Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 8fd0139a21ea343a645bde7cbfcdce90b79a8ea4..547a0d3ce7073392be372f34d16cf2c8f67bb808 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1853,7 +1853,6 @@ af:
       my edits: My Redigerings
       my traces: My Spore
       my settings: My Instellings
       my edits: My Redigerings
       my traces: My Spore
       my settings: My Instellings

-      oauth settings: Oauth-instellings

       blocks on me: Versperrings vir u
       blocks by me: Versperrings deur u
       send message: Stuur boodskap
       blocks on me: Versperrings vir u
       blocks by me: Versperrings deur u
       send message: Stuur boodskap

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 11da44d971bee7c1bfbf76cfcce2b6a76b371e52..fa0844d04027af5ca612ebca9593c4b19ca251c6 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1143,7 +1143,6 @@ aln:
       my edits: ndryshimet e mia
       my traces: gjurmët e mia
       my settings: preferencat e mia
       my edits: ndryshimet e mia
       my traces: gjurmët e mia
       my settings: preferencat e mia

-      oauth settings: ndrryshimet per autorizim

       blocks on me: bllokimet e mia
       blocks by me: bllokimet e dhana nga un
       send message: dërgo mesazh
       blocks on me: bllokimet e mia
       blocks by me: bllokimet e dhana nga un
       send message: dërgo mesazh

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4a1bfca1dc6b9519be334270778bedd5f06b6f86..f6b4b725bb4de83eb0cd6defb65fe28245ed319b 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1389,10 +1389,6 @@ ar:
       reconfirm_html: إذا كنت في حاجة لإعادة إرسال تأكيد البريد الإلكتروني، <a href="%{reconfirm}">انقر
         هنا</a>.
     confirm_resend:
       reconfirm_html: إذا كنت في حاجة لإعادة إرسال تأكيد البريد الإلكتروني، <a href="%{reconfirm}">انقر
         هنا</a>.
     confirm_resend:

-      success_html: لقد أرسلنا رسالة تأكيد جديدة إلى %{email} وبمجرد تأكيد حسابك ستتمكن
-        من رسم الخرائط.<br /><br />إذا كنت تستخدم نظاما مضادا للبريد العشوائي يرسل
-        طلبات تأكيد، فيُرجَى التأكد من أنك وضعت في القائمة البيضاء %{sender} لأننا
-        غير قادرين على الرد على أي طلبات تأكيد.

       failure: المستخدم %{name} غير موجود.
     confirm_email:
       heading: أكد تغيير عنوان البريد الإلكتروني
       failure: المستخدم %{name} غير موجود.
     confirm_email:
       heading: أكد تغيير عنوان البريد الإلكتروني


@@ -2179,9 +2175,6 @@ ar:
         إضافية أو الخادم قد لا تزال تحتاج إلى واحدة.
       continue: أنشئ حسابا
       terms accepted: نشكرك على قبول شروط المساهم الجديدة!
         إضافية أو الخادم قد لا تزال تحتاج إلى واحدة.
       continue: أنشئ حسابا
       terms accepted: نشكرك على قبول شروط المساهم الجديدة!

-      terms declined: نحن نأسف أن كنت قد قررت عدم قبول شروط المساهمة الجديدة، لمزيد
-        من المعلومات; يُرجَى الاطلاع على <a href="%{url}">صفحة الويكي هذه</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: شروط
       heading: شروط
     terms:
       title: شروط
       heading: شروط


@@ -2211,6 +2204,10 @@ ar:
         france: فرنسا
         italy: إيطاليا
         rest_of_world: بقية العالم
         france: فرنسا
         italy: إيطاليا
         rest_of_world: بقية العالم

+    terms_declined_flash:
+      terms_declined_html: نحن نأسف أن كنت قد قررت عدم قبول شروط المساهمة الجديدة،
+        لمزيد من المعلومات; يُرجَى الاطلاع على <a href="%{url}">صفحة الويكي هذه</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: لا يوجد مستخدم كهذا
       heading: المستخدم %{user} غير موجود
     no_such_user:
       title: لا يوجد مستخدم كهذا
       heading: المستخدم %{user} غير موجود


@@ -2227,7 +2224,6 @@ ar:
       my profile: ملفي الشخصي
       my settings: إعداداتي
       my comments: تعليقاتي
       my profile: ملفي الشخصي
       my settings: إعداداتي
       my comments: تعليقاتي

-      oauth settings: "\uFEFFإعدادات oauth"

       blocks on me: عمليات منعي
       blocks by me: عمليات المنع بواسطتي
       send message: إرسل رسالة
       blocks on me: عمليات منعي
       blocks by me: عمليات المنع بواسطتي
       send message: إرسل رسالة

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 3afd57b0f5a1971643df86289190e377dfdecc01..ea76984b63dcfd56c9e35d3995f5743fb364e357 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1317,11 +1317,6 @@ ast:
       reconfirm_html: Si necesites que volvamos a unviate'l corréu de confirmación,
         <a href="%{reconfirm}">calca equí</a>.
     confirm_resend:
       reconfirm_html: Si necesites que volvamos a unviate'l corréu de confirmación,
         <a href="%{reconfirm}">calca equí</a>.
     confirm_resend:

-      success_html: Venimos d'unviar un nuevu corréu de confirmación a %{email} y
-        darréu de confirmar la to cuenta tarás preparáu pa mapear. <br /><br />Si
-        uses un sistema escontra'l corréu puxarra qu'unvia solicitúes de confirmación,
-        asegúrate d'amestar %{sender} na llista blanca de remitentes seguros, porque
-        nós nun podemos responder solicitúes de confirmación.

       failure: Nun s'alcontró l'usuariu %{name}.
     confirm_email:
       heading: Confirmar el cambiu de direición de corréu electrónicu
       failure: Nun s'alcontró l'usuariu %{name}.
     confirm_email:
       heading: Confirmar el cambiu de direición de corréu electrónicu


@@ -2110,9 +2105,6 @@ ast:
         pero delles ferramientes estra o sirvidores inda puen necesitala.
       continue: Date d'alta
       terms accepted: ¡Gracies por aceutar les condiciones de collaboración!
         pero delles ferramientes estra o sirvidores inda puen necesitala.
       continue: Date d'alta
       terms accepted: ¡Gracies por aceutar les condiciones de collaboración!

-      terms declined: Sentimos que decidieras nun aceutar les Condiciones de Collaborador.
-        Pa más información llei <a href="%{url}">esta páxina wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Condiciones
       heading: Condiciones
     terms:
       title: Condiciones
       heading: Condiciones


@@ -2141,6 +2133,10 @@ ast:
         france: Francia
         italy: Italia
         rest_of_world: Restu del mundu
         france: Francia
         italy: Italia
         rest_of_world: Restu del mundu

+    terms_declined_flash:
+      terms_declined_html: Sentimos que decidieras nun aceutar les Condiciones de
+        Collaborador. Pa más información llei <a href="%{url}">esta páxina wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nun esiste l'usuariu
       heading: L'usuariu %{user} nun esiste
     no_such_user:
       title: Nun esiste l'usuariu
       heading: L'usuariu %{user} nun esiste


@@ -2157,7 +2153,6 @@ ast:
       my profile: El mio perfil
       my settings: Les mios preferencies
       my comments: Los mios comentarios
       my profile: El mio perfil
       my settings: Les mios preferencies
       my comments: Los mios comentarios

-      oauth settings: configuración OAuth

       blocks on me: Bloqueos recibíos
       blocks by me: Bloqueos puestos
       send message: Unviar mensaxe
       blocks on me: Bloqueos recibíos
       blocks by me: Bloqueos puestos
       send message: Unviar mensaxe

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 9072ae302c72c59ae61a6dee6ebccb05de91f81f..94bbb72a36e4b1c887ce48c800c56ac139864316 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -909,12 +909,6 @@ be-Tarask:
       already active: Гэты рахунак ужо пацьверджаны.
       unknown token: Гэты код пацьверджаньня скончыўся альбо не існуе.
     confirm_resend:
       already active: Гэты рахунак ужо пацьверджаны.
       unknown token: Гэты код пацьверджаньня скончыўся альбо не існуе.
     confirm_resend:

-      success_html: Мы даслалі новы ліст з пацьверджаньнем на адрас %{email} і, як
-        толькі Вы пацьвердзіце Ваш рахунак, Вы зможаце пачаць працаваць з мапамі.<br
-        /><br />Калі Вы карыстаецеся сыстэмай абароны ад спаму, якая дасылае запыты
-        на пацьверджаньне, калі ласка, упэўніцеся, што адрас %{sender} знаходзіцца
-        ў Вашым давераным сьпісе, таму што мы ня маем магчымасьці адказваць на любыя
-        запыты.

       failure: Удзельнік %{name} ня знойдзены.
     confirm_email:
       heading: Пацьвердзіць зьмену адрасу электроннай пошты
       failure: Удзельнік %{name} ня знойдзены.
     confirm_email:
       heading: Пацьвердзіць зьмену адрасу электроннай пошты


@@ -1397,9 +1391,6 @@ be-Tarask:
         яго потым ў Вашых наладах.
       continue: Зарэгістравацца
       terms accepted: Дзякуй за тое, што прынялі новыя ўмовы супрацоўніцтва!
         яго потым ў Вашых наладах.
       continue: Зарэгістравацца
       terms accepted: Дзякуй за тое, што прынялі новыя ўмовы супрацоўніцтва!

-      terms declined: Нам шкада, што Вы вырашылі не прыняць новыя ўмовы супрацоўніцтва.
-        Для атрыманьня дадатковай інфармацыі, калі ласка, глядзіце <a href="%{url}">гэтую
-        вікі-старонку</a>.

     terms:
       title: Умовы
       heading: Умовы
     terms:
       title: Умовы
       heading: Умовы


@@ -1416,6 +1407,10 @@ be-Tarask:
         france: Францыя
         italy: Італія
         rest_of_world: Астатні сьвет
         france: Францыя
         italy: Італія
         rest_of_world: Астатні сьвет

+    terms_declined_flash:
+      terms_declined_html: Нам шкада, што Вы вырашылі не прыняць новыя ўмовы супрацоўніцтва.
+        Для атрыманьня дадатковай інфармацыі, калі ласка, глядзіце <a href="%{url}">гэтую
+        вікі-старонку</a>.

     no_such_user:
       title: Няма такога карыстальніка
       heading: Удзельнік %{user} не існуе
     no_such_user:
       title: Няма такога карыстальніка
       heading: Удзельнік %{user} не існуе


@@ -1427,7 +1422,6 @@ be-Tarask:
       my edits: Мае рэдагаваньні
       my traces: Мае трэкі
       my settings: Мае налады
       my edits: Мае рэдагаваньні
       my traces: Мае трэкі
       my settings: Мае налады

-      oauth settings: налады OAuth

       blocks on me: Атрыманыя блякаваньні
       blocks by me: Заблякаваныя мной
       send message: Адаслаць паведамленьне
       blocks on me: Атрыманыя блякаваньні
       blocks by me: Заблякаваныя мной
       send message: Адаслаць паведамленьне

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 4a9816cf1f6be581862686d0e4b523fb2bf713dd..7c284346a8ae4a49313db4e1c6c5181c97df9709 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1340,11 +1340,6 @@ be:
       reconfirm_html: Калі вам трэба зноў даслаць пацверджанне па электроннай пошце,
         <a href="%{reconfirm}"><a href="%{пацвердзіць}">націсніце тут</a>.
     confirm_resend:
       reconfirm_html: Калі вам трэба зноў даслаць пацверджанне па электроннай пошце,
         <a href="%{reconfirm}"><a href="%{пацвердзіць}">націсніце тут</a>.
     confirm_resend:

-      success_html: Мы даслалі новы ліст з пацверджаннем на адрас %{email} і, як толькі
-        Вы пацвердзіце Ваш рахунак, Вы зможаце пачаць працаваць з картай.<br /><br
-        />Калі Вы карыстаецеся сістэмай абароны ад спаму, якая дасылае запыты на пацверджанне,
-        калі ласка, упэўніцеся, што адрас %{sender} знаходзіцца ў Вашым давераным
-        спісе, таму што мы не маем магчымасці адказваць на любыя запыты.

       failure: Карыстальнік %{name} не знойдзены.
     confirm_email:
       heading: Пацвердзіць змену паштовага адраса
       failure: Карыстальнік %{name} не знойдзены.
     confirm_email:
       heading: Пацвердзіць змену паштовага адраса


@@ -2138,10 +2133,6 @@ be:
         але для некаторых дадатковых інструментаў або сервераў ён усё яшчэ спатрэбіцца.
       continue: Зарэгістравацца
       terms accepted: Дзякуй за прыняцце новых умоў ўдзелу!
         але для некаторых дадатковых інструментаў або сервераў ён усё яшчэ спатрэбіцца.
       continue: Зарэгістравацца
       terms accepted: Дзякуй за прыняцце новых умоў ўдзелу!

-      terms declined: Нам шкада, што Вы вырашылі не прыняць новыя ўмовы супрацоўніцтва.
-        Для атрыманьня дадатковай інфармацыі, калі ласка, глядзіце <a href="%{url}">гэтую
-        вікі-старонку</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Умовы
       heading: Умовы
     terms:
       title: Умовы
       heading: Умовы


@@ -2171,6 +2162,11 @@ be:
         france: Францыя
         italy: Італія
         rest_of_world: Астатні свет
         france: Францыя
         italy: Італія
         rest_of_world: Астатні свет

+    terms_declined_flash:
+      terms_declined_html: Нам шкада, што Вы вырашылі не прыняць новыя ўмовы супрацоўніцтва.
+        Для атрыманьня дадатковай інфармацыі, калі ласка, глядзіце <a href="%{url}">гэтую
+        вікі-старонку</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Няма такога карыстальніка
       heading: Карыстальнік %{user} не існуе
     no_such_user:
       title: Няма такога карыстальніка
       heading: Карыстальнік %{user} не існуе


@@ -2187,7 +2183,6 @@ be:
       my profile: Мой профіль
       my settings: Мае настройкі
       my comments: Мае каментары
       my profile: Мой профіль
       my settings: Мае настройкі
       my comments: Мае каментары

-      oauth settings: налады OAuth

       blocks on me: Мае блакіроўкі
       blocks by me: Заблакавана мною
       send message: Адаслаць паведамленне
       blocks on me: Мае блакіроўкі
       blocks by me: Заблакавана мною
       send message: Адаслаць паведамленне

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index f0f874c22fd781c2eaffa0fad5d0ce857f1b5d4b..c7ee017c2287dc728896891cc692c61dee46edd9 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1733,7 +1733,6 @@ bg:
       use external auth: Или използвайте удостоверяване от външен източник
       continue: Регистриране
       terms accepted: Благодарим Ви, че приемате новите условия за сътрудничество!
       use external auth: Или използвайте удостоверяване от външен източник
       continue: Регистриране
       terms accepted: Благодарим Ви, че приемате новите условия за сътрудничество!

-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Условия
       heading: Условия
     terms:
       title: Условия
       heading: Условия


@@ -1750,6 +1749,8 @@ bg:
         france: Франция
         italy: Италия
         rest_of_world: В останалата част на света
         france: Франция
         italy: Италия
         rest_of_world: В останалата част на света

+    terms_declined_flash:
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Няма такъв потребител
       heading: Потребителят %{user} не съществува
     no_such_user:
       title: Няма такъв потребител
       heading: Потребителят %{user} не съществува


@@ -1764,7 +1765,6 @@ bg:
       my profile: Профил
       my settings: Настройки
       my comments: Моите коментари
       my profile: Профил
       my settings: Настройки
       my comments: Моите коментари

-      oauth settings: Настройки на OAuth

       blocks on me: Блокирани от мен
       blocks by me: Блокирани от мен
       send message: Изпратете съобщение
       blocks on me: Блокирани от мен
       blocks by me: Блокирани от мен
       send message: Изпратете съобщение

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index b955387f05beb2551b547935241d8d22554e265b..4a255e3770151fd11a6e758bd63750621b9b9c8e 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1569,7 +1569,6 @@ bn:
       my profile: আমার প্রোফাইল
       my settings: আমার সেটিংস
       my comments: আমার মন্তব্যসমূহ
       my profile: আমার প্রোফাইল
       my settings: আমার সেটিংস
       my comments: আমার মন্তব্যসমূহ

-      oauth settings: OAuth সেটিংস

       send message: বার্তা পাঠান
       diary: দিনলিপি
       edits: সম্পাদনাসমূহ
       send message: বার্তা পাঠান
       diary: দিনলিপি
       edits: সম্পাদনাসমূহ

diff --git a/config/locales/br.yml b/config/locales/br.yml
index d4016023e5b265424a586ad973f3c630d9754005..6b5ab00ba49a905af19c6f18d96d7bd88eab815c 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1372,10 +1372,6 @@ br:
       reconfirm_html: M'ho peus ezhomm da adkas ar postel kadarnaat, <a href="%{reconfirm}">klikit
         amañ</a>.
     confirm_resend:
       reconfirm_html: M'ho peus ezhomm da adkas ar postel kadarnaat, <a href="%{reconfirm}">klikit
         amañ</a>.
     confirm_resend:

-      success_html: Kaset hon eus ur postel kadarnaat da %{email}. Kerkent ha kadarnaet
-        ho kont e c'hallot kregiñ da gartennañ.<br /><br />Ma implijit ur reizhiad
-        enep-strob hag a gas goulennoù kadarnaat, lakait %{sender} en ho listenn wenn,
-        mar plij, rak n'omp ket evit respont d'ar posteloù-se.

       failure: N'eo ket bet kavet an implijer %{name}.
     confirm_email:
       heading: Kadarnaat ur c'hemm chomlec'h postel
       failure: N'eo ket bet kavet an implijer %{name}.
     confirm_email:
       heading: Kadarnaat ur c'hemm chomlec'h postel


@@ -2145,10 +2141,6 @@ br:
       continue: En em enskrivañ
       terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar
         c'henlabourer !
       continue: En em enskrivañ
       terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar
         c'henlabourer !

-      terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù
-        ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh <a href="%{url}">ar
-        bajenn wiki-mañ</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Termenoù
       heading: Termenoù
     terms:
       title: Termenoù
       heading: Termenoù


@@ -2172,6 +2164,11 @@ br:
         france: Bro-C'hall
         italy: Italia
         rest_of_world: Peurrest ar bed
         france: Bro-C'hall
         italy: Italia
         rest_of_world: Peurrest ar bed

+    terms_declined_flash:
+      terms_declined_html: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù
+        ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh <a href="%{url}">ar
+        bajenn wiki-mañ</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: N'eus implijer ebet evel hemañ
       heading: N'eus ket eus an implijer %{user}
     no_such_user:
       title: N'eus implijer ebet evel hemañ
       heading: N'eus ket eus an implijer %{user}


@@ -2188,7 +2185,6 @@ br:
       my profile: Ma frofil
       my settings: ma arventennoù
       my comments: ma evezhiadennoù
       my profile: Ma frofil
       my settings: ma arventennoù
       my comments: ma evezhiadennoù

-      oauth settings: arventennoù oauth

       blocks on me: Stankadurioù evidon
       blocks by me: stankadurioù graet ganin
       send message: Kas ur gemennadenn
       blocks on me: Stankadurioù evidon
       blocks by me: stankadurioù graet ganin
       send message: Kas ur gemennadenn

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 2ccb9dc5eaf05effb01723309f52fd1f7d4b6cd9..eb3d0d4a71f4f4a090ef7d8d4dfd53c573ef1308 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -907,10 +907,6 @@ bs:
       already active: Ovaj račun je već potvrđen.
       unknown token: Taj kod za potvrdu je istekao ili ne postoji.
     confirm_resend:
       already active: Ovaj račun je već potvrđen.
       unknown token: Taj kod za potvrdu je istekao ili ne postoji.
     confirm_resend:

-      success_html: Poslali smo novu potvrdu na e-mail %{email} a čim potvrdite svoj
-        račun, moći ćete početi mapirati.<br /><br />Ako koristite antispam sistem
-        koji šalje potvrdu zahtjeva, molimo Vas da provjerite jeli %{sender} na tzv.
-        "bijeloj listi", jer nismo u mogućnosti odgovarati na potvrde zahtjeva.

       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrditi promjenu e-mail adrese.
       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrditi promjenu e-mail adrese.


@@ -1445,8 +1441,6 @@ bs:
         kasnije u postavkama.
       continue: Otvorite račun
       terms accepted: Hvala za prihvatanje novih uslova za doprinosioce!
         kasnije u postavkama.
       continue: Otvorite račun
       terms accepted: Hvala za prihvatanje novih uslova za doprinosioce!

-      terms declined: Žao nam je da ste odlučili ne prihvatiti nove Uslove za doprinosioce.
-        Za više informacije, molimo pogledajte <a href="%{url}">ovu wiki stranicu</a>.

     terms:
       title: Uslovi za doprinosioce
       heading: Uslovi za doprinosioce
     terms:
       title: Uslovi za doprinosioce
       heading: Uslovi za doprinosioce


@@ -1463,6 +1457,10 @@ bs:
         france: Francuska
         italy: Italija
         rest_of_world: Ostatak svijeta
         france: Francuska
         italy: Italija
         rest_of_world: Ostatak svijeta

+    terms_declined_flash:
+      terms_declined_html: Žao nam je da ste odlučili ne prihvatiti nove Uslove za
+        doprinosioce. Za više informacije, molimo pogledajte <a href="%{url}">ovu
+        wiki stranicu</a>.

     no_such_user:
       title: Taj korisnik ne postoji.
       heading: Korisnik %{user} ne postoji
     no_such_user:
       title: Taj korisnik ne postoji.
       heading: Korisnik %{user} ne postoji


@@ -1476,7 +1474,6 @@ bs:
       my profile: Moj profil
       my settings: Moja podešavanja
       my comments: Moji komentari
       my profile: Moj profil
       my settings: Moja podešavanja
       my comments: Moji komentari

-      oauth settings: Oauth podešavanja

       blocks on me: Blokade na mene
       blocks by me: Blokade koje sam postavio/la
       send message: Poslati poruku
       blocks on me: Blokade na mene
       blocks by me: Blokade koje sam postavio/la
       send message: Poslati poruku

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index b5e1eaace0eaac4022ef20ac81dbf85b2d366ace..4b41eba5b9effecb9da7f2b678ec0e29ff556926 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1604,11 +1604,6 @@ ca:
       reconfirm_html: Si necessites que et reenviem el correu de confirmació, <a href="%{reconfirm}">clica
         aquí</a>.
     confirm_resend:
       reconfirm_html: Si necessites que et reenviem el correu de confirmació, <a href="%{reconfirm}">clica
         aquí</a>.
     confirm_resend:

-      success_html: Hem enviat un bitllet de confirmació nou per %{email} i tan aviat
-        com confirmeu el vostre compte podreu cartografiar.<br><br>Si utilitzeu un
-        sistema contra el correu brossa que envia les sol·licituds de confirmació,
-        llavors autoritzeu %{sender} ja que no som capaços de respondre les sol·licituds
-        de confirmació.

       failure: L'usuari %{name} no s'ha trobat.
     confirm_email:
       heading: Confirma un canvi d'adreça electrònica
       failure: L'usuari %{name} no s'ha trobat.
     confirm_email:
       heading: Confirma un canvi d'adreça electrònica


@@ -2426,9 +2421,6 @@ ca:
         servidors o eines extres sí que en poden demanar una.
       continue: Registreu-vos-hi
       terms accepted: Gràcies per acceptar els nous termes de col·laboració.
         servidors o eines extres sí que en poden demanar una.
       continue: Registreu-vos-hi
       terms accepted: Gràcies per acceptar els nous termes de col·laboració.

-      terms declined: Heu decidit no acceptar els nous termes de col·laboració. Per
-        a més informació, consulteu <a href="%{url}">aquesta pàgina wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Termes
       heading: Termes
     terms:
       title: Termes
       heading: Termes


@@ -2457,6 +2449,10 @@ ca:
         france: França
         italy: Itàlia
         rest_of_world: Resta del món
         france: França
         italy: Itàlia
         rest_of_world: Resta del món

+    terms_declined_flash:
+      terms_declined_html: Heu decidit no acceptar els nous termes de col·laboració.
+        Per a més informació, consulteu <a href="%{url}">aquesta pàgina wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Aquest usuari no existeix
       heading: L'usuari %{user} no existeix
     no_such_user:
       title: Aquest usuari no existeix
       heading: L'usuari %{user} no existeix


@@ -2473,7 +2469,6 @@ ca:
       my profile: El meu perfil
       my settings: Les meves preferències
       my comments: Els meus comentaris
       my profile: El meu perfil
       my settings: Les meves preferències
       my comments: Els meus comentaris

-      oauth settings: configuració OAuth

       blocks on me: Blocs sobre mi
       blocks by me: Blocs fets per mi
       send message: Envia un missatge
       blocks on me: Blocs sobre mi
       blocks by me: Blocs fets per mi
       send message: Envia un missatge

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 3c31069295c6076f2db508214c5908957779b8fe..b1f3bd31281b18dc3ec042a672ab918e25edd4ba 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -932,7 +932,6 @@ ce:
       my profile: Сан профиль
       my settings: Сан нисдаран гӀирс
       my comments: Сан комменташ
       my profile: Сан профиль
       my settings: Сан нисдаран гӀирс
       my comments: Сан комменташ

