Localisation updates from https://translatewiki.net.

diff --git a/config/locales/af.yml b/config/locales/af.yml
index b22687d8aca240a87c4c5460f6888ee6f8015dfd..2e7941ada07c280fe3cc8bc11a9d066dfd205133 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -923,7 +923,7 @@ af:
     forums:
       title: Forums
     wiki:
     forums:
       title: Forums
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
   about_page:
     next: Volgende
       title: wiki.openstreetmap.org
   about_page:
     next: Volgende


@@ -1054,7 +1054,7 @@ af:
       get_directions_title: Kry rigtingaanwysings tussen twee punte
       from: Vanaf
       to: Na
       get_directions_title: Kry rigtingaanwysings tussen twee punte
       from: Vanaf
       to: Na

-      where_am_i: Waar bevind ek my?
+      where_am_i: Waar is ek tans?

       submit_text: Soek
     key:
       table:
       submit_text: Soek
     key:
       table:


@@ -1504,19 +1504,6 @@ af:
     period:
       one: 1 uur
       other: '%{count} ure'
     period:
       one: 1 uur
       other: '%{count} ure'

-    partial:
-      show: Wys
-      edit: Redigeer
-      revoke: Herroep!
-      confirm: Is u seker?
-      display_name: Versperde gebruiker
-      creator_name: Skepper
-      reason: Rede vir die versperring
-      status: Status
-      revoker_name: Herroep deur
-      not_revoked: (nie herroep nie)
-      next: Volgende »
-      previous: « Vorige

     helper:
       time_future: Tyd oor %{time} verstreke.
       until_login: Aktief totdat die gebruiker aanmeld.
     helper:
       time_future: Tyd oor %{time} verstreke.
       until_login: Aktief totdat die gebruiker aanmeld.


@@ -1544,6 +1531,20 @@ af:
       revoker: 'Herroep deur:'
       needs_view: Die gebruiker moet aanmeld alvorens hierdie versperring verwyder
         sal word.
       revoker: 'Herroep deur:'
       needs_view: Die gebruiker moet aanmeld alvorens hierdie versperring verwyder
         sal word.

+  user_blocks:
+    block:
+      not_revoked: (nie herroep nie)
+      show: Wys
+      edit: Redigeer
+      revoke: Herroep!
+    blocks:
+      display_name: Versperde gebruiker
+      creator_name: Skepper
+      reason: Rede vir die versperring
+      status: Status
+      revoker_name: Herroep deur
+      next: Volgende »
+      previous: « Vorige

   javascripts:
     share:
       title: Deel
   javascripts:
     share:
       title: Deel

diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 9d0a205bf1c95999d79488b29144369f5798209c..9bbc2bde946167d2ffc812ab046ac5b97fa167cb 100644 (file)
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -1404,17 +1404,6 @@ aln:
     period:
       one: 1 orë
       other: '%{count} orë'
     period:
       one: 1 orë
       other: '%{count} orë'

-    partial:
-      show: Tregoj
-      edit: Redaktoj
-      revoke: Tërheq!
-      confirm: A jeni i sigurt?
-      display_name: Përdoruesi Blocked
-      creator_name: Krijuesi
-      reason: Arsyeja për bllok
-      status: Statusi
-      revoker_name: Revokuar nga ana
-      not_revoked: (Jo revokuar)

     helper:
       time_future: Përfundon në %{time}.
       until_login: Aktiv deri kur përdoruesi shkrimet in
     helper:
       time_future: Përfundon në %{time}.
       until_login: Aktiv deri kur përdoruesi shkrimet in


@@ -1441,6 +1430,18 @@ aln:
       back: Shiko të gjitha blloqet
       revoker: 'Revoker:'
       needs_view: Shfrytëzuesi duhet të hyj para se të fshihet ky bllok.
       back: Shiko të gjitha blloqet
       revoker: 'Revoker:'
       needs_view: Shfrytëzuesi duhet të hyj para se të fshihet ky bllok.

+  user_blocks:
+    block:
+      not_revoked: (Jo revokuar)
+      show: Tregoj
+      edit: Redaktoj
+      revoke: Tërheq!
+    blocks:
+      display_name: Përdoruesi Blocked
+      creator_name: Krijuesi
+      reason: Arsyeja për bllok
+      status: Statusi
+      revoker_name: Revokuar nga ana

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9cda6b9ea2378d2e4fe7f2c395a075999d1a6d7f..86636cd431f51ecaf9592b5dd458fab3641df97a 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1975,20 +1975,6 @@ ar:
       one: ساعة واحد
       two: ساعتين
       other: '%{count} ساعة'
       one: ساعة واحد
       two: ساعتين
       other: '%{count} ساعة'

-    partial:
-      show: اعرض
-      edit: تعديل
-      revoke: ابطل!
-      confirm: هل أنت متأكد؟
-      display_name: مستخدم مُعرقل
-      creator_name: المنشئ
-      reason: السبب العرقلة
-      status: الحالة
-      revoker_name: مُبطل بواسطة
-      not_revoked: (لم تلغ)
-      showing_page: الصفحة %{page}
-      next: التالي »
-      previous: « السابق

     helper:
       time_future: ينتهي في %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
     helper:
       time_future: ينتهي في %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.


@@ -2017,6 +2003,21 @@ ar:
       back: اعرض كل العرقلات
       revoker: 'المبطل:'
       needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقلة.
       back: اعرض كل العرقلات
       revoker: 'المبطل:'
       needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقلة.

+  user_blocks:
+    block:
+      not_revoked: (لم تلغ)
+      show: اعرض
+      edit: تعديل
+      revoke: ابطل!
+    blocks:
+      display_name: مستخدم مُعرقل
+      creator_name: المنشئ
+      reason: السبب العرقلة
+      status: الحالة
+      revoker_name: مُبطل بواسطة
+      showing_page: الصفحة %{page}
+      next: التالي »
+      previous: « السابق

   note:
     description:
       opened_at_html: تم الإنشاء قبل %{when}
   note:
     description:
       opened_at_html: تم الإنشاء قبل %{when}

diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 31c9dd8743b01cb60a444aead3a2518be34db3d1..2cd91655239b09e35f00cb3cb19b8dd58e1c0021 100644 (file)
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -1160,17 +1160,6 @@ arz:
       one: ساعه واحد
       two: ساعتين
       other: '%{count} ساعة'
       one: ساعه واحد
       two: ساعتين
       other: '%{count} ساعة'

-    partial:
-      show: اعرض
-      edit: عدّل
-      revoke: ابطل!
-      confirm: هل أنت متأكد؟
-      display_name: مستخدم معرقل
-      creator_name: المنشئ
-      reason: السبب للعرقلة
-      status: الحالة
-      revoker_name: مُبطل بواسطة
-      not_revoked: (لم تلغ)

     helper:
       time_future: ينتهى فى %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.
     helper:
       time_future: ينتهى فى %{time}.
       until_login: نشط حتى يقوم المستخدم بتسجيل الدخول.


@@ -1197,6 +1186,18 @@ arz:
       back: اعرض كل العرقلات
       revoker: 'المبطل:'
       needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقله.
       back: اعرض كل العرقلات
       revoker: 'المبطل:'
       needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقله.

+  user_blocks:
+    block:
+      not_revoked: (لم تلغ)
+      show: اعرض
+      edit: عدّل
+      revoke: ابطل!
+    blocks:
+      display_name: مستخدم معرقل
+      creator_name: المنشئ
+      reason: السبب للعرقلة
+      status: الحالة
+      revoker_name: مُبطل بواسطة

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 369ebbe28b8732321412a5e6ffed857012aabfd7..71b662d8023e6b50254933dabe9b846051e27bf6 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -2246,20 +2246,6 @@ ast:
     period:
       one: 1 hora
       other: '%{count} hores'
     period:
       one: 1 hora
       other: '%{count} hores'

-    partial:
-      show: Amosar
-      edit: Editar
-      revoke: ¡Desaniciar!
-      confirm: ¿Tas seguru?
-      display_name: Usuariu bloquiáu
-      creator_name: Creador
-      reason: Motivu del bloquéu
-      status: Estáu
-      revoker_name: Desaniciáu por
-      not_revoked: (non desaniciáu)
-      showing_page: Páxina %{page}
-      next: Siguiente »
-      previous: « Anterior

     helper:
       time_future: Fina en %{time}.
       until_login: Activu fasta que'l usuariu anicie sesión.
     helper:
       time_future: Fina en %{time}.
       until_login: Activu fasta que'l usuariu anicie sesión.


@@ -2290,6 +2276,21 @@ ast:
       back: Ver tolos bloqueos
       revoker: 'Desaniciador:'
       needs_view: L'usuariu tien de coneutase enantes de que se desanicie esti bloquéu.
       back: Ver tolos bloqueos
       revoker: 'Desaniciador:'
       needs_view: L'usuariu tien de coneutase enantes de que se desanicie esti bloquéu.

+  user_blocks:
+    block:
+      not_revoked: (non desaniciáu)
+      show: Amosar
+      edit: Editar
+      revoke: ¡Desaniciar!
+    blocks:
+      display_name: Usuariu bloquiáu
+      creator_name: Creador
+      reason: Motivu del bloquéu
+      status: Estáu
+      revoker_name: Desaniciáu por
+      showing_page: Páxina %{page}
+      next: Siguiente »
+      previous: « Anterior

   note:
     description:
       opened_at_html: Creada hai %{when}
   note:
     description:
       opened_at_html: Creada hai %{when}

diff --git a/config/locales/az.yml b/config/locales/az.yml
index ff08ac7d0e576c95187d4d0d56a1816e0a63f812..1074b68b2476a29b27965d22da8a4aa768ff79b2 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1093,19 +1093,6 @@ az:
         edilib'
       revoke: Ləğv et!
       flash: Bu blok ləğv edilib.
         edilib'
       revoke: Ləğv et!
       flash: Bu blok ləğv edilib.

-    partial:
-      show: Göstər
-      edit: Redaktə et
-      revoke: Ləğv et!
-      confirm: Əminsinizmi?
-      display_name: Bloklanmış İstifadəçilər
-      creator_name: Yaradıcı
-      reason: Bloklanma səbəbi
-      status: Status
-      revoker_name: Tərəfindən ləgv edilib
-      not_revoked: (ləgv edilməyib)
-      next: Növbəti »
-      previous: « Əvvəlki

     helper:
       time_past: '%{time} əvvəl sona çatıb.'
     blocks_by:
     helper:
       time_past: '%{time} əvvəl sona çatıb.'
     blocks_by:


@@ -1116,6 +1103,20 @@ az:
       status: Status
       show: 'Göstər:'
       revoke: Ləğv et!
       status: Status
       show: 'Göstər:'
       revoke: Ləğv et!

+  user_blocks:
+    block:
+      not_revoked: (ləgv edilməyib)
+      show: Göstər
+      edit: Redaktə et
+      revoke: Ləğv et!
+    blocks:
+      display_name: Bloklanmış İstifadəçilər
+      creator_name: Yaradıcı
+      reason: Bloklanma səbəbi
+      status: Status
+      revoker_name: Tərəfindən ləgv edilib
+      next: Növbəti »
+      previous: « Əvvəlki

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index a79905fa7b1dbdf02a49bb6d6b2a3748d40a776a..4b256f5054731ed700ce3e7a7e7c96b3bc2f6dc1 100644 (file)
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -175,7 +175,7 @@ be-Tarask:
     list:
       title: Наборы зьменаў
       title_user: Набор зьменаў %{user}
     list:
       title: Наборы зьменаў
       title_user: Набор зьменаў %{user}

-      title_friend: Ð\9dабоÑ\80Ñ\8b зÑ\8cменаÑ\9e Ð\92аÑ\88Ñ\8bх сяброў
+      title_friend: Ð\9dабоÑ\80Ñ\8b зÑ\8cменаÑ\9e маÑ\96х сяброў

       title_nearby: Наборы зьменаў для суседніх удзельнікаў
     timeout:
       sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для
       title_nearby: Наборы зьменаў для суседніх удзельнікаў
     timeout:
       sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для


@@ -1576,17 +1576,6 @@ be-Tarask:
       one: '%{count} гадзіна'
       few: '%{count} гадзіны'
       other: '%{count} гадзінаў'
       one: '%{count} гадзіна'
       few: '%{count} гадзіны'
       other: '%{count} гадзінаў'

-    partial:
-      show: Паказаць
-      edit: Рэдагаваць
-      revoke: Адклікаць!
-      confirm: Вы ўпэўнены?
-      display_name: Заблякаваны ўдзельнік
-      creator_name: Стваральнік
-      reason: Прычына блякаваньня
-      status: Статус
-      revoker_name: Адкліканае
-      not_revoked: (не адкліканае)

     helper:
       time_future: Канчаецца ў %{time}.
       until_login: Актыўнае да моманту ўваходу ўдзельніка ў сыстэму.
     helper:
       time_future: Канчаецца ў %{time}.
       until_login: Актыўнае да моманту ўваходу ўдзельніка ў сыстэму.


@@ -1614,6 +1603,18 @@ be-Tarask:
       revoker: 'Адклікаўшы:'
       needs_view: Удзельніку трэба ўвайсьці ў сыстэму, перад тым як гэтае блякаваньне
         будзе зьнятае.
       revoker: 'Адклікаўшы:'
       needs_view: Удзельніку трэба ўвайсьці ў сыстэму, перад тым як гэтае блякаваньне
         будзе зьнятае.

+  user_blocks:
+    block:
+      not_revoked: (не адкліканае)
+      show: Паказаць
+      edit: Рэдагаваць
+      revoke: Адклікаць!
+    blocks:
+      display_name: Заблякаваны ўдзельнік
+      creator_name: Стваральнік
+      reason: Прычына блякаваньня
+      status: Статус
+      revoker_name: Адкліканае

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 74e26393bb552c7bb957bbc7919aaa2324db3d84..550031ea8a523cc21669d95a2df92b9f8d04dd81 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -2170,20 +2170,6 @@ be:
     period:
       one: 1 гадзіна
       other: '%{count} гадзін'
     period:
       one: 1 гадзіна
       other: '%{count} гадзін'

-    partial:
-      show: Паказаць
-      edit: Рэдагаваць
-      revoke: Адазваць!
-      confirm: Вы ўпэўненыя?
-      display_name: Заблакаваны карыстальнік
-      creator_name: Стваральнік
-      reason: Прычына блакіроўкі
-      status: Статус
-      revoker_name: Адкліканы
-      not_revoked: (не адкліканы)
-      showing_page: Старонка %{page}
-      next: Далей »
-      previous: « Назад

     helper:
       time_future: Заканчваецца праз %{time}.
       until_login: Актыўная да моманту ўваходу ўдзельніка ў сістэму.
     helper:
       time_future: Заканчваецца праз %{time}.
       until_login: Актыўная да моманту ўваходу ўдзельніка ў сістэму.


@@ -2215,6 +2201,21 @@ be:
       revoker: 'Адклікаўшы:'
       needs_view: Удзельніку трэба ўвайсці ў сістэму, перад тым як гэтая блакіроўка
         будзе знята.
       revoker: 'Адклікаўшы:'
       needs_view: Удзельніку трэба ўвайсці ў сістэму, перад тым як гэтая блакіроўка
         будзе знята.

+  user_blocks:
+    block:
+      not_revoked: (не адкліканы)
+      show: Паказаць
+      edit: Рэдагаваць
+      revoke: Адазваць!
+    blocks:
+      display_name: Заблакаваны карыстальнік
+      creator_name: Стваральнік
+      reason: Прычына блакіроўкі
+      status: Статус
+      revoker_name: Адкліканы
+      showing_page: Старонка %{page}
+      next: Далей »
+      previous: « Назад

   note:
     description:
       opened_at_html: Створана %{when} таму
   note:
     description:
       opened_at_html: Створана %{when} таму

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5ebf2d1873b480026230501c827ce6cd1763681a..77d8c5d4561ec8ea18d6030692d326f684b9f3ae 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1216,16 +1216,18 @@ bg:
     revoke:
       confirm: Потвърждаване
   user_block:
     revoke:
       confirm: Потвърждаване
   user_block:

-    partial:
+    show:
+      ago: преди %{time}
+      edit: Редактиране
+  user_blocks:
+    block:

       edit: Редактиране
       edit: Редактиране

+    blocks:

       display_name: Блокиран потребител
       creator_name: Създател
       reason: Причина за блокиране
       status: Статут
       showing_page: Страница %{page}
       display_name: Блокиран потребител
       creator_name: Създател
       reason: Причина за блокиране
       status: Статут
       showing_page: Страница %{page}

-    show:
-      ago: преди %{time}
-      edit: Редактиране

   note:
     rss:
       closed: закрита бележка (около %{place})
   note:
     rss:
       closed: закрита бележка (около %{place})

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index e81db809fe00c7c335b5c21ef115d00970f35766..3736d0bba32bc4d432e2c11e1b3bee959a46c4a4 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -1317,12 +1317,6 @@ bn:
       fail: '`%{name}'' ব্যবহারকারীর `%{role}'' দায়িত্বটি বাতিল অযোগ্য। দয়া করে
         দেখুন যে এই ব্যবহারকারী এবং দায়িত্বটি সঠিক কিনা।'
   user_block:
       fail: '`%{name}'' ব্যবহারকারীর `%{role}'' দায়িত্বটি বাতিল অযোগ্য। দয়া করে
         দেখুন যে এই ব্যবহারকারী এবং দায়িত্বটি সঠিক কিনা।'
   user_block:

-    partial:
-      edit: সম্পাদনা
-      confirm: আপনি কি নিশ্চিত?
-      display_name: বাধাপ্রাপ্ত ব্যবহারকারী
-      next: পরবর্তী »
-      previous: « পূর্ববর্তী

     show:
       created: তৈরি হয়েছে
       ago: '%{time} আগে'
     show:
       created: তৈরি হয়েছে
       ago: '%{time} আগে'


@@ -1330,6 +1324,13 @@ bn:
       show: দেখাও
       edit: সম্পাদনা
       confirm: আপনি কি নিশ্চিত?
       show: দেখাও
       edit: সম্পাদনা
       confirm: আপনি কি নিশ্চিত?

+  user_blocks:
+    block:
+      edit: সম্পাদনা
+    blocks:
+      display_name: বাধাপ্রাপ্ত ব্যবহারকারী
+      next: পরবর্তী »
+      previous: « পূর্ববর্তী

   note:
     entry:
       comment: মন্তব্য
   note:
     entry:
       comment: মন্তব্য

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 11dab591999d466648c7d8432406f8d902f031d1..0072f2212e7bf6753ddc8f502359515339a995ae 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2270,20 +2270,6 @@ br:
     period:
       one: 1 eurvezh
       other: '%{count} eurvezh'
     period:
       one: 1 eurvezh
       other: '%{count} eurvezh'

-    partial:
-      show: Diskouez
-      edit: Aozañ
-      revoke: Disteuler !
-      confirm: Ha sur oc'h ?
-      display_name: Implijer stanket
-      creator_name: Krouer
-      reason: Abeg evit stankañ
-      status: Statud
-      revoker_name: Torret gant
-      not_revoked: (n'eo ket torret)
-      showing_page: Page %{page}
-      next: ↓War-lerc'h »
-      previous: ↓« Kent

     helper:
       time_future: Echuiñ a ray a-benn %{time}.
       until_login: Oberiant betek ma kevre an implijer.
     helper:
       time_future: Echuiñ a ray a-benn %{time}.
       until_login: Oberiant betek ma kevre an implijer.


@@ -2314,6 +2300,21 @@ br:
       back: Gwelet an holl stankadurioù
       revoker: 'Torrer :'
       needs_view: Ret eo d'an implijer kevreañ a-raok ma vefe diverket ar stankadur-mañ.
       back: Gwelet an holl stankadurioù
       revoker: 'Torrer :'
       needs_view: Ret eo d'an implijer kevreañ a-raok ma vefe diverket ar stankadur-mañ.

+  user_blocks:
+    block:
+      not_revoked: (n'eo ket torret)
+      show: Diskouez
+      edit: Aozañ
+      revoke: Disteuler !
+    blocks:
+      display_name: Implijer stanket
+      creator_name: Krouer
+      reason: Abeg evit stankañ
+      status: Statud
+      revoker_name: Torret gant
+      showing_page: Page %{page}
+      next: ↓War-lerc'h »
+      previous: ↓« Kent

   note:
     description:
       opened_at_html: Bet krouet %{when} zo
   note:
     description:
       opened_at_html: Bet krouet %{when} zo

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index b10c2e59f810629c95d724dff384c3b6e9011bba..eacf37bcc0152583d844224e14baf186248090fd 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1804,20 +1804,6 @@ bs:
     period:
       one: 1 sat
       other: '%{count} sata/i'
     period:
       one: 1 sat
       other: '%{count} sata/i'

-    partial:
-      show: Pokazati
-      edit: Urediti
-      revoke: Opozvati!
-      confirm: Da li ste sigurni?
-      display_name: Blokirani korisnik
-      creator_name: Kreator
-      reason: Razlog za blokadu
-      status: Stanje
-      revoker_name: Opozvano od strane
-      not_revoked: (nije opozvano)
-      showing_page: Stranica %{page}
-      next: Sljedeća »
-      previous: « Prethodna

     helper:
       time_future: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.
     helper:
       time_future: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.


@@ -1846,6 +1832,21 @@ bs:
       back: Pogledati sve blokade
       revoker: 'Opozivalac:'
       needs_view: Korisnik se mora prijaviti prije nego se blokada očisti.
       back: Pogledati sve blokade
       revoker: 'Opozivalac:'
       needs_view: Korisnik se mora prijaviti prije nego se blokada očisti.

+  user_blocks:
+    block:
+      not_revoked: (nije opozvano)
+      show: Pokazati
+      edit: Urediti
+      revoke: Opozvati!
+    blocks:
+      display_name: Blokirani korisnik
+      creator_name: Kreator
+      reason: Razlog za blokadu
+      status: Stanje
+      revoker_name: Opozvano od strane
+      showing_page: Stranica %{page}
+      next: Sljedeća »
+      previous: « Prethodna

   note:
     description:
       opened_at_html: Kreirano prije %{when}
   note:
     description:
       opened_at_html: Kreirano prije %{when}

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0c087b4c3cb2445f3a8a274f055a0864b7762bda..4a32f5f7f2078743ef7acd37fe2d5a62bdf6ba68 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -2225,20 +2225,6 @@ ca:
     period:
       one: 1 hora
       other: '%{count} hores'
     period:
       one: 1 hora
       other: '%{count} hores'

-    partial:
-      show: Mostra
-      edit: Modifica
-      revoke: Revoca!
-      confirm: N'esteu segur?
-      display_name: S'ha blocat l'usuari
-      creator_name: Creador
-      reason: Motiu del blocatge
-      status: Estat
-      revoker_name: Revocat per
-      not_revoked: (no revocat)
-      showing_page: Pàgina %{page}
-      next: Endavant »
-      previous: « Enrere

     helper:
       time_future: Finalitza en %{time}.
       until_login: Activa fins que l'usuari es connecta.
     helper:
       time_future: Finalitza en %{time}.
       until_login: Activa fins que l'usuari es connecta.


@@ -2267,6 +2253,21 @@ ca:
       back: Mostra tots els blocs
       revoker: 'Revoker:'
       needs_view: L'usuari ha d'iniciar una sessió abans que es netegi el bloc.
       back: Mostra tots els blocs
       revoker: 'Revoker:'
       needs_view: L'usuari ha d'iniciar una sessió abans que es netegi el bloc.

+  user_blocks:
+    block:
+      not_revoked: (no revocat)
+      show: Mostra
+      edit: Modifica
+      revoke: Revoca!
+    blocks:
+      display_name: S'ha blocat l'usuari
+      creator_name: Creador
+      reason: Motiu del blocatge
+      status: Estat
+      revoker_name: Revocat per
+      showing_page: Pàgina %{page}
+      next: Endavant »
+      previous: « Enrere

   note:
     description:
       opened_at_html: Creat fa %{when}
   note:
     description:
       opened_at_html: Creat fa %{when}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f6e348057946705f57f317bf9e5a9f99eb7b1cf7..b2f46a25159997a54a37a4bea0dfb7e230922ad9 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2263,20 +2263,6 @@ cs:
     period:
       one: 1 hodina
       other: '%{count} hodiny'
     period:
       one: 1 hodina
       other: '%{count} hodiny'

-    partial:
-      show: Zobrazit
-      edit: Upravit
-      revoke: Zrušit !
-      confirm: Jste si jistý?
-      display_name: Zablokovaný uživatel
-      creator_name: Autor
-      reason: Důvod pro blok
-      status: Stav
-      revoker_name: Zrušil
-      not_revoked: (nezrušeno)
-      showing_page: Stránka %{page}
-      next: Následující »
-      previous: « Předchozí

     helper:
       time_future: Končí za %{time}.
       until_login: Aktivní dokud se uživatel nepřihlásí.
     helper:
       time_future: Končí za %{time}.
       until_login: Aktivní dokud se uživatel nepřihlásí.


@@ -2306,6 +2292,21 @@ cs:
       back: Zobrazit všechny bloky
       revoker: 'Zrušil:'
       needs_view: Aby se blok smazal, uživatel se musí nejprve přihlásit.
       back: Zobrazit všechny bloky
       revoker: 'Zrušil:'
       needs_view: Aby se blok smazal, uživatel se musí nejprve přihlásit.

+  user_blocks:
+    block:
+      not_revoked: (nezrušeno)
+      show: Zobrazit
+      edit: Upravit
+      revoke: Zrušit !
+    blocks:
+      display_name: Zablokovaný uživatel
+      creator_name: Autor
+      reason: Důvod pro blok
+      status: Stav
+      revoker_name: Zrušil
+      showing_page: Stránka %{page}
+      next: Následující »
+      previous: « Předchozí

   note:
     description:
       opened_at_html: Vytvořeno před %{when}
   note:
     description:
       opened_at_html: Vytvořeno před %{when}


@@ -2436,7 +2437,7 @@ cs:
       distance: Vzdálenost
       errors:
         no_route: Nepodařilo se nalézt trasu mezi zadanými místy.
       distance: Vzdálenost
       errors:
         no_route: Nepodařilo se nalézt trasu mezi zadanými místy.

-        no_place: Omlouváme se - nepodařilo se nám najít „%{place}“.
+        no_place: Omlouváme se – nepodařilo se nám najít „%{place}“.

       instructions:
         continue_without_exit: Pokračujte na %{name}
         slight_right_without_exit: Mírně vpravo na %{name}
       instructions:
         continue_without_exit: Pokračujte na %{name}
         slight_right_without_exit: Mírně vpravo na %{name}


@@ -2456,7 +2457,7 @@ cs:
         onramp_right_with_name_directions: Odbočte vpravo na nájezd na %{name}, směrem
           na %{directions}
         onramp_right_without_directions: Odbočte vpravo na nájezd
         onramp_right_with_name_directions: Odbočte vpravo na nájezd na %{name}, směrem
           na %{directions}
         onramp_right_without_directions: Odbočte vpravo na nájezd

-        onramp_right: Odbočte doprava na rampu
+        onramp_right: Odbočte doprava na nájezd

         endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name}
         merge_right_without_exit: Připojte se vpravo na %{name}
         fork_right_without_exit: Na rozcestí odbočte vpravo na %{name}
         endofroad_right_without_exit: Na konci silnice odbočte vpravo na %{name}
         merge_right_without_exit: Připojte se vpravo na %{name}
         fork_right_without_exit: Na rozcestí odbočte vpravo na %{name}


@@ -2481,7 +2482,7 @@ cs:
         onramp_left_with_name_directions: Odbočte vlevo na nájezd na %{name}, směrem
           na %{directions}
         onramp_left_without_directions: Odbočte vlevo na nájezd
         onramp_left_with_name_directions: Odbočte vlevo na nájezd na %{name}, směrem
           na %{directions}
         onramp_left_without_directions: Odbočte vlevo na nájezd

-        onramp_left: Odbočte vlevo na rampu
+        onramp_left: Odbočte vlevo na nájezd

         endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name}
         merge_left_without_exit: Připojte se vlevo na %{name}
         fork_left_without_exit: Na rozcestí odbočte vlevo na %{name}
         endofroad_left_without_exit: Na konci silnice odbočte vlevo na %{name}
         merge_left_without_exit: Připojte se vlevo na %{name}
         fork_left_without_exit: Na rozcestí odbočte vlevo na %{name}

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index b9971430be3880dbf6aed53ec37a1d396b3a028a..dc0863a7aa5795f8aee315775d3c879513657ea2 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1518,14 +1518,6 @@ cy:
     revoke:
       confirm: Cadarnhau
   user_block:
     revoke:
       confirm: Cadarnhau
   user_block:

-    partial:
-      show: Dangos
-      edit: Golygu
-      confirm: Ydych yn sicr?
-      status: Statws
-      showing_page: Tudalen %{page}
-      next: Nesaf »
-      previous: « Blaenorol

     helper:
       time_future: Yn dod i ben mewn %{time}.
       time_past: Wedi dod i ben %{time} yn ôl.
     helper:
       time_future: Yn dod i ben mewn %{time}.
       time_past: Wedi dod i ben %{time} yn ôl.


@@ -1534,6 +1526,15 @@ cy:
       show: Dangos
       edit: Golygu
       confirm: Ydych yn sicr?
       show: Dangos
       edit: Golygu
       confirm: Ydych yn sicr?

+  user_blocks:
+    block:
+      show: Dangos
+      edit: Golygu
+    blocks:
+      status: Statws
+      showing_page: Tudalen %{page}
+      next: Nesaf »
+      previous: « Blaenorol

   note:
     description:
       commented_at_html: Diweddarwyd %{when} yn ôl
   note:
     description:
       commented_at_html: Diweddarwyd %{when} yn ôl

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 68be02613aad3131651e6b997ecdd0a34baef69c..433bc6017ad1dcc21ab2199a629d9b085478d4d2 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -20,6 +20,7 @@
 # Author: Luckas
 # Author: Macofe
 # Author: Mikini
 # Author: Luckas
 # Author: Macofe
 # Author: Mikini

+# Author: Mjjzf

 # Author: Nemo bis
 # Author: OleLaursen
 # Author: Peter Alberti
 # Author: Nemo bis
 # Author: OleLaursen
 # Author: Peter Alberti


@@ -260,7 +261,7 @@ da:
     list:
       title: Ændringssæt
       title_user: Ændringssæt af %{user}
     list:
       title: Ændringssæt
       title_user: Ændringssæt af %{user}

-      title_friend: Ændringssæt af dine venner
+      title_friend: Ændringssæt af mine venner

       title_nearby: Ændringssæt af brugere i nærheden
       empty: Ingen ændringssæt er fundet.
       empty_area: Ingen ændringssæt i dette område.
       title_nearby: Ændringssæt af brugere i nærheden
       empty: Ingen ændringssæt er fundet.
       empty_area: Ingen ændringssæt i dette område.


@@ -1673,6 +1674,7 @@ da:
     trace_header:
       upload_trace: Upload et spor
       see_all_traces: Vis alle spor
     trace_header:
       upload_trace: Upload et spor
       see_all_traces: Vis alle spor

+      see_my_traces: Se mine spor

       traces_waiting:
         one: Du har allerede et GPS-spor i køen. Overvej at vente på dette før du
           uploader flere spor for ikke at blokere køen for andre brugere.
       traces_waiting:
         one: Du har allerede et GPS-spor i køen. Overvej at vente på dette før du
           uploader flere spor for ikke at blokere køen for andre brugere.


@@ -1699,6 +1701,7 @@ da:
       delete_track: Slet dette spor
       trace_not_found: Spor ikke fundet!
       visibility: 'Synlighed:'
       delete_track: Slet dette spor
       trace_not_found: Spor ikke fundet!
       visibility: 'Synlighed:'

+      confirm_delete: Slet dette spor?

     trace_paging_nav:
       showing_page: Side %{page}
       older: Ældre spor
     trace_paging_nav:
       showing_page: Side %{page}
       older: Ældre spor


@@ -1721,6 +1724,7 @@ da:
       map: kort
     list:
       public_traces: Offentlige GPS-spor
       map: kort
     list:
       public_traces: Offentlige GPS-spor

+      my_traces: Mine GPS-spor

       public_traces_from: Offentlige GPS-spor fra %{user}
       description: Gennemse de seneste GPS-sporingsoverførsler
       tagged_with: ' med egenskaberne %{tags}'
       public_traces_from: Offentlige GPS-spor fra %{user}
       description: Gennemse de seneste GPS-sporingsoverførsler
       tagged_with: ' med egenskaberne %{tags}'


@@ -2017,6 +2021,7 @@ da:
       if set location: Indstil din hjemmeposition på siden %{settings_link} for at
         se andre brugere i nærheden.
       settings_link_text: indstillinger
       if set location: Indstil din hjemmeposition på siden %{settings_link} for at
         se andre brugere i nærheden.
       settings_link_text: indstillinger

+      my friends: Mine venner

       no friends: Du har ikke tilføjet nogle venner endnu.
       km away: '%{count}km væk'
       m away: '%{count}m væk'
       no friends: Du har ikke tilføjet nogle venner endnu.
       km away: '%{count}km væk'
       m away: '%{count}m væk'


@@ -2278,20 +2283,6 @@ da:
     period:
       one: 1 time
       other: '%{count} timer'
     period:
       one: 1 time
       other: '%{count} timer'

-    partial:
-      show: Vis
-      edit: Redigér
-      revoke: Tilbagekald!
-      confirm: Er du sikker?
-      display_name: Blokkeret bruger
-      creator_name: Oprettet af
-      reason: Årsag til blokering
-      status: Status
-      revoker_name: Tilbagekaldt af
-      not_revoked: (ikke tilbagekaldt)
-      showing_page: Side %{page}
-      next: Næste »
-      previous: « Forrige

     helper:
       time_future: Slutter om %{time}.
       until_login: Aktiv, indtil brugeren logger på.
     helper:
       time_future: Slutter om %{time}.
       until_login: Aktiv, indtil brugeren logger på.


@@ -2322,6 +2313,21 @@ da:
       back: Vis alle blokeringer
       revoker: 'Tilbagekalder:'
       needs_view: Brugeren skal logge på, før denne blokering vil blive fjernet
       back: Vis alle blokeringer
       revoker: 'Tilbagekalder:'
       needs_view: Brugeren skal logge på, før denne blokering vil blive fjernet

+  user_blocks:
+    block:
+      not_revoked: (ikke tilbagekaldt)
+      show: Vis
+      edit: Redigér
+      revoke: Tilbagekald!
+    blocks:
+      display_name: Blokkeret bruger
+      creator_name: Oprettet af
+      reason: Årsag til blokering
+      status: Status
+      revoker_name: Tilbagekaldt af
+      showing_page: Side %{page}
+      next: Næste »
+      previous: « Forrige

   note:
     description:
       opened_at_html: Oprettet for %{when} siden
   note:
     description:
       opened_at_html: Oprettet for %{when} siden


@@ -2452,7 +2458,7 @@ da:
       distance: Afstand
       errors:
         no_route: Kunne ikke finde en rute mellem de to steder.
       distance: Afstand
       errors:
         no_route: Kunne ikke finde en rute mellem de to steder.

-        no_place: Beklager - kunne ikke finde det sted.
+        no_place: Beklager - kunne ikke finde '%{place}'.

       instructions:
         continue_without_exit: Fortsæt ad %{name}
         slight_right_without_exit: Svagt til højre ind på %{name}
       instructions:
         continue_without_exit: Fortsæt ad %{name}
         slight_right_without_exit: Svagt til højre ind på %{name}


@@ -2471,6 +2477,7 @@ da:
         onramp_right_with_name_directions: Drej mod højre ind på rampen på %{name},
           retning imod %{directions}
         onramp_right_without_directions: Drej mod højre ind på rampen
         onramp_right_with_name_directions: Drej mod højre ind på rampen på %{name},
           retning imod %{directions}
         onramp_right_without_directions: Drej mod højre ind på rampen

+        onramp_right: Drej til højre ind på rampen

         endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på
           %{name}
         merge_right_without_exit: Flet til højre ind på %{name}
         endofroad_right_without_exit: Ved slutningen af vejen drej til højre ud på
           %{name}
         merge_right_without_exit: Flet til højre ind på %{name}


@@ -2496,6 +2503,7 @@ da:
         onramp_left_with_name_directions: Drej mod venstre ind på rampen på %{name},
           retning imod %{directions}
         onramp_left_without_directions: Drej mod venstre ind på rampen
         onramp_left_with_name_directions: Drej mod venstre ind på rampen på %{name},
           retning imod %{directions}
         onramp_left_without_directions: Drej mod venstre ind på rampen

+        onramp_left: Drej til venstre ind på rampen

         endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på
           %{name}
         merge_left_without_exit: Flet til venstre ind på %{name}
         endofroad_left_without_exit: Ved slutningen af vejen drej til venstre ud på
           %{name}
         merge_left_without_exit: Flet til venstre ind på %{name}

diff --git a/config/locales/de.yml b/config/locales/de.yml
index b5e27f48ace83250cdcee1537ae5189a45fec9c7..d56ab3f7b87a2f3353f16a343bd551bf29b0db2c 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2359,20 +2359,6 @@ de:
     period:
       one: 1 Stunde
       other: '%{count} Stunden'
     period:
       one: 1 Stunde
       other: '%{count} Stunden'

-    partial:
-      show: Anzeigen
-      edit: Bearbeiten
-      revoke: Aufheben!
-      confirm: Bist du sicher?
-      display_name: Gesperrter Benutzer
-      creator_name: Urheber
-      reason: Grund der Sperre
-      status: Status
-      revoker_name: Aufgehoben von
-      not_revoked: (nicht aufgehoben)
-      showing_page: Seite %{page}
-      next: Nächste »
-      previous: « Vorige

     helper:
       time_future: Endet in %{time}.
       until_login: Aktiv, bis der Benutzer sich anmeldet.
     helper:
       time_future: Endet in %{time}.
       until_login: Aktiv, bis der Benutzer sich anmeldet.


@@ -2404,6 +2390,21 @@ de:
       revoker: 'Aufgehoben von:'
       needs_view: Der Benutzer muss sich wieder anmelden, damit die Sperre beendet
         wird.
       revoker: 'Aufgehoben von:'
       needs_view: Der Benutzer muss sich wieder anmelden, damit die Sperre beendet
         wird.

+  user_blocks:
+    block:
+      not_revoked: (nicht aufgehoben)
+      show: Anzeigen
+      edit: Bearbeiten
+      revoke: Aufheben!
+    blocks:
+      display_name: Gesperrter Benutzer
+      creator_name: Urheber
+      reason: Grund der Sperre
+      status: Status
+      revoker_name: Aufgehoben von
+      showing_page: Seite %{page}
+      next: Nächste »
+      previous: « Vorige

   note:
     description:
       opened_at_html: '%{when} erstellt'
   note:
     description:
       opened_at_html: '%{when} erstellt'

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 33090156d581a03df4f3c9415c57596e64067e98..b0ace2c753223ba3180f3582286355ccbb52101b 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -1045,19 +1045,6 @@ diq:
     period:
       one: 1 seate
       other: '%{count} seati'
     period:
       one: 1 seate
       other: '%{count} seati'

-    partial:
-      show: Bımocne
-      edit: Bıvırne
-      revoke: Terkne!
-      confirm: Vac welay?
-      display_name: Karberê kılitbiyayey
-      creator_name: Vıraştoğ
-      status: Weziyet
-      revoker_name: Terknoğ
-      not_revoked: (nê terkiyayo)
-      showing_page: Pele %{page}
-      next: Peyên »
-      previous: « Verên

     helper:
       time_future: '%{time} dı bıqediyo'
       time_past: Verdê %{time} qedya
     helper:
       time_future: '%{time} dı bıqediyo'
       time_past: Verdê %{time} qedya


@@ -1078,6 +1065,20 @@ diq:
       revoke: Terkne!
       confirm: Vac welay?
       revoker: 'Terkner:'
       revoke: Terkne!
       confirm: Vac welay?
       revoker: 'Terkner:'

+  user_blocks:
+    block:
+      not_revoked: (nê terkiyayo)
+      show: Bımocne
+      edit: Bıvırne
+      revoke: Terkne!
+    blocks:
+      display_name: Karberê kılitbiyayey
+      creator_name: Vıraştoğ
+      status: Weziyet
+      revoker_name: Terknoğ
+      showing_page: Pele %{page}
+      next: Peyên »
+      previous: « Verên

   note:
     entry:
       comment: Mışewre
   note:
     entry:
       comment: Mışewre

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 8e15478449c8021bde478edfb4e8ffb9eb9a88bf..db48558105921148631f5120aaa14a5f83648346 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1951,20 +1951,6 @@ dsb:
       one: 1 góźina
       two: '%{count} góźinje'
       other: '%{count} góźinow'
       one: 1 góźina
       two: '%{count} góźinje'
       other: '%{count} góźinow'

-    partial:
-      show: Pokazaś
-      edit: Wobźěłaś
-      revoke: Wótpóraś!
-      confirm: Sy se wěsty?
-      display_name: Zablokěrowany wužywaŕ
-      creator_name: Blokěrowaŕ
-      reason: Pśicyna za blokěrowanje
-      status: Status
-      revoker_name: Wótpórany wót
-      not_revoked: (nic wótpórany)
-      showing_page: Bok %{page}
-      next: Pśiducy »
-      previous: « Pjerwjejšny

     helper:
       time_future: Kóńcy se %{time}.
       until_login: Aktiwny, až wužywaŕ se njepśizjawja.
     helper:
       time_future: Kóńcy se %{time}.
       until_login: Aktiwny, až wužywaŕ se njepśizjawja.


@@ -1991,6 +1977,21 @@ dsb:
       back: Wše blokěrowanja pokazaś
       revoker: 'Anulěrowaŕ:'
       needs_view: Wužywaŕ musy se pśizjawiś, nježli blokěrowanje se wótpórajo.
       back: Wše blokěrowanja pokazaś
       revoker: 'Anulěrowaŕ:'
       needs_view: Wužywaŕ musy se pśizjawiś, nježli blokěrowanje se wótpórajo.

+  user_blocks:
+    block:
+      not_revoked: (nic wótpórany)
+      show: Pokazaś
+      edit: Wobźěłaś
+      revoke: Wótpóraś!
+    blocks:
+      display_name: Zablokěrowany wužywaŕ
+      creator_name: Blokěrowaŕ
+      reason: Pśicyna za blokěrowanje
+      status: Status
+      revoker_name: Wótpórany wót
+      showing_page: Bok %{page}
+      next: Pśiducy »
+      previous: « Pjerwjejšny

   note:
     description:
       opened_at_html: Pśed %{when} napórany
   note:
     description:
       opened_at_html: Pśed %{when} napórany

diff --git a/config/locales/el.yml b/config/locales/el.yml
index ca387284512483b18ddd5c9521819f14b26c9a80..49938ac0b602c69c12bcb2213b362fdaca51c56e 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2341,20 +2341,6 @@ el:
     period:
       one: 1 ώρα
       other: '%{count} ώρες'
     period:
       one: 1 ώρα
       other: '%{count} ώρες'

-    partial:
-      show: Εμφάνιση
-      edit: Επεξεργασία
-      revoke: Ανακαλέστε!
-      confirm: Είσαστε σίγουροι;
-      display_name: Αποκλεισμένος Χρήστης
-      creator_name: Δημιουργός
-      reason: Αιτία φραγής
-      status: Κατάσταση
-      revoker_name: Ανακλήθηκε από
-      not_revoked: (δεν έχει ανακληθεί)
-      showing_page: Σελίδα %{page}
-      next: Επόμενη »
-      previous: « Προηγούμενη

     helper:
       time_future: Τελειώνει σε %{time}.
       until_login: Ενεργό έως ότου ο χρήστης συνδεθεί.
     helper:
       time_future: Τελειώνει σε %{time}.
       until_login: Ενεργό έως ότου ο χρήστης συνδεθεί.


@@ -2385,6 +2371,21 @@ el:
       back: Προβολή όλων των φραγών
       revoker: 'Έκανε την ανάκληση:'
       needs_view: Ο χρήστης πρέπει να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή.
       back: Προβολή όλων των φραγών
       revoker: 'Έκανε την ανάκληση:'
       needs_view: Ο χρήστης πρέπει να συνδεθεί προτού εκκαθαριστεί αυτή η φραγή.

+  user_blocks:
+    block:
+      not_revoked: (δεν έχει ανακληθεί)
+      show: Εμφάνιση
+      edit: Επεξεργασία
+      revoke: Ανακαλέστε!
+    blocks:
+      display_name: Αποκλεισμένος Χρήστης
+      creator_name: Δημιουργός
+      reason: Αιτία φραγής
+      status: Κατάσταση
+      revoker_name: Ανακλήθηκε από
+      showing_page: Σελίδα %{page}
+      next: Επόμενη »
+      previous: « Προηγούμενη

   note:
     description:
       opened_at_html: Δημιουργήθηκε %{when} πριν
   note:
     description:
       opened_at_html: Δημιουργήθηκε %{when} πριν

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5183e5f4910ab6b44999a7ff4c9bd45be75160b6..4be180898de9ba53dbf6eba3bc23e5b076f1fb1e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2203,20 +2203,6 @@ en-GB:
     period:
       one: 1 hour
       other: '%{count} hours'
     period:
       one: 1 hour
       other: '%{count} hours'

-    partial:
-      show: Show
-      edit: Edit
-      revoke: Revoke!
-      confirm: Are you sure?
-      display_name: Blocked User
-      creator_name: Creator
-      reason: Reason for block
-      status: Status
-      revoker_name: Revoked by
-      not_revoked: (not revoked)
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.


@@ -2246,6 +2232,21 @@ en-GB:
       back: View all blocks
       revoker: 'Revoker:'
       needs_view: The user needs to log in before this block will be cleared.
       back: View all blocks
       revoker: 'Revoker:'
       needs_view: The user needs to log in before this block will be cleared.

+  user_blocks:
+    block:
+      not_revoked: (not revoked)
+      show: Show
+      edit: Edit
+      revoke: Revoke!
+    blocks:
+      display_name: Blocked User
+      creator_name: Creator
+      reason: Reason for block
+      status: Status
+      revoker_name: Revoked by
+      showing_page: Page %{page}
+      next: Next »
+      previous: « Previous

   note:
     description:
       opened_at_html: Created %{when} ago
   note:
     description:
       opened_at_html: Created %{when} ago

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 932118ae1eff7eea02c8101f9e13b72eda9d6450..c8c4c0200bd329681afa301d08d21d57a5b1dc4d 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -2224,20 +2224,6 @@ eo:
     period:
       one: 1 horo
       other: '%{count} horoj'
     period:
       one: 1 horo
       other: '%{count} horoj'

-    partial:
-      show: Montri
-      edit: Redakti
-      revoke: Malbloki!
-      confirm: Ĉu vi certas?
-      display_name: Blokita uzanto
-      creator_name: Kreinto
-      reason: Kialo de blokado
-      status: Stato
-      revoker_name: Nuligita de
-      not_revoked: (ne nuligita)
-      showing_page: Paĝo %{page}
-      next: Sekva »
-      previous: « Antaŭa

     helper:
       time_future: Finiĝos %{time}.
       until_login: Aktiva ĝis la uzanto ensalutos.
     helper:
       time_future: Finiĝos %{time}.
       until_login: Aktiva ĝis la uzanto ensalutos.


@@ -2267,6 +2253,21 @@ eo:
       back: Montri ĉiujn blokadojn
       revoker: 'Malblokanto:'
       needs_view: La uzanto devas ensaluti antaŭ ĉi tiu blokado nuligos.
       back: Montri ĉiujn blokadojn
       revoker: 'Malblokanto:'
       needs_view: La uzanto devas ensaluti antaŭ ĉi tiu blokado nuligos.

+  user_blocks:
+    block:
+      not_revoked: (ne nuligita)
+      show: Montri
+      edit: Redakti
+      revoke: Malbloki!
+    blocks:
+      display_name: Blokita uzanto
+      creator_name: Kreinto
+      reason: Kialo de blokado
+      status: Stato
+      revoker_name: Nuligita de
+      showing_page: Paĝo %{page}
+      next: Sekva »
+      previous: « Antaŭa

   note:
     description:
       opened_at_html: Kreita antaŭ %{when}
   note:
     description:
       opened_at_html: Kreita antaŭ %{when}

diff --git a/config/locales/es.yml b/config/locales/es.yml
index e3d5f1d2a31d8edd18473014fc5abd7f74ce47ca..a6d44251dec3e17fa84611a67628821af0b5cdba 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1885,7 +1885,7 @@ es:
           title: Iniciar sesión con OpenID
           alt: Iniciar sesión con una URL OpenID
         google:
           title: Iniciar sesión con OpenID
           alt: Iniciar sesión con una URL OpenID
         google:

-          title: Iniciar sesión con Google
+          title: Acceder con Google

           alt: Iniciar sesión con una OpenID de Google
         facebook:
           title: Inicia sesión con Facebook
           alt: Iniciar sesión con una OpenID de Google
         facebook:
           title: Inicia sesión con Facebook


@@ -1903,10 +1903,10 @@ es:
           title: Iniciar sesión con Yahoo
           alt: Iniciar sesión con una OpenID de Yahoo
         wordpress:
           title: Iniciar sesión con Yahoo
           alt: Iniciar sesión con una OpenID de Yahoo
         wordpress:

-          title: Iniciar sesión con Wordpress
+          title: Acceder con Wordpress

           alt: Iniciar sesión con una OpenID de Wordpress
         aol:
           alt: Iniciar sesión con una OpenID de Wordpress
         aol:

-          title: Iniciar sesión con AOL
+          title: Acceder con AOL

           alt: Iniciar sesión con una OpenID de AOL
     logout:
       title: Salir
           alt: Iniciar sesión con una OpenID de AOL
     logout:
       title: Salir


@@ -2301,20 +2301,6 @@ es:
     period:
       one: 1 hora
       other: '%{count} horas'
     period:
       one: 1 hora
       other: '%{count} horas'

-    partial:
-      show: Mostrar
-      edit: Editar
-      revoke: Revocar
-      confirm: ¿Lo confirmas?
-      display_name: Usuario bloqueado
-      creator_name: Creador
-      reason: Razón del bloqueo
-      status: Estado
-      revoker_name: Revocado por
-      not_revoked: (no revocado)
-      showing_page: Página %{page}
-      next: Siguiente »
-      previous: « Anterior

     helper:
       time_future: Termina en %{time}.
       until_login: Activo hasta que el usuario acceda.
     helper:
       time_future: Termina en %{time}.
       until_login: Activo hasta que el usuario acceda.


@@ -2346,6 +2332,21 @@ es:
       revoker: 'Revocador:'
       needs_view: El usuario tiene que iniciar sesión antes de que este bloqueo sea
         eliminado
       revoker: 'Revocador:'
       needs_view: El usuario tiene que iniciar sesión antes de que este bloqueo sea
         eliminado

