Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 863c7f3caa6224906d24d2f75acab327a5bdae57..450ebfc00b9d4d6d2aab980f6e4167944bff440f 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1789,9 +1789,9 @@ af:
       revoke: Herroep!
       flash: Hierdie versperring is herroep.
     helper:
-      time_future: Tyd oor %{time} verstreke.
+      time_future_html: Tyd oor %{time} verstreke.
       until_login: Aktief totdat die gebruiker aanmeld.
-      time_past: Tyd is %{time} gelede verstreke.
+      time_past_html: Tyd is %{time} gelede verstreke.
       block_duration:
         hours:
           one: 1 uur

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 53026df36964a38bd68302700a6d5b34beeddc9d..442763b6b2a3afa5559f3a115a6fb55f2ed744b2 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1380,9 +1380,9 @@ aln:
       revoke: Tërheq!
       flash: Ky bllok është revokuar.
     helper:
-      time_future: Përfundon në %{time}.
+      time_future_html: Përfundon në %{time}.
       until_login: Aktiv deri kur përdoruesi shkrimet in
-      time_past: Përfundoi %{time} më parë.
+      time_past_html: Përfundoi %{time} më parë.
       block_duration:
         hours:
           one: 1 orë

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4e6847895698c32267c4d4488a92e28df280d186..1cf1301c723da267dfdf410287fb802d5d9622c8 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -2478,10 +2478,10 @@ ar:
       revoke: ابطل!
       flash: تم إبطال هذه العرقلة.
     helper:
-      time_future: ينتهي في %{time}.
+      time_future_html: ينتهي في %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
-      time_future_and_until_login: ينتهي في %{time} وبعد تسجيل دخول المستخدم.
-      time_past: انتهى %{time}.
+      time_future_and_until_login_html: ينتهي في %{time} وبعد تسجيل دخول المستخدم.
+      time_past_html: انتهى %{time}.
       block_duration:
         hours:
           few: '%{count} ساعات'

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 890db73d45c778533b27ca04ba3f3823a02dabd2..8234c54f80eff1a32a07abd900a96fd5c421a201 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -1133,9 +1133,9 @@ arz:
       revoke: ابطل!
       flash: تم إبطال هذه العرقله.
     helper:
-      time_future: ينتهى فى %{time}.
+      time_future_html: ينتهى فى %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
-      time_past: انتهى منذ %{time}.
+      time_past_html: انتهى منذ %{time}.
       block_duration:
         hours:
           few: '%{count} ساعات'

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 213c3418b07311e3dd585ed19302d66cf1bc06ec..06e432432c41a5190962cda3f002bb0bc5ac4867 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -2466,11 +2466,11 @@ ast:
       revoke: ¡Desaniciar!
       flash: Esti bloquéu se desanició.
     helper:
-      time_future: Fina en %{time}.
+      time_future_html: Fina en %{time}.
       until_login: Activu fasta que'l usuariu anicie sesión.
-      time_future_and_until_login: Acaba en %{time} y después de que l'usuariu anicie
-        sesión.
-      time_past: Finó %{time}.
+      time_future_and_until_login_html: Acaba en %{time} y después de que l'usuariu
+        anicie sesión.
+      time_past_html: Finó %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 8d6ef61d135741bf2d274b34d9644dfd74c60b1d..4fad302ca95c2bb19503d8bba5ccc5f1e948c308 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1149,7 +1149,7 @@ az:
       revoke: Ləğv et!
       flash: Bu blok ləğv edilib.
     helper:
-      time_past: '%{time} əvvəl sona çatıb.'
+      time_past_html: '%{time} əvvəl sona çatıb.'
     blocks_by:
       title: '%{name} tərəfindən blok edilib'
     show:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index b814a5b3afa240b4b0dcde036df1d0f92977ec7a..71d1b3d34721a0c41bed3dab72da23decd1d094b 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1635,9 +1635,9 @@ be-Tarask:
       revoke: Адклікаць!
       flash: Гэтае блякаваньне было адкліканае.
     helper:
-      time_future: Канчаецца ў %{time}.
+      time_future_html: Канчаецца ў %{time}.
       until_login: Актыўнае да моманту ўваходу ўдзельніка ў сыстэму.
-      time_past: Скончылася %{time}.
+      time_past_html: Скончылася %{time}.
       block_duration:
         hours:
           one: '%{count} гадзіна'

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 3b265a8b90042306946eb3ca42859bd52b018ed5..f62449e90951b632e55042d1941e597db9dc0cb4 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -10,6 +10,7 @@
 # Author: Macofe
 # Author: Maksim L.
 # Author: Mechanizatar
+# Author: Nerogaf
 # Author: Unomano
 # Author: Дзяніс Тутэйшы
 # Author: Тест
@@ -20,6 +21,8 @@ be:
     formats:
       friendly: '%e %B %Y у %H:%M'
   helpers:
+    file:
+      prompt: Абраць файл
     submit:
       diary_comment:
         create: Захаваць
@@ -32,7 +35,7 @@ be:
         create: Даслаць
       client_application:
         create: Зарэгістравацца
-        update: Ð Ñ\8dдагаваць
+        update: Ð\90бнавÑ\96ць
       redaction:
         create: Стварыць рэдакцыю
         update: Захаваць рэдакцыю
@@ -85,6 +88,8 @@ be:
       way_tag: Тэг лініі
     attributes:
       client_application:
+        name: Імя (абявязкова)
+        url: Галоўны URL-адрас дастасаваньня (абявязкова)
         callback_url: URL-адрас зваротнага выкліку
         support_url: URL-адрас падтрымкі
       diary_comment:
@@ -107,7 +112,7 @@ be:
         longitude: Даўгата
         public: Агульны
         description: Апісанне
-        gpx_file: 'Ð\90даслаць GPX-файл:'
+        gpx_file: 'Ð\94аслаць GPX-файл:'
         visibility: 'Бачнасць:'
         tagstring: 'Тэгі:'
       message:
@@ -2485,11 +2490,11 @@ be:
       revoke: Адазваць!
       flash: Гэтая блакіроўка была адклікана.
     helper:
-      time_future: Заканчваецца праз %{time}.
+      time_future_html: Заканчваецца праз %{time}.
       until_login: Актыўная да моманту ўваходу ўдзельніка ў сістэму.
-      time_future_and_until_login: Заканчваецца праз %{time} і пасля таго, як карыстальнік
-        увойдзе ў сістэму.
-      time_past: Скончылася %{time}.
+      time_future_and_until_login_html: Заканчваецца праз %{time} і пасля таго, як
+        карыстальнік увойдзе ў сістэму.
+      time_past_html: Скончылася %{time}.
       block_duration:
         hours:
           one: 1 гадзіна

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 24c48629f5f5250bc9b7836e78af3fcc5019f6a9..7fdabdfddcc01e3997ee9fac53082f1c2df92f14 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1924,7 +1924,7 @@ bg:
     revoke:
       revoke: Анулиране!
     helper:
-      time_future: Изтича след %{time}.
+      time_future_html: Изтича след %{time}.
       block_duration:
         hours:
           one: час

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 3c189ffb76b558f0c08527425ccf8b5b88da8f5f..02a9b3e02c19d6f90898e08e275f95ab01cd694b 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2503,11 +2503,11 @@ br:
       revoke: Disteuler !
       flash: Torret eo bet ar stankadur-mañ.
     helper:
-      time_future: Echuiñ a ray a-benn %{time}.
+      time_future_html: Echuiñ a ray a-benn %{time}.
       until_login: Oberiant betek ma kevre an implijer.
-      time_future_and_until_login: Echuiñ a ra a-benn %{time} hag ur wech kevreet
+      time_future_and_until_login_html: Echuiñ a ra a-benn %{time} hag ur wech kevreet
         an implijer.
-      time_past: Echuet da %{time}.
+      time_past_html: Echuet da %{time}.
       block_duration:
         hours:
           one: 1 eurvezh

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 8e77a5405d466c271ecedd0813213da483ad15d0..694b052fb4583330f03a1e9e3fd8d6bd7c32a973 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1751,9 +1751,9 @@ bs:
       revoke: Opozvati!
       flash: Ova blokada je opozvana.
     helper:
-      time_future: Završava u %{time}.
+      time_future_html: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.
-      time_past: Završeno prije %{time}.
+      time_past_html: Završeno prije %{time}.
       block_duration:
         hours:
           one: 1 sat

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 27c8a414b9ba218f3f56857af8d53849f3d80805..c14c8b65d68e59acd1aabc5338cc1ebe4fb169a7 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2612,11 +2612,11 @@ ca:
       revoke: Revoca!
       flash: Aquest bloc ha estat revocat.
     helper:
-      time_future: Finalitza en %{time}.
+      time_future_html: Finalitza en %{time}.
       until_login: Activa fins que l'usuari es connecta.
