Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 1db4fa18da2bf218191616412ab5eeefa983c8b4..4a18cd9f2406931812559ea55eafd98d9319a5ee 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1579,7 +1579,7 @@ af:
         facebook:
           title: Meld aan met Facebook
           alt: Meld aan met ’n Facebook-rekening
-        windowslive:
+        microsoft:
           title: Meld aan met Windows Live
           alt: Meld aan met ’n Windows Live-rekening
         github:

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 508a21f7d6bf36a93702f6cb12fd669f8d3cc265..7ba39bd48af77be5c59b5de9b57387396208731f 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -308,7 +308,7 @@ ar:
       openid: هوية مفتوحة
       google: جوجل
       facebook: فيسبوك
-      windowslive: مايكروسوفت
+      microsoft: مايكروسوفت
       github: جيت هب
       wikipedia: ويكيبيديا
   api:
@@ -1887,7 +1887,7 @@ ar:
         facebook:
           title: تسجيل الدخول باستخدام فيس بوك
           alt: تسجيل الدخول بحساب فيسبوك
-        windowslive:
+        microsoft:
           title: تسجيل الدخول مع مايكروسوفت
           alt: تسجيل الدخول بحساب مايكروسوفت
         github:

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index bb821a0407deceb3b847834a8633ae8e61e3a397..bafcf785c3fb5103d77f94bc780512796a8bd944 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1491,7 +1491,7 @@ ast:
         facebook:
           title: Anicia sesión con Facebook
           alt: Anicia sesión con una cuenta de Facebook
-        windowslive:
+        microsoft:
           title: Anicia sesión con Windows Live
           alt: Anicia sesión con una cuenta de Windows Live
         github:

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index a943ecac5a7f3fdd9bae21587dda7fe06a84d1be..81475529a0cc72a7bc0922935921e3999e519f6b 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -224,7 +224,7 @@ ba:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Майкрософт
+      microsoft: Майкрософт
       github: GitHub
       wikipedia: Википедия
   api:

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 5112e3988107a30a6e10b90b92dcf62307279dda..fdf9d6f5a9ae4b73ce97c5b958cba6251abc8f4b 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1498,7 +1498,7 @@ be:
         facebook:
           title: Увайсці праз Facebook
           alt: Увайсці праз уліковы запіс Facebook
-        windowslive:
+        microsoft:
           title: Увайсці праз Windows live
           alt: Увайсці праз уліковы запіс Windows Live
         github:

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e40ff79ff00eb74ce59b07c3ee3255d1b9a76129..384fb420225dba57839238efbf9e700747477f36 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -212,7 +212,7 @@ bg:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Майкрософт
+      microsoft: Майкрософт
       github: GitHub
       wikipedia: Уикипедия
   api:
@@ -1440,7 +1440,7 @@ bg:
         facebook:
           title: Влизане с Facebook
           alt: Влизане със сметка на Facebook
-        windowslive:
+        microsoft:
           title: Влизане с Майкрософт
           alt: Влизане със сметка на Майкрософт
         github:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index ecc870fef505f80997a8759d8c7b657471727d93..fdf69b13e82edf27faeb1b1982531ff8257155e9 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -238,7 +238,7 @@ bn:
       openid: ওপেনআইডি
       google: গুগল
       facebook: ফেসবুক
-      windowslive: মাইক্রোসফট
+      microsoft: মাইক্রোসফট
       github: গিটহাব
       wikipedia: উইকিপিডিয়া
   api:
@@ -1554,7 +1554,7 @@ bn:
         facebook:
           title: ফেসবুক দিয়ে প্রবেশ
           alt: ফেসবুক অ্যাকাউন্ট দিয়ে প্রবেশ করুন
-        windowslive:
+        microsoft:
           title: মাইক্রোসফট দিয়ে লগইন করুন
           alt: একটি মাইক্রোসফট অ্যাকাউন্ট দিয়ে লগইন করুন
         github:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 7ef4346e3ca00823ed820f824ba7ce8a40fdec95..02e0240fac393465346f348bddaa4fd213aa52c3 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1871,7 +1871,7 @@ br:
         facebook:
           title: Kevreañ ouzh Facebook
           alt: Kevreañ ouzh ur gont facebook
-        windowslive:
+        microsoft:
           title: Kevreañ ouzh Microsoft
           alt: Kevreañ ouzh ur gont Microsoft
         github:

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index fa2a7676d53fa666f3b58915f9a78b7ad42fa7bf..7072f31ba01bc3618abce3c593d61e6e1635a30d 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1903,7 +1903,7 @@ ca:
         facebook:
           title: Inicieu la sessió amb Facebook
           alt: Inicieu la sessió amb un compte de Facebook
-        windowslive:
+        microsoft:
           title: Inicieu la sessió amb Windows
           alt: Inicieu de sessió amb un compte de Windows
         github:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f1abd90c371cba7ce3ec7d6981d9b341d242687e..010f23ec95bcc11bf7025163ed77732fef225b7f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1943,7 +1943,7 @@ cs:
         facebook:
           title: Přihlásit se přes Facebook
           alt: Přihlášení pomocí účtu na Facebooku
-        windowslive:
+        microsoft:
           title: Přihlásit se přes Microsoft
           alt: Přihlášení pomocí účtu Microsoft
         github:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 19dc32de18450c4cb136d592e83f921161c44504..58351acf1ba31ede504d86f7582a5811de4966c6 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1476,7 +1476,7 @@ cy:
         facebook:
           title: Mewngofnodi â Facebook
           alt: Mewngofnodi â Chyfrif Facebook
-        windowslive:
+        microsoft:
           title: Mewngofnodi gyda Microsoft
           alt: Mewngofnodi gyda Chyfrif Microsoft
         github:

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 502577aff03d5e24968495bd71fe894ac0b412fd..426d6a7e6fd127b2a59d4c18f77a4856afe9080f 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1884,7 +1884,7 @@ da:
         facebook:
           title: Log på med Facebook
           alt: Log på med en Facebook-konto
-        windowslive:
+        microsoft:
           title: Log på med Windows Live
           alt: Log på med en Windows Live-konto
         github:

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0990c3d6d67e24959ee0dee5f721fa0f1107655e..b4b1b24aa99a663ac359b4cc255a240a281d4f98 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1974,7 +1974,7 @@ de:
         facebook:
           title: Mit Facebook anmelden
           alt: Mit einem Facebook-Konto anmelden
-        windowslive:
+        microsoft:
           title: Mit Microsoft anmelden
           alt: Mit einem Microsoft-Konto anmelden
         github:

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4d9b62c5941ee5e98a771bb896ab210f44469d93..28c9c606255f04fbb1643601690184ce4f5c26f7 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1905,7 +1905,7 @@ el:
         facebook:
           title: Σύνδεση με το Facebook
           alt: Σύνδεση με έναν Λογαριασμό Facebook