+  user_blocks:
+    block:
+      not_revoked: (no revocado)
+      show: Mostrar
+      edit: Editar
+      revoke: Revocar
+    blocks:
+      display_name: Usuario bloqueado
+      creator_name: Creador
+      reason: Razón del bloqueo
+      status: Estado
+      revoker_name: Revocado por
+      showing_page: Página %{page}
+      next: Siguiente »
+      previous: « Anterior

   note:
     description:
       opened_at_html: Creado hace %{when}
   note:
     description:
       opened_at_html: Creado hace %{when}

diff --git a/config/locales/et.yml b/config/locales/et.yml
index c63df8a1ab9c0882d527c282147883db138ccc1f..85556ea25854d2fe156941ae76c781f4ba790b1b 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2011,20 +2011,6 @@ et:
     period:
       one: 1 tund
       other: '%{count} tundi'
     period:
       one: 1 tund
       other: '%{count} tundi'

-    partial:
-      show: Näita
-      edit: Redigeeri
-      revoke: Tühista!
-      confirm: Oled Sa kindel?
-      display_name: Blokeeritud kasutaja
-      creator_name: Blokeerija
-      reason: Blokeerimise põhjus
-      status: Olek
-      revoker_name: Tühistanud
-      not_revoked: (pole tühistatud)
-      showing_page: Leht %{page}
-      next: Järgmine »
-      previous: « Eelmine

     helper:
       time_future: Lõpuni %{time}.
       until_login: Aktiivne kuni kasutaja logib sisse.
     helper:
       time_future: Lõpuni %{time}.
       until_login: Aktiivne kuni kasutaja logib sisse.


@@ -2054,6 +2040,21 @@ et:
       back: Vaata kõiki blokeeringuid
       revoker: Tühistaja
       needs_view: Kasutaja peab sisse logima enne kui see blokeering eemaldatakse.
       back: Vaata kõiki blokeeringuid
       revoker: Tühistaja
       needs_view: Kasutaja peab sisse logima enne kui see blokeering eemaldatakse.

+  user_blocks:
+    block:
+      not_revoked: (pole tühistatud)
+      show: Näita
+      edit: Redigeeri
+      revoke: Tühista!
+    blocks:
+      display_name: Blokeeritud kasutaja
+      creator_name: Blokeerija
+      reason: Blokeerimise põhjus
+      status: Olek
+      revoker_name: Tühistanud
+      showing_page: Leht %{page}
+      next: Järgmine »
+      previous: « Eelmine

   note:
     description:
       opened_at_html: Loodud %{when} tagasi
   note:
     description:
       opened_at_html: Loodud %{when} tagasi

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 0d68ec50e6ac9d5190ba68100e1f51d91ccd3156..94a074aaf61827a20d75168ef06c7acd1f67271a 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2187,20 +2187,6 @@ eu:
     period:
       one: ordu bat
       other: '%{count} ordu'
     period:
       one: ordu bat
       other: '%{count} ordu'

-    partial:
-      show: Erakutsi
-      edit: Aldatu
-      revoke: Ezeztatu!
-      confirm: Ziur zaude?
-      display_name: Blokeatutako Erabiltzailea
-      creator_name: Egilea
-      reason: Blokeatzeko arrazoia
-      status: Egoera
-      revoker_name: -k ezeztatua
-      not_revoked: (ez da ezeztatu)
-      showing_page: '%{page} orria'
-      next: Hurrengoa »
-      previous: « Aurrekoa

     helper:
       time_future: '%{time}n bukatzen du'
       until_login: Erabiltzaileak saioa hasi arte aktiboa.
     helper:
       time_future: '%{time}n bukatzen du'
       until_login: Erabiltzaileak saioa hasi arte aktiboa.


@@ -2231,6 +2217,21 @@ eu:
       back: Blokeo guztiak ikusi
       revoker: 'Ezeztatu duena:'
       needs_view: Erabiltzaileak saioa hasi behar du blokeoa kendu baino lehen.
       back: Blokeo guztiak ikusi
       revoker: 'Ezeztatu duena:'
       needs_view: Erabiltzaileak saioa hasi behar du blokeoa kendu baino lehen.

+  user_blocks:
+    block:
+      not_revoked: (ez da ezeztatu)
+      show: Erakutsi
+      edit: Aldatu
+      revoke: Ezeztatu!
+    blocks:
+      display_name: Blokeatutako Erabiltzailea
+      creator_name: Egilea
+      reason: Blokeatzeko arrazoia
+      status: Egoera
+      revoker_name: -k ezeztatua
+      showing_page: '%{page} orria'
+      next: Hurrengoa »
+      previous: « Aurrekoa

   note:
     description:
       opened_at_html: Duela %{when} sortua
   note:
     description:
       opened_at_html: Duela %{when} sortua

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 15f680e059b7ec85b4d9363ed45a00f937185b2e..e669010d2ae97a60c045b9e2c60e2556623e3815 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -2191,20 +2191,6 @@ fa:
     period:
       one: 1 ساعت
       other: '%{count} ساعت'
     period:
       one: 1 ساعت
       other: '%{count} ساعت'

-    partial:
-      show: نمایش
-      edit: ویرایش
-      revoke: باطل کردن!
-      confirm: آیا مطمئن هستید؟
-      display_name: کاربر بلوک شده
-      creator_name: ایجاد کننده
-      reason: دلیل بلوک
-      status: وضعیت
-      revoker_name: باطل شده توسط
-      not_revoked: (باطل نشده)
-      showing_page: صفحهٔ %{page}
-      next: بعدی »
-      previous: « قبلی

     helper:
       time_future: در %{time} پایان می پذیرد.
       until_login: فعال تا وقتی کاربر وارد شود.
     helper:
       time_future: در %{time} پایان می پذیرد.
       until_login: فعال تا وقتی کاربر وارد شود.


@@ -2233,6 +2219,21 @@ fa:
       back: مشاهده تمام بلوک ها
       revoker: 'باطل کننده:'
       needs_view: کاربر قبل از پاک شدن این بلوک نیاز به وارد شدن دارد.
       back: مشاهده تمام بلوک ها
       revoker: 'باطل کننده:'
       needs_view: کاربر قبل از پاک شدن این بلوک نیاز به وارد شدن دارد.

+  user_blocks:
+    block:
+      not_revoked: (باطل نشده)
+      show: نمایش
+      edit: ویرایش
+      revoke: باطل کردن!
+    blocks:
+      display_name: کاربر بلوک شده
+      creator_name: ایجاد کننده
+      reason: دلیل بلوک
+      status: وضعیت
+      revoker_name: باطل شده توسط
+      showing_page: صفحهٔ %{page}
+      next: بعدی »
+      previous: « قبلی

   note:
     description:
       opened_at_html: ایجاد شده %{when} قبل
   note:
     description:
       opened_at_html: ایجاد شده %{when} قبل

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 301cd1923ef29b63f64ffa9b0294da5692411d35..545423b2e79833dc697193f5b7c7fdb3a0dbffd8 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2257,20 +2257,6 @@ fi:
     period:
       one: 1 tunti
       other: '%{count} tuntia'
     period:
       one: 1 tunti
       other: '%{count} tuntia'

-    partial:
-      show: Näytä
-      edit: Muokkaa
-      revoke: Estä!
-      confirm: Oletko varma?
-      display_name: Estetty käyttäjä
-      creator_name: Tekijä
-      reason: Eston syy
-      status: Tila
-      revoker_name: Eston tehnyt
-      not_revoked: (ei kumottu)
-      showing_page: Sivu %{page}
-      next: Seuraava »
-      previous: « Edellinen

     helper:
       time_future: Päättyy %{time} kuluttua.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
     helper:
       time_future: Päättyy %{time} kuluttua.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.


@@ -2301,6 +2287,21 @@ fi:
       back: Näytä kaikki estot
       revoker: 'Estäjä:'
       needs_view: Käyttäjän täytyy kirjautua sisään ennen kuin esto poistuu.
       back: Näytä kaikki estot
       revoker: 'Estäjä:'
       needs_view: Käyttäjän täytyy kirjautua sisään ennen kuin esto poistuu.

+  user_blocks:
+    block:
+      not_revoked: (ei kumottu)
+      show: Näytä
+      edit: Muokkaa
+      revoke: Estä!
+    blocks:
+      display_name: Estetty käyttäjä
+      creator_name: Tekijä
+      reason: Eston syy
+      status: Tila
+      revoker_name: Eston tehnyt
+      showing_page: Sivu %{page}
+      next: Seuraava »
+      previous: « Edellinen

   note:
     description:
       opened_at_html: Luotu %{when} sitten
   note:
     description:
       opened_at_html: Luotu %{when} sitten

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6fee8790ac085cff50d5ace7f3aeb652f085877a..a1e58f356e7b8a949b37882ff0bdcc90da914c16 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -2359,20 +2359,6 @@ fr:
     period:
       one: '%{count} heure'
       other: '%{count} heures'
     period:
       one: '%{count} heure'
       other: '%{count} heures'

-    partial:
-      show: Afficher
-      edit: Modifier
-      revoke: Révoquer !
-      confirm: Êtes-vous sûr ?
-      display_name: Utilisateur bloqué
-      creator_name: Créateur
-      reason: Motif du blocage
-      status: État
-      revoker_name: Révoqué par
-      not_revoked: (non révoqué)
-      showing_page: Page %{page}
-      next: Suivant »
-      previous: « Précédent

     helper:
       time_future: Prends fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.
     helper:
       time_future: Prends fin dans %{time}.
       until_login: Actif jusqu’à ce que l’utilisateur se connecte.


@@ -2403,6 +2389,21 @@ fr:
       back: Afficher tous les blocages
       revoker: 'Révocateur :'
       needs_view: L’utilisateur doit se connecter avant que ce blocage soit supprimé.
       back: Afficher tous les blocages
       revoker: 'Révocateur :'
       needs_view: L’utilisateur doit se connecter avant que ce blocage soit supprimé.

+  user_blocks:
+    block:
+      not_revoked: (non révoqué)
+      show: Afficher
+      edit: Modifier
+      revoke: Révoquer !
+    blocks:
+      display_name: Utilisateur bloqué
+      creator_name: Créateur
+      reason: Motif du blocage
+      status: État
+      revoker_name: Révoqué par
+      showing_page: Page %{page}
+      next: Suivant »
+      previous: « Précédent

   note:
     description:
       opened_at_html: Créé il y a %{when}
   note:
     description:
       opened_at_html: Créé il y a %{when}

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 63e978728dfd1b2b9c17520e63cd19db71899a87..9453636c6dca32908665012eac3a301e6482fb59 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -1327,20 +1327,6 @@ fur:
     period:
       one: 1 ore
       other: '%{count} oris'
     period:
       one: 1 ore
       other: '%{count} oris'

-    partial:
-      show: Mostre
-      edit: Cambie
-      revoke: Revoche!
-      confirm: Sêstu sigûr?
-      display_name: Utent blocât
-      creator_name: Creadôr
-      reason: Reson dal bloc
-      status: Stât
-      revoker_name: Revocât di
-      not_revoked: (no revocât)
-      showing_page: Pagjine %{page}
-      next: Sucessîf »
-      previous: « Precedent

     helper:
       time_future: Finìs ca di %{time}.
       time_past: Finît %{time} indaûr.
     helper:
       time_future: Finìs ca di %{time}.
       time_past: Finît %{time} indaûr.


@@ -1365,6 +1351,21 @@ fur:
       reason: 'Reson dal bloc:'
       back: Cjale ducj i blocs
       revoker: 'Chel che al à revocât:'
       reason: 'Reson dal bloc:'
       back: Cjale ducj i blocs
       revoker: 'Chel che al à revocât:'

+  user_blocks:
+    block:
+      not_revoked: (no revocât)
+      show: Mostre
+      edit: Cambie
+      revoke: Revoche!
+    blocks:
+      display_name: Utent blocât
+      creator_name: Creadôr
+      reason: Reson dal bloc
+      status: Stât
+      revoker_name: Revocât di
+      showing_page: Pagjine %{page}
+      next: Sucessîf »
+      previous: « Precedent

   note:
     description:
       opened_at_html: Creât %{when} indaûr
   note:
     description:
       opened_at_html: Creât %{when} indaûr

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 21a5a5fc2be973e55f5650b6e63ba61f61c87a67..cb4623f6891bc11aa7a03b28db52f3f533e0633b 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -600,15 +600,17 @@ fy:
       title: Meidoggers
       heading: Meidoggers
   user_block:
       title: Meidoggers
       heading: Meidoggers
   user_block:

-    partial:
+    show:
+      status: Status
+      edit: Bewurkje
+  user_blocks:
+    block:

       edit: Bewurkje
       edit: Bewurkje

+    blocks:

       status: Status
       showing_page: Side %{page}
       next: Folgjende »
       previous: « Foarige
       status: Status
       showing_page: Side %{page}
       next: Folgjende »
       previous: « Foarige

-    show:
-      status: Status
-      edit: Bewurkje

   note:
     mine:
       id: Id
   note:
     mine:
       id: Id

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 2a12fa3bc83e55db6ba290cc33f7202a70138ce6..f92e98c6668e09ee516f74d4db02168b7ea8b1fa 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1992,24 +1992,25 @@ ga:
     period:
       one: uair amháin an chloig
       other: '%{count} uair an chloig'
     period:
       one: uair amháin an chloig
       other: '%{count} uair an chloig'

-    partial:
+    show:
+      show: Taispeáin
+      confirm: An bhfuil tú cinnte?
+      needs_view: Ní mór don úsáideoir logáil isteach sula nglanfar an bac seo.
+  user_blocks:
+    block:
+      not_revoked: (nár tarraingíodh siar)

       show: Taispeáin
       edit: Cuir in Eagar
       revoke: Tarraing siar!
       show: Taispeáin
       edit: Cuir in Eagar
       revoke: Tarraing siar!

-      confirm: An bhfuil tú cinnte?
+    blocks:

       display_name: Úsáideoir Bactha
       creator_name: Cruthaitheoir
       reason: Cúis don bhac
       status: Stádas
       revoker_name: Tarraingthe siar ag
       display_name: Úsáideoir Bactha
       creator_name: Cruthaitheoir
       reason: Cúis don bhac
       status: Stádas
       revoker_name: Tarraingthe siar ag

-      not_revoked: (nár tarraingíodh siar)

       showing_page: Leathanach %{page}
       next: Ar aghaidh »
       previous: « Roimhe
       showing_page: Leathanach %{page}
       next: Ar aghaidh »
       previous: « Roimhe

-    show:
-      show: Taispeáin
-      confirm: An bhfuil tú cinnte?
-      needs_view: Ní mór don úsáideoir logáil isteach sula nglanfar an bac seo.

   note:
     rss:
       title: Nótaí OpenStreetMap
   note:
     rss:
       title: Nótaí OpenStreetMap

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 04dca87f5d67ff5d05e47de2abeb8dfce4625b59..759ad99ce5f2117dbb72231aff5b9053624fe5c4 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -2223,20 +2223,6 @@ gd:
       flash: Chaidh am bacadh seo a chùl-ghairm.
     period:
       other: '%{count} uair a thìde'
       flash: Chaidh am bacadh seo a chùl-ghairm.
     period:
       other: '%{count} uair a thìde'

-    partial:
-      show: Seall
-      edit: Deasaich
-      revoke: Cùl-ghairm!
-      confirm: A bheil thu cinnteach?
-      display_name: Cleachdaiche bacte
-      creator_name: Cruthadair
-      reason: Adhbhar a' bhacaidh
-      status: Staid
-      revoker_name: Air a chùl-ghairm le
-      not_revoked: (cha deach a chùl-ghairm)
-      showing_page: Duilleag %{page}
-      next: Air adhart »
-      previous: « Air ais

     helper:
       time_future: Falbhaidh an ùine air an ceann %{time}.
       until_login: Gnìomhach gus an clàraich an cleachdaiche a-steach.
     helper:
       time_future: Falbhaidh an ùine air an ceann %{time}.
       until_login: Gnìomhach gus an clàraich an cleachdaiche a-steach.


@@ -2264,6 +2250,21 @@ gd:
       revoker: 'Cùl-ghairm le:'
       needs_view: Feumaidh an cleachdaiche clàradh a-steach mus dèid am bacadh seo
         a thoirt air falamh.
       revoker: 'Cùl-ghairm le:'
       needs_view: Feumaidh an cleachdaiche clàradh a-steach mus dèid am bacadh seo
         a thoirt air falamh.

+  user_blocks:
+    block:
+      not_revoked: (cha deach a chùl-ghairm)
+      show: Seall
+      edit: Deasaich
+      revoke: Cùl-ghairm!
+    blocks:
+      display_name: Cleachdaiche bacte
+      creator_name: Cruthadair
+      reason: Adhbhar a' bhacaidh
+      status: Staid
+      revoker_name: Air a chùl-ghairm le
+      showing_page: Duilleag %{page}
+      next: Air adhart »
+      previous: « Air ais

   note:
     description:
       opened_at_html: Air a chruthachadh o chionn %{when}
   note:
     description:
       opened_at_html: Air a chruthachadh o chionn %{when}

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 556a261fe1022074267b598ac87f97f4e2354320..b7f3b1eff3d3c2ff1c72095d7ad6c658aa037a51 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2285,20 +2285,6 @@ gl:
     period:
       one: 1 hora
       other: '%{count} horas'
     period:
       one: 1 hora
       other: '%{count} horas'

-    partial:
-      show: Mostrar
-      edit: Editar
-      revoke: Revogar!
-      confirm: Está seguro?
-      display_name: Usuario bloqueado
-      creator_name: Creador
-      reason: Motivo para o bloqueo
-      status: Estado
-      revoker_name: Revogado por
-      not_revoked: (non revogado)
-      showing_page: Páxina %{page}
-      next: Seguinte »
-      previous: « Anterior

     helper:
       time_future: Remata en %{time}.
       until_login: Activo ata que o usuario inicie sesión.
     helper:
       time_future: Remata en %{time}.
       until_login: Activo ata que o usuario inicie sesión.


@@ -2330,6 +2316,21 @@ gl:
       revoker: 'Autor da revogación:'
       needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
         retirado.
       revoker: 'Autor da revogación:'
       needs_view: O usuario ten que acceder ao sistema antes de que o bloqueo sexa
         retirado.

+  user_blocks:
+    block:
+      not_revoked: (non revogado)
+      show: Mostrar
+      edit: Editar
+      revoke: Revogar!
+    blocks:
+      display_name: Usuario bloqueado
+      creator_name: Creador
+      reason: Motivo para o bloqueo
+      status: Estado
+      revoker_name: Revogado por
+      showing_page: Páxina %{page}
+      next: Seguinte »
+      previous: « Anterior

   note:
     description:
       opened_at_html: Creado hai %{when}
   note:
     description:
       opened_at_html: Creado hai %{when}

diff --git a/config/locales/he.yml b/config/locales/he.yml
index c7376fde2ebc6e557f558c431ceec5d94bcbcf70..1c2f5b618b4e7425effa97e2c00a4c0ee5914e2a 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2154,20 +2154,6 @@ he:
     period:
       one: שעה אחת
       other: '%{count} שעות'
     period:
       one: שעה אחת
       other: '%{count} שעות'

-    partial:
-      show: הצגה
-      edit: עריכה
-      revoke: לבטל!
-      confirm: באמת?
-      display_name: משתמש חסום
-      creator_name: יוצר
-      reason: סיבה לחסימה
-      status: מצב
-      revoker_name: בוטלה על־ידי
-      not_revoked: (לא בוטלה)
-      showing_page: הדף %{page}
-      next: הבא »
-      previous: « הקודם

     helper:
       time_future: תסתיים בעוד %{time}
       until_login: פעילה עד שהמשתמש ייכנס לחשבון.
     helper:
       time_future: תסתיים בעוד %{time}
       until_login: פעילה עד שהמשתמש ייכנס לחשבון.


@@ -2197,6 +2183,21 @@ he:
       back: צפייה בכל החסימות
       revoker: 'מבטל:'
       needs_view: המשתמש צריך להיכנס לחשבון לפני שהחסימה הזאת יכולה להתבטל.
       back: צפייה בכל החסימות
       revoker: 'מבטל:'
       needs_view: המשתמש צריך להיכנס לחשבון לפני שהחסימה הזאת יכולה להתבטל.

+  user_blocks:
+    block:
+      not_revoked: (לא בוטלה)
+      show: הצגה
+      edit: עריכה
+      revoke: לבטל!
+    blocks:
+      display_name: משתמש חסום
+      creator_name: יוצר
+      reason: סיבה לחסימה
+      status: מצב
+      revoker_name: בוטלה על־ידי
+      showing_page: הדף %{page}
+      next: הבא »
+      previous: « הקודם

   note:
     description:
       opened_at_html: נוצרה לפני %{when}
   note:
     description:
       opened_at_html: נוצרה לפני %{when}

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4def80e7bb9e3772ef8d5d9478bb4b8238775339..96749d8cc1c364ded9aabce5dd2e07105028e20a 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1881,20 +1881,6 @@ hr:
     period:
       one: 1 sat
       other: '%{count} sati'
     period:
       one: 1 sat
       other: '%{count} sati'

-    partial:
-      show: Prikaži
-      edit: Uredi
-      revoke: Opozovi!
-      confirm: Jeste li sigurni?
-      display_name: Blokirani korisnik
-      creator_name: Tvorac
-      reason: Razlog za blokadu
-      status: Status
-      revoker_name: Opozvao
-      not_revoked: (nije opozvano)
-      showing_page: Stranica %{page}
-      next: Slijedeća »
-      previous: « Prethodna

     helper:
       time_future: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.
     helper:
       time_future: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.


@@ -1921,6 +1907,21 @@ hr:
       back: Prikaži sve blokade
       revoker: 'Opozivatelj:'
       needs_view: Korisnik se mora prijaviti prije nego se blokada očisti.
       back: Prikaži sve blokade
       revoker: 'Opozivatelj:'
       needs_view: Korisnik se mora prijaviti prije nego se blokada očisti.

+  user_blocks:
+    block:
+      not_revoked: (nije opozvano)
+      show: Prikaži
+      edit: Uredi
+      revoke: Opozovi!
+    blocks:
+      display_name: Blokirani korisnik
+      creator_name: Tvorac
+      reason: Razlog za blokadu
+      status: Status
+      revoker_name: Opozvao
+      showing_page: Stranica %{page}
+      next: Slijedeća »
+      previous: « Prethodna

   note:
     description:
       opened_at_html: Stvorena prije %{when}
   note:
     description:
       opened_at_html: Stvorena prije %{when}

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index b7d9cdbfd20efdb2dcb6f3e0987469db073fdd15..c9d440d14f81f4598c4aa54960443058670ad100 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -2140,20 +2140,6 @@ hsb:
       one: 1 hodźina
       two: '%{count} hodźinje'
       other: '%{count} hodźin'
       one: 1 hodźina
       two: '%{count} hodźinje'
       other: '%{count} hodźin'

-    partial:
-      show: Pokazać
-      edit: Wobdźěłać
-      revoke: Zběhnyć!
-      confirm: Chceš woprawdźe?
-      display_name: Zablokowany wužiwar
-      creator_name: Blokowar
-      reason: Přičina za blokowanje
-      status: Status
-      revoker_name: Zběhnjene wot
-      not_revoked: (njezběhnjeny)
-      showing_page: Strona %{page}
-      next: Přichodny »
-      previous: « Předchadny

     helper:
       time_future: Kónči so %{time}.
       until_login: Aktiwne, doniž so wužiwar njepřizjewja.
     helper:
       time_future: Kónči so %{time}.
       until_login: Aktiwne, doniž so wužiwar njepřizjewja.


@@ -2182,6 +2168,21 @@ hsb:
       back: Wšě blokowanja pokazać
       revoker: 'Zeběracy wužiwar:'
       needs_view: Wužiwar dyrbi so přizjewić, prjedy hač tute blokowanje so zběhnje.
       back: Wšě blokowanja pokazać
       revoker: 'Zeběracy wužiwar:'
       needs_view: Wužiwar dyrbi so přizjewić, prjedy hač tute blokowanje so zběhnje.

+  user_blocks:
+    block:
+      not_revoked: (njezběhnjeny)
+      show: Pokazać
+      edit: Wobdźěłać
+      revoke: Zběhnyć!
+    blocks:
+      display_name: Zablokowany wužiwar
+      creator_name: Blokowar
+      reason: Přičina za blokowanje
+      status: Status
+      revoker_name: Zběhnjene wot
+      showing_page: Strona %{page}
+      next: Přichodny »
+      previous: « Předchadny

   note:
     description:
       opened_at_html: Před %{when} wutworjeny
   note:
     description:
       opened_at_html: Před %{when} wutworjeny

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e75764bd0d77da82098c93c85929902f46552042..f6147b43ff4d5cb5015459645a276d83bc3e3be7 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -733,7 +733,7 @@ hu:
           government: Kormányzati hivatal
           insurance: Biztosítási iroda
           lawyer: Ügyvéd
           government: Kormányzati hivatal
           insurance: Biztosítási iroda
           lawyer: Ügyvéd

-          ngo: Nem kormányzati iroda
+          ngo: Civil szervezet irodája

           telecommunication: Távközlési iroda
           travel_agent: Utazási iroda
           "yes": Iroda
           telecommunication: Távközlési iroda
           travel_agent: Utazási iroda
           "yes": Iroda


@@ -2193,20 +2193,6 @@ hu:
     period:
       one: 1 órája
       other: '%{count} órája'
     period:
       one: 1 órája
       other: '%{count} órája'