-      oauth settings: OAuth нисдаран гӀирс

       blocks on me: Сан блоктохарш
       send message: ДӀабахьийта хаам
       edits: Нисдарш
       blocks on me: Сан блоктохарш
       send message: ДӀабахьийта хаам
       edits: Нисдарш

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 2b83cbd80c8f925d3b4a4ed4b3337e2ad0e3c99b..f4c8cf8ae92497143b3b2e6b67d06854c35f0501 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1637,10 +1637,6 @@ cs:
       reconfirm_html: Pokud potřebujete, abychom vám poslali potvrzovací e-mail znovu,
         <a href="%{reconfirm}">klikněte zde</a>.
     confirm_resend:
       reconfirm_html: Pokud potřebujete, abychom vám poslali potvrzovací e-mail znovu,
         <a href="%{reconfirm}">klikněte zde</a>.
     confirm_resend:

-      success_html: Poslali jsme na %{email} novou potvrzovací zprávu, jakmile potvrdíte
-        svůj účet, budete moci začít tvořit mapy.<br /><br />Pokud používáte nějaký
-        protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku
-        pro %{sender}, neboť na žádosti o potvrzení nejsme schopni reagovat.

       failure: Uživatel %{name} nebyl nalezen.
     confirm_email:
       heading: Potvrzení změny e-mailové adresy
       failure: Uživatel %{name} nebyl nalezen.
     confirm_email:
       heading: Potvrzení změny e-mailové adresy


@@ -2439,9 +2435,6 @@ cs:
         další nástroje nebo servery je mohou přesto potřebovat.
       continue: Zaregistrovat se
       terms accepted: Děkujeme za odsouhlasení nových podmínek pro přispěvatele!
         další nástroje nebo servery je mohou přesto potřebovat.
       continue: Zaregistrovat se
       terms accepted: Děkujeme za odsouhlasení nových podmínek pro přispěvatele!

-      terms declined: Je nám líto, že jste se rozhodli nepřijmout nové Podmínky pro
-        přispěvatele. Podrobnější informace najdete na <a href="%{url}">této wikistránce</a>.
-      terms declined url: http://wiki.openstreetmap.org/wiki/CS:Contributor_Terms_Declined?uselang=cs

     terms:
       title: Podmínky
       heading: Podmínky
     terms:
       title: Podmínky
       heading: Podmínky


@@ -2471,6 +2464,10 @@ cs:
         france: Francie
         italy: Itálie
         rest_of_world: Zbytek světa
         france: Francie
         italy: Itálie
         rest_of_world: Zbytek světa

+    terms_declined_flash:
+      terms_declined_html: Je nám líto, že jste se rozhodli nepřijmout nové Podmínky
+        pro přispěvatele. Podrobnější informace najdete na <a href="%{url}">této wikistránce</a>.
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/CS:Contributor_Terms_Declined?uselang=cs

     no_such_user:
       title: Uživatel nenalezen
       heading: Uživatel %{user} neexistuje
     no_such_user:
       title: Uživatel nenalezen
       heading: Uživatel %{user} neexistuje


@@ -2487,7 +2484,6 @@ cs:
       my profile: Můj profil
       my settings: Moje nastavení
       my comments: Moje komentáře
       my profile: Můj profil
       my settings: Moje nastavení
       my comments: Moje komentáře

-      oauth settings: nastavení oauth

       blocks on me: Moje zablokování
       blocks by me: Zablokování mnou
       send message: Poslat zprávu
       blocks on me: Moje zablokování
       blocks by me: Zablokování mnou
       send message: Poslat zprávu

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index fc5a0b5245507eb5a599f1e315eb403e2a6826dc..564842afdea659aaccf62b16241a652ac1fbf66d 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1427,7 +1427,6 @@ cy:
       my profile: Fy Mhroffil
       my settings: Fy Ngosodiadau
       my comments: Fy Sylwadau
       my profile: Fy Mhroffil
       my settings: Fy Ngosodiadau
       my comments: Fy Sylwadau

-      oauth settings: gosodiadau oauth

       blocks on me: Rhwystrau arnaf i
       blocks by me: Rhwystrau gennyf i
       send message: Anfon Neges
       blocks on me: Rhwystrau arnaf i
       blocks by me: Rhwystrau gennyf i
       send message: Anfon Neges

diff --git a/config/locales/da.yml b/config/locales/da.yml
index c27abc7c46a07a1b1b7013261efda42b6afade15..c03da8c9f7697b8e279ed36c73d4906d69ce70c5 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1610,10 +1610,6 @@ da:
       reconfirm_html: Hvis du har brug for at vi gensender bekræftelsesmailen, så
         <a href="%{reconfirm}">klik her</a>.
     confirm_resend:
       reconfirm_html: Hvis du har brug for at vi gensender bekræftelsesmailen, så
         <a href="%{reconfirm}">klik her</a>.
     confirm_resend:

-      success_html: Vi har sendt en ny bekræftelsesbesked til %{email}, og så snart
-        du har bekræftet din konto, kan du gå i gang med kortlægningen.<br /><br />Hvis
-        du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg
-        for at du har hvidlistet %{sender} da vi ikke kan svare på den slags forespørgsler.

       failure: Bruger %{name} ikke fundet.
     confirm_email:
       heading: Bekræft ændring af e-mailadresse
       failure: Bruger %{name} ikke fundet.
     confirm_email:
       heading: Bekræft ændring af e-mailadresse


@@ -2439,10 +2435,6 @@ da:
         men nogle ekstra værktøjer eller servere, har muligvis stadig brug for en.
       continue: Opret konto
       terms accepted: Tak for at du accepterede de nye vilkår for bidragsydere!
         men nogle ekstra værktøjer eller servere, har muligvis stadig brug for en.
       continue: Opret konto
       terms accepted: Tak for at du accepterede de nye vilkår for bidragsydere!

-      terms declined: Vi er kede af at du har besluttet at du ikke kan acceptere de
-        nye vilkår for bidragsydere. For yderligere oplysninger, se venligst <a href="%{url}">denne
-        wikiside</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Vilkår
       heading: Vilkår
     terms:
       title: Vilkår
       heading: Vilkår


@@ -2473,6 +2465,11 @@ da:
         france: Frankrig
         italy: Italien
         rest_of_world: Resten af verden
         france: Frankrig
         italy: Italien
         rest_of_world: Resten af verden

+    terms_declined_flash:
+      terms_declined_html: Vi er kede af at du har besluttet at du ikke kan acceptere
+        de nye vilkår for bidragsydere. For yderligere oplysninger, se venligst <a
+        href="%{url}">denne wikiside</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Ingen sådan bruger
       heading: Brugeren %{user} findes ikke
     no_such_user:
       title: Ingen sådan bruger
       heading: Brugeren %{user} findes ikke


@@ -2489,7 +2486,6 @@ da:
       my profile: Min profil
       my settings: Mine indstillinger
       my comments: Mine kommentarer
       my profile: Min profil
       my settings: Mine indstillinger
       my comments: Mine kommentarer

-      oauth settings: oauth-indstillinger

       blocks on me: Mine blokeringer
       blocks by me: Blokeringer udført af mig
       send message: Send besked
       blocks on me: Mine blokeringer
       blocks by me: Blokeringer udført af mig
       send message: Send besked

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1aac9909110cfa00c4224c2c6e9eb8e4390d90fb..33c0128f148fe524c9dccd23d379ed32cbc2eaa6 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1683,11 +1683,6 @@ de:
       reconfirm_html: Um die Bestätigungs-E-Mail erneut zuzusenden, <a href="%{reconfirm}">klicke
         hier</a>.
     confirm_resend:
       reconfirm_html: Um die Bestätigungs-E-Mail erneut zuzusenden, <a href="%{reconfirm}">klicke
         hier</a>.
     confirm_resend:

-      success_html: Wir haben eine neue Bestätigungsnachricht an %{email} gesendet.
-        Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren beginnen.<br
-        /><br />Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert,
-        musst du %{sender} auf dessen Positivliste setzen, da wir auf keine Bestätigungsanfragen
-        reagieren können.

       failure: Benutzer %{name} konnte nicht gefunden werden.
     confirm_email:
       heading: Änderung der E-Mail-Adresse bestätigen
       failure: Benutzer %{name} konnte nicht gefunden werden.
     confirm_email:
       heading: Änderung der E-Mail-Adresse bestätigen


@@ -2532,10 +2527,6 @@ de:
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!

-      terms declined: Wir bedauern es, dass du dich dazu entschieden hast, den neuen
-        Bedingungen für Mitwirkende nicht zuzustimmen. Weitere Informationen findest
-        du auf <a href="%{url}">dieser Wikiseite</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined

     terms:
       title: Bedingungen
       heading: Bedingungen
     terms:
       title: Bedingungen
       heading: Bedingungen


@@ -2568,6 +2559,11 @@ de:
         france: Frankreich
         italy: Italien
         rest_of_world: Rest der Welt
         france: Frankreich
         italy: Italien
         rest_of_world: Rest der Welt

+    terms_declined_flash:
+      terms_declined_html: Wir bedauern es, dass du dich dazu entschieden hast, den
+        neuen Bedingungen für Mitwirkende nicht zuzustimmen. Weitere Informationen
+        findest du auf <a href="%{url}">dieser Wikiseite</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/DE:Contributor_Terms_Declined

     no_such_user:
       title: Benutzer nicht gefunden
       heading: Der Benutzer %{user} existiert nicht
     no_such_user:
       title: Benutzer nicht gefunden
       heading: Der Benutzer %{user} existiert nicht


@@ -2584,7 +2580,6 @@ de:
       my profile: Profil
       my settings: Einstellungen
       my comments: Meine Kommentare
       my profile: Profil
       my settings: Einstellungen
       my comments: Meine Kommentare

-      oauth settings: OAuth-Einstellungen

       blocks on me: Erhaltene Sperren
       blocks by me: Vergebene Sperren
       send message: Nachricht senden
       blocks on me: Erhaltene Sperren
       blocks by me: Vergebene Sperren
       send message: Nachricht senden

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 13a19538187f443e4a6284494b924aaf5c220685..99312bfdef70fd3a7f62bede7f8f1c2dcc57e1e4 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -998,7 +998,6 @@ diq:
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
       my comments: Mışewrey mı
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
       my comments: Mışewrey mı

-      oauth settings: sazê OAuthi

       blocks on me: Bloqeyê mı
       blocks by me: Bloqe kerdışê mı
       send message: mesac bırışê
       blocks on me: Bloqeyê mı
       blocks by me: Bloqe kerdışê mı
       send message: mesac bırışê

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index bd276b9c6f088fc3c6d34d1baf57e165fe904235..65152f5ab1e28e171ec0c34602157d9a2b5e2120 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -974,11 +974,6 @@ dsb:
       reconfirm_html: Jolic musyš nam wobkšuśeńsku e-mailku znowego pósłaś, <a href="%{reconfirm}">klikni
         how</a>.
     confirm_resend:
       reconfirm_html: Jolic musyš nam wobkšuśeńsku e-mailku znowego pósłaś, <a href="%{reconfirm}">klikni
         how</a>.
     confirm_resend:

-      success_html: Smy nowu wobkšuśeński e-mail na %{email} póslali a gaž wobkšuśijoš
-        swójo konto, móžoš kartěrowanje zachopiś.<br /><br />Jolic wužywaš pśeśiwospamowy
-        system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu %{sender}
-        do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja
-        wótegroniś.

       failure: Wuzywaŕ %{name} njejo se namakał.
     confirm_email:
       heading: Změnjenje e-mailoweje adrese wobkšuśiś
       failure: Wuzywaŕ %{name} njejo se namakał.
     confirm_email:
       heading: Změnjenje e-mailoweje adrese wobkšuśiś


@@ -1629,8 +1624,6 @@ dsb:
         w nastajenjach změniś.
       continue: Registrěrowaś
       terms accepted: Źěkujomy se, až sy nowe wuměnjenja za sobuskutkajucuch akceptěrował!
         w nastajenjach změniś.
       continue: Registrěrowaś
       terms accepted: Źěkujomy se, až sy nowe wuměnjenja za sobuskutkajucuch akceptěrował!

-      terms declined: Woblutujomy, až sy se rozsuźił, nowe wužywarske wuměnjenja njeakceptěrowaś.
-        Za dalšne informacije glědaj pšosym <a href="%{url}">toś ten wikibok</a>.

     terms:
       title: Wuměnjenja za sobustatkujucych
       heading: Wuměnjenja za pśinosowarjow
     terms:
       title: Wuměnjenja za sobustatkujucych
       heading: Wuměnjenja za pśinosowarjow


@@ -1647,6 +1640,10 @@ dsb:
         france: Francojska
         italy: Italska
         rest_of_world: Zbytk swěta
         france: Francojska
         italy: Italska
         rest_of_world: Zbytk swěta

+    terms_declined_flash:
+      terms_declined_html: Woblutujomy, až sy se rozsuźił, nowe wužywarske wuměnjenja
+        njeakceptěrowaś. Za dalšne informacije glědaj pšosym <a href="%{url}">toś
+        ten wikibok</a>.

     no_such_user:
       title: Toś ten wužywaŕ njejo
       heading: Wužywaŕ %{user} njeeksistěrujo
     no_such_user:
       title: Toś ten wužywaŕ njejo
       heading: Wužywaŕ %{user} njeeksistěrujo


@@ -1662,7 +1659,6 @@ dsb:
       my profile: Mój profil
       my settings: Móje nastajenja
       my comments: Móje komentary
       my profile: Mój profil
       my settings: Móje nastajenja
       my comments: Móje komentary

-      oauth settings: OAUTH-nastajenja

       blocks on me: Dostane blokowanja
       blocks by me: Dane blokěrowanja
       send message: Powěsć pósłaś
       blocks on me: Dostane blokowanja
       blocks by me: Dane blokěrowanja
       send message: Powěsć pósłaś

diff --git a/config/locales/el.yml b/config/locales/el.yml
index a529c925f9e092e12cf8c1b70c45b83450034f42..d9c6e731f0ec5541e004cc06d634ff44db6c34ac 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1421,12 +1421,6 @@ el:
       reconfirm_html: Εάν θέλετε να σας ξαναστείλουμε το email επιβεβαίωσης <a href="%{reconfirm}">πατήστε
         εδώ</a>.
     confirm_resend:
       reconfirm_html: Εάν θέλετε να σας ξαναστείλουμε το email επιβεβαίωσης <a href="%{reconfirm}">πατήστε
         εδώ</a>.
     confirm_resend:

-      success_html: Έχουμε στείλει ένα νέο σημείωμα επιβεβαίωσης στο %{email} και
-        μόλις επιβεβαιώσετε τον λογαριασμό σας, θα μπορείτε να αρχίσετε τη χαρτογράφηση.<br
-        /><br />Εάν χρησιμοποιείτε ένα σύστημα αποκλεισμού ανεπιθύμητων μηνυμάτων,
-        το οποίο στέλνει αιτήματα επιβεβαίωσης, βεβαιωθείτε ότι έχετε προσθέσει σε
-        λίστα επιτρεπόμενων το %{sender} καθώς δεν μπορούμε να απαντάμε σε κανένα
-        αίτημα επιβεβαίωσης.

       failure: Ο χρήστης %{name} δεν βρέθηκε.
     confirm_email:
       heading: Επιβεβαίωση αλλαγής της διεύθυνσης ηλεκτρονικού ταχυδρομείου
       failure: Ο χρήστης %{name} δεν βρέθηκε.
     confirm_email:
       heading: Επιβεβαίωση αλλαγής της διεύθυνσης ηλεκτρονικού ταχυδρομείου


@@ -2235,10 +2229,6 @@ el:
         μερικά ειδικά εργαλεία αλλιώς ο διακομιστής μπορεί να χρειάζεται ένα.
       continue: Εγγραφή
       terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς!
         μερικά ειδικά εργαλεία αλλιώς ο διακομιστής μπορεί να χρειάζεται ένα.
       continue: Εγγραφή
       terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς!

-      terms declined: Λυπούμαστε για το ότι αποφασίσατε να μην αποδεχθείτε τους νέους
-        όρους συνεισφοράς. Για περισσότερες πληροφορίες, παρακαλούμε δείτε <a href="%{url}">αυτήν
-        τη σελίδα wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Όροι
       heading: Όροι
     terms:
       title: Όροι
       heading: Όροι


@@ -2270,6 +2260,11 @@ el:
         france: Γαλλία
         italy: Ιταλία
         rest_of_world: Υπόλοιπος κόσμος
         france: Γαλλία
         italy: Ιταλία
         rest_of_world: Υπόλοιπος κόσμος

+    terms_declined_flash:
+      terms_declined_html: Λυπούμαστε για το ότι αποφασίσατε να μην αποδεχθείτε τους
+        νέους όρους συνεισφοράς. Για περισσότερες πληροφορίες, παρακαλούμε δείτε <a
+        href="%{url}">αυτήν τη σελίδα wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Άγνωστος χρήστης
       heading: Ο χρήστης %{user} δεν υπάρχει
     no_such_user:
       title: Άγνωστος χρήστης
       heading: Ο χρήστης %{user} δεν υπάρχει


@@ -2287,7 +2282,6 @@ el:
       my profile: Το Προφίλ Μου
       my settings: Οι Ρυθμίσεις Μου
       my comments: Τα Σχόλιά Μου
       my profile: Το Προφίλ Μου
       my settings: Οι Ρυθμίσεις Μου
       my comments: Τα Σχόλιά Μου

-      oauth settings: ρυθμίσεις oauth

       blocks on me: Φραγές σε Εμένα
       blocks by me: Φραγές από Εμένα
       send message: Αποστολή Μηνύματος
       blocks on me: Φραγές σε Εμένα
       blocks by me: Φραγές από Εμένα
       send message: Αποστολή Μηνύματος

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 730ab9b14d2e41b3f31dfbb1a5478d53d72b60dd..dd7d8e7f84e8a50de0f9bf67dd3a62a0fb161067 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1279,11 +1279,6 @@ en-GB:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:

-      success_html: We've sent a new confirmation note to %{email} and as soon as
-        you confirm your account you'll be able to get mapping.<br /><br />If you
-        use an antispam system which sends confirmation requests then please make
-        sure you whitelist %{sender} as we are unable to reply to any confirmation
-        requests.

       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address


@@ -2043,9 +2038,6 @@ en-GB:
         but some extra tools or server may still need one.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
         but some extra tools or server may still need one.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!

-      terms declined: We are sorry that you have decided to not accept the new Contributor
-        Terms. For more information, please see <a href="%{url}">this wiki page</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Terms
       heading: Terms
     terms:
       title: Terms
       heading: Terms


@@ -2064,6 +2056,11 @@ en-GB:
         france: France
         italy: Italy
         rest_of_world: Rest of the world
         france: France
         italy: Italy
         rest_of_world: Rest of the world

+    terms_declined_flash:
+      terms_declined_html: We are sorry that you have decided to not accept the new
+        Contributor Terms. For more information, please see <a href="%{url}">this
+        wiki page</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: No such user
       heading: The user %{user} does not exist
     no_such_user:
       title: No such user
       heading: The user %{user} does not exist


@@ -2080,7 +2077,6 @@ en-GB:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments

-      oauth settings: oauth settings

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index f0a8f264b20931527736067fe395c66ac067755f..42488f35a46c93397685cb24c7a1690d41b45b11 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1590,10 +1590,6 @@ eo:
       reconfirm_html: Por resendi la konfirman kodon, <a href="%{reconfirm}">alklaku
         ĉi tie</a>.
     confirm_resend:
       reconfirm_html: Por resendi la konfirman kodon, <a href="%{reconfirm}">alklaku
         ĉi tie</a>.
     confirm_resend:

-      success_html: Ni sendis novan konfirman kodon al %{email}, kaj tiel frue vi
-        konfirmos vian konton, vi povos mapigi.<br /><br />Se vi uzas kontraŭ-trud-mesaĝan
-        sistemon, certigu ke vi aldonis %{sender} al via blanka listo, do tiel ni
-        eblos kontakti vin senprobleme.

       failure: Uzanto %{name} ne trovita.
     confirm_email:
       heading: Konfirmi ŝanĝon de retadreso.
       failure: Uzanto %{name} ne trovita.
     confirm_email:
       heading: Konfirmi ŝanĝon de retadreso.


@@ -2397,9 +2393,6 @@ eo:
         iloj aŭ servilo krom tio povas bezoni ĝin.
       continue: Registriĝi
       terms accepted: Dankon por akcepto de nova interkonsento pri kontribuado!
         iloj aŭ servilo krom tio povas bezoni ĝin.
       continue: Registriĝi
       terms accepted: Dankon por akcepto de nova interkonsento pri kontribuado!

-      terms declined: Ni bedaŭras, ke vi ne akceptis la novan interkonsenton pri kontribuado.
-        Por pli da informoj, bonvolu vidi <a href="%{url}">ĉi tiu viki-paĝo</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Kondiĉoj
       heading: Kondiĉoj
     terms:
       title: Kondiĉoj
       heading: Kondiĉoj


@@ -2430,6 +2423,11 @@ eo:
         france: Francujo
         italy: Italujo
         rest_of_world: Resto de la mondo
         france: Francujo
         italy: Italujo
         rest_of_world: Resto de la mondo

+    terms_declined_flash:
+      terms_declined_html: Ni bedaŭras, ke vi ne akceptis la novan interkonsenton
+        pri kontribuado. Por pli da informoj, bonvolu vidi <a href="%{url}">ĉi tiu
+        viki-paĝo</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Neekzistanta uzanto
       heading: La uzanto %{user} ne ekzistas
     no_such_user:
       title: Neekzistanta uzanto
       heading: La uzanto %{user} ne ekzistas


@@ -2446,7 +2444,6 @@ eo:
       my profile: Profilo
       my settings: Agordoj
       my comments: Miaj komentoj
       my profile: Profilo
       my settings: Agordoj
       my comments: Miaj komentoj

-      oauth settings: oauth-agordoj

       blocks on me: Blokas min
       blocks by me: Blokitaj de mi
       send message: Sendi mesaĝon
       blocks on me: Blokas min
       blocks by me: Blokitaj de mi
       send message: Sendi mesaĝon

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2b29107dbbf58ba04fc052f11056925a5120871d..f765b9b27c2362a65a111d68f9a4be61ddbaf42e 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1661,11 +1661,6 @@ es:
       reconfirm_html: Si necesita que le reenviemos el correo electrónico de confirmación,
         <a href="%{reconfirm}">haga clic aquí</a>.
     confirm_resend:
       reconfirm_html: Si necesita que le reenviemos el correo electrónico de confirmación,
         <a href="%{reconfirm}">haga clic aquí</a>.
     confirm_resend:

-      success_html: Hemos enviado un nuevo aviso de confirmación a %{email} y tan
-        pronto como confirme su cuenta, podrá comenzar a editar el mapa.<br /><br
-        />Si utiliza un sistema antispam que envía solicitudes de confirmación, asegúrese
-        de incluir a %{sender} en la lista blanca, ya que no podemos responder a ninguna
-        solicitud de confirmación.

       failure: No se ha encontrado el usuario %{name}
     confirm_email:
       heading: Confirmar el cambio de dirección de correo electrónico
       failure: No se ha encontrado el usuario %{name}
     confirm_email:
       heading: Confirmar el cambio de dirección de correo electrónico


@@ -2493,10 +2488,6 @@ es:
         aunque hay algunas herramientas y servidores que aún la solicitan.
       continue: Registrarse
       terms accepted: ¡Gracias por aceptar los nuevos términos de colaborador!
         aunque hay algunas herramientas y servidores que aún la solicitan.
       continue: Registrarse
       terms accepted: ¡Gracias por aceptar los nuevos términos de colaborador!

-      terms declined: Lamentamos que haya decidido no aceptar los nuevos Términos
-        de colaborador. Para obtener más información, consulte <a href="%{url}">esta
-        página wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined

     terms:
       title: Términos
       heading: Términos
     terms:
       title: Términos
       heading: Términos


@@ -2527,6 +2518,11 @@ es:
         france: Francia
         italy: Italia
         rest_of_world: Resto del mundo
         france: Francia
         italy: Italia
         rest_of_world: Resto del mundo

+    terms_declined_flash:
+      terms_declined_html: Lamentamos que haya decidido no aceptar los nuevos Términos
+        de colaborador. Para obtener más información, consulte <a href="%{url}">esta
+        página wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/ES:Contributor_Terms_Declined

     no_such_user:
       title: Este usuario no existe
       heading: El usuario %{user} no existe
     no_such_user:
       title: Este usuario no existe
       heading: El usuario %{user} no existe


@@ -2543,7 +2539,6 @@ es:
       my profile: Mi perfil
       my settings: Mi configuración
       my comments: Mis comentarios
       my profile: Mi perfil
       my settings: Mi configuración
       my comments: Mis comentarios

