X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eb3cdd34dabc90e1957e1df238412fb20676f06a..c55d346d5f7501fd6f5f636e85c8a60ec67d88ee:/config/locales/el.yml

diff --git a/config/locales/el.yml b/config/locales/el.yml
index abd6b74c2..359ebbe62 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1,22 +1,25 @@
 # Messages for Greek (ÎÎ»Î»Î·Î½Î¹ÎºÎ¬)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Aitolos
 # Author: Auslaender
 # Author: Babispan
 # Author: Consta
 # Author: Crazymadlover
+# Author: Danieldegroot2
 # Author: Evropi
 # Author: FocalPoint
 # Author: Geraki
 # Author: Glavkos
+# Author: Jimkats
 # Author: KATRINE1992
 # Author: KATRINE1993
 # Author: Kiriakos
 # Author: Kongr43gpen
 # Author: Logictheo
 # Author: Macofe
+# Author: Michail Angelos Georgoulas
+# Author: NikosLikomitros
 # Author: Nikosgranturismogt
 # Author: Norhorn
 # Author: Omnipaedista
@@ -39,6 +42,8 @@ el:
     formats:
       friendly: '%e %B %Y ÏÏÎ¹Ï %H:%M'
   helpers:
+    file:
+      prompt: ÎÏÎ¹Î»Î¿Î³Î® Î±ÏÏÎµÎ¯Î¿Ï
     submit:
       diary_comment:
         create: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·
@@ -48,10 +53,13 @@ el:
       issue_comment:
         create: Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÏÎ¿Î»Î¯Î¿Ï
       message:
-        create: ÎÏÎ¿ÏÏÎ¿Î»Î®
+        create: Î£ÏÎµÎ¯Î»Îµ
       client_application:
         create: ÎÎ³Î³ÏÎ±ÏÎ®
-        update: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+        update: ÎÎ½Î·Î¼Î­ÏÏÏÎ·
+      doorkeeper_application:
+        create: ÎÎ³Î³ÏÎ±ÏÎ®
+        update: ÎÎ½Î·Î¼Î­ÏÏÏÎ·
       redaction:
         create: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÎ±ÏÎ¬Î»ÎµÎ¹ÏÎ·Ï
         update: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÎ±ÏÎ¬Î»ÎµÎ¹ÏÎ·Ï
@@ -65,7 +73,7 @@ el:
     errors:
       messages:
         invalid_email_address: Î´ÎµÎ½ ÏÎ±Î¯Î½ÎµÏÎ±Î¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î­Î³ÎºÏÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î». ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï
-        email_address_not_routable: ÎÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î·ÏÎ­Î¿
+        email_address_not_routable: Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î·ÏÎ­Î¿
     models:
       acl: ÎÎ¯ÏÏÎ± ÎµÎ»Î­Î³ÏÎ¿Ï ÏÏÏÏÎ²Î±ÏÎ·Ï
       changeset: ÎÎ¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
@@ -103,6 +111,19 @@ el:
       way_node: ÎÏÎ¼Î²Î¿Ï Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï
       way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï
     attributes:
+      client_application:
+        name: ÎÎ½Î¿Î¼Î± (Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹)
+        url: URL ÎºÏÏÎ¹Î±Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï (Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹)
+        callback_url: URL ÎÏÎ±Î½Î¬ÎºÎ»Î·ÏÎ·Ï
+        support_url: URL Î¥ÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·Ï
+        allow_read_prefs: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·
+        allow_write_prefs: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·
+        allow_write_diary: Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÏÎ½ Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï, ÏÏÏÎ»Î¹Î± ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±
+          ÏÎ¯Î»ÏÎ½
+        allow_write_api: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï ÏÎ¬ÏÏÎ·
+        allow_read_gpx: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎ½ Î¹ÏÎ½ÏÎ½ GPS
+        allow_write_gpx: Î¼ÎµÏÎ±ÏÏÏÏÏÏÎ· Î¹ÏÎ½ÏÎ½ GPS
+        allow_write_notes: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·Î¼ÎµÎ¹ÏÏÎµÏÎ½
       diary_comment:
         body: ÎÏÏÎ¹Î¿ Î¼Î­ÏÎ¿Ï
       diary_entry:
@@ -111,30 +132,74 @@ el:
         latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
         longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
         language: ÎÎ»ÏÏÏÎ±
+      doorkeeper/application:
+        name: ÎÎ½Î¿Î¼Î±
+        redirect_uri: ÎÎ½Î±ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ· URIs
+        confidential: ÎÎ¼ÏÎ¹ÏÏÎ· ÎµÏÎ±ÏÎ¼Î¿Î³Î®;
+        scopes: ÎÎ´ÎµÎ¹ÎµÏ
       friend:
         user: Î§ÏÎ®ÏÏÎ·Ï
         friend: Î¦Î¯Î»Î¿Ï
       trace:
         user: Î§ÏÎ®ÏÏÎ·Ï
         visible: ÎÏÎ±ÏÏ
-        name: ÎÎ½Î¿Î¼Î±
+        name: ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï
         size: ÎÎ­Î³ÎµÎ¸Î¿Ï
         latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
         longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
         public: ÎÎ·Î¼ÏÏÎ¹Î¿
         description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
+        gpx_file: ÎÎ½Î­Î²Î±ÏÎ¼Î± GPX Î±ÏÏÎµÎ¯Î¿Ï
+        visibility: ÎÏÎ±ÏÏÏÎ·ÏÎ±
+        tagstring: ÎÏÎ¹ÎºÎ­ÏÎµÏ
       message:
         sender: ÎÏÎ¿ÏÏÎ¿Î»Î­Î±Ï
         title: ÎÎ­Î¼Î±
-        body: ÎÏÏÎ¹Î¿ Î¼Î­ÏÎ¿Ï
+        body: ÎÏÏÎ¹Î¿ ÏÏÎ¼Î±
         recipient: Î Î±ÏÎ±Î»Î®ÏÏÎ·Ï
+      redaction:
+        title: Î¤Î¯ÏÎ»Î¿Ï
+        description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
+      report:
+        category: ÎÏÎ¹Î»Î­Î¾ÏÎµ Î¼Î¹Î± Î±Î¹ÏÎ¯Î± Î³Î¹Î± ÏÎ·Î½ Î±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ±Ï
+        details: Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÎ±ÏÎ¬ÏÏÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ ÏÏÏÎ²Î»Î·Î¼Î±
+          (Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹).
       user:
+        auth_provider: Î Î¬ÏÎ¿ÏÎ¿Ï Î±ÏÎ¸ÎµÎ½ÏÎ¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï
+        auth_uid: UID Î±ÏÎ¸ÎµÎ½ÏÎ¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï
         email: ÎÎ»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿
+        email_confirmation: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï email
+        new_email: ÎÎ­Î± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· email
         active: ÎÎ½ÎµÏÎ³Ï
-        display_name: ÎÎ¼ÏÎ±Î½Î¹Î¶ÏÎ¼ÎµÎ½Î¿ ÏÎ½Î¿Î¼Î±
-        description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
-        languages: ÎÎ»ÏÏÏÎµÏ
+        display_name: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· Î¿Î½ÏÎ¼Î±ÏÎ¿Ï
+        description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ® ÏÏÎ¿ÏÎ¯Î»
+        home_lat: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
+        home_lon: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
+        languages: Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½ÎµÏ Î³Î»ÏÏÏÎµÏ
+        preferred_editor: Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½Î¿Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï
         pass_crypt: ÎÏÎ´Î¹ÎºÏÏ
+        pass_crypt_confirmation: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÎºÏÎ´Î¹ÎºÎ¿Ï
+    help:
+      doorkeeper/application:
+        confidential: Î ÎµÏÎ±ÏÎ¼Î¿Î³Î® Î¸Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯ ÏÏÎ¿Ï ÏÎ¿ Î¼ÏÏÏÎ¹ÎºÏ ÏÎµÎ»Î¬ÏÎ· Î¼ÏÎ¿ÏÎµÎ¯ Î½Î±
+          ÎºÏÎ±ÏÎ·Î¸ÎµÎ¯ Î­Î¼ÏÎ¹ÏÏÎ¿ (Î¿Î¹ ÎµÎ³Î³ÎµÎ½ÎµÎ¯Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î­Ï ÎºÎ¹Î½Î·ÏÏÎ½ ÎºÎ±Î¹ Î¿Î¹ ÎµÏÎ±ÏÎ¼Î¿Î³Î­Ï Î¼Î¿Î½Î®Ï ÏÎµÎ»Î¯Î´Î±Ï
+          Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î¼ÏÎ¹ÏÏÎµÏ)
+        redirect_uri: Î§ÏÎ®ÏÎ· Î¼Î¯Î±Ï ÏÎµÎ¹ÏÎ¬Ï Î±Î½Î¬ URI
+      trace:
+        tagstring: Î´Î¹Î±ÏÏÏÎ¹ÏÎ¼Î­Î½Î¿ Î¼Îµ ÎºÏÎ¼Î¼Î±
+      user_block:
+        reason: Î Î±Î¹ÏÎ¯Î± Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·. Î Î±ÏÎ±ÎºÎ±Î»Ï Î½Î± ÎµÎ¯ÏÏÎµ ÏÏÎ¿ ÏÎ¿ Î´ÏÎ½Î±ÏÏÎ½ ÏÎ¹Î¿
+          Î®ÏÎµÎ¼Î¿Ï/-Î· ÎºÎ±Î¹ Î»Î¿Î³Î¹ÎºÏÏ/-Î®, Î´Î¯Î½Î¿Î½ÏÎ±Ï ÏÏÎµÏ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ
+          Î³Î¹Î± ÏÎ·Î½ ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÎºÎ±Î¹ ÏÎºÎµÏÏÏÎ¼ÎµÎ½Î¿Ï/-Î· ÏÏÎ¹ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± Î¸Î± ÎµÎ¯Î½Î±Î¹ Î´Î·Î¼ÏÏÎ¹Î± Î¿ÏÎ±ÏÏ.
+          ÎÎ¬Î²ÎµÏÎµ ÏÏÏÏÎ· ÏÎ±Ï ÏÏÎ¹ Î´ÎµÎ½ ÎºÎ±ÏÎ±Î½Î¿Î¿ÏÎ½ ÏÎ»Î¿Î¹ Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ·Î½ Î¿ÏÎ¿Î»Î¿Î³Î¯Î± ÏÎ·Ï ÎºÎ¿Î¹Î½ÏÏÎ·ÏÎ±Ï,
+          Î³Î¹' Î±ÏÏÏ ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î±ÏÎ»Î¿ÏÏ ÎºÎ±Î¹ ÎºÎ±ÏÎ±Î½Î¿Î·ÏÎ¿ÏÏ ÏÏÎ¿ÏÏ.
+        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:
       about_x_hours:
@@ -149,7 +214,7 @@ el:
       almost_x_years:
         one: ÏÏÎµÎ´ÏÎ½ Î­Î½Î± ÏÏÏÎ½Î¿ ÏÏÎ¹Î½
         other: ÏÏÎµÎ´ÏÎ½ %{count} ÏÏÏÎ½Î¹Î± ÏÏÎ¹Î½
-      half_a_minute: Î¼Î¹ÏÏ Î»ÎµÏÏÏ ÏÏÎ¹Î½
+      half_a_minute: ÏÏÎ¹Î½ Î¼Î¹ÏÏ Î»ÎµÏÏÏ
       less_than_x_seconds:
         one: Î»Î¹Î³ÏÏÎµÏÎ¿ Î±ÏÏ Î­Î½Î± Î´ÎµÏÏÎµÏÏÎ»ÎµÏÏÎ¿ ÏÏÎ¹Î½
         other: Î»Î¹Î³ÏÏÎµÏÎ¿ Î±ÏÏ %{count} Î´ÎµÏÏÎµÏÏÎ»ÎµÏÏÎ± ÏÏÎ¹Î½
@@ -178,18 +243,12 @@ el:
     with_version: '%{id}, v%{version}'
   editor:
     default: Î ÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î® (ÏÏÏÎ± ÎµÎ¯Î½Î±Î¹ %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÎµÎ½ÏÏÏ ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ®)
     id:
       name: iD
-      description: iD (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÎµÎ½ÏÏÏ ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ®)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÎµÎ½ÏÏÏ ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ®)
+      description: iD (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÎµÎ½ÏÏÏ ÏÎµÏÎ¹Î·Î³Î·ÏÎ®)
     remote:
       name: ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿Ï Î­Î»ÎµÎ³ÏÎ¿Ï
-      description: ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿Ï Î­Î»ÎµÎ³ÏÎ¿Ï (JOSM Î® Merkaartor)
+      description: ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿Ï Î­Î»ÎµÎ³ÏÎ¿Ï (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: ÎÎ±Î½Î­Î½Î±
@@ -222,6 +281,82 @@ el:
       entry:
         comment: Î£ÏÏÎ»Î¹Î¿
         full: Î Î»Î®ÏÎ·Ï ÏÎ·Î¼ÎµÎ¯ÏÏÎ·
+  account:
+    deletions:
+      show:
+        title: ÎÎ¹Î±Î³ÏÎ±ÏÎ® ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï Î¼Î¿Ï
+        warning: Î ÏÎ¿ÏÎ¿ÏÎ®! Î Î´Î¹Î±Î´Î¹ÎºÎ±ÏÎ¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÎµÎ¯Î½Î±Î¹ Î¿ÏÎ¹ÏÏÎ¹ÎºÎ® ÎºÎ±Î¹
+          Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î±Î½Î±ÏÏÏÎ±ÏÎµÎ¯.
+        delete_account: ÎÎ¹Î±Î³ÏÎ±ÏÎ® ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï
+        delete_introduction: 'ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏÎµÏÎµ ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï ÏÏÎ¿ OpenStreetMap
+          ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÎºÎ¿ÏÎ¼ÏÎ¯. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎ·Î¼ÎµÎ¹ÏÏÏÎµ ÏÎ¹Ï ÎµÎ¾Î®Ï Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ:'
+        delete_profile: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î», ÏÏÎ¼ÏÎµÏÎ¹Î»Î±Î¼Î²Î±Î½Î¿Î¼Î­Î½Î¿Ï ÏÎ¿Ï Î¬Î²Î±ÏÎ±Ï,
+          ÏÎ·Î½ ÏÎµÏÎ¹Î³ÏÎ±ÏÎ® ÎºÎ±Î¹ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÏÎ¹ÏÎ¹Î¿Ï ÏÎ±Ï, Î¸Î± ÎºÎ±ÏÎ±ÏÎ³Î·Î¸Î¿ÏÎ½.
+        delete_display_name: Î¤Î¿ ÎµÎ¼ÏÎ±Î½Î¹Î¶ÏÎ¼ÎµÎ½Î¿ ÏÎ½Î¿Î¼Î± ÏÎ±Ï Î¸Î± ÎºÎ±ÏÎ±ÏÎ³Î·Î¸ÎµÎ¯ ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î±
+          ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯ Î±ÏÏ Î¬Î»Î»Î¿ÏÏ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿ÏÏ.
+        retain_caveats: 'Î©ÏÏÏÏÎ¿, Î¿ÏÎ¹ÏÎ¼Î­Î½ÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± ÎµÏÎ¬Ï Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½ ÏÏÎ¿
+          OpenStreetMap, Î±ÎºÏÎ¼Î· ÎºÎ±Î¹ Î¼ÎµÏÎ¬ ÏÎ· Î´Î¹Î±Î³ÏÎ±ÏÎ® ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ±Ï:'
+        retain_edits: ÎÎ¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÎ·Î½ Î²Î¬ÏÎ· Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½ ÏÎ¿Ï ÏÎ¬ÏÏÎ·, ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎ¿ÏÎ½,
+          Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½.
+        retain_traces: Î¤Î± Î¯ÏÎ½Î· ÏÎ¿Ï Î­ÏÎµÏÎµ Î¼ÎµÏÎ±ÏÎ¿ÏÏÏÏÎµÎ¹, ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎ¿ÏÎ½, Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½.
+        retain_diary_entries: ÎÎ¹ ÎºÎ±ÏÎ±ÏÏÏÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ±Ï ÎºÎ±Î¹ ÏÎ± ÏÏÏÎ»Î¹Î± ÏÎ¿Ï
+          Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ±Ï, ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎ¿ÏÎ½, Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½ Î±Î»Î»Î¬ Î´ÎµÎ½ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯Î¶Î¿Î½ÏÎ±Î¹.
+        retain_notes: ÎÎ¹ ÏÎ·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï ÏÏÎ¿Î½ ÏÎ¬ÏÏÎ· ÎºÎ±Î¹ ÏÎ± ÏÏÏÎ»Î¹Î± ÏÏÎ½ ÏÎ·Î¼ÎµÎ¹ÏÏÎµÏÎ½, ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎ¿ÏÎ½,
+          Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½ Î±Î»Î»Î¬ Î´ÎµÎ½ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯Î¶Î¿Î½ÏÎ±Î¹.
+        retain_changeset_discussions: ÎÎ¹ ÏÏÎ¶Î·ÏÎ®ÏÎµÎ¹Ï ÏÎ±Ï ÏÏÎ¹Ï Î¿Î¼Î¬Î´ÎµÏ Î±Î»Î»Î±Î³ÏÎ½, ÎµÎ¬Î½ ÏÏÎ¬ÏÏÎ¿ÏÎ½,
+          Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸Î¿ÏÎ½.
+        retain_email: Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸ÎµÎ¯.
+        confirm_delete: ÎÎ¯ÏÎ±ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹;
+        cancel: ÎÎºÏÏÏÏÎ·
+  accounts:
+    edit:
+      title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï
+      my settings: ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¼Î¿Ï
+      current email address: Î¤ÏÎ­ÏÎ¿ÏÏÎ± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï
+      external auth: ÎÎ¾ÏÏÎµÏÎ¹ÎºÎ® ÎµÏÎ±Î»Î®Î¸ÎµÏÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ±Ï
+      openid:
+        link: https://wiki.openstreetmap.org/wiki/OpenID
+        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
+      public editing:
+        heading: ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+        enabled: ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ. ÎÎµÎ½ ÎµÎ¯ÏÏÎµ ÏÎ¹Î± Î±Î½ÏÎ½ÏÎ¼Î¿Î¹ ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ
+          Î´ÎµÎ´Î¿Î¼Î­Î½Î±.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
+        disabled: ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ Î´ÎµÎ´Î¿Î¼Î­Î½Î±, ÏÎ»ÎµÏ
+          Î¿Î¹ ÏÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½ÎµÏ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÎµÎ¯Î½Î±Î¹ Î±Î½ÏÎ½ÏÎ¼ÎµÏ.
+        disabled link text: Î³Î¹Î±ÏÎ¯ Î´ÎµÎ½ Î¼ÏÎ¿ÏÏ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÏ ÏÎ¿Î½ ÏÎ¬ÏÏÎ·;
+      public editing note:
+        heading: ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+        html: ÎÏÏÎ®Î½ ÏÎ· ÏÏÎ¹Î³Î¼Î® Î¿Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ Î±Î½ÏÎ½ÏÎ¼ÎµÏ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ ÎºÎ±Î½ÎµÎ¯Ï
+          Î½Î± ÏÎ±Ï ÏÏÎµÎ¯Î»ÎµÎ¹ Î¼Î®Î½ÏÎ¼Î± Î® Î½Î± Î´ÎµÎ¹ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï. ÎÎ¹Î± Î½Î± Î´ÎµÎ¯Î¾ÎµÏÎµ ÏÎ¹ Î­ÏÎµÏÎµ
+          ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ ÎºÎ±Î¹ Î½Î± ÎµÏÎ¹ÏÏÎ­ÏÎµÏÎµ ÏÏÎ¿ÏÏ Î¬Î»Î»Î¿ÏÏ Î­ÏÎ¸Î¿ÏÎ½ ÏÎµ ÎµÏÎ±ÏÎ® Î¼Î±Î¶Î¯ ÏÎ±Ï Î¼Î­ÏÏ
+          ÏÎ¿Ï Î¹ÏÏÎ¿ÏÏÏÎ¿Ï, ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Î±ÏÏ ÎºÎ¬ÏÏ. <b>ÎÎµÏÎ¬ ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÎµ API 0.6,
+          Î¼ÏÎ½Î¿ Î¿Î¹ ÎµÏÏÎ½ÏÎ¼Î¿Î¹ ÏÏÎ®ÏÏÎµÏ Î¼ÏÎ¿ÏÎ¿ÏÎ½ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ¿ÏÎ½ Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¿Ï ÏÎ¬ÏÏÎ·.</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Î¼Î¬Î¸ÎµÏÎµ Î³Î¹Î±ÏÎ¯</a>).
+          <ul><li>Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ® ÏÎ±Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î´ÎµÎ½ Î¸Î± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¸ÎµÎ¯ Î´Î·Î¼ÏÏÎ¹Î±.
+          </li><li> ÎÏÏÎ® Î· ÎµÎ½Î­ÏÎ³ÎµÎ¹Î± Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î±Î½Î±Î¹ÏÎµÎ¸ÎµÎ¯ ÎºÎ±Î¹ ÏÎ»Î¿Î¹ Î¿Î¹ Î½Î­Î¿Î¹ ÏÏÎ®ÏÏÎµÏ
+          ÎµÎ¯Î½Î±Î¹ ÎµÏÏÎ½ÏÎ¼Î¿Î¹ ÎµÎ¾' Î±ÏÏÎ®Ï.</li></ul>
+      contributor terms:
+        heading: ÎÏÎ¿Î¹ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï
+        agreed: ÎÏÎµÏÎµ Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
+        not yet agreed: ÎÎµÎ½ Î­ÏÎµÏÎµ Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
+        review link text: Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÏÎµ Î±ÏÏÏ ÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿, Î³Î¹Î± ÏÎ·Î½ ÎµÎ½Î·Î¼Î­ÏÏÏÎ·
+          ÏÎ±Ï ÎºÎ±Î¹ ÏÎ·Î½ Î±ÏÎ¿Î´Î¿ÏÎ® ÏÏÎ½ Î½Î­ÏÎ½ ÏÏÏÎ½ ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
+        agreed_with_pd: ÎÎ·Î»ÏÏÎ±ÏÎµ ÎµÏÎ¯ÏÎ·Ï ÏÏÎ¹ Î±ÏÎ¿Î´Î­ÏÎµÏÏÎµ ÏÏÎ¹ Î¿Î¹ ÏÏÎ¿ÏÎ¿ÏÎ¿Î¹Î®ÏÎµÎ¹Ï ÏÎ±Ï Î±Î½Î®ÎºÎ¿ÏÎ½
+          ÏÏÎ¿Î½ Î´Î·Î¼ÏÏÎ¹Î¿ ÏÎ¿Î¼Î­Î±.
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
+        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
+      save changes button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· Î±Î»Î»Î±Î³ÏÎ½
+      make edits public button: ÎÎ± Î³Î¯Î½Î¿ÏÎ½ ÏÎ»ÎµÏ Î¿Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ Î¼Î¿Ï Î´Î·Î¼ÏÏÎ¹ÎµÏ
+      delete_account: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï...
+    update:
+      success_confirm_needed: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ¿Ï ÏÏÎ®ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½ ÎµÏÎ¹ÏÏÏÏÏ. ÎÎ»Î­Î³Î¾ÏÎµ
+        ÏÎ¿ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿ ÏÎ±Ï Î³Î¹Î± Î¼Î¹Î± ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï ÏÎ·Ï Î½Î­Î±Ï ÏÎ±Ï
+        Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
+      success: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎ®ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏÎ¹ÏÏÏÎ¯Î±.
+    destroy:
+      success: Î Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î´Î¹Î±Î³ÏÎ¬ÏÎ·ÎºÎµ...
   browse:
     created: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ
     closed: ÎÎºÎ»ÎµÎ¹ÏÎµ
@@ -236,6 +371,12 @@ el:
     anonymous: Î±Î½ÏÎ½ÏÎ¼Î¿Ï
     no_comment: (ÏÏÏÎ¯Ï ÏÏÏÎ»Î¹Î¿)
     part_of: ÎÎ­ÏÎ¿Ï ÏÎ¿Ï
+    part_of_relations:
+      one: 1 ÏÏÎ­ÏÎ·
+      other: '%{count} ÏÏÎ­ÏÎµÎ¹Ï'
+    part_of_ways:
+      one: 1 Î´Î¹Î±Î´ÏÎ¿Î¼Î®
+      other: '%{count} Î´Î¹Î±Î´ÏÎ¿Î¼Î­Ï'
     download_xml: ÎÎ®ÏÎ· XML
     view_history: Î ÏÎ¿Î²Î¿Î»Î® Î¹ÏÏÎ¿ÏÎ¹ÎºÎ¿Ï
     view_details: Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
@@ -250,8 +391,8 @@ el:
       relation: Î£ÏÎ­ÏÎµÎ¹Ï (%{count})
       relation_paginated: Î£ÏÎ­ÏÎµÎ¹Ï (%{x}-%{y} Î±ÏÏ %{count})
       comment: Î£ÏÏÎ»Î¹Î± (%{count})
-      hidden_commented_by: ÎÏÏÎ¼Î¼Î­Î½Î¿ ÏÏÏÎ»Î¹Î¿ ÏÎ¿Ï %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Î£ÏÏÎ»Î¹Î¿ Î±ÏÏ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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:
@@ -268,6 +409,9 @@ el:
       title_html: 'ÎÎ¹Î±Î´ÏÎ¿Î¼Î®: %{name}'
       history_title_html: 'ÎÏÏÎ¿ÏÎ¹ÎºÏ Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï: %{name}'
       nodes: ÎÏÎ¼Î²Î¿Î¹
+      nodes_count:
+        one: '%{count} ÎºÏÎ¼Î²Î¿Ï'
+        other: '%{count} ÎºÏÎ¼Î²Î¿Î¹'
       also_part_of_html:
         one: ÏÎ¼Î®Î¼Î± ÏÎ·Ï Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï %{related_ways}
         other: ÏÎ¼Î®Î¼Î± ÏÏÎ½ Î´Î¹Î±Î´ÏÎ¿Î¼ÏÎ½ %{related_ways}
@@ -275,6 +419,9 @@ el:
       title_html: 'Î£ÏÎ­ÏÎ·: %{name}'
       history_title_html: 'ÎÏÏÎ¿ÏÎ¹ÎºÏ ÏÏÎ­ÏÎ·Ï: %{name}'
       members: ÎÎ­Î»Î·
+      members_count:
+        one: 1 Î¼Î­Î»Î¿Ï
+        other: '%{count} Î¼Î­Î»Î·'
     relation_member:
       entry_html: '%{type} %{name}'
       entry_role_html: '%{type} %{name} ÏÏ %{role}'
@@ -286,6 +433,7 @@ el:
       entry_html: Î£ÏÎ­ÏÎ· %{relation_name}
       entry_role_html: Î£ÏÎ­ÏÎ· %{relation_name} (ÏÏ %{relation_role})
     not_found:
+      title: ÎÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ
       sorry: 'ÎÏÏÎ¬Î¼Î±Î¹, ÏÎ¿ %{type} #%{id} Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ.'
       type:
         node: ÎºÏÎ¼Î²Î¿Ï
@@ -294,6 +442,7 @@ el:
         changeset: Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
         note: ÏÎ·Î¼ÎµÎ¯ÏÏÎ·
     timeout:
