From: Niklas Laxström Date: Mon, 20 Jun 2016 06:16:22 +0000 (+0200) Subject: Localisation updates from https://translatewiki.net. X-Git-Tag: live~4374 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ee1cc2aa5102b3da1cb6780d111fdef01c62a1ec?ds=sidebyside Localisation updates from https://translatewiki.net. --- diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 85c14a0c7..d3955907d 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1072,9 +1072,9 @@ ast: de retirada de datos o pidilo direutamente nel nuesu formulariu en llinia. trademarks_title_html: Marques rexistraes - trademarks_1_html: OpenStreetMap ya'l logotipu de la lente son marques rexistraes - de la Fundación OpenStreetMap. Si tienes entrugues tocante al to usu de les - marques, mándales al grupu + trademarks_1_html: OpenStreetMap ,el logotipu de la lente y Estáu del Mapa son + marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues tocante + al usu de les marques, mándales al grupu de trabayu sobro llicencies. welcome_page: title: ¡Bienveníu! diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 63e1c41d8..57ffe9fac 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -12,6 +12,7 @@ # Author: Kosovastar # Author: Macofe # Author: Meno25 +# Author: Sampablokuper # Author: Shirayuki --- en-GB: @@ -1101,9 +1102,10 @@ en-GB: procedure or file directly at our on-line filing page. trademarks_title_html: Trademarks - trademarks_1_html: OpenStreetMap and the magnifying glass logo are registered - trademarks of the OpenStreetMap Foundation. If you have questions about your - use of the marks, please send your questions to the Licence + trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of the + Map are registered trademarks of the OpenStreetMap Foundation. If you have + questions about your use of the marks, please send your questions to the Licence Working Group. welcome_page: title: Welcome! diff --git a/config/locales/et.yml b/config/locales/et.yml index 289452643..2a33a71cc 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -961,9 +961,9 @@ et: protseduuri poole või otse meie onlain lehele. trademarks_title_html: Kaubamärgid - trademarks_1_html: OpenStreetMap ja suurendusklaasi logo on OpenStreetMap Sihtasutuse - registreeritud kaubamärgid. Kui teil on nende märkide kasutamise kohta küsimusi, - siis saatke küsimused Litsentsi + trademarks_1_html: OpenStreetMap, suurendusklaasi logo ja State of the Map on + OpenStreetMap Sihtasutuse registreeritud kaubamärgid. Kui teil on nende märkide + kasutamise kohta küsimusi, siis saatke küsimused Litsentsi töörühmale. welcome_page: title: Tere tulemast! @@ -1195,6 +1195,14 @@ et: details: Märkuse lisateavet leiad %{url}. changeset_comment_notification: greeting: Tere, + commented: + subject_own: '[OpenStreetMap] %{commenter} on kommenteerinud ühte sinu muutuskogumit' + subject_other: '[OpenStreetMap] %{commenter} on kommenteerinud muutuskogumit, + millest sa oled huvitunud' + your_changeset: '%{commenter} on jätnud kommentaari ühele sinu muutuskogumile, + mis on loodud %{time}' + commented_changeset: '%{commenter} on jätnud kommentaari kaardi muutuskogumile, + mida sa jälgid, mille on loonud %{changeset_author} kuupäeval %{time}' message: inbox: title: Saabunud kirjad diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 3c9f24bb3..0865edcb7 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1100,9 +1100,9 @@ gl: para retirar datos ou deixe unha notificación no noso formulario en liña. trademarks_title_html: Marcas rexistadas - trademarks_1_html: OpenStreetMap e o logotipo coa lupa son marcas rexistadas - da OpenStreetMap Foundation. Se ten algunha pregunta sobre a utilización das - marcas, por favor envée as súas cuestión ó Grupo + trademarks_1_html: OpenStreetMap, o logotipo coa lupa e ''State of the Map'' + son marcas rexistadas da Fundación OpenStreetMap. Se ten algunha pregunta + sobre a utilización das marcas, por favor envée as súas cuestión ó Grupo de Traballo de Licenzas. welcome_page: title: Reciba a nosa benvida! diff --git a/config/locales/it.yml b/config/locales/it.yml index 9faffb313..0026f8b92 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -11,6 +11,7 @@ # Author: Devid Farinelli # Author: Dieterdreist # Author: Efred +# Author: Einreiher # Author: Federico Mugnaini # Author: Frammm # Author: Fringio @@ -1114,10 +1115,10 @@ it: procedura di rimozione per violazione del copyright o segnalacelo direttamente alla nostra pagina di segnalazione on-line. trademarks_title_html: Marchi registrati - trademarks_1_html: OpenStreetMap, il logo con la lente d'ingrandimento e State - of the Map sono marchi registrati della Fondazione OpenStreetMap. Se avete - domande sull'uso dei marchi, inviatele al gruppo - di lavoro per le licenze. + trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e + "State of the Map" sono marchi registrati della Fondazione OpenStreetMap. + Se avete domande sull''uso dei marchi, inviatele al gruppo + di lavoro per le licenze.' welcome_page: title: Benvenuto! introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile. diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 5e8817896..4fbd27899 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1792,7 +1792,7 @@ ko: use external auth: 다른 제3자 로그인 방식 사용하기 auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다. continue: 가입하기 - terms accepted: 새 기여자 약관에 동의하셔서 감사합니다! + terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다! terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 이 위키 문서를 참조하세요. terms: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index e83396453..e71c0db7e 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1091,9 +1091,9 @@ mk: \nза отстранување или поднесете жалба на \nоваа наменска страница." trademarks_title_html: Заштитни знаци - trademarks_1_html: OpenStreetMap и логото со лупа се заштитни знаци на фондацијата - OpenStreetMap. Ако имате прашања во врска со употребата на знаците, пишете - ѝ на Работната + trademarks_1_html: OpenStreetMap, логото со лупа и „State of the Map“ („Состојба + на картата“) се заштитни знаци на задолжбината OpenStreetMap. Ако имате прашања + во врска со употребата на знаците, пишете ѝ на Работната група за лиценци. welcome_page: title: Добре дојдовте! diff --git a/config/locales/oc.yml b/config/locales/oc.yml index c7cbb7ac9..5cce5aeed 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -999,9 +999,8 @@ oc: title: Exemple d'atribucion more_title_html: Per trobar mai d’informacions more_1_html: |- - Se volètz obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la FAQ - legala. + Per obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la FAQ legala. contributors_title_html: Nòstres contributors contributors_fr_html: |- França : conten de donadas de la @@ -1697,16 +1696,16 @@ oc: revoke: administrator: Revocar l'accès administrator moderator: Revocar l'accès moderador - block_history: blòts recebuts - moderator_history: blòts provesits + block_history: Blocatges actius + moderator_history: Blocatges donats comments: Comentaris - create_block: blocar aqueste utilizaire - activate_user: activar aqueste utilizaire - deactivate_user: desactivar aqueste utilizaire + create_block: Blocar aqueste utilizaire + activate_user: Activar aqueste utilizaire + deactivate_user: Desactivar aqueste utilizaire confirm_user: Confirmar aqueste utilizaire - hide_user: amagar aqueste utilizaire - unhide_user: reafichar aqueste utilizaire - delete_user: suprimir aqueste utilizaire + hide_user: Amagar aqueste utilizaire + unhide_user: Reafichar aqueste utilizaire + delete_user: Suprimir aqueste utilizaire confirm: Confirmar friends_changesets: Percórrer totes los gropes de modificacions dels amics friends_diaries: Entradas de jornal dels amics diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f464a317e..29b8df2c7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1127,9 +1127,10 @@ ru: изымания или непосредственно на нашу вебстраницу регистрации. trademarks_title_html: Товарные знаки - trademarks_1_html: OpenStreetMap и логотип с увеличительным стеклом являются - зарегистрированными товарными знаками Фонда OpenStreetMap. Если у вас есть - вопросы об использовании знаков, пожалуйста, отправьте ваши вопросы рабочей + trademarks_1_html: OpenStreetMap, логотип с увеличительным стеклом и State of + the Map являются зарегистрированными товарными знаками Фонда OpenStreetMap. + Если у вас есть вопросы об использовании знаков, пожалуйста, отправьте ваши + вопросы рабочей группе по лицензированию. welcome_page: title: Добро пожаловать! diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7a2533b34..9937563af 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1061,7 +1061,8 @@ zh-TW: infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的撤除程序，或直接在我們的網上申報頁面提出。 trademarks_title_html: 商標 - trademarks_1_html: 開放街圖和放大鏡logo是開放街圖基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到授權條款工作小組 + trademarks_1_html: 開放街圖、放大鏡logo和開放街圖研討會是開放街圖基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到授權條款工作小組 (Licence Working Group)。 welcome_page: title: 歡迎！