-    partial:
-      show: Megjelenítés
-      edit: Szerkesztés
-      revoke: Visszavonás!
-      confirm: Biztos vagy benne?
-      display_name: Blokkolt felhasználó
-      creator_name: Készítő
-      reason: Blokkolás indoklása
-      status: Állapot
-      revoker_name: 'Visszavonta:'
-      not_revoked: (nincs visszavonva)
-      showing_page: '%{page}. oldal'
-      next: Következő »
-      previous: « Előző

     helper:
       time_future: Véget ér %{time} múlva.
       until_login: Aktív a felhasználó bejelentkezéséig.
     helper:
       time_future: Véget ér %{time} múlva.
       until_login: Aktív a felhasználó bejelentkezéséig.


@@ -2236,6 +2222,21 @@ hu:
       back: Összes blokkolás megjelenítése
       revoker: 'Visszavonó:'
       needs_view: A felhasználónak be kell jelentkeznie, mielőtt a blokkolás feloldódna.
       back: Összes blokkolás megjelenítése
       revoker: 'Visszavonó:'
       needs_view: A felhasználónak be kell jelentkeznie, mielőtt a blokkolás feloldódna.

+  user_blocks:
+    block:
+      not_revoked: (nincs visszavonva)
+      show: Megjelenítés
+      edit: Szerkesztés
+      revoke: Visszavonás!
+    blocks:
+      display_name: Blokkolt felhasználó
+      creator_name: Készítő
+      reason: Blokkolás indoklása
+      status: Állapot
+      revoker_name: 'Visszavonta:'
+      showing_page: '%{page}. oldal'
+      next: Következő »
+      previous: « Előző

   note:
     description:
       opened_at_html: Létrehozva %{when}
   note:
     description:
       opened_at_html: Létrehozva %{when}

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 92ac13ced92ea798792636c799a8fdfbe6ca0f16..9a1be4ce4e16b94223f76dc7a03eb6db08d99d13 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2189,20 +2189,6 @@ ia:
     period:
       one: 1 hora
       other: '%{count} horas'
     period:
       one: 1 hora
       other: '%{count} horas'

-    partial:
-      show: Monstrar
-      edit: Modificar
-      revoke: Revocar!
-      confirm: Es tu secur?
-      display_name: Usator blocate
-      creator_name: Creator
-      reason: Motivo del blocada
-      status: Stato
-      revoker_name: Revocate per
-      not_revoked: (non revocate)
-      showing_page: Pagina %{page}
-      next: Sequente »
-      previous: « Precedente

     helper:
       time_future: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
     helper:
       time_future: Expira in %{time}.
       until_login: Active usque le usator aperi un session.


@@ -2233,6 +2219,21 @@ ia:
       back: Vider tote le blocadas
       revoker: 'Revocator:'
       needs_view: Le usator debe aperir un session ante que iste blocada es cancellate.
       back: Vider tote le blocadas
       revoker: 'Revocator:'
       needs_view: Le usator debe aperir un session ante que iste blocada es cancellate.

+  user_blocks:
+    block:
+      not_revoked: (non revocate)
+      show: Monstrar
+      edit: Modificar
+      revoke: Revocar!
+    blocks:
+      display_name: Usator blocate
+      creator_name: Creator
+      reason: Motivo del blocada
+      status: Stato
+      revoker_name: Revocate per
+      showing_page: Pagina %{page}
+      next: Sequente »
+      previous: « Precedente

   note:
     description:
       opened_at_html: Create %{when} retro
   note:
     description:
       opened_at_html: Create %{when} retro

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 41fd9dd4f49f8ac2a3eb2a3473eb986f00285dc2..10fc2e14ed828e699c83c3c9e5c4d1749a3755ba 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2212,20 +2212,6 @@ id:
     period:
       one: 1 hour
       other: '%{count} hours'
     period:
       one: 1 hour
       other: '%{count} hours'

-    partial:
-      show: Tampilkan
-      edit: Edit
-      revoke: Batalkan!
-      confirm: Apakah Anda yakin?
-      display_name: Pengguna yang Diblokir
-      creator_name: Pencipta
-      reason: Alasan untuk blokir
-      status: Status
-      revoker_name: Dibatalkan oleh
-      not_revoked: (tidak dicabut)
-      showing_page: Halaman %{page}
-      next: Berikutnya »
-      previous: « Sebelumnya

     helper:
       time_future: Berakhir pada %{time}.
       until_login: Aktif sampai pengguna melakukan log in.
     helper:
       time_future: Berakhir pada %{time}.
       until_login: Aktif sampai pengguna melakukan log in.


@@ -2255,6 +2241,21 @@ id:
       back: Lihat semua blokir
       revoker: 'Pembatal:'
       needs_view: Pengguna harus log in sebelum blokir ini dihapus.
       back: Lihat semua blokir
       revoker: 'Pembatal:'
       needs_view: Pengguna harus log in sebelum blokir ini dihapus.

+  user_blocks:
+    block:
+      not_revoked: (tidak dicabut)
+      show: Tampilkan
+      edit: Edit
+      revoke: Batalkan!
+    blocks:
+      display_name: Pengguna yang Diblokir
+      creator_name: Pencipta
+      reason: Alasan untuk blokir
+      status: Status
+      revoker_name: Dibatalkan oleh
+      showing_page: Halaman %{page}
+      next: Berikutnya »
+      previous: « Sebelumnya

   note:
     description:
       opened_at_html: Dibuat %{when} yang lalu
   note:
     description:
       opened_at_html: Dibuat %{when} yang lalu

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 517e367f3d4cd4474c606388f3a29a71d56c08dc..35d5ac98ae02c6012608348993c7f69b1f0ce65a 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2305,20 +2305,6 @@ is:
     period:
       one: 1 stund
       other: '%{count} stundir'
     period:
       one: 1 stund
       other: '%{count} stundir'

-    partial:
-      show: Sýna
-      edit: Breyta
-      revoke: Eyða banninu
-      confirm: Ert þú viss?
-      display_name: Bann gegn
-      creator_name: Búið til af
-      reason: Ástæða banns
-      status: Staða
-      revoker_name: Eytt af
-      not_revoked: (ekki eytt)
-      showing_page: Síða %{page}
-      next: Næsta »
-      previous: « Fyrri

     helper:
       time_future: Endar eftir %{time}
       until_login: Virkt þangað til notandinn skráir sig inn.
     helper:
       time_future: Endar eftir %{time}
       until_login: Virkt þangað til notandinn skráir sig inn.


@@ -2349,6 +2335,21 @@ is:
       back: Listi yfir öll bönn
       revoker: 'Eytt af:'
       needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
       back: Listi yfir öll bönn
       revoker: 'Eytt af:'
       needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.

+  user_blocks:
+    block:
+      not_revoked: (ekki eytt)
+      show: Sýna
+      edit: Breyta
+      revoke: Eyða banninu
+    blocks:
+      display_name: Bann gegn
+      creator_name: Búið til af
+      reason: Ástæða banns
+      status: Staða
+      revoker_name: Eytt af
+      showing_page: Síða %{page}
+      next: Næsta »
+      previous: « Fyrri

   note:
     description:
       opened_at_html: Búið til fyrir %{when} síðan
   note:
     description:
       opened_at_html: Búið til fyrir %{when} síðan

diff --git a/config/locales/it.yml b/config/locales/it.yml
index e673ef991688e5158ce550a92362c6355f0e8483..6104b63af1fe7298641d728910685fa0afe8ad45 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -2309,20 +2309,6 @@ it:
     period:
       one: 1 ora
       other: '%{count} ore'
     period:
       one: 1 ora
       other: '%{count} ore'

-    partial:
-      show: Mostra
-      edit: Modifica
-      revoke: Revoca!
-      confirm: Sei sicuro?
-      display_name: Utente bloccato
-      creator_name: Autore
-      reason: Motivo del blocco
-      status: Stato
-      revoker_name: Revocato da
-      not_revoked: (non revocato)
-      showing_page: Pagina %{page}
-      next: Successivo »
-      previous: « Precedente

     helper:
       time_future: Termina fra %{time}.
       until_login: Attivo finché l'utente non si collega.
     helper:
       time_future: Termina fra %{time}.
       until_login: Attivo finché l'utente non si collega.


@@ -2353,6 +2339,21 @@ it:
       back: Visualizza tutti i blocchi
       revoker: 'Revocatore:'
       needs_view: L'utente deve collegarsi prima che questo blocco sia cancellato.
       back: Visualizza tutti i blocchi
       revoker: 'Revocatore:'
       needs_view: L'utente deve collegarsi prima che questo blocco sia cancellato.

+  user_blocks:
+    block:
+      not_revoked: (non revocato)
+      show: Mostra
+      edit: Modifica
+      revoke: Revoca!
+    blocks:
+      display_name: Utente bloccato
+      creator_name: Autore
+      reason: Motivo del blocco
+      status: Stato
+      revoker_name: Revocato da
+      showing_page: Pagina %{page}
+      next: Successivo »
+      previous: « Precedente

   note:
     description:
       opened_at_html: Creata %{when} fa
   note:
     description:
       opened_at_html: Creata %{when} fa

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 710dc0bed68964c66513a14900c968b6ef0124e4..07a5d4130d05652f15b8ae9519971beeedc6d71b 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -671,7 +671,9 @@ ja:
           water_park: 親水公園
           "yes": レジャー
         man_made:
           water_park: 親水公園
           "yes": レジャー
         man_made:

+          bridge: 橋

           lighthouse: 灯台
           lighthouse: 灯台

+          mine: 鉱山

           pipeline: パイプライン
           silo: サイロ
           storage_tank: 貯蔵タンク
           pipeline: パイプライン
           silo: サイロ
           storage_tank: 貯蔵タンク


@@ -2003,20 +2005,6 @@ ja:
       revoke: 取り消す!
       flash: このブロックは取り消されました。
     period: '%{count} 時間'
       revoke: 取り消す!
       flash: このブロックは取り消されました。
     period: '%{count} 時間'

-    partial:
-      show: 表示する
-      edit: 編集
-      revoke: 取り消す!
-      confirm: 本当によろしいですか?
-      display_name: ブロックされている利用者
-      creator_name: 作成者
-      reason: ブロックされた理由
-      status: 状態
-      revoker_name: 取り消し者
-      not_revoked: (取り消されていません)
-      showing_page: ページ %{page}
-      next: 次へ »
-      previous: « 前へ

     helper:
       time_future: '%{time} に終了します。'
       until_login: 利用者がログインするまで有効です。
     helper:
       time_future: '%{time} に終了します。'
       until_login: 利用者がログインするまで有効です。


@@ -2046,6 +2034,21 @@ ja:
       back: すべてのブロックを表示
       revoker: '取消:'
       needs_view: ブロックを解除するには、利用者はログインし直す必要があります。
       back: すべてのブロックを表示
       revoker: '取消:'
       needs_view: ブロックを解除するには、利用者はログインし直す必要があります。

+  user_blocks:
+    block:
+      not_revoked: (取り消されていません)
+      show: 表示する
+      edit: 編集
+      revoke: 取り消す!
+    blocks:
+      display_name: ブロックされている利用者
+      creator_name: 作成者
+      reason: ブロックされた理由
+      status: 状態
+      revoker_name: 取り消し者
+      showing_page: ページ %{page}
+      next: 次へ »
+      previous: « 前へ

   note:
     description:
       opened_at_html: '%{when}前に作成'
   note:
     description:
       opened_at_html: '%{when}前に作成'


@@ -2171,7 +2174,7 @@ ja:
       distance: 距離
       errors:
         no_route: ２点間のルートが見つかりません。
       distance: 距離
       errors:
         no_route: ２点間のルートが見つかりません。

-        no_place: 残念ながら、その場所は見つかりませんでした。
+        no_place: 残念ながら、場所「%{place}」は見つかりませんでした。

       instructions:
         continue_without_exit: '%{name}を続行'
         slight_right_without_exit: 道なりに右折して%{name}へ
       instructions:
         continue_without_exit: '%{name}を続行'
         slight_right_without_exit: 道なりに右折して%{name}へ

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 1c3df4f9ba7d57834e29fb4ee32315c78b490e52..2d0530a4fe04c9851fa576e356517dea11a7361c 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -1161,20 +1161,6 @@ ka:
     period:
       one: 1 საათი
       other: '%{count} საათი'
     period:
       one: 1 საათი
       other: '%{count} საათი'

-    partial:
-      show: ჩვენება
-      edit: რედაქტირება
-      revoke: განბლოკვა!
-      confirm: დარწმუნებული ხართ?
-      display_name: დაბლოკილი მომხმარებელი
-      creator_name: შემქმნელი
-      reason: დაბლოკვის მიზეზი
-      status: სტატუსი
-      revoker_name: განბლოკილია
-      not_revoked: (არ არის განბლოკილი)
-      showing_page: გვერდი %{page}
-      next: შემდეგი »
-      previous: « წინა

     helper:
       time_future: მთავრდება %{time}–ში.
       until_login: აქტიურია მანამდე, სანამ მომხმარებელი არ შევა სისტემაში.
     helper:
       time_future: მთავრდება %{time}–ში.
       until_login: აქტიურია მანამდე, სანამ მომხმარებელი არ შევა სისტემაში.


@@ -1201,6 +1187,21 @@ ka:
       back: ყველა ბლოკირების ჩვენება
       revoker: 'განმბლოკველი:'
       needs_view: სანამ მოხდება ბლოკის მოხსნა, მანამდე საჭიროა მომხმარებლის დარეგისტრირება
       back: ყველა ბლოკირების ჩვენება
       revoker: 'განმბლოკველი:'
       needs_view: სანამ მოხდება ბლოკის მოხსნა, მანამდე საჭიროა მომხმარებლის დარეგისტრირება

+  user_blocks:
+    block:
+      not_revoked: (არ არის განბლოკილი)
+      show: ჩვენება
+      edit: რედაქტირება
+      revoke: განბლოკვა!
+    blocks:
+      display_name: დაბლოკილი მომხმარებელი
+      creator_name: შემქმნელი
+      reason: დაბლოკვის მიზეზი
+      status: სტატუსი
+      revoker_name: განბლოკილია
+      showing_page: გვერდი %{page}
+      next: შემდეგი »
+      previous: « წინა

   note:
     description:
       opened_at_html: შეიქმნა %{when} წინ
   note:
     description:
       opened_at_html: შეიქმნა %{when} წინ

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 133288ef5fd6356c9108ea811e6abcab8bd05b52..403dc219cf00876b83cae726b86bc0bb8a74b373 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -1359,19 +1359,6 @@ kab:
     revoke:
       confirm: Sentem
   user_block:
     revoke:
       confirm: Sentem
   user_block:

-    partial:
-      show: Sken
-      edit: Ẓreg
-      revoke: Ḥwi!
-      confirm: Tebɣiḍ?
-      display_name: Aseqdac iweḥlen
-      creator_name: Amernay
-      reason: Taɣzint n  usewḥel
-      status: Addad
-      revoker_name: Isewḥel-it
-      showing_page: Asebter %{page}
-      next: Ar zdat»
-      previous: « ar deffir

     helper:
       time_future: Ad ifak di %{time}.
       until_login: D urmid arama yeqqen useqdac
     helper:
       time_future: Ad ifak di %{time}.
       until_login: D urmid arama yeqqen useqdac


@@ -1398,6 +1385,20 @@ kab:
       reason: 'Taɣzint n  usewḥel:'
       back: Sken akk isewḥal
       needs_view: Aseqdac-agi yesra ad yeqqen send ad yettwakkes u sewḥel.
       reason: 'Taɣzint n  usewḥel:'
       back: Sken akk isewḥal
       needs_view: Aseqdac-agi yesra ad yeqqen send ad yettwakkes u sewḥel.

+  user_blocks:
+    block:
+      show: Sken
+      edit: Ẓreg
+      revoke: Ḥwi!
+    blocks:
+      display_name: Aseqdac iweḥlen
+      creator_name: Amernay
+      reason: Taɣzint n  usewḥel
+      status: Addad
+      revoker_name: Isewḥel-it
+      showing_page: Asebter %{page}
+      next: Ar zdat»
+      previous: « ar deffir

   note:
     description:
       opened_at_html: Yattwarna %{when} aya
   note:
     description:
       opened_at_html: Yattwarna %{when} aya

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 63bd46933fc2393fefe9fbb8f21270b2f336a797..0f6b4286b2569e5c133420d43d85c902e393200c 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -87,7 +87,7 @@ km:
     view_details: មើលព័ត៌មានលម្អិត​
     location: ទីតាំង​៖​
     changeset:
     view_details: មើលព័ត៌មានលម្អិត​
     location: ទីតាំង​៖​
     changeset:

-      title: 'សំនុំ​បំលាស់ប្តូរ​: %{id}'
+      title: សំណុំបន្លាស់ប្ដូរ៖ %{id}

       belongs_to: អ្នក​បង្កើត
       node: ខ្នែងចំនួន (%{count})
       node_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
       belongs_to: អ្នក​បង្កើត
       node: ខ្នែងចំនួន (%{count})
       node_paginated: ខ្នែងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})


@@ -95,10 +95,11 @@ km:
       way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
       relation: ទំនាក់ទំនងចំនួន (%{count})
       relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
       way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})
       relation: ទំនាក់ទំនងចំនួន (%{count})
       relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count})

-      changesetxml: á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8fូរ​ XML
+      changesetxml: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aូរ​ XML

       feed:
       feed:

-        title: á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8fូរ​ %{id}
+        title: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aូរ​ %{id}

         title_comment: សំនុំ​បំលាស់ប្តូរ​ %{id} - %{comment}
         title_comment: សំនុំ​បំលាស់ប្តូរ​ %{id} - %{comment}

+      join_discussion: កត់ឈ្មោះចូលដើម្បីចូលរួមពិភាក្សា

     node:
       title: ខ្នែង៖ %{name}
       history_title: ប្រវត្តិខ្នែង៖ %{name}
     node:
       title: ខ្នែង៖ %{name}
       history_title: ប្រវត្តិខ្នែង៖ %{name}


@@ -166,9 +167,9 @@ km:
       comment: មតិយោបល់​
       area: តំបន់
     list:
       comment: មតិយោបល់​
       area: តំបន់
     list:

-      title: á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8fá\9e¼á\9e\9aâ\80\8b
+      title: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9a

       title_user: សំនុំ​បំលាស់ប្តូរ​ ដោយ %{user}
       title_user: សំនុំ​បំលាស់ប្តូរ​ ដោយ %{user}

-      title_friend: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\8aá\9f\84á\9e\99á\9e\98á\9e·á\9e\8fá\9f\92á\9e\8fá\9e\97á\9e\80á\9f\92á\9e\8aá\9e·á\9e\9aá\9e\94á\9e\9fá\9f\8bá\9e¢á\9f\92á\9e\93á\9e\80
+      title_friend: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\8aá\9f\84á\9e\99á\9e\98á\9e·á\9e\8fá\9f\92á\9e\8fá\9e\97á\9e\80á\9f\92á\9e\8aá\9e·á\9e\81á\9f\92á\9e\89á\9e»á\9f\86

       title_nearby: សំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់ក្បែរៗអ្នក
       empty: រកមិនឃើញសំណុំបន្លាស់ប្ដូរ។
       empty_area: គ្មានសំណុំបន្លាស់ប្ដូរនៅក្នុងតំបន់នេះទេ។
       title_nearby: សំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់ក្បែរៗអ្នក
       empty: រកមិនឃើញសំណុំបន្លាស់ប្ដូរ។
       empty_area: គ្មានសំណុំបន្លាស់ប្ដូរនៅក្នុងតំបន់នេះទេ។


@@ -180,6 +181,7 @@ km:
   diary_entry:
     new:
       title: ប្រកាសកំណត់ហេតុថ្មី
   diary_entry:
     new:
       title: ប្រកាសកំណត់ហេតុថ្មី

+      publish_button: បោះផ្សាយ

     list:
       title: កំណត់ហេតុរបស់អ្នកប្រើប្រាស់
       title_friends: កំណត់ហេតុរបស់មិត្តភក្ដិ
     list:
       title: កំណត់ហេតុរបស់អ្នកប្រើប្រាស់
       title_friends: កំណត់ហេតុរបស់មិត្តភក្ដិ


@@ -235,7 +237,7 @@ km:
       scale: រង្វាស់​
       max: អតិ.
       image_size: ទំហំ​រូបភាព​
       scale: រង្វាស់​
       max: អតិ.
       image_size: ទំហំ​រូបភាព​

-      zoom: á\9e\96á\9e\84á\9f\92á\9e\9aá\9e¸á\9e\80á\9e¬á\9e\94á\9e\84á\9f\92á\9e\9aá\9e½á\9e\98
+      zoom: á\9e\96á\9e\84á\9f\92á\9e\9aá\9e¸á\9e\80á\9e\85á\9e¼á\9e\9bá\9e¬á\9e\94á\9e\84á\9f\92á\9e\9aá\9e½á\9e\98á\9e\85á\9f\81á\9e\89

       add_marker: បន្ថែមសញ្ញាសម្គាល់ទៅលើផែនទី
       latitude: រយៈទទឹង៖
       longitude: រយៈបណ្ដោយ៖
       add_marker: បន្ថែមសញ្ញាសម្គាល់ទៅលើផែនទី
       latitude: រយៈទទឹង៖
       longitude: រយៈបណ្ដោយ៖


@@ -254,20 +256,24 @@ km:
           bank: ធនាគារ
           bar: បារ
           bbq: BBQ
           bank: ធនាគារ
           bar: បារ
           bbq: BBQ

-          bench: បង់
-          bicycle_parking: á\9e\80á\9e\93á\9f\92á\9e\9bá\9f\82á\9e\84á\9e\85á\9e\8fá\9e\80á\9e\84á\9f\8b
-          bicycle_rental: á\9e\80á\9e\84á\9f\8bá\9e\87á\9e½á\9e\9b
+          bench: បង់អង្គុយ
+          bicycle_parking: á\9e\80á\9e\93á\9f\92á\9e\9bá\9f\82á\9e\84á\9e\85á\9e\8fá\9e\91á\9f\84á\9e\85á\9e\80á\9f\92á\9e\9aá\9e\99á\9e¶á\9e\93
+          bicycle_rental: á\9e\80á\9e\93á\9f\92á\9e\9bá\9f\82á\9e\84á\9e\87á\9e½á\9e\9bá\9e\91á\9f\84á\9e\85á\9e\80á\9f\92á\9e\9aá\9e\99á\9e¶á\9e\93

           biergarten: បៀរហ្កាដិន
           biergarten: បៀរហ្កាដិន

+          boat_rental: កន្លែងជួលទូក

           brothel: ផ្ទះបន
           bureau_de_change: កន្លែងប្ដូរប្រាក់
           bus_station: ចំណតឡានក្រុង
           cafe: ហាងកាហ្វេ
           brothel: ផ្ទះបន
           bureau_de_change: កន្លែងប្ដូរប្រាក់
           bus_station: ចំណតឡានក្រុង
           cafe: ហាងកាហ្វេ

-          car_rental: ឡានជួល
-          car_wash: លាងឡាន
-          casino: បនល្បែង
+          car_rental: កន្លែងជួលរថយន្ត
+          car_sharing: កន្លែងប្រើរថយន្តរួមគ្នា
+          car_wash: កន្លែងលាងរថយន្ត
+          casino: កាស៊ីណូ

           charging_station: ស្ថានីយ៍សាកភ្លើង
           charging_station: ស្ថានីយ៍សាកភ្លើង

+          childcare: កន្លែងថែទាំកុមារ

           cinema: រោងកុន
           clinic: គ្លីនីក
           cinema: រោងកុន
           clinic: គ្លីនីក

+          clock: នាឡិកា

           college: មហាវិទ្យាល័យ
           community_centre: មណ្ឌលសហគមន៍
           courthouse: តុលាការ
           college: មហាវិទ្យាល័យ
           community_centre: មណ្ឌលសហគមន៍
           courthouse: តុលាការ


@@ -277,27 +283,39 @@ km:
           drinking_water: ទឹកផឹក
           driving_school: សាលាបង្រៀនបើកបរ
           embassy: ស្ថានទូត
           drinking_water: ទឹកផឹក
           driving_school: សាលាបង្រៀនបើកបរ
           embassy: ស្ថានទូត

+          fast_food: ហាងម្ហូបទាន់ចិត្ត
+          ferry_terminal: ចំណតសាឡាង

           fire_station: ស្ថានីយ៍អគ្គីភ័យ
           food_court: អាហារដ្ឋាន
           fire_station: ស្ថានីយ៍អគ្គីភ័យ
           food_court: អាហារដ្ឋាន

-          fountain: á\9e\91á\9eºកផុស
+          fountain: á\9e\91á\9e¹កផុស

           fuel: ឥន្ធនៈ
           fuel: ឥន្ធនៈ

+          gambling: បនល្បែង

           grave_yard: វាលផ្នូរខ្មោច
           grave_yard: វាលផ្នូរខ្មោច

+          grit_bin: ធុងអំបិល

           hospital: មន្ទីរពេទ្យ
           hospital: មន្ទីរពេទ្យ

-          ice_cream: ការ៉េម
+          hunting_stand: ខ្ទមអ្នកប្រមាញ់
+          ice_cream: ហាងការ៉េម

           kindergarten: សាលាមតេ្តយ្យ
           library: បណ្ណាល័យ
           marketplace: ទីផ្សារ
           kindergarten: សាលាមតេ្តយ្យ
           library: បណ្ណាល័យ
           marketplace: ទីផ្សារ

+          monastery: ព្រះវិហារ
+          motorcycle_parking: ចំណត់ទោចក្រយានយន្ត

           nightclub: ក្លឹបរាត្រី
           nightclub: ក្លឹបរាត្រី

+          nursing_home: កន្លែងថែទាំជនចាស់ជរា

           office: ការិយាល័យ
           parking: ចំណតរថយន្ត
           office: ការិយាល័យ
           parking: ចំណតរថយន្ត