+      title: Î£ÏÎ¬Î»Î¼Î± Î»Î®Î¾Î·Ï ÏÏÏÎ½Î¿Ï
       sorry: ÎÏÏÎ¬Î¼Î±Î¹, ÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î³Î¹Î± ÏÎ¿ %{type} Î¼Îµ Î±Î½Î±Î³Î½ÏÏÎ¹ÏÏÎ¹ÎºÏ %{id}, ÏÏÎµÎ¹Î¬ÏÏÎ·ÎºÎ±Î½
         ÏÎ¿Î»Ï ÏÏÏÎ½Î¿ Î³Î¹Î± Î½Î± Î±Î½Î±ÎºÏÎ·Î¸Î¿ÏÎ½.
       type:
@@ -333,15 +482,15 @@ el:
       open_title: 'ÎÎ½Î¿Î¹ÎºÏÎ® ÏÎ·Î¼ÎµÎ¯ÏÏÎ· #%{note_name}'
       closed_title: 'ÎÏÎ¹Î»ÏÎ¼Î­Î½Î· ÏÎ·Î¼ÎµÎ¯ÏÏÎ· #%{note_name}'
       hidden_title: 'ÎÏÏÏÎ® ÏÎ·Î¼ÎµÎ¯ÏÏÎ· #%{note_name}'
-      opened_by: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ Î±ÏÏ ÏÎ¿Î½ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ Î±ÏÏ Î±Î½ÏÎ½ÏÎ¼Î¿ ÏÏÎ®ÏÏÎ· <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Î£ÏÏÎ»Î¹Î¿ Î±ÏÏ ÏÎ¿Î½ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Î£ÏÏÎ»Î¹Î¿ Î±ÏÏ Î±Î½ÏÎ½ÏÎ¼Î¿ ÏÏÎ®ÏÏÎ· <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: ÎÏÎ¹Î»ÏÎ¸Î·ÎºÎµ Î±ÏÏ ÏÎ¿Î½ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: ÎÏÎ¹Î»ÏÎ¸Î·ÎºÎµ Î±ÏÏ Î±Î½ÏÎ½ÏÎ¼Î¿ ÏÏÎ®ÏÏÎ· <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: ÎÏÎ±Î½ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ Î±ÏÏ ÏÎ¿Î½ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: ÎÏÎ±Î½ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ Î±ÏÏ Î±Î½ÏÎ½ÏÎ¼Î¿ ÏÏÎ®ÏÏÎ· <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: ÎÎ³Î¹Î½Îµ ÎºÏÏÏÏ Î±ÏÏ ÏÎ¿Î½ %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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: Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏÎ½
@@ -358,7 +507,7 @@ el:
       no_edits: (ÏÏÏÎ¯Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ)
       view_changeset_details: Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½ Î±Î»Î»Î±Î³ÏÎ½
     changesets:
-      id: ÎÎ½Î±Î³Î½ÏÏÎ¹ÏÏÎ¹ÎºÏ
+      id: ID
       saved_at: ÎÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ ÏÏÎ¹Ï
       user: Î§ÏÎ®ÏÏÎ·Ï
       comment: Î£ÏÏÎ»Î¹Î¿
@@ -369,8 +518,8 @@ el:
       title_friend: ÎÎ»Î»Î±Î³Î­Ï Î±ÏÏ ÏÎ¿ÏÏ ÏÎ¯Î»Î¿ÏÏ Î¼Î¿Ï
       title_nearby: ÎÎ»Î»Î±Î³Î­Ï Î±ÏÏ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ
       empty: ÎÎµ Î²ÏÎ­Î¸Î·ÎºÎ±Î½ Î±Î»Î»Î±Î³Î­Ï.
-      empty_area: ÎÎµ Î²ÏÎ­Î¸Î·ÎºÎ±Î½ Î±Î»Î»Î±Î³Î­Ï ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®.
-      empty_user: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î±Î»Î»Î±Î³Î­Ï Î±ÏÏ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·.
+      empty_area: Î§ÏÏÎ¯Ï Î±Î»Î»Î±Î³Î­Ï ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®.
+      empty_user: Î§ÏÏÎ¯Ï Î±Î»Î»Î±Î³Î­Ï Î±ÏÏ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·.
       no_more: ÎÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎ±Î½ Î¬Î»Î»ÎµÏ Î±Î»Î»Î±Î³Î­Ï.
       no_more_area: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¬Î»Î»ÎµÏ Î±Î»Î»Î±Î³Î­Ï Î³Î¹Î± Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®.
       no_more_user: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¬Î»Î»ÎµÏ Î±Î»Î»Î±Î³Î­Ï Î±ÏÏ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·.
@@ -390,17 +539,34 @@ el:
     timeout:
       sorry: ÎÎ±Ï ÏÏÎ³ÏÏÏÎµÎ¯ÏÎµ, Î· Î»Î¯ÏÏÎ± ÏÏÎ½ ÏÏÎ¿Î»Î¯ÏÎ½ ÏÎ·Ï Î¿Î¼Î¬Î´Î±Ï Î±Î»Î»Î±Î³ÏÎ½ ÏÎ¿Ï Î¶Î·ÏÎ®ÏÎ±ÏÎµ,
         ÏÏÎµÎ¹Î¬ÏÏÎ·ÎºÎµ ÏÎ¿Î»Ï ÏÏÏÎ½Î¿ Î³Î¹Î± Î½Î± Î±Î½Î±ÎºÏÎ·Î¸ÎµÎ¯.
+  dashboards:
+    contact:
+      km away: '%{count}km Î¼Î±ÎºÏÎ¹Î¬'
+      m away: '%{count}m Î¼Î±ÎºÏÎ¹Î¬'
+    popup:
+      your location: Î ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï
+      nearby mapper: ÎÎ¿Î½ÏÎ¹Î½ÏÏ ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï
+      friend: Î¦Î¯Î»Î¿Ï
+    show:
+      title: Î¤Î¿ ÏÎ±Î¼ÏÎ»Ï Î¼Î¿Ï
+      no_home_location_html: '%{edit_profile_link} ÎºÎ±Î¹ Î²Î¬Î»ÏÎµ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï Î³Î¹Î±
+        Î½Î± Î´ÎµÎ¯ÏÎµ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ.'
+      edit_your_profile: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ±Ï
+      my friends: ÎÎ¹ ÏÎ¯Î»Î¿Î¹ Î¼Î¿Ï
+      no friends: ÎÎµÎ½ Î­ÏÎµÏÎµ ÏÏÎ¿ÏÎ¸Î­ÏÎµÎ¹ ÏÎ¯Î»Î¿ÏÏ Î±ÎºÏÎ¼Î±.
+      nearby users: ÎÎ»Î»Î¿Î¹ ÎºÎ¿Î½ÏÎ¹Î½Î¿Î¯ ÏÏÎ®ÏÏÎµÏ
+      no nearby users: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¬Î»Î»Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Î´Î®Î»ÏÏÎ±Î½ ÏÏÎ¹ ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ¿ÏÎ½ ÎºÎ¿Î½ÏÎ¬
+        ÏÎ±Ï ÏÏÎ¿Ï ÏÎ¿ ÏÎ±ÏÏÎ½.
+      friends_changesets: Î¿Î¼Î¬Î´ÎµÏ Î±Î»Î»Î±Î³ÏÎ½ ÏÎ¯Î»ÏÎ½
+      friends_diaries: ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ¯Î»ÏÎ½
+      nearby_changesets: Î¿Î¼Î¬Î´ÎµÏ Î±Î»Î»Î±Î³ÏÎ½ Î±ÏÏ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ
+      nearby_diaries: ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï Î±ÏÏ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ
   diary_entries:
     new:
       title: ÎÎ­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
     form:
-      subject: 'ÎÎ­Î¼Î±:'
-      body: 'ÎÏÏÎ¹Î¿ Î¼Î­ÏÎ¿Ï:'
-      language: 'ÎÎ»ÏÏÏÎ±:'
-      location: 'Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±:'
-      latitude: 'ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï:'
-      longitude: 'ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï:'
-      use_map_link: ÏÏÎ®ÏÎ· ÏÎ¿Ï ÏÎ¬ÏÏÎ·
+      location: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±
+      use_map_link: Î§ÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¯Î·ÏÎµ ÏÎ¿Î½ ÏÎ¬ÏÏÎ·
     index:
       title: ÎÎ¼ÎµÏÎ¿Î»ÏÎ³Î¹Î± ÏÏÎ·ÏÏÏÎ½
       title_friends: ÎÎ¼ÎµÏÎ¿Î»ÏÎ³Î¹Î± ÏÎ¯Î»ÏÎ½
@@ -410,7 +576,7 @@ el:
       new: ÎÎ­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       new_title: Î£ÏÎ½ÏÎ±Î¾Î· Î½Î­Î±Ï ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï ÏÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Ï Î¼Î¿Ï
       my_diary: Î¤Î¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Ï Î¼Î¿Ï
-      no_entries: ÎÎµ Î²ÏÎ­Î¸Î·ÎºÎ±Î½ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï ÏÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿
+      no_entries: Î§ÏÏÎ¯Ï ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       recent_entries: Î ÏÏÏÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       older_entries: Î Î±Î»Î¹ÏÏÎµÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
       newer_entries: ÎÎµÏÏÎµÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
@@ -430,9 +596,10 @@ el:
         %{id}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï
         Î¼Î­ÏÏ ÏÎ¿Ï Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
     diary_entry:
-      posted_by_html: ÎÎ·Î¼Î¿ÏÎ¹ÎµÏÏÎ·ÎºÎµ Î±ÏÏ ÏÎ¿Î½ %{link_user} ÏÏÎ¹Ï %{created} ÏÏÎ± %{language_link}
+      posted_by_html: ÎÎ·Î¼Î¿ÏÎ¹ÎµÏÏÎ·ÎºÎµ Î±ÏÏ ÏÎ¿Î½ %{link_user} ÏÏÎ¹Ï %{created} ÏÏÎ± %{language_link}.
+      updated_at_html: Î¤ÎµÎ»ÎµÏÏÎ±Î¯Î± ÎµÎ½Î·Î¼Î­ÏÏÏÎ· ÏÏÎ¹Ï %{updated}.
       comment_link: Î£ÏÎ¿Î»Î¹Î¬ÏÏÎµ ÏÎ·Î½ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
-      reply_link: ÎÏÎ±Î½ÏÎ®ÏÏÎµ ÏÏÎ·Î½ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
+      reply_link: ÎÏÎ¿ÏÏÎ¿Î»Î® Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï ÏÏÎ¿Î½ ÏÏÎ³Î³ÏÎ±ÏÎ­Î±
       comment_count:
         zero: Î§ÏÏÎ¯Ï ÏÏÏÎ»Î¹Î±
         one: '%{count} ÏÏÏÎ»Î¹Î¿'
@@ -464,13 +631,18 @@ el:
         title: ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï OpenStreetMap
         description: Î ÏÏÏÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï Î±ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï OpenStreetMap
     comments:
-      has_commented_on: Î %{display_name} Î­ÏÎµÎ¹ ÏÏÎ¿Î»Î¹Î¬ÏÎµÎ¹ ÏÏÎ¹Ï Î±ÎºÏÎ»Î¿ÏÎ¸ÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
-        Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
+      heading: Î£ÏÏÎ»Î¹Î± ÎÎ¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï %{user}
+      no_comments: Î§ÏÏÎ¯Ï ÏÏÏÎ»Î¹Î± Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       post: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
       when: Î ÏÏÎµ
       comment: Î£ÏÏÎ»Î¹Î¿
       newer_comments: ÎÎµÏÏÎµÏÎ± ÏÏÏÎ»Î¹Î±
       older_comments: Î Î±Î»Î±Î¹ÏÏÎµÏÎ± ÏÏÏÎ»Î¹Î±
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Î ÎµÏÎ±ÏÎ¼Î¿Î³Î® ÎºÎ±ÏÎ±ÏÏÏÎ®Î¸Î·ÎºÎµ.
   friendships:
     make_friend:
       heading: Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ¿Ï %{user} ÏÏ ÏÎ¯Î»Î¿Ï;
@@ -478,6 +650,8 @@ el:
       success: Î %{name} ÎµÎ¯Î½Î±Î¹ ÏÏÏÎ± ÏÎ¯Î»Î¿Ï ÏÎ¿Ï!
       failed: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î±ÏÎ­ÏÏÏÎµ Î· ÏÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ¿Ï ÏÏÎ®ÏÏÎ· %{name} ÏÏ ÏÎ¯Î»Î¿Ï.
       already_a_friend: ÎÎ¯ÏÏÎµ Î®Î´Î· ÏÎ¯Î»Î¿Î¹ Î¼Îµ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· %{name}.
+      limit_exceeded: ÎÎºÎ±Î½ÎµÏ ÏÎ¿Î»Î»Î¿ÏÏ ÏÎ¯Î»Î¿ÏÏ ÏÎµÎ»ÎµÏÏÎ±Î¯Î±. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎµÏÎ¯Î¼ÎµÎ½Îµ Î»Î¯Î³Î¿ ÏÏÎ¹Î½
+        ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÎµÎ¹Ï Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿ÏÏ ÏÎ¯Î»Î¿ÏÏ.
     remove_friend:
       heading: ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ¯Î»Î¿Ï %{user};
       button: ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ¯Î»Î¿Ï
@@ -517,8 +691,10 @@ el:
           holding_position: ÎºÏÎ¬ÏÎ·ÏÎ· Î¸Î­ÏÎ·Ï
           parking_position: ÎÎ­ÏÎ· ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï
           runway: ÎÎ¹Î¬Î´ÏÎ¿Î¼Î¿Ï
+          taxilane: ÎÏÏÎ¯Î´Î± ÏÎ±Î¾Î¯
           taxiway: Î¤ÏÎ¿ÏÎ¹ÏÎ´ÏÎ¿Î¼Î¿Ï
           terminal: Î¤ÎµÏÎ¼Î±ÏÎ¹ÎºÏÏ ÏÏÎ±Î¸Î¼ÏÏ
+          windsock: ÎÎ½ÎµÎ¼Î¿ÏÏÎ¹Î¿
         amenity:
           animal_shelter: ÎÎ±ÏÎ±ÏÏÎ³Î¹Î¿ Î¶ÏÏÎ½
           arts_centre: ÎÎ­Î½ÏÏÎ¿ ÏÎµÏÎ½ÏÎ½
@@ -529,7 +705,9 @@ el:
           bench: Î Î¬Î³ÎºÎ¿Ï
           bicycle_parking: Î£ÏÎ¬Î¸Î¼ÎµÏÏÎ· ÏÎ¿Î´Î·Î»Î¬ÏÏÎ½
           bicycle_rental: ÎÎ½Î¿Î¹ÎºÎ¯Î±ÏÎ· ÏÎ¿Î´Î·Î»Î¬ÏÏÎ½
+          bicycle_repair_station: Î£ÏÎ±Î¸Î¼ÏÏ ÎµÏÎ¹ÏÎºÎµÏÎ®Ï ÏÎ¿Î´Î·Î»Î¬ÏÎ¿Ï
           biergarten: Î¥ÏÎ±Î¯Î¸ÏÎ¹Î± Î¼ÏÏÏÎ±ÏÎ¯Î±
+          blood_bank: Î¤ÏÎ¬ÏÎµÎ¶Î± Î±Î¯Î¼Î±ÏÎ¿Ï
           boat_rental: ÎÎ½Î¿Î¹ÎºÎ¯Î±ÏÎ· ÏÎºÎ±ÏÏÎ½
           brothel: ÎÎ¯ÎºÎ¿Ï Î±Î½Î¿ÏÎ®Ï
           bureau_de_change: ÎÎ½ÏÎ±Î»Î»Î±ÎºÏÎ®ÏÎ¹Î¿ ÏÏÎ½Î±Î»Î»Î¬Î³Î¼Î±ÏÎ¿Ï
@@ -546,6 +724,7 @@ el:
           clock: Î¡Î¿Î»ÏÎ¹
           college: ÎÎ¿Î»Î­Î³Î¹Î¿
           community_centre: ÎÎ¿Î¹Î½Î¿ÏÎ¹ÎºÏ ÎºÎ­Î½ÏÏÎ¿
+          conference_centre: Î£ÏÎ½ÎµÎ´ÏÎ¹Î±ÎºÏ ÎºÎ­Î½ÏÏÎ¿
           courthouse: ÎÎ¹ÎºÎ±ÏÏÎ®ÏÎ¹Î¿
           crematorium: ÎÏÎµÎ¼Î±ÏÏÏÎ¹Î¿
           dentist: ÎÎ´Î¿Î½ÏÎ¯Î±ÏÏÎ¿Ï
@@ -565,36 +744,37 @@ el:
           hospital: ÎÎ¿ÏÎ¿ÎºÎ¿Î¼ÎµÎ¯Î¿
           hunting_stand: ÎÏÎ½Î·Î³Î·ÏÎ¹ÎºÏ ÎºÎ¹ÏÏÎºÎ¹
           ice_cream: Î Î±Î³ÏÏÏ
+          internet_cafe: ÎÎ½ÏÎµÏÎ½ÎµÏ ÎºÎ±ÏÎ­
           kindergarten: ÎÎ·ÏÎ¹Î±Î³ÏÎ³ÎµÎ¯Î¿
+          language_school: Î£ÏÎ¿Î»ÎµÎ¯Î¿ Î³Î»ÏÏÏÎ±Ï
           library: ÎÎ¹Î²Î»Î¹Î¿Î¸Î®ÎºÎ·
           marketplace: ÎÎ³Î¿ÏÎ¬
           monastery: ÎÎ¿Î½Î±ÏÏÎ®ÏÎ¹
+          money_transfer: ÎÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÏÎ·Î¼Î¬ÏÏÎ½
           motorcycle_parking: Î§ÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï Î¼Î¿ÏÎ¿ÏÎ¹ÎºÎ»ÎµÏÏÎ½
+          music_school: Î©Î´ÎµÎ¯Î¿
           nightclub: ÎÏÏÏÎµÏÎ¹Î½Ï ÎºÎ­Î½ÏÏÎ¿
           nursing_home: ÎÎ¯ÎºÎ¿Ï ÎµÏÎ³Î·ÏÎ¯Î±Ï
-          office: ÎÏÎ±ÏÎµÎ¯Î¿
           parking: Î§ÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï
           parking_entrance: ÎÎ¯ÏÎ¿Î´Î¿Ï ÏÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï
           parking_space: Î§ÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï
+          payment_terminal: Î¤ÎµÏÎ¼Î±ÏÎ¹ÎºÏ ÏÎ»Î·ÏÏÎ¼ÏÎ½
           pharmacy: Î¦Î±ÏÎ¼Î±ÎºÎµÎ¯Î¿
           place_of_worship: Î¤ÏÏÎ¿Ï Î»Î±ÏÏÎµÎ¯Î±Ï
           police: ÎÏÏÏÎ½Î¿Î¼Î¯Î±
           post_box: Î¤Î±ÏÏÎ´ÏÎ¿Î¼Î¹ÎºÎ® Î¸ÏÏÎ¯Î´Î±
           post_office: Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿
-          preschool: Î ÏÎ¿ÏÏÎ¿Î»Î¹ÎºÎ® ÎµÎºÏÎ±Î¯Î´ÎµÏÏÎ·
           prison: Î¦ÏÎ»Î±ÎºÎ®
           pub: Î Î±Î¼Ï
-          public_building: ÎÎ·Î¼ÏÏÎ¹Î¿ ÎºÏÎ¯ÏÎ¹Î¿
+          public_bath: ÎÎ·Î¼ÏÏÎ¹Î¿ Î»Î¿ÏÏÏÏ
+          public_bookcase: ÎÎ·Î¼ÏÏÎ¹Î± Î²Î¹Î²Î»Î¹Î¿Î¸Î®ÎºÎ·
+          public_building: ÎÎ·Î¼ÏÏÎ¹Î¿ ÎºÏÎ®ÏÎ¹Î¿
           recycling: Î£Î·Î¼ÎµÎ¯Î¿ Î±Î½Î±ÎºÏÎºÎ»ÏÏÎ·Ï
           restaurant: ÎÏÏÎ¹Î±ÏÏÏÎ¹Î¿
-          retirement_home: ÎÎ·ÏÎ¿ÎºÎ¿Î¼ÎµÎ¯Î¿
-          sauna: Î£Î¬Î¿ÏÎ½Î±
           school: Î£ÏÎ¿Î»ÎµÎ¯Î¿
           shelter: ÎÎ±ÏÎ±ÏÏÎ³Î¹Î¿
-          shop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           shower: ÎÏÎ¿ÏÏ
           social_centre: ÎÎ¿Î¹Î½ÏÎ½Î¹ÎºÏ ÎºÎ­Î½ÏÏÎ¿
-          social_club: ÎÎ¿Î¹Î½ÏÎ½Î¹ÎºÎ® Î»Î­ÏÏÎ·
           social_facility: ÎÎ¿Î¹Î½ÏÎ½Î¹ÎºÎ® ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·
           studio: Î£ÏÎ¿ÏÎ½ÏÎ¹Î¿
           swimming_pool: Î Î¹ÏÎ¯Î½Î±
@@ -604,18 +784,21 @@ el:
           toilets: Î¤Î¿ÏÎ±Î»Î­ÏÎµÏ
           townhall: ÎÎ·Î¼Î±ÏÏÎµÎ¯Î¿
           university: Î Î±Î½ÎµÏÎ¹ÏÏÎ®Î¼Î¹Î¿
+          vehicle_inspection: ÎÏÎ¹Î¸ÎµÏÏÎ·ÏÎ· Î¿ÏÎ®Î¼Î±ÏÎ¿Ï
           vending_machine: ÎÎ·ÏÎ¬Î½Î·Î¼Î± Î±ÏÏÏÎ¼Î±ÏÎ·Ï ÏÏÎ»Î·ÏÎ·Ï
           veterinary: ÎÏÎ·Î½Î¹Î±ÏÏÎ¹ÎºÎ® Î§ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÎ®
           village_hall: ÎÎ¯Î¸Î¿ÏÏÎ± ÏÏÏÎ¹Î¿Ï
           waste_basket: ÎÎ±Î»Î¬Î¸Î¹ Î±ÏÎ¿ÏÏÎ¹Î¼Î¼Î¬ÏÏÎ½
           waste_disposal: ÎÎ¹Î¬Î¸ÎµÏÎ· Î±ÏÎ¿Î²Î»Î®ÏÏÎ½
+          waste_dump_site: Î§ÏÏÎ¿Ï Î±ÏÏÏÏÎ¹ÏÎ·Ï Î±ÏÎ¿ÏÏÎ¹Î¼Î¬ÏÏÎ½
           water_point: Î£Î·Î¼ÎµÎ¯Î¿ Î±Î½ÎµÏÎ¿Î´Î¹Î±ÏÎ¼Î¿Ï Î½ÎµÏÎ¿Ï
-          youth_centre: ÎÎ­Î½ÏÏÎ¿ Î½ÎµÎ¿Î»Î±Î¯Î±Ï
         boundary:
           administrative: ÎÎ¹Î¿Î¹ÎºÎ·ÏÎ¹ÎºÏ ÏÏÎ¹Î¿
           census: ÎÏÎ¹Î¿ Î±ÏÎ¿Î³ÏÎ±ÏÎ®Ï
           national_park: ÎÎ¸Î½Î¹ÎºÏ ÏÎ¬ÏÎºÎ¿
+          political: Î£ÏÎ½Î¿ÏÎ¿ ÎµÎºÎ»Î¿Î³Î¹ÎºÎ®Ï ÏÎµÏÎ¹ÏÎ­ÏÎµÎ¹Î±Ï
           protected_area: Î ÏÎ¿ÏÏÎ±ÏÎµÏÏÎ¼ÎµÎ½Î· ÏÎµÏÎ¹Î¿ÏÎ®
+          "yes": Î£ÏÎ½Î¿ÏÎ¿
         bridge:
           aqueduct: Î¥Î´ÏÎ±Î³ÏÎ³ÎµÎ¯Î¿
           boardwalk: Î ÎµÎ¶Î¿Î´ÏÏÎ¼Î¹Î¿
@@ -624,26 +807,75 @@ el:
           viaduct: ÎÎ¿Î¹Î»Î±Î´Î¿Î³Î­ÏÏÏÎ±
           "yes": ÎÎ­ÏÏÏÎ±
         building:
-          "yes": ÎÏÎ¯ÏÎ¹Î¿
+          apartment: ÎÎ¹Î±Î¼Î­ÏÎ¹ÏÎ¼Î±
+          apartments: ÎÎ¹Î±Î¼ÎµÏÎ¯ÏÎ¼Î±ÏÎ±
+          barn: Î£ÏÎ±ÏÎ»Î¿Ï
+          bungalow: ÎÏÎ¬Î½Î³ÎºÎ±Î»Î¿Î¿Ï
+          cabin: ÎÎ±Î¼ÏÎ¯Î½Î±
+          chapel: Î Î±ÏÎµÎºÎºÎ»Î®ÏÎ¹
+          church: ÎÎºÎºÎ»Î·ÏÎ¯Î±
+          civic: Î Î¿Î»Î¹ÏÎ¹ÎºÏ ÎºÏÎ®ÏÎ¹Î¿
+          college: Î Î±Î½ÎµÏÎ¹ÏÏÎ·Î¼Î¹Î±ÎºÏ ÎºÏÎ®ÏÎ¹Î¿
+          commercial: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÏ ÎºÏÎ®ÏÎ¹Î¿
+          construction: ÎÏÎ®ÏÎ¹Î¿ ÏÏÏ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ®
+          dormitory: ÎÎ¿Î¹ÏÏÎ½Î±Ï
+          farm: ÎÎ³ÏÎ¿Î¹ÎºÎ¯Î±
+          farm_auxiliary: ÎÎ¿Î·Î¸Î·ÏÎ¹ÎºÎ® Î±Î³ÏÎ¿Î¹ÎºÎ¯Î±
+          garage: ÎÎºÎ±ÏÎ¬Î¶
+          garages: ÎÎºÎ±ÏÎ¬Î¶
+          greenhouse: ÎÎµÏÎ¼Î¿ÎºÎ®ÏÎ¹Î¿
+          hangar: Î¥ÏÏÏÏÎµÎ³Î¿ Î±ÎµÏÎ¿ÏÎºÎ±ÏÏÎ½
+          hospital: ÎÏÎ®ÏÎ¹Î¿ ÎÎ¿ÏÎ¿ÎºÎ¿Î¼ÎµÎ¯Î¿Ï
+          hotel: ÎÎµÎ½Î¿Î´Î¿ÏÎµÎ¯Î¿
+          house: Î£ÏÎ¯ÏÎ¹
+          hut: ÎÎ±Î»ÏÎ²Î±
+          industrial: ÎÎ¹Î¿Î¼Î·ÏÎ±Î½Î¹ÎºÏ ÎÏÎ®ÏÎ¹Î¿
+          kindergarten: ÎÏÎ®ÏÎ¹Î¿ Î½Î·ÏÎ¹Î±Î³ÏÎ³ÎµÎ¯Î¿Ï
+          office: ÎÏÎ®ÏÎ¹Î¿ ÎÏÎ±ÏÎµÎ¯ÏÎ½
+          public: ÎÎ·Î¼ÏÏÎ¹Î¿ ÎºÏÎ®ÏÎ¹Î¿
+          residential: Î Î¿Î»ÏÎºÎ±ÏÎ¿Î¹ÎºÎ¯Î±
+          retail: ÎÏÎ®ÏÎ¹Î¿ Î»Î¹Î±Î½Î¹ÎºÎ®Ï
+          roof: ÎÏÎ¿ÏÎ®
+          ruins: ÎÏÎµÎ¹ÏÏÎ¼Î­Î½Î¿ ÎÏÎ®ÏÎ¹Î¿
+          school: Î£ÏÎ¿Î»Î¹ÎºÏ ÎÏÎ®ÏÎ¹Î¿
+          shed: Î¥ÏÏÏÏÎµÎ³Î¿
+          stable: Î£ÏÎ¬Î²Î»Î¿Ï
+          static_caravan: Î¤ÏÎ¿ÏÏÏÏÎ¹ÏÎ¿
+          temple: ÎÏÎ®ÏÎ¹Î¿ Î½Î±Î¿Ï
+          train_station: ÎÏÎ®ÏÎ¹Î¿ Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÎ¿Ï Î£ÏÎ±Î¸Î¼Î¿Ï
+          university: ÎÏÎ®ÏÎ¹Î¿ Î Î±Î½ÎµÏÎ¹ÏÏÎ·Î¼Î¯Î¿Ï
+          warehouse: ÎÏÎ¿Î¸Î®ÎºÎ·
+          "yes": ÎÏÎ®ÏÎ¹Î¿
+        club:
+          scout: ÎÎ¬ÏÎ· ÎÎ¼Î¬Î´Î±Ï Î ÏÎ¿ÏÎºÏÏÏÎ½
+          sport: ÎÎ¸Î»Î·ÏÎ¹ÎºÏÏ ÏÏÎ»Î»Î¿Î³Î¿Ï
         craft:
+          beekeeper: ÎÎµÎ»Î¹ÏÏÎ¿ÎºÏÎ¼Î¿Ï
+          blacksmith: Î£Î¹Î´Î·ÏÎ¿ÏÏÎ³ÏÏ
           brewery: ÎÏÎ¸Î¿ÏÎ¿Î¹ÎµÎ¯Î¿
           carpenter: ÎÏÎ»Î¿ÏÏÎ³ÏÏ
           electrician: ÎÎ»ÎµÎºÏÏÎ¿Î»ÏÎ³Î¿Ï
+          electronics_repair: ÎÏÎ¹ÏÎºÎµÏÎ® Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏÎ½
           gardener: ÎÎ·ÏÎ¿ÏÏÏÏ
+          handicraft: Î§ÎµÎ¹ÏÎ¿ÎºÎ±ÏÎ±ÏÎºÎµÏÎ­Ï
+          metal_construction: ÎÎ±ÏÎ±ÏÎºÎµÏÎ±ÏÏÎ®Ï ÎÎµÏÎ¬Î»Î»ÏÎ½
           painter: ÎÏÎ³ÏÎ¬ÏÎ¿Ï
           photographer: Î¦ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï
           plumber: Î¥Î´ÏÎ±ÏÎ»Î¹ÎºÏÏ
           shoemaker: Î¤ÏÎ±Î³ÎºÎ¬ÏÎ·Ï
           tailor: Î¡Î¬ÏÏÎ·Ï
+          winery: ÎÎ¹Î½Î¿ÏÎ¿Î¹ÎµÎ¯Î¿
           "yes": ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎµÏÎ½ÏÎ½
+        crossing: ÎÎ¹Î¬Î²Î±ÏÎ·
         emergency:
+          access_point: Î£Î·Î¼ÎµÎ¯Î¿ Î ÏÏÏÎ²Î±ÏÎ·Ï
           ambulance_station: Î£ÏÎ±Î¸Î¼ÏÏ Î±ÏÎ¸ÎµÎ½Î¿ÏÏÏÏÎ½
           assembly_point: Î£Î·Î¼ÎµÎ¯Î¿ ÏÏÎ³ÎºÎ­Î½ÏÏÏÏÎ·Ï
           defibrillator: ÎÏÎ¹Î½Î¹Î´ÏÏÎ®Ï
+          fire_extinguisher: Î ÏÏÎ¿ÏÎ²ÎµÏÏÎ®ÏÎ±Ï
           landing_site: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î­ÎºÏÎ±ÎºÏÎ·Ï ÏÏÎ¿ÏÎ³ÎµÎ¯ÏÏÎ·Ï
           phone: Î¤Î·Î»Î­ÏÏÎ½Î¿ Î­ÎºÏÎ±ÎºÏÎ·Ï Î±Î½Î¬Î³ÎºÎ·Ï
           water_tank: ÎÎµÎ¾Î±Î¼ÎµÎ½Î® Î½ÎµÏÎ¿Ï Î­ÎºÏÎ±ÎºÏÎ·Ï Î±Î½Î¬Î³ÎºÎ·Ï
-          "yes": ÎÏÎµÎ¯Î³Î¿Î½ÏÎ±
         highway:
           abandoned: ÎÎ³ÎºÎ±ÏÎ±Î»ÎµÎ»ÎµÎ¹Î¼Î¼Î­Î½Î¿Ï Î±ÏÏÎ¿ÎºÎ¹Î½Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
           bridleway: ÎÎ¿Î½Î¿ÏÎ¬ÏÎ¹ Î³Î¹Î± Î¬Î»Î¿Î³Î±
@@ -684,19 +916,22 @@ el:
           tertiary: Î¤ÏÎ¹ÏÎµÏÏÎ½ Î´ÏÏÎ¼Î¿Ï
           tertiary_link: Î¤ÏÎ¹ÏÎµÏÏÎ½ Î´ÏÏÎ¼Î¿Ï
           track: Î§ÏÎ¼Î±ÏÏÎ´ÏÎ¿Î¼Î¿Ï
+          traffic_mirror: ÎÎ±Î¸ÏÎ­ÏÏÎ·Ï ÎºÏÎºÎ»Î¿ÏÎ¿ÏÎ¯Î±Ï
           traffic_signals: Î£Î®Î¼Î±ÏÎ± ÎºÏÎºÎ»Î¿ÏÎ¿ÏÎ¯Î±Ï
-          trail: ÎÎ¿Î½Î¿ÏÎ¬ÏÎ¹
           trunk: ÎÎ¸Î½Î¹ÎºÎ® Î¿Î´ÏÏ
           trunk_link: ÎÎ¸Î½Î¹ÎºÎ® Î¿Î´ÏÏ
           turning_loop: ÎÏÎºÎ»Î¹ÎºÏÏ ÎÏÎ¼Î²Î¿Ï
           unclassified: ÎÏÎ±Î¾Î¹Î½ÏÎ¼Î·ÏÎ· Î¿Î´ÏÏ
           "yes": ÎÏÏÎ¼Î¿Ï
         historic:
+          aircraft: ÎÏÏÎ¿ÏÎ¹ÎºÏ Î±ÎµÏÎ¿ÏÎºÎ¬ÏÎ¿Ï
           archaeological_site: ÎÏÏÎ±Î¹Î¿Î»Î¿Î³Î¹ÎºÏÏ ÏÏÏÎ¿Ï
+          bomb_crater: ÎÏÏÎ¿ÏÎ¹ÎºÏÏ ÎºÏÎ±ÏÎ®ÏÎ±Ï Î²ÏÎ¼Î²Î±Ï
           battlefield: Î ÎµÎ´Î¯Î¿ Î¼Î¬ÏÎ·Ï
           boundary_stone: Î£ÏÎ½Î¿ÏÎ¹Î±ÎºÎ® ÏÏÎ®Î»Î·
-          building: ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎºÏÎ¯ÏÎ¹Î¿
+          building: ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎºÏÎ®ÏÎ¹Î¿
           bunker: ÎÏÏÏÏ
+          cannon: ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎºÎ±Î½ÏÎ½Î¹
           castle: ÎÎ¬ÏÏÏÎ¿
           church: ÎÎºÎºÎ»Î·ÏÎ¯Î±
           city_gate: ÎÎ¯ÏÎ¿Î´Î¿Ï ÏÎ·Ï ÏÏÎ»Î·Ï
@@ -704,7 +939,6 @@ el:
           fort: ÎÏÏÏÏ
           heritage: ÎÎ½Î·Î¼ÎµÎ¯Î¿ ÏÎ¿Î»Î¹ÏÎ¹ÏÏÎ¹ÎºÎ®Ï ÎºÎ»Î·ÏÎ¿Î½Î¿Î¼Î¹Î¬Ï
           house: Î£ÏÎ¯ÏÎ¹
-          icon: ÎÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿
           manor: ÎÏÎ±ÏÎ»Î·
           memorial: ÎÎ½Î·Î¼ÎµÎ¯Î¿
           mine: ÎÏÏÏÎµÎ¯Î¿
@@ -729,7 +963,6 @@ el:
           commercial: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ®
           conservation: ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ·
           construction: ÎÎ±ÏÎ±ÏÎºÎµÏÎ®
-          farm: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
           farmland: ÎÎµÏÏÎ³Î¹ÎºÎ® Î³Î·
           farmyard: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
           forest: ÎÎ¬ÏÎ¿Ï
@@ -745,18 +978,21 @@ el:
           quarry: ÎÎ±ÏÎ¿Î¼ÎµÎ¯Î¿
           railway: Î£Î¹Î´Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
           recreation_ground: Î§ÏÏÎ¿Ï Î±Î½Î±ÏÏÏÎ®Ï
+          religious: ÎÏÎ·ÏÎºÎµÏÏÎ¹ÎºÏ Î­Î´Î±ÏÎ¿Ï
           reservoir: Î¤Î±Î¼Î¹ÎµÏÏÎ®ÏÎ±Ï
           reservoir_watershed: ÎÎµÎ¾Î±Î¼ÎµÎ½Î® Î±ÏÎ¿ÏÏÎ¿Î®Ï ÏÎ´Î¬ÏÏÎ½
           residential: ÎÎ±ÏÎ¿Î¹ÎºÎ·Î¼Î­Î½Î· ÏÎµÏÎ¹Î¿ÏÎ®
           retail: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î»Î¹Î±Î½Î¹ÎºÎ®Ï
-          road: Î ÎµÏÎ¹Î¿ÏÎ® Î´ÏÏÎ¼ÏÎ½
           village_green: Î ÏÎ¬ÏÎ¹Î½Î¿ ÏÏÏÎ¹Ï
           vineyard: ÎÎ¼ÏÎµÎ»ÏÎ½Î±Ï
           "yes": Î§ÏÎ®ÏÎ· Î³Î·Ï
         leisure:
           beach_resort: Î Î±ÏÎ±Î¸Î±Î»Î¬ÏÏÎ¹Î¿ Î¸Î­ÏÎµÏÏÎ¿
           bird_hide: ÎÎ±ÏÎ±ÏÏÎ³Î¹Î¿ ÏÎ¿ÏÎ»Î¹ÏÎ½
+          bleachers: ÎÎ¾Î­Î´ÏÎ± ÏÏÏÎ¯Ï ÏÏÎ­Î³Î±ÏÏÏÎ¿
+          bowling_alley: ÎÎ¯Î¸Î¿ÏÏÎ± Î¼ÏÏÎ¿ÏÎ»Î¹Î½Î³Îº
           common: ÎÎ¿Î¹Î½ÏÏÏÎ·ÏÏÎ· Î³Î·
+          dance: ÎÎ¯Î¸Î¿ÏÏÎ± ÏÏÏÎ¿Ï
           dog_park: Î Î¬ÏÎºÎ¿ ÏÎºÏÎ»ÏÎ½
           firepit: ÎÎ¬ÎºÎºÎ¿Ï Î¦ÏÏÎ¹Î¬Ï
           fishing: ÎÎ»Î¹ÎµÏÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ®
@@ -769,7 +1005,9 @@ el:
           marina: ÎÎ±ÏÎ¯Î½Î±
           miniature_golf: ÎÎ¯Î½Î¹ Î³ÎºÎ¿Î»Ï
           nature_reserve: ÎÎ±ÏÎ±ÏÏÎ³Î¹Î¿ ÏÎ·Ï ÏÏÏÎ·Ï
+          outdoor_seating: Î¥ÏÎ±Î¯Î¸ÏÎ¹Î± ÎºÎ±Î¸Î¯ÏÎ¼Î±ÏÎ±
           park: Î Î¬ÏÎºÎ¿
+          picnic_table: Î¤ÏÎ±ÏÎ­Î¶Î¹ ÏÎ¹ÎºÎ½Î¹Îº
           pitch: ÎÎ®ÏÎµÎ´Î¿ Î±Î¸Î»Î·ÏÎ¹ÏÎ¼Î¿Ï
           playground: Î Î±Î¹Î´Î¹ÎºÎ® ÏÎ±ÏÎ¬
           recreation_ground: Î§ÏÏÎ¿Ï Î±Î½Î±ÏÏÏÎ®Ï
@@ -784,6 +1022,9 @@ el:
           "yes": Î¨ÏÏÎ±Î³ÏÎ³Î¯Î±
         man_made:
           adit: ÎÏÎ¹Î¶ÏÎ½ÏÎ¹Î± ÎµÎ¯ÏÎ¿Î´Î¿Ï ÏÎµ Î¿ÏÏÏÎµÎ¯Î¿
+          advertising: ÎÎ¹Î±ÏÎ®Î¼Î¹ÏÎ·
+          antenna: ÎÎµÏÎ±Î¯Î±
+          avalanche_protection: Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎ¹Î¿Î½Î¿ÏÏÎ¹Î²Î¬Î´Î±Ï
           beacon: ÏÎ¬ÏÎ¿Ï
           beehive: ÎÏÏÎ­Î»Î·
           breakwater: ÎÏÎ¼Î±ÏÎ¿Î¸ÏÎ±ÏÏÏÎ·Ï
@@ -791,6 +1032,7 @@ el:
           bunker_silo: ÎÏÏÏÏ
           chimney: ÎÎ±Î¼Î¹Î½Î¬Î´Î±
           crane: ÎÎµÏÎ±Î½ÏÏ
+          cross: Î£ÏÎ±ÏÏÏÏ
           dolphin: ÎÎ­ÏÏÏÎ±
           dyke: ÎÎ½Î¬ÏÏÎ¼Î±
           embankment: ÎÎ½Î¬ÏÏÎ¼Î±
@@ -799,6 +1041,7 @@ el:
           groyne: Î¦ÏÎ¬Î³Î¼Î±
           kiln: ÎÎ±Î¼Î¯Î½Î¹
           lighthouse: Î¦Î¬ÏÎ¿Ï
+          manhole: ÎÎ½Î¸ÏÏÏÎ¿Î¸ÏÏÎ¯Î´Î±
           mast: ÎÎ±ÏÎ¬ÏÏÎ¹
           mine: ÎÏÏÏÎµÎ¯Î¿
           mineshaft: Î¦ÏÎµÎ¬ÏÎ¹Î¿ Î¿ÏÏÏÎµÎ¯Î¿Ï
@@ -806,12 +1049,17 @@ el:
           petroleum_well: ÎÎµÏÏÏÎ·ÏÎ· Î ÎµÏÏÎµÎ»Î±Î¯Î¿Ï
           pier: ÎÏÎ¿Î²Î¬Î¸ÏÎ±
           pipeline: ÎÎ³ÏÎ³ÏÏ
+          pumping_station: ÎÎ½ÏÎ»Î¹Î¿ÏÏÎ¬ÏÎ¹Î¿
           silo: Î£Î¹Î»Ï
+          snow_cannon: ÎÎ±Î½ÏÎ½Î¹ ÏÎ¹Î¿Î½Î¹Î¿Ï
+          snow_fence: Î§Î¹Î¿Î½Î¿ÏÏÎ¬ÏÏÎ·Ï
           storage_tank: ÎÎµÎ¾Î±Î¼ÎµÎ½Î® Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Ï
           surveillance: ÎÏÎ¹ÏÎ®ÏÎ·ÏÎ·
+          telescope: Î¤Î·Î»ÎµÏÎºÏÏÎ¹Î¿
           tower: Î ÏÏÎ³Î¿Ï
           wastewater_plant: ÎÎ¿Î½Î¬Î´Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±Ï Î»ÏÎ¼Î¬ÏÏÎ½
           watermill: ÎÎµÏÏÎ¼ÏÎ»Î¿Ï
+          water_tap: ÎÏÏÏÎ·
           water_tower: Î ÏÏÎ³Î¿Ï Î½ÎµÏÎ¿Ï
           water_well: Î Î·Î³Î¬Î´Î¹
           water_works: ÎÏÎ³Î± Î¥Î´Î¬ÏÏÎ½
@@ -822,6 +1070,7 @@ el:
           airfield: Î£ÏÏÎ±ÏÎ¹ÏÏÎ¹ÎºÏ Î±ÎµÏÎ¿Î´ÏÏÎ¼Î¹Î¿
           barracks: Î£ÏÏÎ±ÏÏÎ½Î±Ï
           bunker: ÎÏÏÏÏ
+          checkpoint: Î£Î·Î¼ÎµÎ¯Î¿ ÎµÎ»Î­Î³ÏÎ¿Ï
           "yes": Î£ÏÏÎ±ÏÏÏ
         mountain_pass:
           "yes": ÎÏÎµÎ¹Î½Ï ÏÎ­ÏÎ±ÏÎ¼Î±
@@ -831,6 +1080,7 @@ el:
           cape: ÎÎºÏÏÏÎ®ÏÎ¹Î¿
           cave_entrance: ÎÎ¯ÏÎ¿Î´Î¿Ï ÏÏÎ·Î»Î¹Î¬Ï
           cliff: ÎÎºÏÎµÎ¼ÏÏ
+          coastline: ÎÎºÏÎ¿Î³ÏÎ±Î¼Î¼Î®
           crater: ÎÏÎ±ÏÎ®ÏÎ±Ï
           dune: ÎÎ¼Î¼ÏÎ»Î¿ÏÎ¿Ï
           fell: ÎÏÏÎ¿Ï
@@ -842,11 +1092,13 @@ el:
           heath: ÎÎºÎ±Î»Î»Î¹Î­ÏÎ³Î·ÏÎ· Î³Î·
           hill: ÎÏÏÎ¿Ï
           island: ÎÎ·ÏÎ¯
+          isthmus: ÎÏÎ¸Î¼ÏÏ
           land: ÎÎ·ÏÎ¬
           marsh: ÎÎ¬Î»ÏÎ¿Ï
           moor: ÎÎ­ÏÏÏÎ±
           mud: ÎÎ¬ÏÏÎ·
           peak: ÎÎ¿ÏÏÏÎ®
+          peninsula: Î§ÎµÏÏÏÎ½Î·ÏÎ¿Ï
           point: Î£Î·Î¼ÎµÎ¯Î¿
           reef: ÎÏÎ±Î»Î¿Ï
           ridge: Î£ÎºÏÏÎµÎ»Î¿Ï
@@ -859,6 +1111,8 @@ el:
           stone: Î Î­ÏÏÎ±
           strait: Î Î¿ÏÎ¸Î¼ÏÏ
           tree: ÎÎ­Î½ÏÏÎ¿
+          tree_row: Î£ÎµÎ¹ÏÎ¬ Î´Î­Î½ÏÏÏÎ½
+          tundra: Î¤Î¿ÏÎ½Î´ÏÎ±
           valley: ÎÎ¿Î¹Î»Î¬Î´Î±
           volcano: ÎÏÎ±Î¯ÏÏÎµÎ¹Î¿
           water: ÎÎµÏÏ
@@ -870,19 +1124,28 @@ el:
           architect: ÎÏÏÎ¹ÏÎ­ÎºÏÎ¿Î½Î±Ï
           association: Î£ÏÎ»Î»Î¿Î³Î¿Ï
           company: ÎÏÎ±Î¹ÏÎµÎ¯Î±
+          diplomatic: ÎÎ¹ÏÎ»ÏÎ¼Î±ÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
           educational_institution: ÎÎºÏÎ±Î¹Î´ÎµÏÏÎ¹ÎºÏ Î¯Î´ÏÏÎ¼Î±
           employment_agency: ÎÏÎ³Î±Î½Î¹ÏÎ¼ÏÏ Î±ÏÎ±ÏÏÏÎ»Î·ÏÎ·Ï
+          energy_supplier: ÎÏÎ±ÏÎµÎ¯Î¿ ÏÎ±ÏÎ¿ÏÎ®Ï ÎµÎ½Î­ÏÎ³ÎµÎ¹Î±Ï
           estate_agent: ÎÏÎ·Î¼Î±ÏÎ¿Î¼ÎµÏÎ¹ÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
+          financial: ÎÏÎ±ÏÎµÎ¯Î¿ Î¿Î¹ÎºÎ¿Î½Î¿Î¼Î¹ÎºÏÎ½
           government: ÎÏÎ²ÎµÏÎ½Î·ÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
           insurance: ÎÏÏÎ±Î»Î¹ÏÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
           it: ÎÏÎ±ÏÎµÎ¯Î¿ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÎºÎ®Ï
           lawyer: ÎÎ¹ÎºÎ·Î³ÏÏÎ¿Ï
+          logistics: ÎÎ¿Î³Î¹ÏÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
           ngo: ÎÏÎ±ÏÎµÎ¯Î¿ ÎÎÎ
+          notary: Î£ÏÎ¼Î²Î¿Î»Î±Î¹Î¿Î³ÏÎ¬ÏÎ¿Ï
+          religion: ÎÏÎ·ÏÎºÎµÏÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
+          research: ÎÏÎµÏÎ½Î·ÏÎ¹ÎºÏ Î³ÏÎ±ÏÎµÎ¯Î¿
+          tax_advisor: Î¦Î¿ÏÎ¿Î»Î¿Î³Î¹ÎºÏÏ ÏÏÎ¼Î²Î¿ÏÎ»Î¿Ï
           telecommunication: ÎÏÎ±ÏÎµÎ¯Î¿ ÏÎ·Î»ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î¹ÏÎ½
           travel_agent: Î¤Î±Î¾Î¹Î´Î¹ÏÏÎ¹ÎºÏ ÏÏÎ±ÎºÏÎ¿ÏÎµÎ¯Î¿
           "yes": ÎÏÎ±ÏÎµÎ¯Î¿
         place:
           allotments: ÎÎ±ÏÎ±Î½ÏÎºÎ·ÏÎ¿Î¹
+          archipelago: ÎÏÏÎ¹ÏÎ­Î»Î±Î³Î¿Ï
           city: Î ÏÎ»Î·
           city_block: ÎÎ¹ÎºÎ¿Î´Î¿Î¼Î¹ÎºÏ ÏÎµÏÏÎ¬Î³ÏÎ½Î¿ ÏÏÎ»Î·Ï
           country: Î§ÏÏÎ±
@@ -897,6 +1160,7 @@ el:
           locality: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±
           municipality: ÎÎ®Î¼Î¿Ï
           neighbourhood: ÎÎµÎ¹ÏÎ¿Î½Î¹Î¬
+          plot: ÎÎ¹ÎºÏÏÎµÎ´Î¿
           postcode: Î¤Î±ÏÏÎ´ÏÎ¿Î¼Î¹ÎºÏÏ ÎºÏÎ´Î¹ÎºÎ±Ï
           quarter: Î£ÏÎ½Î¿Î¹ÎºÎ¯Î±
           region: Î ÎµÏÎ¹Î¿ÏÎ®
@@ -906,7 +1170,6 @@ el:
           subdivision: Î¥ÏÎ¿Î´Î¹Î±Î¯ÏÎµÏÎ·
           suburb: Î ÏÎ¿Î¬ÏÏÎ¹Î¿
           town: ÎÏÎ¼ÏÏÎ¿Î»Î·
-          unincorporated_area: ÎÎ·-ÎµÎ½ÏÏÎ¼Î±ÏÏÎ¼Î­Î½Î· ÏÎµÏÎ¹Î¿ÏÎ®
           village: Î§ÏÏÎ¹Ï
           "yes": ÎÎ­ÏÎ¿Ï
         railway:
@@ -932,11 +1195,14 @@ el:
           switch: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÎ¬ ÏÎ·Î¼ÎµÎ¯Î±
           tram: ÎÏÎ±Î¼Î¼Î® ÏÏÎ±Î¼
           tram_stop: Î£ÏÎ¬ÏÎ· ÏÏÎ±Î¼
+          yard: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ Î£ÏÎ±Î¸Î¼ÏÏ ÎÎ¹Î±Î»Î¿Î³Î®Ï
         shop:
           alcohol: ÎÎºÏÏÏ Î¬Î´ÎµÎ¹Î±Ï
           antiques: ÎÎ½ÏÎ¯ÎºÎµÏ
           art: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ­ÏÎ½Î·Ï
+          baby_goods: ÎÏÎµÏÎ¹ÎºÎ¬ ÎµÎ¯Î´Î·
           bakery: Î¦Î¿ÏÏÎ½Î¿Ï
+          bathroom_furnishing: ÎÎ¾Î¿ÏÎ»Î¹ÏÎ¼ÏÏ Î¼ÏÎ¬Î½Î¹Î¿Ï
           beauty: Î£Î±Î»ÏÎ½Î¹ Î¿Î¼Î¿ÏÏÎ¹Î¬Ï
           beverages: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿ÏÏÎ½
           bicycle: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿Î´Î·Î»Î¬ÏÏÎ½
@@ -949,28 +1215,34 @@ el:
           car_repair: Î£ÏÎ½ÎµÏÎ³ÎµÎ¯Î¿ Î±ÏÏÎ¿ÎºÎ¹Î½Î®ÏÏÎ½
           carpet: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ±Î»Î¹ÏÎ½
           charity: Î¦Î¹Î»Î±Î½Î¸ÏÏÏÎ¹ÎºÏ ÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
+          cheese: Î¤ÏÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           chemist: Î§Î·Î¼Î¹ÎºÏÏ
+          chocolate: Î£Î¿ÎºÎ¿Î»Î±ÏÎµÏÎ¯
           clothes: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿ÏÏÏÎ½
           computer: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÏÎ½
           confectionery: ÎÎ±ÏÎ±ÏÎ¿ÏÎ»Î±ÏÏÎ¹ÎºÎ®
           convenience: Î Î±Î½ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           copyshop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÏÏÎ¿Î±Î½ÏÎ¹Î³ÏÎ¬ÏÏÎ½
           cosmetics: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎºÎ±Î»Î»ÏÎ½ÏÎ¹ÎºÏÎ½
+          curtain: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎºÎ¿ÏÏÏÎ¯Î½ÏÎ½
+          dairy: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î³Î±Î»Î±ÎºÏÎ¿ÎºÎ¿Î¼Î¹ÎºÏÎ½
           deli: ÎÏÎµÎ»Î¹ÎºÎ±ÏÎ­ÏÎµÎ½
           department_store: Î Î¿Î»ÏÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           discount: ÎÎºÏÏÏÏÎ¹ÎºÏ ÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           doityourself: ÎÎ´Î¹Î¿ÎºÎ±ÏÎ±ÏÎºÎµÏÎ­Ï
           dry_cleaning: Î£ÏÎµÎ³Î½Ï ÎºÎ±Î¸Î¬ÏÎ¹ÏÎ¼Î±
+          e-cigarette: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏÎ½ ÏÏÎ¹Î³Î¬ÏÏÎ½
           electronics: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏÎ½
+          erotic: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎµÏÏÏÎ¹ÎºÏÎ½ ÎµÎ¹Î´ÏÎ½
           estate_agent: ÎÏÎ·Î¼Î±ÏÎ¿Î¼ÎµÏÎ¯ÏÎ·Ï
+          fabric: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÏÎ±ÏÎ¼Î¬ÏÏÎ½
           farm: ÎÎµÏÏÎ³Î¹ÎºÎ¬ ÎµÏÏÎ´Î¹Î±
           fashion: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¼ÏÎ´Î±Ï
