Skip to content

Commit c05148e

Browse files
Merge branch 'master' into show_ressource_change_history_issue223
2 parents 4acc966 + dc4f4ec commit c05148e

File tree

230 files changed

+60812
-54219
lines changed

Some content is hidden

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

230 files changed

+60812
-54219
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Using Field, archaeologists can:
1919
* manage types and inventories
2020
* sync & publish their excavation data
2121

22+
## Information for users and interested projects
23+
We are always happy to hear about your Field projects! If you are using Field in your research, consider [signing up for the Field users mailing list](https://lists.fu-berlin.de/listinfo/idaifield2-user) ([idaifield2-user@dainst.de](mailto:idaifield2-user@dainst.de)), where you can exchange tips and tricks with other users and get updates about new releases. Feel free to also join in the [Discussions](https://github.com/dainst/idai-field/discussions) in this repository.
24+
2225
## Information for developers and collaborators
2326

2427
This is a monorepo containing five packages:

core/config/Library/Language.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
},
6767
"processor": {
6868
"label": "Responsabile",
69-
"description": "La persona o le persone responsabili della risorsa o dell'oggetto durante la campagna. Importante: i nomi delle persone che inseriscono o modificano la voce nella banca dati vengono salvati automaticamente e quindi non devono essere inseriti qui"
69+
"description": "La persona o le persone responsabili della risorsa o dell'oggetto durante la campagna. Importante: i nomi delle persone che inseriscono o modificano la voce nella banca dati vengono salvati automaticamente e quindi non devono essere inseriti qui."
7070
},
7171
"campaign": {
7272
"label": "Campagna"

core/config/Library/Language.pt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@
15551555
"description": "Espécie animal presente"
15561556
}
15571557
},
1558-
"label": "ossos"
1558+
"label": "Ossos"
15591559
},
15601560
"Survey": {
15611561
"fields": {

core/config/Library/Language.tr.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@
267267
}
268268
},
269269
"Mollusk": {
270-
"label": "Deniz kabuğu",
270+
"label": "Yumuşakçalar",
271271
"fields": {
272272
"classification": {
273-
"label": "Deniz kabuğu sınıflandırması"
273+
"label": "Yumuşakça sınıflandırması"
274274
}
275275
}
276276
},
@@ -885,7 +885,7 @@
885885
}
886886
},
887887
"Pottery": {
888-
"label": "Çanak Çömlek",
888+
"label": "Pişmiş Toprak",
889889
"fields": {
890890
"amountSherdsWall": {
891891
"label": "Gövde parçası sayısı"
@@ -1011,7 +1011,7 @@
10111011
"label": "Obje tipi"
10121012
},
10131013
"specificType": {
1014-
"label": "Çanak çömlek tipi"
1014+
"label": "Pişmiş toprak tipi"
10151015
},
10161016
"temper": {
10171017
"label": "Katkı",
@@ -1038,7 +1038,7 @@
10381038
"label": "Kap parçası"
10391039
},
10401040
"Firing": {
1041-
"label": "Çanak çömlek fırınlama"
1041+
"label": "Pişmiş toprak fırınlama"
10421042
},
10431043
"FormComparisonCompendia": {
10441044
"label": "Form karşılaştırma özeti"
@@ -1064,7 +1064,7 @@
10641064
}
10651065
},
10661066
"Grave": {
1067-
"label": "Gömüt",
1067+
"label": "Mezar",
10681068
"fields": {
10691069
"bibliography": {
10701070
"label": "Kaynakça"
@@ -1105,10 +1105,10 @@
11051105
"description": "Stratigrafik birimi sınırlamak için hangi kriter(ler) seçildi?"
11061106
},
11071107
"graveType": {
1108-
"label": "Gömüt tipi"
1108+
"label": "Mezar tipi"
11091109
},
11101110
"specificType": {
1111-
"label": "Özel gömüt tipi"
1111+
"label": "Özel mezar tipi"
11121112
},
11131113
"soilType": {
11141114
"label": "Toprak tipi",
@@ -1173,7 +1173,7 @@
11731173
}
11741174
},
11751175
"Terracotta": {
1176-
"label": "Pişmiş Toprak",
1176+
"label": "Terrakotta",
11771177
"fields": {
11781178
"clayColorBreak": {
11791179
"label": "Parça: Hamur rengi ve tonu"
@@ -1186,7 +1186,7 @@
11861186
},
11871187
"clayStructure": {
11881188
"label": "Yapısı",
1189-
"description": "Pişmiş toprak yapısal türü nedir?"
1189+
"description": "Terrakotta yapısal türü nedir?"
11901190
},
11911191
"coatColorInside": {
11921192
"label": "Astar (iç): Rengi ve tonu"

core/config/Library/Valuelists/Language.default.pt.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"position-values-edge-default": {
1616
"values": {
17-
"Oberkante": "Margem superior",
18-
"Unterkante": "Margem inferior"
17+
"Oberkante": "margem superior",
18+
"Unterkante": "margem inferior"
1919
}
2020
},
2121
"orientation-default-1": {

core/config/Library/Valuelists/Language.default.tr.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"position-values-expansion-default": {
1010
"values": {
11-
"Maximale Ausdehnung": "Maksimum genişleme",
12-
"Minimale Ausdehnung": "Minimum genişleme"
11+
"Maximale Ausdehnung": "En uzun tarafından",
12+
"Minimale Ausdehnung": "En kısa tarafından"
1313
}
1414
},
1515
"position-values-edge-default": {
@@ -870,7 +870,7 @@
870870
"Felsabarbeitung": "",
871871
"Funderfassung": "Buluntuların kaydedilmesi",
872872
"Fundsammlung": "Buluntuların toplanması",
873-
"Grab": "Gömüt",
873+
"Grab": "Mezar",
874874
"Nekropole": "Nekropol",
875875
"Spolie in rezenter Mauer": "Modern duvarda devşirme",
876876
"Steinbruch": "Taş ocağı",

0 commit comments

Comments
 (0)