-        windowslive:
+        microsoft:
           title: Σύνδεση μέσω της Microsoft
           alt: Σύνδεση με ένα Λογαριασμό Microsoft
         github:

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b192b0528a1d67333d5bcec79e545b1b3e992df2..3fbb69c26d3ddad7a9b6f5a95d2efe1c60210345 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1383,7 +1383,7 @@ en-GB:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
-        windowslive:
+        microsoft:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 88bf0a112a7acdf7ca3a807608be9729dfd99bfd..4d112cdf4ae8e892ac3ffd46b7b9bf44b95f8e4e 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -235,6 +235,7 @@ eo:
       openid: OpenID
       google: Google
       facebook: Facebook
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Vikipedio
   api:
@@ -1830,6 +1831,9 @@ eo:
       no home location: Vi ne enigis vian hejmlokon.
       update home location on click: Ĉu freŝigi la hejmlokon kiam mi alklakas sur
         la mapo?
+      show: Montri
+      delete: Forigi
+      undelete: Malforigi
     update:
       success: Aktualigis profilon.
       failure: Ne povis aktualigi la profilon.
@@ -1858,7 +1862,7 @@ eo:
         facebook:
           title: Ensaluti per Fejsbuko
           alt: Ensaluti per konto je Fejsbuko
-        windowslive:
+        microsoft:
           title: Ensaluti per Microsoft
           alt: Ensaluti per konto Microsoft
         github:
@@ -2915,7 +2919,9 @@ eo:
     index:
       title: Rimarkoj kreitaj aŭ komentitaj de %{user}
       heading: Rimarkoj de %{user}
-      subheading_html: Rimarkoj kreitaj aŭ komentitaj de %{user}
+      subheading_html: Rimarkoj %{submitted} aŭ %{commented} de %{user}
+      subheading_submitted: kreitaj
+      subheading_commented: komentitaj
       no_notes: Neniu rimarko
       id: Identigilo
       creator: Aŭtoro

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 966991f1186c8384cb5daf91bb80ba96ab357806..1e08e1fbfe8017147b270bfd64ad7bcd2ea930c3 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -68,6 +68,7 @@
 # Author: Nancystodd
 # Author: Nelthal
 # Author: Nemo bis
+# Author: No se
 # Author: Nunte
 # Author: Ovruni
 # Author: Pantareje
@@ -304,7 +305,7 @@ es:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -626,7 +627,7 @@ es:
       login: Iniciar sesión
     no_such_entry:
       title: No existe esta entrada de diario
-      heading: No hay ninguna entrada con el identificador %{id}
+      heading: No hay ninguna entrada con el identificador "%{id}"
       body: No hay alguna entrada de diario o comentario con el identificador %{id}.
         Revisa la ortografía, o tal vez el enlace en el que hiciste clic es incorrecto.
     diary_entry:
@@ -1960,7 +1961,7 @@ es:
         facebook:
           title: Iniciar sesión con Facebook
           alt: Iniciar sesión con una cuenta de Facebook
-        windowslive:
+        microsoft:
           title: Iniciar sesión con Microsoft
           alt: Iniciar sesión con una cuenta Microsoft
         github:

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 263d70c8be397faabb577048737bf1c40a88f343..7bb68167c1f0a631c759e91ef8d436c78304ca36 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1399,7 +1399,7 @@ et:
         facebook:
           title: Logi sisse Facebooki kaudu
           alt: Logi sisse Facebooki kontoga
-        windowslive:
+        microsoft:
           title: Logi sisse Windows Live'i kaudu
           alt: Logi sisse Windows Live'i kontoga
         github:

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index d17c5ca15c3282653a048711b3f0390b0ad922e1..058e8464d98692536f8fcdebe5dabd82c679bced 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1854,7 +1854,7 @@ eu:
         facebook:
           title: Saioa hasi Facebookekin
           alt: Saioa hasi Facebookekin
-        windowslive:
+        microsoft:
           title: Saioa hasi Windows Livekin
           alt: Windows Live kontu batekin saioa hasi
         github:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6f51531b7fbb6f39b806d66f7a28b26c75bac1d6..efa485f43402b10b6fdbc2c1e77915b44cfd437f 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -256,7 +256,7 @@ fa:
       openid: OpenID
       google: گوگل
       facebook: فیس‌بوک
-      windowslive: مایکروسافت
+      microsoft: مایکروسافت
       github: گیت‌هاب
       wikipedia: ویکی‌پدیا
   api:
@@ -1837,7 +1837,7 @@ fa:
         facebook:
           title: ورود با فیسبوک
           alt: ورود با حساب فیسبوک
-        windowslive:
+        microsoft:
           title: ورود با مایکروسافت
           alt: ورود با حساب مایکروسافت
         github:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a358fcd065a2228d5157ecb144a0292bf757d7ff..6ce44bc86edf15c409d69eef0ce84e09a8eae3cc 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1166,7 +1166,7 @@ fi:
           financial: Rahoitusalan toimisto
           government: Virasto
           insurance: Vakuutusyhtiö
-          it: IT toimisto
+          it: IT-toimisto
           lawyer: Asianajotoimisto
           logistics: Logistiikkatoimisto
           newspaper: Sanomalehtitoimisto
@@ -1849,7 +1849,7 @@ fi:
         facebook:
           title: Kirjaudu Facebookin avulla
           alt: Kirjaudu käyttämällä Facebook-tunnustasi
-        windowslive:
+        microsoft:
           title: Kirjaudu Microsoft-tilin avulla
           alt: Kirjaudu sisään Microsoft-tililläsi
         github:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0aa7d67d63e6d9e6b2bbf9bee0e6262e3696c27f..ce8569c48a0e70fa129ea5b941e09d8f11645cda 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -41,11 +41,13 @@
 # Author: JenyxGym
 # Author: Jiremek
 # Author: Jlrb+
+# Author: Koreller
 # Author: Linedwell
 # Author: Litlok
 # Author: Ljubinka
 # Author: Ltrlg
 # Author: Lucky
+# Author: Lulucmy
 # Author: Macofe
 # Author: Manaviko
 # Author: Mathieu
@@ -309,12 +311,13 @@ fr:
       openid: OpenID
       google: Google
       facebook: Facebook
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipédia
   api:
     notes:
       comment:
-        opened_at_html: Créé le %{when}
+        opened_at_html: Créé %{when}
         opened_at_by_html: Créée %{when} par %{user}
         commented_at_html: Mis à jour le %{when}
         commented_at_by_html: Mis à jour le %{when} par %{user}
@@ -339,12 +342,12 @@ fr:
       show:
         title: Supprimer mon compte
         warning: Avertissement ! Le processus de suppression de compte est définitif