-          fish: ÎÏÎ¸ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
+          fishing: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎµÎ¹Î´ÏÎ½ Î±Î»Î¹ÎµÎ¯Î±Ï
           florist: ÎÎ½Î¸Î¿ÏÏÎ»Î·Ï
           food: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÏÎ¿ÏÎ¯Î¼ÏÎ½
           funeral_directors: ÎÏÎ±ÏÎµÎ¯Î¿ ÎºÎ·Î´ÎµÎ¹ÏÎ½
           furniture: ÎÏÎ¹ÏÎ»Î±
-          gallery: ÎÎºÎ±Î»ÎµÏÎ¯
           garden_centre: ÎÎ­Î½ÏÏÎ¿ ÎºÎ®ÏÎ¿Ï
           general: Î Î±Î½ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           gift: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î´ÏÏÏÎ½
@@ -978,28 +1250,35 @@ el:
           grocery: ÎÏÏÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           hairdresser: ÎÎ¿Î¼Î¼ÏÏÎ®ÏÎ¹Î¿
           hardware: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¼Îµ ÏÏÏÎ¼Î±ÏÎ±-ÏÎ¹Î´Î·ÏÎ¹ÎºÎ¬
+          hearing_aids: ÎÎ¿Î·Î¸Î®Î¼Î±ÏÎ± Î±ÎºÎ¿Î®Ï
           hifi: Hi-Fi
           houseware: ÎÎ±Î³Î±Î¶Î¯ Î¼Îµ Î¿Î¹ÎºÎ¹Î±ÎºÎ¬ ÎµÎ¯Î´Î·
+          ice_cream: Î Î±Î³ÏÏÎ±ÏÎ¶Î¯Î´Î¹ÎºÎ¿
           interior_decoration: ÎÎ¹Î±ÎºÏÏÎ¼Î·ÏÎ· ÎµÏÏÏÎµÏÎ¹ÎºÎ¿Ï ÏÏÏÎ¿Ï
           jewelry: ÎÎ¿ÏÎ¼Î·Î¼Î±ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           kiosk: Î ÎµÏÎ¯ÏÏÎµÏÎ¿
           kitchen: ÎÎ±Î³Î±Î¶Î¯ ÎºÎ¿ÏÎ¶Î¹Î½ÏÎ½
           laundry: Î Î»ÏÎ½ÏÎ®ÏÎ¹Î¿
+          locksmith: ÎÎ»ÎµÎ¹Î´Î±ÏÎ¬Ï
           lottery: ÎÎ¿ÏÎ±ÏÎ¯Î±
           mall: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÏ ÎºÎ­Î½ÏÏÎ¿
-          market: ÎÎ³Î¿ÏÎ¬
           massage: ÎÎ±ÏÎ¬Î¶
+          medical_supply: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¹Î±ÏÏÎ¹ÎºÏÎ½ ÏÏÎ¿Î¼Î·Î¸ÎµÎ¹ÏÎ½
           mobile_phone: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎºÎ¹Î½Î·ÏÎ®Ï ÏÎ·Î»ÎµÏÏÎ½Î¯Î±Ï
           motorcycle: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¼Î¿ÏÎ¿ÏÎ¹ÎºÎ»ÎµÏÏÎ½
+          motorcycle_repair: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎµÏÎ¹ÏÎºÎµÏÎ®Ï Î¼Î¿ÏÎ¿ÏÏÎºÎ»ÎµÏÏÎ½
           music: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¼Î¿ÏÏÎ¹ÎºÎ®Ï
+          musical_instrument: ÎÎ¿ÏÏÎ¹ÎºÎ¬ ÏÏÎ³Î±Î½Î±
           newsagent: Î ÏÎ±ÎºÏÎ¿ÏÎµÎ¯Î¿ ÎµÏÎ·Î¼ÎµÏÎ¯Î´ÏÎ½
+          nutrition_supplements: Î£ÏÎ¼ÏÎ»Î·ÏÏÎ¼Î±ÏÎ± Î´Î¹Î±ÏÏÎ¿ÏÎ®Ï
           optician: ÎÏÏÎ¹ÎºÏÏ
           organic: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¿ÏÎ³Î±Î½Î¹ÎºÏÎ½ ÏÏÎ¿ÏÎ¯Î¼ÏÎ½
           outdoor: Î¥ÏÎ±Î¯Î¸ÏÎ¹Î¿ ÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           paint: Î§ÏÏÎ¼Î±ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
+          pastry: ÎÎ±ÏÎ±ÏÎ¿ÏÎ»Î±ÏÏÎµÎ¯Î¿
           pawnbroker: ÎÎ½ÎµÏÏÏÎ¿Î´Î±Î½ÎµÎ¹ÏÏÎ®Ï
+          perfumery: ÎÏÏÎ¼Î±ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           pet: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎºÎ±ÏÎ¿Î¹ÎºÎ¯Î´Î¹ÏÎ½
-          pharmacy: Î¦Î±ÏÎ¼Î±ÎºÎµÎ¯Î¿
           photo: Î¦ÏÏÎ¿Î³ÏÎ±ÏÎµÎ¯Î¿
           seafood: ÎÎ±Î»Î±ÏÏÎ¹Î½Ï ÏÎ±Î³Î·ÏÏ
           second_hand: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¼ÎµÏÎ±ÏÎµÎ¹ÏÎ¹ÏÎ¼Î­Î½ÏÎ½
@@ -1016,6 +1295,7 @@ el:
           vacant: ÎÎµÎ½Ï ÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           variety_store: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿Î¹ÎºÎ¹Î»Î¹ÏÎ½
           video: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î²Î¯Î½ÏÎµÎ¿
+          wholesale: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿Î½Î´ÏÎ¹ÎºÎ®Ï
           wine: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎºÏÎ±ÏÎ¹ÏÎ½
           "yes": ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î±
         tourism:
@@ -1063,18 +1343,16 @@ el:
           weir: Î¥Î´Î±ÏÎ¿ÏÏÎ¬ÎºÏÎ·Ï
           "yes": ÎÎ±Î½Î¬Î»Î¹
       admin_levels:
-        level2: Î£ÏÎ½Î¿ÏÎ± ÏÏÏÎ±Ï
+        level2: Î£ÏÎ½Î¿ÏÎ¿ ÏÏÏÎ±Ï
+        level3: Î£ÏÎ½Î¿ÏÎ¿ ÏÎµÏÎ¹Î¿ÏÎ®Ï
         level4: Î£ÏÎ½Î¿ÏÎ¿ ÏÎ¿Î»Î¹ÏÎµÎ¯Î±Ï
         level5: Î£ÏÎ½Î¿ÏÎ¿ ÏÎµÏÎ¹Î¿ÏÎ®Ï
         level6: Î£ÏÎ½Î¿ÏÎ¿ ÎºÎ¿Î¼Î·ÏÎµÎ¯Î±Ï
+        level7: Î£ÏÎ½Î¿ÏÎ¿ Î´Î®Î¼Î¿Ï
         level8: Î£ÏÎ½Î¿ÏÎ¿ ÏÏÎ»Î·Ï
         level9: Î£ÏÎ½Î¿ÏÎ¿ ÏÏÏÎ¹Î¿Ï
         level10: Î£ÏÎ½Î¿ÏÎ¿ ÏÏÎ¿Î±ÏÏÎ¯Î¿Ï
-    description:
-      title:
-        osm_nominatim: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±ÏÏ ÏÎ¿ <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±ÏÏ ÏÎ¿ <a href="http://www.geonames.org/">GeoNames</a>
+        level11: Î£ÏÎ½Î¿ÏÎ¿ Î³ÎµÎ¹ÏÎ¿Î½Î¹Î¬Ï
       types:
         cities: Î ÏÎ»ÎµÎ¹Ï
         towns: ÎÏÎ¼Î¿ÏÏÎ»ÎµÎ¹Ï
@@ -1152,9 +1430,6 @@ el:
     new:
       title_html: ÎÎ½Î±ÏÎ¿ÏÎ¬ %{link}
       missing_params: ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î½Î­Î± Î±Î½Î±ÏÎ¿ÏÎ¬
-      details: Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÎ±ÏÎ¬ÏÏÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ ÏÏÏÎ²Î»Î·Î¼Î±
-        (Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹).
-      select: 'ÎÏÎ¹Î»Î­Î¾ÏÎµ Î¼Î¹Î± Î±Î¹ÏÎ¯Î± Î³Î¹Î± ÏÎ·Î½ Î±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ±Ï:'
       disclaimer:
         intro: 'Î ÏÎ¹Î½ ÏÏÎµÎ¯Î»ÎµÏÎµ ÏÎ·Î½ Î±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ±Ï ÏÏÎ¿ÏÏ ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ­Ï ÏÎ¿Ï Î¹ÏÏÎ¿ÏÏÏÎ¿Ï, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ
           ÏÎ¹Î³Î¿ÏÏÎµÏÏÎµÎ¯ÏÎµ ÏÏÎ¹:'
@@ -1217,9 +1492,10 @@ el:
     intro_text: Î¤Î¿ OpenStreetMap ÎµÎ¯Î½Î±Î¹ ÏÎ¬ÏÏÎ·Ï ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï, ÏÎ¿Ï Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ Î±ÏÏ Î±Î½Î¸ÏÏÏÎ¿ÏÏ
       ÏÎ±Î½ ÎºÎ¹ ÎµÏÎ¬Ï ÎºÎ±Î¹ ÎµÎ¯Î½Î±Î¹ Î´ÏÏÎµÎ¬Î½, ÏÏÏ Î¬Î´ÎµÎ¹Î± ÎµÎ»ÎµÏÎ¸ÎµÏÎ·Ï ÏÏÎ®ÏÎ·Ï.
     intro_2_create_account: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î­Î½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÏÎ®ÏÏÎ·
-    hosting_partners_html: Î Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î± ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ %{ucl}, %{bytemark}, ÎºÎ±Î¹
-      Î¬Î»Î»Î¿ÏÏ %{partners}.
+    hosting_partners_html: Î ÏÎ¹Î»Î¿Î¾ÎµÎ½Î¯Î± ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ %{ucl}, %{fastly}, %{bytemark},
+      ÎºÎ±Î¹ Î¬Î»Î»Î¿ÏÏ %{partners}.
     partners_ucl: UCL
+    partners_fastly: Fastly
     partners_bytemark: Bytemark Hosting
     partners_partners: ÏÏÎ½ÎµÏÎ³Î¬ÏÎµÏ
     tou: ÎÏÎ¿Î¹ ÏÏÎ®ÏÎ·Ï
@@ -1241,44 +1517,48 @@ el:
       text: ÎÎ¬Î½ÏÎµ Î¼Î¹Î± Î´ÏÏÎµÎ¬
     learn_more: ÎÎ¬Î¸ÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±
     more: Î ÎµÏÎ¹ÏÏÏÏÎµÏÎ±
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÏÎ¿Î»Î¯Î±ÏÎµ Î¼Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ¹ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï'
       hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
       header: 'Î %{from_user} Î­ÏÎµÎ¹ ÏÏÎ¿Î»Î¹Î¬ÏÎµÎ¹ ÏÎ·Î½ ÎºÎ±ÏÎ±ÏÏÏÎ¹ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÏÎ¿ OpenStreetMap
         Î¼Îµ Î¸Î­Î¼Î± %{subject}:'
+      header_html: 'Î %{from_user} Î­ÏÎµÎ¹ ÏÏÎ¿Î»Î¹Î¬ÏÎµÎ¹ ÏÎ·Î½ ÎºÎ±ÏÎ±ÏÏÏÎ¹ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÏÎ¿ OpenStreetMap
+        Î¼Îµ Î¸Î­Î¼Î± %{subject}:'
       footer: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ ÏÏÏÎ»Î¹Î¿ ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î±
-        ÏÏÎ¿Î»Î¹Î¬ÏÎµÏÎµ ÏÏÎ¿ %{commenturl} Î® Î½Î± Î±ÏÎ±Î½ÏÎ®ÏÎµÏÎµ ÏÏÎ¿ %{replyurl}
+        ÏÏÎ¿Î»Î¹Î¬ÏÎµÏÎµ ÏÏÎ¿ %{commenturl} Î® Î½Î± ÏÏÎµÎ¯Î»ÎµÏÎµ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ ÏÏÎ³Î³ÏÎ±ÏÎ­Î± ÏÏÎ¿ %{replyurl}
+      footer_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ ÏÏÏÎ»Î¹Î¿ ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ
+        Î½Î± ÏÏÎ¿Î»Î¹Î¬ÏÎµÏÎµ ÏÏÎ¿ %{commenturl} Î® Î½Î± ÏÏÎµÎ¯Î»ÎµÏÎµ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ ÏÏÎ³Î³ÏÎ±ÏÎ­Î± ÏÏÎ¿ %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
       header: 'Î ÏÏÎ®ÏÏÎ·Ï %{from_user} ÏÎ¬Ï Î­ÏÎµÎ¹ ÏÏÎµÎ¯Î»ÎµÎ¹ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î¼Î­ÏÏ ÏÎ¿Ï OpenStreetMap
         Î¼Îµ Î¸Î­Î¼Î± %{subject}:'
-      footer_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î½Î± Î±ÏÎ±Î½ÏÎ®ÏÎµÏÎµ
-        ÏÏÎ¿ %{replyurl}
+      header_html: 'Î ÏÏÎ®ÏÏÎ·Ï %{from_user} ÏÎ¬Ï Î­ÏÎµÎ¹ ÏÏÎµÎ¯Î»ÎµÎ¹ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î¼Î­ÏÏ ÏÎ¿Ï OpenStreetMap
+        Î¼Îµ Î¸Î­Î¼Î± %{subject}:'
+      footer: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î½Î± ÏÏÎµÎ¯Î»ÎµÏÎµ
+        Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ ÏÏÎ³Î³ÏÎ±ÏÎ­Î± ÏÏÎ¿ %{replyurl}
+      footer_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î½Î± ÏÏÎµÎ¯Î»ÎµÏÎµ
+        Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ ÏÏÎ³Î³ÏÎ±ÏÎ­Î± ÏÏÎ¿ %{replyurl}
     friendship_notification:
       hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
       subject: '[OpenStreetMap] Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÎ±Ï ÏÏÏÏÎ¸ÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿'
       had_added_you: Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÎ±Ï ÏÏÏÏÎ¸ÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿ ÏÏÎ¿ OpenStreetMap.
       see_their_profile: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ¿Ï ÏÏÎ¿ %{userurl}.
+      see_their_profile_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ¿Ï ÏÏÎ¿ %{userurl}.
       befriend_them: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± ÏÎ¿ÏÏ ÏÏÎ¿ÏÎ¸Î­ÏÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿ÏÏ ÏÏÎ¿ %{befriendurl}.
-    gpx_notification:
-      greeting: ÎÎµÎ¹Î±,
-      your_gpx_file: ÎÎ¿Î¹Î¬Î¶ÎµÎ¹ Î¼Îµ Î´Î¹ÎºÏ ÏÎ±Ï Î±ÏÏÎµÎ¯Î¿ GPX
-      with_description: Î¼Îµ ÏÎµÏÎ¹Î³ÏÎ±ÏÎ®
-      and_the_tags: 'ÎºÎ±Î¹ ÏÎ± ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬:'
-      and_no_tags: ÎºÎ±Î¹ ÏÏÏÎ¯Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ.
-      failure:
-        subject: '[OpenStreetMap] Î ÎµÎ¹ÏÎ±Î³ÏÎ³Î® GPX Î±ÏÎ­ÏÏÏÎµ'
-        failed_to_import: 'ÎÏÎ­ÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î®. Î¤Î¿ ÏÏÎ¬Î»Î¼Î± ÎµÎ¯Î½Î±Î¹:'
-        more_info_1: Î ÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ± ÏÏÎ¬Î»Î¼Î±ÏÎ± ÎµÎ¹ÏÎ±Î³ÏÎ³Î®Ï GPX
-          ÎºÎ±Î¹ ÏÏÏ Î½Î± ÏÎ± Î±ÏÎ¿ÏÏÎ³ÎµÏÎµ
-        more_info_2: 'Î¼ÏÎ¿ÏÎ¿ÏÎ½ Î½Î± Î²ÏÎµÎ¸Î¿ÏÎ½ ÏÏÎ¿:'
-      success:
-        subject: '[OpenStreetMap] Î ÎµÎ¹ÏÎ±Î³ÏÎ³Î® GPX ÏÎ­ÏÏÏÎµ'
-        loaded_successfully:
-          one: ÏÏÏÏÏÏÎµ ÎµÏÎ¹ÏÏÏÏÏ Î¼Îµ %{trace_points} Î±ÏÏ 1 ÏÎ¹Î¸Î±Î½Ï ÏÎ·Î¼ÎµÎ¯Î¿.
-          other: ÏÏÏÏÏÏÎµ ÎµÏÎ¹ÏÏÏÏÏ Î¼Îµ %{trace_points} Î±ÏÏ ÏÎ¹Î¸Î±Î½Î¬ %{possible_points}
-            ÏÎ·Î¼ÎµÎ¯Î±.
+      befriend_them_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± ÏÎ¿ÏÏ ÏÏÎ¿ÏÎ¸Î­ÏÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿ÏÏ ÏÏÎ¿ %{befriendurl}.
+    gpx_failure:
+      hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
+      failed_to_import: 'ÎÏÎ­ÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î®. Î¤Î¿ ÏÏÎ¬Î»Î¼Î± ÎµÎ¯Î½Î±Î¹:'
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      subject: '[OpenStreetMap] Î ÎµÎ¹ÏÎ±Î³ÏÎ³Î® GPX Î±ÏÎ­ÏÏÏÎµ'
+    gpx_success:
+      hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
+      loaded_successfully:
+        one: ÏÏÏÏÏÏÎµ ÎµÏÎ¹ÏÏÏÏÏ Î¼Îµ %{trace_points} Î±ÏÏ 1 ÏÎ¹Î¸Î±Î½Ï ÏÎ·Î¼ÎµÎ¯Î¿.
+        other: ÏÏÏÏÏÏÎµ ÎµÏÎ¹ÏÏÏÏÏ Î¼Îµ %{trace_points} Î±ÏÏ ÏÎ¹Î¸Î±Î½Î¬ %{possible_points} ÏÎ·Î¼ÎµÎ¯Î±.
+      subject: '[OpenStreetMap] Î ÎµÎ¹ÏÎ±Î³ÏÎ³Î® GPX ÏÎ­ÏÏÏÎµ'
     signup_confirm:
       subject: '[OpenStreetMap] ÎÎ±Î»ÏÏ Î®Î»Î¸Î±ÏÎµ ÏÏÎ¿ OpenStreetMap'
       greeting: ÎÎµÎ¹Î± ÏÎ¿Ï!
@@ -1291,13 +1571,6 @@ el:
     email_confirm:
       subject: '[OpenStreetMap] ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï
         ÏÎ±Ï'
-    email_confirm_plain:
-      greeting: ÎÎµÎ¹Î±,
-      hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÎµÎ»ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÎµÏÎµÎ¯Ï) Î¸Î­Î»ÎµÎ¹ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ·Î½ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
-        ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÏÎ¿ %{server_url} ÏÎµ %{new_address}.
-      click_the_link: ÎÎ¬Î½ ÎµÎ¯ÏÏÎµ ÎµÏÎµÎ¯Ï, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿Î½ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î³Î¹Î±
-        Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ Î· Î±Î»Î»Î±Î³Î®.
-    email_confirm_html:
       greeting: ÎÎµÎ¹Î±,
       hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÎµÎ»ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÎµÏÎµÎ¯Ï) Î¸Î­Î»ÎµÎ¹ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ·Î½ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
         ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÏÎ¿ %{server_url} ÏÎµ %{new_address}.
@@ -1305,19 +1578,11 @@ el:
         Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ Î· Î±Î»Î»Î±Î³Î®.
     lost_password:
       subject: '[OpenStreetMap] ÎÎ¯ÏÎ·ÏÎ· ÎµÏÎ±Î½Î±ÏÎ¿ÏÎ¬Ï ÎºÏÎ´Î¹ÎºÎ¿Ï'
-    lost_password_plain:
       greeting: ÎÎµÎ¹Î±,
       hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÏÎ¹Î¸Î±Î½ÏÏÎ±ÏÎ± ÎµÏÎµÎ¯Ï) Î­ÏÎµÎ¹ Î¶Î·ÏÎ®ÏÎµÎ¹ ÎµÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ¿Ï ÎºÏÎ´Î¹ÎºÎ¿Ï
         ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï Î¼Îµ Î±ÏÏÏ ÏÎ¿ email ÏÏÎ¿ openstreetmap.org.
       click_the_link: ÎÎ¬Î½ ÏÏÏÎºÎµÎ¹ÏÎ±Î¹ Î³Î¹Î± ÏÎ±Ï, ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿Î½ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÏÏÎ½Î´ÎµÏÎ¼Î¿ Î³Î¹Î±
         Î½Î± ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÏÏÏÏÎ²Î±ÏÎ®Ï ÏÎ±Ï.
-    lost_password_html:
-      greeting: ÎÎµÎ¹Î±,
-      hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÏÎ¹Î¸Î±Î½ÏÏÎ±ÏÎ± ÎµÏÎµÎ¯Ï) Î­ÏÎµÎ¹ Î¶Î·ÏÎ®ÏÎµÎ¹ ÎµÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ¿Ï ÎºÏÎ´Î¹ÎºÎ¿Ï
-        ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÏÎ¿ openstreetmap.org ÏÎ¿Ï Î±Î½ÏÎ¹ÏÏÎ¿Î¹ÏÎµÎ¯ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·
-        Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
-      click_the_link: ÎÎ¬Î½ ÎµÎ¯ÏÏÎµ ÎµÏÎµÎ¯Ï, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿Î½ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÏÏÎ½Î´ÎµÏÎ¼Î¿
-        Î³Î¹Î± Î½Î± Î³Î¯Î½ÎµÎ¹ ÎµÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÎ¿Ï ÎºÏÎ´Î¹ÎºÎ¿Ï ÏÎ±Ï.
     note_comment_notification:
       anonymous: ÎÎ½ÏÎ½ÏÎ¼Î¿Ï ÏÏÎ®ÏÏÎ·Ï
       greeting: ÎÎµÎ¹Î±,
@@ -1367,11 +1632,39 @@ el:
         ÏÏÎ¿ %{url}.
       unsubscribe: ÎÎ¹Î± Î½Î± Î´Î¹Î±Î³ÏÎ±ÏÎµÎ¯ÏÎµ Î±ÏÏ ÏÎ¹Ï ÎµÎ½Î·Î¼ÎµÏÏÏÎµÎ¹Ï Î±ÏÏÎ®Ï ÏÎ·Ï Î¿Î¼Î¬Î´Î±Ï Î±Î»Î»Î±Î³ÏÎ½,
         ÎµÏÎ¹ÏÎºÎµÏÎ¸ÎµÎ¯ÏÎµ ÏÎ¿ %{url} ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ "ÎÎ¹Î±Î³ÏÎ±ÏÎ®".
+  confirmations:
+    confirm:
+      heading: ÎÎ»Î­Î³Î¾ÏÎµ ÏÎ¿ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿ ÏÎ±Ï!
+      introduction_1: Î£Î±Ï ÏÏÎµÎ¯Î»Î±Î¼Îµ Î­Î½Î± email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï.
+      introduction_2: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÏÎµ ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï ÎºÎ¬Î½Î¿Î½ÏÎ±Ï ÎºÎ»Î¹Îº ÏÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ¿
+        email ÎºÎ±Î¹ Î¸Î± ÎµÎ¯ÏÏÎµ ÏÎµ Î¸Î­ÏÎ· Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏÎµÏÎµ ÏÎ· ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·.
+      press confirm button: Î Î±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·" Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
+        ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï.
+      button: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
+      success: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸Î·ÎºÎµ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï, ÎµÏÏÎ±ÏÎ¹ÏÏÎ¿ÏÎ¼Îµ Î³Î¹Î± ÏÎ·Î½ ÎµÎ³Î³ÏÎ±ÏÎ® ÏÎ±Ï!
+      already active: ÎÏÏÏÏ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ Î®Î´Î· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯.
+      unknown token: Î ÎºÏÎ´Î¹ÎºÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î­Î»Î·Î¾Îµ Î® Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹.
+      reconfirm_html: ÎÎ¬Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÎ±Ï Î¾Î±Î½Î±ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ ÏÎ¿ email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï <a href="%{reconfirm}">ÏÎ±ÏÎ®ÏÏÎµ
+        ÎµÎ´Ï</a>.
+    confirm_resend:
+      failure: Î ÏÏÎ®ÏÏÎ·Ï %{name} Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ.
+    confirm_email:
+      heading: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±Î»Î»Î±Î³Î®Ï ÏÎ·Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï
+      press confirm button: Î Î±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Â«ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Â» ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ
+        ÏÎ· Î½Î­Î± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï.
+      button: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
+      success: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸Î·ÎºÎµ Î· Î±Î»Î»Î±Î³Î® ÏÎ·Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï!
+      failure: ÎÎ¹Î± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î­ÏÎµÎ¹ Î®Î´Î· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ Î¼Îµ Î±ÏÏÏ
+        ÏÎ¿ Î´Î¹Î±ÎºÏÎ¹ÏÎ¹ÎºÏ.
+      unknown_token: ÎÏÏÏÏ Î¿ ÎºÏÎ´Î¹ÎºÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î­ÏÎµÎ¹ Î»Î®Î¾ÎµÎ¹ Î® Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹.
+    resend_success_flash:
+      confirmation_sent: ÎÏÎ¿ÏÎ¼Îµ ÏÏÎµÎ¯Î»ÎµÎ¹ Î¼Î¹Î± Î½Î­Î± ÏÎ·Î¼ÎµÎ¯ÏÏÎ· ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï ÏÏÎ¿ %{email}
+        ÎºÎ±Î¹ Î¼ÏÎ»Î¹Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï Î¸Î± Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ®ÏÎµÏÎµ.
   messages:
     inbox:
       title: ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î±
       my_inbox: Î¤Î± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± Î¼Î¿Ï
-      outbox: ÎµÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î±
+      my_outbox: Î¤Î± ÎµÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î± Î¼Î¿Ï
       messages: ÎÏÎµÏÎµ %{new_messages} ÎºÎ±Î¹ %{old_messages}
       new_messages:
         one: '%{count} Î½Î­Î¿ Î¼Î®Î½ÏÎ¼Î±'
@@ -1406,9 +1699,8 @@ el:
       body: ÎÏÏÎ¬Î¼Î±Î¹ Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î¼Î®Î½ÏÎ¼Î± Î¼Îµ Î±ÏÏÏ ÏÎ¿ Î±Î½Î±Î³Î½ÏÏÎ¹ÏÏÎ¹ÎºÏ.
     outbox:
       title: ÎÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î±
-      my_inbox_html: Î¤Î± %{inbox_link} Î¼Î¿Ï
-      inbox: ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î±
-      outbox: ÎµÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î±
+      my_inbox: Î¤Î± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± Î¼Î¿Ï
+      my_outbox: Î¤Î± ÎµÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î± Î¼Î¿Ï
       messages:
         one: ÎÏÎµÏÎµ %{count} Î±ÏÎµÏÏÎ±Î»Î¼Î­Î½Î¿ Î¼Î®Î½ÏÎ¼Î±
         other: ÎÏÎµÏÎµ %{count} Î±ÏÎµÏÏÎ±Î»Î¼Î­Î½Î± Î¼Î·Î½ÏÎ¼Î±ÏÎ±
