X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3498b490b7e695f0be0898e3df76961bda4738e..dbc3ab53e76f74306b2fe9722e5e77b52a45cf06:/config/locales/ba.yml

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 94e4f9760..8c69c3bda 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: AiseluRB
 # Author: Amire80
+# Author: Bashkorttan
 # Author: Lizalizaufa
 # Author: MR973
 # Author: Roustammr
@@ -144,7 +145,6 @@ ba:
         auth_provider: ÐÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÑ
         auth_uid: ÐÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ UID
         email: Ð­Ð»ÐµÐºÑÑÐ¾Ð½ Ð¿Ð¾ÑÑÐ° Ð°Ð´ÑÐµÑÑ
-        email_confirmation: Ð­Ð»ÐµÐºÑÑÐ¾Ð½ Ð¿Ð¾ÑÑÐ°Ð½Ñ ÑÐ°Ò«Ð»Ð°Ñ
         new_email: Ð¯Ò£Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½ Ð¿Ð¾ÑÑÐ° Ð°Ð´ÑÐµÑÑ
         active: ÓÒ¯ÒÐµÐ¼
         display_name: Ð¡Ð°ÒÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½ Ð¸ÑÐµÐ¼
@@ -221,7 +221,6 @@ ba:
   auth:
     providers:
       none: Ð®Ò¡
-      openid: OpenID
       google: Google
       facebook: Facebook
       microsoft: ÐÐ°Ð¹ÐºÑÐ¾ÑÐ¾ÑÑ
@@ -251,8 +250,6 @@ ba:
         comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
         full: Ð¢ÑÐ»Ñ ÑÐµÐºÑÑ
   browse:
-    created: ÐÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½
-    closed: Ð¯Ð±ÑÒ¡
     version: ÐÐµÑÑÐ¸Ñ
     in_changeset: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ
     anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
@@ -265,28 +262,9 @@ ba:
       one: 1 ÑÐ»
       other: '%{count} ÑÐ»Ð´Ð°Ñ'
     download_xml: ' XML-Ð´Ñ ÐºÒ¯ÑÐµÑÐµÒ¯'
-    view_history: Ð¢Ð°ÑÐ¸ÑÑÑ Ò¡Ð°ÑÐ°Ñ
+    view_history: Ð¢Ð°ÑÐ¸Ñ
     view_details: ÐÐ½ÑÐµÐºÐ»ÓÐ±ÐµÑÓÐº
     location: 'ÐÐµÐ¾Ð³ÑÐ°ÑÐ¸Ðº ÑÑÑÐ½:'
-    changeset:
-      title: 'Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ: %{id}'
-      belongs_to: ÐÐ²ÑÐ¾Ñ
-      node: ÐÓ©ÐºÑÓÐ»ÓÑ (%{count})
-      node_paginated: ÐÓ©ÐºÑÓÐ»ÓÑ (%{x}-%{y} Ð¸Ð· %{count})
-      way: ÒºÑÒÑÒ¡ÑÐ°Ñ (%{count})
-      way_paginated: Ð®Ð»Ð´Ð°Ñ (%{x}-%{y} %{count}Ò»ÑÐ½Ð°Ð½)
-      relation: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{count})
-      relation_paginated: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{x}-%{y} %{count}Ð½Ð°Ð½)
-      comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ÒÐ°Ñ (%{count})
-      changesetxml: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑÐ½ÑÒ£ XML-Ñ
-      osmchangexml: osmChange XML
-      feed:
-        title: 'Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ: %{id}'
-        title_comment: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ %{id} â %{comment}
-      join_discussion: Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑÒÐ° Ò¡ÑÑÑÐ»ÑÑ Ó©ÑÓ©Ð½ ÑÐ¸ÑÑÐµÐ¼Ð°ÒÐ° Ð¸Ð½ÐµÐ³ÐµÒ
-      discussion: Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑ
-      still_open: Ð¢Ó©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÓÐ»Ðµ Ð°ÑÑÒ¡. Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑ, ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÑÐ±ÑÐ»ÒÐ°Ð½Ð´Ð°Ð½
-        Ò»ÑÒ£ ÒÑÐ½Ð° Ð±ÑÐ»Ð°ÑÐ°Ò¡.
     node:
       title_html: 'ÐÓ©ÐºÑÓ: %{name}'
       history_title_html: 'ÐÓ©ÐºÑÓ ÑÐ°ÑÐ¸ÑÑ: %{name}'
