X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46875fdde3ecdc37bb69e892b15509132a3bf9cf..8abe9e2d10a4cef92418f7cebf1483827b58ab0b:/config/locales/ba.yml

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index ca3c1da48..854f29198 100644
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -34,7 +34,7 @@ ba:
       client_application:
         create: Ð¢ÐµÑÐºÓÐ»ÐµÒ¯
         update: Ð¯Ò£ÑÑÑÑÑÒÐ°
-      doorkeeper_application:
+      oauth2_application:
         create: Ð¢ÐµÑÐºÓÐ»ÐµÒ¯
         update: Ð¯Ò£ÑÑÑÑÑÒÐ°
       redaction:
@@ -64,7 +64,6 @@ ba:
       message: Ð¥ÓÐ±ÓÑ
       node: Ð¢Ó©Ð¹Ó©Ð½
       node_tag: Ð¢Ó©Ð¹Ó©Ð½ ÑÐµÐ³Ñ
-      notifier: ÐÐµÐ»Ð´ÐµÑÐµÒ¯ÑÐµ
       old_node: ÐÒ«ÐºÐµ Ð½Ó©ÐºÑÓ
       old_node_tag: ÐÓ©ÐºÑÓÐ½ÐµÒ£ Ð¸Ò«ÐºÐµ ÑÐµÐ³Ñ
       old_relation: ÐÒ«ÐºÐµ ÑÐ°ÒÑÑÑÑÑÐ¼Ð°
@@ -108,7 +107,7 @@ ba:
         title: Ð¢ÐµÐ¼Ð°
         latitude: ÐÐ¸Ò£Ð»ÐµÐº
         longitude: ÐÒÐ¾Ð½Ð»Ð¾Ò¡
-        language: Ð¢ÐµÐ»
+        language_code: Ð¢ÐµÐ»
       doorkeeper/application:
         name: ÐÑÐµÐ¼
         redirect_uri: Ð¯Ò£ÑÐ½Ð°Ð½ Ð¹Ò¯Ð½ÓÐ»ÑÐµÒ¯
@@ -170,10 +169,6 @@ ba:
           Ò¡ÑÐ»Ð»Ð°Ð½ÑÐ¿ Ò¡Ð°ÑÐ°ÒÑÒ.
         needs_view: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑÒÐ° Ð±Ð»Ð¾ÐºÑÐ°Ð½ ÑÑÒ¡Ò¡Ð°Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð°ÒÐ° Ð¸Ð½ÐµÑÐ³Ó ÑÓ©ÑÑÓÑ Ð¸ÑÐµÑÐ³ÓÐ¼Ðµ?
       user:
-        email_confirmation: ÒºÐµÒÒÐµÒ£ Ð°Ð´ÑÐµÑÑÒÑÒ Ð°ÑÑÒ¡ ÐºÒ¯ÑÐµÐ½Ð¼ÓÐ¹ÓÑÓÐº, ÑÑÐ»ÑÑÐ°Ò¡ Ð¼ÓÒÐ»Ò¯Ð¼ÓÑ Ð°Ð»ÑÑ
-          Ó©ÑÓ©Ð½ Ð±ÐµÒÒÐµÒ£ <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
-          title="OSMF privacy policy including section on email addresses"> ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»Ð»ÐµÐº
-          ÑÓÐ¹ÓÑÓÑÐµÐ½</a> Ò¡Ð°ÑÐ°ÒÑÒ.
         new_email: (ÐºÒ¯ÑÒ»ÓÑÐµÐ»Ð¼ÓÐ¹)
   datetime:
     distance_in_words_ago:
@@ -257,14 +252,6 @@ ba:
   browse:
     created: ÐÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½
     closed: Ð¯Ð±ÑÒ¡
-    created_html: Ð¯Ò»Ð°Ð»ÒÐ°Ð½ <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Ð¯Ð±ÑÐ»ÒÐ°Ð½ <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Ð¯Ò»Ð°Ð»ÒÐ°Ð½ <abbr title='%{title}'>%{time}</abbr> Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½
-      %{user}
-    deleted_by_html: Ð®Ð¹ÑÐ»ÒÐ°Ð½ <abbr title='%{title}'>%{time}</abbr>Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½%{user}
-    edited_by_html: Ð¢Ó©ÒÓÑÐµÐ»Ð³ÓÐ½ <abbr title='%{title}'>%{time}</abbr> Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½
-      %{user}
-    closed_by_html: Ð¯Ð±ÑÐ»ÒÐ°Ð½ <abbr title='%{title}'>%{time}</abbr>Ò¡ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½%{user}
     version: ÐÐµÑÑÐ¸Ñ
     in_changeset: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑ
     anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
@@ -290,10 +277,6 @@ ba:
       relation: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{count})
       relation_paginated: ÐÓ©Ð½ÓÑÓÐ±ÓÑÑÓÑ (%{x}-%{y} %{count}Ð½Ð°Ð½)
       comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ÒÐ°Ñ (%{count})
-      hidden_commented_by_html: ' %{user} <abbr title=''%{exact_time}''>%{when}ÑÐ°Ð½
-        Ð¹ÓÑÐµÑÐµÐ½ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹, ÐºÐ¸ÑÐµÐ³Ó</abbr>'
-      commented_by_html: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹Ñ %{user} <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
       changesetxml: Ð¢Ó©ÒÓÑÐµÒ¯ÒÓÑ Ð¿Ð°ÐºÐµÑÑÐ½ÑÒ£ XML-Ñ
       osmchangexml: osmChange XML
       feed:
@@ -372,31 +355,6 @@ ba:
       wikimedia_commons_link: Wikimedia CommonsÑÐ° %{page} ÑÐ»ÐµÐ¼ÐµÐ½Ñ
       telephone_link: Ð¨ÑÐ»ÑÑÑÐ°ÑÑÑÒÐ° %{phone_number}
       colour_preview: Ð¢Ó©Ò«ÑÓÑÒÐµ Ò¡Ð°ÑÐ°Ñ %{colour_value}
-    note:
-      title: ' %{id} Ð¸ÑÐºÓÑÐ¼ÓÒ»Ðµ'
-      new_note: Ð¯Ò£Ñ Ð¼ÓÒ¡ÓÐ»Ó
-      description: Ð¢Ð°ÑÑÐ¸ÑÐ»Ð°Ð¼Ð°
-      open_title: 'Ð­ÑÐºÓÑÑÐµÐ»Ð¼ÓÐ³ÓÐ½ Ð¼ÓÒ¡ÓÐ»Ó #%{note_name}'
-      closed_title: 'Ð­ÑÐºÓÑÑÐµÐ»Ð³ÓÐ½ Ð¼ÓÒ¡ÓÐ»ÓÐ° #%{note_name}'
-      hidden_title: 'ÐÓÑÐµÑÐµÐ»Ð³ÓÐ½ ÑÒÐ¼Ð° #%{note_name}'
-      opened_by_html: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ Ð±ÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½ %{user} <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      opened_by_anonymous_html: ÐÐ½Ð¾Ð½Ð¸Ð¼ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ Ð±ÑÐ»Ð´ÑÑÑÐ»ÒÐ°Ð½ <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      commented_by_html: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹Ñ %{user} <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      commented_by_anonymous_html: ÐÐ½Ð¾Ð½Ð¸Ð¼ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹Ñ  <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      closed_by_html: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÑÐºÓÑÑÐµÐ»Ð³ÓÐ½ %{user} <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      closed_by_anonymous_html: ÐÐ½Ð¾Ð½Ð¸Ð¼ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ ÑÓ©ÑÑÓÑ Ð¸ÑÐµÐ»Ð³ÓÐ½ <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      reopened_by_html: Ò ÑÐ»Ð»Ð°Ð½ÑÑÑÑ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ Ò¡Ð°Ð±Ð°ÑÑÐ°Ð½ Ð°ÑÑÐ»ÒÐ°Ð½ %{user} <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      reopened_by_anonymous_html: ÐÐ½Ð¾Ð½Ð¸Ð¼ ÑÐ°ÑÐ°ÑÑÐ½Ð°Ð½ Ò¡Ð°Ð±Ð°ÑÑÐ°Ð½ Ð°ÑÑÐ»ÒÐ°Ð½ <abbr title='%{exact_time}'>%{when}
-        ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      hidden_by_html: ÐÓÑÐµÑÐµÐ»Ð³ÓÐ½ %{user} <abbr title='%{exact_time}'>%{when} ÐºÐ¸ÑÐµÐ³Ó</abbr>
-      report: ÐÑÐ» ÑÒÐ¼Ð° ÑÑÑÐ°Ò»ÑÐ½Ð´Ð° ÑÓÐ±ÓÑ Ð¸ÑÐµÒ¯
     query:
       title: ÐÐ±ÑÐµÐºÑÑÐ°Ñ ÑÑÑÐ°Ò»ÑÐ½Ð´Ð° Ð¼ÓÒÐ»Ò¯Ð¼ÓÑ
       introduction: Ð¯Ò¡ÑÐ½Ð´Ð°ÒÑ Ð¾Ð±ÑÐµÐºÑÑÐ°ÑÒÑ ÑÐ°Ð±ÑÑ Ó©ÑÓ©Ð½ ÐºÐ°ÑÑÐ°ÒÐ° Ð±Ð°Ò«ÑÒÑÒ
@@ -552,20 +510,6 @@ ba:
       success: '%{name} Ð´ÑÒ«ÑÐ°ÑÒÐ°Ð½ Ð°Ð»ÑÐ¿ ÑÐ°ÑÐ»Ð°Ð½Ð´Ñ.'
       not_a_friend: '%{name} Ò»ÐµÒÒÐµÒ£ Ð´ÑÒ« ÑÒ¯Ð³ÐµÐ».'
   geocoder:
-    search:
-      title:
-        latlon_html: |2-
-
-          <a href="http://openstreetmap.org/">ÑÑÐµÐ½Ð´ÓÐ³Ðµ Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ</a>
-        ca_postcode_html: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>Ð°Ð»ÑÐ½ÒÐ°Ð½
-          Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ
-        osm_nominatim_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>Ð½Ð°Ð½ ÑÑÒ¡Ò¡Ð°Ð½ Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ
-        geonames_html: <a href="http://www.geonames.org/">GeoNames</a>Ð½Ð°Ð½ ÑÑÒ¡Ò¡Ð°Ð½ Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ
-        osm_nominatim_reverse_html: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>Ð½Ð°Ð½ Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ
-        geonames_reverse_html: <a href="http://www.geonames.org/">GeoNames</a>Ð½Ð°Ð½
-          ÑÑÒ¡Ò¡Ð°Ð½ Ò»Ó©ÒÓ©Ð¼ÑÓÐ»ÓÑ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -897,7 +841,6 @@ ba:
           commercial: ÒºÐ°ÑÑÑ Ð¸ÑÐµÒ¯ ÑÐ»Ð°Ð½Ñ
           conservation: ÐÐ°Ð¿Ð¾Ð²ÐµÐ´Ð½Ð¸Ðº
           construction: Ð¢Ó©ÒÓ©Ð»Ó©Ñ
-          farm: Ð¤ÐµÑÐ¼Ð°
           farmland: ÐÑÑÐ» ÑÑÐ¶Ð°Ð»ÑÒÑ ÐµÑÒÓÑÐµ
           farmyard: ÐÑÑÐ» ÑÑÐ¶Ð°Ð»ÑÒÑ Ð¸ÑÐ°ÑÐ°Ð»Ð°ÑÑ
           forest: Ð£ÑÐ¼Ð°Ð½ ÑÑÐ¶Ð°Ð»ÑÒÑ
@@ -1036,6 +979,16 @@ ba:
       latitude: 'ÐÐ¸Ò£Ð»ÐµÐº:'
       longitude: 'ÐÒÐ¾Ð½Ð»Ð¾Ò¡:'
       paste_html: Ð¡Ð°Ð¹ÑÒ¡Ð° Ð¸Ð½Ð´ÐµÑÐµÐ¿ Ò¡ÑÐ¹ÑÑ Ó©ÑÓ©Ð½ HTML-ÐºÐ¾Ð´
+  notes:
+    show:
+      title: ' %{id} Ð¸ÑÐºÓÑÐ¼ÓÒ»Ðµ'
+      description: Ð¢Ð°ÑÑÐ¸ÑÐ»Ð°Ð¼Ð°
+      open_title: 'Ð­ÑÐºÓÑÑÐµÐ»Ð¼ÓÐ³ÓÐ½ Ð¼ÓÒ¡ÓÐ»Ó #%{note_name}'
+      closed_title: 'Ð­ÑÐºÓÑÑÐµÐ»Ð³ÓÐ½ Ð¼ÓÒ¡ÓÐ»ÓÐ° #%{note_name}'
+      hidden_title: 'ÐÓÑÐµÑÐµÐ»Ð³ÓÐ½ ÑÒÐ¼Ð° #%{note_name}'
+      report: ÐÑÐ» ÑÒÐ¼Ð° ÑÑÑÐ°Ò»ÑÐ½Ð´Ð° ÑÓÐ±ÓÑ Ð¸ÑÐµÒ¯
+    new:
+      title: Ð¯Ò£Ñ Ð¼ÓÒ¡ÓÐ»Ó
   javascripts:
     share:
       only_standard_layer: ÐÐ°ÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑ Ò¡Ð°ÑÐ»Ð°Ð¼ ÒÑÐ½Ð° Ò»Ò¯ÑÓÑ ÐºÐµÒ¯ÐµÐº ÑÐºÑÐ¿Ð¾ÑÑÐ»Ð°Ð½Ð° Ð°Ð»Ð°
