Localisation updates from https://translatewiki.net.

2019-06-03 17:46:00 +02:00 · 2019-06-03 17:46:00 +02:00 · c3699e206e
commit c3699e206e
parent f4e848d9ea
70 changed files with 491 additions and 263 deletions
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@ -1503,13 +1503,14 @@ af:
      confirm: Is u seker u wil hierdie versperring herroep?
      revoke: Herroep!
      flash: Hierdie versperring is herroep.
-    period:
-      one: 1 uur
-      other: '%{count} ure'
    helper:
      time_future: Tyd oor %{time} verstreke.
      until_login: Aktief totdat die gebruiker aanmeld.
      time_past: Tyd is %{time} gelede verstreke.
+      block_duration:
+        hours:
+          one: 1 uur
+          other: '%{count} ure'
    blocks_on:
      title: Versperrings op %{name}
      heading: Lys van versperrings teen %{name}
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@ -1399,13 +1399,14 @@ aln:
      confirm: Jeni i sigurt që dëshironi të revokuar kete kategori?
      revoke: Tërheq!
      flash: Ky bllok është revokuar.
-    period:
-      one: 1 orë
-      other: '%{count} orë'
    helper:
      time_future: Përfundon në %{time}.
      until_login: Aktiv deri kur përdoruesi shkrimet in
      time_past: Përfundoi %{time} më parë.
+      block_duration:
+        hours:
+          one: 1 orë
+          other: '%{count} orë'
    blocks_on:
      title: Blocks në %{name}
      heading: Lista e blloqeve në %{name}
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -2419,16 +2419,17 @@ ar:
      confirm: هل أنت متأكد أنك ترغب في إبطال هذه العرقلة ؟
      revoke: ابطل!
      flash: تم إبطال هذه العرقلة.
-    period:
-      few: '%{count} ساعات'
-      one: ساعة واحد
-      two: ساعتين
-      other: '%{count} ساعة'
    helper:
      time_future: ينتهي في %{time}.
      until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
      time_future_and_until_login: ينتهي في %{time} وبعد تسجيل دخول المستخدم.
      time_past: انتهى منذ %{time}.
+      block_duration:
+        hours:
+          few: '%{count} ساعات'
+          one: ساعة واحد
+          two: ساعتين
+          other: '%{count} ساعة'
    blocks_on:
      title: العرقلات على %{name}
      heading: لائحة العرقلات على %{name}
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@ -1151,15 +1151,16 @@ arz:
      confirm: هل أنت متأكد أنك ترغب فى إبطال هذه العرقله ؟
      revoke: ابطل!
      flash: تم إبطال هذه العرقله.
-    period:
-      few: '%{count} ساعات'
-      one: ساعه واحد
-      two: ساعتين
-      other: '%{count} ساعة'
    helper:
      time_future: ينتهى فى %{time}.
      until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
      time_past: انتهى منذ %{time}.
+      block_duration:
+        hours:
+          few: '%{count} ساعات'
+          one: ساعه واحد
+          two: ساعتين
+          other: '%{count} ساعة'
    blocks_on:
      title: العرقلات على %{name}
      heading: لائحه العرقلات على %{name}
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@ -2416,15 +2416,16 @@ ast:
      confirm: ¿Seguro que quies desaniciar esti bloquéu?
      revoke: ¡Desaniciar!
      flash: Esti bloquéu se desanició.
-    period:
-      one: 1 hora
-      other: '%{count} hores'
    helper:
      time_future: 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ó hai %{time}.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} hores'
    blocks_on:
      title: Bloqueos fechos a %{name}
      heading: Llista de los bloqueos a %{name}
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@ -1566,14 +1566,15 @@ be-Tarask:
      confirm: Вы ўпэўнены, што жадаеце адклікаць гэтае блякаваньне?
      revoke: Адклікаць!
      flash: Гэтае блякаваньне было адкліканае.
-    period:
-      one: '%{count} гадзіна'
-      few: '%{count} гадзіны'
-      other: '%{count} гадзінаў'
    helper:
      time_future: Канчаецца ў %{time}.
      until_login: Актыўнае да моманту ўваходу ўдзельніка ў сыстэму.
      time_past: Скончылася %{time} таму.
+      block_duration:
+        hours:
+          one: '%{count} гадзіна'
+          few: '%{count} гадзіны'
+          other: '%{count} гадзінаў'
    blocks_on:
      title: Блякаваньні для %{name}
      heading: Сьпіс блякаваньняў %{name}
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@ -2420,15 +2420,16 @@ be:
      confirm: Вы ўпэўнены, што жадаеце адклікаць гэтую блакіроўку?
      revoke: Адазваць!
      flash: Гэтая блакіроўка была адклікана.
-    period:
-      one: 1 гадзіна
-      other: '%{count} гадзін'
    helper:
      time_future: Заканчваецца праз %{time}.
      until_login: Актыўная да моманту ўваходу ўдзельніка ў сістэму.
      time_future_and_until_login: Заканчваецца праз %{time} і пасля таго, як карыстальнік
        увойдзе ў сістэму.
      time_past: Скончылася %{time} таму.
+      block_duration:
+        hours:
+          one: 1 гадзіна
+          other: '%{count} гадзін'
    blocks_on:
      title: Блакіроўкі для %{name}
      heading: Спіс блакіровак %{name}
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@ -2434,15 +2434,16 @@ br:
      confirm: Ha sur oc'h hoc'h eus c'hoant da derriñ ar stankadur-mañ ?
      revoke: Disteuler !
      flash: Torret eo bet ar stankadur-mañ.
-    period:
-      one: 1 eurvezh
-      other: '%{count} eurvezh'
    helper:
      time_future: 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
        an implijer.
      time_past: Echuet %{time} zo.
+      block_duration:
+        hours:
+          one: 1 eurvezh
+          other: '%{count} eurvezh'
    blocks_on:
      title: Stankadurioù evit %{name}
      heading: Roll ar stankadurioù evit %{name}
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@ -1793,13 +1793,14 @@ bs:
      confirm: Jeste li sgurni da želite opozvati ovu blokadu?
      revoke: Opozvati!
      flash: Ova blokada je opozvana.
-    period:
-      one: 1 sat
-      other: '%{count} sata/i'
    helper:
      time_future: Završava u %{time}.
      until_login: Aktivno dok se korsnik ne prijavi.
      time_past: Završeno prije %{time}.
+      block_duration:
+        hours:
+          one: 1 sat
+          other: '%{count} sata/i'
    blocks_on:
      title: Blokade na %{name}
      heading: Lista blokada na %{name}
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -2297,13 +2297,14 @@ ca:
      confirm: Esteu segur que voleu revocar aquest bloc?
      revoke: Revoca!
      flash: Aquest bloc ha estat revocat.
-    period:
-      one: 1 hora
-      other: '%{count} hores'
    helper:
      time_future: Finalitza en %{time}.
      until_login: Activa fins que l'usuari es connecta.
      time_past: Va acabar fa %{time}.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} hores'
    blocks_on:
      title: Blocs en %{name}
      heading: Llista de quadres a %{name}
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@ -963,9 +963,11 @@ ce:
    revoke:
      revoke: ДӀаяккха блок!
      flash: ХӀара блок дӀаяьккхина.
-    period:
-      one: 1 сахьт
-      other: '%{count} сахьт'
+    helper:
+      block_duration:
+        hours:
+          one: 1 сахьт
+          other: '%{count} сахьт'
    show:
      created: Кхоьллина
      ago: '%{time} хьалха'
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -2417,14 +2417,15 @@ cs:
      confirm: Opravdu chcete zrušit tento blok?
      revoke: Zrušit !
      flash: Tento blok byl zrušen.
-    period:
-      one: 1 hodina
-      other: '%{count} hodiny'
    helper:
      time_future: 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 před %{time}.
+      block_duration:
+        hours:
+          one: 1 hodina
+          other: '%{count} hodiny'
    blocks_on:
      title: Zablokování uživatele %{name}
      heading: Seznam zablokování uživatele %{name}
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -2447,15 +2447,16 @@ da:
      confirm: Er du sikker på du vil tilbagekalde denne blokering?
      revoke: Tilbagekald!
      flash: Denne blokering er blevet tilbagekaldt.
-    period:
-      one: 1 time
-      other: '%{count} timer'
    helper:
      time_future: Slutter om %{time}.
      until_login: Aktiv, indtil brugeren logger på.
      time_future_and_until_login: Slutter om %{time} og efter brugeren er logget
        ind.
      time_past: Sluttede %{time} siden.