-          et ne pourra pas être annulé.
+          et ne peut pas être annulé.
         delete_account: Supprimer un compte
         delete_introduction: 'Vous pouvez supprimer votre compte OpenStreetMap en
           utilisant le bouton ci-dessous. Veuillez prendre note des détails suivants :'
-        delete_profile: Vos informations de profil, y compris votre avatar, votre
-          description et votre emplacement de domicile seront retirés.
+        delete_profile: Les informations de votre profil, y compris votre avatar,
+          votre description et votre lieu de résidence seront supprimées.
         delete_display_name: Votre nom affiché sera supprimé et pourra être réutilisé
           pour d’autres comptes.
         retain_caveats: 'Cependant, quelques informations vous concernant seront conservées
@@ -369,7 +372,7 @@ fr:
       external auth: Authentification externe
       openid:
         link: https://wiki.openstreetmap.org/wiki/FR:OpenID
-        link text: qu’est-ce que ceci ?
+        link text: qu’est-ce que cela ?
       public editing:
         heading: Modification publique
         enabled: Activée. Non anonyme et peut modifier les données.
@@ -390,7 +393,7 @@ fr:
         link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms/FR
         link text: qu’est-ce que ceci ?
       save changes button: Enregistrer les modifications
-      delete_account: Suppression du compte...
+      delete_account: Supprimer le compte...
     go_public:
       heading: Modification publique
       currently_not_public: Actuellement, vos modifications sont anonymes et les utilisateurs
@@ -1986,7 +1989,7 @@ fr:
         facebook:
           title: Connexion avec Facebook
           alt: Se connecter avec un compte de Facebook
-        windowslive:
+        microsoft:
           title: Connexion avec Microsoft
           alt: Se connecter avec un compte Microsoft
         github:
@@ -3117,7 +3120,9 @@ fr:
     index:
       title: Notes soumises ou commentées par « %{user} »
       heading: Notes de « %{user} »
-      subheading_html: Notes soumises ou commentées par « %{user} »
+      subheading_html: Notes %{submitted} ou %{commented} par %{user}
+      subheading_submitted: soumis
+      subheading_commented: commenté
       no_notes: Aucune note
       id: Identifiant
       creator: Créateur

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 219c282f715972c872fe57c7392508b8ec4932f2..fddcd757a080b67d40a89efe31afdf164eb3a623 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1123,7 +1123,7 @@ fur:
         facebook:
           title: Jentre cun Facebook
           alt: Jentre cuntun un cont Facebook
-        windowslive:
+        microsoft:
           title: Jentre cun Windows Live
           alt: Jentre cuntun cont di Windows Live
         github:

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index fc81f938d4531dfad38ca1dfe1375d0cf61668bd..60d2efa81a8158250642544e2c5264708339185f 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1800,7 +1800,7 @@ fy:
         facebook:
           title: Oanmelde mei Facebook
           alt: Meld jo oan mei in Facebook-akkount
-        windowslive:
+        microsoft:
           title: Oanmelde mei Windows Live
           alt: Meld jo oan mei in Windows Live-akkount
         github:

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 34d7bd4d6eab44f8519cda7419c83532b12b127d..81775a67094b2117057211a61c0c2cc71080b9bf 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1348,7 +1348,7 @@ ga:
         facebook:
           title: Logáil isteach le Facebook
           alt: Logáil isteach le Cuntas Facebook
-        windowslive:
+        microsoft:
           title: Logáil isteach le Windows Live
           alt: Logáil isteach le Cuntas Windows Live
         github:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index a2457bd6c9fe2b7a2d79b6c67a1e7d29fa0bb098..6a4f75c0cad095cd80c01b2cf3d4e79b57fcd96f 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1189,7 +1189,7 @@ gd:
         facebook:
           title: Clàraich a-steach le Facebook
           alt: Clàraich a-steach le cunntas Facebook
-        windowslive:
+        microsoft:
           title: Clàraich a-steach le Windows Live
           alt: Clàraich a-steach le cunntas Windows Live
         github:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 460003de8d2c112431ce86a572c3c1e63f6b65d8..e241bf3878c4a1ccb78bd5d55b6edef16d274b52 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -229,6 +229,7 @@ gl:
       openid: OpenID
       google: Google
       facebook: Facebook
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1848,6 +1849,9 @@ gl:
       no home location: Non inseriches o teu lugar de orixe.
       update home location on click: Desexas actualizar a túa localización ó premer
         sobre o mapa?
+      show: Amosar
+      delete: Borrar
+      undelete: Desfacer o borrado
     update:
       success: Perfil actualizado.
       failure: Non foi posíbel actualizar o perfil.
@@ -1876,7 +1880,7 @@ gl:
         facebook:
           title: Iniciar a sesión co Facebook
           alt: Iniciar a sesión cunha conta do Facebook
-        windowslive:
+        microsoft:
           title: Iniciar a sesión con Microsoft
           alt: Iniciar a sesión cunha conta de Microsoft
         github:
@@ -2970,7 +2974,9 @@ gl:
     index:
       title: Notas enviadas ou comentadas por %{user}
       heading: Notas de %{user}
-      subheading_html: Notas enviadas ou comentadas por %{user}
+      subheading_html: Notas %{submitted} ou %{commented} por %{user}
+      subheading_submitted: enviadas
+      subheading_commented: comentadas
       no_notes: Sen notas
       id: ID
       creator: Creador

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 36f7fab271d787e71d0bb619005f079b5d0ae00a..d617b3c33661a720703172d72f8a44ac0cb76fba 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -51,7 +51,7 @@ he:
       prompt: בחירת קובץ
     submit:
       diary_comment:
-        create: הערה
+        create: פרס×\95×\9d ×\94ער×\94
       diary_entry:
         create: פרסום
         update: עדכון
@@ -273,7 +273,7 @@ he:
       openid: OpenID
       google: גוגל
       facebook: פייסבוק
-      windowslive: מיקרוסופט
+      microsoft: מיקרוסופט
       github: גיטהאב
       wikipedia: ויקיפדיה
   api:
@@ -1898,7 +1898,7 @@ he:
         facebook:
           title: כניסה עם פייסבוק
           alt: כניסה עם חשבון פייסבוק
-        windowslive:
+        microsoft:
           title: כניסה עם מיקרוסופט
           alt: כניסה עם חשבון מיקרוסופט
         github:
@@ -2956,7 +2956,9 @@ he:
     index:
       title: הערות ותגובות של %{user}
       heading: הערות של %{user}
