From 808b7e419a0391fc2b4b18835f189d66e56a0dac Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 10 Nov 2009 10:49:10 +0000 Subject: [PATCH] Fix various variable referencing problems in translations. --- config/locales/af.yml | 6 +++--- config/locales/be.yml | 3 +-- config/locales/br.yml | 2 +- config/locales/dsb.yml | 4 ++-- config/locales/eo.yml | 1 - config/locales/fr.yml | 2 +- config/locales/fur.yml | 6 +++--- config/locales/hi.yml | 2 +- config/locales/hsb.yml | 6 +++--- config/locales/ia.yml | 4 ++-- config/locales/nl.yml | 8 ++++---- config/locales/no.yml | 6 ------ config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/ru.yml | 6 +++--- config/locales/sl.yml | 6 +++--- config/locales/sv.yml | 2 +- config/locales/zh-CN.yml | 4 ++-- 18 files changed, 32 insertions(+), 40 deletions(-) diff --git a/config/locales/af.yml b/config/locales/af.yml index 6c9be80d7..28fe71635 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -174,7 +174,7 @@ af: tag_details: tags: "Etikette:" way: - download: "{{download_xml_link}} of {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} of {{edit_link}}" download_xml: Laai XML af edit: wysig view_history: besigtig geskiedenis @@ -212,7 +212,7 @@ af: description: Onlangse wysigings diary_entry: diary_comment: - comment_from: Kommentaar van ((link_user)) op ((comment_created_at)) + comment_from: Kommentaar van {{link_user}} op {{comment_created_at}} diary_entry: comment_count: one: 1 reaksie @@ -770,7 +770,7 @@ af: reset_password: confirm password: "Bevestig wagwoord:" flash changed: U wagwoord is verander. - heading: Herstel wagwoord vir {{name}} + heading: Herstel wagwoord vir {{user}} password: "Wagwoord:" reset: Kry nuwe wagwoord title: Herstel wagwoord diff --git a/config/locales/be.yml b/config/locales/be.yml index f5ef000cc..bc79fe842 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -416,7 +416,6 @@ be: subject: "[OpenStreetMap] Збой імпарту GPX" greeting: Прывітанне, success: - loaded_successfully: " |" subject: "[OpenStreetMap] Імпарт GPX мінуў паспяхова" with_description: з апісаннем your_gpx_file: Гэта выглядае як ваш файл GPX @@ -645,7 +644,7 @@ be: title: Няма такога карыстальніка remove_friend: not_a_friend: "{{name}} не з'яўляецца вашым сябрам." - success: "{{name} выдалены са спіса сяброў." + success: "{{name}} выдалены са спіса сяброў." reset_password: flash token bad: Не знайшоў такі ключ, можа, праверце URL? title: скінуць пароль diff --git a/config/locales/br.yml b/config/locales/br.yml index 79609d578..2eebd93d1 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1092,7 +1092,7 @@ br: success: Hizivaet eo ar stankadur. user_role: filter: - already_has_role: Ar roll {{roll}} zo gant an implijer dija. + already_has_role: Ar roll {{role}} zo gant an implijer dija. doesnt_have_role: N'emañ ket ar roll {{role}} gant an implijer. not_a_role: An neudennad « {{role}} » n'eo ket ur roll reizh. not_an_administrator: N'eus nemet ar verourien a c'hall merañ ar rolloù, ha n'oc'h ket ur merour. diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 6011b14c3..cd29054a0 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -317,7 +317,7 @@ dsb: new: title: Nowy zapisk dnjownika no_such_entry: - body: Bóžko njejo zapisk dnjownika abo komentar z ID {{id}. Pšosym pśekontrolěruj pšawopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy. + body: Bóžko njejo zapisk dnjownika abo komentar z ID {{id}}. Pšosym pśekontrolěruj pšawopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy. heading: Žeden zapisk z ID {{id}} title: Zapisk dnjownika njeeksistěrujo no_such_user: @@ -542,7 +542,7 @@ dsb: click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby wobkšuśił změnu. greeting: Witaj, hopefully_you_1: Něchten (naźejucy ty) co swóju e-mailowu adresu pla - hopefully_you_2: "{{server_url}} do {{new_adress}} změniś." + hopefully_you_2: "{{server_url}} do {{new_address}} změniś." friend_notification: had_added_you: "{{user}} jo śi na OpenStreetMap ako pśijaśela pśidał." see_their_profile: Jogo profil jo na {{userurl}} a móžoš jogo teke ako pśijaśela pśidaś, jolic coš. diff --git a/config/locales/eo.yml b/config/locales/eo.yml index dbb6ff8d6..0ca80a3c3 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -431,7 +431,6 @@ eo: no_such_user: body: Bedaŭrinde, ne ekzistas uzanto nomita {{user}}. Bonvolu kontroli la literumadon aŭ la ligon kion vi sekvis. heading: La uzanto {{user}} ne ekzistas - title: La uzanto {{user}} ne ekzistas trace: ago: Antaŭ {{time_in_words_ago}} by: de diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 28381f692..8ea1d1adf 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -135,7 +135,7 @@ fr: way: Voir le chemin sur une carte plus grande loading: Chargement... node: - download: "{{download_xml_link}} ou {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}" download_xml: Télécharger XML edit: modifier node: Point diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 93921402e..ad58e0638 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -117,7 +117,7 @@ fur: relation_details: members: "Membris:" relation_history: - download: "{{count}} ponts" + download: "{{download_xml_link}} o {{view_details_link}}" download_xml: Discjame XML relation_history: Storic relazion relation_history_title: "Storic de relazion: {{relation_name}}" @@ -219,8 +219,8 @@ fur: description: Ultimis vôs par {{language_name}} dai diaris dai utents di OpenStreetMap title: Vôs dai diaris di OpenStreetMap par {{language_name}} user: - description: Ultimis vôs dal diari di OpenStreetMap di {{utent}} - title: Vôs dal diari di OpenStreetMap par {{utent}} + description: Ultimis vôs dal diari di OpenStreetMap di {{user}} + title: Vôs dal diari di OpenStreetMap par {{user}} list: in_language_title: Vôs dai diaris par {{language}} new: Gnove vôs dal diari diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 196b7713f..87a280cda 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -97,7 +97,7 @@ hi: node_history_title: "नोड इतिहास: {{node_name}}" view_details: विवरण देखें not_found: - sorry: क्षमा करें, ये {{type}} इस आईडी {{id }} के साथ, पाया नहीं जा सका + sorry: क्षमा करें, ये {{type}} इस आईडी {{id}} के साथ, पाया नहीं जा सका type: node: आसंधि relation: संबंध diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index dfb053ecd..9bd1f7587 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -190,7 +190,7 @@ hsb: details: Podrobnosće drag_a_box: Ramik na kartu ćahnyć, zo by so wobłuk wubrał edited_by_user_at_timestamp: Wobdźěłany wot wužiwarja [[user]] dnja [[timestamp]] - history_for_feature: Historija za [[funkciju]] + history_for_feature: Historija za [[feature]] load_data: Daty začitać loaded_an_area_with_num_features: Sy wobłuk začitał, kotryž [[num_features]] přiznamjenjow wobsahuje. Powšitkownje někotre wobhladowaki maja problemy ze zwobraznjenju tajkeho mnóstwa datow. Powšitkownje wobhladowaki najlěpje funguja, hdyž mjenje hač 100 přiznamjenjow naraz zwobraznjeja; hewak so wobhladowak spomali abo samo hižo njereaguje. Jeli chceš tute daty woprawdźe zwobraznić, klikń deleka na tłóčatko. loading: Začituje so... @@ -202,7 +202,7 @@ hsb: heading: Objektowa lisćina history: type: - node: Suk [[id] + node: Suk [[id]] way: Puć [[id]] selected: type: @@ -1036,7 +1036,7 @@ hsb: heading: Wobdźěłuje so blokowanje přećiwo {{name}} needs_view: Dyrbi so wužiwar přizjewić, prjedy hač so tute blokowanje zběhnje? period: Kak dołho, wot nětka, wužiwar budźe za API zablokowany. - reason: Přičina, čehoždla ({name}} so blokuje. Prošu budź tak měrny a rozumny kaž móžno a podaj tak wjele podrobnosćow wo situaciji kaž móžno. Wobkedźbuj, zo nic wšitcy wužiwarjo žargon zhromadźenstwa rozumja, spytaj potajkim zapřijeća lajkow wužiwać. + reason: Přičina, čehoždla {{name}} so blokuje. Prošu budź tak měrny a rozumny kaž móžno a podaj tak wjele podrobnosćow wo situaciji kaž móžno. Wobkedźbuj, zo nic wšitcy wužiwarjo žargon zhromadźenstwa rozumja, spytaj potajkim zapřijeća lajkow wužiwać. show: Tute blokowanje pokazać submit: Blokowanje aktualizować title: Wobdźěłuje so blokowanje přećiwo {{name}} diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 60152c703..2718cbe52 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -145,7 +145,7 @@ ia: node_history_title: "Historia del nodo: {{node_name}}" view_details: vider detalios not_found: - sorry: Pardono, le {{typo}} con le ID {{id}} non ha essite trovate. + sorry: Pardono, le {{type}} con le ID {{id}} non ha essite trovate. type: changeset: gruppo de modificationes node: nodo @@ -911,7 +911,7 @@ ia: title: Contrasigno perdite make_friend: already_a_friend: Tu es ja amico de {{name}}. - failed: Pardono, non poteva adder {{nomine}} como amico. + failed: Pardono, non poteva adder {{name}} como amico. success: "{{name}} es ora tu amico." new: confirm email address: "Confirmar adresse de e-mail:" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 1decd8911..45fe0bc3d 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -944,7 +944,7 @@ nl: title: Deze gebruiker bestaat niet remove_friend: not_a_friend: "{{name}} staat niet in uw vriendelijst." - success: "{{name} is verwijderd uit uw vriendenlijst." + success: "{{name}} is verwijderd uit uw vriendenlijst." reset_password: confirm password: "Wachtwoord bevestigen:" flash changed: Uw wachtwoord is gewijzigd. @@ -1104,13 +1104,13 @@ nl: not_a_role: "\"{{role}}\" is geen geldige rol." not_an_administrator: Alleen beheerders kunnen gebruikersrollen beheren. U bent geen beheerder. grant: - are_you_sure: Weet u zeker dat u de rol "{{role}}" aan gebruiker "{{user}}" wilt toekennen? + are_you_sure: Weet u zeker dat u de rol "{{role}}" aan gebruiker "{{name}}" wilt toekennen? confirm: Bevestigen - fail: Het was niet mogelijk de rol "{{role}}" aan gebruiker "{{user}}" toe te kennen. Controleer of de gebruikersnaam en rolnaam correct waren. + fail: Het was niet mogelijk de rol "{{role}}" aan gebruiker "{{name}}" toe te kennen. Controleer of de gebruikersnaam en rolnaam correct waren. heading: Toekennen rechten bevestigen title: Toekennen rechten bevestigen revoke: - are_you_sure: Weet u zeker dat u de rol "{{role}}" van gebruiker "{{user}}" wilt intrekken? + are_you_sure: Weet u zeker dat u de rol "{{role}}" van gebruiker "{{name}}" wilt intrekken? confirm: Bevestigen fail: Het was niet mogelijk de rol "{{role}}" voor gebruiker "{{name}}" in te trekken. Controleer of de gebruikersnaam en rolnaam correct waren. heading: Intrekken rechten bevestigen diff --git a/config/locales/no.yml b/config/locales/no.yml index 418da0582..f023d4938 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -292,9 +292,6 @@ user_title: Dagboken for {{user}} new: title: ny dagboksoppføring - no_such_entry: - heading: " %s har ingen overstyringsoppføring" - title: " %s har ingen overstyringsoppføring" no_such_user: heading: Brukeren {{user}} finnes ikke title: Ingen bruker funnet @@ -531,8 +528,6 @@ index: application: Applikasjonsnavn issued_at: Utstedt - my_apps: Min {{inbox_link}} - my_tokens: Min {{inbox_link}} register_new: Registrer din applikasjon revoke: Tilbakekall! title: Mine OAuth-detaljer @@ -614,7 +609,6 @@ trunk: Hovedvei unclassified: Uklassifisert vei wood: Ved - heading: endret beskyttelsesnivå for «[[$1]]» search: search: Søk submit_text: Gå diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 3882487e6..fbcb27d18 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -609,7 +609,7 @@ pl: title: Nie znaleziono użytkownika remove_friend: not_a_friend: "{{name}} nie był Twoim znajomym." - success: "{{name} został wyłączony z grona Twoich znajomych." + success: "{{name}} został wyłączony z grona Twoich znajomych." reset_password: confirm password: Potwierdź hasło flash changed: Hasło zostało zmienione. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 0c294ae70..63b9bad0a 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -216,7 +216,7 @@ pt-BR: tag_details: tags: "Etiquetas:" way: - download: "{{download_xml_link}} ou {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}" download_xml: Baixar XML edit: editar view_history: ver histórico diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f2f29c802..ada6d0602 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -214,7 +214,7 @@ ru: tag_details: tags: "Метки:" way: - download: "{{download_xml_link}} или {{view_history_link}}" + download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}" download_xml: Скачать XML edit: править view_history: посмотреть историю @@ -1088,7 +1088,7 @@ ru: heading: Отмена блокирования для пользователя {{block_on}}, которое создал {{block_by}} past: Это блокирование закончилось {{time}} назад и уже не может быть отменено. revoke: Снять блокирование! - time_future: Это блокирование закончится {{time}. + time_future: Это блокирование закончится {{time}}. title: Снять блокирование для {{block_on}} show: back: Показать все блокировки @@ -1101,7 +1101,7 @@ ru: revoker: "Разблокировавший:" show: Показывать status: Состояние - time_future: Заканчивается ((время)) + time_future: Заканчивается {{time}} time_past: Закончилась {{time}} назад title: "{{block_on}}, наложил блокировку: {{block_by}}" update: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 767a824ed..70ab615b8 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -226,9 +226,9 @@ sl: description_user: Paketi sprememb uporabnika {{user}} description_user_bbox: Paketi sprememb uporabnika {{user}} znotraj {{bbox}} heading: Paketi sprememb - heading_bbox: Paketi sprememb znotraj področja {{bbox}} - heading_user: Paketi sprememb uporabnika {{user}} - heading_user_bbox: Paketi sprememb uporabnika {{user}} znotraj {{bbox}} + heading_bbox: Paketi sprememb + heading_user: Paketi sprememb + heading_user_bbox: Paketi sprememb title: Paketi sprememb title_bbox: Paketi sprememb znotraj področja {{bbox}} title_user: Paketi sprememb uporabnika {{user}} diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 6daca1a12..02466eb7d 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -283,7 +283,7 @@ sv: heading: "Ingen dagboksanteckning med id: {{id}}" title: Ingen sådan dagboksanteckning no_such_user: - body: Det finns ingen användare med namnet {user}}. Kontrollera din stavning, eller kanske det är länken du klickade på som är fel. + body: Det finns ingen användare med namnet {{user}}. Kontrollera din stavning, eller kanske det är länken du klickade på som är fel. heading: Användaren {{user}} finns inte title: Ingen sådan användare view: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 58df623ba..09bc53176 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -262,7 +262,7 @@ zh-CN: uk_postcode: 结果 从 NPEMap / FreeThe Postcode us_postcode: 结果 从 Geocoder.us layouts: - donate: 通过下面的link到Hardware Upgrade Fund来支持。 + donate: 通过下面的{{link}}到Hardware Upgrade Fund来支持。 donate_link_text: 捐款 edit: 编辑 edit_tooltip: 编辑地图 @@ -362,7 +362,7 @@ zh-CN: gpx_notification: greeting: 您好， message_notification: - footer1: 您可以在{{replyurl}}阅读这条消息 + footer1: 您可以在{{readurl}}阅读这条消息 footer2: 并且您可以在{{replyurl}}回复 header: "{{from_user}}已经通过OpenStreetMap向您发送标题为{{subject}}的消息:" hi: 您好{{to_user}}, -- 2.43.2