+          parking_entrance: ច្រកចូលចំណតរថយន្ត
+          parking_space: កន្លែងចតរថយន្ត

           pharmacy: ឱសថស្ថាន
           place_of_worship: ទីសក្ការបូជា
           police: នគរបាល
           pharmacy: ឱសថស្ថាន
           place_of_worship: ទីសក្ការបូជា
           police: នគរបាល

-          post_box: ប្រអប់ប្រៃសណីយ
+          post_box: ប្រអប់ប្រៃសណីយ៍

           post_office: ប៉ុស្តិ៍ប្រៃសណីយ៍
           post_office: ប៉ុស្តិ៍ប្រៃសណីយ៍

+          preschool: សាលាមតេ្តយ្យ

           prison: ពន្ធនាគារ
           prison: ពន្ធនាគារ

-          pub: á\9e\94á\9e¶á\9e\9a
+          pub: á\9e á\9e¶á\9e\84á\9e\9fá\9f\92á\9e\9aá\9e¶

           public_building: អាគារសាធារណៈ
           public_building: អាគារសាធារណៈ

+          recycling: កន្លែងចោលសំរាមអាចប្រើឡើងវិញ

           restaurant: ភោជនីយដ្ឋាន
           retirement_home: ផ្ទះចាស់ជរា
           sauna: សោណា
           restaurant: ភោជនីយដ្ឋាន
           retirement_home: ផ្ទះចាស់ជរា
           sauna: សោណា


@@ -306,16 +324,22 @@ km:
           shop: ហាង
           shower: កន្លែងងូតទឹក
           social_centre: មណ្ឌលសង្គមកិច្ច
           shop: ហាង
           shower: កន្លែងងូតទឹក
           social_centre: មណ្ឌលសង្គមកិច្ច

+          social_club: ក្លឹបសកម្មភាពសង្គម
+          social_facility: អាគារសាធារណៈ
+          studio: ស្ទុយឌីយ៉ូ

           swimming_pool: អាងហែលទឹក
           swimming_pool: អាងហែលទឹក

-          taxi: តាក់ស៊ី
+          taxi: á\9e\85á\9f\86á\9e\8eá\9e\8fá\9e\8fá\9e¶á\9e\80á\9f\8bá\9e\9fá\9f\8aá\9e¸

           telephone: ទូរស័ព្ទសាធារណៈ
           theatre: មហោស្រព
           toilets: បន្ទប់ទឹក
           telephone: ទូរស័ព្ទសាធារណៈ
           theatre: មហោស្រព
           toilets: បន្ទប់ទឹក

+          townhall: សាលាក្រុង

           university: សាកលវិទ្យាល័យ
           vending_machine: ម៉ាស៊ីនលក់
           veterinary: ពេទ្យសត្វ
           village_hall: សាលាភូមិ
           university: សាកលវិទ្យាល័យ
           vending_machine: ម៉ាស៊ីនលក់
           veterinary: ពេទ្យសត្វ
           village_hall: សាលាភូមិ

-          waste_basket: ធុងសម្រាម
+          waste_basket: ធុងសំរាម
+          waste_disposal: កន្លែងប្រមូលសំរាម
+          water_point: កន្លែងបូមទឹក

           youth_centre: មណ្ឌលយុវជន
         boundary:
           administrative: ព្រំដែនរដ្ឋបាល
           youth_centre: មណ្ឌលយុវជន
         boundary:
           administrative: ព្រំដែនរដ្ឋបាល


@@ -323,29 +347,71 @@ km:
           national_park: ឧទ្យានជាតិ
           protected_area: តំបន់ការពារ
         bridge:
           national_park: ឧទ្យានជាតិ
           protected_area: តំបន់ការពារ
         bridge:

-          swing: ស្ពានយោល
+          aqueduct: ផ្លូវបង្ហូរទឹក
+          boardwalk: ផ្លូវឈើ
+          suspension: ស្ពានយោល
+          swing: ស្ពានវិល
+          viaduct: ស្ពានខ្ពស់

           "yes": ស្ពាន
         building:
           "yes": អាគារ
           "yes": ស្ពាន
         building:
           "yes": អាគារ

+        craft:
+          brewery: កន្លែងបិតស្រា
+          carpenter: ហាងជាងឈើ
+          electrician: ហាងអគ្គីសនី
+          gardener: ហាងថែទាំសួនច្បារ
+          painter: ហាងលាបថ្នាំ
+          photographer: ហាងថតរូប
+          plumber: ហាងបំពុងទឹក
+          shoemaker: ហាងស្បែកជើង
+          tailor: ហាងកាត់ដេរ
+          "yes": ហាងសិប្បកម្ម

         emergency:
         emergency:

+          ambulance_station: ស្ថានីយ៍រថយន្តសង្គ្រោះបន្ទាន់
+          assembly_point: កន្លែងជួបជុំគ្នាពេលមានអាសន្ន
+          defibrillator: ម៉ាស៊ីនកន្ត្រាក់បេះដូង
+          landing_site: កន្លែងចុះចតពេលមានអាសន្ន

           phone: ទូរស័ព្ទសង្រ្គោះបន្ទាន់
           phone: ទូរស័ព្ទសង្រ្គោះបន្ទាន់

+          water_tank: ធុងស្ដុកទឹកពេលមានអាសន្ន

         highway:
         highway:

+          abandoned: ផ្លូវល្បឿនលឿនបោះបង់ចោល

           bridleway: ផ្លូវសេះ
           bridleway: ផ្លូវសេះ

+          bus_stop: ចំណតឡានក្រុង
+          construction: ផ្លូវល្បឿនលឿនកំពុងស្ថាបនា
+          cycleway: ផ្លូវទោចក្រយាន
+          elevator: ជណ្ដើរយោង
+          footway: ផ្លូវថ្មើរជើង
+          ford: ផ្លូវលិចទឹក
+          give_way: ផ្លាកសញ្ញាផ្ដល់អាទិភាព
+          motorway: ផ្លូវល្បឿនលឿន
+          motorway_link: ផ្លូវល្បឿនលឿន

           rest_area: កន្លែងសម្រាក
           road: ផ្លូវ
           rest_area: កន្លែងសម្រាក
           road: ផ្លូវ

+          stop: ផ្លាកសញ្ញាឈប់

           street_lamp: ភ្លើងបំភ្លឺផ្លូវ
           street_lamp: ភ្លើងបំភ្លឺផ្លូវ

+          traffic_signals: ភ្លើងសញ្ញាចរាចរណ៍

         historic:
           archaeological_site: ស្ថានីយ៍ប្រវត្តិសាស្ត្រ
           battlefield: សមរភូមិ
           boundary_stone: បង្គោលព្រំដែន
         historic:
           archaeological_site: ស្ថានីយ៍ប្រវត្តិសាស្ត្រ
           battlefield: សមរភូមិ
           boundary_stone: បង្គោលព្រំដែន

-          building: អាគារ
+          building: អាគារប្រវត្តិសាស្ត្រ
+          bunker: ត្រង់សេ

           castle: ប្រាសាទ
           church: វិហារគ្រិស្តសាសនា
           castle: ប្រាសាទ
           church: វិហារគ្រិស្តសាសនា

+          city_gate: ក្លោងទ្វារក្រុង
+          citywalls: កំផែងក្រុង

           fort: បន្ទាយ
           fort: បន្ទាយ

+          heritage: ស្ថនីយ៍បេតិកភ័ណ្ឌ

           house: ផ្ទះ
           house: ផ្ទះ

+          mine: ភ្នំរ៉ែ
+          mine_shaft: អណ្ដូងរ៉ែ

           tomb: ផ្នូរ
           tower: ប៉ម
           tomb: ផ្នូរ
           tower: ប៉ម

+          "yes": ស្ថានីយ៍ប្រវត្តិសាស្ត្រ

         landuse:
         landuse:

+          commercial: តំបន់ពាណិជ្ជកម្ម
+          conservation: តំបន់អភិរក្ស
+          construction: តំបន់កំពុងសាងសង់

           farm: កសិដ្ឋាន​
           farmland: ដីកសិដ្ឋាន
           farmyard: វាលកសិដ្ឋាន
           farm: កសិដ្ឋាន​
           farmland: ដីកសិដ្ឋាន
           farmyard: វាលកសិដ្ឋាន


@@ -353,20 +419,24 @@ km:
           grass: វាលស្មៅ
           industrial: តំបន់ឧស្សាហកម្ម
           military: តំបន់យោធា
           grass: វាលស្មៅ
           industrial: តំបន់ឧស្សាហកម្ម
           military: តំបន់យោធា

+          mine: ភ្នំរ៉ែ

           quarry: កន្លែងយកថ្ម
           railway: ផ្លូវដែក
           recreation_ground: ទីលានកំសាន្ត
           reservoir: បឹងស្តុកទឹក
           residential: តំបន់លំនៅដ្ឋាន
           quarry: កន្លែងយកថ្ម
           railway: ផ្លូវដែក
           recreation_ground: ទីលានកំសាន្ត
           reservoir: បឹងស្តុកទឹក
           residential: តំបន់លំនៅដ្ឋាន

+          retail: ហាងលក់រាយ

           road: តំបន់ផ្លូវ
           vineyard: ចំការទំពាំងបាយជូរ
         leisure:
           beach_resort: ឆ្នេរកំសាន្ត
           common: ដីរួម
           fishing: តំបន់ស្ទូចត្រី
           road: តំបន់ផ្លូវ
           vineyard: ចំការទំពាំងបាយជូរ
         leisure:
           beach_resort: ឆ្នេរកំសាន្ត
           common: ដីរួម
           fishing: តំបន់ស្ទូចត្រី

-          fitness_station: ស្ថានីយ៍កីឡា
+          fitness_centre: មណ្ឌលហាត់ប្រាណ
+          fitness_station: ស្ថានីយ៍ហាត់ប្រាណ

           garden: សួនច្បារ
           golf_course: ទីលានកូនហ្គោល
           garden: សួនច្បារ
           golf_course: ទីលានកូនហ្គោល

+          horse_riding: កន្លែងជិះសេះ

           ice_rink: តារាងលេងស្គីលើទឹកកក
           nature_reserve: តំបន់អភិរក្សធម្មជាតិ
           park: ឧទ្យាន​
           ice_rink: តារាងលេងស្គីលើទឹកកក
           nature_reserve: តំបន់អភិរក្សធម្មជាតិ
           park: ឧទ្យាន​


@@ -382,6 +452,7 @@ km:
         natural:
           bay: ឆកសមុទ្រ
           beach: ឆ្នេរខ្សាច់
         natural:
           bay: ឆកសមុទ្រ
           beach: ឆ្នេរខ្សាច់

+          cape: ជ្រោយ

           cave_entrance: ច្រកចូលរូងភ្នំ
           cliff: ជ្រោះ
           crater: មាត់ភ្នំភ្លើង
           cave_entrance: ច្រកចូលរូងភ្នំ
           cliff: ជ្រោះ
           crater: មាត់ភ្នំភ្លើង


@@ -402,11 +473,14 @@ km:
         office:
           accountant: គណនីករ
           architect: ស្ថាបត្យករ
         office:
           accountant: គណនីករ
           architect: ស្ថាបត្យករ

+          association: សមាគម

           company: ក្រុមហ៊ុន
           company: ក្រុមហ៊ុន

+          educational_institution: ស្ថាប័នអប់រំ

           employment_agency: ភ្នាក់ងារណែនាំការងារ
           estate_agent: ភ្នាក់ងារអចលនវត្ថុ
           government: ការិយាល័យរដ្ឋាភិបាល
           insurance: ការិយាល័យធានារ៉ាប់រង
           employment_agency: ភ្នាក់ងារណែនាំការងារ
           estate_agent: ភ្នាក់ងារអចលនវត្ថុ
           government: ការិយាល័យរដ្ឋាភិបាល
           insurance: ការិយាល័យធានារ៉ាប់រង

+          it: ការិយាល័យព័តមានវិទ្យា

           lawyer: មេធាវី
           ngo: ការិយាល័យ NGO
           telecommunication: ការិយាល័យទូរគមនាគមន៍
           lawyer: មេធាវី
           ngo: ការិយាល័យ NGO
           telecommunication: ការិយាល័យទូរគមនាគមន៍


@@ -414,7 +488,9 @@ km:
           "yes": ការិយាល័យ
         place:
           city: ទីក្រុង
           "yes": ការិយាល័យ
         place:
           city: ទីក្រុង

-          county: ប្រទេស
+          country: ប្រទេស​
+          county: ខេត្តក្រុង
+          farm: កសិដ្ឋាន​

           house: ផ្ទះ
           houses: ផ្ទះ
           island: កោះ
           house: ផ្ទះ
           houses: ផ្ទះ
           island: កោះ


@@ -427,9 +503,17 @@ km:
           abandoned: ផ្លូវដែកបោះបង់ចោល
           construction: ផ្លូវដែកកំពុងស្ថាបនា
           disused: ផ្លូវដែកឈប់ប្រើ
           abandoned: ផ្លូវដែកបោះបង់ចោល
           construction: ផ្លូវដែកកំពុងស្ថាបនា
           disused: ផ្លូវដែកឈប់ប្រើ

+          level_crossing: ផ្លូវកាត់ផ្លូវដែក
+          light_rail: ផ្លូវដែកធុនស្រាល
+          miniature: ផ្លូវដែកខ្នាតតូច
+          preserved: ផ្លូវដែកអភិរក្ស
+          proposed: ផ្លូវដែកគម្រោងសង់
+          spur: ផ្លូវខ្នែងផ្លូវដែក

           station: ស្ថានីយ៍ផ្លូវដែក
           station: ស្ថានីយ៍ផ្លូវដែក

-          subway: ស្ថានីយ៍រថភ្លើងក្រោមដី
+          stop: ស្ថានីយ៍ផ្លូវដែក
+          subway: ផ្លូវដែកក្រោមដី

           subway_entrance: ច្រកចូលស្ថានីយ៍រថភ្លើងក្រោមដី
           subway_entrance: ច្រកចូលស្ថានីយ៍រថភ្លើងក្រោមដី

+          switch: ផ្លូវបំបែកផ្លូវដែក

         shop:
           antiques: ហាងវត្ថុបុរាណ
           art: ហាងសិល្បៈ
         shop:
           antiques: ហាងវត្ថុបុរាណ
           art: ហាងសិល្បៈ


@@ -437,27 +521,68 @@ km:
           beauty: ហាងសម្អាងការ
           beverages: ហាងភេសជ្ជៈ
           bicycle: ហាងទោចក្រយាន
           beauty: ហាងសម្អាងការ
           beverages: ហាងភេសជ្ជៈ
           bicycle: ហាងទោចក្រយាន

+          bookmaker: ហាងភ្នាល់

           books: បណ្ណាគារ
           books: បណ្ណាគារ

+          boutique: ហាងសម្អាងការ

           butcher: ហាងសាច់
           butcher: ហាងសាច់

-          car: á\9e á\9e¶á\9e\84á\9e¡á\9e¶á\9e\93
-          car_parts: á\9e á\9e¶á\9e\84á\9e\82á\9f\92á\9e\9aá\9e¿á\9e\84á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e¡á\9e¶á\9e\93
-          car_repair: á\9e á\9e¶á\9e\84á\9e\87á\9e½á\9e\9fá\9e\87á\9e»á\9e\9bá\9e¡á\9e¶á\9e\93
+          car: á\9e á\9e¶á\9e\84á\9e\9aá\9e\90á\9e\99á\9e\93á\9f\92á\9e\8f
+          car_parts: á\9e á\9e¶á\9e\84á\9e\82á\9f\92á\9e\9aá\9e¿á\9e\84á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\9aá\9e\90á\9e\99á\9e\93á\9f\92á\9e\8f
+          car_repair: á\9e á\9e¶á\9e\84á\9e\87á\9e½á\9e\9fá\9e\87á\9e»á\9e\9bá\9e\9aá\9e\90á\9e\99á\9e\93á\9f\92á\9e\8f

           carpet: ហាងកម្រាលព្រំ
           carpet: ហាងកម្រាលព្រំ

+          charity: ហាងសប្បុរសធម៌
+          chemist: ហាងថ្នាំ
+          clothes: ហាងសម្លៀកបំពាក់
+          computer: ហាងកុំព្យូទ័រ
+          confectionery: ហាងនំ
+          copyshop: ហាងថតចម្លង
+          cosmetics: ហាងគ្រឿងសម្អាង
+          dry_cleaning: ហាងបោកអ៊ុត
+          electronics: ហាងអេឡិចត្រូនិច
+          estate_agent: ភ្នាក់ងារអចលនវត្ថុ
+          fish: ហាងត្រី
+          florist: ហាងផ្កា
+          food: ហាងអាហារ
+          furniture: ហាងសង្ហារឹម
+          gallery: វិចិត្រសាល
+          gift: ហាងវត្ថុអនុស្សាវរីយ៍
+          greengrocer: ហាងបន្លែនិងផ្លែឈើ
+          hairdresser: ហាងកាត់សក់និងអ៊ុតសក់
+          jewelry: ហាងលក់គ្រឿងអល័ង្ការ
+          laundry: ហាងបោកអ៊ុត
+          massage: ហាងម៉ាស្សា
+          mobile_phone: ហាងទូរស័ព្ទ
+          motorcycle: ហាងទោចក្រយានយន្ត
+          music: ហាងតន្ត្រី
+          newsagent: ហាងកាសែត
+          optician: ហាងវ៉ែនតា
+        tourism:
+          camp_site: កន្លែងបោះតង់
+          caravan_site: កន្លែងចតឡានបោះតង់

     description:
       types:
         cities: ក្រុង​
   layouts:
     description:
       types:
         cities: ក្រុង​
   layouts:

-    logout: ចាកចេញ​
-    log_in: ឡុកអ៊ីន​
-    sign_up: ចុះឈ្មោះ​
+    logout: កត់ឈ្មោះចេញ
+    log_in: កត់ឈ្មោះចូល
+    log_in_tooltip: កត់ឈ្មោះចូលជាមួយគណនីមានហើយ
+    sign_up: ចុះឈ្មោះ​ចូល

     edit: កែប្រែ​
     history: ប្រវត្តិ​
     export: នាំចេញ​
     tag_line: |-
       ផែនទីពិភពលោក​វិគីសេរី <br/>
       (The Free Wiki World Map)
     edit: កែប្រែ​
     history: ប្រវត្តិ​
     export: នាំចេញ​
     tag_line: |-
       ផែនទីពិភពលោក​វិគីសេរី <br/>
       (The Free Wiki World Map)

+    help: ជំនួយ
+    about: អំពី
+    copyright: រក្សាសិទ្ឋ
+    community: សហគមន៍

     make_a_donation:
       text: ជួយ​ឧបត្ថម្ភ​
     make_a_donation:
       text: ជួយ​ឧបត្ថម្ភ​

+    learn_more: ស្វែងយល់បន្ថែម
+    more: ផ្សេងទៀត
+  license_page:
+    foreign:
+      title: អំពីការបកប្រែនេះ

   notifier:
     diary_comment_notification:
       hi: សួស្ដី %{to_user},
   notifier:
     diary_comment_notification:
       hi: សួស្ដី %{to_user},


@@ -515,6 +640,16 @@ km:
     key:
       table:
         entry:
     key:
       table:
         entry:

+          motorway: ផ្លូវល្បឿនលឿន
+          main_road: ផ្លូវធំ
+          cycleway: ផ្លូវទោចក្រយាន
+          cycleway_national: ផ្លូវទោចក្រយានជាតិ
+          cycleway_local: ផ្លូវទោចក្រយានតំបន់
+          rail: ផ្លូវដែក
+          subway: ផ្លូវដែកក្រោមដី
+          tram:
+          - ផ្លូវដែកធុនស្រាល
+          admin: ព្រំដែនរដ្ឋបាល

           forest: ព្រៃឈើ​
           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​
           forest: ព្រៃឈើ​
           park: ឧទ្យាន​
           industrial: តំបន់ឧស្សាហកម្ម​


@@ -523,7 +658,7 @@ km:
           school:
           - សាលារៀន​
           - សាកលវិទ្យាល័យ​
           school:
           - សាលារៀន​
           - សាកលវិទ្យាល័យ​

-          station: á\9e\9fá\9f\92á\9e\90á\9e¶á\9e\93á\9e¸á\9e\99á\9e\9aá\9e\90á\9e\97á\9f\92á\9e\9bá\9e¾á\9e\84â\80\8b
+          station: á\9e\9fá\9f\92á\9e\90á\9e¶á\9e\93á\9e¸á\9e\99á\9f\8dá\9e\95á\9f\92á\9e\9bá\9e¼á\9e\9cá\9e\8aá\9f\82á\9e\80

   trace:
     edit:
       filename: ឈ្មោះឯកសារ​៖
   trace:
     edit:
       filename: ឈ្មោះឯកសារ​៖


@@ -533,7 +668,7 @@ km:
       edit: កែប្រែ​
       description: បរិយាយ​៖
       tags: ស្លាក​៖
       edit: កែប្រែ​
       description: បរិយាយ​៖
       tags: ស្លាក​៖

-      save_button: á\9e\9aá\9e\80á\9f\92á\9e\9fá\9e¶á\9e\91á\9e»á\9e\80â\80\8bá\9e\94á\9f\86លាស់ប្តូរនានា​
+      save_button: á\9e\9aá\9e\80á\9f\92á\9e\9fá\9e¶á\9e\91á\9e»á\9e\80â\80\8bá\9e\94á\9e\93á\9f\92លាស់ប្តូរនានា​

       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​​?
     trace_form:
       upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​​?
     trace_form:
       upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖


@@ -578,15 +713,44 @@ km:
       allow_write_api: កែសម្រួលផែនទី​
   user:
     login:
       allow_write_api: កែសម្រួលផែនទី​
   user:
     login:

-      title: á\9e¡á\9e»á\9e\80á\9e¢á\9f\8aá\9e¸á\9e\93â\80\8b
-      heading: á\9e¡á\9e»á\9e\80á\9e¢á\9f\8aá\9e¸á\9e\93â\80\8b
+      title: á\9e\80á\9e\8fá\9f\8bá\9e\88á\9f\92á\9e\98á\9f\84á\9f\87á\9e\85á\9e¼á\9e\9b
+      heading: á\9e\80á\9e\8fá\9f\8bá\9e\88á\9f\92á\9e\98á\9f\84á\9f\87á\9e\85á\9e¼á\9e\9b

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

-      login_button: ឡុកអ៊ីន​
+      login_button: កត់ឈ្មោះចូល
+      auth_providers:
+        openid:
+          title: កត់ឈ្មោះចូលដោយប្រើ OpenID
+        google:
+          title: កត់ឈ្មោះចូលដោយប្រើ Google
+        facebook:
+          title: កត់ឈ្មោះចូលដោយប្រើ Facebook
+        windowslive:
+          title: កត់ឈ្មោះចូលដោយប្រើ Windows Live
+        github:
+          title: កត់ឈ្មោះចូលដោយប្រើ GitHub
+        wikipedia:
+          title: កត់ឈ្មោះចូលដោយប្រើវិគីភីឌា
+        yahoo:
+          title: កត់ឈ្មោះចូលដោយប្រើ Yahoo
+        wordpress:
+          title: កត់ឈ្មោះចូលដោយប្រើ Wordpress
+        aol:
+          title: កត់ឈ្មោះចូលដោយប្រើ AOL
+    logout:
+      title: កត់ឈ្មោះចេញ
+      logout_button: កត់ឈ្មោះចេញ

     new:
     new:

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

     terms:
       agree: យល់​ព្រម​
       decline: បដិសេធ
     terms:
       agree: យល់​ព្រម​
       decline: បដិសេធ

+      legale_select: ប្រទេស​ស្នាក់​នៅ៖
+      legale_names:
+        france: ប្រទេសបារាំង
+        italy: ប្រទេសអ៊ីតាលី
+        rest_of_world: ប្រទេសផ្សេងទៀត

     view:
       my edits: កំណែប្រែ​របស់ខ្ញុំ​
       edits: កំណែប្រែ​
     view:
       my edits: កំណែប្រែ​របស់ខ្ញុំ​
       edits: កំណែប្រែ​


@@ -594,8 +758,8 @@ km:
       add as friend: បន្ថែមជាមិត្ត​
       description: បរិយាយ​
       no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។
       add as friend: បន្ថែមជាមិត្ត​
       description: បរិយាយ​
       no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។

-      km away: á\9e\98á\9e¶á\9e\93á\9e\85á\9f\86ងាយ %{count} គ.ម.
-      m away: á\9e\98á\9e¶á\9e\93á\9e\85á\9f\86ងាយ %{count} ម.
+      km away: á\9e\85á\9e\98á\9f\92ងាយ %{count} គ.ម.
+      m away: á\9e\85á\9e\98á\9f\92ងាយ %{count} ម.

     account:
       title: កែប្រែគណនី​
       public editing:
     account:
       title: កែប្រែគណនី​
       public editing:


@@ -611,13 +775,41 @@ km:
       heading: បញ្ជាក់ការផ្លាស់ប្ដូរ​អាសយដ្ឋានអ៊ីមែល
       press confirm button: ចុចលើប៉ូតុងខាងក្រោមដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក​។
       button: បញ្ជាក់​
       heading: បញ្ជាក់ការផ្លាស់ប្ដូរ​អាសយដ្ឋានអ៊ីមែល
       press confirm button: ចុចលើប៉ូតុងខាងក្រោមដើម្បីបញ្ជាក់អាសយដ្ឋានអ៊ីមែលថ្មីរបស់អ្នក​។
       button: បញ្ជាក់​