-      oauth settings: configuración de OAuth

       blocks on me: Bloqueos sobre mí
       blocks by me: Bloqueados por mí
       send message: Enviar mensaje
       blocks on me: Bloqueos sobre mí
       blocks by me: Bloqueados por mí
       send message: Enviar mensaje

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 9803ac7a3b0935618d0c342c4cdfe9a3ddfb1dbc..f3cd56191193420a2ea0cbbdcd8f39b5d1b0a7e3 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1104,11 +1104,6 @@ et:
       reconfirm_html: Kui soovid, et saadaksime sulle uuesti kinnitusmeili, siis <a
         href="%{reconfirm}">kliki siia</a>.
     confirm_resend:
       reconfirm_html: Kui soovid, et saadaksime sulle uuesti kinnitusmeili, siis <a
         href="%{reconfirm}">kliki siia</a>.
     confirm_resend:

-      success_html: Me saatsime sulle uue kinnitusmeili aadressile %{email} ja niipea
-        kui oled oma konto kinnitanud saad alustada kaardistamist.<br /><br /> Kui
-        sa kasutad rämpskirjade vastast süsteemi, mis saadab kinnitustaotluse, siis
-        veendu, et oled kandnud aadressi %{sender} valgesse nimekirja, sest me ei
-        ole võimelised vastama ühelegi kinnitustaotlusele.

       failure: Kasutajat %{name} ei leitud.
     confirm_email:
       heading: Kinnita e-posti aadressi muutmine
       failure: Kasutajat %{name} ei leitud.
     confirm_email:
       heading: Kinnita e-posti aadressi muutmine


@@ -1879,8 +1874,6 @@ et:
         lisatööriista või serveri jaoks võib seda siiski tarvis minna.
       continue: Registreeru
       terms accepted: Täname, et nõustusid uute kaastöö tingimustega!
         lisatööriista või serveri jaoks võib seda siiski tarvis minna.
       continue: Registreeru
       terms accepted: Täname, et nõustusid uute kaastöö tingimustega!

-      terms declined: Meil on kahju, et otsustasid mitte nõustuda uute kaastöö tingimustega.
-        Lisateabe saamiseks vaata <a href="%{url}">seda wiki lehte</a>.

     terms:
       title: Tingimused
       heading: Tingimused
     terms:
       title: Tingimused
       heading: Tingimused


@@ -1897,6 +1890,9 @@ et:
         france: Prantsusmaa
         italy: Itaalia
         rest_of_world: Muu maailm
         france: Prantsusmaa
         italy: Itaalia
         rest_of_world: Muu maailm

+    terms_declined_flash:
+      terms_declined_html: Meil on kahju, et otsustasid mitte nõustuda uute kaastöö
+        tingimustega. Lisateabe saamiseks vaata <a href="%{url}">seda wiki lehte</a>.

     no_such_user:
       title: Sellist kasutajat ei ole
       heading: Kasutajat %{user}  pole olemas
     no_such_user:
       title: Sellist kasutajat ei ole
       heading: Kasutajat %{user}  pole olemas


@@ -1912,7 +1908,6 @@ et:
       my profile: Minu profiil
       my settings: Minu seadistused
       my comments: Minu kommentaarid
       my profile: Minu profiil
       my settings: Minu seadistused
       my comments: Minu kommentaarid

-      oauth settings: OAuthi seaded

       blocks on me: Saadud blokeeringud
       blocks by me: Minu seatud blokeeringud
       send message: Saada sõnum
       blocks on me: Saadud blokeeringud
       blocks by me: Minu seatud blokeeringud
       send message: Saada sõnum

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e09470fb39960558f19dcd84a1f657c9f0cc9138..31bac55363e8625375dcd1d8bd4a145e894a51d1 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1413,11 +1413,6 @@ eu:
       reconfirm_html: Berrespen-mezu elektronikoa bidaltzea behar baduzu, <a href="%{reconfirm}">egin
         klik hemen</a>.
     confirm_resend:
       reconfirm_html: Berrespen-mezu elektronikoa bidaltzea behar baduzu, <a href="%{reconfirm}">egin
         klik hemen</a>.
     confirm_resend:

-      success_html: Berrespen ohar bat bidali dugu %{email} helbidera eta zure kontua
-        berretsi bezain laster, mapak eskuratu ahal izango dituzu. <br/> <br/> Berrespen
-        eskaerak bidaltzen dituen antispam sistema erabiltzen baduzu, mesedez ziurta
-        zaitez %{sender} zurien zerrenda duzula, baieztapen eskaerei erantzun ezin
-        diegulako.

       failure: '%{name} erabiltzailea ez da aurkitu.'
     confirm_email:
       heading: Helbide elektronikoan aldaketa bat baieztatu
       failure: '%{name} erabiltzailea ez da aurkitu.'
     confirm_email:
       heading: Helbide elektronikoan aldaketa bat baieztatu


@@ -2206,9 +2201,6 @@ eu:
         gerta daiteke.
       continue: Eman izena
       terms accepted: Eskerrik asko laguntzaileen termino berriak onartzeagatik!
         gerta daiteke.
       continue: Eman izena
       terms accepted: Eskerrik asko laguntzaileen termino berriak onartzeagatik!

-      terms declined: Sentitzen dugu Kolaboratzaileen baldintza berriak onartu ez
-        dituzula. Informazio gehiagorako, ikus <a href="%{url}"> wiki orri hau </a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Baldintzak
       heading: Baldintzak
     terms:
       title: Baldintzak
       heading: Baldintzak


@@ -2230,6 +2222,11 @@ eu:
         france: Frantzia
         italy: Italy
         rest_of_world: Gainerako mundua
         france: Frantzia
         italy: Italy
         rest_of_world: Gainerako mundua

+    terms_declined_flash:
+      terms_declined_html: Sentitzen dugu Kolaboratzaileen baldintza berriak onartu
+        ez dituzula. Informazio gehiagorako, ikus <a href="%{url}"> wiki orri hau
+        </a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Ez dago horrelako erabiltzailerik
       heading: '%{user} erabiltzailea ez da existitzen'
     no_such_user:
       title: Ez dago horrelako erabiltzailerik
       heading: '%{user} erabiltzailea ez da existitzen'


@@ -2246,7 +2243,6 @@ eu:
       my profile: Nire profila
       my settings: Nire Hobespenak
       my comments: Nire Iruzkinak
       my profile: Nire profila
       my settings: Nire Hobespenak
       my comments: Nire Iruzkinak

-      oauth settings: oauth ezarpenak

       blocks on me: Nireganako blokeoak
       blocks by me: Nik egindako blokeoak
       send message: Mezua bidali
       blocks on me: Nireganako blokeoak
       blocks by me: Nik egindako blokeoak
       send message: Mezua bidali

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 816f2f66a6fd3b3eeada4c796ed590dcb50f179b..9c47f1c175a1d95d47e8f1a20bbea020c285fcfc 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1578,10 +1578,6 @@ fa:
       reconfirm_html: اگر لازم است مجدداً ایمیل تأیید را بفرستیم، <a href="%{reconfirm}">اینجا
         کلیک کنید</a>.
     confirm_resend:
       reconfirm_html: اگر لازم است مجدداً ایمیل تأیید را بفرستیم، <a href="%{reconfirm}">اینجا
         کلیک کنید</a>.
     confirm_resend:

-      success_html: یادداشت تأیید دیگری به %{email} فرستادیم. به‌محض‌اینکه حسابتان
-        را تأیید کنید می‌توانید نقشه‌کشی را آغاز کنید.<br /><br />اگر از سیستم ضدهرزنامه
-        استفاده می‌کنید که درخواست تأیید می‌فرستد، لطفاً مطمئن شوید %{sender} را در
-        لیست سفید گذاشته باشید، زیرا ما نمی‌توانیم هیچ درخواست تأییدی را پاسخ دهیم.

       failure: کاربر %{name} یافت نشد.
     confirm_email:
       heading: تأیید تغییر نشانی ایمیل
       failure: کاربر %{name} یافت نشد.
     confirm_email:
       heading: تأیید تغییر نشانی ایمیل


@@ -2388,10 +2384,6 @@ fa:
         ندارید اما شاید میزبان انتخابی شما گذرواژهٔ خودش را بخواهد.
       continue: ثبت نام
       terms accepted: از اینکه شرایط جدید مشارکت‌کننده را پذیرفتید، سپاسگزاریم!
         ندارید اما شاید میزبان انتخابی شما گذرواژهٔ خودش را بخواهد.
       continue: ثبت نام
       terms accepted: از اینکه شرایط جدید مشارکت‌کننده را پذیرفتید، سپاسگزاریم!

-      terms declined: از اینکه تصمیم گرفته‌اید شرایط جدید مشارکت‌کننده را نپذیرید،
-        متأسف هستیم. برای اطلاعات بیشتر، لطفاً <a href="%{url}">این صفحهٔ ویکی</a>را
-        ببینید.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: شرایط
       heading: شرایط
     terms:
       title: شرایط
       heading: شرایط


@@ -2420,6 +2412,11 @@ fa:
         france: فرانسه
         italy: ایتالیا
         rest_of_world: دیگر نقاط جهان
         france: فرانسه
         italy: ایتالیا
         rest_of_world: دیگر نقاط جهان

+    terms_declined_flash:
+      terms_declined_html: از اینکه تصمیم گرفته‌اید شرایط جدید مشارکت‌کننده را نپذیرید،
+        متأسف هستیم. برای اطلاعات بیشتر، لطفاً <a href="%{url}">این صفحهٔ ویکی</a>را
+        ببینید.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: چنین کاربری وجود ندارد
       heading: کاربر %{user} وجود ندارد
     no_such_user:
       title: چنین کاربری وجود ندارد
       heading: کاربر %{user} وجود ندارد


@@ -2436,7 +2433,6 @@ fa:
       my profile: نمایهٔ من
       my settings: تنظیمات من
       my comments: نظرات من
       my profile: نمایهٔ من
       my settings: تنظیمات من
       my comments: نظرات من

-      oauth settings: تنظیمات oauth

       blocks on me: مسدودی‌های من
       blocks by me: مسدودی‌های به دست من
       send message: ارسال پیام
       blocks on me: مسدودی‌های من
       blocks by me: مسدودی‌های به دست من
       send message: ارسال پیام

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index e5ec1efee52c40983394a9608b4eba2ed619b1a3..30bec39f1c545bfc33967bfec1e284d5a0259f99 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -716,6 +716,8 @@ fi:
           retail: Liikerakennus
           roof: Katto
           school: Koulurakennus
           retail: Liikerakennus
           roof: Katto
           school: Koulurakennus

+          semidetached_house: Paritalo
+          service: Palvelurakennus

           stable: Talli
           temple: Temppelirakennus
           terrace: Rivitalo
           stable: Talli
           temple: Temppelirakennus
           terrace: Rivitalo


@@ -1500,11 +1502,6 @@ fi:
       reconfirm_html: Vahvistusviestin voi tilata uudelleen <a href="%{reconfirm}">napsauttamalla
         tästä</a>.
     confirm_resend:
       reconfirm_html: Vahvistusviestin voi tilata uudelleen <a href="%{reconfirm}">napsauttamalla
         tästä</a>.
     confirm_resend:

-      success_html: Aktivointilinkin sisältävä viesti on lähetetty osoitteeseen %{email}.
-        Kartan muokkaamisen voi aloittaa heti käyttäjätunnuksen vahvistamisen jälkeen.<br
-        /><br />Jos käytät vahvistuspyyntöjä lähettävää roskapostinesto-ohjelmaa,
-        lisää %{sender} sallittujen osoitteiden listalle, sillä vahvistuspyyntöihin
-        ei vastata.

       failure: Käyttäjää %{name} ei löytynyt.
     confirm_email:
       heading: Vahvista sähköpostiosoitteen muutos
       failure: Käyttäjää %{name} ei löytynyt.
     confirm_email:
       heading: Vahvista sähköpostiosoitteen muutos


@@ -2306,9 +2303,6 @@ fi:
         tai palvelimet voivat silti vaatia sitä.
       continue: Rekisteröidy
       terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä!
         tai palvelimet voivat silti vaatia sitä.
       continue: Rekisteröidy
       terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä!

-      terms declined: Harmi, ettet hyväksynyt uusia osallistumisehtoja. Katso lisätietoja
-        <a href="%{url}">tältä wikisivulta</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Fi:Contributor_Terms_Declined

     terms:
       title: Ehdot
       heading: Ehdot
     terms:
       title: Ehdot
       heading: Ehdot


@@ -2337,6 +2331,10 @@ fi:
         france: Ranska
         italy: Italia
         rest_of_world: Muu maailma
         france: Ranska
         italy: Italia
         rest_of_world: Muu maailma

+    terms_declined_flash:
+      terms_declined_html: Harmi, ettet hyväksynyt uusia osallistumisehtoja. Katso
+        lisätietoja <a href="%{url}">tältä wikisivulta</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Fi:Contributor_Terms_Declined

     no_such_user:
       title: Haettua käyttäjää ei ole olemassa
       heading: Käyttäjää %{user} ei ole olemassa
     no_such_user:
       title: Haettua käyttäjää ei ole olemassa
       heading: Käyttäjää %{user} ei ole olemassa


@@ -2352,7 +2350,6 @@ fi:
       my profile: Käyttäjäsivu
       my settings: Asetukset
       my comments: Omat kommentit
       my profile: Käyttäjäsivu
       my settings: Asetukset
       my comments: Omat kommentit

-      oauth settings: oauth-asetukset

       blocks on me: Saadut estot
       blocks by me: Tekemäni estot
       send message: Lähetä viesti
       blocks on me: Saadut estot
       blocks by me: Tekemäni estot
       send message: Lähetä viesti

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 02ec98a268a0ad190636a236a462409e8cfb2359..7a0c8122f30fe2664a96f926bdf554fe8316136e 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -962,7 +962,6 @@ fit:
       my profile: Minun profiili
       my settings: Minun inställninkit
       my comments: Minun kommentit
       my profile: Minun profiili
       my settings: Minun inställninkit
       my comments: Minun kommentit

-      oauth settings: oauth-inställninkit

       send message: Lähätä viesti
       edits: Mookkaukset
       add as friend: Lissää ystäväksi
       send message: Lähätä viesti
       edits: Mookkaukset
       add as friend: Lissää ystäväksi

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 696f25378d5181e2794859a76954c605050d075b..345f5513e5a5114bcccb2e4d6eb29c0e2b61e5a6 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1684,12 +1684,6 @@ fr:
       reconfirm_html: Si vous avez besoin que nous vous renvoyions un courriel de
         confirmation, <a href="%{reconfirm}">cliquez ici</a>.
     confirm_resend:
       reconfirm_html: Si vous avez besoin que nous vous renvoyions un courriel de
         confirmation, <a href="%{reconfirm}">cliquez ici</a>.
     confirm_resend:

-      success_html: Nous avons envoyé une nouvelle confirmation à %{email} et dès
-        que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.<br
-        /><br /> Si vous utilisez un filtre contre les courriels indésirables qui
-        renvoie à l’expéditeur des demandes de confirmation, veuillez ajouter %{sender}
-        à votre liste blanche, car nous ne sommes en mesure de répondre à aucune des
-        demandes de confirmation.

       failure: L’utilisateur %{name} est introuvable.
     confirm_email:
       heading: Confirmer le changement de votre adresse de courriel
       failure: L’utilisateur %{name} est introuvable.
     confirm_email:
       heading: Confirmer le changement de votre adresse de courriel


@@ -2539,10 +2533,6 @@ fr:
         en nécessiter un.
       continue: S’inscrire
       terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur !
         en nécessiter un.
       continue: S’inscrire
       terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur !

-      terms declined: Nous sommes désolés que vous ayez décidé de ne pas accepter
-        les nouvelles Conditions de contribution. Pour plus d’informations, veuillez
-        consulter <a href="%{url}">cette page wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Conditions
       heading: Conditions
     terms:
       title: Conditions
       heading: Conditions


@@ -2573,6 +2563,11 @@ fr:
         france: France
         italy: Italie
         rest_of_world: Reste du monde
         france: France
         italy: Italie
         rest_of_world: Reste du monde

+    terms_declined_flash:
+      terms_declined_html: Nous sommes désolés que vous ayez décidé de ne pas accepter
+        les nouvelles Conditions de contribution. Pour plus d’informations, veuillez
+        consulter <a href="%{url}">cette page wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Utilisateur inexistant
       heading: L’utilisateur %{user} n’existe pas
     no_such_user:
       title: Utilisateur inexistant
       heading: L’utilisateur %{user} n’existe pas


@@ -2589,7 +2584,6 @@ fr:
       my profile: Mon profil
       my settings: Mes options
       my comments: Mes commentaires
       my profile: Mon profil
       my settings: Mes options
       my comments: Mes commentaires

-      oauth settings: paramètres OAuth

       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part
       send message: Envoyer un message
       blocks on me: Blocages me concernant
       blocks by me: Blocages de ma part
       send message: Envoyer un message

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 5806b9f8b4180442b2c2d291a543ffb1e5750ea4..d6e3ae25bafff667f1bfeba6a0d008e38a4a07fb 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1306,7 +1306,6 @@ fur:
       my profile: Il gno profîl
       my settings: Impostazions
       my comments: I mei coments
       my profile: Il gno profîl
       my settings: Impostazions
       my comments: I mei coments

-      oauth settings: configurazion OAuth

       blocks on me: Blocs su di me
       blocks by me: Blocs aplicâts di me
       send message: Mande messaç
       blocks on me: Blocs su di me
       blocks by me: Blocs aplicâts di me
       send message: Mande messaç

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index ffecff38ef7afcc1f23a9e4d252472a189236c1b..9886379b3612aa7e4d6b14123f526e2c64df8634 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1939,7 +1939,6 @@ ga:
       my profile: Mo Phróifíl
       my settings: Mo Shocruithe
       my comments: Mo Nótaí Tráchta
       my profile: Mo Phróifíl
       my settings: Mo Shocruithe
       my comments: Mo Nótaí Tráchta

-      oauth settings: socruithe oauth

       blocks on me: Baic Orm
       blocks by me: Baic a Rinne Mé
       send message: Seol an Teachtaireacht
       blocks on me: Baic Orm
       blocks by me: Baic a Rinne Mé
       send message: Seol an Teachtaireacht

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index b8e278deddabe1397e19ff7ce02ee1bcc93d4ba9..0f51d2c4581337aeb839fdd3958d9064af9f25fc 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1078,11 +1078,6 @@ gd:
       reconfirm_html: <a href="%{reconfirm}">Briog an-seo</a> ma tha thu airson 's
         gun cuir sinn post-d dearbhaidh dhut a-rithist.
     confirm_resend:
       reconfirm_html: <a href="%{reconfirm}">Briog an-seo</a> ma tha thu airson 's
         gun cuir sinn post-d dearbhaidh dhut a-rithist.
     confirm_resend:

-      success_html: Chuir sinn teachdaireachd dearbhaidh ùr gu %{email} agus 's urrainn
-        dhut tòiseachadh air an obair-mhapa nuair a bhios tu air an cunntas agad a
-        dhearbhadh.<br /><br />Ma chleachdas tu siostam an aghaidh spama a chuireas
-        iarrtasan dearbhaidh, dèan cinnteach gun cuir thu %{sender} air a gheal-liosta
-        air sgàth 's nach urrainn dhuinn freagairt ri iarrtas dearbhaidh sam bith.

       failure: Cha deach an cleachdaiche %{name} a lorg.
     confirm_email:
       heading: Dearbhaich atharrachadh an t-seòlaidh puist-d
       failure: Cha deach an cleachdaiche %{name} a lorg.
     confirm_email:
       heading: Dearbhaich atharrachadh an t-seòlaidh puist-d


@@ -1833,10 +1828,6 @@ gd:
         co-dhiù.
       continue: Clàraich
       terms accepted: Mòran taing gun do dh'aontaich thu ri teirmichean a' chom-pàirtiche!
         co-dhiù.
       continue: Clàraich
       terms accepted: Mòran taing gun do dh'aontaich thu ri teirmichean a' chom-pàirtiche!

-      terms declined: Tha sinn duilich nach do dh'aontaich thu ri teirmichean ùra
-        a' chom-pàirtiche. airson barrachd fiosrachaidh, tadhail air <a href="%{url}">an
-        duilleag seo air an uicidh</a>.
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Teirmichean a' chom-pàirtiche
       heading: Teirmichean a' chom-pàirtiche
     terms:
       title: Teirmichean a' chom-pàirtiche
       heading: Teirmichean a' chom-pàirtiche


@@ -1856,6 +1847,11 @@ gd:
         france: An Fhraing
         italy: An Eadailt
         rest_of_world: An corr dhen t-saoghail
         france: An Fhraing
         italy: An Eadailt
         rest_of_world: An corr dhen t-saoghail

+    terms_declined_flash:
+      terms_declined_html: Tha sinn duilich nach do dh'aontaich thu ri teirmichean
+        ùra a' chom-pàirtiche. airson barrachd fiosrachaidh, tadhail air <a href="%{url}">an
+        duilleag seo air an uicidh</a>.
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Chan eil an cleachdaiche seo ann
       heading: Chan eil an cleachdaiche %{user} ann
     no_such_user:
       title: Chan eil an cleachdaiche seo ann
       heading: Chan eil an cleachdaiche %{user} ann


@@ -1873,7 +1869,6 @@ gd:
       my profile: A' phròifil agam
       my settings: Na roghainnean agam
       my comments: Na beachdan agam
       my profile: A' phròifil agam
       my settings: Na roghainnean agam
       my comments: Na beachdan agam

-      oauth settings: roghainnean oauth

       blocks on me: Bacaidhean orm
       blocks by me: Bacaidhean a rinn mi
       send message: Cuir teachdaireachd
       blocks on me: Bacaidhean orm
       blocks by me: Bacaidhean a rinn mi
       send message: Cuir teachdaireachd

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e56a7c2bdffd5757124284382cc2d4930788659c..86cc3389c3e9d2ce163b239331ebf57e361e810d 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -38,6 +38,8 @@ gl:
       client_application:
         create: Rexistrarse
         update: Actualizar
       client_application:
         create: Rexistrarse
         update: Actualizar

+      doorkeeper_application:
+        update: Actualizar

       redaction:
         create: Crear a redacción
         update: Gardar a redacción
       redaction:
         create: Crear a redacción
         update: Gardar a redacción


@@ -109,6 +111,11 @@ gl:
         latitude: Latitude
         longitude: Lonxitude
         language: Lingua
         latitude: Latitude
         longitude: Lonxitude
         language: Lingua

+      doorkeeper/application:
+        name: Nome
+        redirect_uri: Redirixir URIs
+        confidential: Aplicación confidencial?
+        scopes: Permisos

       friend:
         user: Usuario
         friend: Amizade
       friend:
         user: Usuario
         friend: Amizade


@@ -151,6 +158,8 @@ gl:
         pass_crypt: Contrasinal
         pass_crypt_confirmation: Confirmar contrasinal
     help:
         pass_crypt: Contrasinal
         pass_crypt_confirmation: Confirmar contrasinal
     help:

+      doorkeeper/application:
+        redirect_uri: Usar unha liña por URI

       trace:
         tagstring: separadas por comas
       user_block:
       trace:
         tagstring: separadas por comas
       user_block:


@@ -506,11 +515,17 @@ gl:
     comments:
       has_commented_on: '%{display_name} deixou un comentario nas seguintes entradas
         de diario'
     comments:
       has_commented_on: '%{display_name} deixou un comentario nas seguintes entradas
         de diario'

+      no_comments: Sen comentarios no diario

       post: Artigo
       when: Cando
       comment: Comentario
       newer_comments: Comentarios máis recentes
       older_comments: Comentarios máis vellos
       post: Artigo
       when: Cando
       comment: Comentario
       newer_comments: Comentarios máis recentes
       older_comments: Comentarios máis vellos

+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Aplicación rexistrada.

   friendships:
     make_friend:
       heading: Quere engadir a %{user} coma amizade?
   friendships:
     make_friend:
       heading: Quere engadir a %{user} coma amizade?


@@ -997,13 +1012,14 @@ gl:
         mountain_pass:
           "yes": Porto de montaña
         natural:
         mountain_pass:
           "yes": Porto de montaña
         natural:

+          atoll: Atol

           bare_rock: Rocha núa
           bay: Badía
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de cova
           cliff: Cantil
           bare_rock: Rocha núa
           bay: Badía
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de cova
           cliff: Cantil

-          coastline: Litoral
+          coastline: Beiramar

           crater: Cráter
           dune: Duna
           fell: Brañal
           crater: Cráter
           dune: Duna
           fell: Brañal


@@ -1021,6 +1037,7 @@ gl:
           moor: Páramo
           mud: Lama
           peak: Cumio
           moor: Páramo
           mud: Lama
           peak: Cumio

+          peninsula: Península

           point: Punto
           reef: Arrecife
           ridge: Crista
           point: Punto
           reef: Arrecife
           ridge: Crista


@@ -1068,6 +1085,7 @@ gl:
           "yes": Oficina
         place:
           allotments: Hortas
           "yes": Oficina
         place:
           allotments: Hortas