+      block_duration:
+        hours:
+          one: 1 time
+          other: '%{count} timer'
    blocks_on:
      title: Blokeringer af %{name}
      heading: Liste over blokeringer af %{name}
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -2522,15 +2522,16 @@ de:
      confirm: Bist du sicher, dass du diese Sperre aufheben möchtest?
      revoke: Aufheben
      flash: Die Sperre wurde aufgehoben.
-    period:
-      one: 1 Stunde
-      other: '%{count} Stunden'
    helper:
      time_future: Endet in %{time}.
      until_login: Aktiv, bis der Benutzer sich anmeldet.
      time_future_and_until_login: Endet in %{time} und nachdem sich der Benutzer
        angemeldet hat.
      time_past: Endete vor %{time}
+      block_duration:
+        hours:
+          one: 1 Stunde
+          other: '%{count} Stunden'
    blocks_on:
      title: Sperren für %{name}
      heading: Liste der Sperren für %{name}
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@ -20,6 +20,7 @@ diq:
    submit:
      diary_entry:
        create: Vıla ke
+        update: Rocane ke
  activerecord:
    models:
      acl: Qontrol Listeyê Resayışi
@ -1061,12 +1062,13 @@ diq:
      title: Bloqeyê karberi
    revoke:
      revoke: Terkne!
-    period:
-      one: 1 seate
-      other: '%{count} seati'
    helper:
      time_future: '%{time} dı bıqediyo'
      time_past: Verdê %{time} qedya
+      block_duration:
+        hours:
+          one: 1 seate
+          other: '%{count} seati'
    blocks_on:
      title: Blokeyê ke %{name} kerdê
      heading: Blokeyê ke %{name} kerdê listey ênan
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@ -1961,15 +1961,16 @@ dsb:
      confirm: Coš napšawdu toś to blokěrowanje wótpóraś?
      revoke: Wótpóraś!
      flash: Toś to blokěrowanje jo se wótpórało.
-    period:
-      few: '%{count} góźiny'
-      one: 1 góźina
-      two: '%{count} góźinje'
-      other: '%{count} góźinow'
    helper:
      time_future: Kóńcy se %{time}.
      until_login: Aktiwny, až wužywaŕ se njepśizjawja.
      time_past: Jo se pśed %{time} skóńcyło.
+      block_duration:
+        hours:
+          few: '%{count} góźiny'
+          one: 1 góźina
+          two: '%{count} góźinje'
+          other: '%{count} góźinow'
    blocks_on:
      title: Blokěrowanja pśeśiwo %{name}
      heading: Lisćina blokěrowanjow pśeśiwo %{name}
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -2479,15 +2479,16 @@ el:
      confirm: Είστε σίγουρος πως επιθυμείτε να ανακαλέσετε αυτή τη φραγή;
      revoke: Ανακαλέστε!
      flash: Αυτή η φραγή έχει ανακληθεί.
-    period:
-      one: 1 ώρα
-      other: '%{count} ώρες'
    helper:
      time_future: Τελειώνει σε %{time}.
      until_login: Ενεργό έως ότου ο χρήστης συνδεθεί.
      time_future_and_until_login: Τελειώνει σε %{time} και μετά αφότου ο χρήστης
        έχει συνδεθεί.
      time_past: Τελείωσε %{time} πριν.
+      block_duration:
+        hours:
+          one: 1 ώρα
+          other: '%{count} ώρες'
    blocks_on:
      title: Φραγές στον %{name}
      heading: Κατάλογος φραγών στον %{name}
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@ -2217,14 +2217,15 @@ en-GB:
      confirm: Are you sure you wish to revoke this block?
      revoke: Revoke!
      flash: This block has been revoked.
-    period:
-      one: 1 hour
-      other: '%{count} hours'
    helper:
      time_future: 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} ago.
+      block_duration:
+        hours:
+          one: 1 hour
+          other: '%{count} hours'
    blocks_on:
      title: Blocks on %{name}
      heading: List of blocks on %{name}
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -2407,14 +2407,27 @@ eo:
      confirm: Ĉu vi certe volas nuligi ĉi tiun blokadon?
      revoke: Malbloki!
      flash: Ĉi tiu blokado estas nuligita.
-    period:
-      one: 1 horo
-      other: '%{count} horoj'
    helper:
      time_future: Finiĝos %{time}.
      until_login: Aktiva ĝis la uzanto ensalutos.
      time_future_and_until_login: Finiĝos dum %{time} kaj post la uzanto ensalutos.
      time_past: Finiĝis antaŭ %{time}
+      block_duration:
+        hours:
+          one: 1 horo
+          other: '%{count} horoj'
+        days:
+          one: 1 tago
+          other: '%{count} tagoj'
+        weeks:
+          one: 1 semajno
+          other: '%{count} semajnoj'
+        months:
+          one: 1 monato
+          other: '%{count} monatoj'
+        years:
+          one: 1 jaro
+          other: '%{count} jaroj'
    blocks_on:
      title: Blokadoj por %{name}
      heading: Listo de blokadoj por %{name}
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -2494,15 +2494,16 @@ es:
      confirm: ¿Confirmas que quieres revocar este bloqueo?
      revoke: Revocar
      flash: Este bloqueo ha sido revocado.
-    period:
-      one: 1 hora
-      other: '%{count} horas'
    helper:
      time_future: 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
        ha iniciado sesión.
      time_past: Finalizado hace %{time}.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
    blocks_on:
      title: Bloqueos sobre %{name}
      heading: Lista de bloqueos sobre %{name}
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@ -2089,14 +2089,15 @@ et:
      confirm: Kas oled kindel, et soovid seda blokeeringut tühistada?
      revoke: Tühista!
      flash: See blokeering on tühistatud.
-    period:
-      one: 1 tund
-      other: '%{count} tundi'
    helper:
      time_future: 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} tagasi.
+      block_duration:
+        hours:
+          one: 1 tund
+          other: '%{count} tundi'
    blocks_on:
      title: Kasutaja %{name} blokeeringud
      heading: Kasutaja %{name} blokeeringud
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@ -2427,15 +2427,16 @@ eu:
      confirm: Blokeo hau ezeztatu nahi duzula argi daukazu?
      revoke: Ezeztatu!
      flash: Bloke hau ezeztatu egin da.
-    period:
-      one: ordu bat
-      other: '%{count} ordu'
    helper:
      time_future: '%{time}n bukatzen du'
      until_login: Erabiltzaileak saioa hasi arte aktiboa.
      time_future_and_until_login: '%{time} denbora barru bukatzen du eta erabiltzaileak
        saioa hasi eta gero.'
      time_past: Duela %{time} bukatua.
+      block_duration:
+        hours:
+          one: ordu bat
+          other: '%{count} ordu'
    blocks_on:
      title: '%{name}n dauden blokeoak'
      heading: '%{name}n blokeoen zerrenda'
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -44,6 +44,7 @@ fa:
    submit:
      diary_entry:
        create: انتشار
+        update: به‌روزرسانی
  activerecord:
    errors:
      messages:
@ -1105,6 +1106,7 @@ fa:
    partners_ucl: UCL
    partners_bytemark: Bytemark Hosting
    partners_partners: شرکای تجاری
+    tou: شرایط استفاده
    osm_offline: دیتابیس OpenStreetMap در حال حاضر آفلاین است در حالی که کار تعمیر
      و نگهداری دیتابیس ضروری انجام میگیرد.
    osm_read_only: دیتابیس OpenStreetMap در حال حاضر روی حالت فقط خواندنی است در حالی
@ -1345,8 +1347,8 @@ fa:
        حق‌نشر و پروانه</a> را ببینید.'
      legal_title: قانونی
      legal_html: |-
-        این سایت و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به‌نمایندگی از جامعه توسط <a href='https://osmfoundation.org/'>بنیاد OpenStreetMap</a> ‏(OSMF) هدایت می‌شود. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        پذیرش سیاست‌های استفاده</a> و <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">سیاست حریم خصوصی</a> ماست.
+        این سایت و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به‌نمایندگی از جامعه توسط <a href='https://osmfoundation.org/'>بنیاد OpenStreetMap</a> ‏(OSMF) هدایت می‌شود. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به پذیرش <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        سیاست استفادهٔ قابل‌قبول</a>، <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">شرایط استفاده</a> و <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">سیاست حریم خصوصی</a> ماست.
        <br>
        اگر در رابطه با پروانه، حق‌نشر یا سایر موارد قانونی سؤالی دارید لطفاً <a href='https://osmfoundation.org/Contact'>با OSMF تماس بگیرید</a>.
        <br>
@ -1449,7 +1451,7 @@ fa:
          Information</a>، حق‌نشر State محفوظ است."
        contributors_gb_html: |-
          <strong>پادشاهی بریتانیا</strong>: شامل داده‌های Ordnance