-      time_future_and_until_login: Acaba a %{time} i després que l'usuari hagi iniciat
-        la sessió.
-      time_past: Va acabar a %{time}.
+      time_future_and_until_login_html: Acaba a %{time} i després que l'usuari hagi
+        iniciat la sessió.
+      time_past_html: Va acabar a %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ab3273798b0ef1b6361e31d94bdb004cd09cef81..eaa618d40597e62a441f1c1cc15df44c2b99906f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2673,10 +2673,10 @@ cs:
       revoke: Zrušit !
       flash: Tento blok byl zrušen.
     helper:
-      time_future: Končí za %{time}.
+      time_future_html: Končí za %{time}.
       until_login: Aktivní dokud se uživatel nepřihlásí.
-      time_future_and_until_login: Končí za %{time} a až se uživatel přihlásí.
-      time_past: Ukončeno %{time}.
+      time_future_and_until_login_html: Končí za %{time} a až se uživatel přihlásí.
+      time_past_html: Ukončeno %{time}.
       block_duration:
         hours:
           one: 1 hodina

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index aeb803149757a133fdfe09d953f0e83cae56e45a..378f932b90473ce95141dc8a5d96380e349cd709 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1557,8 +1557,8 @@ cy:
       confirm: Cadarnhau
   user_blocks:
     helper:
-      time_future: Yn dod i ben mewn %{time}.
-      time_past: Wedi dod i ben %{time} yn ôl.
+      time_future_html: Yn dod i ben mewn %{time}.
+      time_past_html: Wedi dod i ben %{time} yn ôl.
     show:
       status: Statws
       show: Dangos

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5ef360f56e003209d5eb682cda52a34640bb6b91..4fd30c6758a25fcac9b603e866c1ad2b7df24234 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -2698,11 +2698,11 @@ da:
       revoke: Tilbagekald!
       flash: Denne blokering er blevet tilbagekaldt.
     helper:
-      time_future: Slutter om %{time}.
+      time_future_html: Slutter om %{time}.
       until_login: Aktiv, indtil brugeren logger på.
-      time_future_and_until_login: Slutter om %{time} og efter brugeren er logget
+      time_future_and_until_login_html: Slutter om %{time} og efter brugeren er logget
         ind.
-      time_past: Sluttede %{time}.
+      time_past_html: Sluttede %{time}.
       block_duration:
         hours:
           one: 1 time

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 691870397ad18e8a8c962ba0eba5ca9201814496..230641d37b5a445d7b9f169b21e02bdbfc643bc4 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2789,11 +2789,11 @@ de:
       revoke: Aufheben
       flash: Die Sperre wurde aufgehoben.
     helper:
-      time_future: Endet in %{time}.
+      time_future_html: Endet in %{time}.
       until_login: Aktiv, bis der Benutzer sich anmeldet.
-      time_future_and_until_login: Endet in %{time} und nachdem sich der Benutzer
+      time_future_and_until_login_html: Endet in %{time} und nachdem sich der Benutzer
         angemeldet hat.
-      time_past: Endete %{time}.
+      time_past_html: Endete %{time}.
       block_duration:
         hours:
           one: 1 Stunde

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 37fd44a42a68e9dbeeb8079e126d64eec7397c27..79ccc5be6f52a0f4709166f02c3b5f7bc817d73e 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -1071,8 +1071,8 @@ diq:
     revoke:
       revoke: Terkne!
     helper:
-      time_future: '%{time} dı bıqediyo'
-      time_past: '%{time} qedya'
+      time_future_html: '%{time} dı bıqediyo'
+      time_past_html: '%{time} qedya'
       block_duration:
         hours:
           one: 1 seate

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 2228963301eaac5634602f5e523f7b945541d290..b9fd3fa41e2fac5e25ae30a77e0a8ab290a6dbf7 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1939,9 +1939,9 @@ dsb:
       revoke: Wótpóraś!
       flash: Toś to blokěrowanje jo se wótpórało.
     helper:
-      time_future: Kóńcy se %{time}.
+      time_future_html: Kóńcy se %{time}.
       until_login: Aktiwny, až wužywaŕ se njepśizjawja.
-      time_past: Jo se pśed %{time} skóńcyło.
+      time_past_html: Jo se pśed %{time} skóńcyło.
       block_duration:
         hours:
           few: '%{count} góźiny'

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 78e3055686a08a589ea9a1e5b181afcf30acddc4..3fda4cbe7320a8d3798a7bd89fdd688032f89229 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2556,11 +2556,11 @@ el:
       revoke: Ανακαλέστε!
       flash: Αυτή η φραγή έχει ανακληθεί.
     helper:
-      time_future: Τελειώνει σε %{time}.
+      time_future_html: Τελειώνει σε %{time}.
       until_login: Ενεργό έως ότου ο χρήστης συνδεθεί.
-      time_future_and_until_login: Τελειώνει σε %{time} και μετά αφότου ο χρήστης
+      time_future_and_until_login_html: Τελειώνει σε %{time} και μετά αφότου ο χρήστης
         έχει συνδεθεί.
-      time_past: Τελείωσε %{time}.
+      time_past_html: Τελείωσε %{time}.
       block_duration:
         hours:
           one: 1 ώρα

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 23d0fb5724460fe67439848a3c728f0bcf9d7f17..8016960c4fefaa4dd7e01caa3b1806159a03aa97 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2340,10 +2340,11 @@ en-GB:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
-      time_future: Ends in %{time}.
+      time_future_html: Ends in %{time}.
       until_login: Active until the user logs in.
-      time_future_and_until_login: Ends in %{time} and after the user has logged in.
-      time_past: Ended %{time}.
+      time_future_and_until_login_html: Ends in %{time} and after the user has logged
+        in.
+      time_past_html: Ended %{time}.
       block_duration:
         hours:
           one: 1 hour

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 5a9e7c044b9108bd3b8259a6a3226701c8a32c92..7a356c9eb436e8ceec9cd96d3b5b6b3750a4d2b7 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -310,6 +310,7 @@ eo:
       entry_html: Rilato %{relation_name}
       entry_role_html: Rilato %{relation_name} (kiel %{relation_role})
     not_found:
+      title: Ne trovita
       sorry: Bedaŭrinde la %{type} kun id %{id} ne troveblas.
       type:
         node: nodo
@@ -318,6 +319,7 @@ eo:
         changeset: ŝanĝaro
         note: rimarko
     timeout:
+      title: Tempolimo atingita
       sorry: Bedaŭrinde la datumoj por la %{type} kun la identigilo %{id} alvenis
         tro malrapide.
       type:
@@ -2656,10 +2658,10 @@ eo:
       revoke: Malbloki!
       flash: Ĉi tiu blokado estas nuligita.
     helper:
-      time_future: Finiĝos post %{time}.
+      time_future_html: Finiĝos post %{time}.
       until_login: Aktiva ĝis la uzanto ensalutos.
-      time_future_and_until_login: Finiĝos post %{time} kaj post la uzanto ensalutos.
-      time_past: Finiĝis %{time}.
+      time_future_and_until_login_html: Finiĝos post %{time} kaj post la uzanto ensalutos.
+      time_past_html: Finiĝis %{time}.
       block_duration:
         hours:
           one: 1 horo

diff --git a/config/locales/es.yml b/config/locales/es.yml
index fe9993d129eaf2809b8a33242f1d1ffdcb34f00a..ffe045fa0e0ebab70d64815b138da85aebc44bf8 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2551,11 +2551,11 @@ es:
       revoke: Revocar
       flash: Este bloqueo ha sido revocado.
     helper:
-      time_future: Termina en %{time}.
+      time_future_html: Termina en %{time}.
       until_login: Activo hasta que el usuario acceda.
-      time_future_and_until_login: Termina en %{time} y después de que el usuario
+      time_future_and_until_login_html: Termina en %{time} y después de que el usuario
         ha iniciado sesión.
-      time_past: Finalizado %{time}.
+      time_past_html: Finalizado %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 343a4c4d29d811cce74c0cb314d9db062081af05..e5039a988386c4d4555488d8e16e8dadd84122cc 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2163,10 +2163,10 @@ et:
       revoke: Tühista!
       flash: See blokeering on tühistatud.
     helper:
-      time_future: Lõpuni %{time}.
+      time_future_html: Lõpuni %{time}.
       until_login: Aktiivne kuni kasutaja logib sisse.
-      time_future_and_until_login: Lõpuni %{time} ja kuni kasutaja on sisse loginud.
-      time_past: Lõppes %{time}.
+      time_future_and_until_login_html: Lõpuni %{time} ja kuni kasutaja on sisse loginud.
+      time_past_html: Lõppes %{time}.
       block_duration:
         hours:
           one: 1 tund

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4c28cd84c1c539d540cef40dbea3d7c4ff9af9c9..7bc5d1c803cfa36df1d16d837f368ba8eda53411 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2395,11 +2395,11 @@ eu:
       revoke: Ezeztatu!
       flash: Blokeo hau ezeztatu da.
     helper:
-      time_future: '%{time}n bukatzen du'
+      time_future_html: '%{time}n bukatzen du'
       until_login: Erabiltzaileak saioa hasi arte aktiboa.
-      time_future_and_until_login: '%{time} denbora barru bukatzen du eta erabiltzaileak
+      time_future_and_until_login_html: '%{time} denbora barru bukatzen du eta erabiltzaileak
         saioa hasi eta gero.'
-      time_past: '%{time} bukatua.'
+      time_past_html: '%{time} bukatua.'
       block_duration:
         hours:
           one: ordu bat

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 10e2f47d2c8691d649594c17dffe1ab212bd833e..1636f39e2255d9a3b473420146f5871e892b009d 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2555,11 +2555,11 @@ fa:
       revoke: باطل شود!
       flash: این مسدودی باطل شد.
     helper:
-      time_future: '%{time} دیگر پایان می‌یابد.'
+      time_future_html: '%{time} دیگر پایان می‌یابد.'
       until_login: تا وقتی کاربر وارد شود فعال می‌ماند.
-      time_future_and_until_login: '%{time} دیگر و پس از ورود به حساب کاربری پایان
-        می‌یابد.'
-      time_past: '%{time} پایان یافت.'
+      time_future_and_until_login_html: '%{time} دیگر و پس از ورود به حساب کاربری
+        پاÛ\8cاÙ\86 Ù\85Û\8câ\80\8cÛ\8cابد.'
+      time_past_html: '%{time} پایان یافت.'
       block_duration:
         hours:
           one: 1 ساعت

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ef852db0d70923916f62a203d632eb2c9957d9fe..950a6d2538adcf24717814f1b351ca8d03dc9d5f 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2498,11 +2498,11 @@ fi:
       revoke: Poista!
       flash: Tämä esto on poistettu
     helper:
-      time_future: Päättyy %{time} kuluttua.
+      time_future_html: Päättyy %{time} kuluttua.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
-      time_future_and_until_login: Päättyy %{time} kuluttua ja käyttäjän kirjauduttua
+      time_future_and_until_login_html: Päättyy %{time} kuluttua ja käyttäjän kirjauduttua
         sisään.
-      time_past: Päättyi %{time}.
+      time_past_html: Päättyi %{time}.
       block_duration:
         hours:
           one: 1 tunti

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b4503b2014af2b597b4f5c06e2eaf704e25559ec..7879a24ed428e87d41d8fad819af04d515a70623 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2799,11 +2799,11 @@ fr:
       revoke: Révoquer !
       flash: Ce blocage a été révoqué.
     helper:
-      time_future: Prends fin dans %{time}.
+      time_future_html: Prends fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.
-      time_future_and_until_login: Finit dans %{time} et une fois que l’utilisateur
+      time_future_and_until_login_html: Finit dans %{time} et une fois que l’utilisateur
         s’est connecté.
-      time_past: Terminé à %{time}.
+      time_past_html: Terminé à %{time}.
       block_duration:
         hours:
           one: '%{count} heure'

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 3c335dee292a2055bcf6acadda20744c1c21f55b..7b70c8787e9c99bd300e0c25bc307f84476ede28 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1325,8 +1325,8 @@ fur:
       time_future: Chest bloc al finìs ca di %{time}.
       revoke: Revoche!
     helper:
-      time_future: Finìs ca di %{time}.
-      time_past: Finît %{time} indaûr.
+      time_future_html: Finìs ca di %{time}.
+      time_past_html: Finît %{time} indaûr.
       block_duration:
         hours:
           one: 1 ore

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index d27974b95a029c2e013d7aed7e01e0d5b10f9008..93eff88b64a6e5c92f0a8da75715de28cd73015a 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2188,9 +2188,9 @@ gd:
       revoke: Cùl-ghairm!
       flash: Chaidh am bacadh seo a chùl-ghairm.
     helper:
-      time_future: Falbhaidh an ùine air an ceann %{time}.
+      time_future_html: Falbhaidh an ùine air an ceann %{time}.
       until_login: Gnìomhach gus an clàraich an cleachdaiche a-steach.
-      time_past: Dh'fhalbh an ùine air o chionn %{time}.
+      time_past_html: Dh'fhalbh an ùine air o chionn %{time}.
       block_duration:
         hours:
           other: '%{count} uair a thìde'

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 35e6c91a31a8a005e227b152a72f0fcc8330864c..d27fada096aeede11c0759908b7abb8b5c6776e9 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2718,11 +2718,11 @@ gl:
       revoke: Revogar!
       flash: Revogouse o bloqueo.
     helper:
-      time_future: Remata en %{time}.
+      time_future_html: Remata en %{time}.
       until_login: Activo até que o usuario inicie sesión.
-      time_future_and_until_login: Remata en %{time} e despois de que o usuario iniciou
-        a sesión.
-      time_past: Rematou %{time}.
+      time_future_and_until_login_html: Remata en %{time} e despois de que o usuario
+        iniciou a sesión.
+      time_past_html: Rematou %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/he.yml b/config/locales/he.yml
index cca9ff9adf009d03ef28ad5412974e0b93d913e6..4d3e82756f9da98b07a774830d6812336cd2fdb2 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2656,10 +2656,10 @@ he:
       revoke: לבטל!
       flash: החסימה הזאת בוטלה.
     helper:
-      time_future: תסתיים בעוד %{time}
+      time_future_html: תסתיים בעוד %{time}
       until_login: פעילה עד שהמשתמש ייכנס לחשבון.
-      time_future_and_until_login: מסתיים ב־%{time} ואחרי שהמשתמש נכנס לחשבון.
-      time_past: הסתיימה ב־%{time}.
+      time_future_and_until_login_html: מסתיים ב־%{time} ואחרי שהמשתמש נכנס לחשבון.
+      time_past_html: הסתיימה ב־%{time}.
       block_duration:
         hours:
           one: שעה אחת

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index bba24cffaf77d57859fb9cb767cad8563249997a..37e08e4f2803fc173d3e4210a317549178585dc8 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1894,9 +1894,9 @@ hr:
       revoke: Opozovi!
       flash: Ova blokada je opozvana.
     helper:
-      time_future: Završava u %{time}.
+      time_future_html: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.
-      time_past: Završeno %{time}.
+      time_past_html: Završeno %{time}.
       block_duration:
         hours:
           one: 1 sat

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 634199c1aa08707ea1963297e687d381fcdd9686..90d591f2cfb53de4e1bcc11a92c1e9160866b65c 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2350,9 +2350,9 @@ hsb:
       revoke: Zběhnyć!
       flash: Tute blokowanje je so zběhnyło.
     helper:
-      time_future: Kónči so %{time}.
+      time_future_html: Kónči so %{time}.
       until_login: Aktiwne, doniž so wužiwar njepřizjewja.
-      time_past: Je so před %{time} skónčiło.
+      time_past_html: Je so před %{time} skónčiło.
       block_duration:
         hours:
           few: '%{count} hodźiny'

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c6123f48d00b6ac0609c8b1ccd7aa9bb02dd6658..7e962456cd5f7cc4fd23d674afc736c0b6b5c2a4 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -4,6 +4,7 @@
 # Author: --szabi--
 # Author: Abijeet Patro
 # Author: Athoss
+# Author: Balint36
 # Author: BanKris
 # Author: Bencemac
 # Author: BáthoryPéter
@@ -642,7 +643,7 @@ hu:
           retail: Kereskedelmi épület
           school: Iskolaépület
           terrace: Sorház
-          train_station: Vasútállomás
+          train_station: Felvételi épület
           university: Egyetemi épület
           "yes": Épület
         craft:
@@ -824,6 +825,7 @@ hu:
           pier: Móló
           pipeline: Csővezeték
           silo: Siló
+          snow_fence: Hófogó háló
           storage_tank: Tároló tartály
           surveillance: Megfigyelés
           tower: Torony
@@ -2483,10 +2485,11 @@ hu:
       revoke: Visszavonás!
       flash: Ez a blokkolás vissza lett vonva.
     helper:
-      time_future: Véget ér %{time} múlva.
+      time_future_html: Véget ér %{time} múlva.
       until_login: Aktív a felhasználó bejelentkezéséig.
-      time_future_and_until_login: '%{time} múlva van vége, miután a felhasználó bejelentkezett.'
-      time_past: Véget ért %{time} időpontban.
+      time_future_and_until_login_html: '%{time} múlva van vége, miután a felhasználó
+        bejelentkezett.'
+      time_past_html: Véget ért %{time} időpontban.
       block_duration:
         hours:
           one: 1 órája

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c88d5d1e5bde164004b2eab38e63b0e0c499ab85..0a228ce04bd83fcf203a269f928f0827ca648ca6 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2547,11 +2547,11 @@ ia:
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
     helper:
-      time_future: Expira in %{time}.
+      time_future_html: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
-      time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
-        session.
-      time_past: Expirava %{time}.
+      time_future_and_until_login_html: Termina in %{time} e post que le usator ha
+        aperite session.
+      time_past_html: Expirava %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/id.yml b/config/locales/id.yml
index aefb8e1a808944ea8bdf1220fc766eb7aa018546..bced63d056b9131a6a3dc58fbc00cdcd612742b8 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2449,10 +2449,11 @@ id:
       revoke: Batalkan!
       flash: Blokir ini telah dibatalkan.
     helper:
-      time_future: Berakhir pada %{time}.
+      time_future_html: Berakhir pada %{time}.
       until_login: Aktif sampai pengguna melakukan log in.
-      time_future_and_until_login: Berakhir dalam %{time} dan setelah pengguna masuk.
-      time_past: Berakhir %{time} yang lalu.
+      time_future_and_until_login_html: Berakhir dalam %{time} dan setelah pengguna
+        masuk.
+      time_past_html: Berakhir %{time} yang lalu.
       block_duration:
         hours:
           one: 1 hour

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 850f637ebb258387de0a14a798eef9700eff9a47..3dd347d422dc1f0ed17696256d4821f6a9e4ed3f 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2722,11 +2722,11 @@ is:
       revoke: Eyða banninu
       flash: Banninu var eytt.
     helper:
-      time_future: Endar eftir %{time}
+      time_future_html: Endar eftir %{time}
       until_login: Virkt þangað til notandinn skráir sig inn.
-      time_future_and_until_login: Endar eftir %{time} og eftir að notandinn skráir
-        sig inn.
-      time_past: Endaði %{time}.
+      time_future_and_until_login_html: Endar eftir %{time} og eftir að notandinn
+        skráir sig inn.
+      time_past_html: Endaði %{time}.
       block_duration:
         hours:
           one: 1 stund

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 286769a4054bafdefea1069fca792a22080947f8..b5ef9b8494989988d3ff5a713534a30cbb3f022b 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2740,11 +2740,11 @@ it:
       revoke: Revoca!
       flash: Questo blocco è stato revocato.
     helper:
-      time_future: Termina fra %{time}.
+      time_future_html: Termina fra %{time}.
       until_login: Attivo finché l'utente non si collega.
-      time_future_and_until_login: Termina tra %{time} e una volta che l'utente avrà
-        effettuato l'accesso.
-      time_past: Terminato %{time}.
+      time_future_and_until_login_html: Termina tra %{time} e una volta che l'utente
+        avrà effettuato l'accesso.
+      time_past_html: Terminato %{time}.
       block_duration:
         hours:
           one: 1 ora

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e5bf6a08df8657ecfe863bcf74a5984eb2aadbc5..a0bc3955678325ba68c374e7b04eb9bff6648028 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2479,10 +2479,10 @@ ja:
       revoke: 取り消す!
       flash: このブロックは取り消されました。
     helper:
-      time_future: '%{time} に終了します。'
+      time_future_html: '%{time} に終了します。'
       until_login: 利用者がログインするまで有効です。
-      time_future_and_until_login: 利用者のログイン後%{time}で終了します。
-      time_past: '%{time}に終了しました。'
+      time_future_and_until_login_html: 利用者のログイン後%{time}で終了します。
+      time_past_html: '%{time}に終了しました。'
       block_duration:
         hours: '%{count}時間'
         days:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 6b69cb91a20b5650a016f069639d6ef576d4aec6..a28480d7d8f039cfdb5135f149ec93a8a2823237 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1158,9 +1158,9 @@ ka:
       revoke: განბლოკვა!
       flash: ეს ბლოკირება მოიხსნა.
     helper:
-      time_future: მთავრდება %{time}–ში.
+      time_future_html: მთავრდება %{time}–ში.
       until_login: აქტიურია მანამდე, სანამ მომხმარებელი არ შევა სისტემაში.
-      time_past: დასრულდა %{time} წინ.
+      time_past_html: დასრულდა %{time} წინ.
       block_duration:
         hours:
           one: 1 საათი

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index fe4394fd5ecc204498c7bf9a992b76d6c2aff0d1..d8281057792e0bc5e7113eaf7ed37ec4fe3365a2 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1422,9 +1422,9 @@ kab:
       confirm: Sentem
   user_blocks:
     helper:
-      time_future: Ad ifak di %{time}.
+      time_future_html: Ad ifak di %{time}.
       until_login: D urmid arama yeqqen useqdac
-      time_past: Ifuk %{time} aya.
+      time_past_html: Ifuk %{time} aya.
     blocks_on:
       title: Asewḥel n %{name}
       empty: '%{name} ur yewḥil ara yakan.'

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3133b20ff50d9eb06bef236fe6203860bf62c7e3..4b1023bd5d2221156b502bc1f7e4783eff1caa73 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2377,10 +2377,10 @@ ko:
       revoke: 해제!
       flash: 이 차단을 해제했습니다.
     helper:
-      time_future: '%{time}에 끝납니다.'
+      time_future_html: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.
-      time_future_and_until_login: '%{time} 이후에 사용자가 로그인하면.'
-      time_past: '%{time}에 끝났습니다.'
+      time_future_and_until_login_html: '%{time} 이후에 사용자가 로그인하면.'
+      time_past_html: '%{time}에 끝났습니다.'
       block_duration:
         hours:
           one: 1시간

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index c2e66318e905ae00d4324f5a4c002923cf37b478..809f753dbd1daab2d96a656f240879a32e084d6f 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -2513,10 +2513,11 @@ ku-Latn:
       revoke: Betal bike!
       flash: Ev astengî hate betalkirin.
     helper:
-      time_future: Di %{time} de diqede.
+      time_future_html: Di %{time} de diqede.
       until_login: Heta ku bikarhêner têkeve aktîv e
-      time_future_and_until_login: Di %{time} de û gava ku bikarhêner têket wê biqede.
-      time_past: '%{time} qediya.'
+      time_future_and_until_login_html: Di %{time} de û gava ku bikarhêner têket wê
+        biqede.
+      time_past_html: '%{time} qediya.'
       block_duration:
         hours:
           one: 1 saetê

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1b086d59531f12deb7f556819f4e62aa13dad78b..36cabd2f7ac15de2e9648b2a97935e158139d0e3 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2440,10 +2440,11 @@ lt:
       revoke: Atšaukti!
       flash: Šis blokavimas buvo atšauktas
     helper:
-      time_future: Baigiasi po %{time}.
+      time_future_html: Baigiasi po %{time}.
       until_login: Aktyvus iki naudotojo prisijungimo.
-      time_future_and_until_login: Baigiasi %{time} ir po to, kai naudotojas prisijungia.
-      time_past: Pasibaigė %{time}
+      time_future_and_until_login_html: Baigiasi %{time} ir po to, kai naudotojas
+        prisijungia.
+      time_past_html: Pasibaigė %{time}
       block_duration:
         hours:
           one: 1 valanda

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 6cf1268bd236bc7849680108663dc6e231809556..c90019bdc618e4e252b657970912eb20761162bd 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -2235,9 +2235,9 @@ lv:
       revoke: Atsaukt!
       flash: Šis bloks ir atsaukts.
     helper:
-      time_future: Beidzas %{time}.
+      time_future_html: Beidzas %{time}.
       until_login: Aktīvs līdz lietotājs autorizēsies.
-      time_past: Pabeigts %{time} atpakaļ.
+      time_past_html: Pabeigts %{time} atpakaļ.
       block_duration:
         hours:
           one: 1 stunda

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 8e7a7a8379430d22de11872fb0188b9f4ec96bff..11c73b04770d49f638b04d2accc59db32dab2638 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2691,10 +2691,11 @@ mk:
       revoke: Поништи!
       flash: Овој блок е поништен.
     helper:
-      time_future: Истекува за %{time}.
+      time_future_html: Истекува за %{time}.
       until_login: Активно додека не се најави корисникот.
-      time_future_and_until_login: Завршува во %{time} и откако корисникот ќе се најави.
-      time_past: Истечено %{time}.
+      time_future_and_until_login_html: Завршува во %{time} и откако корисникот ќе
+        се најави.
+      time_past_html: Истечено %{time}.
       block_duration:
         hours:
           one: еден час

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 8a42242276e7359b9a3164f400294369635c2c90..7e9d6e365939e6ceed5729eaa04ce08c963bc92d 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -2208,9 +2208,9 @@ ms:
       revoke: Tarik Balik!
       flash: Sekatan ini telah ditarik balik.
     helper:
-      time_future: Berakhir dalam masa %{time}.
+      time_future_html: Berakhir dalam masa %{time}.
       until_login: Aktif sehingga pengguna itu log masuk.
-      time_past: Berakhir %{time} lalu.
+      time_past_html: Berakhir %{time} lalu.
       block_duration:
         hours:
           one: 1 jam

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 1fa949e9a956fc84a15acaa29eef96f121778258..8af2e5d0e7231c70955b617d6145b86b63138c2e 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2466,11 +2466,11 @@ nb:
       revoke: Tilbakekall!
       flash: Denne blokkeringen har blitt tilbakekalt.
     helper:
-      time_future: Slutter om %{time}.
+      time_future_html: Slutter om %{time}.
       until_login: Aktiv inntil brukeren logger inn.
-      time_future_and_until_login: Slutter om %{time} og etter at brukeren har logget
-        inn.
-      time_past: Sluttet for %{time}.
+      time_future_and_until_login_html: Slutter om %{time} og etter at brukeren har
+        logget inn.
+      time_past_html: Sluttet for %{time}.
       block_duration:
         hours:
           one: 1 time

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7854775ed1b5fbd9df710bcf0dcf2df84562630b..b0e35dee3a45d6a3780a2e616f63c27d20eda4cf 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2546,11 +2546,11 @@ nl:
       revoke: Intrekken
       flash: Deze blokkade is ingetrokken.
     helper:
-      time_future: Vervalt over %{time}.
+      time_future_html: Vervalt over %{time}.
       until_login: Actief totdat de gebruiker zich aanmeldt.
-      time_future_and_until_login: Eindigt in %{time} en nadat de gebruiker ingelogd
+      time_future_and_until_login_html: Eindigt in %{time} en nadat de gebruiker ingelogd
         is.
-      time_past: '%{time} vervallen.'
+      time_past_html: '%{time} vervallen.'
       block_duration:
         hours:
           one: 1 uur

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index fb5bdd901d596d82d8c10a8563a2702526908978..835dd770d7c8839f1fea62a5d6e9cc508eea0fe5 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1979,11 +1979,11 @@ nn:
       revoke: Tilbakekall!
       flash: Denne blokkeringa har vorte tilbakekalt.
     helper:
-      time_future: Sluttar om %{time}.
+      time_future_html: Sluttar om %{time}.
       until_login: Aktiv inntil brukaren loggar inn.
-      time_future_and_until_login: Sluttar om %{time} og etter at brukaren har logga
-        inn.
-      time_past: Slutta %{time} sidan.
+      time_future_and_until_login_html: Sluttar om %{time} og etter at brukaren har
+        logga inn.
+      time_past_html: Slutta %{time} sidan.
       block_duration:
         hours:
           one: 1 time

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index c1b9a8913f86fed507d99bd7037c4d80798acedb..4b1d87572684ed51cc8e94f600b896f538713897 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2269,11 +2269,11 @@ oc:
       revoke: Revocar !
       flash: Aqueste blocatge es estat revocat.
     helper:
-      time_future: Acaba a %{time}.
+      time_future_html: Acaba a %{time}.
       until_login: Actiu fins al moment que l'utilizaire se connectarà.
-      time_future_and_until_login: Acabat dins %{time} i après que l'usancieri ague
-        començat la session.
-      time_past: Acabat fa %{time}.
+      time_future_and_until_login_html: Acabat dins %{time} i après que l'usancieri
+        ague començat la session.
+      time_past_html: Acabat fa %{time}.
       block_duration:
         hours:
           one: 1 ora

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 55f6ce0919fb08b6aebef36500b967d8613725df..7caecaab4e69a47aa6eb629afd54512898aa0fc3 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2770,10 +2770,11 @@ pl:
       revoke: Odwołaj!
       flash: Blokada została odwołana.
     helper:
-      time_future: Blokada wygasa za %{time}.
+      time_future_html: Blokada wygasa za %{time}.
       until_login: Aktywna do momentu zalogowania się użytkownika.
-      time_future_and_until_login: Kończy się za %{time} i po zalogowaniu się użytkownika.
-      time_past: Zakończono %{time}.
+      time_future_and_until_login_html: Kończy się za %{time} i po zalogowaniu się
+        użytkownika.
+      time_past_html: Zakończono %{time}.
       block_duration:
         hours:
           one: 1 godzina

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 645c7859cb445a7ba5c5c6646df2dbbdb045ec89..8e844b59c54a5dcc1f605b69f1b2bba227c7876a 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -2742,10 +2742,10 @@ pt-BR:
       revoke: Cancelar!
       flash: Esse bloqueio foi retirado.
     helper:
-      time_future: Termina em %{time}.
+      time_future_html: Termina em %{time}.
       until_login: Ativo até que o usuário se conecte.
-      time_future_and_until_login: Termina em %{time} e após o usuário ter logado.
-      time_past: Terminou há %{time}
+      time_future_and_until_login_html: Termina em %{time} e após o usuário ter logado.
+      time_past_html: Terminou há %{time}
       block_duration:
         hours:
           one: uma hora

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 8548149c12529e81e685c24686cb141cd21502f9..94cc6e17325d0d15af738aacb3b9bd20a666fc1b 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2732,11 +2732,11 @@ pt-PT:
       revoke: Revogar!
       flash: Este bloqueio foi revogado.
     helper:
-      time_future: Termina em %{time}.
+      time_future_html: Termina em %{time}.
       until_login: Ativo até o utilizador iniciar sessão.
-      time_future_and_until_login: Termina em %{time} e depois de o utilizador iniciar
-        sessão.
-      time_past: Terminou a %{time}.
+      time_future_and_until_login_html: Termina em %{time} e depois de o utilizador
+        iniciar sessão.
+      time_past_html: Terminou a %{time}.
       block_duration:
         hours:
           one: 1 hora

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 10723b08a5e4c214a4ad208fade7e3365bf6f1b1..bf769758426f19cc10b7fbec857ff355fe06152b 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -2620,11 +2620,11 @@ ro:
       revoke: Revocă!
       flash: Această blocare a fost revocată.
     helper:
-      time_future: Se termină în %{time}.
+      time_future_html: Se termină în %{time}.
       until_login: Activ până când utilizatorul se conectează.
-      time_future_and_until_login: Se termină în %{time} și după ce utilizatorul s-a
-        logat.
-      time_past: Terminat în urmă cu %{time}.
+      time_future_and_until_login_html: Se termină în %{time} și după ce utilizatorul
+        s-a logat.
+      time_past_html: Terminat în urmă cu %{time}.
       block_duration:
         hours:
           one: 1 oră

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index e7aec38931e96a67d056b7dfa499c199d8e2d9d2..a2a1f88b7bfe27513541218b2769a374835d636c 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2625,11 +2625,11 @@ ru:
       revoke: Снять блокировку!
       flash: Эта блокировка была снята.
     helper:
-      time_future: Заканчивается через %{time}.
+      time_future_html: Заканчивается через %{time}.
       until_login: Активно до тех пор, пока пользователь не войдёт в систему.
-      time_future_and_until_login: Заканчивается через %{time} и после того, как пользователь
-        войдёт в систему.
-      time_past: Закончилось %{time}.
+      time_future_and_until_login_html: Заканчивается через %{time} и после того,
+        как полÑ\8cзоваÑ\82елÑ\8c войдÑ\91Ñ\82 в Ñ\81иÑ\81Ñ\82емÑ\83.
+      time_past_html: Закончилось %{time}.
       block_duration:
         hours:
           one: 1 час

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 0ee83eab11d30f5da36bc4fdf4f0c56a7bedd3b6..f85630b3b36ad30058aeba4b78a23eb95f9fc14f 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2125,9 +2125,9 @@ scn:
       revoke: Rèvuca!
       flash: Stu bloccu fu arrivucatu.
     helper:
-      time_future: Finisci tra %{time}
+      time_future_html: Finisci tra %{time}
       until_login: Attivatu nfina a quannu l'utenti trasi.
-      time_past: Finìu %{time} fa.
+      time_past_html: Finìu %{time} fa.
       block_duration:
         hours:
           one: 1 ura

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2d7ae53007bd67af7dffc1bc510ea46cb8f68507..43776ea640a0d7439ad2a60983410180bdb74a6f 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -2071,9 +2071,9 @@ sk:
       revoke: Zrušiť!
       flash: Tento blok bol zrušený.
     helper:
-      time_future: Končí o %{time}.
+      time_future_html: Končí o %{time}.
       until_login: Aktívny až do prihlásenia používateľa.
-      time_past: Ukončené pred %{time}.
+      time_past_html: Ukončené pred %{time}.
       block_duration:
         hours:
           few: '%{count} hodiny'

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0bef91daffd08d6eea8a469112fe70221f01e488..892f79ebf650e2aa30ceb374630024eb75458fe3 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -2129,10 +2129,10 @@ sl:
       revoke: Prekliči!
       flash: Ta blokada je bila preklicana.
     helper:
-      time_future: Konča v %{time}.
+      time_future_html: Konča v %{time}.
       until_login: Aktivna dokler uporabnik se prijavi.
-      time_future_and_until_login: Konča se čez %{time} in ko se uporabnik prijavi.
-      time_past: Je končala %{time} nazaj.
+      time_future_and_until_login_html: Konča se čez %{time} in ko se uporabnik prijavi.
+      time_past_html: Je končala %{time} nazaj.
       block_duration:
         hours:
           few: '%{count} ure'

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 89d84f8172a0624105d2f8ac56c3a687aee68ec4..7a09afe952004ed9550f86ac105604dfdbe12345 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1587,9 +1587,9 @@ sr-Latn:
       revoke: Opozovi
       flash: Ova blokada je opozvana.
     helper:
-      time_future: Završava se u %{time}.
+      time_future_html: Završava se u %{time}.
       until_login: Aktivno sve dok se korisnik ne prijavi.
-      time_past: Završeno pre %{time}.
+      time_past_html: Završeno pre %{time}.
       block_duration:
         hours:
           one: 1 sat

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index aa59c878cbedbeb146f9b7b5fb713b40d8bed9fe..5047c2e2cabc15aecfc6af6d2509467b2811fb8a 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2332,10 +2332,11 @@ sr:
       revoke: Опозови
       flash: Ова блокада је опозвана.
     helper:
-      time_future: Завршава се у %{time}.
+      time_future_html: Завршава се у %{time}.
       until_login: Активно све док се корисник не пријави.
-      time_future_and_until_login: Завршава у %{time} и након што се корисник пријави.
-      time_past: Завршено пре %{time}.
+      time_future_and_until_login_html: Завршава у %{time} и након што се корисник
+        пријави.
+      time_past_html: Завршено пре %{time}.
       block_duration:
         hours:
           one: 1 сат

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0238eb7739c1d305e9a47b39e739eb93a0a57b5e..0848e746bb05221e53a7f085b5f805c92ec85e6e 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -2620,11 +2620,11 @@ sv:
       revoke: Upphäv!
       flash: Denna blockering har upphävts.
     helper:
-      time_future: Slutar om %{time}.
+      time_future_html: Slutar om %{time}.
       until_login: Aktiv till dess användaren loggar in.
-      time_future_and_until_login: Slutar %{time} och efter att användaren har loggat
-        in.
-      time_past: Avslutades för %{time}.
+      time_future_and_until_login_html: Slutar %{time} och efter att användaren har
+        loggat in.
+      time_past_html: Avslutades för %{time}.
       block_duration:
         hours:
           one: 1 timme

diff --git a/config/locales/te.yml b/config/locales/te.yml
index ae5df44f5b73f53ae1b737f58452b5e9e9a63a46..4e0f3a96fda240fd69fac2b98a712fb039ce6a2a 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -822,8 +822,8 @@ te:
     revoke:
       confirm: మీరు నిజంగానే ఈ నిరోధాన్ని ఎత్తివేయాలనుకుంటున్నారా?
     helper:
-      time_future: '%{time}లో ముగుస్తుంది.'
-      time_past: '%{time} క్రితం ముగిసింది.'
+      time_future_html: '%{time}లో ముగుస్తుంది.'
+      time_past_html: '%{time} క్రితం ముగిసింది.'
       block_duration:
         hours:
           one: 1 గంట

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 94b9f6101d4ddefe0fe1108e2c4ff336fa8615e0..92fd8240789911bf1103ab60deeb42b271202199 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -160,6 +160,15 @@ th:
       x_seconds:
         one: 1 วินาทีที่แล้ว
         other: '%{count} วินาทีที่แล้ว'
+      x_minutes:
+        one: 1 นาทีที่แล้ว
+        other: '%{count} นาทีที่แล้ว'
+      x_days:
+        one: 1 วันที่แล้ว
+        other: '%{count} วันที่แล้ว'
+      x_months:
+        one: 1 เดือนที่แล้ว
+        other: '%{count} เดือนที่แล้ว'
       x_years: '%{count} ปีก่อน'
   editor:
     default: ค่าปกติ (ขณะนี้ %{name})
@@ -175,13 +184,26 @@ th:
     remote:
       name: การควบคุมระยะไกล
       description: ตัวควบคุมระยะไกล (JOSM หรือ Merkaartor)
+  auth:
+    providers:
+      none: ไม่มี
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: วิกิพีเดีย
   api:
     notes:
       comment:
         opened_at_html: สร้างเมื่อ %{when}
+        opened_at_by_html: สร้างเมื่อ %{when} โดย %{user}
         commented_at_html: ปรับปรุงเมื่อ %{when}
+        commented_at_by_html: ปรับปรุงเมื่อ %{when} โดย %{user}
         closed_at_html: ปิดเรื่องเมื่อ %{when}
+        closed_at_by_html: แก้ไขเมื่อ %{when} โดย %{user}
         reopened_at_html: รื้อฟื้นเมื่อ %{when}
+        reopened_at_by_html: เปิดใช้งานซ้ำเมื่อ %{when} โดย %{user}
       rss:
         title: หมายเหตุแผนที่ บน OpenStreetMap
       entry:
@@ -340,12 +362,16 @@ th:
     comment:
       comment: 'ความคิดเห็นใหม่ที่มีต่อชุดการเปลี่ยนแปลง #%{changeset_id} โดย %{author}'
       commented_at_by_html: ปรับปรุงเมื่อ %{when} โดย %{user}
+    comments:
+      comment: 'ความคิดเห็นใหม่ที่มีต่อชุดการเปลี่ยนแปลง #%{changeset_id} โดย %{author}'
     index:
-      title_all: การสนทนาชุดการเปลี่ยนแปลงของ OpenStreetMap
-      title_particular: 'การอภิปรายชุดการเปลี่ยนแปลง OpenStreetMap  #%{changeset_id}'
+      title_all: การอภิปรายชุดการเปลี่ยนแปลงของ OpenStreetMap
+      title_particular: 'การอภิปรายชุดการเปลี่ยนแปลง OpenStreetMap #%{changeset_id}'
+    timeout:
+      sorry: ขออภัย รายการชุดการเปลี่ยนแปลงที่ท่านร้องขอใช้เวลานานเกินสมควรในการสืบค้น
   diary_entries:
     new:
-      title: สร้างบันทึกใหม่
+      title: สรà¹\89าà¸\87รายà¸\81ารà¸\9aัà¸\99à¸\97ึà¸\81à¹\83หมà¹\88
     form:
       subject: 'เรื่อง:'
       body: 'เนื้อหา:'
@@ -360,8 +386,9 @@ th:
       title_nearby: บันทึกของผู้ใช้ที่อยู่ใกล้เคียง
       user_title: บันทึกของ %{user}
       in_language_title: รายการบันทึกทั้งหมดในภาษา %{language}
-      new: สร้างบันทึกใหม่
-      new_title: สร้างบันทึกใหม่ในสมุดบันทึกประจำตัวของฉัน
+      new: สร้างรายการบันทึกใหม่
+      new_title: สร้างรายการบันทึกใหม่ในสมุดบันทึกประจำตัวของฉัน
+      my_diary: บันทึกของฉัน
       no_entries: ไม่มีรายการบันทึก
       recent_entries: รายการบันทึกล่าสุด
       older_entries: รายการก่อนหน้า
@@ -374,16 +401,16 @@ th:
       user_title: บันทึกของ %{user}
       leave_a_comment: แสดงความคิดเห็น
       login_to_leave_a_comment_html: '%{login_link} เพื่อแสดงความคิดเห็น'
-      login: ลà¸\87à¸\8aืà¹\88อà¹\80à¸\82à¹\89าà¹\83à¸\8aà¹\89
+      login: à¹\80à¸\82à¹\89าสูà¹\88ระà¸\9aà¸\9a
     no_such_entry:
       title: ไม่มีรายการบันทึกที่ระบุ
-      heading: 'ไม่มีรายการรหัส: %{id}'
-      body: ขออภัย ไม่พบรายการบันทึกหรือข้อคิดเห็นที่กำกับด้วยรหัส %{id} โปรดตรวจการสะกดของท่าน
+      heading: 'ไม่มีรายการ id: %{id}'
+      body: ขออภัย ไม่พบรายการบันทึกหรือข้อคิดเห็นที่กำกับด้วย id %{id} โปรดตรวจการสะกดของท่าน
         หรือถ้าไม่เป็นผลแสดงว่าลิงก์ที่ท่านคลิกมาผิดพลาด
     diary_entry:
       posted_by_html: ประกาศโดย %{link_user} เมื่อ %{created} ในภาษา %{language_link}
       comment_link: แสดงความคิดเห็นต่อรายการนี้
-      reply_link: à¸\95อà¸\9aà¸\81ลัà¸\9aà¸\82à¹\89อà¸\84วามรายà¸\81ารนี้
+      reply_link: à¸\95อà¸\9aà¸\81ลัà¸\9aà¸\82à¹\89อà¸\84วามà¸\96ึà¸\87à¸\9cูà¹\89à¹\80à¸\82ียà¸\99นี้
       comment_count:
         zero: ไม่มีข้อคิดเห็น
         one: '%{count} ข้อคิดเห็น'
@@ -396,6 +423,7 @@ th:
     diary_comment:
       comment_from_html: ความคิดเห็นจาก %{link_user} เมื่อ %{comment_created_at}
       hide_link: ซ่อนข้อคิดเห็นนี้
+      unhide_link: เลิกซ่อนข้อคิดเห็นนี้
       confirm: ยืนยัน
       report: แจ้งปัญหาเกี่ยวกับความเห็นนี้
     location:
@@ -404,8 +432,8 @@ th:
       edit: แก้ไข
     feed:
       user:
-        title: รายการบันทึก OpenStreetMap สำหรับผู้ใช้ %{user}
-        description: รายการบันทึกล่าสุด OpenStreetMap จากผู้ใช้ %{user}
+        title: รายการบันทึก OpenStreetMap สำหรับ %{user}
+        description: รายการบันทึกล่าสุด OpenStreetMap จาก %{user}
       language:
         title: รายการบันทึก OpenStreetMap ในภาษา%{language_name}
         description: รายการบันทึกล่าสุดจากผู้ใช้ OpenStreetMap ในภาษา%{language_name}
@@ -1449,7 +1477,7 @@ th:
     help:
       title: ขอรับความช่วยเหลือ
       welcome:
-        title: ยินดีต้อนรับสู่ OSM
+        title: ยินดีต้อนรับสู่ OpenStreetMap
       beginners_guide:
         url: https://wiki.openstreetmap.org/wiki/Th:Beginners%27_guide
         title: คำแนะนำสำหรับผู้เริ่มต้น
@@ -1642,7 +1670,9 @@ th:
       newer: รอยทางที่ใหม่กว่า
     trace:
       pending: ค้างอยู่
-      count_points: '%{count} จุด'
+      count_points:
+        one: 1 จุด
+        other: '%{count} จุด'
       more: เพิ่มเติม
       trace_details: ดูรายละเอียดรอยทาง
       view_map: แสดงแผนที่
@@ -1830,8 +1860,9 @@ th:
       terms declined: ขออภัย ท่านมิได้ยอมรับเงื่อนไขผู้ร่วมสร้างสรรค์ เราจึงไม่สามารถดำเนินการต่อไปได้
         รายละเอียดเพิ่มเติมโปรดดู<a href="%{url}">หน้านี้</a>.
     terms:
-      title: เงื่อนไขผู้ร่วมสร้างสรรค์
-      heading: เงื่อนไขผู้ร่วมสร้างสรรค์
+      title: ข้อกำหนด
+      heading: ข้อกำหนด
+      heading_ct: ข้อกำหนดผู้มีส่วนร่วม
       consider_pd: นอกเหนือจากข้อตกลงข้างต้น ข้าพเจ้ายินดีสละการสร้างสรรค์ของข้าพเจ้าให้เป็นงานอันไม่มีลิขสิทธิ์
       consider_pd_why: นี้คืออะไร?
       decline: ไม่ยอมรับ
@@ -2068,9 +2099,9 @@ th:
       confirm: แน่ใจหรือว่าต้องการจะยกเิลิกการระงับนี้?
       flash: ได้ยกเลิกการระงับนี้แล้ว
     helper:
-      time_future: จะสิ้นสุดใน %{time}
+      time_future_html: จะสิ้นสุดใน %{time}
       until_login: มีผลจนถึงการเริ่มเข้าระบบครั้งถัดไป
-      time_past: สิ้นสุดไปเมื่อ %{time}
+      time_past_html: สิ้นสุดไปเมื่อ %{time}
       block_duration:
         years: '%{count} ปี'
     blocks_on:

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 79e17ee45ab7cac032b8e115e7bde3d49d8ba938..e00ac6ff956488e694d19bf5d4284742ddbda421 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1893,9 +1893,9 @@ tl:
       revoke: Bawiin!
       flash: Nabawi na ang hadlang na ito.
     helper:
-      time_future: Magwawakas sa %{time}.
+      time_future_html: Magwawakas sa %{time}.
       until_login: Masigla hanggang sa paglagda ng tagagamit.
-      time_past: Nagwakas na noong %{time} na ang nakalilipas.
+      time_past_html: Nagwakas na noong %{time} na ang nakalilipas.
       block_duration:
         hours:
           one: 1 oras

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bbe971cd7a18c4a8ab8c941e84d9b27a183fea67..ec13ec0b892e68f06538a5568356bea07a317551 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2756,10 +2756,11 @@ tr:
       revoke: İptal!
       flash: Bu engelleme iptal edildi.
     helper:
-      time_future: '%{time} içinde bitecek.'
+      time_future_html: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.
-      time_future_and_until_login: '%{time} içinde ve kullanıcı oturum açtığında bitecek.'
-      time_past: '%{time} bitti.'
+      time_future_and_until_login_html: '%{time} içinde ve kullanıcı oturum açtığında
+        bitecek.'
+      time_past_html: '%{time} bitti.'
       block_duration:
         hours:
           one: 1 saat
@@ -2792,7 +2793,7 @@ tr:
       show: Göster
       edit: Düzenle
       revoke: İptal!
-      confirm: Emin misin?
+      confirm: Emin misiniz?
       reason: 'Engelleme sebebi:'
       back: Tüm engellemeleri göster
       revoker: 'Geri alan:'

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 27742f279a8fa4a6f16402415d63afc32a0d92d1..23cc26d25707aaa03a42e942b2b41d597eb5a441 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2540,11 +2540,11 @@ uk:
       revoke: Зняти блокування!
       flash: Це блокування було знято.
     helper:
-      time_future: До закінчення %{time}.
+      time_future_html: До закінчення %{time}.
       until_login: Активне до тих пір, доки користувач не увійде в систему.
-      time_future_and_until_login: Закінчується через %{time} і після входу користувача
+      time_future_and_until_login_html: Закінчується через %{time} і після входу користувача
         в систему.
-      time_past: Закінчилось %{time}.
+      time_past_html: Закінчилось %{time}.
       block_duration:
         hours:
           one: '%{count} година'

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3a4684e28d979e06e38c7e524a997006361e8ead..54cf8133feb093ee0b7c00390b16ccf4db9397a6 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2533,10 +2533,11 @@ vi:
       revoke: Bỏ cấm!
       flash: Đã bỏ cấm.
     helper:
-      time_future: Hết hạn %{time}.
+      time_future_html: Hết hạn %{time}.
       until_login: Có hiệu lực cho đến khi người dùng đăng nhập.
-      time_future_and_until_login: Kết thúc %{time} nữa sau khi người dùng đăng nhập.
-      time_past: Đã hết hạn %{time}.
+      time_future_and_until_login_html: Kết thúc %{time} nữa sau khi người dùng đăng
+        nhập.
+      time_past_html: Đã hết hạn %{time}.
       block_duration:
         hours: '%{count} giờ'
         days:

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a58395358a6fe94c4a7749dd391e14989e6b0507..2d46969860c776438c3c5b325142e6073bf6b94c 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -348,6 +348,7 @@ zh-CN:
       entry_html: 关系 %{relation_name}
       entry_role_html: 关系 %{relation_name} (作为 %{relation_role})
     not_found:
+      title: 未找到
       sorry: '抱歉，无法找到 %{type} #%{id}。'
       type:
         node: 节点
@@ -356,6 +357,7 @@ zh-CN:
         changeset: 变更集
         note: 注记
     timeout:
+      title: 超时错误
       sorry: 对不起，检索 id 为 %{id} 的 %{type} 的数据时间过长。
       type:
         node: 节点
@@ -562,6 +564,7 @@ zh-CN:
           pylon: 桥塔
           station: 索道站
           t-bar: T字形电梯
+          "yes": 航空
         aeroway:
           aerodrome: 小型飞机场
           airstrip: 飞机跑道
@@ -570,6 +573,7 @@ zh-CN:
           hangar: 飞机库
           helipad: 直升机停机坪
           holding_position: 等车位置
+          navigationaid: 航空导航辅助
           parking_position: 停车位置
           runway: 飞机跑道
           taxilane: 滑行道
@@ -577,6 +581,7 @@ zh-CN:
           terminal: 航站楼
           windsock: 风向袋
         amenity:
+          animal_boarding: 动物寄养处
           animal_shelter: 动物收容所
           arts_centre: 艺术中心
           atm: 自动提款机
@@ -586,6 +591,7 @@ zh-CN:
           bench: 长椅
           bicycle_parking: 自行车停车处
           bicycle_rental: 自行车出租点
+          bicycle_repair_station: 自行车维修站
           biergarten: 露天啤酒店
           blood_bank: 血库
           boat_rental: 租船处
@@ -630,8 +636,10 @@ zh-CN:
           language_school: 语言学校
           library: 图书馆
           loading_dock: 装卸码头
+          love_hotel: 爱情旅馆
           marketplace: 商场
           monastery: 修道院
+          money_transfer: 汇款处
           motorcycle_parking: 摩托车停车场
           music_school: 音乐学校
           nightclub: 夜总会
@@ -639,6 +647,7 @@ zh-CN:
           parking: 停车场
           parking_entrance: 停车场入口
           parking_space: 停车位
+          payment_terminal: 支付终端
           pharmacy: 药店
           place_of_worship: 宗教场所
           police: 警察局
@@ -647,9 +656,12 @@ zh-CN:
           prison: 监狱
           pub: 酒馆
           public_bath: 公共浴场
+          public_bookcase: 公共书柜
           public_building: 公共建筑
+          ranger_station: 公园管理站
           recycling: 回收点
           restaurant: 餐馆
+          sanitary_dump_station: 储粪池
           school: 学校
           shelter: 避雨亭
           shower: 淋浴
@@ -662,6 +674,7 @@ zh-CN:
           theatre: 剧院
           toilets: 洗手间
           townhall: 市政厅
+          training: 训练设施
           university: 大学
           vehicle_inspection: 车辆检测站
           vending_machine: 自动售货机
@@ -670,10 +683,12 @@ zh-CN:
           waste_basket: 垃圾桶
           waste_disposal: 废物处理
           waste_dump_site: 垃圾倾倒场
+          watering_place: 动物饮水处
           water_point: 引水点
           weighbridge: 地磅
           "yes": 便利设施
         boundary:
+          aboriginal_lands: 原住民土地
           administrative: 行政区边界
           census: 人口普查边界
           national_park: 国家公园
@@ -695,6 +710,7 @@ zh-CN:
           cabin: 小屋
           chapel: 教堂
           church: 教堂建筑
+          civic: 公共建筑
           college: 学院建筑
           commercial: 商业建筑物
           construction: 在建建筑
@@ -705,6 +721,7 @@ zh-CN:
           garage: 车库
           garages: 车库
           greenhouse: 温室
+          hangar: 机库
           hospital: 医院建筑物
           hotel: 酒店建筑
           house: 房屋
@@ -729,6 +746,7 @@ zh-CN:
           terrace: 阳台建筑
           train_station: 火车站建筑
           university: 大学建筑物
+          warehouse: 仓库
           "yes": 建筑物
         club:
           sport: 体育俱乐部
@@ -737,26 +755,37 @@ zh-CN:
           blacksmith: 铁匠铺
           brewery: 啤酒厂
           carpenter: 木匠工坊
+          caterer: 餐饮服务商
+          confectionery: 糖果店
           dressmaker: 裁缝工作室
           electrician: 电工工坊
           electronics_repair: 电子维修处
           gardener: 园艺工坊
           glaziery: 琉璃工坊
           handicraft: 手工艺工坊
+          metal_construction: 金属结构坊
           painter: 装修工坊
           photographer: 摄影室
           plumber: 管道工坊
           roofer: 屋顶工作室
+          sawmill: 锯木厂
           shoemaker: 鞋匠工坊
+          stonemason: 石匠铺
           tailor: 裁缝店
+          window_construction: 窗户施工
           winery: 酿酒厂
           "yes": 工艺品店
         emergency:
           ambulance_station: 救护站
           assembly_point: 集合地点
           defibrillator: 除颤仪
+          fire_xtinguisher: 灭火器
+          fire_water_pond: 消防水塘
           landing_site: 紧急着陆地点
+          life_ring: 紧急救生圈
           phone: 紧急电话
+          siren: 防空警报
+          suction_point: 消防吸水点
           water_tank: 紧急水箱
           "yes": 紧急
         highway:
@@ -769,6 +798,7 @@ zh-CN:
           cycleway: 自行车道
           elevator: 电梯
           emergency_access_point: 紧急求救点
+          emergency_bay: 应急停车带
           footway: 人行道
           ford: 浅滩
           give_way: 让路标志
@@ -801,12 +831,14 @@ zh-CN:
           track: 小路
           traffic_mirror: 道路反光镜
           traffic_signals: 交通信号灯
+          trailhead: 步道起点
           trunk: 主干道路
           trunk_link: 干道
           turning_loop: 环形回车道
           unclassified: 无等级道路
           "yes": 道路
         historic:
+          aircraft: 历史航空器
           archaeological_site: 遗址
           bomb_crater: 弹坑遗址
           battlefield: 战场
@@ -820,17 +852,20 @@ zh-CN:
           citywalls: 城墙
           fort: 堡垒
           heritage: 遗产地
+          hollow_way: 坳路
           house: 房屋
           manor: 庄园
           memorial: 纪念碑
           mine: 矿井
           mine_shaft: 矿井
           monument: 纪念碑
+          railway: 历史铁路
           roman_road: 罗马道路
           ruins: 遗迹
           stone: 石头
           tomb: 墓
           tower: 塔
+          wayside_chapel: 路边小教堂
           wayside_cross: 路旁十字架
           wayside_shrine: 路旁神龛
           wreck: 残骸
@@ -839,6 +874,7 @@ zh-CN:
           "yes": 交叉点
         landuse:
           allotments: 小块园地
+          aquaculture: 水产养殖
           basin: 盆地
           brownfield: 棕地
           cemetery: 公墓
@@ -872,6 +908,7 @@ zh-CN:
           "yes": 土地利用
         leisure:
           adult_gaming_centre: 成人游戏中心
+          amusement_arcade: 娱乐厅
           bandstand: 演奏台
           beach_resort: 海滩度假村
           bird_hide: 野生动物观察站
@@ -919,6 +956,7 @@ zh-CN:
           bunker_silo: 地堡
           cairn: 堆石标
           chimney: 烟囱
+          clearcut: 采伐迹地
           communications_tower: 通讯塔
           crane: 吊车
           cross: 十字架
@@ -939,7 +977,7 @@ zh-CN:
           pier: 码头
           pipeline: 管道
           pumping_station: 泵站
-          reservoir_covered: 地下水池
+          reservoir_covered: 覆盖水库
           silo: 发射井
           snow_cannon: 雪炮
           snow_fence: 防雪栅栏
@@ -1052,6 +1090,7 @@ zh-CN:
           locality: 地区
           municipality: 直辖市
           neighbourhood: 居住区
+          plot: 地块
           postcode: 邮政编码
           quarter: 街角
           region: 地区
@@ -1096,6 +1135,7 @@ zh-CN:
           baby_goods: 婴儿用品
           bag: 包店
           bakery: 面包店
+          bathroom_furnishing: 浴室装修
           beauty: 美容店
           bed: 床上用品
           beverages: 饮料店
@@ -1119,6 +1159,8 @@ zh-CN:
           convenience: 便利店
           copyshop: 复印店
           cosmetics: 化妆品店
+          craft: 工艺品供应店
+          curtain: 窗帘店
           dairy: 乳品店
           deli: 熟食店
           department_store: 百货商场
@@ -1132,6 +1174,7 @@ zh-CN:
           fabric: 面料商店
           farm: 农产品店
           fashion: 时装店
+          fishing: 钓鱼用品店
           florist: 花店
           food: 食品店
           funeral_directors: 殡仪馆
@@ -2449,10 +2492,10 @@ zh-CN:
       revoke: 撤销！
       flash: 该封禁已经被撤销。
     helper:
-      time_future: 结束于 %{time}。
+      time_future_html: 结束于 %{time}。
       until_login: 用户登录时激活。
-      time_future_and_until_login: 结束于%{time}，并在用户登录之后。
-      time_past: 结束于%{time}。
+      time_future_and_until_login_html: 结束于%{time}，并在用户登录之后。
+      time_past_html: 结束于%{time}。
       block_duration:
         hours:
           one: 1 小时

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index aa16cc6fa29a29b7297abe9db49cf73588359f8b..fbe3fa4205c78a374dbd19d502077bfb06b25761 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2520,10 +2520,10 @@ zh-TW:
       revoke: 撤銷！
       flash: 這項封鎖已被撤銷。
     helper:
-      time_future: 於 %{time} 結束。
+      time_future_html: 於 %{time} 結束。
       until_login: 生效直至這個使用者登入為止。
-      time_future_and_until_login: 在用戶已登入後結束於%{time}。
-      time_past: 於%{time}結束。
+      time_future_and_until_login_html: 在用戶已登入後結束於%{time}。
+      time_past_html: 於%{time}結束。
       block_duration:
         hours:
           one: 1 小時