+          archipelago: Arquipélago

           city: Cidade
           city_block: Quinteiro
           country: País
           city: Cidade
           city_block: Quinteiro
           country: País


@@ -1606,10 +1624,6 @@ gl:
       reconfirm_html: Se quere que reenviemos o correo electrónico de confirmación,
         <a href="%{reconfirm}">prema aquí</a>.
     confirm_resend:
       reconfirm_html: Se quere que reenviemos o correo electrónico de confirmación,
         <a href="%{reconfirm}">prema aquí</a>.
     confirm_resend:

-      success_html: Procura unha nota de confirmación que che enviamos a %{email}
-        e comezarás a crear mapas decontado.<br /><br />Se empregas un sistema de
-        bloqueo de spam, asegúrate de incluír %{sender} na túa listaxe branca para
-        poder completar o proceso sen problemas.

       failure: Non se atopou o usuario "%{name}".
     confirm_email:
       heading: Confirmar a modificación do enderezo de correo electrónico
       failure: Non se atopou o usuario "%{name}".
     confirm_email:
       heading: Confirmar a modificación do enderezo de correo electrónico


@@ -1623,6 +1637,7 @@ gl:
     inbox:
       title: Caixa de entrada
       my_inbox: A miña caixa de entrada
     inbox:
       title: Caixa de entrada
       my_inbox: A miña caixa de entrada

+      my_outbox: Caixa de saída

       messages: Ten %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} mensaxe nova'
       messages: Ten %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} mensaxe nova'


@@ -1657,6 +1672,8 @@ gl:
       body: Non hai ningunha mensaxe con esa ID.
     outbox:
       title: Caixa de saída
       body: Non hai ningunha mensaxe con esa ID.
     outbox:
       title: Caixa de saída

+      my_inbox: Caixa de entrada
+      my_outbox: Caixa de saída

       messages:
         one: Enviaches %{count} mensaxe
         other: Enviaches %{count} mensaxes
       messages:
         one: Enviaches %{count} mensaxe
         other: Enviaches %{count} mensaxes


@@ -2315,7 +2332,7 @@ gl:
       in: en
     index:
       public_traces: Pistas GPS públicas
       in: en
     index:
       public_traces: Pistas GPS públicas

-      my_traces: As miñas pistas GPS
+      my_traces: As miñas pistas

       public_traces_from: Pistas GPS públicas de %{user}
       description: Procurar as pistas GPS subidas recentemente
       tagged_with: ' etiquetadas con %{tags}'
       public_traces_from: Pistas GPS públicas de %{user}
       description: Procurar as pistas GPS subidas recentemente
       tagged_with: ' etiquetadas con %{tags}'


@@ -2323,6 +2340,9 @@ gl:
         nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         da wiki</a>.
       upload_trace: Subir unha pista
         nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         da wiki</a>.
       upload_trace: Subir unha pista

+      all_traces: Todas as pistas
+      traces_from: Pistas públicas de %{user}
+      remove_tag_filter: Eliminar etiqueta do filtro

     destroy:
       scheduled_for_deletion: Pista agardando a súa eliminación
     make_public:
     destroy:
       scheduled_for_deletion: Pista agardando a súa eliminación
     make_public:


@@ -2381,6 +2401,14 @@ gl:
       flash: Revogou o pase de %{application}
     permissions:
       missing: Non permitiu á aplicación acceder a esta instalación
       flash: Revogou o pase de %{application}
     permissions:
       missing: Non permitiu á aplicación acceder a esta instalación

+    scopes:
+      read_prefs: Ler preferencias de usuario
+      write_prefs: Modificar preferencias de usuario
+      write_diary: Crear entradas de diario, comentarios e amizades
+      write_api: Modificar o mapa
+      read_gpx: Ler pistas GPS privadas
+      write_gpx: Subir pistas GPS
+      write_notes: Modificar notas

   oauth_clients:
     new:
       title: Rexistrar unha nova aplicación
   oauth_clients:
     new:
       title: Rexistrar unha nova aplicación


@@ -2422,6 +2450,42 @@ gl:
       flash: Actualizou de xeito correcto a información do cliente
     destroy:
       flash: Destruíu o rexistro da aplicación de cliente
       flash: Actualizou de xeito correcto a información do cliente
     destroy:
       flash: Destruíu o rexistro da aplicación de cliente

+  oauth2_applications:
+    index:
+      title: As miñas aplicacións de cliente
+      oauth_2: OAuth 2
+      new: Rexistrar unha nova aplicación
+      name: Nome
+      permissions: Permisos
+    application:
+      edit: Editar
+      delete: Eliminar
+      confirm_delete: Eliminar esta aplicación?
+    new:
+      title: Rexistrar unha nova aplicación
+    edit:
+      title: Editar a túa aplicación
+    show:
+      edit: Editar
+      delete: Eliminar
+      confirm_delete: Eliminar esta aplicación?
+      client_id: ID de cliente
+      client_secret: Cliente secreto
+      permissions: Permisos
+      redirect_uris: Redirixir URIs
+    not_found:
+      sorry: Desculpa, non foi atopada a aplicación.
+  oauth2_authorizations:
+    new:
+      title: Autorización requirida
+      authorize: Autorizar
+      deny: Rexeitar
+    error:
+      title: Ocorreu un erro
+  oauth2_authorized_applications:
+    index:
+      application: Aplicación
+      permissions: Permisos

   users:
     new:
       title: Rexistrarse
   users:
     new:
       title: Rexistrarse


@@ -2446,9 +2510,6 @@ gl:
         aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
       continue: Rexistrarse
       terms accepted: Grazas por aceptar os novos termos do contribuínte!
         aínda que hai algunhas ferramentas e servidores que aínda a solicitan.
       continue: Rexistrarse
       terms accepted: Grazas por aceptar os novos termos do contribuínte!

-      terms declined: Sentimos que decidise non aceptar os novos Termos do contribuínte.
-        Para obter máis información, vexa <a href="%{url}">esta páxina da wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Termos
       heading: Termos
     terms:
       title: Termos
       heading: Termos


@@ -2477,6 +2538,11 @@ gl:
         france: Francia
         italy: Italia
         rest_of_world: Resto do mundo
         france: Francia
         italy: Italia
         rest_of_world: Resto do mundo

+    terms_declined_flash:
+      terms_declined_html: Sentimos que decidise non aceptar os novos Termos do contribuínte.
+        Para obter máis información, vexa <a href="%{url}">esta páxina da wiki</a>.
+      terms_declined_link: esta páxina da wiki
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Non existe tal usuario
       heading: O usuario "%{user}" non existe
     no_such_user:
       title: Non existe tal usuario
       heading: O usuario "%{user}" non existe


@@ -2493,7 +2559,6 @@ gl:
       my profile: O meu perfil
       my settings: Os meus axustes
       my comments: Os meus comentarios
       my profile: O meu perfil
       my settings: Os meus axustes
       my comments: Os meus comentarios

-      oauth settings: axustes OAuth

       blocks on me: Os meus bloqueos
       blocks by me: Bloqueos efectuados
       send message: Enviar unha mensaxe
       blocks on me: Os meus bloqueos
       blocks by me: Bloqueos efectuados
       send message: Enviar unha mensaxe


@@ -2755,8 +2820,9 @@ gl:
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading_html: '%{block_on} bloqueado por %{block_by}'
     show:
       title: '%{block_on} bloqueado por %{block_by}'
       heading_html: '%{block_on} bloqueado por %{block_by}'

-      created: Creado
-      status: Estado
+      created: 'Creado:'
+      duration: 'Duración:'
+      status: 'Estado:'

       show: Amosar
       edit: Editar
       revoke: Revogar!
       show: Amosar
       edit: Editar
       revoke: Revogar!


@@ -2785,6 +2851,7 @@ gl:
       title: Notas enviadas ou comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas enviadas ou comentadas por %{user}
       title: Notas enviadas ou comentadas por %{user}
       heading: Notas de %{user}
       subheading_html: Notas enviadas ou comentadas por %{user}

+      no_notes: Sen notas

       id: ID
       creator: Creador
       description: Descrición
       id: ID
       creator: Creador
       description: Descrición

diff --git a/config/locales/he.yml b/config/locales/he.yml
index d0719a19a21fec11165519f3850e1983aee2cb9e..81fa27f52b6ba86161210ebb85e26ae0410b96a5 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1626,10 +1626,6 @@ he:
       reconfirm_html: אם ברצונך לקבל שוב מכתב אימות, <a href="%{reconfirm}">נא ללחוץ
         כאן</a>.
     confirm_resend:
       reconfirm_html: אם ברצונך לקבל שוב מכתב אימות, <a href="%{reconfirm}">נא ללחוץ
         כאן</a>.
     confirm_resend:

-      success_html: שלחנו הודעת אישור חדש לכתובת %{email} ומרגע אישור חשבונך, אפשר
-        יהיה להתחיל למפות.<br /><br />אם בדואר האלקטרוני שלך מופעלת מערכת נגד דואר
-        זהל אשר שולחת בקשות אישור, נא להוסיף את %{sender} לרשימה הלבנה, מאחר ואיננו
-        יכולים להשיב לבקשות אישור כלשהן.

       failure: משתמש %{name} לא נמצא.
     confirm_email:
       heading: אישור שינוי כתובת הדוא״ל
       failure: משתמש %{name} לא נמצא.
     confirm_email:
       heading: אישור שינוי כתובת הדוא״ל


@@ -2426,9 +2422,6 @@ he:
         יכולים להזדקק לכזה.
       continue: הרשמה
       terms accepted: תודה על קבלת תנאי התרומה החדשים!
         יכולים להזדקק לכזה.
       continue: הרשמה
       terms accepted: תודה על קבלת תנאי התרומה החדשים!

-      terms declined: אנחנו מצטערים שהחלטת לא לקבל את תנאי התרומה החדשים. למידע נוסף
-        ר׳ <a href="%{url}">דף הוויקי הזה</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined

     terms:
       title: תנאים
       heading: תנאים
     terms:
       title: תנאים
       heading: תנאים


@@ -2455,6 +2448,10 @@ he:
         france: צרפת
         italy: איטליה
         rest_of_world: שאר העולם
         france: צרפת
         italy: איטליה
         rest_of_world: שאר העולם

+    terms_declined_flash:
+      terms_declined_html: אנחנו מצטערים שהחלטת לא לקבל את תנאי התרומה החדשים. למידע
+        נוסף ר׳ <a href="%{url}">דף הוויקי הזה</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/He:Contributor_Terms_Declined

     no_such_user:
       title: אין משתמש כזה
       heading: המשתמש %{user} אינו קיים
     no_such_user:
       title: אין משתמש כזה
       heading: המשתמש %{user} אינו קיים


@@ -2470,7 +2467,6 @@ he:
       my profile: הפרופיל שלי
       my settings: ההגדרות שלי
       my comments: ההערות שלי
       my profile: הפרופיל שלי
       my settings: ההגדרות שלי
       my comments: ההערות שלי

-      oauth settings: הגדרות oauth

       blocks on me: מתי חסמו אותי
       blocks by me: מתי חסמתי
       send message: שליחת הודעה
       blocks on me: מתי חסמו אותי
       blocks by me: מתי חסמתי
       send message: שליחת הודעה

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 43359959b9f7535a7b88e4679ab98869b82dd1db..b55d6db173362276cdafaad866c6dae6de7f84be 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1124,10 +1124,6 @@ hr:
       already active: Ovaj račun je već potvrđen.
       unknown token: Taj potvrdni kôd je istekao ili ne postoji.
     confirm_resend:
       already active: Ovaj račun je već potvrđen.
       unknown token: Taj potvrdni kôd je istekao ili ne postoji.
     confirm_resend:

-      success_html: Poslali smo novu potvrdu na email %{email}, a čim potvrdiš svoj
-        račun, moći ćeš početi kartirati.<br /><br />Ako koristiš antispam sustav
-        koji šalje potvrdu zahtjeva, molim te da provjeriš je li %{sender} na tzv.
-        "whitelisti", jer nismo u mogućnosti odgovarati na potvrde zahtjeva.

       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrdi promjenu email adrese.
       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrdi promjenu email adrese.


@@ -1741,7 +1737,6 @@ hr:
       my profile: Moj profil
       my settings: Moje postavke
       my comments: Moji komentari
       my profile: Moj profil
       my settings: Moje postavke
       my comments: Moji komentari

-      oauth settings: oauth postavke

       blocks on me: Osobne blokade
       blocks by me: Blokade koje sam postavio
       send message: Pošalji poruku
       blocks on me: Osobne blokade
       blocks by me: Blokade koje sam postavio
       send message: Pošalji poruku

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index de97aa7d58a601aac1c2a53f3871d22e82df1958..e0c00f981579ebbf634f095a08b76b435b5d37f3 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1378,10 +1378,6 @@ hsb:
       reconfirm_html: Jeli dyrbiš nam wobkrućensku e-mejlku znowa pósłać, <a href="%{reconfirm}">klikń
         tu</a>.
     confirm_resend:
       reconfirm_html: Jeli dyrbiš nam wobkrućensku e-mejlku znowa pósłać, <a href="%{reconfirm}">klikń
         tu</a>.
     confirm_resend:

-      success_html: Smy nowu wobkrućenski e-mejl na %{email} póslali a tak ruče hač
-        swoje konto wobkrućiš, móžeš kartěrowanje započeć.<br /><br /> Jeli přećiwospamowy
-        system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu %{sender}
-        do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.

       failure: Wužiwar %{name} njenamakany.
     confirm_email:
       heading: Změnjenje e-mejloweje adresy wobkrućić
       failure: Wužiwar %{name} njenamakany.
     confirm_email:
       heading: Změnjenje e-mejloweje adresy wobkrućić


@@ -2106,8 +2102,6 @@ hsb:
         někotrym přidatnym funkcijam abo serweram móhło być trjeba.
       continue: Registrować
       terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował!
         někotrym přidatnym funkcijam abo serweram móhło być trjeba.
       continue: Registrować
       terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował!

-      terms declined: Wobžarujemy, zo sy so rozsudźił, nowe wužiwarske wuměnjenja
-        njeakceptować. Za dalše informacije hlej prošu <a href="%{url}">tutu wikistronu</a>.

     terms:
       title: Wuměnjenja za sobuskutkowarjow
       heading: Wuměnjenja za sobuskutkowarjow
     terms:
       title: Wuměnjenja za sobuskutkowarjow
       heading: Wuměnjenja za sobuskutkowarjow


@@ -2124,6 +2118,9 @@ hsb:
         france: Francoska
         italy: Italska
         rest_of_world: Zbytk swěta
         france: Francoska
         italy: Italska
         rest_of_world: Zbytk swěta

+    terms_declined_flash:
+      terms_declined_html: Wobžarujemy, zo sy so rozsudźił, nowe wužiwarske wuměnjenja
+        njeakceptować. Za dalše informacije hlej prošu <a href="%{url}">tutu wikistronu</a>.

     no_such_user:
       title: Wužiwar njeeksistuje
       heading: Wužiwar %{user} njeeksistuje
     no_such_user:
       title: Wužiwar njeeksistuje
       heading: Wužiwar %{user} njeeksistuje


@@ -2140,7 +2137,6 @@ hsb:
       my profile: Mój profil
       my settings: Moje nastajenja
       my comments: Moje komentary
       my profile: Mój profil
       my settings: Moje nastajenja
       my comments: Moje komentary

-      oauth settings: OAUTH-nastajenja

       blocks on me: Dostane blokowanja
       blocks by me: Date blokowanja
       send message: Powěsć pósłać
       blocks on me: Dostane blokowanja
       blocks by me: Date blokowanja
       send message: Powěsć pósłać

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index f95dee8cf5855721bdea0dba8c661a6689f0bc53..d8761f023adc34874a4b03e56814f095679740e0 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1607,11 +1607,6 @@ hu:
       reconfirm_html: A jóváhagyó link újraküldéséhez <a href="%{reconfirm}">kattints
         ide</a>.
     confirm_resend:
       reconfirm_html: A jóváhagyó link újraküldéséhez <a href="%{reconfirm}">kattints
         ide</a>.
     confirm_resend:

-      success_html: Elküldtünk egy új megerősítő üzenetet %{email} címedre, és amint
-        megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.<br /><br
-        />Ha olyan spamszűrőt használsz, amely megerősítési kéréseket küld, akkor
-        győződj meg róla, hogy a %{sender} címet engedélylistára tetted, mivel megerősítési
-        kérelmekre nem tudunk válaszolni.

       failure: '%{name} felhasználó nem található.'
     confirm_email:
       heading: E-mail cím módosításának megerősítése
       failure: '%{name} felhasználó nem található.'
     confirm_email:
       heading: E-mail cím módosításának megerősítése


@@ -2424,9 +2419,6 @@ hu:
         de néhány extra eszköz vagy szerver igényelhet egyet.
       continue: Regisztráció
       terms accepted: Köszönjük, hogy elfogadtad az új hozzájárulási feltételeket!
         de néhány extra eszköz vagy szerver igényelhet egyet.
       continue: Regisztráció
       terms accepted: Köszönjük, hogy elfogadtad az új hozzájárulási feltételeket!

-      terms declined: Sajnáljuk, hogy úgy döntöttél, nem fogadod el az új közreműködési
-        feltételeket. További információért lásd <a href="%{url}">ezt a wiki oldalt</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Feltételek
       heading: Feltételek
     terms:
       title: Feltételek
       heading: Feltételek


@@ -2457,6 +2449,10 @@ hu:
         france: Franciaország
         italy: Olaszország
         rest_of_world: A világ többi része
         france: Franciaország
         italy: Olaszország
         rest_of_world: A világ többi része

+    terms_declined_flash:
+      terms_declined_html: Sajnáljuk, hogy úgy döntöttél, nem fogadod el az új közreműködési
+        feltételeket. További információért lásd <a href="%{url}">ezt a wiki oldalt</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nincs ilyen felhasználó
       heading: '%{user} felhasználó nem létezik'
     no_such_user:
       title: Nincs ilyen felhasználó
       heading: '%{user} felhasználó nem létezik'


@@ -2473,7 +2469,6 @@ hu:
       my profile: Profilom
       my settings: Beállításaim
       my comments: Hozzászólásaim
       my profile: Profilom
       my settings: Beállításaim
       my comments: Hozzászólásaim

-      oauth settings: oauth beállítások

       blocks on me: Engem sújtó blokkolások
       blocks by me: Általam kiosztott blokkolások
       send message: Üzenet küldése
       blocks on me: Engem sújtó blokkolások
       blocks by me: Általam kiosztott blokkolások
       send message: Üzenet küldése

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 52191103714f87130374124cdd5e8d757ac3ebdd..fbbff9d1548a423cae6bc6b47b5a3581920d6b3c 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1595,11 +1595,6 @@ ia:
       reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
         hic</a>.
     confirm_resend:
       reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
         hic</a>.
     confirm_resend:

-      success_html: Nos ha inviate un nove message de confirmation a %{email} e si
-        tosto que tu confirma le conto, tu potera comenciar a cartographar.<br /><br
-        />Si tu usa un systema anti-spam que invia requestas de confirmation, alora
-        per favor assecura te de adder %{sender} al lista blanc, alteremente nos non
-        pote responder a requestas de confirmation.

       failure: Usator %{name} non trovate.
     confirm_email:
       heading: Confirmar un cambio de adresse de e-mail
       failure: Usator %{name} non trovate.
     confirm_email:
       heading: Confirmar un cambio de adresse de e-mail


@@ -2418,9 +2413,6 @@ ia:
         ma alcun instrumentos o servitores supplementari pote totevia necessitar un.
       continue: Crear conto
       terms accepted: Gratias pro acceptar le nove conditiones de contributor!
         ma alcun instrumentos o servitores supplementari pote totevia necessitar un.
       continue: Crear conto
       terms accepted: Gratias pro acceptar le nove conditiones de contributor!

-      terms declined: Nos regretta que tu ha decidite de non acceptar le nove Conditiones
-        de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste
-        pagina wiki</a>.

     terms:
       title: Conditiones
       heading: Conditiones
     terms:
       title: Conditiones
       heading: Conditiones


@@ -2449,6 +2441,10 @@ ia:
         france: Francia
         italy: Italia
         rest_of_world: Resto del mundo
         france: Francia
         italy: Italia
         rest_of_world: Resto del mundo

+    terms_declined_flash:
+      terms_declined_html: Nos regretta que tu ha decidite de non acceptar le nove
+        Conditiones de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste
+        pagina wiki</a>.

     no_such_user:
       title: Iste usator non existe
       heading: Le usator %{user} non existe
     no_such_user:
       title: Iste usator non existe
       heading: Le usator %{user} non existe


@@ -2465,7 +2461,6 @@ ia:
       my profile: Mi profilo
       my settings: Mi preferentias
       my comments: Mi commentos
       my profile: Mi profilo
       my settings: Mi preferentias
       my comments: Mi commentos

-      oauth settings: configuration oauth

       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me
       send message: Inviar message
       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me
       send message: Inviar message

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 73e1f9d4a1b8e87ac89ea21f19bcdc871d43adb6..8421fffed874e29a9ce42897b17fa3188afc336c 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1503,11 +1503,6 @@ id:
       reconfirm_html: Jika Anda membutuhkan kami mengirimkan ulang surel konfirmasi,
         <a href="%{reconfirm}">klik di sini</a>.
     confirm_resend:
       reconfirm_html: Jika Anda membutuhkan kami mengirimkan ulang surel konfirmasi,
         <a href="%{reconfirm}">klik di sini</a>.
     confirm_resend:

-      success_html: Kami telah mengirim catatan konfirmasi baru ke %{email} dan setelah
-        Anda mengkonfirmasi akun, Anda akan dapat mulai melakukan pemetaan.<br /><br
-        />Jika Anda menggunakan sistem anti spam yang mengirimkan permintaan konfirmasi
-        silahkan pastikan Anda memasukkan %{sender} ke dalam daftar putih karena kami
-        tidak dapat membalas permintaan konfirmasi Anda.

       failure: Pengguna %{name} tidak ditemukan.
     confirm_email:
       heading: Konfirmasi perubahan alamat email
       failure: Pengguna %{name} tidak ditemukan.
     confirm_email:
       heading: Konfirmasi perubahan alamat email


@@ -2306,10 +2301,6 @@ id:
         tetapi beberapa alat tambahan atau server mungkin memerlukannya.
       continue: Mendaftar
       terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru!
         tetapi beberapa alat tambahan atau server mungkin memerlukannya.
       continue: Mendaftar
       terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru!

-      terms declined: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor
-        baru. Untuk informasi lebih lanjut, silahkan lihat <a href="%{url}">this wiki
-        page</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Persyaratan
       heading: Persyaratan
     terms:
       title: Persyaratan
       heading: Persyaratan


@@ -2340,6 +2331,11 @@ id:
         france: Perancis
         italy: Italia
         rest_of_world: Bagian lain dari dunia
         france: Perancis
         italy: Italia
         rest_of_world: Bagian lain dari dunia

+    terms_declined_flash:
+      terms_declined_html: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor
+        baru. Untuk informasi lebih lanjut, silahkan lihat <a href="%{url}">this wiki
+        page</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Pengguna tersebut tidak ditemukan
       heading: Pengguna %{user} tidak dapat ditemukan
     no_such_user:
       title: Pengguna tersebut tidak ditemukan
       heading: Pengguna %{user} tidak dapat ditemukan


@@ -2356,7 +2352,6 @@ id:
       my profile: Profilku
       my settings: Pengaturanku
       my comments: Komentarku
       my profile: Profilku
       my settings: Pengaturanku
       my comments: Komentarku

-      oauth settings: Pengaturan oauth

       blocks on me: Blok kepada saya
       blocks by me: Blok oleh saya
       send message: Kirim Pesan
       blocks on me: Blok kepada saya
       blocks by me: Blok oleh saya
       send message: Kirim Pesan

diff --git a/config/locales/is.yml b/config/locales/is.yml
index b6d97d46bd69027f35a1d2a9c0a4dba172069505..71b0ef584be9c1388fdc446fb66c4c25708f4278 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1557,11 +1557,6 @@ is:
       reconfirm_html: Ef þú vilt að við sendum þér staðfestingarpóstinn aftur, <a
         href="%{reconfirm}">smelltu hér</a>.
     confirm_resend:
       reconfirm_html: Ef þú vilt að við sendum þér staðfestingarpóstinn aftur, <a
         href="%{reconfirm}">smelltu hér</a>.
     confirm_resend:

-      success_html: Við höfum sent staðfestingarskilaboð til %{email}, um leið og
-        þú staðfestir aðganginn þinn geturðu farið að vinna í kortunum.<br /><br />Ef
-        þú ert að nota ruslpóstsíukerfi sem sendir staðfestingarbeiðnir, gakktu úr
-        skugga um að %{sender} sé á lista yfir leyfða sendendur, því við erum ekki
-        fær um að svara neinum staðfestingarbeiðnum.

       failure: Notandinn %{name} fannst ekki.
     confirm_email:
       heading: Staðfesta breytingu á netfangi
       failure: Notandinn %{name} fannst ekki.
     confirm_email:
       heading: Staðfesta breytingu á netfangi