-          Survey &copy;‏ حق‌نشر و حق پایگاه‌داده Crown‏ ۲۰۱۰-۱۲.
+          Survey &copy;‏ حق‌نشر و حق پایگاه‌داده Crown‏ ۲۰۱۰-۱۹.
        contributors_footer_1_html: |-
          برای اطلاعات بیشتر درباره این‌ها و سایر منابعی که برای پیشرفت اوپن‌استریت‌مپ استفاده شده، لطفاً <a
          href="https://wiki.openstreetmap.org/wiki/Contributors">صفحهٔ مشارکت‌کنندگان</a> را در ویکی ببینید.
@ -2097,6 +2099,11 @@ fa:
    terms:
      title: شرایط
      heading: شرایط
+      heading_ct: شرایط مشارکت‌کننده
+      read and accept with tou: لطفاً توافق‌نامهٔ مشارکت‌کننده و شرایط استفاده را
+        مطالعه کنید و هر دو گزینه را علامت بزنید و سپس روی دکمهٔ ادامه کلیک کنید.
+      read_ct: شرایط مشارکت‌کننده را خواندم و با آن موافق هستم
+      read_tou: شرایط استفاده را خواندم و با آن موافق هستم
      consider_pd: علاوه بر موارد بالا، می‌پذیرم که مشارکت‌هایم در مالکیت عمومی باشد.
      consider_pd_why: این چیست؟
      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@ -2234,7 +2241,7 @@ fa:
        link text: این چیست؟
        disabled: گرآواتار غیرفعال شده است.
        enabled: نمایش گرآواتار شما فعال شد.
-      new image: افزون تصویر
+      new image: افزودن تصویر
      keep image: نگه‌داشتن تصویر فعلی
      delete image: حذف تصویر فعلی
      replace image: ' تصویر فعلی را جایگزین کنید'
@ -2404,15 +2411,16 @@ fa:
      confirm: مطمئنید می‌خواهید این مسدودی را لغو کنید؟
      revoke: باطل شود!
      flash: این مسدودی لغو شد.
-    period:
-      one: 1 ساعت
-      other: '%{count} ساعت'
    helper:
      time_future: '%{time} دیگر پایان می‌یابد.'
      until_login: تا وقتی کاربر وارد شود فعال می‌ماند.
      time_future_and_until_login: '%{time} دیگر و پس از ورود به حساب کاربری پایان
        می‌یابد.'
      time_past: '%{time} پیش پایان یافت.'
+      block_duration:
+        hours:
+          one: 1 ساعت
+          other: '%{count} ساعت'
    blocks_on:
      title: مسدودی‌های کاربری %{name}
      heading: فهرست مسدودی‌های %{name}
@ -2511,6 +2519,7 @@ fa:
        title: لایه‌ها
      copyright: © <a href='%{copyright_url}'>مشارکت‌کنندگان OpenStreetMap</a>
      donate_link_text: <a class='donate-attr' href='%{donate_url}'>کمک مالی</a>
+      terms: <a href='%{terms_url}' target='_blank'>شرایط وبسایت و API</a>
    site:
      edit_tooltip: ویرایش نقشه
      edit_disabled_tooltip: برای ویرایش نقشه بزرگنمایی کنید
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alluk.
+# Author: Antsa
 # Author: BriskyBlizzard
 # Author: Centerlink
 # Author: Crt
@ -2121,6 +2122,7 @@ fi:
      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
      guidance: 'Vaihtoehtoisia lukutapoja: <a href="%{summary}">selkokielinen yhteenveto
        (englanniksi)</a> ja <a href="%{translations}">epäviralliset käännökset</a>'
+      continue: Seuraava
      declined: https://wiki.openstreetmap.org/wiki/Fi:Contributor_Terms_Declined
      decline: En hyväksy
      you need to accept or decline: Ennen jatkamista lue läpi osallistumisehdot ja
@ -2423,15 +2425,16 @@ fi:
      confirm: Oletko varma, että haluat poistaa tämän eston?
      revoke: Poista!
      flash: Tämä esto on poistettu
-    period:
-      one: 1 tunti
-      other: '%{count} tuntia'
    helper:
      time_future: 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
        sisään.
      time_past: Päättyi %{time} sitten.
+      block_duration:
+        hours:
+          one: 1 tunti
+          other: '%{count} tuntia'
    blocks_on:
      title: Käyttäjän %{name} estot
      heading: Käyttäjän %{name} estot
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -52,6 +52,7 @@
 # Author: Pipo
 # Author: Pyrog
 # Author: Quentinv57
+# Author: Roptat
 # Author: Ruila
 # Author: Rémi Bovard
 # Author: Seb35
@ -399,7 +400,7 @@ fr:
        %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous
        avez cliqué.
    diary_entry:
-      posted_by: Publié par %{link_user} à %{created} en %{language_link}
+      posted_by: Publié par %{link_user} le %{created} en %{language_link}
      comment_link: Commenter cette entrée
      reply_link: Répondre à cette entrée
      comment_count:
@ -2540,15 +2541,26 @@ fr:
      confirm: Êtes-vous sûr de vouloir révoquer ce blocage ?
      revoke: Révoquer !
      flash: Ce blocage a été révoqué.
-    period:
-      one: '%{count} heure'
-      other: '%{count} heures'
    helper:
      time_future: 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
        s’est connecté.
      time_past: Terminé il y a %{time}.
+      block_duration:
+        hours:
+          one: '%{count} heure'
+          other: '%{count} heures'
+        days:
+          one: 1 jour
+          other: '%{count} jours'
+        weeks:
+          one: 1 semaine
+          other: '%{count} semaines'
+        months: '%{count} mois'
+        years:
+          one: 1 année
+          other: '%{count} années'
    blocks_on:
      title: Blocages de « %{name} »
      heading: Liste des blocages sur « %{name} »
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@ -1343,12 +1343,13 @@ fur:
    revoke:
      time_future: Chest bloc al finìs ca di %{time}.
      revoke: Revoche!
-    period:
-      one: 1 ore
-      other: '%{count} oris'
    helper:
      time_future: Finìs ca di %{time}.
      time_past: Finît %{time} indaûr.
+      block_duration:
+        hours:
+          one: 1 ore
+          other: '%{count} oris'
    blocks_on:
      title: Blocs su %{name}
      heading: Liste dai blocs su %{name}
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@ -2072,9 +2072,11 @@ ga:
      confirm: An bhfuil tú cinnte gur mhaith leat an bac seo a tharraingt siar?
      revoke: Tarraing siar!
      flash: Tarraingíodh an bac seo siar.
-    period:
-      one: uair amháin an chloig
-      other: '%{count} uair an chloig'
+    helper:
+      block_duration:
+        hours:
+          one: uair amháin an chloig
+          other: '%{count} uair an chloig'
    show:
      show: Taispeáin
      confirm: An bhfuil tú cinnte?
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@ -2235,12 +2235,13 @@ gd:
      confirm: A bheil thu cinnteach gu bheil thu airson am bacadh seo a chùl-ghairm?
      revoke: Cùl-ghairm!
      flash: Chaidh am bacadh seo a chùl-ghairm.
-    period:
-      other: '%{count} uair a thìde'
    helper:
      time_future: 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}.
+      block_duration:
+        hours:
+          other: '%{count} uair a thìde'
    blocks_on:
      title: Bacaidhean air %{name}
      heading: Liosta dhe na bacaidhean air %{name}
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -2469,15 +2469,16 @@ gl:
      confirm: Ten a certeza de querer revogar este bloqueo?
      revoke: Revogar!
      flash: Revogouse o bloqueo.
-    period:
-      one: 1 hora
-      other: '%{count} horas'
    helper:
      time_future: 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 hai %{time}.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
    blocks_on:
      title: Bloqueos feitos a %{name}
      heading: Listaxe dos bloqueos feitos a %{name}
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -2374,14 +2374,15 @@ he:
      confirm: האם ברצונך לבטל את החסימה הזאת?
      revoke: לבטל!
      flash: החסימה הזאת בוטלה.
-    period:
-      one: שעה אחת
-      other: '%{count} שעות'
    helper:
      time_future: תסתיים בעוד %{time}
      until_login: פעילה עד שהמשתמש ייכנס לחשבון.
      time_future_and_until_login: מסתיים ב־%{time} ואחרי שהמשתמש נכנס לחשבון.
      time_past: הסתיימה לפני %{time}.
+      block_duration:
+        hours:
+          one: שעה אחת
+          other: '%{count} שעות'
    blocks_on:
      title: חסימות של %{name}
      heading: רשימת החסימות של %{name}
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@ -1898,13 +1898,14 @@ hr:
      confirm: Jeste li sgurni da želite opozvati ovu blokadu?
      revoke: Opozovi!
      flash: Ova blokada je opozvana.
