From b4153314c7de7660c902d68ee4f482f88757d72f Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 17 Mar 2022 23:13:02 +0100 Subject: [PATCH 1/7] Fixed tests --- test/LegacyThemeLoader.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/LegacyThemeLoader.spec.ts b/test/LegacyThemeLoader.spec.ts index 8b1972120..0d305f450 100644 --- a/test/LegacyThemeLoader.spec.ts +++ b/test/LegacyThemeLoader.spec.ts @@ -422,8 +422,8 @@ export default class LegacyThemeLoaderSpec extends T { } ] }, "test"); - T.isTrue(r.warnings.length > 0, "Failing case 0 is not detected") - T.isTrue(r.warnings[0].indexOf("The mapping key=value is fully matched by a previous mapping (namely 0)") >= 0, "Error message does not contain tag and indices") + T.isTrue(r.errors.length > 0, "Failing case 0 is not detected") + T.isTrue(r.errors[0].indexOf("The mapping key=value is fully matched by a previous mapping (namely 0)") >= 0, "Error message does not contain tag and indices") const r0 = new DetectShadowedMappings().convert({ mappings: [ { @@ -436,7 +436,7 @@ export default class LegacyThemeLoaderSpec extends T { } ] }, "test"); - T.isTrue(r0.warnings.length > 0, "Failing case 1 is not detected") + T.isTrue(r0.errors.length > 0, "Failing case 1 is not detected") } ], ["Images are rewritten", () => { From f2e26718c6193d6b84983a689e9ea15a6becab3b Mon Sep 17 00:00:00 2001 From: Falk Rund Date: Mon, 21 Mar 2022 06:16:25 +0000 Subject: [PATCH 2/7] Translated using Weblate (German) Currently translated at 59.3% (256 of 431 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/ --- langs/de.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/langs/de.json b/langs/de.json index 97f28883d..3f8ec0baf 100644 --- a/langs/de.json +++ b/langs/de.json @@ -41,10 +41,10 @@ "about": "OpenStreetMap für ein bestimmtes Thema einfach bearbeiten und hinzufügen", "aboutMapcomplete": "

Über MapComplete

Nutzen Sie es, um OpenStreetMap-Informationen zu einem einzigen Thema hinzuzufügen. Beantworten Sie Fragen, und innerhalb weniger Minuten sind Ihre Beiträge überall verfügbar. Der Theme-Maintainer definiert Elemente, Fragen und Sprachen dafür.

Mehr erfahren

MapComplete bietet immer den nächsten Schritt, um mehr über OpenStreetMap zu erfahren.


Haben Sie ein Problem bemerkt? Haben Sie einen Funktionswunsch? Möchten Sie bei der Übersetzung helfen? Besuchen Sie den Quellcode oder den Issue Tracker

Möchten Sie Ihren Fortschritt sehen? Verfolgen Sie die Anzahl der Änderungen auf OsmCha.

", "add": { - "addNew": "Hier eine neue {category} hinzufügen", + "addNew": "Füge eine neue {category} hinzu", "addNewMapLabel": "Hier klicken, um ein neues Element hinzuzufügen", - "confirmButton": "Fügen Sie hier eine {category} hinzu.
Ihre Ergänzung ist für alle sichtbar
", - "confirmIntro": "

Hier einen {title} hinzufügen?

Der Punkt, den Sie hier anlegen, wird für alle sichtbar sein. Bitte fügen Sie der Karte nur dann Dinge hinzu, wenn sie wirklich existieren. Viele Anwendungen verwenden diese Daten.", + "confirmButton": "Fügen Sie eine {category} hinzu.
Ihre Ergänzung ist für alle sichtbar
", + "confirmIntro": "

Füge einen {title} hinzu?

Der Punkt, den Sie hier anlegen, wird für alle sichtbar sein. Bitte fügen Sie der Karte nur dann Dinge hinzu, wenn sie wirklich existieren. Viele Anwendungen verwenden diese Daten.", "disableFilters": "Alle Filter deaktivieren", "disableFiltersExplanation": "Einige Elemente können durch einen Filter ausgeblendet sein", "hasBeenImported": "Dieser Punkt wurde bereits importiert", @@ -52,7 +52,7 @@ "intro": "Sie haben irgendwo geklickt, wo noch keine Daten bekannt sind.
", "layerNotEnabled": "Die Ebene {layer} ist nicht aktiviert. Aktivieren Sie diese Ebene, um einen Punkt hinzuzufügen", "openLayerControl": "Das Ebenen-Kontrollkästchen öffnen", - "pleaseLogin": "Bitte loggen Sie sich ein, um einen neuen Punkt hinzuzufügen", + "pleaseLogin": "Bitte loggen Sie sich ein, um einen neuen Punkt hinzuzufügen", "presetInfo": "Der neue POI hat {tags}", "stillLoading": "Die Daten werden noch geladen. Bitte warten Sie etwas, bevor Sie einen neuen Punkt hinzufügen.", "title": "Punkt hinzufügen?", @@ -292,4 +292,4 @@ "split": "Teilen", "splitTitle": "Wählen Sie auf der Karte aus, wo die Straße geteilt werden soll" } -} \ No newline at end of file +} From aa54a881fe68a21087cc053cd87aefb400849340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Mon, 21 Mar 2022 09:40:35 +0000 Subject: [PATCH 3/7] Translated using Weblate (Slovenian) Currently translated at 56.7% (21 of 37 strings) Translation: MapComplete/shared-questions Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/sl/ --- langs/shared-questions/sl.json | 78 +++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/langs/shared-questions/sl.json b/langs/shared-questions/sl.json index 9e26dfeeb..a1c81cc94 100644 --- a/langs/shared-questions/sl.json +++ b/langs/shared-questions/sl.json @@ -1 +1,77 @@ -{} \ No newline at end of file +{ + "shared_questions": { + "dog-access": { + "mappings": { + "2": { + "then": "Psi so dovoljeni, vendar morajo biti na povodcu" + }, + "0": { + "then": "Psi so dovoljeni" + }, + "1": { + "then": "Psi niso dovoljeni" + }, + "3": { + "then": "Psi so dovoljeni in lahko prosto tekajo naokoli" + } + }, + "question": "Ali so v tem podjetju dovoljeni psi?" + }, + "description": { + "question": "Ali je še kaj pomembnega, česar niste mogli povedati v prejšnjih vprašanjih? Dopišite tukaj.
Ne ponavljajte že navedenih dejstev" + }, + "payment-options": { + "mappings": { + "1": { + "then": "Tukaj sprejemajo plačilne kartice" + }, + "0": { + "then": "Tu sprejemajo gotovino" + } + }, + "question": "Kateri načini plačila so možni tu?" + }, + "level": { + "mappings": { + "4": { + "then": "Nahaja se v prvi kletni etaži" + }, + "0": { + "then": "Nahaja se pod zemljo" + }, + "1": { + "then": "Nahaja se v pritličju" + }, + "2": { + "then": "Nahaja se v pritličju" + }, + "3": { + "then": "Nahaja se v prvem nadstropju" + } + }, + "render": "Nahaja se v {level}. nadstropju" + }, + "email": { + "question": "Kakšen naslov elektronske pošte ima {title()}?" + }, + "opening_hours": { + "question": "Kakšen odpiralni čas ima {title()}?", + "render": "

Odpiralni čas

{opening_hours_table(opening_hours)}" + }, + "payment-options-advanced": { + "override": { + "mappings+": { + "0": { + "then": "Plačilo se opravi z namensko aplikacijo" + }, + "1": { + "then": "Plačilo se izvede s člansko izkaznico" + } + } + } + }, + "phone": { + "question": "Kakšno telefonsko številko ima {title()}?" + } + } +} From eb625e1c4d887bfc7f16ced55e4df2942f98959e Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 23 Mar 2022 12:08:22 +0100 Subject: [PATCH 4/7] Drop assumption in preset that only one plug is there --- assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json index ce36a1f9d..24f020861 100644 --- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json +++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json @@ -65,8 +65,7 @@ "tags": [ "amenity=charging_station", "motorcar=no", - "bicycle=yes", - "socket:typee=1" + "bicycle=yes" ], "title": { "nl": "laadpunt voor elektrische fietsen" From 5163cb031e239bd323a710c93096cdf29f149ee4 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 23 Mar 2022 12:42:47 +0100 Subject: [PATCH 5/7] Attempt to fix #709 --- UI/BigComponents/SimpleAddUI.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts index cd86e1d52..87e8730ef 100644 --- a/UI/BigComponents/SimpleAddUI.ts +++ b/UI/BigComponents/SimpleAddUI.ts @@ -24,6 +24,7 @@ import {ElementStorage} from "../../Logic/ElementStorage"; import ConfirmLocationOfPoint from "../NewPoint/ConfirmLocationOfPoint"; import BaseLayer from "../../Models/BaseLayer"; import Loading from "../Base/Loading"; +import Hash from "../../Logic/Web/Hash"; /* * The SimpleAddUI is a single panel, which can have multiple states: @@ -92,6 +93,7 @@ export default class SimpleAddUI extends Toggle { state.selectedElement.setData(state.allElements.ContainingFeatures.get( newElementAction.newElementId )) + Hash.hash.setData(newElementAction.newElementId) } const addUi = new VariableUiElement( From aed59a6b015171f17381a71ba2893f2f216e5102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Thu, 24 Mar 2022 15:49:15 +0000 Subject: [PATCH 6/7] Translated using Weblate (Slovenian) Currently translated at 13.2% (57 of 431 strings) Translation: MapComplete/Core Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/sl/ --- langs/sl.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/langs/sl.json b/langs/sl.json index de66f409d..56d9b1c41 100644 --- a/langs/sl.json +++ b/langs/sl.json @@ -22,7 +22,15 @@ "thursday": "Četrtek", "tuesday": "Torek", "wednesday": "Sreda" - } + }, + "search": { + "searching": "Iskanje…", + "error": "Nekaj se je zalomilo…", + "nothing": "Nič ni bilo najdenega…", + "search": "Poiščite lokacijo" + }, + "save": "Shrani", + "skippedQuestions": "Nekatera vprašanja so bila preskočena" }, "image": { "addPicture": "Dodaj sliko", @@ -34,5 +42,13 @@ "intro": "MapComplete je pregledovalnik in urejevalnik zemljevida OpenStreetMap, ki prikazuje in omogoča urejanje informacij na določeno tematiko.", "pickTheme": "Za začetek spodaj izberite tematiko.", "title": "Dobrodošli na MapComplete" + }, + "centerMessage": { + "retrying": "Nalaganje podatkov ni uspelo. Ponoven poskus čez {count} sekund…", + "loadingData": "Nalaganje podatkov…" + }, + "delete": { + "cancel": "Prekliči", + "delete": "Izbriši" } -} \ No newline at end of file +} From 515123337895df003253dffd94e1957e6ae7fa3d Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sun, 27 Mar 2022 19:44:22 +0200 Subject: [PATCH 7/7] Translation sync --- assets/tagRenderings/questions.json | 63 +++++++++++++------- assets/themes/buurtnatuur/buurtnatuur.json | 4 +- assets/themes/campersite/campersite.json | 4 +- assets/themes/uk_addresses/uk_addresses.json | 23 +++++-- langs/de.json | 2 +- langs/shared-questions/sl.json | 46 +++++++------- langs/sl.json | 36 +++++------ 7 files changed, 107 insertions(+), 71 deletions(-) diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 28027eb09..00b8ea143 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -80,7 +80,8 @@ "eo": "Kio estas la telefonnumero de {title()}?", "hu": "Mi a telefonszáma ennek: {title()}?", "ca": "Quin és el telèfon de {title()}?", - "ja": "{title()}の電話番号は？" + "ja": "{title()}の電話番号は？", + "sl": "Kakšno telefonsko številko ima {title()}?" }, "render": "{phone}", "mappings": [ @@ -168,7 +169,8 @@ "eo": "Kio estas la retpoŝta adreso de {title()}?", "hu": "Mi a(z) {title()} e-mail címe?", "ca": "Quina és l'adreça de correu electrònic de {title()}?", - "ja": "{title()}のEメールアドレスは何ですか？" + "ja": "{title()}のEメールアドレスは何ですか？", + "sl": "Kakšen naslov elektronske pošte ima {title()}?" }, "mappings": [ { @@ -352,7 +354,8 @@ "zh_Hant": "這間商業空間是否允許犬隻？", "ru": "Впускают ли собак в это здание?", "pl": "Czy w tej firmie psy są dozwolone?", - "ja": "犬を飼うことができますか？" + "ja": "犬を飼うことができますか？", + "sl": "Ali so v tem podjetju dovoljeni psi?" }, "mappings": [ { @@ -374,7 +377,8 @@ "id": "Anjing diperbolehkan", "pl": "Psy dozwolone", "ja": "ペット同伴可能", - "es": "Se permiten perros" + "es": "Se permiten perros", + "sl": "Psi so dovoljeni" } }, { @@ -396,7 +400,8 @@ "ru": "С собаками не впускают", "id": "Anjing tidak diperbolehkan", "ja": "ペット同伴不可", - "es": "No se permiten perros" + "es": "No se permiten perros", + "sl": "Psi niso dovoljeni" } }, { @@ -416,7 +421,8 @@ "ru": "Собак впускают, но на поводке", "id": "Anjing diperbolehkan, tetapi mereka harus diikat", "pl": "Psy dozwolone, ale muszą być na smyczy", - "ja": "ペット同伴可能。ただしリード着用" + "ja": "ペット同伴可能。ただしリード着用", + "sl": "Psi so dovoljeni, vendar morajo biti na povodcu" } }, { @@ -435,7 +441,8 @@ "zh_Hant": "允許犬隻而且可以自由跑動", "ru": "Собак свободно впускают", "pl": "Psy dozwolone i mogą biegać bez ograniczeń", - "ja": "犬同伴可能、自由に走り回れる" + "ja": "犬同伴可能、自由に走り回れる", + "sl": "Psi so dovoljeni in lahko prosto tekajo naokoli" } } ] @@ -458,7 +465,8 @@ "sv": "Finns det fortfarande någonting relevant som du inte kunde ge i de föregående frågorna? Lägg till det här.
Repetera inte redan angivna fakta", "id": "Apakah masih ada sesuatu yang relevan yang tidak dapat Anda berikan dalam pertanyaan sebelumnya? Tambahkan di sini.
Jangan ulangi fakta yang sudah dinyatakan ", "ja": "前の質問で伝えきれなかった関連事項がまだありますか？ここに追加してください。
今後表示しない", - "es": "¿Aún hay algo relevante que no ha encajado en las preguntas anteriores? Compártalo aquí.
No repita datos ya expresados" + "es": "¿Aún hay algo relevante que no ha encajado en las preguntas anteriores? Compártalo aquí.
No repita datos ya expresados", + "sl": "Ali je še kaj pomembnega, česar niste mogli povedati v prejšnjih vprašanjih? Dopišite tukaj.
Ne ponavljajte že navedenih dejstev" }, "render": "{description}", "freeform": { @@ -481,7 +489,8 @@ "pt": "Qual é o horário de funcionamento de {title()}?", "hu": "Mikor van nyitva ez: {title()}?", "ca": "Quin és l'horari d'obertura de {title()}?", - "ja": "{title()}の営業時間は？" + "ja": "{title()}の営業時間は？", + "sl": "Kakšen odpiralni čas ima {title()}?" }, "render": { "de": "

Öffnungszeiten

{opening_hours_table(opening_hours)}", @@ -499,7 +508,8 @@ "eo": "

Malfermitaj horoj

{opening_hours_table(opening_hours)}", "hu": "

Nyitva tartás

{opening_hours_table(opening_hours)}", "ca": "

Horari d'obertura

{opening_hours_table(opening_hours)}", - "ja": "

営業時間

{opening_hours_table(opening_hours)}" + "ja": "

営業時間

{opening_hours_table(opening_hours)}", + "sl": "

Odpiralni čas

{opening_hours_table(opening_hours)}" }, "freeform": { "key": "opening_hours", @@ -605,7 +615,8 @@ "zh_Hant": "這邊接受那種付款方式？", "pl": "Jakie metody płatności są tutaj dostępne?", "ru": "Какие способы оплаты здесь принимают?", - "ja": "どのような支払い方法が可能ですか？" + "ja": "どのような支払い方法が可能ですか？", + "sl": "Kateri načini plačila so možni tu?" }, "multiAnswer": true, "mappings": [ @@ -629,7 +640,8 @@ "zh_Hant": "這邊接受現金", "pl": "Płatność gotówkowa jest tutaj dostępna", "ru": "Здесь принимают наличными", - "ja": "現金利用可能" + "ja": "現金利用可能", + "sl": "Tu sprejemajo gotovino" } }, { @@ -652,7 +664,8 @@ "zh_Hant": "這邊接受現金卡", "pl": "Płatność kartą jest tutaj dostępna", "ru": "Здесь принимают банковские карты", - "ja": "お支払いはこちらで承ります" + "ja": "お支払いはこちらで承ります", + "sl": "Tukaj sprejemajo plačilne kartice" } } ] @@ -671,7 +684,8 @@ "hu": "Fizetés erre a célra szolgáló alkalmazással", "zh_Hant": "使用專用應用程式付款", "de": "Die Bezahlung erfolgt über eine spezielle App", - "fr": "Paiement via une application" + "fr": "Paiement via une application", + "sl": "Plačilo se opravi z namensko aplikacijo" } }, { @@ -684,7 +698,8 @@ "hu": "Fizetési tagsági kártyával", "zh_Hant": "使用會員卡付款", "de": "Die Bezahlung erfolgt mit einer Mitgliedskarte", - "fr": "Paiement via une carte de membre" + "fr": "Paiement via une carte de membre", + "sl": "Plačilo se izvede s člansko izkaznico" } } ] @@ -732,7 +747,8 @@ "hu": "A(z) {level}. emeleten", "it": "Si trova al piano numero {level}", "ca": "Situat a la planta {level}", - "ja": "{level}階にあります" + "ja": "{level}階にあります", + "sl": "Nahaja se v {level}. nadstropju" }, "freeform": { "key": "level", @@ -756,7 +772,8 @@ "it": "Si trova sotto il livello stradale", "nb_NO": "Under bakken", "ca": "Situat a planta subterrani", - "ja": "地下にあります" + "ja": "地下にあります", + "sl": "Nahaja se pod zemljo" }, "hideInAnswer": true }, @@ -778,7 +795,8 @@ "it": "Si trova al pianoterra", "nb_NO": "På gateplan", "ca": "Situat a planta zero", - "ja": "1階にあります" + "ja": "1階にあります", + "sl": "Nahaja se v pritličju" } }, { @@ -800,7 +818,8 @@ "it": "Si trova al pianoterra", "nb_NO": "På gateplan", "ca": "Situat a planta zero", - "ja": "1階にあります" + "ja": "1階にあります", + "sl": "Nahaja se v pritličju" } }, { @@ -822,7 +841,8 @@ "it": "Si trova al primo piano", "nb_NO": "I andre etasje", "ca": "Situat a primera planta", - "ja": "1階にあります" + "ja": "1階にあります", + "sl": "Nahaja se v prvem nadstropju" } }, { @@ -833,7 +853,8 @@ "zh_Hant": "位於地下一樓", "de": "Ist im 1. Untergeschoss", "hu": "Az első alagsori szinten", - "fr": "Sous-sol" + "fr": "Sous-sol", + "sl": "Nahaja se v prvi kletni etaži" } } ] diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json index 705397547..d6d16daca 100644 --- a/assets/themes/buurtnatuur/buurtnatuur.json +++ b/assets/themes/buurtnatuur/buurtnatuur.json @@ -538,7 +538,9 @@ ] }, "then": "Beheer door een privépersoon", - "addExtraTags": ["operator="] + "addExtraTags": [ + "operator=" + ] } ], "condition": { diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json index fedd61276..e7c6fc25c 100644 --- a/assets/themes/campersite/campersite.json +++ b/assets/themes/campersite/campersite.json @@ -200,7 +200,9 @@ "pt_BR": "Pode ser usado de graça", "de": "Nutzung kostenlos" }, - "addExtraTags": ["charge="] + "addExtraTags": [ + "charge=" + ] } ] }, diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index e09a24ae0..75a10030c 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -258,7 +258,9 @@ { "if": "not:addr:unit=yes", "then": "There is no sub-unit within this address", - "addExtraTags": ["addr:unit="] + "addExtraTags": [ + "addr:unit=" + ] }, { "if": "addr:unit=", @@ -332,7 +334,9 @@ "nl": "Dit gebouw heeft geen huisnummer", "de": "Dieses Gebäude hat keine Hausnummer" }, - "addExtraTags": [ "addr:housenumber="] + "addExtraTags": [ + "addr:housenumber=" + ] }, { "if": { @@ -368,8 +372,11 @@ "then": { "en": "No extra place name is given or needed" }, - "addExtraTags": ["addr:substreet="] - },{ + "addExtraTags": [ + "addr:substreet=" + ] + }, + { "if": "addr:substreet=", "then": { "en": "
Place (e.g. \"Castle Mews\", \"West Business Park\")
" @@ -399,7 +406,9 @@ "then": { "en": "No extra place name is given or needed" }, - "addExtraTags": ["addr:substreet="] + "addExtraTags": [ + "addr:substreet=" + ] }, { "if": "addr:substreet=", @@ -473,7 +482,9 @@ { "if": "not:addr:parentstreet=yes", "then": "No parent street name is needed within this address", - "addExtraTags": ["addr:parentstreet="] + "addExtraTags": [ + "addr:parentstreet=" + ] }, { "if": "addr:parentstreet:={_closest_street:0:name}", diff --git a/langs/de.json b/langs/de.json index 3f8ec0baf..d6dc6f7a3 100644 --- a/langs/de.json +++ b/langs/de.json @@ -292,4 +292,4 @@ "split": "Teilen", "splitTitle": "Wählen Sie auf der Karte aus, wo die Straße geteilt werden soll" } -} +} \ No newline at end of file diff --git a/langs/shared-questions/sl.json b/langs/shared-questions/sl.json index a1c81cc94..6f9ad2e62 100644 --- a/langs/shared-questions/sl.json +++ b/langs/shared-questions/sl.json @@ -1,41 +1,30 @@ { "shared_questions": { + "description": { + "question": "Ali je še kaj pomembnega, česar niste mogli povedati v prejšnjih vprašanjih? Dopišite tukaj.
Ne ponavljajte že navedenih dejstev" + }, "dog-access": { "mappings": { - "2": { - "then": "Psi so dovoljeni, vendar morajo biti na povodcu" - }, "0": { "then": "Psi so dovoljeni" }, "1": { "then": "Psi niso dovoljeni" }, + "2": { + "then": "Psi so dovoljeni, vendar morajo biti na povodcu" + }, "3": { "then": "Psi so dovoljeni in lahko prosto tekajo naokoli" } }, "question": "Ali so v tem podjetju dovoljeni psi?" }, - "description": { - "question": "Ali je še kaj pomembnega, česar niste mogli povedati v prejšnjih vprašanjih? Dopišite tukaj.
Ne ponavljajte že navedenih dejstev" - }, - "payment-options": { - "mappings": { - "1": { - "then": "Tukaj sprejemajo plačilne kartice" - }, - "0": { - "then": "Tu sprejemajo gotovino" - } - }, - "question": "Kateri načini plačila so možni tu?" + "email": { + "question": "Kakšen naslov elektronske pošte ima {title()}?" }, "level": { "mappings": { - "4": { - "then": "Nahaja se v prvi kletni etaži" - }, "0": { "then": "Nahaja se pod zemljo" }, @@ -47,17 +36,28 @@ }, "3": { "then": "Nahaja se v prvem nadstropju" + }, + "4": { + "then": "Nahaja se v prvi kletni etaži" } }, "render": "Nahaja se v {level}. nadstropju" }, - "email": { - "question": "Kakšen naslov elektronske pošte ima {title()}?" - }, "opening_hours": { "question": "Kakšen odpiralni čas ima {title()}?", "render": "

Odpiralni čas

{opening_hours_table(opening_hours)}" }, + "payment-options": { + "mappings": { + "0": { + "then": "Tu sprejemajo gotovino" + }, + "1": { + "then": "Tukaj sprejemajo plačilne kartice" + } + }, + "question": "Kateri načini plačila so možni tu?" + }, "payment-options-advanced": { "override": { "mappings+": { @@ -74,4 +74,4 @@ "question": "Kakšno telefonsko številko ima {title()}?" } } -} +} \ No newline at end of file diff --git a/langs/sl.json b/langs/sl.json index 56d9b1c41..3a5fc5c9f 100644 --- a/langs/sl.json +++ b/langs/sl.json @@ -1,10 +1,26 @@ { + "centerMessage": { + "loadingData": "Nalaganje podatkov…", + "retrying": "Nalaganje podatkov ni uspelo. Ponoven poskus čez {count} sekund…" + }, + "delete": { + "cancel": "Prekliči", + "delete": "Izbriši" + }, "general": { "back": "Nazaj", "cancel": "Prekliči", "confirm": "Potrdi", "pickLanguage": "Izberite jezik: ", + "save": "Shrani", + "search": { + "error": "Nekaj se je zalomilo…", + "nothing": "Nič ni bilo najdenega…", + "search": "Poiščite lokacijo", + "searching": "Iskanje…" + }, "skip": "Preskoči to vprašanje", + "skippedQuestions": "Nekatera vprašanja so bila preskočena", "weekdays": { "abbreviations": { "friday": "Pet", @@ -22,15 +38,7 @@ "thursday": "Četrtek", "tuesday": "Torek", "wednesday": "Sreda" - }, - "search": { - "searching": "Iskanje…", - "error": "Nekaj se je zalomilo…", - "nothing": "Nič ni bilo najdenega…", - "search": "Poiščite lokacijo" - }, - "save": "Shrani", - "skippedQuestions": "Nekatera vprašanja so bila preskočena" + } }, "image": { "addPicture": "Dodaj sliko", @@ -42,13 +50,5 @@ "intro": "MapComplete je pregledovalnik in urejevalnik zemljevida OpenStreetMap, ki prikazuje in omogoča urejanje informacij na določeno tematiko.", "pickTheme": "Za začetek spodaj izberite tematiko.", "title": "Dobrodošli na MapComplete" - }, - "centerMessage": { - "retrying": "Nalaganje podatkov ni uspelo. Ponoven poskus čez {count} sekund…", - "loadingData": "Nalaganje podatkov…" - }, - "delete": { - "cancel": "Prekliči", - "delete": "Izbriši" } -} +} \ No newline at end of file