@@ -2398,10 +2393,6 @@ is:
       continue: Nýskrá
       terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags
         þíns!
       continue: Nýskrá
       terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags
         þíns!

-      terms declined: Okkur þykir miður að þú hafir ákveðið að samþykkja ekki nýja
-        skilmála vegna framlags (contributor terms). Til að sjá ítarlegri upplýsingar,
-        geturðu skoðað <a href="%{url}">þessa síðu</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Skilmálar
       heading: Skilmálar
     terms:
       title: Skilmálar
       heading: Skilmálar


@@ -2431,6 +2422,11 @@ is:
         france: Frakkland
         italy: Ítalía
         rest_of_world: Restin af heiminum
         france: Frakkland
         italy: Ítalía
         rest_of_world: Restin af heiminum

+    terms_declined_flash:
+      terms_declined_html: Okkur þykir miður að þú hafir ákveðið að samþykkja ekki
+        nýja skilmála vegna framlags (contributor terms). Til að sjá ítarlegri upplýsingar,
+        geturðu skoðað <a href="%{url}">þessa síðu</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Notandi ekki til
       heading: Notandinn %{user} er ekki til
     no_such_user:
       title: Notandi ekki til
       heading: Notandinn %{user} er ekki til


@@ -2447,7 +2443,6 @@ is:
       my profile: Notandasniðið mitt
       my settings: Stillingarnar mínar
       my comments: Athugasemdir mínar
       my profile: Notandasniðið mitt
       my settings: Stillingarnar mínar
       my comments: Athugasemdir mínar

-      oauth settings: oauth stillingar

       blocks on me: Bönn gegn mér
       blocks by me: Bönn eftir mig
       send message: Senda skilaboð
       blocks on me: Bönn gegn mér
       blocks by me: Bönn eftir mig
       send message: Senda skilaboð

diff --git a/config/locales/it.yml b/config/locales/it.yml
index a1eeb914f118b3f5595a59aa26076196abdfbdf9..2268def07cf61dd423b3a6649ee195d23b7c1f6b 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1635,11 +1635,6 @@ it:
       reconfirm_html: Per richiedere nuovamente una email di conferma, <a href="%{reconfirm}">Clicca
         qui</a>.
     confirm_resend:
       reconfirm_html: Per richiedere nuovamente una email di conferma, <a href="%{reconfirm}">Clicca
         qui</a>.
     confirm_resend:

-      success_html: È stato spedito un nuovo messaggio di conferma all'indirizzo %{email}
-        e non appena verrà confermato il proprio profilo si sarà in grado di mappare.<br
-        /><br />Se si utilizzano dei filtri antispam che spediscono richieste di conferma
-        assicurarsi di inserire l'indirizzo %{sender} nella whitelist, altrimenti
-        non siamo in grado di rispondere ad alcuna richiesta di conferma.

       failure: Utente %{name} non trovato.
     confirm_email:
       heading: Conferma una variazione di indirizzo email
       failure: Utente %{name} non trovato.
     confirm_email:
       heading: Conferma una variazione di indirizzo email


@@ -2475,10 +2470,6 @@ it:
         bisogno.
       continue: Registrati
       terms accepted: Grazie di aver accettato le nuove regole per contribuire!
         bisogno.
       continue: Registrati
       terms accepted: Grazie di aver accettato le nuove regole per contribuire!

-      terms declined: Siamo spiacenti che tu abbia deciso di non accettare i nuovi
-        termini di contribuzione. Per ulteriori informazioni consultare <a href="%{url}">questa
-        pagina del wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Termini
       heading: Termini
     terms:
       title: Termini
       heading: Termini


@@ -2509,6 +2500,11 @@ it:
         france: Francia
         italy: Italia
         rest_of_world: Resto del mondo
         france: Francia
         italy: Italia
         rest_of_world: Resto del mondo

+    terms_declined_flash:
+      terms_declined_html: Siamo spiacenti che tu abbia deciso di non accettare i
+        nuovi termini di contribuzione. Per ulteriori informazioni consultare <a href="%{url}">questa
+        pagina del wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nessun utente
       heading: L'utente %{user} non esiste
     no_such_user:
       title: Nessun utente
       heading: L'utente %{user} non esiste


@@ -2525,7 +2521,6 @@ it:
       my profile: Il mio profilo
       my settings: Impostazioni
       my comments: Miei commenti
       my profile: Il mio profilo
       my settings: Impostazioni
       my comments: Miei commenti

-      oauth settings: Impostazioni oauth

       blocks on me: Blocchi su di me
       blocks by me: Blocchi applicati da me
       send message: Invia messaggio
       blocks on me: Blocchi su di me
       blocks by me: Blocchi applicati da me
       send message: Invia messaggio

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5309a28acffb63006cb4aee72375687cb2b1fca8..cd99214fab1ce22ddefd3f35f25f99035cd7e31b 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1568,9 +1568,6 @@ ja:
       unknown token: この確認コードは期限切れ、または存在しません。
       reconfirm_html: 確認メールを再送する必要がある場合は、<a href="%{reconfirm}">ここをクリック</a>してください。
     confirm_resend:
       unknown token: この確認コードは期限切れ、または存在しません。
       reconfirm_html: 確認メールを再送する必要がある場合は、<a href="%{reconfirm}">ここをクリック</a>してください。
     confirm_resend:

-      success_html: '%{email}に確認メッセージを再送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br
-        />あなたの指定したアドレスに確認メールが届くまであなたはログインできません。メールボックスでスパムフィルターを使用している場合は %{sender}
-        からの確認メールを受信できるようホワイトリストを設定してください。'

       failure: '%{name}というアカウントは登録されていません。'
     confirm_email:
       heading: メール アドレスの変更を確認
       failure: '%{name}というアカウントは登録されていません。'
     confirm_email:
       heading: メール アドレスの変更を確認


@@ -2257,8 +2254,6 @@ ja:
       auth no password: サードパーティ認証があるとパスワードは不要ですが、それでもその他のツールやサーバーが必要な場合があります。
       continue: ユーザー登録
       terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます!
       auth no password: サードパーティ認証があるとパスワードは不要ですが、それでもその他のツールやサーバーが必要な場合があります。
       continue: ユーザー登録
       terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます!

-      terms declined: 新しい協力者規約を承諾いただけず残念です。詳しい情報は、<a href="%{url}">このウィキページ</a>をご覧ください。
-      terms declined url: https://wiki.openstreetmap.org/wiki/JA:Contributor_Terms_Declined

     terms:
       title: 規約
       heading: 規約
     terms:
       title: 規約
       heading: 規約


@@ -2282,6 +2277,9 @@ ja:
         france: フランス
         italy: イタリア
         rest_of_world: それ以外の国
         france: フランス
         italy: イタリア
         rest_of_world: それ以外の国

+    terms_declined_flash:
+      terms_declined_html: 新しい協力者規約を承諾いただけず残念です。詳しい情報は、<a href="%{url}">このウィキページ</a>をご覧ください。
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/JA:Contributor_Terms_Declined

     no_such_user:
       title: 存在しない利用者です
       heading: '%{user} という利用者は存在しません'
     no_such_user:
       title: 存在しない利用者です
       heading: '%{user} という利用者は存在しません'


@@ -2297,7 +2295,6 @@ ja:
       my profile: 自分のプロフィール
       my settings: 設定
       my comments: 自分のコメント
       my profile: 自分のプロフィール
       my settings: 設定
       my comments: 自分のコメント

-      oauth settings: OAuth 設定

       blocks on me: 自分に与えられたブロック
       blocks by me: 自分が実行したブロック
       send message: メッセージを送信
       blocks on me: 自分に与えられたブロック
       blocks by me: 自分が実行したブロック
       send message: メッセージを送信

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 2de2c6748e8db22d1409e0fa6004a49020226899..2b6501a3838d3d1a2008582ee90723a56089caab 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1282,7 +1282,6 @@ kab:
       my profile: Amaɣnu-iw
       my settings: Iɣewwaṛen-iw
       my comments: Iwenniten-iw
       my profile: Amaɣnu-iw
       my settings: Iɣewwaṛen-iw
       my comments: Iwenniten-iw

-      oauth settings: iɣewwaṛen oauth

       blocks on me: Asewḥel i y-iɛnan
       blocks by me: Asewḥel sɣur-i
       send message: Azen izen
       blocks on me: Asewḥel i y-iɛnan
       blocks by me: Asewḥel sɣur-i
       send message: Azen izen

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7b6adb97f1af387982004a3c27b3f45b51069d62..b94d9c0118f31beb7c326d096eed3608e663d161 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1451,9 +1451,6 @@ ko:
       unknown token: 확인 코드가 만료되었거나 존재하지 않습니다.
       reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, <a href="%{reconfirm}">여기를 클릭하세요</a>.
     confirm_resend:
       unknown token: 확인 코드가 만료되었거나 존재하지 않습니다.
       reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, <a href="%{reconfirm}">여기를 클릭하세요</a>.
     confirm_resend:

-      success_html: '%{email}(으)로 새 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.<br /><br
-        />확인 요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 %{sender}이(가)
-        있는지 확인하세요.'

       failure: '%{name} 사용자를 찾을 수 없습니다.'
     confirm_email:
       heading: 이메일 주소 바꾸기 확인
       failure: '%{name} 사용자를 찾을 수 없습니다.'
     confirm_email:
       heading: 이메일 주소 바꾸기 확인


@@ -2211,9 +2208,6 @@ ko:
       auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       continue: 가입하기
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
       auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.
       continue: 가입하기
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!

-      terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
-        위키 문서</a>를 참조하세요.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 약관
       heading: 약관
     terms:
       title: 약관
       heading: 약관


@@ -2236,6 +2230,10 @@ ko:
         france: 프랑스
         italy: 이탈리아
         rest_of_world: 나머지 국가
         france: 프랑스
         italy: 이탈리아
         rest_of_world: 나머지 국가

+    terms_declined_flash:
+      terms_declined_html: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
+        위키 문서</a>를 참조하세요.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: 이러한 사용자는 없습니다
       heading: '%{user} 사용자는 존재하지 않습니다'
     no_such_user:
       title: 이러한 사용자는 없습니다
       heading: '%{user} 사용자는 존재하지 않습니다'


@@ -2251,7 +2249,6 @@ ko:
       my profile: 내 프로필
       my settings: 프로필 설정
       my comments: 내 의견
       my profile: 내 프로필
       my settings: 프로필 설정
       my comments: 내 의견

-      oauth settings: oauth 설정

       blocks on me: 나를 차단
       blocks by me: 나한테 차단
       send message: 메시지 보내기
       blocks on me: 나를 차단
       blocks by me: 나한테 차단
       send message: 메시지 보내기

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index b999fcf7966ec9adb2cb4d8e133d401c485d915a..1a65ea2b7056bb6bc51d290f67df14458779adbb 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1621,11 +1621,6 @@ ku-Latn:
       reconfirm_html: Heke ji bo ku em koda pejirandinê ji te re dîsa bişînin îhtiyaciya
         te bi me hebe <a href="%{reconfirm}">bitikîne ser vir</a>.
     confirm_resend:
       reconfirm_html: Heke ji bo ku em koda pejirandinê ji te re dîsa bişînin îhtiyaciya
         te bi me hebe <a href="%{reconfirm}">bitikîne ser vir</a>.
     confirm_resend:

-      success_html: Me ji hesabê te yê %{email} re notekî teyîdê şand û gava ku te
-        hesabê xwe pejirand tu yê bikaribî dest bi çêkirina nexşeyê bikî.<br /><br
-        />Eger tu sîstemekî antî-spam bi kar bînî, ji ber ku em nikarin ji daxwazên
-        pejirandinê re cewab bidin, xêra xwe jê piştrast be ku di navbera adrêsên
-        ku têne qebûlkirin (whitelist) de %{sender} jî heye.

       failure: Bikarhêner %{name} nehate dîtin.
     confirm_email:
       heading: Guherandina navnîşana e-nameyê bipejirîne
       failure: Bikarhêner %{name} nehate dîtin.
     confirm_email:
       heading: Guherandina navnîşana e-nameyê bipejirîne


@@ -2459,9 +2454,6 @@ ku-Latn:
       continue: Qeyd bibe
       terms accepted: Em spasiya te dikin ji bo ku te şertên beşdariyê yê nû qebûl
         kirǃ
       continue: Qeyd bibe
       terms accepted: Em spasiya te dikin ji bo ku te şertên beşdariyê yê nû qebûl
         kirǃ

-      terms declined: Em xemgîn in ji ber ku te şertên beşdariyê yê nû qebûl nekir.
-        Ji bo zêdetir agahiyan xêra xwe binêre <a href="%{url}">vê rûpela wîkiyê</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Şertûmerc
       heading: Şertûmerc
     terms:
       title: Şertûmerc
       heading: Şertûmerc


@@ -2493,6 +2485,10 @@ ku-Latn:
         france: Frensa
         italy: Îtalya
         rest_of_world: Cihên din ên dinyayê
         france: Frensa
         italy: Îtalya
         rest_of_world: Cihên din ên dinyayê

+    terms_declined_flash:
+      terms_declined_html: Em xemgîn in ji ber ku te şertên beşdariyê yê nû qebûl
+        nekir. Ji bo zêdetir agahiyan xêra xwe binêre <a href="%{url}">vê rûpela wîkiyê</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Bikarhênerek wek vê tine
       heading: Bikarhênerek bi navê %{user} tine
     no_such_user:
       title: Bikarhênerek wek vê tine
       heading: Bikarhênerek bi navê %{user} tine


@@ -2509,7 +2505,6 @@ ku-Latn:
       my profile: Profîla min
       my settings: Hevyazên min
       my comments: Şîroveyên min
       my profile: Profîla min
       my settings: Hevyazên min
       my comments: Şîroveyên min

-      oauth settings: mîhengên OAuthê

       blocks on me: Astengên ser min
       blocks by me: Astengên ku ez dakirime
       send message: Peyam bişîne
       blocks on me: Astengên ser min
       blocks by me: Astengên ku ez dakirime
       send message: Peyam bişîne

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 65ba49e6f75e4dafa0d56fe8d1f3c391a3a57997..ed88e552c3b9807d46b09ed8340e65a718a8c8f7 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1210,7 +1210,6 @@ lb:
       my profile: Mäi Profil
       my settings: Meng Astellungen
       my comments: Meng Bemierkungen
       my profile: Mäi Profil
       my settings: Meng Astellungen
       my comments: Meng Bemierkungen

-      oauth settings: OAuth-Astellungen

       blocks by me: vu Mir Gespaart
       send message: Message schécken
       diary: Blog
       blocks by me: vu Mir Gespaart
       send message: Message schécken
       diary: Blog

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 0b7093765cf7255df32023ad9f7a208def4f07a9..9052ba3fb19c33ee7d92ea872c34015443dc0cdb 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1314,11 +1314,6 @@ lt:
       reconfirm_html: Jei norite iš naujo siųsti patvirtinimo laišką, <a href="%{reconfirm}">spauskite
         čia</a>.
     confirm_resend:
       reconfirm_html: Jei norite iš naujo siųsti patvirtinimo laišką, <a href="%{reconfirm}">spauskite
         čia</a>.
     confirm_resend:

-      success_html: Mes nusiuntėme jums naują patvirtinimo pranešimą į  %{email} ir
-        ten patvirtinsite savo paskyrą, kad galėtumėte pradėti žymėti.<br /><br />Jei
-        jūs naudojate įvairias programas prieš spam'ą, įtraukite į patikimų adresų
-        sąrašą (Whitelist) %{sender}, nes kitaip negalėsime jums nusiųsti jokių patvirtinimo
-        užklausų.

       failure: Naudotojas %{name} nerastas.
     confirm_email:
       heading: Patvirtinkite e-pašto adreso pakeitimą
       failure: Naudotojas %{name} nerastas.
     confirm_email:
       heading: Patvirtinkite e-pašto adreso pakeitimą


@@ -2098,9 +2093,6 @@ lt:
         bet kai kuriems papildomiems įrankiams arba serveriui gali jo prireikti.
       continue: Užsiregistruoti
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!
         bet kai kuriems papildomiems įrankiams arba serveriui gali jo prireikti.
       continue: Užsiregistruoti
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!

-      terms declined: Atsiprašome, jei nesutinkate su naujomis Talkininkų sąlygomis.
-        Daugiau informacijos rasite <a href="%{url}">čia</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Sąlygos
       heading: Sąlygos
     terms:
       title: Sąlygos
       heading: Sąlygos


@@ -2123,6 +2115,10 @@ lt:
         france: Prancūzija
         italy: Italija
         rest_of_world: Likęs pasaulis
         france: Prancūzija
         italy: Italija
         rest_of_world: Likęs pasaulis

+    terms_declined_flash:
+      terms_declined_html: Atsiprašome, jei nesutinkate su naujomis Talkininkų sąlygomis.
+        Daugiau informacijos rasite <a href="%{url}">čia</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nėra tokio naudotojo
       heading: Naudotojas %{user} neegzistuoja
     no_such_user:
       title: Nėra tokio naudotojo
       heading: Naudotojas %{user} neegzistuoja


@@ -2139,7 +2135,6 @@ lt:
       my profile: Mano profilis
       my settings: Mano nustatymai
       my comments: Mano komentarai
       my profile: Mano profilis
       my settings: Mano nustatymai
       my comments: Mano komentarai

-      oauth settings: OAuth nustatymai

       blocks on me: Apribojimai man
       blocks by me: Mano sukurti apribojimai
       send message: Siųsti žinutę
       blocks on me: Apribojimai man
       blocks by me: Mano sukurti apribojimai
       send message: Siųsti žinutę

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 1a5951e7b4ebac170b2df6e1961b62b8475938c7..c3ed1afe2be33ede5a0ac143512d5336876437c2 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1149,10 +1149,6 @@ lv:
       reconfirm_html: Ja nepieciešams, lai izsūtam apstiprinājuma e-pastu vēlreiz,
         <a href="%{reconfirm}">spied te</a>.
     confirm_resend:
       reconfirm_html: Ja nepieciešams, lai izsūtam apstiprinājuma e-pastu vēlreiz,
         <a href="%{reconfirm}">spied te</a>.
     confirm_resend:

-      success_html: Mēs nosūtījām jaunu pārbaudes e-pastu uz %{email} un tiklīdz tu
-        apstiprināsi savu lietotāju, tu varēti kartēt.<br /><br />Ja tu lieto pretmēstuļu
-        sistēmu, kura nosūta pārbaudes pieprasījumus, tad pārliecinies, ka esi ielicis
-        %{sender} baltajā sarakstā, jo mēs nevaram atbildēt uz pārbaudes pieprasījumiem.

       failure: Lietotājs %{name} nav atrasts.
     confirm_email:
       heading: Apstiprināt e-pasta adreses maiņu
       failure: Lietotājs %{name} nav atrasts.
     confirm_email:
       heading: Apstiprināt e-pasta adreses maiņu


@@ -1903,8 +1899,6 @@ lv:
         bet dažiem rīkiem vai serveriem tā vēl joprojām varētu būt nepieciešama.
       continue: Reģistrēties
       terms accepted: Paldies, ka pieņēmāt jaunos devuma noteikumus!
         bet dažiem rīkiem vai serveriem tā vēl joprojām varētu būt nepieciešama.
       continue: Reģistrēties
       terms accepted: Paldies, ka pieņēmāt jaunos devuma noteikumus!

-      terms declined: Mums žēl, ka tu izvēlējies nepieņemt jaunos Veidotāju Noteikumus.
-        Priekš vairāk informācijas, apskati <a href="%{url}">šo wiki lapu</a>.

     terms:
       title: Dalībnieka noteikumi
       heading: Dalībnieka noteikumi
     terms:
       title: Dalībnieka noteikumi
       heading: Dalībnieka noteikumi


@@ -1921,6 +1915,9 @@ lv:
         france: Francija
         italy: Itālija
         rest_of_world: Pārējā pasaule
         france: Francija
         italy: Itālija
         rest_of_world: Pārējā pasaule

+    terms_declined_flash:
+      terms_declined_html: Mums žēl, ka tu izvēlējies nepieņemt jaunos Veidotāju Noteikumus.
+        Priekš vairāk informācijas, apskati <a href="%{url}">šo wiki lapu</a>.

     no_such_user:
       title: Neesošs lietotājs
       heading: Lietotājs %{user} neeksistē
     no_such_user:
       title: Neesošs lietotājs
       heading: Lietotājs %{user} neeksistē


@@ -1937,7 +1934,6 @@ lv:
       my profile: Mans profils
       my settings: Mani iestatījumi
       my comments: Mani komentāri
       my profile: Mans profils
       my settings: Mani iestatījumi
       my comments: Mani komentāri

-      oauth settings: OAuth uzstādījumi

       blocks on me: Bloki uz mani
       blocks by me: Manis piešķirtie Bloki
       send message: Nosūtīt ziņojumu
       blocks on me: Bloki uz mani
       blocks by me: Manis piešķirtie Bloki
       send message: Nosūtīt ziņojumu

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 8127eb8a18647bb47556830b09d0c4c8babe46fd..99bd9117154c8be1e63eca1f8dfcae5ffd2a267c 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1591,10 +1591,6 @@ mk:
       reconfirm_html: Ако сакате повторно да ви ја испратиме потврдната порака, <a
         href="%{reconfirm}">стиснете тука</a>.
     confirm_resend:
       reconfirm_html: Ако сакате повторно да ви ја испратиме потврдната порака, <a
         href="%{reconfirm}">стиснете тука</a>.
     confirm_resend:

-      success_html: Испративме поврдна порака на %{email}, и штом ќе ја потврдите
-        сметката, ќе можете да почнете со картографска работа.<br /><br />Ако користите
-        систем против спам кој испраќа барања за потврда, тогаш ќе морате да ја дозволите
-        адресата %{sender} бидејќи ние немаме начин да одговараме на такви потврди.

       failure: Корисникот %{name} не е пронајден.
     confirm_email:
       heading: Потврди промена на е-пошта
       failure: Корисникот %{name} не е пронајден.
     confirm_email:
       heading: Потврди промена на е-пошта


@@ -2427,9 +2423,6 @@ mk:
         но може да ја побараат некои дополнителни алатки или опслужувачот.
       continue: Зачленување
       terms accepted: Ви благодариме што ги прифативте новите услови за учество!
         но може да ја побараат некои дополнителни алатки или опслужувачот.
       continue: Зачленување
       terms accepted: Ви благодариме што ги прифативте новите услови за учество!

-      terms declined: Жалиме што не се согласувате со новите Услови за учество. Повеќе
-        информации ќе најдете на <a href="%{url}">оваа страница</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk

     terms:
       title: Услови
       heading: Услови
     terms:
       title: Услови
       heading: Услови


@@ -2459,6 +2452,10 @@ mk:
         france: Франција
         italy: Италија
         rest_of_world: Остатокот од светот
         france: Франција
         italy: Италија
         rest_of_world: Остатокот од светот

+    terms_declined_flash:
+      terms_declined_html: Жалиме што не се согласувате со новите Услови за учество.
+        Повеќе информации ќе најдете на <a href="%{url}">оваа страница</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk

     no_such_user:
       title: Нема таков корисник
       heading: Корисникот %{user} не постои.
     no_such_user:
       title: Нема таков корисник
       heading: Корисникот %{user} не постои.


@@ -2475,7 +2472,6 @@ mk:
       my profile: Мојот профил
       my settings: Мои нагодувања
       my comments: Мои коментари
       my profile: Мојот профил
       my settings: Мои нагодувања
       my comments: Мои коментари

-      oauth settings: oauth поставки

       blocks on me: Добиени блокови
       blocks by me: Извршени болокови
       send message: Испрати порака
       blocks on me: Добиени блокови
       blocks by me: Извршени болокови
       send message: Испрати порака

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 3347221f62282473c7d4f075b2fe39fbbf4b66e6..210fdaac2d82f67f2195b0a577edca8c3009470b 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1210,8 +1210,6 @@ mr:
       confirm email address: विपत्रपत्त्याची निश्चिती करा
       display name: 'दर्शवायचे नाव:'
       continue: नोंदणी करा
       confirm email address: विपत्रपत्त्याची निश्चिती करा
       display name: 'दर्शवायचे नाव:'
       continue: नोंदणी करा

-      terms declined: आपण नवीन योगदात्यांसाठी अटी मान्य न करण्याचे निवडल्याचा आम्हाला
-        खेद आहे. अधिक माहितीसाठी कृपया <a href="%{url}">हे विकीपान पहा</a>.

     terms:
       title: योगदात्यांसाठी अटी
       heading: योगदात्यांसाठी अटी
     terms:
       title: योगदात्यांसाठी अटी
       heading: योगदात्यांसाठी अटी


@@ -1222,6 +1220,9 @@ mr:
         france: फ्रान्स
         italy: इटली
         rest_of_world: उर्वरित जग
         france: फ्रान्स
         italy: इटली
         rest_of_world: उर्वरित जग

