Fix broken translations

pull/30/head^2
Frode Petterson 2017-09-26 11:54:34 +02:00
parent 6f62cf9da0
commit 46d769ef0b
5 changed files with 40 additions and 388 deletions

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -12,23 +11,10 @@
"field": { "field": {
"label": "Karte", "label": "Karte",
"fields": [ "fields": [
=======
"widgets":[
{ {
"label":"Default" "label": "Slika"
}
],
"label":"Karte",
"entity":"karte",
"field":{
"label":"Karte",
"fields":[
>>>>>>> master
{
"label":"Slika"
}, },
{ {
<<<<<<< HEAD
"label": "Ista slika", "label": "Ista slika",
"description": "Opcionalna slika koja se koristi umjestodvije iste slike." "description": "Opcionalna slika koja se koristi umjestodvije iste slike."
}, },
@ -43,20 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"label":"Ista slika",
"description":"Opcionalna slika koja se koristi umjestodvije iste slike."
},
{
"label":"Opis",
"description":"Kratak tekst koji će biti prikazan čim se pronađu dvije iste karte."
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Podešavanje ponašanja", "label": "Podešavanje ponašanja",
"description": "These options will let you control how the game behaves.", "description": "These options will let you control how the game behaves.",
"fields": [ "fields": [
@ -70,26 +47,10 @@
}, },
{ {
"label": "Add button for retrying when the game is over" "label": "Add button for retrying when the game is over"
=======
"label":"Podešavanje ponašanja",
"description":"These options will let you control how the game behaves.",
"fields":[
{
"label":"Poredaj karte u redove ",
"description":"Will try to match the number of columns and rows when laying out the cards. Afterward, the cards will be scaled to fit the container."
},
{
"label":"Broj karata za upotrebu",
"description":"Setting this to a number greater than 2 will make the game pick random cards from the list of cards."
},
{
"label":"Add button for retrying when the game is over"
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Look and feel", "label": "Look and feel",
"description": "Control the visuals of the game.", "description": "Control the visuals of the game.",
"fields": [ "fields": [
@ -101,42 +62,25 @@
{ {
"label": "Card Back", "label": "Card Back",
"description": "Use a custom back for your cards." "description": "Use a custom back for your cards."
=======
"label":"Look and feel",
"description":"Control the visuals of the game.",
"fields":[
{
"label":"Theme Color",
"description":"Choose a color to create a theme for your card game.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Card Back",
"description":"Use a custom back for your cards."
>>>>>>> master
} }
] ]
}, },
{ {
"label":"Prijevod", "label": "Prijevod",
"fields":[ "fields": [
{ {
"label":"Tekst kad se okrene karta ", "label": "Tekst kad se okrene karta ",
"default":"Okrenuta karta" "default": "Okrenuta karta"
}, },
{ {
"label":"Tekst za provedeno vrijeme", "label": "Tekst za provedeno vrijeme",
"default":"Provedeno vrijeme" "default": "Provedeno vrijeme"
}, },
{ {
"label":"Feedback tekst", "label": "Feedback tekst",
"default":"BRAVO!" "default": "BRAVO!"
}, },
{ {
<<<<<<< HEAD
"label": "Tekst na dugmetu pokušaj ponovo", "label": "Tekst na dugmetu pokušaj ponovo",
"default": "Pokušaj ponovo?" "default": "Pokušaj ponovo?"
}, },
@ -163,14 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"Tekst na dugmetu pokušaj ponovo",
"default":"Pokušaj ponovo?"
},
{
"label":"Close button label",
"default":"Close"
>>>>>>> master
} }
] ]
} }

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -12,23 +11,10 @@
"field": { "field": {
"label": "Karte", "label": "Karte",
"fields": [ "fields": [
=======
"widgets":[
{ {
"label":"Vorgaben" "label": "Bild"
}
],
"label":"Karten",
"entity":"karte",
"field":{
"label":"Karte",
"fields":[
>>>>>>> master
{
"label":"Bild"
}, },
{ {
<<<<<<< HEAD
"label": "Matching Image", "label": "Matching Image",
"description": "An optional image to match against instead of using two cards with the same image." "description": "An optional image to match against instead of using two cards with the same image."
}, },
@ -43,20 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"label":"Passendes Bild",
"description":"Ein optionales anderes Bild als Gegenstück statt zwei Karten mit dem selben Bild zu nutzen"
},
{
"label":"Beschreibung",
"description":"Ein kurzer Text, der angezeigt wird, sobald zwei identische Karten gefunden werden."
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Behavioural settings", "label": "Behavioural settings",
"description": "These options will let you control how the game behaves.", "description": "These options will let you control how the game behaves.",
"fields": [ "fields": [
@ -70,26 +47,10 @@
}, },
{ {
"label": "Add button for retrying when the game is over" "label": "Add button for retrying when the game is over"
=======
"label":"Interaktionseinstellungen",
"description":"Mit diesen Einstellungen kannst du das Verhalten des Spiels anpassen.",
"fields":[
{
"label":"Positioniere die Karten in einem Quadrat.",
"description":"Es wird versucht, die Anzahl der Zeilen und Spalten passend zu den Karten einzustellen. Danach werden die Karten passend skaliert."
},
{
"label":"Anzahl der zu nutzenden Karten",
"description":"Wird hier eine Zahl größer als 2 eingestellt, werden zufällig Karten aus der Kartenliste gezogen."
},
{
"label":"Füge einen Button hinzu, um das Spiel noch einmal neu zu starten zu können, wenn es vorbei ist."
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Look and feel", "label": "Look and feel",
"description": "Control the visuals of the game.", "description": "Control the visuals of the game.",
"fields": [ "fields": [
@ -101,42 +62,25 @@
{ {
"label": "Card Back", "label": "Card Back",
"description": "Use a custom back for your cards." "description": "Use a custom back for your cards."
=======
"label":"Design-Aspekte",
"description":"Beeinflusse die Optik des Spiels",
"fields":[
{
"label":"Themenfarbe",
"description":"Wähle eine Farbe, um ein Theme für deine Karten zu erstellen.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Kartenrückseite",
"description":"Nutze eine individuelle Rückseite für deine Karten."
>>>>>>> master
} }
] ]
}, },
{ {
"label":"Übersetzung", "label": "Übersetzung",
"fields":[ "fields": [
{ {
"label":"Text für die Anzahl der Züge", "label": "Text für die Anzahl der Züge",
"default":"Züge" "default": "Züge"
}, },
{ {
"label":"Text für die benötigte Zeit", "label": "Text für die benötigte Zeit",
"default":"Benötigte Zeit" "default": "Benötigte Zeit"
}, },
{ {
"label":"Text als Rückmeldung", "label": "Text als Rückmeldung",
"default":"Gute Arbeit!" "default": "Gute Arbeit!"
}, },
{ {
<<<<<<< HEAD
"label": "Try again button text", "label": "Try again button text",
"default": "Reset" "default": "Reset"
}, },
@ -163,14 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"Text des Wiederholen-Buttons",
"default":"Erneut versuchen?"
},
{
"label":"Beschriftung des \"Abbrechen\"-Buttons",
"default":"Schließen"
>>>>>>> master
} }
] ]
} }

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -12,23 +11,10 @@
"field": { "field": {
"label": "Carte", "label": "Carte",
"fields": [ "fields": [
=======
"widgets":[
{ {
"label":"Default" "label": "Image"
}
],
"label":"Cartes",
"entity":"carte",
"field":{
"label":"Carte",
"fields":[
>>>>>>> master
{
"label":"Image"
}, },
{ {
<<<<<<< HEAD
"label": "Matching Image", "label": "Matching Image",
"description": "An optional image to match against instead of using two cards with the same image." "description": "An optional image to match against instead of using two cards with the same image."
}, },
@ -43,20 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"label":"Matching Image",
"description":"An optional image to match against instead of using two cards with the same image."
},
{
"label":"Description",
"description":"Petit texte affiché quand deux cartes identiques sont trouvées."
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Behavioural settings", "label": "Behavioural settings",
"description": "These options will let you control how the game behaves.", "description": "These options will let you control how the game behaves.",
"fields": [ "fields": [
@ -70,26 +47,10 @@
}, },
{ {
"label": "Add button for retrying when the game is over" "label": "Add button for retrying when the game is over"
=======
"label":"Behavioural settings",
"description":"These options will let you control how the game behaves.",
"fields":[
{
"label":"Position the cards in a square",
"description":"Will try to match the number of columns and rows when laying out the cards. Afterward, the cards will be scaled to fit the container."
},
{
"label":"Number of cards to use",
"description":"Setting this to a number greater than 2 will make the game pick random cards from the list of cards."
},
{
"label":"Add button for retrying when the game is over"
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Look and feel", "label": "Look and feel",
"description": "Control the visuals of the game.", "description": "Control the visuals of the game.",
"fields": [ "fields": [
@ -101,42 +62,25 @@
{ {
"label": "Card Back", "label": "Card Back",
"description": "Use a custom back for your cards." "description": "Use a custom back for your cards."
=======
"label":"Look and feel",
"description":"Control the visuals of the game.",
"fields":[
{
"label":"Theme Color",
"description":"Choose a color to create a theme for your card game.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Card Back",
"description":"Use a custom back for your cards."
>>>>>>> master
} }
] ]
}, },
{ {
"label":"Interface", "label": "Interface",
"fields":[ "fields": [
{ {
"label":"Texte pour le nombre de cartes retournées", "label": "Texte pour le nombre de cartes retournées",
"default":"Cartes retournées :" "default": "Cartes retournées :"
}, },
{ {
"label":"Texte pour le temps passé", "label": "Texte pour le temps passé",
"default":"Temps écoulé :" "default": "Temps écoulé :"
}, },
{ {
"label":"Texte de l'appréciation finale", "label": "Texte de l'appréciation finale",
"default":"Bien joué !" "default": "Bien joué !"
}, },
{ {
<<<<<<< HEAD
"label": "Try again button text", "label": "Try again button text",
"default": "Reset" "default": "Reset"
}, },
@ -163,14 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"Try again button text",
"default":"Try again?"
},
{
"label":"Close button label",
"default":"Close"
>>>>>>> master
} }
] ]
} }

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -12,23 +11,10 @@
"field": { "field": {
"label": "Carta", "label": "Carta",
"fields": [ "fields": [
=======
"widgets":[
{ {
"label":"Default" "label": "Immagine"
}
],
"label":"Carte",
"entity":"carta",
"field":{
"label":"Carta",
"fields":[
>>>>>>> master
{
"label":"Immagine"
}, },
{ {
<<<<<<< HEAD
"label": "Matching Image", "label": "Matching Image",
"description": "An optional image to match against instead of using two cards with the same image." "description": "An optional image to match against instead of using two cards with the same image."
}, },
@ -43,20 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"label":"Matching Image",
"description":"An optional image to match against instead of using two cards with the same image."
},
{
"label":"Descrizione",
"description":"Breve testo visualizzato quando due carte uguali vengono trovate."
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Behavioural settings", "label": "Behavioural settings",
"description": "These options will let you control how the game behaves.", "description": "These options will let you control how the game behaves.",
"fields": [ "fields": [
@ -70,26 +47,10 @@
}, },
{ {
"label": "Add button for retrying when the game is over" "label": "Add button for retrying when the game is over"
=======
"label":"Behavioural settings",
"description":"These options will let you control how the game behaves.",
"fields":[
{
"label":"Position the cards in a square",
"description":"Will try to match the number of columns and rows when laying out the cards. Afterward, the cards will be scaled to fit the container."
},
{
"label":"Number of cards to use",
"description":"Setting this to a number greater than 2 will make the game pick random cards from the list of cards."
},
{
"label":"Add button for retrying when the game is over"
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Look and feel", "label": "Look and feel",
"description": "Control the visuals of the game.", "description": "Control the visuals of the game.",
"fields": [ "fields": [
@ -101,30 +62,13 @@
{ {
"label": "Card Back", "label": "Card Back",
"description": "Use a custom back for your cards." "description": "Use a custom back for your cards."
=======
"label":"Look and feel",
"description":"Control the visuals of the game.",
"fields":[
{
"label":"Theme Color",
"description":"Choose a color to create a theme for your card game.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Card Back",
"description":"Use a custom back for your cards."
>>>>>>> master
} }
] ]
}, },
{ {
"label":"Localizzazione", "label": "Localizzazione",
"fields":[ "fields": [
{ {
<<<<<<< HEAD
"label": "Testo Gira carta", "label": "Testo Gira carta",
"default": "Card turns" "default": "Card turns"
}, },
@ -163,26 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"Testo Gira carta",
"default":"Card turns"
},
{
"label":"Testo Tempo trascorso",
"default":"Time spent"
},
{
"label":"Testo Feedback",
"default":"Good work!"
},
{
"label":"Try again button text",
"default":"Try again?"
},
{
"label":"Close button label",
"default":"Close"
>>>>>>> master
} }
] ]
} }

View File

@ -1,7 +1,6 @@
{ {
"semantics":[ "semantics": [
{ {
<<<<<<< HEAD
"widgets": [ "widgets": [
{ {
"label": "Default" "label": "Default"
@ -30,34 +29,11 @@
{ {
"label": "Description", "label": "Description",
"description": "An optional short text that will pop up once the two matching cards are found." "description": "An optional short text that will pop up once the two matching cards are found."
=======
"widgets":[
{
"label":"Default"
}
],
"label":"Kort",
"entity":"kort",
"field":{
"label":"Kort",
"fields":[
{
"label":"Bilde"
},
{
"label":"Tilhørende bilde",
"description":"Et valgfritt bilde som brukes av kort nummer to istedenfor å bruke to kort med samme bilde."
},
{
"label":"Beskrivelse",
"description":"En valgfri kort tekst som spretter opp når kort-paret er funnet."
>>>>>>> master
} }
] ]
} }
}, },
{ {
<<<<<<< HEAD
"label": "Innstillinger for oppførsel", "label": "Innstillinger for oppførsel",
"description": "Disse instillingene lar deg bestemme hvordan spillet skal oppføre seg.", "description": "Disse instillingene lar deg bestemme hvordan spillet skal oppføre seg.",
"fields": [ "fields": [
@ -71,26 +47,10 @@
}, },
{ {
"label": "Legg til knapp for å prøve på nytt når spillet er over" "label": "Legg til knapp for å prøve på nytt når spillet er over"
=======
"label":"Innstillinger for oppførsel",
"description":"Disse instillingene lar deg bestemme hvordan spillet skal oppføre seg.",
"fields":[
{
"label":"Plasser kortene i en firkant",
"description":"Vil forsøk å samsvare antall kolonner og rader når kortene legges ut. Etterpå vil kortene bli skalert til å passe beholderen."
},
{
"label":"Antall kort som skal brukes",
"description":"Ved å sette antallet høyere enn 2 vil spillet plukke tilfeldige kort fra listen over kort."
},
{
"label":"Legg til knapp for å prøve på nytt når spillet er over"
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Tilpass utseende", "label": "Tilpass utseende",
"description": "Kontroller de visuelle aspektene ved spillet.", "description": "Kontroller de visuelle aspektene ved spillet.",
"fields": [ "fields": [
@ -102,27 +62,10 @@
{ {
"label": "Kortbaksiden", "label": "Kortbaksiden",
"description": "Bruk en tilpasset kortbakside for kortene dine." "description": "Bruk en tilpasset kortbakside for kortene dine."
=======
"label":"Tilpass utseende",
"description":"Kontroller de visuelle aspektene ved spillet.",
"fields":[
{
"label":"Temafarge",
"description":"Velg en farge for å skape et tema over kortspillet ditt.",
"default":"#909090",
"spectrum":{
}
},
{
"label":"Kortbaksiden",
"description":"Bruk en tilpasset kortbakside for kortene dine."
>>>>>>> master
} }
] ]
}, },
{ {
<<<<<<< HEAD
"label": "Oversettelser", "label": "Oversettelser",
"fields": [ "fields": [
{ {
@ -164,29 +107,6 @@
{ {
"label": "Card matched label", "label": "Card matched label",
"default": "Match found." "default": "Match found."
=======
"label":"Oversettelser",
"fields":[
{
"label":"Etikett for antall vendte kort",
"default":"Kort vendt"
},
{
"label":"Etikett for tid brukt",
"default":"Tid brukt"
},
{
"label":"Tilbakemeldingstekst",
"default":"Godt jobbet!"
},
{
"label":"Prøv på nytt-tekst",
"default":"Prøv på nytt?"
},
{
"label":"Lukk knapp-merkelapp",
"default":"Lukk"
>>>>>>> master
} }
] ]
} }