-      success: បានបញ្ជាក់អាសយដ្ឋានអ៊ីមែលរបស់អ្នករូចរាល់ហើយ សូមអរគុណចំពោះការចុះឈ្មោះ​!
+      success: បានបញ្ជាក់អាសយដ្ឋានអ៊ីមែលរបស់អ្នករូចរាល់ហើយ!

     make_friend:
       success: '%{name} ឥឡូវនេះជាមិត្តរបស់អ្នក​។'
       failed: អភ័យទោស, បរាជ័យក្នុងការបន្ដែម %{name} ជាមិត្ត​។
       already_a_friend: អ្នកគឺជាមិត្តជាមួយ %{name} រួចហើយ​។
     remove_friend:
       not_a_friend: '%{name} មិនមែនជាមិត្តរបស់អ្នកទេ​។'
     make_friend:
       success: '%{name} ឥឡូវនេះជាមិត្តរបស់អ្នក​។'
       failed: អភ័យទោស, បរាជ័យក្នុងការបន្ដែម %{name} ជាមិត្ត​។
       already_a_friend: អ្នកគឺជាមិត្តជាមួយ %{name} រួចហើយ​។
     remove_friend:
       not_a_friend: '%{name} មិនមែនជាមិត្តរបស់អ្នកទេ​។'

+  javascripts:
+    embed:
+      report_problem: រាយការណ៍​បញ្ហា
+    key:
+      title: កំណត់សម្គាល់
+      tooltip: កំណត់សម្គាល់
+      tooltip_disabled: ស្រទាប់នេះគ្មានកំណត់សម្គាល់ទេ
+    map:
+      zoom:
+        in: ពង្រីកចូល
+        out: បង្រួមចេញ
+      locate:
+        title: បង្ហាញទីតាំងខ្ញុំ
+        popup: អ្នកកំពុងស្ថិតនៅចម្ងាយ {distance} {unit} ពីចំនុចនេះ
+      base:
+        standard: ស្តង់ដារ
+        cycle_map: ផែនទីផ្លូវទោចក្រយាន
+        transport_map: ផែនទីចរាចរណ៍
+        hot: សកម្មភាពមនុស្សធម៌
+      layers:
+        header: ស្រទាប់ផែនទី
+        title: ស្រទាប់
+    site:
+      edit_disabled_tooltip: ពង្រីកចូលដើម្បីកែប្រែផែនទី
+      createnote_disabled_tooltip: ពង្រីកចូលដើម្បីបន្ថែមចំណារទៅលើផែនទី
+      map_data_zoom_in_tooltip: ពង្រីកចូលដើម្បីមើលទិន្នន័យផែនទី
+    context:
+      show_address: បង្ហាញអាសយដ្ឋាន

   redaction:
     show:
       description: បរិយាយ៖
   redaction:
     show:
       description: បរិយាយ៖

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 50f270249b11376a00a2c748c0c7c9753b76ed2e..1b03a90f34b9d6b62b541844a3c6a141f250f10f 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -416,6 +416,7 @@ ko:
           apron: 에이프런
           gate: 문
           helipad: 헬기 착륙장
           apron: 에이프런
           gate: 문
           helipad: 헬기 착륙장

+          parking_position: 주차 위치

           runway: 활주로
           taxiway: 유도로
           terminal: 터미널
           runway: 활주로
           taxiway: 유도로
           terminal: 터미널


@@ -474,6 +475,7 @@ ko:
           office: 사옥
           parking: 주차장
           parking_entrance: 주차장 입구
           office: 사옥
           parking: 주차장
           parking_entrance: 주차장 입구

+          parking_space: 주차 공간

           pharmacy: 약국
           place_of_worship: 예배당
           police: 경찰서
           pharmacy: 약국
           place_of_worship: 예배당
           police: 경찰서


@@ -597,6 +599,7 @@ ko:
           manor: 장원
           memorial: 기념비
           mine: 광산
           manor: 장원
           memorial: 기념비
           mine: 광산

+          mine_shaft: 탄갱

           monument: 기념물
           roman_road: 로마 도로
           ruins: 폐허
           monument: 기념물
           roman_road: 로마 도로
           ruins: 폐허


@@ -869,6 +872,8 @@ ko:
           stationery: 문구점
           supermarket: 수퍼마켓
           tailor: 양복점
           stationery: 문구점
           supermarket: 수퍼마켓
           tailor: 양복점

+          ticket: 매표소
+          tobacco: 담배 가게

           toys: 완구점
           travel_agency: 여행사
           tyres: 타이어 상점
           toys: 완구점
           travel_agency: 여행사
           tyres: 타이어 상점


@@ -2119,20 +2124,6 @@ ko:
     period:
       one: 1시간
       other: '%{count}시간'
     period:
       one: 1시간
       other: '%{count}시간'

-    partial:
-      show: 보기
-      edit: 편집
-      revoke: 해제!
-      confirm: 확실합니까?
-      display_name: 차단된 사용자
-      creator_name: 만든이
-      reason: 차단 이유
-      status: 상태
-      revoker_name: 해제자
-      not_revoked: (철회하지 않음)
-      showing_page: '%{page}쪽'
-      next: 다음 »
-      previous: « 이전

     helper:
       time_future: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.
     helper:
       time_future: '%{time}에 끝납니다.'
       until_login: 사용자가 로그인할 때까지 활성합니다.


@@ -2162,6 +2153,21 @@ ko:
       back: 모든 차단 보기
       revoker: '해제:'
       needs_view: 차단 해제하기 전에 다시 로그인해야합니다.
       back: 모든 차단 보기
       revoker: '해제:'
       needs_view: 차단 해제하기 전에 다시 로그인해야합니다.

+  user_blocks:
+    block:
+      not_revoked: (철회하지 않음)
+      show: 보기
+      edit: 편집
+      revoke: 해제!
+    blocks:
+      display_name: 차단된 사용자
+      creator_name: 만든이
+      reason: 차단 이유
+      status: 상태
+      revoker_name: 해제자
+      showing_page: '%{page}쪽'
+      next: 다음 »
+      previous: « 이전

   note:
     description:
       opened_at_html: '%{when} 전에 만듦'
   note:
     description:
       opened_at_html: '%{when} 전에 만듦'

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 477f44aaa171ab53fb73fbc6df908d0facadceb6..6bdc8a0d0ba29d28aaa515565e1b58f8b358556a 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1697,6 +1697,7 @@ ku-Latn:
       delete_track: Vê şopê jê bibe
       trace_not_found: Şop nehate dîtin!
       visibility: Kî dikare bibîneː
       delete_track: Vê şopê jê bibe
       trace_not_found: Şop nehate dîtin!
       visibility: Kî dikare bibîneː

+      confirm_delete: Vê şopê dixwazî jê bibî?

     trace_paging_nav:
       showing_page: Rûpel %{page}
       older: Şopên kevintir
     trace_paging_nav:
       showing_page: Rûpel %{page}
       older: Şopên kevintir


@@ -2288,20 +2289,6 @@ ku-Latn:
     period:
       one: 1 saetê
       other: '%{count} saetan'
     period:
       one: 1 saetê
       other: '%{count} saetan'

-    partial:
-      show: Nîşan bide
-      edit: Biguherîne
-      revoke: Betal bike!
-      confirm: Tu piştrast î?
-      display_name: Bikarhênerê astengkirî
-      creator_name: Çêker
-      reason: Sedema astengkirinê
-      status: Rewş
-      revoker_name: Yê ku betal kiriyeː
-      not_revoked: (ne betalkirî)
-      showing_page: Rûpel %{page}
-      next: Pêşve »
-      previous: « Paşve

     helper:
       time_future: Di %{time} de diqede.
       until_login: Heta ku bikarhêner têkeve aktîv e
     helper:
       time_future: Di %{time} de diqede.
       until_login: Heta ku bikarhêner têkeve aktîv e


@@ -2331,6 +2318,21 @@ ku-Latn:
       back: Hemû astengiyan bibîne
       revoker: Yê ku rakiriyeː
       needs_view: Divê bikarhêner berî ku ev astengî rabe têbikeve.
       back: Hemû astengiyan bibîne
       revoker: Yê ku rakiriyeː
       needs_view: Divê bikarhêner berî ku ev astengî rabe têbikeve.

+  user_blocks:
+    block:
+      not_revoked: (ne betalkirî)
+      show: Nîşan bide
+      edit: Biguherîne
+      revoke: Betal bike!
+    blocks:
+      display_name: Bikarhênerê astengkirî
+      creator_name: Çêker
+      reason: Sedema astengkirinê
+      status: Rewş
+      revoker_name: Yê ku betal kiriyeː
+      showing_page: Rûpel %{page}
+      next: Pêşve »
+      previous: « Paşve

   note:
     description:
       opened_at_html: Berî %{when} hate çêkirin
   note:
     description:
       opened_at_html: Berî %{when} hate çêkirin

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index cd115fcb9f87fbe3519975f53a01d64503fe2ea6..48129516f420c30fbbc94693bdcf9a649fdde60f 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1218,19 +1218,6 @@ lb:
     period:
       one: 1 Stonn
       other: '%{count} Stonnen'
     period:
       one: 1 Stonn
       other: '%{count} Stonnen'

-    partial:
-      show: Weisen
-      edit: Änneren
-      revoke: Ophiewen!
-      confirm: Sidd Dir sécher?
-      display_name: Gespaarte Benotzer
-      reason: Grond fir d'Spär
-      status: Status
-      revoker_name: Opgehuewe vum
-      not_revoked: (net opgehuewen)
-      showing_page: Säit %{page}
-      next: Nächst »
-      previous: « Vireg

     blocks_on:
       title: Späre vum %{name}
       empty: '%{name} gouf bis elo nach net gespaart.'
     blocks_on:
       title: Späre vum %{name}
       empty: '%{name} gouf bis elo nach net gespaart.'


@@ -1248,6 +1235,20 @@ lb:
       confirm: Sidd Dir sécher?
       reason: 'Grond fir d''Spär:'
       back: All Späre weisen
       confirm: Sidd Dir sécher?
       reason: 'Grond fir d''Spär:'
       back: All Späre weisen

+  user_blocks:
+    block:
+      not_revoked: (net opgehuewen)
+      show: Weisen
+      edit: Änneren
+      revoke: Ophiewen!
+    blocks:
+      display_name: Gespaarte Benotzer
+      reason: Grond fir d'Spär
+      status: Status
+      revoker_name: Opgehuewe vum
+      showing_page: Säit %{page}
+      next: Nächst »
+      previous: « Vireg

   note:
     rss:
       title: OpenStreetMap Notizen
   note:
     rss:
       title: OpenStreetMap Notizen

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8d94f6f1adf52238013810d6a0247f0dc9e6942b..64d2eae1409c759cced163e0a019ef751c36a059 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -2201,20 +2201,6 @@ lt:
     period:
       one: 1 valanda
       other: '%{count} valandos'
     period:
       one: 1 valanda
       other: '%{count} valandos'

-    partial:
-      show: Rodyti
-      edit: Keisti
-      revoke: Atšaukti!
-      confirm: Ar tikrai?
-      display_name: Blokuojamas naudotojas
-      creator_name: Kūrėjas
-      reason: Blokavimo priežastis
-      status: Būsena
-      revoker_name: Atšaukė
-      not_revoked: (neatšauktas)
-      showing_page: Puslapis %{page}
-      next: Kitas »
-      previous: « Ankstesnis

     helper:
       time_future: Baigiasi po %{time}.
       until_login: Aktyvus iki naudotojo prisijungimo.
     helper:
       time_future: Baigiasi po %{time}.
       until_login: Aktyvus iki naudotojo prisijungimo.


@@ -2243,6 +2229,21 @@ lt:
       back: Peržiūrėti visus blokavimus
       revoker: 'Atšaukėjas:'
       needs_view: Naudotojas turi prisijungti, kad jo blokavimas būtų panaikintas.
       back: Peržiūrėti visus blokavimus
       revoker: 'Atšaukėjas:'
       needs_view: Naudotojas turi prisijungti, kad jo blokavimas būtų panaikintas.

+  user_blocks:
+    block:
+      not_revoked: (neatšauktas)
+      show: Rodyti
+      edit: Keisti
+      revoke: Atšaukti!
+    blocks:
+      display_name: Blokuojamas naudotojas
+      creator_name: Kūrėjas
+      reason: Blokavimo priežastis
+      status: Būsena
+      revoker_name: Atšaukė
+      showing_page: Puslapis %{page}
+      next: Kitas »
+      previous: « Ankstesnis

   note:
     description:
       opened_at_html: Sukurta prieš %{when}
   note:
     description:
       opened_at_html: Sukurta prieš %{when}

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 0f5cafb3852c9a071152e2693f5a1b0b04c5eaa5..07ebde4a0e262aa19ed1296c2159f14f27906b26 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -2171,20 +2171,6 @@ lv:
     period:
       one: 1 stunda
       other: '%{count} stundas'
     period:
       one: 1 stunda
       other: '%{count} stundas'

-    partial:
-      show: Rādīt
-      edit: Labot
-      revoke: Atsaukt!
-      confirm: Vai esat pārliecināts?
-      display_name: Bloķēts lietotājs
-      creator_name: Autors
-      reason: Iemesls liegumam
-      status: Statuss
-      revoker_name: Atsaucis
-      not_revoked: (nav atsaukts)
-      showing_page: Rāda lapu %{page}
-      next: Nākamais »
-      previous: « Iepriekšējais

     helper:
       time_future: Beidzas %{time}.
       until_login: Aktīvs līdz lietotājs autorizēsies.
     helper:
       time_future: Beidzas %{time}.
       until_login: Aktīvs līdz lietotājs autorizēsies.


@@ -2213,6 +2199,21 @@ lv:
       back: Skatīt visus bloķējumus
       revoker: 'Atsaucējs:'
       needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks notīrīts.
       back: Skatīt visus bloķējumus
       revoker: 'Atsaucējs:'
       needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks notīrīts.

+  user_blocks:
+    block:
+      not_revoked: (nav atsaukts)
+      show: Rādīt
+      edit: Labot
+      revoke: Atsaukt!
+    blocks:
+      display_name: Bloķēts lietotājs
+      creator_name: Autors
+      reason: Iemesls liegumam
+      status: Statuss
+      revoker_name: Atsaucis
+      showing_page: Rāda lapu %{page}
+      next: Nākamais »
+      previous: « Iepriekšējais

   note:
     description:
       opened_at_html: Izveidots %{when} atpakaļ
   note:
     description:
       opened_at_html: Izveidots %{when} atpakaļ

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 3fed1769f9e3125b436bfa8a67c98884ace121c8..a75bdd280b54fc950b8ef391a76ab53b2cc4488a 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2275,20 +2275,6 @@ mk:
     period:
       one: еден час
       other: '%{count} часа'
     period:
       one: еден час
       other: '%{count} часа'

-    partial:
-      show: Прикажи
-      edit: Уреди
-      revoke: Поништи!
-      confirm: Дали сте сигурни?
-      display_name: Блокиран корисник
-      creator_name: Создавач
-      reason: Причина за блокирање
-      status: Статус
-      revoker_name: 'Поништил:'
-      not_revoked: (не се поништува)
-      showing_page: Страница %{page}
-      next: Следна »
-      previous: « Претходна

     helper:
       time_future: Истекува за %{time}.
       until_login: Активно додека не се најави корисникот.
     helper:
       time_future: Истекува за %{time}.
       until_login: Активно додека не се најави корисникот.


@@ -2318,6 +2304,21 @@ mk:
       back: Преглед на сите блокови
       revoker: 'Поништувач:'
       needs_view: Овој корисник мора да се најави пред да се исчисти блокот.
       back: Преглед на сите блокови
       revoker: 'Поништувач:'
       needs_view: Овој корисник мора да се најави пред да се исчисти блокот.

+  user_blocks:
+    block:
+      not_revoked: (не се поништува)
+      show: Прикажи
+      edit: Уреди
+      revoke: Поништи!
+    blocks:
+      display_name: Блокиран корисник
+      creator_name: Создавач
+      reason: Причина за блокирање
+      status: Статус
+      revoker_name: 'Поништил:'
+      showing_page: Страница %{page}
+      next: Следна »
+      previous: « Претходна

   note:
     description:
       opened_at_html: Создадена пред %{when}
   note:
     description:
       opened_at_html: Создадена пред %{when}

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 150ade432b2f6f7058b8cc043b9e4cfd2f1479fd..5ed2a720886c466b2d87c9442e3ade70d09473f5 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1366,8 +1366,8 @@ mr:
     period:
       one: १ तास
       other: '%{count} तास'
     period:
       one: १ तास
       other: '%{count} तास'

-    partial:
-      confirm: नक्की आहात?
+  user_blocks:
+    blocks:

       showing_page: पान %{page}
       next: पुढील »
       previous: « मागील
       showing_page: पान %{page}
       next: पुढील »
       previous: « मागील

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index ef6e0154ca7b4cf82a90a4a9dd33865ae7fb4658..fc0ffca9705816e2244ae814a5e944ab82130a31 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -2077,20 +2077,6 @@ ms:
     period:
       one: 1 jam
       other: '%{count} jam'
     period:
       one: 1 jam
       other: '%{count} jam'

-    partial:
-      show: Tunjukkan
-      edit: Sunting
-      revoke: Tarik Balik!
-      confirm: Adakah anda pasti?
-      display_name: Pengguna yang Disekat
-      creator_name: Pembuat
-      reason: Sebab sekatan
-      status: Status
-      revoker_name: Ditarik balik oleh
-      not_revoked: (tidak ditarik balik)
-      showing_page: Halaman %{page}
-      next: Berikutnya »
-      previous: « Sebelumnya

     helper:
       time_future: Berakhir dalam masa %{time}.
       until_login: Aktif sehingga pengguna itu log masuk.
     helper:
       time_future: Berakhir dalam masa %{time}.
       until_login: Aktif sehingga pengguna itu log masuk.


@@ -2118,6 +2104,21 @@ ms:
       back: Lihat semua sekatan
       revoker: 'Penarik balik:'
       needs_view: Pengguna perlu log masuk sebelum sekatan ini dapat ditarik balik.
       back: Lihat semua sekatan
       revoker: 'Penarik balik:'
       needs_view: Pengguna perlu log masuk sebelum sekatan ini dapat ditarik balik.

+  user_blocks:
+    block:
+      not_revoked: (tidak ditarik balik)
+      show: Tunjukkan
+      edit: Sunting
+      revoke: Tarik Balik!
+    blocks:
+      display_name: Pengguna yang Disekat
+      creator_name: Pembuat
+      reason: Sebab sekatan
+      status: Status
+      revoker_name: Ditarik balik oleh
+      showing_page: Halaman %{page}
+      next: Berikutnya »
+      previous: « Sebelumnya

   note:
     description:
       opened_at_html: Dicatatkan %{when} yang lalu
   note:
     description:
       opened_at_html: Dicatatkan %{when} yang lalu

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index c2e00da526ffe29e17ed3efce8d8f3b6a33f6e1d..bdc3489b86e9f3c8f8b65c9433e1fbff3d56112c 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -2167,20 +2167,6 @@ nb:
     period:
       one: 1 time
       other: '%{count} timer'
     period:
       one: 1 time
       other: '%{count} timer'

-    partial:
-      show: Vis
-      edit: Rediger
-      revoke: Tilbakekall!
-      confirm: Er du sikker?
-      display_name: Blokkert bruker
-      creator_name: Opprettet av
-      reason: Årsak for blokkering
-      status: Status
-      revoker_name: Tilbakekalt av
-      not_revoked: (ikke tilbakekalt)
-      showing_page: Side %{page}
-      next: Neste »
-      previous: « Forrige

     helper:
       time_future: Slutter om %{time}.
       until_login: Aktiv inntil brukeren logger inn.
     helper:
       time_future: Slutter om %{time}.
       until_login: Aktiv inntil brukeren logger inn.


@@ -2211,6 +2197,21 @@ nb:
       back: Vis alle blokkeringer
       revoker: 'Tilbakekaller:'
       needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
       back: Vis alle blokkeringer
       revoker: 'Tilbakekaller:'
       needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.

+  user_blocks:
+    block:
+      not_revoked: (ikke tilbakekalt)
+      show: Vis
+      edit: Rediger
+      revoke: Tilbakekall!
+    blocks:
+      display_name: Blokkert bruker
+      creator_name: Opprettet av
+      reason: Årsak for blokkering
+      status: Status
+      revoker_name: Tilbakekalt av
+      showing_page: Side %{page}
+      next: Neste »
+      previous: « Forrige

   note:
     description:
       opened_at_html: Opprettet for %{when} siden
   note:
     description:
       opened_at_html: Opprettet for %{when} siden

diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index c0bb47599368a2c468fbe8fa594ca1389e09b3eb..c99039786e6e53f160ca258f7d3df12d5f5bf05b 100644 (file)
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -628,13 +628,14 @@ nds:
       success: '%{name} is rutnahmen bi de Frünn.'
       not_a_friend: '%{name} is keen von dien Frünn.'
   user_block:
       success: '%{name} is rutnahmen bi de Frünn.'
       not_a_friend: '%{name} is keen von dien Frünn.'
   user_block:

-    partial:
-      show: Wiesen
-      edit: Ännern

     show:
       status: Status
       show: Wiesen
       edit: Ännern
     show:
       status: Status
       show: Wiesen
       edit: Ännern

+  user_blocks:
+    block:
+      show: Wiesen
+      edit: Ännern

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 009cea823342ffae860e6529b9eea2ba2790e49d..330d622c9702fe14f87fe68a2919e78478736048 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -1169,21 +1169,22 @@ ne:
       fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका
         दुबै मान्य छन् भन्ने खुलाउनु होस् ।
   user_block:
       fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका
         दुबै मान्य छन् भन्ने खुलाउनु होस् ।
   user_block:

-    partial:
+    show:
+      created: सृजना गरिएको
+      status: वस्तुस्थिति

       show: देखाउनुहोस्
       edit: सम्पादन
       confirm: निश्चित हुनुहुन्छ ?
       show: देखाउनुहोस्
       edit: सम्पादन
       confirm: निश्चित हुनुहुन्छ ?

+  user_blocks:
+    block:
+      show: देखाउनुहोस्
+      edit: सम्पादन
+    blocks:

       creator_name: सर्जक
       status: वस्तुस्थिति
       showing_page: पृष्ठ %{page}
       next: अर्को »
       previous: « अघिल्लो
       creator_name: सर्जक
       status: वस्तुस्थिति
       showing_page: पृष्ठ %{page}
       next: अर्को »
       previous: « अघिल्लो

-    show:
-      created: सृजना गरिएको
-      status: वस्तुस्थिति
-      show: देखाउनुहोस्
-      edit: सम्पादन
-      confirm: निश्चित हुनुहुन्छ ?

   note:
     entry:
       comment: टिप्पणी
   note:
     entry:
       comment: टिप्पणी

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e5943661b715d5b0baebf63be1564696f0ed4d65..55f7dc2c0378f9c3e16cd5d9c94351efc039c944 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -2237,20 +2237,6 @@ nl:
     period:
       one: 1 uur
       other: '%{count} uur'
     period:
       one: 1 uur
       other: '%{count} uur'

-    partial:
-      show: Weergeven
-      edit: Bewerken
-      revoke: Intrekken
-      confirm: Weet u het zeker?
-      display_name: Geblokkeerde gebruiker
-      creator_name: Auteur
-      reason: Reden voor blokkade
-      status: Status
-      revoker_name: Ingetrokken door
-      not_revoked: (niet ingetrokken)
-      showing_page: Pagina %{page}
-      next: Volgende »
-      previous: « Vorige

     helper:
       time_future: Vervalt over %{time}.
       until_login: Actief totdat de gebruiker zich aanmeldt.
     helper:
       time_future: Vervalt over %{time}.
       until_login: Actief totdat de gebruiker zich aanmeldt.


@@ -2281,6 +2267,21 @@ nl:
       back: Alle blokkades bekijken
       revoker: 'Ingetrokken door:'
       needs_view: De gebruiker moet aanmelden voordat deze blokkade wordt verwijderd.
       back: Alle blokkades bekijken
       revoker: 'Ingetrokken door:'
       needs_view: De gebruiker moet aanmelden voordat deze blokkade wordt verwijderd.

+  user_blocks:
+    block:
+      not_revoked: (niet ingetrokken)
+      show: Weergeven
+      edit: Bewerken
+      revoke: Intrekken
+    blocks:
+      display_name: Geblokkeerde gebruiker
+      creator_name: Auteur
+      reason: Reden voor blokkade
+      status: Status
+      revoker_name: Ingetrokken door
+      showing_page: Pagina %{page}
+      next: Volgende »
+      previous: « Vorige

   note:
     description:
       opened_at_html: '%{when} geleden gemaakt'
   note:
     description:
       opened_at_html: '%{when} geleden gemaakt'

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index bd28cc51a11973a7d5f2c5d703934ca93f9756bf..427a1301a7ff6d194e8263572f56d291eb3d05f4 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1979,20 +1979,6 @@ nn:
     period:
       one: 1 time
       other: '%{count} timar'
     period:
       one: 1 time
       other: '%{count} timar'

-    partial:
-      show: Vis
-      edit: Rediger
-      revoke: Tilbakekall!
-      confirm: Er du sikker?
-      display_name: Blokkert brukar
-      creator_name: Oppretta av
-      reason: Årsak for blokkering
-      status: Status
-      revoker_name: Tilbakekalt av
-      not_revoked: (ikkje tilbakekalt)
-      showing_page: Side %{page}
-      next: Neste »
-      previous: « Forrige

     helper:
       time_future: Sluttar om %{time}.
       until_login: Aktiv inntil brukaren loggar inn.
     helper:
       time_future: Sluttar om %{time}.
       until_login: Aktiv inntil brukaren loggar inn.


