From 46d769ef0ba21caf0f6aaf318ed8e6d2e9d0148c Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Tue, 26 Sep 2017 11:54:34 +0200 Subject: [PATCH] Fix broken translations --- language/bs.json | 86 +++++++----------------------------------------- language/de.json | 86 +++++++----------------------------------------- language/fr.json | 86 +++++++----------------------------------------- language/it.json | 86 +++--------------------------------------------- language/nb.json | 84 ++-------------------------------------------- 5 files changed, 40 insertions(+), 388 deletions(-) diff --git a/language/bs.json b/language/bs.json index 047f2cd..125eae6 100644 --- a/language/bs.json +++ b/language/bs.json @@ -1,7 +1,6 @@ { - "semantics":[ + "semantics": [ { -<<<<<<< HEAD "widgets": [ { "label": "Default" @@ -12,23 +11,10 @@ "field": { "label": "Karte", "fields": [ -======= - "widgets":[ - { - "label":"Default" - } - ], - "label":"Karte", - "entity":"karte", - "field":{ - "label":"Karte", - "fields":[ ->>>>>>> master { - "label":"Slika" + "label": "Slika" }, { -<<<<<<< HEAD "label": "Ista slika", "description": "Opcionalna slika koja se koristi umjestodvije iste slike." }, @@ -43,20 +29,11 @@ { "label": "Description", "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", "description": "These options will let you control how the game behaves.", "fields": [ @@ -70,26 +47,10 @@ }, { "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", "description": "Control the visuals of the game.", "fields": [ @@ -101,42 +62,25 @@ { "label": "Card Back", "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", - "fields":[ + "label": "Prijevod", + "fields": [ { - "label":"Tekst kad se okrene karta ", - "default":"Okrenuta karta" + "label": "Tekst kad se okrene karta ", + "default": "Okrenuta karta" }, { - "label":"Tekst za provedeno vrijeme", - "default":"Provedeno vrijeme" + "label": "Tekst za provedeno vrijeme", + "default": "Provedeno vrijeme" }, { - "label":"Feedback tekst", - "default":"BRAVO!" + "label": "Feedback tekst", + "default": "BRAVO!" }, { -<<<<<<< HEAD "label": "Tekst na dugmetu pokušaj ponovo", "default": "Pokušaj ponovo?" }, @@ -163,16 +107,8 @@ { "label": "Card matched label", "default": "Match found." -======= - "label":"Tekst na dugmetu pokušaj ponovo", - "default":"Pokušaj ponovo?" - }, - { - "label":"Close button label", - "default":"Close" ->>>>>>> master } ] } ] -} \ No newline at end of file +} diff --git a/language/de.json b/language/de.json index 3c3d210..550d6b0 100644 --- a/language/de.json +++ b/language/de.json @@ -1,7 +1,6 @@ { - "semantics":[ + "semantics": [ { -<<<<<<< HEAD "widgets": [ { "label": "Default" @@ -12,23 +11,10 @@ "field": { "label": "Karte", "fields": [ -======= - "widgets":[ - { - "label":"Vorgaben" - } - ], - "label":"Karten", - "entity":"karte", - "field":{ - "label":"Karte", - "fields":[ ->>>>>>> master { - "label":"Bild" + "label": "Bild" }, { -<<<<<<< HEAD "label": "Matching Image", "description": "An optional image to match against instead of using two cards with the same image." }, @@ -43,20 +29,11 @@ { "label": "Description", "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", "description": "These options will let you control how the game behaves.", "fields": [ @@ -70,26 +47,10 @@ }, { "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", "description": "Control the visuals of the game.", "fields": [ @@ -101,42 +62,25 @@ { "label": "Card Back", "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", - "fields":[ + "label": "Übersetzung", + "fields": [ { - "label":"Text für die Anzahl der Züge", - "default":"Züge" + "label": "Text für die Anzahl der Züge", + "default": "Züge" }, { - "label":"Text für die benötigte Zeit", - "default":"Benötigte Zeit" + "label": "Text für die benötigte Zeit", + "default": "Benötigte Zeit" }, { - "label":"Text als Rückmeldung", - "default":"Gute Arbeit!" + "label": "Text als Rückmeldung", + "default": "Gute Arbeit!" }, { -<<<<<<< HEAD "label": "Try again button text", "default": "Reset" }, @@ -163,16 +107,8 @@ { "label": "Card matched label", "default": "Match found." -======= - "label":"Text des Wiederholen-Buttons", - "default":"Erneut versuchen?" - }, - { - "label":"Beschriftung des \"Abbrechen\"-Buttons", - "default":"Schließen" ->>>>>>> master } ] } ] -} \ No newline at end of file +} diff --git a/language/fr.json b/language/fr.json index 9b93588..32ca798 100644 --- a/language/fr.json +++ b/language/fr.json @@ -1,7 +1,6 @@ { - "semantics":[ + "semantics": [ { -<<<<<<< HEAD "widgets": [ { "label": "Default" @@ -12,23 +11,10 @@ "field": { "label": "Carte", "fields": [ -======= - "widgets":[ - { - "label":"Default" - } - ], - "label":"Cartes", - "entity":"carte", - "field":{ - "label":"Carte", - "fields":[ ->>>>>>> master { - "label":"Image" + "label": "Image" }, { -<<<<<<< HEAD "label": "Matching Image", "description": "An optional image to match against instead of using two cards with the same image." }, @@ -43,20 +29,11 @@ { "label": "Description", "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", "description": "These options will let you control how the game behaves.", "fields": [ @@ -70,26 +47,10 @@ }, { "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", "description": "Control the visuals of the game.", "fields": [ @@ -101,42 +62,25 @@ { "label": "Card Back", "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", - "fields":[ + "label": "Interface", + "fields": [ { - "label":"Texte pour le nombre de cartes retournées", - "default":"Cartes retournées :" + "label": "Texte pour le nombre de cartes retournées", + "default": "Cartes retournées :" }, { - "label":"Texte pour le temps passé", - "default":"Temps écoulé :" + "label": "Texte pour le temps passé", + "default": "Temps écoulé :" }, { - "label":"Texte de l'appréciation finale", - "default":"Bien joué !" + "label": "Texte de l'appréciation finale", + "default": "Bien joué !" }, { -<<<<<<< HEAD "label": "Try again button text", "default": "Reset" }, @@ -163,16 +107,8 @@ { "label": "Card matched label", "default": "Match found." -======= - "label":"Try again button text", - "default":"Try again?" - }, - { - "label":"Close button label", - "default":"Close" ->>>>>>> master } ] } ] -} \ No newline at end of file +} diff --git a/language/it.json b/language/it.json index b8b9fec..6a2e4c3 100644 --- a/language/it.json +++ b/language/it.json @@ -1,7 +1,6 @@ { - "semantics":[ + "semantics": [ { -<<<<<<< HEAD "widgets": [ { "label": "Default" @@ -12,23 +11,10 @@ "field": { "label": "Carta", "fields": [ -======= - "widgets":[ - { - "label":"Default" - } - ], - "label":"Carte", - "entity":"carta", - "field":{ - "label":"Carta", - "fields":[ ->>>>>>> master { - "label":"Immagine" + "label": "Immagine" }, { -<<<<<<< HEAD "label": "Matching Image", "description": "An optional image to match against instead of using two cards with the same image." }, @@ -43,20 +29,11 @@ { "label": "Description", "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", "description": "These options will let you control how the game behaves.", "fields": [ @@ -70,26 +47,10 @@ }, { "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", "description": "Control the visuals of the game.", "fields": [ @@ -101,30 +62,13 @@ { "label": "Card Back", "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", - "fields":[ + "label": "Localizzazione", + "fields": [ { -<<<<<<< HEAD "label": "Testo Gira carta", "default": "Card turns" }, @@ -163,28 +107,8 @@ { "label": "Card matched label", "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 } ] } ] -} \ No newline at end of file +} diff --git a/language/nb.json b/language/nb.json index ce5abb5..21218d7 100644 --- a/language/nb.json +++ b/language/nb.json @@ -1,7 +1,6 @@ { - "semantics":[ + "semantics": [ { -<<<<<<< HEAD "widgets": [ { "label": "Default" @@ -30,34 +29,11 @@ { "label": "Description", "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", "description": "Disse instillingene lar deg bestemme hvordan spillet skal oppføre seg.", "fields": [ @@ -71,26 +47,10 @@ }, { "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", "description": "Kontroller de visuelle aspektene ved spillet.", "fields": [ @@ -102,27 +62,10 @@ { "label": "Kortbaksiden", "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", "fields": [ { @@ -164,31 +107,8 @@ { "label": "Card matched label", "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 } ] } ] -} \ No newline at end of file +}