-      subheading_html: הערות ותגובות של %{user}
+      subheading_html: הערות ש%{submitted} על־ידי %{user} או %{commented} מאת %{user}
+      subheading_submitted: שנשלחו
+      subheading_commented: קיבלו תגובות
       no_notes: אין הערות
       id: מזהה
       creator: יוצר

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 692428839c6d1c23aed6866e50487d9f6a8cb814..36d0cfcb4c2aef06162df32512e8d429a4d50510 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -231,7 +231,7 @@ hi:
       openid: OpenID
       google: गूगल
       facebook: फेसबुक
-      windowslive: विन्डोज़ लाइव
+      microsoft: विन्डोज़ लाइव
       github: गिट्हब
       wikipedia: विकिपीडिया
   api:
@@ -942,6 +942,8 @@ hi:
       delete image: इस तस्वीर को हटाएं
       replace image: इस तस्वीर की जगह दूसरी लगाएं
       home location: घर का स्थान
+      show: दिखाएँ
+      delete: हटाएँ
   site:
     about:
       legal_1_1_terms_of_use: उपयोग की शर्तें

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 17ef797bc01923855638b7ba6f2f465adcf41186..4a9d1ba6bb1c24f34d57b90dd7e426cf46b992db 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1251,7 +1251,7 @@ hr:
         facebook:
           title: Prijavi se sa Facebook-om
           alt: Prijavi se sa računom Facebook-a
-        windowslive:
+        microsoft:
           title: Prijavi se sa Windows Live-om
           alt: Prijavi se sa računom Windows Live-a
         github:

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 79052ed5440f57f28346b41bb28cc8dcff80df6f..9c28c2cada880a5da3af63644fcac64913521b97 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1782,7 +1782,7 @@ hsb:
         facebook:
           title: Přizjewjenje z Facebook
           alt: Přizjewjenje z facebookowym kontom
-        windowslive:
+        microsoft:
           title: Přizjewjenje z Windows Live
           alt: Přizjewjenje z kontom Windows Live
         github:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5df67b97683e2fbf412bdb853abac493f8194f31..9e9d6c018b5f084186598b87d1c962a4a923a319 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -33,6 +33,7 @@
 # Author: Tacsipacsi
 # Author: Uno20001
 # Author: Urbalazs
+# Author: Zalán Hári
 # Author: Zizzerus
 ---
 hu:
@@ -1882,7 +1883,7 @@ hu:
         facebook:
           title: Bejelentkezés Facebook-kal
           alt: Bejelentkezés Facebook fiókkal
-        windowslive:
+        microsoft:
           title: Bejelentkezés Microsofttal.
           alt: Bejelentkezés Microsoft fiókkal
         github:
@@ -1965,7 +1966,7 @@ hu:
         szerzői jogi vagy egyéb jogi kérdései vannak.
       legal_2_1_contact_the_osmf: lépj kapcsolatba az OSM Alapítvánnyal
       legal_2_2_html: Az OpenStreetMap, a nagyító logó és a State of the Map %{registered_trademarks_link}.
-      legal_2_2_registered_trademarks: az OSMF bejegyzett védjegye
+      legal_2_2_registered_trademarks: az OSMF bejegyzett védjegyei
       partners_title: Partnerek
     copyright:
       foreign:

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7a4063e4b5105769974c4b7493e1cb951ebef58c..8bc1c60869f661c600b1e0206e57727a70314d0e 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -218,6 +218,7 @@ ia:
       openid: OpenID
       google: Google
       facebook: Facebook
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1870,7 +1871,7 @@ ia:
         facebook:
           title: Aperir session con Facebook
           alt: Aperir session con un conto de Facebook
-        windowslive:
+        microsoft:
           title: Aperir session con Microsoft
           alt: Aperir session con un conto Microsoft
         github:
@@ -2949,7 +2950,9 @@ ia:
     index:
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}
-      subheading_html: Notas submittite o commentate per %{user}
+      subheading_html: Notas %{submitted} o %{commented} per %{user}
+      subheading_submitted: submittite
+      subheading_commented: commentate
       no_notes: Sin notas
       id: ID
       creator: Creator

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 00943412a12f44b73e3be23607e9c002ce67a8e1..69501f68c772d48a00d45083f630f06e41806867 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1888,7 +1888,7 @@ id:
         facebook:
           title: Masuk dengan Facebook
           alt: Masuk dengan akun Facebook
-        windowslive:
+        microsoft:
           title: Masuk dengan Windows Live
           alt: Masuk dengan akun Windows Live
         github:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 297191f9d1cb974cabcdc4b38d0e02c812bbf079..efc567067850db4133f09144ca6cfed5718b5ccf 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1864,6 +1864,9 @@ is:
       home location: Upphafsstaðsetning
       no home location: Þú hefur ekki stillt staðsetningu þína.
       update home location on click: Uppfæra staðsetninguna þegar ég smelli á kortið
+      show: Birta
+      delete: Eyða
+      undelete: Afturkalla eyðingu
     update:
       success: Notandasíða uppfært.
       failure: Gat ekki uppfært kjörstillingar.
@@ -1892,7 +1895,7 @@ is:
         facebook:
           title: Skrá inn með Facebook
           alt: Skrá inn með Facebook-aðgangi
-        windowslive:
+        microsoft:
           title: Skrá inn með Microsoft
           alt: Skrá inn með Microsoft-aðgangi
         github:

diff --git a/config/locales/it.yml b/config/locales/it.yml
index e000c57818703ff1e3764576fb9d6637fa0c9324..666711d3e6feaa8a2063c40024b6c68e0f6273eb 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1926,7 +1926,7 @@ it:
         facebook:
           title: Accedi con Facebook
           alt: Accedi con un account Facebook
-        windowslive:
+        microsoft:
           title: Accedi con Microsoft
           alt: Accedi con un account Microsoft
         github:
@@ -3008,7 +3008,9 @@ it:
     index:
       title: Note inserite o commentate da %{user}
       heading: Note dell'utente %{user}
-      subheading_html: Note inserite o commentate da %{user}
+      subheading_html: Note %{submitted} o %{commented} da %{user}
+      subheading_submitted: inviate
+      subheading_commented: commentate
       no_notes: Nessuna nota
       id: Identificativo
       creator: Autore

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9869ab108cd800af603d1e21a1598e756c999c3f..13ec9bc9fcd3aa18520cb1de94d207292a9b0c95 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -269,7 +269,7 @@ ja:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: マイクロソフト
+      microsoft: マイクロソフト
       github: GitHub
       wikipedia: ウィキペディア
   api:
@@ -350,12 +350,12 @@ ja:
   browse:
     created: 作成
     closed: クローズ
-    created_ago_html: '%{time_ago} に作成されました'
+    created_ago_html: '%{time_ago} に作成'
     closed_ago_html: '%{time_ago}に閉じられました'