-    period:
-      one: 1 sat
-      other: '%{count} sati'
    helper:
      time_future: Završava u %{time}.
      until_login: Aktivno dok se korsnik ne prijavi.
      time_past: Završeno prije %{time}.
+      block_duration:
+        hours:
+          one: 1 sat
+          other: '%{count} sati'
    blocks_on:
      title: Blokade na %{name}
      heading: Lista blokada na %{name}
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@ -2153,15 +2153,16 @@ hsb:
      confirm: Chceš woprawdźe tute blokowanje zběhnyć?
      revoke: Zběhnyć!
      flash: Tute blokowanje je so zběhnyło.
-    period:
-      few: '%{count} hodźiny'
-      one: 1 hodźina
-      two: '%{count} hodźinje'
-      other: '%{count} hodźin'
    helper:
      time_future: 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.
+      block_duration:
+        hours:
+          few: '%{count} hodźiny'
+          one: 1 hodźina
+          two: '%{count} hodźinje'
+          other: '%{count} hodźin'
    blocks_on:
      title: Blokowanja přećiwo %{name}
      heading: Lisćina blokowanjow přećiwo %{name}
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -2363,14 +2363,15 @@ hu:
      confirm: Biztosan vissza szeretnéd vonni ezt a blokkolást?
      revoke: Visszavonás!
      flash: Ez a blokkolás vissza lett vonva.
-    period:
-      one: 1 órája
-      other: '%{count} órája'
    helper:
      time_future: 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} óta.
+      block_duration:
+        hours:
+          one: 1 órája
+          other: '%{count} órája'
    blocks_on:
      title: '%{name} blokkolásai'
      heading: '%{name} blokkolásainak felsorolása'
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@ -2311,15 +2311,16 @@ ia:
      confirm: Es tu secur de voler revocar iste blocada?
      revoke: Revocar!
      flash: Iste blocada ha essite revocate.
-    period:
-      one: 1 hora
-      other: '%{count} horas'
    helper:
      time_future: 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} retro.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
    blocks_on:
      title: Blocadas de %{name}
      heading: Lista de blocadas de %{name}
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@ -2409,14 +2409,15 @@ id:
      confirm: Apakah Anda yakin untuk membatalkan blokir ini?
      revoke: Batalkan!
      flash: Blokir ini telah dibatalkan.
-    period:
-      one: 1 hour
-      other: '%{count} hours'
    helper:
      time_future: 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.
+      block_duration:
+        hours:
+          one: 1 hour
+          other: '%{count} hours'
    blocks_on:
      title: Diblokir pada %{name}
      heading: Daftar blokir pada %{name}
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@ -2464,15 +2464,16 @@ is:
      confirm: Staðfestu að þú viljir eyða þessu banni.
      revoke: Eyða banninu
      flash: Banninu var eytt.
-    period:
-      one: 1 stund
-      other: '%{count} stundir'
    helper:
      time_future: 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 fyrir %{time} síðan
+      block_duration:
+        hours:
+          one: 1 stund
+          other: '%{count} stundir'
    blocks_on:
      title: Bönn gegn %{name}
      heading: Bönn gegn %{name}
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -55,6 +55,7 @@ it:
    submit:
      diary_entry:
        create: Pubblica
+        update: Aggiorna
  activerecord:
    errors:
      messages:
@ -2165,6 +2166,7 @@ it:
      title: Termini
      heading: Termini
      heading_ct: Regole per contribuire
+      read_tou: Ho letto e accetto le Condizioni d’utilizzo
      consider_pd: In aggiunta a quanto sopra, considero che i miei contributi sono
        in Pubblico dominio
      consider_pd_why: cos'è questo?
@ -2482,15 +2484,25 @@ it:
      confirm: Sei sicuro di voler revocare questo blocco?
      revoke: Revoca!
      flash: Questo blocco è stato revocato.
-    period:
-      one: 1 ora
-      other: '%{count} ore'
    helper:
      time_future: 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} fa.
+      block_duration:
+        hours:
+          one: 1 ora
+          other: '%{count} ore'
+        days:
+          one: 1 giorno
+          other: '%{count} giorni'
+        months:
+          one: 1 mese
+          other: '%{count} mesi'
+        years:
+          one: 1 anno
+          other: '%{count} anni'
    blocks_on:
      title: Blocchi su %{name}
      heading: Lista dei blocchi su %{name}
@ -2589,6 +2601,8 @@ it:
        title: Livelli
      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Fai una donazione</a>
+      terms: <a href='%{terms_url}' target='_blank'>Condizioni del sito web e delle
+        API</a>
    site:
      edit_tooltip: Modifica la mappa
      edit_disabled_tooltip: Zooma per modificare la mappa
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -2233,12 +2233,13 @@ ja:
      confirm: このブロックを本当に取り消しますか?
      revoke: 取り消す!
      flash: このブロックは取り消されました。
-    period: '%{count} 時間'
    helper:
      time_future: '%{time} に終了します。'
      until_login: 利用者がログインするまで有効です。
      time_future_and_until_login: 利用者のログイン後%{time}で終了します。
      time_past: '%{time}前に終了しました。'
+      block_duration:
+        hours: '%{count} 時間'
    blocks_on:
      title: '%{name} がされたブロック'
      heading: '%{name} のブロックのリスト'
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@ -1169,13 +1169,14 @@ ka:
      confirm: დარწმუნებული ხართ, რომ ამ ბლოკირების მოხსნა გსურთ?
      revoke: განბლოკვა!
      flash: ეს ბლოკირება მოიხსნა.
-    period:
-      one: 1 საათი
-      other: '%{count} საათი'
    helper:
      time_future: მთავრდება %{time}–ში.
      until_login: აქტიურია მანამდე, სანამ მომხმარებელი არ შევა სისტემაში.
      time_past: დასრულდა %{time} წინ.
+      block_duration:
+        hours:
+          one: 1 საათი
+          other: '%{count} საათი'
    blocks_on:
      title: '%{name}-ის მიერ გაკეთებული ბლოკირებები'
      heading: '%{name}-ის მიერ გაკეთებული ბლოკირებების სია'
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -2330,14 +2330,27 @@ ko:
      confirm: 이 차단을 해제하겠습니까?
      revoke: 해제!
      flash: 이 차단을 해제했습니다.
-    period:
-      one: 1시간
-      other: '%{count}시간'
    helper:
      time_future: '%{time}에 끝납니다.'
      until_login: 사용자가 로그인할 때까지 활성합니다.
      time_future_and_until_login: '%{time} 이후에 사용자가 로그인하면.'
      time_past: '%{time} 전에 끝났습니다.'
+      block_duration:
+        hours:
+          one: 1시간
+          other: '%{count}시간'
+        days:
+          one: 1일
+          other: '%{count}일'
+        weeks:
+          one: 1주
+          other: '%{count}주'
+        months:
+          one: 1개월
+          other: '%{count}개월'
+        years:
+          one: 1년
+          other: '%{count}년'
    blocks_on:
      title: '%{name}님에 대해 차단'
      heading: '%{name} 사용자에 대한 차단 목록'
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@ -2424,14 +2424,15 @@ ku-Latn:
      confirm: Tu bawer î ku tu dixwazî vî astengiyê rabikî?
      revoke: Betal bike!
      flash: Ev astengî hate betalkirin.
-    period:
-      one: 1 saetê
-      other: '%{count} saetan'
    helper:
      time_future: 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: Berî %{time} qediya.
+      block_duration:
+        hours:
+          one: 1 saetê
+          other: '%{count} saetan'
    blocks_on:
      title: Astengiyên ser %{name}
      heading: Lîsteya astengiyên ser %{name}
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@ -15,6 +15,7 @@ lb:
    submit:
      diary_entry:
        create: Verëffentlechen
+        update: Aktualiséieren
  activerecord:
    models:
      changeset: Set vun Ännerungen
@ -1259,9 +1260,11 @@ lb:
    revoke:
      revoke: Ophiewen!
      flash: Dës Spär gouf opgehuewen.
-    period:
-      one: 1 Stonn
-      other: '%{count} Stonnen'
+    helper:
+      block_duration:
+        hours:
+          one: 1 Stonn
+          other: '%{count} Stonnen'
    blocks_on:
      title: Späre vum %{name}
      empty: '%{name} gouf bis elo nach net gespaart.'
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@ -2233,13 +2233,14 @@ lt:
      confirm: Ar tikrai norite atšaukti šį blokavimą?
      revoke: Atšaukti!
      flash: Šis blokavimas buvo atšauktas