+    terms_declined_flash:
+      terms_declined_html: आपण नवीन योगदात्यांसाठी अटी मान्य न करण्याचे निवडल्याचा
+        आम्हाला खेद आहे. अधिक माहितीसाठी कृपया <a href="%{url}">हे विकीपान पहा</a>.

     no_such_user:
       title: असा सदस्य अस्तित्वात नाही
       heading: सदस्य %{user} अस्तित्वात नाही
     no_such_user:
       title: असा सदस्य अस्तित्वात नाही
       heading: सदस्य %{user} अस्तित्वात नाही


@@ -1236,7 +1237,6 @@ mr:
       my messages: माझे संदेश
       my settings: माझ्या मांडण्या
       my comments: माझे अभिप्राय
       my messages: माझे संदेश
       my settings: माझ्या मांडण्या
       my comments: माझे अभिप्राय

-      oauth settings: oauth प्रस्थापने

       blocks on me: माझ्यावरील निर्बंध
       blocks by me: माझ्याकडून निर्बंध
       send message: संदेश पाठवा
       blocks on me: माझ्यावरील निर्बंध
       blocks by me: माझ्याकडून निर्बंध
       send message: संदेश पाठवा

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 9b44a0357428782529a9cf7e4e8bcaae0a67a65a..06ad493e4f2836ca2dd616b90ab639c938d275c2 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1199,11 +1199,6 @@ ms:
       reconfirm_html: Jika anda perlukan kami untuk mengirim semula e-mel penghantaran,
         <a href="%{reconfirm}">klik di sini</a>.
     confirm_resend:
       reconfirm_html: Jika anda perlukan kami untuk mengirim semula e-mel penghantaran,
         <a href="%{reconfirm}">klik di sini</a>.
     confirm_resend:

-      success_html: Kami telah menghantar pesanan pengesahan kepada %{email}. Sebaik
-        sahaja anda mengesahkan akaun anda, anda akan boleh menyunting peta.<br /><br
-        />Jika anda menggunakan sistem anti-spam yang menghantar permohonan untuk
-        pengesahan, sila pastikan anda membenarkan %{sender} kerana kami tidak dapat
-        membalas sebarang permohonan untuk pengesahan.

       failure: Pengguna %{name} tidak dijumpai.
     confirm_email:
       heading: Sahkan penukaran alamat e-mel
       failure: Pengguna %{name} tidak dijumpai.
     confirm_email:
       heading: Sahkan penukaran alamat e-mel


@@ -1922,9 +1917,6 @@ ms:
         masuk
       continue: Daftar
       terms accepted: Terima kasih kerana menerima terma-terma penyumbang yang baru!
         masuk
       continue: Daftar
       terms accepted: Terima kasih kerana menerima terma-terma penyumbang yang baru!

-      terms declined: Kami berasa kesal kerana anda memutuskan untuk tidak menerima
-        Terma-Terma Penyumbang yang baru ini. Untuk maklumat lanjut, sila rujuk <a
-        href="%{url}">laman wiki ini</a>.

     terms:
       title: Terma-terma penyumbang
       heading: Terma-terma penyumbang
     terms:
       title: Terma-terma penyumbang
       heading: Terma-terma penyumbang


@@ -1943,6 +1935,10 @@ ms:
         france: Perancis
         italy: Itali
         rest_of_world: Negara lain
         france: Perancis
         italy: Itali
         rest_of_world: Negara lain

+    terms_declined_flash:
+      terms_declined_html: Kami berasa kesal kerana anda memutuskan untuk tidak menerima
+        Terma-Terma Penyumbang yang baru ini. Untuk maklumat lanjut, sila rujuk <a
+        href="%{url}">laman wiki ini</a>.

     no_such_user:
       title: Pengguna ini tidak wujud
       heading: Pengguna %{user} tidak wujud
     no_such_user:
       title: Pengguna ini tidak wujud
       heading: Pengguna %{user} tidak wujud


@@ -1958,7 +1954,6 @@ ms:
       my profile: Profil Saya
       my settings: Tetapan Saya
       my comments: Komen Saya
       my profile: Profil Saya
       my settings: Tetapan Saya
       my comments: Komen Saya

-      oauth settings: tetapan oauth

       blocks on me: Sekatan pada Saya
       blocks by me: Sekatan oleh Saya
       send message: Hantar Pesanan
       blocks on me: Sekatan pada Saya
       blocks by me: Sekatan oleh Saya
       send message: Hantar Pesanan

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 6d540551efd8f3aac86dcc0ede3058339533ccde..8c9f5d77f76cf3089eea207eaef41b8b4c73a816 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1425,10 +1425,6 @@ nb:
       reconfirm_html: Hvis du trenger at vi sender bekreftelseseposten på nytt, <a
         href="%{reconfirm}">klikk her</a>
     confirm_resend:
       reconfirm_html: Hvis du trenger at vi sender bekreftelseseposten på nytt, <a
         href="%{reconfirm}">klikk her</a>
     confirm_resend:

-      success_html: Vi har sendt en ny bekreftelsesmelding til %{email} og så snart
-        du bekrefter kontoen din kan du begynne å lage kart.<br /><br />Om du bruker
-        et antispamsystem som sender bekreftelsesforspørsler, kontroller at du har
-        hvitelistet %{sender} siden vi ikke kan svar på bekreftelsesforespørsler.

       failure: Fant ikke brukeren %{name}.
     confirm_email:
       heading: Bekreft endring av e-postadresse
       failure: Fant ikke brukeren %{name}.
     confirm_email:
       heading: Bekreft endring av e-postadresse


@@ -2208,9 +2204,6 @@ nb:
         del ekstra verktøy og tjenere kan trenge det.
       continue: Registrer deg
       terms accepted: Takk for at du godtok de nye bidragsytervilkårene!
         del ekstra verktøy og tjenere kan trenge det.
       continue: Registrer deg
       terms accepted: Takk for at du godtok de nye bidragsytervilkårene!

-      terms declined: Vi beklager at du har besluttet å ikke akseptere de nye bidragsytervilkårene.
-        For mer informasjon, se <a href="%{url}">denne wiki-siden</a> .
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Vilkår
       heading: Vilkår
     terms:
       title: Vilkår
       heading: Vilkår


@@ -2239,6 +2232,11 @@ nb:
         france: Frankrike
         italy: Italia
         rest_of_world: Resten av verden
         france: Frankrike
         italy: Italia
         rest_of_world: Resten av verden

+    terms_declined_flash:
+      terms_declined_html: Vi beklager at du har besluttet å ikke akseptere de nye
+        bidragsytervilkårene. For mer informasjon, se <a href="%{url}">denne wiki-siden</a>
+        .
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Ingen bruker funnet
       heading: Brukeren %{user} finnes ikke
     no_such_user:
       title: Ingen bruker funnet
       heading: Brukeren %{user} finnes ikke


@@ -2255,7 +2253,6 @@ nb:
       my profile: Min profil
       my settings: Mine innstillinger
       my comments: Mine kommentarer
       my profile: Min profil
       my settings: Mine innstillinger
       my comments: Mine kommentarer

-      oauth settings: oauth-innstillinger

       blocks on me: Mine blokkeringer
       blocks by me: Blokkeringer opprettet av meg
       send message: Send melding
       blocks on me: Mine blokkeringer
       blocks by me: Blokkeringer opprettet av meg
       send message: Send melding

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 47767144a64987f3643e506c9dc32c9a2cefaa5b..5734ce50fe022637623d807ba040313c682fbf61 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1648,10 +1648,6 @@ nl:
       reconfirm_html: Als nodig, kunt u <a href="%{reconfirm}">de bevestigingscode
         opnieuw laten verzenden</a>.
     confirm_resend:
       reconfirm_html: Als nodig, kunt u <a href="%{reconfirm}">de bevestigingscode
         opnieuw laten verzenden</a>.
     confirm_resend:

-      success_html: Er is ter bevestiging een e-mail verstuurd naar %{email} en als
-        u uw account hebt bevestigd, kunt u gaan mappen.<br /><br />Als u een spamfilter
-        gebruikt die per e-mail een bevestiging stuurt, zorg er dan voor dat u %{sender}
-        toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken.

       failure: De gebruiker %{name} is niet gevonden.
     confirm_email:
       heading: Gewijzigd e-mailadres bevestigen
       failure: De gebruiker %{name} is niet gevonden.
     confirm_email:
       heading: Gewijzigd e-mailadres bevestigen


@@ -2486,9 +2482,6 @@ nl:
         maar sommige extra hulpmiddelen of servers kunnen het nog steeds nodig hebben.
       continue: Registreren
       terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst!
         maar sommige extra hulpmiddelen of servers kunnen het nog steeds nodig hebben.
       continue: Registreren
       terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst!

-      terms declined: We vinden het jammer dat u hebt besloten de nieuwe Bijdragersvoorwaarden
-        niet te accepteren. Zie <a href="%{url}">deze wikipagina</a> voor meer informatie.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Voorwaarden
       heading: Voorwaarden
     terms:
       title: Voorwaarden
       heading: Voorwaarden


@@ -2520,6 +2513,10 @@ nl:
         france: Frankrijk
         italy: Italië
         rest_of_world: Rest van de wereld
         france: Frankrijk
         italy: Italië
         rest_of_world: Rest van de wereld

+    terms_declined_flash:
+      terms_declined_html: We vinden het jammer dat u hebt besloten de nieuwe Bijdragersvoorwaarden
+        niet te accepteren. Zie <a href="%{url}">deze wikipagina</a> voor meer informatie.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Deze gebruiker bestaat niet
       heading: De gebruiker %{user} bestaat niet
     no_such_user:
       title: Deze gebruiker bestaat niet
       heading: De gebruiker %{user} bestaat niet


@@ -2536,7 +2533,6 @@ nl:
       my profile: Profiel
       my settings: Instellingen
       my comments: Mijn reacties
       my profile: Profiel
       my settings: Instellingen
       my comments: Mijn reacties

-      oauth settings: Oauth-instellingen

       blocks on me: Blokkades voor u
       blocks by me: Blokkades door u
       send message: Bericht verzenden
       blocks on me: Blokkades voor u
       blocks by me: Blokkades door u
       send message: Bericht verzenden

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 9f34f39cd4b72620a26aba94f859c81768343ed2..9cb4d08ba9c007039072a0a9ac6709f5ed307116 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1081,10 +1081,6 @@ nn:
       already active: Denne kontoen har allereie stadfesta.
       unknown token: Den koda ser ikkje ut til å eksistere.
     confirm_resend:
       already active: Denne kontoen har allereie stadfesta.
       unknown token: Den koda ser ikkje ut til å eksistere.
     confirm_resend:

-      success_html: Me har sendt ein ny bekreftelsesmelding til %{email} og så snart
-        du stadfestar kontoen din kan du byrje å lage kart.<br /><br />Om du brukar
-        eit antispamsystem som sender bekreftelsesforspørsler, kontrollar at du har
-        kvitelista %{sender} sidan me ikkje kan svar på bekreftelsesforespørsler.

       failure: Fann ikkje brukaren %{name}.
     confirm_email:
       heading: Stadfest endring av e-postadresse
       failure: Fann ikkje brukaren %{name}.
     confirm_email:
       heading: Stadfest endring av e-postadresse


@@ -1708,9 +1704,6 @@ nn:
         dette seinare i innstellingane.
       continue: Registrer deg
       terms accepted: Takk for at du godtok dei nye bidragsytervilkårene!
         dette seinare i innstellingane.
       continue: Registrer deg
       terms accepted: Takk for at du godtok dei nye bidragsytervilkårene!

-      terms declined: Me beklagar at du har vedteke å ikkje akseptere dei nye bidragsytervilkårene.
-        For meir informasjon, sjå <a href="%{url}">denne wiki-sida</a> .
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_terms_declined

     terms:
       title: Bidragsytervilkår
       heading: Bidragsytervilkåra
     terms:
       title: Bidragsytervilkår
       heading: Bidragsytervilkåra


@@ -1729,6 +1722,11 @@ nn:
         france: Frankrike
         italy: Italia
         rest_of_world: Resten av verda
         france: Frankrike
         italy: Italia
         rest_of_world: Resten av verda

+    terms_declined_flash:
+      terms_declined_html: Me beklagar at du har vedteke å ikkje akseptere dei nye
+        bidragsytervilkårene. For meir informasjon, sjå <a href="%{url}">denne wiki-sida</a>
+        .
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_terms_declined

     no_such_user:
       title: Ingen brukar funnet
       heading: Brukaren %{user} finst ikkje
     no_such_user:
       title: Ingen brukar funnet
       heading: Brukaren %{user} finst ikkje


@@ -1745,7 +1743,6 @@ nn:
       my profile: Min profil
       my settings: Mine innstillingar
       my comments: Mine kommentarar
       my profile: Min profil
       my settings: Mine innstillingar
       my comments: Mine kommentarar

-      oauth settings: oauth-innstillingar

       blocks on me: Mine blokeringar
       blocks by me: blokkeringar utført av meg
       send message: Send melding
       blocks on me: Mine blokeringar
       blocks by me: blokkeringar utført av meg
       send message: Send melding

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 4edadf16d7c6efacf40d3d9c7e1e4aa9cb7f7384..fcafff152624b5d6e25f9c344b402a517268b82e 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -907,11 +907,6 @@ nqo:
       reconfirm_html: ߣߴߌ ߞߍ߫ ߘߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߕߎ߲߯ߣߌ߲߫߸ <a
         href="%{reconfirm}">ߦߊ߲߬ ߛߐ߲߬ߞߌ߲߫</a>
     confirm_resend:
       reconfirm_html: ߣߴߌ ߞߍ߫ ߘߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߕߎ߲߯ߣߌ߲߫߸ <a
         href="%{reconfirm}">ߦߊ߲߬ ߛߐ߲߬ߞߌ߲߫</a>
     confirm_resend:

-      success_html: ߊ߲ ߓߘߊ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߦߟߌߣߐ ߗߋ߫ %{email} ߡߊ߬ ߣߴߌ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ
-        ߟߊߛߙߋߦߊ߫ ߌߞߘߐ߫ ߣߌ߲߬߸ ߌ ߘߌ߫ ߛߋ߫ ߡߊߔߌ߲ (ߔߊ߬ߔߘߊ߬ ߟߊߘߊ߲) ߘߊߡߌ߬ߣߊ߫ ߟߊ߫.<br/><be/>ߣߴߌ
-        ߞߊ߬ ߊ߲ߕߌߛߑߔߊߡ ߞߊ߲ߞߋ ߟߊߓߊ߯ߙߊ߫ ߏ߬ ߡߍ߲ ߦߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ ߡߊߢߌߣߌ߲ߠߌ߲ ߗߋ߫ ߟߊ߫߸ ߌ
-        ߦߋ߫ ߘߍ߲߬ߞߣߍ߬ߦߊ߫ ߡߎߣߎ߲߬ ߖߊ߰ߣߌ߲߫ ߛߙߍߘߍ߫ ߘߐߞߏߟߏ߲ %{sender} ߞߏ ߘߐ߫ ߓߊߏ߬ ߊ߲ ߠߎ߬
-        ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߡߊߢߌߣߌ߲ߠߌ߲߫ ߛߌ߫ ߖߋ߬ߓߌ߬ ߟߊ߫.

       failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
     confirm_email:
       heading: ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߡߊߝߊ߬ߟߋ߲߬ߠߌ߲ ߠߊߛߙߋߦߊ߫
       failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
     confirm_email:
       heading: ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߡߊߝߊ߬ߟߋ߲߬ߠߌ߲ ߠߊߛߙߋߦߊ߫

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 379561ee5969ca43b6e2d0b55bc00c9acaf4352c..afefb5cc7de61d1b762e9165e12d4e105f0f4c2f 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2014,7 +2014,6 @@ oc:
       my profile: Mon perfil
       my settings: Mas opcions
       my comments: Mos comentaris
       my profile: Mon perfil
       my settings: Mas opcions
       my comments: Mos comentaris

-      oauth settings: paramètres OAuth

       blocks on me: Mos blocatges
       blocks by me: Mos blocatges
       send message: Mandar un messatge
       blocks on me: Mos blocatges
       blocks by me: Mos blocatges
       send message: Mandar un messatge

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 22eaba205adfff9c075d8d86e4faf97c7d7890b1..caa0832451499b5ccfa0c1d6aeb0b0f3f7600d87 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1685,10 +1685,6 @@ pl:
       reconfirm_html: Możesz ponownie przesłać wiadomość z potwierdzeniem <a href="%{reconfirm}">klikając
         tutaj</a>.
     confirm_resend:
       reconfirm_html: Możesz ponownie przesłać wiadomość z potwierdzeniem <a href="%{reconfirm}">klikając
         tutaj</a>.
     confirm_resend:

-      success_html: Wysłaliśmy nową wiadomość z potwierdzeniem na %{email} i jak tylko
-        aktywujesz swoje konto, będziesz mógł zacząć edytować mapę.<br /><br />Jeśli
-        używasz systemu antyspamowego, upewnij się, że do swojej białej listy dodałeś
-        adres %{sender}. Dzięki temu będziemy mogli skontaktować się z tobą bez problemów.

       failure: Nie odnaleziono użytkownika %{name}.
     confirm_email:
       heading: Porwierdzenie zmiany adresu mailowego
       failure: Nie odnaleziono użytkownika %{name}.
     confirm_email:
       heading: Porwierdzenie zmiany adresu mailowego


@@ -2509,10 +2505,6 @@ pl:
         jednak niektóre dodatkowe narzędzia lub serwer mogą go potrzebować.
       continue: Zarejestruj się
       terms accepted: Dziękujemy za przyjęcie nowych Warunków uczestnictwa!
         jednak niektóre dodatkowe narzędzia lub serwer mogą go potrzebować.
       continue: Zarejestruj się
       terms accepted: Dziękujemy za przyjęcie nowych Warunków uczestnictwa!

-      terms declined: Jest nam przykro, że zdecydowałeś się nie przyjmować nowych
-        Warunków uczestnictwa. Więcej informacji możesz znaleźć <a href="%{url}">na
-        tej stronie</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Warunki
       heading: Warunki
     terms:
       title: Warunki
       heading: Warunki


@@ -2543,6 +2535,11 @@ pl:
         france: Francja
         italy: Włochy
         rest_of_world: Reszta świata
         france: Francja
         italy: Włochy
         rest_of_world: Reszta świata

+    terms_declined_flash:
+      terms_declined_html: Jest nam przykro, że zdecydowałeś się nie przyjmować nowych
+        Warunków uczestnictwa. Więcej informacji możesz znaleźć <a href="%{url}">na
+        tej stronie</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nie znaleziono użytkownika
       heading: Użytkownik %{user} nie istnieje
     no_such_user:
       title: Nie znaleziono użytkownika
       heading: Użytkownik %{user} nie istnieje


@@ -2559,7 +2556,6 @@ pl:
       my profile: Profil
       my settings: Ustawienia
       my comments: Komentarze
       my profile: Profil
       my settings: Ustawienia
       my comments: Komentarze

-      oauth settings: Ustawienia oauth

       blocks on me: Otrzymane blokady
       blocks by me: Nałożone blokady
       send message: wyślij wiadomość
       blocks on me: Otrzymane blokady
       blocks by me: Nałożone blokady
       send message: wyślij wiadomość

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 297c60be874b30625046811b12af3b5094df4807..6cfb9a85d018ba558f341e4caa8e1ace2eac0047 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1645,11 +1645,6 @@ pt-BR:
       reconfirm_html: Caso precise que enviemos de novo o e-mail de confirmação, <a
         href="%{reconfirm}">clique aqui</a>.
     confirm_resend:
       reconfirm_html: Caso precise que enviemos de novo o e-mail de confirmação, <a
         href="%{reconfirm}">clique aqui</a>.
     confirm_resend:

-      success_html: Enviamos uma nova mensagem de confirmação para %{email} e, assim
-        que você confirmar o seu cadastro, poderá começar a mapear.<br /><br />Se
-        você usa um sistema antispam que exige uma mensagem de confirmação então certifique-se
-        de que o endereço %{sender} esteja na sua lista de e-mails confiáveis, já
-        que não conseguimos responder a nenhum pedido de confirmação.

       failure: Usuário %{name} não encontrado.
     confirm_email:
       heading: Confirmar uma mudança do endereço de e-mail
       failure: Usuário %{name} não encontrado.
     confirm_email:
       heading: Confirmar uma mudança do endereço de e-mail


@@ -2483,10 +2478,6 @@ pt-BR:
         mas certas ferramentas ou o servidor talvez ainda precisem.
       continue: Registrar-se
       terms accepted: Obrigado por aceitar os novos termos de contribuição!
         mas certas ferramentas ou o servidor talvez ainda precisem.
       continue: Registrar-se
       terms accepted: Obrigado por aceitar os novos termos de contribuição!

-      terms declined: Lamentamos que você tenha decidido não aceitar os novos termos
-        do contribuidor. Para mais informações, consulte <a href="%{url}">esta página
-        do wiki</a> .
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=pt-br

     terms:
       title: Termos
       heading: Termos
     terms:
       title: Termos
       heading: Termos


@@ -2515,6 +2506,11 @@ pt-BR:
         france: França
         italy: Itália
         rest_of_world: Outros países
         france: França
         italy: Itália
         rest_of_world: Outros países

+    terms_declined_flash:
+      terms_declined_html: Lamentamos que você tenha decidido não aceitar os novos
+        termos do contribuidor. Para mais informações, consulte <a href="%{url}">esta
+        página do wiki</a> .
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=pt-br

     no_such_user:
       title: Usuário não existe
       heading: O usuário %{user} não existe
     no_such_user:
       title: Usuário não existe
       heading: O usuário %{user} não existe


@@ -2531,7 +2527,6 @@ pt-BR:
       my profile: Meu perfil
       my settings: Minhas configurações
       my comments: Meus comentários
       my profile: Meu perfil
       my settings: Minhas configurações
       my comments: Meus comentários

-      oauth settings: configurações do oauth

       blocks on me: Bloqueios sobre mim
       blocks by me: Bloqueios por mim
       send message: Enviar mensagem
       blocks on me: Bloqueios sobre mim
       blocks by me: Bloqueios por mim
       send message: Enviar mensagem

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0d7db73a432b23b9ef58ede8d8d1eb1e3147a9cc..062f49c9e8a4ad7fef980b91e4f7bcd17fdf3a2a 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1634,11 +1634,6 @@ pt-PT:
       reconfirm_html: Se for preciso reeenviar o e-mail de confirmação, <a href="%{reconfirm}">clica
         aqui</a>.
     confirm_resend:
       reconfirm_html: Se for preciso reeenviar o e-mail de confirmação, <a href="%{reconfirm}">clica
         aqui</a>.
     confirm_resend:

-      success_html: Enviámos um e-mail de confirmação para %{email}. Assim que confirmares
-        a tua conta, poderás começar a mapear.<br /><br />Se usares um sistema antispam
-        que envie pedidos de confirmação, por favor, coloca o endereço %{sender} na
-        lista branca de remetentes seguros, uma vez que não temos possibilidade de
-        responder a pedidos de confirmação.

       failure: O utilizador %{name} não foi encontrado.
     confirm_email:
       heading: Confirmar alteração de e-mail
       failure: O utilizador %{name} não foi encontrado.
     confirm_email:
       heading: Confirmar alteração de e-mail


@@ -2464,9 +2459,6 @@ pt-PT:
         de uma.
       continue: Criar conta
       terms accepted: Obrigado por aceitares os novos termos de contribuidor!
         de uma.
       continue: Criar conta
       terms accepted: Obrigado por aceitares os novos termos de contribuidor!

-      terms declined: Lamentamos que não tenhas aceitado os novos Termos de Contribuidor.
-        Para mais informações, consulta <a href="%{url}">esta página wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Pt:Contributor_Terms_Declined

     terms:
       title: Termos
       heading: Termos
     terms:
       title: Termos
       heading: Termos


@@ -2497,6 +2489,10 @@ pt-PT:
         france: França
         italy: Itália
         rest_of_world: Resto do mundo
         france: França
         italy: Itália
         rest_of_world: Resto do mundo

+    terms_declined_flash:
+      terms_declined_html: Lamentamos que não tenhas aceitado os novos Termos de Contribuidor.
+        Para mais informações, consulta <a href="%{url}">esta página wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Pt:Contributor_Terms_Declined

     no_such_user:
       title: Utilizador inexistente
       heading: O utilizador %{user} não existe
     no_such_user:
       title: Utilizador inexistente
       heading: O utilizador %{user} não existe


@@ -2514,7 +2510,6 @@ pt-PT:
       my profile: Perfil
       my settings: Definições
       my comments: Comentários
       my profile: Perfil
       my settings: Definições
       my comments: Comentários

-      oauth settings: Configurações OAuth

       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios
       send message: Enviar mensagem
       blocks on me: Quem me bloqueou
       blocks by me: Os meus bloqueios
       send message: Enviar mensagem

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 73c0cc3c52b2740aa54e7c0900906cd36e0e947d..25ccd2a6d0efbdb534854ca0db1aef656d76b713 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1562,11 +1562,6 @@ ro:
       reconfirm_html: Dacă aveți nevoie să retrimitem e-mailul de confirmare, <a href="%{reconfirm}">faceți
         clic aici</a>.
     confirm_resend:
       reconfirm_html: Dacă aveți nevoie să retrimitem e-mailul de confirmare, <a href="%{reconfirm}">faceți
         clic aici</a>.
     confirm_resend:

-      success_html: Am trimis o nouă notă de confirmare către %{email} și de îndată
-        ce vă confirmați contul, veți putea obține cartografiere.<br /><br />Dacă
-        utilizați un sistem antispam care trimite cereri de confirmare, vă rugăm să
-        asigurați-vă că ați lăsat pe lista albă %{sender} ca fiind imposibil să răspundeți
-        la orice solicitări de confirmare.

       failure: Utilizatorul %{name} nu a fost găsit.
     confirm_email:
       heading: Confirmați o schimbare a adresei de e-mail
       failure: Utilizatorul %{name} nu a fost găsit.
     confirm_email:
       heading: Confirmați o schimbare a adresei de e-mail


@@ -2386,9 +2381,6 @@ ro:
         dar unele instrumente suplimentare sau serverul pot avea nevoie de una.
       continue: Înregistrare
       terms accepted: Vă mulțumim pentru acceptarea noilor termeni de contribuire!
         dar unele instrumente suplimentare sau serverul pot avea nevoie de una.
       continue: Înregistrare
       terms accepted: Vă mulțumim pentru acceptarea noilor termeni de contribuire!

-      terms declined: Ne pare rău că ați decis să nu acceptați noii Termeni de Contributor.
-        Pentru mai multe informații, consultați <a href="%{url}">această pagină wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Termeni
       heading: Termeni
     terms:
       title: Termeni
       heading: Termeni


@@ -2420,6 +2412,11 @@ ro:
         france: Franța
         italy: Italia
         rest_of_world: Restul lumii
         france: Franța
         italy: Italia
         rest_of_world: Restul lumii

+    terms_declined_flash:
+      terms_declined_html: Ne pare rău că ați decis să nu acceptați noii Termeni de
+        Contributor. Pentru mai multe informații, consultați <a href="%{url}">această
+        pagină wiki</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nici un utilizator găsit
       heading: Utilizatorul %{user} nu există
     no_such_user:
       title: Nici un utilizator găsit
       heading: Utilizatorul %{user} nu există


@@ -2436,7 +2433,6 @@ ro:
       my profile: Profilul meu
       my settings: Setările mele
       my comments: Comentariile mele
       my profile: Profilul meu
       my settings: Setările mele
       my comments: Comentariile mele

-      oauth settings: Setările pentru oaut

       blocks on me: Blochează pe mine
       blocks by me: Blochează de mine
       send message: Trimite mesajul
       blocks on me: Blochează pe mine
       blocks by me: Blochează de mine
       send message: Trimite mesajul

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6fac951b8a5e5459b3e758c7dbb2b8938fce5c27..8934ad84c2bcfd43a6df827bbe2d6e57a7ffd18b 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1608,11 +1608,6 @@ ru:
       reconfirm_html: Если хотите, чтобы мы выслали ещё одно подтверждение по электронной
         почте, <a href="%{reconfirm}">нажмите здесь</a>.
     confirm_resend:
       reconfirm_html: Если хотите, чтобы мы выслали ещё одно подтверждение по электронной
         почте, <a href="%{reconfirm}">нажмите здесь</a>.
     confirm_resend:

-      success_html: Мы выслали новое письмо с подтверждением на адрес %{email}, и
-        как только вы подтвердите вашу учётную запись, вы можете начать работать с
-        картами.<br /><br />Если вы используете антиспам-систему, посылающую запросы
-        на подтверждение, пожалуйста, внесите адрес %{sender} в ваш белый список,
-        так как мы не можем отвечать на такие запросы.

       failure: Участник %{name} не найден.
     confirm_email:
       heading: Подтвердите изменение адреса электронной почты
       failure: Участник %{name} не найден.
     confirm_email:
       heading: Подтвердите изменение адреса электронной почты


@@ -2431,9 +2426,6 @@ ru:
         он необходим
       continue: Зарегистрироваться
       terms accepted: Спасибо за принятие новых условий участия!
         он необходим
       continue: Зарегистрироваться
       terms accepted: Спасибо за принятие новых условий участия!

-      terms declined: Нам жаль, что вы решили не принимать новые условия участия.
-        Дополнительную информацию можно найти <a href="%{url}">на следующей странице</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=ru

     terms:
       title: Условия
       heading: Условия сотрудничества
     terms:
       title: Условия
       heading: Условия сотрудничества


@@ -2463,6 +2455,10 @@ ru:
         france: На французском
         italy: На итальянском
         rest_of_world: Остальной мир
         france: На французском
         italy: На итальянском
         rest_of_world: Остальной мир

+    terms_declined_flash:
+      terms_declined_html: Нам жаль, что вы решили не принимать новые условия участия.
+        Дополнительную информацию можно найти <a href="%{url}">на следующей странице</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=ru

     no_such_user:
       title: Нет такого пользователя
       heading: Пользователя %{user} не существует
     no_such_user:
       title: Нет такого пользователя
       heading: Пользователя %{user} не существует


@@ -2479,9 +2475,6 @@ ru:
       my profile: Мой профиль
       my settings: Мои настройки
       my comments: Мои комментарии
       my profile: Мой профиль
       my settings: Мои настройки
       my comments: Мои комментарии

-      oauth settings: |2-
-
-        настройки OAuth

       blocks on me: Мои блокировки
       blocks by me: Наложенные мною блокировки
       send message: Отправить сообщение
       blocks on me: Мои блокировки
       blocks by me: Наложенные мною блокировки
       send message: Отправить сообщение

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 4dfaac501c735ff1000e4445b1436bf0ff150892..ecf47f26348a9836970320e01c3ed979a87038fc 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -18,6 +18,7 @@ scn:
         create: Sarva
       diary_entry:
         create: Pùbblica
         create: Sarva
       diary_entry:
         create: Pùbblica

+        update: Agghiorna

       message:
         create: Manna
       client_application:
       message:
         create: Manna
       client_application:


@@ -1061,11 +1062,6 @@ scn:
       reconfirm_html: Si voi chi ti mannamu n'àutra vota lu missaggiu di cunferma,
         <a href="%{reconfirm}">clicca ccà</a>.
     confirm_resend:
       reconfirm_html: Si voi chi ti mannamu n'àutra vota lu missaggiu di cunferma,
         <a href="%{reconfirm}">clicca ccà</a>.
     confirm_resend:

-      success_html: Ti mannammu n'àutru missaggiu di cunferma unni %{email}, e lu
-        forti chi cunfermi lu tò cuntu poi accuminzari a mappari.<br /><br />S'adòpiri
-        nu sistema anti-spam chi manna addumannati di cunferma, pi favuri hai a mèttiri
-        lu nnirizzu %{sender} ntâ lista janca, pirchì nuàutri nun putemu arrispùnniri
-        a nudda addumannata di cunferma.

       failure: Utenti %{name} nun attruvatu.
     confirm_email:
       heading: Cunferma dû canciu dû nnirizzu di posta
       failure: Utenti %{name} nun attruvatu.
     confirm_email:
       heading: Cunferma dû canciu dû nnirizzu di posta


@@ -1806,9 +1802,6 @@ scn:
       continue: Scrìviti
       terms accepted: T'arringrazziamu d'aviri accittatu li cunnizzioni di cuntribbuzzioni
         novi!
       continue: Scrìviti
       terms accepted: T'arringrazziamu d'aviri accittatu li cunnizzioni di cuntribbuzzioni
         novi!

-      terms declined: Ni dispiaci chi dicidisti di nun accittari li cunnizzioni di
-        cuntribbuzzioni novi. Pi maiuri nfurmazzioni, pi favuri talìa <a href="%{url}">sta
-        pàggina dâ wiki</a>.

     terms:
       title: Cunnizzioni di cuntribbuzzioni
       heading: Cunnizzioni di cuntribbuzzioni
     terms:
       title: Cunnizzioni di cuntribbuzzioni
       heading: Cunnizzioni di cuntribbuzzioni


@@ -1826,6 +1819,10 @@ scn:
         france: Francia
         italy: Italia
         rest_of_world: Restu dû munnu
         france: Francia
         italy: Italia
         rest_of_world: Restu dû munnu

+    terms_declined_flash:
+      terms_declined_html: Ni dispiaci chi dicidisti di nun accittari li cunnizzioni
+        di cuntribbuzzioni novi. Pi maiuri nfurmazzioni, pi favuri talìa <a href="%{url}">sta
+        pàggina dâ wiki</a>.

     no_such_user:
       title: St'utenti nun c'è
       heading: L’utenti %{user} nun esisti
     no_such_user:
       title: St'utenti nun c'è
       heading: L’utenti %{user} nun esisti


@@ -1841,7 +1838,6 @@ scn:
       my profile: Lu mè prufilu
       my settings: Li mè mpustazzioni
       my comments: Li mè cummenti
       my profile: Lu mè prufilu
       my settings: Li mè mpustazzioni
       my comments: Li mè cummenti

-      oauth settings: Mpustazzioni di oauth

       blocks on me: Cu blocca a mìa
       blocks by me: A cu bloccu iu
       send message: Manna nu missaggiu
       blocks on me: Cu blocca a mìa
       blocks by me: A cu bloccu iu
       send message: Manna nu missaggiu

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 190835ebaa77f6d8a1a277d1a2750cf96bc3c72d..3b83bc1dc57d3425aa1305b4c064817a29c7b69d 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1150,11 +1150,6 @@ sk:
       reconfirm_html: Ak potrebujete, aby sme vám potvrdzovací e-mail poslali znova,
         <a href="%{reconfirm}">kliknite sem</a>.
     confirm_resend:
       reconfirm_html: Ak potrebujete, aby sme vám potvrdzovací e-mail poslali znova,
         <a href="%{reconfirm}">kliknite sem</a>.
     confirm_resend:

-      success_html: Na adresu %{email} sme Vám poslali potvrdzovací e-mail. Akonáhle
-        svoje konto potvrdíte, budete môcť začať tvoriť mapy.<br /><br />Ak náhodou
-        používate systém pre ochranu proti nevyžiadanej pošte (anti-spam), ktorý vyžaduje
-        potvrdenia, nezabudnite definovať výnimku pre odosielateľa %{sender}, nakoľko
-        na žiadosti o potvrdenie nie sme schopní reagovať.

       failure: Používateľ %{name} neexistuje.
     confirm_email:
       heading: Potvrdiť zmenu e-mailovej adresy
       failure: Používateľ %{name} neexistuje.
     confirm_email:
       heading: Potvrdiť zmenu e-mailovej adresy


@@ -1776,8 +1771,6 @@ sk:
       use external auth: Prípadne použite na prihlásenie služby tretích strán
       continue: Zaregistrovať sa
       terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania!
       use external auth: Prípadne použite na prihlásenie služby tretích strán
       continue: Zaregistrovať sa
       terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania!

-      terms declined: Je nám ľúto, že ste sa rozhodli neprijať nové Podmienky prispievania.
-        Bližšie informácie nájdete na<a href="%{url}">tejto wiki-stránke</a>.

     terms:
       title: Podmienky
       heading: Podmienky
     terms:
       title: Podmienky
       heading: Podmienky


@@ -1796,6 +1789,9 @@ sk:
         france: Francúzsko
         italy: Taliansko
         rest_of_world: Zvyšok sveta
         france: Francúzsko
         italy: Taliansko
         rest_of_world: Zvyšok sveta

+    terms_declined_flash:
+      terms_declined_html: Je nám ľúto, že ste sa rozhodli neprijať nové Podmienky
+        prispievania. Bližšie informácie nájdete na<a href="%{url}">tejto wiki-stránke</a>.

     no_such_user:
       title: Taký používateľ neexistuje
       heading: Používateľ %{user} neexistuje
     no_such_user:
       title: Taký používateľ neexistuje
       heading: Používateľ %{user} neexistuje


@@ -1811,7 +1807,6 @@ sk:
       my profile: Môj profil
       my settings: Moje nastavenia
       my comments: Moje komentáre
       my profile: Môj profil
       my settings: Moje nastavenia
       my comments: Moje komentáre

-      oauth settings: oauth nastavenia

       blocks on me: Moje zablokovania
       blocks by me: Mnou udelené bloky
       send message: Poslať správu
       blocks on me: Moje zablokovania
       blocks by me: Mnou udelené bloky
       send message: Poslať správu

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a57636fe213769f6c02bb6fa77ed7dfd612e52ac..0055e2f1ffcf816c00ed07a165655cdd7d47ebf8 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1252,12 +1252,6 @@ sl:
       reconfirm_html: Če hočete da vam znova pošljemo potrditveno e-pošto, <a href="%{reconfirm}">kliknite
         tukaj</a>.
     confirm_resend:
       reconfirm_html: Če hočete da vam znova pošljemo potrditveno e-pošto, <a href="%{reconfirm}">kliknite
         tukaj</a>.
     confirm_resend:

-      success_html: Poslali smo potrditveno sporočilo na %{email} in takoj, ko boste
-        potrdili vaš račun, boste lahko začeli kartirati.<br /><br />V kolikor vaš
-        filter neželene pošte pred sprejemom sporočil neznanih pošiljateljev zahteva
-        potrditev, vas prosimo, da pošiljatelja %{sender} uvrstite na seznam dovoljenih
-        pošiljateljev. Sistem pač ne zmore dovolj inteligentno odgovarjati na vse
-        take zahtevke.

       failure: Uporabnika %{name} ni bilo mogoče najti.
     confirm_email:
       heading: Potrdite spremembo naslova e-pošte
       failure: Uporabnika %{name} ni bilo mogoče najti.
     confirm_email:
       heading: Potrdite spremembo naslova e-pošte


@@ -1894,8 +1888,6 @@ sl:
         nekatera dodatna orodja ali strežnik morda še vedno zahtevala.
       continue: Registracija
       terms accepted: Hvala za sprejem novih pogojev prispevanja!
         nekatera dodatna orodja ali strežnik morda še vedno zahtevala.
       continue: Registracija
       terms accepted: Hvala za sprejem novih pogojev prispevanja!

-      terms declined: Žal nam je, da ste se odločili, da ne sprejmete novih "contributor
-        terms". Za več informacij, si oglejte <a href="%{url}">to wiki stran</a>.

     terms:
       title: Pogoji
       heading: Pogoji
     terms:
       title: Pogoji
       heading: Pogoji


@@ -1916,6 +1908,9 @@ sl:
         france: Francija
         italy: Italija
         rest_of_world: Ostali svet
         france: Francija
         italy: Italija
         rest_of_world: Ostali svet

+    terms_declined_flash:
+      terms_declined_html: Žal nam je, da ste se odločili, da ne sprejmete novih "contributor
+        terms". Za več informacij, si oglejte <a href="%{url}">to wiki stran</a>.

     no_such_user:
       title: Ni tega uporabnika
       heading: Uporabnik %{user} ne obstaja
     no_such_user:
       title: Ni tega uporabnika
       heading: Uporabnik %{user} ne obstaja


@@ -1932,7 +1927,6 @@ sl:
       my profile: Moj profil
       my settings: Moje nastavitve
       my comments: Moje pripombe
       my profile: Moj profil
       my settings: Moje nastavitve
       my comments: Moje pripombe

-      oauth settings: Nastavitve OAuth

       blocks on me: Blokade mene
       blocks by me: Moje blokade
       send message: Pošlji sporočilo
       blocks on me: Blokade mene
       blocks by me: Moje blokade
       send message: Pošlji sporočilo

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index a8f0b0d1f7bba93587be59a2f18f2320e14e2758..d1d514e814aaf93703b2537b9a2c824c9ca068a2 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -968,11 +968,6 @@ sq:
       already active: Kjo llogari tashmë është konfirmuar.
       unknown token: Kodi i konfirmimit ka skaduar ose nuk ekziston.
     confirm_resend:
       already active: Kjo llogari tashmë është konfirmuar.
       unknown token: Kodi i konfirmimit ka skaduar ose nuk ekziston.
     confirm_resend:

-      success_html: Ne kemi dërguar një shënim konfrimimi tek %{email} juaj dhe sapo
-        të konfirmoni llogarnië ju do të jeni në gjendje të filloni punën me harta.<br
-        /><br />Nëse ju përdorni një antispam sistem që dërgon kërkesat e konfirmimit
-        atëherë ju lutem që të shtoni në listën e bardhë %{sender} pasi që ne nuk
-        do të jemi në gjendje të përgjigjemi ndaj çfarëdo kërkese për konfirmim.

       failure: Përdoruesi %{name} nuk u gjet.
     confirm_email:
       heading: Konfirmoni ndryshimin e adresës së emailit
       failure: Përdoruesi %{name} nuk u gjet.
     confirm_email:
       heading: Konfirmoni ndryshimin e adresës së emailit


@@ -1395,7 +1390,6 @@ sq:
       display name description: Emri yt publik. Ti mund ta ndryshosh më vonë në preferenca.
       continue: Vazhdo
       terms accepted: Faleminderit për pranimin kushteve të reja për kontribues!
       display name description: Emri yt publik. Ti mund ta ndryshosh më vonë në preferenca.
       continue: Vazhdo
       terms accepted: Faleminderit për pranimin kushteve të reja për kontribues!

-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Kushtet
       heading: Kushtet
     terms:
       title: Kushtet
       heading: Kushtet


@@ -1410,6 +1404,8 @@ sq:
         france: Francë
         italy: Itali
         rest_of_world: Pjesa tjetër e botës
         france: Francë
         italy: Itali
         rest_of_world: Pjesa tjetër e botës

+    terms_declined_flash:
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Nuk ka përdorues të tillë
       heading: Përdoruesi %{user} nuk ekziston
     no_such_user:
       title: Nuk ka përdorues të tillë
       heading: Përdoruesi %{user} nuk ekziston


@@ -1425,7 +1421,6 @@ sq:
       my profile: Profili im
       my settings: Preferencat e mia
       my comments: Komentet e mia
       my profile: Profili im
       my settings: Preferencat e mia
       my comments: Komentet e mia

-      oauth settings: Konfigurimet i rregullave

       blocks on me: Blloqet mbi mua
       blocks by me: Bllokimet nga unë
       send message: Dërgo mesazh
       blocks on me: Blloqet mbi mua
       blocks by me: Bllokimet nga unë
       send message: Dërgo mesazh

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 547f35c22979d3628356488f68afbfdd2cdbef20..d9903174484a8fe82ff9708dc6ebde1fdcb76b91 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -793,10 +793,6 @@ sr-Latn:
       already active: Ovaj nalog je već potvrđen.
       unknown token: Izgleda da taj novčić ne postoji.
     confirm_resend:
       already active: Ovaj nalog je već potvrđen.
       unknown token: Izgleda da taj novčić ne postoji.
     confirm_resend:

-      success_html: Poslali smo novu potvrdnu poruku na %{email}. Nakon što potvrdite
-        svoj nalog, moći ćete da počnete s mapiranjem.<br /><br />Ako koristite sistem
-        protiv nepoželjnih poruka, dodajte %{sender} u spisak dozvoljenih adresa jer
-        nismo u mogućnosti da odgovorimo na bilo koji zahtev za potvrdu.

       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrda promene e-adrese
       failure: Korisnik %{name} nije pronađen.
     confirm_email:
       heading: Potvrda promene e-adrese


@@ -1284,9 +1280,6 @@ sr-Latn:
         promeniti u postavkama.
       continue: Nastavi
       terms accepted: Hvala vam što prihvatate nove uslove uređivanja.
         promeniti u postavkama.
       continue: Nastavi
       terms accepted: Hvala vam što prihvatate nove uslove uređivanja.

-      terms declined: Žao nam je što ste odlučili da ne prihvatite nove uslove uređivanja.
-        Pogledajte <a href="%{url}">ovu stranicu</a> za više informacija.
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec

     terms:
       title: Uslovi uređivanja
       heading: Uslovi uređivanja
     terms:
       title: Uslovi uređivanja
       heading: Uslovi uređivanja


@@ -1305,6 +1298,10 @@ sr-Latn:
         france: Francuska
         italy: Italija
         rest_of_world: Ostatak sveta
         france: Francuska
         italy: Italija
         rest_of_world: Ostatak sveta

+    terms_declined_flash:
+      terms_declined_html: Žao nam je što ste odlučili da ne prihvatite nove uslove
+        uređivanja. Pogledajte <a href="%{url}">ovu stranicu</a> za više informacija.
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec

     no_such_user:
       title: Nema takvog korisnika
       heading: Korisnik %{user} ne postoji
     no_such_user:
       title: Nema takvog korisnika
       heading: Korisnik %{user} ne postoji


@@ -1317,7 +1314,6 @@ sr-Latn:
       my traces: moji tragovi
       my settings: moje postavke
       my comments: moji komentari
       my traces: moji tragovi
       my settings: moje postavke
       my comments: moji komentari

-      oauth settings: oAuth postavke

       blocks on me: blokiranja na mene
       blocks by me: moja blokiranja
       send message: pošalji poruku
       blocks on me: blokiranja na mene
       blocks by me: moja blokiranja
       send message: pošalji poruku

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f0e7f49544e3a9ddaf5ff4dfa232b30cde3e73ea..e24bf2ebb01519db067762beda0bc2b4d4361c93 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1322,10 +1322,6 @@ sr:
       reconfirm_html: Ако треба да нам поново пошаљеш е-писмо, <a href="%{reconfirm}">кликни
         овде</a>.
     confirm_resend:
       reconfirm_html: Ако треба да нам поново пошаљеш е-писмо, <a href="%{reconfirm}">кликни
         овде</a>.
     confirm_resend:

-      success_html: Послали смо нову потврдну поруку на %{email}. Након што потврдите
-        свој налог, моћи ћете да почнете с мапирањем.<br /><br />Ако користите систем
-        против непожељних порука, додајте %{sender} у списак дозвољених адреса јер
-        нисмо у могућности да одговоримо на било који захтев за потврду.

       failure: Корисник %{name} није пронађен.
     confirm_email:
       heading: Потврда промене имејл адресе
       failure: Корисник %{name} није пронађен.
     confirm_email:
       heading: Потврда промене имејл адресе


@@ -2093,9 +2089,6 @@ sr:
         али неки додатни алати или сервер можда је ипак буду захтевали.
       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.
         али неки додатни алати или сервер можда је ипак буду захтевали.
       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.

-      terms declined: Жао нам је што сте одлучили да не прихватите нове услове уређивања.
-        Погледајте <a href="%{url}">ову страницу</a> за више информација.
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec

     terms:
       title: Услови
       heading: Услови
     terms:
       title: Услови
       heading: Услови


@@ -2114,6 +2107,10 @@ sr:
         france: Француска
         italy: Италија
         rest_of_world: Остатак света
         france: Француска
         italy: Италија
         rest_of_world: Остатак света

+    terms_declined_flash:
+      terms_declined_html: Жао нам је што сте одлучили да не прихватите нове услове
+        уређивања. Погледајте <a href="%{url}">ову страницу</a> за више информација.
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=sr-ec

     no_such_user:
       title: Нема таквог корисника
       heading: Корисник %{user} не постоји
     no_such_user:
       title: Нема таквог корисника
       heading: Корисник %{user} не постоји


@@ -2130,7 +2127,6 @@ sr:
       my profile: Мој профил
       my settings: Моје поставке
       my comments: Моји коментари
       my profile: Мој профил
       my settings: Моје поставке
       my comments: Моји коментари

-      oauth settings: oAuth поставке

       blocks on me: Мени забрањено
       blocks by me: Моје забране
       send message: Пошаљи поруку
       blocks on me: Мени забрањено
       blocks by me: Моје забране
       send message: Пошаљи поруку

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index c583cbca9230c5a3e459adc110f4a037b10d89e3..25c5594d76e4b22913891072076668eaf0584d17 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1566,10 +1566,6 @@ sv:
       reconfirm_html: Om du vill att vi ska skicka bekräftelsemailet igen, <a href="%{reconfirm}">klicka
         här</a>.
     confirm_resend:
       reconfirm_html: Om du vill att vi ska skicka bekräftelsemailet igen, <a href="%{reconfirm}">klicka
         här</a>.
     confirm_resend:

-      success_html: Vi har skickat ett nytt bekräftelsemeddelande till %{email} och
-        så snart du bekräftat ditt konto kommer du kunna börja kartera.<br /><br />Om
-        du använder ett antispamsystem som skickar bekräftelsemeddelanden se till
-        att du vitlistar %{sender} då vi inte kan svara på några sådana begäranden.

       failure: Användaren %{name} hittades inte.
     confirm_email:
       heading: Bekräfta byte av e-postadress
       failure: Användaren %{name} hittades inte.
     confirm_email:
       heading: Bekräfta byte av e-postadress


@@ -2396,9 +2392,6 @@ sv:
       continue: Skapa ett konto
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!
       continue: Skapa ett konto
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!

-      terms declined: Vi beklagar att du bestämt dig för att inte acceptera de nya
-        användarvillkoren. För mer information, se <a href="%{url}">denna wikisida</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Villkor för deltagare
       heading: Villkor för deltagare
     terms:
       title: Villkor för deltagare
       heading: Villkor för deltagare