@@ -1442,12 +1734,141 @@ el:
       as_unread: Î¤Î¿ Î¼Î®Î½ÏÎ¼Î± ÏÎ·Î¼ÎµÎ¹ÏÎ¸Î·ÎºÎµ ÏÏ Î¼Î· Î±Î½Î±Î³Î½ÏÏÎ¼Î­Î½Î¿
     destroy:
       destroyed: Î¤Î¿ Î¼Î®Î½ÏÎ¼Î± Î´Î¹Î±Î³ÏÎ¬ÏÎ·ÎºÎµ
+  passwords:
+    lost_password:
+      title: Î§Î¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï
+      heading: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï;
+      email address: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
+      new password button: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
+      help_text: Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ±ÏÎµ
+        Î³Î¹Î± Î½Î± ÎµÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ. ÎÎ± ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ Î­Î½Î±Î½ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÎ¿Î½ Î¿ÏÎ¿Î¯Î¿Î½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
+        Î³Î¹Î± Î½Î± ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï.
+      notice email on way: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ ÏÎ¿Ï ÏÎ¿ ÏÎ¬ÏÎ±ÏÎµ :-(, Î±Î»Î»Î¬ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
+        ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÎµÏÏÎ¬Î»Î·, ÏÏÏÎµ Î½Î± Î¼ÏÎ¿ÏÎ­ÏÎµÏÎµ Î½Î± ÏÎ¿ ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÏÎ½ÏÎ¿Î¼Î±.
+      notice email cannot find: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ Î±ÏÏÎ® Î· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
+        ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
+    reset_password:
+      title: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
+      heading: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï Î³Î¹Î± ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· %{user}
+      reset: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
+      flash changed: Î¤Î¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï Î¬Î»Î»Î±Î¾Îµ!
+      flash token bad: ÎÎµÎ½ Î²ÏÎ®ÎºÎ±ÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿Î¼Î¼Î¬ÏÎ¹, Î¼Î®ÏÏÏ ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ»Î­Î³Î¾ÎµÏÎµ ÏÎ¿ URL;
+  preferences:
+    show:
+      title: ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î¼Î¿Ï
+      preferred_editor: Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½Î¿Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï
+      preferred_languages: Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½ÎµÏ Î³Î»ÏÏÏÎµÏ
+      edit_preferences: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½
+    edit:
+      title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ¿ÏÎ¹Î¼Î¯ÏÎµÏÎ½
+      save: ÎÎ½Î·Î¼Î­ÏÏÏÎ· ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½
+      cancel: ÎÎºÏÏÏÏÎ·
+    update:
+      failure: ÎÎµÎ½ Î¼ÏÏÏÎµÏÎ±Î½ Î½Î± ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î¿ÏÎ½ Î¿Î¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï.
+    update_success_flash:
+      message: ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½.
+  profiles:
+    edit:
+      title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ¿ÏÎ¯Î»
+      save: ÎÎ½Î·Î¼Î­ÏÏÏÎ· ÏÏÎ¿ÏÎ¯Î»
+      cancel: ÎÎºÏÏÏÏÎ·
+      image: ÎÎ¹ÎºÏÎ½Î±
+      gravatar:
+        gravatar: Î§ÏÎ®ÏÎ· Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
+        what_is_gravatar: Î¤Î¯ ÎµÎ¯Î½Î±Î¹ ÏÎ¿ Gravatar;
+        disabled: 'Î¤Î¿ Gravatar Î­ÏÎµÎ¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯:'
+        enabled: ÎÏÎµÎ¹ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯ Î· ÎµÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎ¿Ï Gravatar ÏÎ±Ï.
+      new image: Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÎµÎ¹ÎºÏÎ½Î±Ï
+      keep image: ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      delete image: ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      replace image: ÎÎ½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      image size hint: (ÏÎµÏÏÎ¬Î³ÏÎ½ÎµÏ ÎµÎ¹ÎºÏÎ½ÎµÏ ÏÎ¿ÏÎ»Î¬ÏÎ¹ÏÏÎ¿Î½ 100 x 100 Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ±)
+      home location: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î£ÏÎ¹ÏÎ¹Î¿Ï
+      no home location: ÎÎµÎ½ Î­ÏÎµÏÎµ ÎµÎ¹ÏÎ¬Î³ÎµÎ¹ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ¿Ï ÏÏÎ¹ÏÎ¹Î¿Ï ÏÎ±Ï.
+      update home location on click: ÎÎ½Î·Î¼Î­ÏÏÏÎ· ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±Ï ÏÏÎ¹ÏÎ¹Î¿Ï ÏÏÎ±Î½ ÎºÎ¬Î½Ï ÎºÎ»Î¹Îº ÏÏÎ¿Î½
+        ÏÎ¬ÏÏÎ·;
+    update:
+      success: Î¤Î¿ ÏÏÎ¿ÏÎ¯Î» ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎµ.
+      failure: ÎÎµÎ½ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎ½Î·Î¼ÎµÏÏÎ¸ÎµÎ¯ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î».
+  sessions:
+    new:
+      title: ÎÎ¯ÏÎ¿Î´Î¿Ï
+      heading: ÎÎ¯ÏÎ¿Î´Î¿Ï
+      email or username: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ». Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î® ÎÎ½Î¿Î¼Î± Î§ÏÎ®ÏÏÎ·:'
+      password: 'Î£ÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ:'
+      openid_html: '%{logo} OpenID:'
+      remember: ÎÎ± Î¼Îµ Î¸ÏÎ¼Î¬ÏÎ±Î¹
+      lost password link: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï;
+      login_button: ÎÎ¯ÏÎ¿Î´Î¿Ï
+      register now: ÎÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ ÏÏÏÎ±
+      with username: 'ÎÏÎµÏÎµ Î®Î´Î· Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï OpenStreetMap; Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ ÏÎ¿
+        ÏÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ· ÎºÎ±Î¹ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï:'
+      with external: 'ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÏÎ¯ÏÎ· ÏÏÎ·ÏÎµÏÎ¯Î± Î³Î¹Î± ÎµÎ¯ÏÎ¿Î´Î¿:'
+      new to osm: ÎÎ­Î¿Î¹ ÏÏÎ¿ OpenStreetMap;
+      to make changes: ÎÎ¹Î± Î½Î± ÎºÎ¬Î½ÎµÏÎµ Î±Î»Î»Î±Î³Î­Ï ÏÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¿Ï OpenStreetMap, ÏÏÎ­ÏÎµÎ¹
+        Î½Î± Î­ÏÎµÏÎµ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï.
+      create account minute: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î­Î½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï. Î§ÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î¼ÏÎ½Î¿ Î­Î½Î± Î»ÎµÏÏÏ.
+      no account: ÎÎµÎ½ Î­ÏÎµÏÎµ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï;
+      account not active: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³ÏÏ Î±ÎºÏÎ¼Î±.<br
+        />Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ¿ email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
+        ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï, Î® <a href="%{reconfirm}">ÎºÎ¬Î½ÏÎµ Î±Î¯ÏÎ·ÏÎ· Î½Î­Î¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï</a>.
+      account is suspended: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ Î»ÏÎ³Ï ÏÏÎ¿ÏÏÎ·Ï
+        Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï.<br>Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÏÎµ Î¼Îµ ÏÎ·Î½ <a href="%{webmaster}">ÏÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·</a>
+        ÎµÎ¬Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÎ¿ ÏÏÎ¶Î·ÏÎ®ÏÎµÏÎµ.
+      auth failure: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ Î±ÏÏÎ­Ï ÏÎ¹Ï Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ.
+      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: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Wikipedia
+          alt: Î£ÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ Î­Î½Î± ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï Wikipedia
+        wordpress:
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ¿ Wordpress
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Wordpress OpenID
+        aol:
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ·Î½ AOL
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± AOL OpenID
+    destroy:
+      title: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ·
+      heading: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ· Î±ÏÏ ÏÎ¿ OpenStreetMap
+      logout_button: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ·
+  shared:
+    markdown_help:
+      title_html: ÎÎ½Î±Î»ÏÎµÏÎ±Î¹ Î¼Îµ ÏÎ¿ <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      headings: ÎÏÎ¹ÎºÎµÏÎ±Î»Î¯Î´ÎµÏ
+      unordered: ÎÏÎ±Î¾Î¹Î½ÏÎ¼Î·ÏÎ· Î»Î¯ÏÏÎ±
+      ordered: Î¤Î±Î¾Î¹Î½Î¿Î¼Î·Î¼Î­Î½Î· Î»Î¯ÏÏÎ±
+      first: Î ÏÏÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿
+      second: ÎÎµÏÏÎµÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿
+      link: Î£ÏÎ½Î´ÎµÏÎ¼Î¿Ï
+      text: ÎÎµÎ¯Î¼ÎµÎ½Î¿
+      image: ÎÎ¹ÎºÏÎ½Î±
+      alt: ÎÎ½Î±Î». ÎºÎµÎ¯Î¼ÎµÎ½Î¿
+      url: URL
+    richtext_field:
+      edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      preview: Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ·
   site:
     about:
       next: ÎÏÏÎ¼ÎµÎ½Î·
       copyright_html: Î£ÏÎ½ÎµÎ¹ÏÏÎ­ÏÎ¿Î½ÏÎµÏ ÏÎ¿Ï <span>&copy;</span>OpenStreetMap<br>
       used_by_html: Î¤Î¿ %{name} ÏÏÎ¿ÏÏÎ­ÏÎµÎ¹ Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¬ÏÏÎ· ÏÎµ ÏÎ¹Î»Î¹Î¬Î´ÎµÏ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ, ÎµÏÎ±ÏÎ¼Î¿Î³Î­Ï
-        ÎºÎ¹Î½Î·ÏÎ¿Ï ÎºÎ±Î¹ ÏÏÏÎºÎµÏÎ­Ï ÏÎ»Î¹ÎºÎ¿Ï
+        ÎºÎ¹Î½Î·ÏÎ¿Ï ÎºÎ±Î¹ ÏÏÏÎºÎµÏÎ­Ï ÏÎ»Î¹ÏÎ¼Î¹ÎºÎ¿Ï
       lede_text: Î¤Î¿ OpenStreetMap Î±Î½Î±ÏÏÏÏÏÎµÏÎ±Î¹ Î±ÏÏ Î¼Î¹Î± ÎºÎ¿Î¹Î½ÏÏÎ·ÏÎ± ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÏÎ½ ÏÎ¿Ï ÏÏÎ½ÎµÎ¹ÏÏÎ­ÏÎ¿ÏÎ½
         ÎºÎ±Î¹ Î´Î¹Î±ÏÎ·ÏÎ¿ÏÎ½ Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ Î´ÏÏÎ¼Î¿ÏÏ, Î¼Î¿Î½Î¿ÏÎ¬ÏÎ¹Î±, ÎºÎ±ÏÎµÏÎ­ÏÎ¹ÎµÏ, ÏÎ¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÎ¿ÏÏ
         ÏÏÎ±Î¸Î¼Î¿ÏÏ ÎºÎ±Î¹ ÏÎ¿Î»Î»Î¬ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±, ÏÎµ ÏÎ»Î¿Î½ ÏÎ¿Î½ ÎºÏÏÎ¼Î¿.
@@ -1507,16 +1928,20 @@ el:
           Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´Î¹Î±Î½ÎµÎ¯Î¼ÎµÏÎµ ÏÎ¿ Î±ÏÎ¿ÏÎ­Î»ÎµÏÎ¼Î± Î¼ÏÎ½Î¿ ÏÏÎ¼ÏÏÎ½Î± Î¼Îµ ÏÎ·Î½ Î¯Î´Î¹Î± Î¬Î´ÎµÎ¹Î±. Î ÏÎ»Î®ÏÎ·Ï
           <a href="https://opendatacommons.org/licenses/odbl/1.0/">Î½Î¿Î¼Î¹ÎºÏÏ ÎºÏÎ´Î¹ÎºÎ±Ï</a>
           ÎµÎ¾Î·Î³ÎµÎ¯ ÏÎ± Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± ÎºÎ±Î¹ ÏÎ¹Ï ÏÏÎ¿ÏÏÎµÏÏÎµÎ¹Ï.
-        intro_3_html: |-
-          Î ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÏÎ± ÏÎ»Î±ÎºÎ¯Î´Î¹Î± ÏÎ¬ÏÏÎ· ÎºÎ±Î¹ Î· ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î¼Î±Ï, ÎµÎ¯Î½Î±Î¹ Î±Î´ÎµÎ¹Î¿Î´Î¿ÏÎ·Î¼Î­Î½ÎµÏ ÏÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA).
+        intro_3_1_html: |-
+          Î ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· Î¼Î±Ï, Î±Î´ÎµÎ¹Î¿Î´Î¿ÏÎµÎ¯ÏÎ±Î¹ ÏÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Î ÏÏ Î½Î± ÎºÎ¬Î½ÎµÏÎµ Î±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ¿ OpenStreetMap
         credit_1_html: ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ·Î½ Î±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ¿ &ldquo;&copy;
           Î£ÏÎ½ÎµÎ¹ÏÏÎ­ÏÎ¿Î½ÏÎµÏ ÏÎ¿Ï OpenStreetMap&rdquo;.
-        credit_2_html: |-
+        credit_2_1_html: |-
           ÎÏÎ¯ÏÎ·Ï ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÏÎ±ÏÎ­Ï ÏÏÎ¹ ÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î´Î¹Î±ÏÎ¯Î¸ÎµÎ½ÏÎ±Î¹ ÏÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± Open Database License ÎºÎ±Î¹ Î±Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ± ÏÎ»Î±ÎºÎ¯Î´Î¹Î± ÏÎ¬ÏÏÎ·, ÏÏÎ¹ Î· ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ¯Î± ÎµÎ¯Î½Î±Î¹ ÏÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± CC-BY-SA. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿ ÎºÎ¬Î½ÎµÏÎµ Î±ÏÏÏ Î¼Îµ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÎµ <a href="https://www.openstreetmap.org/copyright">Î±ÏÏÎ®Î½ ÏÎ· ÏÎµÎ»Î¯Î´Î± Î´Î¹ÎºÎ±Î¹ÏÎ¼Î¬ÏÏÎ½</a>.
           ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬ ÎºÎ±Î¹ ÏÎ±Î½ ÏÏÎ¿Î±ÏÎ±Î¹ÏÎ¿ÏÎ¼ÎµÎ½Î¿ ÎµÎ¬Î½ Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬Î¶ÎµÏÎµ Î´ÎµÎ´Î¿Î¼Î­Î½Î± OSM, Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´ÏÏÎµÏÎµ Î±ÏÎµÏÎ¸ÎµÎ¯Î±Ï ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ¿Ï ÏÎ¹Ï Î¬Î´ÎµÎ¹ÎµÏ. Î£Îµ Î¼Î­ÏÎ± ÏÏÎ± Î¿ÏÎ¿Î¯Î± Î¿Î¹ ÏÏÎ½Î´ÎµÏÎ¼Î¿Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÏÎ¹ÎºÏÎ¿Î¯ (Ï.Ï. ÎµÎºÏÏÏÏÏÎµÎ¹Ï), ÏÏÎ¿ÏÎµÎ¯Î½Î¿ÏÎ¼Îµ Î½Î± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÎµÏÎµ ÏÎ¿ÏÏ Î±Î½Î±Î³Î½ÏÏÏÎµÏ ÏÎ±Ï ÏÏÎ¿ openstreetmap.org (Î¯ÏÏÏ ÎµÏÎµÎºÏÎµÎ¯Î½Î¿Î½ÏÎ±Ï ÏÎ¿ Â«OpenStreetMapÂ» ÏÎµ Î±ÏÏÎ®Î½ ÏÎ· ÏÎ»Î®ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·), ÏÏÎ¿Ï opendatacommons.org ÎºÎ±Î¹ Î±Î½Î±Î»ÏÎ³ÏÏ ÏÏÎ¿ creativecommons.org.
-        credit_3_html: |-
+        credit_3_1_html: "Î¤Î± ÏÎ»Î±ÎºÎ¯Î´Î¹Î± ÏÎ¬ÏÏÎ· ÏÎ¿Ï &ldquo;standard style&rdquo; ÏÏÎ¿ www.openstreetmap.org
+          ÎµÎ¯Î½Î±Î¹ Î¼Î¹Î± Î Î±ÏÎ±Î³ÏÎ¼ÎµÎ½Î· ÎÏÎ³Î±ÏÎ¯Î± Î±ÏÏ ÏÎ¿ ÎÎ´ÏÏÎ¼Î± OpenStreetMap Î¼Îµ ÏÏÎ®ÏÎ· Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½
+          OpenStreetMap \nÏÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± Open Database License. ÎÏÎ±Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ
+          Î±ÏÏÏ ÏÎ¿ ÏÏÏÎ» ÏÎ¬ÏÏÎ·, Î· Î¯Î´Î¹Î± Î±ÏÏÎ´Î¿ÏÎ· Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ Î³Î¹Î± ÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¿Ï ÏÎ¬ÏÏÎ·."
+        credit_4_html: |-
           ÎÎ¹Î± Î­Î½Î±Î½ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¬ ÎµÎ¼ÏÎ±Î½Î¹Î¶ÏÎ¼ÎµÎ½Î¿ ÏÎ¬ÏÏÎ·, Î· Î±Î½Î±ÏÎ¿ÏÎ¬ Î¸Î± ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÎ±Î¹ ÏÏÎ· Î³ÏÎ½Î¯Î± ÏÎ¿Ï ÏÎ¬ÏÏÎ·.
           ÎÎ¹Î± ÏÎ±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±:
         attribution_example:
@@ -1542,10 +1967,10 @@ el:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> ÎºÎ±Î¹
           Land Tirol (ÏÏÏ <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT Î¼Îµ ÏÏÎ¿ÏÎ¿ÏÎ¿Î¹Î®ÏÎµÎ¹Ï</a>).
         contributors_au_html: |-
-          <strong>ÎÏÏÏÏÎ±Î»Î¯Î±</strong>: Î ÎµÏÎ¹Î­ÏÎµÎ¹ Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î±ÏÏ
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
-          Î¼Îµ Î¬Î´ÎµÎ¹Î± Î±ÏÏ ÏÎ¿ Commonwealth of Australia ÏÏÏ
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+          <strong>ÎÏÏÏÏÎ±Î»Î¯Î±</strong>: ÎÎ½ÏÏÎ¼Î±ÏÏÎ½ÎµÎ¹ Î® Î±Î½Î±ÏÏÏÎ³Î¼Î­Î½Î¿ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÎÎ¹Î¿Î¹ÎºÎ·ÏÎ¹ÎºÎ¬ ÎÏÎ¹Î± ÏÎ¿Ï &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
+          Î¼Îµ Î¬Î´ÎµÎ¹Î± Î±ÏÏ ÏÎ·Î½ ÎÎ¿Î¹Î½Î¿ÏÎ¿Î»Î¹ÏÎµÎ¯Î± ÏÎ·Ï ÎÏÏÏÏÎ±Î»Î¯Î±Ï ÏÏÏ
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
         contributors_ca_html: |-
           <strong>ÎÎ±Î½Î±Î´Î¬Ï</strong>: Î ÎµÏÎ¹Î­ÏÎµÎ¹ Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î±ÏÏ ÏÎ±
           GeoBaseÂ®, GeoGratis (Â© Î¤Î¼Î®Î¼Î± Î¦ÏÏÎ¹ÎºÏÎ½
@@ -1593,8 +2018,8 @@ el:
           ÏÎ¬ÏÏÎµÏ) ÏÏÏÎ¯Ï ÏÎ·Î½ ÏÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· Î¬Î´ÎµÎ¹Î± Î±ÏÏ ÏÎ¿ÏÏ Î¹Î´Î¹Î¿ÎºÏÎ®ÏÎµÏ ÏÏÎ½ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î¬ÏÏÎ½.
         infringement_2_html: ÎÎ¬Î½ ÏÎ¹ÏÏÎµÏÎµÏÎµ ÏÏÎ¹ ÏÏÎ¿ÏÏÎ­Î¸Î·ÎºÎµ ÏÎ±ÏÎ¬Î½Î¿Î¼Î± ÏÎ»Î¹ÎºÏ ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÏÎµÏÎµÏÎ±Î¹
           Î±ÏÏ ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± ÏÏÎ· Î²Î¬ÏÎ· Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½ ÏÎ¿Ï OpenStreetMap Î® ÏÎµ Î±ÏÏÏÎ½
-          ÏÎ¿Î½ Î¹ÏÏÏÏÎ¿ÏÎ¿, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î±ÏÎµÏÎ¸ÏÎ½Î¸ÎµÎ¯ÏÎµ ÏÏÎ· <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">
-          Î´Î¹Î±Î´Î¹ÎºÎ±ÏÎ¯Î± Î±ÏÎ¿Î¼Î¬ÎºÏÏÎ½ÏÎ·Ï </a> Î® ÎºÎ±ÏÎ±Î¸Î­ÏÏÎµ Î¬Î¼ÎµÏÎ± Î¼Î¹Î± Î±Î¯ÏÎ·ÏÎ· ÏÏÎ·Î½ <a href="https://dmca.openstreetmap.org/">on-line
+          ÏÎ¿Î½ Î¹ÏÏÏÏÎ¿ÏÎ¿, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î±ÏÎµÏÎ¸ÏÎ½Î¸ÎµÎ¯ÏÎµ ÏÏÎ· <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">Î´Î¹Î±Î´Î¹ÎºÎ±ÏÎ¯Î±
+          Î±ÏÎ¿Î¼Î¬ÎºÏÏÎ½ÏÎ·Ï</a> Î® ÎºÎ±ÏÎ±Î¸Î­ÏÏÎµ Î¬Î¼ÎµÏÎ± Î¼Î¹Î± Î±Î¯ÏÎ·ÏÎ· ÏÏÎ·Î½ <a href="https://dmca.openstreetmap.org/">on-line
           ÏÎµÎ»Î¯Î´Î± Î±Î¹ÏÎ®ÏÎµÏÎ½</a>.
         trademarks_title_html: <span id="trademarks"></span>ÎÎ¼ÏÎ¿ÏÎ¹ÎºÎ¬ ÏÎ®Î¼Î±ÏÎ±
         trademarks_1_html: Î¤Î¿ OpenStreetMap, ÏÎ¿ Î»Î¿Î³ÏÏÏÏÎ¿ Î¼Îµ ÏÎ¿ Î¼ÎµÎ³ÎµÎ¸ÏÎ½ÏÎ¹ÎºÏ ÏÎ±ÎºÏ ÎºÎ±Î¹
@@ -1620,18 +2045,6 @@ el:
         Î´ÎµÎ½ ÏÎ¿ ÎºÎ¬Î½ÎµÏÎµ. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÏÎ¹Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÎ±Ï Î´Î·Î¼ÏÏÎ¹ÎµÏ Î±ÏÏ ÏÎ·Î½ %{user_page}.
       user_page_link: ÏÎµÎ»Î¯Î´Î± ÏÏÎ®ÏÏÎ·
       anon_edits_link_text: ÎÎ¬Î¸ÎµÏÎµ Î³Î¹Î±ÏÎ¯ ÏÏÎ¼Î²Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ.
-      flash_player_required_html: Î§ÏÎµÎ¹Î¬Î¶ÎµÏÏÎµ Flash player Î³Î¹Î± Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿
-        Potlatch, ÏÎ¿ Flash ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±Ï ÏÎ¿Ï OpenStreetMap. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± <a
-        href=https://get.adobe.com/flashplayer/">ÎºÎ¬Î½ÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Flash Player Î±ÏÏ
-        ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Î Î¿Î»Î»Î­Ï
-        Î¬Î»Î»ÎµÏ ÎµÏÎ¹Î»Î¿Î³Î­Ï</a> ÎµÎ¯Î½Î±Î¹ ÎµÏÎ¯ÏÎ·Ï Î´Î¹Î±Î¸Î­ÏÎ¹Î¼ÎµÏ Î³Î¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ¿ OpenStreetMap.
-      potlatch_unsaved_changes: ÎÏÎµÏÎµ Î¼Î· Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼Î­Î½ÎµÏ Î±Î»Î»Î±Î³Î­Ï. (ÎÎ¹Î± Î½Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ
-        ÏÏÎ¿ Potlatch, ÏÏÎ­ÏÎµÎ¹ Î½Î± Î±ÏÎ¿ÎµÏÎ¹Î»Î­Î¾ÏÎµ Î¿ÏÎ¿Î¹Î±Î´Î®ÏÎ¿ÏÎµ Î´Î¹Î±Î´ÏÎ¿Î¼Î® Î® ÎºÏÎ¼Î²Î¿, Î±Î½ ÎµÏÎµÎ¾ÎµÏÎ³Î¬Î¶ÎµÏÏÎµ
-        ÏÎµ Î¶ÏÎ½ÏÎ±Î½Î® Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±, Î® Î±ÏÎ»Î¬ ÏÎ±ÏÎ®ÏÏÎµ Â«ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Â» ÎµÎ¬Î½ Î­ÏÎµÏÎµ ÎºÎ¿ÏÎ¼ÏÎ¯ Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Ï.)
-      potlatch2_not_configured: Î¤Î¿ Potlatch 2 Î´ÎµÎ½ Î­ÏÎµÎ¹ ÏÏÎ¸Î¼Î¹ÏÏÎµÎ¯ - ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î´ÎµÎ¯ÏÎµ
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: ÎÏÎµÏÎµ Î¼Î· Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼Î­Î½ÎµÏ Î±Î»Î»Î±Î³Î­Ï. (ÎÎ¹Î± Î½Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ
-        ÏÏÎ¿ Potlatch 2, ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Â«ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Â».)
       id_not_configured: Î iD Î´ÎµÎ½ Î­ÏÎµÎ¹ ÏÏÎ¸Î¼Î¹ÏÏÎµÎ¯
       no_iframe_support: Î ÏÎµÏÎ¹Î·Î³Î·ÏÎ®Ï ÏÎ±Ï Î´ÎµÎ½ ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ iframe ÏÎ¿Ï HTML,
         ÏÎ¿Ï ÎµÎ¯Î½Î±Î¹ Î±ÏÎ±ÏÎ±Î¯ÏÎ·ÏÎ¿ Î³Î¹Î± Î±ÏÏÎ®Î½ ÏÎ·Î½ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±.
@@ -1749,6 +2162,15 @@ el:
         url: https://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
         description: Î ÎµÏÎ¹Î·Î³Î·Î¸ÎµÎ¯ÏÎµ ÏÎ¿ wiki Î³Î¹Î± ÎµÏÎ¹Î¼ÎµÎ»Î®Ï ÏÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ· ÏÎ¿Ï OpenStreetMap.