-    period:
-      one: 1 valanda
-      other: '%{count} valandos'
    helper:
      time_future: Baigiasi po %{time}.
      until_login: Aktyvus iki naudotojo prisijungimo.
      time_past: Pasibaigė prieš %{time}
+      block_duration:
+        hours:
+          one: 1 valanda
+          other: '%{count} valandos'
    blocks_on:
      title: Naudotojo %{name} blokavimai
      heading: Naudotojo %{name} apribojimų sąrašas
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -2215,13 +2215,14 @@ lv:
      confirm: Vai jūs tiešām vēlaties atcelt šo bloku?
      revoke: Atsaukt!
      flash: Šis bloks ir atsaukts.
-    period:
-      one: 1 stunda
-      other: '%{count} stundas'
    helper:
      time_future: Beidzas %{time}.
      until_login: Aktīvs līdz lietotājs autorizēsies.
      time_past: Pabeigts %{time} atpakaļ.
+      block_duration:
+        hours:
+          one: 1 stunda
+          other: '%{count} stundas'
    blocks_on:
      title: Liegumi uz %{name}
      heading: Liegumu saraksts uz %{name}
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@ -2440,14 +2440,27 @@ mk:
      confirm: Дали сигурно дакате да го поништите овој блок?
      revoke: Поништи!
      flash: Овој блок е поништен.
-    period:
-      one: еден час
-      other: '%{count} часа'
    helper:
      time_future: Истекува за %{time}.
      until_login: Активно додека не се најави корисникот.
      time_future_and_until_login: Завршува во %{time} и откако корисникот ќе се најави.
      time_past: Истечено пред %{time}.
+      block_duration:
+        hours:
+          one: еден час
+          other: '%{count} часа'
+        days:
+          one: 1 ден
+          other: '%{count} дена'
+        weeks:
+          one: 1 седмица
+          other: '%{count} седмици'
+        months:
+          one: 1 месец
+          other: '%{count} месеци'
+        years:
+          one: 1 година
+          other: '%{count} години'
    blocks_on:
      title: Блокови за %{name}
      heading: Список на блокови за %{name}
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@ -1362,9 +1362,11 @@ mr:
        one: पान %{page} (%{first_item}, %{items} पैकी)
        other: पान %{page} (%{first_item}-%{last_item}, %{items}पैकी)
  user_blocks:
-    period:
-      one: १ तास
-      other: '%{count} तास'
+    helper:
+      block_duration:
+        hours:
+          one: १ तास
+          other: '%{count} तास'
    blocks:
      showing_page: पान %{page}
      next: पुढील »
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@ -2089,13 +2089,14 @@ ms:
      confirm: Adakah anda benar-benar ingin membuang sekatan ini?
      revoke: Tarik Balik!
      flash: Sekatan ini telah ditarik balik.
-    period:
-      one: 1 jam
-      other: '%{count} jam'
    helper:
      time_future: Berakhir dalam masa %{time}.
      until_login: Aktif sehingga pengguna itu log masuk.
      time_past: Berakhir %{time} lalu.
+      block_duration:
+        hours:
+          one: 1 jam
+          other: '%{count} jam'
    blocks_on:
      title: Sekatan ke atas %{name}
      heading: Senarai sekatan ke atas %{name}
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@ -2410,15 +2410,16 @@ nb:
      confirm: Er du sikker på at du vil tilbakekalle denne blokkeringen?
      revoke: Tilbakekall!
      flash: Denne blokkeringen har blitt tilbakekalt.
-    period:
-      one: 1 time
-      other: '%{count} timer'
    helper:
      time_future: 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} siden.
+      block_duration:
+        hours:
+          one: 1 time
+          other: '%{count} timer'
    blocks_on:
      title: Blokkeringer av %{name}
      heading: Liste over blokkeringer av %{name}
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -7,6 +7,7 @@
 # Author: CGID
 # Author: Carsrac
 # Author: Donarreiskoffer
+# Author: Duckson32
 # Author: Elroy
 # Author: Esketti
 # Author: Freek
@ -56,6 +57,7 @@ nl:
    submit:
      diary_entry:
        create: Publiceren
+        update: Update
  activerecord:
    errors:
      messages:
@ -2477,15 +2479,16 @@ nl:
      confirm: Weet u zeker dat u deze blokkade wilt intrekken?
      revoke: Intrekken
      flash: Deze blokkade is ingetrokken.
-    period:
-      one: 1 uur
-      other: '%{count} uur'
    helper:
      time_future: Vervalt over %{time}.
      until_login: Actief totdat de gebruiker zich aanmeldt.
      time_future_and_until_login: Eindigt in %{time} en nadat de gebruiker ingelogd
        is.
      time_past: '%{time} geleden vervallen.'
+      block_duration:
+        hours:
+          one: 1 uur
+          other: '%{count} uur'
    blocks_on:
      title: Blokkades voor %{name}
      heading: Lijst met blokkades voor %{name}
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -1986,15 +1986,16 @@ nn:
      confirm: Er du sikker på at du vil tilbakekalle denne blokkeringa?
      revoke: Tilbakekall!
      flash: Denne blokkeringa har vorte tilbakekalt.
-    period:
-      one: 1 time
-      other: '%{count} timar'
    helper:
      time_future: 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.
+      block_duration:
+        hours:
+          one: 1 time
+          other: '%{count} timar'
    blocks_on:
      title: Blokkeringar av %{name}
      heading: Liste over blokkeringar av %{name}
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@ -2058,13 +2058,14 @@ oc:
      confirm: Sètz segur que volètz revocar aqueste blocatge ?
      revoke: Revocar !
      flash: Aqueste blocatge es estat revocat.
-    period:
-      one: 1 ora
-      other: '%{count} oras'
    helper:
      time_future: Acaba a %{time}.
      until_login: Actiu fins al moment que l'utilizaire se connectarà.
      time_past: Acabat fa %{time}.
+      block_duration:
+        hours:
+          one: 1 ora
+          other: '%{count} oras'
    blocks_on:
      title: Blocatges de %{name}
      heading: Lista dels blocatges sus %{name}
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@ -1198,9 +1198,11 @@ pa:
    revoke:
      revoke: ਪਰਤਾਉ!
      flash: ਇਹ ਰੋਕ ਪਰਤਾ ਦਿੱਤੀ ਗਈ ਹੈ।
-    period:
-      one: ੧ ਘੰਟਾ
-      other: '%{count} ਘੰਟੇ'
+    helper:
+      block_duration:
+        hours:
+          one: ੧ ਘੰਟਾ
+          other: '%{count} ਘੰਟੇ'
    show:
      status: ਹਾਲਾਤ
      show: ਵਿਖਾਉ
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -2466,14 +2466,15 @@ pl:
      confirm: Czy na pewno chcesz odwołać tę blokadę?
      revoke: Odwołaj
      flash: Blokada została odwołana.
-    period:
-      one: 1 godzina
-      other: '%{count} godzin'
    helper:
      time_future: Blokada wygasa za %{time}.
      until_login: Aktywne do momentu zalogowania użytkownika.
      time_future_and_until_login: Kończy się %{time} i po zalogowaniu się użytkownika.
      time_past: Zakończono %{time} temu.
+      block_duration:
+        hours:
+          one: 1 godzina
+          other: '%{count} godzin'
    blocks_on:
      title: Blokady na użytkownika %{name}
      heading: Lista blokad na użytkownika %{name}
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -1162,7 +1162,7 @@ pt-BR:
      %{link}.'
    help: Ajuda
    about: Sobre
-    copyright: Direitos Autorais
+    copyright: Direitos autorais
    community: Comunidade
    community_blogs: Blogs da Comunidade
    community_blogs_title: Blogs de membros da comunidade OpenStreetMap
@ -1382,7 +1382,7 @@ pt-BR:
      local_knowledge_html: O OpenStreetMap valoriza o conhecimento local. Os contribuidores
        utilizam fotografias aéreas, dispositivos GPS, e mapas do terreno para verificar
        que a informação no OpenStreetMap é rigorosa e atualizada.
-      community_driven_title: Impulsionado pela Comunidade
+      community_driven_title: Impulsionado pela comunidade
      community_driven_html: |-
        A comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente.
        Entre os nossos colaboradores encontra-se mapeadores entusiastas, profissionais das áreas de sistemas geográficos, engenheiros que utilizam os servidores do OSM, voluntários a mapear áreas afetadas por grandes desastres, e muitos mais.