@@ -361,6 +339,20 @@ ba:
       introduction: Ð¯Ò¡ÑÐ½Ð´Ð°ÒÑ Ð¾Ð±ÑÐµÐºÑÑÐ°ÑÒÑ ÑÐ°Ð±ÑÑ Ó©ÑÓ©Ð½ ÐºÐ°ÑÑÐ°ÒÐ° Ð±Ð°Ò«ÑÒÑÒ
       nearby: Ð¯Ò¡ÑÐ½Ð´Ð°ÒÑ Ð¾Ð±ÑÐµÐºÑÑÐ°Ñ
       enclosing: Ð£ÑÑÐ½Ñ
+  changeset_comments:
+    feeds:
+      comment:
+        comment: '%{author} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑÐ½Ð° %{changeset_id} ÑÒ£Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹'
+        commented_at_by_html: Ð¯Ò£ÑÑÑÑÐ»ÒÐ°Ð½ %{when} Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ %{user} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½
+      comments:
+        comment: '%{author} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑÐ½Ð° %{changeset_id} ÑÒ£Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹'
+      show:
+        title_all: OpenStreetMap ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ Ð±ÑÐ¹ÑÐ½ÑÐ° ÑÐµÐºÐµÑÐ»ÓÑÐµÒ¯
+        title_particular: ' OpenStreetMap #%{changeset_id} ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ Ð±ÑÐ¹ÑÐ½ÑÐ°
+          ÑÐµÐºÐµÑÐ»ÓÑÐµÒ¯'
+      timeout:
+        sorry: Ò ÑÒÒÐ°Ð½ÑÑÒ¡Ð° Ò¡Ð°ÑÑÑ, Ò»ÐµÒ Ò»Ð¾ÑÐ°ÒÐ°Ð½ ÑÓ©ÒÓÑÐ¼Ó Ð¿Ð°ÐºÐµÑÑÐ°ÑÑ Ð¸ÑÐµÐ¼Ð»ÐµÐ³ÐµÐ½ Ð°Ð»ÑÑ Ó©ÑÓ©Ð½
+          ÐºÒ¯Ð¿ Ð²Ð°Ò¡ÑÑ ÑÐ°Ð»Ð°Ð¿ Ð¸ÑÓ.
   changesets:
     changeset_paging_nav:
       showing_page: ' %{page} Ð±Ð¸ÑÐµ'
@@ -388,19 +380,27 @@ ba:
       no_more_area: ÐÑÐ» Ó©Ð»ÐºÓÐ»Ó Ð±Ð°ÑÒ¡Ð° ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÑÒ¡.
       no_more_user: ÐÑÐ» Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑÐ½Ð°Ð½ Ð±Ð°ÑÒ¡Ð° ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÑÒ¡.
       load_more: ÐÒ¯Ð±ÐµÑÓÐº ÑÐµÐ¹ÓÒ¯
