Skip to content

Commit

Permalink
Merge branch 'master' into angular-update
Browse files Browse the repository at this point in the history
  • Loading branch information
tkleinke committed Jun 28, 2024
2 parents 6e92d9e + 8b6d956 commit 70da5dc
Show file tree
Hide file tree
Showing 31 changed files with 1,156 additions and 1,359 deletions.
23 changes: 19 additions & 4 deletions core/config/Core/Language.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
},
"shortDescription": {
"label": "Descrição breve"
},
"hasChildren": {
"label": "Recursos subordinados"
},
"includesStratigraphicalUnits": {
"label": "Inclui unidades estratigráficas"
}
},
"categories": {
Expand Down Expand Up @@ -73,10 +79,10 @@
"label": "Adjacente a"
},
"isAfter": {
"label": "Depois de"
"label": "Cronologicamente depois de"
},
"isBefore": {
"label": "Antes de"
"label": "Cronologicamente antes de"
},
"isContemporaryWith": {
"label": "Contemporâneo com"
Expand All @@ -88,16 +94,25 @@
"label": "Representado em"
},
"isMapLayerOf": {
"label": "Camada de mapa de"
"label": "Mapa de fundo de"
},
"hasMapLayer": {
"label": "Tem camada de mapa"
"label": "Tem mapa de fundo"
},
"isInstanceOf": {
"label": "Classificação tipológica"
},
"hasInstance": {
"label": "Espólio associado"
},
"abuts": {
"label": ""
},
"isStoredIn": {
"label": "É armazenado em"
},
"isStoragePlaceOf": {
"label": "É lugar de armazenamento de"
}
}
}
32 changes: 22 additions & 10 deletions core/config/Library/Language.pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,50 @@
"position": "Posição / Contexto",
"dimension": "Dimensões",
"identification": "Identificação",
"other": "Outro"
"other": "Outro",
"hierarchy": "Hierarquia",
"stratigraphy": "Estratigrafia",
"inventory": "Inventariação"
},
"commons": {
"dimensionLength": {
"label": "Comprimento"
"label": "Comprimento",
"description": "Indicação do comprimento"
},
"dimensionWidth": {
"label": "Largura"
"label": "Largura",
"description": "Indicação da largura na extensão máxima/mínima"
},
"dimensionHeight": {
"label": "Altura"
"label": "Altura",
"description": "Indicação da altura na extensão máxima/mínima"
},
"dimensionDepth": {
"label": "Profundiade"
"label": "Profundiade",
"description": "Indicação da profundidade na extensão máxima/mínima"
},
"dimensionThickness": {
"label": "Espessura"
"label": "Espessura",
"description": "Espessura do objeto"
},
"dimensionVerticalExtent": {
"label": "Extensão vertical"
},
"dimensionPerimeter": {
"label": "Perímetro"
"label": "Perímetro",
"description": "Indicação da circunferência do objeto"
},
"dimensionDiameter": {
"label": "Diâmetro"
"label": "Diâmetro",
"description": "Indicação do diâmetro do objeto"
},
"dimensionOther": {
"label": "Outras dimensões",
"description": "Outras dimensões podem ser registadas aqui; explique sff"
},
"area": {
"label": "Área em m2"
"label": "Área em m2",
"description": "Indicação da superfície em metros quadrados"
},
"processor": {
"label": "Processor",
Expand All @@ -48,7 +59,8 @@
"label": "Campanha"
},
"description": {
"label": "Descrição"
"label": "Descrição",
"description": "Campo de descrição livre"
},
"period": {
"label": "Período"
Expand Down
12 changes: 6 additions & 6 deletions core/config/Library/Templates/Language.pt.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"default": {
"label": ""
"label": "Standard"
},
"minimalExcavation": {
"label": ""
"label": "Configuração de base (escavação)"
},
"minimalBuilding": {
"label": ""
"label": "Configuração de base (registo gráfico de arquitetura)"
},
"minimalSurvey": {
"label": ""
"label": "Configuração de base (prospeção)"
},
"archaeoDox": {
"label": "",
"label": "archaeoDox",
"languageConfiguration": {
"relations": {
"isPresentIn": {
"label": ""
"label": "Está presente no desenho de perfil/de plano"
}
}
}
Expand Down
178 changes: 170 additions & 8 deletions core/config/Library/Valuelists/Language.default.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@
},
"Photo-originalFormat-default": {
"values": {
"Farbe": "Color"
"Farbe": "Color",
"Digital": "Digital",
"Analog": "Analogue",
"Dia": "Slide",
"S/W": "B/W"
}
},
"Layer-distinguishingCriteria-default": {
Expand Down Expand Up @@ -94,15 +98,71 @@
"Deutschland": "Germany",
"Irland": "Ireland",
"Italien": "Italy",
"Palästina": "Palestine"
"Palästina": "Palestine",
"Attisch": "Attic",
"Chios": "Chios",
"Ephesos": "Ephesus",
"Etruskisch": "Etruscan",
"Gallien": "Gaul",
"Ionien": "Ionia",
"Kampanisch": "Campanian",
"Karthagisch": "Carthaginian",
"Kleinasien": "Asia Minor",
"Knidos": "Knidos",
"Korinth": "Corinth",
"Kos": "Kos",
"Levante": "Levante",
"Lokal": "Local",
"Lokal/Regional": "Local/Regional",
"Milet": "Miletus",
"Mäandertal": "Meander Valley",
"Nordafrika": "North Africa",
"Nordafrikanisch": "North African",
"Pannonien": "Pannonia",
"Peloponnes": "Peloponnese",
"Regional": "Regional",
"Rhodos": "Rhodes",
"Samos": "Samos",
"Skandinavien": "Scandinavia",
"Slawisch": "Slavic",
"Spanien": "Spain",
"Syrien": "Syria",
"Südtunesisch": "Southern Tunisian",
"Südägäis": "Southern Aegean",
"Antiochia (Antakya)": "Antioch (Antakya)",
"Lesbos": "Lesbos",
"Sizilien": "Sicily"
}
},
"periods-default-1": {
"values": {
"Frühmittelalter": "Early Middle Ages",
"Mittelalter": "Middle Ages",
"Spätmittelalter": "Late Middle Ages",
"Hochmittelalter": "High Middle Ages"
"Hochmittelalter": "High Middle Ages",
"Archaisch": "Archaic",
"Bronzezeitlich": "Bronze Age",
"Byzantinisch": "Byzantine",
"Eisenzeitlich": "Iron Age",
"Frühbyzantinisch": "Early Byzantine",
"Frühhellenistisch": "Early Hellenistic",
"Frühklassisch": "Early Classical",
"Frühkaiserzeitlich": "Early Imperial Period",
"Frühbronzezeitlich": "Early Bronze Age",
"Spätbronzezeitlich": "Late Bronze Age",
"Geometrisch": "Geometric",
"Hellenistisch": "Hellenistic",
"Kaiserzeitlich": "Imperial Period",
"Klassisch": "Classical",
"Neolithisch": "Neolithic",
"Osmanisch": "Ottoman",
"Rezent": "Recent",
"Römisch": "Roman",
"Spätantik": "Late Antique",
"Spätbyzantinisch": "Late Byzantine",
"Späthellenistisch": "Late Hellenistic",
"Spätkaiserzeitlich": "Late Imperial Period",
"Spätklassisch": "Late Classical"
}
},
"colors-default-2": {
Expand All @@ -114,8 +174,15 @@
"rot": "red",
"rotbraun": "red-brown",
"schwarz": "black",
"weiß": "white"
}
"weiß": "white",
"beige": "beige",
"dunkelbraun": "dark brown",
"dunkelrot": "dark red",
"gelb": "yellow",
"hellbraun": "light brown",
"hellgrau": "light grey"
},
"description": "Color set 2, various applications"
},
"glass-decorationTechnique-default": {
"values": {
Expand All @@ -132,7 +199,9 @@
"Glasschlacke": "Glass slag",
"Lampe": "Lamp",
"Löffel": "Spoon",
"Tessera": "Tessera"
"Tessera": "Tessera",
"Gefäß": "Vessel",
"Ring": "Ring"
}
},
"Brick-decorationTechnique-default": {
Expand All @@ -159,18 +228,111 @@
},
"glass-vesselForm-default": {
"values": {
"Tasse": "Cup (with vertical handle)"
"Tasse": "Cup (with vertical handle)",
"Deckel": "Lid",
"Flasche": "Flask",
"Teller": "Plate",
"Unbestimmt": "Indeterminate"
}
},
"glass-vesselFormSpecific-default": {
"values": {
"Dattelflasche": "Date-shaped bottle"
"Dattelflasche": "Date-shaped bottle",
"Alabastron": "Alabastron",
"Amphoriskos": "Amphoriskos",
"Aryballos": "Aryballos",
"Hydria": "Hydria",
"Kotyle": "Kotyle",
"Krater": "Krater",
"Kylix": "Kylix",
"Lekythos": "Lekythos",
"Schöpfer": "Ladle",
"Skyphos": "Skyphos"
}
},
"Building-buildingType-default": {
"values": {
"Befestigung": "Fortification",
"Lager": "Storage building"
}
},
"colors-default-1": {
"values": {
"schwarz": "black",
"beige": "beige",
"blass-": "pale-",
"blau": "blue",
"braun": "brown",
"cremefarben": "cream",
"dunkel-": "dark-",
"gelb": "yellow",
"grau": "grey",
"grün": "green",
"hell-": "light-",
"leuchtend-": "bright-",
"ocker": "ochre",
"orange": "orange",
"rosa": "rose",
"rot": "red",
"türkis": "turquoise",
"violett": "violet",
"weiß": "white"
},
"description": "Color set 1, various Applications; IT-Department, 2019"
},
"Building-buildingCategory-default": {
"values": {
"Tempel": "Temple",
"Theater": "Theatre",
"Turm": "Tower",
"Wohnbau": "Domestic Building"
}
},
"Building-material-default-3": {
"values": {
"Eisen": "Iron",
"Marmor": "Marble",
"Blei": "Lead",
"Erde": "Earth",
"Glas": "Glass",
"Holz": "Wood"
}
},
"Wood-objectType-default": {
"values": {
"Gefäß": "Vessel",
"Architektur": "Architecture",
"Altar": "Altar",
"Gerät": "Tool",
"Kasten/Kiste": "Box",
"Spielzeug": "Toy"
}
},
"glass-formDescription-default": {
"values": {
"rund": "round"
}
},
"Building-buildingCategorySpecific-default": {
"values": {
"Bogen": "Arch"
}
},
"Wood-color-default": {
"values": {
"braun": "brown",
"haselnuss": "hazelnut",
"schwarz": "black"
}
},
"Brick-brickUsage-default": {
"values": {
"Decke": "Ceiling",
"Dach": "Roof",
"Fenster": "Window",
"Fussboden": "Floor",
"Gewölbedecke": "Vaulted ceiling",
"Türsturz": "Lintel"
}
}
}
Loading

0 comments on commit 70da5dc

Please sign in to comment.