@ -1390,7 +1390,7 @@ pt-BR:
        <a href='https://blog.openstreetmap.org'>Blogue do OpenStreetMap</a>,
        <a href='%{diary_path}'>diários dos utilizadores</a>,
        <a href='https://blogs.openstreetmap.org/'>blogues da comunidade</a>, e o sítio da <a href='https://www.osmfoundation.org/'>Fundação OSM</a>.
-      open_data_title: Dados Abertos
+      open_data_title: Dados abertos
      open_data_html: |-
        O OpenStreetMap é constituído por <i>dados abertos</i>: qualquer
        pessoa tem a liberdade de usar os dados para qualquer fim desde
@ -1424,7 +1424,7 @@ pt-BR:
        native_link: Versão em Português do Brasil
        mapping_link: começar a mapear
      legal_babble:
-        title_html: Direitos Autorais e Licença
+        title_html: Direitos autorais e licença
        intro_1_html: |-
          O OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> é disponibilizado em <i>dados abertos</i>, sob a licença <a
          href="https://opendatacommons.org/licenses/odbl/">Open Data
@ -1635,7 +1635,7 @@ pt-BR:
          href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grupo de trabalho
          OSMF</a> apropriado.
    help:
-      title: Obtendo Ajuda
+      title: Obtendo ajuda
      introduction: O OpenStreetMap oferece vários recursos para você saber mais sobre
        o projeto, perguntar e responder a questões, e colaborativamente discutir
        e documentar vários tópicos sobre o mapa.
@ -1668,7 +1668,7 @@ pt-BR:
          no OpenStreetMap e outros serviços.
      welcomemat:
        url: https://welcome.openstreetmap.org/
-        title: Para Organizações
+        title: Para organizações
        description: Com uma organização fazendo planos para o OpenStreetMap? Encontre
          o que você precisa saber no Welcome Mat.
      wiki:
@ -1920,7 +1920,7 @@ pt-BR:
      in: em
      map: mapa
    index:
-      public_traces: Trilhas Públicas de GPS
+      public_traces: Trilhas públicas de GPS
      my_traces: Minhas trilhas GPS
      public_traces_from: Trilhas de GPS públicas de %{user}
      description: Procurar recentes carregamentos de rastreamento de GPS
@ -1960,7 +1960,7 @@ pt-BR:
        Você deve lê-la para poder voltar a salvar suas edições.
      blocked: Seu acesso à API foi bloqueado. Acesse a interface web para mais detalhes.
      need_to_see_terms: O seu acesso à API está temporariamente suspenso. Faça o
-        login na interface web para ler os Termos do Contribuidor. Você não precisa
+        login na interface web para ler os termos do contribuidor. Você não precisa
        concordar, mas você deve vê-los.
  oauth:
    authorize:
@ -2017,18 +2017,18 @@ pt-BR:
      allow_write_notes: alterar notas.
    index:
      title: Meus detalhes do OAuth
-      my_tokens: Minhas aplicações autorizadas
+      my_tokens: Meus aplicativos autorizados
      list_tokens: 'Os seguintes tokens foram distribuidos para aplicações em seu
        nome:'
-      application: Nome da Aplicação
+      application: Nome do aplicativo
      issued_at: Emitido em
      revoke: Cancelar!
-      my_apps: Minhas Aplicações Cliente
-      no_apps: Você tem uma aplicação que gostaria de registrar para usar conosco
+      my_apps: Meus clientes de aplicativos
+      no_apps: Você tem um aplicativo que gostaria de registrar para usar conosco
        com o padrão %{oauth}? Você deve registrar sua aplicação web antes que ela
        possa fazer requisições OAuth para esse serviço.
      registered_apps: 'Você tem as seguintes aplicações cliente registradas:'
-      register_new: Registre sua aplicação
+      register_new: Registre seu aplicativo
    form:
      name: Nome
      required: Obrigatório
@ -2150,19 +2150,19 @@ pt-BR:
        Consulte a <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="política
        de privacidade OSMF, incluindo secção sobre endereços de e-mail">política
        de privacidade</a> para mais informação.
-      display name: 'Nome de Exibição:'
+      display name: 'Nome de exibição:'
      display name description: Seu nome de usuário disponível publicamente. Você
        pode mudá-lo depois nas preferências.
      external auth: 'Autenticação de Terceiros:'
      password: 'Senha:'
-      confirm password: 'Confirmar Senha:'
+      confirm password: 'Confirmar senha:'
      use external auth: Ou identifique-se através de terceiros
      auth no password: Com autenticação por terceiros não é necessária uma senha,
        mas certas ferramentas ou o servidor talvez ainda precisem.
      continue: Registrar-se
      terms accepted: Obrigado por aceitar os novos termos de contribuição!
-      terms declined: Lamentamos que você tenha decidido não aceitar os novos Termos
-        do Contribuidor. Para mais informações, consulte <a href="%{url}">esta página
+      terms declined: Lamentamos que você tenha decidido não aceitar os novos termos
+        do contribuidor. Para mais informações, consulte <a href="%{url}">esta página
        do wiki</a> .
      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=pt-br
    terms:
@ -2187,7 +2187,7 @@ pt-BR:
      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=pt-br
      decline: Discordo
      you need to accept or decline: Por favor leia e, em seguida, aceite ou recuse
-        os novos Termos do Contribuidor para continuar.
+        os novos termos do contribuidor para continuar.
      legale_select: 'País em que você mora:'
      legale_names:
        france: França
@ -2200,25 +2200,25 @@ pt-BR:
        link em que você clicou esteja errado.
      deleted: excluído
    show:
-      my diary: Meu Diário
+      my diary: Meu diário
      new diary entry: nova publicação no diário
      my edits: Minhas Edições
      my traces: Minhas trilhas
-      my notes: Minhas Notas de Mapa
+      my notes: Minhas notas de mapa
      my messages: Minhas Mensagens
      my profile: Meu Perfil
-      my settings: Minhas Configurações
-      my comments: Meus Comentários
+      my settings: Minhas configurações
+      my comments: Meus comentários
      oauth settings: configurações do oauth
      blocks on me: Bloqueios sobre Mim
      blocks by me: Bloqueios por Mim
-      send message: Enviar Mensagem
+      send message: Enviar mensagem
      diary: Diário
      edits: Edições
      traces: Trilhas
      notes: Notas de Mapa
      remove as friend: Desfazer Amizade
-      add as friend: Adicionar como Amigo
+      add as friend: Adicionar como amigo
      mapper since: 'Mapeador desde:'
      ago: (%{time_in_words_ago} atrás)
      ct status: 'Termos do contribuidor:'
@ -2273,8 +2273,8 @@ pt-BR:
    account:
      title: Editar conta
      my settings: Minhas configurações
-      current email address: 'Endereço de E-mail Atual:'
-      new email address: 'Novo Endereço de E-mail:'
+      current email address: 'Endereço de e-mail atual:'
+      new email address: 'Novo endereço de e-mail:'
      email never displayed publicly: (nunca exibido publicamente)
      external auth: 'Autenticação externa:'
      openid:
@ -2299,17 +2299,17 @@ pt-BR:
          de e-mail não será revelado.</li><li>Esta ação não pode ser revertida e
          todos os novos utilizadores têm as edições disponibilizadas publicamente.</li></ul>
      contributor terms:
-        heading: 'Termos do Contribuidor:'
-        agreed: Você aceitou os novos Termos do Contribuidor.
-        not yet agreed: Você não aceitou os novos Termos do Contribuidor.
+        heading: 'Termos do contribuidor:'
+        agreed: Você aceitou os novos termos do contribuidor.
+        not yet agreed: Você não aceitou os novos termos do contribuidor.
        review link text: Por favor siga este link quando você puder para revisar
          e aceitar os novos Termos de Contribuição.
        agreed_with_pd: Você também declara que considera suas edições em Domínio
          Público.
        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
        link text: o que é isso?
-      profile description: 'Descrição do Perfil:'
-      preferred languages: 'Idiomas Preferidos:'
+      profile description: 'Descrição do perfil:'
+      preferred languages: 'Idiomas preferidos:'
      preferred editor: 'Editor Preferido:'
      image: 'Imagem:'
      gravatar:
@ -2323,7 +2323,7 @@ pt-BR:
      delete image: Remover a imagem atual
      replace image: Trocar a imagem atual
      image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor)
-      home location: 'Local Principal:'
+      home location: 'Local principal:'
      no home location: Você ainda não definiu o seu local principal.
      latitude: 'Latitude:'
      longitude: 'Longitude:'
@ -2494,14 +2494,27 @@ pt-BR:
      confirm: Deseja realmente retirar esse bloqueio?
      revoke: Cancelar!
      flash: Esse bloqueio foi retirado.
-    period:
-      one: uma hora
-      other: '%{count} horas'
    helper:
      time_future: 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}