-    timeout:
-      sorry: Ò ÑÒÒÐ°Ð½ÑÑÒ¡Ð° Ò¡Ð°ÑÑÑ, Ò»ÐµÒ Ò»Ð¾ÑÐ°ÒÐ°Ð½ ÑÓ©ÒÓÑÐ¼Ó Ð¿Ð°ÐºÐµÑÑÐ°ÑÑ Ð¸ÑÐµÐ¼Ð»ÐµÐ³ÐµÐ½ Ð°Ð»ÑÑ Ó©ÑÓ©Ð½ ÐºÒ¯Ð¿
-        Ð²Ð°Ò¡ÑÑ ÑÐ°Ð»Ð°Ð¿ Ð¸ÑÓ.
-  changeset_comments:
-    comment:
-      comment: '%{author} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑÐ½Ð° %{changeset_id} ÑÒ£Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹'
-      commented_at_by_html: Ð¯Ò£ÑÑÑÑÐ»ÒÐ°Ð½ %{when} Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ %{user} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½
-    comments:
-      comment: '%{author} ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑÐ½Ð° %{changeset_id} ÑÒ£Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹'
-    index:
-      title_all: OpenStreetMap ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ Ð±ÑÐ¹ÑÐ½ÑÐ° ÑÐµÐºÐµÑÐ»ÓÑÐµÒ¯
-      title_particular: ' OpenStreetMap #%{changeset_id} ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ Ð±ÑÐ¹ÑÐ½ÑÐ°
-        ÑÐµÐºÐµÑÐ»ÓÑÐµÒ¯'
+      feed:
+        title: 'Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ: %{id}'
+        title_comment: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ %{id} â %{comment}
+        created: ÐÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½
+        closed: Ð¯Ð±ÑÒ¡
+        belongs_to: ÐÐ²ÑÐ¾Ñ
+    show:
+      title: 'Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ: %{id}'
+      discussion: Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑ
+      join_discussion: Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑÒÐ° Ò¡ÑÑÑÐ»ÑÑ Ó©ÑÓ©Ð½ ÑÐ¸ÑÑÐµÐ¼Ð°ÒÐ° Ð¸Ð½ÐµÐ³ÐµÒ
+      still_open: Ð¢Ó©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÓÐ»Ðµ Ð°ÑÑÒ¡. Ð¤ÐµÐºÐµÑ Ð°Ð»ÑÑÑÑ, ÑÓ©ÒÓÑÐ¼ÓÐ»ÓÑ Ð¿Ð°ÐºÐµÑÑ ÑÐ±ÑÐ»ÒÐ°Ð½Ð´Ð°Ð½
+        Ò»ÑÒ£ ÒÑÐ½Ð° Ð±ÑÐ»Ð°ÑÐ°Ò¡.
+      changesetxml: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑÐ½ÑÒ£ XML-Ñ
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: ÐÓ©ÐºÑÓÐ»ÓÑ (%{count})
+      nodes_paginated: ÐÓ©ÐºÑÓÐ»ÓÑ (%{x}-%{y} Ð¸Ð· %{count})
+      ways: ÒºÑÒÑÒ¡ÑÐ°Ñ (%{count})
+      ways_paginated: Ð®Ð»Ð´Ð°Ñ (%{x}-%{y} %{count}Ò»ÑÐ½Ð°Ð½)
+      relations: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{count})
+      relations_paginated: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{x}-%{y} %{count}Ð½Ð°Ð½)
     timeout:
       sorry: Ò ÑÒÒÐ°Ð½ÑÑÒ¡Ð° Ò¡Ð°ÑÑÑ, Ò»ÐµÒ Ò»Ð¾ÑÐ°ÒÐ°Ð½ ÑÓ©ÒÓÑÐ¼Ó Ð¿Ð°ÐºÐµÑÑÐ°ÑÑ Ð¸ÑÐµÐ¼Ð»ÐµÐ³ÐµÐ½ Ð°Ð»ÑÑ Ó©ÑÓ©Ð½ ÐºÒ¯Ð¿
         Ð²Ð°Ò¡ÑÑ ÑÐ°Ð»Ð°Ð¿ Ð¸ÑÓ.
@@ -435,6 +435,7 @@ ba:
       new_title: ÐÐ¸Ð½ÐµÒ£ ÐºÓ©Ð½Ð´ÓÐ»ÐµÐºÑÓ ÑÒ£Ñ ÑÒÐ¼Ð° ÑÒÑÑ
       my_diary: ÐÐ¸Ð½ÐµÒ£ ÐºÓ©Ð½Ð´ÓÐ»ÐµÐº
       no_entries: ÐÓ©Ð½Ð´ÓÐ»ÐµÐºÑÓ ÑÒÐ¼Ð°Ð»Ð°Ñ ÑÒ¡
+    page:
       recent_entries: ÒºÑÒ£ÒÑ ÐºÓ©Ð½Ð´ÓÐ»ÐµÐº ÑÒÐ¼Ð°Ð»Ð°ÑÑ
       older_entries: ÐÒ«ÐºÐµÑÓÐº ÑÒÐ¼Ð°Ð»Ð°Ñ
       newer_entries: Ð¯Ò£ÑÑÐ°Ò¡ ÑÒÐ¼Ð°Ð»Ð°Ñ
@@ -486,8 +487,10 @@ ba:
       all:
         title: OpenStreetMap ÐºÓ©Ð½Ð´ÓÐ»ÐµÐº ÑÒÐ¼Ð°Ò»Ñ
         description: OpenStreetMap Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÐ»Ð°ÑÑÐ½ÑÒ£ Ò»ÑÒ£ÒÑ ÐºÓ©Ð½Ð´ÓÐ»ÐµÐº ÑÒÐ¼Ð°Ð»Ð°ÑÑ
-    comments:
+  diary_comments:
+    index:
       no_comments: ÐÓ©Ð½Ð´ÓÐ»ÐµÐºÑÓ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ÒÐ°Ñ ÑÒ¡
+    page:
       post: Post
       when: Ò Ð°ÑÐ°Ð½
       comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