Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 13d5f8b09fa3746e26f05ccbf2e96edc7643cec5..ed86ba29bc8080b8d27efff092877b7d8cafdac9 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -140,7 +140,6 @@ af:
         auth_provider: Verifikasie verskaffer
         auth_uid: Verifikasie UID
         email: E-pos
         auth_provider: Verifikasie verskaffer
         auth_uid: Verifikasie UID
         email: E-pos

-        email_confirmation: E-posbevestiging

         new_email: 'Nuwe e-posadres:'
         active: Bedrywig
         display_name: Skermnaam
         new_email: 'Nuwe e-posadres:'
         active: Bedrywig
         display_name: Skermnaam


@@ -1555,7 +1554,7 @@ af:
   sessions:
     new:
       title: Meld aan
   sessions:
     new:
       title: Meld aan

-      heading: Meld aan
+      tab_title: Meld aan

       email or username: 'E-posadres of gebruikernaam:'
       password: 'Wagwoord:'
       remember: Onthou my
       email or username: 'E-posadres of gebruikernaam:'
       password: 'Wagwoord:'
       remember: Onthou my


@@ -1563,34 +1562,7 @@ af:
       login_button: Meld aan
       register now: Registreer nou
       with external: 'Gebruik andersins ’n derde party om mee aan te meld:'
       login_button: Meld aan
       register now: Registreer nou
       with external: 'Gebruik andersins ’n derde party om mee aan te meld:'

-      no account: Nog nie geregistreer nie?

       auth failure: Jammer, kon nie met hierdie inligting aanmeld nie.
       auth failure: Jammer, kon nie met hierdie inligting aanmeld nie.

-      openid_logo_alt: Meld aan met 'n OpenID
-      auth_providers:
-        openid:
-          title: Meld aan met OpenID
-          alt: Meld aan met 'n OpenID-URL
-        google:
-          title: Meld aan met Google
-          alt: Meld aan met 'n Google-OpenID
-        facebook:
-          title: Meld aan met Facebook
-          alt: Meld aan met ’n Facebook-rekening
-        microsoft:
-          title: Meld aan met Windows Live
-          alt: Meld aan met ’n Windows Live-rekening
-        github:
-          title: Meld aan met GitHub
-          alt: Meld aan met ’n GitHub-rekening
-        wikipedia:
-          title: Meld aan met Wikipedia
-          alt: Meld aan met ’n Wikipedia-rekening
-        wordpress:
-          title: Meld aan met Wordpress
-          alt: Meld aan met ’n Wordpress-OpenID
-        aol:
-          title: Meld aan met AOL
-          alt: Meld aan met ’n AOL-OpenID

     destroy:
       title: Teken af
       heading: Meld van OpenStreetMap af
     destroy:
       title: Teken af
       heading: Meld van OpenStreetMap af


@@ -1811,6 +1783,32 @@ af:
       account_settings: Rekeninginstellings
       oauth1_settings: OAuth 1 instellings
       oauth2_applications: OAuth 2 programme
       account_settings: Rekeninginstellings
       oauth1_settings: OAuth 1 instellings
       oauth2_applications: OAuth 2 programme

+    auth_providers:
+      openid_logo_alt: Meld aan met 'n OpenID
+      openid:
+        title: Meld aan met OpenID
+        alt: Meld aan met 'n OpenID-URL
+      google:
+        title: Meld aan met Google
+        alt: Meld aan met 'n Google-OpenID
+      facebook:
+        title: Meld aan met Facebook
+        alt: Meld aan met ’n Facebook-rekening
+      microsoft:
+        title: Meld aan met Windows Live
+        alt: Meld aan met ’n Windows Live-rekening
+      github:
+        title: Meld aan met GitHub
+        alt: Meld aan met ’n GitHub-rekening
+      wikipedia:
+        title: Meld aan met Wikipedia
+        alt: Meld aan met ’n Wikipedia-rekening
+      wordpress:
+        title: Meld aan met Wordpress
+        alt: Meld aan met ’n Wordpress-OpenID
+      aol:
+        title: Meld aan met AOL
+        alt: Meld aan met ’n AOL-OpenID

   oauth:
     authorize:
       allow_to: 'Sta die kliëntprogram toe om:'
   oauth:
     authorize:
       allow_to: 'Sta die kliëntprogram toe om:'


@@ -1897,9 +1895,9 @@ af:
         header: Gratis en redigeerbaar
       display name description: U gebruikernaam wat openbaar verskyn. U kan dit wel
         later nog onder voorkeure wysig.
         header: Gratis en redigeerbaar
       display name description: U gebruikernaam wat openbaar verskyn. U kan dit wel
         later nog onder voorkeure wysig.

-      use external auth: Gebruik andersins 'n derde party om mee aan te meld

       continue: Meld aan
       terms accepted: Dankie dat u die nuwe bydraerooreenkoms aanvaar het!
       continue: Meld aan
       terms accepted: Dankie dat u die nuwe bydraerooreenkoms aanvaar het!

+      use external auth: Gebruik andersins 'n derde party om mee aan te meld

     terms:
       title: Voorwaardes
       heading: Voorwaardes
     terms:
       title: Voorwaardes
       heading: Voorwaardes

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 6c4cd9088f7186a179cb6f7ac57ef3b7e08d7393..d648ede29d27b2619733a458054266665a77704b 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -802,7 +802,7 @@ aln:
   sessions:
     new:
       title: Kyçu
   sessions:
     new:
       title: Kyçu

-      heading: Kycu
+      tab_title: Kycu

       email or username: 'Email Adresa ose Username:'
       password: 'Fjalekalimi:'
       remember: Kujtom mu
       email or username: 'Email Adresa ose Username:'
       password: 'Fjalekalimi:'
       remember: Kujtom mu

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d2cb9ff56ea351eb38242b12c9b60ca0dcafc0b4..947fb0d20476c151a0a6d08e6267f36c67fe186f 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -186,7 +186,6 @@ ar:
         auth_provider: مزود التوثيق
         auth_uid: معرف التوثيق UID
         email: البريد الإلكتروني
         auth_provider: مزود التوثيق
         auth_uid: معرف التوثيق UID
         email: البريد الإلكتروني

-        email_confirmation: تأكيد البريد الإلكتروني

         new_email: عنوان البريد الإلكتروني الجديد
         active: نشط
         display_name: عرض الاسم
         new_email: عنوان البريد الإلكتروني الجديد
         active: نشط
         display_name: عرض الاسم


@@ -1902,7 +1901,7 @@ ar:
   sessions:
     new:
       title: تسجيل الدخول
   sessions:
     new:
       title: تسجيل الدخول

-      heading: تسجيل الدخول
+      tab_title: تسجيل الدخول

       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'
       remember: تذكرني
       email or username: 'عنوان البريد الإلكتروني أو اسم المستخدم:'
       password: 'كلمة السر:'
       remember: تذكرني


@@ -1910,34 +1909,7 @@ ar:
       login_button: تسجيل الدخول
       register now: سجل حسابًا الآن
       with external: 'بدلا من ذلك، استخدم طرفا ثالثا لتسجيل الدخول:'
       login_button: تسجيل الدخول
       register now: سجل حسابًا الآن
       with external: 'بدلا من ذلك، استخدم طرفا ثالثا لتسجيل الدخول:'

-      no account: ليس لديك حسابا؟

       auth failure: آسف، لا يمكن الدخول بتلك التفاصيل.
       auth failure: آسف، لا يمكن الدخول بتلك التفاصيل.

-      openid_logo_alt: تسجيل الدخول بOpenID
-      auth_providers:
-        openid:
-          title: تسجيل الدخول بOpenID
-          alt: تسجيل الدخول باستخدام مسار OpenID
-        google:
-          title: تسجيل الدخول باستخدام جوجل
-          alt: تسجيل الدخول ب Google OpenID
-        facebook:
-          title: تسجيل الدخول باستخدام فيس بوك
-          alt: تسجيل الدخول بحساب فيسبوك
-        microsoft:
-          title: تسجيل الدخول مع مايكروسوفت
-          alt: تسجيل الدخول بحساب مايكروسوفت
-        github:
-          title: تسجيل الدخول بجيثب
-          alt: تسجيل الدخول باستخدام حساب جيثب
-        wikipedia:
-          title: تسجيل الدخول عبر ويكيبيديا
-          alt: سجل الدخول باستخدام حساب ويكيبيديا
-        wordpress:
-          title: تسجيل الدخول بووردبريس
-          alt: تسجيل الدخول بـWordpress OpenID
-        aol:
-          title: تسجيل الدخول بإيه أو إل
-          alt: تسجيل الدخول بـAOL OpenID

     destroy:
       title: تسجيل الخروج
       heading: الخروج من خريطة الشارع المفتوحة
     destroy:
       title: تسجيل الخروج
       heading: الخروج من خريطة الشارع المفتوحة


@@ -2383,6 +2355,32 @@ ar:
         الويب لعرض شروط المساهمة. أنت لا تحتاج إلى موافق،ة لكن يجب عرضها.
     settings_menu:
       account_settings: إعدادات الحساب
         الويب لعرض شروط المساهمة. أنت لا تحتاج إلى موافق،ة لكن يجب عرضها.
     settings_menu:
       account_settings: إعدادات الحساب

+    auth_providers:
+      openid_logo_alt: تسجيل الدخول بOpenID
+      openid:
+        title: تسجيل الدخول بOpenID
+        alt: تسجيل الدخول باستخدام مسار OpenID
+      google:
+        title: تسجيل الدخول باستخدام جوجل
+        alt: تسجيل الدخول ب Google OpenID
+      facebook:
+        title: تسجيل الدخول باستخدام فيس بوك
+        alt: تسجيل الدخول بحساب فيسبوك
+      microsoft:
+        title: تسجيل الدخول مع مايكروسوفت
+        alt: تسجيل الدخول بحساب مايكروسوفت
+      github:
+        title: تسجيل الدخول بجيثب
+        alt: تسجيل الدخول باستخدام حساب جيثب
+      wikipedia:
+        title: تسجيل الدخول عبر ويكيبيديا
+        alt: سجل الدخول باستخدام حساب ويكيبيديا
+      wordpress:
+        title: تسجيل الدخول بووردبريس
+        alt: تسجيل الدخول بـWordpress OpenID
+      aol:
+        title: تسجيل الدخول بإيه أو إل
+        alt: تسجيل الدخول بـAOL OpenID

   oauth:
     authorize:
       title: السماح بالوصول إلى حسابك
   oauth:
     authorize:
       title: السماح بالوصول إلى حسابك


@@ -2477,11 +2475,9 @@ ar:
       display name description: اسم المستخدم الخاص بك الظاهر علنًا، يمكنك تغيير هذا
         في التفضيلات في وقت لاحق.
       external auth: 'مصادقة طرف ثالث:'
       display name description: اسم المستخدم الخاص بك الظاهر علنًا، يمكنك تغيير هذا
         في التفضيلات في وقت لاحق.
       external auth: 'مصادقة طرف ثالث:'

-      use external auth: 'بدلا من ذلك، استخدم طرفا ثالثا لتسجيل الدخول:'
-      auth no password: مع مصادقة طرف ثالث كلمة السر غير مطلوبة، ولكن بعض الأدوات
-        إضافية أو الخادم قد لا تزال تحتاج إلى واحدة.

       continue: أنشئ حسابًا
       terms accepted: نشكرك على قبول شروط المساهم الجديدة!
       continue: أنشئ حسابًا
       terms accepted: نشكرك على قبول شروط المساهم الجديدة!

+      use external auth: 'بدلا من ذلك، استخدم طرفا ثالثا لتسجيل الدخول:'

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

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 2f182162bf5a437c0b0f12f44875060c11e768c2..bfe44811a42541696bf2116f7e11b9cab32eec98 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -717,7 +717,7 @@ arz:
   sessions:
     new:
       title: ولوج
   sessions:
     new:
       title: ولوج

-      heading: ولوج
+      tab_title: ولوج

       email or username: 'عنوان البريد الإلكترونى أو اسم المستخدم:'
       password: 'كلمه المرور:'
       lost password link: أنسيت كلمه المرور؟
       email or username: 'عنوان البريد الإلكترونى أو اسم المستخدم:'
       password: 'كلمه المرور:'
       lost password link: أنسيت كلمه المرور؟

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 3d6b92272c2eb4c31f5c103a579fc1a06b79645d..4078b2e73e3e6763d9658c5900945dd55c38d705 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1464,7 +1464,7 @@ ast:
   sessions:
     new:
       title: Entrar
   sessions:
     new:
       title: Entrar

-      heading: Entrar
+      tab_title: Entrar

       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'
       remember: Recordame
       email or username: 'Direición de corréu o nome d''usuariu:'
       password: 'Contraseña:'
       remember: Recordame


@@ -1472,34 +1472,7 @@ ast:
       login_button: Entrar
       register now: Rexistrate agora
       with external: 'Alternativamente, usa un terceru p''aniciar sesión:'
       login_button: Entrar
       register now: Rexistrate agora
       with external: 'Alternativamente, usa un terceru p''aniciar sesión:'

-      no account: ¿Nun tienes una cuenta?

       auth failure: Sentímoslo, nun se pudo coneutar al sistema con esos datos.
       auth failure: Sentímoslo, nun se pudo coneutar al sistema con esos datos.

-      openid_logo_alt: Coneutar con una OpenID
-      auth_providers:
-        openid:
-          title: Aniciar sesión con OpenID
-          alt: Aniciar sesión con una URL d'OpenID
-        google:
-          title: Aniciar sesión con Google
-          alt: Aniciar sesión con una OpenID de Google
-        facebook:
-          title: Anicia sesión con Facebook
-          alt: Anicia sesión con una cuenta de Facebook
-        microsoft:
-          title: Anicia sesión con Windows Live
-          alt: Anicia sesión con una cuenta de Windows Live
-        github:
-          title: Aniciar sesión con GitHub
-          alt: Aniciar sesión con una cuenta de GitHub
-        wikipedia:
-          title: Aniciar sesión con Wikipedia
-          alt: Aniciar sesión con una cuenta de Wikipedia
-        wordpress:
-          title: Aniciar sesión con Wordpress
-          alt: Aniciar sesión con una OpenID de Wordpress
-        aol:
-          title: Aniciar sesión con AOL
-          alt: Aniciar sesión con una OpenID de AOL

     destroy:
       title: Salir
       heading: Colar d'OpenStreetMap
     destroy:
       title: Salir
       heading: Colar d'OpenStreetMap


@@ -1845,6 +1818,32 @@ ast:
       need_to_see_terms: El to accesu a la API ta torgáu de mou temporal. Por favor,
         coneuta pela interfaz web pa ver los Términos de Collaboración. Nun fai falta
         aceutalos, pero debes conocelos.
       need_to_see_terms: El to accesu a la API ta torgáu de mou temporal. Por favor,
         coneuta pela interfaz web pa ver los Términos de Collaboración. Nun fai falta
         aceutalos, pero debes conocelos.

+    auth_providers:
+      openid_logo_alt: Coneutar con una OpenID
+      openid:
+        title: Aniciar sesión con OpenID
+        alt: Aniciar sesión con una URL d'OpenID
+      google:
+        title: Aniciar sesión con Google
+        alt: Aniciar sesión con una OpenID de Google
+      facebook:
+        title: Anicia sesión con Facebook
+        alt: Anicia sesión con una cuenta de Facebook
+      microsoft:
+        title: Anicia sesión con Windows Live
+        alt: Anicia sesión con una cuenta de Windows Live
+      github:
+        title: Aniciar sesión con GitHub
+        alt: Aniciar sesión con una cuenta de GitHub
+      wikipedia:
+        title: Aniciar sesión con Wikipedia
+        alt: Aniciar sesión con una cuenta de Wikipedia
+      wordpress:
+        title: Aniciar sesión con Wordpress
+        alt: Aniciar sesión con una OpenID de Wordpress
+      aol:
+        title: Aniciar sesión con AOL
+        alt: Aniciar sesión con una OpenID de AOL

   oauth:
     authorize:
       title: Autorizar l'accesu a la to cuenta
   oauth:
     authorize:
       title: Autorizar l'accesu a la to cuenta


@@ -1926,11 +1925,9 @@ ast:
       display name description: El nome d'usuariu que s'amuesa en público. Pue camudalo
         más sero nes preferencies.
       external auth: 'Autenticación con un terceru:'
       display name description: El nome d'usuariu que s'amuesa en público. Pue camudalo
         más sero nes preferencies.
       external auth: 'Autenticación con un terceru:'

-      use external auth: Alternativamente, usa un terceru p'aniciar sesión
-      auth no password: Cola autenticación con un terceru nun fai falta una contraseña,
-        pero delles ferramientes estra o sirvidores inda puen necesitala.

       continue: Date d'alta
       terms accepted: ¡Gracies por aceutar les condiciones de collaboración!
       continue: Date d'alta
       terms accepted: ¡Gracies por aceutar les condiciones de collaboración!

+      use external auth: Alternativamente, usa un terceru p'aniciar sesión

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

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 62c24e4e8d8e1b0e89fc353089bed189826bf541..30f712324e5f5a0f4e55c7dee5466328f1472d3d 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -911,22 +911,13 @@ az:
   sessions:
     new:
       title: Daxil olun
   sessions:
     new:
       title: Daxil olun

-      heading: Daxil olun
+      tab_title: Daxil olun

       password: 'Parol:'
       remember: Məni xatırla
       login_button: Daxil ol
       register now: İndi qeydiyyatdan keç
       with external: 'Alternativ olaraq, daxil olmaq üçün üçüncü tərəfdən istifadə
         edin:'
       password: 'Parol:'
       remember: Məni xatırla
       login_button: Daxil ol
       register now: İndi qeydiyyatdan keç
       with external: 'Alternativ olaraq, daxil olmaq üçün üçüncü tərəfdən istifadə
         edin:'

-      no account: İstifadəçi hesabınız yoxdur?
-      openid_logo_alt: OpenID ilə hesabınıza daxil olun
-      auth_providers:
-        microsoft:
-          title: Microsoft ilə daxil olun
-        github:
-          alt: GitHub Hesabı ilə daxil olun
-        wikipedia:
-          alt: Vikipediya hesabı ilə daxil olun

     destroy:
       title: Sistemdən çıx
       heading: OpenStreetMap-dən çıx
     destroy:
       title: Sistemdən çıx
       heading: OpenStreetMap-dən çıx


@@ -1017,6 +1008,15 @@ az:
       edit_map: Xəritəni redaktə et
       public: İCTİMAİ
       private: MƏXFİ
       edit_map: Xəritəni redaktə et
       public: İCTİMAİ
       private: MƏXFİ

+  application:
+    auth_providers:
+      openid_logo_alt: OpenID ilə hesabınıza daxil olun
+      microsoft:
+        title: Microsoft ilə daxil olun
+      github:
+        alt: GitHub Hesabı ilə daxil olun
+      wikipedia:
+        alt: Vikipediya hesabı ilə daxil olun

   oauth_clients:
     show:
       confirm: Əminsinizmi?
   oauth_clients:
     show:
       confirm: Əminsinizmi?

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 131bbb2d8e1ee05724c15602569bcd11a7b2c265..c19165b69883144af7263c5f347cc9e81e52db48 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -145,7 +145,6 @@ ba:
         auth_provider: Аутентификация провайдеры
         auth_uid: Аутентификация UID
         email: Электрон почта адресы
         auth_provider: Аутентификация провайдеры
         auth_uid: Аутентификация UID
         email: Электрон почта адресы

-        email_confirmation: Электрон почтаны раҫлау

         new_email: Яңы электрон почта адресы
         active: Әүҙем
         display_name: Сағылдырылған исем
         new_email: Яңы электрон почта адресы
         active: Әүҙем
         display_name: Сағылдырылған исем

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 3b8f06c35c88f51bcc6d1a0d19043b73c12523da..f34c20da5d9785390290712eae40ad81e6fcb5e0 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -143,7 +143,6 @@ be-Tarask:
         auth_provider: Пастаўшчык аўтэнтыфікацыі
         auth_uid: UID аўтэнтыфікацыі
         email: Электронная пошта
         auth_provider: Пастаўшчык аўтэнтыфікацыі
         auth_uid: UID аўтэнтыфікацыі
         email: Электронная пошта

-        email_confirmation: Пацьверджаньне э-пошты

         new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя
         new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя


@@ -1066,7 +1065,7 @@ be-Tarask:
   sessions:
     new:
       title: Увайсьці
   sessions:
     new:
       title: Увайсьці

-      heading: Уваход
+      tab_title: Уваход

       email or username: Адрас электроннай пошты ці імя карыстальніка
       password: Пароль
       remember: Запомніць мяне
       email or username: Адрас электроннай пошты ці імя карыстальніка
       password: Пароль
       remember: Запомніць мяне


@@ -1074,7 +1073,6 @@ be-Tarask:
       login_button: Увайсьці
       register now: Зарэгістравацца зараз
       auth failure: Прабачце, немагчыма ўвайсьці з такім адрасам і паролем.
       login_button: Увайсьці
       register now: Зарэгістравацца зараз
       auth failure: Прабачце, немагчыма ўвайсьці з такім адрасам і паролем.

-      openid_logo_alt: Увайсьці ў сыстэму з дапамогай OpenID

     destroy:
       title: Выйсьці
       heading: Выйсьці з OpenStreetMap
     destroy:
       title: Выйсьці
       heading: Выйсьці з OpenStreetMap


@@ -1284,6 +1282,8 @@ be-Tarask:
       need_to_see_terms: Ваш доступ да API часова прыпынены. Калі ласка, увайдзіце
         ў ўэб-інтэрфэйс, каб каб паглядзець умовы супрацоўніцтва. Вам не абавязкова
         пагаджацца зь імі, але неабходна зь імі азнаёміцца.
       need_to_see_terms: Ваш доступ да API часова прыпынены. Калі ласка, увайдзіце
         ў ўэб-інтэрфэйс, каб каб паглядзець умовы супрацоўніцтва. Вам не абавязкова
         пагаджацца зь імі, але неабходна зь імі азнаёміцца.

+    auth_providers:
+      openid_logo_alt: Увайсьці ў сыстэму з дапамогай OpenID

   oauth:
     authorize:
       request_access_html: Дастасаваньне %{app_name} патрабуе доступ да Вашага рахунку,
   oauth:
     authorize:
       request_access_html: Дастасаваньне %{app_name} патрабуе доступ да Вашага рахунку,

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 8791227c29fe252e135471102b0ac44e090cff36..5e3c4156872ef5f19612484c6c3e903a451a89f3 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -149,7 +149,6 @@ be:
         auth_provider: Аўтэнтыфікатар
         auth_uid: UID аўтэнтыфікацыі
         email: Электронная пошта
         auth_provider: Аўтэнтыфікатар
         auth_uid: UID аўтэнтыфікацыі
         email: Электронная пошта

-        email_confirmation: Пацверджанне электроннай пошты

         new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя
         new_email: Новы адрас электроннай пошты
         active: Актыўны
         display_name: Бачнае імя


@@ -1543,7 +1542,7 @@ be:
   sessions:
     new:
       title: Уваход
   sessions:
     new:
       title: Уваход

-      heading: Уваход
+      tab_title: Уваход

       email or username: Электронны адрас або Імя карыстальніка
       password: Пароль
       remember: Памятаць мяне
       email or username: Электронны адрас або Імя карыстальніка
       password: Пароль
       remember: Памятаць мяне


@@ -1551,34 +1550,7 @@ be:
       login_button: Увайсці
       register now: Зарэгістравацца зараз
       with external: 'У якасці альтэрнатывы выкарыстайце для ўваходу старонні сервіс:'
       login_button: Увайсці
       register now: Зарэгістравацца зараз
       with external: 'У якасці альтэрнатывы выкарыстайце для ўваходу старонні сервіс:'

-      no account: Не маеце асабістага рахунка?

       auth failure: Прабачце, немагчыма увайсці з такім адрасам і паролем.
       auth failure: Прабачце, немагчыма увайсці з такім адрасам і паролем.

-      openid_logo_alt: Увайсці з дапамогай OpenID
-      auth_providers:
-        openid:
-          title: Уваход праз OpenID
-          alt: Уваход праз OpenID URL
-        google:
-          title: Уваход праз Google
-          alt: Уваход праз Google OpenID
-        facebook:
-          title: Увайсці праз Facebook
-          alt: Увайсці праз уліковы запіс Facebook
-        microsoft:
-          title: Увайсці праз Microsoft
-          alt: Увайсці праз уліковы запіс Microsoft
-        github:
-          title: Уваход праз GitHub
-          alt: Увайсці праз уліковы запіс GitHub
-        wikipedia:
-          title: Увайсці праз Вікіпедыю
-          alt: Уваход з выкарыстаннем уліковага запісу Вікіпедыі
-        wordpress:
-          title: Уваход праз Wordpress
-          alt: Уваход праз Wordpress OpenID
-        aol:
-          title: Уваход праз AOL
-          alt: Уваход праз AOL OpenID

     destroy:
       title: Выйсці
       heading: Выйсці з OpenStreetMap
     destroy:
       title: Выйсці
       heading: Выйсці з OpenStreetMap


@@ -1958,6 +1930,32 @@ be:
       need_to_see_terms: Ваш доступ да API часова прыпынены. Калі ласка, ўвайдзіце
         ў вэб-інтэрфейс для прагляду ўмоў удзелу. Вы не абавязаны пагаджацца, але
         вам варта праглядзець іх.
       need_to_see_terms: Ваш доступ да API часова прыпынены. Калі ласка, ўвайдзіце
         ў вэб-інтэрфейс для прагляду ўмоў удзелу. Вы не абавязаны пагаджацца, але
         вам варта праглядзець іх.

+    auth_providers:
+      openid_logo_alt: Увайсці з дапамогай OpenID
+      openid:
+        title: Уваход праз OpenID
+        alt: Уваход праз OpenID URL
+      google:
+        title: Уваход праз Google
+        alt: Уваход праз Google OpenID
+      facebook:
+        title: Увайсці праз Facebook
+        alt: Увайсці праз уліковы запіс Facebook
+      microsoft:
+        title: Увайсці праз Microsoft
+        alt: Увайсці праз уліковы запіс Microsoft
+      github:
+        title: Уваход праз GitHub
+        alt: Увайсці праз уліковы запіс GitHub
+      wikipedia:
+        title: Увайсці праз Вікіпедыю
+        alt: Уваход з выкарыстаннем уліковага запісу Вікіпедыі
+      wordpress:
+        title: Уваход праз Wordpress
+        alt: Уваход праз Wordpress OpenID
+      aol:
+        title: Уваход праз AOL
+        alt: Уваход праз AOL OpenID

   oauth:
     authorize:
       title: Дазваленне на доступ да вашага ўліковага запісу
   oauth:
     authorize:
       title: Дазваленне на доступ да вашага ўліковага запісу


@@ -2036,11 +2034,9 @@ be:
       display name description: Ваша імя, якое будзе бачнае ўсім. Вы можаце змяніць
         яго потым ў вашых параметрах.
       external auth: 'Аўтэнтыфікацыя праз:'
       display name description: Ваша імя, якое будзе бачнае ўсім. Вы можаце змяніць
         яго потым ў вашых параметрах.
       external auth: 'Аўтэнтыфікацыя праз:'

-      use external auth: У якасці альтэрнатывы выкарыстайце для ўваходу старонні сервіс
-      auth no password: Пры выкарыстанні знешняй аўтэнтыфікацыі пароль не патрэбны,
-        але для некаторых дадатковых інструментаў або сервераў ён усё яшчэ спатрэбіцца.

       continue: Зарэгістравацца
       terms accepted: Дзякуй за прыняцце новых умоў ўдзелу!
       continue: Зарэгістравацца
       terms accepted: Дзякуй за прыняцце новых умоў ўдзелу!

+      use external auth: У якасці альтэрнатывы выкарыстайце для ўваходу старонні сервіс

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

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 6cfa8239c53e5365bafa5b18e97bbb396c779d39..714adfce190e9906e903067f245ee0b58d6736d2 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -143,7 +143,6 @@ bg:
       user:
         auth_provider: Доставчик на автентикация
         email: Електронна поща
       user:
         auth_provider: Доставчик на автентикация
         email: Електронна поща

-        email_confirmation: Потвърждение по имейл

         new_email: Нова електронна поща
         active: Активен
         display_name: Видимо потребителско име
         new_email: Нова електронна поща
         active: Активен
         display_name: Видимо потребителско име


@@ -1472,7 +1471,7 @@ bg:
   sessions:
     new:
       title: Влизане
   sessions:
     new:
       title: Влизане

-      heading: Влизане
+      tab_title: Влизане

       email or username: Електронна поща или потребителско име
       password: Парола
       remember: Запомняне
       email or username: Електронна поща или потребителско име
       password: Парола
       remember: Запомняне


@@ -1480,34 +1479,7 @@ bg:
       login_button: Влизане
       register now: Регистрирайте се
       with external: 'Или използвайте удостоверяване от външен източник:'
       login_button: Влизане
       register now: Регистрирайте се
       with external: 'Или използвайте удостоверяване от външен източник:'

-      no account: Нямате сметка?

       auth failure: Съжаляваме, но не можете да влезете с тези данни.
       auth failure: Съжаляваме, но не можете да влезете с тези данни.

-      openid_logo_alt: Влизане с OpenID
-      auth_providers:
-        openid:
-          title: Влизане с OpenID
-          alt: Влизане с адрес на OpenID
-        google:
-          title: Влизане с Гугъл
-          alt: Влизане с OpenID на Google
-        facebook:
-          title: Влизане с Facebook
-          alt: Влизане със сметка на Facebook
-        microsoft:
-          title: Влизане с Майкрософт
-          alt: Влизане със сметка на Майкрософт
-        github:
-          title: Влизане с GitHub
-          alt: Влизане със сметка в GitHub
-        wikipedia:
-          title: Влизане с Уикипедия
-          alt: Влизане със сметка от Уикипедия
-        wordpress:
-          title: Влизане с Wordpress
-          alt: Влизане с OpenID от Wordpress
-        aol:
-          title: Влизане с AOL
-          alt: Влизане с OpenID от AOL

     destroy:
       title: Изход
       heading: Изход от OpenStreetMap
     destroy:
       title: Изход
       heading: Изход от OpenStreetMap


@@ -1870,6 +1842,32 @@ bg:
     permission_denied: Нямате разрешение за достъп до това действие
     require_admin:
       not_an_admin: Трябва да сте админ за да извършите това действие
     permission_denied: Нямате разрешение за достъп до това действие
     require_admin:
       not_an_admin: Трябва да сте админ за да извършите това действие

+    auth_providers:
+      openid_logo_alt: Влизане с OpenID
+      openid:
+        title: Влизане с OpenID
+        alt: Влизане с адрес на OpenID
+      google:
+        title: Влизане с Гугъл
+        alt: Влизане с OpenID на Google
+      facebook:
+        title: Влизане с Facebook
+        alt: Влизане със сметка на Facebook
+      microsoft:
+        title: Влизане с Майкрософт
+        alt: Влизане със сметка на Майкрософт
+      github:
+        title: Влизане с GitHub
+        alt: Влизане със сметка в GitHub
+      wikipedia:
+        title: Влизане с Уикипедия
+        alt: Влизане със сметка от Уикипедия
+      wordpress:
+        title: Влизане с Wordpress
+        alt: Влизане с OpenID от Wordpress
+      aol:
+        title: Влизане с AOL
+        alt: Влизане с OpenID от AOL

   oauth:
     authorize:
       allow_to: 'Позволи приложението на клиента да:'
   oauth:
     authorize:
       allow_to: 'Позволи приложението на клиента да:'


@@ -1920,9 +1918,9 @@ bg:
           хора като Вас и е безплатна за всеки, който иска да я поправи, актуализира,
           изтегли и използва.
       external auth: 'Удостоверяване от външен източник:'
           хора като Вас и е безплатна за всеки, който иска да я поправи, актуализира,
           изтегли и използва.
       external auth: 'Удостоверяване от външен източник:'

-      use external auth: Или използвайте удостоверяване от външен източник

       continue: Регистриране
       terms accepted: Благодарим Ви, че приемате новите условия за сътрудничество!
       continue: Регистриране
       terms accepted: Благодарим Ви, че приемате новите условия за сътрудничество!

+      use external auth: Или използвайте удостоверяване от външен източник

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

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 52e1212d04687c2ceae1987bffb734eba5a68131..9103934a62de073e457790af83084cbe24febfee 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -160,7 +160,6 @@ bn:
         auth_provider: প্রমাণীকরণ সরবরাহকারী
         auth_uid: প্রমাণীকরণ ইউআইডি
         email: ইমেইল
         auth_provider: প্রমাণীকরণ সরবরাহকারী
         auth_uid: প্রমাণীকরণ ইউআইডি
         email: ইমেইল

-        email_confirmation: ইমেইল নিশ্চিতকরণ

         new_email: নতুন ই-মেইল ঠিকানা
         active: সক্রিয়
         display_name: প্রদর্শনের জন্য নাম
         new_email: নতুন ই-মেইল ঠিকানা
         active: সক্রিয়
         display_name: প্রদর্শনের জন্য নাম


@@ -1545,32 +1544,14 @@ bn:
   sessions:
     new:
       title: প্রবেশ করুন
   sessions:
     new:
       title: প্রবেশ করুন

-      heading: প্রবেশ
+      tab_title: প্রবেশ

       email or username: ইমেইল ঠিকানা অথবা ব্যবহারকারী নাম
       password: পাসওয়ার্ড
       remember: আমাকে মনে রাখো
       lost password link: পাসওয়ার্ড ভুলে গেছেন?
       login_button: প্রবেশ করুন
       register now: এখনই নিবন্ধন করুন
       email or username: ইমেইল ঠিকানা অথবা ব্যবহারকারী নাম
       password: পাসওয়ার্ড
       remember: আমাকে মনে রাখো
       lost password link: পাসওয়ার্ড ভুলে গেছেন?
       login_button: প্রবেশ করুন
       register now: এখনই নিবন্ধন করুন

-      no account: কোনও অ্যাকাউন্ট নেই?

       auth failure: দুঃখিত, এই তথ্য দিয়ে প্রবেশ করানো যাচ্ছে না।
       auth failure: দুঃখিত, এই তথ্য দিয়ে প্রবেশ করানো যাচ্ছে না।

-      auth_providers:
-        google:
-          title: গুগল দিয়ে প্রবেশ
-        facebook:
-          title: ফেসবুক দিয়ে প্রবেশ
-          alt: ফেসবুক অ্যাকাউন্ট দিয়ে প্রবেশ করুন
-        microsoft:
-          title: মাইক্রোসফট দিয়ে লগইন করুন
-          alt: একটি মাইক্রোসফট অ্যাকাউন্ট দিয়ে লগইন করুন
-        github:
-          title: গিটহাব দিয়ে প্রবেশ করুন
-          alt: একটি গিটহাব অ্যাকাউন্ট দিয়ে প্রবেশ করুন
-        wikipedia:
-          title: উইকিপিডিয়া দিয়ে প্রবেশ করুন
-          alt: উইকিপিডিয়া অ্যাকাউন্ট দিয়ে প্রবেশ করুন
-        wordpress:
-          title: ওয়ার্ডপ্রেস দিয়ে প্রবেশ

     destroy:
       title: প্রস্থান
       logout_button: প্রস্থান
     destroy:
       title: প্রস্থান
       logout_button: প্রস্থান


@@ -1840,6 +1821,23 @@ bn:
   application:
     settings_menu:
       account_settings: অ্যাকাউন্ট সেটিংস
   application:
     settings_menu:
       account_settings: অ্যাকাউন্ট সেটিংস

+    auth_providers:
+      google:
+        title: গুগল দিয়ে প্রবেশ
+      facebook:
+        title: ফেসবুক দিয়ে প্রবেশ
+        alt: ফেসবুক অ্যাকাউন্ট দিয়ে প্রবেশ করুন
+      microsoft:
+        title: মাইক্রোসফট দিয়ে লগইন করুন
+        alt: একটি মাইক্রোসফট অ্যাকাউন্ট দিয়ে লগইন করুন
+      github:
+        title: গিটহাব দিয়ে প্রবেশ করুন
+        alt: একটি গিটহাব অ্যাকাউন্ট দিয়ে প্রবেশ করুন
+      wikipedia:
+        title: উইকিপিডিয়া দিয়ে প্রবেশ করুন
+        alt: উইকিপিডিয়া অ্যাকাউন্ট দিয়ে প্রবেশ করুন
+      wordpress:
+        title: ওয়ার্ডপ্রেস দিয়ে প্রবেশ

   oauth:
     authorize:
       allow_write_api: মানচিত্রটি পরিবর্তন করুন
   oauth:
     authorize:
       allow_write_api: মানচিত্রটি পরিবর্তন করুন


@@ -1882,8 +1880,6 @@ bn:
       title: নিবন্ধন করুন
       about:
         header: মুক্ত ও সম্পাদনাযোগ্য
       title: নিবন্ধন করুন
       about:
         header: মুক্ত ও সম্পাদনাযোগ্য

-      auth no password: তৃতীয় কোনো পদ্ধতিতে লগইন সক্রিয় থাকলে পাসওয়ার্ড বাধ্যতামূলক
-        নয়, কিন্তু অতিরিক্ত কিছু সরঞ্জাম এবং সার্ভারের জন্য কখনো প্রয়োজন হতে পারে।

       continue: নিবন্ধন করুন
       terms accepted: নতুন অবদানকারী শর্তাবলী গ্রহণ করার জন্য ধন্যবাদ!
       privacy_policy: গোপনীয়তার নীতি
       continue: নিবন্ধন করুন
       terms accepted: নতুন অবদানকারী শর্তাবলী গ্রহণ করার জন্য ধন্যবাদ!
       privacy_policy: গোপনীয়তার নীতি

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8027297d16e3138c50c89713cfc63fa80c46c483..67c5b031cf23ec04a7a1c86768ffa076b8e3b4e0 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -154,7 +154,6 @@ br:
         auth_provider: Pourchaser gwiriekadur
         auth_uid: UID an dilesadur
         email: Postel
         auth_provider: Pourchaser gwiriekadur
         auth_uid: UID an dilesadur
         email: Postel

-        email_confirmation: Kadarnaat ar postel

         new_email: Chomlec'h postel nevez
         active: Oberiant
         display_name: Anv diskouezet
         new_email: Chomlec'h postel nevez
         active: Oberiant
         display_name: Anv diskouezet


@@ -1921,7 +1920,7 @@ br:
   sessions:
     new:
       title: Kevreañ
   sessions:
     new:
       title: Kevreañ

-      heading: Kevreañ
+      tab_title: Kevreañ

       email or username: Chomlec'h postel pe anv implijer
       password: Ger-tremen
       remember: Derc'hel soñj ac'hanon
       email or username: Chomlec'h postel pe anv implijer
       password: Ger-tremen
       remember: Derc'hel soñj ac'hanon


@@ -1929,35 +1928,8 @@ br:
       login_button: Kevreañ
       register now: En em enskrivañ bremañ
       with external: 'Mod all, implijit un tredeour evit kevreañ :'
       login_button: Kevreañ
       register now: En em enskrivañ bremañ
       with external: 'Mod all, implijit un tredeour evit kevreañ :'

-      no account: N'hoc'h eus kont ebet ?

       auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù
         pourchaset.
       auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù
         pourchaset.

-      openid_logo_alt: Kevreañ gant un OpenID
-      auth_providers:
-        openid:
-          title: Kevreañ gant OpenID
-          alt: Kevreañ gant un URL OpenID
-        google:
-          title: Kevreañ gant Google
-          alt: Kevreañ gant OpenID Google
-        facebook:
-          title: Kevreañ gant Facebook
-          alt: Kevreañ gant ur gont Facebook
-        microsoft:
-          title: Kevreañ gant Microsoft
-          alt: Kevreañ gant ur gont Microsoft
-        github:
-          title: Kevreañ gant GitHub
-          alt: Kevreañ gant ur gont GitHub
-        wikipedia:
-          title: Kevreañ gant Wikipedia
-          alt: Kevreañ gant ur gont Wikipedia
-        wordpress:
-          title: Kevreañ gant Wordpress
-          alt: Kevreañ gant un OpenID Wordpress
-        aol:
-          title: Kevreañ gant AOL
-          alt: Kevreañ gant un OpenID AOL

     destroy:
       title: Digevreañ
       heading: Kuitaat OpenStreetMap
     destroy:
       title: Digevreañ
       heading: Kuitaat OpenStreetMap


@@ -2499,6 +2471,32 @@ br:
       oauth2_applications: Arloadoù OAuth 2
       oauth2_authorizations: Aotreoù OAuth 2
       muted_users: Implijerien kuzhet
       oauth2_applications: Arloadoù OAuth 2
       oauth2_authorizations: Aotreoù OAuth 2
       muted_users: Implijerien kuzhet

+    auth_providers:
+      openid_logo_alt: Kevreañ gant un OpenID
+      openid:
+        title: Kevreañ gant OpenID
+        alt: Kevreañ gant un URL OpenID
+      google:
+        title: Kevreañ gant Google
+        alt: Kevreañ gant OpenID Google
+      facebook:
+        title: Kevreañ gant Facebook
+        alt: Kevreañ gant ur gont Facebook
+      microsoft:
+        title: Kevreañ gant Microsoft
+        alt: Kevreañ gant ur gont Microsoft
+      github:
+        title: Kevreañ gant GitHub
+        alt: Kevreañ gant ur gont GitHub
+      wikipedia:
+        title: Kevreañ gant Wikipedia
+        alt: Kevreañ gant ur gont Wikipedia
+      wordpress:
+        title: Kevreañ gant Wordpress
+        alt: Kevreañ gant un OpenID Wordpress
+      aol:
+        title: Kevreañ gant AOL
+        alt: Kevreañ gant un OpenID AOL

   oauth:
     authorize:
       title: Aotren mont d'ho kont
   oauth:
     authorize:
       title: Aotren mont d'ho kont


@@ -2640,16 +2638,13 @@ br:
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
       external auth: 'Dilesadur trede :'
       display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit
         cheñch diwezhatoc'h en ho penndibaboù.
       external auth: 'Dilesadur trede :'

-      use external auth: 'Mod all, implijit un tredeour evit kevreañ :'
-      auth no password: Gant dilesadur un tredeour n'eus ket ezhomm d'ober gant ur
-        ger-tremen, met evit binvioù ouzhpenn pe evit ur servijer e c'haller bepred
-        goulenn unan diganeco'h.

       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 !

-      email_confirmation_help_html: Ho chomlec'h ne vo ket hewel d'an holl, sellit
-        ouzh %{privacy_policy_link} evit gouzout hiroc'h.
+      email_help_html: Ho chomlec'h ne vo ket hewel d'an holl, sellit ouzh %{privacy_policy_link}
+        evit gouzout hiroc'h.

       privacy_policy: reolennoù prevezded
       privacy_policy: reolennoù prevezded

+      use external auth: 'Mod all, implijit un tredeour evit kevreañ :'

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

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index c11f73d5e8efe3cf7d63734758af1964ddef114d..1ca3e106ebb72bc58dca526757e9b674a87b61b0 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1045,20 +1045,14 @@ bs:
   sessions:
     new:
       title: Prijava
   sessions:
     new:
       title: Prijava

-      heading: Prijava
+      tab_title: Prijava

       email or username: 'E-mail adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava
       register now: Registrirajte se sada
       email or username: 'E-mail adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Izgubili ste lozinku?
       login_button: Prijava
       register now: Registrirajte se sada

-      no account: Nemate korisničko ime?

       auth failure: Žao mi je, ne možemo Vas prijaviti s ovim detaljima.
       auth failure: Žao mi je, ne možemo Vas prijaviti s ovim detaljima.

-      openid_logo_alt: Prijavite se sa OtvorenimID
-      auth_providers:
-        wordpress:
-          title: Prijavite se sa Wordpress nalogom
-          alt: Prijavite se sa Wordpress OpenID

     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap
     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap


@@ -1301,6 +1295,11 @@ bs:
       need_to_see_terms: Vaš pristup API-ju je privremeno suspendovan. Molimo da se
         prijavite na web upravljačku ploču da pogledate Uslove za doprinosioce. Ne
         morate se složiti, ali ih morate pogledati.
       need_to_see_terms: Vaš pristup API-ju je privremeno suspendovan. Molimo da se
         prijavite na web upravljačku ploču da pogledate Uslove za doprinosioce. Ne
         morate se složiti, ali ih morate pogledati.

+    auth_providers:
+      openid_logo_alt: Prijavite se sa OtvorenimID
+      wordpress:
+        title: Prijavite se sa Wordpress nalogom
+        alt: Prijavite se sa Wordpress OpenID

   oauth:
     authorize:
       request_access_html: 'Aplikacija %{app_name} zahtjeva pristup Vašem korisničkom
   oauth:
     authorize:
       request_access_html: 'Aplikacija %{app_name} zahtjeva pristup Vašem korisničkom

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index bf3413725ddb055670492710731f613d55eb1a4b..d08b674fb500d0448d26b7eb0d23630d8de25065 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -181,7 +181,6 @@ ca:
         auth_provider: Proveïdor d'autenticació
         auth_uid: UID d'autenticació
         email: Adreça electrònica
         auth_provider: Proveïdor d'autenticació
         auth_uid: UID d'autenticació
         email: Adreça electrònica

-        email_confirmation: Confirmació de correu electrònic

         new_email: Nova adreça electrònica
         active: Actiu
         display_name: Nom en pantalla
         new_email: Nova adreça electrònica
         active: Actiu
         display_name: Nom en pantalla


@@ -1894,7 +1893,7 @@ ca:
   sessions:
     new:
       title: Inicia la sessió
   sessions:
     new:
       title: Inicia la sessió

-      heading: Inicia la sessió
+      tab_title: Inicia la sessió

       email or username: Adreça de correu o nom d'usuari
       password: Contrasenya
       remember: Recorda'm
       email or username: Adreça de correu o nom d'usuari
       password: Contrasenya
       remember: Recorda'm


@@ -1902,34 +1901,7 @@ ca:
       login_button: Accés
       register now: Registreu-vos-hi ara
       with external: Alternativament, inicieu una sessió mitjançant un tercer
       login_button: Accés
       register now: Registreu-vos-hi ara
       with external: Alternativament, inicieu una sessió mitjançant un tercer

-      no account: No teniu cap compte?

       auth failure: No podeu iniciar la sessió amb aquesta informació.
       auth failure: No podeu iniciar la sessió amb aquesta informació.

-      openid_logo_alt: Inicia sessió amb un compte OpenID
-      auth_providers:
-        openid:
-          title: Inicia sessió amb un compte OpenID
-          alt: Inicia sessió amb un URL d'OpenID
-        google:
-          title: Inicieu la sessió amb Google
-          alt: Inicieu la sessió amb un compte OpenID de Google
-        facebook:
-          title: Inicieu la sessió amb Facebook
-          alt: Inicieu la sessió amb un compte de Facebook
-        microsoft:
-          title: Inicieu la sessió amb Windows
-          alt: Inicieu de sessió amb un compte de Windows
-        github:
-          title: Inicieu la sessió amb GitHub
-          alt: Inicieu la sessió amb un compte de GitHub
-        wikipedia:
-          title: Inicieu la sessió amb Viquipèdia
-          alt: Inicieu la sessió amb un compte de Viquipèdia
-        wordpress:
-          title: Inicieu la sessió amb Wordpress
-          alt: Inicieu la sessió amb un compte OpenID de Wordpress
-        aol:
-          title: Inicieu la sessió amb AOL
-          alt: Inicieu la sessió amb un compte OpenID d'AOL

     destroy:
       title: Surt
       heading: Tanca la sessió d'OpenStreetMap
     destroy:
       title: Surt
       heading: Tanca la sessió d'OpenStreetMap


@@ -2552,6 +2524,32 @@ ca:
       oauth2_applications: Aplicacions OAuth 2
       oauth2_authorizations: Autoritzacions OAuth 2
       muted_users: Usuaris silenciats
       oauth2_applications: Aplicacions OAuth 2
       oauth2_authorizations: Autoritzacions OAuth 2
       muted_users: Usuaris silenciats

+    auth_providers:
+      openid_logo_alt: Inicia sessió amb un compte OpenID
+      openid:
+        title: Inicia sessió amb un compte OpenID
+        alt: Inicia sessió amb un URL d'OpenID
+      google:
+        title: Inicieu la sessió amb Google
+        alt: Inicieu la sessió amb un compte OpenID de Google
+      facebook:
+        title: Inicieu la sessió amb Facebook
+        alt: Inicieu la sessió amb un compte de Facebook
+      microsoft:
+        title: Inicieu la sessió amb Windows
+        alt: Inicieu de sessió amb un compte de Windows
+      github:
+        title: Inicieu la sessió amb GitHub
+        alt: Inicieu la sessió amb un compte de GitHub
+      wikipedia:
+        title: Inicieu la sessió amb Viquipèdia
+        alt: Inicieu la sessió amb un compte de Viquipèdia
+      wordpress:
+        title: Inicieu la sessió amb Wordpress
+        alt: Inicieu la sessió amb un compte OpenID de Wordpress
+      aol:
+        title: Inicieu la sessió amb AOL
+        alt: Inicieu la sessió amb un compte OpenID d'AOL

   oauth:
     authorize:
       title: Autoritzeu l'accés al vostre compte
   oauth:
     authorize:
       title: Autoritzeu l'accés al vostre compte


@@ -2699,16 +2697,14 @@ ca:
       display name description: El nom d'usuari que es mostrarà públicament. El podeu
         canviar més endavant a les preferències.
       external auth: 'Autenticació mitjançant tercers:'
       display name description: El nom d'usuari que es mostrarà públicament. El podeu
         canviar més endavant a les preferències.
       external auth: 'Autenticació mitjançant tercers:'

-      use external auth: 'Alternativament, inicieu la sessió mitjançant un tercer:'
-      auth no password: Amb l'autenticació per tercers cal contrasenya, però alguns
-        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ó.
       continue: Registreu-vos-hi
       terms accepted: Gràcies per acceptar els nous termes de col·laboració.

-      email_confirmation_help_html: La vostra adreça no es mostrarà públicament, consulteu
-        la nostra %{privacy_policy_link} per obtenir més informació.
+      email_help_html: La vostra adreça no es mostrarà públicament, consulteu la nostra
+        %{privacy_policy_link} per obtenir més informació.

       privacy_policy: política de privadesa
       privacy_policy_title: Política de privadesa de l'OSMF incloent la secció sobre
         adreces de correu electrònic
       privacy_policy: política de privadesa
       privacy_policy_title: Política de privadesa de l'OSMF incloent la secció sobre
         adreces de correu electrònic

+      use external auth: 'Alternativament, inicieu la sessió mitjançant un tercer:'

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

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 92b224820c1f85755aa2dce7093574852f744a0a..611ea26966816f877f4a0e688d76fca4ec29d2c6 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -777,7 +777,7 @@ ce:
   sessions:
     new:
       title: ЧугӀо
   sessions:
     new:
       title: ЧугӀо

-      heading: ЧугӀо
+      tab_title: ЧугӀо

       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'
       remember: Дагалаца со
       email or username: 'Эл. пошт йа декъашхочун цӀе:'
       password: 'Пароль:'
       remember: Дагалаца со

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ecd35af4ecbae70cf95d99b7bb9a2993d2015531..682374f340822cfab95c67d10904f564f9b2e79c 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -186,7 +186,6 @@ cs:
         auth_provider: Poskytovatel autentizace
         auth_uid: Autentizační UID
         email: E-mail
         auth_provider: Poskytovatel autentizace
         auth_uid: Autentizační UID
         email: E-mail

-        email_confirmation: Potvrzení e-mailu

         new_email: Nová emailová adresa
         active: Aktivní
         display_name: Zobrazované jméno
         new_email: Nová emailová adresa
         active: Aktivní
         display_name: Zobrazované jméno


@@ -2012,7 +2011,7 @@ cs:
   sessions:
     new:
       title: Přihlásit se
   sessions:
     new:
       title: Přihlásit se

-      heading: Přihlášení
+      tab_title: Přihlášení

       email or username: E-mailová adresa nebo uživatelské jméno
       password: Heslo
       remember: Zapamatuj si mě
       email or username: E-mailová adresa nebo uživatelské jméno
       password: Heslo
       remember: Zapamatuj si mě


@@ -2020,34 +2019,7 @@ cs:
       login_button: Přihlásit se
       register now: Zaregistrujte se
       with external: 'Případně se přihlaste prostřednictvím třetí strany:'
       login_button: Přihlásit se
       register now: Zaregistrujte se
       with external: 'Případně se přihlaste prostřednictvím třetí strany:'

-      no account: Nemáte účet?

       auth failure: Je mi líto, ale s uvedenými údaji se nemůžete přihlásit.
       auth failure: Je mi líto, ale s uvedenými údaji se nemůžete přihlásit.

-      openid_logo_alt: Přihlášení pomocí OpenID
-      auth_providers:
-        openid:
-          title: Přihlásit se pomocí OpenID
-          alt: Přihlásit se pomocí OpenID URL
-        google:
-          title: Přihlásit se prostřednictvím Google
-          alt: Přihlásit se pomocí Google OpenID
-        facebook:
-          title: Přihlásit se přes Facebook
-          alt: Přihlásit se pomocí účtu na Facebooku
-        microsoft:
-          title: Přihlásit se přes Microsoft
-          alt: Přihlásit se pomocí účtu Microsoft
-        github:
-          title: Přihlásit se přes GitHub
-          alt: Přihlásit se pomocí GitHub účtu
-        wikipedia:
-          title: Přihlásit se účtem na Wikipedii
-          alt: Přihlásit se účtem na Wikipedii
-        wordpress:
-          title: Přihlásit se prostřednictvím Wordpress
-          alt: Přihlásit se pomocí Wordpress OpenID
-        aol:
-          title: Přihlásit se prostřednictvím AOL
-          alt: Přihlásit se pomocí AOL OpenID

     destroy:
       title: Odhlásit se
       heading: Odhlášení z OpenStreetMap
     destroy:
       title: Odhlásit se
       heading: Odhlášení z OpenStreetMap


@@ -2708,6 +2680,32 @@ cs:
       oauth2_applications: Aplikace OAuth 2
       oauth2_authorizations: Autorizace OAuth 2
       muted_users: Ztlumení uživatelé
       oauth2_applications: Aplikace OAuth 2
       oauth2_authorizations: Autorizace OAuth 2
       muted_users: Ztlumení uživatelé

+    auth_providers:
+      openid_logo_alt: Přihlášení pomocí OpenID
+      openid:
+        title: Přihlásit se pomocí OpenID
+        alt: Přihlásit se pomocí OpenID URL
+      google:
+        title: Přihlásit se prostřednictvím Google
+        alt: Přihlásit se pomocí Google OpenID
+      facebook:
+        title: Přihlásit se přes Facebook
+        alt: Přihlásit se pomocí účtu na Facebooku
+      microsoft:
+        title: Přihlásit se přes Microsoft
+        alt: Přihlásit se pomocí účtu Microsoft
+      github:
+        title: Přihlásit se přes GitHub
+        alt: Přihlásit se pomocí GitHub účtu
+      wikipedia:
+        title: Přihlásit se účtem na Wikipedii
+        alt: Přihlásit se účtem na Wikipedii
+      wordpress:
+        title: Přihlásit se prostřednictvím Wordpress
+        alt: Přihlásit se pomocí Wordpress OpenID
+      aol:
+        title: Přihlásit se prostřednictvím AOL
+        alt: Přihlásit se pomocí AOL OpenID

   oauth:
     authorize:
       title: Autorizovat přístup k vašemu účtu
   oauth:
     authorize:
       title: Autorizovat přístup k vašemu účtu


@@ -2857,16 +2855,14 @@ cs:
       display name description: Vaše veřejně zobrazované uživatelské jméno. Můžete
         si ho později změnit ve svém nastavení.
       external auth: 'Autentizace třetí stranou:'
       display name description: Vaše veřejně zobrazované uživatelské jméno. Můžete
         si ho později změnit ve svém nastavení.
       external auth: 'Autentizace třetí stranou:'

-      use external auth: Případně se přihlaste prostřednictvím třetí strany
-      auth no password: S autentizací třetí stranou není heslo potřeba, ale některé
-        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!
       continue: Zaregistrovat se
       terms accepted: Děkujeme za odsouhlasení nových podmínek pro přispěvatele!

-      email_confirmation_help_html: Vaše adresa se nezobrazuje veřejně, více informací
-        získáte v našich %{privacy_policy_link}.
+      email_help_html: Vaše adresa se nezobrazuje veřejně, více informací získáte
+        v našich %{privacy_policy_link}.

       privacy_policy: pravidlech ochrany osobních údajů
       privacy_policy_title: Pravidla ochrany osobních údajů OSMF, včetně části o e-mailových
         adresách
       privacy_policy: pravidlech ochrany osobních údajů
       privacy_policy_title: Pravidla ochrany osobních údajů OSMF, včetně části o e-mailových
         adresách

+      use external auth: Případně se přihlaste prostřednictvím třetí strany

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

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 90d31d0b9c7bed7a9eae310fae6238cf89048f9c..edaf1023a01d4f74204a125a651175ab09d0cc91 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -140,7 +140,6 @@ cy:
         auth_provider: Darparwr Ap
         auth_uid: UID Dilysu
         email: E-bost
         auth_provider: Darparwr Ap
         auth_uid: UID Dilysu
         email: E-bost

-        email_confirmation: Cadarnhad e-bost

         new_email: Cyfeiriad e-bost newydd
         active: Gweithredol
         display_name: Enw defnyddiwr
         new_email: Cyfeiriad e-bost newydd
         active: Gweithredol
         display_name: Enw defnyddiwr


@@ -1772,7 +1771,7 @@ cy:
   sessions:
     new:
       title: Mewngofnodi
   sessions:
     new:
       title: Mewngofnodi

-      heading: Mewngofnodi
+      tab_title: Mewngofnodi

       email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
       password: Cyfrinair
       remember: Cofiwch fi
       email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
       password: Cyfrinair
       remember: Cofiwch fi


@@ -1780,34 +1779,7 @@ cy:
       login_button: Mewngofnodi
       register now: Cofrestru nawr
       with external: 'Fel arall, defnyddiwch drydydd parti i fewngofnodi:'
       login_button: Mewngofnodi
       register now: Cofrestru nawr
       with external: 'Fel arall, defnyddiwch drydydd parti i fewngofnodi:'

-      no account: Dim cyfrif gennych?

       auth failure: Mae'n ddrwg gennym, ni ellir mewngofnodi gyda'r manylion hynny.
       auth failure: Mae'n ddrwg gennym, ni ellir mewngofnodi gyda'r manylion hynny.

-      openid_logo_alt: Mewngofnodi gydag OpenID
-      auth_providers:
-        openid:
-          title: Mewngofnodi ag OpenID
-          alt: Mewngofnodi ag URL OpenID
-        google:
-          title: Mewngofnodi â Google
-          alt: Mewngofnodi â Google OpenID
-        facebook:
-          title: Mewngofnodi â Facebook
-          alt: Mewngofnodi â Chyfrif Facebook
-        microsoft:
-          title: Mewngofnodi gyda Microsoft
-          alt: Mewngofnodi gyda Chyfrif Microsoft
-        github:
-          title: Mewngofnodi â GitHub
-          alt: Mewngofnodi â Chyfrif GitHub
-        wikipedia:
-          title: Mewngofnodi ag Wicipedia
-          alt: Mewngofnodi â Chyfrif Wicipedia
-        wordpress:
-          title: Mewngofnodi ag Wordpress
-          alt: Mewngofnodi ag Wordpress OpenID
-        aol:
-          title: Mewngofnodi ag AOL
-          alt: Mewngofnodi ag AOL OpenID

     destroy:
       title: Allgofnodi
       heading: Allgofnodi o OpenStreetMap
     destroy:
       title: Allgofnodi
       heading: Allgofnodi o OpenStreetMap


@@ -2280,6 +2252,32 @@ cy:
       oauth2_applications: Apiau OAuth 2
       oauth2_authorizations: Awdurdodiadau OAuth 2
       muted_users: Defnyddwyr ag Anwybyddwyd
       oauth2_applications: Apiau OAuth 2
       oauth2_authorizations: Awdurdodiadau OAuth 2
       muted_users: Defnyddwyr ag Anwybyddwyd

+    auth_providers:
+      openid_logo_alt: Mewngofnodi gydag OpenID
+      openid:
+        title: Mewngofnodi ag OpenID
+        alt: Mewngofnodi ag URL OpenID
+      google:
+        title: Mewngofnodi â Google
+        alt: Mewngofnodi â Google OpenID
+      facebook:
+        title: Mewngofnodi â Facebook
+        alt: Mewngofnodi â Chyfrif Facebook
+      microsoft:
+        title: Mewngofnodi gyda Microsoft
+        alt: Mewngofnodi gyda Chyfrif Microsoft
+      github:
+        title: Mewngofnodi â GitHub
+        alt: Mewngofnodi â Chyfrif GitHub
+      wikipedia:
+        title: Mewngofnodi ag Wicipedia
+        alt: Mewngofnodi â Chyfrif Wicipedia
+      wordpress:
+        title: Mewngofnodi ag Wordpress
+        alt: Mewngofnodi ag Wordpress OpenID
+      aol:
+        title: Mewngofnodi ag AOL
+        alt: Mewngofnodi ag AOL OpenID

   oauth:
     authorize:
       title: Awdurdodi mynediad i'ch cyfrif
   oauth:
     authorize:
       title: Awdurdodi mynediad i'ch cyfrif


@@ -2385,10 +2383,10 @@ cy:
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
       external auth: 'Dilysu Trydydd Parti:'
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
       external auth: 'Dilysu Trydydd Parti:'

-      use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi

       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
       privacy_policy: polisi preifatrwydd
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
       privacy_policy: polisi preifatrwydd

+      use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi

     terms:
       title: Telerau
       heading: Telerau
     terms:
       title: Telerau
       heading: Telerau

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 857dba978bf5f96a668d08ee55face7ba7c80e1b..6f0d89417ce72427088de1936a0a5eaa65291797 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -171,7 +171,6 @@ da:
         auth_provider: Autentificeringsleverandør
         auth_uid: Autentificerings-UID
         email: E-mail
         auth_provider: Autentificeringsleverandør
         auth_uid: Autentificerings-UID
         email: E-mail

-        email_confirmation: E-mail-bekræftelse

         new_email: Ny e-mailadresse
         active: Aktiv
         display_name: Offentligt brugernavn
         new_email: Ny e-mailadresse
         active: Aktiv
         display_name: Offentligt brugernavn


@@ -1928,7 +1927,7 @@ da:
   sessions:
     new:
       title: Log ind
   sessions:
     new:
       title: Log ind

-      heading: Log ind
+      tab_title: Log ind

       email or username: E-mailadresse eller brugernavn
       password: Adgangskode
       remember: Husk mig
       email or username: E-mailadresse eller brugernavn
       password: Adgangskode
       remember: Husk mig


@@ -1936,34 +1935,7 @@ da:
       login_button: Log ind
       register now: Registrér nu
       with external: 'Alternativt kan du bruge en tredjepart for at logge ind:'
       login_button: Log ind
       register now: Registrér nu
       with external: 'Alternativt kan du bruge en tredjepart for at logge ind:'

-      no account: Har du ingen konto?

       auth failure: Kunne ikke logge på med disse oplysninger.
       auth failure: Kunne ikke logge på med disse oplysninger.

-      openid_logo_alt: Log på med et OpenID
-      auth_providers:
-        openid:
-          title: Log på med OpenID
-          alt: Log på med en OpenID-URL
-        google:
-          title: Log på med Google
-          alt: Log på med et Google OpenID
-        facebook:
-          title: Log på med Facebook
-          alt: Log på med en Facebook-konto
-        microsoft:
-          title: Log ind med Microsoft
-          alt: Log ind med en Microsoft-konto
-        github:
-          title: Log ind med GitHub
-          alt: Log ind med en GitHub-konto
-        wikipedia:
-          title: Log ind med Wikipedia
-          alt: Log ind med en Wikipedia-konto
-        wordpress:
-          title: Log på med Wordpress
-          alt: Log på med et Wordpress OpenID
-        aol:
-          title: Log på med AOL
-          alt: Log på med et AOL OpenID

     destroy:
       title: Log af
       heading: Log af fra OpenStreetMap
     destroy:
       title: Log af
       heading: Log af fra OpenStreetMap


@@ -2615,6 +2587,32 @@ da:
       oauth2_applications: OAuth 2-applikationer
       oauth2_authorizations: OAuth 2-autorisationer
       muted_users: Stillegjorte Brugere
       oauth2_applications: OAuth 2-applikationer
       oauth2_authorizations: OAuth 2-autorisationer
       muted_users: Stillegjorte Brugere

+    auth_providers:
+      openid_logo_alt: Log på med et OpenID
+      openid:
+        title: Log på med OpenID
+        alt: Log på med en OpenID-URL
+      google:
+        title: Log på med Google
+        alt: Log på med et Google OpenID
+      facebook:
+        title: Log på med Facebook
+        alt: Log på med en Facebook-konto
+      microsoft:
+        title: Log ind med Microsoft
+        alt: Log ind med en Microsoft-konto
+      github:
+        title: Log ind med GitHub
+        alt: Log ind med en GitHub-konto
+      wikipedia:
+        title: Log ind med Wikipedia
+        alt: Log ind med en Wikipedia-konto
+      wordpress:
+        title: Log på med Wordpress
+        alt: Log på med et Wordpress OpenID
+      aol:
+        title: Log på med AOL
+        alt: Log på med et AOL OpenID

   oauth:
     authorize:
       title: Tillad adgang til din konto
   oauth:
     authorize:
       title: Tillad adgang til din konto


@@ -2761,15 +2759,13 @@ da:
       display name description: Dit offentligt synlige brugernavn. Du kan ændre dette
         senere i indstillingerne.
       external auth: 'Tredjeparts-godkendelse:'
       display name description: Dit offentligt synlige brugernavn. Du kan ændre dette
         senere i indstillingerne.
       external auth: 'Tredjeparts-godkendelse:'

-      use external auth: Alternativt kan du bruge en tredjepart for at logge på
-      auth no password: Med tredjeparts-godkendelse er en adgangskode ikke påkrævet,
-        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!
       continue: Opret konto
       terms accepted: Tak for at du accepterede de nye vilkår for bidragsydere!

-      email_confirmation_help_html: Din adresse vises ikke offentligt. Se vores %{privacy_policy_link}
+      email_help_html: Din adresse vises ikke offentligt. Se vores %{privacy_policy_link}

         for flere oplysninger.
       privacy_policy: privatlivs-politik
       privacy_policy_title: OSMF privatlivs-politik inklusiv afsnit om e-mailadresser
         for flere oplysninger.
       privacy_policy: privatlivs-politik
       privacy_policy_title: OSMF privatlivs-politik inklusiv afsnit om e-mailadresser

+      use external auth: Alternativt kan du bruge en tredjepart for at logge på

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

diff --git a/config/locales/de.yml b/config/locales/de.yml
index d23403058752ef0c84ad77792777b0738a180e26..eb65f02f7b32b1d5ccd9efe83c381a96316a747a 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -245,7 +245,6 @@ de:
         auth_provider: Authentifizierungsanbieter
         auth_uid: Authentifizierungs-UID
         email: E-Mail
         auth_provider: Authentifizierungsanbieter
         auth_uid: Authentifizierungs-UID
         email: E-Mail

-        email_confirmation: E-Mail-Bestätigung

         new_email: Neue E-Mail-Adresse
         active: Aktiv
         display_name: Anzeigename
         new_email: Neue E-Mail-Adresse
         active: Aktiv
         display_name: Anzeigename


@@ -2058,7 +2057,7 @@ de:
   sessions:
     new:
       title: Anmelden
   sessions:
     new:
       title: Anmelden

-      heading: Anmelden
+      tab_title: Anmelden

       email or username: E-Mail-Adresse oder Benutzername
       password: Passwort
       remember: Anmeldedaten merken
       email or username: E-Mail-Adresse oder Benutzername
       password: Passwort
       remember: Anmeldedaten merken


@@ -2066,34 +2065,7 @@ de:
       login_button: Anmelden
       register now: Jetzt registrieren
       with external: 'Verwende alternativ einen Drittanbieter für die Anmeldung:'
       login_button: Anmelden
       register now: Jetzt registrieren
       with external: 'Verwende alternativ einen Drittanbieter für die Anmeldung:'

-      no account: Du hast noch kein Benutzerkonto?

       auth failure: Mit diesen Daten leider keine Anmeldung möglich.
       auth failure: Mit diesen Daten leider keine Anmeldung möglich.

-      openid_logo_alt: Mit einer OpenID anmelden
-      auth_providers:
-        openid:
-          title: Mit OpenID anmelden
-          alt: Mit einer OpenID-URL anmelden
-        google:
-          title: Mit Google anmelden
-          alt: Mit einer Google-OpenID anmelden
-        facebook:
-          title: Mit Facebook anmelden
-          alt: Mit einem Facebook-Konto anmelden
-        microsoft:
-          title: Mit Microsoft anmelden
-          alt: Mit einem Microsoft-Konto anmelden
-        github:
-          title: Mit GitHub anmelden
-          alt: Mit einem GitHub-Konto anmelden
-        wikipedia:
-          title: Mit Wikipedia anmelden
-          alt: Mit einem Wikipedia-Benutzerkonto anmelden
-        wordpress:
-          title: Mit Wordpress anmelden
-          alt: Mit einer Wordpress-OpenID anmelden
-        aol:
-          title: Mit AOL anmelden
-          alt: Mit einer AOL-OpenID anmelden

     destroy:
       title: Abmelden
       heading: Von OpenStreetMap abmelden
     destroy:
       title: Abmelden
       heading: Von OpenStreetMap abmelden


@@ -2785,6 +2757,32 @@ de:
       oauth2_applications: OAuth 2-Anwendungen
       oauth2_authorizations: OAuth 2-Berechtigungen
       muted_users: Stummgeschaltete Benutzer
       oauth2_applications: OAuth 2-Anwendungen
       oauth2_authorizations: OAuth 2-Berechtigungen
       muted_users: Stummgeschaltete Benutzer

+    auth_providers:
+      openid_logo_alt: Mit einer OpenID anmelden
+      openid:
+        title: Mit OpenID anmelden
+        alt: Mit einer OpenID-URL anmelden
+      google:
+        title: Mit Google anmelden
+        alt: Mit einer Google-OpenID anmelden
+      facebook:
+        title: Mit Facebook anmelden
+        alt: Mit einem Facebook-Konto anmelden
+      microsoft:
+        title: Mit Microsoft anmelden
+        alt: Mit einem Microsoft-Konto anmelden
+      github:
+        title: Mit GitHub anmelden
+        alt: Mit einem GitHub-Konto anmelden
+      wikipedia:
+        title: Mit Wikipedia anmelden
+        alt: Mit einem Wikipedia-Benutzerkonto anmelden
+      wordpress:
+        title: Mit Wordpress anmelden
+        alt: Mit einer Wordpress-OpenID anmelden
+      aol:
+        title: Mit AOL anmelden
+        alt: Mit einer AOL-OpenID anmelden

   oauth:
     authorize:
       title: Zugriff auf dein Benutzerkonto autorisieren
   oauth:
     authorize:
       title: Zugriff auf dein Benutzerkonto autorisieren


@@ -2936,17 +2934,15 @@ de:
       display name description: Dein öffentlich angezeigter Benutzername. Er kann
         später in den Einstellungen geändert werden.
       external auth: 'Drittparteiauthentifikation:'
       display name description: Dein öffentlich angezeigter Benutzername. Er kann
         später in den Einstellungen geändert werden.
       external auth: 'Drittparteiauthentifikation:'

-      use external auth: Verwende alternativ einen Drittanbieter für die Anmeldung
-      auth no password: Mit Drittparteiauthentifikation ist kein Passwort erforderlich,
-        jedoch können einige Extrawerkzeuge oder Server eines benötigen.

       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!

-      email_confirmation_help_html: Deine Adresse wird nicht öffentlich angezeigt.
-        Weitere Informationen findest du in unserer %{privacy_policy_link}.
+      email_help_html: Deine Adresse wird nicht öffentlich angezeigt. Weitere Informationen
+        findest du in unserer %{privacy_policy_link}.

       privacy_policy: Datenschutzrichtlinie
       privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
         E-Mail-Adressen
       privacy_policy: Datenschutzrichtlinie
       privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
         E-Mail-Adressen

+      use external auth: Verwende alternativ einen Drittanbieter für die Anmeldung

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

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index ba1079129aa11f4e1f9bf4bce903637e647f6608..669c102e8ad7f1469132d6b80392af48fa3c11e6 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -846,15 +846,13 @@ diq:
   sessions:
     new:
       title: Cıkewtış
   sessions:
     new:
       title: Cıkewtış

-      heading: Cıkewtış
+      tab_title: Cıkewtış

       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış
       register now: Enewkê qeyd bê
       email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
       remember: Mı biya xo viri
       lost password link: Şıma parolay xo ke xo vira?
       login_button: Cıkewtış
       register now: Enewkê qeyd bê

-      no account: Hesabê şıma çıniyo?
-      openid_logo_alt: OpenID ya dekewê de

     destroy:
       title: Veciyayış
       heading: OpenStreetMap ra vıcyayış
     destroy:
       title: Veciyayış
       heading: OpenStreetMap ra vıcyayış


@@ -947,6 +945,9 @@ diq:
       public_traces: Pêron rê akerde rêçê GPS
       public_traces_from: '%{user} ra pêron rê akerde rêçê GPS'
       tagged_with: '%{tags} ya etiketyayo'
       public_traces: Pêron rê akerde rêçê GPS
       public_traces_from: '%{user} ra pêron rê akerde rêçê GPS'
       tagged_with: '%{tags} ya etiketyayo'

+  application:
+    auth_providers:
+      openid_logo_alt: OpenID ya dekewê de

   oauth_clients:
     show:
       edit: Teferuatan bıvurne
   oauth_clients:
     show:
       edit: Teferuatan bıvurne

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index aa74193ce99f537b5903de96e302183502d315e9..7682a8f00ca8271c211db3f915fee5375798450a 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1119,16 +1119,14 @@ dsb:
   sessions:
     new:
       title: Pśizjawjenje
   sessions:
     new:
       title: Pśizjawjenje

-      heading: Pśizjawjenje
+      tab_title: Pśizjawjenje

       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'
       remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se
       register now: Něnto registrěrowaś
       email or username: 'E-mailowa adresa abo wužywarske mě:'
       password: 'Gronidło:'
       remember: Spomnjeś se
       lost password link: Sy swójo gronidło zabył?
       login_button: Pśizjawiś se
       register now: Něnto registrěrowaś

-      no account: Njamaš wužywarske konto?

       auth failure: Bóžko, pśizjawjenje z toś tymi datami njejo móžno.
       auth failure: Bóžko, pśizjawjenje z toś tymi datami njejo móžno.

-      openid_logo_alt: Z OpenID se pśizjawiś

     destroy:
       title: Wótzjawiś se
       heading: Z OpenStreetMap se wótzjawiś
     destroy:
       title: Wótzjawiś se
       heading: Z OpenStreetMap se wótzjawiś


@@ -1435,6 +1433,8 @@ dsb:
       need_to_see_terms: Twój pśistup na API jo nachylu wusajźony. Pšosym pśizjaw
         se k webpówjerchoju, aby se wužywarske wuměnjenja woglědał. Njetrjebaš zwóliś
         do nich, musyš se je jano woglědaś.
       need_to_see_terms: Twój pśistup na API jo nachylu wusajźony. Pšosym pśizjaw
         se k webpówjerchoju, aby se wužywarske wuměnjenja woglědał. Njetrjebaš zwóliś
         do nich, musyš se je jano woglědaś.

+    auth_providers:
+      openid_logo_alt: Z OpenID se pśizjawiś

   oauth:
     authorize:
       title: Pśistup na twójo konto awtorizěrowaś
   oauth:
     authorize:
       title: Pśistup na twójo konto awtorizěrowaś

diff --git a/config/locales/el.yml b/config/locales/el.yml
index d7ce719db2bc7381251d4742b702867f5561298f..148cfe72b8bd9757581a7643f7edbd3450f70078 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -179,7 +179,6 @@ el:
         auth_provider: Πάροχος αυθεντικοποίησης
         auth_uid: UID αυθεντικοποίησης
         email: Διεύθυνση ηλεκτρονικού ταχυδρομείου
         auth_provider: Πάροχος αυθεντικοποίησης
         auth_uid: UID αυθεντικοποίησης
         email: Διεύθυνση ηλεκτρονικού ταχυδρομείου

-        email_confirmation: Επιβεβαίωση διεύθυνσης email

         new_email: Νέα διεύθυνση email
         active: Ενεργό
         display_name: Εμφάνιση ονόματος
         new_email: Νέα διεύθυνση email
         active: Ενεργό
         display_name: Εμφάνιση ονόματος


@@ -1992,7 +1991,7 @@ el:
   sessions:
     new:
       title: Σύνδεση
   sessions:
     new:
       title: Σύνδεση

-      heading: Σύνδεση
+      tab_title: Σύνδεση

       email or username: Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη
       password: Συνθηματικό
       remember: Να με θυμάσαι
       email or username: Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη
       password: Συνθηματικό
       remember: Να με θυμάσαι


@@ -2000,34 +1999,7 @@ el:
       login_button: Σύνδεση
       register now: Εγγραφείτε τώρα
       with external: 'Εναλλακτικά, χρησιμοποιήστε τρίτη υπηρεσία για σύνδεση:'
       login_button: Σύνδεση
       register now: Εγγραφείτε τώρα
       with external: 'Εναλλακτικά, χρησιμοποιήστε τρίτη υπηρεσία για σύνδεση:'

-      no account: Δεν έχετε λογαριασμό;

       auth failure: Λυπούμαστε, δεν μπορείτε να συνδεθείτε με αυτές τις λεπτομέρειες.
       auth failure: Λυπούμαστε, δεν μπορείτε να συνδεθείτε με αυτές τις λεπτομέρειες.

-      openid_logo_alt: Σύνδεση με ένα OpenID
-      auth_providers:
-        openid:
-          title: Σύνδεση με OpenID
-          alt: Σύνδεση με ένα OpenID URL
-        google:
-          title: Σύνδεση με Google
-          alt: Σύνδεση με ένα Google OpenID
-        facebook:
-          title: Σύνδεση με Facebook
-          alt: Σύνδεση με λογαριασμό Facebook
-        microsoft:
-          title: Σύνδεση με Microsoft
-          alt: Σύνδεση με λογαριασμό Microsoft
-        github:
-          title: Σύνδεση με GitHub
-          alt: Σύνδεση με λογαριασμό GitHub
-        wikipedia:
-          title: Σύνδεση με Wikipedia
-          alt: Συνδεθείτε με λογαριασμό Wikipedia
-        wordpress:
-          title: Σύνδεση με Wordpress
-          alt: Σύνδεση με ένα Wordpress OpenID
-        aol:
-          title: Σύνδεση με AOL
-          alt: Σύνδεση με ένα AOL OpenID

     destroy:
       title: Αποσύνδεση
       heading: Αποσύνδεση από το OpenStreetMap
     destroy:
       title: Αποσύνδεση
       heading: Αποσύνδεση από το OpenStreetMap


@@ -2665,6 +2637,32 @@ el:
       oauth2_applications: Εφαρμογές OAuth 2
       oauth2_authorizations: Εξουσιοδοτήσεις OAuth 2
       muted_users: Χρήστες σε Σίγαση
       oauth2_applications: Εφαρμογές OAuth 2
       oauth2_authorizations: Εξουσιοδοτήσεις OAuth 2
       muted_users: Χρήστες σε Σίγαση

+    auth_providers:
+      openid_logo_alt: Σύνδεση με ένα OpenID
+      openid:
+        title: Σύνδεση με OpenID
+        alt: Σύνδεση με ένα OpenID URL
+      google:
+        title: Σύνδεση με Google
+        alt: Σύνδεση με ένα Google OpenID
+      facebook:
+        title: Σύνδεση με Facebook
+        alt: Σύνδεση με λογαριασμό Facebook
+      microsoft:
+        title: Σύνδεση με Microsoft
+        alt: Σύνδεση με λογαριασμό Microsoft
+      github:
+        title: Σύνδεση με GitHub
+        alt: Σύνδεση με λογαριασμό GitHub
+      wikipedia:
+        title: Σύνδεση με Wikipedia
+        alt: Συνδεθείτε με λογαριασμό Wikipedia
+      wordpress:
+        title: Σύνδεση με Wordpress
+        alt: Σύνδεση με ένα Wordpress OpenID
+      aol:
+        title: Σύνδεση με AOL
+        alt: Σύνδεση με ένα AOL OpenID

   oauth:
     authorize:
       title: Επιτρέψτε την πρόσβαση στο λογαριασμό σας
   oauth:
     authorize:
       title: Επιτρέψτε την πρόσβαση στο λογαριασμό σας


@@ -2818,16 +2816,14 @@ el:
       display name description: Το δημόσια εμφανιζόμενο όνομα χρήστη. Μπορείτε να
         το αλλάξετε αργότερα από τις προτιμήσεις.
       external auth: 'Έλεγχος ταυτότητας από τρίτο μέρος:'
       display name description: Το δημόσια εμφανιζόμενο όνομα χρήστη. Μπορείτε να
         το αλλάξετε αργότερα από τις προτιμήσεις.
       external auth: 'Έλεγχος ταυτότητας από τρίτο μέρος:'

-      use external auth: Εναλλακτικά, χρησιμοποιήστε τρίτη υπηρεσία για σύνδεση
-      auth no password: Για την έγκριση τρίτων δεν απαιτείται κωδικός πρόσβασης, αλλά
-        μερικά ειδικά εργαλεία αλλιώς ο διακομιστής μπορεί να χρειάζεται ένα.

       continue: Εγγραφή
       terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς!
       continue: Εγγραφή
       terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς!

-      email_confirmation_help_html: Η διεύθυνσή σας δεν εμφανίζεται δημόσια, ανατρέξτε
-        στην %{privacy_policy_link} για περισσότερες πληροφορίες.
+      email_help_html: Η διεύθυνσή σας δεν εμφανίζεται δημόσια, ανατρέξτε στην %{privacy_policy_link}
+        για περισσότερες πληροφορίες.

       privacy_policy: πολιτική απορρήτου
       privacy_policy_title: Πολιτική απορρήτου OSMF, συμπεριλαμβανομένης της ενότητας
         για τις διευθύνσεις ηλεκτρονικού ταχυδρομείου
       privacy_policy: πολιτική απορρήτου
       privacy_policy_title: Πολιτική απορρήτου OSMF, συμπεριλαμβανομένης της ενότητας
         για τις διευθύνσεις ηλεκτρονικού ταχυδρομείου

+      use external auth: Εναλλακτικά, χρησιμοποιήστε τρίτη υπηρεσία για σύνδεση

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a1fe561764e23a6bdfd8ceb351070567967495df..b2d20128faeac3bf5836c81265383532b550475a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1365,7 +1365,7 @@ en-GB:
   sessions:
     new:
       title: Login
   sessions:
     new:
       title: Login

-      heading: Login
+      tab_title: Login

       email or username: E-mail Address or Username
       password: Password
       remember: Remember me
       email or username: E-mail Address or Username
       password: Password
       remember: Remember me


@@ -1373,34 +1373,7 @@ en-GB:
       login_button: Login
       register now: Register now
       with external: 'Alternatively, use a third party to login:'
       login_button: Login
       register now: Register now
       with external: 'Alternatively, use a third party to login:'

-      no account: Don't have an account?

       auth failure: Sorry, could not log in with those details.
       auth failure: Sorry, could not log in with those details.

-      openid_logo_alt: Log in with an OpenID
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        microsoft:
-          title: Login with Microsoft
-          alt: Login with a Microsoft Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
-        wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
-        wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID

     destroy:
       title: Logout
       heading: Logout of OpenStreetMap
     destroy:
       title: Logout
       heading: Logout of OpenStreetMap


@@ -1720,6 +1693,32 @@ en-GB:
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.

+    auth_providers:
+      openid_logo_alt: Log in with an OpenID
+      openid:
+        title: Login with OpenID
+        alt: Login with an OpenID URL
+      google:
+        title: Login with Google
+        alt: Login with a Google OpenID
+      facebook:
+        title: Login with Facebook
+        alt: Login with a Facebook Account
+      microsoft:
+        title: Login with Microsoft
+        alt: Login with a Microsoft Account
+      github:
+        title: Login with GitHub
+        alt: Login with a GitHub Account
+      wikipedia:
+        title: Login with Wikipedia
+        alt: Login with a Wikipedia Account
+      wordpress:
+        title: Login with Wordpress
+        alt: Login with a Wordpress OpenID
+      aol:
+        title: Login with AOL
+        alt: Login with an AOL OpenID

   oauth:
     authorize:
       title: Authorise access to your account
   oauth:
     authorize:
       title: Authorise access to your account


@@ -1801,11 +1800,9 @@ en-GB:
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'

-      use external auth: Alternatively, use a third party to login
-      auth no password: With third party authentication a password is not required,
-        but some extra tools or server may still need one.

       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!

+      use external auth: Alternatively, use a third party to login

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

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 4bd7a92ce4567f78d9e2c1d1f7810d3664c357f8..cf9a1442c7a99f1ab02eb9ac630abcdeec798bf1 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -162,7 +162,6 @@ eo:
         auth_provider: Liveranto de aŭtentigo
         auth_uid: Uzant‑identigilo de aŭtentigo
         email: Retpoŝto
         auth_provider: Liveranto de aŭtentigo
         auth_uid: Uzant‑identigilo de aŭtentigo
         email: Retpoŝto

-        email_confirmation: Konfirmi retpoŝtan adreson

         new_email: Nova retpoŝta adreso
         active: Aktiva
         display_name: Montra nomo
         new_email: Nova retpoŝta adreso
         active: Aktiva
         display_name: Montra nomo


@@ -1925,7 +1924,7 @@ eo:
   sessions:
     new:
       title: Ensaluti
   sessions:
     new:
       title: Ensaluti

-      heading: Ensaluti
+      tab_title: Ensaluti

       email or username: Retpoŝta adreso aŭ uzantnomo
       password: Pasvorto
       remember: Memori min
       email or username: Retpoŝta adreso aŭ uzantnomo
       password: Pasvorto
       remember: Memori min


@@ -1933,34 +1932,7 @@ eo:
       login_button: Ensaluti
       register now: Registriĝi
       with external: 'Alimaniere, ensalutu uzante:'
       login_button: Ensaluti
       register now: Registriĝi
       with external: 'Alimaniere, ensalutu uzante:'

-      no account: Ĉu vi ne havas konton?

       auth failure: Bedaŭrinde ne povas ensaluti kun ĉi tiuj informoj.
       auth failure: Bedaŭrinde ne povas ensaluti kun ĉi tiuj informoj.

-      openid_logo_alt: Ensaluti per OpenID
-      auth_providers:
-        openid:
-          title: Ensaluti per OpenID
-          alt: Ensaluti per ligilo OpenID
-        google:
-          title: Ensaluti per Google
-          alt: Ensaluti per Google OpenID
-        facebook:
-          title: Ensaluti per Facebook
-          alt: Ensaluti per konto Facebook
-        microsoft:
-          title: Ensaluti per Microsoft
-          alt: Ensaluti per konto Microsoft
-        github:
-          title: Ensaluti per GitHub
-          alt: Ensaluti per konto GitHub
-        wikipedia:
-          title: Ensaluti per Vikipedio
-          alt: Ensaluti per Vikipedia konto
-        wordpress:
-          title: Ensaluti per Wordpress
-          alt: Ensaluti per Wordpress OpenID
-        aol:
-          title: Ensaluti per AOL
-          alt: Ensaluti per AOL OpenID

     destroy:
       title: Elsaluti
       heading: Elsaluti el OpenStreetMap
     destroy:
       title: Elsaluti
       heading: Elsaluti el OpenStreetMap


@@ -2612,6 +2584,32 @@ eo:
       oauth2_applications: Aplikaĵoj OAuth 2
       oauth2_authorizations: Rajtigoj OAuth 2
       muted_users: Silentigitaj uzantoj
       oauth2_applications: Aplikaĵoj OAuth 2
       oauth2_authorizations: Rajtigoj OAuth 2
       muted_users: Silentigitaj uzantoj

+    auth_providers:
+      openid_logo_alt: Ensaluti per OpenID
+      openid:
+        title: Ensaluti per OpenID
+        alt: Ensaluti per ligilo OpenID
+      google:
+        title: Ensaluti per Google
+        alt: Ensaluti per Google OpenID
+      facebook:
+        title: Ensaluti per Facebook
+        alt: Ensaluti per konto Facebook
+      microsoft:
+        title: Ensaluti per Microsoft
+        alt: Ensaluti per konto Microsoft
+      github:
+        title: Ensaluti per GitHub
+        alt: Ensaluti per konto GitHub
+      wikipedia:
+        title: Ensaluti per Vikipedio
+        alt: Ensaluti per Vikipedia konto
+      wordpress:
+        title: Ensaluti per Wordpress
+        alt: Ensaluti per Wordpress OpenID
+      aol:
+        title: Ensaluti per AOL
+        alt: Ensaluti per AOL OpenID

   oauth:
     authorize:
       title: Rajtigi aliron al via konto
   oauth:
     authorize:
       title: Rajtigi aliron al via konto


@@ -2760,16 +2758,14 @@ eo:
       display name description: Via publike montrata uzantnomo. Vi povas ŝanĝi ĝin
         poste per la agordoj.
       external auth: 'Ensaluti per ekstera servo:'
       display name description: Via publike montrata uzantnomo. Vi povas ŝanĝi ĝin
         poste per la agordoj.
       external auth: 'Ensaluti per ekstera servo:'

-      use external auth: Alternative, ensaluti uzante eksteran servon
-      auth no password: Kun ensalutado per ekstera servo, pasvorto ne endas, sed kelkaj
-        iloj aŭ servilo krom tio povas bezoni ĝin.

       continue: Registriĝi
       terms accepted: Dankon por akcepto de nova interkonsento pri kontribuado!
       continue: Registriĝi
       terms accepted: Dankon por akcepto de nova interkonsento pri kontribuado!

-      email_confirmation_help_html: Via retpoŝta adreso ne estas publike montrata,
-        legu nian %{privacy_policy_link} por pli da informoj.
+      email_help_html: Via retpoŝta adreso ne estas publike montrata, legu nian %{privacy_policy_link}
+        por pli da informoj.

       privacy_policy: privatecan politikon
       privacy_policy_title: privateca politiko de OSMF enhavanta sekcion pri uzo de
         retpoŝta adreso
       privacy_policy: privatecan politikon
       privacy_policy_title: privateca politiko de OSMF enhavanta sekcion pri uzo de
         retpoŝta adreso

+      use external auth: Alternative, ensaluti uzante eksteran servon

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

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6d5e855b148c5d6178da9767746afedf1ab7a019..a744437173888eaf483647e12ecbe19735f79292 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -232,7 +232,6 @@ es:
         auth_provider: Proveedor de autentificación
         auth_uid: UID de autentificación
         email: Correo electrónico
         auth_provider: Proveedor de autentificación
         auth_uid: UID de autentificación
         email: Correo electrónico

-        email_confirmation: Confirmación de correo electrónico

         new_email: Nueva dirección de correo electrónico
         active: Activo
         display_name: Nombre para mostrar
         new_email: Nueva dirección de correo electrónico
         active: Activo
         display_name: Nombre para mostrar


@@ -2039,7 +2038,7 @@ es:
   sessions:
     new:
       title: Iniciar sesión
   sessions:
     new:
       title: Iniciar sesión

-      heading: Iniciar sesión
+      tab_title: Iniciar sesión

       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: Contraseña
       remember: Recordarme
       email or username: 'Dirección de correo electrónico o nombre de usuario:'
       password: Contraseña
       remember: Recordarme


@@ -2047,34 +2046,7 @@ es:
       login_button: Iniciar sesión
       register now: Registrarse ahora
       with external: 'O bien, utiliza un servicio de terceros para acceder:'
       login_button: Iniciar sesión
       register now: Registrarse ahora
       with external: 'O bien, utiliza un servicio de terceros para acceder:'

-      no account: ¿No estás registrado?

       auth failure: Lo sentimos. No se pudo iniciar sesión con esos datos.
       auth failure: Lo sentimos. No se pudo iniciar sesión con esos datos.

-      openid_logo_alt: Inicia sesión con una OpenID
-      auth_providers:
-        openid:
-          title: Iniciar sesión con OpenID
-          alt: Iniciar sesión con una URL OpenID
-        google:
-          title: Iniciar sesión con Google
-          alt: Iniciar sesión con una OpenID de Google
-        facebook:
-          title: Iniciar sesión con Facebook
-          alt: Iniciar sesión con una cuenta de Facebook
-        microsoft:
-          title: Iniciar sesión con Microsoft
-          alt: Iniciar sesión con una cuenta Microsoft
-        github:
-          title: Iniciar sesión con GitHub
-          alt: Iniciar sesión con una cuenta de GitHub
-        wikipedia:
-          title: Iniciar sesión con Wikipedia
-          alt: Iniciar sesión con una cuenta de Wikipedia
-        wordpress:
-          title: Iniciar sesión con Wordpress
-          alt: Iniciar sesión con una OpenID de Wordpress
-        aol:
-          title: Iniciar sesión con AOL
-          alt: Iniciar sesión con una OpenID de AOL

     destroy:
       title: Cerrar sesión
       heading: Cerrar sesión de OpenStreetMap
     destroy:
       title: Cerrar sesión
       heading: Cerrar sesión de OpenStreetMap


@@ -2759,6 +2731,32 @@ es:
       oauth2_applications: Aplicaciones de OAuth 2
       oauth2_authorizations: Autorizaciones de OAuth 2
       muted_users: Usuarios silenciados
       oauth2_applications: Aplicaciones de OAuth 2
       oauth2_authorizations: Autorizaciones de OAuth 2
       muted_users: Usuarios silenciados

+    auth_providers:
+      openid_logo_alt: Inicia sesión con una OpenID
+      openid:
+        title: Iniciar sesión con OpenID
+        alt: Iniciar sesión con una URL OpenID
+      google:
+        title: Iniciar sesión con Google
+        alt: Iniciar sesión con una OpenID de Google
+      facebook:
+        title: Iniciar sesión con Facebook
+        alt: Iniciar sesión con una cuenta de Facebook
+      microsoft:
+        title: Iniciar sesión con Microsoft
+        alt: Iniciar sesión con una cuenta Microsoft
+      github:
+        title: Iniciar sesión con GitHub
+        alt: Iniciar sesión con una cuenta de GitHub
+      wikipedia:
+        title: Iniciar sesión con Wikipedia
+        alt: Iniciar sesión con una cuenta de Wikipedia
+      wordpress:
+        title: Iniciar sesión con Wordpress
+        alt: Iniciar sesión con una OpenID de Wordpress
+      aol:
+        title: Iniciar sesión con AOL
+        alt: Iniciar sesión con una OpenID de AOL

   oauth:
     authorize:
       title: Autorizar el acceso a tu cuenta
   oauth:
     authorize:
       title: Autorizar el acceso a tu cuenta


@@ -2907,16 +2905,14 @@ es:
       display name description: Tu nombre de usuario público. Puedes cambiarlo más
         tarde en las preferencias.
       external auth: 'Autentificación de terceros:'
       display name description: Tu nombre de usuario público. Puedes cambiarlo más
         tarde en las preferencias.
       external auth: 'Autentificación de terceros:'

-      use external auth: O bien, utiliza un servicio de terceros para acceder
-      auth no password: Con la autenticación de terceros no se necesita una contraseña,
-        aunque habrá algunas herramientas y servidores que aún la soliciten.

       continue: Registrarse
       terms accepted: ¡Gracias por aceptar los nuevos Términos de Colaborador!
       continue: Registrarse
       terms accepted: ¡Gracias por aceptar los nuevos Términos de Colaborador!

-      email_confirmation_help_html: Tu dirección no se mostrará públicamente, consulta
-        nuestra %{privacy_policy_link} para obtener más información.
+      email_help_html: Tu dirección no se mostrará públicamente, consulta nuestra
+        %{privacy_policy_link} para obtener más información.

       privacy_policy: normativa de privacidad
       privacy_policy_title: Política de privacidad de la OSMF, incluida la sección
         sobre direcciones de correo electrónico
       privacy_policy: normativa de privacidad
       privacy_policy_title: Política de privacidad de la OSMF, incluida la sección
         sobre direcciones de correo electrónico

+      use external auth: O bien, utiliza un servicio de terceros para acceder

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

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 264bdc86a5f09a5c2f8a4eda94e4581b87d2a02d..0c3b1427cc614ef55eb2f673fb980dc2427c31d4 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -145,7 +145,6 @@ et:
         details: Palun esita probleemi kohta veel üksikasju (nõutav).
       user:
         email: E-posti aadress
         details: Palun esita probleemi kohta veel üksikasju (nõutav).
       user:
         email: E-posti aadress

-        email_confirmation: E-posti aadressi kinnitus

         new_email: Uus e-posti aadress
         active: Aktiivne
         display_name: Kuvatav nimi
         new_email: Uus e-posti aadress
         active: Aktiivne
         display_name: Kuvatav nimi


@@ -1853,7 +1852,7 @@ et:
   sessions:
     new:
       title: Sisselogimine
   sessions:
     new:
       title: Sisselogimine

-      heading: Logi sisse
+      tab_title: Logi sisse

       email or username: E-posti aadress või kasutajanimi
       password: Parool
       remember: Jäta mind meelde
       email or username: E-posti aadress või kasutajanimi
       password: Parool
       remember: Jäta mind meelde


@@ -1861,34 +1860,7 @@ et:
       login_button: Logi sisse
       register now: Registreeru nüüd
       with external: 'Teise võimalusena võid sisse logida kolmanda osapoole kaudu:'
       login_button: Logi sisse
       register now: Registreeru nüüd
       with external: 'Teise võimalusena võid sisse logida kolmanda osapoole kaudu:'

-      no account: Sa ei ole veel registreerinud kasutajaks?

       auth failure: Kahjuks ei õnnestu nende andmetega sisse logida.
       auth failure: Kahjuks ei õnnestu nende andmetega sisse logida.

-      openid_logo_alt: Logi sisse OpenID-ga
-      auth_providers:
-        openid:
-          title: Logi sisse OpenID-ga
-          alt: Logi sisse OpenID URL-iga
-        google:
-          title: Logi sisse Google'i kaudu
-          alt: Logi sisse Google'i OpenID-ga
-        facebook:
-          title: Logi sisse Facebooki kaudu
-          alt: Logi sisse Facebooki kontoga
-        microsoft:
-          title: Logi sisse Microsofti kaudu
-          alt: Logi sisse Microsofti kontoga
-        github:
-          title: Logi sisse GitHubi kaudu
-          alt: Logi sisse GitHubi kontoga
-        wikipedia:
-          title: Logi sisse Vikipeedia kaudu
-          alt: Logi sisse Vikipeedia kontoga
-        wordpress:
-          title: Logi sisse Wordpressi kaudu
-          alt: Logi sisse Wordpressi OpenID-ga
-        aol:
-          title: Logi sisse AOL-i kaudu
-          alt: Logi sisse AOL-i OpenID-ga

     destroy:
       title: Logi välja
       heading: Logi OpenStreetMapist välja
     destroy:
       title: Logi välja
       heading: Logi OpenStreetMapist välja


@@ -2540,6 +2512,32 @@ et:
       oauth2_applications: OAuth 2 rakendused
       oauth2_authorizations: OAuth 2 volitused
       muted_users: Vaigistatud kasutajad
       oauth2_applications: OAuth 2 rakendused
       oauth2_authorizations: OAuth 2 volitused
       muted_users: Vaigistatud kasutajad

+    auth_providers:
+      openid_logo_alt: Logi sisse OpenID-ga
+      openid:
+        title: Logi sisse OpenID-ga
+        alt: Logi sisse OpenID URL-iga
+      google:
+        title: Logi sisse Google'i kaudu
+        alt: Logi sisse Google'i OpenID-ga
+      facebook:
+        title: Logi sisse Facebooki kaudu
+        alt: Logi sisse Facebooki kontoga
+      microsoft:
+        title: Logi sisse Microsofti kaudu
+        alt: Logi sisse Microsofti kontoga
+      github:
+        title: Logi sisse GitHubi kaudu
+        alt: Logi sisse GitHubi kontoga
+      wikipedia:
+        title: Logi sisse Vikipeedia kaudu
+        alt: Logi sisse Vikipeedia kontoga
+      wordpress:
+        title: Logi sisse Wordpressi kaudu
+        alt: Logi sisse Wordpressi OpenID-ga
+      aol:
+        title: Logi sisse AOL-i kaudu
+        alt: Logi sisse AOL-i OpenID-ga

   oauth:
     authorize:
       title: Lubada juurdepääs sinu kontole
   oauth:
     authorize:
       title: Lubada juurdepääs sinu kontole


@@ -2676,16 +2674,13 @@ et:
       display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem
         eelistustes.
       external auth: 'Kolmanda osapoole autentimine:'
       display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem
         eelistustes.
       external auth: 'Kolmanda osapoole autentimine:'

-      use external auth: Teise võimalusena võid sisse logida kolmanda osapoole kaudu
-      auth no password: Kolmanda osapoole autentimisega parooli ei nõuta, aga mõne
-        lisatööriista või serveri jaoks võib seda siiski tarvis minna.

       continue: Registreeru
       terms accepted: Täname, et nõustusid uute kaastöötingimustega!
       continue: Registreeru
       terms accepted: Täname, et nõustusid uute kaastöötingimustega!

-      email_confirmation_help_html: Sinu aadressi ei kuvata avalikult, loe täpsemalt
-        meie %{privacy_policy_link}.
+      email_help_html: Sinu aadressi ei kuvata avalikult, loe täpsemalt meie %{privacy_policy_link}.

       privacy_policy: andmekaitsereeglitest
       privacy_policy_title: OSMF-i andmekaitsereeglid, milles on alaosa e-posti aadresside
         kohta
       privacy_policy: andmekaitsereeglitest
       privacy_policy_title: OSMF-i andmekaitsereeglid, milles on alaosa e-posti aadresside
         kohta

+      use external auth: Teise võimalusena võid sisse logida kolmanda osapoole kaudu

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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 6930900a06c6833b0a144065862eadb8038eee1d..8cd2bf1cbd3e0b0c23a467da43e7e8704e7a41a6 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -157,7 +157,6 @@ eu:
         auth_provider: Autentifikazio-hornitzailea
         auth_uid: Autentikazio UID
         email: Eposta
         auth_provider: Autentifikazio-hornitzailea
         auth_uid: Autentikazio UID
         email: Eposta

-        email_confirmation: 'E-posta egiaztapena:'

         new_email: 'E-posta helbide berria:'
         active: Aktiboa
         display_name: Erakusteko izena
         new_email: 'E-posta helbide berria:'
         active: Aktiboa
         display_name: Erakusteko izena


@@ -1900,7 +1899,7 @@ eu:
   sessions:
     new:
       title: Saio-hasiera
   sessions:
     new:
       title: Saio-hasiera

-      heading: Saio-hasiera
+      tab_title: Saio-hasiera

       email or username: 'Eposta helbide edo erabiltzaile izena:'
       password: Pasahitza
       remember: Gogora nazazu
       email or username: 'Eposta helbide edo erabiltzaile izena:'
       password: Pasahitza
       remember: Gogora nazazu


@@ -1908,34 +1907,7 @@ eu:
       login_button: Saioa hasi
       register now: Erregistratu orain
       with external: 'Bestela, erabili hirugarrenen bat saioa hasteko:'
       login_button: Saioa hasi
       register now: Erregistratu orain
       with external: 'Bestela, erabili hirugarrenen bat saioa hasteko:'

-      no account: Ez al duzu konturik?

       auth failure: Barkatu, ezin izan da saioa hasi xehetasun horiekin.
       auth failure: Barkatu, ezin izan da saioa hasi xehetasun horiekin.

-      openid_logo_alt: ID irekiarekin saioa hasi
-      auth_providers:
-        openid:
-          title: ID irekiarekin saioa hasi
-          alt: Hasi saioa ID irekia duen URL batekin
-        google:
-          title: Saioa hasi Googlekin
-          alt: Google ID irekiarekin saioa hasi
-        facebook:
-          title: Saioa hasi Facebookekin
-          alt: Saioa hasi Facebookekin
-        microsoft:
-          title: Saioa hasi Microsoftekin
-          alt: Microsoft kontu batekin saioa hasi
-        github:
-          title: GitHub-rekin saioa hasi
-          alt: GitHub kontuarekin saioa hasi
-        wikipedia:
-          title: Saioa hasi Wikipediarekin
-          alt: Wikipedia kontuarekin saioa hasi
-        wordpress:
-          title: Wordpress bidez saioa hasi
-          alt: Wordpress ID irekiarekin saioa hasi
-        aol:
-          title: AOL erabiliz saioa hasi
-          alt: AOL ID irekiarekin saioa hasi

     destroy:
       title: Saio-itxiera
       heading: OpenStreetMap-etik saioa itxi
     destroy:
       title: Saio-itxiera
       heading: OpenStreetMap-etik saioa itxi


@@ -2489,6 +2461,32 @@ eu:
       oauth1_settings: OAuth 1 ezarpenak
       oauth2_applications: OAuth 2 aplikazioak
       oauth2_authorizations: OAuth 2 baimenak
       oauth1_settings: OAuth 1 ezarpenak
       oauth2_applications: OAuth 2 aplikazioak
       oauth2_authorizations: OAuth 2 baimenak

+    auth_providers:
+      openid_logo_alt: ID irekiarekin saioa hasi
+      openid:
+        title: ID irekiarekin saioa hasi
+        alt: Hasi saioa ID irekia duen URL batekin
+      google:
+        title: Saioa hasi Googlekin
+        alt: Google ID irekiarekin saioa hasi
+      facebook:
+        title: Saioa hasi Facebookekin
+        alt: Saioa hasi Facebookekin
+      microsoft:
+        title: Saioa hasi Microsoftekin
+        alt: Microsoft kontu batekin saioa hasi
+      github:
+        title: GitHub-rekin saioa hasi
+        alt: GitHub kontuarekin saioa hasi
+      wikipedia:
+        title: Saioa hasi Wikipediarekin
+        alt: Wikipedia kontuarekin saioa hasi
+      wordpress:
+        title: Wordpress bidez saioa hasi
+        alt: Wordpress ID irekiarekin saioa hasi
+      aol:
+        title: AOL erabiliz saioa hasi
+        alt: AOL ID irekiarekin saioa hasi

   oauth:
     authorize:
       title: Zure kontuan sartzeko baimena eman
   oauth:
     authorize:
       title: Zure kontuan sartzeko baimena eman


@@ -2631,17 +2629,14 @@ eu:
       display name description: Zuk publikoki erakutsitako erabiltzaile izena. Hau
         geroago alda dezakezu hobespenetan.
       external auth: 'Hirugarrenen Autentifikazioa:'
       display name description: Zuk publikoki erakutsitako erabiltzaile izena. Hau
         geroago alda dezakezu hobespenetan.
       external auth: 'Hirugarrenen Autentifikazioa:'

-      use external auth: Bestela, erabili hirugarrenen bat saioa hasteko
-      auth no password: Hirugarrenen autentifikazioarekin pasahitza ez da beharrezkoa,
-        baina zenbait tresna edo zerbitzari gehigarri batek oraindik ere behar izatea
-        gerta daiteke.

       continue: Eman izena
       terms accepted: Eskerrik asko laguntzaileen termino berriak onartzeagatik!
       continue: Eman izena
       terms accepted: Eskerrik asko laguntzaileen termino berriak onartzeagatik!

-      email_confirmation_help_html: Zure helbidea ez da publikoki bistaratzen, ikusi
-        gure %{privacy_policy_link} informazio gehiago lortzeko.
+      email_help_html: Zure helbidea ez da publikoki bistaratzen, ikusi gure %{privacy_policy_link}
+        informazio gehiago lortzeko.

       privacy_policy: pribatutasun politika
       privacy_policy_title: OSMF pribatutasun-politika helbide elektronikoei buruzko
         atala barne
       privacy_policy: pribatutasun politika
       privacy_policy_title: OSMF pribatutasun-politika helbide elektronikoei buruzko
         atala barne

+      use external auth: Bestela, erabili hirugarrenen bat saioa hasteko

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

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 52c8b29647ccee10493180f9f07fc7d65837180a..31b88d8a9afe70d4d2352e3caec6398842a1dcf4 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -180,7 +180,6 @@ fa:
         auth_provider: فراهم‌آورندهٔ احراز هویت
         auth_uid: شناسه UID احراز هویت
         email: رایانامه
         auth_provider: فراهم‌آورندهٔ احراز هویت
         auth_uid: شناسه UID احراز هویت
         email: رایانامه

-        email_confirmation: تأیید رایانامه

         new_email: نشانی رایانامهٔ جدید
         active: فعال
         display_name: نام نمایشی
         new_email: نشانی رایانامهٔ جدید
         active: فعال
         display_name: نام نمایشی


@@ -1817,7 +1816,7 @@ fa:
   sessions:
     new:
       title: ورود
   sessions:
     new:
       title: ورود

-      heading: ورود
+      tab_title: ورود

       email or username: نشانی رایانامه یا نام کاربری
       password: رمز عبور
       remember: مرا به خاطر بسپار
       email or username: نشانی رایانامه یا نام کاربری
       password: رمز عبور
       remember: مرا به خاطر بسپار


@@ -1825,34 +1824,7 @@ fa:
       login_button: ورود
       register now: اکنون نام‌نویسی کنید
       with external: 'به‌جای ثبت نام، از روش شخص ثالث استفاده کنید:'
       login_button: ورود
       register now: اکنون نام‌نویسی کنید
       with external: 'به‌جای ثبت نام، از روش شخص ثالث استفاده کنید:'

-      no account: حساب کاربری ندارید؟

       auth failure: متأسفانه با این اطلاعات نمی‌توان وارد شد.
       auth failure: متأسفانه با این اطلاعات نمی‌توان وارد شد.

-      openid_logo_alt: ورود با OpenID
-      auth_providers:
-        openid:
-          title: ورود با OpenID
-          alt: ورود با نشانی OpenID
-        google:
-          title: ورود با گوگل
-          alt: ورود با OpenID گوگل
-        facebook:
-          title: ورود با فیسبوک
-          alt: ورود با حساب فیسبوک
-        microsoft:
-          title: ورود با مایکروسافت
-          alt: ورود با حساب مایکروسافت
-        github:
-          title: ورود با GitHub
-          alt: ورود با حساب GitHub
-        wikipedia:
-          title: ورود با ویکی‌پدیا
-          alt: ورود با حساب ویکی‌پدیا
-        wordpress:
-          title: ورود با وردپرس
-          alt: ورود با OpenID وردپرس
-        aol:
-          title: ورود با AOL
-          alt: ورود با AOL OpenID

     destroy:
       title: خروج
       heading: خروج از OpenStreetMap
     destroy:
       title: خروج
       heading: خروج از OpenStreetMap


@@ -2253,6 +2225,32 @@ fa:
       oauth1_settings: تنظیمات OAuth 1
       oauth2_applications: برنامه‌های OAuth 2
       oauth2_authorizations: مجوزهای OAuth 2
       oauth1_settings: تنظیمات OAuth 1
       oauth2_applications: برنامه‌های OAuth 2
       oauth2_authorizations: مجوزهای OAuth 2

+    auth_providers:
+      openid_logo_alt: ورود با OpenID
+      openid:
+        title: ورود با OpenID
+        alt: ورود با نشانی OpenID
+      google:
+        title: ورود با گوگل
+        alt: ورود با OpenID گوگل
+      facebook:
+        title: ورود با فیسبوک
+        alt: ورود با حساب فیسبوک
+      microsoft:
+        title: ورود با مایکروسافت
+        alt: ورود با حساب مایکروسافت
+      github:
+        title: ورود با GitHub
+        alt: ورود با حساب GitHub
+      wikipedia:
+        title: ورود با ویکی‌پدیا
+        alt: ورود با حساب ویکی‌پدیا
+      wordpress:
+        title: ورود با وردپرس
+        alt: ورود با OpenID وردپرس
+      aol:
+        title: ورود با AOL
+        alt: ورود با AOL OpenID

   oauth:
     authorize:
       title: اجازهٔ دسترسی به حسابتان را صادر کنید
   oauth:
     authorize:
       title: اجازهٔ دسترسی به حسابتان را صادر کنید


@@ -2389,12 +2387,10 @@ fa:
       display name description: نام کاربری شما که دیگران آن را می‌بینند. می‌توانید
         بعداً آن را در تنظیمات تغییر دهید.
       external auth: 'احراز هویت شخص ثالث:'
       display name description: نام کاربری شما که دیگران آن را می‌بینند. می‌توانید
         بعداً آن را در تنظیمات تغییر دهید.
       external auth: 'احراز هویت شخص ثالث:'

-      use external auth: به‌جای ثبت نام، از روش شخص ثالث استفاده کنید
-      auth no password: در اعتبارسنجی به‌روش شخص ثالث نیازی به رمز عبور اوپن‌استریت‌مپ
-        ندارید اما شاید میزبان انتخابی شما رمز عبور خودش را بخواهد.

       continue: ثبت نام
       terms accepted: از اینکه شرایط جدید مشارکت‌کننده را پذیرفتید، سپاسگزاریم!
       privacy_policy: سیاست محرمانگی
       continue: ثبت نام
       terms accepted: از اینکه شرایط جدید مشارکت‌کننده را پذیرفتید، سپاسگزاریم!
       privacy_policy: سیاست محرمانگی

+      use external auth: به‌جای ثبت نام، از روش شخص ثالث استفاده کنید

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

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 18964005d515229bc94edabb41ce6caed9bb3772..7268c13e7e8465184050bb7a520fe27d504f64bb 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -187,7 +187,6 @@ fi:
         auth_provider: Todennuksen tarjoaja
         auth_uid: Todennus-UID
         email: Sähköpostiosoite
         auth_provider: Todennuksen tarjoaja
         auth_uid: Todennus-UID
         email: Sähköpostiosoite

-        email_confirmation: Sähköpostin varmistus

         new_email: Uusi sähköpostiosoite
         active: Aktivoitu
         display_name: Näyttönimi
         new_email: Uusi sähköpostiosoite
         active: Aktivoitu
         display_name: Näyttönimi


@@ -1833,7 +1832,7 @@ fi:
   sessions:
     new:
       title: Kirjautumissivu
   sessions:
     new:
       title: Kirjautumissivu

-      heading: Kirjaudu
+      tab_title: Kirjaudu

       email or username: Sähköpostiosoite tai käyttäjätunnus
       password: Salasana
       remember: Pidä minut sisäänkirjautuneena
       email or username: Sähköpostiosoite tai käyttäjätunnus
       password: Salasana
       remember: Pidä minut sisäänkirjautuneena


@@ -1841,34 +1840,7 @@ fi:
       login_button: Kirjaudu sisään
       register now: Rekisteröidy
       with external: 'Voit myös kirjautua jonkun muun palvelun tunnuksilla:'
       login_button: Kirjaudu sisään
       register now: Rekisteröidy
       with external: 'Voit myös kirjautua jonkun muun palvelun tunnuksilla:'

-      no account: Eikö sinulla vielä ole käyttäjätunnusta?

       auth failure: Kirjautuminen epäonnistui.
       auth failure: Kirjautuminen epäonnistui.

-      openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella
-      auth_providers:
-        openid:
-          title: Kirjaudu sisään OpenID:llä
-          alt: Kirjaudu sisään OpenID-osoitteella
-        google:
-          title: Kirjaudu käyttämällä Google-tunnustasi
-          alt: Kirjaudu käyttämällä Google OpenID-tunnustasi
-        facebook:
-          title: Kirjaudu Facebookin avulla
-          alt: Kirjaudu käyttämällä Facebook-tunnustasi
-        microsoft:
-          title: Kirjaudu Microsoft-tilin avulla
-          alt: Kirjaudu sisään Microsoft-tililläsi
-        github:
-          title: Kirjaudu GitHubin avulla
-          alt: Kirjaudu GitHub-tilin avulla
-        wikipedia:
-          title: Kirjaudu sisään Wikipedialla
-          alt: Kirjaudu sisään Wikipedia-tunnuksella
-        wordpress:
-          title: Kirjaudu WordPressin avulla
-          alt: Kirjaudu käyttämällä Wordpress OpenID -tunnustasi
-        aol:
-          title: Kirjaudu AOL:n avulla
-          alt: Kirjaudu käyttämällä AOL OpenID -tunnustasi

     destroy:
       title: Kirjaudu ulos
       heading: Kirjaudu ulos OpenStreetMapista
     destroy:
       title: Kirjaudu ulos
       heading: Kirjaudu ulos OpenStreetMapista


@@ -2426,6 +2398,32 @@ fi:
       oauth2_applications: OAuth 2 -sovellukset
       oauth2_authorizations: OAuth 2 -käyttöoikeudet
       muted_users: Hiljennetyt käyttäjät
       oauth2_applications: OAuth 2 -sovellukset
       oauth2_authorizations: OAuth 2 -käyttöoikeudet
       muted_users: Hiljennetyt käyttäjät

+    auth_providers:
+      openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella
+      openid:
+        title: Kirjaudu sisään OpenID:llä
+        alt: Kirjaudu sisään OpenID-osoitteella
+      google:
+        title: Kirjaudu käyttämällä Google-tunnustasi
+        alt: Kirjaudu käyttämällä Google OpenID-tunnustasi
+      facebook:
+        title: Kirjaudu Facebookin avulla
+        alt: Kirjaudu käyttämällä Facebook-tunnustasi
+      microsoft:
+        title: Kirjaudu Microsoft-tilin avulla
+        alt: Kirjaudu sisään Microsoft-tililläsi
+      github:
+        title: Kirjaudu GitHubin avulla
+        alt: Kirjaudu GitHub-tilin avulla
+      wikipedia:
+        title: Kirjaudu sisään Wikipedialla
+        alt: Kirjaudu sisään Wikipedia-tunnuksella
+      wordpress:
+        title: Kirjaudu WordPressin avulla
+        alt: Kirjaudu käyttämällä Wordpress OpenID -tunnustasi
+      aol:
+        title: Kirjaudu AOL:n avulla
+        alt: Kirjaudu käyttämällä AOL OpenID -tunnustasi

   oauth:
     authorize:
       title: Salli tilisi käyttö
   oauth:
     authorize:
       title: Salli tilisi käyttö


@@ -2562,13 +2560,10 @@ fi:
       display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin
         muuttaa asetuksista.
       external auth: 'Kolmannen osapuolen todennus:'
       display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin
         muuttaa asetuksista.
       external auth: 'Kolmannen osapuolen todennus:'

-      use external auth: Kirjaudu toisen palvelun tunnuksilla
-      auth no password: Mikäli kirjaudut sisään kolmannen osapuolen palveluiden avulla,
-        sinun ei tarvitse luoda itsellesi salasanaa, mutta jotkin ylimääräiset työkalut
-        tai palvelimet voivat silti vaatia sitä.

       continue: Rekisteröidy
       terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä!
       privacy_policy: tietosuojakäytäntö
       continue: Rekisteröidy
       terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä!
       privacy_policy: tietosuojakäytäntö

+      use external auth: Kirjaudu toisen palvelun tunnuksilla

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

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index ae57596c81c4edef9b0b882847e6971a9cde2266..8b29b97f42d22b57f2fb73557ae2c497674a3829 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -709,23 +709,12 @@ fit:
   sessions:
     new:
       title: Lokkaussivu
   sessions:
     new:
       title: Lokkaussivu

-      heading: Lokkaa
+      tab_title: Lokkaa

       email or username: 'E-postiatressi tai käyttäjänimi:'
       password: 'Salasana:'
       lost password link: Unhouttanu sinun salasanan?
       login_button: Lokkaa sisäle
       register now: Luo konttu nyt
       email or username: 'E-postiatressi tai käyttäjänimi:'
       password: 'Salasana:'
       lost password link: Unhouttanu sinun salasanan?
       login_button: Lokkaa sisäle
       register now: Luo konttu nyt

-      openid_logo_alt: Lokkaa sisäle OpenID-konttulla
-      auth_providers:
-        openid:
-          title: Lokkaa sisäle OpenID:llä
-          alt: Lokkaa sisäle OpenID-atressilla
-        google:
-          title: Lokkaa sisäle Googlella
-        facebook:
-          title: Lokkaa sisäle Feispukilla
-        wikipedia:
-          title: Lokkaa sisäle Wikipeetialla

     destroy:
       title: Lokkaa ulos
       heading: Lokkaa ulos OpenStreetMapista
     destroy:
       title: Lokkaa ulos
       heading: Lokkaa ulos OpenStreetMapista


@@ -842,6 +831,18 @@ fit:
     index:
       public_traces: Julkiset GPS-jäljet
       my_traces: Minun GPS-jäljet
     index:
       public_traces: Julkiset GPS-jäljet
       my_traces: Minun GPS-jäljet

+  application:
+    auth_providers:
+      openid_logo_alt: Lokkaa sisäle OpenID-konttulla
+      openid:
+        title: Lokkaa sisäle OpenID:llä
+        alt: Lokkaa sisäle OpenID-atressilla
+      google:
+        title: Lokkaa sisäle Googlella
+      facebook:
+        title: Lokkaa sisäle Feispukilla
+      wikipedia:
+        title: Lokkaa sisäle Wikipeetialla

   oauth_clients:
     edit:
       title: Mookkaa sovellustasi
   oauth_clients:
     edit:
       title: Mookkaa sovellustasi

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fccbdf9510360dc4497c4a1bab41b85138c00ca6..71f9ecc0ff8fafd73f827c4bb6fff27daa20646a 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -244,7 +244,6 @@ fr:
         auth_provider: Fournisseur d’authentification
         auth_uid: UID d’authentification
         email: Courriel
         auth_provider: Fournisseur d’authentification
         auth_uid: UID d’authentification
         email: Courriel

-        email_confirmation: Confirmation du courriel

         new_email: Nouvelle adresse de courriel
         active: Actif
         display_name: Afficher le nom
         new_email: Nouvelle adresse de courriel
         active: Actif
         display_name: Afficher le nom


@@ -2066,7 +2065,7 @@ fr:
   sessions:
     new:
       title: Se connecter
   sessions:
     new:
       title: Se connecter

-      heading: Se connecter
+      tab_title: Se connecter

       email or username: 'Adresse de courriel ou nom d’utilisateur :'
       password: 'Mot de passe :'
       remember: Se souvenir de moi
       email or username: 'Adresse de courriel ou nom d’utilisateur :'
       password: 'Mot de passe :'
       remember: Se souvenir de moi


@@ -2074,35 +2073,8 @@ fr:
       login_button: Se connecter
       register now: S’inscrire maintenant
       with external: 'Vous pouvez également utiliser un service tiers pour vous connecter :'
       login_button: Se connecter
       register now: S’inscrire maintenant
       with external: 'Vous pouvez également utiliser un service tiers pour vous connecter :'

-      no account: Vous n’avez pas encore de compte ?

       auth failure: Désolé, mais les informations fournies n’ont pas permis de vous
         identifier.
       auth failure: Désolé, mais les informations fournies n’ont pas permis de vous
         identifier.

-      openid_logo_alt: Se connecter avec OpenID
-      auth_providers:
-        openid:
-          title: Connexion avec OpenID
-          alt: Se connecter avec une URL OpenID
-        google:
-          title: Connexion avec Google
-          alt: Se connecter avec un OpenID de Google
-        facebook:
-          title: Connexion avec Facebook
-          alt: Se connecter avec un compte de Facebook
-        microsoft:
-          title: Connexion avec Microsoft
-          alt: Se connecter avec un compte Microsoft
-        github:
-          title: Connexion avec GitHub
-          alt: Se connecter avec un compte de GitHub
-        wikipedia:
-          title: Connexion avec Wikipédia
-          alt: Se connecter avec un compte de Wikipédia
-        wordpress:
-          title: Connexion avec Wordpress
-          alt: Se connecter avec un OpenID de Wordpress
-        aol:
-          title: Connexion avec AOL
-          alt: Se connecter avec un OpenID d’AOL

     destroy:
       title: Déconnexion
       heading: Se déconnecter d’OpenStreetMap
     destroy:
       title: Déconnexion
       heading: Se déconnecter d’OpenStreetMap


@@ -2800,6 +2772,32 @@ fr:
       oauth2_applications: Applications OAuth 2
       oauth2_authorizations: Droits OAuth 2
       muted_users: Utilisateurs silencieux
       oauth2_applications: Applications OAuth 2
       oauth2_authorizations: Droits OAuth 2
       muted_users: Utilisateurs silencieux

+    auth_providers:
+      openid_logo_alt: Se connecter avec OpenID
+      openid:
+        title: Connexion avec OpenID
+        alt: Se connecter avec une URL OpenID
+      google:
+        title: Connexion avec Google
+        alt: Se connecter avec un OpenID de Google
+      facebook:
+        title: Connexion avec Facebook
+        alt: Se connecter avec un compte de Facebook
+      microsoft:
+        title: Connexion avec Microsoft
+        alt: Se connecter avec un compte Microsoft
+      github:
+        title: Connexion avec GitHub
+        alt: Se connecter avec un compte de GitHub
+      wikipedia:
+        title: Connexion avec Wikipédia
+        alt: Se connecter avec un compte de Wikipédia
+      wordpress:
+        title: Connexion avec Wordpress
+        alt: Se connecter avec un OpenID de Wordpress
+      aol:
+        title: Connexion avec AOL
+        alt: Se connecter avec un OpenID d’AOL

   oauth:
     authorize:
       title: Autoriser l’accès à votre compte
   oauth:
     authorize:
       title: Autoriser l’accès à votre compte


@@ -2955,18 +2953,15 @@ fr:
       display name description: Votre nom d’utilisateur affiché publiquement. Vous
         pouvez changer ceci ultérieurement dans les préférences.
       external auth: 'Authentification tierce :'
       display name description: Votre nom d’utilisateur affiché publiquement. Vous
         pouvez changer ceci ultérieurement dans les préférences.
       external auth: 'Authentification tierce :'

-      use external auth: Vous pouvez également utiliser un service tiers pour vous
-        connecter.
-      auth no password: Avec l’authentification par tiers, un mot de passe n’est pas
-        nécessaire, mais des outils supplémentaires ou un serveur peuvent toujours
-        en nécessiter un.

       continue: S’inscrire
       terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur !
       continue: S’inscrire
       terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur !

-      email_confirmation_help_html: Votre adresse n’est pas affichée publiquement,
-        consultez notre %{privacy_policy_link} pour plus d’informations.
+      email_help_html: Votre adresse n’est pas affichée publiquement, consultez notre
+        %{privacy_policy_link} pour plus d’informations.

       privacy_policy: politique de confidentialité
       privacy_policy_title: Politique de confidentialité de l’OSMF, qui comprend une
         section sur les adresses de courriel
       privacy_policy: politique de confidentialité
       privacy_policy_title: Politique de confidentialité de l’OSMF, qui comprend une
         section sur les adresses de courriel

+      use external auth: Vous pouvez également utiliser un service tiers pour vous
+        connecter.

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 018f181cd558e6934e5ec73e8db1aae432500987..f03174352c4e64cff367c97a69238ca80cfd5da9 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -127,7 +127,6 @@ fur:
         auth_provider: Fornidôr de autenticazion
         auth_uid: UID de autenticazion
         email: Pueste eletroniche
         auth_provider: Fornidôr de autenticazion
         auth_uid: UID de autenticazion
         email: Pueste eletroniche

-        email_confirmation: Conferme de pueste eletroniche

         new_email: Gnove direzion di pueste
         active: Atîf
         display_name: Non di mostrâ
         new_email: Gnove direzion di pueste
         active: Atîf
         display_name: Non di mostrâ


@@ -1144,41 +1143,14 @@ fur:
   sessions:
     new:
       title: Jentre
   sessions:
     new:
       title: Jentre

-      heading: Jentre
+      tab_title: Jentre

       email or username: 'Direzion di pueste eletroniche o non utent:'
       password: 'Password:'
       remember: Visiti di me
       lost password link: Password pierdude?
       login_button: Jentre
       register now: Regjistriti cumò
       email or username: 'Direzion di pueste eletroniche o non utent:'
       password: 'Password:'
       remember: Visiti di me
       lost password link: Password pierdude?
       login_button: Jentre
       register now: Regjistriti cumò

-      no account: No âstu ancjemò un profîl?

       auth failure: Nus displâs, ma no si à rivât a jentrâ cun i dâts inserîts.
       auth failure: Nus displâs, ma no si à rivât a jentrâ cun i dâts inserîts.

-      openid_logo_alt: Jentre cuntun OpenID
-      auth_providers:
-        openid:
-          title: Jentre cun OpenID
-          alt: Jentre cuntun URL OpenID
-        google:
-          title: Jentre cun Google
-          alt: Jentre cuntun OpenID Google
-        facebook:
-          title: Jentre cun Facebook
-          alt: Jentre cuntun un cont Facebook
-        microsoft:
-          title: Jentre cun Microsoft
-          alt: Jentre cuntun cont di Microsoft
-        github:
-          title: Jentre cun GitHub
-          alt: Jentre cuntun cont GitHub
-        wikipedia:
-          title: Jentre cun Vichipedie
-          alt: Jentre cuntun cont de Vichipedie
-        wordpress:
-          title: Jentre cun Wordpress
-          alt: Jentre cuntun OpenID Wordpress
-        aol:
-          title: Jentre cun AOL
-          alt: Jentre cuntun OpenID AOL

     destroy:
       title: Jes
       heading: Va fûr di OpenStreetMap
     destroy:
       title: Jes
       heading: Va fûr di OpenStreetMap


@@ -1439,6 +1411,32 @@ fur:
       oauth1_settings: Impostazions OAuth1
       oauth2_applications: Aplicazions OAuth 2
       oauth2_authorizations: Autorizazions OAuth 2
       oauth1_settings: Impostazions OAuth1
       oauth2_applications: Aplicazions OAuth 2
       oauth2_authorizations: Autorizazions OAuth 2

+    auth_providers:
+      openid_logo_alt: Jentre cuntun OpenID
+      openid:
+        title: Jentre cun OpenID
+        alt: Jentre cuntun URL OpenID
+      google:
+        title: Jentre cun Google
+        alt: Jentre cuntun OpenID Google
+      facebook:
+        title: Jentre cun Facebook
+        alt: Jentre cuntun un cont Facebook
+      microsoft:
+        title: Jentre cun Microsoft
+        alt: Jentre cuntun cont di Microsoft
+      github:
+        title: Jentre cun GitHub
+        alt: Jentre cuntun cont GitHub
+      wikipedia:
+        title: Jentre cun Vichipedie
+        alt: Jentre cuntun cont de Vichipedie
+      wordpress:
+        title: Jentre cun Wordpress
+        alt: Jentre cuntun OpenID Wordpress
+      aol:
+        title: Jentre cun AOL
+        alt: Jentre cuntun OpenID AOL

   oauth:
     authorize:
       title: Permèt l'accès al to cont
   oauth:
     authorize:
       title: Permèt l'accès al to cont


@@ -1537,11 +1535,9 @@ fur:
       display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs
         gambiâlu plui tart tes preferencis.
       external auth: 'Autenticazion vie une tierce part:'
       display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs
         gambiâlu plui tart tes preferencis.
       external auth: 'Autenticazion vie une tierce part:'

-      use external auth: In alternative, dopre une tierce part par jentrâ
-      auth no password: Cun l'autenticazione vie une tierce part, no convente une
-        password ma cualchi imprest o servidôr esterni podarès instès domandânt une

       continue: Regjistriti
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!
       continue: Regjistriti
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!

+      use external auth: In alternative, dopre une tierce part par jentrâ

     terms:
       title: Tiermins
       heading: Tiermins
     terms:
       title: Tiermins
       heading: Tiermins

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 7fce45fa2ccfa048945908f45649a463affca127..ec00cb99b638344802170695ac056d0863857634 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -133,7 +133,6 @@ fy:
         auth_provider: Autentifikaasje-oanbieder
         auth_uid: Autentifikaasje-UID
         email: E-mail
         auth_provider: Autentifikaasje-oanbieder
         auth_uid: Autentifikaasje-UID
         email: E-mail

-        email_confirmation: Befêstigjen e-mail

         new_email: Nij e-mailadres
         active: Aktyf
         display_name: Werjûne namme
         new_email: Nij e-mailadres
         active: Aktyf
         display_name: Werjûne namme


@@ -1770,7 +1769,7 @@ fy:
   sessions:
     new:
       title: Oanmelde
   sessions:
     new:
       title: Oanmelde

-      heading: Oanmelde
+      tab_title: Oanmelde

       email or username: 'E-mailadres as meidochnamme:'
       password: 'Wachtwurd:'
       remember: My ûnthâlde
       email or username: 'E-mailadres as meidochnamme:'
       password: 'Wachtwurd:'
       remember: My ûnthâlde


@@ -1778,34 +1777,7 @@ fy:
       login_button: Oanmelde
       register now: No ynskriuwe
       with external: 'Brûk oars in treddepartij om jo oan te melden:'
       login_button: Oanmelde
       register now: No ynskriuwe
       with external: 'Brûk oars in treddepartij om jo oan te melden:'

-      no account: Hawwe jo gjin akkount?

       auth failure: Spitich, koe jo net oanmelde mei dy gegevens.
       auth failure: Spitich, koe jo net oanmelde mei dy gegevens.

-      openid_logo_alt: Meld jo oan mei in openID
-      auth_providers:
-        openid:
-          title: Oanmelde mei OpenID
-          alt: Meld jo oan mei in OpenID-URL
-        google:
-          title: Oanmelde mei Google
-          alt: Meld jo oan mei in Google-openID
-        facebook:
-          title: Oanmelde mei Facebook
-          alt: Meld jo oan mei in Facebook-akkount
-        microsoft:
-          title: Oanmelde mei Windows Live
-          alt: Meld jo oan mei in Windows Live-akkount
-        github:
-          title: Oanmelde mei GitHub
-          alt: Meld jo oan mei in GitHub-akkount
-        wikipedia:
-          title: Oanmelde mei de Wikipedy
-          alt: Meld jo oan mei in Wikipedy-akkount
-        wordpress:
-          title: Oanmelde mei Wordpress
-          alt: Meld jo oan mei in Wordpress-openID
-        aol:
-          title: Oanmelde mei AOL
-          alt: Meld jo oan mei in AOL-openID

     destroy:
       title: Ofmelde
       heading: Ofmelde by OpenStreetMap
     destroy:
       title: Ofmelde
       heading: Ofmelde by OpenStreetMap


@@ -2185,6 +2157,32 @@ fy:
       oauth1_settings: Ynstellings OAuth 1
       oauth2_applications: Applikaasjes OAuth 2
       oauth2_authorizations: Autorisaasjes OAuth 2
       oauth1_settings: Ynstellings OAuth 1
       oauth2_applications: Applikaasjes OAuth 2
       oauth2_authorizations: Autorisaasjes OAuth 2

+    auth_providers:
+      openid_logo_alt: Meld jo oan mei in openID
+      openid:
+        title: Oanmelde mei OpenID
+        alt: Meld jo oan mei in OpenID-URL
+      google:
+        title: Oanmelde mei Google
+        alt: Meld jo oan mei in Google-openID
+      facebook:
+        title: Oanmelde mei Facebook
+        alt: Meld jo oan mei in Facebook-akkount
+      microsoft:
+        title: Oanmelde mei Windows Live
+        alt: Meld jo oan mei in Windows Live-akkount
+      github:
+        title: Oanmelde mei GitHub
+        alt: Meld jo oan mei in GitHub-akkount
+      wikipedia:
+        title: Oanmelde mei de Wikipedy
+        alt: Meld jo oan mei in Wikipedy-akkount
+      wordpress:
+        title: Oanmelde mei Wordpress
+        alt: Meld jo oan mei in Wordpress-openID
+      aol:
+        title: Oanmelde mei AOL
+        alt: Meld jo oan mei in AOL-openID

   oauth:
     authorize:
       title: Tagong ta jo akkount autorisearje
   oauth:
     authorize:
       title: Tagong ta jo akkount autorisearje


@@ -2322,11 +2320,9 @@ fy:
       display name description: Jo meidochnamme dy't elkenien sjen kin. Jo kinne dy
         letter yn 'e foarkarren feroarje.
       external auth: 'Tredde-autentifikaasje:'
       display name description: Jo meidochnamme dy't elkenien sjen kin. Jo kinne dy
         letter yn 'e foarkarren feroarje.
       external auth: 'Tredde-autentifikaasje:'

-      use external auth: Brûk oars in treddepartij om jo oan te melden
-      auth no password: Mei autentifikaasje troch in tredde is in wachtwurd oerstallich,
-        mar guon ark as tsjinners soene ien freegje kinne.

       continue: Ynskriuwe
       terms accepted: Tankjewol foar it akseptearjen fan 'e nije bydragersbetingsten!
       continue: Ynskriuwe
       terms accepted: Tankjewol foar it akseptearjen fan 'e nije bydragersbetingsten!

+      use external auth: Brûk oars in treddepartij om jo oan te melden

     terms:
       title: Betingsten
       heading: Betingsten
     terms:
       title: Betingsten
       heading: Betingsten

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index bdfa6b1d498ce8f912d0bbf238c185d3985dc12c..2e8857e8fe2ad11b64c8abc847231ec029c434ac 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -126,7 +126,6 @@ ga:
         auth_provider: Soláthraí Fíordheimhniúcháin
         auth_uid: UID Fíordheimhnithe
         email: Ríomhphost
         auth_provider: Soláthraí Fíordheimhniúcháin
         auth_uid: UID Fíordheimhnithe
         email: Ríomhphost

-        email_confirmation: Deimhniú ar an seoladh ríomhphost

         new_email: An seoladh ríomhphoist nua
         active: Gníomhach
         display_name: Ainm Taispeána
         new_email: An seoladh ríomhphoist nua
         active: Gníomhach
         display_name: Ainm Taispeána


@@ -1319,7 +1318,7 @@ ga:
   sessions:
     new:
       title: Logáil isteach
   sessions:
     new:
       title: Logáil isteach

-      heading: Logáil isteach
+      tab_title: Logáil isteach

       email or username: 'Seoladh Ríomhphoist nó Ainm Úsáideora:'
       password: 'Focal Faire:'
       remember: Cuimhnigh orm
       email or username: 'Seoladh Ríomhphoist nó Ainm Úsáideora:'
       password: 'Focal Faire:'
       remember: Cuimhnigh orm


@@ -1327,34 +1326,7 @@ ga:
       login_button: Logáil isteach
       register now: Cláraigh anois
       with external: 'Nó, bain úsáid as tríú páirtí le logáil isteach:'
       login_button: Logáil isteach
       register now: Cláraigh anois
       with external: 'Nó, bain úsáid as tríú páirtí le logáil isteach:'

-      no account: Níl cuntas agat?

       auth failure: Ár leithscéil, níorbh fhéidir logáil isteach leis na sonraí sin.
       auth failure: Ár leithscéil, níorbh fhéidir logáil isteach leis na sonraí sin.

-      openid_logo_alt: Logáil isteach le OpenID
-      auth_providers:
-        openid:
-          title: Logáil isteach le OpenID
-          alt: Logáil isteach le URL OpenID
-        google:
-          title: Logáil isteach le Google
-          alt: Logáil isteach le OpenID Google
-        facebook:
-          title: Logáil isteach le Facebook
-          alt: Logáil isteach le Cuntas Facebook
-        microsoft:
-          title: Logáil isteach le Windows Live
-          alt: Logáil isteach le Cuntas Windows Live
-        github:
-          title: Logáil isteach le GitHub
-          alt: Logáil isteach le Cuntas GitHub
-        wikipedia:
-          title: Logáil isteach le Vicipéid
-          alt: Logáil isteach le Cuntas Vicipéid
-        wordpress:
-          title: Logáil isteach le Wordpress
-          alt: Logáil isteach le OpenID Wordpress
-        aol:
-          title: Logáil isteach le AOL
-          alt: Logáil isteach le OpenID AOL

     destroy:
       title: Logáil amach
       heading: Logáil amach as OpenStreetMap
     destroy:
       title: Logáil amach
       heading: Logáil amach as OpenStreetMap


@@ -1668,6 +1640,32 @@ ga:
       need_to_see_terms: Cuireadh do rochtain ar an API ar fionraí go sealadach. Logáil
         isteach ar an gcomhéadan gréasáin le hamharc ar Théarmaí na Rannchuiditheoirí.
         Ní gá duit aontú, ach ní mór duit amharc orthu.
       need_to_see_terms: Cuireadh do rochtain ar an API ar fionraí go sealadach. Logáil
         isteach ar an gcomhéadan gréasáin le hamharc ar Théarmaí na Rannchuiditheoirí.
         Ní gá duit aontú, ach ní mór duit amharc orthu.

+    auth_providers:
+      openid_logo_alt: Logáil isteach le OpenID
+      openid:
+        title: Logáil isteach le OpenID
+        alt: Logáil isteach le URL OpenID
+      google:
+        title: Logáil isteach le Google
+        alt: Logáil isteach le OpenID Google
+      facebook:
+        title: Logáil isteach le Facebook
+        alt: Logáil isteach le Cuntas Facebook
+      microsoft:
+        title: Logáil isteach le Windows Live
+        alt: Logáil isteach le Cuntas Windows Live
+      github:
+        title: Logáil isteach le GitHub
+        alt: Logáil isteach le Cuntas GitHub
+      wikipedia:
+        title: Logáil isteach le Vicipéid
+        alt: Logáil isteach le Cuntas Vicipéid
+      wordpress:
+        title: Logáil isteach le Wordpress
+        alt: Logáil isteach le OpenID Wordpress
+      aol:
+        title: Logáil isteach le AOL
+        alt: Logáil isteach le OpenID AOL

   oauth:
     authorize:
       title: Rochtain ar do chuntas a údarú
   oauth:
     authorize:
       title: Rochtain ar do chuntas a údarú


@@ -1749,9 +1747,9 @@ ga:
       display name description: An t-ainm úsáideora atá agat a thaispeántar go poiblí.
         Is féidir leat é seo a athrú níos moille sna sainroghanna.
       external auth: 'Fíordheimhniú Tríú Páirtí:'
       display name description: An t-ainm úsáideora atá agat a thaispeántar go poiblí.
         Is féidir leat é seo a athrú níos moille sna sainroghanna.
       external auth: 'Fíordheimhniú Tríú Páirtí:'

-      use external auth: Nó, bain úsáid as tríú páirtí le logáil isteach

       continue: Cláraigh
       terms accepted: Go raibh maith agat as glacadh leis na téarmaí nua do rannchuiditheoirí.
       continue: Cláraigh
       terms accepted: Go raibh maith agat as glacadh leis na téarmaí nua do rannchuiditheoirí.

+      use external auth: Nó, bain úsáid as tríú páirtí le logáil isteach

     terms:
       title: Téarmaí
       heading: Téarmaí
     terms:
       title: Téarmaí
       heading: Téarmaí

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index c662fb049b19396ad5b3ed7fbd01c993557c9f0d..b4f35e515526dc3545c47d55db0db5dc0fdf1742 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -544,15 +544,12 @@ gcf:
   sessions:
     new:
       title: Konnékté-w
   sessions:
     new:
       title: Konnékté-w

-      heading: Konnékté-w
+      tab_title: Konnékté-w

       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''w:'
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''w:'
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w

-      auth_providers:
-        wikipedia:
-          title: Konèkté-w épi Wikipédya

   site:
     about:
       next: Jousapré
   site:
     about:
       next: Jousapré


@@ -627,6 +624,10 @@ gcf:
       more: plis
     index:
       empty_title: Ayen pò-ò la
       more: plis
     index:
       empty_title: Ayen pò-ò la

+  application:
+    auth_providers:
+      wikipedia:
+        title: Konèkté-w épi Wikipédya

   oauth:
     authorize:
       allow_write_api: modifyé kat-la.
   oauth:
     authorize:
       allow_write_api: modifyé kat-la.

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 90cf01bdfd3f0d782e0623c9c34ba61b87007029..5f9ee47092e1bdc58c0cfdedef20325f7cbdd12a 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1163,7 +1163,7 @@ gd:
   sessions:
     new:
       title: Clàraich a-steach
   sessions:
     new:
       title: Clàraich a-steach

-      heading: Clàraich a-steach
+      tab_title: Clàraich a-steach

       email or username: 'Seòladh puist-d no ainm-cleachdaiche:'
       password: 'Facal-faire:'
       remember: Cuimhnich orm
       email or username: 'Seòladh puist-d no ainm-cleachdaiche:'
       password: 'Facal-faire:'
       remember: Cuimhnich orm


@@ -1171,35 +1171,8 @@ gd:
       login_button: Clàraich a-steach
       register now: Clàraich an-dràsta
       with external: 'No cleachd treas-phàrtaidh airson clàradh a-steach:'
       login_button: Clàraich a-steach
       register now: Clàraich an-dràsta
       with external: 'No cleachd treas-phàrtaidh airson clàradh a-steach:'

-      no account: Nach eil cunntas agad?

       auth failure: Duilich ach chan urrainn dhuinn do clàradh a-steach leis an fiosrachadh
         seo.
       auth failure: Duilich ach chan urrainn dhuinn do clàradh a-steach leis an fiosrachadh
         seo.

-      openid_logo_alt: Clàraich a-steach le OpenID
-      auth_providers:
-        openid:
-          title: Clàraich a-steach le OpenID
-          alt: Clàraich a-steach le URL OpenID
-        google:
-          title: Clàraich a-steach le Google
-          alt: Clàraich a-steach le OpenID Google
-        facebook:
-          title: Clàraich a-steach le Facebook
-          alt: Clàraich a-steach le cunntas Facebook
-        microsoft:
-          title: Clàraich a-steach le Windows Live
-          alt: Clàraich a-steach le cunntas Windows Live
-        github:
-          title: Clàraich a-steach le GitHub
-          alt: Clàraich a-steach le cunntas GitHub
-        wikipedia:
-          title: Clàraich a-steach leis an Uicipeid
-          alt: Clàraich a-steach le cunntas na h-Uicipeid
-        wordpress:
-          title: Clàraich a-steach le Wordpress
-          alt: Clàraich a-steach le OpenID Wordpress
-        aol:
-          title: Clàraich a-steach le AOL
-          alt: Clàraich a-steach le OpenID AOL

     destroy:
       title: Clàraich a-mach
       heading: Clàraich a-mach à OpenStreetMap
     destroy:
       title: Clàraich a-mach
       heading: Clàraich a-mach à OpenStreetMap


@@ -1528,6 +1501,32 @@ gd:
         Feuch an clàraich thu a-steach air an eadar-aghaidh-lìn gus teirmichean a'
         chom-pàirtiche a shealltainn. Cha leig thu leas aontachadh riutha, ach feumaidh
         tu an leughadh.
         Feuch an clàraich thu a-steach air an eadar-aghaidh-lìn gus teirmichean a'
         chom-pàirtiche a shealltainn. Cha leig thu leas aontachadh riutha, ach feumaidh
         tu an leughadh.

+    auth_providers:
+      openid_logo_alt: Clàraich a-steach le OpenID
+      openid:
+        title: Clàraich a-steach le OpenID
+        alt: Clàraich a-steach le URL OpenID
+      google:
+        title: Clàraich a-steach le Google
+        alt: Clàraich a-steach le OpenID Google
+      facebook:
+        title: Clàraich a-steach le Facebook
+        alt: Clàraich a-steach le cunntas Facebook
+      microsoft:
+        title: Clàraich a-steach le Windows Live
+        alt: Clàraich a-steach le cunntas Windows Live
+      github:
+        title: Clàraich a-steach le GitHub
+        alt: Clàraich a-steach le cunntas GitHub
+      wikipedia:
+        title: Clàraich a-steach leis an Uicipeid
+        alt: Clàraich a-steach le cunntas na h-Uicipeid
+      wordpress:
+        title: Clàraich a-steach le Wordpress
+        alt: Clàraich a-steach le OpenID Wordpress
+      aol:
+        title: Clàraich a-steach le AOL
+        alt: Clàraich a-steach le OpenID AOL

   oauth:
     authorize:
       title: Ceadaich inntrigeadh dhan chunntas agad
   oauth:
     authorize:
       title: Ceadaich inntrigeadh dhan chunntas agad


@@ -1607,12 +1606,9 @@ gd:
       display name description: An t-ainm-cleachdaiche agad a thèid a shealltainn
         gu poblach. 'S urrainn dhut seo atharrachadh uair sam bith sna roghainnean.
       external auth: 'Dearbhadh treas-phàrtaidh:'
       display name description: An t-ainm-cleachdaiche agad a thèid a shealltainn
         gu poblach. 'S urrainn dhut seo atharrachadh uair sam bith sna roghainnean.
       external auth: 'Dearbhadh treas-phàrtaidh:'

-      use external auth: No cleachd treas-phàrtaidh airson clàradh a-steach
-      auth no password: Chan iarr sinn facal-faire ort le dearbhadh treas-phàrtaidh
-        ach dh'fhaoidte gum bi innealan a bharrachd no frithealaiche feumach air fear
-        co-dhiù.

       continue: Clàraich
       terms accepted: Mòran taing gun do dh'aontaich thu ri teirmichean a' chom-pàirtiche!
       continue: Clàraich
       terms accepted: Mòran taing gun do dh'aontaich thu ri teirmichean a' chom-pàirtiche!

+      use external auth: No cleachd treas-phàrtaidh airson clàradh a-steach

     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

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0d0d2b1682fb570f6b1233fcb20d40af6c6c597d..0fea5e93bdb3b0f92cb11acb3d09c54294468019 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -155,7 +155,6 @@ gl:
         auth_provider: Fornecedor de autenticación
         auth_uid: UID de autenticación
         email: Enderezo de correo electrónico
         auth_provider: Fornecedor de autenticación
         auth_uid: UID de autenticación
         email: Enderezo de correo electrónico

-        email_confirmation: Confirmación do correo

         new_email: Novo enderezo de correo electrónico
         active: Activo
         display_name: Nome público
         new_email: Novo enderezo de correo electrónico
         active: Activo
         display_name: Nome público


@@ -1958,7 +1957,7 @@ gl:
   sessions:
     new:
       title: Acceder ao sistema
   sessions:
     new:
       title: Acceder ao sistema

-      heading: Acceder ao sistema
+      tab_title: Acceder ao sistema

       email or username: Enderezo de correo electrónico ou nome de usuario
       password: Contrasinal
       remember: Lembrádeme
       email or username: Enderezo de correo electrónico ou nome de usuario
       password: Contrasinal
       remember: Lembrádeme


@@ -1966,34 +1965,7 @@ gl:
       login_button: Acceder ao sistema
       register now: Rexístrate agora
       with external: 'Ou ben, emprega un servizo de terceiros para acceder:'
       login_button: Acceder ao sistema
       register now: Rexístrate agora
       with external: 'Ou ben, emprega un servizo de terceiros para acceder:'

-      no account: Non estás rexistrado?

       auth failure: Sentímolo, non puido acceder ó sistema con eses datos.
       auth failure: Sentímolo, non puido acceder ó sistema con eses datos.

-      openid_logo_alt: Acceder ó sistema cun OpenID
-      auth_providers:
-        openid:
-          title: Acceder ó sistema co OpenID
-          alt: Acceder ó sistema cun URL do OpenID
-        google:
-          title: Acceder ó sistema con Google
-          alt: Acceder ó sistema cun OpenID de Google
-        facebook:
-          title: Acceder ó sistema co Facebook
-          alt: Acceder ó sistema cunha conta do Facebook
-        microsoft:
-          title: Acceder ó sistema con Microsoft
-          alt: Acceder ó sistema cunha conta de Microsoft
-        github:
-          title: Acceder ó sistema co GitHub
-          alt: Acceder ó sistema cunha conta do GitHub
-        wikipedia:
-          title: Acceder ó sistema coa Wikipedia
-          alt: Acceder ó sistema cunha conta da Wikipedia
-        wordpress:
-          title: Acceder ó sistema co Wordpress
-          alt: Acceder ó sistema cun OpenID do Wordpress
-        aol:
-          title: Acceder ó sistema co AOL
-          alt: Acceder ó sistema cun OpenID do AOL

     destroy:
       title: Pechar a sesión
       heading: Saír do OpenStreetMap
     destroy:
       title: Pechar a sesión
       heading: Saír do OpenStreetMap


@@ -2677,6 +2649,32 @@ gl:
       oauth2_applications: Aplicacións OAuth 2
       oauth2_authorizations: Autorizacións OAuth 2
       muted_users: Usuarios silenciados
       oauth2_applications: Aplicacións OAuth 2
       oauth2_authorizations: Autorizacións OAuth 2
       muted_users: Usuarios silenciados

+    auth_providers:
+      openid_logo_alt: Acceder ó sistema cun OpenID
+      openid:
+        title: Acceder ó sistema co OpenID
+        alt: Acceder ó sistema cun URL do OpenID
+      google:
+        title: Acceder ó sistema con Google
+        alt: Acceder ó sistema cun OpenID de Google
+      facebook:
+        title: Acceder ó sistema co Facebook
+        alt: Acceder ó sistema cunha conta do Facebook
+      microsoft:
+        title: Acceder ó sistema con Microsoft
+        alt: Acceder ó sistema cunha conta de Microsoft
+      github:
+        title: Acceder ó sistema co GitHub
+        alt: Acceder ó sistema cunha conta do GitHub
+      wikipedia:
+        title: Acceder ó sistema coa Wikipedia
+        alt: Acceder ó sistema cunha conta da Wikipedia
+      wordpress:
+        title: Acceder ó sistema co Wordpress
+        alt: Acceder ó sistema cun OpenID do Wordpress
+      aol:
+        title: Acceder ó sistema co AOL
+        alt: Acceder ó sistema cun OpenID do AOL

   oauth:
     authorize:
       title: Autorizar o acceso á túa conta
   oauth:
     authorize:
       title: Autorizar o acceso á túa conta


@@ -2826,16 +2824,14 @@ gl:
       display name description: O teu nome de usuario amosado publicamente. Podes
         mudalo máis tarde nos axustes.
       external auth: 'Autenticación de terceiros:'
       display name description: O teu nome de usuario amosado publicamente. Podes
         mudalo máis tarde nos axustes.
       external auth: 'Autenticación de terceiros:'

-      use external auth: Ou ben, emprega un servizo de terceiros para acceder
-      auth no password: Coa autenticación de terceiros non se precisa un contrasinal,
-        aínda que hai algunhas ferramentas e servidores que aínda a solicitan.

       continue: Rexistrarse
       terms accepted: Grazas por aceptar os novos termos do colaborador!
       continue: Rexistrarse
       terms accepted: Grazas por aceptar os novos termos do colaborador!

-      email_confirmation_help_html: O teu enderezo non se mostra publicamente; consulta
-        a nosa %{privacy_policy_link} para obter máis información.
+      email_help_html: O teu enderezo non se mostra publicamente; consulta a nosa
+        %{privacy_policy_link} para obter máis información.

       privacy_policy: política de protección de datos
       privacy_policy_title: Política de protección de datos da OSMF, que contén unha
         sección sobre os enderezos de correo electrónico
       privacy_policy: política de protección de datos
       privacy_policy_title: Política de protección de datos da OSMF, que contén unha
         sección sobre os enderezos de correo electrónico

+      use external auth: Ou ben, emprega un servizo de terceiros para acceder

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

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 18291aabd11d7e9c2dd6d13119fd970029ef4cdf..9779599b052cd84b965680b999d35e7779a63288 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -176,7 +176,6 @@ he:
         auth_provider: ספק אימות
         auth_uid: מזהה אימות ייחודי
         email: דוא״ל
         auth_provider: ספק אימות
         auth_uid: מזהה אימות ייחודי
         email: דוא״ל

-        email_confirmation: אימות דוא״ל

         new_email: כתובת דוא״ל חדשה
         active: פעיל
         display_name: שם לתצוגה
         new_email: כתובת דוא״ל חדשה
         active: פעיל
         display_name: שם לתצוגה


@@ -1961,7 +1960,7 @@ he:
   sessions:
     new:
       title: כניסה
   sessions:
     new:
       title: כניסה

-      heading: כניסה
+      tab_title: כניסה

       email or username: כתובת דוא״ל או שם משתמש
       password: סיסמה
       remember: לזכור אותי
       email or username: כתובת דוא״ל או שם משתמש
       password: סיסמה
       remember: לזכור אותי


@@ -1969,34 +1968,7 @@ he:
       login_button: כניסה
       register now: להירשם עכשיו
       with external: 'לחלופין, השתמשו בצד שלישי כדי להיכנס:'
       login_button: כניסה
       register now: להירשם עכשיו
       with external: 'לחלופין, השתמשו בצד שלישי כדי להיכנס:'

-      no account: אין לך חשבון?

       auth failure: סליחה, לא ניתן להיכנס עם הפרטים האלה.
       auth failure: סליחה, לא ניתן להיכנס עם הפרטים האלה.

-      openid_logo_alt: כניסה עם OpenID
-      auth_providers:
-        openid:
-          title: כניסה עם OpenID
-          alt: כניסה עם URL של OpenID
-        google:
-          title: כניסה עם גוגל
-          alt: כניסה עם OpenID של גוגל
-        facebook:
-          title: כניסה עם פייסבוק
-          alt: כניסה עם חשבון פייסבוק
-        microsoft:
-          title: כניסה עם מיקרוסופט
-          alt: כניסה עם חשבון מיקרוסופט
-        github:
-          title: כניסה עם גיטהאב
-          alt: כניסה עם חשבון גיטהאב
-        wikipedia:
-          title: כניסה עם ויקיפדיה
-          alt: כניסה עם חשבון ויקיפדיה
-        wordpress:
-          title: כניסה עם וורדפרס
-          alt: כניסה עם OpenID של וורדפרס
-        aol:
-          title: כניסה עם AOL
-          alt: כניסה עם OpenID של AOL

     destroy:
       title: יציאה
       heading: יציאה מ־OpenStreetMap
     destroy:
       title: יציאה
       heading: יציאה מ־OpenStreetMap


@@ -2652,6 +2624,32 @@ he:
       oauth2_applications: יישומי OAuth 2
       oauth2_authorizations: אישורי OAuth 2
       muted_users: משתמשים מושתקים
       oauth2_applications: יישומי OAuth 2
       oauth2_authorizations: אישורי OAuth 2
       muted_users: משתמשים מושתקים

+    auth_providers:
+      openid_logo_alt: כניסה עם OpenID
+      openid:
+        title: כניסה עם OpenID
+        alt: כניסה עם URL של OpenID
+      google:
+        title: כניסה עם גוגל
+        alt: כניסה עם OpenID של גוגל
+      facebook:
+        title: כניסה עם פייסבוק
+        alt: כניסה עם חשבון פייסבוק
+      microsoft:
+        title: כניסה עם מיקרוסופט
+        alt: כניסה עם חשבון מיקרוסופט
+      github:
+        title: כניסה עם גיטהאב
+        alt: כניסה עם חשבון גיטהאב
+      wikipedia:
+        title: כניסה עם ויקיפדיה
+        alt: כניסה עם חשבון ויקיפדיה
+      wordpress:
+        title: כניסה עם וורדפרס
+        alt: כניסה עם OpenID של וורדפרס
+      aol:
+        title: כניסה עם AOL
+        alt: כניסה עם OpenID של AOL

   oauth:
     authorize:
       title: אישור הגישה לחשבון שלך
   oauth:
     authorize:
       title: אישור הגישה לחשבון שלך


@@ -2795,15 +2793,13 @@ he:
       display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעדפות
         שלך.
       external auth: 'אימות עם צד שלישי:'
       display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעדפות
         שלך.
       external auth: 'אימות עם צד שלישי:'

-      use external auth: לחלופין, אפשר להשתמש בגורמי צד שלישי כדי להיכנס
-      auth no password: עם אימות צד שלישי אין צורך בסיסמה, אבל כלים נוספים או שרת
-        יכולים להזדקק לכזה.

       continue: הרשמה
       terms accepted: תודה על קבלת תנאי התרומה החדשים!
       continue: הרשמה
       terms accepted: תודה על קבלת תנאי התרומה החדשים!

-      email_confirmation_help_html: הכתובת שלך אינה מוצגת בפומבי, ר' את %{privacy_policy_link}
+      email_help_html: הכתובת שלך אינה מוצגת בפומבי, ר' את %{privacy_policy_link}

         שלנו למידע נוסף.
       privacy_policy: מדיניות הפרטיות
       privacy_policy_title: מדיניות הפרטיות של OSMF כוללת סעיף על כתובות דוא״ל
         שלנו למידע נוסף.
       privacy_policy: מדיניות הפרטיות
       privacy_policy_title: מדיניות הפרטיות של OSMF כוללת סעיף על כתובות דוא״ל

+      use external auth: לחלופין, אפשר להשתמש בגורמי צד שלישי כדי להיכנס

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

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index afed0e0dd6e0f4bb838ee1bff10b91ba0fc581df..09f4fe50f31b660f6f9c8bd264e51b7f610a9d13 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -151,7 +151,6 @@ hi:
         auth_provider: प्रमाणीकरण प्रदाता
         auth_uid: प्रमाणीकरण यूआईडी
         email: ई-मेल
         auth_provider: प्रमाणीकरण प्रदाता
         auth_uid: प्रमाणीकरण यूआईडी
         email: ई-मेल

-        email_confirmation: ईमेल पुष्टिकरण

         new_email: नया ई-मेल पता
         active: सक्रिय
         display_name: प्रदर्शन नाम
         new_email: नया ई-मेल पता
         active: सक्रिय
         display_name: प्रदर्शन नाम

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index d04efe349bd3a33a9eb36c147b8b12683c9021ac..a01a6e06ded9270b1859f65a876ede5fa7c3af42 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -128,7 +128,6 @@ hr:
         description: Opis
       user:
         email: Email
         description: Opis
       user:
         email: Email

-        email_confirmation: 'Potvrda adrese e-pošte:'

         new_email: 'Nova adresa e-pošte:'
         active: Aktivan
         display_name: Prikaži ime
         new_email: 'Nova adresa e-pošte:'
         active: Aktivan
         display_name: Prikaži ime


@@ -1225,7 +1224,7 @@ hr:
   sessions:
     new:
       title: Prijava
   sessions:
     new:
       title: Prijava

-      heading: Prijava
+      tab_title: Prijava

       email or username: 'Email adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       email or username: 'Email adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me


@@ -1233,34 +1232,7 @@ hr:
       login_button: Prijava
       register now: Registrirajte se sada
       with external: 'Ili koristite drugi servis za prijavljivanje:'
       login_button: Prijava
       register now: Registrirajte se sada
       with external: 'Ili koristite drugi servis za prijavljivanje:'

-      no account: Nemate račun?

       auth failure: Žao mi je, ne mogu prijaviti s ovim detaljima.
       auth failure: Žao mi je, ne mogu prijaviti s ovim detaljima.

-      openid_logo_alt: Prijavi se sa OpenID-om
-      auth_providers:
-        openid:
-          title: Prijavi se sa OpenID-om
-          alt: Prijavi se sa URL-om OpenID-a
-        google:
-          title: Prijavi se sa Google-om
-          alt: Prijavi se sa Google-ovim OpenID-om
-        facebook:
-          title: Prijavi se sa Facebook-om
-          alt: Prijavi se sa računom Facebook-a
-        microsoft:
-          title: Prijavi se sa Windows Live-om
-          alt: Prijavi se sa računom Windows Live-a
-        github:
-          title: Prijavi se sa Github-om
-          alt: Prijavi se sa računom Github-a
-        wikipedia:
-          title: Prijavi se preko Wikipedije
-          alt: Prijavi se s Wikipedijinim računom
-        wordpress:
-          title: Prijavi se sa Wordpressom
-          alt: Prijavi se sa Wordpressovim OpenID-om
-        aol:
-          title: Prijavi se sa AOL-om
-          alt: Prijavi se sa AOL-ovim OpenID-om

     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap-a
     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap-a


@@ -1556,6 +1528,32 @@ hr:
     setup_user_auth:
       blocked: Tvoj pristup API-u je blokiran. Prijavite se na web sučelje da saznate
         više.
     setup_user_auth:
       blocked: Tvoj pristup API-u je blokiran. Prijavite se na web sučelje da saznate
         više.

+    auth_providers:
+      openid_logo_alt: Prijavi se sa OpenID-om
+      openid:
+        title: Prijavi se sa OpenID-om
+        alt: Prijavi se sa URL-om OpenID-a
+      google:
+        title: Prijavi se sa Google-om
+        alt: Prijavi se sa Google-ovim OpenID-om
+      facebook:
+        title: Prijavi se sa Facebook-om
+        alt: Prijavi se sa računom Facebook-a
+      microsoft:
+        title: Prijavi se sa Windows Live-om
+        alt: Prijavi se sa računom Windows Live-a
+      github:
+        title: Prijavi se sa Github-om
+        alt: Prijavi se sa računom Github-a
+      wikipedia:
+        title: Prijavi se preko Wikipedije
+        alt: Prijavi se s Wikipedijinim računom
+      wordpress:
+        title: Prijavi se sa Wordpressom
+        alt: Prijavi se sa Wordpressovim OpenID-om
+      aol:
+        title: Prijavi se sa AOL-om
+        alt: Prijavi se sa AOL-ovim OpenID-om

   oauth:
     authorize:
       request_access_html: Aplikacija %{app_name} zahtjeva pristup vašem korisničkom
   oauth:
     authorize:
       request_access_html: Aplikacija %{app_name} zahtjeva pristup vašem korisničkom


@@ -1620,11 +1618,9 @@ hr:
       display name description: Javno prikazano korisničko ime. Možete ga promjeniti
         i kasnije u postavkama.
       external auth: 'Prijavljivanje s drugog servisa:'
       display name description: Javno prikazano korisničko ime. Možete ga promjeniti
         i kasnije u postavkama.
       external auth: 'Prijavljivanje s drugog servisa:'

-      use external auth: Alternativno, koristite drugi servis za prijavljivanje
-      auth no password: Sa prijavljivanjem sa drugog servisa ne trebate lozinku, ali
-        drugi alati ili serveri će možda trebati.

       continue: Otvori račun
       terms accepted: Hvala za prihvaćanje novih pridonositeljskih uvjeta!
       continue: Otvori račun
       terms accepted: Hvala za prihvaćanje novih pridonositeljskih uvjeta!

+      use external auth: Alternativno, koristite drugi servis za prijavljivanje

     terms:
       title: Uvjeti doprinositelja
       heading: Uvjeti
     terms:
       title: Uvjeti doprinositelja
       heading: Uvjeti

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 295de5cc96c3676578f1c7a1e92d72507a0b9b22..96b9ebff2dd493a534babb463e37005f16e19a30 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -142,7 +142,6 @@ hsb:
         auth_provider: Poskićowar awtentifikacije
         auth_uid: UID awtentifikacije
         email: E-mejl
         auth_provider: Poskićowar awtentifikacije
         auth_uid: UID awtentifikacije
         email: E-mejl

-        email_confirmation: Wobkrućenje mejlki

         new_email: Nowa mejlowa adresa
         active: Aktiwny
         display_name: Wužiwarske mjeno
         new_email: Nowa mejlowa adresa
         active: Aktiwny
         display_name: Wužiwarske mjeno


@@ -1819,7 +1818,7 @@ hsb:
   sessions:
     new:
       title: Přizjewjenje
   sessions:
     new:
       title: Přizjewjenje

-      heading: Přizjewjenje
+      tab_title: Přizjewjenje

       email or username: E-mejlowa adresa abo wužiwarske mjeno
       password: Hesło
       remember: Spomjatkować sej
       email or username: E-mejlowa adresa abo wužiwarske mjeno
       password: Hesło
       remember: Spomjatkować sej


@@ -1827,34 +1826,7 @@ hsb:
       login_button: Přizjewjenje
       register now: Nětko registrować
       with external: 'Wužiwaj jako alternatiwu třećeho za přizjewjenje:'
       login_button: Přizjewjenje
       register now: Nětko registrować
       with external: 'Wužiwaj jako alternatiwu třećeho za přizjewjenje:'

-      no account: Nimaš žane konto?

       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.
       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.

-      openid_logo_alt: Z OpenID přizjewić
-      auth_providers:
-        openid:
-          title: Přizjewjenje z OpenID
-          alt: Přizjewjenje z OpenID-URL
-        google:
-          title: Přizjewjenje z Google
-          alt: Přizjewjenje z Google OpenID
-        facebook:
-          title: Přizjewjenje z Facebook
-          alt: Přizjewjenje z facebookowym kontom
-        microsoft:
-          title: Přizjewjenje z Microsoft
-          alt: Přizjewjenje z kontom Microsoft
-        github:
-          title: Z GitHub přizjewić
-          alt: Z kontom GitHub přizjewić
-        wikipedia:
-          title: Z Wikipediju přizjewić
-          alt: Z kontom Wikipedije přizjewić
-        wordpress:
-          title: Přizjewjenje z Wordpress
-          alt: Přizjewjenje z Wordpress OpenID
-        aol:
-          title: Přizjewjenje z AOL
-          alt: Přizjewjenje z AOL OpenID

     destroy:
       title: Wotzjewić
       heading: Z OpenStreetMap wotzjewić
     destroy:
       title: Wotzjewić
       heading: Z OpenStreetMap wotzjewić


@@ -2296,6 +2268,32 @@ hsb:
       oauth2_applications: Nastajenja OAUTH 2
       oauth2_authorizations: Prawa OAUTH 2
       muted_users: Zněmjeni wužiwarjo
       oauth2_applications: Nastajenja OAUTH 2
       oauth2_authorizations: Prawa OAUTH 2
       muted_users: Zněmjeni wužiwarjo

+    auth_providers:
+      openid_logo_alt: Z OpenID přizjewić
+      openid:
+        title: Přizjewjenje z OpenID
+        alt: Přizjewjenje z OpenID-URL
+      google:
+        title: Přizjewjenje z Google
+        alt: Přizjewjenje z Google OpenID
+      facebook:
+        title: Přizjewjenje z Facebook
+        alt: Přizjewjenje z facebookowym kontom
+      microsoft:
+        title: Přizjewjenje z Microsoft
+        alt: Přizjewjenje z kontom Microsoft
+      github:
+        title: Z GitHub přizjewić
+        alt: Z kontom GitHub přizjewić
+      wikipedia:
+        title: Z Wikipediju přizjewić
+        alt: Z kontom Wikipedije přizjewić
+      wordpress:
+        title: Přizjewjenje z Wordpress
+        alt: Přizjewjenje z Wordpress OpenID
+      aol:
+        title: Přizjewjenje z AOL
+        alt: Přizjewjenje z AOL OpenID

   oauth:
     authorize:
       title: Přistup na twoje konto awtorizować
   oauth:
     authorize:
       title: Přistup na twoje konto awtorizować


@@ -2424,12 +2422,10 @@ hsb:
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo
         w nastajenjach změnić.
       external auth: Awtentifikacija přez třeću stronu
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo
         w nastajenjach změnić.
       external auth: Awtentifikacija přez třeću stronu

-      use external auth: Jako alternatiwa wužij třeću stronu za přizjewjenje
-      auth no password: Z přizjewjenjom přez třeću stronu hesło trěbne njeje, ale
-        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ł!
       privacy_policy: prawidła priwatnosće
       continue: Registrować
       terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował!
       privacy_policy: prawidła priwatnosće

+      use external auth: Jako alternatiwa wužij třeću stronu za přizjewjenje

     terms:
       title: Wuměnjenja
       heading: Wuměnjenja
     terms:
       title: Wuměnjenja
       heading: Wuměnjenja

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c94bc61417d4056d77072020ed0ac14f4cad1b51..759414b842287590f33fe669a05d7fbf7c80cb8c 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -171,7 +171,6 @@ hu:
         auth_provider: Hitelesítésszolgáltató
         auth_uid: Hitelesítési felhasználóazonosító
         email: E-mail
         auth_provider: Hitelesítésszolgáltató
         auth_uid: Hitelesítési felhasználóazonosító
         email: E-mail

-        email_confirmation: E-mail-cím megerősítése

         new_email: Új e-mail-cím
         active: Aktív
         display_name: Megjelenítendő név
         new_email: Új e-mail-cím
         active: Aktív
         display_name: Megjelenítendő név


@@ -1951,7 +1950,7 @@ hu:
   sessions:
     new:
       title: Bejelentkezés
   sessions:
     new:
       title: Bejelentkezés

-      heading: Bejelentkezés
+      tab_title: Bejelentkezés

       email or username: E-mail-cím vagy felhasználónév
       password: Jelszó
       remember: Emlékezz rám
       email or username: E-mail-cím vagy felhasználónév
       password: Jelszó
       remember: Emlékezz rám


@@ -1959,34 +1958,7 @@ hu:
       login_button: Bejelentkezés
       register now: Regisztrálj most
       with external: 'Alternatívaként használj külső fiókot a bejelentkezéshez:'
       login_button: Bejelentkezés
       register now: Regisztrálj most
       with external: 'Alternatívaként használj külső fiókot a bejelentkezéshez:'

-      no account: Nem rendelkezel még felhasználói fiókkal?

       auth failure: Sajnáljuk, ilyen adatokkal nem tudsz bejelentkezni.
       auth failure: Sajnáljuk, ilyen adatokkal nem tudsz bejelentkezni.

-      openid_logo_alt: Bejelentkezés egy OpenID-vel
-      auth_providers:
-        openid:
-          title: Bejelentkezés OpenID-vel
-          alt: Bejelentkezés OpenID-URL-lel
-        google:
-          title: Bejelentkezés Google-lel
-          alt: Bejelentkezés Google OpenID-vel
-        facebook:
-          title: Bejelentkezés Facebook-kal
-          alt: Bejelentkezés Facebook fiókkal
-        microsoft:
-          title: Bejelentkezés Microsofttal.
-          alt: Bejelentkezés Microsoft fiókkal
-        github:
-          title: Bejelentkezés GitHub-bal
-          alt: Bejelentkezés GitHub fiókkal
-        wikipedia:
-          title: Bejelentkezés Wikipédiával
-          alt: Wikipédia fiókkal való bejelentkezés
-        wordpress:
-          title: Bejelentkezés Wordpress-szel
-          alt: Bejelentkezés Wordpress OpenID-vel
-        aol:
-          title: Bejelentkezés AOL-lal
-          alt: Bejelentkezés AOL OpenID-vel

     destroy:
       title: Kijelentkezés
       heading: Kijelentkezés az OpenStreetMapból
     destroy:
       title: Kijelentkezés
       heading: Kijelentkezés az OpenStreetMapból


@@ -2591,6 +2563,32 @@ hu:
       oauth2_applications: OAuth 2 alkalmazások
       oauth2_authorizations: OAuth 2 engedélyek
       muted_users: Elnémított felhasználók
       oauth2_applications: OAuth 2 alkalmazások
       oauth2_authorizations: OAuth 2 engedélyek
       muted_users: Elnémított felhasználók

+    auth_providers:
+      openid_logo_alt: Bejelentkezés egy OpenID-vel
+      openid:
+        title: Bejelentkezés OpenID-vel
+        alt: Bejelentkezés OpenID-URL-lel
+      google:
+        title: Bejelentkezés Google-lel
+        alt: Bejelentkezés Google OpenID-vel
+      facebook:
+        title: Bejelentkezés Facebook-kal
+        alt: Bejelentkezés Facebook fiókkal
+      microsoft:
+        title: Bejelentkezés Microsofttal.
+        alt: Bejelentkezés Microsoft fiókkal
+      github:
+        title: Bejelentkezés GitHub-bal
+        alt: Bejelentkezés GitHub fiókkal
+      wikipedia:
+        title: Bejelentkezés Wikipédiával
+        alt: Wikipédia fiókkal való bejelentkezés
+      wordpress:
+        title: Bejelentkezés Wordpress-szel
+        alt: Bejelentkezés Wordpress OpenID-vel
+      aol:
+        title: Bejelentkezés AOL-lal
+        alt: Bejelentkezés AOL OpenID-vel

   oauth:
     authorize:
       title: A fiókodhoz való hozzáférés engedélyezése
   oauth:
     authorize:
       title: A fiókodhoz való hozzáférés engedélyezése


@@ -2742,14 +2740,12 @@ hu:
       display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban
         később megváltoztathatod.
       external auth: 'Harmadik fél általi hitelesítés:'
       display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban
         később megváltoztathatod.
       external auth: 'Harmadik fél általi hitelesítés:'

-      use external auth: Alternatívaként használhatsz külső fiókokat a bejelentkezéshez
-      auth no password: Harmadik féltől származó hitelesítés esetén a jelszó nem kötelező,
-        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 közreműködési feltételeket!
       privacy_policy: adatvédelmi irányelvek
       privacy_policy_title: Az OSMF adatvédelmi szabályzata, beleértve az e-mail címekről
         szóló részt
       continue: Regisztráció
       terms accepted: Köszönjük, hogy elfogadtad az új közreműködési feltételeket!
       privacy_policy: adatvédelmi irányelvek
       privacy_policy_title: Az OSMF adatvédelmi szabályzata, beleértve az e-mail címekről
         szóló részt

+      use external auth: Alternatívaként használhatsz külső fiókokat a bejelentkezéshez

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 94bcbb3e19a6c0969155feb73708f4a070ec2c95..c432da5e5dddcd75d58dbc8b82666bc8133d5e6c 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -141,7 +141,6 @@ ia:
         auth_provider: Fornitor de authentication
         auth_uid: UID de authentication
         email: E-mail
         auth_provider: Fornitor de authentication
         auth_uid: UID de authentication
         email: E-mail

-        email_confirmation: Confirmation del e-mail

         new_email: Nove adresse de e-mail
         active: Active
         display_name: Nomine public
         new_email: Nove adresse de e-mail
         active: Active
         display_name: Nomine public


@@ -1941,7 +1940,7 @@ ia:
   sessions:
     new:
       title: Aperir session
   sessions:
     new:
       title: Aperir session

-      heading: Aperir session
+      tab_title: Aperir session

       email or username: Adresse de e-mail o nomine de usator
       password: Contrasigno
       remember: Memorar me
       email or username: Adresse de e-mail o nomine de usator
       password: Contrasigno
       remember: Memorar me


@@ -1949,34 +1948,7 @@ ia:
       login_button: Aperir session
       register now: Registrar ora
       with external: 'Alternativemente, usa un tertio pro aperir session:'
       login_button: Aperir session
       register now: Registrar ora
       with external: 'Alternativemente, usa un tertio pro aperir session:'

-      no account: Non ha un conto?

       auth failure: Pardono, non poteva aperir un session con iste detalios.
       auth failure: Pardono, non poteva aperir un session con iste detalios.

-      openid_logo_alt: Aperir session con OpenID
-      auth_providers:
-        openid:
-          title: Aperir session con OpenID
-          alt: Aperir session con un URL de OpenID
-        google:
-          title: Aperir session con Google
-          alt: Aperir session con un OpenID de Google
-        facebook:
-          title: Aperir session con Facebook
-          alt: Aperir session con un conto de Facebook
-        microsoft:
-          title: Aperir session con Microsoft
-          alt: Aperir session con un conto Microsoft
-        github:
-          title: Aperir session con GitHub
-          alt: Aperir session con un conto de GitHub
-        wikipedia:
-          title: Aperir session con Wikipedia
-          alt: Aperir session con un conto de Wikipedia
-        wordpress:
-          title: Aperir session con WordPress
-          alt: Aperir session con un OpenID de WordPress
-        aol:
-          title: Aperir session con AOL
-          alt: Aperir session con un OpenID de AOL

     destroy:
       title: Clauder session
       heading: Clauder le session de OpenStreetMap
     destroy:
       title: Clauder session
       heading: Clauder le session de OpenStreetMap


@@ -2646,6 +2618,32 @@ ia:
       oauth2_applications: Applicationes OAuth 2
       oauth2_authorizations: Autorisationes OAuth 2
       muted_users: Usatores silentiate
       oauth2_applications: Applicationes OAuth 2
       oauth2_authorizations: Autorisationes OAuth 2
       muted_users: Usatores silentiate

+    auth_providers:
+      openid_logo_alt: Aperir session con OpenID
+      openid:
+        title: Aperir session con OpenID
+        alt: Aperir session con un URL de OpenID
+      google:
+        title: Aperir session con Google
+        alt: Aperir session con un OpenID de Google
+      facebook:
+        title: Aperir session con Facebook
+        alt: Aperir session con un conto de Facebook
+      microsoft:
+        title: Aperir session con Microsoft
+        alt: Aperir session con un conto Microsoft
+      github:
+        title: Aperir session con GitHub
+        alt: Aperir session con un conto de GitHub
+      wikipedia:
+        title: Aperir session con Wikipedia
+        alt: Aperir session con un conto de Wikipedia
+      wordpress:
+        title: Aperir session con WordPress
+        alt: Aperir session con un OpenID de WordPress
+      aol:
+        title: Aperir session con AOL
+        alt: Aperir session con un OpenID de AOL

   oauth:
     authorize:
       title: Autorisar accesso a tu conto
   oauth:
     authorize:
       title: Autorisar accesso a tu conto


@@ -2796,16 +2794,14 @@ ia:
       display name description: Tu nomine de usator monstrate publicamente. Tu pote
         cambiar lo plus tarde in le preferentias.
       external auth: 'Authentication per tertios:'
       display name description: Tu nomine de usator monstrate publicamente. Tu pote
         cambiar lo plus tarde in le preferentias.
       external auth: 'Authentication per tertios:'

-      use external auth: Alternativemente, usa un tertio pro aperir session
-      auth no password: Con authentication per tertio, un contrasigno non es necessari,
-        ma alcun instrumentos o servitores supplementari pote totevia necessitar un.

       continue: Crear conto
       terms accepted: Gratias pro acceptar le nove conditiones de contributor!
       continue: Crear conto
       terms accepted: Gratias pro acceptar le nove conditiones de contributor!

-      email_confirmation_help_html: Tu adresse non es monstrate publicamente. Consulta
-        nostre %{privacy_policy_link} pro plus information.
+      email_help_html: Tu adresse non es monstrate publicamente. Consulta nostre %{privacy_policy_link}
+        pro plus information.

       privacy_policy: politica de confidentialitate
       privacy_policy_title: Politica de confidentialitate del OSMF con un section
         sur adresses de e-mail
       privacy_policy: politica de confidentialitate
       privacy_policy_title: Politica de confidentialitate del OSMF con un section
         sur adresses de e-mail

+      use external auth: Alternativemente, usa un tertio pro aperir session

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

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 55a8bc97f28ab73f10d746fc9d7e765e7ea9248c..0cb3aea0725555636339085b04326f728e7f612f 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -176,7 +176,6 @@ id:
         auth_provider: Penyedia Otentikasi
         auth_uid: UID Otentikasi
         email: Surel
         auth_provider: Penyedia Otentikasi
         auth_uid: UID Otentikasi
         email: Surel

-        email_confirmation: Konfirmasi Surel

         new_email: Alamat Surel Baru
         active: Aktif
         display_name: Nama Tampilan
         new_email: Alamat Surel Baru
         active: Aktif
         display_name: Nama Tampilan


@@ -199,7 +198,7 @@ id:
           mungkin, ketahui bahwa pesan ini dapat dilihat oleh publik. Ingat, tidak
           semua pengguna paham istilah-istilah teknis. Gunakan istilah sesederhana
           mungkin.
           mungkin, ketahui bahwa pesan ini dapat dilihat oleh publik. Ingat, tidak
           semua pengguna paham istilah-istilah teknis. Gunakan istilah sesederhana
           mungkin.

-        needs_view: Apakah pengguna harus login sebelum blokirnya dihapus?
+        needs_view: Apakah pengguna harus masuk log sebelum blokirnya dihapus?

       user:
         new_email: (jangan pernah ditampilkan ke publik)
   datetime:
       user:
         new_email: (jangan pernah ditampilkan ke publik)
   datetime:


@@ -230,10 +229,10 @@ id:
       x_years:
         other: '%{count} tahun yang lalu'
   editor:
       x_years:
         other: '%{count} tahun yang lalu'
   editor:

-    default: Standar (saat ini %{name})
+    default: Tetapan (saat ini %{name})

     id:
       name: iD
     id:
       name: iD

-      description: iD (editor di dalam browser internet)
+      description: iD (editor dalam perambaninternet)

     remote:
       name: Pengendali Jarak Jauh
       description: Remote Control (JOSM, Potlatch, Merkaartor)
     remote:
       name: Pengendali Jarak Jauh
       description: Remote Control (JOSM, Potlatch, Merkaartor)


@@ -251,7 +250,7 @@ id:
         opened_at_html: Dibuat %{when} yang lalu
         opened_at_by_html: Dibuat %{when} yang lalu oleh %{user}
         commented_at_html: Diperbarui %{when} yang lalu
         opened_at_html: Dibuat %{when} yang lalu
         opened_at_by_html: Dibuat %{when} yang lalu oleh %{user}
         commented_at_html: Diperbarui %{when} yang lalu

-        commented_at_by_html: Dimutakhirkan %{when} yang lalu oleh %{user}
+        commented_at_by_html: Diperbarui %{when} yang lalu oleh %{user}

         closed_at_html: Diselesaikan %{when} yang lalu
         closed_at_by_html: Diselesaikan %{when} yang lalu oleh %{user}
         reopened_at_html: Diaktifkan kembali %{when} yang lalu
         closed_at_html: Diselesaikan %{when} yang lalu
         closed_at_by_html: Diselesaikan %{when} yang lalu oleh %{user}
         reopened_at_html: Diaktifkan kembali %{when} yang lalu


@@ -262,7 +261,7 @@ id:
         description_area: Daftar catatan, laporan, komentar atau ditutup di daerah
           Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})]
         description_item: Sebuah rss feed untuk catatan %{id}
         description_area: Daftar catatan, laporan, komentar atau ditutup di daerah
           Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})]
         description_item: Sebuah rss feed untuk catatan %{id}

-        opened: catatan baru (near %{place})
+        opened: catatan baru (dekat %{place})

         commented: komentar baru (near %{place})
         closed: catatan ditutup (near %{place})
         reopened: catatan yang diaktifkan kembali (near %{place})
         commented: komentar baru (near %{place})
         closed: catatan ditutup (near %{place})
         reopened: catatan yang diaktifkan kembali (near %{place})


@@ -1918,7 +1917,7 @@ id:
   sessions:
     new:
       title: Masuk log
   sessions:
     new:
       title: Masuk log

-      heading: Masuk log
+      tab_title: Masuk log

       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi
       remember: Ingat saya
       email or username: Alamat Email atau Nama Pengguna
       password: Kata Sandi
       remember: Ingat saya


@@ -1926,34 +1925,7 @@ id:
       login_button: Masuk log
       register now: Daftar sekarang
       with external: 'Atau, gunakan pihak ketiga untuk masuk:'
       login_button: Masuk log
       register now: Daftar sekarang
       with external: 'Atau, gunakan pihak ketiga untuk masuk:'

-      no account: Belum memiliki akun?

       auth failure: Maaf, tidak bisa login dengan rincian tersebut.
       auth failure: Maaf, tidak bisa login dengan rincian tersebut.

-      openid_logo_alt: Login dengan OpenID
-      auth_providers:
-        openid:
-          title: Masuk log dengan OpenID
-          alt: Masuk log dengan URL OpenID
-        google:
-          title: Masuk log dengan Google
-          alt: Masuk log dengan Google OpenID
-        facebook:
-          title: Masuk log dengan Facebook
-          alt: Masuk log dengan akun Facebook
-        microsoft:
-          title: Masuk log dengan Microsoft
-          alt: Masuk log dengan Akun Microsoft
-        github:
-          title: Masuk dengan GitHub.
-          alt: Masuk log dengan Akun GitHub.
-        wikipedia:
-          title: Masuk log dengan Wikipedia
-          alt: Masuk log dengan Akun Wikipedia
-        wordpress:
-          title: Masuk log dengan Wordpress
-          alt: Masuk log dengan Wordpress OpenID
-        aol:
-          title: Masuk log dengan AOL
-          alt: Masuk log dengan AOL OpenID

     destroy:
       title: Logout
       heading: Logout dari OpenStreetMap
     destroy:
       title: Logout
       heading: Logout dari OpenStreetMap


@@ -2266,7 +2238,7 @@ id:
         description: Panduan yang ditunjang komunitas bagi pemula.
       community:
         title: Forum Bantuan & Komunitas
         description: Panduan yang ditunjang komunitas bagi pemula.
       community:
         title: Forum Bantuan & Komunitas

-        description: Forum bincang-bincang OpenStreetMap.
+        description: Tempat untuk mencari bantuan dan berdiskusi bersama tentang OpenStreetMap.

       mailing_lists:
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat
       mailing_lists:
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat


@@ -2600,6 +2572,32 @@ id:
       oauth2_applications: Aplikasi OAuth 2
       oauth2_authorizations: Otorisasi OAuth 2
       muted_users: Pengguna yang Dibisukan
       oauth2_applications: Aplikasi OAuth 2
       oauth2_authorizations: Otorisasi OAuth 2
       muted_users: Pengguna yang Dibisukan

+    auth_providers:
+      openid_logo_alt: Login dengan OpenID
+      openid:
+        title: Masuk log dengan OpenID
+        alt: Masuk log dengan URL OpenID
+      google:
+        title: Masuk log dengan Google
+        alt: Masuk log dengan Google OpenID
+      facebook:
+        title: Masuk log dengan Facebook
+        alt: Masuk log dengan akun Facebook
+      microsoft:
+        title: Masuk log dengan Microsoft
+        alt: Masuk log dengan Akun Microsoft
+      github:
+        title: Masuk dengan GitHub.
+        alt: Masuk log dengan Akun GitHub.
+      wikipedia:
+        title: Masuk log dengan Wikipedia
+        alt: Masuk log dengan Akun Wikipedia
+      wordpress:
+        title: Masuk log dengan Wordpress
+        alt: Masuk log dengan Wordpress OpenID
+      aol:
+        title: Masuk log dengan AOL
+        alt: Masuk log dengan AOL OpenID

   oauth:
     authorize:
       title: Otorisasi akses ke akun Anda
   oauth:
     authorize:
       title: Otorisasi akses ke akun Anda


@@ -2747,16 +2745,14 @@ id:
       display name description: Username Anda yang ditampilkan pada publik. Anda dapat
         mengubahnya dalam pengaturan.
       external auth: 'Autentikasi Pihak Ketiga:'
       display name description: Username Anda yang ditampilkan pada publik. Anda dapat
         mengubahnya dalam pengaturan.
       external auth: 'Autentikasi Pihak Ketiga:'

-      use external auth: Atau, gunakan pihak ketiga untuk masuk
-      auth no password: Dengan autentikasi pihak ketiga kata sandi tidak diperlukan,
-        tetapi beberapa alat tambahan atau server mungkin memerlukannya.

       continue: Mendaftar
       terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru!
       continue: Mendaftar
       terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru!

-      email_confirmation_help_html: Alamat Anda tidak dapat dilihat publik. Lihat
-        %{privacy_policy_link} kami untuk info lebih lanjut.
+      email_help_html: Alamat Anda tidak dapat dilihat publik. Lihat %{privacy_policy_link}
+        kami untuk info lebih lanjut.

       privacy_policy: kebijakan privasi
       privacy_policy_title: Kebijakan privasi OSMF meliputi aturan soal alamat surat
         elektronik
       privacy_policy: kebijakan privasi
       privacy_policy_title: Kebijakan privasi OSMF meliputi aturan soal alamat surat
         elektronik

+      use external auth: Atau, gunakan pihak ketiga untuk masuk

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index df04164cdbf3664ac00fd20c01b3f751ed81ae30..8adacfff35108c4ec34e280f3ddebfa92ac69d55 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -146,7 +146,6 @@ is:
         auth_provider: Auðkenningaraðili
         auth_uid: UID auðkenningar
         email: Netfang
         auth_provider: Auðkenningaraðili
         auth_uid: UID auðkenningar
         email: Netfang

-        email_confirmation: Staðfesting póstfangs

         new_email: Nýtt póstfang
         active: Virkur
         display_name: Sýnilegt nafn
         new_email: Nýtt póstfang
         active: Virkur
         display_name: Sýnilegt nafn


@@ -1870,7 +1869,7 @@ is:
   sessions:
     new:
       title: Innskrá
   sessions:
     new:
       title: Innskrá

-      heading: Innskrá
+      tab_title: Innskrá

       email or username: Tölvupóstur eða notandanafn
       password: Lykilorð
       remember: Muna innskráninguna
       email or username: Tölvupóstur eða notandanafn
       password: Lykilorð
       remember: Muna innskráninguna


@@ -1878,34 +1877,7 @@ is:
       login_button: Innskrá
       register now: Skrá þig núna
       with external: 'Þú getur líka notað utanaðkomandi þjónustur til innskráningar:'
       login_button: Innskrá
       register now: Skrá þig núna
       with external: 'Þú getur líka notað utanaðkomandi þjónustur til innskráningar:'

-      no account: Ertu ekki með aðgang?

       auth failure: Þetta notandanafn eða lykilorð er rangt.
       auth failure: Þetta notandanafn eða lykilorð er rangt.

-      openid_logo_alt: Skrá inn með OpenID-aðgangi
-      auth_providers:
-        openid:
-          title: Skrá inn með OpenID
-          alt: Skrá inn með OpenID-slóð
-        google:
-          title: Skrá inn með Google
-          alt: Skrá inn með Google OpenID-aðgangi
-        facebook:
-          title: Skrá inn með Facebook
-          alt: Skrá inn með Facebook-aðgangi
-        microsoft:
-          title: Skrá inn með Microsoft
-          alt: Skrá inn með Microsoft-aðgangi
-        github:
-          title: Skrá inn með GitHub
-          alt: Skrá inn með GitHub-aðgangi
-        wikipedia:
-          title: Skrá inn með Wikipedia
-          alt: Skrá inn með Wikipedia-aðgangi
-        wordpress:
-          title: Skrá inn með Wordpress
-          alt: Skrá inn með Wordpress OpenID-aðgangi
-        aol:
-          title: Skrá inn með AOL
-          alt: Skrá inn með AOL OpenID-aðgangi

     destroy:
       title: Útskráning
       heading: Skrá út úr OpenStreetMap
     destroy:
       title: Útskráning
       heading: Skrá út úr OpenStreetMap


@@ -2611,6 +2583,32 @@ is:
       oauth2_applications: OAuth 2 forrit
       oauth2_authorizations: OAuth 2 auðkenningar
       muted_users: Þaggaðir notendur
       oauth2_applications: OAuth 2 forrit
       oauth2_authorizations: OAuth 2 auðkenningar
       muted_users: Þaggaðir notendur

+    auth_providers:
+      openid_logo_alt: Skrá inn með OpenID-aðgangi
+      openid:
+        title: Skrá inn með OpenID
+        alt: Skrá inn með OpenID-slóð
+      google:
+        title: Skrá inn með Google
+        alt: Skrá inn með Google OpenID-aðgangi
+      facebook:
+        title: Skrá inn með Facebook
+        alt: Skrá inn með Facebook-aðgangi
+      microsoft:
+        title: Skrá inn með Microsoft
+        alt: Skrá inn með Microsoft-aðgangi
+      github:
+        title: Skrá inn með GitHub
+        alt: Skrá inn með GitHub-aðgangi
+      wikipedia:
+        title: Skrá inn með Wikipedia
+        alt: Skrá inn með Wikipedia-aðgangi
+      wordpress:
+        title: Skrá inn með Wordpress
+        alt: Skrá inn með Wordpress OpenID-aðgangi
+      aol:
+        title: Skrá inn með AOL
+        alt: Skrá inn með AOL OpenID-aðgangi

   oauth:
     authorize:
       title: Auðkenndu aðgang að notandaaðganginum þínum
   oauth:
     authorize:
       title: Auðkenndu aðgang að notandaaðganginum þínum


@@ -2761,17 +2759,15 @@ is:
       display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt
         því síðar í stillingunum þínum.
       external auth: 'Auðkenning með þriðja aðila:'
       display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt
         því síðar í stillingunum þínum.
       external auth: 'Auðkenning með þriðja aðila:'

-      use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar
-      auth no password: Með auðkenningu frá þriðja aðila er ekki nauðsynlegt að nota
-        lykilorð, en einhver aukaverkfæri eða þjónar gætu samt þurft á því að halda.

       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!

-      email_confirmation_help_html: Netfangið þitt er ekki birt opinberlega, skoðaðu
-        síðuna um %{privacy_policy_link} til að sjá nánari upplýsingar.
+      email_help_html: Netfangið þitt er ekki birt opinberlega, skoðaðu síðuna um
+        %{privacy_policy_link} til að sjá nánari upplýsingar.

       privacy_policy: meðferð persónuupplýsinga
       privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
       privacy_policy_title: persónuverndarstefnu OSMF, þar með talinn hlutann um tölvupóstföng
       privacy_policy: meðferð persónuupplýsinga
       privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
       privacy_policy_title: persónuverndarstefnu OSMF, þar með talinn hlutann um tölvupóstföng

+      use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar

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

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5b7684e0d6df92dae43c227f76a30991c80d699b..40769ddf167e92c3399b20770331d205e296dee4 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -148,11 +148,11 @@ it:
         support_url: Indirizzo URL di supporto
         allow_read_prefs: leggi le sue preferenze utente
         allow_write_prefs: modifica le sue preferenze utente
         support_url: Indirizzo URL di supporto
         allow_read_prefs: leggi le sue preferenze utente
         allow_write_prefs: modifica le sue preferenze utente

-        allow_write_diary: crea pagine di diario, commenta e fai amicizia
-        allow_write_api: modifica la mappa
+        allow_write_diary: creare pagine di diario, commenti e stringere amicizie
+        allow_write_api: modificare la mappa

         allow_read_gpx: visualizza le sue tracce GPS private
         allow_write_gpx: carica tracce GPS
         allow_read_gpx: visualizza le sue tracce GPS private
         allow_write_gpx: carica tracce GPS

-        allow_write_notes: modifica le note
+        allow_write_notes: modificare le note

       diary_comment:
         body: Corpo
       diary_entry:
       diary_comment:
         body: Corpo
       diary_entry:


@@ -197,7 +197,6 @@ it:
         auth_provider: Fornitore d'autenticazione
         auth_uid: UID d'autenticazione
         email: E-mail
         auth_provider: Fornitore d'autenticazione
         auth_uid: UID d'autenticazione
         email: E-mail

-        email_confirmation: Conferma e-mail

         new_email: Nuovo indirizzo e-mail
         active: Attivo
         display_name: Nome visualizzato
         new_email: Nuovo indirizzo e-mail
         active: Attivo
         display_name: Nome visualizzato


@@ -1999,7 +1998,7 @@ it:
   sessions:
     new:
       title: Entra
   sessions:
     new:
       title: Entra

-      heading: Entra
+      tab_title: Entra

       email or username: Indirizzo e-mail o nome utente
       password: Password
       remember: Ricordati di me
       email or username: Indirizzo e-mail o nome utente
       password: Password
       remember: Ricordati di me


@@ -2007,34 +2006,7 @@ it:
       login_button: Entra
       register now: Registrati ora
       with external: In alternativa, effettua l'accesso tramite terze parti
       login_button: Entra
       register now: Registrati ora
       with external: In alternativa, effettua l'accesso tramite terze parti

-      no account: Non hai un'utenza?

       auth failure: Spiacenti, non si può accedere con questi dettagli.
       auth failure: Spiacenti, non si può accedere con questi dettagli.

-      openid_logo_alt: Accedi con un OpenID
-      auth_providers:
-        openid:
-          title: Accedi con OpenID
-          alt: Accedi con un URL OpenID
-        google:
-          title: Accedi con Google
-          alt: Accedi con un OpenID di Google
-        facebook:
-          title: Accedi con Facebook
-          alt: Accedi con un'utenza Facebook
-        microsoft:
-          title: Accedi con Microsoft
-          alt: Accedi con un'utenza Microsoft
-        github:
-          title: Accedi con GitHub
-          alt: Effettua l'acceso con un'utenza GitHub
-        wikipedia:
-          title: Accedi con Wikipedia
-          alt: Accedi con un'utenza Wikipedia
-        wordpress:
-          title: Accedi con Wordpress
-          alt: Accedi con un OpenID di Wordpress
-        aol:
-          title: Accedi con AOL
-          alt: Accedi con un OpenID di AOL

     destroy:
       title: Esci
       heading: Esci da OpenStreetMap
     destroy:
       title: Esci
       heading: Esci da OpenStreetMap


@@ -2212,7 +2184,12 @@ it:
           %{france}: Contiene dati provenienti dalla
           Direction Générale des Impôts.
         contributors_fr_france: Francia
           %{france}: Contiene dati provenienti dalla
           Direction Générale des Impôts.
         contributors_fr_france: Francia

+        contributors_hr_credit_html: |-
+          %{croatia}: contiene dati da %{dgu_link} e %{open_data_portal}
+          (informazioni pubbliche della Croazia).

         contributors_hr_croatia: Croazia
         contributors_hr_croatia: Croazia

+        contributors_hr_dgu: Amministrazione geodetica statale della Croazia
+        contributors_hr_open_data_portal: Portale nazionale degli open data

         contributors_nl_credit_html: '%{netherlands}: Contiene i dati © AND,
           2007 (%{and_link})'
         contributors_nl_netherlands: Paesi Bassi
         contributors_nl_credit_html: '%{netherlands}: Contiene i dati © AND,
           2007 (%{and_link})'
         contributors_nl_netherlands: Paesi Bassi


@@ -2702,6 +2679,32 @@ it:
       oauth2_applications: Applicazioni OAuth 2
       oauth2_authorizations: Autorizzazioni OAuth 2
       muted_users: Utenti silenziati
       oauth2_applications: Applicazioni OAuth 2
       oauth2_authorizations: Autorizzazioni OAuth 2
       muted_users: Utenti silenziati

+    auth_providers:
+      openid_logo_alt: Accedi con un OpenID
+      openid:
+        title: Accedi con OpenID
+        alt: Accedi con un URL OpenID
+      google:
+        title: Accedi con Google
+        alt: Accedi con un OpenID di Google
+      facebook:
+        title: Accedi con Facebook
+        alt: Accedi con un'utenza Facebook
+      microsoft:
+        title: Accedi con Microsoft
+        alt: Accedi con un'utenza Microsoft
+      github:
+        title: Accedi con GitHub
+        alt: Effettua l'acceso con un'utenza GitHub
+      wikipedia:
+        title: Accedi con Wikipedia
+        alt: Accedi con un'utenza Wikipedia
+      wordpress:
+        title: Accedi con Wordpress
+        alt: Accedi con un OpenID di Wordpress
+      aol:
+        title: Accedi con AOL
+        alt: Accedi con un OpenID di AOL

   oauth:
     authorize:
       title: Autorizzare l'accesso al tuo account
   oauth:
     authorize:
       title: Autorizzare l'accesso al tuo account


@@ -2711,7 +2714,7 @@ it:
       allow_to: 'Consenti all''applicazione client di:'
       allow_read_prefs: leggere le tue preferenze.
       allow_write_prefs: modificare le tue preferenze utente.
       allow_to: 'Consenti all''applicazione client di:'
       allow_read_prefs: leggere le tue preferenze.
       allow_write_prefs: modificare le tue preferenze utente.

-      allow_write_diary: crea pagine di diario, commenti e fai amicizia.
+      allow_write_diary: creare pagine di diario, commenti e stringere amicizie.

       allow_write_api: modificare la mappa.
       allow_read_gpx: leggere i tuoi tracciati GPS privati.
       allow_write_gpx: caricare tracciati GPS.
       allow_write_api: modificare la mappa.
       allow_read_gpx: leggere i tuoi tracciati GPS privati.
       allow_write_gpx: caricare tracciati GPS.


@@ -2731,15 +2734,15 @@ it:
       missing: Non hai autorizzato l'applicazione ad accedere a questa funzione
     scopes:
       openid: Accedi utilizzando OpenStreetMap
       missing: Non hai autorizzato l'applicazione ad accedere a questa funzione
     scopes:
       openid: Accedi utilizzando OpenStreetMap

-      read_prefs: Leggi preferenze utente
-      write_prefs: Modifica le preferenze utente
-      write_diary: Crea voci del diario, commenti e fai amicizia
-      write_api: Modifica la mappa
-      read_gpx: Leggi tracciati GPS privati
-      write_gpx: Carica tracciati GPS
-      write_notes: Modifica le note
-      write_redactions: Rimuovi dati cartografici
-      read_email: Leggere indirizzo di posta elettronica utente
+      read_prefs: Leggere le preferenze dell'utente
+      write_prefs: Modificare le preferenze dell'utente
+      write_diary: Creare voci del diario, commenti e stringere amicizie
+      write_api: Modificare la mappa
+      read_gpx: Leggere tracciati GPS privati
+      write_gpx: Caricare tracciati GPS
+      write_notes: Modificare le note
+      write_redactions: Rimuovere dati cartografici
+      read_email: Leggere indirizzo di posta elettronica dell'utente

       skip_authorization: Approvazione automatica applicazione
   oauth_clients:
     new:
       skip_authorization: Approvazione automatica applicazione
   oauth_clients:
     new:


@@ -2850,17 +2853,14 @@ it:
       display name description: Il proprio nome utente visualizzato pubblicamente.
         Può essere modificato più tardi nelle preferenze.
       external auth: 'Autenticazione tramite terze parti:'
       display name description: Il proprio nome utente visualizzato pubblicamente.
         Può essere modificato più tardi nelle preferenze.
       external auth: 'Autenticazione tramite terze parti:'

-      use external auth: In alternativa, effettua l'accesso tramite terze parti
-      auth no password: Con l'autenticazione tramite terze parti non è richiesta una
-        password, ma alcuni strumenti o server aggiuntivi potrebbero ancora averne
-        bisogno.

       continue: Registrati
       terms accepted: Grazie di aver accettato le nuove regole per contribuire!
       continue: Registrati
       terms accepted: Grazie di aver accettato le nuove regole per contribuire!

-      email_confirmation_help_html: Il tuo indirizzo non viene visualizzato pubblicamente,
-        consulta la nostra %{privacy_policy_link} per ulteriori informazioni.
+      email_help_html: Il tuo indirizzo non viene visualizzato pubblicamente, consulta
+        la nostra %{privacy_policy_link} per ulteriori informazioni.

       privacy_policy: normativa sulla privacy
       privacy_policy_title: Informativa sulla privacy di OSM Foundation compresa la
         sezione sugli indirizzi e-mail
       privacy_policy: normativa sulla privacy
       privacy_policy_title: Informativa sulla privacy di OSM Foundation compresa la
         sezione sugli indirizzi e-mail

+      use external auth: In alternativa, effettua l'accesso tramite terze parti

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


@@ -3123,6 +3123,8 @@ it:
       reason: Motivo del blocco
       status: Stato
       revoker_name: Revocato da
       reason: Motivo del blocco
       status: Stato
       revoker_name: Revocato da

+      older: Blocchi più vecchi
+      newer: Blocchi più recenti

     navigation:
       all_blocks: Tutti i blocchi
       blocks_on_me: Blocchi su di me
     navigation:
       all_blocks: Tutti i blocchi
       blocks_on_me: Blocchi su di me

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4039eaacd1ca6b7fc83189564b42c9c0c35b49eb..25a4eb71fba6c762ec5f4c118c2791c43a7bf8aa 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -199,7 +199,6 @@ ja:
         auth_provider: 認証提供者
         auth_uid: 認証 ID
         email: メール
         auth_provider: 認証提供者
         auth_uid: 認証 ID
         email: メール

-        email_confirmation: メールアドレスの確認

         new_email: 新しいメールアドレス
         active: アクティブ
         display_name: 表示名
         new_email: 新しいメールアドレス
         active: アクティブ
         display_name: 表示名


@@ -1779,7 +1778,7 @@ ja:
   sessions:
     new:
       title: ログイン
   sessions:
     new:
       title: ログイン

-      heading: ログイン
+      tab_title: ログイン

       email or username: 'メールアドレスまたは利用者名:'
       password: 'パスワード:'
       remember: ログイン状態を保持
       email or username: 'メールアドレスまたは利用者名:'
       password: 'パスワード:'
       remember: ログイン状態を保持


@@ -1787,34 +1786,7 @@ ja:
       login_button: ログイン
       register now: 今すぐ登録
       with external: 'サードパーティのアカウントでもログインできます:'
       login_button: ログイン
       register now: 今すぐ登録
       with external: 'サードパーティのアカウントでもログインできます:'

-      no account: アカウントを持っていませんか?

       auth failure: 申し訳ありませんが、入力された情報ではログインできませんでした。
       auth failure: 申し訳ありませんが、入力された情報ではログインできませんでした。

-      openid_logo_alt: OpenID でログイン
-      auth_providers:
-        openid:
-          title: OpenID でログイン
-          alt: OpenID URLでログイン
-        google:
-          title: Googleでログイン
-          alt: Google OpenIDでログイン
-        facebook:
-          title: Facebookでログイン
-          alt: Facebook アカウントを使用してログイン
-        microsoft:
-          title: Microsoftでログイン
-          alt: Microsoftアカウントでログイン
-        github:
-          title: GitHubでログイン
-          alt: GitHubのアカウントでログイン
-        wikipedia:
-          title: ウィキペディアでログイン
-          alt: ウィキペディアのアカウントでログイン
-        wordpress:
-          title: Wordpressでログイン
-          alt: Wordpress OpenIDでログイン
-        aol:
-          title: AOLでログイン
-          alt: AOL OpenIDでログイン

     destroy:
       title: ログアウト
       heading: OpenStreetMap からログアウト
     destroy:
       title: ログアウト
       heading: OpenStreetMap からログアウト


@@ -1894,6 +1866,7 @@ ja:
         contributors_fr_france: フランス
         contributors_nl_netherlands: オランダ
         contributors_nz_new_zealand: ニュージーランド
         contributors_fr_france: フランス
         contributors_nl_netherlands: オランダ
         contributors_nz_new_zealand: ニュージーランド

+        contributors_nz_cc_by: CC BY 4.0

         contributors_rs_serbia: セルビア
         contributors_si_slovenia: スロベニア
         contributors_es_spain: スペイン
         contributors_rs_serbia: セルビア
         contributors_si_slovenia: スロベニア
         contributors_es_spain: スペイン


@@ -2019,12 +1992,17 @@ ja:
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄
           footway: 歩道
           rail: 鉄道
           subway: 地下鉄

+          bus: バス

           cable_car: 交走式ロープウェイ
           chair_lift: チェアリフト
           runway: 空港滑走路
           taxiway: 空港誘導路
           apron: 空港ビル
           admin: 行政境界
           cable_car: 交走式ロープウェイ
           chair_lift: チェアリフト
           runway: 空港滑走路
           taxiway: 空港誘導路
           apron: 空港ビル
           admin: 行政境界

+          capital: 首都
+          city: 都市
+          orchard: 果樹園
+          vineyard: ブドウ園

           forest: 森
           wood: 森林
           golf: ゴルフ場
           forest: 森
           wood: 森林
           golf: ゴルフ場


@@ -2043,10 +2021,12 @@ ja:
           allotments: 家庭菜園
           pitch: 運動場
           centre: スポーツセンター
           allotments: 家庭菜園
           pitch: 運動場
           centre: スポーツセンター

+          beach: 砂浜

           reserve: 自然保護区
           military: 軍用地域
           school: 学校
           university: 大学
           reserve: 自然保護区
           military: 軍用地域
           school: 学校
           university: 大学

+          hospital: 病院

           building: 重要建造物
           station: 鉄道駅
           summit: 山脈
           building: 重要建造物
           station: 鉄道駅
           summit: 山脈


@@ -2056,6 +2036,7 @@ ja:
           private: 私的通行
           destination: 目的通行
           construction: 建設中の道路
           private: 私的通行
           destination: 目的通行
           construction: 建設中の道路

+          bus_stop: バス停

           bicycle_shop: 自転車販売店
           bicycle_parking: 駐輪場
           toilets: トイレ
           bicycle_shop: 自転車販売店
           bicycle_parking: 駐輪場
           toilets: トイレ


@@ -2213,6 +2194,32 @@ ja:
       oauth2_applications: OAuth 2 アプリケーション
       oauth2_authorizations: OAuth 2 認証
       muted_users: ミュートした利用者
       oauth2_applications: OAuth 2 アプリケーション
       oauth2_authorizations: OAuth 2 認証
       muted_users: ミュートした利用者

+    auth_providers:
+      openid_logo_alt: OpenID でログイン
+      openid:
+        title: OpenID でログイン
+        alt: OpenID URLでログイン
+      google:
+        title: Googleでログイン
+        alt: Google OpenIDでログイン
+      facebook:
+        title: Facebookでログイン
+        alt: Facebook アカウントを使用してログイン
+      microsoft:
+        title: Microsoftでログイン
+        alt: Microsoftアカウントでログイン
+      github:
+        title: GitHubでログイン
+        alt: GitHubのアカウントでログイン
+      wikipedia:
+        title: ウィキペディアでログイン
+        alt: ウィキペディアのアカウントでログイン
+      wordpress:
+        title: Wordpressでログイン
+        alt: Wordpress OpenIDでログイン
+      aol:
+        title: AOLでログイン
+        alt: AOL OpenIDでログイン

   oauth:
     authorize:
       title: あなたのアカウントへのアクセスの認証
   oauth:
     authorize:
       title: あなたのアカウントへのアクセスの認証


@@ -2342,11 +2349,10 @@ ja:
         header: フリー、編集可能
       display name description: あなたの公開利用者名です。あとで個人設定で変更できます。
       external auth: 'サードパーティ認証:'
         header: フリー、編集可能
       display name description: あなたの公開利用者名です。あとで個人設定で変更できます。
       external auth: 'サードパーティ認証:'

-      use external auth: サードパーティのアカウントでもログインできます
-      auth no password: サードパーティ認証があるとパスワードは不要ですが、それでもその他のツールやサーバーが必要な場合があります。

       continue: 利用者登録
       terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます!
       privacy_policy: プライバシー・ポリシー
       continue: 利用者登録
       terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます!
       privacy_policy: プライバシー・ポリシー

+      use external auth: サードパーティのアカウントでもログインできます

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


@@ -2664,6 +2670,7 @@ ja:
         gps: 公開GPSトラッキング
         overlays: トラブルシューティング用の地図オーバーレイ
         title: レイヤー
         gps: 公開GPSトラッキング
         overlays: トラブルシューティング用の地図オーバーレイ
         title: レイヤー

+      openstreetmap_contributors: OpenStreetMapの貢献者

       make_a_donation: 寄付をする
     site:
       edit_tooltip: 地図を編集
       make_a_donation: 寄付をする
     site:
       edit_tooltip: 地図を編集


@@ -2697,6 +2704,8 @@ ja:
       descend: 下り坂
       directions: 方向
       distance: 距離
       descend: 下り坂
       directions: 方向
       distance: 距離

+      distance_m: '%{distance}m'
+      distance_km: '%{distance}km'

       errors:
         no_route: ２点間のルートが見つかりません。
         no_place: 残念ながら、場所「%{place}」は見つかりませんでした。
       errors:
         no_route: ２点間のルートが見つかりません。
         no_place: 残念ながら、場所「%{place}」は見つかりませんでした。

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 5de173aa9d679f3ce54e65d52cd4611f961935c7..2e9f02aa47411a0eb2728a47a85f7449aff6c1a8 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -870,15 +870,13 @@ ka:
   sessions:
     new:
       title: შესვლა
   sessions:
     new:
       title: შესვლა

-      heading: შესვლა
+      tab_title: შესვლა

       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'
       remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა
       register now: დარეგისტრირდით ახლავე
       email or username: 'ელ. ფოსტის მისამართი, ან მომხმარებლის სახელი:'
       password: 'პაროლი:'
       remember: დამიმახსოვრე
       lost password link: დაგავიწყდათ პაროლი?
       login_button: შესვლა
       register now: დარეგისტრირდით ახლავე

-      no account: არ გაქვთ ანგარიში?
-      openid_logo_alt: შესვლა OpenID-ის საშუალებით

     destroy:
       title: გასვლა
       heading: OpenStreetMap-დან გასვლა
     destroy:
       title: გასვლა
       heading: OpenStreetMap-დან გასვლა


@@ -978,6 +976,9 @@ ka:
       identifiable: იდენტიფიცირებადი
       private: პირადი
       trackable: კონტროლირებადი
       identifiable: იდენტიფიცირებადი
       private: პირადი
       trackable: კონტროლირებადი

+  application:
+    auth_providers:
+      openid_logo_alt: შესვლა OpenID-ის საშუალებით

   oauth:
     authorize:
       allow_write_api: რუკის შეცვლა.
   oauth:
     authorize:
       allow_write_api: რუკის შეცვლა.

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 22963af6a58d89c8c9a4e0610083b02967ad8fdf..dc9724bc666f211dd8e02f837a2cd9249f91236f 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -142,7 +142,6 @@ kab:
         auth_provider: Asaǧǧaw n usesteb
         auth_uid: UID n usesteb
         email: Imayl
         auth_provider: Asaǧǧaw n usesteb
         auth_uid: UID n usesteb
         email: Imayl

-        email_confirmation: Asentem n yimayl

         new_email: Tansa n yimayl tamaynut
         active: Urmid
         display_name: Mefffer isem
         new_email: Tansa n yimayl tamaynut
         active: Urmid
         display_name: Mefffer isem


@@ -964,40 +963,13 @@ kab:
   sessions:
     new:
       title: Qqen
   sessions:
     new:
       title: Qqen

-      heading: Qqen
+      tab_title: Qqen

       email or username: 'Tansa imayl neɣ isem n useqdac:'
       password: 'Awal uffir:'
       remember: Cfu fell-i
       lost password link: Tweddreḍ awal-ik uffir?
       login_button: Qqen
       register now: Jerred tura
       email or username: 'Tansa imayl neɣ isem n useqdac:'
       password: 'Awal uffir:'
       remember: Cfu fell-i
       lost password link: Tweddreḍ awal-ik uffir?
       login_button: Qqen
       register now: Jerred tura

-      no account: Ur tesɛiḍ ara amiḍan?
-      openid_logo_alt: Qqen s OpenID
-      auth_providers:
-        openid:
-          title: Qqen s OpenID
-          alt: Qqen s tensa URL OpenID
-        google:
-          title: Qqen s Google
-          alt: Qqen s Google OpenID
-        facebook:
-          title: Qqen s Facebook
-          alt: Qqen s umidan Facebook
-        microsoft:
-          title: Qqen s Windows Live
-          alt: Qqen s umiḍan Windows Live
-        github:
-          title: Qqen s GitHub
-          alt: Qqen s umiḍan GitHub
-        wikipedia:
-          title: Qqen s Wikipedia
-          alt: qqes s umiḍan Wikipedia
-        wordpress:
-          title: Qqen s Wordpress
-          alt: Qqen s OpenID
-        aol:
-          title: Qqen s AOL
-          alt: Qqen s AOL OpenID

     destroy:
       title: Tuffɣa
       heading: Tuffɣa si OpenStreetMap
     destroy:
       title: Tuffɣa
       heading: Tuffɣa si OpenStreetMap


@@ -1171,6 +1143,32 @@ kab:
       blocked_zero_hour: Ɣur-k izen utrib ɣef usmel Web OpenStreetMap. Yessef ad t-ɣreḍ-t
         send ad tizmireḍ ad teskelseḍ asnifel-ik.
       blocked: Anekcum-ik API yewḥel. Qqen ar ugrudem Web i ugar n isallen.
       blocked_zero_hour: Ɣur-k izen utrib ɣef usmel Web OpenStreetMap. Yessef ad t-ɣreḍ-t
         send ad tizmireḍ ad teskelseḍ asnifel-ik.
       blocked: Anekcum-ik API yewḥel. Qqen ar ugrudem Web i ugar n isallen.

+    auth_providers:
+      openid_logo_alt: Qqen s OpenID
+      openid:
+        title: Qqen s OpenID
+        alt: Qqen s tensa URL OpenID
+      google:
+        title: Qqen s Google
+        alt: Qqen s Google OpenID
+      facebook:
+        title: Qqen s Facebook
+        alt: Qqen s umidan Facebook
+      microsoft:
+        title: Qqen s Windows Live
+        alt: Qqen s umiḍan Windows Live
+      github:
+        title: Qqen s GitHub
+        alt: Qqen s umiḍan GitHub
+      wikipedia:
+        title: Qqen s Wikipedia
+        alt: qqes s umiḍan Wikipedia
+      wordpress:
+        title: Qqen s Wordpress
+        alt: Qqen s OpenID
+      aol:
+        title: Qqen s AOL
+        alt: Qqen s AOL OpenID

   oauth:
     authorize:
       title: Sireg anekcum ar umiḍan-ik
   oauth:
     authorize:
       title: Sireg anekcum ar umiḍan-ik

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index cff82e6e9b90c76139834befb8e57dfb1c3e405c..fe4518973d73dedf0054bab19e0a5b0637854ee0 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -133,7 +133,6 @@ kk-cyrl:
         auth_provider: Аутентификация провайдері
         auth_uid: Аутентификация UID
         email: Е-пошта
         auth_provider: Аутентификация провайдері
         auth_uid: Аутентификация UID
         email: Е-пошта

-        email_confirmation: E-mail растау

         new_email: Жаңа е-пошта мекенжайы
         active: Белсенді
         display_name: Көрсетілетін ат
         new_email: Жаңа е-пошта мекенжайы
         active: Белсенді
         display_name: Көрсетілетін ат


@@ -1021,28 +1020,10 @@ kk-cyrl:
   sessions:
     new:
       title: Кіру
   sessions:
     new:
       title: Кіру

-      heading: Кіру
+      tab_title: Кіру

       password: Құпиясөз
       remember: Жүйеде қалу
       login_button: Кіру
       password: Құпиясөз
       remember: Жүйеде қалу
       login_button: Кіру

-      no account: Тіркелгіңіз жоқ па?
-      auth_providers:
-        openid:
-          title: OpenID арқылы кіру
-        google:
-          title: Google арқылы кіру
-        facebook:
-          title: Facebook арқылы кіру
-        microsoft:
-          title: Microsoft арқылы кіру
-        github:
-          title: GitHub арқылы кіру
-        wikipedia:
-          title: Уикипедия арқылы кіру
-        wordpress:
-          title: Wordpress арқылы кіру
-        aol:
-          title: AOL арқылы кіру

     destroy:
       title: Шығу
       heading: OpenStreetMap-тен шығу
     destroy:
       title: Шығу
       heading: OpenStreetMap-тен шығу


@@ -1188,6 +1169,23 @@ kk-cyrl:
     settings_menu:
       oauth1_settings: OAuth 1 баптаулары
       oauth2_applications: OAuth 2 қосымшалары
     settings_menu:
       oauth1_settings: OAuth 1 баптаулары
       oauth2_applications: OAuth 2 қосымшалары

+    auth_providers:
+      openid:
+        title: OpenID арқылы кіру
+      google:
+        title: Google арқылы кіру
+      facebook:
+        title: Facebook арқылы кіру
+      microsoft:
+        title: Microsoft арқылы кіру
+      github:
+        title: GitHub арқылы кіру
+      wikipedia:
+        title: Уикипедия арқылы кіру
+      wordpress:
+        title: Wordpress арқылы кіру
+      aol:
+        title: AOL арқылы кіру

   oauth_clients:
     show:
       confirm: Сенімдісіз бе?
   oauth_clients:
     show:
       confirm: Сенімдісіз бе?

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 77e530ce15a1d35a466d3a33ea4aaad71ce75946..4f7918a50f7e5c9d300c75f7f7212354b7415705 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -660,26 +660,9 @@ km:
   sessions:
     new:
       title: កត់ឈ្មោះចូល
   sessions:
     new:
       title: កត់ឈ្មោះចូល

-      heading: កត់ឈ្មោះចូល
+      tab_title: កត់ឈ្មោះចូល

       email or username: អាសយដ្ឋានអ៊ីមែល ឬឈ្មោះអ្នកប្រើប្រាស់​៖
       login_button: កត់ឈ្មោះចូល
       email or username: អាសយដ្ឋានអ៊ីមែល ឬឈ្មោះអ្នកប្រើប្រាស់​៖
       login_button: កត់ឈ្មោះចូល

-      auth_providers:
-        openid:
-          title: កត់ឈ្មោះចូលដោយប្រើ OpenID
-        google:
-          title: កត់ឈ្មោះចូលដោយប្រើ Google
-        facebook:
-          title: កត់ឈ្មោះចូលដោយប្រើ Facebook
-        microsoft:
-          title: កត់ឈ្មោះចូលដោយប្រើ Windows Live
-        github:
-          title: កត់ឈ្មោះចូលដោយប្រើ GitHub
-        wikipedia:
-          title: កត់ឈ្មោះចូលដោយប្រើវិគីភីឌា
-        wordpress:
-          title: កត់ឈ្មោះចូលដោយប្រើ Wordpress
-        aol:
-          title: កត់ឈ្មោះចូលដោយប្រើ AOL

     destroy:
       title: កត់ឈ្មោះចេញ
       logout_button: កត់ឈ្មោះចេញ
     destroy:
       title: កត់ឈ្មោះចេញ
       logout_button: កត់ឈ្មោះចេញ


@@ -746,6 +729,24 @@ km:
       private: ឯកជន​
     index:
       tagged_with: '  បានដាកស្លាកជា %{tags}'
       private: ឯកជន​
     index:
       tagged_with: '  បានដាកស្លាកជា %{tags}'

+  application:
+    auth_providers:
+      openid:
+        title: កត់ឈ្មោះចូលដោយប្រើ OpenID
+      google:
+        title: កត់ឈ្មោះចូលដោយប្រើ Google
+      facebook:
+        title: កត់ឈ្មោះចូលដោយប្រើ Facebook
+      microsoft:
+        title: កត់ឈ្មោះចូលដោយប្រើ Windows Live
+      github:
+        title: កត់ឈ្មោះចូលដោយប្រើ GitHub
+      wikipedia:
+        title: កត់ឈ្មោះចូលដោយប្រើវិគីភីឌា
+      wordpress:
+        title: កត់ឈ្មោះចូលដោយប្រើ Wordpress
+      aol:
+        title: កត់ឈ្មោះចូលដោយប្រើ AOL

   oauth_clients:
     edit:
       title: កែប្រែ​ទំរង់បែបបទរបស់អ្នក​
   oauth_clients:
     edit:
       title: កែប្រែ​ទំរង់បែបបទរបស់អ្នក​


@@ -754,8 +755,8 @@ km:
   users:
     new:
       title: ចុះឈ្មោះ​ចូល
   users:
     new:
       title: ចុះឈ្មោះ​ចូល

-      use external auth: ប្រើភ្នាក់ងារទី៣ដើម្បីកត់ឈ្មោះចូល

       continue: ចុះឈ្មោះចូល
       continue: ចុះឈ្មោះចូល

+      use external auth: ប្រើភ្នាក់ងារទី៣ដើម្បីកត់ឈ្មោះចូល

     terms:
       decline: បដិសេធ
       legale_select: ប្រទេស​ស្នាក់​នៅ៖
     terms:
       decline: បដិសេធ
       legale_select: ប្រទេស​ស្នាក់​នៅ៖

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 061519ece75744338ad659a485edaae598e55aa5..584c3e5ce1fd1324ebcee9a6d1feca64698ccdbe 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -113,7 +113,6 @@ kn:
         description: ವಿವರಣೆ
       user:
         email: ಇ-ಅಂಚೆ
         description: ವಿವರಣೆ
       user:
         email: ಇ-ಅಂಚೆ

-        email_confirmation: ಮಿಂಚಂಚೆ ದೃಢೀಕರಣ

         new_email: ಹೊಸ ಇ-ಅಂಚೆ ವಿಳಾಸ
         active: ಸಕ್ರಿಯ
         display_name: ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸು
         new_email: ಹೊಸ ಇ-ಅಂಚೆ ವಿಳಾಸ
         active: ಸಕ್ರಿಯ
         display_name: ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸು


@@ -762,23 +761,9 @@ kn:
   sessions:
     new:
       title: ಲಾಗ್ ಇನ್
   sessions:
     new:
       title: ಲಾಗ್ ಇನ್

-      heading: ಲಾಗಿನ್
+      tab_title: ಲಾಗಿನ್

       password: 'ಪ್ರವೇಶಪದ:'
       login_button: ಲಾಗಿನ್
       password: 'ಪ್ರವೇಶಪದ:'
       login_button: ಲಾಗಿನ್

-      auth_providers:
-        google:
-          title: ಗೂಗಲ್ ಮೂಲಕ ಲಾಗಿನ್ ಆಗಿರಿ
-          alt: ಗೂಗಲ್ ಓಪನ್ ಐಡಿಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
-        facebook:
-          title: ಫೇಸ್ಬುಕ್ ಮೂಲಕ ಲಾಗಿನ್ ಆಗಿರಿ
-          alt: ಫೇಸ್ಬುಕ್ ಖಾತೆಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
-        microsoft:
-          alt: ಮೈಕ್ರೋಸಾಫ್ಟ್ ಖಾತೆಯೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ
-        github:
-          alt: ಗಿಟ್ಹಬ್ ಖಾತೆಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
-        wikipedia:
-          title: ವಿಕಿಪೀಡಿಯದೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ
-          alt: ವಿಕಿಪೀಡಿಯ ಖಾತೆಯೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ

     destroy:
       title: ಲಾಗ್ ಔಟ್
       logout_button: ಲಾಗ್ ಔಟ್
     destroy:
       title: ಲಾಗ್ ಔಟ್
       logout_button: ಲಾಗ್ ಔಟ್


@@ -879,6 +864,21 @@ kn:
   traces:
     new:
       help: ಸಹಾಯ
   traces:
     new:
       help: ಸಹಾಯ

+  application:
+    auth_providers:
+      google:
+        title: ಗೂಗಲ್ ಮೂಲಕ ಲಾಗಿನ್ ಆಗಿರಿ
+        alt: ಗೂಗಲ್ ಓಪನ್ ಐಡಿಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
+      facebook:
+        title: ಫೇಸ್ಬುಕ್ ಮೂಲಕ ಲಾಗಿನ್ ಆಗಿರಿ
+        alt: ಫೇಸ್ಬುಕ್ ಖಾತೆಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
+      microsoft:
+        alt: ಮೈಕ್ರೋಸಾಫ್ಟ್ ಖಾತೆಯೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ
+      github:
+        alt: ಗಿಟ್ಹಬ್ ಖಾತೆಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ
+      wikipedia:
+        title: ವಿಕಿಪೀಡಿಯದೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ
+        alt: ವಿಕಿಪೀಡಿಯ ಖಾತೆಯೊಂದಿಗೆ ಪ್ರವೇಶಿಸಿ

   oauth_clients:
     show:
       edit: ವಿವರಗಳನ್ನು ಸಂಪಾದಿಸಿ
   oauth_clients:
     show:
       edit: ವಿವರಗಳನ್ನು ಸಂಪಾದಿಸಿ

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index f1a3292f74c01c3591c5ee2b6123f003b555d155..03188391bb4f3142595e4bc82c752e5c6e9c1865 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -178,7 +178,6 @@ ko:
         auth_provider: 인증 제공자
         auth_uid: 인증 UID
         email: 이메일
         auth_provider: 인증 제공자
         auth_uid: 인증 UID
         email: 이메일

-        email_confirmation: 이메일 인증

         new_email: 새 이메일 주소
         active: 활성
         display_name: 표시되는 이름
         new_email: 새 이메일 주소
         active: 활성
         display_name: 표시되는 이름


@@ -327,6 +326,7 @@ ko:
     deleted_ago_by_html: '%{time_ago}에 %{user}님이 삭제함'
     edited_ago_by_html: '%{time_ago}에 %{user}님이 편집함'
     version: 버전
     deleted_ago_by_html: '%{time_ago}에 %{user}님이 삭제함'
     edited_ago_by_html: '%{time_ago}에 %{user}님이 편집함'
     version: 버전

+    redacted_version: 수정된 버전

     in_changeset: 바뀜집합
     anonymous: 익명
     no_comment: (댓글 없음)
     in_changeset: 바뀜집합
     anonymous: 익명
     no_comment: (댓글 없음)


@@ -337,7 +337,10 @@ ko:
       other: 길 %{count}건
     download_xml: XML 다운로드
     view_history: 역사 보기
       other: 길 %{count}건
     download_xml: XML 다운로드
     view_history: 역사 보기

+    view_unredacted_history: 수정되지 않은 기록 보기

     view_details: 자세한 내용 보기
     view_details: 자세한 내용 보기

+    view_redacted_data: 수정된 데이터 보기
+    view_redaction_message: 수정 메시지 보기

     location: '위치:'
     node:
       title_html: '교점: %{name}'
     location: '위치:'
     node:
       title_html: '교점: %{name}'


@@ -447,9 +450,21 @@ ko:
         created: 만들어짐
         closed: 닫힘
         belongs_to: 저자
         created: 만들어짐
         closed: 닫힘
         belongs_to: 저자

+    subscribe:
+      heading: 다음 바뀜집합 토론을 구독하시겠습니까?
+      button: 토론 구독
+    unsubscribe:
+      heading: 다음 바뀜집합 토론의 구독을 취소하시겠습니까?
+      button: 토론 구독 취소
+    heading:
+      title: 바뀜집합 %{id}
+      created_by_html: '%{created}에 의해 %{link_user}이(가) 생성되었습니다.'
+    no_such_entry:
+      title: 해당 바뀜집합이 없습니다.

     show:
       title: '바뀜집합: %{id}'
       created: '생성 시기: %{when}'
     show:
       title: '바뀜집합: %{id}'
       created: '생성 시기: %{when}'

+      closed: '닫힘: %{when}'

       created_ago_html: '%{time_ago}에 생성됨'
       closed_ago_html: '%{time_ago}에 닫힘'
       created_ago_by_html: '%{time_ago}에 %{user}님이 생성함'
       created_ago_html: '%{time_ago}에 생성됨'
       closed_ago_html: '%{time_ago}에 닫힘'
       created_ago_by_html: '%{time_ago}에 %{user}님이 생성함'


@@ -527,6 +542,7 @@ ko:
     show:
       title: '%{user}의 일기 | %{title}'
       user_title: '%{user}의 일기'
     show:
       title: '%{user}의 일기 | %{title}'
       user_title: '%{user}의 일기'

+      discussion: 토론

       leave_a_comment: 의견 남기기
       login_to_leave_a_comment_html: 덧글을 남기려면 %{login_link}해야 합니다.
       login: 로그인
       leave_a_comment: 의견 남기기
       login_to_leave_a_comment_html: 덧글을 남기려면 %{login_link}해야 합니다.
       login: 로그인


@@ -578,7 +594,10 @@ ko:
       newer_comments: 새 의견
       older_comments: 이전 의견
     subscribe:
       newer_comments: 새 의견
       older_comments: 이전 의견
     subscribe:

+      heading: 다음 일기 항목 토론에 구독하시겠습니까?

       button: 토론 구독
       button: 토론 구독

+    unsubscribe:
+      button: 토론 구독 취소

   doorkeeper:
     flash:
       applications:
   doorkeeper:
     flash:
       applications:


@@ -759,6 +778,7 @@ ko:
           waste_disposal: 폐기물 처리장
           watering_place: 급수지
           water_point: 급수장
           waste_disposal: 폐기물 처리장
           watering_place: 급수지
           water_point: 급수장

+          weighbridge: 차량계근대

           "yes": 시설
         boundary:
           aboriginal_lands: 원주민 영역
           "yes": 시설
         boundary:
           aboriginal_lands: 원주민 영역


@@ -1619,8 +1639,8 @@ ko:
         partial_changeset_without_comment: 의견 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.
       details_html: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.
         partial_changeset_without_comment: 의견 없이
       details: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.
       details_html: 바뀜집합에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다.

-      unsubscribe: 이 바뀜집합의 업데이트를 받지 않으려면 %{url} 에 방문하여 "구ë\8f\85 í\95´ì§\80"를 í\81´ë¦­í\95\98ì\8b­ì\8b\9cì\98¤.
-      unsubscribe_html: ì\9d´ ë°\94ë\80\9cì§\91í\95©ì\9d\98 ì\97\85ë\8d°ì\9d´í\8a¸ë¥¼ ë°\9bì§\80 ì\95\8aì\9c¼ë ¤ë©´ %{url} ì\97\90 방문í\95\98ì\97¬ '구ë\8f\85 í\95´ì§\80'를 í\81´ë¦­í\95\98ì\84¸ì\9a\94.
+      unsubscribe: 이 바뀜집합의 업데이트를 받지 않으려면 %{url} 에 방문하여 '구ë\8f\85 í\95´ì§\80'를 í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤.
+      unsubscribe_html: ì\9d´ ë°\94ë\80\9cì§\91í\95©ì\9d\98 ì\97\85ë\8d°ì\9d´í\8a¸ë¥¼ ë°\9bì§\80 ì\95\8aì\9c¼ë ¤ë©´ %{url} ì\97\90 방문í\95\98ì\97¬ '구ë\8f\85 í\95´ì§\80'를 í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤.

   confirmations:
     confirm:
       heading: 이메일을 확인하세요!
   confirmations:
     confirm:
       heading: 이메일을 확인하세요!


@@ -1714,7 +1734,7 @@ ko:
     new:
       title: 잊어버린 비밀번호
       heading: 비밀번호를 잊으셨나요?
     new:
       title: 잊어버린 비밀번호
       heading: 비밀번호를 잊으셨나요?

-      email address: '이메일 주소:'
+      email address: 이메일 주소

       new password button: 비밀번호 재설정
       help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
     edit:
       new password button: 비밀번호 재설정
       help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다.
     edit:


@@ -1724,6 +1744,7 @@ ko:
       flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
     update:
       flash changed: 비밀번호가 바뀌었습니다.
       flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?
     update:
       flash changed: 비밀번호가 바뀌었습니다.

+      flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까?

   preferences:
     show:
       title: 내 환경 설정
   preferences:
     show:
       title: 내 환경 설정


@@ -1766,42 +1787,15 @@ ko:
   sessions:
     new:
       title: 로그인
   sessions:
     new:
       title: 로그인

-      heading: 로그인
-      email or username: '이메일 주소 또는 사용자 이름:'
-      password: '비밀번호:'
+      tab_title: 로그인
+      email or username: 이메일 주소 또는 사용자 이름
+      password: 비밀번호

       remember: 로그인 상태를 기억하기
       lost password link: 비밀번호를 잊으셨나요?
       login_button: 로그인
       register now: 지금 등록하세요
       with external: '다른 제3자 로그인 방식 사용하기:'
       remember: 로그인 상태를 기억하기
       lost password link: 비밀번호를 잊으셨나요?
       login_button: 로그인
       register now: 지금 등록하세요
       with external: '다른 제3자 로그인 방식 사용하기:'

-      no account: 계정이 없나요?

       auth failure: 죄송합니다, 입력한 정보로 로그인할 수 없습니다.
       auth failure: 죄송합니다, 입력한 정보로 로그인할 수 없습니다.

-      openid_logo_alt: OpenID로 로그인
-      auth_providers:
-        openid:
-          title: OpenID로 로그인하기
-          alt: OpenID URL로 로그인
-        google:
-          title: 구글로 로그인하기
-          alt: Google OpenID로 로그인하기
-        facebook:
-          title: 페이스북으로 로그인
-          alt: 페이스북 계정으로 로그인하기
-        microsoft:
-          title: 마이크로소프트로 로그인하기
-          alt: 마이크로소프트 계정으로 로그인하기
-        github:
-          title: GitHub로 로그인
-          alt: GitHub 계정으로 로그인
-        wikipedia:
-          title: 위키백과로 로그인하기
-          alt: 위키백과 계정으로 로그인
-        wordpress:
-          title: 워드프레스로 로그인하기
-          alt: Wordpress OpenID로 로그인하기
-        aol:
-          title: AOL로 로그인하기
-          alt: AOL OpenID로 로그인하기

     destroy:
       title: 로그아웃
       heading: 오픈스트리트맵에서 로그아웃
     destroy:
       title: 로그아웃
       heading: 오픈스트리트맵에서 로그아웃


@@ -1945,6 +1939,7 @@ ko:
           데이터를 포함합니다.
         contributors_fr_france: 프랑스
         contributors_hr_croatia: 크로아티아
           데이터를 포함합니다.
         contributors_fr_france: 프랑스
         contributors_hr_croatia: 크로아티아

+        contributors_hr_open_data_portal: 국가 공개 데이터 포털

         contributors_nl_credit_html: '%{netherlands}: 2007년 © AND 데이터 (%{and_link})를
           포함합니다.'
         contributors_nl_netherlands: 네덜란드
         contributors_nl_credit_html: '%{netherlands}: 2007년 © AND 데이터 (%{and_link})를
           포함합니다.'
         contributors_nl_netherlands: 네덜란드


@@ -2073,8 +2068,8 @@ ko:
         title: 초보자 길라잡이
         description: 커뮤니티에서 관리하는 초보자 길라잡이
       community:
         title: 초보자 길라잡이
         description: 커뮤니티에서 관리하는 초보자 길라잡이
       community:

-        title: 공동체 포럼
-        description: ì\98¤í\94\88ì\8a¤í\8a¸ë¦¬í\8a¸ë§µê³¼ ê´\80ë ¨í\95\9c ë\8c\80í\99\94를 ë\82\98ë\88\84는 장소입니다.
+        title: 도움말 및 커뮤니티 포럼
+        description: ì\98¤í\94\88ì\8a¤í\8a¸ë¦¬í\8a¸ë§µê³¼ ê´\80ë ¨í\95´ì\84\9c ë\8f\84ì\9b\80ì\9d\84 구í\95\98ê³  ë\8c\80í\99\94를 ë\82\98ë\88\8c ì\88\98 ì\9e\88는 장소입니다.

       mailing_lists:
         title: 메일링 리스트
         description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.
       mailing_lists:
         title: 메일링 리스트
         description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다.


@@ -2150,10 +2145,14 @@ ko:
           apron: 공항 계류장
           admin: 행정 구역 경계
           capital: 수도
           apron: 공항 계류장
           admin: 행정 구역 경계
           capital: 수도

+          city: 도시
+          orchard: 과수원

           vineyard: 포도밭
           forest: 숲
           wood: 산림
           vineyard: 포도밭
           forest: 숲
           wood: 산림

+          farmland: 농지

           grass: 잔디
           grass: 잔디

+          meadow: 목초지

           bare_rock: 노출 암반
           sand: 모래
           golf: 골프장
           bare_rock: 노출 암반
           sand: 모래
           golf: 골프장


@@ -2190,6 +2189,7 @@ ko:
           destination: 목적 통행
           construction: 공사 중인 도로
           bus_stop: 버스 정류장
           destination: 목적 통행
           construction: 공사 중인 도로
           bus_stop: 버스 정류장

+          stop: 중지

           bicycle_shop: 자전거 가게
           bicycle_rental: 자전거 대여
           bicycle_parking: 자전거 주차장
           bicycle_shop: 자전거 가게
           bicycle_rental: 자전거 대여
           bicycle_parking: 자전거 주차장


@@ -2368,6 +2368,32 @@ ko:
       oauth1_settings: OAuth 1 설정
       oauth2_applications: OAuth 2 애플리케이션
       oauth2_authorizations: OAuth 2 인가
       oauth1_settings: OAuth 1 설정
       oauth2_applications: OAuth 2 애플리케이션
       oauth2_authorizations: OAuth 2 인가

+    auth_providers:
+      openid_logo_alt: OpenID로 로그인
+      openid:
+        title: OpenID로 로그인하기
+        alt: OpenID URL로 로그인
+      google:
+        title: 구글로 로그인하기
+        alt: Google OpenID로 로그인하기
+      facebook:
+        title: 페이스북으로 로그인
+        alt: 페이스북 계정으로 로그인하기
+      microsoft:
+        title: 마이크로소프트로 로그인하기
+        alt: 마이크로소프트 계정으로 로그인하기
+      github:
+        title: GitHub로 로그인
+        alt: GitHub 계정으로 로그인
+      wikipedia:
+        title: 위키백과로 로그인하기
+        alt: 위키백과 계정으로 로그인
+      wordpress:
+        title: 워드프레스로 로그인하기
+        alt: Wordpress OpenID로 로그인하기
+      aol:
+        title: AOL로 로그인하기
+        alt: AOL OpenID로 로그인하기

   oauth:
     authorize:
       title: 내 계정에 접근 인증
   oauth:
     authorize:
       title: 내 계정에 접근 인증


@@ -2485,6 +2511,7 @@ ko:
       title: 내 인증한 애플리케이션
       application: 애플리케이션
       permissions: 권한
       title: 내 인증한 애플리케이션
       application: 애플리케이션
       permissions: 권한

+      last_authorized: 마지막 승인

       no_applications_html: 아직 %{oauth2} 애플리케이션을 승인하지 않았습니다.
     application:
       revoke: 접근 취소
       no_applications_html: 아직 %{oauth2} 애플리케이션을 승인하지 않았습니다.
     application:
       revoke: 접근 취소


@@ -2503,14 +2530,12 @@ ko:
         paragraph_2: 기여를 시작하려면 가입하세요. 당신의 계정 확인을 위해 이메일을 보내드리겠습니다.
       display name description: 공개적으로 표시되는 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
       external auth: '제3자 인증:'
         paragraph_2: 기여를 시작하려면 가입하세요. 당신의 계정 확인을 위해 이메일을 보내드리겠습니다.
       display name description: 공개적으로 표시되는 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다.
       external auth: '제3자 인증:'

-      use external auth: 다른 제3자 로그인 방식 사용하기
-      auth no password: 제3자 인증은 비밀번호가 필요하지 않지만, 일부 추가 도구나 서버는 여전히 필요할 수 있습니다.

       continue: 가입하기
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
       continue: 가입하기
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!

-      email_confirmation_help_html: 당신의 주소는 공개적으로 노출되지 않습니다. 자세한 내용은 %{privacy_policy_link}를
-        참조하세요.
+      email_help_html: 당신의 주소는 공개적으로 노출되지 않습니다. 자세한 내용은 %{privacy_policy_link}를 참조하세요.

       privacy_policy: 개인정보처리방침
       privacy_policy_title: 이메일 주소 섹션을 포함한 OSMF 개인 정보 보호 정책
       privacy_policy: 개인정보처리방침
       privacy_policy_title: 이메일 주소 섹션을 포함한 OSMF 개인 정보 보호 정책

+      use external auth: 다른 제3자 로그인 방식 사용하기

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


@@ -2591,6 +2616,7 @@ ko:
           importer: 임포터 접근 권한 취소
       block_history: 활성화된 차단
       moderator_history: 실행된 차단
           importer: 임포터 접근 권한 취소
       block_history: 활성화된 차단
       moderator_history: 실행된 차단

+      revoke_all_blocks: 모든 블록 취소

       comments: 의견
       create_block: 이 사용자를 차단
       activate_user: 이 사용자 활성화
       comments: 의견
       create_block: 이 사용자를 차단
       activate_user: 이 사용자 활성화


@@ -2687,6 +2713,8 @@ ko:
       confirm: 이 차단을 해제하겠습니까?
       revoke: 해제!
       flash: 이 차단을 해제했습니다.
       confirm: 이 차단을 해제하겠습니까?
       revoke: 해제!
       flash: 이 차단을 해제했습니다.

+    revoke_all:
+      revoke: 해제!

     helper:
       time_future_html: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.
     helper:
       time_future_html: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 6a4251096414452910889ba3c76de6cc25c17b94..4989838edbbc53d1ec01ab385cfa718c192ffb8e 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -218,28 +218,11 @@ ksh:
   sessions:
     new:
       title: Enlogge
   sessions:
     new:
       title: Enlogge

-      heading: Enlogge
+      tab_title: Enlogge

       email or username: 'De Adräß för de e-mail udder der Metmaacher_Nahme:'
       password: 'Paßwoot:'
       lost password link: Paßwoot verschött jejange?
       login_button: Enlogge
       email or username: 'De Adräß för de e-mail udder der Metmaacher_Nahme:'
       password: 'Paßwoot:'
       lost password link: Paßwoot verschött jejange?
       login_button: Enlogge

-      auth_providers:
-        google:
-          title: Övver Google ennlogge
-          alt: Ennlogge medd ener OpenID vun Google
-        facebook:
-          title: Donn övver ene Zohjang op Facebook ennlogge
-          alt: Donn övver ene Zohjang op Facebook ennlogge
-        microsoft:
-          title: Donn medd enem Zohjang op Windows Live ennlogge
-          alt: Donn medd enem Zohjang op Windows Live ennlogge
-        github:
-          title: Övver GitHub ennlogge
-          alt: Donn övver ene Zohjang bei GitHub ennlogge
-        wordpress:
-          title: Övver Wordpress ennlogge
-        aol:
-          title: Övver AOL enlogge

   site:
     about:
       legal_title: Rääschlesch
   site:
     about:
       legal_title: Rääschlesch


@@ -349,6 +332,23 @@ ksh:
       cookies_needed: |-
         Et schingk, wi wann De cookies afjeschalldt häz.
         Bes esu jood un donn se en Dingem Brauser aanschallde, ih dat De wigger mähß.
       cookies_needed: |-
         Et schingk, wi wann De cookies afjeschalldt häz.
         Bes esu jood un donn se en Dingem Brauser aanschallde, ih dat De wigger mähß.

+    auth_providers:
+      google:
+        title: Övver Google ennlogge
+        alt: Ennlogge medd ener OpenID vun Google
+      facebook:
+        title: Donn övver ene Zohjang op Facebook ennlogge
+        alt: Donn övver ene Zohjang op Facebook ennlogge
+      microsoft:
+        title: Donn medd enem Zohjang op Windows Live ennlogge
+        alt: Donn medd enem Zohjang op Windows Live ennlogge
+      github:
+        title: Övver GitHub ennlogge
+        alt: Donn övver ene Zohjang bei GitHub ennlogge
+      wordpress:
+        title: Övver Wordpress ennlogge
+      aol:
+        title: Övver AOL enlogge

   oauth:
     authorize:
       allow_write_api: donn de Landkaat änndere
   oauth:
     authorize:
       allow_write_api: donn de Landkaat änndere

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index f32e21b0cbcaeaf17726f59f788ce30386104a97..c658a429a54f4bff77969ed36d06d0e8942f8e9c 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -143,7 +143,6 @@ ku-Latn:
         auth_provider: Pêşkêşkera teyîdkirina nasnameyê
         auth_uid: UIDa teyîdkirina nasnameyê
         email: E-name
         auth_provider: Pêşkêşkera teyîdkirina nasnameyê
         auth_uid: UIDa teyîdkirina nasnameyê
         email: E-name

-        email_confirmation: Piştrastkirina e-nameyê

         new_email: Navnîşana e-nameyê yê nû
         active: Çalak
         display_name: Nav nîşan bide
         new_email: Navnîşana e-nameyê yê nû
         active: Çalak
         display_name: Nav nîşan bide


@@ -1842,7 +1841,7 @@ ku-Latn:
   sessions:
     new:
       title: Têkeve
   sessions:
     new:
       title: Têkeve

-      heading: Têkeve
+      tab_title: Têkeve

       email or username: Adrêsa E-peyamê an jî Navê Bikarhêneriyêː
       password: 'Şîfre:'
       remember: Min bi bîr bîne
       email or username: Adrêsa E-peyamê an jî Navê Bikarhêneriyêː
       password: 'Şîfre:'
       remember: Min bi bîr bîne


@@ -1850,34 +1849,7 @@ ku-Latn:
       login_button: Têkeve
       register now: Vê gavê xwe qeyd bike
       with external: Wek alternatîv, ji bo têketinê yek ji van sepanan bi kar bîneː
       login_button: Têkeve
       register now: Vê gavê xwe qeyd bike
       with external: Wek alternatîv, ji bo têketinê yek ji van sepanan bi kar bîneː

-      no account: Hesabekî te tine?

       auth failure: Bibore, bi van dêtayan re tu têneketî.
       auth failure: Bibore, bi van dêtayan re tu têneketî.

-      openid_logo_alt: Têketina bi OpenID'yê
-      auth_providers:
-        openid:
-          title: Bi OpenID'yê têkeve
-          alt: Têketina bi URL'yek OpenID'yê
-        google:
-          title: Bi Google têkeve
-          alt: Têketina bi OpenID ya Googlê
-        facebook:
-          title: Bi Facebookê têkeve
-          alt: Bi hesabekî Facebookê têkeve
-        microsoft:
-          title: Bi Microsoftê têkeve
-          alt: Bi hesabê xwe yê Microsoftê têkeve
-        github:
-          title: Bi GitHub'ê têkeve
-          alt: Bi hesabekî GitHubê têbikeve
-        wikipedia:
-          title: Bi Wîkîpediyayê têkeve
-          alt: Bi hesabekî Wîkîpediyayê têkeve
-        wordpress:
-          title: Bi Wordpressê têkeve
-          alt: Bi OpenID ya Wordpressê têbikeve
-        aol:
-          title: Bi AOL'ê têkeve
-          alt: Bi OpenID ya AOLê têkeve

     destroy:
       title: Derkeve
       heading: Ji OpenStreetMapê derkeve
     destroy:
       title: Derkeve
       heading: Ji OpenStreetMapê derkeve


@@ -2281,6 +2253,32 @@ ku-Latn:
       oauth1_settings: Mîhengên OAuth 1
       oauth2_applications: Aplîkasyonên OAuth 2
       oauth2_authorizations: Destûrdarkirinên OAuth 2
       oauth1_settings: Mîhengên OAuth 1
       oauth2_applications: Aplîkasyonên OAuth 2
       oauth2_authorizations: Destûrdarkirinên OAuth 2

+    auth_providers:
+      openid_logo_alt: Têketina bi OpenID'yê
+      openid:
+        title: Bi OpenID'yê têkeve
+        alt: Têketina bi URL'yek OpenID'yê
+      google:
+        title: Bi Google têkeve
+        alt: Têketina bi OpenID ya Googlê
+      facebook:
+        title: Bi Facebookê têkeve
+        alt: Bi hesabekî Facebookê têkeve
+      microsoft:
+        title: Bi Microsoftê têkeve
+        alt: Bi hesabê xwe yê Microsoftê têkeve
+      github:
+        title: Bi GitHub'ê têkeve
+        alt: Bi hesabekî GitHubê têbikeve
+      wikipedia:
+        title: Bi Wîkîpediyayê têkeve
+        alt: Bi hesabekî Wîkîpediyayê têkeve
+      wordpress:
+        title: Bi Wordpressê têkeve
+        alt: Bi OpenID ya Wordpressê têbikeve
+      aol:
+        title: Bi AOL'ê têkeve
+        alt: Bi OpenID ya AOLê têkeve

   oauth:
     authorize:
       title: Ji bo gihîna hesabê xwe selahiyetê bide
   oauth:
     authorize:
       title: Ji bo gihîna hesabê xwe selahiyetê bide


@@ -2423,13 +2421,10 @@ ku-Latn:
       display name description: Navê te yê ku ji her kesê re tê xuyan. Tu paşê dikarî
         vê navê ji hevyazên xwe biguherînî.
       external auth: 'Teyîdkirina bi aliyên sêyem:'
       display name description: Navê te yê ku ji her kesê re tê xuyan. Tu paşê dikarî
         vê navê ji hevyazên xwe biguherînî.
       external auth: 'Teyîdkirina bi aliyên sêyem:'

-      use external auth: Wek alternatîv, ji bo têketinê yekî ji van bi kar bîne
-      auth no password: Eger tu bi aliyên sêyem teyîd bikî şîfre hewce nake, lê belê
-        ji bo hinek amûrên din an jî ji bo serverê dibe ku dîsa jî şîfreyek hewce
-        bike.

       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ǃ

+      use external auth: Wek alternatîv, ji bo têketinê yekî ji van bi kar bîne

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

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 2d0f3ecc46d03e512cc73b967753173a2cd235d1..d7bcb433b28557d4f7845357f281dcb7cfcf90c1 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -141,7 +141,6 @@ lb:
         auth_provider: Authentifizéierungsubidder
         auth_uid: Authentifizéierungs UID
         email: E-Mail
         auth_provider: Authentifizéierungsubidder
         auth_uid: Authentifizéierungs UID
         email: E-Mail

-        email_confirmation: E-Mail Bestätegung

         new_email: Nei E-Mail-Adress
         active: Aktiv
         display_name: Numm dee gewise gëtt
         new_email: Nei E-Mail-Adress
         active: Aktiv
         display_name: Numm dee gewise gëtt


@@ -1813,7 +1812,7 @@ lb:
   sessions:
     new:
       title: Aloggen
   sessions:
     new:
       title: Aloggen

-      heading: Aloggen
+      tab_title: Aloggen

       email or username: E-Mail-Adress oder Benotzernumm
       password: Passwuert
       remember: Sech u mech erënneren
       email or username: E-Mail-Adress oder Benotzernumm
       password: Passwuert
       remember: Sech u mech erënneren


@@ -1821,34 +1820,7 @@ lb:
       login_button: Aloggen
       register now: Elo aschreiwen
       with external: 'Benotzt alternativ eng Drëtt Partei fir anzeloggen:'
       login_button: Aloggen
       register now: Elo aschreiwen
       with external: 'Benotzt alternativ eng Drëtt Partei fir anzeloggen:'

-      no account: Hutt Dir kee Benotzerkont?

       auth failure: Mat dëssen Daten ass leider keng Umeldung méiglech.
       auth failure: Mat dëssen Daten ass leider keng Umeldung méiglech.

-      openid_logo_alt: Alogge mat enger OpenID
-      auth_providers:
-        openid:
-          title: Mat OpenID aloggen
-          alt: Mat enger OpenID-URL aloggen
-        google:
-          title: Mat Google aloggen
-          alt: Mat enger Google-OpenID aloggen
-        facebook:
-          title: Mat Facebook aloggen
-          alt: Mat engem Facebook-Kont aloggen
-        microsoft:
-          title: Mat Microsoft aloggen
-          alt: Mat engem Microsoft-Kont aloggen
-        github:
-          title: Mat GitHub aloggen
-          alt: Mat engem GitHub-Kont aloggen
-        wikipedia:
-          title: Mat Wikipedia aloggen
-          alt: Mat engem Wikipedia-Benotzerkont aloggen
-        wordpress:
-          title: Mat Wordpress aloggen
-          alt: Mat enger Wordpress-OpenID aloggen
-        aol:
-          title: Mat AOL aloggen
-          alt: Mat enger AOL-OpenID aloggen

     destroy:
       title: Ofmellen
       heading: Vun OpenStreetMap ofmellen
     destroy:
       title: Ofmellen
       heading: Vun OpenStreetMap ofmellen


@@ -2146,6 +2118,32 @@ lb:
       oauth1_settings: OAuth 1-Astellungen
       oauth2_applications: OAuth 2 Applikatiounen
       oauth2_authorizations: OAuth 2 Autorisatiounen
       oauth1_settings: OAuth 1-Astellungen
       oauth2_applications: OAuth 2 Applikatiounen
       oauth2_authorizations: OAuth 2 Autorisatiounen

+    auth_providers:
+      openid_logo_alt: Alogge mat enger OpenID
+      openid:
+        title: Mat OpenID aloggen
+        alt: Mat enger OpenID-URL aloggen
+      google:
+        title: Mat Google aloggen
+        alt: Mat enger Google-OpenID aloggen
+      facebook:
+        title: Mat Facebook aloggen
+        alt: Mat engem Facebook-Kont aloggen
+      microsoft:
+        title: Mat Microsoft aloggen
+        alt: Mat engem Microsoft-Kont aloggen
+      github:
+        title: Mat GitHub aloggen
+        alt: Mat engem GitHub-Kont aloggen
+      wikipedia:
+        title: Mat Wikipedia aloggen
+        alt: Mat engem Wikipedia-Benotzerkont aloggen
+      wordpress:
+        title: Mat Wordpress aloggen
+        alt: Mat enger Wordpress-OpenID aloggen
+      aol:
+        title: Mat AOL aloggen
+        alt: Mat enger AOL-OpenID aloggen

   oauth:
     authorize:
       title: Zougrëff op Äre Benotzerkont autoriséieren
   oauth:
     authorize:
       title: Zougrëff op Äre Benotzerkont autoriséieren

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8cf035c0682f79011304cdf2f8147a7b9398316a..50cc531389ff0d2f525a1612f8604b5d7d164f91 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -160,7 +160,6 @@ lt:
         auth_provider: Tapatumo nustatymo teikėjas
         auth_uid: Tapatumo nustatymo UID
         email: El. paštas
         auth_provider: Tapatumo nustatymo teikėjas
         auth_uid: Tapatumo nustatymo UID
         email: El. paštas

-        email_confirmation: El. pašto patvirtinimas

         new_email: Naujas el. pašto adresas
         active: Aktyvus
         display_name: Rodomas vardas
         new_email: Naujas el. pašto adresas
         active: Aktyvus
         display_name: Rodomas vardas


@@ -1880,7 +1879,7 @@ lt:
   sessions:
     new:
       title: Prisijungti
   sessions:
     new:
       title: Prisijungti

-      heading: Prisijungti
+      tab_title: Prisijungti

       email or username: 'El. pašto adresas ar naudotojo vardas:'
       password: Slaptažodis
       remember: Prisiminti prisijungimą
       email or username: 'El. pašto adresas ar naudotojo vardas:'
       password: Slaptažodis
       remember: Prisiminti prisijungimą


@@ -1888,34 +1887,7 @@ lt:
       login_button: Prisijungti
       register now: Užsiregistruoti
       with external: 'Alternatyviai, naudokite trečią šalį prisijungimui:'
       login_button: Prisijungti
       register now: Užsiregistruoti
       with external: 'Alternatyviai, naudokite trečią šalį prisijungimui:'

-      no account: Neturite savo paskyros?

       auth failure: Atsiprašome, negalite prisijungti su tokiais duomenimis.
       auth failure: Atsiprašome, negalite prisijungti su tokiais duomenimis.

-      openid_logo_alt: Prisijunkite su OpenID
-      auth_providers:
-        openid:
-          title: Prisijunkite su OpenID
-          alt: Prisijunkite su OpenID URL
-        google:
-          title: Prisijunkite su Google
-          alt: Prisijunkite su Google OpenID
-        facebook:
-          title: Prisijungti su Facebook
-          alt: Prisijungti su Facebook paskyra
-        microsoft:
-          title: Prisijungti su Microsoft
-          alt: Prisijungti su Microsoft paskyra
-        github:
-          title: Prisijungti su GitHub
-          alt: Prisijungti su GitHub Paskyra
-        wikipedia:
-          title: Prisijungti su Vikipedija
-          alt: Prisijungti su Vikipedija Paskyra
-        wordpress:
-          title: Prisijunkite su Wordpress
-          alt: Prisijunkite su Wordpress OpenID
-        aol:
-          title: Prisijunkite su AOL
-          alt: Prisijunkite su AOL OpenID

     destroy:
       title: Atsijungti
       heading: Atsijungti nuo OpenStreetMap
     destroy:
       title: Atsijungti
       heading: Atsijungti nuo OpenStreetMap


@@ -2468,6 +2440,32 @@ lt:
       oauth1_settings: „OAuth 1“ nustatymai
       oauth2_applications: „OAuth 2“ programos
       oauth2_authorizations: „OAuth 2“ prieigos teisės
       oauth1_settings: „OAuth 1“ nustatymai
       oauth2_applications: „OAuth 2“ programos
       oauth2_authorizations: „OAuth 2“ prieigos teisės

+    auth_providers:
+      openid_logo_alt: Prisijunkite su OpenID
+      openid:
+        title: Prisijunkite su OpenID
+        alt: Prisijunkite su OpenID URL
+      google:
+        title: Prisijunkite su Google
+        alt: Prisijunkite su Google OpenID
+      facebook:
+        title: Prisijungti su Facebook
+        alt: Prisijungti su Facebook paskyra
+      microsoft:
+        title: Prisijungti su Microsoft
+        alt: Prisijungti su Microsoft paskyra
+      github:
+        title: Prisijungti su GitHub
+        alt: Prisijungti su GitHub Paskyra
+      wikipedia:
+        title: Prisijungti su Vikipedija
+        alt: Prisijungti su Vikipedija Paskyra
+      wordpress:
+        title: Prisijunkite su Wordpress
+        alt: Prisijunkite su Wordpress OpenID
+      aol:
+        title: Prisijunkite su AOL
+        alt: Prisijunkite su AOL OpenID

   oauth:
     authorize:
       title: Autorizuoti priėjimą prie jūsų paskyros
   oauth:
     authorize:
       title: Autorizuoti priėjimą prie jūsų paskyros


@@ -2609,12 +2607,10 @@ lt:
       display name description: Jūsų viešai rodomas naudotojo vardas. Jei norėsite,
         galėsite jį vėliau pakeisti savo nustatymuose.
       external auth: 'Trečios šalies autentikacija:'
       display name description: Jūsų viešai rodomas naudotojo vardas. Jei norėsite,
         galėsite jį vėliau pakeisti savo nustatymuose.
       external auth: 'Trečios šalies autentikacija:'

-      use external auth: Alternatyviai, naudokite trečią šalį prisijungimui
-      auth no password: Naudojant trečios šalies autentikaciją nereikia slaptažodžio,
-        bet kai kuriems papildomiems įrankiams arba serveriui gali jo prireikti.

       continue: Užsiregistruoti
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!
       privacy_policy: privatumo politika
       continue: Užsiregistruoti
       terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas!
       privacy_policy: privatumo politika

+      use external auth: Alternatyviai, naudokite trečią šalį prisijungimui

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

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 43a84bbadb4e9ee027010a9fd51970e641221042..1fd74892d3af0c82b5ccfb8d0ea1281892dc832a 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -138,7 +138,6 @@ lv:
         details: Lūdzu, sniedziet sīkāku informāciju par problēmu (obligāti).
       user:
         email: E-pasts
         details: Lūdzu, sniedziet sīkāku informāciju par problēmu (obligāti).
       user:
         email: E-pasts

-        email_confirmation: E-pasta apstiprinājums

         new_email: Jauna e-pasta adrese
         active: Aktīvs
         display_name: Rādāmais vārds
         new_email: Jauna e-pasta adrese
         active: Aktīvs
         display_name: Rādāmais vārds


@@ -1456,7 +1455,7 @@ lv:
   sessions:
     new:
       title: Pieslēgties
   sessions:
     new:
       title: Pieslēgties

-      heading: Pieslēgties
+      tab_title: Pieslēgties

       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'
       remember: Atcerēties mani
       email or username: 'E-pasta adrese vai lietotājvārds:'
       password: 'Parole:'
       remember: Atcerēties mani


@@ -1464,34 +1463,7 @@ lv:
       login_button: Pieslēgties
       register now: Reģistrēties
       with external: Alternatīvi, varat izmantot trešās puses 'ielogošanās' opciju
       login_button: Pieslēgties
       register now: Reģistrēties
       with external: Alternatīvi, varat izmantot trešās puses 'ielogošanās' opciju

-      no account: Nav lietotāja?

       auth failure: Diemžēl nevarēja ieiet ar šiem datiem
       auth failure: Diemžēl nevarēja ieiet ar šiem datiem

-      openid_logo_alt: Pieteikties ar OpenID
-      auth_providers:
-        openid:
-          title: Pieslēgties ar OpenID
-          alt: Pieslēgties ar OpenID saiti
-        google:
-          title: Pieslēgties ar Google
-          alt: Pieslēgties ar Google OpenID
-        facebook:
-          title: Pieslēgties ar Facebook
-          alt: Pieslēgties ar Facebook kontu
-        microsoft:
-          title: Pieslēgties ar Microsoft
-          alt: Pieslēgties ar Microsoft kontu
-        github:
-          title: Pieslēgties ar GitHub
-          alt: Pieslēgties ar GitHub kontu
-        wikipedia:
-          title: Ieiet ar Vikipēdiju
-          alt: Ieiet ar Vikipēdijas kontu
-        wordpress:
-          title: Pieslēgties ar WordPress
-          alt: Pieslēgties ar WordPress OpenID
-        aol:
-          title: Pieslēgties ar AOL
-          alt: Pieslēgties ar AOL OpenID

     destroy:
       title: Iziet
       heading: Iziet no OpenStreetMap
     destroy:
       title: Iziet
       heading: Iziet no OpenStreetMap


@@ -1863,6 +1835,32 @@ lv:
       need_to_see_terms: Tava piekļuve API un laiku pārtraukta. Lūdzu autorizējies
         mājaslapas interfeisā, lai apskatītu Veidotāju Noteikumus. Tev nevajag piekrist,
         bet tev tie ir jāapskata.
       need_to_see_terms: Tava piekļuve API un laiku pārtraukta. Lūdzu autorizējies
         mājaslapas interfeisā, lai apskatītu Veidotāju Noteikumus. Tev nevajag piekrist,
         bet tev tie ir jāapskata.

+    auth_providers:
+      openid_logo_alt: Pieteikties ar OpenID
+      openid:
+        title: Pieslēgties ar OpenID
+        alt: Pieslēgties ar OpenID saiti
+      google:
+        title: Pieslēgties ar Google
+        alt: Pieslēgties ar Google OpenID
+      facebook:
+        title: Pieslēgties ar Facebook
+        alt: Pieslēgties ar Facebook kontu
+      microsoft:
+        title: Pieslēgties ar Microsoft
+        alt: Pieslēgties ar Microsoft kontu
+      github:
+        title: Pieslēgties ar GitHub
+        alt: Pieslēgties ar GitHub kontu
+      wikipedia:
+        title: Ieiet ar Vikipēdiju
+        alt: Ieiet ar Vikipēdijas kontu
+      wordpress:
+        title: Pieslēgties ar WordPress
+        alt: Pieslēgties ar WordPress OpenID
+      aol:
+        title: Pieslēgties ar AOL
+        alt: Pieslēgties ar AOL OpenID

   oauth:
     authorize:
       title: Atļaut piekļuvi savam kontam
   oauth:
     authorize:
       title: Atļaut piekļuvi savam kontam


@@ -1941,11 +1939,9 @@ lv:
       display name description: Vārds, kas tiks rādīts publiski. Jūs to vēlāk varēsiet
         izmainīt iestatījumos.
       external auth: 'Trešo Pušu Autentifikācija:'
       display name description: Vārds, kas tiks rādīts publiski. Jūs to vēlāk varēsiet
         izmainīt iestatījumos.
       external auth: 'Trešo Pušu Autentifikācija:'

-      use external auth: Alternatīvi, varat izmantot trešās puses 'ielogošanās' opciju
-      auth no password: Ar trešās partijas autentifikāciju nav nepieciešama parole,
-        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!
       continue: Reģistrēties
       terms accepted: Paldies, ka pieņēmāt jaunos devuma noteikumus!

+      use external auth: Alternatīvi, varat izmantot trešās puses 'ielogošanās' opciju

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

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 466886758f2aedc115b14edacdac8067d2f39d4f..148f00f85818b3a4e08489a2ddfed3a76c9326f6 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -143,7 +143,6 @@ mk:
         auth_provider: Заверувач
         auth_uid: Назнака за заверката
         email: Е-пошта
         auth_provider: Заверувач
         auth_uid: Назнака за заверката
         email: Е-пошта

-        email_confirmation: Потврда на е-пошта

         new_email: Нова е-пошта
         active: Активно
         display_name: Име за приказ
         new_email: Нова е-пошта
         active: Активно
         display_name: Име за приказ


@@ -1923,7 +1922,7 @@ mk:
   sessions:
     new:
       title: Најава
   sessions:
     new:
       title: Најава

-      heading: Најава
+      tab_title: Најава

       email or username: Е-пошта или корисничко име
       password: Лозинка
       remember: Запомни ме
       email or username: Е-пошта или корисничко име
       password: Лозинка
       remember: Запомни ме


@@ -1931,34 +1930,7 @@ mk:
       login_button: Најава
       register now: Зачленете се сега
       with external: 'Во спротивно, најавете преку надворешно место:'
       login_button: Најава
       register now: Зачленете се сега
       with external: 'Во спротивно, најавете преку надворешно место:'

-      no account: Немате сметка?

       auth failure: Жалиме, не можевме да ве најавиме со тие податоци.
       auth failure: Жалиме, не можевме да ве најавиме со тие податоци.

-      openid_logo_alt: Најава со OpenID
-      auth_providers:
-        openid:
-          title: Најава со OpenID
-          alt: Најава со URL за OpenID
-        google:
-          title: Најава со Google
-          alt: Најава со OpenID од Google
-        facebook:
-          title: Најава со Фејсбук
-          alt: Најава со профил на Фејсбук
-        microsoft:
-          title: Најава со Microsoft
-          alt: Најава со сметка на Microsoft
-        github:
-          title: Најава со GitHub
-          alt: Најава со сметка на GitHub
-        wikipedia:
-          title: Најава со Википедија
-          alt: Најава со сметка на Википедија
-        wordpress:
-          title: Најава со Wordpress
-          alt: Најава со OpenID од Wordpress
-        aol:
-          title: Најава со AOL
-          alt: Најава со OpenID од AOL

     destroy:
       title: Одјава
       heading: Одјава од OpenStreetMap
     destroy:
       title: Одјава
       heading: Одјава од OpenStreetMap


@@ -2627,6 +2599,32 @@ mk:
       oauth2_applications: Поставки за OAuth 2
       oauth2_authorizations: Овластувања за OAuth 2
       muted_users: Замолкнати корисници
       oauth2_applications: Поставки за OAuth 2
       oauth2_authorizations: Овластувања за OAuth 2
       muted_users: Замолкнати корисници

+    auth_providers:
+      openid_logo_alt: Најава со OpenID
+      openid:
+        title: Најава со OpenID
+        alt: Најава со URL за OpenID
+      google:
+        title: Најава со Google
+        alt: Најава со OpenID од Google
+      facebook:
+        title: Најава со Фејсбук
+        alt: Најава со профил на Фејсбук
+      microsoft:
+        title: Најава со Microsoft
+        alt: Најава со сметка на Microsoft
+      github:
+        title: Најава со GitHub
+        alt: Најава со сметка на GitHub
+      wikipedia:
+        title: Најава со Википедија
+        alt: Најава со сметка на Википедија
+      wordpress:
+        title: Најава со Wordpress
+        alt: Најава со OpenID од Wordpress
+      aol:
+        title: Најава со AOL
+        alt: Најава со OpenID од AOL

   oauth:
     authorize:
       title: Овластете пристап до вашата сметка
   oauth:
     authorize:
       title: Овластете пристап до вашата сметка


@@ -2774,16 +2772,14 @@ mk:
       display name description: Вашето јавно прикажано име. Можете да го смените подоцна
         во прилагодувањата.
       external auth: 'Заверка за надворешното место:'
       display name description: Вашето јавно прикажано име. Можете да го смените подоцна
         во прилагодувањата.
       external auth: 'Заверка за надворешното место:'

-      use external auth: Во спротивно, најавете преку надворешно место
-      auth no password: Ако користите надворешно место, тогаш не ви треба лозинка,
-        но може да ја побараат некои дополнителни алатки или опслужувачот.

       continue: Зачленување
       terms accepted: Ви благодариме што ги прифативте новите услови за учество!
       continue: Зачленување
       terms accepted: Ви благодариме што ги прифативте новите услови за учество!

-      email_confirmation_help_html: Вашата адреса не се прикажува јавно. Повеќе ќе
-        дознаете на %{privacy_policy_link}.
+      email_help_html: Вашата адреса не се прикажува јавно. Повеќе ќе дознаете на
+        %{privacy_policy_link}.

       privacy_policy: правила за личните податоци
       privacy_policy_title: Правилата за лични податоци на OSMF, со одделот за е-поштенски
         адреси
       privacy_policy: правила за личните податоци
       privacy_policy_title: Правилата за лични податоци на OSMF, со одделот за е-поштенски
         адреси

+      use external auth: Во спротивно, најавете преку надворешно место

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

diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 0404ed3d33cec350d7df10343a88b83718dee435..8e4055d51b7b0afc7d584f092eeb1bf965ddfec1 100644 (file)
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -561,40 +561,13 @@ mo:
   sessions:
     new:
       title: Презентаци-вэ
   sessions:
     new:
       title: Презентаци-вэ

-      heading: Презентаци-вэ
+      tab_title: Презентаци-вэ

       email or username: 'Пошта електроникэ сау нумеле де утилизатор:'
       password: 'Паролэ:'
       remember: Пэстраря сесиуний
       lost password link: Аць уйтат парола?
       login_button: Ынтраря ын конт
       register now: Ынреӂистраци-вэ акум
       email or username: 'Пошта електроникэ сау нумеле де утилизатор:'
       password: 'Паролэ:'
       remember: Пэстраря сесиуний
       lost password link: Аць уйтат парола?
       login_button: Ынтраря ын конт
       register now: Ынреӂистраци-вэ акум

-      no account: Ну авець ун конт де утилизатор?
-      openid_logo_alt: Ынтраря ку ажуторул OpenID
-      auth_providers:
-        openid:
-          title: Ынтраря ку ажуторул OpenID
-          alt: Ынтраря ку ажуторул OpenID URL
-        google:
-          title: Ынтраря ку ажуторул Google
-          alt: Ынтраря ку ажуторул Google OpenID
-        facebook:
-          title: Ынтраря ку ажуторул Facebook
-          alt: Ынтраря ку ажуторул контулуй де Facebook
-        microsoft:
-          title: Ынтраря ку ажуторул Windows Live
-          alt: Ынтраря ку ажуторул контулуй де Windows Live
-        github:
-          title: Ынтраря ку ажуторул GitHub
-          alt: Ынтраря ку ажуторул контулуй де GitHub
-        wikipedia:
-          title: Ынтраря ку ажуторул Википедией
-          alt: Ынтраря ку ажуторул контулуй де Википедия
-        wordpress:
-          title: Ынтраря ку ажуторул Wordpress
-          alt: Ынтраря ку ажуторул Wordpress OpenID
-        aol:
-          title: Ынтраря ку ажуторул AOL
-          alt: Ынтраря ку ажуторул AOL OpenID

     destroy:
       title: Ынкееря сесиуний
       heading: Ешире дин OpenStreetMap
     destroy:
       title: Ынкееря сесиуний
       heading: Ешире дин OpenStreetMap


@@ -602,6 +575,33 @@ mo:
   site:
     export:
       title: Експортаре
   site:
     export:
       title: Експортаре

+  application:
+    auth_providers:
+      openid_logo_alt: Ынтраря ку ажуторул OpenID
+      openid:
+        title: Ынтраря ку ажуторул OpenID
+        alt: Ынтраря ку ажуторул OpenID URL
+      google:
+        title: Ынтраря ку ажуторул Google
+        alt: Ынтраря ку ажуторул Google OpenID
+      facebook:
+        title: Ынтраря ку ажуторул Facebook
+        alt: Ынтраря ку ажуторул контулуй де Facebook
+      microsoft:
+        title: Ынтраря ку ажуторул Windows Live
+        alt: Ынтраря ку ажуторул контулуй де Windows Live
+      github:
+        title: Ынтраря ку ажуторул GitHub
+        alt: Ынтраря ку ажуторул контулуй де GitHub
+      wikipedia:
+        title: Ынтраря ку ажуторул Википедией
+        alt: Ынтраря ку ажуторул контулуй де Википедия
+      wordpress:
+        title: Ынтраря ку ажуторул Wordpress
+        alt: Ынтраря ку ажуторул Wordpress OpenID
+      aol:
+        title: Ынтраря ку ажуторул AOL
+        alt: Ынтраря ку ажуторул AOL OpenID

   users:
     show:
       my diary: Журналул меу
   users:
     show:
       my diary: Журналул меу

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index c5f915a8fb8e9d866c324b9ff7a30c8a85b3b002..e7bec4be0e5f6ef168e8d00ed2a67343b0ceb195 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1018,14 +1018,13 @@ mr:
   sessions:
     new:
       title: सनोंद प्रवेश करा
   sessions:
     new:
       title: सनोंद प्रवेश करा

-      heading: सनोंद प्रवेश करा
+      tab_title: सनोंद प्रवेश करा

       email or username: 'विपत्रपत्ता किंवा सदस्यनाव:'
       password: 'परवलीचा शब्द:'
       remember: माझी आठवण ठेवा
       lost password link: परवलीचा शब्द विसरलात?
       login_button: सनोंद प्रवेश करा
       register now: आत्ता नोंदणी करा
       email or username: 'विपत्रपत्ता किंवा सदस्यनाव:'
       password: 'परवलीचा शब्द:'
       remember: माझी आठवण ठेवा
       lost password link: परवलीचा शब्द विसरलात?
       login_button: सनोंद प्रवेश करा
       register now: आत्ता नोंदणी करा

-      no account: आपले खाते नाही?

   site:
     about:
       next: पुढील
   site:
     about:
       next: पुढील

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a2584419e07f8a8566b72ddf1500e88bd8d862f3..e73c511c1a2b8f62b75d8402a608184ad4653bb7 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -145,7 +145,6 @@ ms:
         auth_provider: Pembekal Pengesahan
         auth_uid: UID pengesahan
         email: E-mel
         auth_provider: Pembekal Pengesahan
         auth_uid: UID pengesahan
         email: E-mel

-        email_confirmation: Pengesahan E-mel

         new_email: Alamat E-mel Baru
         active: Aktif
         display_name: Nama Paparan
         new_email: Alamat E-mel Baru
         active: Aktif
         display_name: Nama Paparan


@@ -1439,42 +1438,15 @@ ms:
   sessions:
     new:
       title: Log masuk
   sessions:
     new:
       title: Log masuk

-      heading: Log masuk
+      tab_title: Log masuk

       email or username: 'Alamat E-mel atau Nama Pengguna:'
       password: 'Kata laluan:'
       remember: Ingati saya
       lost password link: Lupa kata laluan anda?
       login_button: Log masuk
       register now: Daftar sekarang
       email or username: 'Alamat E-mel atau Nama Pengguna:'
       password: 'Kata laluan:'
       remember: Ingati saya
       lost password link: Lupa kata laluan anda?
       login_button: Log masuk
       register now: Daftar sekarang

-      no account: Belum buka akaun?

       auth failure: Maaf, log masuk tidak dapat dibenarkan dengan butiran-butiran
         itu.
       auth failure: Maaf, log masuk tidak dapat dibenarkan dengan butiran-butiran
         itu.

-      openid_logo_alt: Log masuk dengan OpenID
-      auth_providers:
-        openid:
-          title: Log masuk dengan OpenID
-          alt: Log masuk dengan OpenID URL
-        google:
-          title: Log masuk dengan Google
-          alt: Log masuk dengan Google OpenID
-        facebook:
-          title: Log masuk dengan Facebook
-          alt: Log masuk dengan Akuan Facebook
-        microsoft:
-          title: Log masuk dengan Window Live
-          alt: Log masuk dengan Akaun Windows Live
-        github:
-          title: Log masuk dengan GitHub
-          alt: Log masuk dengan Akaun GitHub.
-        wikipedia:
-          title: Log masuk dengan Wikipedia
-          alt: Log masuk dengan akaun Wikipedia
-        wordpress:
-          title: Log masuk dengan Wordpress
-          alt: Log masuk dengan OpenID Wordpress
-        aol:
-          title: Log masuk dengan AOL
-          alt: Log masuk dengan OpenID Yahoo

     destroy:
       title: Log keluar
       heading: Log keluar dari OpenStreetMap
     destroy:
       title: Log keluar
       heading: Log keluar dari OpenStreetMap


@@ -1864,6 +1836,32 @@ ms:
     settings_menu:
       account_settings: Tetapan Akaun
       muted_users: Pengguna yang Diredamkan
     settings_menu:
       account_settings: Tetapan Akaun
       muted_users: Pengguna yang Diredamkan

+    auth_providers:
+      openid_logo_alt: Log masuk dengan OpenID
+      openid:
+        title: Log masuk dengan OpenID
+        alt: Log masuk dengan OpenID URL
+      google:
+        title: Log masuk dengan Google
+        alt: Log masuk dengan Google OpenID
+      facebook:
+        title: Log masuk dengan Facebook
+        alt: Log masuk dengan Akuan Facebook
+      microsoft:
+        title: Log masuk dengan Window Live
+        alt: Log masuk dengan Akaun Windows Live
+      github:
+        title: Log masuk dengan GitHub
+        alt: Log masuk dengan Akaun GitHub.
+      wikipedia:
+        title: Log masuk dengan Wikipedia
+        alt: Log masuk dengan akaun Wikipedia
+      wordpress:
+        title: Log masuk dengan Wordpress
+        alt: Log masuk dengan OpenID Wordpress
+      aol:
+        title: Log masuk dengan AOL
+        alt: Log masuk dengan OpenID Yahoo

   oauth:
     authorize:
       title: Benarkan akses kepada akaun anda
   oauth:
     authorize:
       title: Benarkan akses kepada akaun anda


@@ -1963,10 +1961,10 @@ ms:
       display name description: Nama pengguna anda yang dipaparkan kepada awam. Anda
         boleh menukarnya dalam keutamaan anda pada bila-bila masa.
       external auth: Pengesahan Pihak Ketiga
       display name description: Nama pengguna anda yang dipaparkan kepada awam. Anda
         boleh menukarnya dalam keutamaan anda pada bila-bila masa.
       external auth: Pengesahan Pihak Ketiga

-      use external auth: Secara alternatif, gunakan khidmat pihak ketiga untuk log
-        masuk

       continue: Daftar
       terms accepted: Terima kasih kerana menerima terma-terma penyumbang yang baru!
       continue: Daftar
       terms accepted: Terima kasih kerana menerima terma-terma penyumbang yang baru!

+      use external auth: Secara alternatif, gunakan khidmat pihak ketiga untuk log
+        masuk

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

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 8501a5764448cfefbbfc4d16f828cdf88be2dc21..d192e2ad2e46cf7e9162958969492346b4af24cb 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -602,23 +602,13 @@ my:
   sessions:
     new:
       title: အကောင့်ထဲဝင်ရန်
   sessions:
     new:
       title: အကောင့်ထဲဝင်ရန်

-      heading: အကောင့်ထဲဝင်ရန်
+      tab_title: အကောင့်ထဲဝင်ရန်

       email or username: အီးမေးလ်လိပ်စာ သို့မဟုတ် အသုံးပြုသူအမည်
       password: စကားဝှက်
       remember: မိမိကို မှတ်မိပါ
       lost password link: စကားဝှက် မေ့နေသလား။
       login_button: အကောင့်ထဲဝင်ရန်
       register now: အခုပဲ မှတ်ပုံတင်ရန်
       email or username: အီးမေးလ်လိပ်စာ သို့မဟုတ် အသုံးပြုသူအမည်
       password: စကားဝှက်
       remember: မိမိကို မှတ်မိပါ
       lost password link: စကားဝှက် မေ့နေသလား။
       login_button: အကောင့်ထဲဝင်ရန်
       register now: အခုပဲ မှတ်ပုံတင်ရန်

-      no account: အကောင့် မရှိဘူးလား။
-      auth_providers:
-        google:
-          title: ဂူဂဲလ်ဖြင့် အကောင့်ထဲဝင်ရန်
-        facebook:
-          title: ဖေ့ဘုတ်ဖြင့် အကောင့်ထဲဝင်ရန်
-          alt: ဖေ့ဘုတ်အကောင့်ဖြင့် အကောင့်ထဲဝင်ရန်
-        wikipedia:
-          title: ဝီကီပီးဒီးယားဖြင့် အကောင့်ထဲဝင်ရန်
-          alt: ဝီကီပီးဒီးယားအကောင့်ဖြင့် အကောင့်ထဲဝင်ရန်

     destroy:
       title: အကောင့်မှပြန်ထွက်
       logout_button: အကောင့်မှပြန်ထွက်
     destroy:
       title: အကောင့်မှပြန်ထွက်
       logout_button: အကောင့်မှပြန်ထွက်


@@ -715,6 +705,16 @@ my:
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်
       edit_map: မြေပုံကို တည်းဖြတ်ရန်
       more: ပို၍
       view_map: မြေပုံကို ကြည့်ရန်
       edit_map: မြေပုံကို တည်းဖြတ်ရန်

+  application:
+    auth_providers:
+      google:
+        title: ဂူဂဲလ်ဖြင့် အကောင့်ထဲဝင်ရန်
+      facebook:
+        title: ဖေ့ဘုတ်ဖြင့် အကောင့်ထဲဝင်ရန်
+        alt: ဖေ့ဘုတ်အကောင့်ဖြင့် အကောင့်ထဲဝင်ရန်
+      wikipedia:
+        title: ဝီကီပီးဒီးယားဖြင့် အကောင့်ထဲဝင်ရန်
+        alt: ဝီကီပီးဒီးယားအကောင့်ဖြင့် အကောင့်ထဲဝင်ရန်

   oauth_clients:
     show:
       confirm: သေချာပါသလား
   oauth_clients:
     show:
       confirm: သေချာပါသလား

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 6c95a901abf41f1989a9760f88e24ffb2a48186a..29c43db563607c24f7b0b05ee69e4cb9d42d106b 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -166,7 +166,6 @@ nb:
         auth_provider: Leverandør av autentisering
         auth_uid: Autentisering UID
         email: E-post
         auth_provider: Leverandør av autentisering
         auth_uid: Autentisering UID
         email: E-post

-        email_confirmation: E-post-bekreftelse

         new_email: Ny e-postadresse
         active: Aktiv
         display_name: Visningsnavn
         new_email: Ny e-postadresse
         active: Aktiv
         display_name: Visningsnavn


@@ -1655,7 +1654,7 @@ nb:
   sessions:
     new:
       title: Logg inn
   sessions:
     new:
       title: Logg inn

-      heading: Logg inn
+      tab_title: Logg inn

       email or username: E-postadresse eller brukernavn
       password: Passord
       remember: Husk meg
       email or username: E-postadresse eller brukernavn
       password: Passord
       remember: Husk meg


@@ -1663,34 +1662,7 @@ nb:
       login_button: Logg inn
       register now: Registrer deg nå
       with external: 'Alternativt kan du bruke en tredjepart til å logge inn:'
       login_button: Logg inn
       register now: Registrer deg nå
       with external: 'Alternativt kan du bruke en tredjepart til å logge inn:'

-      no account: Har du ikke en konto?

       auth failure: Beklager, kunne ikke logge inn med den informasjonen
       auth failure: Beklager, kunne ikke logge inn med den informasjonen

-      openid_logo_alt: Logg inn med en OpenID
-      auth_providers:
-        openid:
-          title: Logg inn med OpenID
-          alt: Logg inn med en OpenID-URL
-        google:
-          title: Logg inn med Google
-          alt: Logg inn med en Google OpenID
-        facebook:
-          title: Logg inn med Facebook
-          alt: Logg inn med en Facebook-konto
-        microsoft:
-          title: Logg inn med Microsoft
-          alt: Logg inn med en Microsoft-konto
-        github:
-          title: Logg inn med GitHub
-          alt: Logg inn med en GitHub-konto
-        wikipedia:
-          title: Logg inn med Wikipedia
-          alt: Logg inn med en Wikipedia-konto
-        wordpress:
-          title: Logg inn med Wordpress
-          alt: Logg inn med en Wordpress OpenID
-        aol:
-          title: Logg inn med AOL
-          alt: Logg inn med en AOL OpenID

     destroy:
       title: Logg ut
       heading: Logg ut fra OpenStreetMap
     destroy:
       title: Logg ut
       heading: Logg ut fra OpenStreetMap


@@ -2061,6 +2033,32 @@ nb:
       need_to_see_terms: Din tilgang til API-et er midlertidig stoppet. Logg inn på
         nettsiden for å lese bidragsytervilkårene. Du trenger ikke godta vilkårene,
         men du må lese dem.
       need_to_see_terms: Din tilgang til API-et er midlertidig stoppet. Logg inn på
         nettsiden for å lese bidragsytervilkårene. Du trenger ikke godta vilkårene,
         men du må lese dem.

+    auth_providers:
+      openid_logo_alt: Logg inn med en OpenID
+      openid:
+        title: Logg inn med OpenID
+        alt: Logg inn med en OpenID-URL
+      google:
+        title: Logg inn med Google
+        alt: Logg inn med en Google OpenID
+      facebook:
+        title: Logg inn med Facebook
+        alt: Logg inn med en Facebook-konto
+      microsoft:
+        title: Logg inn med Microsoft
+        alt: Logg inn med en Microsoft-konto
+      github:
+        title: Logg inn med GitHub
+        alt: Logg inn med en GitHub-konto
+      wikipedia:
+        title: Logg inn med Wikipedia
+        alt: Logg inn med en Wikipedia-konto
+      wordpress:
+        title: Logg inn med Wordpress
+        alt: Logg inn med en Wordpress OpenID
+      aol:
+        title: Logg inn med AOL
+        alt: Logg inn med en AOL OpenID

   oauth:
     authorize:
       title: Autoriser tilgang til din konto
   oauth:
     authorize:
       title: Autoriser tilgang til din konto


@@ -2160,11 +2158,9 @@ nb:
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre
         dette senere i alternativ.
       external auth: 'Tredjepartsgodkjenning:'
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre
         dette senere i alternativ.
       external auth: 'Tredjepartsgodkjenning:'

-      use external auth: Alternativt kan du bruke en tredjepart til å logge inn
-      auth no password: Med tredjepartsbekreftelse er passord ikke påkrevd, men en
-        del ekstra verktøy og tjenere kan trenge det.

       continue: Registrer deg
       terms accepted: Takk for at du godtok de nye bidragsytervilkårene!
       continue: Registrer deg
       terms accepted: Takk for at du godtok de nye bidragsytervilkårene!

+      use external auth: Alternativt kan du bruke en tredjepart til å logge inn

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

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index acaed1b3ceb859ccb9831105d5a25a0868af09c1..0d121bd28fcde9ade3001ddc7bcc907590f3d9c8 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -473,7 +473,7 @@ nds:
   sessions:
     new:
       title: Anmellen
   sessions:
     new:
       title: Anmellen

-      heading: Anmellen
+      tab_title: Anmellen

       email or username: 'E-Mail-Adress oder Brukernaam:'
       password: 'Passwoord:'
       lost password link: Passwoord vergeten?
       email or username: 'E-Mail-Adress oder Brukernaam:'
       password: 'Passwoord:'
       lost password link: Passwoord vergeten?

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index b5d6cdb3c3c5a5921593836fd353ce3a4ccab885..8d7b4561e1f7d7d7b6aa9e4f96cd23fb5674fa17 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -875,14 +875,9 @@ ne:
   sessions:
     new:
       title: प्रवेश
   sessions:
     new:
       title: प्रवेश

-      heading: प्रवेश
+      tab_title: प्रवेश

       password: 'पासवर्ड:'
       login_button: प्रवेश
       password: 'पासवर्ड:'
       login_button: प्रवेश

-      no account: खाता छैन?
-      auth_providers:
-        wikipedia:
-          title: विकिपिडियाकाे प्रयाेग गरि प्रवेश गर्नुहाेस्
-          alt: विकिपिडिया खाताद्वारा प्रवेश गर्नुहोस्

     destroy:
       title: लगआउट
       logout_button: निर्गमन
     destroy:
       title: लगआउट
       logout_button: निर्गमन


@@ -1045,6 +1040,11 @@ ne:
       scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस
     make_public:
       made_public: सार्वजनिक बनाइएको ट्रेस
       scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस
     make_public:
       made_public: सार्वजनिक बनाइएको ट्रेस

+  application:
+    auth_providers:
+      wikipedia:
+        title: विकिपिडियाकाे प्रयाेग गरि प्रवेश गर्नुहाेस्
+        alt: विकिपिडिया खाताद्वारा प्रवेश गर्नुहोस्

   oauth_clients:
     show:
       confirm: निश्चित हुनुहुन्छ ?
   oauth_clients:
     show:
       confirm: निश्चित हुनुहुन्छ ?

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6563edcaeb423be0c0ad707add66f062cf60d88b..1faa33b3afb263ca4cc2958b46554d7014453da3 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -199,7 +199,6 @@ nl:
         auth_provider: Authenticatiedienst
         auth_uid: Authenticatie-UID
         email: E-mail
         auth_provider: Authenticatiedienst
         auth_uid: Authenticatie-UID
         email: E-mail

-        email_confirmation: E-mailbevestiging

         new_email: Nieuw e-mailadres
         active: Actief
         display_name: Weergavenaam
         new_email: Nieuw e-mailadres
         active: Actief
         display_name: Weergavenaam


@@ -2001,7 +2000,7 @@ nl:
   sessions:
     new:
       title: Aanmelden
   sessions:
     new:
       title: Aanmelden

-      heading: Aanmelden
+      tab_title: Aanmelden

       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
       remember: Aanmeldgegevens onthouden
       email or username: 'E-mailadres of gebruikersnaam:'
       password: 'Wachtwoord:'
       remember: Aanmeldgegevens onthouden


@@ -2009,34 +2008,7 @@ nl:
       login_button: Aanmelden
       register now: Nu inschrijven
       with external: 'U kunt ook gebruik maken van een derde partij om aan te melden:'
       login_button: Aanmelden
       register now: Nu inschrijven
       with external: 'U kunt ook gebruik maken van een derde partij om aan te melden:'

-      no account: Hebt u geen account?

       auth failure: Met deze gegevens kunt u helaas niet aanmelden.
       auth failure: Met deze gegevens kunt u helaas niet aanmelden.

-      openid_logo_alt: Aanmelden met een OpenID
-      auth_providers:
-        openid:
-          title: Aanmelden met OpenID
-          alt: Aanmelden met een OpenID URL
-        google:
-          title: Aanmelden met Google
-          alt: Aanmelden met een Google OpenID
-        facebook:
-          title: Aanmelden met Facebook
-          alt: Aanmelden met een Facebookaccount
-        microsoft:
-          title: Aanmelden met Microsoft
-          alt: Aanmelden met een Microsoft-account
-        github:
-          title: Aanmelden met GitHub
-          alt: Aanmelden met een GitHub-account
-        wikipedia:
-          title: Aanmelden met Wikipedia
-          alt: Aanmelden met een Wikipedia-account
-        wordpress:
-          title: Aanmelden met Wordpress
-          alt: Aanmelden met een Wordpress OpenID
-        aol:
-          title: Aanmelden met AOL
-          alt: Aanmelden met een AOL OpenID

     destroy:
       title: Afmelden
       heading: Afmelden van OpenStreetMap
     destroy:
       title: Afmelden
       heading: Afmelden van OpenStreetMap


@@ -2718,6 +2690,32 @@ nl:
       oauth2_applications: OAuth 2 toepassingen
       oauth2_authorizations: OAuth 2 autorisaties
       muted_users: Gedempte gebruikers
       oauth2_applications: OAuth 2 toepassingen
       oauth2_authorizations: OAuth 2 autorisaties
       muted_users: Gedempte gebruikers

+    auth_providers:
+      openid_logo_alt: Aanmelden met een OpenID
+      openid:
+        title: Aanmelden met OpenID
+        alt: Aanmelden met een OpenID URL
+      google:
+        title: Aanmelden met Google
+        alt: Aanmelden met een Google OpenID
+      facebook:
+        title: Aanmelden met Facebook
+        alt: Aanmelden met een Facebookaccount
+      microsoft:
+        title: Aanmelden met Microsoft
+        alt: Aanmelden met een Microsoft-account
+      github:
+        title: Aanmelden met GitHub
+        alt: Aanmelden met een GitHub-account
+      wikipedia:
+        title: Aanmelden met Wikipedia
+        alt: Aanmelden met een Wikipedia-account
+      wordpress:
+        title: Aanmelden met Wordpress
+        alt: Aanmelden met een Wordpress OpenID
+      aol:
+        title: Aanmelden met AOL
+        alt: Aanmelden met een AOL OpenID

   oauth:
     authorize:
       title: Geef toegang tot uw account
   oauth:
     authorize:
       title: Geef toegang tot uw account


@@ -2867,15 +2865,13 @@ nl:
       display name description: Uw openbare gebruikersnaam. U kunt deze later in uw
         voorkeuren wijzigen.
       external auth: 'Authenticatie van derden:'
       display name description: Uw openbare gebruikersnaam. U kunt deze later in uw
         voorkeuren wijzigen.
       external auth: 'Authenticatie van derden:'

-      use external auth: U kunt ook gebruik maken van een derde partij om aan te melden
-      auth no password: Met authenticatie van derden is een wachtwoord niet verplicht,
-        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!
       continue: Registreren
       terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst!

-      email_confirmation_help_html: Uw adres wordt niet openbaar gemaakt, zie ons
-        %{privacy_policy_link} voor meer informatie.
+      email_help_html: Uw adres wordt niet openbaar gemaakt, zie ons %{privacy_policy_link}
+        voor meer informatie.

       privacy_policy: privacybeleid
       privacy_policy_title: OSMF-privacybeleid, met een kopje over e-mailadressen
       privacy_policy: privacybeleid
       privacy_policy_title: OSMF-privacybeleid, met een kopje over e-mailadressen

+      use external auth: U kunt ook gebruik maken van een derde partij om aan te melden

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

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 58e2e53023f284c263da80e02216454442087df2..2905c72301ff50bc7b455bcde8c0c88ddb31a437 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -134,7 +134,6 @@ nn:
         description: Skildring
       user:
         email: E-post
         description: Skildring
       user:
         email: E-post

-        email_confirmation: Stadfesting av e-post

         new_email: Ny e-postadresse
         active: Aktive
         display_name: Visningsnamn
         new_email: Ny e-postadresse
         active: Aktive
         display_name: Visningsnamn


@@ -1772,7 +1771,7 @@ nn:
   sessions:
     new:
       title: Logg inn
   sessions:
     new:
       title: Logg inn

-      heading: Logg inn
+      tab_title: Logg inn

       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'
       remember: Hugs meg
       email or username: 'E-postadresse eller brukarnamn:'
       password: 'Passord:'
       remember: Hugs meg


@@ -1780,34 +1779,7 @@ nn:
       login_button: Logg inn
       register now: Registrer deg no
       with external: 'Alternativt kan du bruke ein tredjepart til å logge inn:'
       login_button: Logg inn
       register now: Registrer deg no
       with external: 'Alternativt kan du bruke ein tredjepart til å logge inn:'

-      no account: Har du ingen brukarkonto?

       auth failure: Beklagar, kunne ikkje logge inn med den informasjonen
       auth failure: Beklagar, kunne ikkje logge inn med den informasjonen

-      openid_logo_alt: Logg inn med ein OpenID
-      auth_providers:
-        openid:
-          title: Logg inn med OpenID
-          alt: Logg inn med ein OpenID-URL
-        google:
-          title: Logg inn med Google
-          alt: Logg inn med ein Google OpenID
-        facebook:
-          title: Logg inn med Facebook
-          alt: Logg inn med ein Facebook-konto
-        microsoft:
-          title: Logg inn med Microsoft
-          alt: Logg inn med ein Microsoft-konto
-        github:
-          title: Logg inn med GitHub
-          alt: Logg inn med ein GitHub-konto
-        wikipedia:
-          title: Logg inn med Wikipedia
-          alt: Logg inn med ein Wikipedia-konto
-        wordpress:
-          title: Logg inn med Wordpress
-          alt: Logg inn med ein Wordpress OpenID
-        aol:
-          title: Logg inn med AOL
-          alt: Logg inn med ein AOL OpenID

     destroy:
       title: Logg ut
       heading: Logg ut frå OpenStreetMap
     destroy:
       title: Logg ut
       heading: Logg ut frå OpenStreetMap


@@ -2289,6 +2261,32 @@ nn:
       need_to_see_terms: Tilgjenget ditt til API-eit er mellombels stoppa. Logg inn
         på nettsiden for å lese bidragsytervilkårene. Du treng ikkje godta vilkåra,
         men du må lese dei.
       need_to_see_terms: Tilgjenget ditt til API-eit er mellombels stoppa. Logg inn
         på nettsiden for å lese bidragsytervilkårene. Du treng ikkje godta vilkåra,
         men du må lese dei.

+    auth_providers:
+      openid_logo_alt: Logg inn med ein OpenID
+      openid:
+        title: Logg inn med OpenID
+        alt: Logg inn med ein OpenID-URL
+      google:
+        title: Logg inn med Google
+        alt: Logg inn med ein Google OpenID
+      facebook:
+        title: Logg inn med Facebook
+        alt: Logg inn med ein Facebook-konto
+      microsoft:
+        title: Logg inn med Microsoft
+        alt: Logg inn med ein Microsoft-konto
+      github:
+        title: Logg inn med GitHub
+        alt: Logg inn med ein GitHub-konto
+      wikipedia:
+        title: Logg inn med Wikipedia
+        alt: Logg inn med ein Wikipedia-konto
+      wordpress:
+        title: Logg inn med Wordpress
+        alt: Logg inn med ein Wordpress OpenID
+      aol:
+        title: Logg inn med AOL
+        alt: Logg inn med ein AOL OpenID

   oauth:
     authorize:
       title: Autoriser tilgang til kontoen din
   oauth:
     authorize:
       title: Autoriser tilgang til kontoen din

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 3422dd68ef1256ec94b708179c9a116f78637572..396c7ca0e630aee6139bdb48c7780289e7718948 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -138,7 +138,6 @@ nqo:
         auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
         auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
         email: ߢ:ߞߏ߲ߘߏ
         auth_provider: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߡߊߛߐߟߊ߲
         auth_uid: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ UID
         email: ߢ:ߞߏ߲ߘߏ

-        email_confirmation: ߢ:ߞߏ߲ߘߏ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ

         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
         new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         active: ߞߎ߲߬ߞߊߟߌ߲
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫


@@ -1343,41 +1342,14 @@ nqo:
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫

-      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      tab_title: ߌ ߜߊ߲߬ߞߎ߲߫

       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
       register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫

-      no account: ߖߊ߬ߕߋ߬ߘߊ߬ ߕߴߌ ߓߟߏ߫ ߓߊ߬؟

       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.

-      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
-      auth_providers:
-        openid:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
-        google:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
-        facebook:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        microsoft:
-          title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        github:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wikipedia:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
-        wordpress:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
-        aol:
-          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߟߊ߫
-          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߏߔߌ߲ ID ߟߊ߫

     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
       heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
       heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫


@@ -1622,6 +1594,32 @@ nqo:
       oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
       oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
       oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
       oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ

+    auth_providers:
+      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
+      openid:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
+      google:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
+      facebook:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
+      microsoft:
+        title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      github:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      wikipedia:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+      wordpress:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
+      aol:
+        title: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߟߊ߫
+        alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߏߔߌ߲ ID ߟߊ߫

   oauth:
     authorize:
       title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
   oauth:
     authorize:
       title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 0b42826528f295b99730c3d32ee38addaffc9b98..f54a14a337c7ba4a188e7b22f78db3c6e539d045 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -143,7 +143,6 @@ oc:
         auth_provider: Fornidor d'autenticacion
         auth_uid: UID d'autentificacion
         email: Adreiça de corrier electronic
         auth_provider: Fornidor d'autenticacion
         auth_uid: UID d'autentificacion
         email: Adreiça de corrier electronic

-        email_confirmation: Corrier electronic d'autentificacion

         new_email: 'Novèla adreiça de corrier electronic :'
         active: Actiu
         display_name: Nom afichat
         new_email: 'Novèla adreiça de corrier electronic :'
         active: Actiu
         display_name: Nom afichat


@@ -1784,7 +1783,7 @@ oc:
   sessions:
     new:
       title: Se connectar
   sessions:
     new:
       title: Se connectar

-      heading: Connexion
+      tab_title: Connexion

       email or username: 'Adreça e-mail o nom d''utilizaire :'
       password: 'Senhal :'
       remember: Se remembrar de ieu
       email or username: 'Adreça e-mail o nom d''utilizaire :'
       password: 'Senhal :'
       remember: Se remembrar de ieu


@@ -1792,35 +1791,8 @@ oc:
       login_button: Se connectar
       register now: S'inscriure ara
       with external: 'A la plaça, utilizatz un tèrç per vos connectar :'
       login_button: Se connectar
       register now: S'inscriure ara
       with external: 'A la plaça, utilizatz un tèrç per vos connectar :'

-      no account: Avètz pas de compte ?

       auth failure: O planhèm, mas las informacions provesidas an pas permés de vos
         identificar.
       auth failure: O planhèm, mas las informacions provesidas an pas permés de vos
         identificar.

-      openid_logo_alt: Se connectar amb un OpenID
-      auth_providers:
-        openid:
-          title: Se connectar amb OpenID
-          alt: Se connectar amb una URL OpenID
-        google:
-          title: Se connectar amb Google
-          alt: Se connectar amb l'OpenID de Google
-        facebook:
-          title: Se connectar amb Facebook
-          alt: Se connectar amb un commpte Facebook
-        microsoft:
-          title: Se connectar amb Windows Live
-          alt: Se connectar amb un compte Windows Live
-        github:
-          title: Connexion amb GitHub
-          alt: Connexion amb un Compte GitHub
-        wikipedia:
-          title: Se connectar amb Wikipèdia
-          alt: Se connectar amb un compte de Wikipèdia
-        wordpress:
-          title: Se connectar amb Wordpress
-          alt: Se connectar amb l'OpenID de Wordpress
-        aol:
-          title: Se connectar amb AOL
-          alt: Se connectar amb l'OpenID d'AOL

     destroy:
       title: Desconnexion
       heading: Desconnexion d'OpenStreetMap
     destroy:
       title: Desconnexion
       heading: Desconnexion d'OpenStreetMap


@@ -2165,6 +2137,32 @@ oc:
         site web per trobar mai d’informacions.
     settings_menu:
       account_settings: Configuracion
         site web per trobar mai d’informacions.
     settings_menu:
       account_settings: Configuracion

+    auth_providers:
+      openid_logo_alt: Se connectar amb un OpenID
+      openid:
+        title: Se connectar amb OpenID
+        alt: Se connectar amb una URL OpenID
+      google:
+        title: Se connectar amb Google
+        alt: Se connectar amb l'OpenID de Google
+      facebook:
+        title: Se connectar amb Facebook
+        alt: Se connectar amb un commpte Facebook
+      microsoft:
+        title: Se connectar amb Windows Live
+        alt: Se connectar amb un compte Windows Live
+      github:
+        title: Connexion amb GitHub
+        alt: Connexion amb un Compte GitHub
+      wikipedia:
+        title: Se connectar amb Wikipèdia
+        alt: Se connectar amb un compte de Wikipèdia
+      wordpress:
+        title: Se connectar amb Wordpress
+        alt: Se connectar amb l'OpenID de Wordpress
+      aol:
+        title: Se connectar amb AOL
+        alt: Se connectar amb l'OpenID d'AOL

   oauth:
     authorize:
       title: Autorizar l’accès a vòstre compte
   oauth:
     authorize:
       title: Autorizar l’accès a vòstre compte


@@ -2234,9 +2232,9 @@ oc:
       display name description: Vòstre nom d'utilizaire afichat publicament. Podètz
         cambiar aquò ulteriorament dins las preferéncias.
       external auth: 'Autentificacion tèrça :'
       display name description: Vòstre nom d'utilizaire afichat publicament. Podètz
         cambiar aquò ulteriorament dins las preferéncias.
       external auth: 'Autentificacion tèrça :'

-      use external auth: A la plaça, utilizatz un tèrç per vos connectar

       continue: S’inscriure
       terms accepted: Mercé d’aver acceptat los novèls tèrmes del contributor !
       continue: S’inscriure
       terms accepted: Mercé d’aver acceptat los novèls tèrmes del contributor !

+      use external auth: A la plaça, utilizatz un tèrç per vos connectar

     terms:
       title: Tèrmes del contributor
       heading: Tèrmes del contributor
     terms:
       title: Tèrmes del contributor
       heading: Tèrmes del contributor

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 28b7c1d8d064c76203de2c72edd4a2098012dfca..1439d1c1e298e860ae4f71d69acd2f0f9540b778 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -829,14 +829,13 @@ pa:
   sessions:
     new:
       title: ਦਾਖ਼ਲ ਹੋਵੋ
   sessions:
     new:
       title: ਦਾਖ਼ਲ ਹੋਵੋ

-      heading: ਦਾਖ਼ਲ ਹੋਵੋ
+      tab_title: ਦਾਖ਼ਲ ਹੋਵੋ

       email or username: 'ਈਮੇਲ ਪਤਾ ਜਾਂ ਵਰਤੋਂਕਾਰ-ਨਾਂ:'
       password: 'ਪਛਾਣ-ਸ਼ਬਦ:'
       remember: ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ
       lost password link: ਆਪਣਾ ਪਛਾਣ-ਸ਼ਬਦ ਗੁਆ ਦਿੱਤਾ?
       login_button: ਦਾਖ਼ਲ ਹੋਵੋ
       register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ
       email or username: 'ਈਮੇਲ ਪਤਾ ਜਾਂ ਵਰਤੋਂਕਾਰ-ਨਾਂ:'
       password: 'ਪਛਾਣ-ਸ਼ਬਦ:'
       remember: ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ
       lost password link: ਆਪਣਾ ਪਛਾਣ-ਸ਼ਬਦ ਗੁਆ ਦਿੱਤਾ?
       login_button: ਦਾਖ਼ਲ ਹੋਵੋ
       register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ

-      no account: ਖਾਤਾ ਨਹੀਂ ਹੈ?

     destroy:
       title: ਲੌਗਆਊਟ
       heading: ਓਪਨ ਸਟਰੀਟ ਮੈਪ ਤੋਂ ਲੌਗਆਊਟ ਕਰੋ
     destroy:
       title: ਲੌਗਆਊਟ
       heading: ਓਪਨ ਸਟਰੀਟ ਮੈਪ ਤੋਂ ਲੌਗਆਊਟ ਕਰੋ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0995fe264e03fab8153ee4c4996475694d4eb839..7cb714203003c62722969aa6c01373ba3e04fae9 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -203,7 +203,6 @@ pl:
         auth_provider: Dostawca uwierzytelnienia
         auth_uid: UID uwierzytelnienia
         email: E-mail
         auth_provider: Dostawca uwierzytelnienia
         auth_uid: UID uwierzytelnienia
         email: E-mail

-        email_confirmation: Potwierdzenie adresu e‐mail

         new_email: Nowy adres e-mail
         active: Aktywny
         display_name: Wyświetlana nazwa
         new_email: Nowy adres e-mail
         active: Aktywny
         display_name: Wyświetlana nazwa


@@ -887,7 +886,7 @@ pl:
           "yes": Granica
         bridge:
           aqueduct: Akwedukt
           "yes": Granica
         bridge:
           aqueduct: Akwedukt

-          boardwalk: Promenada
+          boardwalk: Kładka drewniana

           suspension: Most wiszący
           swing: Most obrotowy
           viaduct: Most wieloprzęsłowy
           suspension: Most wiszący
           swing: Most obrotowy
           viaduct: Most wieloprzęsłowy


@@ -1957,7 +1956,7 @@ pl:
   sessions:
     new:
       title: Logowanie
   sessions:
     new:
       title: Logowanie

-      heading: Logowanie
+      tab_title: Logowanie

       email or username: Adres e-mail lub nazwa użytkownika
       password: Hasło
       remember: Zapamiętaj dane uwierzytelniające
       email or username: Adres e-mail lub nazwa użytkownika
       password: Hasło
       remember: Zapamiętaj dane uwierzytelniające


@@ -1965,34 +1964,7 @@ pl:
       login_button: Zaloguj się
       register now: Zarejestruj się
       with external: 'Alternatywnie, zaloguj się przez:'
       login_button: Zaloguj się
       register now: Zarejestruj się
       with external: 'Alternatywnie, zaloguj się przez:'

-      no account: Nie masz konta?

       auth failure: Niestety, podane dane nie pozwoliły na zalogowanie.
       auth failure: Niestety, podane dane nie pozwoliły na zalogowanie.

-      openid_logo_alt: Zaloguj się przez OpenID
-      auth_providers:
-        openid:
-          title: Zaloguj się przez OpenID
-          alt: Zaloguj się za pomocą adresu URL OpenID
-        google:
-          title: Zaloguj się przez Google
-          alt: Zaloguj się przez Google OpenID
-        facebook:
-          title: Zaloguj się przez Facebooka
-          alt: Zaloguj się przez konto Facebook
-        microsoft:
-          title: Zaloguj się przez Microsoft
-          alt: Zaloguj się kontem Microsoft
-        github:
-          title: Zaloguj się przez GitHub
-          alt: Zaloguj się przez konto GitHub
-        wikipedia:
-          title: Zaloguj się przez Wikipedię
-          alt: Zaloguj się przez konto Wikipedii
-        wordpress:
-          title: Zaloguj się przez Wordpress
-          alt: Zaloguj się przez OpenID Wordpress
-        aol:
-          title: Zaloguj się przez AOL
-          alt: Zaloguj się przez AOL OpenID

     destroy:
       title: Wyloguj się
       heading: Wyloguj się z OpenStreetMap
     destroy:
       title: Wyloguj się
       heading: Wyloguj się z OpenStreetMap


@@ -2573,6 +2545,32 @@ pl:
       oauth1_settings: Ustawienia OAuth 1
       oauth2_applications: Aplikacje OAuth 2
       oauth2_authorizations: Autoryzacje OAuth 2
       oauth1_settings: Ustawienia OAuth 1
       oauth2_applications: Aplikacje OAuth 2
       oauth2_authorizations: Autoryzacje OAuth 2

+    auth_providers:
+      openid_logo_alt: Zaloguj się przez OpenID
+      openid:
+        title: Zaloguj się przez OpenID
+        alt: Zaloguj się za pomocą adresu URL OpenID
+      google:
+        title: Zaloguj się przez Google
+        alt: Zaloguj się przez Google OpenID
+      facebook:
+        title: Zaloguj się przez Facebooka
+        alt: Zaloguj się przez konto Facebook
+      microsoft:
+        title: Zaloguj się przez Microsoft
+        alt: Zaloguj się kontem Microsoft
+      github:
+        title: Zaloguj się przez GitHub
+        alt: Zaloguj się przez konto GitHub
+      wikipedia:
+        title: Zaloguj się przez Wikipedię
+        alt: Zaloguj się przez konto Wikipedii
+      wordpress:
+        title: Zaloguj się przez Wordpress
+        alt: Zaloguj się przez OpenID Wordpress
+      aol:
+        title: Zaloguj się przez AOL
+        alt: Zaloguj się przez AOL OpenID

   oauth:
     authorize:
       title: Uwierzytelnij dostęp do konta
   oauth:
     authorize:
       title: Uwierzytelnij dostęp do konta


@@ -2723,16 +2721,14 @@ pl:
       display name description: Twoja publiczna nazwa użytkownika. Można ją później
         zmienić w ustawieniach.
       external auth: 'Logowanie przez:'
       display name description: Twoja publiczna nazwa użytkownika. Można ją później
         zmienić w ustawieniach.
       external auth: 'Logowanie przez:'

-      use external auth: Alternatywnie, zaloguj się przez...
-      auth no password: Jeśli korzystasz z logowania pośredniego, hasło nie jest wymagane,
-        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!
       continue: Zarejestruj się
       terms accepted: Dziękujemy za przyjęcie nowych Warunków uczestnictwa!

-      email_confirmation_help_html: Twój adres nie jest wyświetlany publicznie, zobacz
-        naszą %{privacy_policy_link}, aby uzyskać więcej informacji.
+      email_help_html: Twój adres nie jest wyświetlany publicznie, zobacz naszą %{privacy_policy_link},
+        aby uzyskać więcej informacji.

       privacy_policy: Polityka prywatności
       privacy_policy_title: Polityka prywatności OSMF, w tym sekcja dotycząca adresów
         e-mail
       privacy_policy: Polityka prywatności
       privacy_policy_title: Polityka prywatności OSMF, w tym sekcja dotycząca adresów
         e-mail

+      use external auth: Alternatywnie, zaloguj się przez...

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

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index a8acc3691bb6b8162ca4d60ba184c2183fe48c1d..2a7f0d26925849710ad6468fdfe6bcdcad686b5e 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -136,7 +136,6 @@ pnb:
         auth_provider: تصدیق دیݨ والا
         auth_uid: تصدیق یوآئی‌ڈی
         email: ای‌میل
         auth_provider: تصدیق دیݨ والا
         auth_uid: تصدیق یوآئی‌ڈی
         email: ای‌میل

-        email_confirmation: ای‌میل پکا کرن

         new_email: نواں ای‌میل دا پتہ
         active: سرگرم
         display_name: عوام ناں
         new_email: نواں ای‌میل دا پتہ
         active: سرگرم
         display_name: عوام ناں


@@ -1436,7 +1435,7 @@ pnb:
   sessions:
     new:
       title: لوگ‌این
   sessions:
     new:
       title: لوگ‌این

-      heading: لوگ‌این کرو
+      tab_title: لوگ‌این کرو

       email or username: 'ای‌میل دا پتہ یا ورتنوالے دا ناں:'
       password: 'پاس‌ورڈ:'
       remember: مینوں یاد رکھو
       email or username: 'ای‌میل دا پتہ یا ورتنوالے دا ناں:'
       password: 'پاس‌ورڈ:'
       remember: مینوں یاد رکھو


@@ -1444,34 +1443,7 @@ pnb:
       login_button: لوگ‌این
       register now: ہُݨے رجِستر کرو
       with external: 'لوگ‌این کرن لئی ہور چݨ سکیو:'
       login_button: لوگ‌این
       register now: ہُݨے رجِستر کرو
       with external: 'لوگ‌این کرن لئی ہور چݨ سکیو:'

-      no account: کھاتہ نہیں اے؟

       auth failure: افسوس، یہہ ویروے نال لوگ‌این کر نہیں سکدے۔
       auth failure: افسوس، یہہ ویروے نال لوگ‌این کر نہیں سکدے۔

-      openid_logo_alt: اوپن آئی ڈی ورتو
-      auth_providers:
-        openid:
-          title: اوپن آئی‌ڈی نال لوگ‌این کرو
-          alt: اوپن آئی ڈی یو آر ایل ورتو
-        google:
-          title: گوگل نال لوگ‌این کرو
-          alt: گوگل ورتو
-        facebook:
-          title: فیس‌بوک نال لوگ‌این کرو
-          alt: فیسبوک ورتو
-        microsoft:
-          title: وینڈوز لائیو نال لوگ‌این کرو
-          alt: وینڈوز لائیو ورتو
-        github:
-          title: گِٹ‌ہب نال لوگ‌این کرو
-          alt: گِٹ ہب ورتو
-        wikipedia:
-          title: وِکیپیڈیا نال لوگ‌این کرو
-          alt: وِکیپیڈیا ورتو
-        wordpress:
-          title: ورڈپریس نال لوگ‌این کرو
-          alt: ورڈ پریس ورتو
-        aol:
-          title: اے او ایل نال لوگ‌این کرو
-          alt: اے او ایل ورتو

     destroy:
       title: لوگ‌آؤٹ
       heading: اِتھے لوگ‌آوٹ کرو
     destroy:
       title: لوگ‌آؤٹ
       heading: اِتھے لوگ‌آوٹ کرو


@@ -1764,6 +1736,32 @@ pnb:
       oauth1_settings: آوتھ ورژن 1 سیٹنگاں
       oauth2_applications: آوتھ ورژن 2 اَیپ
       oauth2_authorizations: آوتھ ورژن 2 ورتݨ
       oauth1_settings: آوتھ ورژن 1 سیٹنگاں
       oauth2_applications: آوتھ ورژن 2 اَیپ
       oauth2_authorizations: آوتھ ورژن 2 ورتݨ

+    auth_providers:
+      openid_logo_alt: اوپن آئی ڈی ورتو
+      openid:
+        title: اوپن آئی‌ڈی نال لوگ‌این کرو
+        alt: اوپن آئی ڈی یو آر ایل ورتو
+      google:
+        title: گوگل نال لوگ‌این کرو
+        alt: گوگل ورتو
+      facebook:
+        title: فیس‌بوک نال لوگ‌این کرو
+        alt: فیسبوک ورتو
+      microsoft:
+        title: وینڈوز لائیو نال لوگ‌این کرو
+        alt: وینڈوز لائیو ورتو
+      github:
+        title: گِٹ‌ہب نال لوگ‌این کرو
+        alt: گِٹ ہب ورتو
+      wikipedia:
+        title: وِکیپیڈیا نال لوگ‌این کرو
+        alt: وِکیپیڈیا ورتو
+      wordpress:
+        title: ورڈپریس نال لوگ‌این کرو
+        alt: ورڈ پریس ورتو
+      aol:
+        title: اے او ایل نال لوگ‌این کرو
+        alt: اے او ایل ورتو

   oauth:
     authorize:
       allow_write_diary: روزنامچے وچ لیکھ بݨا سکدیو، ٹپݨی کریو تے دوست جوڑیو
   oauth:
     authorize:
       allow_write_diary: روزنامچے وچ لیکھ بݨا سکدیو، ٹپݨی کریو تے دوست جوڑیو

diff --git a/config/locales/ps.yml b/config/locales/ps.yml
index 2796408464d5693dc5b3b1ec48fc4f50035c180b..8f529e5c8059083e41360c529fc68a3ff0d82a07 100644 (file)
--- a/config/locales/ps.yml
+++ b/config/locales/ps.yml
@@ -335,13 +335,9 @@ ps:
   sessions:
     new:
       title: ننوتل
   sessions:
     new:
       title: ننوتل

-      heading: ننوتل
+      tab_title: ننوتل

       password: 'پټنوم:'
       login_button: ننوتل
       password: 'پټنوم:'
       login_button: ننوتل

-      auth_providers:
-        github:
-          title: د گېټ هب له لارې ننوتل
-          alt: د يو گېټ هب گڼون له لارې ننوتل

     destroy:
       title: وتل
       logout_button: وتل
     destroy:
       title: وتل
       logout_button: وتل


@@ -394,6 +390,11 @@ ps:
     trace:
       view_map: نخشه کتل
       edit_map: نخشه سمول
     trace:
       view_map: نخشه کتل
       edit_map: نخشه سمول

+  application:
+    auth_providers:
+      github:
+        title: د گېټ هب له لارې ننوتل
+        alt: د يو گېټ هب گڼون له لارې ننوتل

   oauth_clients:
     show:
       confirm: آيا تاسې ډاډه ياست؟
   oauth_clients:
     show:
       confirm: آيا تاسې ډاډه ياست؟

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index e5dd5182001d75d05df5f9e9bed61573e1e91602..1dc5c537ac548062dc9a93a372d6466b073a967d 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -179,7 +179,6 @@ pt-PT:
         auth_provider: Provedor de autenticação
         auth_uid: UID de autenticação
         email: E-mail
         auth_provider: Provedor de autenticação
         auth_uid: UID de autenticação
         email: E-mail

-        email_confirmation: E-mail de confirmação

         new_email: Novo e-mail
         active: Ativo
         display_name: Nome visualizado
         new_email: Novo e-mail
         active: Ativo
         display_name: Nome visualizado


@@ -1980,7 +1979,7 @@ pt-PT:
   sessions:
     new:
       title: Entrar
   sessions:
     new:
       title: Entrar

-      heading: Iniciar sessão
+      tab_title: Iniciar sessão

       email or username: 'E-mail ou Nome de utilizador:'
       password: Palavra-passe
       remember: Ficar autenticado entre sessões
       email or username: 'E-mail ou Nome de utilizador:'
       password: Palavra-passe
       remember: Ficar autenticado entre sessões


@@ -1988,34 +1987,7 @@ pt-PT:
       login_button: Iniciar sessão
       register now: Regista-te agora
       with external: 'Em alternativa, usa um serviço externo para iniciares sessão:'
       login_button: Iniciar sessão
       register now: Regista-te agora
       with external: 'Em alternativa, usa um serviço externo para iniciares sessão:'

-      no account: Não tens uma conta?

       auth failure: Lamentamos, mas não foi possível iniciar sessão com os dados fornecidos.
       auth failure: Lamentamos, mas não foi possível iniciar sessão com os dados fornecidos.

-      openid_logo_alt: Iniciar sessão com um OpenID
-      auth_providers:
-        openid:
-          title: Iniciar sessão com OpenID
-          alt: Iniciar sessão com um URL do OpenID
-        google:
-          title: Iniciar sessão com Google
-          alt: Iniciar sessão com um OpenID do Google
-        facebook:
-          title: Iniciar sessão com Facebook
-          alt: Iniciar sessão com uma conta Facebook
-        microsoft:
-          title: Iniciar sessão com Microsoft
-          alt: Iniciar sessão com uma conta Microsoft
-        github:
-          title: Iniciar sessão com GitHub
-          alt: Iniciar sessão com uma conta GitHub
-        wikipedia:
-          title: Iniciar sessão com a Wikipédia
-          alt: Iniciar sessão com uma conta Wikipédia
-        wordpress:
-          title: Iniciar sessão com Wordpress
-          alt: Iniciar sessão com um OpenID do Wordpress
-        aol:
-          title: Iniciar sessão com AOL
-          alt: Iniciar sessão com um OpenID da AOL

     destroy:
       title: Sair
       heading: Encerrar sessão no OpenStreetMap
     destroy:
       title: Sair
       heading: Encerrar sessão no OpenStreetMap


@@ -2665,6 +2637,32 @@ pt-PT:
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações OAuth 2
       muted_users: Utilizadores Silenciados
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações OAuth 2
       muted_users: Utilizadores Silenciados

+    auth_providers:
+      openid_logo_alt: Iniciar sessão com um OpenID
+      openid:
+        title: Iniciar sessão com OpenID
+        alt: Iniciar sessão com um URL do OpenID
+      google:
+        title: Iniciar sessão com Google
+        alt: Iniciar sessão com um OpenID do Google
+      facebook:
+        title: Iniciar sessão com Facebook
+        alt: Iniciar sessão com uma conta Facebook
+      microsoft:
+        title: Iniciar sessão com Microsoft
+        alt: Iniciar sessão com uma conta Microsoft
+      github:
+        title: Iniciar sessão com GitHub
+        alt: Iniciar sessão com uma conta GitHub
+      wikipedia:
+        title: Iniciar sessão com a Wikipédia
+        alt: Iniciar sessão com uma conta Wikipédia
+      wordpress:
+        title: Iniciar sessão com Wordpress
+        alt: Iniciar sessão com um OpenID do Wordpress
+      aol:
+        title: Iniciar sessão com AOL
+        alt: Iniciar sessão com um OpenID da AOL

   oauth:
     authorize:
       title: Autorizar Acesso À Tua Conta
   oauth:
     authorize:
       title: Autorizar Acesso À Tua Conta


@@ -2815,17 +2813,14 @@ pt-PT:
       display name description: O nome de utilizador ficará visível publicamente.
         Poderás alterar o nome posteriormente nas configurações do teu perfil.
       external auth: 'Autenticação por terceiros:'
       display name description: O nome de utilizador ficará visível publicamente.
         Poderás alterar o nome posteriormente nas configurações do teu perfil.
       external auth: 'Autenticação por terceiros:'

-      use external auth: Em alternativa, usa um serviço externo para iniciares sessão
-      auth no password: Com a autenticação através de terceiros, não é necessário
-        introduzir a palavra-passe, mas certos servidores ou ferramentas poderão precisar
-        de uma.

       continue: Criar conta
       terms accepted: Obrigado por aceitares os novos termos de contribuidor!
       continue: Criar conta
       terms accepted: Obrigado por aceitares os novos termos de contribuidor!

-      email_confirmation_help_html: O seu endereço não é mostrado publicamente. Consulte
-        a nossa %{privacy_policy_link} para mais informações.
+      email_help_html: O seu endereço não é mostrado publicamente. Consulte a nossa
+        %{privacy_policy_link} para mais informações.

       privacy_policy: política de privacidade
       privacy_policy_title: Política de privacidade da OSMF incluindo secção sobre
         endereços de correio eletrónico
       privacy_policy: política de privacidade
       privacy_policy_title: Política de privacidade da OSMF incluindo secção sobre
         endereços de correio eletrónico

+      use external auth: Em alternativa, usa um serviço externo para iniciares sessão

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

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 8d7789cd0420e54591bc24a2637a4cd55a68f8de..ff34be4a45f38de648760acdd7b4499abfc03228 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -199,7 +199,6 @@ pt:
         auth_provider: Provedor de autenticação
         auth_uid: UID de autenticação
         email: E-mail
         auth_provider: Provedor de autenticação
         auth_uid: UID de autenticação
         email: E-mail

-        email_confirmation: Confirmação do e-mail

         new_email: Novo endereço de e-mail
         active: Ativo
         display_name: Nome de exibição
         new_email: Novo endereço de e-mail
         active: Ativo
         display_name: Nome de exibição


@@ -1942,7 +1941,7 @@ pt:
   sessions:
     new:
       title: Entrar
   sessions:
     new:
       title: Entrar

-      heading: Entrar
+      tab_title: Entrar

       email or username: E-mail ou nome de usuário
       password: Senha
       remember: Lembrar neste computador
       email or username: E-mail ou nome de usuário
       password: Senha
       remember: Lembrar neste computador


@@ -1950,34 +1949,7 @@ pt:
       login_button: Entrar
       register now: Registre agora
       with external: 'Ou identifique-se através de terceiros:'
       login_button: Entrar
       register now: Registre agora
       with external: 'Ou identifique-se através de terceiros:'

-      no account: Não possui uma conta?

       auth failure: Impossível entrar com estas informações.
       auth failure: Impossível entrar com estas informações.

-      openid_logo_alt: Entrar com um OpenID
-      auth_providers:
-        openid:
-          title: Entrar com o OpenID
-          alt: Entrar com uma URL do OpenID
-        google:
-          title: Entrar com o Google
-          alt: Entrar com um OpenID da Google
-        facebook:
-          title: Entrar com o Facebook
-          alt: Entrar com uma conta do Facebook
-        microsoft:
-          title: Entrar com o Microsoft
-          alt: Entrar com uma conta do Microsoft
-        github:
-          title: Entrar com o GitHub
-          alt: Entrar com conta do GitHub
-        wikipedia:
-          title: Entrar com Wikipédia
-          alt: Entrar com uma conta da Wikipédia
-        wordpress:
-          title: Entrar com o Wordpress
-          alt: Entrar com um OpenID da Wordpress
-        aol:
-          title: Entrar com a AOL
-          alt: Entrar com um OpenID da AOL

     destroy:
       title: Sair
       heading: Sair do OpenStreetMap
     destroy:
       title: Sair
       heading: Sair do OpenStreetMap


@@ -2639,6 +2611,32 @@ pt:
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações do OAuth 2
       muted_users: Usuários silenciados
       oauth2_applications: Aplicações OAuth 2
       oauth2_authorizations: Autorizações do OAuth 2
       muted_users: Usuários silenciados

+    auth_providers:
+      openid_logo_alt: Entrar com um OpenID
+      openid:
+        title: Entrar com o OpenID
+        alt: Entrar com uma URL do OpenID
+      google:
+        title: Entrar com o Google
+        alt: Entrar com um OpenID da Google
+      facebook:
+        title: Entrar com o Facebook
+        alt: Entrar com uma conta do Facebook
+      microsoft:
+        title: Entrar com o Microsoft
+        alt: Entrar com uma conta do Microsoft
+      github:
+        title: Entrar com o GitHub
+        alt: Entrar com conta do GitHub
+      wikipedia:
+        title: Entrar com Wikipédia
+        alt: Entrar com uma conta da Wikipédia
+      wordpress:
+        title: Entrar com o Wordpress
+        alt: Entrar com um OpenID da Wordpress
+      aol:
+        title: Entrar com a AOL
+        alt: Entrar com um OpenID da AOL

   oauth:
     authorize:
       title: Autorizar acesso à sua conta
   oauth:
     authorize:
       title: Autorizar acesso à sua conta


@@ -2787,16 +2785,14 @@ pt:
       display name description: Seu nome de usuário disponível publicamente. Você
         pode mudá-lo depois nas preferências.
       external auth: 'Autenticação de Terceiros:'
       display name description: Seu nome de usuário disponível publicamente. Você
         pode mudá-lo depois nas preferências.
       external auth: 'Autenticação de Terceiros:'

-      use external auth: Ou identifique-se através de terceiros
-      auth no password: Com autenticação por terceiros não é necessária uma senha,
-        mas certas ferramentas ou o servidor talvez ainda precisem.

       continue: Registrar-se
       terms accepted: Obrigado por aceitar os novos termos de contribuição!
       continue: Registrar-se
       terms accepted: Obrigado por aceitar os novos termos de contribuição!

-      email_confirmation_help_html: Seu endereço não é exibido publicamente, consulte
-        nossa %{privacy_policy_link} para obter mais informações.
+      email_help_html: Seu endereço não é exibido publicamente, consulte nossa %{privacy_policy_link}
+        para obter mais informações.

       privacy_policy: politica de privacidade
       privacy_policy_title: Política de privacidade da OSMF incluindo seção sobre
         endereços de e-mail
       privacy_policy: politica de privacidade
       privacy_policy_title: Política de privacidade da OSMF incluindo seção sobre
         endereços de e-mail

+      use external auth: Ou identifique-se através de terceiros

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

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 21aad7862aed395ea4185fd962bc01f77bca237b..28bac391af8314e1babdf9713541833ea32a34d2 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -151,7 +151,6 @@ ro:
         auth_provider: Furnizor de autentificare
         auth_uid: Autentificare UID
         email: E-mail
         auth_provider: Furnizor de autentificare
         auth_uid: Autentificare UID
         email: E-mail

-        email_confirmation: Confirmare Email

         new_email: Adresa de e-mail nouă
         active: Activ
         display_name: Afișare nume
         new_email: Adresa de e-mail nouă
         active: Activ
         display_name: Afișare nume


@@ -1899,7 +1898,7 @@ ro:
   sessions:
     new:
       title: Autentificare
   sessions:
     new:
       title: Autentificare

-      heading: Autentificare
+      tab_title: Autentificare

       email or username: 'Adresa de e-mail sau numele de utilizator:'
       password: 'Parolă:'
       remember: Ține-mă minte
       email or username: 'Adresa de e-mail sau numele de utilizator:'
       password: 'Parolă:'
       remember: Ține-mă minte


@@ -1907,34 +1906,7 @@ ro:
       login_button: Autentificare
       register now: Formular de inregistrare
       with external: 'Alternativ, utilizați o terță parte pentru a vă conecta:'
       login_button: Autentificare
       register now: Formular de inregistrare
       with external: 'Alternativ, utilizați o terță parte pentru a vă conecta:'

-      no account: Nu aveți cont încă?

       auth failure: Ne pare rău, nu v-am putut conecta la aceste detalii.
       auth failure: Ne pare rău, nu v-am putut conecta la aceste detalii.

-      openid_logo_alt: Conectați-vă cu un OpenID
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Conectați-vă cu un URL OpenID
-        google:
-          title: Autentificare cu Google
-          alt: Conectați-vă cu un Google OpenID
-        facebook:
-          title: Autentificare cu Facebook
-          alt: Conectați-vă cu un cont Facebook
-        microsoft:
-          title: Conectare cu Microsoft
-          alt: Conectare cu un Cont Microsoft
-        github:
-          title: Conectare cu GitHub
-          alt: Conectați-vă cu un cont GitHub
-        wikipedia:
-          title: Autentificare la Wikipedia
-          alt: Conectați-vă cu un cont Wikipedia
-        wordpress:
-          title: Conectați-vă cu Wordpress
-          alt: Conectați-vă cu un cont Wordpress OpenID
-        aol:
-          title: Conectați-vă cu AOL
-          alt: Conectare cu un AOL OpenID

     destroy:
       title: Ieșire
       heading: Deconectare din OpenStreetMap
     destroy:
       title: Ieșire
       heading: Deconectare din OpenStreetMap


@@ -2601,6 +2573,32 @@ ro:
       oauth1_settings: Setări OAuth 1
       oauth2_applications: Aplicații OAuth 2
       oauth2_authorizations: Autorizări OAuth 2
       oauth1_settings: Setări OAuth 1
       oauth2_applications: Aplicații OAuth 2
       oauth2_authorizations: Autorizări OAuth 2

+    auth_providers:
+      openid_logo_alt: Conectați-vă cu un OpenID
+      openid:
+        title: Login with OpenID
+        alt: Conectați-vă cu un URL OpenID
+      google:
+        title: Autentificare cu Google
+        alt: Conectați-vă cu un Google OpenID
+      facebook:
+        title: Autentificare cu Facebook
+        alt: Conectați-vă cu un cont Facebook
+      microsoft:
+        title: Conectare cu Microsoft
+        alt: Conectare cu un Cont Microsoft
+      github:
+        title: Conectare cu GitHub
+        alt: Conectați-vă cu un cont GitHub
+      wikipedia:
+        title: Autentificare la Wikipedia
+        alt: Conectați-vă cu un cont Wikipedia
+      wordpress:
+        title: Conectați-vă cu Wordpress
+        alt: Conectați-vă cu un cont Wordpress OpenID
+      aol:
+        title: Conectați-vă cu AOL
+        alt: Conectare cu un AOL OpenID

   oauth:
     authorize:
       title: Autorizați accesul la contul dvs.
   oauth:
     authorize:
       title: Autorizați accesul la contul dvs.


@@ -2750,16 +2748,14 @@ ro:
       display name description: Numele dvs. de utilizator afișat public. Puteți schimba
         acest lucru mai târziu în preferințe.
       external auth: 'Verificarea terță parte:'
       display name description: Numele dvs. de utilizator afișat public. Puteți schimba
         acest lucru mai târziu în preferințe.
       external auth: 'Verificarea terță parte:'

-      use external auth: 'Alternativ, utilizați o terță parte pentru a vă conecta:'
-      auth no password: Cu autentificarea unei terțe parte nu este necesară o parolă,
-        dar unele instrumente suplimentare sau serverul pot avea nevoie de una.

       continue: Înregistrare
       terms accepted: Vă mulțumim pentru acceptarea noilor termeni de contribuire!
       continue: Înregistrare
       terms accepted: Vă mulțumim pentru acceptarea noilor termeni de contribuire!

-      email_confirmation_help_html: Adresa dvs. nu este afișată public, consultați
-        %{privacy_policy_link} pentru mai multe informații.
+      email_help_html: Adresa dvs. nu este afișată public, consultați %{privacy_policy_link}
+        pentru mai multe informații.

       privacy_policy: Politica de confidențialitate
       privacy_policy_title: Politica de confidențialitate OSMF, inclusiv secțiunea
         privind adresele de e-mail
       privacy_policy: Politica de confidențialitate
       privacy_policy_title: Politica de confidențialitate OSMF, inclusiv secțiunea
         privind adresele de e-mail

+      use external auth: 'Alternativ, utilizați o terță parte pentru a vă conecta:'

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

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2b07655a6d1a7daff20676c1ecc46f57395e7c4b..c5c6a89b70d9e63c03bfa295d52ce7289ab277d2 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -248,7 +248,6 @@ ru:
         auth_provider: Провайдер аутентификации
         auth_uid: UID аутентификации
         email: Адрес электронной почты
         auth_provider: Провайдер аутентификации
         auth_uid: UID аутентификации
         email: Адрес электронной почты

-        email_confirmation: Подтверждение электронной почты

         new_email: Новый адрес электронной почты
         active: Активен
         display_name: Отображаемое имя
         new_email: Новый адрес электронной почты
         active: Активен
         display_name: Отображаемое имя


@@ -2031,7 +2030,7 @@ ru:
   sessions:
     new:
       title: Представьтесь
   sessions:
     new:
       title: Представьтесь

-      heading: Представьтесь
+      tab_title: Представьтесь

       email or username: 'Эл. почта или имя пользователя:'
       password: Пароль
       remember: Запомнить меня
       email or username: 'Эл. почта или имя пользователя:'
       password: Пароль
       remember: Запомнить меня


@@ -2039,34 +2038,7 @@ ru:
       login_button: Представиться
       register now: Зарегистрируйтесь
       with external: 'Кроме того, можете воспользоваться аккаунтом на другом сайте:'
       login_button: Представиться
       register now: Зарегистрируйтесь
       with external: 'Кроме того, можете воспользоваться аккаунтом на другом сайте:'

-      no account: Нет учётной записи?

       auth failure: Извините, вход с этими именем или паролем невозможен.
       auth failure: Извините, вход с этими именем или паролем невозможен.

-      openid_logo_alt: Войти с помощью OpenID
-      auth_providers:
-        openid:
-          title: Войти с помощью OpenID
-          alt: Войти с помощью OpenID URL
-        google:
-          title: Войти с помощью Google
-          alt: Войти с помощью  Google OpenID
-        facebook:
-          title: Войти с помощью Facebook
-          alt: Войти с помощью учётной записи в Facebook
-        microsoft:
-          title: Войти с помощью Microsoft
-          alt: Войти с помощью учётной записи Microsoft
-        github:
-          title: Войти с GitHub
-          alt: Войти с учётной записи на GitHub
-        wikipedia:
-          title: Войти с помощью Википедии
-          alt: Вход с использованием учётной записи в Википедии
-        wordpress:
-          title: Войти с помощью Wordpress
-          alt: Войти с помощью Wordpress OpenI
-        aol:
-          title: Войти с помощью AOL
-          alt: Войти с помощью AOL OpenID

     destroy:
       title: Выйти
       heading: Выйти из OpenStreetMap
     destroy:
       title: Выйти
       heading: Выйти из OpenStreetMap


@@ -2636,6 +2608,32 @@ ru:
       oauth1_settings: Настройки OAuth 1
       oauth2_applications: OAuth 2 приложения
       oauth2_authorizations: OAuth 2 авторизации
       oauth1_settings: Настройки OAuth 1
       oauth2_applications: OAuth 2 приложения
       oauth2_authorizations: OAuth 2 авторизации

+    auth_providers:
+      openid_logo_alt: Войти с помощью OpenID
+      openid:
+        title: Войти с помощью OpenID
+        alt: Войти с помощью OpenID URL
+      google:
+        title: Войти с помощью Google
+        alt: Войти с помощью  Google OpenID
+      facebook:
+        title: Войти с помощью Facebook
+        alt: Войти с помощью учётной записи в Facebook
+      microsoft:
+        title: Войти с помощью Microsoft
+        alt: Войти с помощью учётной записи Microsoft
+      github:
+        title: Войти с GitHub
+        alt: Войти с учётной записи на GitHub
+      wikipedia:
+        title: Войти с помощью Википедии
+        alt: Вход с использованием учётной записи в Википедии
+      wordpress:
+        title: Войти с помощью Wordpress
+        alt: Войти с помощью Wordpress OpenI
+      aol:
+        title: Войти с помощью AOL
+        alt: Войти с помощью AOL OpenID

   oauth:
     authorize:
       title: Разрешить доступ к вашей учётной записи
   oauth:
     authorize:
       title: Разрешить доступ к вашей учётной записи


@@ -2781,16 +2779,14 @@ ru:
       display name description: Ваше имя, как оно будет видно другим пользователям.
         Вы сможете изменить его позже в настройках.
       external auth: 'Внешний сайт с учётной записью:'
       display name description: Ваше имя, как оно будет видно другим пользователям.
         Вы сможете изменить его позже в настройках.
       external auth: 'Внешний сайт с учётной записью:'

-      use external auth: Либо воспользуйтесь аккаунтом с другого сайта
-      auth no password: С внешним логином пароль не обязателен, но в некоторых случаях
-        он необходим

       continue: Зарегистрироваться
       terms accepted: Спасибо за принятие новых условий участия!
       continue: Зарегистрироваться
       terms accepted: Спасибо за принятие новых условий участия!

-      email_confirmation_help_html: Ваш адрес не отображается публично, см. нашу %{privacy_policy_link}
+      email_help_html: Ваш адрес не отображается публично, см. нашу %{privacy_policy_link}

         для получения дополнительной информации.
       privacy_policy: политику конфиденциальности
       privacy_policy_title: Политика конфиденциальности OSMF, включая раздел об адресах
         электронной почты
         для получения дополнительной информации.
       privacy_policy: политику конфиденциальности
       privacy_policy_title: Политика конфиденциальности OSMF, включая раздел об адресах
         электронной почты

+      use external auth: Либо воспользуйтесь аккаунтом с другого сайта

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

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index 31cd0a1c5c35a3fa1a60d54c31e2243796937984..9c891f96c80b55628198854589b66e3e7901c030 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -531,18 +531,12 @@ sat:
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ
   sessions:
     new:
       title: ᱵᱚᱞᱚᱜ ᱢᱮ

-      heading: ᱵᱚᱞᱚᱜ ᱢᱮ
+      tab_title: ᱵᱚᱞᱚᱜ ᱢᱮ

       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
       register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ
       password: 'ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ:'
       remember: ᱫᱤᱥᱟᱹᱭᱤᱧ ᱢᱮ
       lost password link: ᱟᱢᱟᱜ ᱫᱟᱱᱟᱝ ᱥᱟᱵᱟᱫᱽ ᱟᱫᱟᱠᱟᱫᱟᱢ?
       login_button: ᱵᱚᱞᱚᱜ ᱢᱮ
       register now: ᱱᱤᱛᱜᱮ ᱚᱞ ᱦᱚᱪᱚᱜ ᱢᱮ

-      no account: ᱠᱷᱟᱛᱟ ᱵᱟᱱᱩᱜ ᱛᱟᱢᱟ?
-      auth_providers:
-        github:
-          title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
-        wikipedia:
-          title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ

     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ
     destroy:
       title: ᱩᱰᱩᱜᱚᱜᱢᱮ
       logout_button: ᱩᱰᱩᱜᱚᱜᱢᱮ


@@ -615,6 +609,12 @@ sat:
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ
       view_map: ᱱᱚᱠᱥᱟ ᱧᱮᱞ ᱢᱮ
       edit_map: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       public: ᱦᱚᱲ ᱠᱚᱣᱟ

+  application:
+    auth_providers:
+      github:
+        title: ᱜᱤᱴᱦᱚᱵ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ
+      wikipedia:
+        title: ᱩᱭᱠᱤᱯᱤᱰᱤᱭᱟ ᱥᱟᱣᱛᱮ ᱞᱚᱜᱤᱱ ᱢᱮ

   oauth:
     authorize:
       allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾
   oauth:
     authorize:
       allow_write_api: ᱱᱚᱠᱥᱟ ᱵᱚᱫᱚᱞ ᱢᱮ ᱾

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 541977c724aa71bcfcdb91258b489ec03e6dd007..c6d0c1b60578aa7ad30be2f9ff225ef9c08d4e47 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -136,7 +136,6 @@ sc:
         auth_provider: Frunidore de autenticatzione
         auth_uid: UID de autenticatzione
         email: E-lìtera
         auth_provider: Frunidore de autenticatzione
         auth_uid: UID de autenticatzione
         email: E-lìtera

-        email_confirmation: Cunfirma de s'indiritzu de posta eletrònica

         new_email: Indiritzu nou de posta eletrònica
         active: Ativu
         display_name: Nùmene ammustradu
         new_email: Indiritzu nou de posta eletrònica
         active: Ativu
         display_name: Nùmene ammustradu


@@ -1888,7 +1887,7 @@ sc:
   sessions:
     new:
       title: Intra
   sessions:
     new:
       title: Intra

-      heading: Intra
+      tab_title: Intra

       email or username: 'Indiritzu de posta o nùmene de utente:'
       password: 'Crae:'
       remember: Ammenta·ti de mene
       email or username: 'Indiritzu de posta o nùmene de utente:'
       password: 'Crae:'
       remember: Ammenta·ti de mene


@@ -1896,34 +1895,7 @@ sc:
       login_button: Intra
       register now: Registra·ti como
       with external: 'In alternativa, intra impreende unu servìtziu esternu:'
       login_button: Intra
       register now: Registra·ti como
       with external: 'In alternativa, intra impreende unu servìtziu esternu:'

-      no account: Non tenes unu contu?

       auth failure: Non podes intrare cun custos detàllios.
       auth failure: Non podes intrare cun custos detàllios.

-      openid_logo_alt: Intra cun un'OpenID
-      auth_providers:
-        openid:
-          title: Intra cun OpenID
-          alt: Intra cun un'URL de OpenID
-        google:
-          title: Intra cun Google
-          alt: Intra cun un'OpenID de Google
-        facebook:
-          title: Intra cun Facebook
-          alt: Intra cun unu contu de Facebook
-        microsoft:
-          title: Intra cun Microsoft
-          alt: Intra cun unu contu de Microsoft
-        github:
-          title: Intra cun GitHub
-          alt: Intra cun unu contu de GitHub
-        wikipedia:
-          title: Intra cun Wikipedia
-          alt: Intra cun unu contu de Wikipedia
-        wordpress:
-          title: Intra cun Wordpress
-          alt: Intra cun un'OpenID de Wordpress
-        aol:
-          title: Intra cun AOL
-          alt: Intra cun un'OpenID de AOL

     destroy:
       title: Essi
       heading: Essi dae OpenStreetMap
     destroy:
       title: Essi
       heading: Essi dae OpenStreetMap


@@ -2576,6 +2548,32 @@ sc:
       oauth1_settings: Impostatziones OAuth 1
       oauth2_applications: Aplicatziones OAuth 2
       oauth2_authorizations: Autorizatziones OAuth 2
       oauth1_settings: Impostatziones OAuth 1
       oauth2_applications: Aplicatziones OAuth 2
       oauth2_authorizations: Autorizatziones OAuth 2

+    auth_providers:
+      openid_logo_alt: Intra cun un'OpenID
+      openid:
+        title: Intra cun OpenID
+        alt: Intra cun un'URL de OpenID
+      google:
+        title: Intra cun Google
+        alt: Intra cun un'OpenID de Google
+      facebook:
+        title: Intra cun Facebook
+        alt: Intra cun unu contu de Facebook
+      microsoft:
+        title: Intra cun Microsoft
+        alt: Intra cun unu contu de Microsoft
+      github:
+        title: Intra cun GitHub
+        alt: Intra cun unu contu de GitHub
+      wikipedia:
+        title: Intra cun Wikipedia
+        alt: Intra cun unu contu de Wikipedia
+      wordpress:
+        title: Intra cun Wordpress
+        alt: Intra cun un'OpenID de Wordpress
+      aol:
+        title: Intra cun AOL
+        alt: Intra cun un'OpenID de AOL

   oauth:
     authorize:
       title: Autoriza s'atzessu a su contu tuo
   oauth:
     authorize:
       title: Autoriza s'atzessu a su contu tuo


@@ -2725,18 +2723,15 @@ sc:
       display name description: Su nùmene de utente chi s'at a mustrare in manera
         pùblica. Lu podes cambiare prus a tardu in sas preferèntzias.
       external auth: 'Autenticatzione pro mèdiu de unu servìtziu esternu:'
       display name description: Su nùmene de utente chi s'at a mustrare in manera
         pùblica. Lu podes cambiare prus a tardu in sas preferèntzias.
       external auth: 'Autenticatzione pro mèdiu de unu servìtziu esternu:'

-      use external auth: 'In alternativa, intra impreende unu servìtziu esternu:'
-      auth no password: Cun s'autenticatzione pro mèdiu de tertzas partes non serbit
-        una crae de intrada ma carchi aina o serbidore agiuntivu nde diat pòdere tènnere
-        bisòngiu su matessi.

       continue: Iscrie·ti
       terms accepted: Ti torramus gràtzias pro àere atzetadu sas cunditziones noas
         de collaboratzione.
       continue: Iscrie·ti
       terms accepted: Ti torramus gràtzias pro àere atzetadu sas cunditziones noas
         de collaboratzione.

-      email_confirmation_help_html: S'indiritzu tuo no est ammustradu in manera pùblica,
-        consulta sa %{privacy_policy_link} pro àteras informatziones.
+      email_help_html: S'indiritzu tuo no est ammustradu in manera pùblica, consulta
+        sa %{privacy_policy_link} pro àteras informatziones.

       privacy_policy: polìtica de riservadesa
       privacy_policy_title: Informativa subra de sa riservadesa de sa Fundatzione
         OSM chi incluet sa setzione subra de sos indiritzos de posta eletrònica
       privacy_policy: polìtica de riservadesa
       privacy_policy_title: Informativa subra de sa riservadesa de sa Fundatzione
         OSM chi incluet sa setzione subra de sos indiritzos de posta eletrònica

+      use external auth: 'In alternativa, intra impreende unu servìtziu esternu:'

     terms:
       title: Tèrmines
       heading: Tèrmines
     terms:
       title: Tèrmines
       heading: Tèrmines

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index e4983f4f4cd53a6fd933f7b169d793c20eba024b..8b89f6ba97541b9922ce6d9dfc968b9b01485bec 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -125,7 +125,6 @@ scn:
         description: Discrizzioni
       user:
         email: Posta elittrònica
         description: Discrizzioni
       user:
         email: Posta elittrònica

-        email_confirmation: 'Cunvàlida dâ posta elittrònica:'

         new_email: Nnirizzu di posta elittrònica novu
         active: Attivu
         display_name: Nomu ammustratu
         new_email: Nnirizzu di posta elittrònica novu
         active: Attivu
         display_name: Nomu ammustratu


@@ -1282,7 +1281,7 @@ scn:
   sessions:
     new:
       title: Trasi
   sessions:
     new:
       title: Trasi

-      heading: Trasi
+      tab_title: Trasi

       email or username: 'Nnirizzu di posta elittrònica o nomu utenti:'
       password: 'Palora d''òrdini:'
       remember: Arricòrdati di mìa
       email or username: 'Nnirizzu di posta elittrònica o nomu utenti:'
       password: 'Palora d''òrdini:'
       remember: Arricòrdati di mìa


@@ -1290,34 +1289,7 @@ scn:
       login_button: Trasi
       register now: Scrìviti ora
       with external: 'O puru, trasi pi menzu di na terza parti:'
       login_button: Trasi
       register now: Scrìviti ora
       with external: 'O puru, trasi pi menzu di na terza parti:'

-      no account: Nun hai un cuntu?

       auth failure: Purtroppu nun fu pussìbbili tràsiri cu sti dittagghî.
       auth failure: Purtroppu nun fu pussìbbili tràsiri cu sti dittagghî.

-      openid_logo_alt: Trasi cu n'OpenID
-      auth_providers:
-        openid:
-          title: Trasi cu n'OpenID
-          alt: Trasi cu n'URL OpenID
-        google:
-          title: Trasi cu Google
-          alt: Trasi cu n'OpenID di Google
-        facebook:
-          title: Trasi cu Facebook
-          alt: Trasi cûn cuntu di Facebook
-        microsoft:
-          title: Trasi cu Windows Live
-          alt: Trasi cûn cuntu di Windows Live
-        github:
-          title: Trasi cu GitHub
-          alt: Trasi c'un cuntu GitHub
-        wikipedia:
-          title: Trasi cu Wikipedia
-          alt: Trasi c'un cuntu Wikipedia
-        wordpress:
-          title: Trasi cu Wordpress
-          alt: Trasi cu n'OpenID di Wordpress
-        aol:
-          title: Trasi cu AOL
-          alt: Trasi cu n'OpenID d'AOL

     destroy:
       title: Nesci
       heading: Nesci d'OpenStreetMap
     destroy:
       title: Nesci
       heading: Nesci d'OpenStreetMap


@@ -1657,6 +1629,32 @@ scn:
     settings_menu:
       account_settings: Mpustazzioni cuntu
       oauth1_settings: Mpustazzioni OAuth
     settings_menu:
       account_settings: Mpustazzioni cuntu
       oauth1_settings: Mpustazzioni OAuth

+    auth_providers:
+      openid_logo_alt: Trasi cu n'OpenID
+      openid:
+        title: Trasi cu n'OpenID
+        alt: Trasi cu n'URL OpenID
+      google:
+        title: Trasi cu Google
+        alt: Trasi cu n'OpenID di Google
+      facebook:
+        title: Trasi cu Facebook
+        alt: Trasi cûn cuntu di Facebook
+      microsoft:
+        title: Trasi cu Windows Live
+        alt: Trasi cûn cuntu di Windows Live
+      github:
+        title: Trasi cu GitHub
+        alt: Trasi c'un cuntu GitHub
+      wikipedia:
+        title: Trasi cu Wikipedia
+        alt: Trasi c'un cuntu Wikipedia
+      wordpress:
+        title: Trasi cu Wordpress
+        alt: Trasi cu n'OpenID di Wordpress
+      aol:
+        title: Trasi cu AOL
+        alt: Trasi cu n'OpenID d'AOL

   oauth:
     authorize:
       title: Auturizzari l'accessu ô tò cuntu
   oauth:
     authorize:
       title: Auturizzari l'accessu ô tò cuntu


@@ -1748,12 +1746,10 @@ scn:
       display name description: Lu tò nomu d'utenti comu veni ammustratu pubblicamenti.
         Appoi lu poi canciari ntê prifirenzi.
       external auth: 'Autinticazzioni di terzi parti:'
       display name description: Lu tò nomu d'utenti comu veni ammustratu pubblicamenti.
         Appoi lu poi canciari ntê prifirenzi.
       external auth: 'Autinticazzioni di terzi parti:'

-      use external auth: O puru, trasi pi menzu di na terza parti
-      auth no password: Cu l'autinticazzioni di terzi parti nun ci voli na palora
-        d'òrdini, pirò certi strummenti o sirventi nni ponnu addumannari una lu stissu.

       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!

+      use external auth: O puru, trasi pi menzu di na terza parti

     terms:
       title: Cunnizzioni
       heading: Cunnizzioni
     terms:
       title: Cunnizzioni
       heading: Cunnizzioni

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 389717a4e0cf52090eae8b4b6bca1a78e458bd0c..ac968b36b5c00f2096f30e4a0c5e8f714a91492e 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -799,29 +799,6 @@ sco:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:

-    new:
-      auth_providers:
-        google:
-          title: Login wi Google
-          alt: Login wi a Google OpenID
-        facebook:
-          title: Login wi Facebook
-          alt: Login wi a Facebook Accoont
-        microsoft:
-          title: Login wi Windows Live
-          alt: Login wi a Windows Live Accoont
-        github:
-          title: Login wi GitHub
-          alt: Login wi a GitHub Account
-        wikipedia:
-          title: Login wi Wikipedia
-          alt: Login wi a Wikipedia Accoont
-        wordpress:
-          title: Login wi Wordpress
-          alt: Login wi a Wordpress OpenID
-        aol:
-          title: Login wi AOL
-          alt: Login wi an AOL OpenID

     destroy:
       title: Logoot
       heading: Logoot frae OpenStreetMap
     destroy:
       title: Logoot
       heading: Logoot frae OpenStreetMap


@@ -922,6 +899,29 @@ sco:
   traces:
     create:
       upload_trace: Uplaid GPS Trace
   traces:
     create:
       upload_trace: Uplaid GPS Trace

+  application:
+    auth_providers:
+      google:
+        title: Login wi Google
+        alt: Login wi a Google OpenID
+      facebook:
+        title: Login wi Facebook
+        alt: Login wi a Facebook Accoont
+      microsoft:
+        title: Login wi Windows Live
+        alt: Login wi a Windows Live Accoont
+      github:
+        title: Login wi GitHub
+        alt: Login wi a GitHub Account
+      wikipedia:
+        title: Login wi Wikipedia
+        alt: Login wi a Wikipedia Accoont
+      wordpress:
+        title: Login wi Wordpress
+        alt: Login wi a Wordpress OpenID
+      aol:
+        title: Login wi AOL
+        alt: Login wi an AOL OpenID

   users:
     show:
       edits: Eedits
   users:
     show:
       edits: Eedits

diff --git a/config/locales/sh.yml b/config/locales/sh.yml
index 5576d97f7d6d7744c3e71fb76caf98f4b21db872..a785e42292405fcd9e716014f8b065363b2f4914 100644 (file)
--- a/config/locales/sh.yml
+++ b/config/locales/sh.yml
@@ -127,7 +127,6 @@ sh:
       user:
         auth_provider: Davatelj autentifikacije
         email: Imejl
       user:
         auth_provider: Davatelj autentifikacije
         email: Imejl

-        email_confirmation: Potvrda imejla

         new_email: Nova imejl adresa
         active: Aktivan
         display_name: Ime za prikaz
         new_email: Nova imejl adresa
         active: Aktivan
         display_name: Ime za prikaz


@@ -591,7 +590,7 @@ sh:
   sessions:
     new:
       title: Prijava
   sessions:
     new:
       title: Prijava

-      heading: Prijava
+      tab_title: Prijava

       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me


@@ -599,13 +598,7 @@ sh:
       login_button: Prijava
       register now: Registrirajte se sada
       with external: 'Ili koristite vanjski servis:'
       login_button: Prijava
       register now: Registrirajte se sada
       with external: 'Ili koristite vanjski servis:'

-      no account: Nemate račun?

       auth failure: Žao nam je, ne možemo vas prijaviti s ovim detaljima.
       auth failure: Žao nam je, ne možemo vas prijaviti s ovim detaljima.

-      openid_logo_alt: Prijavi se sa OpenID-om
-      auth_providers:
-        openid:
-          title: Prijavi se sa OpenID-om
-          alt: Prijavi se sa URL-om OpenID-a

     suspended_flash:
       suspended: Nažalost, vaš je račun obustavljen zbog sumnjive aktivnosti.
       contact_support_html: Molimo kontaktirajte %{support_link} ako želite razgovarati
     suspended_flash:
       suspended: Nažalost, vaš je račun obustavljen zbog sumnjive aktivnosti.
       contact_support_html: Molimo kontaktirajte %{support_link} ako želite razgovarati


@@ -775,6 +768,11 @@ sh:
       oauth1_settings: OAuth 1 postavke
       oauth2_applications: OAuth 2 prilozi
       oauth2_authorizations: OAuth 2 ovlaštenja
       oauth1_settings: OAuth 1 postavke
       oauth2_applications: OAuth 2 prilozi
       oauth2_authorizations: OAuth 2 ovlaštenja

+    auth_providers:
+      openid_logo_alt: Prijavi se sa OpenID-om
+      openid:
+        title: Prijavi se sa OpenID-om
+        alt: Prijavi se sa URL-om OpenID-a

   oauth:
     authorize:
       title: Autorizujte pristup svom računu
   oauth:
     authorize:
       title: Autorizujte pristup svom računu

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0ac667e3f1c3b8faa9b1e875d3067dd8c0951a1c..afa190cd9137808bdd1b342b9d31c0012a66b447 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -156,7 +156,6 @@ sk:
         auth_provider: Poskytovateľ overenia
         auth_uid: UID overenia
         email: E-mail
         auth_provider: Poskytovateľ overenia
         auth_uid: UID overenia
         email: E-mail

-        email_confirmation: Potvrdenie e-mailu

         new_email: Nová e-mailová adresa
         active: Aktívny
         display_name: Zobrazované meno
         new_email: Nová e-mailová adresa
         active: Aktívny
         display_name: Zobrazované meno


@@ -1774,7 +1773,7 @@ sk:
   sessions:
     new:
       title: Prihlásiť sa
   sessions:
     new:
       title: Prihlásiť sa

-      heading: Prihlásenie
+      tab_title: Prihlásenie

       email or username: E-mailová adresa alebo prihlasovacie meno
       password: Heslo
       remember: Zapamätať
       email or username: E-mailová adresa alebo prihlasovacie meno
       password: Heslo
       remember: Zapamätať


@@ -1782,34 +1781,7 @@ sk:
       login_button: Prihlásiť
       register now: Zaregistrujte se
       with external: 'Prípadne použite na prihlásenie služby tretích strán:'
       login_button: Prihlásiť
       register now: Zaregistrujte se
       with external: 'Prípadne použite na prihlásenie služby tretích strán:'

-      no account: Nemáte konto?

       auth failure: Ľutujeme, s uvedenými údajmi sa nie je možné prihlásiť.
       auth failure: Ľutujeme, s uvedenými údajmi sa nie je možné prihlásiť.

-      openid_logo_alt: Prihlásenie pomocou OpenID
-      auth_providers:
-        openid:
-          title: Prihlásenie sa pomocou OpenID
-          alt: Prihlásenie sa pomocou OpenID URL
-        google:
-          title: Prihlásenie sa pomocou Google
-          alt: Prihlásenie sa pomocou Google OpenID
-        facebook:
-          title: Prihlásenie sa pomocou Facebooku
-          alt: Prihlásenie sa pomocou účtu na Facebooku
-        microsoft:
-          title: Prihlásenie sa pomocou účtu Microsoft
-          alt: Prihlásenie sa pomocou účtu Microsoft
-        github:
-          title: Prihlásiť sa cez GitHub
-          alt: Prihlásiť sa pomocou účtu na GitHube
-        wikipedia:
-          title: Prihlásiť sa pomocou Wikipédie
-          alt: Prihláste sa pomocou účtu Wikipedia
-        wordpress:
-          title: Prihlásenie sa pomocou Wordpress
-          alt: Prihlásenie sa pomocou Wordpress OpenID
-        aol:
-          title: Prihlásenie sa pomocou AOL
-          alt: Prihlásenie sa pomocou AOL OpenID

     destroy:
       title: Odhlásenie
       heading: Odhlásenie z OpenStreetMap
     destroy:
       title: Odhlásenie
       heading: Odhlásenie z OpenStreetMap


@@ -2346,6 +2318,32 @@ sk:
       oauth1_settings: Nastavenia OAuth 1
       oauth2_applications: Aplikácie OAuth 2
       oauth2_authorizations: Autorizácie OAuth 2
       oauth1_settings: Nastavenia OAuth 1
       oauth2_applications: Aplikácie OAuth 2
       oauth2_authorizations: Autorizácie OAuth 2

+    auth_providers:
+      openid_logo_alt: Prihlásenie pomocou OpenID
+      openid:
+        title: Prihlásenie sa pomocou OpenID
+        alt: Prihlásenie sa pomocou OpenID URL
+      google:
+        title: Prihlásenie sa pomocou Google
+        alt: Prihlásenie sa pomocou Google OpenID
+      facebook:
+        title: Prihlásenie sa pomocou Facebooku
+        alt: Prihlásenie sa pomocou účtu na Facebooku
+      microsoft:
+        title: Prihlásenie sa pomocou účtu Microsoft
+        alt: Prihlásenie sa pomocou účtu Microsoft
+      github:
+        title: Prihlásiť sa cez GitHub
+        alt: Prihlásiť sa pomocou účtu na GitHube
+      wikipedia:
+        title: Prihlásiť sa pomocou Wikipédie
+        alt: Prihláste sa pomocou účtu Wikipedia
+      wordpress:
+        title: Prihlásenie sa pomocou Wordpress
+        alt: Prihlásenie sa pomocou Wordpress OpenID
+      aol:
+        title: Prihlásenie sa pomocou AOL
+        alt: Prihlásenie sa pomocou AOL OpenID

   oauth:
     authorize:
       request_access_html: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}).
   oauth:
     authorize:
       request_access_html: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}).


@@ -2456,13 +2454,13 @@ sk:
       display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom
         zmeniť v nastaveniach.
       external auth: 'Autentifikácia treťou stranou:'
       display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom
         zmeniť v nastaveniach.
       external auth: 'Autentifikácia treťou stranou:'

-      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!
       continue: Zaregistrovať sa
       terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania!

-      email_confirmation_help_html: Vaša adresa sa nezobrazuje verejne, pre ďalšie
-        informácie venujte pozornosť našim %{privacy_policy_link}.
+      email_help_html: Vaša adresa sa nezobrazuje verejne, pre ďalšie informácie venujte
+        pozornosť našim %{privacy_policy_link}.

       privacy_policy_title: Pravidlá ochrany osobných údajov OSMF vrátane sekcie o
         e-mailových adresách
       privacy_policy_title: Pravidlá ochrany osobných údajov OSMF vrátane sekcie o
         e-mailových adresách

+      use external auth: Prípadne použite na prihlásenie služby tretích strán

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

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 6599330b0e5e18e43b2edd47178755edae7ef983..bcfccddd12b044aebae6e039fc3890e15aa3cd56 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -123,7 +123,6 @@ skr-arab:
         description: تفصیل
       user:
         email: ای میل
         description: تفصیل
       user:
         email: ای میل

-        email_confirmation: ای میل دی تصدیق

         new_email: نواں ای میل پتہ
         active: متحرک
         display_name: ظاہری ناں
         new_email: نواں ای میل پتہ
         active: متحرک
         display_name: ظاہری ناں


@@ -1099,33 +1098,12 @@ skr-arab:
   sessions:
     new:
       title: لاگ ان
   sessions:
     new:
       title: لاگ ان

-      heading: لاگ ان
+      tab_title: لاگ ان

       email or username: ای میل پتہ یا ورتݨ ناں
       password: پاس ورڈ
       remember: میکوں یاد رکھو
       lost password link: پاسورڈ بھل ڳئے ہو؟
       login_button: لاگ ان
       email or username: ای میل پتہ یا ورتݨ ناں
       password: پاس ورڈ
       remember: میکوں یاد رکھو
       lost password link: پاسورڈ بھل ڳئے ہو؟
       login_button: لاگ ان

-      openid_logo_alt: اوپن آئی ڈی نال لاگ ان تھیوو
-      auth_providers:
-        openid:
-          title: اوپن آئی ڈی نال لاگ ان تھیوو
-          alt: اوپن آئی ڈی یوآرایل نال لاگ ان تھیوو
-        google:
-          title: گوگل نال لاگ ان تھیوو
-          alt: گوگل اوپن آئی ڈی نال لاگ ان تھیوو
-        facebook:
-          title: فیس بک نال لاگ ان تھیوو
-        microsoft:
-          title: مائیکروسافٹ نال لاگ ان تھیوو
-          alt: مائیکروسافٹ کھاتے نال لاگ ان تھیوو
-        github:
-          title: گٹ ہب نال لاگ ان تھیوو
-          alt: گٹ ہب کھاتے نال لاگ ان تھیوو
-        wikipedia:
-          title: وکی پیڈیا نال لاگ ان تھیوو
-          alt: وکی پیڈیا کھاتے نال لاگ ان تھیوو
-        wordpress:
-          title: ورڈپریس نال لاگ ان تھیوو

     destroy:
       title: لاگ آؤٹ
       logout_button: لاگ آؤٹ
     destroy:
       title: لاگ آؤٹ
       logout_button: لاگ آؤٹ


@@ -1277,6 +1255,27 @@ skr-arab:
   application:
     settings_menu:
       account_settings: کھاتہ ترتیباں
   application:
     settings_menu:
       account_settings: کھاتہ ترتیباں

+    auth_providers:
+      openid_logo_alt: اوپن آئی ڈی نال لاگ ان تھیوو
+      openid:
+        title: اوپن آئی ڈی نال لاگ ان تھیوو
+        alt: اوپن آئی ڈی یوآرایل نال لاگ ان تھیوو
+      google:
+        title: گوگل نال لاگ ان تھیوو
+        alt: گوگل اوپن آئی ڈی نال لاگ ان تھیوو
+      facebook:
+        title: فیس بک نال لاگ ان تھیوو
+      microsoft:
+        title: مائیکروسافٹ نال لاگ ان تھیوو
+        alt: مائیکروسافٹ کھاتے نال لاگ ان تھیوو
+      github:
+        title: گٹ ہب نال لاگ ان تھیوو
+        alt: گٹ ہب کھاتے نال لاگ ان تھیوو
+      wikipedia:
+        title: وکی پیڈیا نال لاگ ان تھیوو
+        alt: وکی پیڈیا کھاتے نال لاگ ان تھیوو
+      wordpress:
+        title: ورڈپریس نال لاگ ان تھیوو

   oauth2_applications:
     index:
       name: ناں
   oauth2_applications:
     index:
       name: ناں

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f6e593111f206ce4d7703b5213045c9ece986f13..5a26e34239466e9c60592dbd8996c25b05199e5b 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -156,7 +156,6 @@ sl:
         auth_provider: Ponudnik avtentikacije
         auth_uid: UID avtentikacije
         email: E-poštni naslov
         auth_provider: Ponudnik avtentikacije
         auth_uid: UID avtentikacije
         email: E-poštni naslov

-        email_confirmation: Potrditev e-pošte

         new_email: Novi e-poštni naslov
         active: Aktiven
         display_name: Prikazano ime
         new_email: Novi e-poštni naslov
         active: Aktiven
         display_name: Prikazano ime


@@ -1976,7 +1975,7 @@ sl:
   sessions:
     new:
       title: Prijava
   sessions:
     new:
       title: Prijava

-      heading: Prijava
+      tab_title: Prijava

       email or username: E-poštni naslov ali uporabniško ime
       password: Geslo
       remember: Zapomni si me
       email or username: E-poštni naslov ali uporabniško ime
       password: Geslo
       remember: Zapomni si me


@@ -1984,34 +1983,7 @@ sl:
       login_button: Prijava
       register now: Registrirajte se
       with external: 'Lahko pa se prijavite prek tretje osebe:'
       login_button: Prijava
       register now: Registrirajte se
       with external: 'Lahko pa se prijavite prek tretje osebe:'

-      no account: Še nimate uporabniškega računa?

       auth failure: Oprostite, prijava s temi podatki ni uspela.
       auth failure: Oprostite, prijava s temi podatki ni uspela.

-      openid_logo_alt: Prijavite se z OpenID
-      auth_providers:
-        openid:
-          title: Prijava z OpenID
-          alt: Prijava s povezavo OpenID
-        google:
-          title: Prijava z Googlom
-          alt: Prijava z Google OpenID-jem
-        facebook:
-          title: Prijavi se s Facebookom
-          alt: Prijavi se z računom Facebook
-        microsoft:
-          title: Prijava z Microsoftom
-          alt: Prijava z računom Microsoft
-        github:
-          title: Vpis z GitHub-om
-          alt: Vpis z računom pri GitHub-u
-        wikipedia:
-          title: Prijavi se z Wikipedijo
-          alt: Prijavi se z računom Wikipedije
-        wordpress:
-          title: Prijava z Wordpressom
-          alt: Prijava z Wordpress OpenID-jem
-        aol:
-          title: Prijavi se z AOL-om
-          alt: Prijavi se z z OpenID-jem AOL

     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap
     destroy:
       title: Odjava
       heading: Odjava iz OpenStreetMap


@@ -2679,6 +2651,32 @@ sl:
       oauth2_applications: Aplikacije OAuth 2
       oauth2_authorizations: Pooblastila OAuth 2
       muted_users: Utišani uporabniki
       oauth2_applications: Aplikacije OAuth 2
       oauth2_authorizations: Pooblastila OAuth 2
       muted_users: Utišani uporabniki

+    auth_providers:
+      openid_logo_alt: Prijavite se z OpenID
+      openid:
+        title: Prijava z OpenID
+        alt: Prijava s povezavo OpenID
+      google:
+        title: Prijava z Googlom
+        alt: Prijava z Google OpenID-jem
+      facebook:
+        title: Prijavi se s Facebookom
+        alt: Prijavi se z računom Facebook
+      microsoft:
+        title: Prijava z Microsoftom
+        alt: Prijava z računom Microsoft
+      github:
+        title: Vpis z GitHub-om
+        alt: Vpis z računom pri GitHub-u
+      wikipedia:
+        title: Prijavi se z Wikipedijo
+        alt: Prijavi se z računom Wikipedije
+      wordpress:
+        title: Prijava z Wordpressom
+        alt: Prijava z Wordpress OpenID-jem
+      aol:
+        title: Prijavi se z AOL-om
+        alt: Prijavi se z z OpenID-jem AOL

   oauth:
     authorize:
       title: Dovoljenje za dostop do vašega računa
   oauth:
     authorize:
       title: Dovoljenje za dostop do vašega računa


@@ -2827,16 +2825,14 @@ sl:
       display name description: Vaše javno prikazano uporabniško ime. To lahko spremenite
         pozneje v prilagoditvah.
       external auth: Avtentikacija prek tretje osebe
       display name description: Vaše javno prikazano uporabniško ime. To lahko spremenite
         pozneje v prilagoditvah.
       external auth: Avtentikacija prek tretje osebe

-      use external auth: Lahko pa se prijavite prek tretje osebe
-      auth no password: Pri overitvi tretje osebe geslo ni zahtevano, vendar ga bodo
-        nekatera dodatna orodja ali strežnik morda še vedno zahtevala.

       continue: Registracija
       terms accepted: Hvala za sprejem novih pogojev prispevanja!
       continue: Registracija
       terms accepted: Hvala za sprejem novih pogojev prispevanja!

-      email_confirmation_help_html: Vaš naslov ni javno prikazan, za več informacij
-        glejte naš %{privacy_policy_link}.
+      email_help_html: Vaš naslov ni javno prikazan, za več informacij glejte naš
+        %{privacy_policy_link}.

       privacy_policy: pravilnik o zasebnosti
       privacy_policy_title: Pravilnik o zasebnosti OSMF, vključno z razdelkom o e-poštnih
         naslovih
       privacy_policy: pravilnik o zasebnosti
       privacy_policy_title: Pravilnik o zasebnosti OSMF, vključno z razdelkom o e-poštnih
         naslovih

+      use external auth: Lahko pa se prijavite prek tretje osebe

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

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index ae9a032febf439007ad914f99442aeda8704b91f..a0ab8c0e76f028c3d4c353d9c8c65b500ed0ec06 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1035,23 +1035,14 @@ sq:
   sessions:
     new:
       title: Identifikohu
   sessions:
     new:
       title: Identifikohu

-      heading: Identifikohu
+      tab_title: Identifikohu

       email or username: 'Adresa e emailit ose emri i përdoruesit:'
       password: 'Fjalëkalimi:'
       remember: Më mbaj mend
       lost password link: Ke humbur fjalëkalimin?
       login_button: Identifikohu
       register now: Regjistrohu tani
       email or username: 'Adresa e emailit ose emri i përdoruesit:'
       password: 'Fjalëkalimi:'
       remember: Më mbaj mend
       lost password link: Ke humbur fjalëkalimin?
       login_button: Identifikohu
       register now: Regjistrohu tani

-      no account: Nuk ke llogari?

       auth failure: Na vjen keq, nuk mund të identifikohemi me ato detaje.
       auth failure: Na vjen keq, nuk mund të identifikohemi me ato detaje.

-      openid_logo_alt: Identifikohu me ndonjë ID të hapur
-      auth_providers:
-        openid:
-          title: Identifikohu me OpenID
-        github:
-          title: Identifikohuni me GitHub
-        wikipedia:
-          alt: Identifikohuni me një llogari të Wikipedia-s

     destroy:
       title: Çidentifikohu
       heading: Çidentifikohu nga OpenStreetMap
     destroy:
       title: Çidentifikohu
       heading: Çidentifikohu nga OpenStreetMap


@@ -1253,6 +1244,14 @@ sq:
   application:
     require_admin:
       not_an_admin: Ju duhet të jeni administrator për të kryer atë veprim.
   application:
     require_admin:
       not_an_admin: Ju duhet të jeni administrator për të kryer atë veprim.

+    auth_providers:
+      openid_logo_alt: Identifikohu me ndonjë ID të hapur
+      openid:
+        title: Identifikohu me OpenID
+      github:
+        title: Identifikohuni me GitHub
+      wikipedia:
+        alt: Identifikohuni me një llogari të Wikipedia-s

   oauth_clients:
     show:
       edit: Redakto detajet
   oauth_clients:
     show:
       edit: Redakto detajet

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 6468174b172d45677503d78dc532c7ee6669dca1..f426266ecdde4e175e59566e8beed8f570741555 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -913,16 +913,14 @@ sr-Latn:
   sessions:
     new:
       title: Prijava
   sessions:
     new:
       title: Prijava

-      heading: Prijava
+      tab_title: Prijava

       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me
       register now: Otvorite nalog
       email or username: 'Imejl adresa ili korisničko ime:'
       password: 'Lozinka:'
       remember: Zapamti me
       lost password link: Zaboravili ste lozinku?
       login_button: Prijavi me
       register now: Otvorite nalog

-      no account: Nemate nalog?

       auth failure: Ne mogu da vas prijavim s unetim podacima.
       auth failure: Ne mogu da vas prijavim s unetim podacima.

-      openid_logo_alt: Prijavite se s OpenID-jem

     destroy:
       title: Odjava
       heading: Odjava
     destroy:
       title: Odjava
       heading: Odjava


@@ -1127,6 +1125,8 @@ sr-Latn:
       need_to_see_terms: Vaš pristup API-ju je privremeno ukinut. Prijavite se da
         biste pogledali uslove uređivanja. Ne morate da ih prihvatite, već samo da
         ih vidite.
       need_to_see_terms: Vaš pristup API-ju je privremeno ukinut. Prijavite se da
         biste pogledali uslove uređivanja. Ne morate da ih prihvatite, već samo da
         ih vidite.

+    auth_providers:
+      openid_logo_alt: Prijavite se s OpenID-jem

   oauth:
     authorize:
       request_access_html: Program %{app_name} zahteva pristup vašem nalogu, %{user}.
   oauth:
     authorize:
       request_access_html: Program %{app_name} zahteva pristup vašem nalogu, %{user}.

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6c7d1dd0682455f01731a55c4cea4f04d7a71154..ba9efd6e29685d6bac4ea5a2218635dd7e547012 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -154,7 +154,6 @@ sr:
         auth_provider: Провајдер провере идентитета
         auth_uid: UID идентитета
         email: Имејл
         auth_provider: Провајдер провере идентитета
         auth_uid: UID идентитета
         email: Имејл

-        email_confirmation: Имејл потврда

         new_email: Нова имејл адреса
         active: Активан
         display_name: Име за приказ
         new_email: Нова имејл адреса
         active: Активан
         display_name: Име за приказ


@@ -1627,7 +1626,7 @@ sr:
   sessions:
     new:
       title: Пријава
   sessions:
     new:
       title: Пријава

-      heading: Пријава
+      tab_title: Пријава

       email or username: Имејл адреса или корисничко име
       password: Лозинка
       remember: Запамти ме
       email or username: Имејл адреса или корисничко име
       password: Лозинка
       remember: Запамти ме


@@ -1635,34 +1634,7 @@ sr:
       login_button: Пријави ме
       register now: Отворите налог
       with external: 'Алтернативно, користите трећу страну да се пријавите:'
       login_button: Пријави ме
       register now: Отворите налог
       with external: 'Алтернативно, користите трећу страну да се пријавите:'

-      no account: Немате налог?

       auth failure: Није могуће пријавити се са тим детаљима.
       auth failure: Није могуће пријавити се са тим детаљима.

-      openid_logo_alt: Пријавите се с OpenID-јем
-      auth_providers:
-        openid:
-          title: Пријавити се са OpenID
-          alt: Пријава преко OpenID URL-а
-        google:
-          title: Пријава преко Google-а
-          alt: Пријава преко Google OpenID-а
-        facebook:
-          title: Пријавити се са Facebook-ом
-          alt: Пријава преко Facebook налога
-        microsoft:
-          title: Пријава преко Microsoft-а
-          alt: Пријава преко Microsoft налога
-        github:
-          title: Пријава коришћењем GitHub-а
-          alt: Пријава преко GitHub налога
-        wikipedia:
-          title: Пријава преко Википедије
-          alt: Пријава преко Википедијиног налога
-        wordpress:
-          title: Пријава преко Wordpress-а
-          alt: Пријава преко Wordpress OpenID-а
-        aol:
-          title: Пријава преко AOL-а
-          alt: Пријава преко AOL OpenID-а

     destroy:
       title: Одјава
       heading: Одјава
     destroy:
       title: Одјава
       heading: Одјава


@@ -2088,6 +2060,32 @@ sr:
     settings_menu:
       account_settings: Подешавња налога
       muted_users: Пригушени корисници
     settings_menu:
       account_settings: Подешавња налога
       muted_users: Пригушени корисници

+    auth_providers:
+      openid_logo_alt: Пријавите се с OpenID-јем
+      openid:
+        title: Пријавити се са OpenID
+        alt: Пријава преко OpenID URL-а
+      google:
+        title: Пријава преко Google-а
+        alt: Пријава преко Google OpenID-а
+      facebook:
+        title: Пријавити се са Facebook-ом
+        alt: Пријава преко Facebook налога
+      microsoft:
+        title: Пријава преко Microsoft-а
+        alt: Пријава преко Microsoft налога
+      github:
+        title: Пријава коришћењем GitHub-а
+        alt: Пријава преко GitHub налога
+      wikipedia:
+        title: Пријава преко Википедије
+        alt: Пријава преко Википедијиног налога
+      wordpress:
+        title: Пријава преко Wordpress-а
+        alt: Пријава преко Wordpress OpenID-а
+      aol:
+        title: Пријава преко AOL-а
+        alt: Пријава преко AOL OpenID-а

   oauth:
     authorize:
       title: Ауторизујте приступ свом налогу
   oauth:
     authorize:
       title: Ауторизујте приступ свом налогу


@@ -2189,12 +2187,10 @@ sr:
       display name description: Јавно приказано корисничко име. Касније га можете
         променити у поставкама.
       external auth: 'Аутентификација треће стране:'
       display name description: Јавно приказано корисничко име. Касније га можете
         променити у поставкама.
       external auth: 'Аутентификација треће стране:'

-      use external auth: Алтернативно, користите трећу страну за пријаву
-      auth no password: Са аутентификацијом треће стране, лозинка није потребна —
-        али неки додатни алати или сервер можда је ипак буду захтевали.

       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.
       privacy_policy: политика приватности
       continue: Отвори налог
       terms accepted: Хвала вам што прихватате нове услове уређивања.
       privacy_policy: политика приватности

+      use external auth: Алтернативно, користите трећу страну за пријаву

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

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d723e336d6805b0d762b3bbb90af7feacf1dc719..184082f24e115d5275b0818ceac0baa2459f816c 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -188,7 +188,6 @@ sv:
         auth_provider: Autentiseringsleverantör
         auth_uid: Autentiserings-UID
         email: E-post
         auth_provider: Autentiseringsleverantör
         auth_uid: Autentiserings-UID
         email: E-post

-        email_confirmation: E-postbekräftelse

         new_email: Ny e-postadress
         active: Aktiv
         display_name: Visa namn
         new_email: Ny e-postadress
         active: Aktiv
         display_name: Visa namn


@@ -1928,7 +1927,7 @@ sv:
   sessions:
     new:
       title: Logga in
   sessions:
     new:
       title: Logga in

-      heading: Logga in
+      tab_title: Logga in

       email or username: E-postadress eller Användarnamn
       password: Lösenord
       remember: Kom ihåg mig
       email or username: E-postadress eller Användarnamn
       password: Lösenord
       remember: Kom ihåg mig


@@ -1936,34 +1935,7 @@ sv:
       login_button: Logga in
       register now: Registrera dig nu
       with external: 'Alternativt kan du använda en tredje part för att logga in:'
       login_button: Logga in
       register now: Registrera dig nu
       with external: 'Alternativt kan du använda en tredje part för att logga in:'

-      no account: Har du inget konto?

       auth failure: Kunde inte logga in med de uppgifterna.
       auth failure: Kunde inte logga in med de uppgifterna.

-      openid_logo_alt: Logga in med ett OpenID
-      auth_providers:
-        openid:
-          title: Logga in med OpenID
-          alt: Logga in med en OpenID-URL
-        google:
-          title: Logga in med Google
-          alt: Logga in med ett Google OpenID
-        facebook:
-          title: Logga in med Facebook
-          alt: Logga in med ett Facebook-konto
-        microsoft:
-          title: Logga in med Microsoft
-          alt: Logga in med ett Microsoft-konto
-        github:
-          title: Logga in med GitHub
-          alt: Logga in med ett GitHub-Konto
-        wikipedia:
-          title: Logga in med Wikipedia
-          alt: Logga in med ett Wikipedia-konto
-        wordpress:
-          title: Logga in med Wordpress
-          alt: Logga in med ett Wordpress OpenID
-        aol:
-          title: Logga in med AOL
-          alt: Logga in med ett AOL OpenID

     destroy:
       title: Logga ut
       heading: Logga ut från OpenStreetMap
     destroy:
       title: Logga ut
       heading: Logga ut från OpenStreetMap


@@ -2607,6 +2579,32 @@ sv:
       oauth2_applications: OAuth 2-applikationer
       oauth2_authorizations: OAuth 2-auktoriseringar
       muted_users: Tystade användare
       oauth2_applications: OAuth 2-applikationer
       oauth2_authorizations: OAuth 2-auktoriseringar
       muted_users: Tystade användare

+    auth_providers:
+      openid_logo_alt: Logga in med ett OpenID
+      openid:
+        title: Logga in med OpenID
+        alt: Logga in med en OpenID-URL
+      google:
+        title: Logga in med Google
+        alt: Logga in med ett Google OpenID
+      facebook:
+        title: Logga in med Facebook
+        alt: Logga in med ett Facebook-konto
+      microsoft:
+        title: Logga in med Microsoft
+        alt: Logga in med ett Microsoft-konto
+      github:
+        title: Logga in med GitHub
+        alt: Logga in med ett GitHub-Konto
+      wikipedia:
+        title: Logga in med Wikipedia
+        alt: Logga in med ett Wikipedia-konto
+      wordpress:
+        title: Logga in med Wordpress
+        alt: Logga in med ett Wordpress OpenID
+      aol:
+        title: Logga in med AOL
+        alt: Logga in med ett AOL OpenID

   oauth:
     authorize:
       title: Auktorisera tillgång till ditt konto
   oauth:
     authorize:
       title: Auktorisera tillgång till ditt konto


@@ -2758,16 +2756,14 @@ sv:
       display name description: Ditt offentligt visade användarnamn. Du kan ändra
         detta senare i alternativ.
       external auth: 'Tredjepartsautentisering:'
       display name description: Ditt offentligt visade användarnamn. Du kan ändra
         detta senare i alternativ.
       external auth: 'Tredjepartsautentisering:'

-      use external auth: Alternativt kan du använda en tredje part för att logga in
-      auth no password: Med autentisering av tredje part krävs inte lösenord, men
-        en del extra verktyg eller server kan fortfarande behöva det.

       continue: Registrera
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!
       continue: Registrera
       terms accepted: Tack för att du accepterat de nya villkoren för bidrag till
         kartan!

-      email_confirmation_help_html: Din adress visas inte offentligt, se vår %{privacy_policy_link}
+      email_help_html: Din adress visas inte offentligt, se vår %{privacy_policy_link}

         för mer information.
       privacy_policy: integritetspolicy
       privacy_policy_title: OSMFs integritetspolicy inklusive avsnitt om e-postadresser
         för mer information.
       privacy_policy: integritetspolicy
       privacy_policy_title: OSMFs integritetspolicy inklusive avsnitt om e-postadresser

+      use external auth: Alternativt kan du använda en tredje part för att logga in

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

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 2a8efd873d40101cb324a6140980dcc9d19e3bcd..d7359ff762730251091a6c0a116bf93ebcdb0dad 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -148,7 +148,6 @@ ta:
         auth_provider: அங்கீகார வழங்குநர்
         auth_uid: அங்கீகார UID
         email: மின்னஞ்சல்
         auth_provider: அங்கீகார வழங்குநர்
         auth_uid: அங்கீகார UID
         email: மின்னஞ்சல்

-        email_confirmation: மின்னஞ்சலை உறுதிசெய்தல்

         new_email: புதிய மின்னஞ்சல் முகவரி
         active: செயல்பாட்டிலுள்ளது
         display_name: காட்டவிரும்பும் பெயர்
         new_email: புதிய மின்னஞ்சல் முகவரி
         active: செயல்பாட்டிலுள்ளது
         display_name: காட்டவிரும்பும் பெயர்


@@ -693,7 +692,7 @@ ta:
   sessions:
     new:
       title: புகுபதிகை
   sessions:
     new:
       title: புகுபதிகை

-      heading: புகுபதிகை
+      tab_title: புகுபதிகை

       email or username: 'மின்னஞ்சல் முகவரி அல்லது பயனர் பெயர்:'
       password: 'கடவுச்சொல்:'
       remember: என்னை நினைவில் வைத்துக்கொள்ளவும்
       email or username: 'மின்னஞ்சல் முகவரி அல்லது பயனர் பெயர்:'
       password: 'கடவுச்சொல்:'
       remember: என்னை நினைவில் வைத்துக்கொள்ளவும்

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 325e8ec3e9e08d21dc5721ea14c4d66ce02c86ae..73afebf568c9422edf1a8cd5497698b243db22b1 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -141,7 +141,6 @@ te:
         auth_provider: ఆథెంటికేషను ఇచ్చేవారు
         auth_uid: ఆథెంటికేషను UID
         email: ఈ-మెయిల్
         auth_provider: ఆథెంటికేషను ఇచ్చేవారు
         auth_uid: ఆథెంటికేషను UID
         email: ఈ-మెయిల్

-        email_confirmation: ఈమెయిలు నిర్థారణ

         new_email: కొత్త ఈమెయిలు చిరునామా
         active: క్రియాశీలం
         display_name: కనిపించే పేరు
         new_email: కొత్త ఈమెయిలు చిరునామా
         active: క్రియాశీలం
         display_name: కనిపించే పేరు


@@ -1752,7 +1751,7 @@ te:
   sessions:
     new:
       title: ప్రవేశం
   sessions:
     new:
       title: ప్రవేశం

-      heading: ప్రవేశం
+      tab_title: ప్రవేశం

       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'
       remember: నన్ను గుర్తుంచుకో
       email or username: 'ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:'
       password: 'సంకేతపదం:'
       remember: నన్ను గుర్తుంచుకో


@@ -1760,34 +1759,7 @@ te:
       login_button: ప్రవేశించు
       register now: ఇప్పుడే నమోదవ్వండి
       with external: 'లేదా, ఏదైనా థర్డ్ పార్టీతో లాగినవండి:'
       login_button: ప్రవేశించు
       register now: ఇప్పుడే నమోదవ్వండి
       with external: 'లేదా, ఏదైనా థర్డ్ పార్టీతో లాగినవండి:'

-      no account: మీకు ఖాతా లేదా?

       auth failure: సారీ, ఈ వివరాలతో లాగిన్ చెయ్యలేకపోయాం.
       auth failure: సారీ, ఈ వివరాలతో లాగిన్ చెయ్యలేకపోయాం.

-      openid_logo_alt: ఏదైనా OpenID తో లాగినవండి
-      auth_providers:
-        openid:
-          title: OpenID తో లాగినవండి
-          alt: ఏదైనా OpenID URL తో లాగినవండి
-        google:
-          title: Google తో లాగినవండి
-          alt: Google OpenID తో లాగినవండి
-        facebook:
-          title: Facebook తో లాగినవండి
-          alt: Facebook ఖాతాతో లాగినవండి
-        microsoft:
-          title: Windows Live తో లాగినవండి
-          alt: Windows Live ఖాతాతో లాగినవండి
-        github:
-          title: GitHub తో లాగినవండి
-          alt: GitHub ఖాతాతో లాగినవండి
-        wikipedia:
-          title: వికీపీడియాతో లాగినవండి
-          alt: వికీపీడియా ఖాతాతో లాగినవండి
-        wordpress:
-          title: వర్డ్‌ప్రెస్‌తో లాగినవండి
-          alt: వర్డ్‌ప్రెస్ OpenID తో లాగినవండి
-        aol:
-          title: AOL తో లాగినవండి
-          alt: AOL OpenID తో లాగినవండి

     destroy:
       title: నిష్క్రమించు
       heading: ఓపెన్‌స్ట్రీట్‌మ్యాప్‌ నుండి నిష్క్రమించండి
     destroy:
       title: నిష్క్రమించు
       heading: ఓపెన్‌స్ట్రీట్‌మ్యాప్‌ నుండి నిష్క్రమించండి


@@ -2139,6 +2111,32 @@ te:
       oauth1_settings: OAuth 1 అమరికలు
       oauth2_applications: OAuth 2 అనువర్తనాలు
       oauth2_authorizations: OAuth 2 ఆథరైజేషన్లు
       oauth1_settings: OAuth 1 అమరికలు
       oauth2_applications: OAuth 2 అనువర్తనాలు
       oauth2_authorizations: OAuth 2 ఆథరైజేషన్లు

+    auth_providers:
+      openid_logo_alt: ఏదైనా OpenID తో లాగినవండి
+      openid:
+        title: OpenID తో లాగినవండి
+        alt: ఏదైనా OpenID URL తో లాగినవండి
+      google:
+        title: Google తో లాగినవండి
+        alt: Google OpenID తో లాగినవండి
+      facebook:
+        title: Facebook తో లాగినవండి
+        alt: Facebook ఖాతాతో లాగినవండి
+      microsoft:
+        title: Windows Live తో లాగినవండి
+        alt: Windows Live ఖాతాతో లాగినవండి
+      github:
+        title: GitHub తో లాగినవండి
+        alt: GitHub ఖాతాతో లాగినవండి
+      wikipedia:
+        title: వికీపీడియాతో లాగినవండి
+        alt: వికీపీడియా ఖాతాతో లాగినవండి
+      wordpress:
+        title: వర్డ్‌ప్రెస్‌తో లాగినవండి
+        alt: వర్డ్‌ప్రెస్ OpenID తో లాగినవండి
+      aol:
+        title: AOL తో లాగినవండి
+        alt: AOL OpenID తో లాగినవండి

   oauth:
     authorize:
       title: మీ ఖాతాను అందుకునేందుకు ఆథరైజు చెయ్యండి
   oauth:
     authorize:
       title: మీ ఖాతాను అందుకునేందుకు ఆథరైజు చెయ్యండి

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 042fcccc9d9f18271067f25e43e881f1d7ce0f11..ad6dc41a1e2b76dba96525ab2830d18e3462eca3 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -146,7 +146,6 @@ th:
         auth_provider: ผู้ให้การยืนยัน
         auth_uid: UID การยืนยัน
         email: อีเมล
         auth_provider: ผู้ให้การยืนยัน
         auth_uid: UID การยืนยัน
         email: อีเมล

-        email_confirmation: การยืนยันอีเมล

         new_email: ที่อยู่อีเมลใหม่
         active: เปิดใช้
         display_name: ชื่อที่ใช้แสดง
         new_email: ที่อยู่อีเมลใหม่
         active: เปิดใช้
         display_name: ชื่อที่ใช้แสดง


@@ -1441,7 +1440,7 @@ th:
   sessions:
     new:
       title: ลงชื่อเข้าใช้
   sessions:
     new:
       title: ลงชื่อเข้าใช้

-      heading: ลงชื่อเข้าใช้
+      tab_title: ลงชื่อเข้าใช้

       email or username: 'อีเมลหรือชื่อผู้ใช้:'
       password: 'รหัสผ่าน:'
       remember: จดจำฉันไว้ในระบบ
       email or username: 'อีเมลหรือชื่อผู้ใช้:'
       password: 'รหัสผ่าน:'
       remember: จดจำฉันไว้ในระบบ


@@ -1449,34 +1448,7 @@ th:
       login_button: ลงชื่อเข้าใช้
       register now: สมัครเลย!
       with external: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้
       login_button: ลงชื่อเข้าใช้
       register now: สมัครเลย!
       with external: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้

-      no account: ยังไม่ได้เป็นสมาชิก?

       auth failure: ขออภัย ไม่สามารถเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านดังกล่าวได้
       auth failure: ขออภัย ไม่สามารถเข้าระบบด้วยชื่อผู้ใช้และรหัสผ่านดังกล่าวได้

-      openid_logo_alt: เข้าใช้งานด้วย OpenID
-      auth_providers:
-        openid:
-          title: เข้าใช้งานด้วย OpenID
-          alt: เข้าใช้งานด้วยลิงก์ OpenID
-        google:
-          title: เข้าใช้งานด้วย Google
-          alt: เข้าใช้งานด้วย Google OpenID
-        facebook:
-          title: เข้าใช้งานด้วย Facebook
-          alt: เข้าใช้งานด้วยบัญชี Facebook
-        microsoft:
-          title: เข้าใช้งานด้วย Windows Live
-          alt: เข้าใช้งานด้วยบัญชี Windows Live
-        github:
-          title: เข้าใช้งานด้วย GitHub
-          alt: เข้าใช้งานด้วยบัญชี GitHub
-        wikipedia:
-          title: เข้าใช้งานด้วยวิกิพีเดีย
-          alt: เข้าสู่ระบบด้วยบัญชีวิกิพีเดีย
-        wordpress:
-          title: เข้าใช้งานด้วย Wordpress
-          alt: เข้าสู่ระบบด้วย Wordpress OpenID
-        aol:
-          title: เข้าใช้งานด้วย AOL
-          alt: เข้าใช้งานด้วย AOL OpenID

     destroy:
       title: ออกจากระบบ
       heading: ออกจากระบบ OpenStreetMap
     destroy:
       title: ออกจากระบบ
       heading: ออกจากระบบ OpenStreetMap


@@ -1755,6 +1727,32 @@ th:
       cookies_needed: ดูเหมือนว่าคุณปิดใช้งานคุกกี้อยู่, กรุณาเปิดใช้งานคุกกี้ในบราวเซอร์ของคุณก่อนจะดำเนินการต่อ
     setup_user_auth:
       blocked: คุณถูกระงับการเข้าถึง API, กรุณาเข้าระบบทางหน้าเว็บหลักหากต้องการทราบสาเหตุที่ถูกระงับในครั้งนี้
       cookies_needed: ดูเหมือนว่าคุณปิดใช้งานคุกกี้อยู่, กรุณาเปิดใช้งานคุกกี้ในบราวเซอร์ของคุณก่อนจะดำเนินการต่อ
     setup_user_auth:
       blocked: คุณถูกระงับการเข้าถึง API, กรุณาเข้าระบบทางหน้าเว็บหลักหากต้องการทราบสาเหตุที่ถูกระงับในครั้งนี้

+    auth_providers:
+      openid_logo_alt: เข้าใช้งานด้วย OpenID
+      openid:
+        title: เข้าใช้งานด้วย OpenID
+        alt: เข้าใช้งานด้วยลิงก์ OpenID
+      google:
+        title: เข้าใช้งานด้วย Google
+        alt: เข้าใช้งานด้วย Google OpenID
+      facebook:
+        title: เข้าใช้งานด้วย Facebook
+        alt: เข้าใช้งานด้วยบัญชี Facebook
+      microsoft:
+        title: เข้าใช้งานด้วย Windows Live
+        alt: เข้าใช้งานด้วยบัญชี Windows Live
+      github:
+        title: เข้าใช้งานด้วย GitHub
+        alt: เข้าใช้งานด้วยบัญชี GitHub
+      wikipedia:
+        title: เข้าใช้งานด้วยวิกิพีเดีย
+        alt: เข้าสู่ระบบด้วยบัญชีวิกิพีเดีย
+      wordpress:
+        title: เข้าใช้งานด้วย Wordpress
+        alt: เข้าสู่ระบบด้วย Wordpress OpenID
+      aol:
+        title: เข้าใช้งานด้วย AOL
+        alt: เข้าใช้งานด้วย AOL OpenID

   oauth:
     authorize:
       title: อนุญาตการเข้าถึงบัญชีของคุณ
   oauth:
     authorize:
       title: อนุญาตการเข้าถึงบัญชีของคุณ


@@ -1837,11 +1835,9 @@ th:
         header: เสรีและแก้ไขได้
       display name description: ชื่อที่แสดงต่อสาธารณะ ท่านสามารถเปลี่ยนในภายหลังได้ในหน้าการตั้งค่า
       external auth: 'บัญชีผู้ใช้จากเว็บอื่น:'
         header: เสรีและแก้ไขได้
       display name description: ชื่อที่แสดงต่อสาธารณะ ท่านสามารถเปลี่ยนในภายหลังได้ในหน้าการตั้งค่า
       external auth: 'บัญชีผู้ใช้จากเว็บอื่น:'

-      use external auth: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้
-      auth no password: ถ้ามีบัญชีผู้ใช้จากเว็บอื่น โดยปกติไม่จำเป็นต้องมีรหัสผ่าน
-        แต่ถ้าเข้าใช้งานเครื่องมือบางตัวหรือเซิร์ฟเวอร์ก็ยังจำเป็นต้องมีรหัสผ่านอยู่

       continue: สมัครบัญชี
       terms accepted: ขอบคุณสำหรับการตอบรับเงื่อนไขผู้ร่วมสร้างสรรค์!
       continue: สมัครบัญชี
       terms accepted: ขอบคุณสำหรับการตอบรับเงื่อนไขผู้ร่วมสร้างสรรค์!

+      use external auth: นอกจากนี้ ท่านสามารถใช้บัญชีผู้ใช้จากเว็บอื่นในการเข้าใช้งานได้

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

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index e74b8b89d06efda07fcf08030a55887a79ed204f..a5133d852943238e060360e02a8ffb7331d42b72 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1463,7 +1463,7 @@ tl:
   sessions:
     new:
       title: Lumagda
   sessions:
     new:
       title: Lumagda

-      heading: Lumagda
+      tab_title: Lumagda

       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'
       remember: Tandaan ako
       email or username: 'Tirahan ng E-liham o Pangalan ng Tagagamit:'
       password: 'Password:'
       remember: Tandaan ako


@@ -1472,34 +1472,7 @@ tl:
       register now: Magpatala na ngayon
       with external: 'Bilang alternatibo, gumamit ng serbisyo ikatlong partido para
         lumagda:'
       register now: Magpatala na ngayon
       with external: 'Bilang alternatibo, gumamit ng serbisyo ikatlong partido para
         lumagda:'

-      no account: Wala ka pa bang akawnt?

       auth failure: Paumanhin, hindi makalagda sa pamamagitan ng mga detalyeng iyan.
       auth failure: Paumanhin, hindi makalagda sa pamamagitan ng mga detalyeng iyan.

-      openid_logo_alt: Lumagda sa pamamagitan ng isang OpenID
-      auth_providers:
-        openid:
-          title: Lumagda gamit ang OpenID
-          alt: Lumagda gamit ang isang OpenID URL
-        google:
-          title: Lumagda gamit ang Google
-          alt: Lumagda gamit ang isang Google OpenID
-        facebook:
-          title: Lumagda gamit ang Facebook
-          alt: Lumagda gamit ang isang akawnt sa Facebook
-        microsoft:
-          title: Lumagda gamit ang Windows Live
-          alt: Lumagda gamit ang isang akawnt sa Windows Live
-        github:
-          title: Lumagda gamit ang GitHub
-          alt: Lumagda gamit ang isang akawnt sa GitHub
-        wikipedia:
-          title: Lumagda gamit ang Wikipedia
-          alt: Lumagda gamit ang isang akawnt sa Wikipedia
-        wordpress:
-          title: Lumagda gamit ang Wordpress
-          alt: Lumagda gamit ang isang Wordpress OpenID
-        aol:
-          title: Lumagda gamit ang AOL
-          alt: Lumagda gamit ang isang AOL OpenID

     destroy:
       title: Umalis sa pagkakalagda
       heading: Umalis sa pagkakalagda mula sa OpenStreetMap
     destroy:
       title: Umalis sa pagkakalagda
       heading: Umalis sa pagkakalagda mula sa OpenStreetMap


@@ -1812,6 +1785,32 @@ tl:
     settings_menu:
       account_settings: Mga Katakdaan ng Akawnt
       oauth2_authorizations: Mga pahintulot para sa OAuth 2
     settings_menu:
       account_settings: Mga Katakdaan ng Akawnt
       oauth2_authorizations: Mga pahintulot para sa OAuth 2

+    auth_providers:
+      openid_logo_alt: Lumagda sa pamamagitan ng isang OpenID
+      openid:
+        title: Lumagda gamit ang OpenID
+        alt: Lumagda gamit ang isang OpenID URL
+      google:
+        title: Lumagda gamit ang Google
+        alt: Lumagda gamit ang isang Google OpenID
+      facebook:
+        title: Lumagda gamit ang Facebook
+        alt: Lumagda gamit ang isang akawnt sa Facebook
+      microsoft:
+        title: Lumagda gamit ang Windows Live
+        alt: Lumagda gamit ang isang akawnt sa Windows Live
+      github:
+        title: Lumagda gamit ang GitHub
+        alt: Lumagda gamit ang isang akawnt sa GitHub
+      wikipedia:
+        title: Lumagda gamit ang Wikipedia
+        alt: Lumagda gamit ang isang akawnt sa Wikipedia
+      wordpress:
+        title: Lumagda gamit ang Wordpress
+        alt: Lumagda gamit ang isang Wordpress OpenID
+      aol:
+        title: Lumagda gamit ang AOL
+        alt: Lumagda gamit ang isang AOL OpenID

   oauth:
     authorize:
       request_access_html: Ang aplikasyong %{app_name} ay humihiling na mapuntahan
   oauth:
     authorize:
       request_access_html: Ang aplikasyong %{app_name} ay humihiling na mapuntahan


@@ -1913,10 +1912,10 @@ tl:
         header: Libre at pwedeng baguhin
       display name description: Ang iyong pangalan ng tagagamit na ipinapakita sa
         madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan.
         header: Libre at pwedeng baguhin
       display name description: Ang iyong pangalan ng tagagamit na ipinapakita sa
         madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan.

-      use external auth: Bilang alternatibo, gumamit ng serbisyo ikatlong partido
-        para lumagda

       continue: Magpatala
       terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag!
       continue: Magpatala
       terms accepted: Salamat sa pagtanggap ng bagong mga tuntunin ng tagapag-ambag!

+      use external auth: Bilang alternatibo, gumamit ng serbisyo ikatlong partido
+        para lumagda

     terms:
       title: 'Mga tuntunin:'
       heading: Mga tuntunin
     terms:
       title: 'Mga tuntunin:'
       heading: Mga tuntunin

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c964aa9274e457d85ea217e4d1fb42b0d352857d..7a5cb9787faa0e8d350c2106656bfa08358af3d4 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -188,7 +188,6 @@ tr:
         auth_provider: Kimlik Doğrulama Sağlayıcısı
         auth_uid: Kimlik Doğrulama UIDsi
         email: E-posta
         auth_provider: Kimlik Doğrulama Sağlayıcısı
         auth_uid: Kimlik Doğrulama UIDsi
         email: E-posta

-        email_confirmation: E-posta Onayı

         new_email: Yeni E-posta Adresi
         active: Etkin
         display_name: Görünen Ad
         new_email: Yeni E-posta Adresi
         active: Etkin
         display_name: Görünen Ad


@@ -1982,7 +1981,7 @@ tr:
   sessions:
     new:
       title: Oturum Aç
   sessions:
     new:
       title: Oturum Aç

-      heading: Oturum Aç
+      tab_title: Oturum Aç

       email or username: E-posta Adresi veya Kullanıcı Adı
       password: Parola
       remember: Beni hatırla
       email or username: E-posta Adresi veya Kullanıcı Adı
       password: Parola
       remember: Beni hatırla


@@ -1991,34 +1990,7 @@ tr:
       register now: Şimdi kaydol
       with external: 'Alternatif olarak bir üçüncü parti uygulaması kullanarak oturum
         açın:'
       register now: Şimdi kaydol
       with external: 'Alternatif olarak bir üçüncü parti uygulaması kullanarak oturum
         açın:'

-      no account: Hesabın yok mu?

       auth failure: Üzgünüz, bu giriş ile oturum açılamadı.
       auth failure: Üzgünüz, bu giriş ile oturum açılamadı.

-      openid_logo_alt: OpenID ile giriş
-      auth_providers:
-        openid:
-          title: OpenID ile giriş
-          alt: OpenID Bağlantısı ile giriş
-        google:
-          title: Google ile giriş
-          alt: Google OpenID ile giriş
-        facebook:
-          title: Facebook ile giriş
-          alt: Facebook Hesabı ile giriş
-        microsoft:
-          title: Microsoft ile giriş
-          alt: Microsoft Hesabı ile giriş
-        github:
-          title: GitHub ile giriş
-          alt: GitHub Hesabı ile giriş
-        wikipedia:
-          title: Vikipedi ile giriş
-          alt: Vikipedi Hesabı ile giriş
-        wordpress:
-          title: Wordpress ile oturum aç
-          alt: Wordpress OpenID ile giriş
-        aol:
-          title: AOL ile giriş
-          alt: AOL OpenID ile giriş

     destroy:
       title: Oturumu kapat
       heading: OpenStreetMap'den çıkış
     destroy:
       title: Oturumu kapat
       heading: OpenStreetMap'den çıkış


@@ -2689,6 +2661,32 @@ tr:
       oauth2_applications: OAuth 2 uygulamaları
       oauth2_authorizations: OAuth 2 yetkilendirmeleri
       muted_users: Sessize Alınan Kullanıcılar
       oauth2_applications: OAuth 2 uygulamaları
       oauth2_authorizations: OAuth 2 yetkilendirmeleri
       muted_users: Sessize Alınan Kullanıcılar

+    auth_providers:
+      openid_logo_alt: OpenID ile giriş
+      openid:
+        title: OpenID ile giriş
+        alt: OpenID Bağlantısı ile giriş
+      google:
+        title: Google ile giriş
+        alt: Google OpenID ile giriş
+      facebook:
+        title: Facebook ile giriş
+        alt: Facebook Hesabı ile giriş
+      microsoft:
+        title: Microsoft ile giriş
+        alt: Microsoft Hesabı ile giriş
+      github:
+        title: GitHub ile giriş
+        alt: GitHub Hesabı ile giriş
+      wikipedia:
+        title: Vikipedi ile giriş
+        alt: Vikipedi Hesabı ile giriş
+      wordpress:
+        title: Wordpress ile oturum aç
+        alt: Wordpress OpenID ile giriş
+      aol:
+        title: AOL ile giriş
+        alt: AOL OpenID ile giriş

   oauth:
     authorize:
       title: Hesabınıza erişimi yetkilendirin
   oauth:
     authorize:
       title: Hesabınıza erişimi yetkilendirin


@@ -2838,17 +2836,15 @@ tr:
       display name description: Herkes tarafından görünecek bir kullanıcı adı. Bu
         adı istediğiniz zaman ayarlar bölümünde değiştirebilirsiniz.
       external auth: 'Üçüncü Taraf Kimlik Doğrulaması:'
       display name description: Herkes tarafından görünecek bir kullanıcı adı. Bu
         adı istediğiniz zaman ayarlar bölümünde değiştirebilirsiniz.
       external auth: 'Üçüncü Taraf Kimlik Doğrulaması:'

-      use external auth: 'Alternatif olarak bir üçüncü parti uygulaması kullanarak
-        oturum açın:'
-      auth no password: Üçüncü taraf kimlik doğrulamasında bir parola gerekli değildir,
-        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!
       continue: Kaydol
       terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz!

-      email_confirmation_help_html: Adresiniz herkese açık olarak görüntülenmiyor,
-        daha fazla bilgi için %{privacy_policy_link} sayfasına bakın.
+      email_help_html: Adresiniz herkese açık olarak görüntülenmiyor, daha fazla bilgi
+        için %{privacy_policy_link} sayfasına bakın.

       privacy_policy: gizlilik politikası
       privacy_policy_title: E-posta adresleriyle ilgili bölümü içeren OSMF gizlilik
         politikası
       privacy_policy: gizlilik politikası
       privacy_policy_title: E-posta adresleriyle ilgili bölümü içeren OSMF gizlilik
         politikası

+      use external auth: 'Alternatif olarak bir üçüncü parti uygulaması kullanarak
+        oturum açın:'

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

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index d32e95d5fe556bbfdd87311b60e70a03b6f44d47..3f576290b0aebdb98291e1055e8de2e86ef6c6dd 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -137,7 +137,6 @@ tt:
         auth_provider: Аутентификация провайдеры
         auth_uid: Аутентификациянең UID коды
         email: Электрон почтасы
         auth_provider: Аутентификация провайдеры
         auth_uid: Аутентификациянең UID коды
         email: Электрон почтасы

-        email_confirmation: E-mail раслау

         new_email: Яңа электрон почта адресы
         active: Актив
         display_name: Күрсәтелүче исем
         new_email: Яңа электрон почта адресы
         active: Актив
         display_name: Күрсәтелүче исем


@@ -850,7 +849,7 @@ tt:
   sessions:
     new:
       title: Керү
   sessions:
     new:
       title: Керү

-      heading: Керү
+      tab_title: Керү

       password: 'Серсүз:'
       login_button: Керү
       register now: Теркәлегезче
       password: 'Серсүз:'
       login_button: Керү
       register now: Теркәлегезче

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f1882871fd5104bdeb470a7ab951361240822c95..a2b46449b2abdd0863ada85af20e63f90add2070 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -184,7 +184,6 @@ uk:
         auth_provider: Автентифікатор
         auth_uid: Ідентифікатор автентифікації
         email: Ел. пошта
         auth_provider: Автентифікатор
         auth_uid: Ідентифікатор автентифікації
         email: Ел. пошта

-        email_confirmation: Підтвердження адреси

         new_email: Нова адреса електронної пошти
         active: Активний
         display_name: 'Прізвисько:'
         new_email: Нова адреса електронної пошти
         active: Активний
         display_name: 'Прізвисько:'


@@ -2025,7 +2024,7 @@ uk:
   sessions:
     new:
       title: Ласкаво просимо
   sessions:
     new:
       title: Ласкаво просимо

-      heading: Ласкаво просимо
+      tab_title: Ласкаво просимо

       email or username: Ел. пошта або прізвисько
       password: Пароль
       remember: Запам’ятати мене
       email or username: Ел. пошта або прізвисько
       password: Пароль
       remember: Запам’ятати мене


@@ -2033,34 +2032,7 @@ uk:
       login_button: Увійти
       register now: Зареєструйтеся зараз
       with external: 'Або використовуйте, облікові записи з інших ресурсів:'
       login_button: Увійти
       register now: Зареєструйтеся зараз
       with external: 'Або використовуйте, облікові записи з інших ресурсів:'

-      no account: Не маєте облікового запису?

       auth failure: Вибачте, вхід з цими ім’ям або паролем неможливий.
       auth failure: Вибачте, вхід з цими ім’ям або паролем неможливий.

-      openid_logo_alt: Увійти з допомогою OpenID
-      auth_providers:
-        openid:
-          title: Увійти за допомогою OpenID
-          alt: Увійти за допомогою OpenID URL
-        google:
-          title: Увійти через Google
-          alt: Увійти через Google OpenID
-        facebook:
-          title: Увійти з Facebook
-          alt: Увійти з облікового запису Facebook
-        microsoft:
-          title: Увійти з Microsoft
-          alt: Увійти з облікового запису Microsoft
-        github:
-          title: Увійти через GitHub
-          alt: Вхід через обліковий запис GitHub
-        wikipedia:
-          title: Увійти через Вікіпедію
-          alt: Вхід через обліковий запис у Вікіпедії
-        wordpress:
-          title: Увійти через Wordpress
-          alt: Увійти через Wordpress OpenID
-        aol:
-          title: Увійти через AOL
-          alt: Увійти через AOL OpenID

     destroy:
       title: Вийти
       heading: Вийти з OpenStreetMap
     destroy:
       title: Вийти
       heading: Вийти з OpenStreetMap


@@ -2731,6 +2703,32 @@ uk:
       oauth2_applications: застосунки OAuth 2
       oauth2_authorizations: авторизації OAuth 2
       muted_users: Стишені учасники
       oauth2_applications: застосунки OAuth 2
       oauth2_authorizations: авторизації OAuth 2
       muted_users: Стишені учасники

+    auth_providers:
+      openid_logo_alt: Увійти з допомогою OpenID
+      openid:
+        title: Увійти за допомогою OpenID
+        alt: Увійти за допомогою OpenID URL
+      google:
+        title: Увійти через Google
+        alt: Увійти через Google OpenID
+      facebook:
+        title: Увійти з Facebook
+        alt: Увійти з облікового запису Facebook
+      microsoft:
+        title: Увійти з Microsoft
+        alt: Увійти з облікового запису Microsoft
+      github:
+        title: Увійти через GitHub
+        alt: Вхід через обліковий запис GitHub
+      wikipedia:
+        title: Увійти через Вікіпедію
+        alt: Вхід через обліковий запис у Вікіпедії
+      wordpress:
+        title: Увійти через Wordpress
+        alt: Увійти через Wordpress OpenID
+      aol:
+        title: Увійти через AOL
+        alt: Увійти через AOL OpenID

   oauth:
     authorize:
       title: Авторизувати доступ до облікового запису
   oauth:
     authorize:
       title: Авторизувати доступ до облікового запису


@@ -2883,18 +2881,15 @@ uk:
       display name description: Ваше ім’я учасника, доступне всім. Ви можете змінити
         його потім у ваших налаштуваннях.
       external auth: 'Автентифікація через:'
       display name description: Ваше ім’я учасника, доступне всім. Ви можете змінити
         його потім у ваших налаштуваннях.
       external auth: 'Автентифікація через:'

-      use external auth: Або використовуйте, облікові записи з інших ресурсів для
-        входу
-      auth no password: Під час автентифікації з допомогою сторонніх сервісів пароль
-        не потрібен, але для деяких додаткових інструментів або серверів він все ще
-        знадобиться.

       continue: Зареєструватись
       terms accepted: Дякуємо за прийняття нових умов співпраці!
       continue: Зареєструватись
       terms accepted: Дякуємо за прийняття нових умов співпраці!

-      email_confirmation_help_html: Ваша адреса ніколи не показуватиметься публічно.
-        Ð\9eзнайомÑ\82еÑ\81Ñ\8c з наÑ\88оÑ\8e %{privacy_policy_link} длÑ\8f оÑ\82Ñ\80иманнÑ\8f докладноÑ\97 Ñ\96нÑ\84оÑ\80маÑ\86Ñ\96Ñ\97.
+      email_help_html: Ваша адреса ніколи не показуватиметься публічно. Ознайомтесь
+        з нашою %{privacy_policy_link} для отримання докладної інформації.

       privacy_policy: Політикою конфіденційності
       privacy_policy_title: Політика конфіденційності OSMF, включаючи розділ про адреси
         електронної пошти
       privacy_policy: Політикою конфіденційності
       privacy_policy_title: Політика конфіденційності OSMF, включаючи розділ про адреси
         електронної пошти

+      use external auth: Або використовуйте, облікові записи з інших ресурсів для
+        входу

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

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 86a8949407e242b427983f136ca813ad49f85699..5566e2f97998f55ab5787ab2a518fbadadd54fa0 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -158,7 +158,6 @@ vi:
         auth_provider: Nhà cung cấp Xác thực
         auth_uid: Định dạng Duy nhất Xác thực
         email: Thư điện tử
         auth_provider: Nhà cung cấp Xác thực
         auth_uid: Định dạng Duy nhất Xác thực
         email: Thư điện tử

-        email_confirmation: Xác nhận Thư điện tử

         new_email: Địa chỉ Thư điện tử Mới
         active: Tích cực
         display_name: Tên Hiển thị
         new_email: Địa chỉ Thư điện tử Mới
         active: Tích cực
         display_name: Tên Hiển thị


@@ -1828,7 +1827,7 @@ vi:
   sessions:
     new:
       title: Đăng nhập
   sessions:
     new:
       title: Đăng nhập

-      heading: Đăng nhập
+      tab_title: Đăng nhập

       email or username: Địa chỉ Thư điện tử hoặc Tên người dùng
       password: Mật khẩu
       remember: Nhớ tôi
       email or username: Địa chỉ Thư điện tử hoặc Tên người dùng
       password: Mật khẩu
       remember: Nhớ tôi


@@ -1836,34 +1835,7 @@ vi:
       login_button: Đăng nhập
       register now: Mở tài khoản ngay
       with external: 'Hoặc đăng nhập qua dịch vụ bên thứ ba:'
       login_button: Đăng nhập
       register now: Mở tài khoản ngay
       with external: 'Hoặc đăng nhập qua dịch vụ bên thứ ba:'

-      no account: Chưa có tài khoản?

       auth failure: Rất tiếc, không thể đăng nhập với những chi tiết đó.
       auth failure: Rất tiếc, không thể đăng nhập với những chi tiết đó.

-      openid_logo_alt: Đăng nhập dùng OpenID
-      auth_providers:
-        openid:
-          title: Đăng nhập qua OpenID
-          alt: Đăng nhập dùng URL OpenID
-        google:
-          title: Đăng nhập qua Google
-          alt: Đăng nhập dùng OpenID của Google
-        facebook:
-          title: Đăng nhập qua Facebook
-          alt: Đăng nhập dùng tài khoản Facebook
-        microsoft:
-          title: Đăng nhập qua Microsoft
-          alt: Đăng nhập dùng Tài khoản Microsoft
-        github:
-          title: Đăng nhập qua GitHub
-          alt: Đăng nhập dùng tài khoản GitHub
-        wikipedia:
-          title: Đăng nhập qua Wikipedia
-          alt: Đăng nhập qua Tài khoản Wikipedia
-        wordpress:
-          title: Đăng nhập qua WordPress
-          alt: Đăng nhập dùng OpenID của WordPress
-        aol:
-          title: Đăng nhập qua AOL
-          alt: Đăng nhập dùng OpenID của AOL

     destroy:
       title: Đăng xuất
       heading: Đăng xuất OpenStreetMap
     destroy:
       title: Đăng xuất
       heading: Đăng xuất OpenStreetMap


@@ -2462,6 +2434,32 @@ vi:
       oauth2_applications: Ứng dụng OAuth 2
       oauth2_authorizations: Ủy quyền OAuth 2
       muted_users: Người dùng bị Tắt tiếng
       oauth2_applications: Ứng dụng OAuth 2
       oauth2_authorizations: Ủy quyền OAuth 2
       muted_users: Người dùng bị Tắt tiếng

+    auth_providers:
+      openid_logo_alt: Đăng nhập dùng OpenID
+      openid:
+        title: Đăng nhập qua OpenID
+        alt: Đăng nhập dùng URL OpenID
+      google:
+        title: Đăng nhập qua Google
+        alt: Đăng nhập dùng OpenID của Google
+      facebook:
+        title: Đăng nhập qua Facebook
+        alt: Đăng nhập dùng tài khoản Facebook
+      microsoft:
+        title: Đăng nhập qua Microsoft
+        alt: Đăng nhập dùng Tài khoản Microsoft
+      github:
+        title: Đăng nhập qua GitHub
+        alt: Đăng nhập dùng tài khoản GitHub
+      wikipedia:
+        title: Đăng nhập qua Wikipedia
+        alt: Đăng nhập qua Tài khoản Wikipedia
+      wordpress:
+        title: Đăng nhập qua WordPress
+        alt: Đăng nhập dùng OpenID của WordPress
+      aol:
+        title: Đăng nhập qua AOL
+        alt: Đăng nhập dùng OpenID của AOL

   oauth:
     authorize:
       title: Cho phép truy cập tài khoản của bạn
   oauth:
     authorize:
       title: Cho phép truy cập tài khoản của bạn


@@ -2612,16 +2610,14 @@ vi:
       display name description: Tên người dùng của bạn được hiển thị công khai. Bạn
         có thể thay đổi tên này về sau trong tùy chọn.
       external auth: 'Xác minh qua Dịch vụ Bên thứ ba:'
       display name description: Tên người dùng của bạn được hiển thị công khai. Bạn
         có thể thay đổi tên này về sau trong tùy chọn.
       external auth: 'Xác minh qua Dịch vụ Bên thứ ba:'

-      use external auth: Hoặc đăng nhập qua dịch vụ bên thứ ba
-      auth no password: Nếu xác minh qua dịch vụ bên thứ ba, bạn không cần nhập mật
-        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!
       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!

-      email_confirmation_help_html: Địa chỉ thư điện tử không được hiển thị công khai,
-        xem thêm thông tin trong %{privacy_policy_link} của chúng tôi.
+      email_help_html: Địa chỉ thư điện tử không được hiển thị công khai, xem thêm
+        thông tin trong %{privacy_policy_link} của chúng tôi.

       privacy_policy: quy định về quyền riêng tư
       privacy_policy_title: Quy định về quyền riêng tư của OSMF, bao gồm phần về địa
         chỉ thư điện tử
       privacy_policy: quy định về quyền riêng tư
       privacy_policy_title: Quy định về quyền riêng tư của OSMF, bao gồm phần về địa
         chỉ thư điện tử

+      use external auth: Hoặc đăng nhập qua dịch vụ bên thứ ba

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

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 5dfe084d52ac7444421bdde516507a9822b5857f..2b2ea8bae5e0ea2c00f21966fdcc34a4c738b988 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -137,7 +137,6 @@ xmf:
         auth_provider: ავთენტიფიკაციაშ პროვაიდერი
         auth_uid: ავთენტიფიკაციაშ UID
         email: ელ. ფოსტა
         auth_provider: ავთენტიფიკაციაშ პროვაიდერი
         auth_uid: ავთენტიფიკაციაშ UID
         email: ელ. ფოსტა

-        email_confirmation: ელ-ფოსტაშ დოდასურაფა

         new_email: ახალი ელ-ფოსტაშ მიოწურაფუ
         active: აქტიური
         display_name: ჯოხო ეკრანს
         new_email: ახალი ელ-ფოსტაშ მიოწურაფუ
         active: აქტიური
         display_name: ჯოხო ეკრანს

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index db03f5a884ccc4d2fcf9d5866efea6130118a884..3c4f5cc139c5fa8f271064bfad4f9f8ed24acb8d 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -54,7 +54,7 @@ yo:
   sessions:
     new:
       title: Wole
   sessions:
     new:
       title: Wole

-      heading: Wole
+      tab_title: Wole

       lost password link: Se eh ti san password nu?
       auth failure: Pele, e le wole pelu details yi.
   site:
       lost password link: Se eh ti san password nu?
       auth failure: Pele, e le wole pelu details yi.
   site:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 72bcc71864e357e97c53e82b3374fea882e41ccb..ba763ce77b21ed9146dbbf1df83a51c96e05fb02 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -220,7 +220,6 @@ zh-CN:
         auth_provider: 验证提供商
         auth_uid: 验证UID
         email: 电子邮件
         auth_provider: 验证提供商
         auth_uid: 验证UID
         email: 电子邮件

-        email_confirmation: 电子邮件确认

         new_email: 新电子邮件地址
         active: 激活
         display_name: 显示名称
         new_email: 新电子邮件地址
         active: 激活
         display_name: 显示名称


@@ -1889,7 +1888,7 @@ zh-CN:
   sessions:
     new:
       title: 登录
   sessions:
     new:
       title: 登录

-      heading: 登录
+      tab_title: 登录

       email or username: 电子邮件地址或用户名
       password: 密码
       remember: 记住我
       email or username: 电子邮件地址或用户名
       password: 密码
       remember: 记住我


@@ -1897,34 +1896,7 @@ zh-CN:
       login_button: 登录
       register now: 立即注册
       with external: 或者使用第三方服务登录：
       login_button: 登录
       register now: 立即注册
       with external: 或者使用第三方服务登录：

-      no account: 没有账户？

       auth failure: 对不起，凭这些信息您无法登录。
       auth failure: 对不起，凭这些信息您无法登录。

-      openid_logo_alt: 使用 OpenID 登录
-      auth_providers:
-        openid:
-          title: 使用OpenID登录
-          alt: 使用OpenID URL登录
-        google:
-          title: 使用Google登录
-          alt: 使用Google OpenID登录
-        facebook:
-          title: 使用Facebook登录
-          alt: 使用Facebook账户登录
-        microsoft:
-          title: 使用Microsoft登录
-          alt: 使用Microsoft账户登录
-        github:
-          title: 使用GitHub登录
-          alt: 通过GitHub账户登录
-        wikipedia:
-          title: 使用维基百科登录
-          alt: 使用维基百科账户登录
-        wordpress:
-          title: 使用Wordpress登录
-          alt: 使用 Wordpress OpenID 登录
-        aol:
-          title: 使用AOL登录
-          alt: 使用AOL OpenID登录

     destroy:
       title: 退出
       heading: 退出登录OpenStreetMap
     destroy:
       title: 退出
       heading: 退出登录OpenStreetMap


@@ -2470,6 +2442,32 @@ zh-CN:
       oauth2_applications: OAuth 2应用程序
       oauth2_authorizations: OAuth 2授权
       muted_users: 已忽视用户
       oauth2_applications: OAuth 2应用程序
       oauth2_authorizations: OAuth 2授权
       muted_users: 已忽视用户

+    auth_providers:
+      openid_logo_alt: 使用 OpenID 登录
+      openid:
+        title: 使用OpenID登录
+        alt: 使用OpenID URL登录
+      google:
+        title: 使用Google登录
+        alt: 使用Google OpenID登录
+      facebook:
+        title: 使用Facebook登录
+        alt: 使用Facebook账户登录
+      microsoft:
+        title: 使用Microsoft登录
+        alt: 使用Microsoft账户登录
+      github:
+        title: 使用GitHub登录
+        alt: 通过GitHub账户登录
+      wikipedia:
+        title: 使用维基百科登录
+        alt: 使用维基百科账户登录
+      wordpress:
+        title: 使用Wordpress登录
+        alt: 使用 Wordpress OpenID 登录
+      aol:
+        title: 使用AOL登录
+        alt: 使用AOL OpenID登录

   oauth:
     authorize:
       title: 授权访问您的账户
   oauth:
     authorize:
       title: 授权访问您的账户


@@ -2605,13 +2603,12 @@ zh-CN:
         paragraph_2: 注册以开始贡献。我们将发送一封电子邮件以确认您的帐户。
       display name description: 你的公开展示的用户名。你可以稍后在设置中进行修改。
       external auth: 第三方身份验证：
         paragraph_2: 注册以开始贡献。我们将发送一封电子邮件以确认您的帐户。
       display name description: 你的公开展示的用户名。你可以稍后在设置中进行修改。
       external auth: 第三方身份验证：

-      use external auth: 或者使用第三方服务登录
-      auth no password: 通过第三方身份验证，您不再需要密码，但一些额外工具或服务器可能仍然需要。

       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！

-      email_confirmation_help_html: 您的地址不会公开显示，请参阅我们的%{privacy_policy_link}了解更多信息。
+      email_help_html: 您的地址不会公开显示，请参阅我们的%{privacy_policy_link}了解更多信息。

       privacy_policy: 隐私政策
       privacy_policy_title: OSM基金会隐私政策包括电子邮件地址部分
       privacy_policy: 隐私政策
       privacy_policy_title: OSM基金会隐私政策包括电子邮件地址部分

+      use external auth: 或者使用第三方服务登录

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

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 0f5b241bf5872c8923b16d1711edfa26066ed05b..97c6366162d8348c4e4659b317dd57d7eb87286c 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -136,7 +136,6 @@ zh-HK:
         auth_provider: 認證提供者
         auth_uid: 認證UID
         email: 電郵
         auth_provider: 認證提供者
         auth_uid: 認證UID
         email: 電郵

-        email_confirmation: 電郵確認

         new_email: 新電郵地址
         active: 活躍
         display_name: 顯示名稱
         new_email: 新電郵地址
         active: 活躍
         display_name: 顯示名稱


@@ -1182,7 +1181,6 @@ zh-HK:
         header: 自由而可編輯
       display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。
       external auth: 第三方身份認證：
         header: 自由而可編輯
       display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。
       external auth: 第三方身份認證：

-      auth no password: 啟用第三方認證後密碼並非必須，但一些額外的工具或伺服器可能仍需要使用密碼。

       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！
     terms:
       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！
     terms:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 0a77485eff0bd30a66d6bd1f3c4c1249f565c40e..11ae40eb0c6d9a7af1ed48d252897aba925e593e 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -183,7 +183,6 @@ zh-TW:
         auth_provider: 認證提供方
         auth_uid: 認證 UID
         email: 電子郵件
         auth_provider: 認證提供方
         auth_uid: 認證 UID
         email: 電子郵件

-        email_confirmation: 電子郵件確認

         new_email: 新的電子郵件地址
         active: 開啟中
         display_name: 顯示名稱
         new_email: 新的電子郵件地址
         active: 開啟中
         display_name: 顯示名稱


@@ -1871,7 +1870,7 @@ zh-TW:
   sessions:
     new:
       title: 登入
   sessions:
     new:
       title: 登入

-      heading: 登入
+      tab_title: 登入

       email or username: 電子郵件地址或使用者名稱
       password: 密碼
       remember: 記住我
       email or username: 電子郵件地址或使用者名稱
       password: 密碼
       remember: 記住我


@@ -1879,34 +1878,7 @@ zh-TW:
       login_button: 登入
       register now: 立即註冊
       with external: 或者使用第三方服務登入：
       login_button: 登入
       register now: 立即註冊
       with external: 或者使用第三方服務登入：

-      no account: 還沒有帳號嗎？

       auth failure: 很抱歉，無法以這些資料登入。
       auth failure: 很抱歉，無法以這些資料登入。

-      openid_logo_alt: 使用 OpenID 登入
-      auth_providers:
-        openid:
-          title: 使用 OpenID 登入
-          alt: 使用 OpenID 網址登入
-        google:
-          title: 使用 Google 登入
-          alt: 使用 Google OpenID 登入
-        facebook:
-          title: 使用臉書登入
-          alt: 使用臉書帳號登入
-        microsoft:
-          title: 使用 Microsoft 登入
-          alt: 使用 Microsoft 帳號登入
-        github:
-          title: 使用 GitHub 登入
-          alt: 使用 GitHub 帳號登入
-        wikipedia:
-          title: 使用維基百科登入
-          alt: 使用維基百科帳號登入
-        wordpress:
-          title: 使用 Wordpress 登入
-          alt: 使用 Wordpress OpenID 登入
-        aol:
-          title: 使用 AOL 登入
-          alt: 使用 AOL OpenID 登入

     destroy:
       title: 登出
       heading: 從 OpenStreetMap 登出
     destroy:
       title: 登出
       heading: 從 OpenStreetMap 登出


@@ -2458,6 +2430,32 @@ zh-TW:
       oauth2_applications: OAuth 2 應用程式
       oauth2_authorizations: OAuth 2 授權
       muted_users: 已忽視使用者
       oauth2_applications: OAuth 2 應用程式
       oauth2_authorizations: OAuth 2 授權
       muted_users: 已忽視使用者

+    auth_providers:
+      openid_logo_alt: 使用 OpenID 登入
+      openid:
+        title: 使用 OpenID 登入
+        alt: 使用 OpenID 網址登入
+      google:
+        title: 使用 Google 登入
+        alt: 使用 Google OpenID 登入
+      facebook:
+        title: 使用臉書登入
+        alt: 使用臉書帳號登入
+      microsoft:
+        title: 使用 Microsoft 登入
+        alt: 使用 Microsoft 帳號登入
+      github:
+        title: 使用 GitHub 登入
+        alt: 使用 GitHub 帳號登入
+      wikipedia:
+        title: 使用維基百科登入
+        alt: 使用維基百科帳號登入
+      wordpress:
+        title: 使用 Wordpress 登入
+        alt: 使用 Wordpress OpenID 登入
+      aol:
+        title: 使用 AOL 登入
+        alt: 使用 AOL OpenID 登入

   oauth:
     authorize:
       title: 授權使用您的帳號
   oauth:
     authorize:
       title: 授權使用您的帳號


@@ -2594,13 +2592,12 @@ zh-TW:
         paragraph_2: 註冊來開始貢獻，我們會寄送email來確認你的帳號。
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。
       external auth: 第三方身份認證
         paragraph_2: 註冊來開始貢獻，我們會寄送email來確認你的帳號。
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。
       external auth: 第三方身份認證

-      use external auth: 或者使用第三方服務登入
-      auth no password: 使用第三方認証無須填寫密碼，但部份額外工具或伺服器可能仍需要使用密碼。

       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！
       continue: 註冊
       terms accepted: 感謝您接受新的貢獻條款！

-      email_confirmation_help_html: 您的地址不會公開顯示，請參閱我們的%{privacy_policy_link}來了解更多資訊。
+      email_help_html: 您的地址不會公開顯示，請參閱我們的%{privacy_policy_link}來了解更多資訊。

       privacy_policy: 隱私權政策
       privacy_policy_title: OSMF 隱私權政策包含電子郵件地址部份
       privacy_policy: 隱私權政策
       privacy_policy_title: OSMF 隱私權政策包含電子郵件地址部份

+      use external auth: 或者使用第三方服務登入

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