+      block_duration:
+        hours:
+          one: uma hora
+          other: '%{count} horas'
+        days:
+          one: 1 dia
+          other: '%{count} dias'
+        weeks:
+          one: 1 semana
+          other: '%{count} semanas'
+        months:
+          one: 1 mês
+          other: '%{count} meses'
+        years:
+          one: 1 ano
+          other: '%{count} anos'
    blocks_on:
      title: Bloqueios em %{name}
      heading: Lista de bloqueios em %{name}
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@ -2459,15 +2459,16 @@ pt-PT:
      confirm: Tem a certeza que quer revocar este bloqueio?
      revoke: Revogar!
      flash: Este bloqueio foi revogado.
-    period:
-      one: 1 hora
-      other: '%{count} horas'
    helper:
      time_future: Termina em %{time}.
      until_login: Ativo até o utilizador entrar na conta.
      time_future_and_until_login: Termina em %{time} e após o utilizador entrar na
        conta.
      time_past: Terminou há %{time} atrás.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
    blocks_on:
      title: Bloqueios em %{name}
      heading: Lista de bloqueios em %{name}
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -25,6 +25,7 @@ ro:
    submit:
      diary_entry:
        create: Publică
+        update: Actualizează
  activerecord:
    errors:
      messages:
@ -333,7 +334,7 @@ ro:
      older_entries: Înregistrări mai vechi
      newer_entries: Înregistrări mai noi
    edit:
-      title: Editare înregistrare din jurnal
+      title: Modifică înregistrare jurnal
      marker_text: Poziția înregistrării din jurnal
    show:
      title: Jurnalul utilizatorului %{user} | %{title}
@ -1123,6 +1124,7 @@ ro:
    partners_ucl: UCL
    partners_bytemark: Găzduire Bytemark
    partners_partners: parteneri
+    tou: Termeni de Utilizare
    osm_offline: Baza de date OpenStreetMap este în prezent offline, în timp ce se
      efectuează lucrări esențiale de întreținere a bazelor de date.
    osm_read_only: Baza de date OpenStreetMap este în prezent în modul read-only,
@ -1362,13 +1364,15 @@ ro:
        Drepturi de autor și Pagina de licență</a> pentru detalii.'
      legal_title: Legal
      legal_html: |-
-        Acest site și multe alte servicii conexe sunt operate în mod oficial de către <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) în numele comunității. Utilizarea tuturor serviciilor operate de OSMF este supusă la <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Politicile de utilizare acceptabile </a> și <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+        Acest site și multe alte servicii conexe sunt operate în mod oficial de <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        în numele comunității. Utilizarea tuturor serviciilor operate de OSMF este supusă <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Termenilor de Utilizare</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        Politicile de Utilizare Acceptabile</a> şi <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Politica de confidenţialitate
+        </a>
        <br>
-        Vă rugăm <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> contactați OSMF </a>
+        Vă rugăm <a href='https://osmfoundation.org/Contact'>contactați OSMF</a>
        dacă aveți licențe, drepturi de autor sau alte întrebări legale.
        <br>
-        OpenStreetMap, sigla lupă și starea hărții sunt <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy"> </a>.
+        OpenStreetMap, sigla lupă și starea hărții sunt <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">mărci comerciale înregistrate ale OSMF</a>.
      partners_title: Parteneri
    copyright:
      foreign:
@ -2138,8 +2142,19 @@ ro:
        Pentru mai multe informații, consultați <a href="%{url}">această pagină wiki</a>.
      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
    terms:
-      title: Termenii colaboratorului
-      heading: Termenii colaboratorului
+      title: Termeni
+      heading: Termeni
+      heading_ct: Termenii contribuitorului
+      read and accept with tou: Citiți acordul contribuitorului și termenii de utilizare,
+        bifați casetele de validare când ați terminat, apoi apăsați butonul Continuă.
+      contributor_terms_explain: |2-
+
+        Acest acord guvernează termenii pentru contribuțiile dvs. existente și viitoare.
+      read_ct: Am citit și sunt de acord cu termenii contribuitorilor de mai sus
+      tou_explain_html: Aceste %{tou_link} guvernează utilizarea site-ului web și
+        a altor infrastructuri furnizate de OSMF. Faceți clic pe link, citiți și agregați
+        textul.
+      read_tou: Am citit și sunt de acord cu Termenii și condițiile
      consider_pd: Pe lângă acordul de mai sus, consider că contribuțiile mele sunt
        în Domeniul Public
      consider_pd_why: Ce este aceasta?
@ -2147,6 +2162,7 @@ ro:
      guidance: 'Informații care vă ajută să înțelegeți acești termeni: un <a href="%{summary}">
        rezumat lizibil pentru oameni</a> și câteva <a href="%{translations}">traduceri
        informale</a>'
+      continue: Continuă
      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      decline: Declină
      you need to accept or decline: Citiți și apoi acceptați sau refuzați continuarea
@ -2467,15 +2483,28 @@ ro:
      confirm: Sigur doriți să revocați această blocare?
      revoke: Revocă!
      flash: Această blocare a fost revocată.
-    period:
-      one: 1 hour
-      other: '%{count} hours'
    helper:
      time_future: 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}.
+      block_duration:
+        hours:
+          one: 1 hour
+          other: '%{count} hours'
+        days:
+          one: 1 day
+          other: '%{count} days'
+        weeks:
+          one: 1 week
+          other: '%{count} weeks'
+        months:
+          one: 1 month
+          other: '%{count} months'
+        years:
+          one: 1 year
+          other: '%{count} years'
    blocks_on:
      title: Blocări pe %{name}
      heading: Lista blocărilor pe %{name}
@ -2575,6 +2604,7 @@ ro:
        title: Straturi
      copyright: © <a href='%{copyright_url}'>contribuitori OpenStreetMap</a>
      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Donează</a>
+      terms: <a href='%{terms_url}' target='_blank'>Website şi API terms</a>
    site:
      edit_tooltip: Modifică harta
      edit_disabled_tooltip: Măriți pentru a edita harta
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -84,6 +84,7 @@ ru:
    submit:
      diary_entry:
        create: Опубликовать
+        update: Обновить
  activerecord:
    errors:
      messages:
@ -393,7 +394,7 @@ ru:
      older_entries: Более старые записи
      newer_entries: Более новые записи
    edit:
-      title: Редактирование записи
+      title: Редактировать запись дневника
      marker_text: Место написания заметки
    show:
      title: Дневник пользователя %{user} | %{title}
@ -2179,6 +2180,13 @@ ru:
    terms:
      title: Условия
      heading: Условия сотрудничества
+      heading_ct: Условия сотрудничества
+      read and accept with tou: Пожалуйста, ознакомьтесь с соглашением для участников
+        и с условиями использования, после чего поставьте оба флажка и нажмите кнопку
+        «Продолжить».
+      contributor_terms_explain: Это соглашение регулирует условия ваших существующего
+        и будущего вклада.
+      read_ct: Я прочитал и согласен с вышеуказанными условиями
      read_tou: Я соглашаюсь с Условиями использования
      consider_pd: В дополнение к вышеизложенному, я принимаю во внимание, что мой
        вклад находится в общественном достоянии
@ -2508,15 +2516,32 @@ ru:
      confirm: Вы уверены, что хотите снять эту блокировку?
      revoke: Снять блокировку!
      flash: Эта блокировка была снята.
-    period:
-      one: 1 час
-      other: '%{count} час.'
    helper:
      time_future: Заканчивается через %{time}.
      until_login: Активно до тех пор, пока пользователь не войдёт в систему.
      time_future_and_until_login: Заканчивается через %{time} и после того, как пользователь
        войдёт в систему.
      time_past: Закончилось %{time} назад.
+      block_duration:
+        hours:
+          one: 1 час
+          other: '%{count} час.'
+        days:
+          one: 1 день
+          few: '%{count} дня'
+          other: '%{count} дней'
+        weeks:
+          one: 1 неделя
+          few: '%{count} недели'
+          other: '%{count} недель'
+        months:
+          one: 1 месяц
+          few: '%{count} месяца'
+          other: '%{count} месяцев'
+        years:
+          one: 1 год
+          few: '%{count} года'
+          other: '%{count} лет'
    blocks_on:
      title: Блокировки для %{name}
      heading: Список блокировок пользователя %{name}
@ -2617,6 +2642,8 @@ ru:
        title: Слои
      copyright: © <a href='%{copyright_url}'>Участники OpenStreetMap</a>
      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Сделать пожертвование</a>