@@ -2023,6 +2009,21 @@ nn:
       back: Vis alle blokkeringar
       revoker: 'Tilbakekaller:'
       needs_view: Brukaren må logge inn før denne blokkeringa vert fjerna.
       back: Vis alle blokkeringar
       revoker: 'Tilbakekaller:'
       needs_view: Brukaren må logge inn før denne blokkeringa vert fjerna.

+  user_blocks:
+    block:
+      not_revoked: (ikkje tilbakekalt)
+      show: Vis
+      edit: Rediger
+      revoke: Tilbakekall!
+    blocks:
+      display_name: Blokkert brukar
+      creator_name: Oppretta av
+      reason: Årsak for blokkering
+      status: Status
+      revoker_name: Tilbakekalt av
+      showing_page: Side %{page}
+      next: Neste »
+      previous: « Forrige

   note:
     description:
       opened_at_html: Oppretta for %{when} sidan
   note:
     description:
       opened_at_html: Oppretta for %{when} sidan

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index c64b1f4c111d4c43b5889920392d76bed49d2274..1ae462c525734a5de5fcbbc3f49e581db598302b 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -2043,20 +2043,6 @@ oc:
     period:
       one: 1 ora
       other: '%{count} oras'
     period:
       one: 1 ora
       other: '%{count} oras'

-    partial:
-      show: Afichar
-      edit: Modificar
-      revoke: Revocar !
-      confirm: Sètz segur ?
-      display_name: Utilizaire blocat
-      creator_name: Creator
-      reason: Motiu del blocatge
-      status: Estatut
-      revoker_name: Revocat per
-      not_revoked: (pas revocat)
-      showing_page: Pagina %{page}
-      next: Seguent »
-      previous: « Precedent

     helper:
       time_future: Acaba a %{time}.
       until_login: Actiu fins al moment que l'utilizaire se connectarà.
     helper:
       time_future: Acaba a %{time}.
       until_login: Actiu fins al moment que l'utilizaire se connectarà.


@@ -2085,6 +2071,21 @@ oc:
       back: Afichar totes los blocatges
       revoker: 'Revocador :'
       needs_view: L'utilizaire se deu connectar abans qu'aqueste blocatge siá suprimit.
       back: Afichar totes los blocatges
       revoker: 'Revocador :'
       needs_view: L'utilizaire se deu connectar abans qu'aqueste blocatge siá suprimit.

+  user_blocks:
+    block:
+      not_revoked: (pas revocat)
+      show: Afichar
+      edit: Modificar
+      revoke: Revocar !
+    blocks:
+      display_name: Utilizaire blocat
+      creator_name: Creator
+      reason: Motiu del blocatge
+      status: Estatut
+      revoker_name: Revocat per
+      showing_page: Pagina %{page}
+      next: Seguent »
+      previous: « Precedent

   note:
     description:
       opened_at_html: Creat fa %{when}
   note:
     description:
       opened_at_html: Creat fa %{when}

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 1d923718327e359d5b549d2b4989999943da5334..47337e3377ee131a66e142c68de1f51cae6f93f5 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1197,25 +1197,26 @@ pa:
     period:
       one: ੧ ਘੰਟਾ
       other: '%{count} ਘੰਟੇ'
     period:
       one: ੧ ਘੰਟਾ
       other: '%{count} ਘੰਟੇ'

-    partial:
+    show:
+      status: ਹਾਲਾਤ

       show: ਵਿਖਾਉ
       edit: ਸੋਧੋ
       show: ਵਿਖਾਉ
       edit: ਸੋਧੋ

-      revoke: ਪਰਤਾਉ!

       confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ?
       confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ?

+      reason: 'ਰੋਕ ਦਾ ਕਾਰਨ:'
+      back: ਸਾਰੀਆਂ ਰੋਕਾਂ ਵੇਖੋ
+      revoker: 'ਪਰਤਾਉਣ ਵਾਲ਼ਾ:'
+  user_blocks:
+    block:
+      show: ਵਿਖਾਉ
+      edit: ਸੋਧੋ
+      revoke: ਪਰਤਾਉ!
+    blocks:

       display_name: ਰੋਕਿਆ ਵਰਤੋਂਕਾਰ
       creator_name: ਸਿਰਜਣਹਾਰ
       reason: ਰੋਕ ਦਾ ਕਾਰਨ
       status: ਦਰਜਾ
       next: ਅਗਲਾ »
       previous: « ਪਿਛਲਾ
       display_name: ਰੋਕਿਆ ਵਰਤੋਂਕਾਰ
       creator_name: ਸਿਰਜਣਹਾਰ
       reason: ਰੋਕ ਦਾ ਕਾਰਨ
       status: ਦਰਜਾ
       next: ਅਗਲਾ »
       previous: « ਪਿਛਲਾ

-    show:
-      status: ਹਾਲਾਤ
-      show: ਵਿਖਾਉ
-      edit: ਸੋਧੋ
-      confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ?
-      reason: 'ਰੋਕ ਦਾ ਕਾਰਨ:'
-      back: ਸਾਰੀਆਂ ਰੋਕਾਂ ਵੇਖੋ
-      revoker: 'ਪਰਤਾਉਣ ਵਾਲ਼ਾ:'

   note:
     entry:
       comment: ਟਿੱਪਣੀ ਕਰੋ
   note:
     entry:
       comment: ਟਿੱਪਣੀ ਕਰੋ

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e87eb96a296345c482abf09cb883d1b4860037d4..088515364a3c74b751ddbf8066324695e8c55f86 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2293,20 +2293,6 @@ pl:
     period:
       one: 1 godzina
       other: '%{count} godzin'
     period:
       one: 1 godzina
       other: '%{count} godzin'

-    partial:
-      show: Pokaż
-      edit: Edytuj
-      revoke: Odwołaj
-      confirm: Na pewno?
-      display_name: Zablokowany użytkownik
-      creator_name: Twórca
-      reason: Powód blokady
-      status: Status
-      revoker_name: Odwołana przez
-      not_revoked: (nieodwołana)
-      showing_page: Strona %{page}
-      next: Następna »
-      previous: « Poprzednia

     helper:
       time_future: Blokada wygasa za %{time}.
       until_login: Aktywne do momentu zalogowania użytkownika.
     helper:
       time_future: Blokada wygasa za %{time}.
       until_login: Aktywne do momentu zalogowania użytkownika.


@@ -2336,6 +2322,21 @@ pl:
       back: Pokaż wszystkie blokady
       revoker: Cofający uprawnienia
       needs_view: Użytkownik musi się zalogować zanim blokada zostanie wyczyszczona.
       back: Pokaż wszystkie blokady
       revoker: Cofający uprawnienia
       needs_view: Użytkownik musi się zalogować zanim blokada zostanie wyczyszczona.

+  user_blocks:
+    block:
+      not_revoked: (nieodwołana)
+      show: Pokaż
+      edit: Edytuj
+      revoke: Odwołaj
+    blocks:
+      display_name: Zablokowany użytkownik
+      creator_name: Twórca
+      reason: Powód blokady
+      status: Status
+      revoker_name: Odwołana przez
+      showing_page: Strona %{page}
+      next: Następna »
+      previous: « Poprzednia

   note:
     description:
       opened_at_html: Stworzono %{when} temu
   note:
     description:
       opened_at_html: Stworzono %{when} temu

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 331c26e8d18580ef350082c53e8d3d7c0345928c..7006ccca203074dddb65ba89059908a0d68c36a6 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -2313,20 +2313,6 @@ pt-BR:
     period:
       one: uma hora
       other: '%{count} horas'
     period:
       one: uma hora
       other: '%{count} horas'

-    partial:
-      show: Exibir
-      edit: Editar
-      revoke: Cancelar!
-      confirm: Tem certeza?
-      display_name: Usuário bloqueado
-      creator_name: Criador
-      reason: Razão para o bloqueio
-      status: Estado
-      revoker_name: Retirado por
-      not_revoked: (não retirado)
-      showing_page: Página %{page}
-      next: Próximo »
-      previous: « Anterior

     helper:
       time_future: Termina em %{time}.
       until_login: Ativo até que o usuário se conecte.
     helper:
       time_future: Termina em %{time}.
       until_login: Ativo até que o usuário se conecte.


@@ -2356,6 +2342,21 @@ pt-BR:
       back: Ver todos os bloqueios
       revoker: 'Quem retirou:'
       needs_view: O usuário precisa se logar para esse bloqueio ser retirado.
       back: Ver todos os bloqueios
       revoker: 'Quem retirou:'
       needs_view: O usuário precisa se logar para esse bloqueio ser retirado.

+  user_blocks:
+    block:
+      not_revoked: (não retirado)
+      show: Exibir
+      edit: Editar
+      revoke: Cancelar!
+    blocks:
+      display_name: Usuário bloqueado
+      creator_name: Criador
+      reason: Razão para o bloqueio
+      status: Estado
+      revoker_name: Retirado por
+      showing_page: Página %{page}
+      next: Próximo »
+      previous: « Anterior

   note:
     description:
       opened_at_html: Criado %{when} atrás
   note:
     description:
       opened_at_html: Criado %{when} atrás

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 4cafce86871740af2898a02e65ef7aa06e8a1394..658fd16fd7476ca629e92ad649235d79b3929211 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -2296,20 +2296,6 @@ pt-PT:
     period:
       one: 1 hora
       other: '%{count} horas'
     period:
       one: 1 hora
       other: '%{count} horas'

-    partial:
-      show: Mostrar
-      edit: Editar
-      revoke: Revogar!
-      confirm: Tem a certeza?
-      display_name: Utilizador Bloqueado
-      creator_name: Criador
-      reason: Motivo do bloqueio
-      status: Estado
-      revoker_name: Revogado por
-      not_revoked: (não revogado)
-      showing_page: Página %{page}
-      next: Seguinte »
-      previous: « Anterior

     helper:
       time_future: Termina em %{time}.
       until_login: Ativo até o utilizador entrar na conta.
     helper:
       time_future: Termina em %{time}.
       until_login: Ativo até o utilizador entrar na conta.


@@ -2340,6 +2326,21 @@ pt-PT:
       back: Ver todos os bloqueios
       revoker: 'Revogador:'
       needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar.
       back: Ver todos os bloqueios
       revoker: 'Revogador:'
       needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar.

+  user_blocks:
+    block:
+      not_revoked: (não revogado)
+      show: Mostrar
+      edit: Editar
+      revoke: Revogar!
+    blocks:
+      display_name: Utilizador Bloqueado
+      creator_name: Criador
+      reason: Motivo do bloqueio
+      status: Estado
+      revoker_name: Revogado por
+      showing_page: Página %{page}
+      next: Seguinte »
+      previous: « Anterior

   note:
     description:
       opened_at_html: Criado %{when} atrás
   note:
     description:
       opened_at_html: Criado %{when} atrás

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1f9544d272ab028af3e06178533cc93067b932fd..732ae66dae52834f38976ea4da00eaeae12d13af 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1006,10 +1006,11 @@ ro:
       gravatar:
         link text: Ce este aceasta?
   user_block:
       gravatar:
         link text: Ce este aceasta?
   user_block:

-    partial:
-      show: Arată

     show:
       show: Arată
     show:
       show: Arată

+  user_blocks:
+    block:
+      show: Arată

   javascripts:
     share:
       title: Distribuie
   javascripts:
     share:
       title: Distribuie

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 4683f10c29d6421c2751bc61ae9c9c8ac7d96f1b..e745f83f94a493f20f9a901fd66e321c575cf84f 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -2341,20 +2341,6 @@ ru:
     period:
       one: 1 час
       other: '%{count} час.'
     period:
       one: 1 час
       other: '%{count} час.'

-    partial:
-      show: Показать
-      edit: Править
-      revoke: Разблокировать!
-      confirm: Вы уверены?
-      display_name: Заблокированный пользователь
-      creator_name: Автор
-      reason: Причина блокировки
-      status: Состояние
-      revoker_name: Разблокировал
-      not_revoked: (не разблокирован)
-      showing_page: Страница %{page}
-      next: Следующая →
-      previous: ← Предыдущая

     helper:
       time_future: Заканчивается через %{time}.
       until_login: Активно до тех пор, пока пользователь не войдёт в систему.
     helper:
       time_future: Заканчивается через %{time}.
       until_login: Активно до тех пор, пока пользователь не войдёт в систему.


@@ -2386,6 +2372,21 @@ ru:
       revoker: 'Разблокировавший:'
       needs_view: Пользователь должен зарегистрироваться, прежде чем это блокирование
         будет снято.
       revoker: 'Разблокировавший:'
       needs_view: Пользователь должен зарегистрироваться, прежде чем это блокирование
         будет снято.

+  user_blocks:
+    block:
+      not_revoked: (не разблокирован)
+      show: Показать
+      edit: Править
+      revoke: Разблокировать!
+    blocks:
+      display_name: Заблокированный пользователь
+      creator_name: Автор
+      reason: Причина блокировки
+      status: Состояние
+      revoker_name: Разблокировал
+      showing_page: Страница %{page}
+      next: Следующая →
+      previous: ← Предыдущая

   note:
     description:
       opened_at_html: Создана %{when} назад
   note:
     description:
       opened_at_html: Создана %{when} назад

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index db5813acd9b2f1a798f917fb692413aaed2c0775..ed5ae0624a098347b9e6307dcd6f665c27ea608d 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -2155,20 +2155,6 @@ scn:
     period:
       one: 1 ura
       other: '%{count} uri'
     period:
       one: 1 ura
       other: '%{count} uri'

-    partial:
-      show: Ammustra
-      edit: Cancia
-      revoke: Rèvuca!
-      confirm: Sî sicuru?
-      display_name: Utenti bluccatu
-      creator_name: Criaturi
-      reason: Mutivu dû bloccu
-      status: Statu
-      revoker_name: Arrivucatu di
-      not_revoked: (nun arrivucatu)
-      showing_page: Pàggina %{page}
-      next: Appressu »
-      previous: « Arreri

     helper:
       time_future: Finisci tra %{time}
       until_login: Attivatu nfina a quannu l'utenti trasi.
     helper:
       time_future: Finisci tra %{time}
       until_login: Attivatu nfina a quannu l'utenti trasi.


@@ -2197,6 +2183,21 @@ scn:
       back: Talìa tutti li blocchi
       revoker: 'Rivucaturi:'
       needs_view: L'utenti havi a tràsiri prima chi stu bloccu veni livatu.
       back: Talìa tutti li blocchi
       revoker: 'Rivucaturi:'
       needs_view: L'utenti havi a tràsiri prima chi stu bloccu veni livatu.

+  user_blocks:
+    block:
+      not_revoked: (nun arrivucatu)
+      show: Ammustra
+      edit: Cancia
+      revoke: Rèvuca!
+    blocks:
+      display_name: Utenti bluccatu
+      creator_name: Criaturi
+      reason: Mutivu dû bloccu
+      status: Statu
+      revoker_name: Arrivucatu di
+      showing_page: Pàggina %{page}
+      next: Appressu »
+      previous: « Arreri

   note:
     description:
       opened_at_html: Criatu %{when} fa
   note:
     description:
       opened_at_html: Criatu %{when} fa

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3da29052f00819980b6fffb07cb477ffdca22590..a54651201e1a6f4a17c5550ab9a9102b383c56d9 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1931,20 +1931,6 @@ sk:
       few: '%{count} hodiny'
       one: 1 hodina
       other: '%{count} hodín'
       few: '%{count} hodiny'
       one: 1 hodina
       other: '%{count} hodín'

-    partial:
-      show: Zobraziť
-      edit: Upraviť
-      revoke: Zrušiť!
-      confirm: Ste si istí?
-      display_name: Blokovaný používateľ
-      creator_name: Tvorca
-      reason: Dôvod pre blokovanie
-      status: Stav
-      revoker_name: Zrušil
-      not_revoked: (nezrušený)
-      showing_page: Strana %{page}
-      next: Ďalšia stránka »
-      previous: « Predchádzajúca stránka

     helper:
       time_future: Končí o %{time}.
       until_login: Aktívny až do prihlásenia používateľa.
     helper:
       time_future: Končí o %{time}.
       until_login: Aktívny až do prihlásenia používateľa.


@@ -1973,6 +1959,21 @@ sk:
       back: Zobraziť všetky blokovania
       revoker: 'Odvolal:'
       needs_view: Aby sa blok zmazal, požívateľ sa musí najprv prihlásiť.
       back: Zobraziť všetky blokovania
       revoker: 'Odvolal:'
       needs_view: Aby sa blok zmazal, požívateľ sa musí najprv prihlásiť.

+  user_blocks:
+    block:
+      not_revoked: (nezrušený)
+      show: Zobraziť
+      edit: Upraviť
+      revoke: Zrušiť!
+    blocks:
+      display_name: Blokovaný používateľ
+      creator_name: Tvorca
+      reason: Dôvod pre blokovanie
+      status: Stav
+      revoker_name: Zrušil
+      showing_page: Strana %{page}
+      next: Ďalšia stránka »
+      previous: « Predchádzajúca stránka

   note:
     description:
       opened_at_html: Vytvorené pred %{when}
   note:
     description:
       opened_at_html: Vytvorené pred %{when}

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0d10d57b66c669f89fb617a5f873b56d41cff99c..efed8ba12c85cae3bbb959a604b99dbbb302c5f9 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -244,7 +244,7 @@ sl:
     list:
       title: Paketi sprememb
       title_user: Paketi sprememb uporabnika %{user}
     list:
       title: Paketi sprememb
       title_user: Paketi sprememb uporabnika %{user}

-      title_friend: Paket sprememb vaših prijateljev
+      title_friend: Paketi sprememb mojih prijateljev

       title_nearby: Paketi sprememb bližnjih uporabnikov
       empty: Ni najdenih paketov sprememb.
       empty_area: Na tem področju ni paketov sprememb.
       title_nearby: Paketi sprememb bližnjih uporabnikov
       empty: Ni najdenih paketov sprememb.
       empty_area: Na tem področju ni paketov sprememb.


@@ -273,7 +273,7 @@ sl:
       user_title: Dnevnik uporabnika %{user}
       in_language_title: Dnevniki v jeziku %{language}
       new: Nov zapis v dnevnik uporabnikov
       user_title: Dnevnik uporabnika %{user}
       in_language_title: Dnevniki v jeziku %{language}
       new: Nov zapis v dnevnik uporabnikov

-      new_title: Napišite nov zapis v vaš uporabniški dnevnik
+      new_title: Nov zapis v moj uporabniški dnevnik

       no_entries: Ni zapisov v dnevnik
       recent_entries: Nedavni vnosi v dnevnik
       older_entries: Starejši zapisi
       no_entries: Ni zapisov v dnevnik
       recent_entries: Nedavni vnosi v dnevnik
       older_entries: Starejši zapisi


@@ -403,7 +403,10 @@ sl:
           chair_lift: Sedežnica
           drag_lift: Vlečnica
           gondola: Kabinska žičnica
           chair_lift: Sedežnica
           drag_lift: Vlečnica
           gondola: Kabinska žičnica

+          platter: Vlečnica s krožnički
+          pylon: Steber

           station: Žičniška postaja
           station: Žičniška postaja

+          t-bar: Vlečnica s sidri

         aeroway:
           aerodrome: Letališče
           airstrip: Vzletna steza
         aeroway:
           aerodrome: Letališče
           airstrip: Vzletna steza


@@ -469,6 +472,7 @@ sl:
           office: Pisarne
           parking: Parkirišče
           parking_entrance: Vhod v parkirišče
           office: Pisarne
           parking: Parkirišče
           parking_entrance: Vhod v parkirišče

+          parking_space: Parkirno mesto

           pharmacy: Lekarna
           place_of_worship: Verski hram
           police: Policija
           pharmacy: Lekarna
           place_of_worship: Verski hram
           police: Policija


@@ -544,6 +548,7 @@ sl:
           emergency_access_point: Dostop za interventna vozila
           footway: Pešpot
           ford: Prehod
           emergency_access_point: Dostop za interventna vozila
           footway: Pešpot
           ford: Prehod

+          give_way: Znak Nimate prednosti

           living_street: Ulica z umirjenim prometom
           milestone: Kilometerski kamen
           motorway: Avtocesta
           living_street: Ulica z umirjenim prometom
           milestone: Kilometerski kamen
           motorway: Avtocesta


@@ -565,6 +570,7 @@ sl:
           services: Avtocestno postajališče
           speed_camera: Hitrostna kamera
           steps: Stopnice
           services: Avtocestno postajališče
           speed_camera: Hitrostna kamera
           steps: Stopnice

+          stop: Stop znak

           street_lamp: Ulična svetilka
           tertiary: Lokalna cesta
           tertiary_link: Terciarna cesta
           street_lamp: Ulična svetilka
           tertiary: Lokalna cesta
           tertiary_link: Terciarna cesta


@@ -670,10 +676,13 @@ sl:
           bunker_silo: Bunker
           chimney: Dimnik
           crane: Žerjav
           bunker_silo: Bunker
           chimney: Dimnik
           crane: Žerjav

+          flagpole: Zastavni drog

           lighthouse: Svetilnik
           lighthouse: Svetilnik

+          mine: Rudnik

           mineshaft: Rudniški jašek
           pier: Pomol
           pipeline: Cevovod
           mineshaft: Rudniški jašek
           pier: Pomol
           pipeline: Cevovod

+          silo: Silos

           tower: Stolp
           watermill: Vodno kolo
           water_tower: Vodni stolp
           tower: Stolp
           watermill: Vodno kolo
           water_tower: Vodni stolp


@@ -1002,6 +1011,7 @@ sl:
         Za več podrobnosti o teh in drugih virih, ki so bili uporabljeni kot pripomočki pri izboljševanju OpenStreetMap, si prosimo oglejte <a
         href="https://wiki.openstreetmap.org/wiki/Contributors">stran sodelujočih</a> na wikiju OpenStreetMap.
       infringement_title_html: Kršitev avtorskih pravic
         Za več podrobnosti o teh in drugih virih, ki so bili uporabljeni kot pripomočki pri izboljševanju OpenStreetMap, si prosimo oglejte <a
         href="https://wiki.openstreetmap.org/wiki/Contributors">stran sodelujočih</a> na wikiju OpenStreetMap.
       infringement_title_html: Kršitev avtorskih pravic

+      trademarks_title_html: <span id="trademarks"></span>Blagovne znamke

   welcome_page:
     title: Dobrodošli!
     introduction_html: Dobrodošli na OpenStreetMap, brezplačni zemljevid sveta, ki
   welcome_page:
     title: Dobrodošli!
     introduction_html: Dobrodošli na OpenStreetMap, brezplačni zemljevid sveta, ki


@@ -1100,6 +1110,7 @@ sl:
       footer_html: Lahko tudi preberete sporočilo na %{readurl} in lahko odgovorite
         na %{replyurl}
     friend_notification:
       footer_html: Lahko tudi preberete sporočilo na %{readurl} in lahko odgovorite
         na %{replyurl}
     friend_notification:

+      hi: Pozdravljeni, %{to_user},

       subject: '[OpenStreetMap] %{user} vas je dodal med prijatelje'
       had_added_you: '%{user} vas je dodal med prijatelje na OpenStreetMap.'
       see_their_profile: Njegov profil si lahko ogledate na %{userurl}.
       subject: '[OpenStreetMap] %{user} vas je dodal med prijatelje'
       had_added_you: '%{user} vas je dodal med prijatelje na OpenStreetMap.'
       see_their_profile: Njegov profil si lahko ogledate na %{userurl}.


@@ -1659,6 +1670,9 @@ sl:
         google:
           title: Prijava z Googlom
           alt: Prijava z Google OpenID-jem
         google:
           title: Prijava z Googlom
           alt: Prijava z Google OpenID-jem

+        github:
+          title: Vpis z GitHub-om
+          alt: Vpis z računom pri GitHub-u

         yahoo:
           title: Prijava z Yahoo
           alt: Prijava z Yahoo OpenID
         yahoo:
           title: Prijava z Yahoo
           alt: Prijava z Yahoo OpenID


@@ -2036,20 +2050,6 @@ sl:
       one: 1 ura
       two: '%{count} uri'
       other: '%{count} ur'
       one: 1 ura
       two: '%{count} uri'
       other: '%{count} ur'

-    partial:
-      show: Prikaži
-      edit: Uredi
-      revoke: Prekliči!
-      confirm: Ali ste prepričani?
-      display_name: Blokiran uporabnik
-      creator_name: Ustvarjalec
-      reason: 'Razlog za blokado:'
-      status: Stanje
-      revoker_name: Preklical
-      not_revoked: (ni preklicana)
-      showing_page: Stran %{page}
-      next: Naslednja »
-      previous: « Prejšnja

     helper:
       time_future: Konča v %{time}.
       until_login: Aktivna dokler uporabnik se prijavi.
     helper:
       time_future: Konča v %{time}.
       until_login: Aktivna dokler uporabnik se prijavi.


@@ -2079,6 +2079,21 @@ sl:
       back: Prikaži vse blokade
       revoker: 'Preklical:'
       needs_view: Uporabnik se mora prijaviti preden bo blokada ukinjena.
       back: Prikaži vse blokade
       revoker: 'Preklical:'
       needs_view: Uporabnik se mora prijaviti preden bo blokada ukinjena.

+  user_blocks:
+    block:
+      not_revoked: (ni preklicana)
+      show: Prikaži
+      edit: Uredi
+      revoke: Prekliči!
+    blocks:
+      display_name: Blokiran uporabnik
+      creator_name: Ustvarjalec
+      reason: 'Razlog za blokado:'
+      status: Stanje
+      revoker_name: Preklical
+      showing_page: Stran %{page}
+      next: Naslednja »
+      previous: « Prejšnja

   note:
     description:
       opened_at_html: Ustvarjeno %{when} nazaj
   note:
     description:
       opened_at_html: Ustvarjeno %{when} nazaj


