8000 Merge branch 'master' into zh-cn-rep · nokok/docs.scala-lang@b1f9223 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1f9223

Browse files
dongxuwangdongxuwang
authored
Merge branch 'master' into zh-cn-rep
2 parents 77cf982 + f097970 commit b1f9223

File tree

113 files changed

+3463
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+3463
-281
lines changed

‎_ba/tour/abstract-types.md renamed to ‎_ba/tour/abstract-type-members.md

File renamed without changes.

‎_ba/tour/compound-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ partof: scala-tour
99

1010
num: 24
1111
next-page: self-types
12-
previous-page: abstract-types
12+
previous-page: abstract-type-members
1313

1414
---
1515

@@ -56,4 +56,4 @@ def cloneAndReset(obj: Cloneable with Resetable): Cloneable = {
5656
Složeni tipovi mogu se sastojati od više tipova i mogu imati jednu rafinaciju koja može biti korištena da suzi potpis postojećih članova objekta.
5757
General forma je: `A with B with C ... { refinement }`
5858

59-
Primjer za upotrebu rafinacije dat je na stranici o [apstraktnim tipovima](abstract-types.html).
59+
Primjer za upotrebu rafinacije dat je na stranici o [apstraktnim tipovima](abstract-type-members.html).

‎_ba/tour/inner-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ discourse: true
88
partof: scala-tour
99

1010
num: 22
11-
next-page: abstract-types
11+
next-page: abstract-type-members
1212
previous-page: lower-type-bounds
1313

1414
---

‎_ba/tour/package-objects.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
layout: tour
3+
title: Package Objects
4+
language: ba
5+
6+
discourse: true
7+
8+
partof: scala-tour
9+
10+
num: 36
11+
previous-page: packages-and-imports
12+
---
13+
14+
# Package objects
15+
16+
(this section of the tour has not been translated yet. pull request
17+
with translation welcome!)

‎_ba/tour/packages-and-imports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ partof: scala-tour
99

1010
num: 35
1111
previous-page: named-arguments
12-
next-page: type-inference
12+
next-page: package-objects
1313
---
1414

1515
# Packages and Imports

‎_ba/tour/tour-of-scala.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Konkretno, sistem tipova podržava sljedeće:
4545
* [generičke klase](generic-classes.html)
4646
* [anotacije varijanse](variances.html)
4747
* [gornje](upper-type-bounds.html) i [donje](lower-type-bounds.html) granice tipa,
48-
* [unutarnje klase](inner-classes.html) i [apstraktne tipove](abstract-types.html) kao članove objekta
48+
* [unutarnje klase](inner-classes.html) i [apstraktne tipove](abstract-type-members.html) kao članove objekta
4949
* [složene tipove](compound-types.html)
5050
* [eksplicitno tipizirane samo-reference](self-types.html)
5151
* implicitne [parametre](implicit-parameters.html) i [konverzije](implicit-conversions.html)

‎_ba/tour/upper-type-bounds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ previous-page: variances
1313

1414
---
1515

16-
U Scali, [tipski parametri](generic-classes.html) i [apstraktni tipovi](abstract-types.html) mogu biti ograničeni granicom tipa.
16+
U Scali, [tipski parametri](generic-classes.html) i [apstraktni tipovi](abstract-type-members.html) mogu biti ograničeni granicom tipa.
1717
Takve granice tipa ograničavaju konkretne vrijednosti tipskih varijabli i ponekad otkrivaju još informacija o članovima takvih tipova.
1818
_Gornja granica tipa_ `T <: A` kaže da se tipska varijabla `T` odnosi na podtip tipa `A`.
1919
Slijedi primjer koji demonstrira gornju granicu tipa za tipski parametar klase `PetContainer`:

‎_es/tour/abstract-types.md renamed to ‎_es/tour/abstract-type-members.md

File renamed without changes.

‎_es/tour/annotations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ num: 3
1010
language: es
1111

1212
next-page: classes
13-
previous-page: abstract-types
13+
previous-page: abstract-type-members
1414
---
1515

1616
Las anotaciones sirven para asociar meta-información con definiciones.

‎_es/tour/compound-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ Los tipos compuestos pueden crearse a partir de varios tipos de objeto y pueden
4444

4545
La forma general es: `A with B with C ... { refinamiento }`
4646

47-
Un ejemplo del uso de los refinamientos se muestra en la página sobre [tipos abstractos](abstract-types.html).
47+
Un ejemplo del uso de los refinamientos se muestra en la página sobre [tipos abstractos](abstract-type-members.html).

0 commit comments

Comments
 (0)
0