+      terms: <a href='%{terms_url}' target='_blank'>Условия использования сайта и
+        API</a>
    site:
      edit_tooltip: Править карту
      edit_disabled_tooltip: Увеличить масштаб для редактирования карты
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@ -2167,13 +2167,14 @@ scn:
      confirm: Sî sicuru chi voi arrivucari stu bloccu?
      revoke: Rèvuca!
      flash: Stu bloccu fu arrivucatu.
-    period:
-      one: 1 ura
-      other: '%{count} uri'
    helper:
      time_future: Finisci tra %{time}
      until_login: Attivatu nfina a quannu l'utenti trasi.
      time_past: Finìu %{time} fa.
+      block_duration:
+        hours:
+          one: 1 ura
+          other: '%{count} uri'
    blocks_on:
      title: Blocchi di %{name}
      heading: Elencu dî blocchi contra a %{name}
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -1954,14 +1954,15 @@ sk:
      confirm: Ste si istí, že chcete zrušiť tento blok?
      revoke: Zrušiť!
      flash: Tento blok bol zrušený.
-    period:
-      few: '%{count} hodiny'
-      one: 1 hodina
-      other: '%{count} hodín'
    helper:
      time_future: Končí o %{time}.
      until_login: Aktívny až do prihlásenia používateľa.
      time_past: Ukončené pred %{time}.
+      block_duration:
+        hours:
+          few: '%{count} hodiny'
+          one: 1 hodina
+          other: '%{count} hodín'
    blocks_on:
      title: Bloky používateľa %{name}
      heading: Zoznam blokov používateľa %{name}
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@ -2108,16 +2108,17 @@ sl:
      confirm: Ali ste prepričani, da želite preklicati blokado?
      revoke: Prekliči!
      flash: Ta blokada je bila preklicana.
-    period:
-      few: '%{count} ure'
-      one: 1 ura
-      two: '%{count} uri'
-      other: '%{count} ur'
    helper:
      time_future: 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.
+      block_duration:
+        hours:
+          few: '%{count} ure'
+          one: 1 ura
+          two: '%{count} uri'
+          other: '%{count} ur'
    blocks_on:
      title: Blokade uporabnika %{name}
      heading: Seznam blokad uporabnika %{name}
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@ -1605,13 +1605,14 @@ sr-Latn:
      confirm: Želite li da opozovete ovu blokadu?
      revoke: Opozovi
      flash: Ova blokada je opozvana.
-    period:
-      one: 1 sat
-      other: '%{count} sata'
    helper:
      time_future: Završava se u %{time}.
      until_login: Aktivno sve dok se korisnik ne prijavi.
      time_past: Završeno pre %{time}.
+      block_duration:
+        hours:
+          one: 1 sat
+          other: '%{count} sata'
    blocks_on:
      title: Blokade za %{name}
      heading: Spisak blokada za %{name}
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@ -2313,14 +2313,15 @@ sr:
      confirm: Желите ли да опозовете ову блокаду?
      revoke: Опозови
      flash: Ова блокада је опозвана.
-    period:
-      one: 1 сат
-      other: '%{count} сата'
    helper:
      time_future: Завршава се у %{time}.
      until_login: Активно све док се корисник не пријави.
      time_future_and_until_login: Завршава у %{time} и након што се корисник пријави.
      time_past: Завршено пре %{time}.
+      block_duration:
+        hours:
+          one: 1 сат
+          other: '%{count} сата'
    blocks_on:
      title: Блокаде за %{name}
      heading: Листа блокада за %{name}
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -2462,15 +2462,16 @@ sv:
      confirm: Är du säker på att du vill återkalla denna blockering?
      revoke: Upphäv!
      flash: Denna blockering har upphävts.
-    period:
-      one: 1 timme
-      other: '%{count} timmar'
    helper:
      time_future: 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} sedan.
+      block_duration:
+        hours:
+          one: 1 timme
+          other: '%{count} timmar'
    blocks_on:
      title: Blockeringar på %{name}
      heading: Lista över blockeringar på %{name}
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@ -835,12 +835,13 @@ te:
      heading: వాడుకరి నిరోధాల జాబితా
    revoke:
      confirm: మీరు నిజంగానే ఈ నిరోధాన్ని ఎత్తివేయాలనుకుంటున్నారా?
-    period:
-      one: 1 గంట
-      other: '%{count} గంటలు'
    helper:
      time_future: '%{time}లో ముగుస్తుంది.'
      time_past: '%{time} క్రితం ముగిసింది.'
+      block_duration:
+        hours:
+          one: 1 గంట
+          other: '%{count} గంటలు'
    blocks_on:
      title: '%{name} పై నిరోధాలు'
      heading: '%{name}పై ఉన్న నిరోధాల జాబితా'
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@ -1915,13 +1915,14 @@ tl:
      confirm: Nakatitiyak ka bang nais mong bawiin ang hadlang na ito?
      revoke: Bawiin!
      flash: Nabawi na ang hadlang na ito.
-    period:
-      one: 1 oras
-      other: '%{count} mga oras'
    helper:
      time_future: Magwawakas sa %{time}.
      until_login: Masigla hanggang sa paglagda ng tagagamit.
      time_past: Nagwakas na noong %{time} na ang nakalilipas.
+      block_duration:
+        hours:
+          one: 1 oras
+          other: '%{count} mga oras'
    blocks_on:
      title: Mga paghadlang sa %{name}
      heading: Tala ng mga paghadlang sa %{name}
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -2498,14 +2498,15 @@ tr:
      confirm: Bu engeli kaldırmak istediğine emin misin?
      revoke: İptal!
      flash: Bu engelleme iptal edildi.
-    period:
-      one: 1 saat
-      other: '%{count} saat'
    helper:
      time_future: '%{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} önce bitti.'
+      block_duration:
+        hours:
+          one: 1 saat
+          other: '%{count} saat'
    blocks_on:
      title: '%{name} kişisinin engelleri'
      heading: '%{name} hakkında engelleme kayıtları'
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@ -2241,16 +2241,17 @@ uk:
      confirm: Ви впевнені, що бажаєте зняти це блокування?
      revoke: Зняти блокування!
      flash: Це блокування було знято.
-    period:
-      few: '%{count} години'
-      one: '%{count} година'
-      other: '%{count} годин'
    helper:
      time_future: До закінчення %{time}.
      until_login: Активне до тих пір, доки користувач не увійде в систему.
      time_future_and_until_login: Закінчується через %{time} і після входу користувача
        в систему.
      time_past: Закінчилось %{time} тому.
+      block_duration:
+        hours:
+          few: '%{count} години'
+          one: '%{count} година'
+          other: '%{count} годин'
    blocks_on:
      title: Блокування для %{name}
      heading: Перелік блокувань користувача %{name}
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -2388,12 +2388,13 @@ vi:
      confirm: Bạn có chắc muốn bỏ cấm người này?
      revoke: Bỏ cấm!
      flash: Đã bỏ cấm.
-    period: '%{count} giờ'
    helper:
      time_future: 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 cách đây %{time}.
+      block_duration:
+        hours: '%{count} giờ'
    blocks_on:
      title: Các tác vụ cấm %{name}
      heading: Danh sách tác vụ cấm %{name}
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@ -2227,14 +2227,15 @@ zh-CN:
      confirm: 您确定要撤销该封禁？
      revoke: 撤销！
      flash: 该封禁已经被撤销。
-    period:
-      one: 1 小时
-      other: '%{count} 小时'
    helper:
      time_future: 结束于 %{time}。
      until_login: 用户登录时激活。
      time_future_and_until_login: 结束于%{time}，并在用户登录之后。
      time_past: 结束于 %{time} 前。
+      block_duration:
+        hours:
+          one: 1 小时
+          other: '%{count} 小时'
    blocks_on:
      title: 对 %{name} 的封禁
      heading: 对 %{name} 的封禁列表
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -2248,14 +2248,27 @@ zh-TW:
      confirm: 你確定要撤銷這項封鎖？
      revoke: 撤銷！
      flash: 這項封鎖已被撤銷。
-    period:
-      one: 1 小時
-      other: '%{count} 小時'
    helper:
      time_future: 於 %{time} 結束。
      until_login: 生效直至這個使用者登入為止。
      time_future_and_until_login: 在用戶已登入後結束於%{time}。
      time_past: 於 %{time} 之前結束。
+      block_duration:
+        hours:
+          one: 1 小時
+          other: '%{count} 小時'
+        days:
+          one: 1 日
+          other: '%{count} 日'
+        weeks:
+          one: 1 週
+          other: '%{count} 週'
+        months:
+          one: 1 個月
+          other: '%{count} 個月'
+        years:
+          one: 1 年
+          other: '%{count} 年'
    blocks_on:
      title: 對 %{name} 的封鎖
      heading: 對 %{name} 封鎖的清單