+    potlatch:
+      removed: Î ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼Î­Î½Î¿Ï ÏÎ±Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÏÎ¿Ï OpenStreetMap Î­ÏÎµÎ¹ ÏÎµÎ¸ÎµÎ¯ ÏÏ Potlatch.
+        ÎÏÎµÎ¹Î´Î® ÏÎ¿ Adobe Flash Player Î­ÏÎµÎ¹ Î±ÏÎ¿ÏÏÏÎ¸ÎµÎ¯, Î¿ Potlatch Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏÎ¹Î± Î´Î¹Î±Î¸Î­ÏÎ¹Î¼Î¿Ï
+        Î³Î¹Î± ÏÏÎ®ÏÎ· ÏÎµ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Î¹ÏÏÎ¿Ï.
+      desktop_html: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î±ÎºÏÎ¼Î· ÏÎ¿ Potlatch <a href="https://www.systemed.net/potlatch/">ÎºÎ¬Î½Î¿Î½ÏÎ±Ï
+        Î»Î®ÏÎ· ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï Î³Î¹Î± Mac ÎºÎ±Î¹ Windows</a>.
+      id_html: ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î¸Î­ÏÎµÏÎµ ÏÏ ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼Î­Î½Î¿ ÏÎ±Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ® ÏÎ¿Î½
+        iD, Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ­ÏÎµÎ¹ ÏÏÎ¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Î¹ÏÏÎ¿Ï ÏÎ±Ï ÏÏÏÏ Î­ÎºÎ±Î½Îµ Î¿ Potlatch
+        Î­ÎºÎ±Î½Îµ ÏÎ±Î»Î±Î¹ÏÏÎµÏÎ±. <a href="%{settings_url}">ÎÎ»Î»Î¬Î¾ÏÎµ ÏÎ·Î½ ÏÏÎ¿ÏÎ¯Î¼Î·ÏÎ· ÏÎ±Ï ÎµÎ´Ï</a>.
     sidebar:
       search_results: ÎÏÎ¿ÏÎµÎ»Î­ÏÎ¼Î±ÏÎ± ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ·Ï
       close: ÎÎ»ÎµÎ¯ÏÎ¹Î¼Î¿
@@ -1819,7 +2241,7 @@ el:
           school:
           - Î£ÏÎ¿Î»ÎµÎ¯Î¿
           - ÏÎ±Î½ÎµÏÎ¹ÏÏÎ®Î¼Î¹Î¿
-          building: Î£Î·Î¼Î±Î½ÏÎ¹ÎºÏ ÎºÏÎ¯ÏÎ¹Î¿
+          building: Î£Î·Î¼Î±Î½ÏÎ¹ÎºÏ ÎºÏÎ®ÏÎ¹Î¿
           station: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ ÏÏÎ±Î¸Î¼ÏÏ
           summit:
           - ÎÎ¿ÏÏÏÎ®
@@ -1832,23 +2254,6 @@ el:
           bicycle_shop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÎ¿Î´Î·Î»Î¬ÏÏÎ½
           bicycle_parking: Î§ÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï ÏÎ¿Î´Î·Î»Î¬ÏÏÎ½
           toilets: Î¤Î¿ÏÎ±Î»Î­ÏÎµÏ
-    richtext_area:
-      edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
-      preview: Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ·
-    markdown_help:
-      title_html: ÎÎ½Î±Î»ÏÎµÏÎ±Î¹ Î¼Îµ ÏÎ¿ <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: ÎÏÎ¹ÎºÎµÏÎ±Î»Î¯Î´ÎµÏ
-      heading: ÎÏÎ¹ÎºÎµÏÎ±Î»Î¯Î´Î±
-      subheading: Î¥ÏÎ¿ÎºÎµÏÎ±Î»Î¯Î´Î±
-      unordered: ÎÎ· ÏÎ±Î¾Î¹Î½Î¿Î¼Î·Î¼Î­Î½Î· Î»Î¯ÏÏÎ±
-      ordered: Î¤Î±Î¾Î¹Î½Î¿Î¼Î·Î¼Î­Î½Î· Î»Î¯ÏÏÎ±
-      first: Î ÏÏÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿
-      second: ÎÎµÏÏÎµÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿
-      link: Î£ÏÎ½Î´ÎµÏÎ¼Î¿Ï
-      text: ÎÎµÎ¯Î¼ÎµÎ½Î¿
-      image: ÎÎ¹ÎºÏÎ½Î±
-      alt: ÎÎ½Î±Î». ÎºÎµÎ¯Î¼ÎµÎ½Î¿
-      url: ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· URL
     welcome:
       title: ÎÎ±Î»ÏÏ Î®ÏÎ¸Î±ÏÎµ!
       introduction_html: Î£Î±Ï ÎºÎ±Î»ÏÏÎ¿ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÏÏÎ¿ OpenStreetMap, ÏÎ¿Î½ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ ÎºÎ±Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î¬ÏÎ¹Î¼Î¿
@@ -1859,7 +2264,7 @@ el:
         title: Î¤Î¹ ÎµÎ¯Î½Î±Î¹ ÏÏÎ¿Î½ Î§Î¬ÏÏÎ·
         on_html: |-
           Î¤Î¿ OpenStreetMap ÏÎµÏÎ¹Î­ÏÎµÎ¹ ÏÏÎ¬Î³Î¼Î±ÏÎ± ÏÎ¿Ï ÎµÎ¯Î½Î±Î¹ <em>ÏÏÎ±Î³Î¼Î±ÏÎ¹ÎºÎ¬ ÎºÎ±Î¹ ÏÏÎ³ÏÏÎ¿Î½Î±</em> -
-          ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ ÎµÎºÎ±ÏÎ¿Î¼Î¼ÏÏÎ¹Î± ÎºÏÎ¯ÏÎ¹Î±, Î´ÏÏÎ¼Î¿ÏÏ ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ Î³Î¹Î± Î´Î¹Î¬ÏÎ¿ÏÎ± Î¼Î­ÏÎ·. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ®ÏÎµÏÎµ
+          ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ ÎµÎºÎ±ÏÎ¿Î¼Î¼ÏÏÎ¹Î± ÎºÏÎ®ÏÎ¹Î±, Î´ÏÏÎ¼Î¿ÏÏ ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ Î³Î¹Î± Î´Î¹Î¬ÏÎ¿ÏÎ± Î¼Î­ÏÎ·. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ®ÏÎµÏÎµ
           Î¿ÏÎ¿Î¹Î¿Î´Î®ÏÎ¿ÏÎµ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ¿Ï ÏÏÎ±Î³Î¼Î±ÏÎ¹ÎºÎ¿Ï ÎºÏÏÎ¼Î¿Ï ÏÎ±Ï ÎµÎ½Î´Î¹Î±ÏÎ­ÏÎµÎ¹.
         off_html: |-
           ÎÏÏÎ¬ ÏÎ¿Ï <em>Î´ÎµÎ½</em> ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ ÎµÎ¯Î½Î±Î¹ Î´Î¿Î³Î¼Î±ÏÎ¹ÎºÎ¬ Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÏÏÏ Î²Î±Î¸Î¼Î¿Î»Î¿Î³Î¯ÎµÏ, Î¹ÏÏÎ¿ÏÎ¹ÎºÎ¬ Î®
@@ -1911,11 +2316,6 @@ el:
         ÏÏ Î±Î½Î±Î³Î½ÏÏÎ¯ÏÎ¹Î¼Î¿, ÏÎ± ÏÎ·Î¼ÎµÎ¯Î± ÏÎ±Î¾Î¹Î½ÏÎ¼Î·ÏÎ·Ï Î¼Îµ ÏÏÎ¿Î½Î¹ÎºÎ¬ ÏÎ®Î¼Î±ÏÎ±)
     new:
       upload_trace: ÎÎµÏÎ±ÏÏÏÏÏÏÎ· Î¯ÏÎ½Î¿ÏÏ GPS
-      upload_gpx: 'ÎÏÎ¿ÏÏÎ¿Î»Î® Î±ÏÏÎµÎ¯Î¿Ï GPX:'
-      description: 'Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:'
-      tags: 'Î§Î±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬:'
-      tags_help: Î´Î¹Î±ÏÏÏÎ¹ÏÎ¼Î­Î½Î¿ Î¼Îµ ÎºÏÎ¼Î¼Î±
-      visibility: 'ÎÏÎ±ÏÏÏÎ·ÏÎ±:'
       visibility_help: ÏÎ¹ ÏÎ·Î¼Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ;
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: ÎÎ¿Î®Î¸ÎµÎ¹Î±
@@ -1935,20 +2335,9 @@ el:
           Î½Î± Î¿Î»Î¿ÎºÎ»Î·ÏÏÎ¸Î¿ÏÎ½ ÏÏÎ¹Î½ Î±Î½ÎµÎ²Î¬ÏÎµÏÎµ Î¬Î»Î»Î±, ÏÏÏÎµ Î½Î± Î¼Î·Î½ ÎµÎ¼ÏÎ¿Î´Î¯ÏÎµÏÎµ ÏÎ· ÏÎµÎ¹ÏÎ¬ Î±Î½Î±Î¼Î¿Î½Î®Ï
           Î³Î¹Î± Î¬Î»Î»Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ.
     edit:
+      cancel: ÎÎºÏÏÏÏÎ·
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î¯ÏÎ½Î¿ÏÏ %{name}
       heading: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î¯ÏÎ½Î¿ÏÏ %{name}
-      filename: 'ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï:'
-      download: Î»Î®ÏÎ·
-      uploaded_at: 'ÎÎµÏÎ±ÏÎ¿ÏÏÏÎ¸Î·ÎºÎµ:'
-      points: 'Î£Î·Î¼ÎµÎ¯Î±:'
-      start_coord: 'Î£ÏÎ½ÏÎµÏÎ±Î³Î¼Î­Î½ÎµÏ Î±ÏÏÎ®Ï:'
-      map: ÏÎ¬ÏÏÎ·Ï
-      edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
-      owner: 'ÎÎ´Î¹Î¿ÎºÏÎ®ÏÎ·Ï:'
-      description: 'Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:'
-      tags: 'Î§Î±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬:'
-      tags_help: Î¿ÏÎ¹Î¿Î¸ÎµÏÎ·Î¼Î­Î½Î¿ Î¼Îµ ÎºÏÎ¼Î¼Î±
-      visibility: 'ÎÏÎ±ÏÏÏÎ·ÏÎ±:'
       visibility_help: ÏÎ¹ ÏÎ·Î¼Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ;
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
@@ -1970,8 +2359,8 @@ el:
       description: 'Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:'
       tags: 'Î§Î±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬:'
       none: ÎÎ±Î½Î­Î½Î±
-      edit_trace: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¯ÏÎ½Î¿ÏÏ
-      delete_trace: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¯ÏÎ½Î¿ÏÏ
+      edit_trace: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î¯ÏÎ½Î¿ÏÏ
+      delete_trace: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î¯ÏÎ½Î¿ÏÏ
       trace_not_found: ÎÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ Î¯ÏÎ½Î¿Ï!
       visibility: 'ÎÏÎ±ÏÏÏÎ·ÏÎ±:'
       confirm_delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¯ÏÎ½Î¿ÏÏ;
@@ -1987,7 +2376,6 @@ el:
       more: ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±
       trace_details: Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½ Î¯ÏÎ½Î¿ÏÏ
       view_map: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ¬ÏÏÎ·
-      edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       edit_map: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ¬ÏÏÎ·
       public: ÎÎÎÎÎ£ÎÎ
       identifiable: ÎÎÎÎÎÎ©Î¡ÎÎ£ÎÎÎ
@@ -1995,10 +2383,9 @@ el:
       trackable: ÎÎÎÎ§ÎÎÎ¥Î£ÎÎÎ
       by: Î±ÏÏ
       in: ÏÎµ
-      map: ÏÎ¬ÏÏÎ·Ï
     index:
       public_traces: ÎÎ·Î¼ÏÏÎ¹Î± Î¯ÏÎ½Î· GPS
-      my_traces: Î¤Î± Î¯ÏÎ½Î· GPS Î¼Î¿Ï
+      my_traces: Î¤Î± Î¯ÏÎ½Î· Î¼Î¿Ï
       public_traces_from: ÎÎ·Î¼ÏÏÎ¹Î± Î¯ÏÎ½Î· GPS Î±ÏÏ ÏÎ¿Î½ %{user}
       description: Î ÏÎ¿Î²Î¿Î»Î® ÏÏÏÏÏÎ±ÏÏÎ½ Î¼ÎµÏÎ±ÏÎ¿ÏÏÏÎ¼Î­Î½ÏÎ½ Î¹ÏÎ½ÏÎ½ GPS
       tagged_with: ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¯ÏÏÎ·ÎºÎ±Î½ Î¼Îµ %{tags}
@@ -2006,8 +2393,7 @@ el:
         Î® Î¼Î¬Î¸ÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î³Î¹Î± ÏÎ·Î½ ÎºÎ±ÏÎ±Î³ÏÎ±ÏÎ® Î¹ÏÎ½ÏÎ½ Î¼Îµ GPS ÏÏÎ· <a href='https://wiki.openstreetmap.org/wiki/El:Beginners_Guide_1.2'>ÏÎµÎ»Î¯Î´Î±
         wiki</a>.
       upload_trace: ÎÏÎ¿ÏÏÎ¿Î»Î® Î¯ÏÎ½Î¿ÏÏ
-      see_all_traces: ÎÎµÎ¯ÏÎµ ÏÎ»Î± ÏÎ± Î¯ÏÎ½Î·
-      see_my_traces: ÎÎµÏ ÏÎ± Î¯ÏÎ½Î· Î¼Î¿Ï
+      all_traces: ÎÎ»Î± ÏÎ± Î¯ÏÎ½Î·
     destroy:
       scheduled_for_deletion: Î¤Î¿ Î¯ÏÎ½Î¿Ï ÏÏÎ¿Î³ÏÎ±Î¼Î¼Î±ÏÎ¯ÏÏÎ·ÎºÎµ Î³Î¹Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®
     make_public:
@@ -2034,14 +2420,19 @@ el:
     require_admin:
       not_an_admin: Î ÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯ÏÏÎµ Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®Ï Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Î½ ÎµÎ½Î­ÏÎ³ÎµÎ¹Î±.
     setup_user_auth:
-      blocked_zero_hour: ÎÏÎµÏÎµ Î­Î½Î± ÎµÏÎµÎ¯Î³Î¿Î½ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ Î¹ÏÏÏÏÎ¿ÏÎ¿ ÏÎ¿Ï OpenStreetMap.
-        ÎÎ± ÏÏÎ­ÏÎµÎ¹ Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¹Î½ Î½Î± Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ ÏÎ¹Ï Î±Î»Î»Î±Î³Î­Ï
+      blocked_zero_hour: ÎÎºÎºÏÎµÎ¼ÎµÎ¯ ÎµÏÎµÎ¯Î³Î¿Î½ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Î½ Î¹ÏÏÏÏÎ¿ÏÎ¿ ÏÎ¿Ï OpenStreetMap.
+        Î ÏÎ­ÏÎµÎ¹ Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¹Î½ Î½Î± Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ ÏÎ¹Ï Î±Î»Î»Î±Î³Î­Ï
         ÏÎ±Ï.
       blocked: Î ÏÏÏÏÎ²Î±ÏÎ® ÏÎ±Ï ÏÏÎ¿ API Î­ÏÎµÎ¹ Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÏÎµÎ¯. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ
         ÏÎ· Î´Î¹ÎµÏÎ±ÏÎ® ÏÎ¿Ï Î¹ÏÏÏÏÎ¿ÏÎ¿Ï Î³Î¹Î± Î½Î± Î¼Î¬Î¸ÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±.
       need_to_see_terms: Î ÏÏÏÏÎ²Î±ÏÎ® ÏÎ±Ï ÏÏÎ¿ API Î­ÏÎµÎ¹ Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ ÏÏÎ¿ÏÏÏÎ¹Î½Î¬. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ
         ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ ÏÏÎ·Î½ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ® Î´Î¹ÎµÏÎ±ÏÎ® Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎµÏÏÎ½ÏÏÎ½.
         ÎÎµÎ½ ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î½Î± ÏÎ¿ÏÏ Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ÏÎµ, Î±Î»Î»Î¬ Î¸Î± ÏÏÎ­ÏÎµÎ¹ Î½Î± ÏÎ¿ÏÏ Î´ÎµÎ¯ÏÎµ.
+    settings_menu:
+      account_settings: Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï
+      oauth1_settings: Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï OAuth 1
+      oauth2_applications: ÎÏÎ±ÏÎ¼Î¿Î³Î­Ï OAuth 2
+      oauth2_authorizations: ÎÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ®ÏÎµÎ¹Ï OAuth 2
   oauth:
     authorize:
       title: ÎÏÎ¹ÏÏÎ­ÏÏÎµ ÏÎ·Î½ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï
@@ -2067,11 +2458,17 @@ el:
       title: Î Î±Î¯ÏÎ·ÏÎ· ÎµÏÎ±Î»Î®Î¸ÎµÏÏÎ·Ï Î±ÏÎ­ÏÏÏÎµ
       denied: ÎÏÎµÏÎµ Î±ÏÎ½Î·Î¸ÎµÎ¯ ÏÎ·Î½ ÏÏÏÏÎ²Î±ÏÎ· ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï %{app_name} ÏÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï
         ÏÎ±Ï.
-      invalid: Î¤Î¿ ÎºÎ¿ÏÏÏÎ½Î¹ ÎµÎ¾Î¿ÏÏÎ¹Î¿Î´ÏÏÎ·ÏÎ·Ï Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î³ÎºÏÏÎ¿.
+      invalid: Î¤Î¿ Î±Î´ÎµÎ¹Î¿Î´Î¿ÏÎ¹ÎºÏ ÎµÏÎ±Î»Î®Î¸ÎµÏÏÎ·Ï Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î³ÎºÏÏÎ¿.
     revoke:
-      flash: ÎÎ½Î±ÎºÎ±Î»Î­ÏÎ±ÏÎµ ÏÎ¿ ÎºÎ¿ÏÏÏÎ½Î¹ Î³Î¹Î± ÏÎ¿ %{application}.
+      flash: ÎÎ½Î±ÎºÎ±Î»Î­ÏÎ±ÏÎµ ÏÎ·Î½ Î±Î´ÎµÎ¹Î¿Î´ÏÏÎ·ÏÎ· Î³Î¹Î± ÏÎ¿ %{application}.
     permissions:
       missing: ÎÎµÎ½ Î­ÏÎµÏÎµ ÎµÏÎ¹ÏÏÎ­ÏÎµÎ¹ ÏÎ·Î½ ÏÏÏÏÎ²Î±ÏÎ· ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±
+    scopes:
+      write_api: Î¤ÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï ÏÎ¬ÏÏÎ·
+      read_gpx: ÎÎ½Î¬Î³Î½ÏÏÎ· ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎ½ Î¹ÏÎ½ÏÎ½ GPS
+      write_gpx: ÎÎµÏÎ±ÏÏÏÏÏÏÎ· Î¹ÏÎ½ÏÎ½ GPS
+      write_notes: Î¤ÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·Î¼ÎµÎ¹ÏÏÎµÏÎ½
+      skip_authorization: ÎÏÏÏÎ¼Î±ÏÎ· Î­Î³ÎºÏÎ¹ÏÎ· ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï
   oauth_clients:
     new:
       title: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î½Î­Î±Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï
@@ -2081,28 +2478,20 @@ el:
       title: ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ OAuth Î³Î¹Î± ÏÎ¿ %{app_name}
       key: 'ÎÏÎ´Î¹ÎºÏÏ ÎÎ±ÏÎ±Î½Î±Î»ÏÏÎ® :'
       secret: 'ÎÏÏÏÎ¹ÎºÏ ÏÎ¿Ï ÎÎ±ÏÎ±Î½Î±Î»ÏÏÎ®:'
-      url: 'Î£Î·Î¼ÎµÎ¯Î¿ ÎÎ®ÏÎ·ÏÎ·Ï URL:'
-      access_url: 'Î ÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Î£Î·Î¼ÎµÎ¯Î¿ URL:'
+      url: 'URL Î±Î¹ÏÎ®Î¼Î±ÏÎ¿Ï Î±Î´ÎµÎ¹Î¿Î´ÏÏÎ·ÏÎ·Ï:'
+      access_url: 'URL ÏÏÏÏÎ²Î±ÏÎ·Ï Î±Î´ÎµÎ¹Î¿Î´ÏÏÎ·ÏÎ·Ï:'
       authorize_url: 'ÎÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ®ÏÏÎµ ÏÎ¿ URL:'
       support_notice: Î¥ÏÎ¿ÏÏÎ·ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÏÎ¹Ï ÏÏÎ¿Î³ÏÎ±ÏÎ­Ï HMAC-SHA1 (ÏÏÎ½Î¹ÏÏÎ¬ÏÎ±Î¹) ÎºÎ±Î¹ RSA-SHA1.
       edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
       delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î ÎµÎ»Î¬ÏÎ·
       confirm: ÎÎ¯ÏÎ±ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹;
       requests: 'ÎÎ¯ÏÎ·ÏÎ· ÏÏÎ½ Î±ÎºÏÎ»Î¿ÏÎ¸ÏÎ½ Î±Î´ÎµÎ¹ÏÎ½ Î±ÏÏ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·:'
-      allow_read_prefs: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·.
-      allow_write_prefs: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·.
-      allow_write_diary: Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎµÎ³Î³ÏÎ±ÏÏÎ½ Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï, ÏÏÎ¿Î»Î¯ÏÎ½ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï
-        ÏÎ¯Î»ÏÎ½.
-      allow_write_api: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ±ÏÏÏÎ½.
-      allow_read_gpx: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎ½ Î¹ÏÎ½ÏÎ½ GPS.
-      allow_write_gpx: Î¼ÎµÏÎ±ÏÏÏÏÏÏÎ· Î¹ÏÎ½ÏÎ½ GPS.
-      allow_write_notes: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·Î¼ÎµÎ¹ÏÏÎµÏÎ½.
     index:
       title: ÎÎ¹ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ ÏÎ¿Ï OAuth Î¼Î¿Ï
       my_tokens: ÎÎ¹ ÎÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ·Î¼Î­Î½ÎµÏ ÎÏÎ±ÏÎ¼Î¿Î³Î­Ï Î¼Î¿Ï
-      list_tokens: 'Î¤Î± Î±ÎºÏÎ»Î¿ÏÎ¸Î± ÏÎ·Î¼ÎµÎ¯Î± Î­ÏÎ¿ÏÎ½ ÎµÎºÎ´Î¿Î¸ÎµÎ¯ Î³Î¹Î± ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ± ÏÏÎ¿ ÏÎ½Î¿Î¼Î± ÏÎ±Ï:'
-      application: ÎÎ½Î¿Î¼Î± ÎÏÎ±ÏÎ¼Î¿Î³Î®Ï
-      issued_at: ÎÎºÎ´ÏÎ¸Î·ÎºÎµ Î£ÏÎ¹Ï
+      list_tokens: 'Î¤Î± Î±ÎºÏÎ»Î¿ÏÎ¸Î± tokens Î­ÏÎ¿ÏÎ½ ÎµÎºÎ´Î¿Î¸ÎµÎ¯ Î³Î¹Î± ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ± ÏÏÎ¿ ÏÎ½Î¿Î¼Î± ÏÎ±Ï:'
+      application: ÎÎ½Î¿Î¼Î± ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï
+      issued_at: ÎÎºÎ´ÏÎ¸Î·ÎºÎµ ÏÏÎ¹Ï
       revoke: ÎÎ½Î±ÎºÎ±Î»Î­ÏÏÎµ!
       my_apps: ÎÎ¹ ÎÏÎ±ÏÎ¼Î¿Î³Î­Ï Î ÎµÎ»Î¬ÏÎ· ÎÎ¿Ï
       no_apps_html: ÎÏÎµÏÎµ Î¼Î¹Î± ÎµÏÎ±ÏÎ¼Î¿Î³Î® ÏÎ¿Ï Î¸Î­Î»ÎµÏÎµ Î½Î± ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÏÎµ Î³Î¹Î± ÏÏÎ®ÏÎ· Î¼Î±Î¶Î¯ Î¼Î±Ï
@@ -2112,20 +2501,7 @@ el:
       registered_apps: 'ÎÏÎµÏÎµ ÏÎ¹Ï ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÎµÏÎ±ÏÎ¼Î¿Î³Î­Ï ÏÎµÎ»Î¬ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·Î¼Î­Î½ÎµÏ:'
       register_new: ÎÎ±ÏÎ±ÏÏÏÎ®ÏÏÎµ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î® ÏÎ±Ï
     form:
-      name: ÎÎ½Î¿Î¼Î±
-      required: ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹
-      url: URL ÎÏÏÎ¹Î±Ï ÎÏÎ±ÏÎ¼Î¿Î³Î®Ï
-      callback_url: URL ÎÏÎ±Î½Î¬ÎºÎ»Î·ÏÎ·Ï
-      support_url: URL Î¥ÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·Ï
       requests: 'ÎÎ¹ÏÎ·Î¸ÎµÎ¯ÏÎµ ÏÎ¹Ï Î±ÎºÏÎ»Î¿ÏÎ¸ÎµÏ Î¬Î´ÎµÎ¹ÎµÏ Î±ÏÏ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·:'
-      allow_read_prefs: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·.
-      allow_write_prefs: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÏÎ½ ÏÏÎ®ÏÏÎ·.
-      allow_write_diary: Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎµÎ³Î³ÏÎ±ÏÏÎ½ Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï, ÏÏÎ¿Î»Î¯ÏÎ½ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï
-        ÏÎ¯Î»ÏÎ½.
-      allow_write_api: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ±ÏÏÏÎ½.
-      allow_read_gpx: Î±Î½Î¬Î³Î½ÏÏÎ· ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎ½ Î¹ÏÎ½ÏÎ½ GPS.
-      allow_write_gpx: Î¼ÎµÏÎ±ÏÏÏÏÏÏÎ· Î¹ÏÎ½ÏÎ½ GPS.
-      allow_write_notes: ÏÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·Î¼ÎµÎ¹ÏÏÎµÏÎ½.
     not_found:
       sorry: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î±ÏÏÏÏ Î¿ %{type} Î´ÎµÎ½ Î¼ÏÏÏÎµÏÎµ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯.
     create:
@@ -2134,90 +2510,55 @@ el:
       flash: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ¿Ï ÏÎµÎ»Î¬ÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏÎ¹ÏÏÏÎ¯Î±
     destroy:
       flash: Î ÎµÎ³Î³ÏÎ±ÏÎ® ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï ÏÎµÎ»Î¬ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ¬ÏÎ·ÎºÎµ