-    created_ago_by_html: '%{user}ã\81«ã\82\88ã\81£ã\81¦%{time_ago}ã\81«ä½\9cæ\88\90ã\81\95ã\82\8cã\81¾ã\81\97ã\81\9f'
-    closed_ago_by_html: '%{time_ago}に%{user}によって閉じられました'
-    deleted_ago_by_html: '%{time_ago}に%{user}によって削除されました'
-    edited_ago_by_html: '%{time_ago}に%{user}によって編集されました'
+    created_ago_by_html: '%{user}ã\81\8c%{time_ago}ã\81«ä½\9cæ\88\90'
+    closed_ago_by_html: '%{user}が%{time_ago}に閉じました'
+    deleted_ago_by_html: '%{user}が%{time_ago}に削除'
+    edited_ago_by_html: '%{user}が%{time_ago}に編集'
     version: バージョン
     in_changeset: 変更セット
     anonymous: 匿名
@@ -1795,7 +1795,7 @@ ja:
         facebook:
           title: Facebookでログイン
           alt: Facebook アカウントを使用してログイン
-        windowslive:
+        microsoft:
           title: Microsoftでログイン
           alt: Microsoftアカウントでログイン
         github:

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d2cb1a0d7d8e2d8d8c975c06d98c06ddf3d9c2c6..a5abc42d71a5ac365c218fdddb45eac3c025508f 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -984,7 +984,7 @@ kab:
         facebook:
           title: Qqen s Facebook
           alt: Qqen s umidan Facebook
-        windowslive:
+        microsoft:
           title: Qqen s Windows Live
           alt: Qqen s umiḍan Windows Live
         github:

diff --git a/config/locales/km.yml b/config/locales/km.yml
index bd64152827dc85b6018af40fec2dbc7b2c5ae881..d32001d7b5675f6a0fd5b3549671c8291e2ad8eb 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -673,7 +673,7 @@ km:
           title: កត់ឈ្មោះចូលដោយប្រើ Google
         facebook:
           title: កត់ឈ្មោះចូលដោយប្រើ Facebook
-        windowslive:
+        microsoft:
           title: កត់ឈ្មោះចូលដោយប្រើ Windows Live
         github:
           title: កត់ឈ្មោះចូលដោយប្រើ GitHub

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 5925bc1a18ea87016719c39de91320ec7c4e2725..1a2964d2073224d735a8dfc44ce12ea0f09a0b6a 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -170,7 +170,7 @@ kn:
       none: ಯಾವುದೂ ಇಲ್ಲ
       google: ಗೂಗಲ್
       facebook: ಫೇಸ್‍ಬುಕ್
-      windowslive: ವಿಂಡೋಸ್ ಲೈವ್
+      microsoft: ವಿಂಡೋಸ್ ಲೈವ್
       github: ಗಿಟ್‌ಹಬ್
       wikipedia: ವಿಕಿಪೀಡಿಯ
   api:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9fe8930a379baa515a8adc7079d50948627071a2..8783f551ec8c31366ab5b0c60a6ada2ab8912eb8 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1686,7 +1686,7 @@ ko:
         facebook:
           title: 페이스북으로 로그인
           alt: 페이스북 계정으로 로그인하기
-        windowslive:
+        microsoft:
           title: 윈도 라이브로 로그인하기
           alt: 윈도 라이브 계정으로 로그인하기
         github:

diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml
index 3afc544cf7a2a618b4039b7ef887867ae65cfc00..3cf67f7b5c98e144885fc98c11d752d0b49ce011 100644 (file)
--- a/config/locales/ksh.yml
+++ b/config/locales/ksh.yml
@@ -228,7 +228,7 @@ ksh:
         facebook:
           title: Donn övver ene Zohjang op Facebook ennlogge
           alt: Donn övver ene Zohjang op Facebook ennlogge
-        windowslive:
+        microsoft:
           title: Donn medd enem Zohjang op Windows Live ennlogge
           alt: Donn medd enem Zohjang op Windows Live ennlogge
         github:

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 5f245f4f8cb0f89d282627a7dd07fc2a17b0042b..1d45aad4f840830b9e0824a37666dac3a6ee7f23 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1852,7 +1852,7 @@ ku-Latn:
         facebook:
           title: Bi Facebookê têkeve
           alt: Bi hesabekî Facebookê têkeve
-        windowslive:
+        microsoft:
           title: Bi Windows Live'ê têkeve
           alt: Bi hesabê xwe yê Windows Liveê têkeve
         github:

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 7d92e3a5ac69ca722c0e2c0615dbabfb3f2ceeeb..7d04b25fb7840b32ad0ab00f3e367040070a8f9d 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1840,7 +1840,7 @@ lb:
         facebook:
           title: Mat Facebook aloggen
           alt: Mat engem Facebook Benotzerkont aloggen
-        windowslive:
+        microsoft:
           title: Mat Microsoft aloggen
           alt: Mat engem Microsoft-Benotzerkont aloggen
         github:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b09bc0c78c35b859923db04eec83b0adfcb4dffb..7447cf52140db13012679a28a83e27f5c9344f16 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1775,6 +1775,9 @@ lt:
       home location: Pradinė lokacija
       no home location: Jūs neįvedėte savo namų pozicijos
       update home location on click: Atnaujinti namų poziciją paspaudus ant žemėlapio?
+      show: Rodyti
+      delete: Trinti
+      undelete: Anuliuoti trynimą
     update:
       success: Profilis atnaujintas.
       failure: Nepavyko atnaujinti profilio.
@@ -1803,7 +1806,7 @@ lt:
         facebook:
           title: Prisijungti su Facebook
           alt: Prisijungti su Facebook paskyra
-        windowslive:
+        microsoft:
           title: Prisijungti su Windows Live
           alt: Prisijungti su Windows Live paskyra
         github:

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 3c78c0c8a58fc011aebfe68d545a11692d311c03..4133eec391f12f7233f178329d0151d87d394c5e 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1462,7 +1462,7 @@ lv:
         facebook:
           title: Pieslēgties ar Facebook
           alt: Pieslēgties ar Facebook kontu
-        windowslive:
+        microsoft:
           title: Pieslēgties ar Microsoft
           alt: Pieslēgties ar Microsoft kontu
         github:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 720b34c6bcea61ebbaa033481395aeb25a4494a4..1e4085af741a73db500c0f8d8e91b803118ce5c8 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1859,7 +1859,7 @@ mk:
         facebook:
           title: Најава со Фејсбук
           alt: Најава со профил на Фејсбук
-        windowslive:
+        microsoft:
           title: Најава со Microsoft
           alt: Најава со сметка на Microsoft
         github:

diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 1fe000ae9f1f7566010f050f24e09bf4a4c2102f..b8183b232ddf858878525ed3809b19a262c83b66 100644 (file)
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -580,7 +580,7 @@ mo:
         facebook:
           title: Ынтраря ку ажуторул Facebook
           alt: Ынтраря ку ажуторул контулуй де Facebook
-        windowslive:
+        microsoft:
           title: Ынтраря ку ажуторул Windows Live
           alt: Ынтраря ку ажуторул контулуй де Windows Live
         github:

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 129e0d1a10efab85d963f59f6b35c6c9ebac3818..09186db88da59b3602f975210b53533fb3c2f31c 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1464,7 +1464,7 @@ ms:
         facebook:
           title: Log masuk dengan Facebook
           alt: Log masuk dengan Akuan Facebook
-        windowslive:
+        microsoft:
           title: Log masuk dengan Window Live
           alt: Log masuk dengan Akaun Windows Live
         github:

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 34e08cea6eef47f80e9c17397b291ac64ef11337..6d8323aab45a8da327ce43f4cf0bec5a60a355df 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1616,7 +1616,7 @@ nb:
         facebook:
           title: Logg inn med Facebook
           alt: Logg inn med en Facebook-konto
-        windowslive:
+        microsoft:
           title: Logg inn med Microsoft
           alt: Logg inn med en Microsoft-konto
         github:

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 95794336a795d482c951f3622cc58f09fbc78195..0be36dcf606da68449c09ed1e8bf7727d74c4761 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1931,7 +1931,7 @@ nl:
         facebook:
           title: Aanmelden met Facebook
           alt: Aanmelden met een Facebookaccount
-        windowslive:
+        microsoft:
           title: Aanmelden met Microsoft
           alt: Aanmelden met een Microsoft-account
         github:

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index e5cda0b9c0babc3c75b33ab897cf31dc5653c617..b6c0ba2c8a199cad84c898beab18c6cd9c1f4a1c 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1209,7 +1209,7 @@ nn:
         facebook:
           title: Logg inn med Facebook
           alt: Logg inn med ein Facebook-konto
-        windowslive:
+        microsoft:
           title: Logg inn med Windows Live
           alt: Logg inn med ein Windows Live-konto
         github:

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index d401202273e86fbf1c748ccf328d7d1bd7eeac83..846b4375e54e2c7b714412c5f8b6ca0c81ddf7ff 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -178,7 +178,7 @@ nqo:
       openid: ߏߔߌ߲ ID
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
-      windowslive: ߡߌߞߙߏߛߐߝߕ
+      microsoft: ߡߌߞߙߏߛߐߝߕ
       github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
@@ -1369,7 +1369,7 @@ nqo:
         facebook:
           title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        windowslive:
+        microsoft:
           title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
         github:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2e98de1028a4525c4032ff1170ef8bd766b13e6a..6d2b120acd270f4889bcb08f6d9eb62aab7ac0ad 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1806,7 +1806,7 @@ oc:
         facebook:
           title: Se connectar amb Facebook
           alt: Se connectar amb un commpte Facebook
-        windowslive:
+        microsoft:
           title: Se connectar amb Windows Live
           alt: Se connectar amb un compte Windows Live
         github:

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 50a2e90cfbaf23f9516ffaa7b93ee2c7f57e1fc4..6d71349c586fb0cf719fbbe52816107847ad0cab 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -129,7 +129,7 @@ pa:
       none: ਕੋਈ ਨਹੀਂ
       google: ਗੂਗਲ
       facebook: ਫੇਸਬੁੱਕ
-      windowslive: ਵਿੰਡੋਜ਼ ਲਾਈਵ
+      microsoft: ਵਿੰਡੋਜ਼ ਲਾਈਵ
       github: ਗਿੱਟਹੱਬ
       wikipedia: ਵਿਕੀਪੀਡੀਆ
   api:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f248db1c1a7789b532d43f03b3d68e65f58a4cd7..51285dae14400fdcf6bb20fc87db83f68b4ecf24 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1957,7 +1957,7 @@ pl:
         facebook:
           title: Zaloguj się przez Facebooka
           alt: Zaloguj się przez konto Facebook
-        windowslive:
+        microsoft:
           title: Zaloguj się przez Microsoft
           alt: Zaloguj się kontem Microsoft
         github:

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 1ce103feae657e70b5076af10a38d87b7bdf25da..d085b897b587bcbf5f90ea88a376c04cac57ab74 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -210,7 +210,7 @@ pnb:
       openid: اوپن آئی ڈی
       google: گوگل
       facebook: فیسبوک
-      windowslive: وِنڈوز لائیو
+      microsoft: وِنڈوز لائیو
       github: گِٹ ہب
       wikipedia: وِکیپیدیا
   api:
@@ -1463,7 +1463,7 @@ pnb:
         facebook:
           title: فیس‌بوک نال لوگ‌این کرو
           alt: فیسبوک ورتو
-        windowslive:
+        microsoft:
           title: وینڈوز لائیو نال لوگ‌این کرو
           alt: وینڈوز لائیو ورتو
         github:

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 5b3c3bdd5277a34b21909ed678fa380c4c5aa2c1..ffe0f4ff8cd85e2d07751fe5afbd554bdcdde50e 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -252,6 +252,7 @@ pt-PT:
       openid: OpenID
       google: Google
       facebook: Facebook
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipédia
   api:
@@ -403,7 +404,7 @@ pt-PT:
       history_title_html: 'Histórico da Linha: %{name}'
       nodes: Nós
       nodes_count:
-        one: 1 nó
+        one: '%{count} nó'
         other: '%{count} nós'
       also_part_of_html:
         one: parte da linha %{related_ways}
@@ -583,8 +584,8 @@ pt-PT:
       reply_link: Enviar mensagem ao autor
       comment_count:
         one: '%{count} comentário'
-        zero: Sem comentários
         other: '%{count} comentários'
+      no_comments: Sem comentários
       edit_link: Editar
       hide_link: Ocultar
       unhide_link: Mostrar
@@ -859,7 +860,7 @@ pt-PT:
           stable: Estábulo
           static_caravan: Caravana
           temple: Edíficio de templo
-          terrace: Edifício terraçado
+          terrace: Edifício geminado
           train_station: Edifício de estação dos comboios
           university: Edifício universitário
           warehouse: Armazém
@@ -1130,13 +1131,13 @@ pt-PT:
           "yes": Desfiladeiro
         natural:
           atoll: Atol
-          bare_rock: Rocha visível
+          bare_rock: Rocha exposta
           bay: Baía
           beach: Praia
           cape: Cabo
           cave_entrance: Entrada de gruta
           cliff: Precipício
-          coastline: Litoral
+          coastline: Linha costeira
           crater: Cratera
           dune: Duna
           fell: Encosta desflorestada
@@ -1471,9 +1472,9 @@ pt-PT:
     show:
       title: '%{status} Denúncia #%{issue_id}'
       reports:
-        zero: Sem denúncias
-        one: 1 denúncia
+        one: '%{count} denúncia'
         other: '%{count} denúncias'
+      no_reports: Sem denúncias
       report_created_at: Denunciado pela primeira vez em %{datetime}
       last_resolved_at: Resolvido pela última vez em %{datetime}
       last_updated_at: Atualizado pela última vez em %{datetime} por %{displayname}
@@ -1875,6 +1876,9 @@ pt-PT:
       home location: Localização principal
       no home location: Não definiste a tua localização principal.
       update home location on click: Atualizar a localização ao clicar no mapa?
+      show: Mostrar
+      delete: Eliminar
+      undelete: Desfazer eliminação
     update:
       success: Perfil atualizado.
       failure: Não foi possível atualizar o perfil.
@@ -1903,7 +1907,7 @@ pt-PT:
         facebook:
           title: Iniciar sessão com o Facebook
           alt: Iniciar sessão com uma conta do Facebook
-        windowslive:
+        microsoft:
           title: Iniciar sessão com Microsoft
           alt: Iniciar sessão com uma conta Microsoft
         github:
@@ -2978,7 +2982,9 @@ pt-PT:
     index:
       title: Notas submetidas ou comentadas por %{user}
       heading: Notas de %{user}
-      subheading_html: Notas submetidas ou comentadas por %{user}
+      subheading_html: Notas %{submitted} ou %{commented} por %{user}
+      subheading_submitted: enviada
+      subheading_commented: comentada em
       no_notes: Sem notas
       id: Id
       creator: Criador
@@ -3004,7 +3010,7 @@ pt-PT:
       anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que
         devem ser confirmados por fonte independente.
       hide: Esconder
-      resolve: Marcar como resolvido
+      resolve: Marcar como resolvida
       reactivate: Reabrir
       comment_and_resolve: Comentar e resolver
       comment: Comentar

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index fe8160327f91447f135f711c4d289a4aa34ad725..5247428bbf746e18b87e3c0564b742c3f3154747 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1913,7 +1913,7 @@ pt:
         facebook:
           title: Entrar com o Facebook
           alt: Entrar com uma conta do Facebook
-        windowslive:
+        microsoft:
           title: Entrar com o Windows Live
           alt: Entrar com uma conta do Windows Live
         github:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index ae2b93da1c8c73b45d24f939c8345322d1de5cb4..b61cec96360d834a7e407b1307f4b47be138abf1 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1857,7 +1857,7 @@ ro:
         facebook:
           title: Autentificare cu Facebook
           alt: Conectați-vă cu un cont Facebook
-        windowslive:
+        microsoft:
           title: Conectare cu Microsoft
           alt: Conectare cu un Cont Microsoft
         github:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f83b663a52f1b15cd634b2a48df0754e389d2e68..ca64e0b491d312579aa21fd52c8ab6e487966be7 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1952,7 +1952,7 @@ ru:
         facebook:
           title: Войти с помощью Facebook
           alt: Войти с помощью учётной записи в Facebook
-        windowslive:
+        microsoft:
           title: Войти с помощью Windows Live
           alt: Войти с помощью учётной записи Windows Live
         github:

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 5660a99aa63398a9b253c9a6ee3785928fb72f06..92d9043aab0513925c5a7fb3bc7cf5fed2b0f6de 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -375,7 +375,7 @@ sc:
       history_title_html: 'Istòria de sa lìnia: %{name}'
       nodes: Nodos
       nodes_count:
-        one: 1 nodu
+        one: '%{count} nodu'
         other: '%{count} nodos'
       also_part_of_html:
         one: parte de sa lìnia %{related_ways}
@@ -552,6 +552,7 @@ sc:
       comment_count:
         one: '%{count} cummentu'
         other: '%{count} cummentos'
+      no_comments: Perunu cummentu
       edit_link: Modìfica custa intrada
       hide_link: Cua custa intrada
       unhide_link: Ammustra custa intrada
@@ -1443,6 +1444,7 @@ sc:
       reports:
         one: '%{count} sinnalatzione'
         other: '%{count} sinnalatziones'
+      no_reports: Perunu informe
       report_created_at: Sinnaladu pro sa prima borta su %{datetime}
       last_resolved_at: Risoltu pro s'ùrtima borta su %{datetime}
       last_updated_at: Ùrtima atualizatzione de %{displayname} su %{datetime}
@@ -1853,6 +1855,9 @@ sc:
       no home location: No as insertadu sa positzione de incumintzu tua.
       update home location on click: Atualizare sa positzione de incumintzu incarchende
         in sa mapa?
+      show: Ammustra
+      delete: Iscantzella
+      undelete: Annulla s'iscantzellamentu
     update:
       success: Profilu atualizadu.
       failure: Non s'est pòdidu atualizare su profilu.
@@ -1881,7 +1886,7 @@ sc:
         facebook:
           title: Intra cun Facebook
           alt: Intra cun unu contu de Facebook
-        windowslive:
+        microsoft:
           title: Intra cun Microsoft
           alt: Intra cun unu contu de Microsoft
         github:

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index cb4aa3f5bd6f8c9fa128fa533b09e82e1f15dbae..bf4cf06d15ac4475705f4501be52b954e3a8b902 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1297,7 +1297,7 @@ scn:
         facebook:
           title: Trasi cu Facebook
           alt: Trasi cûn cuntu di Facebook
-        windowslive:
+        microsoft:
           title: Trasi cu Windows Live
           alt: Trasi cûn cuntu di Windows Live
         github:

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index cc0b3b486342fb86804f3074737368a43809866a..4e3fa8fa7f2f411534f60e6c7bca59402d97571c 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -808,7 +808,7 @@ sco:
         facebook:
           title: Login wi Facebook
           alt: Login wi a Facebook Accoont
-        windowslive:
+        microsoft:
           title: Login wi Windows Live
           alt: Login wi a Windows Live Accoont
         github:

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 7bd8b6e87d3b10fea6a7e5736b55b74f1f042361..69551cb832657cf900a103fd76e1c6ade7333393 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1781,7 +1781,7 @@ sk:
         facebook:
           title: Prihlásenie sa pomocou Facebooku
           alt: Prihlásenie sa pomocou účtu na Facebooku
-        windowslive:
+        microsoft:
           title: Prihlásenie sa pomocou Windows Live
           alt: Prihlásenie sa pomocou účtu Windows Live
         github:

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index b33dcc7b700a8542d58bcddb177ae2acba219c25..ebf024269c63862a0cd3e2dd5bb411721150045b 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -148,7 +148,7 @@ skr-arab:
       openid: کھلی آئی ڈی
       google: گوگل
       facebook: فیسبوک
-      windowslive: مائیکروسافٹ
+      microsoft: مائیکروسافٹ
       github: گِٹ ہب
       wikipedia: وکیپیڈیا
   api:
@@ -1111,7 +1111,7 @@ skr-arab:
           alt: گوگل اوپن آئی ڈی نال لاگ ان تھیوو
         facebook:
           title: فیس بک نال لاگ ان تھیوو
-        windowslive:
+        microsoft:
           title: مائیکروسافٹ نال لاگ ان تھیوو
           alt: مائیکروسافٹ کھاتے نال لاگ ان تھیوو
         github:
@@ -1320,6 +1320,8 @@ skr-arab:
       show: ݙِکھاؤ
       edit: تبدیلی کرو
   notes:
+    index:
+      subheading_submitted: جمع تھی ڳیا
     show:
       title: نوٹ:%{id}
       description: تفصیل

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3bbe874dd46e962cb39778282813bd82cf592ab4..9d0554c8b5ef6544df8af9baf6aeb916d9209cdc 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1926,7 +1926,7 @@ sl:
         facebook:
           title: Prijavi se s Facebookom
           alt: Prijavi se z računom Facebook
-        windowslive:
+        microsoft:
           title: Prijava z Microsoftom
           alt: Prijava z računom Microsoft
         github:
@@ -3017,7 +3017,9 @@ sl:
     index:
       title: Opombe, ki jih je posredoval_a ali komentiral_a %{user}
       heading: Opombe uporabnika %{user}
-      subheading_html: Opombe, ki jih je posredoval_a ali komentiral_a %{user}
+      subheading_html: Opombe, ki jih je %{submitted} ali %{commented} %{user}
+      subheading_submitted: posredoval_a
+      subheading_commented: komentiral_a
       no_notes: Ni opomb
       id: Id
       creator: Ustvarjalec

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index f980de83b83901a2940b3bcbf736f9f0d7131def..d015c9baf3108f0d23de4a9a873ce907416bb9a7 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1457,7 +1457,7 @@ sr:
         facebook:
           title: Пријавити се са Facebook-ом
           alt: Пријава преко Facebook налога
-        windowslive:
+        microsoft:
           title: Пријава преко Microsoft-а
           alt: Пријава преко Microsoft налога
         github:

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 847d18f508c0252a685bdcc963bd386a63551d64..08a76ff6bed1c3c2a03f711ed245650992ae7b00 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1872,7 +1872,7 @@ sv:
         facebook:
           title: Logga in med Facebook
           alt: Logga in med ett Facebook-konto
-        windowslive:
+        microsoft:
           title: Logga in med Microsoft
           alt: Logga in med ett Microsoft-konto
         github:

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 095c11d2f717fb3ea127b721db93fb33b553eb29..fc7874b99b4f6692f1a694525b3f1c68e3df729e 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1781,7 +1781,7 @@ te:
         facebook:
           title: Facebook తో లాగినవండి
           alt: Facebook ఖాతాతో లాగినవండి
-        windowslive:
+        microsoft:
           title: Windows Live తో లాగినవండి
           alt: Windows Live ఖాతాతో లాగినవండి
         github:

diff --git a/config/locales/th.yml b/config/locales/th.yml
index c11f31ee2c3f801e307786d12f9a570bf817e675..64e1da4e93ae70558252e10c9dbf2ad1e0b6d493 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1468,7 +1468,7 @@ th:
         facebook:
           title: เข้าใช้งานด้วย Facebook
           alt: เข้าใช้งานด้วยบัญชี Facebook
-        windowslive:
+        microsoft:
           title: เข้าใช้งานด้วย Windows Live
           alt: เข้าใช้งานด้วยบัญชี Windows Live
         github:

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 41a18baf6375506301f239f69a97ecb16a9526f8..78226dcaf98924a841b0bda19bd51691e263af57 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1494,7 +1494,7 @@ tl:
         facebook:
           title: Lumagda gamit ang Facebook
           alt: Lumagda gamit ang isang akawnt sa Facebook
-        windowslive:
+        microsoft:
           title: Lumagda gamit ang Windows Live
           alt: Lumagda gamit ang isang akawnt sa Windows Live
         github:

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 5c325292f3c6f12ceb9d32f6dd3cf05c0d781aff..f13d59eedfc216ef6c7b78ed5ac6fd2b11b84585 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1911,7 +1911,7 @@ tr:
         facebook:
           title: Facebook ile giriş
           alt: Facebook Hesabı ile giriş
-        windowslive:
+        microsoft:
           title: Microsoft ile giriş
           alt: Microsoft Hesabı ile giriş
         github:

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0b51488b71a721a2ca4b6eac2d10909e39994ac4..c7c3369fe80092d985cbd41e5adf4c60637d3a21 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1949,7 +1949,7 @@ uk:
         facebook:
           title: Увійти з Facebook
           alt: Увійти з облікового запису Facebook
-        windowslive:
+        microsoft:
           title: Увійти з Microsoft
           alt: Увійти з облікового запису Microsoft
         github:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 530ebb70580912814d1c85da702799cfe6212cd7..4144a3f018e3d549fd23e32a19de58fc521d5400 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1738,9 +1738,9 @@ vi:
         facebook:
           title: Đăng nhập qua Facebook
           alt: Đăng nhập dùng tài khoản Facebook
-        windowslive:
-          title: Đăng nhập qua Windows Live
-          alt: Đăng nhập dùng tài khoản Windows Live
+        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

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d07cacfeb0a2bb28b0db862189c273d8683ce376..a20d5891b5ed8bc804dc723416aa23bebd9d941e 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1826,7 +1826,7 @@ zh-CN:
         facebook:
           title: 使用脸书登录
           alt: 使用Facebook账户登录
-        windowslive:
+        microsoft:
           title: 使用Microsoft登录
           alt: 使用Microsoft账户登录
         github:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 085c06003f11b4f25125c722e40d19132c6e17ca..ac484938d1871109e6eb3731d7636c627c59782f 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -255,6 +255,7 @@ zh-TW:
       openid: OpenID
       google: Google
       facebook: 臉書
+      microsoft: 微軟
       github: GitHub
       wikipedia: 維基百科
   api:
@@ -1809,7 +1810,7 @@ zh-TW:
         facebook:
           title: 使用臉書登入
           alt: 使用臉書帳號登入
-        windowslive:
+        microsoft:
           title: 使用 Microsoft 帳號登入
           alt: 使用 Microsoft 帳號登入
         github:
@@ -2735,7 +2736,9 @@ zh-TW:
     index:
       title: 由 %{user} 送出或評論的註記
       heading: '%{user} 的註記'
-      subheading_html: '%{user} 送出或評論的註記'
+      subheading_html: 由%{user}%{submitted}或%{commented}的註記
+      subheading_submitted: 已提交
+      subheading_commented: 已評論
       no_notes: 沒有註記
       id: ID
       creator: 建立者