@@ -2193,13 +2208,16 @@ sl:
     edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti,
       nato pa kliknite tukaj.
     directions:
     edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti,
       nato pa kliknite tukaj.
     directions:

+      ascend: Vzpon

       engines:
         graphhopper_bicycle: Kolo (GraphHopper)
       engines:
         graphhopper_bicycle: Kolo (GraphHopper)

+        graphhopper_car: Avto (GraphHopper)

         graphhopper_foot: Hoja (GraphHopper)
         mapquest_bicycle: Kolo (MapQuest)
         mapquest_car: Avto (MapQuest)
         mapquest_foot: Hoja (MapQuest)
         osrm_car: Avto (OSRM)
         graphhopper_foot: Hoja (GraphHopper)
         mapquest_bicycle: Kolo (MapQuest)
         mapquest_car: Avto (MapQuest)
         mapquest_foot: Hoja (MapQuest)
         osrm_car: Avto (OSRM)

+      descend: Spust

       directions: Navodila
       distance: Razdalja
       errors:
       directions: Navodila
       distance: Razdalja
       errors:


@@ -2247,7 +2265,7 @@ sl:
         roundabout_without_exit: V krožišču uporabite izvoz na %{name}
         leave_roundabout_without_exit: Zapustite krožišče - %{name}
         stay_roundabout_without_exit: Ostanite v krožišču - %{name}
         roundabout_without_exit: V krožišču uporabite izvoz na %{name}
         leave_roundabout_without_exit: Zapustite krožišče - %{name}
         stay_roundabout_without_exit: Ostanite v krožišču - %{name}

-        start_without_exit: Začnite na koncu %{name}
+        start_without_exit: Začnite na %{name}

         destination_without_exit: Pojdite do cilja
         against_oneway_without_exit: Pojdite po enosmerni cesti na %{name}
         end_oneway_without_exit: Konec enosmerne ceste na %{name}
         destination_without_exit: Pojdite do cilja
         against_oneway_without_exit: Pojdite po enosmerni cesti na %{name}
         end_oneway_without_exit: Konec enosmerne ceste na %{name}

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 3ae63b54e7ce27fd65911c76f2f128a5dd9ffa95..7f36b6fb7ab5403553e41f1662ca3cc8d4dd8f2b 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1565,15 +1565,16 @@ sq:
         gjuhën e komunitetit, prandaj përdor formulime sa më lehtë të kuptueshme.
     revoke:
       revoke: Revoko!
         gjuhën e komunitetit, prandaj përdor formulime sa më lehtë të kuptueshme.
     revoke:
       revoke: Revoko!

-    partial:
+    show:
+      confirm: A jeni i sigurt?
+  user_blocks:
+    block:

       show: Shfaq
       edit: Redakto
       revoke: Revoko!
       show: Shfaq
       edit: Redakto
       revoke: Revoko!

-      confirm: A jeni i sigurt?
+    blocks:

       status: Statusi
       revoker_name: Revokuar nga
       status: Statusi
       revoker_name: Revokuar nga

-    show:
-      confirm: A jeni i sigurt?

   javascripts:
     site:
       edit_tooltip: Redakto hartën
   javascripts:
     site:
       edit_tooltip: Redakto hartën

diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index a5d15f9a7130d0c87c8425029b8ac6afae683b17..3c1fa3e42366e5a9b6860a110a919b87c88e6ffb 100644 (file)
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1616,20 +1616,6 @@ sr-Latn:
     period:
       one: 1 sat
       other: '%{count} sata'
     period:
       one: 1 sat
       other: '%{count} sata'

-    partial:
-      show: Prikaži
-      edit: Uredi
-      revoke: Opozovi
-      confirm: Jeste li sigurni?
-      display_name: Blokirani korisnik
-      creator_name: Tvorac
-      reason: Razlozi za blokiranje
-      status: Stanje
-      revoker_name: Opozvao
-      not_revoked: (nije opozvano)
-      showing_page: Prikaz stranice %{page}
-      next: Sledeće »
-      previous: « Prethodno

     helper:
       time_future: Završava se u %{time}.
       until_login: Aktivno sve dok se korisnik ne prijavi.
     helper:
       time_future: Završava se u %{time}.
       until_login: Aktivno sve dok se korisnik ne prijavi.


@@ -1656,6 +1642,21 @@ sr-Latn:
       back: Pogledaj sve blokade
       revoker: 'Opozivalac:'
       needs_view: Korisnik mora da se prijavi da bi blokada bila uklonjena.
       back: Pogledaj sve blokade
       revoker: 'Opozivalac:'
       needs_view: Korisnik mora da se prijavi da bi blokada bila uklonjena.

+  user_blocks:
+    block:
+      not_revoked: (nije opozvano)
+      show: Prikaži
+      edit: Uredi
+      revoke: Opozovi
+    blocks:
+      display_name: Blokirani korisnik
+      creator_name: Tvorac
+      reason: Razlozi za blokiranje
+      status: Stanje
+      revoker_name: Opozvao
+      showing_page: Prikaz stranice %{page}
+      next: Sledeće »
+      previous: « Prethodno

   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index d81f2073ed51a1faa80363ca87a0ca6ffb1a061b..8b59fdf1ffe8c29d8bcefe7e403c9257f56aed33 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2214,20 +2214,6 @@ sr:
     period:
       one: 1 сат
       other: '%{count} сата'
     period:
       one: 1 сат
       other: '%{count} сата'

-    partial:
-      show: Прикажи
-      edit: Уреди
-      revoke: Опозови
-      confirm: Јесте ли сигурни?
-      display_name: Блокирани корисник
-      creator_name: Творац
-      reason: Разлози за блокирање
-      status: Стање
-      revoker_name: Опозвао
-      not_revoked: (није опозвано)
-      showing_page: Страница %{page}
-      next: Следеће »
-      previous: « Претходно

     helper:
       time_future: Завршава се у %{time}.
       until_login: Активно све док се корисник не пријави.
     helper:
       time_future: Завршава се у %{time}.
       until_login: Активно све док се корисник не пријави.


@@ -2257,6 +2243,21 @@ sr:
       back: Погледај све блокаде
       revoker: 'Опозивалац:'
       needs_view: Корисник мора да се пријави да би блокада била уклоњена.
       back: Погледај све блокаде
       revoker: 'Опозивалац:'
       needs_view: Корисник мора да се пријави да би блокада била уклоњена.

+  user_blocks:
+    block:
+      not_revoked: (није опозвано)
+      show: Прикажи
+      edit: Уреди
+      revoke: Опозови
+    blocks:
+      display_name: Блокирани корисник
+      creator_name: Творац
+      reason: Разлози за блокирање
+      status: Стање
+      revoker_name: Опозвао
+      showing_page: Страница %{page}
+      next: Следеће »
+      previous: « Претходно

   note:
     description:
       opened_at_html: Направљено пре %{when}
   note:
     description:
       opened_at_html: Направљено пре %{when}

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0e3bcbdeaa9986611b12038c8d58a37ccf00387b..a89d16f3171ef94469db622ec08b30ffe599f935 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1716,6 +1716,7 @@ sv:
       delete_track: Radera detta GPS-spår
       trace_not_found: GPS-spår hittades inte!
       visibility: 'Synlighet:'
       delete_track: Radera detta GPS-spår
       trace_not_found: GPS-spår hittades inte!
       visibility: 'Synlighet:'

+      confirm_delete: Radera detta spår?

     trace_paging_nav:
       showing_page: Sida %{page}
       older: Äldre GPS-spår
     trace_paging_nav:
       showing_page: Sida %{page}
       older: Äldre GPS-spår


@@ -2299,20 +2300,6 @@ sv:
     period:
       one: 1 timme
       other: '%{count} timmar'
     period:
       one: 1 timme
       other: '%{count} timmar'

-    partial:
-      show: Visa
-      edit: Redigera
-      revoke: Återkalla!
-      confirm: Är du säker?
-      display_name: Blockerad användare
-      creator_name: Skapare
-      reason: Orsak till blockering
-      status: Status
-      revoker_name: Återkallad av
-      not_revoked: (Inte återkallat)
-      showing_page: Sida %{page}
-      next: Nästa »
-      previous: « Föregående

     helper:
       time_future: Slutar om %{time}.
       until_login: Aktiv till dess användaren loggar in.
     helper:
       time_future: Slutar om %{time}.
       until_login: Aktiv till dess användaren loggar in.


@@ -2343,6 +2330,21 @@ sv:
       back: Se alla blockeringar
       revoker: 'Återställare:'
       needs_view: Användaren måste logga in innan blockeringen upphör.
       back: Se alla blockeringar
       revoker: 'Återställare:'
       needs_view: Användaren måste logga in innan blockeringen upphör.

+  user_blocks:
+    block:
+      not_revoked: (Inte återkallat)
+      show: Visa
+      edit: Redigera
+      revoke: Återkalla!
+    blocks:
+      display_name: Blockerad användare
+      creator_name: Skapare
+      reason: Orsak till blockering
+      status: Status
+      revoker_name: Återkallad av
+      showing_page: Sida %{page}
+      next: Nästa »
+      previous: « Föregående

   note:
     description:
       opened_at_html: Skapades för %{when} sedan
   note:
     description:
       opened_at_html: Skapades för %{when} sedan


@@ -2515,6 +2517,7 @@ sv:
         onramp_left_with_name_directions: Sväng vänster på rampen till %{name}, mot
           %{directions}
         onramp_left_without_directions: Sväng vänster till rampen
         onramp_left_with_name_directions: Sväng vänster på rampen till %{name}, mot
           %{directions}
         onramp_left_without_directions: Sväng vänster till rampen

+        onramp_left: Sväng vänster till rampen

         endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in på %{name}
         merge_left_without_exit: Sväng vänster in på %{name}
         fork_left_without_exit: Vid vägskälet sväng vänster in på %{name}
         endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in på %{name}
         merge_left_without_exit: Sväng vänster in på %{name}
         fork_left_without_exit: Vid vägskälet sväng vänster in på %{name}

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 7abe5a726791b1c34b9b03eaa6b44d802560dc49..589d5696094f9121726e938f801ff1ea95c23b10 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -777,14 +777,6 @@ ta:
     revoke:
       confirm: உறுதிப்படுத்து
   user_block:
     revoke:
       confirm: உறுதிப்படுத்து
   user_block:

-    partial:
-      show: காண்பி
-      edit: தொகு
-      revoke: திரும்பபெறு!
-      confirm: உறுதியாகவா?
-      display_name: தடைசெய்யப்பட்ட பயனர்
-      creator_name: உருவாக்கியவர்
-      status: நிலை

     show:
       status: நிலை
       show: காண்பி
     show:
       status: நிலை
       show: காண்பி


@@ -792,6 +784,15 @@ ta:
       revoke: திரும்பபெறு!
       confirm: உறுதியாகவா?
       reason: 'தடைக்கான காரணம்:'
       revoke: திரும்பபெறு!
       confirm: உறுதியாகவா?
       reason: 'தடைக்கான காரணம்:'

+  user_blocks:
+    block:
+      show: காண்பி
+      edit: தொகு
+      revoke: திரும்பபெறு!
+    blocks:
+      display_name: தடைசெய்யப்பட்ட பயனர்
+      creator_name: உருவாக்கியவர்
+      status: நிலை

   redaction:
     update:
       flash: மாற்றங்கள் சேமிக்கப்பட்டன
   redaction:
     update:
       flash: மாற்றங்கள் சேமிக்கப்பட்டன

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 1a4dff2ad651acbeec39d3145be76b0501f771d9..9674445dd9b4c8e4c3e72d239ada915f8c36cae7 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -817,13 +817,6 @@ te:
     period:
       one: 1 గంట
       other: '%{count} గంటలు'
     period:
       one: 1 గంట
       other: '%{count} గంటలు'

-    partial:
-      show: చూపించు
-      edit: మార్చు
-      reason: నిరోధానికి కారణం
-      status: స్థితి
-      next: తదుపరి »
-      previous: « మునుపటి

     helper:
       time_future: '%{time}లో ముగుస్తుంది.'
       time_past: '%{time} క్రితం ముగిసింది.'
     helper:
       time_future: '%{time}లో ముగుస్తుంది.'
       time_past: '%{time} క్రితం ముగిసింది.'


@@ -839,6 +832,15 @@ te:
       edit: మార్చు
       reason: 'నిరోధానికి కారణం:'
       back: అన్ని నిరోధాలను చూడండి
       edit: మార్చు
       reason: 'నిరోధానికి కారణం:'
       back: అన్ని నిరోధాలను చూడండి

+  user_blocks:
+    block:
+      show: చూపించు
+      edit: మార్చు
+    blocks:
+      reason: నిరోధానికి కారణం
+      status: స్థితి
+      next: తదుపరి »
+      previous: « మునుపటి

   note:
     entry:
       comment: వ్యాఖ్య
   note:
     entry:
       comment: వ్యాఖ్య

diff --git a/config/locales/th.yml b/config/locales/th.yml
index aeef574f4a2c697ae9e6e29ae78fa2b4da061289..a07438ab2d8755ea4b7e0cb17f17319621b51f01 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1931,12 +1931,6 @@ th:
       title: การกีดกันผู้ใช้
       heading: รายการการกีดกันผู้ใช้
       empty: ยังไม่มีการกีดกันใด ๆ
       title: การกีดกันผู้ใช้
       heading: รายการการกีดกันผู้ใช้
       empty: ยังไม่มีการกีดกันใด ๆ

-    partial:
-      show: แสดง
-      edit: แก้ไข
-      status: สถานะ
-      next: ถัดไป »
-      previous: « ก่อนหน้า

     helper:
       time_future: จะสิ้นสุดใน %{time}
     blocks_on:
     helper:
       time_future: จะสิ้นสุดใน %{time}
     blocks_on:


@@ -1947,6 +1941,14 @@ th:
       status: สถานะ
       show: แสดง
       edit: แก้ไข
       status: สถานะ
       show: แสดง
       edit: แก้ไข

+  user_blocks:
+    block:
+      show: แสดง
+      edit: แก้ไข
+    blocks:
+      status: สถานะ
+      next: ถัดไป »
+      previous: « ก่อนหน้า

   note:
     rss:
       title: หมายเหตุแผนที่ บน OpenStreetMap
   note:
     rss:
       title: หมายเหตุแผนที่ บน OpenStreetMap

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 04c3c1a267c5bf7187eaf22b673379e05a9375f4..4cadfc0778a7f6642e14793307273aff3c48d8f9 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1916,20 +1916,6 @@ tl:
     period:
       one: 1 oras
       other: '%{count} mga oras'
     period:
       one: 1 oras
       other: '%{count} mga oras'

-    partial:
-      show: Ipakita
-      edit: Baguhin
-      revoke: Bawiin!
-      confirm: Nakatitiyak ka ba?
-      display_name: Hinadlangang Tagagamit
-      creator_name: Tagapaglikha
-      reason: Dahilan ng pagharang
-      status: Kalagayan
-      revoker_name: Binawi ni
-      not_revoked: (hindi binawi)
-      showing_page: Ika-%{page} na pahina
-      next: Susunod »
-      previous: « Nakaraan

     helper:
       time_future: Magwawakas sa %{time}.
       until_login: Masigla hanggang sa paglagda ng tagagamit.
     helper:
       time_future: Magwawakas sa %{time}.
       until_login: Masigla hanggang sa paglagda ng tagagamit.


@@ -1959,6 +1945,21 @@ tl:
       revoker: 'Tagapagbawi:'
       needs_view: Ang tagagamit ay kailangang lumagda muna bago mahawi ang hadlang
         na ito.
       revoker: 'Tagapagbawi:'
       needs_view: Ang tagagamit ay kailangang lumagda muna bago mahawi ang hadlang
         na ito.

+  user_blocks:
+    block:
+      not_revoked: (hindi binawi)
+      show: Ipakita
+      edit: Baguhin
+      revoke: Bawiin!
+    blocks:
+      display_name: Hinadlangang Tagagamit
+      creator_name: Tagapaglikha
+      reason: Dahilan ng pagharang
+      status: Kalagayan
+      revoker_name: Binawi ni
+      showing_page: Ika-%{page} na pahina
+      next: Susunod »
+      previous: « Nakaraan

   note:
     description:
       opened_at_html: Nilikha %{when} ang nakaraan
   note:
     description:
       opened_at_html: Nilikha %{when} ang nakaraan

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ddd7aada0b745572c4ae270d79e80e53ca0e8ca3..80ad20f0cacd54fe2b6ca6a1c636b66e0d1457bc 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2231,20 +2231,6 @@ tr:
     period:
       one: 1 saat
       other: '%{count} saat'
     period:
       one: 1 saat
       other: '%{count} saat'

-    partial:
-      show: Göster
-      edit: Düzenle
-      revoke: İptal!
-      confirm: Emin misin?
-      display_name: Engellenmiş kullanıcı
-      creator_name: Oluşturan
-      reason: Engelleme sebebi
-      status: Durum
-      revoker_name: İptal eden
-      not_revoked: (iptal edilmemiş)
-      showing_page: Sayfa %{page}
-      next: Sonraki »
-      previous: « Önceki

     helper:
       time_future: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.
     helper:
       time_future: '%{time} içinde bitecek.'
       until_login: Kullanıcı giriş yapana kadar aktif.


@@ -2274,6 +2260,21 @@ tr:
       back: Tüm engellemeleri göster
       revoker: 'Geri alan:'
       needs_view: Engel kaldırılmadan önce kullanıcının giriş yapması gerekiyor.
       back: Tüm engellemeleri göster
       revoker: 'Geri alan:'
       needs_view: Engel kaldırılmadan önce kullanıcının giriş yapması gerekiyor.

+  user_blocks:
+    block:
+      not_revoked: (iptal edilmemiş)
+      show: Göster
+      edit: Düzenle
+      revoke: İptal!
+    blocks:
+      display_name: Engellenmiş kullanıcı
+      creator_name: Oluşturan
+      reason: Engelleme sebebi
+      status: Durum
+      revoker_name: İptal eden
+      showing_page: Sayfa %{page}
+      next: Sonraki »
+      previous: « Önceki

   note:
     description:
       opened_at_html: '%{when} önce oluşturuldu'
   note:
     description:
       opened_at_html: '%{when} önce oluşturuldu'

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 14f7939b552c99b962d23fcae4f48800824cb3be..091d9740b65a8bafe9524dde017034699d1cbad0 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -2209,20 +2209,6 @@ uk:
       few: '%{count} години'
       one: '%{count} година'
       other: '%{count} годин'
       few: '%{count} години'
       one: '%{count} година'
       other: '%{count} годин'

-    partial:
-      show: Показати
-      edit: Правити
-      revoke: Розблокувати!
-      confirm: Ви впевнені?
-      display_name: Заблокований користувач
-      creator_name: Автор
-      reason: Причина блокування
-      status: Стан
-      revoker_name: Розблокував
-      not_revoked: (не розблокований)
-      showing_page: Сторінка %{page}
-      next: Наступна →
-      previous: ← Попередня

     helper:
       time_future: До закінчення %{time}.
       until_login: Активне до тих пір, доки користувач не увійде в систему.
     helper:
       time_future: До закінчення %{time}.
       until_login: Активне до тих пір, доки користувач не увійде в систему.


@@ -2254,6 +2240,21 @@ uk:
       revoker: 'Розблокував:'
       needs_view: Користувачу потрібну увійти до системи перед тим, як блокування
         буде знято.
       revoker: 'Розблокував:'
       needs_view: Користувачу потрібну увійти до системи перед тим, як блокування
         буде знято.

+  user_blocks:
+    block:
+      not_revoked: (не розблокований)
+      show: Показати
+      edit: Правити
+      revoke: Розблокувати!
+    blocks:
+      display_name: Заблокований користувач
+      creator_name: Автор
+      reason: Причина блокування
+      status: Стан
+      revoker_name: Розблокував
+      showing_page: Сторінка %{page}
+      next: Наступна →
+      previous: ← Попередня

   note:
     description:
       opened_at_html: Створено %{when} тому
   note:
     description:
       opened_at_html: Створено %{when} тому

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 1002094be7402cbfc9a8cd01a9d28ae515d0d3a0..942c4f4b00ca677aa21bc267cf8824f62845f641 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -2160,20 +2160,6 @@ vi:
       revoke: Bỏ cấm!
       flash: Đã bỏ cấm.
     period: '%{count} giờ'
       revoke: Bỏ cấm!
       flash: Đã bỏ cấm.
     period: '%{count} giờ'

-    partial:
-      show: Hiện
-      edit: Sửa đổi
-      revoke: Bỏ cấm!
-      confirm: Bạn có chắc không?
-      display_name: Người bị cấm
-      creator_name: Người cấm
-      reason: Lý do cấm
-      status: Trạng thái
-      revoker_name: Người bỏ cấm
-      not_revoked: (không bị hủy)
-      showing_page: Trang %{page}
-      next: Sau »
-      previous: « Trước

     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.
     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.


@@ -2203,6 +2189,21 @@ vi:
       back: Xem tất cả tác vụ cấm
       revoker: 'Người bỏ cấm:'
       needs_view: Người dùng cần phải đăng nhập trước khi bỏ cấm được.
       back: Xem tất cả tác vụ cấm
       revoker: 'Người bỏ cấm:'
       needs_view: Người dùng cần phải đăng nhập trước khi bỏ cấm được.

+  user_blocks:
+    block:
+      not_revoked: (không bị hủy)
+      show: Hiện
+      edit: Sửa đổi
+      revoke: Bỏ cấm!
+    blocks:
+      display_name: Người bị cấm
+      creator_name: Người cấm
+      reason: Lý do cấm
+      status: Trạng thái
+      revoker_name: Người bỏ cấm
+      showing_page: Trang %{page}
+      next: Sau »
+      previous: « Trước

   note:
     description:
       opened_at_html: Được tạo cách đây %{when}
   note:
     description:
       opened_at_html: Được tạo cách đây %{when}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 22265c1cb61f16071ec6abab6ca0b5552e90af6f..b10e28b2b97994c975a3afc084fb342d0ebb1f4f 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -2069,20 +2069,6 @@ zh-CN:
     period:
       one: 1 小时
       other: '%{count} 小时'
     period:
       one: 1 小时
       other: '%{count} 小时'

-    partial:
-      show: 显示
-      edit: 编辑
-      revoke: 撤销！
-      confirm: 您确定吗？
-      display_name: 封禁的用户
-      creator_name: 创建者
-      reason: 封禁的原因
-      status: 状态
-      revoker_name: 撤销者
-      not_revoked: (未撤销)
-      showing_page: 第 %{page} 页
-      next: 下一页 »
-      previous: « 上一页

     helper:
       time_future: 结束于 %{time}。
       until_login: 用户登录时激活。
     helper:
       time_future: 结束于 %{time}。
       until_login: 用户登录时激活。


@@ -2112,6 +2098,21 @@ zh-CN:
       back: 查看所有封禁
       revoker: 撤销者：
       needs_view: 用户需要在该封禁清除前登录。
       back: 查看所有封禁
       revoker: 撤销者：
       needs_view: 用户需要在该封禁清除前登录。

+  user_blocks:
+    block:
+      not_revoked: (未撤销)
+      show: 显示
+      edit: 编辑
+      revoke: 撤销！
+    blocks:
+      display_name: 封禁的用户
+      creator_name: 创建者
+      reason: 封禁的原因
+      status: 状态
+      revoker_name: 撤销者
+      showing_page: 第 %{page} 页
+      next: 下一页 »
+      previous: « 上一页

   note:
     description:
       opened_at_html: 于 %{when} 前创建
   note:
     description:
       opened_at_html: 于 %{when} 前创建

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 57e98df12651bcfcb0a37e6979443a6234a757bb..b66298699a6dce07ca2d22a49a362cb6c4c8bfda 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2078,20 +2078,6 @@ zh-TW:
     period:
       one: 1 小時
       other: '%{count} 小時'
     period:
       one: 1 小時
       other: '%{count} 小時'

-    partial:
-      show: 顯示
-      edit: 編輯
-      revoke: 撤銷！
-      confirm: 您確定嗎？
-      display_name: 被封鎖的使用者
-      creator_name: 建立者
-      reason: 封鎖的理由
-      status: 狀態
-      revoker_name: 撤銷者
-      not_revoked: (沒有撤銷)
-      showing_page: 第 %{page} 頁
-      next: 下一頁 »
-      previous: « 上一頁

     helper:
       time_future: 於 %{time} 結束。
       until_login: 生效直至這個使用者登入為止。
     helper:
       time_future: 於 %{time} 結束。
       until_login: 生效直至這個使用者登入為止。


@@ -2121,6 +2107,21 @@ zh-TW:
       back: 檢視所有封鎖
       revoker: 撤銷者：
       needs_view: 在還原這個封鎖之前，該使用者需要先登入。
       back: 檢視所有封鎖
       revoker: 撤銷者：
       needs_view: 在還原這個封鎖之前，該使用者需要先登入。

+  user_blocks:
+    block:
+      not_revoked: (沒有撤銷)
+      show: 顯示
+      edit: 編輯
+      revoke: 撤銷！
+    blocks:
+      display_name: 被封鎖的使用者
+      creator_name: 建立者
+      reason: 封鎖的理由
+      status: 狀態
+      revoker_name: 撤銷者
+      showing_page: 第 %{page} 頁
+      next: 下一頁 »
+      previous: « 上一頁

   note:
     description:
       opened_at_html: 於 %{when} 前建立
   note:
     description:
       opened_at_html: 於 %{when} 前建立