@@ -2430,6 +2423,10 @@ sv:
         france: Frankrike
         italy: Italien
         rest_of_world: Övriga världen
         france: Frankrike
         italy: Italien
         rest_of_world: Övriga världen

+    terms_declined_flash:
+      terms_declined_html: Vi beklagar att du bestämt dig för att inte acceptera de
+        nya användarvillkoren. För mer information, se <a href="%{url}">denna wikisida</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Finns ingen sådan användare
       heading: Användaren %{user} finns inte
     no_such_user:
       title: Finns ingen sådan användare
       heading: Användaren %{user} finns inte


@@ -2446,7 +2443,6 @@ sv:
       my profile: Min profil
       my settings: Mina inställningar
       my comments: Mina kommentarer
       my profile: Min profil
       my settings: Mina inställningar
       my comments: Mina kommentarer

-      oauth settings: oauth-inställningar

       blocks on me: Blockeringar av mig
       blocks by me: Blockeringar lagda av mig
       send message: Skicka meddelande
       blocks on me: Blockeringar av mig
       blocks by me: Blockeringar lagda av mig
       send message: Skicka meddelande

diff --git a/config/locales/te.yml b/config/locales/te.yml
index f724e87486e66534ae3e0566a631d1d2d2114186..1627976f00d7c056ceade6e81abe076b5bcf7039 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -733,7 +733,6 @@ te:
       my profile: నా ప్రొఫైలు
       my settings: నా అమరికలు
       my comments: నా వ్యాఖ్యలు
       my profile: నా ప్రొఫైలు
       my settings: నా అమరికలు
       my comments: నా వ్యాఖ్యలు

-      oauth settings: oauth అమరికలు

       blocks on me: నా మీద నిరోధాలు
       blocks by me: నా నిరోధాలు
       send message: సందేశాన్ని పంపించు
       blocks on me: నా మీద నిరోధాలు
       blocks by me: నా నిరోధాలు
       send message: సందేశాన్ని పంపించు

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 290c10550f76d6365bd5869f14b04ccdeb22d29e..64e64d34db61a7545ad114e86379dd77a8cce29a 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1323,10 +1323,6 @@ th:
       unknown token: รหัสยืนยันหมดอายุหรือผิดพลาด
       reconfirm_html: ถ้าท่านต้องการให้เราส่งอีเมลยืนยันซ้ำ <a href="%{reconfirm}">โปรดคลิกที่นี่</a>.
     confirm_resend:
       unknown token: รหัสยืนยันหมดอายุหรือผิดพลาด
       reconfirm_html: ถ้าท่านต้องการให้เราส่งอีเมลยืนยันซ้ำ <a href="%{reconfirm}">โปรดคลิกที่นี่</a>.
     confirm_resend:

-      success_html: เราได้ส่งบันทึกยืนยันใหม่ไปยังอีเมล %{email} เมื่อท่านยืนยันแล้ว
-        จะสามารถเริ่มทำแผนที่ได้ทันที<br /><br />ถ้าท่านมีระบบป้องกันสแปม โปรดให้
-        %{sender} อยู่ในรายการปลอดภัย (whitelist) เพราะเราไม่สามารถตอบอีเมลยืนยันใด
-        ๆ ได้

       failure: ไม่พบผู้ใช้ %{name}
     confirm_email:
       heading: ยืนยันการเปลี่ยนแปลงที่อยู่อีเมล
       failure: ไม่พบผู้ใช้ %{name}
     confirm_email:
       heading: ยืนยันการเปลี่ยนแปลงที่อยู่อีเมล


@@ -2005,8 +2001,6 @@ th:
         แต่ถ้าเข้าใช้งานเครื่องมือบางตัวหรือเซิร์ฟเวอร์ก็ยังจำเป็นต้องมีรหัสผ่านอยู่
       continue: สมัครบัญชี
       terms accepted: ขอบคุณสำหรับการตอบรับเงื่อนไขผู้ร่วมสร้างสรรค์!
         แต่ถ้าเข้าใช้งานเครื่องมือบางตัวหรือเซิร์ฟเวอร์ก็ยังจำเป็นต้องมีรหัสผ่านอยู่
       continue: สมัครบัญชี
       terms accepted: ขอบคุณสำหรับการตอบรับเงื่อนไขผู้ร่วมสร้างสรรค์!

-      terms declined: ขออภัย ท่านมิได้ยอมรับเงื่อนไขผู้ร่วมสร้างสรรค์ เราจึงไม่สามารถดำเนินการต่อไปได้
-        รายละเอียดเพิ่มเติมโปรดดู<a href="%{url}">หน้านี้</a>.

     terms:
       title: ข้อกำหนด
       heading: ข้อกำหนด
     terms:
       title: ข้อกำหนด
       heading: ข้อกำหนด


@@ -2023,6 +2017,9 @@ th:
         france: ฝรั่งเศส
         italy: อิตาลี
         rest_of_world: พื้นที่อื่น ๆ ในโลก
         france: ฝรั่งเศส
         italy: อิตาลี
         rest_of_world: พื้นที่อื่น ๆ ในโลก

+    terms_declined_flash:
+      terms_declined_html: ขออภัย ท่านมิได้ยอมรับเงื่อนไขผู้ร่วมสร้างสรรค์ เราจึงไม่สามารถดำเนินการต่อไปได้
+        รายละเอียดเพิ่มเติมโปรดดู<a href="%{url}">หน้านี้</a>.

     no_such_user:
       title: ไม่มีผู้ใช้ที่ระบุ
       heading: ไม่พบผู้ใช้ชื่อ %{user}
     no_such_user:
       title: ไม่มีผู้ใช้ที่ระบุ
       heading: ไม่พบผู้ใช้ชื่อ %{user}


@@ -2038,7 +2035,6 @@ th:
       my profile: ประวัติของฉัน
       my settings: การตั้งค่าของฉัน
       my comments: ความคิดเห็นของฉัน
       my profile: ประวัติของฉัน
       my settings: การตั้งค่าของฉัน
       my comments: ความคิดเห็นของฉัน

-      oauth settings: ตั้งค่าการอนุญาต OAuth

       blocks on me: การถูกระงับของฉัน
       blocks by me: ผู้ใช้ที่ข้าพเจ้ากีดกัน
       send message: ส่งข้อความ
       blocks on me: การถูกระงับของฉัน
       blocks by me: ผู้ใช้ที่ข้าพเจ้ากีดกัน
       send message: ส่งข้อความ

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index dd848ec8ee4018764105c3f8230ac754bbdfc81e..1730e18da1354384fc0154149d4be506314fa392 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1019,12 +1019,6 @@ tl:
       already active: Natiyak na ang akawnt na ito.
       unknown token: Tila lumipas o hindi umiiral ang kahalip na iyan.
     confirm_resend:
       already active: Natiyak na ang akawnt na ito.
       unknown token: Tila lumipas o hindi umiiral ang kahalip na iyan.
     confirm_resend:

-      success_html: Nagpadala kami ng isang paunawa ng pagtitiyak sa %{email} at kapag
-        tiniyak mo nang iyong akawnt sa lalong madaling panahon maaari ka nang magsimula
-        sa pagmamapa.<br /><br />Kung gumagamit ka ng isang sistemang panlaban sa
-        basurang liham na nagpapadala ng mga kahilingan ng pagtitiyak, pakitiyak na
-        itala mo sa puting-talaan ang %{sender} dahil hindi namin magagawang tumugon
-        sa anumang mga kahilingan ng pagtitiyak.

       failure: Hindi natagpuan ang tagagamit na si %{name}.
     confirm_email:
       heading: Tiyakin ang isang pagpapalit ng tirahan ng e-liham
       failure: Hindi natagpuan ang tagagamit na si %{name}.
     confirm_email:
       heading: Tiyakin ang isang pagpapalit ng tirahan ng e-liham


@@ -1638,10 +1632,6 @@ tl:
         madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan.
       continue: Magpatala
       terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag!
         madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan.
       continue: Magpatala
       terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag!

-      terms declined: Ikinalulungkot namin na nagpasya kang huwag tanggapin ang bagong
-        mga Tuntunin ng Tagapag-ambag. Para sa mas marami pang kabatiran, pakitingnan
-        ang <a href="%{url}">pahinang ito ng wiki</a>.
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 'Mga tuntunin:'
       heading: Tuntunin sa taga-ambag
     terms:
       title: 'Mga tuntunin:'
       heading: Tuntunin sa taga-ambag


@@ -1662,6 +1652,11 @@ tl:
         france: Pransiya
         italy: Italya
         rest_of_world: Iba pang bahagi ng mundo
         france: Pransiya
         italy: Italya
         rest_of_world: Iba pang bahagi ng mundo

+    terms_declined_flash:
+      terms_declined_html: Ikinalulungkot namin na nagpasya kang huwag tanggapin ang
+        bagong mga Tuntunin ng Tagapag-ambag. Para sa mas marami pang kabatiran, pakitingnan
+        ang <a href="%{url}">pahinang ito ng wiki</a>.
+      terms_declined_url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: Walang ganyang tagagamit
       heading: Hindi umiiral ang tagagamit na %{user}
     no_such_user:
       title: Walang ganyang tagagamit
       heading: Hindi umiiral ang tagagamit na %{user}


@@ -1675,7 +1670,6 @@ tl:
       my notes: Aking Talaan
       my settings: mga pagtatakda ko
       my comments: mga puna ko
       my notes: Aking Talaan
       my settings: mga pagtatakda ko
       my comments: mga puna ko

-      oauth settings: mga pagtatakda ng oauth

       blocks on me: mga paghadlang sa akin
       blocks by me: mga paghahadlang ko
       send message: ipadala ang mensahe
       blocks on me: mga paghadlang sa akin
       blocks by me: mga paghahadlang ko
       send message: ipadala ang mensahe

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2b9575904107145dd558e4f851e3a063a31aa108..c624c2ad09d5592fc9d87af882bb4e1551b3ecbb 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1654,11 +1654,6 @@ tr:
       reconfirm_html: Doğrulama e-postasının tekrar gönderimi için bize ihtiyacınız
         varsa, <a href="%{reconfirm}">buraya tıklayın</a>.
     confirm_resend:
       reconfirm_html: Doğrulama e-postasının tekrar gönderimi için bize ihtiyacınız
         varsa, <a href="%{reconfirm}">buraya tıklayın</a>.
     confirm_resend:

-      success_html: '%{email} hesabınıza yeni bir bilgilendirme notu gönderdik ve
-        hesabınızı onaylar onaylamaz harita yapımına başlayabileceksiniz.<br /><br
-        />Onay isteği gönderen bir anti-spam sistemi kullanırsanız onay isteklerine
-        cevap veremediğimizden lütfen kabul edilen adresler listesinde %{sender} olduğundan
-        emin olunuz.'

       failure: '%{name} kullanıcısı bulunamadı.'
     confirm_email:
       heading: E-posta adresinde değişikliği onayla
       failure: '%{name} kullanıcısı bulunamadı.'
     confirm_email:
       heading: E-posta adresinde değişikliği onayla


@@ -2495,9 +2490,6 @@ tr:
         ancak bazı ek araçlar veya sunucu için yine de bir parola gerekebilir.
       continue: Kaydol
       terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz!
         ancak bazı ek araçlar veya sunucu için yine de bir parola gerekebilir.
       continue: Kaydol
       terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz!

-      terms declined: Yeni Katılımcı Koşulları kabul etmediğiniz için üzgünüz. Daha
-        fazla bilgi için lütfen <a href="%{url}">buradaki wiki sayfasına</a> bakınız.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Tr:Contributor_Terms_Declined

     terms:
       title: Koşullar
       heading: Koşullar
     terms:
       title: Koşullar
       heading: Koşullar


@@ -2529,6 +2521,11 @@ tr:
         france: Fransa
         italy: İtalya
         rest_of_world: Dünyanın geri kalanı
         france: Fransa
         italy: İtalya
         rest_of_world: Dünyanın geri kalanı

+    terms_declined_flash:
+      terms_declined_html: Yeni Katılımcı Koşulları kabul etmediğiniz için üzgünüz.
+        Daha fazla bilgi için lütfen <a href="%{url}">buradaki wiki sayfasına</a>
+        bakınız.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Tr:Contributor_Terms_Declined

     no_such_user:
       title: Böyle bir kullanıcı yok
       heading: '%{user} adlı bir kullanıcı yok.'
     no_such_user:
       title: Böyle bir kullanıcı yok
       heading: '%{user} adlı bir kullanıcı yok.'


@@ -2545,7 +2542,6 @@ tr:
       my profile: Profilim
       my settings: Tercihlerim
       my comments: Yorumlarım
       my profile: Profilim
       my settings: Tercihlerim
       my comments: Yorumlarım

-      oauth settings: OAuth ayarları

       blocks on me: Engellendiklerim
       blocks by me: Engellediklerim
       send message: Mesaj Gönder
       blocks on me: Engellendiklerim
       blocks by me: Engellediklerim
       send message: Mesaj Gönder

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0e8f3bee2ae848285a59ca92ab4d7cfde5e2d9c3..36f25ec0ddab555b536375123a6226c1ad1eaf36 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1638,11 +1638,6 @@ uk:
       reconfirm_html: Якщо ви бажаєте, аби ми повторно надіслали ще одне підтвердження
         електронною поштою, то <a href="%{reconfirm}">натисніть тут</a>.
     confirm_resend:
       reconfirm_html: Якщо ви бажаєте, аби ми повторно надіслали ще одне підтвердження
         електронною поштою, то <a href="%{reconfirm}">натисніть тут</a>.
     confirm_resend:

-      success_html: Ми надіслали на вашу електрону пошту (%{email}) листа для підтвердження
-        реєстрації, після того як ви натиснете на посиланні в ньому, ви отримаєте
-        можливість вносити зміни до мапи.<br /><br />Якщо ви користуєтесь системою
-        анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку
-        адресу %{sender}, так як ми не в змозі відповідати на такі запити.

       failure: Користувача %{name} не знайдено.
     confirm_email:
       heading: Підтвердить зміну адреси електронної пошти
       failure: Користувача %{name} не знайдено.
     confirm_email:
       heading: Підтвердить зміну адреси електронної пошти


@@ -2468,10 +2463,6 @@ uk:
         знадобиться.
       continue: Зареєструватись
       terms accepted: Дякуємо за прийняття нових умов співпраці!
         знадобиться.
       continue: Зареєструватись
       terms accepted: Дякуємо за прийняття нових умов співпраці!

-      terms declined: Нам шкода, що ви вирішили не приймати нові Умови Співпраці.
-        Для отримання додаткової інформації, будь ласка, перегляньте <a href="%{url}">цю
-        сторінку</a> .
-      terms declined url: https://wiki.openstreetmap.org/wiki/Uk:Contributor_Terms_Declined

     terms:
       title: Умови
       heading: Умови
     terms:
       title: Умови
       heading: Умови


@@ -2500,6 +2491,11 @@ uk:
         france: Франція
         italy: Італія
         rest_of_world: Решта світу
         france: Франція
         italy: Італія
         rest_of_world: Решта світу

+    terms_declined_flash:
+      terms_declined_html: Нам шкода, що ви вирішили не приймати нові Умови Співпраці.
+        Для отримання додаткової інформації, будь ласка, перегляньте <a href="%{url}">цю
+        сторінку</a> .
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Uk:Contributor_Terms_Declined

     no_such_user:
       title: Немає такого користувача
       heading: Користувача %{user} не існує.
     no_such_user:
       title: Немає такого користувача
       heading: Користувача %{user} не існує.


@@ -2516,7 +2512,6 @@ uk:
       my profile: Профіль
       my settings: Налаштування
       my comments: Мої коментарі
       my profile: Профіль
       my settings: Налаштування
       my comments: Мої коментарі

-      oauth settings: налаштування OAuth

       blocks on me: Мої блокування
       blocks by me: Заблоковано мною
       send message: Надіслати повідомлення
       blocks on me: Мої блокування
       blocks by me: Заблоковано мною
       send message: Надіслати повідомлення

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 08ae18b4a7ab8721f08e0bdea51adc8f577b9cf7..5df891b611875a809c2495afb7ddc25b5cb034e8 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1504,10 +1504,6 @@ vi:
       reconfirm_html: <a href="%{reconfirm}">Nhấn vào đây</a> để gửi thư điện tử xác
         nhận lần nữa.
     confirm_resend:
       reconfirm_html: <a href="%{reconfirm}">Nhấn vào đây</a> để gửi thư điện tử xác
         nhận lần nữa.
     confirm_resend:

-      success_html: Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận
-        tài khoản, bạn sẽ có thể vẽ bản đồ.<br /><br />Nếu hộp thư của bạn gửi thư
-        yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm %{sender} vào danh sách
-        trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này.

       failure: Không tìm thấy người dùng %{name}.
     confirm_email:
       heading: Xác nhận thay đổi địa chỉ thư điện tử
       failure: Không tìm thấy người dùng %{name}.
     confirm_email:
       heading: Xác nhận thay đổi địa chỉ thư điện tử


@@ -2305,10 +2301,6 @@ vi:
         khẩu, nhưng một số công cụ hoặc máy chủ khác có thể vẫn yêu cầu mật khẩu.
       continue: Mở tài khoản
       terms accepted: Cám ơn bạn đã chấp nhận các điều khoản đóng góp mới!
         khẩu, nhưng một số công cụ hoặc máy chủ khác có thể vẫn yêu cầu mật khẩu.
       continue: Mở tài khoản
       terms accepted: Cám ơn bạn đã chấp nhận các điều khoản đóng góp mới!

-      terms declined: Chúng tôi rất tiếc rằng bạn đã quyết định không chấp nhận các
-        Điều khoản Đóng góp mới. Vui lòng xem chi tiết tại <a href="%{url}">trang
-        wiki này</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=vi

     terms:
       title: Điều khoản
       heading: Điều khoản
     terms:
       title: Điều khoản
       heading: Điều khoản


@@ -2339,6 +2331,11 @@ vi:
         france: Pháp
         italy: Ý
         rest_of_world: Các nước khác
         france: Pháp
         italy: Ý
         rest_of_world: Các nước khác

+    terms_declined_flash:
+      terms_declined_html: Chúng tôi rất tiếc rằng bạn đã quyết định không chấp nhận
+        các Điều khoản Đóng góp mới. Vui lòng xem chi tiết tại <a href="%{url}">trang
+        wiki này</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=vi

     no_such_user:
       title: Người dùng không tồn tại
       heading: Người dùng %{user} không tồn tại
     no_such_user:
       title: Người dùng không tồn tại
       heading: Người dùng %{user} không tồn tại


@@ -2355,7 +2352,6 @@ vi:
       my profile: Trang của Tôi
       my settings: Tùy chọn
       my comments: Bình luận của Tôi
       my profile: Trang của Tôi
       my settings: Tùy chọn
       my comments: Bình luận của Tôi

-      oauth settings: thiết lập OAuth

       blocks on me: Tác vụ Cấm Tôi
       blocks by me: Tác vụ Cấm bởi Tôi
       send message: Gửi Thư
       blocks on me: Tác vụ Cấm Tôi
       blocks by me: Tác vụ Cấm bởi Tôi
       send message: Gửi Thư

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a45a98ab1357b0497bda07016f1fa47de64f754b..df880588ee87744249cdc863651ade0b56215c1b 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1592,7 +1592,6 @@ zh-CN:
       unknown token: 确认码已经过期或不存在。
       reconfirm_html: 如果您需要我们重新发送确认邮件，<a href="%{reconfirm}">请点击这里</a>。
     confirm_resend:
       unknown token: 确认码已经过期或不存在。
       reconfirm_html: 如果您需要我们重新发送确认邮件，<a href="%{reconfirm}">请点击这里</a>。
     confirm_resend:

-      success_html: 我们已经发送一封新的确认电子邮件到 %{email}，只要您确认您的帐户，您就可以开始制图了。<br /><br />如果您使用的反垃圾邮件系统发送确认请求，那么请确保您的白名单中有%{sender}，因为我们无法回复任何确认请求。

       failure: 用户 %{name} 未找到。
     confirm_email:
       heading: 确认电子邮件地址更改
       failure: 用户 %{name} 未找到。
     confirm_email:
       heading: 确认电子邮件地址更改


@@ -2265,8 +2264,6 @@ zh-CN:
       auth no password: 通过第三方身份验证，您不再需要密码，但一些额外工具或服务器可能仍然需要。
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！
       auth no password: 通过第三方身份验证，您不再需要密码，但一些额外工具或服务器可能仍然需要。
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！

-      terms declined: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息，请参阅<a href="%{url}">此 wiki 页面</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 条款
       heading: 条款
     terms:
       title: 条款
       heading: 条款


@@ -2289,6 +2286,9 @@ zh-CN:
         france: 法国
         italy: 意大利
         rest_of_world: 世界其他地区
         france: 法国
         italy: 意大利
         rest_of_world: 世界其他地区

+    terms_declined_flash:
+      terms_declined_html: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息，请参阅<a href="%{url}">此 wiki 页面</a>.
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: 无此用户
       heading: 用户 %{user} 不存在
     no_such_user:
       title: 无此用户
       heading: 用户 %{user} 不存在


@@ -2304,7 +2304,6 @@ zh-CN:
       my profile: 我的资料
       my settings: 我的设置
       my comments: 我的评论
       my profile: 我的资料
       my settings: 我的设置
       my comments: 我的评论

-      oauth settings: OAuth设置

       blocks on me: 我的封禁
       blocks by me: 被我封禁
       send message: 发送信息
       blocks on me: 我的封禁
       blocks by me: 被我封禁
       send message: 发送信息

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 69ee308d233c2f73bd576d40960162dc38fedaa5..b5cd737af00a60926477f1748b6beceb854a9082 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1575,8 +1575,6 @@ zh-TW:
       unknown token: 確認碼已經過期或不存在。
       reconfirm_html: 如果你需要我們重新發送確認電子郵件，<a href="%{reconfirm}">請按這裡</a>。
     confirm_resend:
       unknown token: 確認碼已經過期或不存在。
       reconfirm_html: 如果你需要我們重新發送確認電子郵件，<a href="%{reconfirm}">請按這裡</a>。
     confirm_resend:

-      success_html: 我們已經傳送一封新的確認電子郵件至 %{email}，只要你確認你的帳號，你就可以開始製圖了。 <br /><br />如果你使用會傳送確認請求的反垃圾郵件系統，請確保你將
-        %{sender} 加入白名單中，因為我們無法回覆任何確認請求。

       failure: 找不到使用者 %{name}。
     confirm_email:
       heading: 確認電子郵件地址的變更
       failure: 找不到使用者 %{name}。
     confirm_email:
       heading: 確認電子郵件地址的變更


@@ -2282,8 +2280,6 @@ zh-TW:
       auth no password: 使用第三方認証無須填寫密碼，但部份額外工具或伺服器可能仍需要使用密碼。
       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！
       auth no password: 使用第三方認証無須填寫密碼，但部份額外工具或伺服器可能仍需要使用密碼。
       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！

-      terms declined: 我們很遺憾你已決定不接受新的貢獻者條款。有關詳細資訊，請參閱<a href="%{url}">此 wiki 頁面</a>。
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 條款
       heading: 條款
     terms:
       title: 條款
       heading: 條款


@@ -2306,6 +2302,9 @@ zh-TW:
         france: 法國
         italy: 意大利
         rest_of_world: 世界其他地區
         france: 法國
         italy: 意大利
         rest_of_world: 世界其他地區

+    terms_declined_flash:
+      terms_declined_html: 我們很遺憾你已決定不接受新的貢獻者條款。有關詳細資訊，請參閱<a href="%{url}">此 wiki 頁面</a>。
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: 沒有這個使用者
       heading: 使用者 %{user} 不存在
     no_such_user:
       title: 沒有這個使用者
       heading: 使用者 %{user} 不存在


@@ -2321,7 +2320,6 @@ zh-TW:
       my profile: 我的基本資料
       my settings: 我的設定值
       my comments: 我的評論
       my profile: 我的基本資料
       my settings: 我的設定值
       my comments: 我的評論

-      oauth settings: oauth 設定值

       blocks on me: 對我的封鎖
       blocks by me: 我所設的封鎖
       send message: 傳送訊息
       blocks on me: 對我的封鎖
       blocks by me: 我所設的封鎖
       send message: 傳送訊息

diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml
index 2421c73de160371320f83d63f7f9b98fb9c5fcd7..061a11a803d16138dd6c735a474180e0bc52571d 100644 (file)
--- a/config/locales/zh-hk.yml
+++ b/config/locales/zh-hk.yml
@@ -814,7 +814,6 @@ zh-hk:
       body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。
     show:
       my settings: 我的設定
       body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。
     show:
       my settings: 我的設定

-      oauth settings: OAuth設定

       user location: 用戶位置
       if_set_location_html: 在%{settings_link}處設定您家的位置後就能查看附近的使用者。
       nearby users: 其他附近的用戶
       user location: 用戶位置
       if_set_location_html: 在%{settings_link}處設定您家的位置後就能查看附近的使用者。
       nearby users: 其他附近的用戶