+  oauth2_applications:
+    index:
+      no_applications_html: ÎÏÎµÏÎµ Î¼Î¹Î± ÎµÏÎ±ÏÎ¼Î¿Î³Î® ÏÎ¿Ï Î¸Î­Î»ÎµÏÎµ Î½Î± ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÏÎµ Î³Î¹Î± ÏÏÎ®ÏÎ·
+        Î¼Î±Î¶Î¯ Î¼Î±Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÏÏÏÏÏÎ¿ %{oauth2}; Î ÏÎ­ÏÎµÎ¹ Î½Î± Î´Î·Î»ÏÏÎµÏÎµ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î®
+        ÏÎ±Ï ÏÏÎ¹Î½ Î¼ÏÎ¿ÏÎ­ÏÎµÎ¹ Î½Î± ÏÏÎ¿Î²Î¬Î»ÎµÎ¹ Î±Î¹ÏÎ®Î¼Î±ÏÎ± OAuth ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÏÎ·ÏÎµÏÎ¯Î±.
+      new: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î½Î­Î±Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï
+      name: ÎÎ½Î¿Î¼Î±
+      permissions: ÎÎ´ÎµÎ¹ÎµÏ
+    application:
+      edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+      confirm_delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î±ÏÏÎ®Ï ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï;
+    new:
+      title: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î½Î­Î±Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï
+    edit:
+      title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï ÏÎ±Ï
+    show:
+      edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+      confirm_delete: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î±ÏÏÎ®Ï ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï;
+      client_id: ID ÏÎµÎ»Î¬ÏÎ·
+      client_secret: ÎÏÏÏÎ¹ÎºÏ ÏÎµÎ»Î¬ÏÎ·
+      client_secret_warning: Î£Î¹Î³Î¿ÏÏÎµÏÏÎµÎ¯ÏÎµ ÏÏÎ¹ Î¸Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ Î±ÏÏÏ ÏÎ¿ Î¼ÏÏÏÎ¹ÎºÏ - Î´ÎµÎ½
+        Î¸Î± ÎµÎ¯Î½Î±Î¹ ÏÏÎ¿ÏÎ²Î¬ÏÎ¹Î¼Î¿ Î¾Î±Î½Î¬
+      permissions: ÎÎ´ÎµÎ¹ÎµÏ
+    not_found:
+      sorry: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÎ® Î· ÎµÏÏÎµÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï ÎµÏÎ±ÏÎ¼Î¿Î³Î®Ï.
+  oauth2_authorizations:
+    new:
+      title: ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ ÎµÎ¾Î¿ÏÏÎ¹Î¿Î´ÏÏÎ·ÏÎ·
+      introduction: ÎÎ¾Î¿ÏÏÎ¹Î¿Î´ÏÏÎ·ÏÎ· %{application} Î³Î¹Î± ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï
+        Î¼Îµ ÏÎ¹Ï Î±ÎºÏÎ»Î¿ÏÎ¸ÎµÏ Î¬Î´ÎµÎ¹ÎµÏ;
+      authorize: ÎÎ¾Î¿ÏÏÎ¹Î¿Î´ÏÏÎ·ÏÎ·
+    show:
+      title: ÎÏÎ´Î¹ÎºÏÏ ÎµÎ¾Î¿ÏÏÎ¹Î¿Î´ÏÏÎ·ÏÎ·Ï
+  oauth2_authorized_applications:
+    index:
+      title: ÎÎ¹ ÎÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ·Î¼Î­Î½ÎµÏ ÎÏÎ±ÏÎ¼Î¿Î³Î­Ï Î¼Î¿Ï
+      permissions: ÎÎ´ÎµÎ¹ÎµÏ
+      no_applications_html: ÎÎµÎ½ Î­ÏÎµÏÎµ ÎµÎ¾Î¿ÏÏÎ¹Î¿Î´Î¿ÏÎ®ÏÎµÎ¹ Î±ÎºÏÎ¼Î· %{oauth2} ÎµÏÎ±ÏÎ¼Î¿Î³Î­Ï.
+    application:
+      revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï
+      confirm_revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î³Î¹Î± Î±ÏÏÎ®Î½ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î®;
   users:
-    login:
-      title: ÎÎ¯ÏÎ¿Î´Î¿Ï
-      heading: ÎÎ¯ÏÎ¿Î´Î¿Ï
-      email or username: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ». Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î® ÎÎ½Î¿Î¼Î± Î§ÏÎ®ÏÏÎ·:'
-      password: 'Î£ÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ:'
-      openid_html: '%{logo} OpenID:'
-      remember: ÎÎ± Î¼Îµ Î¸ÏÎ¼Î¬ÏÎ±Î¹
-      lost password link: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï;
-      login_button: ÎÎ¯ÏÎ¿Î´Î¿Ï
-      register now: ÎÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ ÏÏÏÎ±
-      with username: 'ÎÏÎµÏÎµ Î®Î´Î· Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï OpenStreetMap; Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ ÏÎ¿
-        ÏÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ· ÎºÎ±Î¹ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï:'
-      with external: 'ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÏÎ¯ÏÎ· ÏÏÎ·ÏÎµÏÎ¯Î± Î³Î¹Î± ÎµÎ¯ÏÎ¿Î´Î¿:'
-      new to osm: ÎÎ­Î¿Î¹ ÏÏÎ¿ OpenStreetMap;
-      to make changes: ÎÎ¹Î± Î½Î± ÎºÎ¬Î½ÎµÏÎµ Î±Î»Î»Î±Î³Î­Ï ÏÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¿Ï OpenStreetMap, ÏÏÎ­ÏÎµÎ¹
-        Î½Î± Î­ÏÎµÏÎµ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï.
-      create account minute: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î­Î½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï. Î§ÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î¼ÏÎ½Î¿ Î­Î½Î± Î»ÎµÏÏÏ.
-      no account: ÎÎµÎ½ Î­ÏÎµÏÎµ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï;
-      account not active: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏÎ³ÏÏ Î±ÎºÏÎ¼Î±.<br
-        />Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ¿ email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
-        ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï, Î® <a href="%{reconfirm}">ÎºÎ¬Î½ÏÎµ Î±Î¯ÏÎ·ÏÎ· Î½Î­Î¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï</a>.
-      account is suspended: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ Î»ÏÎ³Ï ÏÏÎ¿ÏÏÎ·Ï
-        Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï.<br>Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÏÎµ Î¼Îµ ÏÎ¿Î½ <a href="%{webmaster}">webmaster</a>
-        ÎµÎ¬Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÎ¿ ÏÏÎ¶Î·ÏÎ®ÏÎµÏÎµ.
-      auth failure: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ Î±ÏÏÎ­Ï ÏÎ¹Ï Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ.
-      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: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Wikipedia
-          alt: Î£ÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î¼Îµ Î­Î½Î± ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï Wikipedia
-        yahoo:
-          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ¿ Yahoo
-          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Yahoo OpenID
-        wordpress:
-          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ¿ Wordpress
-          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Wordpress OpenID
-        aol:
-          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎ·Î½ AOL
-          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± AOL OpenID
-    logout:
-      title: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ·
-      heading: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ· Î±ÏÏ ÏÎ¿ OpenStreetMap
-      logout_button: ÎÏÎ¿ÏÏÎ½Î´ÎµÏÎ·
-    lost_password:
-      title: Î§Î¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï
-      heading: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï;
-      email address: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
-      new password button: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
-      help_text: Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ±ÏÎµ
-        Î³Î¹Î± Î½Î± ÎµÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ. ÎÎ± ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ Î­Î½Î±Î½ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÎ¿Î½ Î¿ÏÎ¿Î¯Î¿Î½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
-        Î³Î¹Î± Î½Î± ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÎ¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï.
-      notice email on way: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ ÏÎ¿Ï ÏÎ¿ ÏÎ¬ÏÎ±ÏÎµ :-(, Î±Î»Î»Î¬ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
-        ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÎµÏÏÎ¬Î»Î·, ÏÏÏÎµ Î½Î± Î¼ÏÎ¿ÏÎ­ÏÎµÏÎµ Î½Î± ÏÎ¿ ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÏÎ½ÏÎ¿Î¼Î±.
-      notice email cannot find: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ Î±ÏÏÎ® Î· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï
-        ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
-    reset_password:
-      title: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
-      heading: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï Î³Î¹Î± ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· %{user}
-      password: 'Î£ÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ:'
-      confirm password: 'ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï:'
-      reset: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï
-      flash changed: Î¤Î¿ ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ ÏÎ±Ï Î¬Î»Î»Î±Î¾Îµ!
-      flash token bad: ÎÎµÎ½ Î²ÏÎ®ÎºÎ±ÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿Î¼Î¼Î¬ÏÎ¹, Î¼Î®ÏÏÏ ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ»Î­Î³Î¾ÎµÏÎµ ÏÎ¿ URL;
     new:
       title: ÎÎ³Î³ÏÎ±ÏÎ®
       no_auto_account_create: ÎÏÏÏÏÏÏÏ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎ¿ÏÎ¼Îµ Î±ÏÏÏÎ¼Î±ÏÎ± Î­Î½Î±Î½
         Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï Î³Î¹Î± ÎµÏÎ¬Ï.
-      contact_webmaster_html: ÎÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÏÎµ Î¼Îµ ÏÎ¿Î½ <a href="%{webmaster}">webmaster</a>
+      contact_support_html: ÎÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÏÎµ Î¼Îµ ÏÎ·Î½ <a href="%{support}">ÏÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·</a>
         Î³Î¹Î± Î½Î± ÎºÎ±Î½Î¿Î½Î¯ÏÎµÏÎµ Î³Î¹Î± ÏÎ· Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎµÎ½ÏÏ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï - Î¸Î± ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÎ¿ÏÎ¼Îµ Î½Î±
         Î¹ÎºÎ±Î½Î¿ÏÎ¿Î¹Î®ÏÎ¿ÏÎ¼Îµ ÏÎ¿ Î±Î¯ÏÎ·Î¼Î¬ ÏÎ±Ï ÏÎ¿ ÏÏÎ½ÏÎ¿Î¼ÏÏÎµÏÎ¿ Î´ÏÎ½Î±ÏÏÎ½.
       about:
@@ -2226,30 +2567,17 @@ el:
           <p>Î£Îµ Î±Î½ÏÎ¯Î¸ÎµÏÎ· Î¼Îµ Î¬Î»Î»Î¿ÏÏ ÏÎ¬ÏÏÎµÏ, ÏÎ¿ OpenStreetMap Î­ÏÎµÎ¹ Î¿Î»Î¿ÎºÎ»Î·ÏÏÏÎ¹ÎºÎ¬ ÏÏÎ¹Î±ÏÏÎµÎ¯ Î±ÏÏ Î±Î½Î¸ÏÏÏÎ¿ÏÏ ÏÎ±Î½ ÎºÎ¹ ÎµÏÎ¬Ï,
           ÎºÎ±Î¹ ÎµÎ¯Î½Î±Î¹ Î±Î½Î¿Î¹ÎºÏÏÏ ÏÏÎ¿Î½ ÎºÎ±Î¸Î­Î½Î± Î½Î± ÏÎ¿Î½ Î´Î¹Î¿ÏÎ¸ÏÏÎµÎ¹, Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏÎµÎ¹, ÎºÎ±ÏÎµÎ²Î¬ÏÎµÎ¹ ÎºÎ±Î¹ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹.</p>
           <p>ÎÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ Î³Î¹Î± Î½Î± Î±ÏÏÎ¯ÏÎµÏÎµ Î½Î± ÏÏÎ½ÎµÎ¹ÏÏÎ­ÏÎµÏÎµ. ÎÎ± ÏÎ±Ï ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ Î­Î½Î± email Î³Î¹Î± Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎ¿ÏÎ¼Îµ ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï.</p>
-      license_agreement: ÎÏÎ±Î½ ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï, Î¸Î± ÏÏÎ­ÏÎµÎ¹ Î½Î± Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ÏÎµ
-        ÏÎ¿ÏÏ <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">ÏÏÎ¿ÏÏ
-        ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï</a>.
       email address: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ». Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
       confirm email address: 'ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï ÎÎ». Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
-      not_displayed_publicly_html: Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ® ÏÎ±Ï Î´ÎµÎ½ ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÎ±Î¹ Î´Î·Î¼ÏÏÎ¹Î± (Î´ÎµÎ¯ÏÎµ
-        ÏÎ·Î½ <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF
-        privacy policy including section on email addresses">ÏÎ¿Î»Î¹ÏÎ¹ÎºÎ® Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï</a>
-        Î³Î¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ)
       display name: 'ÎÎ¼ÏÎ±Î½Î¹Î¶ÏÎ¼ÎµÎ½Î¿ ÏÎ½Î¿Î¼Î±:'
       display name description: Î¤Î¿ Î´Î·Î¼ÏÏÎ¹Î± ÎµÎ¼ÏÎ±Î½Î¹Î¶ÏÎ¼ÎµÎ½Î¿ ÏÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ·. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î±
         ÏÎ¿ Î±Î»Î»Î¬Î¾ÎµÏÎµ Î±ÏÎ³ÏÏÎµÏÎ± Î±ÏÏ ÏÎ¹Ï ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï.
       external auth: 'ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÎ±ÏÏÏÏÎ·ÏÎ±Ï Î±ÏÏ ÏÏÎ¯ÏÎ¿ Î¼Î­ÏÎ¿Ï:'
-      password: 'Î£ÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ:'
-      confirm password: 'ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÎ¿Ï:'
       use external auth: ÎÎ½Î±Î»Î»Î±ÎºÏÎ¹ÎºÎ¬, ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÏÎ¯ÏÎ· ÏÏÎ·ÏÎµÏÎ¯Î± Î³Î¹Î± ÎµÎ¯ÏÎ¿Î´Î¿
       auth no password: ÎÎ¹Î± ÏÎ·Î½ Î­Î³ÎºÏÎ¹ÏÎ· ÏÏÎ¯ÏÏÎ½ Î´ÎµÎ½ Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ ÎºÏÎ´Î¹ÎºÏÏ ÏÏÏÏÎ²Î±ÏÎ·Ï, Î±Î»Î»Î¬
         Î¼ÎµÏÎ¹ÎºÎ¬ ÎµÎ¹Î´Î¹ÎºÎ¬ ÎµÏÎ³Î±Î»ÎµÎ¯Î± Î±Î»Î»Î¹ÏÏ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®Ï Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î­Î½Î±.
       continue: ÎÎ³Î³ÏÎ±ÏÎ®
       terms accepted: ÎÏÏÎ±ÏÎ¹ÏÏÎ¿ÏÎ¼Îµ Î³Î¹Î± ÏÎ·Î½ Î±ÏÎ¿Î´Î¿ÏÎ® ÏÏÎ½ Î½Î­ÏÎ½ ÏÏÏÎ½ ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï!
-      terms declined: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ Î³Î¹Î± ÏÎ¿ ÏÏÎ¹ Î±ÏÎ¿ÏÎ±ÏÎ¯ÏÎ±ÏÎµ Î½Î± Î¼Î·Î½ Î±ÏÎ¿Î´ÎµÏÎ¸ÎµÎ¯ÏÎµ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ
-        ÏÏÎ¿ÏÏ ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï. ÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î´ÎµÎ¯ÏÎµ <a href="%{url}">Î±ÏÏÎ®Î½
-        ÏÎ· ÏÎµÎ»Î¯Î´Î± wiki</a>.
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: ÎÏÎ¿Î¹
       heading: ÎÏÎ¿Î¹
@@ -2267,7 +2595,7 @@ el:
       consider_pd: ÎÎ±Î¹ ÎµÏÎ¹ÏÏÏÏÎ¸ÎµÏÎ± ÏÏÎ·Î½ ÏÎ±ÏÎ±ÏÎ¬Î½Ï ÏÏÎ¼ÏÏÎ½Î¯Î±, ÎºÎ±ÏÎ±ÏÏÏ ÏÎ¹Ï ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ­Ï
         Î¼Î¿Ï ÏÏÎ¿ ÎºÎ¿Î¹Î½Ï ÎºÏÎ®Î¼Î± (Î³Î¹Î± ÎµÎ»ÎµÏÎ¸ÎµÏÎ· ÏÏÎ®ÏÎ·)
       consider_pd_why: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± Î½Î± ÎºÎ±ÏÎ±Î»Î¬Î²ÎµÏÎµ Î±ÏÏÎ¿ÏÏ ÏÎ¿ÏÏ ÏÏÎ¿ÏÏ:Î¼Î¯Î± <href="%{summary}">
         Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î· ÏÎµÏÎ¯Î»Î·ÏÎ·</a>ÎºÎ±Î¹ Î¼ÎµÏÎ¹ÎºÎ­Ï <a href=''%{translations}''>Î±Î½ÎµÏÎ¯ÏÎ·Î¼ÎµÏ
         Î¼ÎµÏÎ±ÏÏÎ¬ÏÎµÎ¹Ï </a>
@@ -2281,6 +2609,8 @@ el:
         france: ÎÎ±Î»Î»Î¯Î±
         italy: ÎÏÎ±Î»Î¯Î±
         rest_of_world: Î¥ÏÏÎ»Î¿Î¹ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï
+    terms_declined_flash:
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï
       heading: Î ÏÏÎ®ÏÏÎ·Ï %{user} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹
@@ -2289,18 +2619,20 @@ el:
         ÏÎ· ÏÎµÎ»Î¯Î´Î±.
       deleted: Î´Î¹ÎµÎ³ÏÎ¬ÏÎ·
     show:
-      my diary: Î¤Î¿ ÎÎ¼ÎµÏÎ¿Î»ÏÎ³Î¹Ï ÎÎ¿Ï
+      my diary: Î¤Î¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Ï Î¼Î¿Ï
       new diary entry: Î½Î­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
-      my edits: ÎÎ¹ ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÎÎ¿Ï
-      my traces: Î¤Î± ÎÏÎ½Î· ÎÎ¿Ï
+      my edits: ÎÎ¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ Î¼Î¿Ï
+      my traces: Î¤Î± Î¯ÏÎ½Î· Î¼Î¿Ï
       my notes: ÎÎ¹ Î£Î·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï ÎÎ¿Ï
-      my messages: Î¤Î± ÎÎ·Î½ÏÎ¼Î±ÏÎ¬ ÎÎ¿Ï
-      my profile: Î¤Î¿ Î ÏÎ¿ÏÎ¯Î» ÎÎ¿Ï
-      my settings: ÎÎ¹ Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÎ¿Ï
+      my messages: Î¤Î± Î¼Î·Î½ÏÎ¼Î±ÏÎ¬ Î¼Î¿Ï
+      my profile: Î¤Î¿ ÏÏÎ¿ÏÎ¯Î» Î¼Î¿Ï
+      my settings: ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¼Î¿Ï
       my comments: Î¤Î± Î£ÏÏÎ»Î¹Î¬ ÎÎ¿Ï
-      oauth settings: ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï oauth
+      my_preferences: ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î¼Î¿Ï
+      my_dashboard: Î¤Î¿ ÏÎ±Î¼ÏÎ»Ï Î¼Î¿Ï
       blocks on me: Î¦ÏÎ±Î³Î­Ï ÏÎµ ÎÎ¼Î­Î½Î±
       blocks by me: Î¦ÏÎ±Î³Î­Ï Î±ÏÏ ÎÎ¼Î­Î½Î±
+      edit_profile: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ¿ÏÎ¯Î»
       send message: ÎÏÎ¿ÏÏÎ¿Î»Î® ÎÎ·Î½ÏÎ¼Î±ÏÎ¿Ï
       diary: ÎÎ¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿
       edits: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ
@@ -2311,7 +2643,7 @@ el:
       mapper since: 'Î§Î±ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï Î±ÏÏ:'
       ct status: 'ÎÏÎ¿Î¹ ÏÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï:'
       ct undecided: ÎÎ½Î±ÏÎ¿ÏÎ¬ÏÎ¹ÏÏÎ¿Ï
-      ct declined: ÎÏÏÏÏÎ¹ÏÎ·
+      ct declined: ÎÏÎ¿ÏÏÎ¯ÏÎ¸Î·ÎºÎµ
       latest edit: 'Î¤ÎµÎ»ÎµÏÏÎ±Î¯Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± (%{ago}):'
       email address: 'ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ». Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
       created from: 'ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ Î±ÏÏ:'
@@ -2319,16 +2651,6 @@ el:
       spam score: 'Î£ÎºÎ¿Ï Spam:'
       description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
       user location: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÏÎ®ÏÏÎ·
-      if_set_location_html: ÎÏÎ¯ÏÎµÏÎµ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ¿Ï ÏÏÎ¹ÏÎ¹Î¿Ï ÏÎ±Ï ÏÏÎ¹Ï %{settings_link}
-        Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ.
-      settings_link_text: ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï
-      my friends: ÎÎ¹ ÏÎ¯Î»Î¿Î¹ Î¼Î¿Ï
-      no friends: ÎÎµÎ½ Î­ÏÎµÏÎµ ÏÏÎ¿ÏÎ¸Î­ÏÎµÎ¹ ÏÎ¯Î»Î¿ÏÏ Î±ÎºÏÎ¼Î±.
-      km away: '%{count}ÏÎ»Î¼ Î¼Î±ÎºÏÎ¹Î¬'
-      m away: '%{count}Î¼ Î¼Î±ÎºÏÎ¹Î¬'
-      nearby users: ÎÎ»Î»Î¿Î¹ ÎºÎ¿Î½ÏÎ¹Î½Î¿Î¯ ÏÏÎ®ÏÏÎµÏ
-      no nearby users: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¬Î»Î»Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï ÏÎ±ÏÎ±Î´Î­ÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ¹ ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ¿ÏÎ½
-        ÎºÎ¿Î½ÏÎ¬ ÏÎ¿Ï ÏÏÎ¿Ï ÏÎ¿ ÏÎ±ÏÏÎ½.
       role:
         administrator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®Ï
         moderator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®Ï
@@ -2336,7 +2658,7 @@ el:
           administrator: Î§Î¿ÏÎ®Î³Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®
           moderator: Î§Î¿ÏÎ®Î³Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®
         revoke:
-          administrator: ÎÎ½Î±ÎºÎ±Î»Î­ÏÏÎµ ÏÏÏÏÎ²Î±ÏÎ· Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®
+          administrator: ÎÎ½Î±ÎºÎ±Î»Î­ÏÏÎµ ÏÎ·Î½ ÏÏÏÏÎ²Î±ÏÎ· Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®
           moderator: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®
       block_history: ÎÎ½ÎµÏÎ³Î­Ï Î¦ÏÎ±Î³Î­Ï
       moderator_history: Î¦ÏÎ±Î³Î­Ï ÏÎ¿Ï ÎÏÎ¹Î²Î»Î®Î¸Î·ÎºÎ±Î½
@@ -2349,113 +2671,7 @@ el:
       unhide_user: ÎÏÎ±Î½ÎµÎ¼ÏÎ¬Î½Î¹ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï Î§ÏÎ®ÏÏÎ·
       delete_user: ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î±ÏÏÎ¿Ï ÏÎ¿Ï Î§ÏÎ®ÏÏÎ·
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
-      friends_changesets: Î¿Î¼Î¬Î´ÎµÏ Î±Î»Î»Î±Î³ÏÎ½ ÏÎ¯Î»ÏÎ½
-      friends_diaries: ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ¯Î»ÏÎ½
-      nearby_changesets: Î¿Î¼Î¬Î´ÎµÏ Î±Î»Î»Î±Î³ÏÎ½ Î±ÏÏ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ
-      nearby_diaries: ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï Î±ÏÏ ÎºÎ¿Î½ÏÎ¹Î½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ
       report: ÎÎ½Î±ÏÎ¿ÏÎ¬ Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·
-    popup:
-      your location: Î ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï
-      nearby mapper: ÎÎ¿Î½ÏÎ¹Î½ÏÏ ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï
-      friend: Î¦Î¯Î»Î¿Ï
-    account:
-      title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï
-      my settings: ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¼Î¿Ï
-      current email address: 'Î¤ÏÏÎ¹Î½Î® ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
-      new email address: 'ÎÎ­Î± ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:'
-      email never displayed publicly: (ÏÎ¿ÏÎ­ Î´ÎµÎ½ ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÏÎ±Î¹ Î´Î·Î¼ÏÏÎ¹Î±)
-      external auth: 'ÎÎ¾ÏÏÎµÏÎ¹ÎºÏÏ ÎÎ»ÎµÎ³ÏÎ¿Ï Î¤Î±ÏÏÏÏÎ·ÏÎ±Ï:'
-      openid:
-        link: https://wiki.openstreetmap.org/wiki/OpenID
-        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
-      public editing:
-        heading: 'ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±:'
-        enabled: ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ. ÎÎµÎ½ ÎµÎ¯ÏÏÎµ ÏÎ¹Î± Î±Î½ÏÎ½ÏÎ¼Î¿Î¹ ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ
-          Î´ÎµÎ´Î¿Î¼Î­Î½Î±.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
-        disabled: ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ Î´ÎµÎ´Î¿Î¼Î­Î½Î±, ÏÎ»ÎµÏ
-          Î¿Î¹ ÏÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½ÎµÏ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÎµÎ¯Î½Î±Î¹ Î±Î½ÏÎ½ÏÎ¼ÎµÏ.
-        disabled link text: Î³Î¹Î±ÏÎ¯ Î´ÎµÎ½ Î¼ÏÎ¿ÏÏ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÏ ÏÎ¿Î½ ÏÎ¬ÏÏÎ·;
-      public editing note:
-        heading: 'ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±:'
-        html: ÎÏÏÎ®Î½ ÏÎ· ÏÏÎ¹Î³Î¼Î® Î¿Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÎ±Ï ÎµÎ¯Î½Î±Î¹ Î±Î½ÏÎ½ÏÎ¼ÎµÏ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ ÎºÎ±Î½ÎµÎ¯Ï
-          Î½Î± ÏÎ±Ï ÏÏÎµÎ¯Î»ÎµÎ¹ Î¼Î®Î½ÏÎ¼Î± Î® Î½Î± Î´ÎµÎ¹ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï. ÎÎ¹Î± Î½Î± Î´ÎµÎ¯Î¾ÎµÏÎµ ÏÎ¹ Î­ÏÎµÏÎµ
-          ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ ÎºÎ±Î¹ Î½Î± ÎµÏÎ¹ÏÏÎ­ÏÎµÏÎµ ÏÏÎ¿ÏÏ Î¬Î»Î»Î¿ÏÏ Î­ÏÎ¸Î¿ÏÎ½ ÏÎµ ÎµÏÎ±ÏÎ® Î¼Î±Î¶Î¯ ÏÎ±Ï Î¼Î­ÏÏ
-          ÏÎ¿Ï Î¹ÏÏÎ¿ÏÏÏÎ¿Ï, ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Î±ÏÏ ÎºÎ¬ÏÏ. <b>ÎÎµÏÎ¬ ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÎµ API 0.6,
-          Î¼ÏÎ½Î¿ Î¿Î¹ ÎµÏÏÎ½ÏÎ¼Î¿Î¹ ÏÏÎ®ÏÏÎµÏ Î¼ÏÎ¿ÏÎ¿ÏÎ½ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ¿ÏÎ½ Î´ÎµÎ´Î¿Î¼Î­Î½Î± ÏÎ¿Ï ÏÎ¬ÏÏÎ·.</b>.
-          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Î¼Î¬Î¸ÎµÏÎµ Î³Î¹Î±ÏÎ¯</a>).
-          <ul><li>Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ® ÏÎ±Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î´ÎµÎ½ Î¸Î± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¸ÎµÎ¯ Î´Î·Î¼ÏÏÎ¹Î±.
-          </li><li> ÎÏÏÎ® Î· ÎµÎ½Î­ÏÎ³ÎµÎ¹Î± Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î±Î½Î±Î¹ÏÎµÎ¸ÎµÎ¯ ÎºÎ±Î¹ ÏÎ»Î¿Î¹ Î¿Î¹ Î½Î­Î¿Î¹ ÏÏÎ®ÏÏÎµÏ
-          ÎµÎ¯Î½Î±Î¹ ÎµÏÏÎ½ÏÎ¼Î¿Î¹ ÎµÎ¾' Î±ÏÏÎ®Ï.</li></ul>
-      contributor terms:
-        heading: 'ÎÏÎ¿Î¹ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï:'
-        agreed: ÎÏÎµÏÎµ Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
-        not yet agreed: ÎÎµÎ½ Î­ÏÎµÏÎµ Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
-        review link text: Î Î±ÏÎ±ÎºÎ±Î»Ï Î±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÏÎµ Î±ÏÏÏ ÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ±Î½ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î³Î¹Î±
-          Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÎºÎ±Î¹ Î½Î± Î±ÏÎ¿Î´ÎµÏÎ¸ÎµÎ¯ÏÎµ ÏÎ¿ÏÏ Î½Î­Î¿ÏÏ ÎÏÎ¿ÏÏ Î£ÏÎ½ÎµÎ¹ÏÏÎ¿ÏÎ¬Ï.
-        agreed_with_pd: ÎÏÎµÏÎµ ÎµÏÎ¯ÏÎ·Ï Î´Î·Î»ÏÏÎµÎ¹ ÏÏÎ¹ Î¸ÎµÏÏÎµÎ¯ÏÎµ ÏÎ¹Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÎ±Ï Î¿ÏÎ¹
-          ÎµÎ¯Î½Î±Î¹ Public Domain.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
-        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
-      profile description: 'Î ÎµÏÎ¹Î³ÏÎ±ÏÎ® Î ÏÎ¿ÏÎ¯Î»:'
-      preferred languages: 'Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½ÎµÏ ÎÎ»ÏÏÏÎµÏ:'
-      preferred editor: 'Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½Î¿ Î ÏÏÎ³ÏÎ±Î¼Î¼Î± ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±Ï:'
-      image: 'ÎÎ¹ÎºÏÎ½Î±:'
-      gravatar:
-        gravatar: Î§ÏÎ®ÏÎ· Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
-        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
-        disabled: 'Î¤Î¿ Gravatar Î­ÏÎµÎ¹ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯:'
-        enabled: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·Ï ÏÎ¿Ï Gravatar ÏÎ±Ï Î­ÏÎµÎ¹ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¸ÎµÎ¯.
-      new image: Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÎµÎ¹ÎºÏÎ½Î±Ï
-      keep image: ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
-      delete image: ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
-      replace image: ÎÎ½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
-      image size hint: (ÏÎµÏÏÎ¬Î³ÏÎ½ÎµÏ ÎµÎ¹ÎºÏÎ½ÎµÏ ÏÎ¿ÏÎ»Î¬ÏÎ¹ÏÏÎ¿Î½ 100 x 100 Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ±)
-      home location: 'Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î£ÏÎ¹ÏÎ¹Î¿Ï:'
-      no home location: ÎÎµÎ½ Î­ÏÎµÏÎµ ÎµÎ¹ÏÎ¬Î³ÎµÎ¹ ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ¿Ï ÏÏÎ¹ÏÎ¹Î¿Ï ÏÎ±Ï.
-      latitude: 'ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï:'
-      longitude: 'ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï:'
-      update home location on click: ÎÎ½Î·Î¼Î­ÏÏÏÎ· ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±Ï ÏÏÎ¹ÏÎ¹Î¿Ï ÏÏÎ±Î½ ÎºÎ¬Î½Ï ÎºÎ»Î¹Îº ÏÏÎ¿Î½
-        ÏÎ¬ÏÏÎ·;
-      save changes button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÎÎ»Î»Î±Î³ÏÎ½
-      make edits public button: ÎÎ¬Î½Îµ ÏÎ»ÎµÏ ÏÎ¹Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ Î¼Î¿Ï Î´Î·Î¼ÏÏÎ¹ÎµÏ
-      return to profile: ÎÏÎ¹ÏÏÏÎ¿ÏÎ® ÏÏÎ¿ ÏÏÎ¿ÏÎ¯Î»
-      flash update success confirm needed: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ¿Ï ÏÏÎ®ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½
-        ÎµÏÎ¹ÏÏÏÏÏ. ÎÎ»Î­Î³Î¾ÏÎµ ÏÎ¿ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿ ÏÎ±Ï Î³Î¹Î± Î¼Î¹Î± ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï
-        ÏÎ·Ï Î½Î­Î±Ï ÏÎ±Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
-      flash update success: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎ®ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏÎ¹ÏÏÏÎ¯Î±.
-    confirm:
-      heading: ÎÎ»Î­Î³Î¾ÏÎµ ÏÎ¿ Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏ ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿ ÏÎ±Ï!
-      introduction_1: Î£Î±Ï ÏÏÎµÎ¯Î»Î±Î¼Îµ Î­Î½Î± email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï.
-      introduction_2: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÏÎµ ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï ÎºÎ¬Î½Î¿Î½ÏÎ±Ï ÎºÎ»Î¹Îº ÏÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÏÎ¿
-        email ÎºÎ±Î¹ Î¸Î± ÎµÎ¯ÏÏÎµ ÏÎµ Î¸Î­ÏÎ· Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏÎµÏÎµ ÏÎ· ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·.
-      press confirm button: Î Î±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·" Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ
-        ÏÎ¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï.
-      button: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
-      success: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸Î·ÎºÎµ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ¿Ï, ÏÎµ ÎµÏÏÎ±ÏÎ¹ÏÏÎ¿ÏÎ¼Îµ Î³Î¹Î± ÏÎ·Î½ ÎµÎ³Î³ÏÎ±ÏÎ® ÏÎ¿Ï!
-      already active: ÎÏÏÏÏ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ Î®Î´Î· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯.
-      unknown token: ÎÏÏÏÏ Î¿ ÎºÏÎ´Î¹ÎºÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î­ÏÎµÎ¹ Î»Î®Î¾ÎµÎ¹ Î® Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹.
-      reconfirm_html: ÎÎ¬Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÎ±Ï Î¾Î±Î½Î±ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ ÏÎ¿ email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï <a href="%{reconfirm}">ÏÎ±ÏÎ®ÏÏÎµ
-        ÎµÎ´Ï</a>.
-    confirm_resend:
-      success: ÎÏÎ¿ÏÎ¼Îµ ÏÏÎµÎ¯Î»ÎµÎ¹ Î­Î½Î± Î½Î­Î¿ ÏÎ·Î¼ÎµÎ¯ÏÎ¼Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï ÏÏÎ¿ %{email} ÎºÎ±Î¹ Î¼ÏÎ»Î¹Ï
-        ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï, Î¸Î± Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±ÏÏÎ¯ÏÎµÏÎµ ÏÎ· ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·.<br
-        /><br />ÎÎ¬Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ Î­Î½Î± ÏÏÏÏÎ·Î¼Î± Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î¿Ï Î±Î½ÎµÏÎ¹Î¸ÏÎ¼Î·ÏÏÎ½ Î¼Î·Î½ÏÎ¼Î¬ÏÏÎ½,
-        ÏÎ¿ Î¿ÏÎ¿Î¯Î¿ ÏÏÎ­Î»Î½ÎµÎ¹ Î±Î¹ÏÎ®Î¼Î±ÏÎ± ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï, Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ÏÎµ ÏÏÎ¹ Î­ÏÎµÏÎµ ÏÏÎ¿ÏÎ¸Î­ÏÎµÎ¹ ÏÎµ
-        Î»Î¯ÏÏÎ± ÎµÏÎ¹ÏÏÎµÏÏÎ¼ÎµÎ½ÏÎ½ ÏÎ¿ %{sender} ÎºÎ±Î¸ÏÏ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± Î±ÏÎ±Î½ÏÎ¬Î¼Îµ ÏÎµ ÎºÎ±Î½Î­Î½Î±
-        Î±Î¯ÏÎ·Î¼Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï.
-      failure: Î ÏÏÎ®ÏÏÎ·Ï %{name} Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ.
-    confirm_email:
-      heading: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±Î»Î»Î±Î³Î®Ï ÏÎ·Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï
-      press confirm button: Î Î±ÏÎ®ÏÏÎµ ÏÎ¿ ÎºÎ¿ÏÎ¼ÏÎ¯ Â«ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Â» ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÎµÏÎµ
-        ÏÎ· Î½Î­Î± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï.
-      button: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
-      success: ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸Î·ÎºÎµ Î· Î±Î»Î»Î±Î³Î® ÏÎ·Ï Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï!
-      failure: ÎÎ¹Î± Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î­ÏÎµÎ¹ Î®Î´Î· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ Î¼Îµ Î±ÏÏÏ
-        ÏÎ¿ Î´Î¹Î±ÎºÏÎ¹ÏÎ¹ÎºÏ.
-      unknown_token: ÎÏÏÏÏ Î¿ ÎºÏÎ´Î¹ÎºÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï Î­ÏÎµÎ¹ Î»Î®Î¾ÎµÎ¹ Î® Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹.
     set_home:
       flash success: Î ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÏÎ¹ÏÎ¹Î¿Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ ÎµÏÎ¹ÏÏÏÏÏ
     go_public:
@@ -2471,12 +2687,12 @@ el:
         %{date}'
       summary_no_ip_html: '%{name} Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ ÏÏÎ¹Ï %{date}'
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÎÏÎ¹Î»ÎµÎ³Î¼Î­Î½ÏÎ½ Î§ÏÎ·ÏÏÏÎ½
-      hide: ÎÏÏÎºÏÏÏÎ· ÎÏÎ¹Î»ÎµÎ³Î¼Î­Î½ÏÎ½ Î§ÏÎ·ÏÏÏÎ½
+      hide: ÎÏÏÎºÏÏÏÎ· ÎµÏÎ¹Î»ÎµÎ³Î¼Î­Î½ÏÎ½ ÏÏÎ·ÏÏÏÎ½
       empty: ÎÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎ±Î½ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Î½Î± ÏÎ±Î¹ÏÎ¹Î¬Î¶Î¿ÏÎ½
     suspended:
       title: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
       heading: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
-      webmaster: webmaster
+      support: ÏÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·
       body_html: |-
         <p>
         ÎÏÏÎ¬Î¼Î±Î¹, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±ÏÏÏÎ¼Î±ÏÎ± Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ Î»ÏÎ³Ï
@@ -2502,7 +2718,7 @@ el:
         Î½Î± ÏÏÏÏÎµÏÎ¯ÏÎµÏÎµ ÏÎ¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï Î¼Îµ ÏÎ¿ ID ÏÎ±Ï ÏÏÎ¹Ï ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÏÎ®ÏÏÎ·.
   user_role:
     filter:
-      not_a_role: Î¤Î¿ Î±Î»ÏÎ±ÏÎ¹Î¸Î¼Î·ÏÎ¹ÎºÏ `%{role}' Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î½Î±Ï Î­Î³ÎºÏÏÎ¿Ï ÏÏÎ»Î¿Ï.
+      not_a_role: Î ÏÏÎ¿Î¹ÏÎµÎ¹Î¿ÏÎµÎ¹ÏÎ¬ `%{role}' Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î½Î±Ï Î­Î³ÎºÏÏÎ¿Ï ÏÏÎ»Î¿Ï.
       already_has_role: Î ÏÏÎ®ÏÏÎ·Ï Î­ÏÎµÎ¹ Î®Î´Î· ÏÏÎ»Î¿ %{role}.
       doesnt_have_role: Î ÏÏÎ®ÏÏÎ·Ï Î´ÎµÎ½ Î­ÏÎµÎ¹ ÏÏÎ»Î¿ %{role}.
       not_revoke_admin_current_user: Î Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ¹ÎºÏÏ ÏÏÎ»Î¿Ï Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î±Î½Î±Î¹ÏÎµÎ¸ÎµÎ¯
@@ -2534,29 +2750,17 @@ el:
     new:
       title: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÏÎ±Î³Î®Ï ÏÏÎ¿Î½ %{name}
       heading_html: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÏÏÎ±Î³Î®Ï ÏÏÎ¿Î½ %{name}
-      reason: Î Î±Î¹ÏÎ¯Î± Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î¿Ï ÏÎ¿Ï/ÏÎ·Ï %{name}. Î Î±ÏÎ±ÎºÎ±Î»Ï Î½Î± ÎµÎ¯ÏÏÎµ ÏÏÎ¿ ÏÎ¿ Î´ÏÎ½Î±ÏÏÎ½
-        ÏÎ¹Î¿ Î®ÏÎµÎ¼Î¿Ï/-Î· ÎºÎ±Î¹ Î»Î¿Î³Î¹ÎºÏÏ/-Î®, Î´Î¯Î½Î¿Î½ÏÎ±Ï ÏÏÎµÏ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ
-        Î³Î¹Î± ÏÎ·Î½ ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÎºÎ±Î¹ ÏÎºÎµÏÏÏÎ¼ÎµÎ½Î¿Ï/-Î· ÏÏÎ¹ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± Î¸Î± ÎµÎ¯Î½Î±Î¹ Î´Î·Î¼ÏÏÎ¹Î± Î¿ÏÎ±ÏÏ.
-        ÎÎ± Î­ÏÎµÏÎµ ÏÏÏÏÎ· ÏÎ±Ï ÏÏÎ¹ Î´ÎµÎ½ ÎºÎ±ÏÎ±Î½Î¿Î¿ÏÎ½ ÏÎ»Î¿Î¹ Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ·Î½ Î¿ÏÎ¿Î»Î¿Î³Î¯Î± ÏÎ·Ï ÎºÎ¿Î¹Î½ÏÏÎ·ÏÎ±Ï,
-        Î³Î¹' Î±ÏÏÏ ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÎµÎºÎ»Î±ÏÎºÎµÏÎ¼Î­Î½Î¿ÏÏ ÏÏÎ¿ÏÏ.
       period: ÎÎ¹Î± ÏÏÏÎ¿ ÎºÎ±Î¹ÏÏ Î±ÏÏ ÏÏÏÎ± Î¸Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î­Î½Î¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï Î±ÏÏ ÏÎ¿ API.
       tried_contacting: ÎÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î·ÏÎ± Î¼Îµ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· ÎºÎ±Î¹ ÏÎ¿Ï Î¶Î®ÏÎ·ÏÎ± Î½Î± ÏÏÎ±Î¼Î±ÏÎ®ÏÎµÎ¹.
       tried_waiting: ÎÏÏ Î´ÏÏÎµÎ¹ Î­Î½Î± ÎµÏÎ»Î¿Î³Î¿ ÏÏÎ¿Î½Î¹ÎºÏ Î´Î¹Î¬ÏÏÎ·Î¼Î± ÏÏÎ¿Î½ ÏÏÎ®ÏÏÎ· Î½Î± Î±ÏÎ±Î½ÏÎ®ÏÎµÎ¹
         ÏÎµ Î±ÏÏÎ­Ï ÏÎ¹Ï ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î¯ÎµÏ.
-      needs_view: Î ÏÏÎ®ÏÏÎ·Ï ÏÏÎ­ÏÎµÎ¹ Î½Î± ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ ÏÏÎ¿ÏÎ¿Ï ÎµÎºÎºÎ±Î¸Î±ÏÎ¹ÏÏÎµÎ¯ Î±ÏÏÎ® Î· ÏÏÎ±Î³Î®.
       back: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ±Î³ÏÎ½
     edit:
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ±Î³Î®Ï ÏÏÎ¿Î½ %{name}
       heading_html: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ±Î³Î®Ï ÏÏÎ¿Î½ %{name}
-      reason: Î Î±Î¹ÏÎ¯Î± Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î¿Ï ÏÎ¿Ï/ÏÎ·Ï %{name}. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î½Î± ÎµÎ¯ÏÏÎµ ÏÏÎ¿ ÏÎ¿ Î´ÏÎ½Î±ÏÏÎ½
-        ÏÎ¹Î¿ Î®ÏÎµÎ¼Î¿Ï/-Î· ÎºÎ±Î¹ Î»Î¿Î³Î¹ÎºÏÏ/-Î®, Î´Î¯Î½Î¿Î½ÏÎ±Ï ÏÏÎµÏ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ
-        Î³Î¹Î± ÏÎ·Î½ ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·. ÎÎ± Î­ÏÎµÏÎµ ÏÏÏÏÎ· ÏÎ±Ï ÏÏÎ¹ Î´ÎµÎ½ ÎºÎ±ÏÎ±Î½Î¿Î¿ÏÎ½ ÏÎ»Î¿Î¹ Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ·Î½
-        Î¿ÏÎ¿Î»Î¿Î³Î¯Î± ÏÎ·Ï ÎºÎ¿Î¹Î½ÏÏÎ·ÏÎ±Ï, Î³Î¹' Î±ÏÏÏ ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÎµÎºÎ»Î±ÏÎºÎµÏÎ¼Î­Î½Î¿ÏÏ
-        ÏÏÎ¿ÏÏ.
       period: ÎÎ¹Î± ÏÏÏÎ¿ ÎºÎ±Î¹ÏÏ Î±ÏÏ ÏÏÏÎ± Î¸Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¿ÎºÎ»ÎµÎ¹ÏÎ¼Î­Î½Î¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï Î±ÏÏ ÏÎ¿ API.
       show: Î ÏÎ¿Î²Î¿Î»Î® Î±ÏÏÎ®Ï ÏÎ·Ï ÏÏÎ±Î³Î®Ï
       back: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ±Î³ÏÎ½
-      needs_view: Î ÏÎ­ÏÎµÎ¹ Î¿ ÏÏÎ®ÏÏÎ·Ï Î½Î± ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ ÏÏÎ¿ÏÎ¿Ï ÎµÎºÎºÎ±Î¸Î±ÏÎ¹ÏÏÎµÎ¯ Î±ÏÏÎ® Î· ÏÏÎ±Î³Î®;
     filter:
       block_expired: Î ÏÏÎ±Î³Î® Î­ÏÎµÎ¹ Î®Î´Î· Î»Î®Î¾ÎµÎ¹ ÎºÎ±Î¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹.
       block_period: Î ÏÎµÏÎ¯Î¿Î´Î¿Ï ÏÏÎ±Î³Î®Ï ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¯Î± Î±ÏÏ ÏÎ¹Ï ÏÎ¹Î¼Î­Ï ÏÏÎ·Î½ ÏÏÏÏÏÏÎ¼ÎµÎ½Î·
@@ -2584,11 +2788,11 @@ el:
       revoke: ÎÎ½Î±ÎºÎ±Î»Î­ÏÏÎµ!
       flash: ÎÏÏÎ® Î· ÏÏÎ±Î³Î® Î­ÏÎµÎ¹ Î±Î½Î±ÎºÎ»Î·Î¸ÎµÎ¯.
     helper:
-      time_future: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time}.
+      time_future_html: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time}.
       until_login: ÎÎ½ÎµÏÎ³Ï Î­ÏÏ ÏÏÎ¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯.
-      time_future_and_until_login: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time} ÎºÎ±Î¹ Î¼ÎµÏÎ¬ Î±ÏÏÏÎ¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï
+      time_future_and_until_login_html: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time} ÎºÎ±Î¹ Î¼ÎµÏÎ¬ Î±ÏÏÏÎ¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï
         Î­ÏÎµÎ¹ ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯.
-      time_past: Î¤ÎµÎ»ÎµÎ¯ÏÏÎµ %{time}.
+      time_past_html: Î¤ÎµÎ»ÎµÎ¯ÏÏÎµ %{time}.
       block_duration:
         hours:
           one: 1 ÏÏÎ±
@@ -2616,8 +2820,8 @@ el:
     show:
       title: Î %{block_on} Î­ÏÎµÎ¹ ÏÏÎ±ÏÏÎµÎ¯ Î±ÏÏ ÏÎ¿Î½ %{block_by}
       heading_html: Î %{block_on} Î­ÏÎµÎ¹ ÏÏÎ±ÏÏÎµÎ¯ Î±ÏÏ ÏÎ¿Î½ %{block_by}
-      created: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ
-      status: ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ·
+      created: 'ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ:'
+      status: 'ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ·:'
       show: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·
       edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       revoke: ÎÎ½Î±ÎºÎ±Î»Î­ÏÏÎµ!
@@ -2641,10 +2845,11 @@ el:
       next: ÎÏÏÎ¼ÎµÎ½Î· Â»
       previous: Â« Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î·
   notes:
-    mine:
+    index:
       title: Î£Î·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï ÏÎ¿Ï ÏÏÎ¿Î²Î»Î®Î¸Î·ÎºÎ±Î½ Î® ÏÏÎ¿Î»Î¹Î¬ÏÏÎ·ÎºÎ±Î½ Î±ÏÏ ÏÎ¿Î½ %{user}
       heading: ÏÎ·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï ÏÎ¿Ï %{user}
       subheading_html: Î£Î·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï ÏÎ¿Ï ÏÏÎ¿Î²Î»Î®Î¸Î·ÎºÎ±Î½ Î® ÏÏÎ¿Î»Î¹Î¬ÏÏÎ·ÎºÎ±Î½ Î±ÏÏ ÏÎ¿Î½ %{user}
+      no_notes: Î§ÏÏÎ¯Ï ÏÎ·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï
       id: ÎÎ½Î±Î³Î½ÏÏÎ¹ÏÏÎ¹ÎºÏ
       creator: ÎÎ·Î¼Î¹Î¿ÏÏÎ³ÏÏ
       description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
@@ -2664,7 +2869,6 @@ el:
       custom_dimensions: ÎÏÎ¹ÏÎ¼ÏÏ ÏÏÎ¿ÏÎ±ÏÎ¼Î¿ÏÎ¼Î­Î½ÏÎ½ Î´Î¹Î±ÏÏÎ¬ÏÎµÏÎ½
       format: 'ÎÎ¿ÏÏÎ®:'
       scale: 'ÎÎ»Î¯Î¼Î±ÎºÎ±:'
-      image_size: Î ÎµÎ¹ÎºÏÎ½Î± Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÎ¹ ÏÎ¿ ÎºÎ±Î½Î¿Î½Î¹ÎºÏ ÏÏÏÏÎ¼Î± ÏÏÎ¹Ï
       download: ÎÎ®ÏÎ·
       short_url: Î£ÏÎ½ÏÎ¿Î¼Î¿Ï Î£ÏÎ½Î´ÎµÎ¼Î¿Ï
       include_marker: Î£ÏÎ¼ÏÎµÏÎ¯Î»Î·ÏÎ· Î´ÎµÎ¯ÎºÏÎ·
@@ -2695,6 +2899,7 @@ el:
         cycle_map: Î§Î¬ÏÏÎ·Ï Î Î¿Î´Î·Î»Î±ÏÎ¯Î±Ï
         transport_map: Î£ÏÎ³ÎºÎ¿Î¹Î½ÏÎ½Î¹Î±ÎºÏÏ Î§Î¬ÏÏÎ·Ï
         hot: ÎÎ½Î¸ÏÏÏÎ¹ÏÏÎ¹ÎºÏÏ
+        opnvkarte: ÃPNVKarte
       layers:
         header: Î£ÏÏÏÎ¼Î±ÏÎ± Î§Î¬ÏÏÎ·
         notes: Î£Î·Î¼ÎµÎ¹ÏÏÎµÎ¹Ï Î§Î¬ÏÏÎ·
@@ -2707,6 +2912,7 @@ el:
       terms: <a href='%{terms_url}' target='_blank'>ÎÏÎ¿Î¹ Î¹ÏÏÏÏÎ¿ÏÎ¿Ï ÎºÎ±Î¹ API</a>
       thunderforest: ÎÏÎ³ÎµÎ½Î¹ÎºÎ® ÏÎ¿ÏÎ·Î³ÎµÎ¯Î± ÏÎ»Î±ÎºÎ¹Î´Î¯ÏÎ½ Î±ÏÏ ÏÎ¿Î½ <a href='%{thunderforest_url}'
         target='_blank'>Andy Allan</a>
+      opnvkarte: ÎÏÎ³ÎµÎ½Î¹ÎºÎ® ÏÎ¿ÏÎ·Î³Î¯Î± ÏÎ»Î±ÎºÎ¹Î´Î¯ÏÎ½ Î±ÏÏ <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
       hotosm: Î£ÏÏÎ» ÏÎ»Î±ÎºÎ¹Î´Î¯ÏÎ½ Î±ÏÏ ÏÎ·Î½ <a href='%{hotosm_url}' target='_blank'>ÎÎ¼Î¬Î´Î±
         Humanitarian OpenStreetMap</a> ÏÎ¹Î»Î¿Î¾ÎµÎ½ÎµÎ¯ÏÎ±Î¹ Î±ÏÏ <a href='%{osmfrance_url}'
         target='_blank'>OpenStreetMap ÎÎ±Î»Î»Î¯Î±Ï</a>
@@ -2723,7 +2929,7 @@ el:
         Î³Î¹Î± Î´Î¹Î¬ÏÎ¿ÏÎ± ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬
     changesets:
       show:
-        comment: Î£ÏÏÎ»Î¹Î¿
+        comment: Î£ÏÎ¿Î»Î¹Î¬Î¶Ï
         subscribe: ÎÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ ÏÏ ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎ®Ï
         unsubscribe: ÎÎ±ÏÎ¬ÏÎ³Î·ÏÎ· ÎµÎ³Î³ÏÎ±ÏÎ®Ï
         hide_comment: Î±ÏÏÎºÏÏÏÎ·
@@ -2744,18 +2950,18 @@ el:
         resolve: ÎÏÎ¹Î»ÏÏÏÎµ
         reactivate: ÎÏÎ±Î½ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ·
         comment_and_resolve: Î£ÏÎ¿Î»Î¹Î¬ÏÏÎµ ÎºÎ±Î¹ ÎÏÎ¹Î»ÏÏÏÎµ
-        comment: Î£ÏÎ¿Î»Î¹Î¬ÏÏÎµ
+        comment: Î£ÏÎ¿Î»Î¹Î¬Î¶Ï
     edit_help: ÎÎµÏÎ±ÎºÎ¹Î½Î®ÏÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ· ÎºÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÏÎµ Î¶Î¿ÏÎ¼ ÏÎµ Î¼Î¹Î± ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ¿Ï Î¸Î­Î»ÎµÏÎµ
       Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ, ÏÏÎ· ÏÏÎ½Î­ÏÎµÎ¹Î±, ÎºÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÎµÎ´Ï.
     directions:
       ascend: ÎÎ½Î¬Î²Î±ÏÎ·
       engines:
-        fossgis_osrm_bike: ÎÎµ ÏÎ¿Î´Î®Î»Î±ÏÎ¿ (OSRM)
+        fossgis_osrm_bike: Î Î¿Î´Î®Î»Î±ÏÎ¿ (OSRM)
         fossgis_osrm_car: ÎÏÏÎ¿ÎºÎ¯Î½Î·ÏÎ¿ (OSRM)
-        fossgis_osrm_foot: ÎÎµ ÏÎ± ÏÏÎ´Î¹Î± (OSRM)
+        fossgis_osrm_foot: Î ÏÎ´Î¹Î± (OSRM)
         graphhopper_bicycle: Î Î¿Î´Î®Î»Î±ÏÎ¿ (GraphHopper)
-        graphhopper_car: ÎÎµ ÏÎ± ÏÏÎ´Î¹Î± (GraphHopper)
-        graphhopper_foot: ÎÎµ ÏÎ± ÏÏÎ´Î¹Î± (GraphHopper)
+        graphhopper_car: ÎÏÏÎ¿ÎºÎ¯Î½Î·ÏÎ¿ (GraphHopper)
+        graphhopper_foot: Î ÏÎ´Î¹Î± (GraphHopper)
       descend: ÎÎ±ÏÎ¬Î²Î±ÏÎ·
       directions: ÎÎ´Î·Î³Î¯ÎµÏ
       distance: ÎÏÏÏÏÎ±ÏÎ·
@@ -2857,7 +3063,6 @@ el:
       centre_map: ÎÎµÎ½ÏÏÎ¬ÏÎ¹ÏÎ¼Î± ÏÎ¬ÏÏÎ· ÎµÎ´Ï
   redactions:
     edit:
-      description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
       heading: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ±ÏÎ¬Î»Î·ÏÎ·Ï
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÏÎ·Î½ ÏÎ±ÏÎ¬Î»Î·ÏÎ·
     index:
@@ -2865,7 +3070,6 @@ el:
       heading: ÎÎ±ÏÎ¬Î»Î¿Î³Î¿Ï ÏÎ±ÏÎ±Î»Î®ÏÎµÏÎ½
       title: ÎÎ±ÏÎ¬Î»Î¿Î³Î¿Ï ÏÏÎ½ÏÎ±ÎºÏÎ¹ÎºÏÎ½ Î±Î»Î»Î±Î³ÏÎ½
     new:
-      description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
       heading: ÎÎ¹ÏÎ±Î³ÏÎ³Î® ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎ½ Î³Î¹Î± Î½Î­Î± ÏÎ±ÏÎ¬Î»Î·ÏÎ·
       title: ÎÎ·Î¼Î¹Î¿ÏÏÎ³ÏÎ½ÏÎ±Ï Î½Î­Î± ÏÎ±ÏÎ¬Î»Î·ÏÎ·
     show: