X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/37e6725d2d85e92df4bc770b73e137a52afb63a4..e268af48b4329253e2d9cc6438e60d809f368c11:/config/locales/ru.yml

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b31e04d0e..ce87fb379 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -542,7 +542,7 @@ ru:
         relation: Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
     start_rjs:
       feature_warning: ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ %{num_features} Ð¾Ð±ÑÐµÐºÑÐ¾Ð², ÑÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¼ÐµÐ´Ð»Ð¸ÑÑ
-        Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·ÐµÑ. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÑÐ¸ Ð´Ð°Ð½Ð½ÑÐµ?
+        Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·ÐµÑ. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÑÐ¸ Ð´Ð°Ð½Ð½ÑÐµ?
       load_data: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ
       loading: ÐÐ°Ð³ÑÑÐ¶Ð°ÐµÑÑÑâ¦
     tag_details:
@@ -775,20 +775,50 @@ ru:
       comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
       newer_comments: ÐÐ¾Ð»ÐµÐµ Ð½Ð¾Ð²ÑÐµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸
       older_comments: ÐÐ¾Ð»ÐµÐµ ÑÑÐ°ÑÑÐµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸
+    new:
+      heading: ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ðº ÑÐ»ÐµÐ´ÑÑÑÐµÐ¼Ñ Ð¾Ð±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ?
   doorkeeper:
     errors:
       messages:
         account_selection_required: Ð¡ÐµÑÐ²ÐµÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐµÐ±ÑÐµÑ Ð²ÑÐ±Ð¾ÑÐ° ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
           ÐºÐ¾Ð½ÐµÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ.
+        consent_required: Ð¡ÐµÑÐ²ÐµÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐµÐ±ÑÐµÑ ÑÐ¾Ð³Ð»Ð°ÑÐ¸Ñ ÐºÐ¾Ð½ÐµÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+        interaction_required: Ð¡ÐµÑÐ²ÐµÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐµÐ±ÑÐµÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ  Ñ ÐºÐ¾Ð½ÐµÑÐ½ÑÐ¼
+          Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼
+        login_required: Ð¡ÐµÑÐ²ÐµÑ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð°ÑÐ¸Ð¸ ÑÑÐµÐ±ÑÐµÑ Ð°ÑÑÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ ÐºÐ¾Ð½ÐµÑÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
     flash:
       applications:
         create:
           notice: ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¾.
+    openid_connect:
+      errors:
+        messages:
+          auth_time_from_resource_owner_not_configured: ÐÐµÑÐ´Ð°ÑÐ° Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸
+            Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner.
+          reauthenticate_resource_owner_not_configured: ÐÐµÑÐ´Ð°ÑÐ° Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸
+            Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner.
+          resource_owner_from_access_token_not_configured: ÐÐµÑÐ´Ð°ÑÐ° Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ
+            ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token.
+          select_account_for_resource_owner_not_configured: ÐÐµÑÐ´Ð°ÑÐ° Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ
+            ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner.
+          subject_not_configured: ÐÐµÐ½ÐµÑÐ°ÑÐ¸Ñ ÑÐ¾ÐºÐµÐ½Ð° ID Ð½Ðµ ÑÐ´Ð°Ð»Ð°ÑÑ Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ
+            ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Doorkeeper::OpenidConnect.configure.subject.
+    scopes:
+      address: ÐÐ¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ ÑÐ²Ð¾Ð¹ ÑÐ¸Ð·Ð¸ÑÐµÑÐºÐ¸Ð¹ Ð°Ð´ÑÐµÑ
+      email: ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ
+      openid: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ ÑÐ²Ð¾Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ
+      phone: ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÑÐ²Ð¾Ð¹ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°
+      profile: ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ²Ð¾ÑÐ¼ Ð¿ÑÐ¾ÑÐ¸Ð»Ðµ
   errors:
     contact:
