X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/81ed5bef6df68f0defb5341a069bcb1d453acfcb..70f1b327b483a39fc866c48cd44d5c999a262f59:/config/locales/mo.yml?ds=inline

diff --git a/config/locales/mo.yml b/config/locales/mo.yml
index 79577e41c..a46944cdb 100644
--- a/config/locales/mo.yml
+++ b/config/locales/mo.yml
@@ -93,15 +93,6 @@ mo:
     go_public:
       heading: 'Ð ÐµÐ´Ð°ÐºÑÐ°ÑÑ Ð¿ÑÐ±Ð»Ð¸ÐºÑ:'
   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: ÐÐµÑÑÐ¸ÑÐ½Ðµ
     anonymous: Ð°Ð½Ð¾Ð½Ð¸Ð¼
     no_comment: (ÑÑÑÑ ÐºÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ)
@@ -110,21 +101,6 @@ mo:
     view_history: ÐÐºÐ·Ð°Ð¼Ð¸Ð½Ð°ÑÑ Ð¸ÑÑÐ¾ÑÐ¸ÐºÑÐ»ÑÐ¹
     view_details: ÐÐ°Ð¹ Ð´ÐµÑÐ°Ð»Ð¸ÑÑ
     location: 'Ð¡Ð¸ÑÑÐ°ÑÐµ:'
-    changeset:
-      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})
-      hidden_commented_by_html: ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð°ÑÐºÑÐ½Ñ ÑÐºÑÐ¸Ñ Ð´Ðµ %{user} <abbr title='%{exact_time}'>ÐºÑ
-        %{when} ÑÐ½ ÑÑÐ¼Ñ</abbr>
-      commented_by_html: ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ ÑÐºÑÐ¸Ñ Ð´Ðµ %{user} <abbr title='%{exact_time}'>ÐºÑ
-        %{when} ÑÐ½ ÑÑÐ¼Ñ</abbr>
-      join_discussion: ÐÑ ÑÑÐ³ÑÐ¼ ÑÑ ÑÐ½ÑÑÐ°ÑÑ ÑÐ½ ÐºÐ¾Ð½Ñ Ð¿ÐµÐ½ÑÑÑ Ð° Ð²Ñ Ð°Ð»ÑÑÑÑÐ° Ð´Ð¸ÑÐºÑÑÐ¸ÐµÐ¹
-      discussion: ÐÐ¸ÑÐºÑÑÐ¸Ðµ
     node:
       title_html: 'ÐÑÐ½ÐºÑ: %{name}'
     way:
@@ -158,16 +134,24 @@ mo:
     tag_details:
       tags: ÐÐ°ÑÐºÐ°Ð¶Ðµ
   changesets:
-    changeset_paging_nav:
-      showing_page: ÐÐ°ÓÐ¸Ð½Ð° %{page}
-      next: Ð£ÑÐ¼ÑÑÐ¾Ð°ÑÑ â
-      previous: â ÐÑÐµÑÐµÐ´ÐµÐ½ÑÐ°
     changeset:
       anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
       no_edits: (ÑÑÑÑ Ð¼Ð¾Ð´Ð¸ÑÐ¸ÐºÑÑÑ)
-    changesets:
-      user: Ð£ÑÐ¸Ð»Ð¸Ð·Ð°ÑÐ¾Ñ
-      comment: ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ
+    index:
+      feed:
+        created: ÐÑÐµÐ°Ñ
+        closed: Ð«Ð½ÐºÐ¸Ñ
+        belongs_to: ÐÑÑÐ¾Ñ
+    show:
+      discussion: ÐÐ¸ÑÐºÑÑÐ¸Ðµ
+      join_discussion: ÐÑ ÑÑÐ³ÑÐ¼ ÑÑ ÑÐ½ÑÑÐ°ÑÑ ÑÐ½ ÐºÐ¾Ð½Ñ Ð¿ÐµÐ½ÑÑÑ Ð° Ð²Ñ Ð°Ð»ÑÑÑÑÐ° Ð´Ð¸ÑÐºÑÑÐ¸ÐµÐ¹
+    paging_nav:
+      nodes: ÐÑÐ½ÐºÑÐµ (%{count})
+      nodes_paginated: ÐÑÐ½ÐºÑÐµ (%{x}-%{y} Ð´Ð¸Ð½ %{count})
+      ways: ÐÑÐ¹ (%{count})
+      ways_paginated: ÐÑÐ¹ (%{x}-%{y} Ð´Ð¸Ð½ %{count})
+      relations: Ð ÐµÐ»Ð°ÑÐ¸Ð¹ (%{count})
+      relations_paginated: Ð ÐµÐ»Ð°ÑÐ¸Ð¹ (%{x}-%{y} Ð´Ð¸Ð½ %{count})
   dashboards:
     show:
       my friends: ÐÑÐ¸ÐµÑÐµÐ½Ð¸Ð¹ Ð¼ÐµÐ¹