+      contact_url_title: ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ Ð¾ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÑ ÐºÐ°Ð½Ð°Ð»Ð°Ñ ÑÐ²ÑÐ·Ð¸
       contact: Ð¾Ð±ÑÐ°ÑÐ°ÑÑÑÑ
       contact_the_community_html: ÐÐµ ÑÑÐµÑÐ½ÑÐ¹ÑÐµÑÑ %{contact_link} Ðº ÑÐ¾Ð¾Ð±ÑÐµÑÑÐ²Ñ OpenStreetMap,
         ÐµÑÐ»Ð¸ Ð²Ñ Ð½Ð°ÑÐ»Ð¸ Ð½ÐµÑÐ°Ð±Ð¾ÑÐ°ÑÑÑÑ ÑÑÑÐ»ÐºÑ/Ð¾ÑÐ¸Ð±ÐºÑ. ÐÐ°Ð¿Ð¸ÑÐ¸ÑÐµ ÑÐ¾ÑÐ½ÑÐ¹ URL Ð²Ð°ÑÐµÐ³Ð¾ Ð·Ð°Ð¿ÑÐ¾ÑÐ°.
+    bad_request:
+      title: ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ Ð·Ð°Ð¿ÑÐ¾Ñ
+      description: ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ, ÐºÐ¾ÑÐ¾ÑÑÑ Ð²Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð»Ð¸ Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ OpenStreetMap, Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð°
+        (HTTP 400)
     forbidden:
       title: ÐÐ¾ÑÑÑÐ¿ Ð·Ð°Ð¿ÑÐµÑÐµÐ½
       description: ÐÐ°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²Ð°Ð¼Ð¸ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ OpenStreetMap Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾
@@ -983,6 +1013,7 @@ ru:
           college: ÐÐ´Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð»Ð»ÐµÐ´Ð¶Ð°
           commercial: ÐÑÐ¸ÑÐ½Ð¾Ðµ Ð·Ð´Ð°Ð½Ð¸Ðµ
           construction: Ð¡ÑÑÐ¾ÑÑÐµÐµÑÑ Ð·Ð´Ð°Ð½Ð¸Ðµ
+          cowshed: ÐÐ¾ÑÐ¾Ð²Ð½Ð¸Ðº
           detached: ÐÑÐ´ÐµÐ»ÑÐ½Ð¾ÑÑÐ¾ÑÑÐ¸Ð¹ Ð¶Ð¸Ð»Ð¾Ð¹ Ð´Ð¾Ð¼
           dormitory: ÐÐ±ÑÐµÐ¶Ð¸ÑÐ¸Ðµ
           duplex: ÐÑÐ¿Ð»ÐµÐºÑ
@@ -1012,6 +1043,7 @@ ru:
           shed: Ð¡Ð°ÑÐ°Ð¹
           stable: ÐÐ¾Ð½ÑÑÐ½Ñ
           static_caravan: ÐÐµÑÐµÐ´Ð²Ð¸Ð¶Ð½Ð¾Ð¹ Ð´Ð¾Ð¼
+          sty: Ð¡Ð²Ð¸Ð½Ð°ÑÐ½Ð¸Ðº
           temple: ÐÐ´Ð°Ð½Ð¸Ðµ ÑÑÐ°Ð¼Ð°
           terrace: Ð ÑÐ´ Ð´Ð¾Ð¼Ð¾Ð²
           train_station: ÐÐµÐ»ÐµÐ·Ð½Ð¾Ð´Ð¾ÑÐ¾Ð¶Ð½ÑÐ¹ Ð²Ð¾ÐºÐ·Ð°Ð»
@@ -2366,6 +2398,7 @@ ru:
           taxiway: ÑÑÐ»ÑÐ¶Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð¶ÐºÐ°
           apron: ÐÐµÑÑÐ¾Ð½ Ð°ÑÑÐ¾Ð´ÑÐ¾Ð¼Ð°
           admin: ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¸Ð²Ð½Ð°Ñ Ð³ÑÐ°Ð½Ð¸ÑÐ°
+          capital: Ð¡ÑÐ¾Ð»Ð¸ÑÐ°
           city: ÐÐ¾ÑÐ¾Ð´
           orchard: Ð¤ÑÑÐºÑÐ¾Ð²ÑÐ¹ ÑÐ°Ð´
           vineyard: ÐÐ¸Ð½Ð¾Ð³ÑÐ°Ð´Ð½Ð¸Ðº