@@ -182,7 +166,8 @@ mo:
       confirm: ÐÐ¾Ð½ÑÐ¸ÑÐ¼Ð°ÑÐµ
     location:
       edit: Ð ÐµÐ´Ð°ÐºÑÐ°ÑÐµ
-    comments:
+  diary_comments:
+    page:
       post: ÐÐµÑÐ°Ð¶
       when: ÐÑÐ½Ð´
       comment: ÐÐ¾Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ
@@ -535,29 +520,20 @@ mo:
     history: ÐÑÑÐ¾ÑÐ¸Ðº
     export: ÐÐºÑÐ¿Ð¾ÑÑÐ°ÑÐµ
     issues: ÐÑÐ¾Ð±Ð»ÐµÐ¼Ðµ
-    data: ÐÐ°ÑÐµ
-    export_data: ÐÐºÑÐ¿Ð¾ÑÑÐ°ÑÑ Ð´Ð°ÑÐµÐ»Ð¾Ñ
     gps_traces: Ð¢ÑÐ°ÑÐ°ÑÐµ-GPS
     user_diaries: ÐÑÑÐ½Ð°Ð»ÐµÐ»Ðµ ÑÑÐ¸Ð»Ð¸Ð·Ð°ÑÐ¾ÑÐ¸Ð»Ð¾Ñ
     edit_with: Ð ÐµÐ´Ð°ÐºÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» %{editor}
     intro_header: ÐÐ¸Ð½Ðµ Ð°ÑÑ Ð²ÐµÐ½Ð¸Ñ Ð»Ð° OpenStreetMap!
     intro_text: OpenStreetMap ÐµÑÑÐµ Ð¾ ÑÐ°ÑÑÑ Ð° Ð»ÑÐ¼Ð¸Ð¹, ÐºÑÐµÐ°ÑÑ Ð´Ðµ Ð¾Ð°Ð¼ÐµÐ½Ñ ÐºÐ° ÑÐ¸ Ð´ÑÐ¼Ð½ÑÐ²Ð¾Ð°ÑÑÑÑ,
       ÑÐ¸ Ð¿Ð¾Ð°ÑÐµ ÑÐ¸ ÑÑÐ¸Ð»Ð¸Ð·Ð°ÑÑ ÑÐ½ Ð¼Ð¾Ð´ Ð»Ð¸Ð±ÐµÑ ÑÑÐ± Ð¾ Ð»Ð¸ÑÐµÐ½ÑÑ Ð´ÐµÑÐºÐ¸ÑÑ.
-    intro_2_create_account: ÐÑÐµÐ°ÑÑ ÑÐ½ ÐºÐ¾Ð½Ñ Ð´Ðµ ÑÑÐ¸Ð»Ð¸Ð·Ð°ÑÐ¾Ñ
-    partners_ucl: ÐÐ¾Ð»ÐµÓÐ¸ÑÐ» Ð£Ð½Ð¸Ð²ÐµÑÑÐ¸ÑÐ°Ñ Ð´Ð¸Ð½ ÐÐ¾Ð½Ð´ÑÐ° (UCL)
-    partners_bytemark: Ð¥Ð¾ÑÑÐ¸Ð½Ð³ÑÐ» Bytemark
     partners_partners: Ð¿Ð°ÑÑÐµÐ½ÐµÑÑ
     help: ÐÐ¶ÑÑÐ¾Ñ
     about: ÐÐµÑÐ¿ÑÐµ Ð¿ÑÐ¾ÐµÐºÑ
     copyright: ÐÑÐµÐ¿Ñ Ð´Ðµ Ð°ÑÑÐ¾Ñ
-    community: ÐÐ¾Ð¼ÑÐ½Ð¸ÑÐ°ÑÐµ
-    community_blogs: ÐÐ»Ð¾Ð³ÑÑÐ¸Ð»Ðµ ÐºÐ¾Ð¼ÑÐ½Ð¸ÑÑÑÐ¸Ð¹
-    make_a_donation:
-      text: Ð¤Ð°ÑÐµÑÑ Ð¾ Ð´Ð¾Ð½Ð°ÑÐ¸Ðµ
     learn_more: ÐÑÐ»Ð°ÑÑ Ð¼Ð°Ð¹ Ð¼ÑÐ»ÑÐµ
     more: ÐÐ°Ð¹ Ð¼ÑÐ»ÑÐµ
   passwords:
-    lost_password:
+    new:
       title: Ð ÐµÑÑÐ°Ð±Ð¸Ð»Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¹
       heading: ÐÑÑ ÑÐ¹ÑÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ð°?
       email address: 'ÐÐ´ÑÐµÑÐ° Ð´Ðµ Ð¿Ð¾ÑÑÑ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð¸ÐºÑ:'
@@ -572,40 +548,13 @@ mo:
   sessions:
     new:
       title: ÐÑÐµÐ·ÐµÐ½ÑÐ°ÑÐ¸-Ð²Ñ
-      heading: ÐÑÐµÐ·ÐµÐ½ÑÐ°ÑÐ¸-Ð²Ñ
+      tab_title: ÐÑÐµÐ·ÐµÐ½ÑÐ°ÑÐ¸-Ð²Ñ
       email or username: 'ÐÐ¾ÑÑÐ° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð¸ÐºÑ ÑÐ°Ñ Ð½ÑÐ¼ÐµÐ»Ðµ Ð´Ðµ ÑÑÐ¸Ð»Ð¸Ð·Ð°ÑÐ¾Ñ:'
       password: 'ÐÐ°ÑÐ¾Ð»Ñ:'
       remember: ÐÑÑÑÑÐ°ÑÑ ÑÐµÑÐ¸ÑÐ½Ð¸Ð¹
       lost password link: ÐÑÑ ÑÐ¹ÑÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ð°?
       login_button: Ð«Ð½ÑÑÐ°ÑÑ ÑÐ½ ÐºÐ¾Ð½Ñ
       register now: Ð«Ð½ÑÐµÓÐ¸ÑÑÑÐ°ÑÐ¸-Ð²Ñ Ð°ÐºÑÐ¼
-      no account: ÐÑ Ð°Ð²ÐµÑÑ ÑÐ½ ÐºÐ¾Ð½Ñ Ð´Ðµ ÑÑÐ¸Ð»Ð¸Ð·Ð°ÑÐ¾Ñ?
-      openid_logo_alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» OpenID
-      auth_providers:
-        openid:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» OpenID
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» OpenID URL
-        google:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Google
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Google OpenID
-        facebook:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Facebook
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ Facebook
-        windowslive:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Windows Live
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ Windows Live
-        github:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» GitHub
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ GitHub
-        wikipedia:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐÐ¸ÐºÐ¸Ð¿ÐµÐ´Ð¸ÐµÐ¹
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ ÐÐ¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ
-        wordpress:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Wordpress
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Wordpress OpenID
-        aol:
-          title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» AOL
-          alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» AOL OpenID
     destroy:
       title: Ð«Ð½ÐºÐµÐµÑÑ ÑÐµÑÐ¸ÑÐ½Ð¸Ð¹
       heading: ÐÑÐ¸ÑÐµ Ð´Ð¸Ð½ OpenStreetMap
@@ -613,6 +562,26 @@ mo:
   site:
     export:
       title: ÐÐºÑÐ¿Ð¾ÑÑÐ°ÑÐµ
+  application:
+    auth_providers:
+      openid:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» OpenID
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» OpenID URL
+      google:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Google
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Google OpenID
+      facebook:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Facebook
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ Facebook
+      microsoft:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» Windows Live
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ Windows Live
+      github:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» GitHub
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ GitHub
+      wikipedia:
+        title: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐÐ¸ÐºÐ¸Ð¿ÐµÐ´Ð¸ÐµÐ¹
+        alt: Ð«Ð½ÑÑÐ°ÑÑ ÐºÑ Ð°Ð¶ÑÑÐ¾ÑÑÐ» ÐºÐ¾Ð½ÑÑÐ»ÑÐ¹ Ð´Ðµ ÐÐ¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ
   users:
     show:
       my diary: ÐÑÑÐ½Ð°Ð»ÑÐ» Ð¼ÐµÑ
@@ -627,24 +596,8 @@ mo:
       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>
     new:
       title: ÐÐ¾ÑÑ Ð½Ð¾ÑÑ
+    notes_paging_nav:
+      showing_page: ÐÐ°ÓÐ¸Ð½Ð° %{page}
 ...
