From b14abdd8882ad3f098ce29a00504e5cd379c989b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avarab@gmail.com>
Date: Mon, 28 Sep 2009 21:02:47 +0000
Subject: [PATCH] Importing new messages to existing languages from
 Translatewiki. See also [17832].

This commit can be reviewed in a sane manner by looking at
attachment:ticket:2305:first-translatewiki-patch.patch.gz

I've manually gone through it and searched for errors. I didn't find
any.
---
 config/locales/be.yml    | 1306 +++++++++++++-------------
 config/locales/bs.yml    |    1 -
 config/locales/ca.yml    |  309 ++++---
 config/locales/de.yml    | 1757 ++++++++++++++++++-----------------
 config/locales/el.yml    |  617 +++++++------
 config/locales/es.yml    | 1679 ++++++++++++++++++----------------
 config/locales/fr.yml    | 1143 ++++++++++++++++++-----
 config/locales/gcf.yml   |  460 +++++-----
 config/locales/he.yml    | 1097 +++++++++++-----------
 config/locales/hi.yml    | 1291 +++++++++++++-------------
 config/locales/hu.yml    | 1721 +++++++++++++++++------------------
 config/locales/is.yml    | 1653 +++++++++++++++++----------------
 config/locales/it.yml    | 1109 +++++++++++-----------
 config/locales/ja.yml    | 1464 ++++++++++++++++--------------
 config/locales/ko.yml    | 1279 +++++++++++++-------------
 config/locales/nl.yml    | 1463 ++++++++++++++++++------------
 config/locales/pl.yml    | 1131 +++++++++++------------
 config/locales/pt-BR.yml | 1710 +++++++++++++++++-----------------
 config/locales/ro.yml    | 1552 ++++++++++++++++---------------
 config/locales/ru.yml    | 1589 ++++++++++++++++++--------------
 config/locales/sl.yml    | 1595 ++++++++++++++++----------------
 config/locales/vi.yml    | 1816 ++++++++++++++++++-------------------
 config/locales/yo.yml    | 1284 +++++++++++++-------------
 config/locales/zh-CN.yml | 1151 +++++++++++------------
 config/locales/zh-TW.yml | 1866 +++++++++++++++++++-------------------
 25 files changed, 16483 insertions(+), 15560 deletions(-)

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 0cc037594..e5458614b 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1,749 +1,693 @@
-be:
-  activerecord:
-    models:
-      acl: "Ð¡Ð¿ÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ Ð´Ð¾ÑÑÑÐ¿Ñ"
-      changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
-      changeset_tag: "Ð¦ÑÑÐ»ÑÐº Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ"
-      country: "ÐÑÐ°ÑÐ½Ð°"
-      diary_comment: "ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°"
-      diary_entry: "ÐÐ°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°"
-      friend: "Ð¡ÑÐ±Ð°Ñ"
-      language: "ÐÐ¾Ð²Ð°"
-      message: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
-      node: "ÐÑÐ·ÐµÐ»"
-      node_tag: "Ð¦ÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°"
-      notifier: "ÐÐ±Ð²ÑÑÑÑÐ½Ð½Ðµ"
-      old_node: "Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ»"
-      old_node_tag: "Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°"
-      old_relation: "Ð¡ÑÐ°ÑÐ°Ñ ÑÑÐ²ÑÐ·Ñ"
-      old_relation_member: "Ð¡ÑÐ°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ"
-      old_relation_tag: "Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ"
-      old_way: "Ð¡ÑÐ°ÑÑ ÑÐ»ÑÑ"
-      old_way_node: "Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ» ÑÐ»ÑÑÑ"
-      old_way_tag: "Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº ÑÐ»ÑÑÑ"
-      relation: "Ð¡ÑÐ²ÑÐ·Ñ"
-      relation_member: "Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ"
-      relation_tag: "Ð¦ÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ"
-      session: "Ð¡ÐµÐ°Ð½Ñ"
-      trace: "Ð¢ÑÑÐº"
-      tracepoint: "ÐÑÐ½ÐºÑ ÑÑÑÐºÑ"
-      tracetag: "Ð¦ÑÑÐ»ÑÐº ÑÑÑÐºÑ"
-      user: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
-      user_preference: "ÐÐ°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ðµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
-      user_token: "ÐÐ´Ð¼ÐµÑÐºÐ° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
-      way: "Ð¨Ð»ÑÑ"
-      way_node: "ÐÑÐ·ÐµÐ» ÑÐ»ÑÑÑ"
-      way_tag: "Ð¦ÑÑÐ»ÑÐº ÑÐ»ÑÑÑ"
-    attributes:
-      diary_comment:
-        body: "Ð¢ÑÐºÑÑ"
-      diary_entry:
-        user: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
-        title: "ÐÐ°Ð³Ð°Ð»Ð¾Ð²Ð°Ðº"
-        latitude: "Ð¨ÑÑÐ°ÑÐ°"
-        longitude: "ÐÐ°ÑÐ³Ð°ÑÐ°"
-        language: "ÐÐ¾Ð²Ð°"
-      friend:
-        user: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
-        friend: "Ð¡ÑÐ±Ð°Ñ"
-      trace:
-        user: "Ð¡ÑÐ±Ð°Ñ"
-        visible: "ÐÐ°ÑÐ½Ñ"
-        name: "ÐÐ°Ð·Ð²Ð°"
-        size: "ÐÐ°Ð¼ÐµÑ"
-        latitude: "Ð¨ÑÑÐ°ÑÐ°"
-        longitude: "ÐÐ°ÑÐ³Ð°ÑÐ°"
-        public: "ÐÑÐ±Ð»ÑÑÐ½Ñ"
-        description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ"
-      message:
-        sender: "ÐÐ´"
-        title: "ÐÐ°Ð³Ð°Ð»Ð¾Ð²Ð°Ðº"
-        body: "Ð¢ÑÐºÑÑ"
-        recipient: "ÐÐ°Ð¼Ñ"
-      user:
-        email: "Email"
-        active: "ÐÐºÑÑÑÐ½Ñ"
-        display_name: "ÐÐ°ÑÐ½Ð°Ðµ ÑÐ¼Ñ"
-        description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ"
-        languages: "ÐÐ¾Ð²Ñ"
-        pass_crypt: "ÐÐ°ÑÐ¾Ð»Ñ"
-  map:
-    view: ÐÐ°ÑÑÐ°
-    edit: ÐÐ¼ÑÐ½ÑÑÑ
-    coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ:"
-  browse:
-    changeset:
-      title: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
+be: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Ð¢ÑÐºÑÑ
+      diary_entry: 
+        language: ÐÐ¾Ð²Ð°
+        latitude: Ð¨ÑÑÐ°ÑÐ°
+        longitude: ÐÐ°ÑÐ³Ð°ÑÐ°
+        title: ÐÐ°Ð³Ð°Ð»Ð¾Ð²Ð°Ðº
+        user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      friend: 
+        friend: Ð¡ÑÐ±Ð°Ñ
+        user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      message: 
+        body: Ð¢ÑÐºÑÑ
+        recipient: ÐÐ°Ð¼Ñ
+        sender: ÐÐ´
+        title: ÐÐ°Ð³Ð°Ð»Ð¾Ð²Ð°Ðº
+      trace: 
+        description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
+        latitude: Ð¨ÑÑÐ°ÑÐ°
+        longitude: ÐÐ°ÑÐ³Ð°ÑÐ°
+        name: ÐÐ°Ð·Ð²Ð°
+        public: ÐÑÐ±Ð»ÑÑÐ½Ñ
+        size: ÐÐ°Ð¼ÐµÑ
+        user: Ð¡ÑÐ±Ð°Ñ
+        visible: ÐÐ°ÑÐ½Ñ
+      user: 
+        active: ÐÐºÑÑÑÐ½Ñ
+        description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
+        display_name: ÐÐ°ÑÐ½Ð°Ðµ ÑÐ¼Ñ
+        email: Email
+        languages: ÐÐ¾Ð²Ñ
+        pass_crypt: ÐÐ°ÑÐ¾Ð»Ñ
+    models: 
+      acl: Ð¡Ð¿ÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ Ð´Ð¾ÑÑÑÐ¿Ñ
+      changeset: ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ
+      changeset_tag: Ð¦ÑÑÐ»ÑÐº Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ
+      country: ÐÑÐ°ÑÐ½Ð°
+      diary_comment: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°
+      diary_entry: ÐÐ°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÐ°
+      friend: Ð¡ÑÐ±Ð°Ñ
+      language: ÐÐ¾Ð²Ð°
+      message: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
+      node: ÐÑÐ·ÐµÐ»
+      node_tag: Ð¦ÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°
+      notifier: ÐÐ±Ð²ÑÑÑÑÐ½Ð½Ðµ
+      old_node: Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ»
+      old_node_tag: Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº Ð²ÑÐ·Ð»Ð°
+      old_relation: Ð¡ÑÐ°ÑÐ°Ñ ÑÑÐ²ÑÐ·Ñ
+      old_relation_member: Ð¡ÑÐ°ÑÑ ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ
+      old_relation_tag: Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ
+      old_way: Ð¡ÑÐ°ÑÑ ÑÐ»ÑÑ
+      old_way_node: Ð¡ÑÐ°ÑÑ Ð²ÑÐ·ÐµÐ» ÑÐ»ÑÑÑ
+      old_way_tag: Ð¡ÑÐ°ÑÑ ÑÑÑÐ»ÑÐº ÑÐ»ÑÑÑ
+      relation: Ð¡ÑÐ²ÑÐ·Ñ
+      relation_member: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐº ÑÑÐ²ÑÐ·Ñ
+      relation_tag: Ð¦ÑÑÐ»ÑÐº ÑÑÐ²ÑÐ·Ñ
+      session: Ð¡ÐµÐ°Ð½Ñ
+      trace: Ð¢ÑÑÐº
+      tracepoint: ÐÑÐ½ÐºÑ ÑÑÑÐºÑ
+      tracetag: Ð¦ÑÑÐ»ÑÐº ÑÑÑÐºÑ
+      user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      user_preference: ÐÐ°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ðµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      user_token: ÐÐ´Ð¼ÐµÑÐºÐ° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      way: Ð¨Ð»ÑÑ
+      way_node: ÐÑÐ·ÐµÐ» ÑÐ»ÑÑÑ
+      way_tag: Ð¦ÑÑÐ»ÑÐº ÑÐ»ÑÑÑ
+  browse: 
+    changeset: 
       changeset: "ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ:"
-      download: "Ð¡ÑÑÐ³Ð½ÑÑÑ {{changeset_xml_link}} ÑÑ {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ñ:"
-      closed_at: "ÐÐ°ÐºÑÑÑÑ:"
+      changesetxml: Changeset XML
+      download: Ð¡ÑÑÐ³Ð½ÑÑÑ {{changeset_xml_link}} ÑÑ {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: ÐÐ°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ
+    changeset_details: 
       belongs_to: "ÐÐ°Ð»ÐµÐ¶ÑÑÑ:"
       bounding_box: "ÐÐµÐ¶Ñ:"
-      no_bounding_box: "ÐÐµÐ¶Ñ Ð³ÑÑÐ°Ð³Ð° Ð½Ð°Ð±Ð¾ÑÐ° Ð·Ð¼ÐµÐ½Ð°Ñ Ð½Ðµ Ð²ÑÐ·Ð½Ð°ÑÐ°Ð½Ñ."
-      show_area_box: "ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      box: "Ð¼ÑÐ¶Ð°"
+      box: Ð¼ÑÐ¶Ð°
+      closed_at: "ÐÐ°ÐºÑÑÑÑ:"
+      created_at: "Ð¡ÑÐ²Ð¾ÑÐ°Ð½Ñ:"
       has_nodes: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} Ð²ÑÐ·Ð»Ð¾Ñ:"
-      has_ways: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÐ»ÑÑÐ¾Ñ:"
       has_relations: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÑÐ²ÑÐ·ÐµÐ¹:"
-    common_details:
+      has_ways: "Ð¡ÐºÐ»Ð°Ð´Ð°ÐµÑÑÐ° Ð· {{count}} ÑÐ»ÑÑÐ¾Ñ:"
+      no_bounding_box: ÐÐµÐ¶Ñ Ð³ÑÑÐ°Ð³Ð° Ð½Ð°Ð±Ð¾ÑÐ° Ð·Ð¼ÐµÐ½Ð°Ñ Ð½Ðµ Ð²ÑÐ·Ð½Ð°ÑÐ°Ð½Ñ.
+      show_area_box: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+    common_details: 
       edited_at: "ÐÐ¼ÐµÐ½ÐµÐ½Ð°:"
       edited_by: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼:"
-      version: "ÐÐµÑÑÑÑ:"
       in_changeset: "Ð£ Ð½Ð°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ:"
-    containing_relation:
-      relation: "Ð¡ÑÐ²ÑÐ·Ñ {{relation_name}}"
-      relation_as: "(ÑÐº {{relation_role}})"
-    map:
-      loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
-      deleted: "ÐÑÐ´Ð°Ð»ÐµÐ½Ñ"
-      view_larger_map: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
-    node_details:
+      version: "ÐÐµÑÑÑÑ:"
+    map: 
+      deleted: ÐÑÐ´Ð°Ð»ÐµÐ½Ñ
+      loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
+    node: 
+      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
+      download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
+      node: ÐÑÐ·ÐµÐ»
+      node_title: "ÐÑÐ·ÐµÐ»: {{node_name}}"
+      view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
+    node_details: 
       coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
-    node_history:
-      node_history: "ÐÑÑÑÐ¾ÑÑÑ Ð²ÑÐ·Ð»Ð°"
+    node_history: 
       download: "{{download_xml_link}} ÑÑ {{view_details_link}}"
-      download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
-      view_details: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð´ÑÑÐ°Ð»Ñ"
-    node:
-      node: "ÐÑÐ·ÐµÐ»"
-      node_title: "ÐÑÐ·ÐµÐ»: {{node_name}}"
+      download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
+      node_history: ÐÑÑÑÐ¾ÑÑÑ Ð²ÑÐ·Ð»Ð°
+      view_details: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð´ÑÑÐ°Ð»Ñ
+    not_found: 
+      sorry: ÐÑÐ°Ð±Ð°ÑÑÐµ, {{type}} Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ.
+      type: 
+        node: Ð²ÑÐ·ÐµÐ»
+        relation: Ð°Ð´Ð½Ð¾ÑÑÐ½Ñ
+        way: Ð»ÑÐ½ÑÑ
+    paging_nav: 
+      of: Ð·
+      showing_page: ÐÐ°ÐºÐ°Ð· ÑÑÐ°ÑÐ¾Ð½ÐºÑ
+    relation: 
       download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
-      download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
-      view_history: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
-    not_found:
-      sorry: "ÐÑÐ°Ð±Ð°ÑÑÐµ, {{type}} Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ."
-      type:
-        node: "Ð²ÑÐ·ÐµÐ»"
-        way: "Ð»ÑÐ½ÑÑ"
-        relation: "Ð°Ð´Ð½Ð¾ÑÑÐ½Ñ"
-    paging_nav:
-      showing_page: "ÐÐ°ÐºÐ°Ð· ÑÑÐ°ÑÐ¾Ð½ÐºÑ"
-      of: "Ð·"
-    relation_details:
+      download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
+      relation: Ð¡ÑÐ²ÑÐ·Ñ
+      relation_title: "Ð¡ÑÐ²ÑÐ·Ñ: {{relation_name}}"
+      view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
+    relation_details: 
       members: "Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐºÑ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
-    relation_history:
-      relation_history: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ"
+    relation_history: 
+      relation_history: ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ
       relation_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÑÐ²ÑÐ·Ñ: {{relation_name}}"
-    relation_member:
-      as: "ÑÐº"
-    relation:
-      relation: "Ð¡ÑÐ²ÑÐ·Ñ"
-      relation_title: "Ð¡ÑÐ²ÑÐ·Ñ: {{relation_name}}"
-      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
-      download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
-      view_history: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
-    start:
-      view_data: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð¿Ð° Ð±ÑÐ³ÑÑÑÐ¼ Ð°Ð³Ð»ÑÐ´Ð·Ðµ"
-      manually_select: "ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-    start_rjs:
-      data_layer_name: "ÐÐ°Ð´Ð·ÐµÐ½ÑÑ"
-      data_frame_title: "ÐÐ°Ð´Ð·ÐµÐ½ÑÑ"
-      zoom_or_select: "ÐÐ°Ð±Ð»ÑÐ·ÑÑÐµÑÑ ÑÑ Ð²ÑÐ±ÐµÑÑÑÐµ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ Ð´Ð»Ñ Ð°Ð³Ð»ÑÐ´Ñ"
-      drag_a_box: "Ð Ð°ÑÑÑÐ³Ð½ÑÑÐµ ÑÐ°Ð¼ÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð´Ð»Ñ Ð²ÑÐ±Ð°ÑÐ° ÑÐ½ÑÐ°Ð¹ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      manually_select: "ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      loaded_an_area_with_num_features: "ÐÑ Ð·Ð°Ð³ÑÑÐ·ÑÐ»Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ, ÑÑÐ¾ Ð·Ð¼ÑÑÑÐ°Ðµ [[num_features]] ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ñ.  Ð£Ð²Ð¾Ð³ÑÐ»Ðµ, Ð½ÐµÐºÐ°ÑÐ¾ÑÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÑ Ð¼Ð¾Ð³ÑÑÑ Ð½Ðµ Ð·Ð´Ð¾Ð»ÐµÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÐ°ÐºÑÑ ÐºÐ¾Ð»ÑÐºÐ°ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÐ²ÑÑÐ°Ð¹Ð½Ð°, Ð½Ð°Ð¹Ð»ÐµÐ¿ÑÑ ÑÑÐ·ÑÐ»ÑÑÐ°Ñ Ð½Ð°Ð·ÑÑÐ°ÐµÑÑÐ°, ÐºÐ°Ð»Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ñ Ð¼ÐµÐ½Ñ Ð·Ð° 100, Ð¿ÑÑ Ð±Ð¾Ð»ÑÑÐ°Ð¹ ÐºÐ¾Ð»ÑÐºÐ°ÑÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐº Ð¼Ð¾Ð¶Ð° Ð·Ð³ÑÐ±ÑÑÑ ÑÑÑÐºÐ°ÑÑÑ. ÐÐ°Ð»Ñ Ð²Ñ ÑÐ¿ÑÑÐ½ÐµÐ½ÑÑ, ÑÑÐ¾ ÑÐ¾ÑÐ°ÑÐµ Ð¿Ð°Ð³Ð»ÑÐ´Ð·ÐµÑÑ Ð½Ð° Ð³ÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð½ÑÐ¶ÑÐ¹."
-      load_data: "ÐÐ°Ð³ÑÑÐ·ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ"
+    start: 
+      manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      view_data: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ Ð¿Ð° Ð±ÑÐ³ÑÑÑÐ¼ Ð°Ð³Ð»ÑÐ´Ð·Ðµ
+    start_rjs: 
+      data_frame_title: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ
+      data_layer_name: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ
+      details: ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹
+      drag_a_box: Ð Ð°ÑÑÑÐ³Ð½ÑÑÐµ ÑÐ°Ð¼ÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð´Ð»Ñ Ð²ÑÐ±Ð°ÑÐ° ÑÐ½ÑÐ°Ð¹ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      edited_by_user_at_timestamp: ÐÐ¼ÐµÐ½ÐµÐ½Ð° [[user]] Ñ [[timestamp]]
+      history_for_feature: ÐÑÑÑÐ¾ÑÑÑ [[feature]]
+      load_data: ÐÐ°Ð³ÑÑÐ·ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ
+      loaded_an_area_with_num_features: ÐÑ Ð·Ð°Ð³ÑÑÐ·ÑÐ»Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ, ÑÑÐ¾ Ð·Ð¼ÑÑÑÐ°Ðµ [[num_features]] ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ñ.  Ð£Ð²Ð¾Ð³ÑÐ»Ðµ, Ð½ÐµÐºÐ°ÑÐ¾ÑÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÑ Ð¼Ð¾Ð³ÑÑÑ Ð½Ðµ Ð·Ð´Ð¾Ð»ÐµÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÐ°ÐºÑÑ ÐºÐ¾Ð»ÑÐºÐ°ÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÐ²ÑÑÐ°Ð¹Ð½Ð°, Ð½Ð°Ð¹Ð»ÐµÐ¿ÑÑ ÑÑÐ·ÑÐ»ÑÑÐ°Ñ Ð½Ð°Ð·ÑÑÐ°ÐµÑÑÐ°, ÐºÐ°Ð»Ñ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°Ñ Ð¼ÐµÐ½Ñ Ð·Ð° 100, Ð¿ÑÑ Ð±Ð¾Ð»ÑÑÐ°Ð¹ ÐºÐ¾Ð»ÑÐºÐ°ÑÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐº Ð¼Ð¾Ð¶Ð° Ð·Ð³ÑÐ±ÑÑÑ ÑÑÑÐºÐ°ÑÑÑ. ÐÐ°Ð»Ñ Ð²Ñ ÑÐ¿ÑÑÐ½ÐµÐ½ÑÑ, ÑÑÐ¾ ÑÐ¾ÑÐ°ÑÐµ Ð¿Ð°Ð³Ð»ÑÐ´Ð·ÐµÑÑ Ð½Ð° Ð³ÑÑÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð½ÑÐ¶ÑÐ¹.
+      loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
+      manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      object_list: 
+        api: ÐÑÑÑÐ¼Ð°ÑÑ Ð³ÑÑÑÑ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ Ð· API
+        back: ÐÐ´Ð»ÑÑÑÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ
+        details: ÐÑÑÐ°Ð»Ñ
+        heading: Ð¡Ð¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ
+        selected: 
+          type: 
+            node: ÐÑÐ·ÐµÐ» [[id]]
+            way: ÐÑÐ½ÑÑ [[id]]
+        type: 
+          node: ÐÑÐ·ÐµÐ»
+          way: ÐÑÐ½ÑÑ
+      private_user: ÑÐ°ÐµÐ¼Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+      show_history: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
       unable_to_load_size: "ÐÐµÐ»ÑÐ³Ð° Ð·Ð°Ð³ÑÑÐ·ÑÑÑ: Ð¿Ð°ÑÐµÐ¼ Ð¼ÑÐ¶Ñ [[bbox_size]] Ð·Ð°Ð½Ð°Ð´ÑÐ° Ð²ÑÐ»ÑÐºÑ (Ð¿Ð°Ð²ÑÐ½ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð±Ð¾Ð»ÑÑ ÑÐº {{max_bbox_size}})"
-      loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
-      show_history: "ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
-      wait: "ÐÐ°ÑÐ°ÐºÐ°Ð¹ÑÐµ..."
-      history_for_feature: "ÐÑÑÑÐ¾ÑÑÑ [[feature]]"
-      details: "ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹"
-      private_user: "ÑÐ°ÐµÐ¼Ð½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
-      edited_by_user_at_timestamp: "ÐÐ¼ÐµÐ½ÐµÐ½Ð° [[user]] Ñ [[timestamp]]"
-      object_list:
-        heading: "Ð¡Ð¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ"
-        back: "ÐÐ´Ð»ÑÑÑÑÐ°Ð²Ð°ÑÑ ÑÐ¿ÑÑ Ð°Ð±'ÐµÐºÑÐ°Ñ"
-        type:
-          node: "ÐÑÐ·ÐµÐ»"
-          way: "ÐÑÐ½ÑÑ"
-        api: "ÐÑÑÑÐ¼Ð°ÑÑ Ð³ÑÑÑÑ Ð²Ð¾Ð±Ð»Ð°ÑÑÑ Ð· API"
-        details: "ÐÑÑÐ°Ð»Ñ"
-        selected:
-          type:
-            node: "ÐÑÐ·ÐµÐ» [[id]]"
-            way: "ÐÑÐ½ÑÑ [[id]]"
-        history:
-            node: "ÐÑÐ·ÐµÐ» [[id]]"
-            way: "ÐÑÐ½ÑÑ [[id]]"
-    tag_details:
+      wait: ÐÐ°ÑÐ°ÐºÐ°Ð¹ÑÐµ...
+      zoom_or_select: ÐÐ°Ð±Ð»ÑÐ·ÑÑÐµÑÑ ÑÑ Ð²ÑÐ±ÐµÑÑÑÐµ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ Ð´Ð»Ñ Ð°Ð³Ð»ÑÐ´Ñ
+    tag_details: 
       tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
+      download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
+      view_history: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ
+      way: Ð¨Ð»ÑÑ
+      way_title: "Ð¨Ð»ÑÑ: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÑ {{related_ways}}
+        other: ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÐ¾Ñ {{related_ways}}
       nodes: "ÐÑÐ·Ð»Ñ:"
       part_of: "Ð§Ð°ÑÑÐºÐ°:"
-      also_part_of:
-        one: "ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÑ {{related_ways}}"
-        other: "ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÐ°ÑÑÐºÐ° ÑÐ»ÑÑÐ¾Ñ {{related_ways}}"
-    way_history:
-      way_history: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ"
-      way_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} ÑÑ {{view_details_link}}"
-      download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
-      view_details: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹"
-    way:
-      way: "Ð¨Ð»ÑÑ"
-      way_title: "Ð¨Ð»ÑÑ: {{way_name}}"
-      download: "{{download_xml_link}} ÑÑ {{view_history_link}}"
-      download_xml: "Ð¡ÑÑÐ³Ð½ÑÑÑ XML"
-      view_history: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð³ÑÑÑÐ¾ÑÑÑ"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "ÐÐ°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ°"
-      of: "Ð·"
-    changeset:
-      still_editing: "(Ñ Ð¿ÑÐ°ÑÑÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ)"
-      anonymous: "ÐÐ½Ð°Ð½ÑÐ¼Ð½Ð°"
-      no_comment: "(Ð½ÑÐ¼Ð°)"
-      no_edits: "(Ð±ÐµÐ· Ð·Ð¼ÐµÐ½Ð°Ñ)"
-      show_area_box: "Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      big_area: "(Ð²ÑÐ»ÑÐºÐ°Ñ)"
-      view_changeset_details: "ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹ Ð¿ÑÐ° Ð½Ð°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
-      more: "Ð±Ð¾Ð»ÑÑ"
-    changesets:
-      id: "ID"
-      saved_at: "ÐÐ°Ð¿ÑÑÐ°Ð½Ñ"
-      user: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº"
-      comment: "ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
-      area: "ÐÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-    list_bbox:
-      history: "ÐÑÑÑÐ¾ÑÑÑ"
-      changesets_within_the_area: "ÐÐ°Ð±Ð¾ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ:"
-      show_area_box: "Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      no_changesets: "ÐÑÐ¼Ð° Ð½Ð°Ð±Ð¾ÑÐ°Ñ Ð·Ð¼ÐµÐ½Ð°Ñ"
-      all_changes_everywhere: "ÐÐ»Ñ ÑÑÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ Ð¿Ð°ÑÑÑÐ»Ñ Ð³Ð»ÑÐ´Ð·ÑÑÐµ {{recent_changes_link}}"
-      recent_changes: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð¼ÐµÐ½Ñ"
-      no_area_specified: "ÐÑÑÑÐ¾Ð²Ð°ÑÑÑ Ð½Ðµ Ð·Ð°Ð´Ð°Ð´Ð·ÐµÐ½Ð°"
-      first_use_view: "Ð¡Ð¿Ð°ÑÐ°ÑÐºÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµ {{view_tab_link}} ÐºÐ°Ð± Ð²ÑÐ±ÑÐ°ÑÑ Ð¿Ð°ÑÑÑÐ±Ð½ÑÑ Ð²Ð°Ð¼ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ, Ñ ÑÐ¾Ð»ÑÐºÑ Ð¿Ð¾ÑÑÐ¼ Ð·Ð°ÑÐ¾Ð´Ð·ÑÑÐµ Ð½Ð° ÐºÐ°ÑÑÐºÑ 'ÐÑÑÑÐ¾ÑÑÑ'."
-      view_the_map: "Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ ÐºÐ°ÑÑÑ"
-      view_tab: "ÐºÐ°ÑÑÐºÑ Ð°Ð³Ð»ÑÐ´Ñ"
-      alternatively_view: "Ð¦Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÑ ÑÑÐµ {{recent_changes_link}}"
-    list:
-      recent_changes: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð¼ÐµÐ½Ñ"
-      recently_edited_changesets: "ÐÑÐ´Ð°ÑÐ½Ð° Ð·Ð¼ÐµÐ½ÐµÐ½ÑÑ Ð½Ð°Ð±Ð¾ÑÑ:"
-      for_more_changesets: "ÐÐ°Ð± ÑÐ±Ð°ÑÑÑÑ Ð±Ð¾Ð»ÑÑ Ð½Ð°Ð±Ð¾ÑÐ°Ñ Ð·Ð¼ÐµÐ½Ð°Ñ, Ð²ÑÐ±ÐµÑÑÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ñ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑÐµ ÑÐ³Ð¾ Ð·Ð¼ÐµÐ½Ñ, ÑÑ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð½Ð° ÐºÐ°ÑÑÐºÑ 'Ð³ÑÑÑÐ¾ÑÑÑ' Ð´Ð»Ñ Ð¿ÑÑÐ½Ð°Ð¹ ÑÑÑÑÑÐ¾ÑÑÑ."
-    list_user:
-      edits_by_username: "ÐÐ¼ÐµÐ½Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{username_link}}"
-      no_visible_edits_by: "ÐÑÐ¼Ð° Ð±ÑÑÐ½ÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{name}}."
-      for_all_changes: "ÐÐ»Ñ ÑÑÑÑ Ð·Ð¼ÐµÐ½Ð°Ñ ÑÑÑÐ¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ Ð³Ð»ÑÐ´Ð·ÑÑÐµ {{recent_changes_link}}"
-      recent_changes: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð¼ÐµÐ½Ñ"
-  diary_entry:
-    new:
-      title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
-    list:
-      title: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
-      user_title: "ÐÐ·ÑÐ½Ð½ÑÐº {{user}}"
-      in_language_title: "ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ {{language}}"
-      new: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
-      new_title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð»Ñ Ð²Ð°ÑÐ°Ð³Ð° Ð´Ð·ÑÐ½Ð½ÑÐºÑ
-      no_entries: ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÐ°Ñ
-      recent_entries: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ:"
-      older_entries: Ð¡ÑÐ°ÑÑÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
-      newer_entries: ÐÐ°Ð²ÐµÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
-    edit:
-      title: "ÐÐ¼ÑÐ½ÑÑÑ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
-      subject: "Ð¢ÑÐ¼Ð°:"
+      download_xml: Ð¡ÑÑÐ³Ð½ÑÑÑ XML
+      view_details: Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÑÑ Ð¿Ð°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹
+      way_history: ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ
+      way_history_title: "ÐÑÑÑÐ¾ÑÑÑ ÑÐ»ÑÑÑ: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: ÐÐ½Ð°Ð½ÑÐ¼Ð½Ð°
+      big_area: (Ð²ÑÐ»ÑÐºÐ°Ñ)
+      no_comment: (Ð½ÑÐ¼Ð°)
+      no_edits: (Ð±ÐµÐ· Ð·Ð¼ÐµÐ½Ð°Ñ)
+      show_area_box: Ð¿Ð°ÐºÐ°Ð·Ð°ÑÑ Ð¼ÑÐ¶Ñ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      still_editing: (Ñ Ð¿ÑÐ°ÑÑÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ)
+      view_changeset_details: ÐÐ°Ð´ÑÐ°Ð±ÑÐ·Ð½ÐµÐ¹ Ð¿ÑÐ° Ð½Ð°Ð±Ð¾Ñ Ð·Ð¼ÐµÐ½Ð°Ñ
+    changeset_paging_nav: 
+      of: Ð·
+      showing_page: ÐÐ°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ°
+    changesets: 
+      area: ÐÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      comment: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ
+      id: ID
+      saved_at: ÐÐ°Ð¿ÑÑÐ°Ð½Ñ
+      user: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº
+  diary_entry: 
+    diary_comment: 
+      comment_from: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ {{link_user}} Ñ {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ
+        other: "ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ°Ñ: {{count}}"
+      comment_link: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
+      edit_link: ÐÐ¼ÑÐ½ÑÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
+      posted_by: ÐÐ°Ð¿ÑÑÐ°Ð½Ð° {{link_user}} Ñ {{created}} Ð½Ð° {{language_link}}
+      reply_link: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
+    edit: 
       body: "Ð¦ÐµÐ»Ð°:"
       language: "ÐÐ¾Ð²Ð°:"
-      location: "ÐÐµÑÑÐ°:"
       latitude: "Ð¨ÑÑÐ°ÑÐ°:"
+      location: "ÐÐµÑÑÐ°:"
       longitude: "ÐÐ°ÑÐ³Ð°ÑÐ°:"
-      use_map_link: "ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÐºÐ°ÑÑÐ°Ð¹"
-      save_button: "ÐÐ°Ð¿ÑÑÐ°ÑÑ"
       marker_text: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð·Ð°Ð¿ÑÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
-    view:
-      title: "ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | {{user}}"
-      user_title: "ÐÐ·ÑÐ½Ð½ÑÐº {{user}}"
-      leave_a_comment: "ÐÐ°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
-      login_to_leave_a_comment: "{{login_link}} ÐºÐ°Ð± Ð¿Ð°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
-      login: "ÐÐ¾Ð³ÑÐ½"
-      save_button: "ÐÐ°Ð¿ÑÑÐ°ÑÑ"
-    no_such_entry:
+      save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ
+      subject: "Ð¢ÑÐ¼Ð°:"
+      title: ÐÐ¼ÑÐ½ÑÑÑ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+      use_map_link: ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÐºÐ°ÑÑÐ°Ð¹
+    list: 
+      in_language_title: ÐÐ·ÑÐ½Ð½ÑÐº Ð·Ð°Ð¿ÑÑÐ°Ñ Ñ {{language}}
+      new: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+      new_title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð»Ñ Ð²Ð°ÑÐ°Ð³Ð° Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+      newer_entries: ÐÐ°Ð²ÐµÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
+      no_entries: ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÐ°Ñ
+      older_entries: Ð¡ÑÐ°ÑÑÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑÑ
+      recent_entries: "ÐÑÐ´Ð°ÑÐ½ÑÑ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ:"
+      title: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
+      user_title: ÐÐ·ÑÐ½Ð½ÑÐº {{user}}
+    new: 
+      title: ÐÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+    no_such_entry: 
+      body: ÐÑÐ°Ð±Ð°ÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ° Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
       heading: "ÐÑÐ¼Ð° Ð·Ð°Ð¿ÑÑÑ Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼: {{id}}"
-      body: "ÐÑÐ°Ð±Ð°ÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ Ð·Ð°Ð¿ÑÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ° Ð· Ð½ÑÐ¼Ð°ÑÐ°Ð¼ {{id}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
-    no_such_user:
-      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°ÑÐ°"
-      heading: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
-      body: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
-    diary_entry:
-      posted_by: "ÐÐ°Ð¿ÑÑÐ°Ð½Ð° {{link_user}} Ñ {{created}} Ð½Ð° {{language_link}}"
-      comment_link: ÐÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
-      reply_link: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
-      comment_count:
-        one: 1 ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ
-        other: "ÐÐ°Ð¼ÐµÐ½ÑÐ°ÑÐ°Ñ: {{count}}"
-      edit_link: ÐÐ¼ÑÐ½ÑÑÑ Ð³ÑÑÑ Ð·Ð°Ð¿ÑÑ
-    diary_comment:
-      comment_from: "ÐÐ°Ð¼ÐµÐ½ÑÐ°Ñ {{link_user}} Ñ {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      manually_select: "ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      format_to_export: "Ð¤Ð°ÑÐ¼Ð°Ñ Ð´Ð»Ñ ÑÐºÑÐ¿Ð°ÑÑÑ"
-      osm_xml_data: "OpenStreetMap XML"
-      mapnik_image: "Ð²ÑÑÐ²Ð° Mapnik"
-      osmarender_image: "Ð²ÑÑÐ²Ð° Osmarender"
-      embeddable_html: "HTML Ð´Ð»Ñ ÑÑÑÐ°ÑÐºÑ"
-      licence: "ÐÑÑÑÐ½Ð·ÑÑ"
-      export_details: 'ÐÐ°Ð´Ð·ÐµÐ½ÑÑ Ð¿ÑÐ°ÐµÐºÑÑ OpenStreetMap ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð¿Ð° Ð»ÑÑÑÐ½Ð·ÑÑ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.'
-      options: "ÐÐ°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ"
-      format: "Ð¤Ð°ÑÐ¼Ð°Ñ"
-      scale: "ÐÐ°ÑÑÐ°Ð±"
-      max: "Ð¼Ð°ÐºÑ"
-      image_size: "ÐÐ°Ð¼ÐµÑ Ð²ÑÑÐ²Ñ"
-      zoom: "Ð¼Ð°ÑÑÐ°Ð±"
-      add_marker: "ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ"
+    no_such_user: 
+      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½Ðµ ÑÑÐ½ÑÐµ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°ÑÐ°
+    view: 
+      leave_a_comment: ÐÐ°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ
+      login: ÐÐ¾Ð³ÑÐ½
+      login_to_leave_a_comment: "{{login_link}} ÐºÐ°Ð± Ð¿Ð°ÐºÑÐ½ÑÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ"
+      save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ
+      title: ÐÐ·ÑÐ½Ð½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° | {{user}}
+      user_title: ÐÐ·ÑÐ½Ð½ÑÐº {{user}}
+  export: 
+    start: 
+      add_marker: ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ
+      area_to_export: Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      embeddable_html: HTML Ð´Ð»Ñ ÑÑÑÐ°ÑÐºÑ
+      export_button: Ð­ÐºÑÐ¿Ð°ÑÑ
+      export_details: ÐÐ°Ð´Ð·ÐµÐ½ÑÑ Ð¿ÑÐ°ÐµÐºÑÑ OpenStreetMap ÑÐ°ÑÐ¿Ð°ÑÑÑÐ´Ð¶Ð²Ð°ÑÑÑÐ° Ð¿Ð° Ð»ÑÑÑÐ½Ð·ÑÑ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
+      format: Ð¤Ð°ÑÐ¼Ð°Ñ
+      format_to_export: Ð¤Ð°ÑÐ¼Ð°Ñ Ð´Ð»Ñ ÑÐºÑÐ¿Ð°ÑÑÑ
+      image_size: ÐÐ°Ð¼ÐµÑ Ð²ÑÑÐ²Ñ
       latitude: "Ð¨ÑÑ:"
+      licence: ÐÑÑÑÐ½Ð·ÑÑ
       longitude: "ÐÐ°Ñ:"
-      output: "ÐÑÐ²Ð°Ð´"
-      paste_html: "Ð£ÑÑÐ°Ð²ÑÑÑ HTML Ð´Ð»Ñ ÑÐ±ÑÐ´Ð¾Ð²Ñ Ñ Ð²ÑÐ±-ÑÐ°Ð¹Ñ"
-      export_button: "Ð­ÐºÑÐ¿Ð°ÑÑ"
-    start_rjs:
-      export: "Ð­ÐºÑÐ¿Ð°ÑÑ"
-      drag_a_box: "Ð Ð°ÑÑÑÐ³Ð½ÑÑÐµ ÑÐ°Ð¼ÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð´Ð»Ñ Ð²ÑÐ±Ð°ÑÐ° Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      manually_select: "ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ"
-      click_add_marker: "ÐÐ°ÑÑÑÐ½ÑÑÐµ Ð½Ð° ÐºÐ°ÑÑÐµ, ÐºÐ°Ð± Ð´Ð°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ"
-      change_marker: "ÐÐ¼ÑÐ½ÑÑÑ Ð¿Ð°Ð·ÑÑÑÑ Ð¼Ð°ÑÐºÐµÑÐ°"
-      add_marker: "ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ"
-      view_larger_map: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
-  geocoder:
-    results:
-      results: "Ð ÑÐ·ÑÐ»ÑÑÐ°ÑÑ"
-      type_from_source: "{{type}} Ð· {{source_link}}"
-      no_results: "ÐÑÑÐ¾Ð³Ð° Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°"
-  layouts:
-    project_name:
-      title: "OpenStreetMap"
-      h1: "OpenStreetMap"
-    logo:
-      alt_text: "ÐÐ°Ð³Ð°ÑÑÐ¿ OpenStreetMap"
-    welcome_user: "ÐÑÑÐ°ÐµÐ¼, {{user_link}}"
-    welcome_user_link_tooltip: "ÐÐ°ÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ° ÐºÐ°ÑÑÑÑÐ°ÑÐ°"
-    home: "Ð´Ð°Ð¼Ð¾Ñ"
-    home_tooltip: "ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð°Ñ ÑÐ°ÑÑ"
-    inbox: "ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ ({{count}})"
-    inbox_tooltip:
-      zero: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ Ð½ÑÐ¼Ð° Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      one: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ 1 Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
-      other: "Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ¹"
-    logout: "Ð²ÑÐ¹ÑÑÑ"
-    logout_tooltip: "Ð²ÑÐ¹ÑÑÑ"
-    log_in: "ÑÐ²Ð°Ð¹ÑÑÑ"
-    log_in_tooltip: "Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð°ÐºÐ°ÑÐ½ÑÐ°Ð¼, ÑÐºÑ ÑÑÐ½ÑÐµ"
-    sign_up: "ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°"
-    sign_up_tooltip: "Ð¡ÑÐ²Ð°ÑÑÑÑ Ð°ÐºÐ°ÑÐ½Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ"
-    view: "ÐÐ°ÑÑÐ°"
-    view_tooltip: "ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ"
-    edit: "ÐÐ¼ÑÐ½ÑÑÑ"
-    edit_tooltip: "Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ"
-    history: "ÐÑÑÑÐ¾ÑÑÑ"
-    history_tooltip: "ÐÑÑÑÐ¾ÑÑÑ Ð·Ð¼ÐµÐ½"
-    export: "Ð­ÐºÑÐ¿Ð°ÑÑ"
-    export_tooltip: "Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ°ÑÑÑ"
+      manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      mapnik_image: Ð²ÑÑÐ²Ð° Mapnik
+      max: Ð¼Ð°ÐºÑ
+      options: ÐÐ°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
+      osm_xml_data: OpenStreetMap XML
+      osmarender_image: Ð²ÑÑÐ²Ð° Osmarender
+      output: ÐÑÐ²Ð°Ð´
+      paste_html: Ð£ÑÑÐ°Ð²ÑÑÑ HTML Ð´Ð»Ñ ÑÐ±ÑÐ´Ð¾Ð²Ñ Ñ Ð²ÑÐ±-ÑÐ°Ð¹Ñ
+      scale: ÐÐ°ÑÑÐ°Ð±
+      zoom: Ð¼Ð°ÑÑÐ°Ð±
+    start_rjs: 
+      add_marker: ÐÐ°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ
+      change_marker: ÐÐ¼ÑÐ½ÑÑÑ Ð¿Ð°Ð·ÑÑÑÑ Ð¼Ð°ÑÐºÐµÑÐ°
+      click_add_marker: ÐÐ°ÑÑÑÐ½ÑÑÐµ Ð½Ð° ÐºÐ°ÑÑÐµ, ÐºÐ°Ð± Ð´Ð°Ð´Ð°ÑÑ Ð¼Ð°ÑÐºÐµÑ
+      drag_a_box: Ð Ð°ÑÑÑÐ³Ð½ÑÑÐµ ÑÐ°Ð¼ÐºÑ Ð½Ð° ÐºÐ°ÑÑÐµ Ð´Ð»Ñ Ð²ÑÐ±Ð°ÑÐ° Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      export: Ð­ÐºÑÐ¿Ð°ÑÑ
+      manually_select: ÐÑÐ±ÑÐ°ÑÑ ÑÐ½ÑÑÑ Ð¼ÑÑÑÐ¾Ð²Ð°ÑÑÑ
+      view_larger_map: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð±Ð¾Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ
+  geocoder: 
+    results: 
+      no_results: ÐÑÑÐ¾Ð³Ð° Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ð°
+  layouts: 
+    alt_donation: ÐÑÐ°Ð±ÑÑÑ Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½Ðµ
+    donate: ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap {{link}} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ.
+    donate_link_text: Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½ÐµÐ¼
+    edit: ÐÐ¼ÑÐ½ÑÑÑ
+    edit_tooltip: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ
+    export: Ð­ÐºÑÐ¿Ð°ÑÑ
+    export_tooltip: Ð­ÐºÑÐ¿Ð°ÑÑÐ°Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÑ ÐºÐ°ÑÑÑ
     gps_traces: GPS Ð¢ÑÑÐºÑ
-    gps_traces_tooltip: "ÐÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð· ÑÑÑÐºÐ°Ð¼Ñ"
-    user_diaries: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
-    user_diaries_tooltip: "ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ"
-    tag_line: Ð¡Ð²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Wiki-ÐºÐ°ÑÑÐ° ÑÐ²ÐµÑÑ
-    intro_1: "OpenStreetMap - ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÐ° ÑÑÑÐ³Ð¾ ÑÐ²ÐµÑÑ. Ð¯Ðµ ÑÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÐºÑÑ Ð¶ Ð»ÑÐ´Ð·Ñ, ÑÐº Ð²Ñ."
-    intro_2: "OpenStreetMap Ð´Ð°Ð·Ð²Ð°Ð»ÑÐµ Ð²Ð°Ð¼ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ, ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ñ ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ Ð·Ð²ÐµÑÑÐºÐ°Ð¼Ñ Ñ Ð»ÑÐ±ÑÐ¼ Ð¿ÑÐ½ÐºÑÐµ Ð¿Ð»Ð°Ð½ÐµÑÑ."
+    gps_traces_tooltip: ÐÑÐ°ÑÐ°Ð²Ð°ÑÑ Ð· ÑÑÑÐºÐ°Ð¼Ñ
+    help_wiki: ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð° Ñ Wiki
+    help_wiki_tooltip: ÐÐ°Ð²ÐµÐ´ÐºÐ° Ñ ÑÐ°Ð¹Ñ ÐÑÐºÑ
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Main_Page
+    history: ÐÑÑÑÐ¾ÑÑÑ
+    history_tooltip: ÐÑÑÑÐ¾ÑÑÑ Ð·Ð¼ÐµÐ½
+    home: Ð´Ð°Ð¼Ð¾Ñ
+    home_tooltip: ÐÐ°ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð°Ñ ÑÐ°ÑÑ
+    inbox: ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ ({{count}})
+    inbox_tooltip: 
+      one: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ 1 Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
+      other: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ ÑÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ¹
+      zero: Ð£ Ð²Ð°ÑÐ°Ð¹ ÑÐºÑÑÐ½Ñ Ð½ÑÐ¼Ð° Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+    intro_1: OpenStreetMap - ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÐ° ÑÑÑÐ³Ð¾ ÑÐ²ÐµÑÑ. Ð¯Ðµ ÑÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÐºÑÑ Ð¶ Ð»ÑÐ´Ð·Ñ, ÑÐº Ð²Ñ.
+    intro_2: OpenStreetMap Ð´Ð°Ð·Ð²Ð°Ð»ÑÐµ Ð²Ð°Ð¼ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ, ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ñ ÐºÐ°ÑÑÑÑÐ°ÑÑÐ° Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½ÑÐ¼Ñ Ð·Ð²ÐµÑÑÐºÐ°Ð¼Ñ Ñ Ð»ÑÐ±ÑÐ¼ Ð¿ÑÐ½ÐºÑÐµ Ð¿Ð»Ð°Ð½ÐµÑÑ.
     intro_3: "Ð¥Ð¾ÑÑÑÐ½Ð³ Ð´Ð»Ñ OpenStreetMap: {{ucl}} Ñ {{bytemark}}."
-    intro_3_ucl: "Ð¦ÑÐ½ÑÑ UCL VR"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð¿Ð°-Ð·Ð° ÑÐµÑÑÐ²Ð°Ð¼, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°."
-    osm_read_only: "ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð½Ñ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°."
-    donate: "ÐÐ°Ð´ÑÑÑÐ¼Ð°Ð¹ÑÐµ OpenStreetMap {{link}} Ñ ÑÐ¾Ð½Ð´ Ð°Ð±Ð½Ð°ÑÐ»ÐµÐ½Ð½Ñ ÑÑÑÐ½ÑÐºÑ."
-    donate_link_text: Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½ÐµÐ¼
-    help_wiki: "ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð° Ñ Wiki"
-    help_wiki_tooltip: "ÐÐ°Ð²ÐµÐ´ÐºÐ° Ñ ÑÐ°Ð¹Ñ ÐÑÐºÑ"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Main_Page"
-    news_blog: "ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½Ð°Ñ"
-    news_blog_tooltip: "ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½ OpenStreetMap, Ð´Ð°ÑÐ¼Ð¾Ð²ÑÑ Ð³ÐµÐ°Ð´Ð°Ð½ÑÑ, Ñ Ð³.Ð´."
+    intro_3_ucl: Ð¦ÑÐ½ÑÑ UCL VR
+    log_in: ÑÐ²Ð°Ð¹ÑÑÑ
+    log_in_tooltip: Ð£Ð²Ð°Ð¹ÑÑÑ Ð· Ð°ÐºÐ°ÑÐ½ÑÐ°Ð¼, ÑÐºÑ ÑÑÐ½ÑÐµ
+    logo: 
+      alt_text: ÐÐ°Ð³Ð°ÑÑÐ¿ OpenStreetMap
+    logout: Ð²ÑÐ¹ÑÑÑ
+    logout_tooltip: Ð²ÑÐ¹ÑÑÑ
+    news_blog: ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½Ð°Ñ
+    news_blog_tooltip: ÐÐ»Ð¾Ð³ Ð½Ð°Ð²ÑÐ½ OpenStreetMap, Ð´Ð°ÑÐ¼Ð¾Ð²ÑÑ Ð³ÐµÐ°Ð´Ð°Ð½ÑÑ, Ñ Ð³.Ð´.
+    osm_offline: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð¿Ð°-Ð·Ð° ÑÐµÑÑÐ²Ð°Ð¼, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
+    osm_read_only: ÐÐ°Ð·Ð° Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ OpenStreetMap Ð·Ð°ÑÐ°Ð· Ð´Ð°ÑÑÑÐ¿Ð½Ð°Ñ ÑÐ¾Ð»ÑÐºÑ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð½Ñ, ÑÐ°Ð¼Ñ ÑÑÐ¾ Ð¿ÑÐ°ÑÐ¾Ð´Ð·ÑÑÑ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð°Ñ ÑÑÑÐ½ÑÑÐ½Ð°Ñ Ð¿ÑÐ°ÑÐ°.
     shop: ÐÑÐ°Ð¼Ð°
-    shop_tooltip: "ÐÑÐ°Ð¼Ð° Ð· ÑÑÑÐ¼Ð¾Ð²Ð°Ð¹ ÑÑÐ¼Ð²Ð¾Ð»ÑÐºÐ°Ð¹ OpenStreetMap"
-    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
-    sotm: 'ÐÐ°Ð²ÐµÐ´Ð°Ð¹ÑÐµ ÐºÐ°Ð½ÑÐµÑÑÐ½ÑÑÑ OpenStreetMap, The State of the Map 2009, 10-12 Ð»ÑÐ¿ÐµÐ½Ñ Ñ ÐÐ¼ÑÑÑÑÐ´Ð°Ð¼Ðµ!'
-    alt_donation: ÐÑÐ°Ð±ÑÑÑ Ð°ÑÐ²ÑÑÐ°Ð²Ð°Ð½Ð½Ðµ
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} Ð¿Ð°ÐºÑÐ½ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ñ Ð²Ð°ÑÑÐ¼ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
+    shop_tooltip: ÐÑÐ°Ð¼Ð° Ð· ÑÑÑÐ¼Ð¾Ð²Ð°Ð¹ ÑÑÐ¼Ð²Ð¾Ð»ÑÐºÐ°Ð¹ OpenStreetMap
+    sign_up: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
+    sign_up_tooltip: Ð¡ÑÐ²Ð°ÑÑÑÑ Ð°ÐºÐ°ÑÐ½Ñ Ð´Ð»Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ñ
+    sotm: ÐÐ°Ð²ÐµÐ´Ð°Ð¹ÑÐµ ÐºÐ°Ð½ÑÐµÑÑÐ½ÑÑÑ OpenStreetMap, The State of the Map 2009, 10-12 Ð»ÑÐ¿ÐµÐ½Ñ Ñ ÐÐ¼ÑÑÑÑÐ´Ð°Ð¼Ðµ!
+    tag_line: Ð¡Ð²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ Wiki-ÐºÐ°ÑÑÐ° ÑÐ²ÐµÑÑ
+    user_diaries: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
+    user_diaries_tooltip: ÐÐ·ÑÐ½Ð½ÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ
+    view: ÐÐ°ÑÑÐ°
+    view_tooltip: ÐÐ°Ð³Ð»ÑÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ
+    welcome_user: ÐÑÑÐ°ÐµÐ¼, {{user_link}}
+    welcome_user_link_tooltip: ÐÐ°ÑÐ° ÑÑÐ°ÑÐ¾Ð½ÐºÐ° ÐºÐ°ÑÑÑÑÐ°ÑÐ°
+  map: 
+    coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ:"
+    edit: ÐÐ¼ÑÐ½ÑÑÑ
+    view: ÐÐ°ÑÑÐ°
+  message: 
+    inbox: 
+      date: ÐÐ°ÑÐ°
+      from: ÐÐ´
+      my_inbox: ÐÐ°Ðµ ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      no_messages_yet: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  {{people_mapping_nearby_link}}?
+      outbox: Ð·ÑÑÐ¾Ð´Ð½ÑÑ
+      people_mapping_nearby: Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ
+      subject: Ð¢ÑÐ¼Ð°
+      title: Ð£Ð²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      you_have: Ð£ Ð²Ð°Ñ {{new_count}} Ð½Ð¾Ð²ÑÑ Ñ {{old_count}} ÑÑÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+    mark: 
+      as_read: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð¿ÑÐ°ÑÑÑÐ°Ð½ÑÐ¼
+      as_unread: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð½ÐµÑÑÑÐ°Ð½ÑÐ¼
+    message_summary: 
+      read_button: ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ
+      reply_button: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ
+      unread_button: ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð½ÐµÑÑÑÐ°Ð½Ð°Ðµ
+    new: 
+      back_to_inbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      body: Ð¢ÑÐºÑÑ
+      message_sent: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ð°
+      send_button: ÐÐ°ÑÐ»Ð°ÑÑ
+      send_message_to: ÐÐ°ÑÐ»Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ {{name}}
+      subject: Ð¢ÑÐ¼Ð°
+      title: ÐÐ°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
+    no_such_user: 
+      body: ÐÐ°Ð¶Ð°Ð»Ñ, Ð½Ðµ Ð°ÑÑÑÐ¼Ð°Ð»Ð°ÑÑ Ð·Ð½Ð°Ð¹ÑÑÑ ÐºÐ°ÑÑÑÑÐ°ÑÐ° Ð°Ð±Ð¾ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÐ°ÐºÑÐ¼ ÑÐ¼ÐµÐ¼ Ð°Ð±Ð¾ ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼
+      heading: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ
+      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ
+    outbox: 
+      date: ÐÐ°ÑÐ°
+      inbox: ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      my_inbox: ÐÐ°Ðµ {{inbox_link}}
+      no_sent_messages: Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· {{people_mapping_nearby_link}}?
+      outbox: Ð·ÑÑÐ¾Ð´Ð½ÑÑ
+      people_mapping_nearby: Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ
+      subject: Ð¢ÑÐ¼Ð°
+      title: ÐÑÑÐ¾Ð´Ð½ÑÑ
+      to: ÐÐ°Ð¼Ñ
+      you_have_sent_messages: Ð£ Ð²Ð°Ñ {{sent_count}} Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+    read: 
+      back_to_inbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      back_to_outbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð·ÑÑÐ¾Ð´Ð½ÑÑ
+      date: ÐÐ°ÑÐ°
+      from: ÐÐ´
+      reading_your_messages: Ð§ÑÑÐ°Ð½Ð½Ðµ Ð²Ð°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+      reading_your_sent_messages: Ð§ÑÑÐ°Ð½Ð½Ðµ Ð²Ð°ÑÑÑ Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ
+      reply_button: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ
+      subject: Ð¢ÑÐ¼Ð°
+      title: ÐÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
+      to: ÐÐ°Ð¼ÑÑÑ
+      unread_button: ÐÐ´Ð·Ð½Ð°ÑÑÑÑ, ÑÐº Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ
+  notifier: 
+    diary_comment_notification: 
       banner1: "*            ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹ÑÐµ Ð½Ð° Ð³ÑÑÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ.             *"
       banner2: "*             ÐÐ°ÑÑÑÑÐ°Ð¹ÑÐµÑÑ ÑÐ°Ð¹ÑÐ°Ð¼ OpenStreetMap Ð´Ð»Ñ Ð°Ð´ÐºÐ°Ð·Ñ.               *"
-      hi: "ÐÑÑÐ°Ð½Ð½Ñ, {{to_user}},"
+      footer: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð½Ð° {{readurl}} Ñ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð½Ð° {{commenturl}} ÑÑ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}
       header: "{{from_user}} Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°Ñ Ð²Ð°Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ Ð½Ð° OpenStreetMap Ð· ÑÑÐ¼Ð°Ð¹ {{subject}}:"
-      footer: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ð½Ð° {{readurl}} Ñ Ð¿ÑÐ°ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ð²Ð°ÑÑ Ð½Ð° {{commenturl}} ÑÑ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} Ð´Ð°ÑÐ»Ð°Ñ Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
-      banner1: "* ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹ÑÐµ Ð½Ð° Ð³ÑÑÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ. *"
-      banner2: "* ÐÐ»Ñ Ð°Ð´ÐºÐ°Ð·Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
-      hi: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, {{to_user}},"
-      header: "{{from_user}} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ {{subject}} Ð¿ÑÐ°Ð· OpenStreetMap:"
-      footer1: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ - {{readurl}}"
-      footer2: "Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
+      hi: ÐÑÑÐ°Ð½Ð½Ñ, {{to_user}},
+      subject: "[OpenStreetMap] {{user}} Ð¿Ð°ÐºÑÐ½ÑÑ ÐºÐ°Ð¼ÐµÐ½ÑÐ°Ñ Ñ Ð²Ð°ÑÑÐ¼ Ð´Ð·ÑÐ½Ð½ÑÐºÑ"
+    email_confirm: 
+      subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
+    email_confirm_html: 
+      click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ.
+      greeting: ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,
+      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ {{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+    email_confirm_plain: 
+      click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ.
+      greeting: ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,
+      hopefully_you_1: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ
+      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ, ÑÐº ÑÑÐ±ÑÐ°, Ð½Ð° OpenStreetMap."
-      see_their_profile: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° {{userurl}} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ."
-    gpx_notification:
-      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
-      your_gpx_file: "ÐÑÑÐ° Ð²ÑÐ³Ð»ÑÐ´Ð°Ðµ ÑÐº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX"
-      with_description: "Ð· Ð°Ð¿ÑÑÐ°Ð½Ð½ÐµÐ¼"
+      see_their_profile: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð½Ð° {{userurl}} Ñ Ð´Ð°Ð´Ð°ÑÑ, ÑÐº ÑÑÐ±ÑÐ°, Ñ Ð°Ð´ÐºÐ°Ð·, ÐºÐ°Ð»Ñ ÑÐ¾ÑÐ°ÑÐµ.
+      subject: "[OpenStreetMap] {{user}} Ð´Ð°Ð´Ð°Ñ Ð²Ð°Ñ Ñ ÑÐ¿ÑÑ ÑÐ²Ð°ÑÑ ÑÑÐ±ÑÐ¾Ñ"
+    gpx_notification: 
+      and_no_tags: Ñ Ð±ÐµÐ· ÑÑÐ³Ð°Ñ.
       and_the_tags: "Ñ Ð½Ð°ÑÑÑÐ¿Ð½ÑÐ¼Ñ ÑÑÐ³Ð°Ð¼Ñ:"
-      and_no_tags: "Ñ Ð±ÐµÐ· ÑÑÐ³Ð°Ñ."
-      failure:
-        subject: "[OpenStreetMap] ÐÐ±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ GPX"
+      failure: 
         failed_to_import: "Ð·Ð±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ. ÐÐ´Ð±ÑÐ»Ð°ÑÑ Ð¿Ð°Ð¼ÑÐ»ÐºÐ°:"
-        more_info_1: "ÐÐ°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð·Ð±Ð¾Ñ ÑÐ¼Ð¿Ð°ÑÑÑ GPX Ñ Ð°Ð± ÑÑÐ¼, ÑÐº Ð¿Ð°Ð·Ð±ÐµÐ³Ð½ÑÑÑ"
-        more_info_2: "Ð·Ð±Ð¾Ð¹,  Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð½Ð°Ð¹ÑÑÑ ÑÑÑ: "
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
-        subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð°ÑÑ GPX Ð¼ÑÐ½ÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°"
+        more_info_1: ÐÐ°Ð´Ð°ÑÐºÐ¾Ð²ÑÑ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ Ð°Ð± Ð·Ð±Ð¾Ñ ÑÐ¼Ð¿Ð°ÑÑÑ GPX Ñ Ð°Ð± ÑÑÐ¼, ÑÐº Ð¿Ð°Ð·Ð±ÐµÐ³Ð½ÑÑÑ
+        more_info_2: "Ð·Ð±Ð¾Ð¹,  Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð½Ð°Ð¹ÑÑÑ ÑÑÑ:"
+        subject: "[OpenStreetMap] ÐÐ±Ð¾Ð¹ ÑÐ¼Ð¿Ð°ÑÑÑ GPX"
+      greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
+      success: 
         loaded_successfully: " |"
-    signup_confirm:
+        subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð°ÑÑ GPX Ð¼ÑÐ½ÑÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð°"
+      with_description: Ð· Ð°Ð¿ÑÑÐ°Ð½Ð½ÐµÐ¼
+      your_gpx_file: ÐÑÑÐ° Ð²ÑÐ³Ð»ÑÐ´Ð°Ðµ ÑÐº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX
+    lost_password: 
+      subject: "[OpenStreetMap] ÐÐ°Ð¿ÑÑ Ð½Ð° Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
+    lost_password_html: 
+      click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
+      greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
+      hopefully_you: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org.
+    lost_password_plain: 
+      click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
+      greeting: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,
+      hopefully_you_1: Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð°
+      hopefully_you_2: Ð°Ð´ÑÐ°ÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org.
+    message_notification: 
+      banner1: "* ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ðµ Ð°Ð´ÐºÐ°Ð·Ð²Ð°Ð¹ÑÐµ Ð½Ð° Ð³ÑÑÐ°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ. *"
+      banner2: "* ÐÐ»Ñ Ð°Ð´ÐºÐ°Ð·Ñ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
+      footer1: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ - {{readurl}}
+      footer2: Ñ Ð²Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° {{replyurl}}
+      header: "{{from_user}} Ð°Ð´Ð¿ÑÐ°Ð²ÑÑ Ð²Ð°Ð¼ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÑÐ¼Ð°Ð¹ {{subject}} Ð¿ÑÐ°Ð· OpenStreetMap:"
+      hi: ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ, {{to_user}},
+      subject: "[OpenStreetMap] {{user}} Ð´Ð°ÑÐ»Ð°Ñ Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
+    signup_confirm: 
       subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
-    signup_confirm_plain:
-      greeting: "ÐÑÑÐ°Ð½Ð½Ñ!"
-      hopefully_you: "ÐÐµÑÑÐ° (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, Ð²Ñ) ÑÐ¾ÑÐ° ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº "
-      click_the_link_1: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, Ð²ÑÑÐ°ÐµÐ¼! ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± "
-      click_the_link_2: "Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ñ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑ Ð¿ÑÐ° OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, Ð²ÑÑÐ°ÐµÐ¼! ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ñ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑ Ð¿ÑÐ° OpenStreetMap
+      current_user: Ð¡Ð¿ÑÑ Ð±ÑÐ³ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð° ÐºÐ°ÑÑÐ³Ð¾ÑÑÑÑ ÑÑ Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð³Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ Ð´Ð°ÑÑÑÐ¿Ð½Ñ Ð½Ð°  <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: ÐÐ°ÑÑÑÐ°Ð¹ÑÐµ Ð¿ÑÐ° OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">Ð½Ð° wiki</p> ÑÑ  <a href="http://www.opengeodata.org/">Ð±Ð»Ð¾Ð³Ñ opengeodata</a>, Ð½Ð° ÑÐºÑÐ¼ ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÑÑÑ <a href="http://www.opengeodata.org/?cat=13">Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ</a>!
+      greeting: ÐÑÑÐ°Ð½Ð½Ñ!
+      hopefully_you: ÐÐµÑÑÐ° (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, Ð²Ñ) ÑÐ¾ÑÐ° ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
+      introductory_video: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ {{introductory_video_link}}.
+      more_videos: Ð¯ÑÑÑ Ð±Ð¾Ð»ÑÑ {{more_videos_link}}.
+      more_videos_here: Ð²ÑÐ´ÑÐ° ÑÑÑ
+      user_wiki_page: Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹, ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: ÑÐ²Ð¾Ð´Ð½Ð°Ðµ Ð²ÑÐ´ÑÐ° Ð¿ÑÐ° OpenStreetMap
+      wiki_signup: ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð°ÑÐ°ÑÐµÑÑ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ° Ð½Ð°  OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, Ð²ÑÑÐ°ÐµÐ¼! ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð±
+      click_the_link_2: Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ñ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑ Ð¿ÑÐ° OpenStreetMap.
+      current_user_1: Ð¡Ð¿ÑÑ Ð±ÑÐ³ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð° ÐºÐ°ÑÑÐ³Ð¾ÑÑÑÑ ÑÑ Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð³Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ
+      current_user_2: "Ð´Ð°ÑÑÑÐ¿Ð½Ñ Ð½Ð°:"
+      greeting: ÐÑÑÐ°Ð½Ð½Ñ!
+      hopefully_you: ÐÐµÑÑÐ° (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, Ð²Ñ) ÑÐ¾ÑÐ° ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
       introductory_video: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÑÐ²Ð¾Ð´Ð½Ð°Ðµ Ð²ÑÐ´ÑÐ° Ð¿ÑÐ° OpenStreetMap ÑÑÑ:"
       more_videos: "Ð ÑÑÑÑ Ð±Ð¾Ð»ÑÑ Ð²ÑÐ´ÑÐ° ÑÑÑ:"
-      the_wiki: "ÐÐ°ÑÑÑÐ°Ð¹ÑÐµ Ð¿ÑÐ° OpenStreetMap Ð½Ð° wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide"
       opengeodata: "OpenGeoData.org - Ð°ÑÑÑÑÐ¹Ð½Ñ Ð±Ð»Ð¾Ð³ OpenStreetMap, Ñ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð°Ðµ Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ:"
+      the_wiki: "ÐÐ°ÑÑÑÐ°Ð¹ÑÐµ Ð¿ÑÐ° OpenStreetMap Ð½Ð° wiki:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide
+      user_wiki_1: Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹,
+      user_wiki_2: ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ [[Category:Users_in_London]].
       wiki_signup: "ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð°ÑÐ°ÑÐµÑÑ Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ° Ð½Ð°  OpenStreetMap wiki Ð½Ð°:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page"
-      user_wiki_1: "Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹,"
-      user_wiki_2: "ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ [[Category:Users_in_London]]."
-      current_user_1: "Ð¡Ð¿ÑÑ Ð±ÑÐ³ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð° ÐºÐ°ÑÑÐ³Ð¾ÑÑÑÑ ÑÑ Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð³Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ"
-      current_user_2: "Ð´Ð°ÑÑÑÐ¿Ð½Ñ Ð½Ð°:"
-    signup_confirm_html:
-      greeting: "ÐÑÑÐ°Ð½Ð½Ñ!"
-      hopefully_you: "ÐÐµÑÑÐ° (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, Ð²Ñ) ÑÐ¾ÑÐ° ÑÑÐ²Ð°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº"
-      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, Ð²ÑÑÐ°ÐµÐ¼! ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ñ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑ Ð¿ÑÐ° OpenStreetMap"
-      introductory_video: "ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿ÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ {{introductory_video_link}}."
-      video_to_openstreetmap: "ÑÐ²Ð¾Ð´Ð½Ð°Ðµ Ð²ÑÐ´ÑÐ° Ð¿ÑÐ° OpenStreetMap"
-      more_videos: "Ð¯ÑÑÑ Ð±Ð¾Ð»ÑÑ {{more_videos_link}}."
-      more_videos_here: "Ð²ÑÐ´ÑÐ° ÑÑÑ"
-      get_reading: 'ÐÐ°ÑÑÑÐ°Ð¹ÑÐµ Ð¿ÑÐ° OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">Ð½Ð° wiki</p> ÑÑ  <a href="http://www.opengeodata.org/">Ð±Ð»Ð¾Ð³Ñ opengeodata</a>, Ð½Ð° ÑÐºÑÐ¼ ÑÐ°ÐºÑÐ°Ð¼Ð° ÑÑÑÑ <a href="http://www.opengeodata.org/?cat=13">Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ</a>!'
-      wiki_signup: 'ÐÑ ÑÐ°ÐºÑÐ°Ð¼Ð° Ð¼Ð¾Ð¶Ð°ÑÐµ Ð·Ð°ÑÐ°ÑÐµÑÑ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ° Ð½Ð°  OpenStreetMap wiki</a>.'
-      user_wiki_page: 'Ð ÑÐºÐ°Ð¼ÐµÐ½Ð´ÑÐµÐ¼ ÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð½Ð° wiki, ÑÐºÐ°Ñ Ð±ÑÐ´Ð·Ðµ ÑÐºÐ»ÑÑÐ°ÑÑ ÑÑÑÐ»ÑÐºÑ ÐºÐ°ÑÑÐ³Ð¾ÑÑÐ¹, ÑÐºÑÑ Ð°Ð´Ð·Ð½Ð°ÑÐ°ÑÑÑ, Ð´Ð·Ðµ Ð²Ñ Ð·Ð½Ð°ÑÐ¾Ð´Ð·ÑÑÐµÑÑ, Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'Ð¡Ð¿ÑÑ Ð±ÑÐ³ÑÑÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ Ð¿Ð° ÐºÐ°ÑÑÐ³Ð¾ÑÑÑÑ ÑÑ Ð³ÐµÐ°Ð³ÑÐ°ÑÑÑÐ½Ð°Ð³Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ñ Ð´Ð°ÑÑÑÐ¿Ð½Ñ Ð½Ð°  <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ"
-    email_confirm_plain:
-      greeting: "ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,"
-      hopefully_you_1: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ  "
-      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
-      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ."
-    email_confirm_html:
-      greeting: "ÐÐ¾Ð±ÑÑ Ð´Ð·ÐµÐ½Ñ,"
-      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð¶Ð°Ð´Ð°Ðµ Ð·Ð¼ÑÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ Ñ {{server_url}} Ð½Ð° Ð°Ð´ÑÐ°Ñ: {{new_address}}."
-      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, ÑÐ°Ð·Ð¼ÐµÑÑÐ°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ."
-    lost_password:
-      subject: "[OpenStreetMap] ÐÐ°Ð¿ÑÑ Ð½Ð° Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
-    lost_password_plain:
-      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
-      hopefully_you_1: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð°"
-      hopefully_you_2: "Ð°Ð´ÑÐ°ÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org."
-      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
-    lost_password_html:
-      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
-      hopefully_you: "Ð¥ÑÐ¾ÑÑÑÑ (ÑÐ¿Ð°Ð´Ð·ÑÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÑÐ°Ñ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð³ÑÑÐ°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°Ð½Ð°Ð³Ð° Ð½Ð° openstreetmap.org."
-      click_the_link: "ÐÐ°Ð»Ñ Ð³ÑÑÐ° Ð²Ñ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐ°Ð¹Ð´Ð·ÑÑÐµ Ð¿Ð° ÑÐ¿Ð°ÑÑÐ»ÑÑ, Ð¿Ð°ÐºÐ°Ð·Ð°Ð½Ð°Ð¹ Ð½ÑÐ¶ÑÐ¹, ÐºÐ°Ð± Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
-    reset_password:
-      subject: "[OpenStreetMap] ÐÐ¼ÐµÐ½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ"
-    reset_password_plain:
-      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
-      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ Ð½Ð° {{new_password}}"
-    reset_password_html:
-      greeting: "ÐÑÑÐ²ÑÑÐ°Ð½Ð½Ðµ,"
-      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ Ð½Ð° {{new_password}}"
-  message:
-    inbox:
-      title: "Ð£Ð²Ð°ÑÐ¾Ð´Ð½ÑÑ"
-      my_inbox: "ÐÐ°Ðµ ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
-      outbox: "Ð·ÑÑÐ¾Ð´Ð½ÑÑ"
-      you_have: "Ð£ Ð²Ð°Ñ {{new_count}} Ð½Ð¾Ð²ÑÑ Ñ {{old_count}} ÑÑÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      from: "ÐÐ´"
-      subject: "Ð¢ÑÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      no_messages_yet: "Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð·  {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ"
-    message_summary:
-      unread_button: "ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð½ÐµÑÑÑÐ°Ð½Ð°Ðµ"
-      read_button: "ÐÐ´Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ"
-      reply_button: "ÐÐ´ÐºÐ°Ð·Ð°ÑÑ"
-    new:
-      title: "ÐÐ°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
-      send_message_to: "ÐÐ°ÑÐ»Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ {{name}}"
-      subject: "Ð¢ÑÐ¼Ð°"
-      body: "Ð¢ÑÐºÑÑ"
-      send_button: "ÐÐ°ÑÐ»Ð°ÑÑ"
-      back_to_inbox: "ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
-      message_sent: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ð°"
-    no_such_user:
-      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ"
-      heading: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°/Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ñ"
-      body: "ÐÐ°Ð¶Ð°Ð»Ñ, Ð½Ðµ Ð°ÑÑÑÐ¼Ð°Ð»Ð°ÑÑ Ð·Ð½Ð°Ð¹ÑÑÑ ÐºÐ°ÑÑÑÑÐ°ÑÐ° Ð°Ð±Ð¾ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð· ÑÐ°ÐºÑÐ¼ ÑÐ¼ÐµÐ¼ Ð°Ð±Ð¾ ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼"
-    outbox:
-      title: "ÐÑÑÐ¾Ð´Ð½ÑÑ"
-      my_inbox: "ÐÐ°Ðµ {{inbox_link}}"
-      inbox: "ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
-      outbox: "Ð·ÑÑÐ¾Ð´Ð½ÑÑ"
-      you_have_sent_messages: "Ð£ Ð²Ð°Ñ {{sent_count}} Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      to: "ÐÐ°Ð¼Ñ"
-      subject: "Ð¢ÑÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      no_sent_messages: "Ð£ Ð²Ð°Ñ Ð¿Ð°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ. Ð§Ð°Ð¼Ñ Ð± Ð½Ðµ Ð·ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°Ð²Ð°ÑÑÐ° Ð· {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "Ð»ÑÐ´Ð·ÑÐ¼Ñ, ÑÑÐ¾ Ð¶ÑÐ²ÑÑÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ"
-    read:
-      title: "ÐÑÐ°ÑÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ"
-      reading_your_messages: "Ð§ÑÑÐ°Ð½Ð½Ðµ Ð²Ð°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      from: "ÐÐ´"
-      subject: "Ð¢ÑÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      reply_button: "ÐÐ´ÐºÐ°Ð·Ð°ÑÑ"
-      unread_button: "ÐÐ´Ð·Ð½Ð°ÑÑÑÑ, ÑÐº Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ"
-      back_to_inbox: "ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ"
-      reading_your_sent_messages: "Ð§ÑÑÐ°Ð½Ð½Ðµ Ð²Ð°ÑÑÑ Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½ÑÑ"
-      to: "ÐÐ°Ð¼ÑÑÑ"
-      back_to_outbox: "ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð·ÑÑÐ¾Ð´Ð½ÑÑ"
-    mark:
-      as_read: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð¿ÑÐ°ÑÑÑÐ°Ð½ÑÐ¼"
-      as_unread: "ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° Ð½ÐµÑÑÑÐ°Ð½ÑÐ¼"
-  site:
-    index:
-      js_1: "ÐÑ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÐ°Ð¼ Ð±ÐµÐ· Ð¿Ð°Ð´ÑÑÑÐ¼ÐºÑ javascript."
-      js_2: "OpenStreetMap Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ javascript Ð´Ð»Ñ Ð°Ð´Ð»ÑÑÑÑÐ°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ."
-      js_3: 'ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ¿ÑÐ°Ð±Ð°Ð²Ð°ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÑÑÐ½Ñ Ð°Ð³Ð»ÑÐ´ Tiles@Home</a> ÐºÐ°Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐºÐ»ÑÑÑÑÑ javascript.'
-      permalink: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ° ÑÑÐ´Ñ
-      license:
-        notice: "ÐÑÑÑÐ½Ð·ÑÑÑÐµÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ {{license_name}} Ð¿ÑÐ°ÐµÐºÑÐ°Ð¼ {{project_name}} Ñ ÑÐ³Ð¾ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "ÐÑ Ð½Ðµ Ð´Ð°Ð·Ð²Ð¾Ð»ÑÐ»Ñ Ð·ÑÐ°Ð±ÑÑÑ ÑÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼Ñ."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: ÐÑ Ð½Ðµ Ð´Ð°Ð·Ð²Ð¾Ð»ÑÐ»Ñ Ð·ÑÐ°Ð±ÑÑÑ ÑÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼Ñ.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current ÑÐ»ÑÑ ÑÑ point, if editing in list mode, ÑÑ click save if you have a save button.)
       user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current ÑÐ»ÑÑ ÑÑ point, if editing in list mode, ÑÑ click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
+    index: 
+      js_1: ÐÑ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ Ð²Ð°Ð½Ð´ÑÐ¾ÑÐ½ÑÐºÐ°Ð¼ Ð±ÐµÐ· Ð¿Ð°Ð´ÑÑÑÐ¼ÐºÑ javascript.
+      js_2: OpenStreetMap Ð²ÑÐºÐ°ÑÑÑÑÐ¾ÑÐ²Ð°Ðµ javascript Ð´Ð»Ñ Ð°Ð´Ð»ÑÑÑÑÐ°Ð²Ð°Ð½Ð½Ñ ÐºÐ°ÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ.
+      js_3: ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ¿ÑÐ°Ð±Ð°Ð²Ð°ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÑÑÐ½Ñ Ð°Ð³Ð»ÑÐ´ Tiles@Home</a> ÐºÐ°Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐºÐ»ÑÑÑÑÑ javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: ÐÑÑÑÐ½Ð·ÑÑÑÐµÑÑÐ° Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ {{license_name}} Ð¿ÑÐ°ÐµÐºÑÐ°Ð¼ {{project_name}} Ñ ÑÐ³Ð¾ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ð¼Ñ.
+        project_name: OpenStreetMap
+      permalink: Ð¡Ð¿Ð°ÑÑÐ»ÐºÐ° ÑÑÐ´Ñ
+    key: 
+      map_key: ÐÐ»ÑÑ ÐºÐ°ÑÑÑ
+      map_key_tooltip: ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ ÑÑÐ½Ð´ÑÑÑÐ½Ð³Ñ mapnik Ð½Ð° Ð³ÑÑÑÐ¼ ÑÐ·ÑÐ¾ÑÐ½Ñ Ð¼Ð°ÑÑÐ°Ð±Ñ
+    search: 
       search: ÐÐ¾ÑÑÐº
-      where_am_i: "ÐÐ·Ðµ Ñ?"
-      submit_text: "=>"
-      searching: "ÐÐ¾ÑÑÐº..."
       search_help: "Ð½Ð°Ð¿ÑÑÐºÐ»Ð°Ð´: 'ÐÑÐ½ÑÐº', 'Regent Street, Cambridge', 'CB2 5AQ', ÑÑ 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Ð±Ð¾Ð»ÑÑ Ð¿ÑÑÐºÐ»Ð°Ð´Ð°Ñ...</a>"
-    key:
-      map_key: "ÐÐ»ÑÑ ÐºÐ°ÑÑÑ"
-      map_key_tooltip: "ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ ÑÑÐ½Ð´ÑÑÑÐ½Ð³Ñ mapnik Ð½Ð° Ð³ÑÑÑÐ¼ ÑÐ·ÑÐ¾ÑÐ½Ñ Ð¼Ð°ÑÑÐ°Ð±Ñ"
-  trace:
-    create:
-      upload_trace: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPS-ÑÑÑÐº"
-      trace_uploaded: "ÐÐ°Ñ GPX-ÑÐ°Ð¹Ð» Ð±ÑÑ Ð·Ð°ÑÑÐ³Ð½ÑÑÑ Ñ ÑÐ°ÐºÐ°Ðµ ÑÑÑÐ°ÑÐºÑ Ñ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÑÑÐ° Ð·Ð²ÑÑÐ°Ð¹Ð½Ð° ÑÐ¾Ð±ÑÑÑÐ° Ð½Ðµ Ð±Ð¾Ð»ÑÑ Ð·Ð° Ð¿Ð°ÑÐ³Ð°Ð´Ð·ÑÐ½Ñ. ÐÑ Ð°ÑÑÑÐ¼Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÐ²ÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð°Ð± Ð·Ð°ÐºÐ°Ð½ÑÑÐ½Ð½Ñ Ð¿ÑÐ°ÑÑÑÑ Ð¿Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÐµ"
-    edit:
+      submit_text: =>
+      where_am_i: ÐÐ·Ðµ Ñ?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: ÐÐ°Ñ GPX-ÑÐ°Ð¹Ð» Ð±ÑÑ Ð·Ð°ÑÑÐ³Ð½ÑÑÑ Ñ ÑÐ°ÐºÐ°Ðµ ÑÑÑÐ°ÑÐºÑ Ñ Ð±Ð°Ð·Ñ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ. ÐÑÑÐ° Ð·Ð²ÑÑÐ°Ð¹Ð½Ð° ÑÐ¾Ð±ÑÑÑÐ° Ð½Ðµ Ð±Ð¾Ð»ÑÑ Ð·Ð° Ð¿Ð°ÑÐ³Ð°Ð´Ð·ÑÐ½Ñ. ÐÑ Ð°ÑÑÑÐ¼Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÐ²ÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð°Ð± Ð·Ð°ÐºÐ°Ð½ÑÑÐ½Ð½Ñ Ð¿ÑÐ°ÑÑÑÑ Ð¿Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð°Ð¹ Ð¿Ð¾ÑÑÐµ
+      upload_trace: ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPS-ÑÑÑÐº
+    delete: 
+      scheduled_for_deletion: Ð¢ÑÑÐº Ð·Ð°Ð¿Ð»Ð°Ð½Ð°Ð²Ð°Ð½Ñ Ð½Ð° Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð½Ðµ
+    edit: 
+      description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
+      edit: Ð·Ð¼ÑÐ½ÑÑÑ
       filename: "ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ð°:"
-      uploaded_at: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+      owner: "Ð£Ð»Ð°Ð´Ð°Ð»ÑÐ½ÑÐº:"
       points: "ÐÑÐ½ÐºÑÐ°Ñ:"
+      save_button: ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ
       start_coord: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ Ð¿Ð°ÑÐ°ÑÐºÑ:"
-      edit: "Ð·Ð¼ÑÐ½ÑÑÑ"
-      owner: "Ð£Ð»Ð°Ð´Ð°Ð»ÑÐ½ÑÐº:"
-      description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
       tags: "Ð¦ÑÑÐ»ÑÐºÑ:"
-      save_button: "ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ"
-    no_such_user:
-      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
-      heading: "ÐÐ°ÑÑÑÑÐ°Ñ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
-      body: "ÐÑÐ±Ð°ÑÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð¿ÑÐ°Ð²ÑÐ»ÑÐ½Ð°ÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ. ÐÐ°Ð³ÑÑÐ¼Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÐ°, Ð¿Ð° ÑÐºÐ¾Ð¹ Ð²Ñ Ð´Ð°ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ."
-    trace_form:
-      upload_gpx: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPX-ÑÐ°Ð¹Ð»"
-      description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ"
-      tags: "Ð¦ÑÑÐ»ÑÐºÑ"
-      public: "ÐÑÐ±Ð»ÑÑÐ½Ñ?"
-      upload_button: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ"
-      help: "ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð°"
-      help_url: "http://wiki.openstreetmap.org/wiki/RU:Upload"
-    trace_header:
-      see_just_your_traces: "ÐÐ°ÑÑÑÑ ÑÐ¾Ð»ÑÐºÑ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ, ÑÑ Ð´Ð°Ð´Ð°ÑÑ ÑÑÑÐº"
-      see_all_traces: "ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÑÑÐºÑ"
-      see_your_traces: "ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ"
-      traces_waiting: "Ð£ Ð²Ð°Ñ {{count}} ÑÑÑÐºÐ°Ñ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ."
-    trace_optionals:
-      tags: "Ð¦ÑÑÐ»ÑÐºÑ"
-    view:
-      pending: "Ð£ Ð§ÐÐ ÐÐ"
+      uploaded_at: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+    list: 
+      public_traces: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ
+      public_traces_from: ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}
+      tagged_with: " Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° ÑÐº {{tags}}"
+      your_traces: ÐÐ°ÑÑÑ GPS-ÑÑÑÐºÑ
+    make_public: 
+      made_public: Ð¢ÑÑÐº Ð·ÑÐ¾Ð±Ð»ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼
+    no_such_user: 
+      body: ÐÑÐ±Ð°ÑÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð¿ÑÐ°Ð²ÑÐ»ÑÐ½Ð°ÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½Ð½Ñ. ÐÐ°Ð³ÑÑÐ¼Ð° ÑÐ¿Ð°ÑÑÐ»ÐºÐ°, Ð¿Ð° ÑÐºÐ¾Ð¹ Ð²Ñ Ð´Ð°ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ñ {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+    trace: 
+      ago: "{{time_in_words_ago}} ÑÐ°Ð¼Ñ"
+      by: Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹
+      count_points: "{{count}} Ð¿ÑÐ½ÐºÑÐ°Ñ"
+      edit: Ð·Ð¼ÑÐ½ÑÑÑ
+      edit_map: ÐÐ¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ
+      in: Ñ
+      map: ÐºÐ°ÑÑÐ°
+      more: ÑÑÑÑ
+      pending: Ð£ Ð§ÐÐ ÐÐ
+      private: ÐÐ Ð«ÐÐÐ¢ÐÐ«
+      public: ÐÐ£ÐÐÐÐ§ÐÐ«
+      trace_details: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÑÐ»Ð°ÑÑÑÐ²Ð°ÑÑÑ ÑÑÑÐºÑ
+      view_map: ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ
+    trace_form: 
+      description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
+      help: ÐÐ°Ð¿Ð°Ð¼Ð¾Ð³Ð°
+      help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
+      tags: Ð¦ÑÑÐ»ÑÐºÑ
+      upload_button: ÐÐ°ÑÑÐ³Ð½ÑÑÑ
+      upload_gpx: ÐÐ°ÑÑÐ³Ð½ÑÑÑ GPX-ÑÐ°Ð¹Ð»
+    trace_header: 
+      see_all_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÑÑÐºÑ
+      see_just_your_traces: ÐÐ°ÑÑÑÑ ÑÐ¾Ð»ÑÐºÑ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ, ÑÑ Ð´Ð°Ð´Ð°ÑÑ ÑÑÑÐº
+      see_your_traces: ÐÐ°ÑÑÑÑ ÑÑÐµ ÑÐ²Ð°Ðµ ÑÑÑÐºÑ
+      traces_waiting: Ð£ Ð²Ð°Ñ {{count}} ÑÑÑÐºÐ°Ñ Ñ ÑÐ°ÑÐ·Ðµ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿Ð°ÐºÑÐ»Ñ ÑÐ½Ñ Ð±ÑÐ´ÑÑÑ Ð°Ð¿ÑÐ°ÑÐ°Ð²Ð°Ð½ÑÑ, ÐºÐ°Ð± Ð½Ðµ Ð±Ð»Ð°ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÐ³Ñ Ð´Ð»Ñ Ð°ÑÑÐ°ÑÐ½ÑÑ ÐºÐ°ÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ.
+    trace_optionals: 
+      tags: Ð¦ÑÑÐ»ÑÐºÑ
+    trace_paging_nav: 
+      of: Ð·
+      showing: ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÐ°ÑÐ¾Ð½ÐºÑ
+    view: 
+      delete_track: ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº
+      description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
+      download: ÑÑÑÐ³Ð½ÑÑÑ
+      edit: Ð·Ð¼ÑÐ½ÑÑÑ
+      edit_track: ÐÐ¼ÑÐ½ÑÑÑ Ð±ÑÐ³ÑÑÑ ÑÑÑÐº
       filename: "ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ð°:"
-      download: "ÑÑÑÐ³Ð½ÑÑÑ"
-      uploaded: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+      map: ÐºÐ°ÑÑÐ°
+      none: ÐÑÐ¼Ð°
+      owner: "Ð£Ð»Ð°Ð´Ð°Ð»ÑÐ½ÑÐº:"
+      pending: Ð£ Ð§ÐÐ ÐÐ
       points: "ÐÑÐ½ÐºÑÑ:"
       start_coordinates: "ÐÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ Ð¿Ð°ÑÐ°ÑÐºÑ:"
-      map: "ÐºÐ°ÑÑÐ°"
-      edit: "Ð·Ð¼ÑÐ½ÑÑÑ"
-      owner: "Ð£Ð»Ð°Ð´Ð°Ð»ÑÐ½ÑÐº:"
-      description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ:"
-      tags: "Ð¦ÑÑÐ»ÑÐºÑ"
-      none: "ÐÑÐ¼Ð°"
-      make_public: "ÐÑÐ°Ð±ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº Ð°Ð³ÑÐ»ÑÐ½Ð°Ð´Ð°ÑÑÑÐ¿Ð½ÑÐ¼ Ð½Ð°Ð·Ð°ÑÑÑÐ´Ñ"
-      edit_track: "ÐÐ¼ÑÐ½ÑÑÑ Ð±ÑÐ³ÑÑÑ ÑÑÑÐº"
-      delete_track: "ÐÑÐ´Ð°Ð»ÑÑÑ Ð³ÑÑÑ ÑÑÑÐº"
-      viewing_trace: "ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÑÐºÑ {{name}}"
-      trace_not_found: "Ð¢ÑÑÐº Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ!"
-    trace_paging_nav:
-      showing: "ÐÑÐ°Ð³Ð»ÑÐ´ ÑÑÐ°ÑÐ¾Ð½ÐºÑ"
-      of: "Ð·"
-    trace:
-      pending: "Ð£ Ð§ÐÐ ÐÐ"
-      count_points: "{{count}} Ð¿ÑÐ½ÐºÑÐ°Ñ"
-      ago: "{{time_in_words_ago}} ÑÐ°Ð¼Ñ"
-      more: "ÑÑÑÑ"
-      trace_details: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÑÐ»Ð°ÑÑÑÐ²Ð°ÑÑÑ ÑÑÑÐºÑ"
-      view_map: "ÐÑÐ°Ð³Ð»ÐµÐ´Ð·ÐµÑÑ ÐºÐ°ÑÑÑ"
-      edit: "Ð·Ð¼ÑÐ½ÑÑÑ"
-      edit_map: "ÐÐ¼ÑÐ½ÑÑÑ ÐºÐ°ÑÑÑ"
-      public: "ÐÐ£ÐÐÐÐ§ÐÐ«"
-      private: "ÐÐ Ð«ÐÐÐ¢ÐÐ«"
-      by: "Ð· Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð°Ð¹"
-      in: "Ñ"
-      map: "ÐºÐ°ÑÑÐ°"
-    list:
-      public_traces: "ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ"
-      your_traces: "ÐÐ°ÑÑÑ GPS-ÑÑÑÐºÑ"
-      public_traces_from: "ÐÑÐ±Ð»ÑÑÐ½ÑÑ GPS-ÑÑÑÐºÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° {{user}}"
-      tagged_with: " Ð°Ð´Ð¼ÐµÑÐ°Ð½Ð° ÑÐº {{tags}}"
-    delete:
-      scheduled_for_deletion: "Ð¢ÑÑÐº Ð·Ð°Ð¿Ð»Ð°Ð½Ð°Ð²Ð°Ð½Ñ Ð½Ð° Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð½Ðµ"
-    make_public:
-      made_public: "Ð¢ÑÑÐº Ð·ÑÐ¾Ð±Ð»ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼"
-  user:
-    login:
-      title: "Ð£Ð²Ð°ÑÐ¾Ð´"
-      heading: "Ð£Ð²Ð°ÑÐ¾Ð´"
-      please login: "ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÑ {{create_user_link}}."
-      create_account: "ÑÑÐ²Ð°ÑÑÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº"
+      tags: Ð¦ÑÑÐ»ÑÐºÑ
+      trace_not_found: Ð¢ÑÑÐº Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ!
+      uploaded: "ÐÐ°ÑÑÐ³Ð½ÑÑÑ:"
+  user: 
+    account: 
+      email never displayed publicly: (Ð½ÑÐºÐ¾Ð»Ñ Ð½ÑÐºÐ¾Ð¼Ñ Ð½Ðµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ°)
+      flash update success: ÐÐ²ÐµÑÑÐºÑ Ð°Ð± ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð°Ð±Ð½Ð¾ÑÐ»ÐµÐ½ÑÑ.
+      flash update success confirm needed: ÐÐ²ÐµÑÑÐºÑ Ð°Ð± ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð°Ð±Ð½Ð¾ÑÐ»ÐµÐ½ÑÑ. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð°Ñ Ð¿Ð¾ÑÑÑ, Ð²Ð°Ð¼ Ð¿Ð°Ð²ÑÐ½Ð½Ñ Ð¿ÑÑÐ¹ÑÑÑ Ð·Ð°Ð¿ÑÑ Ð½Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð·Ð¼ÐµÐ½Ñ Ð°Ð´ÑÐ°ÑÑ.
+      home location: "ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ:"
+      latitude: "Ð¨ÑÑÐ°ÑÐ°:"
+      longitude: "ÐÐ°ÑÐ³Ð°ÑÐ°:"
+      make edits public button: ÐÑÐ°Ð±ÑÑÑ ÑÑÐµ Ð¼Ð°Ðµ Ð·Ð¼ÐµÐ½Ñ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÐ¼Ñ
+      my settings: ÐÐ°Ðµ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
+      no home location: ÐÑ Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð»Ñ Ð²Ð°ÑÐ°Ðµ Ð°ÑÐ½Ð¾ÑÐ½Ð°Ðµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ.
+      preferred languages: "ÐÐ±ÑÐ°Ð½ÑÑ Ð¼Ð¾Ð²Ñ:"
+      profile description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ Ð¿ÑÐ¾ÑÑÐ»Ñ:"
+      public editing: 
+        disabled: ÐÐ´ÐºÐ»ÑÑÐ°Ð½Ð°. ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð±Ð¾Ð»ÑÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ, Ð°Ð»Ðµ ÑÑÐµ ÑÐ°Ð½ÐµÐ¹ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÑ.
+        disabled link text: ÑÐ°Ð¼Ñ Ñ Ð½Ðµ Ð¼Ð°Ð³Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ?
+        enabled: Ð£ÐºÐ»ÑÑÐ°Ð½Ð°. ÐÑ - Ð½Ðµ Ð°Ð½Ð°Ð½ÑÐ¼Ð½Ñ Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: ÑÑÐ¾ Ð³ÑÑÐ°?
+        heading: "ÐÑÐ±Ð»ÑÑÐ½Ð°Ðµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ:"
+      return to profile: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð¿ÑÐ¾ÑÑÐ»Ñ
+      save changes button: ÐÐ°Ð¿ÑÑÐ°ÑÑ Ð·Ð¼ÐµÐ½Ñ
+      title: ÐÐ¼ÑÐ½ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
+      update home location on click: ÐÐ±Ð½Ð°Ð²ÑÑÑ ÐºÐ°Ð°ÑÐ´ÑÐ½Ð°ÑÑ, ÐºÐ°Ð»Ñ Ñ Ð¿ÑÑÑÑÐºÐ½Ñ Ð¿Ð° ÐºÐ°ÑÑÐµ?
+    confirm: 
+      button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
+      failure: Ð Ð°ÑÑÐ½Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ°ÐºÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼ ÑÐ¶Ð¾ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ.
+      heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ ÑÐ°ÑÑÐ½ÐºÑ
+      press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ°ÑÑÐ½Ð°Ðº.
+      success: Ð Ð°ÑÑÐ½Ð°Ðº Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!
+    confirm_email: 
+      button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
+      failure: ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ°ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼.
+      heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ
+      press confirm button: ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.
+      success: ÐÐ°Ñ Ð°Ð´ÑÐ°Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!
+    friend_map: 
+      nearby mapper: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº: [[nearby_user]]"
+      your location: ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
+    go_public: 
+      flash success: Ð£ÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ ÑÑÐ¿ÐµÑ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÑ, Ñ Ð²Ð°Ð¼ ÑÑÐ¿ÐµÑ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ
+    login: 
+      account not active: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°Ð½Ñ.<br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ Ð½Ð° Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ñ Ð»ÑÑÑÐµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ°ÑÑÐ½ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ³Ð¾.
+      auth failure: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ð· ÑÐ°ÐºÑÐ¼ Ð°Ð´ÑÐ°ÑÐ°Ð¼ Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼.
+      create_account: ÑÑÐ²Ð°ÑÑÑÐµ ÑÐ°ÑÑÐ½Ð°Ðº
       email or username: "ÐÐ¾ÑÑÐ° ÑÑ ÑÐ¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°:"
+      heading: Ð£Ð²Ð°ÑÐ¾Ð´
+      login_button: Ð£Ð²Ð°Ð¹ÑÑÑ
+      lost password link: ÐÐ³ÑÐ±Ð»ÑÐ» Ð¿Ð°ÑÐ¾Ð»Ñ?
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      lost password link: "ÐÐ³ÑÐ±Ð»ÑÐ» Ð¿Ð°ÑÐ¾Ð»Ñ?"
-      login_button: "Ð£Ð²Ð°Ð¹ÑÑÑ"
-      account not active: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°Ð½Ñ.<br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð½Ð°ÑÑÑÐ½ÑÑÐµ Ð½Ð° Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ Ñ Ð»ÑÑÑÐµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ ÑÐ°ÑÑÐ½ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ³Ð¾."
-      auth failure: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° ÑÐ²Ð°Ð¹ÑÑÑ Ð· ÑÐ°ÐºÑÐ¼ Ð°Ð´ÑÐ°ÑÐ°Ð¼ Ñ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼."
-    lost_password:
-      title: "Ð·Ð³ÑÐ±Ð»ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      heading: "ÐÐ°Ð±ÑÐ»Ñ Ð¿Ð°ÑÐ¾Ð»Ñ?"
-      email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
-      new password button: "ÐÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      notice email on way: "ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ ÑÐ³Ð¾ Ð·Ð³ÑÐ±ÑÐ»Ñ :-( Ð°Ð»Ðµ Ð»ÑÑÑ ÑÐ¶Ð¾ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ñ, Ñ Ð²Ñ ÑÑÑÐºÐ° Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ³Ð¾ ÑÐºÑÐ½ÑÑÑ."
-      notice email cannot find: "ÐÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð½Ð°Ð¹ÑÑÑ Ð³ÑÑÐ°ÐºÑ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ, Ð¿ÑÐ°Ð±Ð°ÑÑÐµ."
-    reset_password:
-      title: "ÑÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      flash changed check mail: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÑ ÑÐºÑÐ½ÑÑÑ Ñ ÑÐ¶Ð¾ Ð½Ð° ÑÐ»ÑÑÑ Ð´Ð° Ð²Ð°ÑÐ°Ð¹ Ð¿Ð¾ÑÑÑ :-)"
-      flash token bad: "ÐÐµ Ð·Ð½Ð°Ð¹ÑÐ¾Ñ ÑÐ°ÐºÑ ÐºÐ»ÑÑ, Ð¼Ð¾Ð¶Ð°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ URL?"
-    new:
-      title: "Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº"
-      heading: "Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
-      no_auto_account_create: "ÐÐ° Ð¶Ð°Ð»Ñ, Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ ÑÑÐ²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð°ÑÑÐ°Ð¼Ð°ÑÑÑÐ½Ð°."
-      contact_webmaster: 'ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÑÑÑÐµÑÑ Ð· <a href="mailto:webmaster@openstreetmap.org">Ð²ÑÐ¼-Ð¼Ð°Ð¹ÑÑÑÐ°Ð¼</a> ÐºÐ°Ð± ÑÑÐ²Ð°ÑÑÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº - Ð¼Ñ Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐµÐ¼ Ð²ÑÐ´Ð°ÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº ÑÐº Ð¼Ð°Ð³Ð° ÑÑÑÑÑÐ¹.'
-      fill_form: "ÐÐ°Ð¿Ð¾ÑÐ½ÑÑÐµ ÑÐ¾ÑÐ¼Ñ, Ñ Ð¼Ñ Ð²ÑÑÐ»ÐµÐ¼ Ð²Ð°Ð¼ Ð»ÑÑÑ Ð´Ð»Ñ Ð°ÐºÑÑÐ²ÑÐ·Ð°ÑÑÑ ÑÐ°ÑÑÐ½ÐºÐ°."
-      license_agreement: 'Ð¡ÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº, Ð²Ñ Ð·Ð³Ð°Ð´Ð¶Ð°ÐµÑÐµÑÑ, ÑÑÐ¾ ÑÑÑ, ÑÑÐ¾ Ð²Ñ Ð·Ð°ÑÑÐ³Ð½ÐµÑÐµ Ð½Ð° openstreetmap.org Ñ ÑÑÐµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ Ð¿ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð»ÑÐ±Ð¾Ð¹ ÑÑÑÐ»ÑÑÑ, ÑÑÐ¾ Ð·Ð²ÑÐ·Ð²Ð°ÐµÑÑÐ° Ð· openstreetmap.org Ð±ÑÐ´ÑÑÑ Ð»ÑÑÑÐ½Ð·ÑÑÐ°Ð²Ð°ÑÑÐ° (Ð½ÐµÐ²ÑÐºÐ»ÑÑÐ½Ð°) Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Ð³ÑÑÐ°Ð¹ Ð»ÑÑÑÐ½Ð·ÑÑ Creative Commons (by-sa)</a>.'
+      please login: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÑ {{create_user_link}}.
+      title: Ð£Ð²Ð°ÑÐ¾Ð´
+    lost_password: 
       email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
+      heading: ÐÐ°Ð±ÑÐ»Ñ Ð¿Ð°ÑÐ¾Ð»Ñ?
+      new password button: ÐÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÐ¾Ð»Ñ
+      notice email cannot find: ÐÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð·Ð½Ð°Ð¹ÑÑÑ Ð³ÑÑÐ°ÐºÑ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ, Ð¿ÑÐ°Ð±Ð°ÑÑÐµ.
+      notice email on way: ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ ÑÐ³Ð¾ Ð·Ð³ÑÐ±ÑÐ»Ñ :-( Ð°Ð»Ðµ Ð»ÑÑÑ ÑÐ¶Ð¾ Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½Ñ, Ñ Ð²Ñ ÑÑÑÐºÐ° Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ³Ð¾ ÑÐºÑÐ½ÑÑÑ.
+      title: Ð·Ð³ÑÐ±Ð»ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ
+    make_friend: 
+      already_a_friend: ÐÑ ÑÐ¶Ð¾ ÑÑÐ±ÑÑÐµÑÐµ Ð· {{name}}.
+      failed: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð´Ð°Ð´Ð°ÑÑ {{name}} Ñ ÑÐºÐ°ÑÑÑ ÑÑÐ±ÑÐ°.
+      success: "{{name}} ÑÑÐ¿ÐµÑ Ð²Ð°Ñ ÑÑÐ±Ð°Ñ."
+    new: 
       confirm email address: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ:"
-      not displayed publicly: 'ÐÐµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° Ð°ÑÑÐ°ÑÐ½ÑÐ¼ (Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Ð¿Ð°Ð»ÑÑÑÐºÐ° Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ Ð½Ð° wiki, Ñ ÑÑÐ¼ Ð»ÑÐºÑ ÑÐµÐºÑÑÑ Ð¿ÑÐ° Ð¿Ð°ÑÑÐ¾Ð²ÑÑ Ð°Ð´ÑÐ°ÑÑ">Ð¿Ð°Ð»ÑÑÑÐºÑ Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ</a>)'
+      confirm password: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
+      contact_webmaster: ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÑÑÑÐµÑÑ Ð· <a href="mailto:webmaster@openstreetmap.org">Ð²ÑÐ¼-Ð¼Ð°Ð¹ÑÑÑÐ°Ð¼</a> ÐºÐ°Ð± ÑÑÐ²Ð°ÑÑÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº - Ð¼Ñ Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐµÐ¼ Ð²ÑÐ´Ð°ÑÑ Ð²Ð°Ð¼ ÑÐ°ÑÑÐ½Ð°Ðº ÑÐº Ð¼Ð°Ð³Ð° ÑÑÑÑÑÐ¹.
       display name: "ÐÐ°ÑÐ½Ð°Ðµ ÑÐ¼Ñ:"
+      email address: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ:"
+      fill_form: ÐÐ°Ð¿Ð¾ÑÐ½ÑÑÐµ ÑÐ¾ÑÐ¼Ñ, Ñ Ð¼Ñ Ð²ÑÑÐ»ÐµÐ¼ Ð²Ð°Ð¼ Ð»ÑÑÑ Ð´Ð»Ñ Ð°ÐºÑÑÐ²ÑÐ·Ð°ÑÑÑ ÑÐ°ÑÑÐ½ÐºÐ°.
+      flash create success message: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° ÑÑÐ²Ð¾ÑÐ°Ð½Ñ. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð°Ñ Ð¿Ð°ÑÑÐ¾Ð²ÑÑ ÑÐºÑÑÐ½Ñ - Ñ ÑÐ¹ Ð¿Ð°Ð²ÑÑÐ½ÐµÐ½ Ð±ÑÑÑ ÐºÐ¾Ð´ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ, Ñ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ Ð½Ð°Ð²Ð°Ñ Ð·Ð°ÑÐ°Ð·! :-)<br /><br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐ²Ð°Ð¶ÑÐµ, ÑÑÐ¾ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ²Ð°Ð¹ÑÑÑ, Ð¿Ð°ÐºÑÐ»Ñ Ð²Ñ Ð½Ðµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÐ»Ñ ÑÐ²Ð¾Ð¹ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.<br /><br />ÐÐ°Ð»Ñ Ð²Ñ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ ÑÑÐ¿ÑÐ°ÑÑÑÐ¿Ð°Ð¼Ð°Ð²Ð°Ð¹ ÑÑÑÑÑÐ¼Ð°Ð¹, ÑÐºÐ°Ñ ÑÐ°ÑÑÑÐ»Ð°Ðµ Ð·Ð°Ð¿ÑÑÑ Ð½Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ½ÑÑÑÑÐµ Ñ Ð±ÐµÐ»Ñ ÑÐ¿ÑÑ webmaster@openstreetmap.org, Ð±Ð¾ Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð°Ð´ÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð° Ð·Ð°Ð¿ÑÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½ÑÑ.
+      heading: Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+      license_agreement: Ð¡ÑÐ²Ð°ÑÐ°ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº, Ð²Ñ Ð·Ð³Ð°Ð´Ð¶Ð°ÐµÑÐµÑÑ, ÑÑÐ¾ ÑÑÑ, ÑÑÐ¾ Ð²Ñ Ð·Ð°ÑÑÐ³Ð½ÐµÑÐµ Ð½Ð° openstreetmap.org Ñ ÑÑÐµ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ, ÑÑÐ²Ð¾ÑÐ°Ð½ÑÑ Ð¿ÑÑ Ð²ÑÐºÐ°ÑÑÑÑÐ°Ð½Ð½Ñ Ð»ÑÐ±Ð¾Ð¹ ÑÑÑÐ»ÑÑÑ, ÑÑÐ¾ Ð·Ð²ÑÐ·Ð²Ð°ÐµÑÑÐ° Ð· openstreetmap.org Ð±ÑÐ´ÑÑÑ Ð»ÑÑÑÐ½Ð·ÑÑÐ°Ð²Ð°ÑÑÐ° (Ð½ÐµÐ²ÑÐºÐ»ÑÑÐ½Ð°) Ð½Ð° ÑÐ¼Ð¾Ð²Ð°Ñ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Ð³ÑÑÐ°Ð¹ Ð»ÑÑÑÐ½Ð·ÑÑ Creative Commons (by-sa)</a>.
+      no_auto_account_create: ÐÐ° Ð¶Ð°Ð»Ñ, Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ ÑÑÐ²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÐ°ÑÑÐ½Ð°Ðº Ð°ÑÑÐ°Ð¼Ð°ÑÑÑÐ½Ð°.
+      not displayed publicly: ÐÐµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ° Ð°ÑÑÐ°ÑÐ½ÑÐ¼ (Ð³Ð»ÑÐ´Ð·ÑÑÐµ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Ð¿Ð°Ð»ÑÑÑÐºÐ° Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ Ð½Ð° wiki, Ñ ÑÑÐ¼ Ð»ÑÐºÑ ÑÐµÐºÑÑÑ Ð¿ÑÐ° Ð¿Ð°ÑÑÐ¾Ð²ÑÑ Ð°Ð´ÑÐ°ÑÑ">Ð¿Ð°Ð»ÑÑÑÐºÑ Ð½ÐµÑÐ°Ð·Ð³Ð»Ð°ÑÑÐ½Ð½Ñ</a>)
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      confirm password: "ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
       signup: ÐÐ°ÑÑÐ³ÑÑÑÑÐ°Ð²Ð°ÑÑÐ°
-      flash create success message: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° ÑÑÐ²Ð¾ÑÐ°Ð½Ñ. ÐÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð°Ñ Ð¿Ð°ÑÑÐ¾Ð²ÑÑ ÑÐºÑÑÐ½Ñ - Ñ ÑÐ¹ Ð¿Ð°Ð²ÑÑÐ½ÐµÐ½ Ð±ÑÑÑ ÐºÐ¾Ð´ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ñ, Ñ Ð²Ñ Ð·Ð¼Ð¾Ð¶Ð°ÑÐµ Ð¿Ð°ÑÐ°ÑÑ Ð¼Ð°Ð»ÑÐ²Ð°ÑÑ Ð½Ð°Ð²Ð°Ñ Ð·Ð°ÑÐ°Ð·! :-)<br /><br />ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐ²Ð°Ð¶ÑÐµ, ÑÑÐ¾ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÐ²Ð°Ð¹ÑÑÑ, Ð¿Ð°ÐºÑÐ»Ñ Ð²Ñ Ð½Ðµ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÐ»Ñ ÑÐ²Ð¾Ð¹ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ.<br /><br />ÐÐ°Ð»Ñ Ð²Ñ ÐºÐ°ÑÑÑÑÐ°ÐµÑÐµÑÑ ÑÑÐ¿ÑÐ°ÑÑÑÐ¿Ð°Ð¼Ð°Ð²Ð°Ð¹ ÑÑÑÑÑÐ¼Ð°Ð¹, ÑÐºÐ°Ñ ÑÐ°ÑÑÑÐ»Ð°Ðµ Ð·Ð°Ð¿ÑÑÑ Ð½Ð° Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ, ÐºÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ½ÑÑÑÑÐµ Ñ Ð±ÐµÐ»Ñ ÑÐ¿ÑÑ webmaster@openstreetmap.org, Ð±Ð¾ Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð°Ð´ÐºÐ°Ð·Ð²Ð°ÑÑ Ð½Ð° Ð·Ð°Ð¿ÑÑÑ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½ÑÑ."
-    no_such_user:
-      title: "ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°"
-      heading: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ"
-      body: "ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ."
-    view:
+      title: Ð¡ÑÐ²Ð°ÑÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº
+    no_such_user: 
+      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ. Please check your spelling, ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿ÑÐ°Ð²Ð°Ð¿ÑÑ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, Ð²Ð°Ð¼ Ð´Ð°Ð»Ñ Ð½ÑÐ¿ÑÐ°Ð²ÑÐ»ÑÐ½ÑÑ ÑÐ¿Ð°ÑÑÐ»ÐºÑ.
+      heading: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº {{user}} Ð½Ðµ ÑÑÐ½ÑÐµ
+      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+    remove_friend: 
+      not_a_friend: "{{name}} Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð²Ð°ÑÑÐ¼ ÑÑÐ±ÑÐ°Ð¼."
+      success: "{{name} Ð²ÑÐ´Ð°Ð»ÐµÐ½Ñ ÑÐ° ÑÐ¿ÑÑÐ° ÑÑÐ±ÑÐ¾Ñ."
+    reset_password: 
+      flash token bad: ÐÐµ Ð·Ð½Ð°Ð¹ÑÐ¾Ñ ÑÐ°ÐºÑ ÐºÐ»ÑÑ, Ð¼Ð¾Ð¶Ð°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ URL?
+      title: ÑÐºÑÐ½ÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ
+    set_home: 
+      flash success: ÐÐ°Ð¼Ð°ÑÐ½ÑÐµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°Ð¿ÑÑÐ°Ð½Ð°
+    view: 
+      add as friend: Ð´Ð°Ð´Ð°ÑÑ Ñ ÑÑÐ±ÑÑ
+      add image: ÐÐ°Ð´Ð°ÑÑ Ð²ÑÑÐ²Ñ
+      ago: ({{time_in_words_ago}} ÑÐ°Ð¼Ñ)
+      change your settings: Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°ÑÑÑ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
+      delete image: ÐÑÐ´Ð°Ð»ÑÑÑ Ð²ÑÑÐ²Ñ
+      description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
+      diary: Ð´Ð·ÑÐ½Ð½ÑÐº
+      edits: Ð·Ð¼ÐµÐ½Ñ
+      if set location: ÐÐ°Ð»Ñ Ð²Ñ Ð²ÑÐ·Ð½Ð°ÑÑÑÐµ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ, Ð½ÑÐ¶ÑÐ¹ Ð·'ÑÐ²ÑÑÑÐ° Ð¿ÑÑÐ³Ð¾Ð¶Ð°Ñ ÐºÐ°ÑÑÐ° Ñ ÑÑÑ ÑÐ°ÐºÐ¾Ðµ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐ·Ð½Ð°ÑÑÑÑ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ {{settings_link}}.
+      km away: "{{count}} ÐºÐ¼ Ð°Ð´ Ð²Ð°Ñ"
+      mapper since: "ÐÐ°Ð»ÑÐµ ÐºÐ°ÑÑÑ Ð·:"
       my diary: Ð¼Ð¾Ð¹ Ð´Ð·ÑÐ½Ð½ÑÐº
-      new diary entry: Ð½Ð¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
       my edits: Ð¼Ð°Ðµ Ð·Ð¼ÐµÐ½Ñ
-      my traces: Ð¼Ð°Ðµ ÑÑÑÐºÑ
       my settings: Ð¼Ð°Ðµ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
+      my traces: Ð¼Ð°Ðµ ÑÑÑÐºÑ
+      nearby users: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ:"
+      new diary entry: Ð½Ð¾Ð²Ñ Ð·Ð°Ð¿ÑÑ Ñ Ð´Ð·ÑÐ½Ð½ÑÐºÑ
+      no friends: ÐÑ Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð´Ð°Ð´Ð°Ð»Ñ Ð½ÑÐºÐ¾Ð³Ð° Ñ ÑÑÐ±ÑÑ.
+      no home location: ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð½Ðµ Ð¿Ð°ÐºÐ°Ð·Ð°Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ.
+      no nearby users: ÐÐ°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, ÑÑÐ¾ Ð°Ð´Ð¼ÐµÑÑÐ»Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ.
+      remove as friend: Ð²ÑÐ´Ð°Ð»ÑÑÑ Ð· ÑÑÐ±ÑÐ¾Ñ
       send message: Ð´Ð°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½Ð½Ðµ
-      diary: Ð´Ð·ÑÐ½Ð½ÑÐº
-      edits: Ð·Ð¼ÐµÐ½Ñ
+      settings_link_text: Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½ÑÑ
       traces: ÑÑÑÐºÑ
-      remove as friend: Ð²ÑÐ´Ð°Ð»ÑÑÑ Ð· ÑÑÐ±ÑÐ¾Ñ
-      add as friend: Ð´Ð°Ð´Ð°ÑÑ Ñ ÑÑÐ±ÑÑ
-      mapper since: "ÐÐ°Ð»ÑÐµ ÐºÐ°ÑÑÑ Ð·:"
-      ago: "({{time_in_words_ago}} ÑÐ°Ð¼Ñ)"
-      user image heading: ÐÑÑÐ²Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
-      delete image: ÐÑÐ´Ð°Ð»ÑÑÑ Ð²ÑÑÐ²Ñ
       upload an image: ÐÐ°ÑÑÐ³Ð½ÑÑÑ Ð²ÑÑÐ²Ñ
-      add image: ÐÐ°Ð´Ð°ÑÑ Ð²ÑÑÐ²Ñ
-      description: ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ
+      user image heading: ÐÑÑÐ²Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
       user location: ÐÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
-      no home location: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº Ð½Ðµ Ð¿Ð°ÐºÐ°Ð·Ð°Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ."
-      if set location: "ÐÐ°Ð»Ñ Ð²Ñ Ð²ÑÐ·Ð½Ð°ÑÑÑÐµ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ, Ð½ÑÐ¶ÑÐ¹ Ð·'ÑÐ²ÑÑÑÐ° Ð¿ÑÑÐ³Ð¾Ð¶Ð°Ñ ÐºÐ°ÑÑÐ° Ñ ÑÑÑ ÑÐ°ÐºÐ¾Ðµ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÐ·Ð½Ð°ÑÑÑÑ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½Ð° ÑÑÐ°ÑÐ¾Ð½ÑÑ {{settings_link}}."
-      settings_link_text: Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½ÑÑ
       your friends: ÐÐ°ÑÑÑ ÑÑÐ±ÑÑ
-      no friends: ÐÑ Ð¿Ð°ÐºÑÐ»Ñ Ð½Ðµ Ð´Ð°Ð´Ð°Ð»Ñ Ð½ÑÐºÐ¾Ð³Ð° Ñ ÑÑÐ±ÑÑ.
-      km away: "{{count}} ÐºÐ¼ Ð°Ð´ Ð²Ð°Ñ"
-      nearby users: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ:"
-      no nearby users: "ÐÐ°ÐºÑÐ»Ñ Ð½ÑÐ¼Ð° ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°Ñ, ÑÑÐ¾ Ð°Ð´Ð¼ÐµÑÑÐ»Ñ ÑÐ²Ð°Ñ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð½ÐµÐ¿Ð°Ð´Ð°Ð»ÑÐºÑ."
-      change your settings: Ð·Ð¼ÑÐ½ÑÑÑ Ð²Ð°ÑÑÑ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
-    friend_map:
-      your location: ÐÐ°ÑÐ° Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ
-      nearby mapper: "ÐÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº: [[nearby_user]]"
-    account:
-      title: "ÐÐ¼ÑÐ½ÑÑÑ ÑÐ°ÑÑÐ½Ð°Ðº"
-      my settings: ÐÐ°Ðµ Ð½Ð°ÑÑÐ°ÑÐ»ÐµÐ½Ð½Ñ
-      email never displayed publicly: "(Ð½ÑÐºÐ¾Ð»Ñ Ð½ÑÐºÐ¾Ð¼Ñ Ð½Ðµ Ð¿Ð°ÐºÐ°Ð·Ð²Ð°ÐµÑÑÐ°)"
-      public editing:
-        heading: "ÐÑÐ±Ð»ÑÑÐ½Ð°Ðµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ:"
-        enabled: "Ð£ÐºÐ»ÑÑÐ°Ð½Ð°. ÐÑ - Ð½Ðµ Ð°Ð½Ð°Ð½ÑÐ¼Ð½Ñ Ñ Ð¼Ð¾Ð¶Ð°ÑÐµ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ Ð´Ð°Ð´Ð·ÐµÐ½ÑÑ."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "ÑÑÐ¾ Ð³ÑÑÐ°?"
-        disabled: "ÐÐ´ÐºÐ»ÑÑÐ°Ð½Ð°. ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð±Ð¾Ð»ÑÑ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ, Ð°Ð»Ðµ ÑÑÐµ ÑÐ°Ð½ÐµÐ¹ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð°Ð½Ð°Ð½ÑÐ¼Ð½ÑÑ."
-        disabled link text: "ÑÐ°Ð¼Ñ Ñ Ð½Ðµ Ð¼Ð°Ð³Ñ ÑÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ?"
-      profile description: "ÐÐ¿ÑÑÐ°Ð½Ð½Ðµ Ð¿ÑÐ¾ÑÑÐ»Ñ:"
-      preferred languages: "ÐÐ±ÑÐ°Ð½ÑÑ Ð¼Ð¾Ð²Ñ:"
-      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: ÐÐ°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ð½Ðµ ÑÐ°ÑÑÐ½ÐºÑ
-      press confirm button: "ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð°ÐºÑÑÐ²ÑÐ·Ð°Ð²Ð°ÑÑ ÑÐ°ÑÑÐ½Ð°Ðº."
-      button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      success: "Ð Ð°ÑÑÐ½Ð°Ðº Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!"
-      failure: "Ð Ð°ÑÑÐ½Ð°Ðº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° Ð· ÑÐ°ÐºÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼ ÑÐ¶Ð¾ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ."
-    confirm_email:
-      heading: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð·Ð¼ÐµÐ½Ñ Ð¿Ð°ÑÑÐ¾Ð²Ð°Ð³Ð° Ð°Ð´ÑÐ°ÑÑ
-      press confirm button: "ÐÐ°ÑÑÑÐ½ÑÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ, ÐºÐ°Ð± Ð¿Ð°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²Ñ Ð¿Ð°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ."
-      button: ÐÐ°ÑÐ²ÐµÑÐ´Ð·ÑÑÑ
-      success: "ÐÐ°Ñ Ð°Ð´ÑÐ°Ñ Ð¿Ð°ÑÐ²ÐµÑÐ´Ð¶Ð°Ð½Ñ, Ð´Ð·ÑÐºÑÐ¹ Ð·Ð° ÑÑÐ³ÑÑÑÑÐ°ÑÑÑ!"
-      failure: "ÐÐ°ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐ°Ñ ÑÐ¶Ð¾ Ð±ÑÑ Ð¿Ð°ÑÐ°ÐµÑÐ´Ð¶Ð°Ð½Ñ Ð³ÑÑÑÐ¼ ÐºÐ»ÑÑÐ¾Ð¼."
-    set_home:
-      flash success: "ÐÐ°Ð¼Ð°ÑÐ½ÑÐµ Ð¼ÐµÑÑÐ°Ð·Ð½Ð°ÑÐ¾Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°ÑÐ¿ÑÑÐ¾Ð²Ð° Ð·Ð°Ð¿ÑÑÐ°Ð½Ð°"
-    go_public:
-      flash success: "Ð£ÑÐµ Ð²Ð°ÑÑÑ Ð·Ð¼ÐµÐ½Ñ ÑÑÐ¿ÐµÑ Ð¿ÑÐ±Ð»ÑÑÐ½ÑÑ, Ñ Ð²Ð°Ð¼ ÑÑÐ¿ÐµÑ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½Ð½Ðµ"
-    make_friend:
-      success: "{{name}} ÑÑÐ¿ÐµÑ Ð²Ð°Ñ ÑÑÐ±Ð°Ñ."
-      failed: "ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÐµÐ¼Ð°Ð³ÑÑÐ¼Ð° Ð´Ð°Ð´Ð°ÑÑ {{name}} Ñ ÑÐºÐ°ÑÑÑ ÑÑÐ±ÑÐ°."
-      already_a_friend: "ÐÑ ÑÐ¶Ð¾ ÑÑÐ±ÑÑÐµÑÐµ Ð· {{name}}."
-    remove_friend:
-      success: "{{name} Ð²ÑÐ´Ð°Ð»ÐµÐ½Ñ ÑÐ° ÑÐ¿ÑÑÐ° ÑÑÐ±ÑÐ¾Ñ."
-      not_a_friend: "{{name}} Ð½Ðµ Ð·'ÑÑÐ»ÑÐµÑÑÐ° Ð²Ð°ÑÑÐ¼ ÑÑÐ±ÑÐ°Ð¼."
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index db3e24375..5adb18a8b 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1,4 +1,3 @@
-# Imported at Mon Sep 28 20:33:14 2009 from Translatewiki.net
 bs: 
   activerecord: 
     attributes: 
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0387eba4e..7b7d1e35d 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1,155 +1,178 @@
-ca:
-  html:
-    dir: "ltr"
-  activerecord:
-    models:
-      acl: "Llista de control d'accÃ©s"
-      changeset: "Conjunt de canvis"
-      changeset_tag: "Etiqueta del conjunt de canvis"
-      country: "PaÃ­s"
-      diary_comment: "Commentari del diari"
-      diary_entry: "Entrada al diari"
-      friend: "Amic"
-      language: "Idioma"
-      message: "Missatge"
-      node: "Node"
-      node_tag: "Etiqueta del node"
-      notifier: "Notificador"
-      old_node: "Node antic"
-      old_node_tag: "Etiqueta del node antic"
-      old_relation: "RelaciÃ³ antiga"
-      old_relation_member: "Membre de la relaciÃ³ antiga"
-      old_relation_tag: "Etiqueta de relaciÃ³ antiga"
-      old_way: "CamÃ­ antic"
-      old_way_node: "Node del camÃ­ antic"
-      old_way_tag: "Etiqueta del camÃ­ antic"
-      relation: "RelaciÃ³"
-      relation_member: "Membre de la relaciÃ³"
-      relation_tag: "Etiqueta de la relaciÃ³"
-      session: "SessiÃ³"
-      trace: "TraÃ§"
-      tracepoint: "Punt de traÃ§"
-      tracetag: "Etiqueta del traÃ§"
-      user: "Usuari"
-      user_preference: "PreferÃ¨ncies d'usuari"
-      user_token: ""
-      way: "CamÃ­"
-      way_node: "Node del camÃ­"
-      way_tag: "Etiqueta del camÃ­"
-    attributes:
-      diary_comment:
-        body: "Cos"
-      diary_entry:
-        user: "Usuari"
-        title: "TÃ­tol"
-        latitude: "Latitud"
-        longitude: "Longitud"
-        language: "Idioma"
-      friend:
-        user: "Usuari"
-        friend: "Amic"
-      trace:
-        user: "Usuari"
-        visible: "Visible"
-        name: "Nom"
-        size: "Mida"
-        latitude: "Latitud"
-        longitude: "Longitud"
-        public: "PÃºblic"
-        description: "DescripciÃ³"
-      message:
-        sender: "Remitent"
-        title: "TÃ­tol"
-        body: "Cos"
-        recipient: "Destinatari"
-      user:
-        email: "E-mail"
-        active: "Actiu"
-        display_name: "Nom en pantalla"
-        description: "DescripciÃ³"
-        languages: "Idiomes"
-        pass_crypt: "Contrasenya"
-  map:
-    view: "Veure"
-    edit: "Edita"
-    coordinates: "Coordenades:"
-  browse:
-    changeset:
-      title: "Conjunt de canvis"
-      changeset: "Conjunt de canvis {{id}}"
-      download: "Baixa {{changeset_xml_link}} o {{osmchange_xml_link}}"
-      changesetxml: "XML del conjunt de canvis"
-      osmchangexml: "XML en format osmChange"
-    changeset_details:
-      created_at: "Creat el:"
-      closed_at: "Tancat el:"
+ca: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Cos
+      diary_entry: 
+        language: Idioma
+        latitude: Latitud
+        longitude: Longitud
+        title: TÃ­tol
+        user: Usuari
+      friend: 
+        friend: Amic
+        user: Usuari
+      message: 
+        body: Cos
+        recipient: Destinatari
+        sender: Remitent
+        title: TÃ­tol
+      trace: 
+        description: DescripciÃ³
+        latitude: Latitud
+        longitude: Longitud
+        name: Nom
+        public: PÃºblic
+        size: Mida
+        user: Usuari
+        visible: Visible
+      user: 
+        active: Actiu
+        description: DescripciÃ³
+        display_name: Nom en pantalla
+        email: E-mail
+        languages: Idiomes
+        pass_crypt: Contrasenya
+    models: 
+      acl: Llista de control d'accÃ©s
+      changeset: Conjunt de canvis
+      changeset_tag: Etiqueta del conjunt de canvis
+      country: PaÃ­s
+      diary_comment: Commentari del diari
+      diary_entry: Entrada al diari
+      friend: Amic
+      language: Idioma
+      message: Missatge
+      node: Node
+      node_tag: Etiqueta del node
+      notifier: Notificador
+      old_node: Node antic
+      old_node_tag: Etiqueta del node antic
+      old_relation: RelaciÃ³ antiga
+      old_relation_member: Membre de la relaciÃ³ antiga
+      old_relation_tag: Etiqueta de relaciÃ³ antiga
+      old_way: CamÃ­ antic
+      old_way_node: Node del camÃ­ antic
+      old_way_tag: Etiqueta del camÃ­ antic
+      relation: RelaciÃ³
+      relation_member: Membre de la relaciÃ³
+      relation_tag: Etiqueta de la relaciÃ³
+      session: SessiÃ³
+      trace: TraÃ§
+      tracepoint: Punt de traÃ§
+      tracetag: Etiqueta del traÃ§
+      user: Usuari
+      user_preference: PreferÃ¨ncies d'usuari
+      way: CamÃ­
+      way_node: Node del camÃ­
+      way_tag: Etiqueta del camÃ­
+  browse: 
+    changeset: 
+      changeset: Conjunt de canvis {{id}}
+      changesetxml: XML del conjunt de canvis
+      download: Baixa {{changeset_xml_link}} o {{osmchange_xml_link}}
+      osmchangexml: XML en format osmChange
+      title: Conjunt de canvis
+    changeset_details: 
       belongs_to: "Pertany a:"
-      show_area_box: "Mostra caixa de l'Ã rea"
-      box: "caixa"
+      box: caixa
+      closed_at: "Tancat el:"
+      created_at: "Creat el:"
       has_nodes: "TÃ© els segÃ¼ents {{count}} nodes:"
-      has_ways: "TÃ© els segÃ¼ents {{count}} camins:"
       has_relations: "TÃ© les segÃ¼ents {{count}} relacions:"
-    common_details:
+      has_ways: "TÃ© els segÃ¼ents {{count}} camins:"
+      show_area_box: Mostra caixa de l'Ã rea
+    common_details: 
+      changeset_comment: "Comentari:"
       edited_at: "Editat:"
       edited_by: "Editat per:"
-      version: "VersiÃ³"
       in_changeset: "Al conjunt de canvis:"
-    containing_relation:
-      entry: "RelaciÃ³ {{relation_name}}"
-      entry_role: "RelaciÃ³ {{relation_name}} (com a  {{relation_role}})"
-    map:
-      loading: "Carregant..."
-      deleted: "Esborrat"
-    node_details:
+      version: VersiÃ³
+    containing_relation: 
+      entry: RelaciÃ³ {{relation_name}}
+      entry_role: RelaciÃ³ {{relation_name}} (com a  {{relation_role}})
+    map: 
+      deleted: Esborrat
+      loading: Carregant...
+    node: 
+      download: "{{download_xml_link}} o {{view_history_link}}"
+      download_xml: Baixa l'XML
+      node: Node
+      node_title: "Node: {{node_name}}"
+      view_history: visualitza l'historial
+    node_details: 
       coordinates: "Coordenades:"
       part_of: "Part de:"
-    node_history:
-      node_history: "Historial del node"
+    node_history: 
       download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: "Baixa l'XML"
-      view_details: "veure detalls"
-    node:
-      node: "Node"
-      node_title: "Node: {{node_name}}"
-      download: "{{download_xml_link}} o {{view_history_link}}"
-      download_xml: "Baixa l'XML"
-      view_history: "visualitza l'historial"
-    not_found:
-      sorry: "Ho sentim, no s'ha trobat el {{type}} amb l'id {{id}}."
-      type:
-        node: "node"
-        way: "camÃ­"
-        relation: "relaciÃ³"
-    paging_nav:
-      showing_page: "Mostrant pÃ gina"
-      of: "de"
-    relation_details:
+      download_xml: Baixa l'XML
+      node_history: Historial del node
+      view_details: veure detalls
+    not_found: 
+      sorry: Ho sentim, no s'ha trobat el {{type}} amb l'id {{id}}.
+      type: 
+        node: node
+        relation: relaciÃ³
+        way: camÃ­
+    paging_nav: 
+      of: de
+      showing_page: Mostrant pÃ gina
+    relation: 
+      download: "{{download_xml_link}} oo {{view_history_link}}"
+      download_xml: Baixa l'XML
+      relation: RelaciÃ³
+      relation_title: "RelaciÃ³: {{relation_name}}"
+      view_history: visualitza l'historial
+    relation_details: 
       members: "Membres:"
       part_of: "Part de:"
-    relation_history:
-      relation_history: "Historial de la relaciÃ³"
+    relation_history: 
+      relation_history: Historial de la relaciÃ³
       relation_history_title: "Historial de la relaciÃ³: {{relation_name}}"
-    relation:
-      relation: "RelaciÃ³"
-      relation_title: "RelaciÃ³: {{relation_name}}"
-      download: "{{download_xml_link}} oo {{view_history_link}}"
-      download_xml: "Baixa l'XML"
-      view_history: "visualitza l'historial"
-    start:
-      view_data: "Visualitza la informaciÃ³ per a la vista del mapa actual"
-      manually_select: "SelÂ·lecciona una altra Ã rea manualment"
-    start_rjs:
-      data_layer_name: "InformaciÃ³"
-      data_frame_title: "InformaciÃ³"
-      object_list:
-        type:
-          way: "CamÃ­"
-        selected:
-          type:
-            way: "CamÃ­ [[id]]"
-    way:
-      way: "CamÃ­"
-  diary_entry:
-    edit:
-      language: "Idioma"
-
+    start: 
+      manually_select: SelÂ·lecciona una altra Ã rea manualment
+      view_data: Visualitza la informaciÃ³ per a la vista del mapa actual
+    start_rjs: 
+      data_frame_title: InformaciÃ³
+      data_layer_name: InformaciÃ³
+      details: Detalls
+      object_list: 
+        details: Detalls
+        history: 
+          type: 
+            node: Node [[id]]
+        selected: 
+          type: 
+            node: Node [[id]]
+            way: CamÃ­ [[id]]
+        type: 
+          node: Node
+          way: CamÃ­
+    way: 
+      way: CamÃ­
+  changeset: 
+    list: 
+      heading: Conjunt de canvis
+      heading_bbox: Conjunt de canvis
+      heading_user: Conjunt de canvis
+      heading_user_bbox: Conjunt de canvis
+      title: Conjunt de canvis
+  diary_entry: 
+    edit: 
+      language: Idioma
+  map: 
+    coordinates: "Coordenades:"
+    edit: Edita
+    view: Veure
+  trace: 
+    edit: 
+      map: mapa
+      owner: "Propietari:"
+      points: "Punts:"
+      visibility: "Visibilitat:"
+    trace: 
+      ago: fa {{time_in_words_ago}}
+      by: en
+      in: a
+    trace_paging_nav: 
+      of: de
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 452c628f8..c327781dd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,991 +1,956 @@
-de:
-  html: 
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site (1. Teil nicht so wichtig!)
-    models:
-      acl: "Liste fÃ¼r Zugangskontrolle"
-      changeset: "Changeset"
-      changeset_tag: "Changeset-Tag"
-      country: "Land"
-      diary_comment: "Blog-Kommentar"
-      diary_entry: "Blogeintrag"
-      friend: "Freund"
-      language: "Sprache"
-      message: "Nachricht"
-      node: "Knoten"
-      node_tag: "Knoten-Tag"
-      notifier: "Benachrichtigung"
-      old_node: "Alter Knoten"
-      old_node_tag: "Alter Knoten-Tag"
-      old_relation: "Alte Relation"
-      old_relation_member: "Altes Relation-Mitglied"
-      old_relation_tag: "Alter Relation-Tag"
-      old_way: "Alter Weg"
-      old_way_node: "Alter Weg-Knoten"
-      old_way_tag: "Alter Weg-Tag"
-      relation: "Relation"
-      relation_member: "Relation-Mitglied"
-      relation_tag: "Relation-Tag"
-      session: "Sitzung"
-      trace: "Track"
-      tracepoint: "Track-Punkt"
-      tracetag: "Track-Tag"
-      user: "Benutzer"
-      user_preference: "Benutzer-Einstellungen"
-      user_token: "Benutzer-KÃ¼rzel"
-      way: "Weg"
-      way_node: "Weg-Knoten"
-      way_tag: "Weg-Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Text"
-      diary_entry:
-        user: "Benutzer"
-        title: "Titel"
-        latitude: "Breitengrad"
-        longitude: "LÃ¤ngengrad"
-        language: "Sprache"
-      friend:
-        user: "Benutzer"
-        friend: "Freund"
-      trace:
-        user: "Benutzer"
-        visible: "Sichtbar"
-        name: "Name"
-        size: "GrÃ¶Ãe"
-        latitude: "Breitengrad"
-        longitude: "LÃ¤ngengrad"
-        public: "Ãffentlich"
-        description: "Beschreibung"
-      message:
-        sender: "Sender"
-        title: "Titel"
-        body: "Text"
-        recipient: "EmpfÃ¤nger"
-      user:
-        email: "E-Mail"
-        active: "Aktiv"
-        display_name: "Name anzeigen"
-        description: "Beschreibung"
-        languages: "Sprachen"
-        pass_crypt: "Passwort"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: Karte
-    edit: Bearbeiten
-    coordinates: "Koordinaten:"
-  browse:
-    changeset:
-      title: "Changeset" 
+de: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Text
+      diary_entry: 
+        language: Sprache
+        latitude: Breitengrad
+        longitude: LÃ¤ngengrad
+        title: Titel
+        user: Benutzer
+      friend: 
+        friend: Freund
+        user: Benutzer
+      message: 
+        body: Text
+        recipient: EmpfÃ¤nger
+        sender: Sender
+        title: Titel
+      trace: 
+        description: Beschreibung
+        latitude: Breitengrad
+        longitude: LÃ¤ngengrad
+        name: Name
+        public: Ãffentlich
+        size: GrÃ¶Ãe
+        user: Benutzer
+        visible: Sichtbar
+      user: 
+        active: Aktiv
+        description: Beschreibung
+        display_name: Name zum Anzeigen
+        email: E-Mail
+        languages: Sprachen
+        pass_crypt: Passwort
+    models: 
+      acl: Liste fÃ¼r Zugangskontrolle
+      changeset: Changeset
+      changeset_tag: Changeset-Tag
+      country: Land
+      diary_comment: Blog-Kommentar
+      diary_entry: Blogeintrag
+      friend: Freund
+      language: Sprache
+      message: Nachricht
+      node: Knoten
+      node_tag: Knoten-Tag
+      notifier: Benachrichtigung
+      old_node: Alter Knoten
+      old_node_tag: Alter Knoten-Tag
+      old_relation: Alte Relation
+      old_relation_member: Altes Relation-Mitglied
+      old_relation_tag: Alter Relation-Tag
+      old_way: Alter Weg
+      old_way_node: Alter Weg-Knoten
+      old_way_tag: Alter Weg-Tag
+      relation: Relation
+      relation_member: Relation-Mitglied
+      relation_tag: Relation-Tag
+      session: Sitzung
+      trace: Track
+      tracepoint: Track-Punkt
+      tracetag: Track-Tag
+      user: Benutzer
+      user_preference: Benutzer-Einstellungen
+      user_token: Benutzer-KÃ¼rzel
+      way: Weg
+      way_node: Weg-Knoten
+      way_tag: Weg-Tag
+  browse: 
+    changeset: 
       changeset: "Changeset: {{id}}"
+      changesetxml: Changeset XML
       download: "{{changeset_xml_link}} oder {{osmchange_xml_link}} herunterladen"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset {{id}}"
-        title_comment: "Changeset {{id}} - {{comment}}"
-    changeset_navigation:
-      user:
-        name_tooltip: "Ãnderungen von {{user}} anzeigen"
-        prev_tooltip: "Vorherige Ãnderung von {{user}}"
-        next_tooltip: "NÃ¤chste Ãnderung von {{user}}"
-      all:
-        prev_tooltip: "Vorheriges Changeset"
-        next_tooltip: "NÃ¤chstes Changeset"
-    changeset_details:
-      created_at: "Erstellt am:"
-      closed_at: "Geschlossen am:"
+      feed: 
+        title: Changeset {{id}}
+        title_comment: Changeset {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Changeset
+    changeset_details: 
       belongs_to: "Erstellt von:"
       bounding_box: "Bereich:"
-      no_bounding_box: "FÃ¼r dieses Changeset wurde kein Bereich gespeichert."
-      show_area_box: "Bereichsgrenze anzeigen"
-      box: "Bereichsgrenze"
-      has_nodes:
+      box: Bereichsgrenze
+      closed_at: "Geschlossen am:"
+      created_at: "Erstellt am:"
+      has_nodes: 
         one: "EnthÃ¤lt folgenden Knoten:"
         other: "EnhÃ¤lt folgende {{count}} Knoten:"
-      has_ways:
-        one:  "EnthÃ¤lt folgenden Weg:"
-        other: "EnthÃ¤lt folgende {{count}} Wege:"
-      has_relations:
-        one:  "EnthÃ¤lt folgende Relation:"
+      has_relations: 
+        one: "EnthÃ¤lt folgende Relation:"
         other: "EnthÃ¤lt folgende {{count}} Relationen:"
+      has_ways: 
+        one: "EnthÃ¤lt folgenden Weg:"
+        other: "EnthÃ¤lt folgende {{count}} Wege:"
+      no_bounding_box: FÃ¼r dieses Changeset wurde kein Bereich gespeichert.
+      show_area_box: Bereichsgrenze anzeigen
+    changeset_navigation: 
+      all: 
+        next_tooltip: NÃ¤chstes Changeset
+        prev_tooltip: Vorheriges Changeset
+      user: 
+        name_tooltip: Ãnderungen von {{user}} anzeigen
+        next_tooltip: NÃ¤chste Ãnderung von {{user}}
+        prev_tooltip: Vorherige Ãnderung von {{user}}
     common_details: 
+      changeset_comment: "Kommentar:"
       edited_at: "Bearbeitet am:"
       edited_by: "Bearbeitet von:"
-      version: "Version:"
       in_changeset: "Im Changeset:"
-    containing_relation:
-      entry: "Relation {{relation_name}}"
-      entry_role: "Relation {{relation_name}} (als {{relation_role}})"
-    map:
-      loading: "Laden..."
-      deleted: "GelÃ¶scht"
-      larger:
-        area: "Bereich grÃ¶Ãerer Karte"
-        node: "Knoten auf grÃ¶Ãerer Karte"
-        way: "Weg auf grÃ¶Ãerer Karte"
-        relation: "Relation auf grÃ¶Ãerer Karte"
-    node_details:
+      version: "Version:"
+    containing_relation: 
+      entry: Relation {{relation_name}}
+      entry_role: Relation {{relation_name}} (als {{relation_role}})
+    map: 
+      deleted: GelÃ¶scht
+      larger: 
+        area: Bereich grÃ¶Ãerer Karte
+        node: Knoten auf grÃ¶Ãerer Karte
+        relation: Relation auf grÃ¶Ãerer Karte
+        way: Weg auf grÃ¶Ãerer Karte
+      loading: Laden â¦
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
+      download_xml: XML herunterladen
+      edit: Bearbeiten
+      node: Knoten
+      node_title: "Knoten: {{node_name}}"
+      view_history: Chronik anzeigen
+    node_details: 
       coordinates: "Koordinaten:"
       part_of: "Teil von:"
-    node_history:
-      node_history: "Knoten-Chronik"
-      node_history_title: "Knoten-Chronik: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} oder {{view_details_link}}"
-      download_xml: "XML herunterladen"
-      view_details: "Detailseite anzeigen"
-    node:
-      node: "Knoten"
-      node_title: "Knoten: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
-      download_xml: "XML herunterladen"
-      view_history: "Chronik anzeigen"
-      edit: "Bearbeiten"
-    not_found:
-      sorry: "Wir konnten den {{type}} mit der Nummer {{id}} leider nicht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt."
-      type:
+      download_xml: XML herunterladen
+      node_history: Knoten-Chronik
+      node_history_title: "Knoten-Chronik: {{node_name}}"
+      view_details: Detailseite anzeigen
+    not_found: 
+      sorry: Wir konnten den {{type}} mit der Nummer {{id}} leider nicht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt.
+      type: 
+        changeset: Menge von Ãnderungen
         node: Knoten
-        way: Weg
         relation: Relation
-    paging_nav:
-      showing_page: "Zeige Seite"
-      of: "von"
-    relation_details:
+        way: Weg
+    paging_nav: 
+      of: von
+      showing_page: Zeige Seite
+    relation: 
+      download: "{{download_xml_link}} oder {{view_history_link}}"
+      download_xml: XML herunterladen
+      relation: Relation
+      relation_title: "Relation: {{relation_name}}"
+      view_history: Chronik anzeigen
+    relation_details: 
       members: "Mitglieder:"
       part_of: "Mitglied von:"
-    relation_history:
-      relation_history: "Relations-Chronik"
-      relation_history_title: "Relations-Chronik: {{relation_name}}"
+    relation_history: 
       download: "{{download_xml_link}} oder {{view_details_link}}"
-      download_xml: "XML herungerladen"
-      view_details: "Details anzeigen"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: XML herunterladen
+      relation_history: Relations-Chronik
+      relation_history_title: "Relations-Chronik: {{relation_name}}"
+      view_details: Details anzeigen
+    relation_member: 
       entry_role: "{{type}} {{name}} als {{role}}"
-      type:
-        node: "Knoten"
-        way: "Weg"
-        relation: "Relation"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: {{relation_name}}"
-      download: "{{download_xml_link}} oder {{view_history_link}}"
-      download_xml: "XML herunterladen"
-      view_history: "Chronik anzeigen"
-    start:
-      view_data: "Daten des aktuellen Kartenausschnitts anzeigen"
-      manually_select: "Einen anderen Kartenausschnitt manuell auswÃ¤hlen"
-    start_rjs:
-      data_layer_name: "Daten"
-      data_frame_title: "Daten"
-      zoom_or_select: "Karte vergrÃ¶ssern oder einen Bereich auf der Karte auswÃ¤hlen"
-      drag_a_box: "Einen Rahmen Ã¼ber die Karte aufziehen, um einen Bereich auszuwÃ¤hlen"
-      manually_select: "Einen anderen Kartenausschnitt manuell auswÃ¤hlen"
-      loaded_an_area_with_num_features: "Du hast einen Bereich geladen, der [[num_features]] Elemente enthÃ¤lt. Manche Browser haben Probleme bei der Darstellung einer so groÃen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lÃ¤sst ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf \'Daten laden\' unten."
-      load_data: "Daten laden"
+      type: 
+        node: Knoten
+        relation: Relation
+        way: Weg
+    start: 
+      manually_select: Einen anderen Kartenausschnitt manuell auswÃ¤hlen
+      view_data: Daten des aktuellen Kartenausschnitts anzeigen
+    start_rjs: 
+      data_frame_title: Daten
+      data_layer_name: Daten
+      details: Details
+      drag_a_box: Einen Rahmen Ã¼ber die Karte aufziehen, um einen Bereich auszuwÃ¤hlen
+      edited_by_user_at_timestamp: Bearbeitet von [[user]] am [[timestamp]]
+      history_for_feature: Chronik fÃ¼r [[feature]]
+      load_data: Daten laden
+      loaded_an_area_with_num_features: Du hast einen Bereich geladen, der [[num_features]] Elemente enthÃ¤lt. Manche Browser haben Probleme bei der Darstellung einer so groÃen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lÃ¤sst ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf âDaten ladenâ unten.
+      loading: Laden â¦
+      manually_select: Einen anderen Kartenausschnitt manuell auswÃ¤hlen
+      object_list: 
+        api: Diesen Bereich von der API abfragen
+        back: Objektliste anzeigen
+        details: Details
+        heading: Objektliste
+        history: 
+          type: 
+            node: Knoten [[id]]
+            way: Weg [[id]]
+        selected: 
+          type: 
+            node: Knoten [[id]]
+            way: Weg [[id]]
+        type: 
+          node: Knoten
+          way: Weg
+      private_user: Anonymer Benutzer
+      show_history: Chronik
       unable_to_load_size: "Konnte nicht geladen werden: Bereich der GrÃ¶Ãe [[bbox_size]] ist zu groÃ (soll kleiner als {{max_bbox_size}} sein)"
-      loading: "Laden..."
-      show_history: "Chronik"
-      wait: "Verarbeiten..."
-      history_for_feature: "Chronik fÃ¼r [[feature]]"
-      details: "Details"
-      private_user: "Anonymer Benutzer"
-      edited_by_user_at_timestamp: "Bearbeitet von [[user]] am [[timestamp]]"
-      object_list:
-        heading: "Objektliste"
-        back: "Objektliste anzeigen"
-        type:
-          node: "Knoten"
-          way: "Weg"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Diesen Bereich von der API abfragen"
-        details: "Details"
-        selected:
-          type:
-            node: "Knoten [[id]]"
-            way: "Weg [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Knoten [[id]]"
-            way: "Weg [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: Verarbeiten â¦
+      zoom_or_select: Karte vergrÃ¶ssern oder einen Bereich auf der Karte auswÃ¤hlen
+    tag_details: 
       tags: "Tags:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
+      download_xml: Download als XML
+      edit: Bearbeiten
+      view_history: Chronik anzeigen
+      way: Weg
+      way_title: "Weg: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: Auch Teil des Wegs {{related_ways}}
+        other: Auch Teil der Wege {{related_ways}}
       nodes: "Knoten:"
       part_of: "Teil von:"
-      also_part_of:
-        one: "Auch Teil des Wegs {{related_ways}}"
-        other: "Auch Teil der Wege {{related_ways}}"
-    way_history:
-      way_history: "Wege-Chronik"
-      way_history_title: "Chronik des Wegs: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} oder {{view_details_link}}"
-      download_xml: "Download als XML"
-      view_details: "Detailseite anzeigen"
-    way:
-      way: "Weg"
-      way_title: "Weg: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
-      download_xml: "Download als XML"
-      view_history: "Chronik anzeigen"
-      edit: "Bearbeiten"
-  changeset:
+      download_xml: Download als XML
+      view_details: Detailseite anzeigen
+      way_history: Wege-Chronik
+      way_history_title: "Chronik des Wegs: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonym
+      big_area: (groÃ)
+      no_comment: (kein Kommentar)
+      no_edits: (keine Bearbeitung)
+      show_area_box: Bereich anzeigen
+      still_editing: (in Bearbeitung)
+      view_changeset_details: Details des Changesets
     changeset_paging_nav: 
-      showing_page: "Seite"
-      of: "von"
-    changeset:
-      id: "#{{id}}"
-      still_editing: "(in Bearbeitung)"
-      anonymous: "Anonym"
-      no_comment: "(kein Kommentar)"
-      no_edits: "(keine Bearbeitung)"
-      show_area_box: "Bereich anzeigen"
-      big_area: "(groÃ)"
-      view_changeset_details: "Details des Changesets"
-    changesets:
-      id: "ID"
-      saved_at: "Gespeichert am"
-      user: "Benutzer"
-      comment: "Kommentar"
-      area: "Bereich"
-    list:
-      title: "Changesets"
-      title_user: "Changesets von {{user}}"
-      title_bbox: "Changesets in {{bbox}}"
-      title_user_bbox: "Changesets von {{user}} in {{bbox}}"
-
-      heading: "Changesets"
-      heading_user: "Changesets"
-      heading_bbox: "Changesets"
-      heading_user_bbox: "Changesets"
-
-      description: "Letzte Ãnderungen"
-      description_user: "Letzte Ãnderungen von {{user}}"
-      description_bbox: "Letzte Ãnderungen in {{bbox}}"
-      description_user_bbox: "Letzte Ãnderungen von {{user}} in {{bbox}}"
-  diary_entry:
-    new:
-      title: Selbst Bloggen
-    list:
-      title: "Blogs"
-      user_title: "{{user}}s Blog" 
-      in_language_title: "Blogeintrag in {{language}}"
-      new: Selbst Bloggen
-      new_title: Blogeintrag erstellen
-      no_entries: Dieser Benutzer hat noch kein Blog
-      recent_entries: "Neuste EintrÃ¤ge:"
-      older_entries: Ãltere
-      newer_entries: Neuere
-    edit:
-      title: "Eintrag bearbeiten"
-      subject: "Betreff:"
+      of: von
+      showing_page: Seite
+    changesets: 
+      area: Bereich
+      comment: Kommentar
+      id: ID
+      saved_at: Gespeichert am
+      user: Benutzer
+    list: 
+      description: Letzte Ãnderungen
+      description_bbox: Letzte Ãnderungen in {{bbox}}
+      description_user: Letzte Ãnderungen von {{user}}
+      description_user_bbox: Letzte Ãnderungen von {{user}} in {{bbox}}
+      heading: Changesets
+      heading_bbox: Changesets
+      heading_user: Changesets
+      heading_user_bbox: Changesets
+      title: Changesets
+      title_bbox: Changesets in {{bbox}}
+      title_user: Changesets von {{user}}
+      title_user_bbox: Changesets von {{user}} in {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Kommentar von {{link_user}} am {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 Kommentar
+        other: "{{count}} Kommentare"
+      comment_link: Kommentar zu diesem Eintrag
+      edit_link: Diesen Eintrag bearbeiten
+      posted_by: Verfasst von {{link_user}} am {{created}} in {{language_link}}
+      reply_link: Auf diesen Eintrag antworten
+    edit: 
       body: "Text:"
       language: "Sprache:"
-      location: "Ort:"
       latitude: "Breitengrad:"
+      location: "Ort:"
       longitude: "LÃ¤ngengrad:"
-      use_map_link: "Karte anzeigen"
-      save_button: "Speichern"
       marker_text: Ort des Eintrags
-    view:
-      title: "Benutzer-Blogs | {{user}}"
+      save_button: Speichern
+      subject: "Betreff:"
+      title: Eintrag bearbeiten
+      use_map_link: Karte anzeigen
+    feed: 
+      all: 
+        description: Recent diary entries from users of OpenStreetMap
+        title: OpenStreetMap diary entries
+      language: 
+        description: Letze BlogeintrÃ¤ge von Benutzern von OpenStreetMap in {{language_name}}
+        title: OpenStreetMap BlogeintrÃ¤ge in {{language_name}}
+      user: 
+        description: Letzte OpenStreetMap BlogeintrÃ¤ge von {{user}}
+        title: OpenStreetMap BlogeintrÃ¤ge von {{user}}
+    list: 
+      in_language_title: Blogeintrag in {{language}}
+      new: Selbst Bloggen
+      new_title: Blogeintrag erstellen
+      newer_entries: Neuere
+      no_entries: Dieser Benutzer hat noch kein Blog
+      older_entries: Ãltere
+      recent_entries: "Neuste EintrÃ¤ge:"
+      title: Blogs
       user_title: "{{user}}s Blog"
-      leave_a_comment: "Schreibe einen Kommentar"
-      save_button: "Speichern"
-      login_to_leave_a_comment: "{{login_link}}, um einen Kommentar zu schreiben" 
-      login: "Anmelden"
-    no_such_entry:
-      title: "Blogeintrag nicht gefunden"
-      heading: "Kein Blogeintrag mit der Nummer {{id}}"
-      body: "Wir konnten leider keinen Blogeintrag oder Kommentar mit der Nummer {{id}} finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt."
-    no_such_user:
-      title: "Benutzer nicht gefunden"
-      heading: "Der Benutzer {{user}} existiert nicht"
-      body: "Wir konnten leider keinen Benutzer mit dem Namen {{user}} finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt."
-    diary_entry:
-      posted_by: "Verfasst von {{link_user}} am {{created}} in {{language_link}}"
-      comment_link: Kommentar zu diesem Eintrag
-      reply_link: Auf diesen Eintrag antworten
-      comment_count:
-        one: 1 Kommentar
-        other: "{{count}} Kommentare"
-      edit_link: Diesen Eintrag bearbeiten
-    diary_comment:
-      comment_from: "Kommentar von {{link_user}} am {{comment_created_at}}"
-    feed:
-      user:
-        title: "OpenStreetMap BlogeintrÃ¤ge von {{user}}"
-        description: "Letzte OpenStreetMap BlogeintrÃ¤ge von {{user}}"
-      language:
-        title: "OpenStreetMap BlogeintrÃ¤ge in {{language_name}}"
-        description: "Letze BlogeintrÃ¤ge von Benutzern von OpenStreetMap in {{language_name}}"
-      all:
-        title: "OpenStreetMap diary entries"
-        description: "Recent diary entries from users of OpenStreetMap"
-  export:
-    start:
-      area_to_export: "Bereich fÃ¼r den Export"
-      manually_select: "Einen anderen Bereich manuell auswÃ¤hlen"
-      format_to_export: "Format fÃ¼r den Export"
-      osm_xml_data: "OpenStreetMap-XML-Daten"
-      mapnik_image: "Mapnik-Bild"
-      osmarender_image: "Osmarender-Bild"
-      embeddable_html: "HTML zum Einbinden"
-      licence: "Lizenz"
-      export_details: 'Die von OpenStreetMap zur VerfÃ¼gung gestellten Daten sind unter der <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Lizenz</a> lizenziert.'
-      options: "Optionen"
-      format: "Format"
-      scale: "MaÃstab"
-      max: "max."
-      image_size: "BildgrÃ¶Ãe"
-      zoom: "Zoom"
-      add_marker: "Markierung zur Karte hinzufÃ¼gen"
+    new: 
+      title: Selbst Bloggen
+    no_such_entry: 
+      body: Wir konnten leider keinen Blogeintrag oder Kommentar mit der Nummer {{id}} finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt.
+      heading: Kein Blogeintrag mit der Nummer {{id}}
+      title: Blogeintrag nicht gefunden
+    no_such_user: 
+      body: Wir konnten leider keinen Benutzer mit dem Namen {{user}} finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt.
+      heading: Der Benutzer {{user}} existiert nicht
+      title: Benutzer nicht gefunden
+    view: 
+      leave_a_comment: Schreibe einen Kommentar
+      login: Anmelden
+      login_to_leave_a_comment: "{{login_link}}, um einen Kommentar zu schreiben"
+      save_button: Speichern
+      title: Benutzer-Blogs | {{user}}
+      user_title: "{{user}}s Blog"
+  export: 
+    start: 
+      add_marker: Markierung zur Karte hinzufÃ¼gen
+      area_to_export: Bereich fÃ¼r den Export
+      embeddable_html: HTML zum Einbinden
+      export_button: Export
+      export_details: Die von OpenStreetMap zur VerfÃ¼gung gestellten Daten sind unter der <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 Lizenz</a> lizenziert.
+      format: Format
+      format_to_export: Format fÃ¼r den Export
+      image_size: BildgrÃ¶Ãe
       latitude: "Breitengrad:"
+      licence: Lizenz
       longitude: "LÃ¤ngengrad:"
-      output: "Ausgabe"
-      paste_html: "HTML-Code kopieren, um ihn in eine Website einzufÃ¼gen."
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Einen Rahmen Ã¼ber der Karte aufziehen, um einen Bereich auszuwÃ¤hlen"
-      manually_select: "Einen anderen Kartenausschnitt manuell auswÃ¤hlen"
-      click_add_marker: "Auf die Karte klicken, um eine Markierung hinzuzufÃ¼gen"
-      change_marker: "Position der Markierung Ã¤ndern"
-      add_marker: "Markierung zur Karte hinzufÃ¼gen"
-      view_larger_map: "GrÃ¶Ãere Karte anzeigen"
-  geocoder:
-    search:
-      title:
-        latlon: 'Suchergebnisse von <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Suchergebnisse von <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Suchergebnisse von <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Suchergebnisse von <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Suchergebnisse von <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} von {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} vom <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Ort von <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
+      manually_select: Einen anderen Bereich manuell auswÃ¤hlen
+      mapnik_image: Mapnik-Bild
+      max: max.
+      options: Optionen
+      osm_xml_data: OpenStreetMap-XML-Daten
+      osmarender_image: Osmarender-Bild
+      output: Ausgabe
+      paste_html: HTML-Code kopieren, um ihn in eine Website einzufÃ¼gen.
+      scale: MaÃstab
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Markierung zur Karte hinzufÃ¼gen
+      change_marker: Position der Markierung Ã¤ndern
+      click_add_marker: Auf die Karte klicken, um eine Markierung hinzuzufÃ¼gen
+      drag_a_box: Einen Rahmen Ã¼ber der Karte aufziehen, um einen Bereich auszuwÃ¤hlen
+      export: Export
+      manually_select: Einen anderen Kartenausschnitt manuell auswÃ¤hlen
+      view_larger_map: GrÃ¶Ãere Karte anzeigen
+  geocoder: 
+    description: 
+      title: 
+        geonames: Ort von <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} vom <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
         cities: GroÃstÃ¤dte
-        towns: StÃ¤dte
         places: Orte
-    description_osm_namefinder:
+        towns: StÃ¤dte
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} von {{type}}"
-    results:
-      no_results: "Keine Ergebnisse"
-    distance:
-      zero: "weniger als 1km"
-      one: "ca. 1km"
-      other: "ca. {{count}}km"
-    direction:
-      south_west: "sÃ¼dwestlich"
-      south: "sÃ¼dlich"
-      south_east: "sÃ¼dÃ¶stlich"
-      east: "Ã¶stlich"
-      north_east: "nordÃ¶stlich"
-      north: "nÃ¶rdlich"
-      north_west: "nordwestlich"
-      west: "westlich"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap Logo
-    welcome_user: "Willkommen, {{user_link}}"
-    welcome_user_link_tooltip: Eigene Benutzerseite
+    direction: 
+      east: Ã¶stlich
+      north: nÃ¶rdlich
+      north_east: nordÃ¶stlich
+      north_west: nordwestlich
+      south: sÃ¼dlich
+      south_east: sÃ¼dÃ¶stlich
+      south_west: sÃ¼dwestlich
+      west: westlich
+    distance: 
+      one: ca. 1 km
+      other: ca. {{count}} km
+      zero: weniger als 1 km
+    results: 
+      no_results: Keine Ergebnisse
+    search: 
+      title: 
+        ca_postcode: Suchergebnisse von <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Suchergebnisse von <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Suchergebnisse von <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Suchergebnisse von <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Suchergebnisse von <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} von {{placename}}"
+  layouts: 
+    alt_donation: Spenden
+    donate: UnterstÃ¼tze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
+    donate_link_text: Spende
+    edit: Bearbeiten
+    edit_tooltip: Karte bearbeiten
+    export: Export
+    export_tooltip: Kartendaten exportieren
+    gps_traces: GPS-Tracks
+    gps_traces_tooltip: GPS-Tracks anzeigen und verwalten
+    help_wiki: Hilfe & Wiki
+    help_wiki_tooltip: Hilfe &amp; Wiki des Projekts
+    help_wiki_url: http://wiki.openstreetmap.org/index.php?title=Hauptseite&uselang=de
+    history: Chronik
+    history_tooltip: Ãnderungen der Kartendaten anzeigen
     home: Standort
     home_tooltip: Eigener Standort
-    inbox: "Posteingang ({{count}})"
-    inbox_tooltip:
-      zero: Dein Posteingang enthÃ¤lt keine ungelesenen Nachrichten
+    inbox: Posteingang ({{count}})
+    inbox_tooltip: 
       one: Dein Posteingang enthÃ¤lt 1 ungelesene Nachricht
       other: Dein Posteingang enthÃ¤lt {{count}} ungelesene Nachrichten
-    logout: Abmelden
-    logout_tooltip: "Abmelden"
+      zero: Dein Posteingang enthÃ¤lt keine ungelesenen Nachrichten
+    intro_1: OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird.
+    intro_2: OpenStreetMap ermÃ¶glicht es geographische Daten gemeinschaftlich von Ã¼berall auf der Welt anzuschauen und zu bearbeiten.
+    intro_3: Das Hosting der OpenStreetMap-Server wird freundlicherweise von {{ucl}} und {{bytemark}} unterstÃ¼tzt.
     log_in: Anmelden
     log_in_tooltip: FÃ¼r dein Benutzerkonto anmelden
+    logo: 
+      alt_text: OpenStreetMap Logo
+    logout: Abmelden
+    logout_tooltip: Abmelden
+    news_blog: News-Blog
+    news_blog_tooltip: News-Blog Ã¼ber OpenStreetMap, freie geographische Daten, etc.
+    osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfÃ¼gbar.
+    osm_read_only: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im "Nur-Lesen-Modus".
+    shop: Shop
+    shop_tooltip: Shop fÃ¼r Artikel mit OpenStreetMap-Logo
     sign_up: Registrieren
     sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen
+    sotm: Besuche die OpenStreetMap-Konferenz, The State of the Map 2009, am 10.-12. Juli in Amsterdam!
+    tag_line: Die freie Wiki-Weltkarte
+    user_diaries: Blogs
+    user_diaries_tooltip: Benutzer-Blogs lesen
     view: Karte
     view_tooltip: Karte betrachten
+    welcome_user: Willkommen, {{user_link}}
+    welcome_user_link_tooltip: Eigene Benutzerseite
+  map: 
+    coordinates: "Koordinaten:"
     edit: Bearbeiten
-    edit_tooltip: Karte bearbeiten
-    history: Chronik
-    history_tooltip: Ãnderungen der Kartendaten anzeigen
-    export: Export
-    export_tooltip: Kartendaten exportieren 
-    gps_traces: GPS-Tracks
-    gps_traces_tooltip: GPS-Tracks anzeigen und verwalten 
-    user_diaries: Blogs
-    user_diaries_tooltip: Benutzer-Blogs lesen
-    tag_line: Die freie Wiki-Weltkarte
-    intro_1: "OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird." 
-    intro_2: "OpenStreetMap ermÃ¶glicht es geographische Daten gemeinschaftlich von Ã¼berall auf der Welt anzuschauen und zu bearbeiten."
-    intro_3: "Das Hosting der OpenStreetMap-Server wird freundlicherweise von {{ucl}} und {{bytemark}} unterstÃ¼tzt."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfÃ¼gbar."
-    osm_read_only: 'Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im "Nur-Lesen-Modus".'
-    donate: "UnterstÃ¼tze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}."
-    donate_link_text: Spende
-    help_wiki: "Hilfe & Wiki"
-    help_wiki_tooltip: "Hilfe & Wiki; Wiki des Projekts"
-    help_wiki_url: "http://wiki.openstreetmap.org/index.php?title=Hauptseite&uselang=de"
-    news_blog: "News-Blog"
-    news_blog_tooltip: "News-Blog Ã¼ber OpenStreetMap, freie geographische Daten, etc."
-    shop: Shop
-    shop_tooltip: Shop fÃ¼r Artikel mit OpenStreetMap-Logo
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Besuche die OpenStreetMap-Konferenz, The State of the Map 2009, am 10.-12. Juli in Amsterdam!'
-    alt_donation: Spenden
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} hat deinen Blogeintrag kommentiert"
+    view: Karte
+  message: 
+    delete: 
+      deleted: Nachricht gelÃ¶scht
+    inbox: 
+      date: Datum
+      from: Absender
+      my_inbox: Posteingang
+      no_messages_yet: Du hast noch keine Nachrichten. Trete doch mit {{people_mapping_nearby_link}} in Kontakt.
+      outbox: Gesendet
+      people_mapping_nearby: Mappern in deiner NÃ¤he
+      subject: Betreff
+      title: Posteingang
+      you_have: Du hast {{new_count}} neue Nachrichten und {{old_count}} alte Nachrichten
+    mark: 
+      as_read: Nachricht als gelesen markiert
+      as_unread: Nachricht als ungelesen markiert
+    message_summary: 
+      delete_button: LÃ¶schen
+      read_button: Als gelesen markieren
+      reply_button: Antworten
+      unread_button: Als ungelesen markieren
+    new: 
+      back_to_inbox: ZurÃ¼ck zum Posteingang
+      body: Text
+      message_sent: Nachricht gesendet
+      send_button: Senden
+      send_message_to: Eine Nachricht an {{name}} senden
+      subject: Betreff
+      title: Nachricht senden
+    no_such_user: 
+      body: Wir konnten leider keinen entsprechenden Benutzer oder eine entsprechende Nachricht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt.
+      heading: Benutzer oder Nachricht nicht gefunden
+      title: Benutzer oder Nachricht nicht gefunden
+    outbox: 
+      date: Datum
+      inbox: Posteingang
+      my_inbox: "{{inbox_link}}"
+      no_sent_messages: Du hast noch keine Nachrichten versendet. Trete doch mit {{people_mapping_nearby_link}} in Kontakt.
+      outbox: Gesendet
+      people_mapping_nearby: Mappern in deiner NÃ¤he
+      subject: Betreff
+      title: Gesendet
+      to: An
+      you_have_sent_messages: Du hast {{sent_count}} Nachrichten versendet
+    read: 
+      back_to_inbox: ZurÃ¼ck zum Posteingang
+      back_to_outbox: ZurÃ¼ck zu Gesendete Nachrichten
+      date: Datum
+      from: Absender
+      reading_your_messages: Eigene Nachrichten
+      reading_your_sent_messages: Deine versendeten Nachrichten lesen
+      reply_button: Antworten
+      subject: Betreff
+      title: Nachricht lesen
+      to: An
+      unread_button: Als ungelesen markieren
+    sent_message_summary: 
+      delete_button: LÃ¶schen
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                Bitte antworte nicht auf diese E-Mail.                *"
       banner2: "*     Verwende stattdessen die OpenStreetMap Website zum Antworten.    *"
-      hi: "Hallo {{to_user}},"
+      footer: Hier gehts zum Eintrag {{readurl}}, du kannst ihn kommentieren {{commenturl}} oder direkt beantworten {{replyurl}}.
       header: "{{from_user}} hat deinen Blogeintrag {{subject}} kommentiert:"
-      footer: "Hier gehts zum Eintrag {{readurl}}, du kannst ihn kommentieren {{commenturl}} oder direkt beantworten {{replyurl}}."
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} hat dir eine Nachricht gesendet"
-      banner1: "*                   Bitte antworte nicht auf diese E-Mail.                    *"
-      banner2: "*                Nutze die OpenStreetMap-Webseite, um zu antworten.           *"
-      hi: "Hallo {{to_user}},"
-      header: "{{from_user}} hat dir eine Nachricht Ã¼ber OpenStreetMap mit dem Betreff {{subject}} gesendet:"
-      footer1: "Du kannst diese Nachricht auch hier {{readurl}} lesen"
-      footer2: "und hier {{replyurl}} antworten"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} hat dich als Freund hinzugefÃ¼gt"
+      hi: Hallo {{to_user}},
+      subject: "[OpenStreetMap] {{user}} hat deinen Blogeintrag kommentiert"
+    email_confirm: 
+      subject: "[OpenStreetMap] Deine E-Mail-Adresse bestÃ¤tigen"
+    email_confirm_html: 
+      click_the_link: Wenn du das bist, bestÃ¤tige bitte deine E-Mail-Adresse mit dem Link unten
+      greeting: Hallo,
+      hopefully_you: Jemand (hoffentlich du) mÃ¶chte seine E-Mail-Adresse bei {{server_url}} zu {{new_address}} Ã¤ndern.
+    email_confirm_plain: 
+      click_the_link: Wenn du das bist, bestÃ¤tige bitte deine E-Mail-Adresse mit dem Link unten.
+      greeting: Hallo,
+      hopefully_you_1: Jemand (hoffentlich du) mÃ¶chte seine E-Mail-Adresse bei
+      hopefully_you_2: "{{server_url}} zu {{new_address}} Ã¤ndern."
+    friend_notification: 
       had_added_you: "{{user}} hat dich als Freund hinzugefÃ¼gt."
-      see_their_profile: "Sein Profil ist hier {{userurl}} zu finden, dort kannst du ihn ebenfalls als Freund hinzufÃ¼gen."
-    gpx_notification:
-      greeting: "Hallo,"
-      your_gpx_file: "Deine GPX-Datei"
-      with_description: "mit der Beschreibung"
+      see_their_profile: Sein Profil ist hier {{userurl}} zu finden, dort kannst du ihn ebenfalls als Freund hinzufÃ¼gen.
+      subject: "[OpenStreetMap] {{user}} hat dich als Freund hinzugefÃ¼gt"
+    gpx_notification: 
+      and_no_tags: und ohne Tags.
       and_the_tags: "und folgenden Tags:"
-      and_no_tags: "und ohne Tags."
-      failure:
-        subject: "[OpenStreetMap] GPX-Import Fehler"
+      failure: 
         failed_to_import: "konnte nicht importiert werden. Fehlermeldung:"
-        more_info_1: "Mehr Informationen Ã¼ber GPX-Import Fehler und wie diese vermieden werden kÃ¶nnen"
+        more_info_1: Mehr Informationen Ã¼ber GPX-Import Fehler und wie diese vermieden werden kÃ¶nnen
         more_info_2: "finden sich hier:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX-Import Fehler"
+      greeting: Hallo,
+      success: 
+        loaded_successfully: "{{trace_points}} von\n{{possible_points}} mÃ¶glichen Punkten wurden erfolgreich importiert."
         subject: "[OpenStreetMap] GPX-Import erfolgreich"
-        loaded_successfully: |
-          {{trace_points}} von
-          {{possible_points}} mÃ¶glichen Punkten wurden erfolgreich importiert.
-    signup_confirm:
+      with_description: mit der Beschreibung
+      your_gpx_file: Deine GPX-Datei
+    lost_password: 
+      subject: "[OpenStreetMap] Anfrage zum Passwort zurÃ¼cksetzen"
+    lost_password_html: 
+      click_the_link: Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurÃ¼ckzusetzen.
+      greeting: Hallo,
+      hopefully_you: Jemand (hoffentlich du) hat darum gebeten sein Passwort fÃ¼r das OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurÃ¼ckzusetzen.
+    lost_password_plain: 
+      click_the_link: Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurÃ¼ckzusetzen.
+      greeting: Hallo,
+      hopefully_you_1: Jemand (hoffentlich du) hat darum gebeten sein Passwort fÃ¼r das
+      hopefully_you_2: OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurÃ¼ckzusetzen.
+    message_notification: 
+      banner1: "*                   Bitte antworte nicht auf diese E-Mail.                    *"
+      banner2: "*                Nutze die OpenStreetMap-Webseite, um zu antworten.           *"
+      footer1: Du kannst diese Nachricht auch hier {{readurl}} lesen
+      footer2: und hier {{replyurl}} antworten
+      header: "{{from_user}} hat dir eine Nachricht Ã¼ber OpenStreetMap mit dem Betreff {{subject}} gesendet:"
+      hi: Hallo {{to_user}},
+      subject: "[OpenStreetMap] {{user}} hat dir eine Nachricht gesendet"
+    signup_confirm: 
       subject: "[OpenStreetMap] Deine E-Mail-Adresse bestÃ¤tigen"
-    signup_confirm_plain:
-      greeting: "Hallo!"
-      hopefully_you: "Jemand (hoffentlich du) mÃ¶chte ein Benutzerkonto erstellen fÃ¼r"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein"
-      click_the_link_2: "Benutzerkonto zu bestÃ¤tigen. Lies danach weiter, denn es folgen mehr Informationen Ã¼ber OSM."
+    signup_confirm_html: 
+      click_the_link: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestÃ¤tigen. Lies danach weiter, denn es folgen mehr Informationen Ã¼ber OSM.
+      current_user: Ebenso ist <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">eine Liste mit allen Benutzern in einer Kategorie</a>, die anzeigt wo diese auf der Welt sind, verfÃ¼gbar.
+      get_reading: Weitere Informationen Ã¼ber OSM findest du in <a href="http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide">unserem Wiki</a><br /><a href="http://www.opengeodata.org/">OpenGeoData.org</a> ist das OpenStreetMap Blog; dort gibt es auch einen <a href="http://www.opengeodata.org/?cat=13">Podcast</a>.
+      greeting: Hallo!
+      hopefully_you: Jemand (hoffentlich du) mÃ¶chte ein Benutzerkonto erstellen fÃ¼r
+      introductory_video: Du kannst dir das {{introductory_video_link}} anschauen.
+      more_videos: DarÃ¼ber hinaus gibt es noch viele weitere {{more_videos_link}}.
+      more_videos_here: Videos Ã¼ber OpenStreetMap
+      user_wiki_page: Es wird begrÃ¼Ãt, wenn du eine Wiki-Benutzerseite erstellst. Bitte fÃ¼ge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_MÃ¼nchen">[[Category:Users_in_MÃ¼nchen]]</a>.
+      video_to_openstreetmap: EinfÃ¼hrungsvideo zu OpenStreetMap
+      wiki_signup: Im <a href="http://wiki.openstreetmap.org/wiki/Hauptseite">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein
+      click_the_link_2: Benutzerkonto zu bestÃ¤tigen. Lies danach weiter, denn es folgen mehr Informationen Ã¼ber OSM.
+      current_user_1: Eine Liste mit allen Benutzern in einer Kategorie,
+      current_user_2: " die anzeigt wo sie auf der Welt sind, ist hier verfÃ¼gbar:"
+      greeting: Hallo!
+      hopefully_you: Jemand (hoffentlich du) mÃ¶chte ein Benutzerkonto erstellen fÃ¼r
       introductory_video: "Ein EinfÃ¼hrungsvideo zu OpenStreetMap kannst du dir hier anschauen:"
       more_videos: "Weitere Videos gibt es hier:"
-      the_wiki: "Weitere Informationen Ã¼ber OSM findest du in unserem Wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide"
       opengeodata: "OpenGeoData.org ist das OpenStreetMap Blog; dort gibt es auch einen Podcast:"
+      the_wiki: "Weitere Informationen Ã¼ber OSM findest du in unserem Wiki:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide
+      user_wiki_1: Es wird begrÃ¼Ãt wenn du dort eine Benutzerseite erstellst, welche
+      user_wiki_2: einen Kategorie-Tag enthÃ¤lt der auf deinen Standort hinweist, zum Beispiel [[Category:Users_in_MÃ¼nchen]].
       wiki_signup: "Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Hauptseite"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "Es wird begrÃ¼Ãt wenn du dort eine Benutzerseite erstellst, welche"
-      user_wiki_2: "einen Kategorie-Tag enthÃ¤lt der auf deinen Standort hinweist, zum Beispiel [[Category:Users_in_MÃ¼nchen]]."
-      current_user_1: "Eine Liste mit allen Benutzern in einer Kategorie,"
-      current_user_2: " die anzeigt wo sie auf der Welt sind, ist hier verfÃ¼gbar:"
-    signup_confirm_html:
-      greeting: "Hallo!"
-      hopefully_you: "Jemand (hoffentlich du) mÃ¶chte ein Benutzerkonto erstellen fÃ¼r"
-      click_the_link: "Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestÃ¤tigen. Lies danach weiter, denn es folgen mehr Informationen Ã¼ber OSM."
-      introductory_video: "Du kannst dir das {{introductory_video_link}} anschauen."
-      video_to_openstreetmap: "EinfÃ¼hrungsvideo zu OpenStreetMap"
-      more_videos: "DarÃ¼ber hinaus gibt es noch viele weitere {{more_videos_link}}."
-      more_videos_here: "Videos Ã¼ber OpenStreetMap"
-      get_reading: 'Weitere Informationen Ã¼ber OSM findest du in <a href="http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide">unserem Wiki</a><br /><a href="http://www.opengeodata.org/">OpenGeoData.org</a> ist das OpenStreetMap Blog; dort gibt es auch einen <a href="http://www.opengeodata.org/?cat=13">Podcast</a>.'
-      wiki_signup: 'Im <a href="http://wiki.openstreetmap.org/wiki/Hauptseite">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.'
-      user_wiki_page: 'Es wird begrÃ¼Ãt, wenn du eine Wiki-Benutzerseite erstellst. Bitte fÃ¼ge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_MÃ¼nchen">[[Category:Users_in_MÃ¼nchen]]</a>.'
-      current_user: 'Ebenso ist <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">eine Liste mit allen Benutzern in einer Kategorie</a>, die anzeigt wo diese auf der Welt sind, verfÃ¼gbar.'
-    email_confirm:
-      subject: "[OpenStreetMap] Deine E-Mail-Adresse bestÃ¤tigen"
-    email_confirm_plain:
-      greeting: "Hallo,"
-      hopefully_you_1: "Jemand (hoffentlich du) mÃ¶chte seine E-Mail-Adresse bei"
-      hopefully_you_2: "{{server_url}} zu {{new_address}} Ã¤ndern."
-      click_the_link: "Wenn du das bist, bestÃ¤tige bitte deine E-Mail-Adresse mit dem Link unten."
-    email_confirm_html:
-      greeting: "Hallo,"
-      hopefully_you: "Jemand (hoffentlich du) mÃ¶chte seine E-Mail-Adresse bei {{server_url}} zu {{new_address}} Ã¤ndern."
-      click_the_link: "Wenn du das bist, bestÃ¤tige bitte deine E-Mail-Adresse mit dem Link unten"
-    lost_password:
-      subject: "[OpenStreetMap] Anfrage zum Passwort zurÃ¼cksetzen"
-    lost_password_plain:
-      greeting: "Hallo,"
-      hopefully_you_1: "Jemand (hoffentlich du) hat darum gebeten sein Passwort fÃ¼r das"
-      hopefully_you_2: "OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurÃ¼ckzusetzen."
-      click_the_link: "Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurÃ¼ckzusetzen."
-    lost_password_html:
-      greeting: "Hallo,"
-      hopefully_you: "Jemand (hoffentlich du) hat darum gebeten sein Passwort fÃ¼r das OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurÃ¼ckzusetzen."
-      click_the_link: "Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurÃ¼ckzusetzen."
-  message:
-    inbox:
-      title: "Posteingang"
-      my_inbox: "Posteingang"
-      outbox: "Gesendet"
-      you_have: "Du hast {{new_count}} neue Nachrichten und {{old_count}} alte Nachrichten"
-      from: "Absender"
-      subject: "Betreff"
-      date: "Datum"
-      no_messages_yet: "Du hast noch keine Nachrichten. Trete doch mit {{people_mapping_nearby_link}} in Kontakt."
-      people_mapping_nearby: "Mappern in deiner NÃ¤he" 
-    message_summary:
-      unread_button: "Als ungelesen markieren"
-      read_button: "Als gelesen markieren"
-      reply_button: "Antworten"
-      delete_button: "LÃ¶schen"
-    new:
-      title: "Nachricht senden" 
-      send_message_to: "Eine Nachricht an {{name}} senden"
-      subject: "Betreff"
-      body: "Text"
-      send_button: "Senden"
-      back_to_inbox: "ZurÃ¼ck zum Posteingang"
-      message_sent: "Nachricht gesendet"
-    no_such_user:
-      title: "Benutzer oder Nachricht nicht gefunden"
-      heading: "Benutzer oder Nachricht nicht gefunden"
-      body: "Wir konnten leider keinen entsprechenden Benutzer oder eine entsprechende Nachricht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt."
-    outbox:
-      title: "Gesendet" 
-      my_inbox: "{{inbox_link}}"
-      inbox: "Posteingang"
-      outbox: "Gesendet"
-      you_have_sent_messages: "Du hast {{sent_count}} Nachrichten versendet"
-      to: "An"
-      subject: "Betreff"
-      date: "Datum"
-      no_sent_messages: "Du hast noch keine Nachrichten versendet. Trete doch mit {{people_mapping_nearby_link}} in Kontakt."
-      people_mapping_nearby: "Mappern in deiner NÃ¤he"
-    read:
-      title: "Nachricht lesen"
-      reading_your_messages: "Eigene Nachrichten"
-      from: "Absender"
-      subject: "Betreff"
-      date: "Datum"
-      reply_button: "Antworten"
-      unread_button: "Als ungelesen markieren"
-      back_to_inbox: "ZurÃ¼ck zum Posteingang"
-      reading_your_sent_messages: "Deine versendeten Nachrichten lesen"
-      to: "An"
-      back_to_outbox: "ZurÃ¼ck zu Gesendete Nachrichten"
-    sent_message_summary:
-      delete_button: "LÃ¶schen"
-    mark: 
-      as_read: "Nachricht als gelesen markiert" 
-      as_unread: "Nachricht als ungelesen markiert"
-    delete:
-      deleted: "Nachricht gelÃ¶scht"
-  site:
-    index:
-      js_1: "Dein Browser unterstÃ¼tzt kein Javascript oder du hast es deaktiviert."
-      js_2: "OpenStreetMap nutzt Javascript fÃ¼r die Kartendarstellung."
-      js_3: 'Solltest bei dir kein Javascript mÃ¶glich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.'
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Hauptseite
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: Deine privaten GPS-Tracks auszulesen
+      allow_read_prefs: Deine Benutzereinstellungen zu lesen
+      allow_to: "Erlaube der Anwendung:"
+      allow_write_api: Die OSM-Datenbank zu Ã¤ndern
+      allow_write_diary: BlogeintrÃ¤ge und Kommentare zu schreiben und Freunde einzutragen
+      allow_write_gpx: GPS-Tracks hochzuladen
+      allow_write_prefs: Deine Benutzereinstellungen zu verÃ¤ndern
+      request_access: "Die Anwendung {{app_name}} mÃ¶chte auf Deinen OpenStreetMap-Account zugreifen. Bitte entscheide, ob Du der Anwendung die folgenden Rechte gewÃ¤hren mÃ¶chtest. Du kannst alle oder einige der folgenden Rechte gewÃ¤hren:"
+    revoke: 
+      flash: You've revoked the token for {{application}}
+  oauth_clients: 
+    create: 
+      flash: Registered the information successfully
+    destroy: 
+      flash: Destroyed the client application registration
+    edit: 
+      submit: Edit
+      title: Edit your application
+    form: 
+      allow_read_gpx: read their private GPS traces.
+      allow_read_prefs: read their user preferences.
+      allow_write_api: modify the map.
+      allow_write_diary: create diary entries, comments and make friends.
+      allow_write_gpx: upload GPS traces.
+      allow_write_prefs: modify their user preferences.
+      callback_url: Callback URL
+      name: Name
+      requests: "Request the following permissions from the user:"
+      required: Required
+      support_url: Support URL
+      url: Main Application URL
+    index: 
+      application: Application Name
+      issued_at: Issued At
+      list_tokens: "The following tokens have been issued to applications in your name:"
+      my_apps: My Client Applications
+      my_tokens: My Authorised Applications
+      no_apps: Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service.
+      register_new: Register your application
+      registered_apps: "You have the following client applications registered:"
+      revoke: Revoke!
+      title: My OAuth Details
+    new: 
+      submit: Register
+      title: Register a new application
+    not_found: 
+      sorry: Sorry, that {{type}} could not be found.
+    show: 
+      access_url: "Access Token URL:"
+      allow_read_gpx: read their private GPS traces.
+      allow_read_prefs: read their user preferences.
+      allow_write_api: modify the map.
+      allow_write_diary: create diary entries, comments and make friends.
+      allow_write_gpx: upload GPS traces.
+      allow_write_prefs: modify their user preferences.
+      authorize_url: "Authorise URL:"
+      edit: Edit Details
+      key: "Consumer Key:"
+      requests: "Requesting the following permissions from the user:"
+      secret: "Consumer Secret:"
+      support_notice: We support hmac-sha1 (recommended) as well as plain text in ssl mode.
+      title: OAuth details for {{app_name}}
+      url: "Request Token URL:"
+    update: 
+      flash: Updated the client information successfully
+  site: 
+    edit: 
+      anon_edits_link_text: Hier findest du mehr Infos dazu.
+      flash_player_required: Du benÃ¶tigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor zu benutzen. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lade den Flash Player von Adobe.com herunter</a>. <a href="http://wiki.openstreetmap.org/wiki/DE:Editing">Einige andere MÃ¶glichkeiten</a>, um OpenStreetMap zu editieren, sind hier beschrieben.
+      not_public: Deine Einstellungen sind auf anonymes Bearbeiten gestellt.
+      not_public_description: Du musst deine Einstellungen auf Ã¶ffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun.
+      potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere FlÃ¤che bzw. deselektiere den Weg oder Punkt, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.)
+      user_page_link: Benutzerseite
+    index: 
+      js_1: Dein Browser unterstÃ¼tzt kein Javascript oder du hast es deaktiviert.
+      js_2: OpenStreetMap nutzt Javascript fÃ¼r die Kartendarstellung.
+      js_3: Solltest bei dir kein Javascript mÃ¶glich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne Javascript benutzen.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden.
+        project_name: OpenStreetMap Projekt
       permalink: Permalink
       shortlink: Shortlink
-      license:
-        notice: "Lizenziert unter {{license_name}} Lizenz durch das {{project_name}} und seine Mitwirkenden."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/deed.de"
-        project_name: "OpenStreetMap Projekt"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "Deine Einstellungen sind auf anonymes Bearbeiten gestellt."
-      not_public_description: "Du musst deine Einstellungen auf Ã¶ffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun."
-      user_page_link: Benutzerseite
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Hier findest du mehr Infos dazu."
-      flash_player_required: 'Du benÃ¶tigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor zu benutzen. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lade den Flash Player von Adobe.com herunter</a>. <a href="http://wiki.openstreetmap.org/wiki/DE:Editing">Einige andere MÃ¶glichkeiten</a>, um OpenStreetMap zu editieren, sind hier beschrieben.'
-      potlatch_unsaved_changes: "Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere FlÃ¤che bzw. deselektiere den Weg oder Punkt, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.)"
-    sidebar:
-      search_results: Suchergebnisse
-      close: SchlieÃen
-    search:
-      search: Suchen
-      where_am_i: "Wo bin ich?"
-      submit_text: "Go"
-      search_help: "Beispiele: 'MÃ¼nchen', 'HeinestraÃe, WÃ¼rzburg', 'CB2 5AQ', oder 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele...</a>"
-    key:
-      map_key: "Legende"
-      map_key_tooltip: "Legende fÃ¼r die Mapnik-Karte bei diesem Zoom-Level"
-      table:
-        heading: "Legende f&uuml;r Zoomstufe {{zoom_level}}"
-        entry:
-          motorway: "Autobahn"
-          trunk: "SchnellstraÃe"
-          primary: "BundesstraÃe"
-          secondary: "Landes-, KreisstraÃe"
-          unclassified: "StraÃe"
-          unsurfaced: "Unbefestigte StraÃe"
-          track: "Wald-, Feldweg"
-          byway: "Nebenweg"
-          bridleway: "Reitweg"
-          cycleway: "Fahrradweg"
-          footway: "Fussweg"
-          rail: "Eisenbahn"
-          subway: "U-Bahn"
-          tram:
-            - Light rail
-            - tram
-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
+    key: 
+      map_key: Legende
+      map_key_tooltip: Legende fÃ¼r die Mapnik-Karte bei diesem Zoom-Level
+      table: 
+        entry: 
+          admin: Landesgrenzen, sonstige Grenzen
+          allotments: Kleingartenanlage
+          apron: 
             - Airport apron
             - terminal
-          admin: "Landesgrenzen, sonstige Grenzen"
-          forest: "Forst"
-          wood: "Naturwald"
-          golf: "Golfplatz"
-          park: "Park"
-          resident: "Wohngebiet"
-          tourist: "Touristenattraktion"
-          common:
+          bridge: Dicker Rand = BrÃ¼cke
+          bridleway: Reitweg
+          brownfield: Brachland
+          building: Besonderes GebÃ¤ude
+          byway: Nebenweg
+          cable: 
+            - Cable car
+            - chair lift
+          cemetery: Friedhof
+          centre: Sportzentum
+          commercial: Gewerbegebiet
+          common: 
             - Common
             - meadow
-          retail: "Einkaufszentrum"
-          industrial: "Industriegebiet"
-          commercial: "Gewerbegebiet"
-          heathland: "Heide"
-          lake:
+          construction: StraÃe im Bau
+          cycleway: Fahrradweg
+          destination: Nur fÃ¼r Anrainer
+          farm: Landwirtschaft
+          footway: Fussweg
+          forest: Forst
+          golf: Golfplatz
+          heathland: Heide
+          industrial: Industriegebiet
+          lake: 
             - Lake
             - reservoir
-          farm: "Landwirtschaft"
-          brownfield: "Brachland"
-          cemetery: "Friedhof"
-          allotments: "Kleingartenanlage"
-          pitch: "Sportfeld"
-          centre: "Sportzentum"
-          reserve: "Naturschutzgebiet"
-          military: "MilitÃ¤rgebiet"
-          school: "Schule, UniversitÃ¤t"
-          building: "Besonderes GebÃ¤ude"
-          station: "Bahnhof"
-          summit:
+          military: MilitÃ¤rgebiet
+          motorway: Autobahn
+          park: Park
+          permissive: EingeschÃ¤nkter Zugang
+          pitch: Sportfeld
+          primary: BundesstraÃe
+          private: Privater Zugang
+          rail: Eisenbahn
+          reserve: Naturschutzgebiet
+          resident: Wohngebiet
+          retail: Einkaufszentrum
+          runway: 
+            - Airport Runway
+            - taxiway
+          school: Schule, UniversitÃ¤t
+          secondary: Landes-, KreisstraÃe
+          station: Bahnhof
+          subway: U-Bahn
+          summit: 
             - Summit
             - peak
-          tunnel: "Gestrichelter Rand = Tunnel"
-          bridge: "Dicker Rand = BrÃ¼cke"
-          private: "Privater Zugang"
-          permissive: "EingeschÃ¤nkter Zugang"
-          destination: "Nur fÃ¼r Anrainer"
-          construction: "StraÃe im Bau"
-  trace:
-    visibility:
-      private: "Private (only shared as anonymous, unordered points)"
-      public: "Public (shown in trace list and as anonymous, unordered points)"
-      trackable: "Trackable (only shared as anonymous, ordered points with timestamps)"
-      identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
-    create:
-      upload_trace: "Lade einen GPS-Track hoch"
-      trace_uploaded: "Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschlieÃend wird dir eine BestÃ¤tigungs-E-Mail gesendet."
-    edit:
-      title: "Track {{name}} bearbeiten"
-      heading: "Track {{name}} bearbeiten"
+          tourist: Touristenattraktion
+          track: Wald-, Feldweg
+          tram: 
+            - Light rail
+            - tram
+          trunk: SchnellstraÃe
+          tunnel: Gestrichelter Rand = Tunnel
+          unclassified: StraÃe
+          unsurfaced: Unbefestigte StraÃe
+          wood: Naturwald
+        heading: Legende fÃ¼r Zoomstufe {{zoom_level}}
+    search: 
+      search: Suchen
+      search_help: "Beispiele: âMÃ¼nchenâ, âHeinestraÃe, WÃ¼rzburgâ, âCB2 5AQâ, oder âpost offices near LÃ¼nenâ <a href='http://wiki.openstreetmap.org/wiki/Search'>mehr Beispiele â¦</a>"
+      submit_text: Go
+      where_am_i: Wo bin ich?
+    sidebar: 
+      close: SchlieÃen
+      search_results: Suchergebnisse
+  trace: 
+    create: 
+      trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschlieÃend wird dir eine BestÃ¤tigungs-E-Mail gesendet.
+      upload_trace: Lade einen GPS-Track hoch
+    delete: 
+      scheduled_for_deletion: FÃ¼r LÃ¶schung vorgesehener Track
+    edit: 
+      description: "Beschreibung:"
+      download: herunterladen
+      edit: bearbeiten
       filename: "Dateiname:"
-      download: "herunterladen"
-      uploaded_at: "Hochgeladen am:"
+      heading: Track {{name}} bearbeiten
+      map: Karte
+      owner: "Besitzer:"
       points: "Punkte:"
+      save_button: Speichere Ãnderungen
       start_coord: "Startkoordinate:"
-      map: "Karte"
-      edit: "bearbeiten"
-      owner: "Besitzer:"
-      description: "Beschreibung:"
       tags: "Tags:"
-      tags_help: "Trennung durch Komma" 
-      save_button: "Speichere Ãnderungen"
+      tags_help: Trennung durch Komma
+      title: Track {{name}} bearbeiten
+      uploaded_at: "Hochgeladen am:"
       visibility: "Sichtbarkeit:"
-      visibility_help: "Was heiÃt das?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      title: "Benutzer nicht gefunden"
-      heading: "Der Benutzer {{user}} existiert nicht"
-      body: "Entschuldige, wir konnten keinen Benutzer mit dem Namen {{user}} finden. Du hast dich mÃ¶glicherweise vertippt, oder du bist einem ungÃ¼ltigem Link gefolgt."
-    trace_form:
-      upload_gpx: "GPX-Datei"
-      description: "Beschreibung"
-      tags: "Tags"
-      tags_help: "Trennung durch Komma" 
-      visibility: "Sichtbarkeit"
-      visibility_help: "Was heiÃt das?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "Hochladen"
-      help: "Hilfe"
-      help_url: "http://wiki.openstreetmap.org/wiki/DE:Upload"
-    trace_header:
-      see_just_your_traces: "Eigene GPS-Tracks anzeigen oder neue hinzufÃ¼gen"
-      see_all_traces: "Alle GPS-Tracks"
-      see_your_traces: "Eigene GPS-Tracks"
+      visibility_help: Was heiÃt das?
+    list: 
+      public_traces: Ãffentliche GPS-Tracks
+      public_traces_from: Ãffentliche GPS-Tracks von {{user}}
+      tagged_with: " Gekennzeichnet mit {{tags}}"
+      your_traces: Eigene GPS-Tracks
+    make_public: 
+      made_public: verÃ¶ffentlichter Track
+    no_such_user: 
+      body: Entschuldige, wir konnten keinen Benutzer mit dem Namen {{user}} finden. Du hast dich mÃ¶glicherweise vertippt, oder du bist einem ungÃ¼ltigem Link gefolgt.
+      heading: Der Benutzer {{user}} existiert nicht
+      title: Benutzer nicht gefunden
+    trace: 
+      ago: "{{time_in_words_ago}}"
+      by: von
+      count_points: "{{count}} Punkte"
+      edit: bearbeiten
+      edit_map: Karte bearbeiten
+      in: in
+      map: Karte
+      more: mehr
+      pending: AUSSTEHEND
+      private: PRIVAT
+      public: ÃFFENTLICH
+      trace_details: Track-Details
+      view_map: Karte anzeigen
+    trace_form: 
+      description: Beschreibung
+      help: Hilfe
+      help_url: http://wiki.openstreetmap.org/wiki/DE:Upload
+      tags: Tags
+      tags_help: Trennung durch Komma
+      upload_button: Hochladen
+      upload_gpx: GPX-Datei
+      visibility: Sichtbarkeit
+      visibility_help: Was heiÃt das?
+    trace_header: 
+      see_all_traces: Alle GPS-Tracks
+      see_just_your_traces: Eigene GPS-Tracks anzeigen oder neue hinzufÃ¼gen
+      see_your_traces: Eigene GPS-Tracks
       traces_waiting: "{{count}} deiner Tracks sind momentan in der Warteschlange. Bitte warte bis diese fertig sind, um die Verarbeitung nicht fÃ¼r andere Nutzer zu blockieren."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      title: "Track {{name}} betrachten"
-      heading: "Track {{name}} betrachten"
-      pending: "WARTEND"
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: von
+      showing: Zeige Seite
+    view: 
+      delete_track: Diesen Track lÃ¶schen
+      description: "Beschreibung:"
+      download: herunterladen
+      edit: bearbeiten
+      edit_track: Diesen Track bearbeiten
       filename: "Dateiname:"
-      download: "herunterladen"
-      uploaded: "Hochgeladen am:"
-      points: "Punkte"
-      start_coordinates: "Startkoordinate:"
-      map: "Karte"
-      edit: "bearbeiten"
+      heading: Track {{name}} betrachten
+      map: Karte
+      none: Keine
       owner: "Besitzer:"
-      description: "Beschreibung:"
+      pending: WARTEND
+      points: Punkte
+      start_coordinates: "Startkoordinate:"
       tags: "Tags:"
-      none: "Keine"
-      edit_track: "Diesen Track bearbeiten"
-      delete_track: "Diesen Track lÃ¶schen"
-      trace_not_found: "Track nicht gefunden!"
-      visibility: "Sichtbarkeit:" 
-    trace_paging_nav:
-      showing: "Zeige Seite"
-      of: "von"
-    trace:
-      pending: "AUSSTEHEND"
-      count_points: "{{count}} Punkte"
-      ago: "{{time_in_words_ago}}"
-      more: "mehr"
-      trace_details: "Track-Details"
-      view_map: "Karte anzeigen"
-      edit: "bearbeiten"
-      edit_map: "Karte bearbeiten"
-      public: "ÃFFENTLICH"
-      private: "PRIVAT"
-      by: "von"
-      in: "in"
-      map: "Karte"
-    list: 
-      public_traces: "Ãffentliche GPS-Tracks" 
-      your_traces: "Eigene GPS-Tracks" 
-      public_traces_from: "Ãffentliche GPS-Tracks von {{user}}" 
-      tagged_with: " Gekennzeichnet mit {{tags}}" 
-    delete: 
-      scheduled_for_deletion: "FÃ¼r LÃ¶schung vorgesehener Track" 
-    make_public: 
-      made_public: "verÃ¶ffentlichter Track"
-  oauth:
-    oauthorize:
-      request_access: "Die Anwendung {{app_name}} mÃ¶chte auf Deinen OpenStreetMap-Account zugreifen. Bitte entscheide, ob Du der Anwendung die folgenden Rechte gewÃ¤hren mÃ¶chtest. Du kannst alle oder einige der folgenden Rechte gewÃ¤hren:"
-      allow_to: "Erlaube der Anwendung:"
-      allow_read_prefs:  "Deine Benutzereinstellungen zu lesen"
-      allow_write_prefs: "Deine Benutzereinstellungen zu verÃ¤ndern"
-      allow_write_diary: "BlogeintrÃ¤ge und Kommentare zu schreiben und Freunde einzutragen"
-      allow_write_api:   "Die OSM-Datenbank zu Ã¤ndern"
-      allow_read_gpx:    "Deine privaten GPS-Tracks auszulesen"
-      allow_write_gpx:   "GPS-Tracks hochzuladen"
-    revoke:
-      flash: "You've revoked the token for {{application}}"
-  oauth_clients:
-    new:
-      title: "Register a new application"
-      submit: "Register"
-    edit:
-      title: "Edit your application"
-      submit: "Edit"
-    show:
-      title: "OAuth details for {{app_name}}"
-      key: "Consumer Key:"
-      secret: "Consumer Secret:"
-      url: "Request Token URL:"
-      access_url: "Access Token URL:"
-      authorize_url: "Authorise URL:"
-      support_notice: "We support hmac-sha1 (recommended) as well as plain text in ssl mode."
-      edit: "Edit Details"
-      requests: "Requesting the following permissions from the user:"
-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-    index:
-      title: "My OAuth Details"
-      my_tokens: "My Authorised Applications"
-      list_tokens: "The following tokens have been issued to applications in your name:"
-      application: "Application Name"
-      issued_at: "Issued At"
-      revoke: "Revoke!"
-      my_apps: "My Client Applications"
-      no_apps: "Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service."
-      registered_apps: "You have the following client applications registered:"
-      register_new: "Register your application"
-    form:
-      name: "Name"
-      required: "Required"
-      url: "Main Application URL"
-      callback_url: "Callback URL"
-      support_url: "Support URL"
-      requests: "Request the following permissions from the user:"
-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-    not_found: 
-      sorry: "Sorry, that {{type}} could not be found."
-    create:
-      flash: "Registered the information successfully"
-    update:
-      flash: "Updated the client information successfully"
-    destroy:
-      flash: "Destroyed the client application registration"
-  user:
-    login:
-      title: "Anmelden"
-      heading: "Anmelden"
-      please login: "Bitte melde dich an oder {{create_user_link}}."
-      create_account: "erstelle ein Benutzerkonto"
+      title: Track {{name}} betrachten
+      trace_not_found: Track nicht gefunden!
+      uploaded: "Hochgeladen am:"
+      visibility: "Sichtbarkeit:"
+    visibility: 
+      identifiable: Identifiable (shown in trace list and as identifiable, ordered points with timestamps)
+      private: Private (only shared as anonymous, unordered points)
+      public: Public (shown in trace list and as anonymous, unordered points)
+      trackable: Trackable (only shared as anonymous, ordered points with timestamps)
+  user: 
+    account: 
+      email never displayed publicly: (nicht Ã¶ffentlich sichtbar)
+      flash update success: Benutzerinformationen erfolgreich aktualisiert.
+      flash update success confirm needed: Benutzerinformationen erfolgreich aktualisiert. Du erhÃ¤ltst eine E-Mail, um deine neue E-Mail-Adresse zu bestÃ¤tigen.
+      home location: "Standort:"
+      latitude: "Breitengrad:"
+      longitude: "LÃ¤ngengrad:"
+      make edits public button: Alle meine Bearbeitungen Ã¶ffentlich machen
+      my settings: Eigene Einstellungen
+      no home location: Du hast noch keinen Standort angegeben.
+      preferred languages: "Bevorzugte Sprachen:"
+      profile description: "Profil-Beschreibung:"
+      public editing: 
+        disabled: Deaktiviert, bearbeiten von Daten nicht mÃ¶glich, alle bisherigen Bearbeitungen sind anonym.
+        disabled link text: Warum kann ich nichts bearbeiten?
+        enabled: Aktiviert. Nicht anonym, bearbeiten der Kartendaten mÃ¶glich.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Was ist das?
+        heading: "Ãffentliches Bearbeiten:"
+      return to profile: ZurÃ¼ck zum Profil
+      save changes button: Speichere Ãnderungen
+      title: Benutzerkonto bearbeiten
+      update home location on click: Standort bei Klick auf die Karte aktualisieren?
+    confirm: 
+      button: BestÃ¤tigen
+      failure: Ein Benutzeraccount wurde bereits mit diesem Link bestÃ¤tigt.
+      heading: Benutzerkonto bestÃ¤tigen
+      press confirm button: Benutzerkonto aktivieren, indem du auf den BestÃ¤tigungsbutton klickst.
+      success: Dein Benutzeraccount wurde bestÃ¤tigt, danke fÃ¼rs Registrieren!
+    confirm_email: 
+      button: BestÃ¤tigen
+      failure: Eine E-Mail-Adresse wurde bereits mit diesem Link bestÃ¤tigt.
+      heading: Ãnderung der E-Mail-Adresse bestÃ¤tigen
+      press confirm button: Neue E-Mail-Adresse bestÃ¤tigen, indem du auf den BestÃ¤tigungsbutton klickst.
+      success: Deine E-Mail-Adresse wurde bestÃ¤tigt, danke fÃ¼rs Registrieren!
+    friend_map: 
+      nearby mapper: "Mapper in der NÃ¤he: [[nearby_user]]"
+      your location: Eigener Standort
+    go_public: 
+      flash success: Alle deine Bearbeitungen sind nun Ã¶ffentlich und du kannst nun die Kartendaten bearbeiten.
+    login: 
+      account not active: Leider ist dein Benutzerkonto noch nicht aktiv.<br />Bitte aktivierte dein Benutzerkonto, indem du auf den Link in deiner BestÃ¤tigungs-E-Mail klickst.
+      auth failure: Sorry, Anmelden mit diesen Daten nicht mÃ¶glich.
+      create_account: erstelle ein Benutzerkonto
       email or username: "E-Mail-Adresse oder Benutzername:"
+      heading: Anmelden
+      login_button: Anmelden
+      lost password link: Passwort vergessen?
       password: "Passwort:"
-      lost password link: "Passwort vergessen?"
-      login_button: "Anmelden"
-      account not active: "Leider ist dein Benutzerkonto noch nicht aktiv.<br />Bitte aktivierte dein Benutzerkonto, indem du auf den Link in deiner BestÃ¤tigungs-E-Mail klickst."
-      auth failure: "Sorry, Anmelden mit diesen Daten nicht mÃ¶glich."
-    lost_password:
-      title: "Passwort vergessen"
-      heading: "Passwort vergessen?"
-      email address: "E-Mail-Adresse:"
-      new password button: "Passwort zurÃ¼cksetzen"
-      notice email on way: "Eine E-Mail mit Hinweisen zum ZurÃ¼cksetzen des Passworts wurde an dich versandt."
-      notice email cannot find: "Wir konnten die E-Mailadresse nicht finden. Du hast dich mÃ¶glicherweise vertippt oder mit einer anderen E-Mailadresse angemeldet."
-    reset_password:
-      title: "Passwort zurÃ¼cksetzen"
-      heading: "Reset Password for {{user}}"
-      password: "Password:"
-      confirm password: "Confirm Password:"
-      reset: "Reset Password"
-      flash changed: "Your password has been changed."
-      flash token bad: "Wir konnten dieses KÃ¼rzel leider nicht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt."
-    new:
-      title: "Benutzerkonto erstellen"
-      heading: "Ein Benutzerkonto erstellen"
-      no_auto_account_create: "Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht mÃ¶glich."
-      contact_webmaster: 'Bitte kontaktiere den <a href="mailto:webmaster@openstreetmap.org">Webmaster</a> um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie mÃ¶glich bearbeiten.'
-      fill_form: "FÃ¼lle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt."
-      license_agreement: 'Mit der Erstellung des Benutzerkontos stimmst du zu, dass alle Daten, die du zum OpenStreetMap-Projekt beitrÃ¤gst, (nicht exklusiv) unter <a href="http://creativecommons.org/licenses/by-sa/2.0/">dieser Creative Commons Lizenz (by-sa)</a> lizenziert werden.'
+      please login: Bitte melde dich an oder {{create_user_link}}.
+      title: Anmelden
+    lost_password: 
       email address: "E-Mail-Adresse:"
+      heading: Passwort vergessen?
+      new password button: Passwort zurÃ¼cksetzen
+      notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast dich mÃ¶glicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet.
+      notice email on way: Eine E-Mail mit Hinweisen zum ZurÃ¼cksetzen des Passworts wurde an dich versandt.
+      title: Passwort vergessen
+    make_friend: 
+      already_a_friend: Du bist bereits mit {{name}} befreundet.
+      failed: Sorry, {{name}} konnte nicht als dein Freund hinzugefÃ¼gt werden.
+      success: "{{name}} ist nun dein Freund."
+    new: 
       confirm email address: "BestÃ¤tige deine E-Mail-Adresse:"
-      not displayed publicly: 'Nicht Ã¶ffentlich sichtbar (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>)'
+      confirm password: "Passwort bestÃ¤tigen:"
+      contact_webmaster: Bitte kontaktiere den <a href="mailto:webmaster@openstreetmap.org">Webmaster</a> um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie mÃ¶glich bearbeiten.
       display name: "Benutzername:"
+      email address: "E-Mail-Adresse:"
+      fill_form: FÃ¼lle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt.
+      flash create success message: Benutzerkonto wurde erfolgreich erstellt. Ein BestÃ¤tigungslink wurde dir per E-Mail zugesendet, bitte bestÃ¤tige diesen und du kannst mit dem Mappen beginnen.<br /><br />Du kannst dich nicht einloggen bevor du deine E-Mail-Adresse mit dem BestÃ¤tigungslink bestÃ¤tigt hast.<br /><br />Falls du einen Spam-Blocker nutzt, der BestÃ¤tigungsanfragen sendet, dann setze bitte webmaster@openstreetmap.org auf deine Whitelist, weil wir auf keine BestÃ¤tigungsanfrage antworten kÃ¶nnen.
+      heading: Ein Benutzerkonto erstellen
+      license_agreement: Mit der Erstellung des Benutzerkontos stimmst du zu, dass alle Daten, die du zum OpenStreetMap-Projekt beitrÃ¤gst, (nicht exklusiv) unter <a href="http://creativecommons.org/licenses/by-sa/2.0/">dieser Creative Commons Lizenz (by-sa)</a> lizenziert werden.
+      no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht mÃ¶glich.
+      not displayed publicly: Nicht Ã¶ffentlich sichtbar (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>)
       password: "Passwort:"
-      confirm password: "Passwort bestÃ¤tigen:"
       signup: Registrieren
-      flash create success message: "Benutzerkonto wurde erfolgreich erstellt. Ein BestÃ¤tigungslink wurde dir per E-Mail zugesendet, bitte bestÃ¤tige diesen und du kannst mit dem Mappen beginnen.<br /><br />Du kannst dich nicht einloggen bevor du deine E-Mail-Adresse mit dem BestÃ¤tigungslink bestÃ¤tigt hast.<br /><br />Falls du einen Spam-Blocker nutzt, der BestÃ¤tigungsanfragen sendet, dann setze bitte webmaster@openstreetmap.org auf deine Whitelist, weil wir auf keine BestÃ¤tigungsanfrage antworten kÃ¶nnen."
-    no_such_user:
-      title: "Benutzer nicht gefunden"
-      heading: "Der Benutzer {{user}} existiert nicht"
-      body: "Es gibt leider keinen Benutzer mit dem Namen {{user}}. Bitte Ã¼berprÃ¼fe deine Schreibweise oder der Link war beschÃ¤digt."
-    view:
+      title: Benutzerkonto erstellen
+    no_such_user: 
+      body: Es gibt leider keinen Benutzer mit dem Namen {{user}}. Bitte Ã¼berprÃ¼fe deine Schreibweise oder der Link war beschÃ¤digt.
+      heading: Der Benutzer {{user}} existiert nicht
+      title: Benutzer nicht gefunden
+    remove_friend: 
+      not_a_friend: "{{name}} ist nicht dein Freund."
+      success: "{{name} wurde als Freund entfernt."
+    reset_password: 
+      confirm password: "Passwort bestÃ¤tigen:"
+      flash changed: Dein Passwort wurde geÃ¤ndert.
+      flash token bad: Wir konnten dieses KÃ¼rzel leider nicht finden. Du hast dich mÃ¶glicherweise vertippt oder du bist einem ungÃ¼ltigem Link gefolgt.
+      heading: Passwort fÃ¼r {{user}} zurÃ¼cksetzen
+      password: "Passwort:"
+      reset: Passwort zurÃ¼cksetzen
+      title: Passwort zurÃ¼cksetzen
+    set_home: 
+      flash success: Standort erfolgreich gespeichert
+    view: 
+      add as friend: Als Freund hinzufÃ¼gen
+      add image: Ein Bild hinzufÃ¼gen
+      ago: ({{time_in_words_ago}})
+      change your settings: Ãndere deine Einstellungen
+      delete image: Bild lÃ¶schen
+      description: Beschreibung
+      diary: Blog
+      edits: Bearbeitungen
+      if set location: Wenn du deinen Standort angegeben hast, erscheint eine Karte am Seitenende. Du kannst deinen Standort in deinen {{settings_link}} Ã¤ndern.
+      km away: "{{count}}km entfernt"
+      m away: "{{count}}m entfernt"
+      mapper since: "Mapper seit:"
       my diary: Eigener Blog
-      new diary entry: Neuer Blogeintrag
       my edits: Eigene Bearbeitungen
-      my traces: Eigene Tracks
       my settings: Eigene Einstellungen
+      my traces: Eigene Tracks
+      my_oauth_details: View my OAuth details
+      nearby users: "Benutzer in der NÃ¤he:"
+      new diary entry: Neuer Blogeintrag
+      no friends: Du hast bis jetzt keine Freunde hinzugefÃ¼gt.
+      no home location: Es wurde kein Standort angegeben.
+      no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner NÃ¤he angegeben haben.
+      remove as friend: Als Freund entfernen
       send message: Nachricht senden
-      diary: Blog
-      edits: Bearbeitungen
+      settings_link_text: Einstellungen
       traces: Tracks
-      remove as friend: Als Freund entfernen
-      add as friend: Als Freund hinzufÃ¼gen
-      mapper since: "Mapper seit:"
-      ago: "({{time_in_words_ago}})"
-      user image heading: Benutzerbild
-      delete image: Bild lÃ¶schen
       upload an image: Ein Bild hochladen
-      add image: Ein Bild hinzufÃ¼gen
-      description: Beschreibung
+      user image heading: Benutzerbild
       user location: Standort des Benutzers
-      no home location: "Es wurde kein Standort angegeben."
-      if set location: "Wenn du deinen Standort angegeben hast, erscheint eine Karte am Seitenende. Du kannst deinen Standort in deinen {{settings_link}} Ã¤ndern."
-      settings_link_text: Einstellungen
       your friends: Eigene Freunde
-      no friends: Du hast bis jetzt keine Freunde hinzugefÃ¼gt.
-      km away: "{{count}}km entfernt"
-      m away: "{{count}}m entfernt" 
-      nearby users: "Benutzer in der NÃ¤he:"
-      no nearby users: "Es gibt bisher keine Benutzer, die einen Standort in deiner NÃ¤he angegeben haben."
-      change your settings: Ãndere deine Einstellungen
-      my_oauth_details: "View my OAuth details"
-    friend_map:
-      your location: "Eigener Standort"
-      nearby mapper: "Mapper in der NÃ¤he: [[nearby_user]]"
-    account:
-      title: "Benutzerkonto bearbeiten"
-      my settings: Eigene Einstellungen
-      email never displayed publicly: "(nicht Ã¶ffentlich sichtbar)"
-      public editing:
-        heading: "Ãffentliches Bearbeiten:"
-        enabled: "Aktiviert. Nicht anonym, bearbeiten der Kartendaten mÃ¶glich."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "Was ist das?"
-        disabled: "Deaktiviert, bearbeiten von Daten nicht mÃ¶glich, alle bisherigen Bearbeitungen sind anonym."
-        disabled link text: "Warum kann ich nichts bearbeiten?"
-      profile description: "Profil-Beschreibung:"
-      preferred languages: "Bevorzugte Sprachen:"
-      home location: "Standort:"
-      no home location: "Du hast noch keinen Standort angegeben."
-      latitude: "Breitengrad:"
-      longitude: "LÃ¤ngengrad:"
-      update home location on click: "Standort bei Klick auf die Karte aktualisieren?"
-      save changes button: Speichere Ãnderungen
-      make edits public button: Alle meine Bearbeitungen Ã¶ffentlich machen
-      return to profile: ZurÃ¼ck zum Profil
-      flash update success confirm needed: "Benutzerinformationen erfolgreich aktualisiert. Du erhÃ¤ltst eine E-Mail, um deine neue E-Mail-Adresse zu bestÃ¤tigen."
-      flash update success: "Benutzerinformationen erfolgreich aktualisiert."
-    confirm:
-      heading: Benutzerkonto bestÃ¤tigen
-      press confirm button: "Benutzerkonto aktivieren, indem du auf den BestÃ¤tigungsbutton klickst."
-      button: BestÃ¤tigen
-      success: "Dein Benutzeraccount wurde bestÃ¤tigt, danke fÃ¼rs Registrieren!" 
-      failure: "Ein Benutzeraccount wurde bereits mit diesem Link bestÃ¤tigt."
-    confirm_email:
-      heading: Ãnderung der E-Mail-Adresse bestÃ¤tigen
-      press confirm button: "Neue E-Mail-Adresse bestÃ¤tigen, indem du auf den BestÃ¤tigungsbutton klickst."
-      button: BestÃ¤tigen
-      success: "Deine E-Mail-Adresse wurde bestÃ¤tigt, danke fÃ¼rs Registrieren!" 
-      failure: "Eine E-Mail-Adresse wurde bereits mit diesem Link bestÃ¤tigt."
-    set_home:
-      flash success: "Standort erfolgreich gespeichert"
-    go_public:
-      flash success: "Alle deine Bearbeitungen sind nun Ã¶ffentlich und du kannst nun die Kartendaten bearbeiten."
-    make_friend: 
-      success: "{{name}} ist nun dein Freund." 
-      failed: "Sorry, {{name}} konnte nicht als dein Freund hinzugefÃ¼gt werden." 
-      already_a_friend: "Du bist bereits mit {{name}} befreundet." 
-    remove_friend: 
-      success: "{{name}} wurde als Freund entfernt." 
-      not_a_friend: "{{name}} ist nicht dein Freund."
diff --git a/config/locales/el.yml b/config/locales/el.yml
index eae9845c5..f0b1c0655 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1,312 +1,305 @@
-el:
- html:
-   dir: ltr
- activerecord:
-   # Translates all the model names, which is used in error handling on the web site
-   models:
-     acl: "Î ÏÏÏÎ²Î±ÏÎ· ÏÏÎ· Î»Î¯ÏÏÎ± ÎµÎ»Î­Î³ÏÎ¿Ï"
-     changeset: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï"
-     changeset_tag: "ÎÏÎ¹ÎºÎ­ÏÎ± Î±Î»Î»Î±Î³Î®Ï ÏÏÎ»Î»Î¿Î³Î®Ï"
-     country: "Î§ÏÏÎ±"
-     diary_comment: "Î£ÏÏÎ»Î¹Î¿ ÏÏÎ¿ blog"
-     diary_entry: "ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog"
-     friend: "Î¦Î¯Î»Î¿Ï"
-     language: "ÎÎ»ÏÏÏÎ±"
-     message: "ÎÎ®Î½ÏÎ¼Î±"
-     node: "Î£Î·Î¼ÎµÎ¯Î¿"
-     node_tag: "Î£Î·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±"
-     notifier: "ÎÎ¹Î´Î¿ÏÎ¿Î¹Î·ÏÎ®Ï"
-     old_node: "Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿"
-     old_node_tag: "Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±"
-     old_relation: "Î Î±Î»Î¹Î¬ ÏÏÎ­ÏÎ·"
-     old_relation_member: "Î Î±Î»Î¹Ï Î¼Î­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï"
-     old_relation_tag: "Î Î±Î»Î¹Î¬ ÎµÏÎ¹ÎºÎ­ÏÎ± ÏÎ·Ï ÏÏÎ­ÏÎ·Ï"
-     old_way: "Î Î±Î»Î¯Î± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·"
-     old_way_node: "Î£Î·Î¼ÎµÎ¯Î¿ ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï"
-     old_way_tag: "ÎÏÎ¹ÎºÎ­ÏÎ± ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï"
-     relation: "Î£ÏÎ­ÏÎ·"
-     relation_member: "ÎÎ­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï"
-     relation_tag: "ÎÏÎ¹ÎºÎ­ÏÎ± ÏÏÎ­ÏÎ·Ï"
-     session: "Î£ÏÎ½ÎµÎ´ÏÎ¯Î±"
-     trace: "ÎÏÎ½Î¿Ï"
-     tracepoint: "Î£Î·Î¼ÎµÎ¯Î¿ Î¯ÏÎ½Î¿ÏÏ"
-     tracetag: "ÎÏÎ¹ÎºÎ­ÏÎ± Î¯ÏÎ½Î¿ÏÏ"
-     user: "Î§ÏÎ®ÏÏÎ·Ï"
-     user_preference: "Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï ÏÏÎ®ÏÏÎ·"
-     user_token: "Î¤ÎµÎºÎ¼Î®ÏÎ¹Î¿ ÏÏÎ®ÏÏÎ·"
-     way: "ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·"
-     way_node: "ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ·Î¼ÎµÎ¯Î¿Ï"
-     way_tag: "ÎÏÎ¹ÎºÎ­ÏÎ± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï"
-   # Translates all the model attributes, which is used in error handling on the web site
-   # Only the ones that are used on the web site are translated at the moment
-   attributes:
-     diary_comment:
-       body: "Î£ÏÎ¼Î±"
-     diary_entry:
-       user: "Î§ÏÎ®ÏÏÎ·Ï"
-       title: "Î¤Î¯ÏÎ»Î¿Ï"
-       latitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï"
-       longitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
-       language: "ÎÎ»ÏÏÏÎ±"
-     friend:
-       user: "Î§ÏÎ®ÏÏÎ·Ï"
-       friend: "Î¦Î¯Î»Î¿Ï"
-     trace:
-       user: "Î§ÏÎ®ÏÏÎ·Ï"
-       visible: "ÎÏÎ±ÏÏ"
-       name: "ÎÎ½Î¿Î¼Î±"
-       size: "ÎÎ­Î³ÎµÎ¸Î¿Ï"
-       latitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï"
-       longitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
-       public: "ÎÎ¿Î¹Î½Ï"
-       description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®"
-     message:
-       sender: "ÎÏÎ¿ÏÏÎ¿Î»Î­Î±Ï"
-       title: "Î¤Î¯ÏÎ»Î¿Ï"
-       body: "Î£ÏÎ¼Î±"
-       recipient: "ÎÎ®ÏÏÎ·Ï"
-     user:
-       email: "Email"
-       active: "ÎÎ½ÎµÏÎ³Ï"
-       display_name: "ÎÎ½Î¿Î¼Î±"
-       description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®"
-       languages: "ÎÎ»ÏÏÏÎµÏ"
-       pass_crypt: "Password"
- map:
-   view: "ÎÎ¾Î­ÏÎ±ÏÎµ"
-   edit: "ÎÎ»Î»Î±Î¾Îµ"
-   coordinates: "Î£ÏÎ½ÏÎµÏÎ±Î³Î¼Î­Î½ÎµÏ:"
- browse:
-   changeset:
-     title: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï"
-     changeset: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï: {{id}}"
-#     download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
-     changesetxml: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï XML"
-     osmchangexml: "osmÎ±Î»Î»Î±Î³Î® XML"
-   changeset_details:
-     created_at: "ÎÎ·Î¼Î¿Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ ÏÏÎ¹Ï:"
-     closed_at: "ÎÎºÎ»ÎµÎ¹ÏÎµ ÏÏÎ¹Ï:"
-     belongs_to: "ÎÎ½Î®ÎºÎµÎ¹ ÏÏÎ¿Î½/ÏÏÎ·Î½:"
-#     bounding_box: "Bounding box:"
-#     no_bounding_box: "No bounding box has been stored for this changeset."
-     show_area_box: "ÎÎµÎ¯Î¾Îµ ÎºÎ¿ÏÏÎ¹ ÏÎµÏÎ¹Î¿ÏÎ®Ï"
-     box: "ÎºÎ¿ÏÏÎ¹"
-     has_nodes: "ÎÏÎµÎ¹ ÏÎ± ÎµÏÏÎ¼ÎµÎ½Î± {{count}} ÏÎ·Î¼ÎµÎ¯Î±:"
-     has_ways: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} ÎºÎ±ÏÎµÏÎ¸Î®Î½ÏÎµÎ¹Ï:"
-     has_relations: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} ÏÏÎ­ÏÎµÎ¹Ï:"
-   common_details:
-     edited_at: "ÎÎ»Î»Î¬Î¾Îµ ÏÏÎ¹Ï:"
-     edited_by: "ÎÎ»Î»Î±Î³Î® Î­Î³Î¹Î½Îµ Î±ÏÏ:"
-     version: "ÎÎºÎ´Î¿ÏÎ®:"
-     in_changeset: "Î£ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï:"
-   containing_relation:
-     relation: "Î£ÏÎ­ÏÎ· {{relation_name}}"
-#     relation_as: "(as {{relation_role}})"
-   map:
-     loading: "Î¦ÏÏÏÏÏÎ·..."
-     deleted: "ÎÎ¹Î±Î³ÏÎ±ÏÎ®"
-   node_details:
-     coordinates: "Î£ÏÎ½ÏÎµÏÎ±Î³Î¼Î­Î½ÎµÏ: "
-     part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï:"
-   node_history:
-     node_history: "ÎÏÏÎ¿ÏÎ¯Î± ÏÎ·Î¼ÎµÎ¯Î¿Ï"
-     download: "{{download_xml_link}} Î® {{view_details_link}}"
-#     download_xml: "Download XML"
-     view_details: "ÎÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ"
-   node:
-     node: "Î£Î®Î¼ÎµÎ¿"
-     node_title: "Î£Î®Î¼ÎµÎ¿: {{node_name}}"
-     download: "{{download_xml_link}} Î® {{view_history_link}}"
-#     download_xml: "Download XML"
-     view_history: "ÎÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±"
-   not_found:
-     sorry: "Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î· {{type}} Î¼Îµ ÏÎ·Î½ ÏÎ±ÏÏÏÏÎ·ÏÎ± {{id}}, Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯."
-     type:
-       node: "Î£Î·Î¼ÎµÎ¯Î¿"
-       way: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·"
-       relation: "ÏÏÎ­ÏÎ·"
-   paging_nav:
-     showing_page: "ÎÎµÎ¯ÏÎ½ÎµÎ¹ ÏÎµÎ»Î¯Î´Î±"
-     of: "ÏÎ¿Ï"
-   relation_details:
-     members: "ÎÎ­Î»Î·:"
-     part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï:"
-   relation_history:
-     relation_history: "ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï"
-     relation_history_title: "ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï: {{relation_name}}"
-   relation:
-     relation: "Î£ÏÎ­ÏÎ·"
-     relation_title: "Î£ÏÎ­ÏÎ·: {{relation_name}}"
-     download: "{{download_xml_link}} Î® {{view_history_link}}"
-#     download_xml: "Download XML"
-     view_history: "Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±"
-   start:
-     view_data: "ÎÎµÏ ÏÏÎ¿Î¹ÏÎµÎ¯Î± Î³Î¹Î± Î±ÏÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·"
-     manually_select: "ÎÎ¹Î¬Î»ÎµÎ¾Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ"
-   start_rjs:
-     data_layer_name: "Î£ÏÎ¿Î¹ÏÎµÎ¯Î±"
-     data_frame_title: "Î£ÏÎ¿Î¹ÏÎµÎ¯Î±"
-     zoom_or_select: "ÎÏÏÎ¯Î±ÏÎµ Î® Î´Î¹Î¬Î»ÎµÎ¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® Î±ÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·"
-     drag_a_box: "Î¤ÏÎ¬Î²Î± ÏÎ¿ ÎºÎ¿Î¸ÏÎ¯ ÏÏÎ¿ ÏÎ¬ÏÏÎ· Î³Î¹Î± Î½Î± Î´Î¹Î±Î»ÎµÎ¾ÎµÎ¯Ï ÏÎµÏÎ¹Î¿ÏÎ®"
-     manually_select: "ÎÎ¹Î¬Î»ÎµÎ¾Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ"
-     loaded_an_area_with_num_features: "Â¨ÎÏÎµÎ¹Ï ÏÎ¿ÏÏÏÏÎµÎ¹ Î¼Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® ÏÎ¿Ï ÎµÏÎµÎ¹ [[num_features]] ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬. ÎÎµÎ½Î¹ÎºÎ¬, Î¼ÎµÏÎ¹ÎºÎ¿Î¯ browsers Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î¼Î·Î½ Î±Î½ÏÎ­ÏÎ¿ÏÎ½ Î½Î± Î´ÎµÎ¯Î¾Î¿ÏÎ½ ÏÏÏÎ± ÏÎ¿Î»Î»Î¬ ÏÏÎ¿Î¯ÏÎµÎ¹Î±. ÎÎµÎ½Î¹ÎºÎ¬, Î¿Î¹ browsers Î´Î¿ÏÎ»ÎµÏÎ¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ± Î´ÎµÎ¯ÏÎ½ÏÎ½ÏÎ±Ï Î»Î¹Î³ÏÏÎµÏÎ± Î±ÏÏ 100 ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ· ÏÎ¿ÏÎ¬: Î¼Îµ Î¿ÏÎ¹Î´Î®ÏÎ¿ÏÎµ Î¬Î»Î»Î¿ Î¿ browser Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î³Î¯Î½ÎµÎ¹ Î±ÏÎ³ÏÏ Î® Î½Î± Î¼Î·Î½ Î±Î½ÏÎ¹Î´ÏÎ¬. ÎÎ½ ÎµÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï Î¿ÏÎ¹ Î¸ÎµÏ Î½Î± Î´ÎµÎ¹Ï Î±ÏÏÎ¬ ÏÎ± ÏÏÎ¿Î¹ÏÎµÎ¯Î±, ÎºÎ¬Î½Îµ ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÏÏÎ¼ÎµÎ½Î¿ ÎºÎ¿ÏÎ¼ÏÎ¯."
-     load_data: "Î¦ÏÏÏÏÏÎµ ÏÏÎ¿Î¹ÏÎµÎ¯Î±"
-     unable_to_load_size: "ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎ¿ÏÏÏÏÎµÎ¹: Î¤Î¿ Î¼Î­Î³ÎµÎ¸Î¿Ï ÏÎ¿Ï bounding box [[bbox_size]] ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¹ÎºÏÏÏÎµÏÎ¿ Î±ÏÎ¿ {{max_bbox_size}})"
-     loading: "Î¦ÏÏÏÏÏÎ·..."
-     show_history: "ÎÎµÎ¯Î¾Îµ Î¹ÏÏÎ¿ÏÎ¯Î±"
-     wait: "ÎÎ½Î±Î¼Î¿Î½Î®..."
-     history_for_feature: "ÎÏÏÎ¿ÏÎ¯Î± ÏÎ¿Ï [[feature]]"
-     details: "ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ"
-     private_user: "Î¹Î´Î¹ÏÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï"
-     edited_by_user_at_timestamp: "ÎÎ»Î»Î±Î³Î® Î­Î³Î¹Î½Îµ Î±ÏÏ [[user]] ÏÏÎ¹Ï [[timestamp]]"
-     object_list:
-       heading: "ÎÎ¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½"
-       back: "ÎÎµÎ¯Î¾Îµ Î»Î¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½"
-       type:
-         node: "Î£Î·Î¼ÎµÎ¯Î¿"
-         way: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·"
-         # There's no 'relation' type because it isn't represented in OpenLayers
-       api: "ÎÏÎ±Î½Î¬ÎºÏÎ·ÏÎ· ÏÎµÏÎ¹Î¿ÏÎ®Ï Î±ÏÏ ÏÎ¿ API"
-       details: "ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ"
-       selected:
-         type:
-           node: "Î£Î·Î¼ÎµÎ¯Î¿ [[id]]"
-           way: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]"
-           # There's no 'relation' type because it isn't represented in OpenLayers
-       history:
-         type:
-           node: "Î£Î·Î¼ÎµÎ¯Î¿ [[id]]"
-           way: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]"
-           # There's no 'relation' type because it isn't represented in OpenLayers
-   tag_details:
-     tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
-   way_details:
-     nodes: "Î£Î·Î¼ÎµÎ¯Î±:"
-     part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï"
-     also_part_of:
-       one: "ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï {{related_ways}}"
-       other: "ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎµÏÎ½ {{related_ways}}"
-   way_history:
-     way_history: "ÎÏÏÎ¿ÏÎ¯Î± ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï"
-     way_history_title: "ÎÏÏÎ¿ÏÎ¯Î± ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï: {{way_name}}"
-     download: "{{download_xml_link}} Î® {{view_details_link}}"
-#     download_xml: "Download XML"
-     view_details: "Î´ÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ"
-   way:
-     way: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·"
-     way_title: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·: {{way_name}}"
-     download: "{{download_xml_link}} Î® {{view_history_link}}"
-#     download_xml: "Download XML"
-     view_history: "Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±"
- changeset:
-   changeset_paging_nav:
-     showing_page: "EÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÎ»Î¯Î´Î±Ï"
-#     of: "of"
-   changeset:
-#     still_editing: "(still editing)"
-     anonymous: "ÎÎ½ÏÎ½ÏÎ¼Î¿Ï"
-#     no_comment: "(none)"
-#     no_edits: "(no edits)"
-     show_area_box: "Î´ÎµÎ¯Î¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® ÎºÎ¿ÏÏÎ¹Î¿Ï"
-#     big_area: "(big)"
-     view_changeset_details: "ÎÎµÏ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½"
-#     more: "more"
-   changesets:
-     id: "ID"
-     saved_at: "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏÎ¹Ï"
-     user: "Î§ÏÎ®ÏÏÎ·Ï"
-     comment: "Î£ÏÏÎ»Î¹Î¿"
-     area: "Î ÎµÏÎ¹Î¿ÏÎ®"
-   list_bbox:
-     history: "ÎÏÏÎ¿ÏÎ¯Î±"
-     changesets_within_the_area: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï ÏÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®:"
-     show_area_box: "Î´ÎµÎ¯Î¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® ÎºÎ¿ÏÏÎ¹Î¿Ï"
-     no_changesets: "ÎÎ±Î¼Î¯Î± Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï"
-     all_changes_everywhere: "ÎÎ¹Î± Î±Î»Î»Î±Î³Î­Ï Î±Î»Î»Î¿Ï Î´ÎµÏ {{recent_changes_link}}"
-     recent_changes: "Î ÏÏÏÏÎ±ÏÎµÏ ÎÎ»Î»Î±Î³Î­Ï"
-     no_area_specified: "Î ÎµÏÎ¹Î¿ÏÎ® Î´ÎµÎ½ Î­ÏÎµÎ¹ ÎºÎ±Î¸Î¿ÏÎ¹ÏÏÎµÎ¯"
-     first_use_view: "Î ÏÏÏÎ± ÏÏÎ·ÏÎ·Î¼Î¿ÏÎ¿Î¯Î·ÏÎµ ÏÎ¿ {{view_tab_link}} Î³Î¹Î± Î½Î± Î±ÏÎ¿Î´ÏÏÎµÎ¹Ï ÎºÎ±Î¹ Î½Î± ÎµÏÏÎ¹Î¬ÏÎµÎ¹Ï, Î¼ÎµÏÎ¬ ÎºÎ¬Î½Îµ ÎºÎ»Î¹Îº ÏÏÎ¿ tab Î¹ÏÏÎ¿ÏÎ¯Î±Ï."
-     view_the_map: "Î´ÎµÏ ÏÎ¿ ÏÎ¬ÏÏÎ·"
-     view_tab: "Î´ÎµÏ ÏÎ¿ tab"
-     alternatively_view: "Â¨Î, Î´ÎµÏ ÏÎ»Î± {{recent_changes_link}}"
-   list:
-     recent_changes: "Î ÏÏÏÏÎ±ÏÎµÏ Î±Î»Î»Î±Î³Î­Ï"
-     recently_edited_changesets: "Î ÏÏÏÏÎ±ÏÎµÏ Î±Î»Î»Î±Î³Î­Ï ÏÏÎ»Î»Î¿Î³Î®Ï:"
-     for_more_changesets: "ÎÎ¹Î± Î±Î»Î»Î±Î³Î­Ï ÏÏÎ»Î»Î¿Î³Î®Ï, Î´Î¹Î¬Î»ÎµÎ¾Îµ ÏÏÎ®ÏÏÎ· ÎºÎ±Î¹ Î´ÎµÏ ÏÎ¹Ï Î±Î»Î»Î±Î³Î­Ï ÏÎ¿Ï Î® Î´ÎµÏ ÏÎ·Î½ Î¹ÏÏÎ¿ÏÎ¯Î± Î±Î»Î»Î±Î³ÏÎ½ ÏÏÎ³Î³ÎµÎºÏÎ¹Î¼Î­Î½Î·Ï ÏÎµÏÎ¹Î¿ÏÎ®Ï."
-   list_user:
-     edits_by_username: "ÎÎ»Î»Î±Î³Î­Ï Î±ÏÏ {{username_link}}"
-     no_visible_edits_by: "ÎÎ±Î¼Î¯Î± Î¿ÏÎ±ÏÎ® Î±Î»Î»Î±Î³Î® Î±ÏÏ {{name}}."
-     for_all_changes: "ÎÎ¹Î± Î±Î»Î»Î±Î³Î­Ï ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ·ÏÏÏÎ½, Î´ÎµÏ {{recent_changes_link}}"
-     recent_changes: "Î ÏÏÏÏÎ±ÏÎµÏ Î±Î»Î»Î±Î³Î­Ï"
- diary_entry:
-   new:
-     title: "ÎÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog"
-   list:
-     title: "Blog ÏÏÎ·ÏÏÏÎ½"
-     user_title: "Blog {{user}}"
-     new: "ÎÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog"
-     new_title: "Î£ÏÎ½Î¸ÎµÏÎ· ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÏÏÎ¿ blog ÏÏÎ®ÏÏÎ·"
-     no_entries: "ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog"
-     recent_entries: "Î ÏÏÏÎ¿ÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï blog: "
-     older_entries: "Î Î±Î»Î¯ÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï"
-     newer_entries: "Î ÏÏÏÏÎ±ÏÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï"
-   edit:
-     title: "ÎÎ»Î»Î±Î³Î· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog"
-     subject: "ÎÎ­Î¼Î±: "
-     body: "Î£ÏÎ¼Î±: "
-     language: "ÎÎ»ÏÏÏÎ±: "
-     location: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±: "
-     latitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï"
-     longitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï"
-     use_map_link: "ÏÏÎ·ÏÎ·Î¼Î¿ÏÎ¿Î¯Î·ÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ·"
-     save_button: "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·"
-     marker_text: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï blog"
-   view:
-     title: "Blog ÏÏÎ·ÏÏÏÎ½ | {{user}}"
-     user_title: "Blog {{user}}"
-     leave_a_comment: "ÎÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï"
-     login_to_leave_a_comment: "{{login_link}} Î³Î¹Î± ÎµÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï"
-#     login: "Login"
-     save_button: "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·"
-   no_such_entry:
-     heading: "ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ±: {{id}}"
-     body: "Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog Î® ÏÏÏÎ»Î¹Î¿ Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ± {{id}}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï ÏÎ¿ link."
-   no_such_user:
-     title: "ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ïr"
-     heading: "Î ÏÏÎ®ÏÏÎ·Ï {{user}} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹"
-     body: "Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± {{user}}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï ÏÎ¿ link."
-   diary_entry:
-     posted_by: "ÎÏÎ¬ÏÏÎ·ÎºÎµ Î±ÏÎ¿ ÏÎ¿ ÏÏÎ®ÏÏÎ· {{link_user}} ÏÏÎ¹Ï {{created}} ÏÏÎ± {{language_link}}"
-     comment_link: "Î£ÏÏÎ»Î¹Î± Î³Î¹Î± ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·"
-     reply_link: "ÎÏÎ¬Î½ÏÎ·ÏÎ· ÏÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·"
-     comment_count:
-       one: "1 ÏÏÏÎ»Î¹Î¿"
-       other: "{{count}} ÏÏÏÎ»Î¹Î±"
-     edit_link: "ÎÎ»Î»Î±Î³Î® ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï"
-   diary_comment:
-     comment_from: "Î£ÏÏÎ»Î¹Î¿ Î±ÏÎ¿ ÏÎ¿Î½ {{link_user}} ÏÏÎ¹Ï {{comment_created_at}}"
- export:
-   start:
-     area_to_export: "ÎÎ¾Î±Î³ÏÎ³Î® ÏÎµÏÎ¹Î¿ÏÎ®Ï"
-     manually_select: "ÎÎ¹Î¬Î»ÎµÎ¾Îµ ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ"
-     format_to_export: "ÎÎ¾Î±Î³ÏÎ³Î® ÏÏÏÏÎ¿Ï ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ·Ï"
-     osm_xml_data: "OpenStreetMap XML ÏÏÎ¿Î¹ÏÎµÎ¯Î±"
-     mapnik_image: "Mapnik ÎµÎ¹ÎºÏÎ½Î±"
-     osmarender_image: "Osmarender ÎµÎ¹ÎºÏÎ½Î±"
-#     embeddable_html: "Embeddable HTML"
-     licence: "ÎÎ´ÎµÎ¹Î±"
-     export_details: 'OpenStreetMap data are licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-     options: "ÎÏÎ¹Î»Î¿Î³Î­Ï"
-     format: "Î¤ÏÏÏÎ¿Ï ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ·Ï"
-     scale: "ÎÎ»Î¯Î¼Î±ÎºÎ±"
-     max: "max"
-     image_size: "ÎÎ­Î³ÎµÎ¸Î¿Ï ÎµÎ¹ÎºÏÎ½Î±Ï"
-     zoom: "ÎÏÏÎ¯Î±ÏÎ·"
-     add_marker: "Î ÏÏÏÎ¸ÎµÏÎ· markerÏÏÎ¿ ÏÎ¬ÏÏÎ·"
-     latitude: "Î. Î .:"
-     longitude: "Î. Î.:"
-     output: "ÎÏÏÎ´Î¿ÏÎ·"
-#     paste_html: "Paste HTML to embed in website"
-     export_button: "ÎÎ¾Î±Î³ÏÎ³Î®"
-   start_rjs:
-     export: "ÎÎ¾Î±Î³ÏÎ³Î®"
+el: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Î£ÏÎ¼Î±
+      diary_entry: 
+        language: ÎÎ»ÏÏÏÎ±
+        latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
+        longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
+        title: Î¤Î¯ÏÎ»Î¿Ï
+        user: Î§ÏÎ®ÏÏÎ·Ï
+      friend: 
+        friend: Î¦Î¯Î»Î¿Ï
+        user: Î§ÏÎ®ÏÏÎ·Ï
+      message: 
+        body: Î£ÏÎ¼Î±
+        recipient: ÎÎ®ÏÏÎ·Ï
+        sender: ÎÏÎ¿ÏÏÎ¿Î»Î­Î±Ï
+        title: Î¤Î¯ÏÎ»Î¿Ï
+      trace: 
+        description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
+        latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
+        longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
+        name: ÎÎ½Î¿Î¼Î±
+        public: ÎÎ¿Î¹Î½Ï
+        size: ÎÎ­Î³ÎµÎ¸Î¿Ï
+        user: Î§ÏÎ®ÏÏÎ·Ï
+        visible: ÎÏÎ±ÏÏ
+      user: 
+        active: ÎÎ½ÎµÏÎ³Ï
+        description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
+        display_name: ÎÎ½Î¿Î¼Î±
+        email: Email
+        languages: ÎÎ»ÏÏÏÎµÏ
+        pass_crypt: Password
+    models: 
+      acl: Î ÏÏÏÎ²Î±ÏÎ· ÏÏÎ· Î»Î¯ÏÏÎ± ÎµÎ»Î­Î³ÏÎ¿Ï
+      changeset: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï
+      changeset_tag: ÎÏÎ¹ÎºÎ­ÏÎ± Î±Î»Î»Î±Î³Î®Ï ÏÏÎ»Î»Î¿Î³Î®Ï
+      country: Î§ÏÏÎ±
+      diary_comment: Î£ÏÏÎ»Î¹Î¿ ÏÏÎ¿ blog
+      diary_entry: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
+      friend: Î¦Î¯Î»Î¿Ï
+      language: ÎÎ»ÏÏÏÎ±
+      message: ÎÎ®Î½ÏÎ¼Î±
+      node: Î£Î·Î¼ÎµÎ¯Î¿
+      node_tag: Î£Î·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±
+      notifier: ÎÎ¹Î´Î¿ÏÎ¿Î¹Î·ÏÎ®Ï
+      old_node: Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿
+      old_node_tag: Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±
+      old_relation: Î Î±Î»Î¹Î¬ ÏÏÎ­ÏÎ·
+      old_relation_member: Î Î±Î»Î¹Ï Î¼Î­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
+      old_relation_tag: Î Î±Î»Î¹Î¬ ÎµÏÎ¹ÎºÎ­ÏÎ± ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
+      old_way: Î Î±Î»Î¯Î± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·
+      old_way_node: Î£Î·Î¼ÎµÎ¯Î¿ ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
+      old_way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
+      relation: Î£ÏÎ­ÏÎ·
+      relation_member: ÎÎ­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
+      relation_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÏÏÎ­ÏÎ·Ï
+      session: Î£ÏÎ½ÎµÎ´ÏÎ¯Î±
+      trace: ÎÏÎ½Î¿Ï
+      tracepoint: Î£Î·Î¼ÎµÎ¯Î¿ Î¯ÏÎ½Î¿ÏÏ
+      tracetag: ÎÏÎ¹ÎºÎ­ÏÎ± Î¯ÏÎ½Î¿ÏÏ
+      user: Î§ÏÎ®ÏÏÎ·Ï
+      user_preference: Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï ÏÏÎ®ÏÏÎ·
+      user_token: Î¤ÎµÎºÎ¼Î®ÏÎ¹Î¿ ÏÏÎ®ÏÏÎ·
+      way: ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·
+      way_node: ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ·Î¼ÎµÎ¯Î¿Ï
+      way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
+  browse: 
+    changeset: 
+      changeset: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï: {{id}}"
+      changesetxml: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï XML
+      osmchangexml: osmÎ±Î»Î»Î±Î³Î® XML
+      title: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï
+    changeset_details: 
+      belongs_to: "ÎÎ½Î®ÎºÎµÎ¹ ÏÏÎ¿Î½/ÏÏÎ·Î½:"
+      box: ÎºÎ¿ÏÏÎ¹
+      closed_at: "ÎÎºÎ»ÎµÎ¹ÏÎµ ÏÏÎ¹Ï:"
+      created_at: "ÎÎ·Î¼Î¿Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ ÏÏÎ¹Ï:"
+      has_nodes: "ÎÏÎµÎ¹ ÏÎ± ÎµÏÏÎ¼ÎµÎ½Î± {{count}} ÏÎ·Î¼ÎµÎ¯Î±:"
+      has_relations: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} ÏÏÎ­ÏÎµÎ¹Ï:"
+      has_ways: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ {{count}} ÎºÎ±ÏÎµÏÎ¸Î®Î½ÏÎµÎ¹Ï:"
+      show_area_box: ÎÎµÎ¯Î¾Îµ ÎºÎ¿ÏÏÎ¹ ÏÎµÏÎ¹Î¿ÏÎ®Ï
+    common_details: 
+      changeset_comment: "Î£ÏÏÎ»Î¹Î¿:"
+      edited_at: "ÎÎ»Î»Î¬Î¾Îµ ÏÏÎ¹Ï:"
+      edited_by: "ÎÎ»Î»Î±Î³Î® Î­Î³Î¹Î½Îµ Î±ÏÏ:"
+      in_changeset: "Î£ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï:"
+      version: "ÎÎºÎ´Î¿ÏÎ®:"
+    map: 
+      deleted: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+      loading: Î¦ÏÏÏÏÏÎ·...
+    node: 
+      download: "{{download_xml_link}} Î® {{view_history_link}}"
+      node: Î£Î®Î¼ÎµÎ¿
+      node_title: "Î£Î®Î¼ÎµÎ¿: {{node_name}}"
+      view_history: ÎÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
+    node_details: 
+      coordinates: "Î£ÏÎ½ÏÎµÏÎ±Î³Î¼Î­Î½ÎµÏ:"
+      part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï:"
+    node_history: 
+      download: "{{download_xml_link}} Î® {{view_details_link}}"
+      node_history: ÎÏÏÎ¿ÏÎ¯Î± ÏÎ·Î¼ÎµÎ¯Î¿Ï
+      view_details: ÎÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
+    not_found: 
+      sorry: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î· {{type}} Î¼Îµ ÏÎ·Î½ ÏÎ±ÏÏÏÏÎ·ÏÎ± {{id}}, Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯.
+      type: 
+        node: Î£Î·Î¼ÎµÎ¯Î¿
+        relation: ÏÏÎ­ÏÎ·
+        way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·
+    paging_nav: 
+      of: ÏÎ¿Ï
+      showing_page: ÎÎµÎ¯ÏÎ½ÎµÎ¹ ÏÎµÎ»Î¯Î´Î±
+    relation: 
+      download: "{{download_xml_link}} Î® {{view_history_link}}"
+      relation: Î£ÏÎ­ÏÎ·
+      relation_title: "Î£ÏÎ­ÏÎ·: {{relation_name}}"
+      view_history: Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
+    relation_details: 
+      members: "ÎÎ­Î»Î·:"
+      part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï:"
+    relation_history: 
+      relation_history: ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï
+      relation_history_title: "ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï: {{relation_name}}"
+      view_details: ÏÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
+    start: 
+      manually_select: ÎÎ¹Î¬Î»ÎµÎ¾Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ
+      view_data: ÎÎµÏ ÏÏÎ¿Î¹ÏÎµÎ¯Î± Î³Î¹Î± Î±ÏÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·
+    start_rjs: 
+      data_frame_title: Î£ÏÎ¿Î¹ÏÎµÎ¯Î±
+      data_layer_name: Î£ÏÎ¿Î¹ÏÎµÎ¯Î±
+      details: ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
+      drag_a_box: Î¤ÏÎ¬Î²Î± ÏÎ¿ ÎºÎ¿Î¸ÏÎ¯ ÏÏÎ¿ ÏÎ¬ÏÏÎ· Î³Î¹Î± Î½Î± Î´Î¹Î±Î»ÎµÎ¾ÎµÎ¯Ï ÏÎµÏÎ¹Î¿ÏÎ®
+      edited_by_user_at_timestamp: ÎÎ»Î»Î±Î³Î® Î­Î³Î¹Î½Îµ Î±ÏÏ [[user]] ÏÏÎ¹Ï [[timestamp]]
+      history_for_feature: ÎÏÏÎ¿ÏÎ¯Î± ÏÎ¿Ï [[feature]]
+      load_data: Î¦ÏÏÏÏÏÎµ ÏÏÎ¿Î¹ÏÎµÎ¯Î±
+      loaded_an_area_with_num_features: "Â¨ÎÏÎµÎ¹Ï ÏÎ¿ÏÏÏÏÎµÎ¹ Î¼Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® ÏÎ¿Ï ÎµÏÎµÎ¹ [[num_features]] ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬. ÎÎµÎ½Î¹ÎºÎ¬, Î¼ÎµÏÎ¹ÎºÎ¿Î¯ browsers Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î¼Î·Î½ Î±Î½ÏÎ­ÏÎ¿ÏÎ½ Î½Î± Î´ÎµÎ¯Î¾Î¿ÏÎ½ ÏÏÏÎ± ÏÎ¿Î»Î»Î¬ ÏÏÎ¿Î¯ÏÎµÎ¹Î±. ÎÎµÎ½Î¹ÎºÎ¬, Î¿Î¹ browsers Î´Î¿ÏÎ»ÎµÏÎ¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ± Î´ÎµÎ¯ÏÎ½ÏÎ½ÏÎ±Ï Î»Î¹Î³ÏÏÎµÏÎ± Î±ÏÏ 100 ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ· ÏÎ¿ÏÎ¬: Î¼Îµ Î¿ÏÎ¹Î´Î®ÏÎ¿ÏÎµ Î¬Î»Î»Î¿ Î¿ browser Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î³Î¯Î½ÎµÎ¹ Î±ÏÎ³ÏÏ Î® Î½Î± Î¼Î·Î½ Î±Î½ÏÎ¹Î´ÏÎ¬. ÎÎ½ ÎµÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï Î¿ÏÎ¹ Î¸ÎµÏ Î½Î± Î´ÎµÎ¹Ï Î±ÏÏÎ¬ ÏÎ± ÏÏÎ¿Î¹ÏÎµÎ¯Î±, ÎºÎ¬Î½Îµ ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÏÏÎ¼ÎµÎ½Î¿ ÎºÎ¿ÏÎ¼ÏÎ¯."
+      loading: Î¦ÏÏÏÏÏÎ·...
+      manually_select: ÎÎ¹Î¬Î»ÎµÎ¾Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ
+      object_list: 
+        api: ÎÏÎ±Î½Î¬ÎºÏÎ·ÏÎ· ÏÎµÏÎ¹Î¿ÏÎ®Ï Î±ÏÏ ÏÎ¿ API
+        back: ÎÎµÎ¯Î¾Îµ Î»Î¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½
+        details: ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
+        heading: ÎÎ¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½
+        history: 
+          type: 
+            node: Î£Î·Î¼ÎµÎ¯Î¿ [[id]]
+            way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]
+        selected: 
+          type: 
+            node: Î£Î·Î¼ÎµÎ¯Î¿ [[id]]
+            way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]
+        type: 
+          node: Î£Î·Î¼ÎµÎ¯Î¿
+          way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·
+      private_user: Î¹Î´Î¹ÏÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï
+      show_history: ÎÎµÎ¯Î¾Îµ Î¹ÏÏÎ¿ÏÎ¯Î±
+      unable_to_load_size: "ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎ¿ÏÏÏÏÎµÎ¹: Î¤Î¿ Î¼Î­Î³ÎµÎ¸Î¿Ï ÏÎ¿Ï bounding box [[bbox_size]] ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¹ÎºÏÏÏÎµÏÎ¿ Î±ÏÎ¿ {{max_bbox_size}})"
+      wait: ÎÎ½Î±Î¼Î¿Î½Î®...
+      zoom_or_select: ÎÏÏÎ¯Î±ÏÎµ Î® Î´Î¹Î¬Î»ÎµÎ¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® Î±ÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·
+    tag_details: 
+      tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
+    way: 
+      download: "{{download_xml_link}} Î® {{view_history_link}}"
+      view_history: Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
+      way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·
+      way_title: "ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï {{related_ways}}
+        other: ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎµÏÎ½ {{related_ways}}
+      nodes: "Î£Î·Î¼ÎµÎ¯Î±:"
+      part_of: ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï
+    way_history: 
+      download: "{{download_xml_link}} Î® {{view_details_link}}"
+      view_details: Î´ÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
+      way_history: ÎÏÏÎ¿ÏÎ¯Î± ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï
+      way_history_title: "ÎÏÏÎ¿ÏÎ¯Î± ÎºÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·Ï: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: ÎÎ½ÏÎ½ÏÎ¼Î¿Ï
+      show_area_box: Î´ÎµÎ¯Î¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® ÎºÎ¿ÏÏÎ¹Î¿Ï
+      view_changeset_details: ÎÎµÏ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
+    changeset_paging_nav: 
+      showing_page: EÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÎ»Î¯Î´Î±Ï
+    changesets: 
+      area: Î ÎµÏÎ¹Î¿ÏÎ®
+      comment: Î£ÏÏÎ»Î¹Î¿
+      id: ID
+      saved_at: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏÎ¹Ï
+      user: Î§ÏÎ®ÏÏÎ·Ï
+  diary_entry: 
+    diary_comment: 
+      comment_from: Î£ÏÏÎ»Î¹Î¿ Î±ÏÎ¿ ÏÎ¿Î½ {{link_user}} ÏÏÎ¹Ï {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 ÏÏÏÎ»Î¹Î¿
+        other: "{{count}} ÏÏÏÎ»Î¹Î±"
+      comment_link: Î£ÏÏÎ»Î¹Î± Î³Î¹Î± ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
+      edit_link: ÎÎ»Î»Î±Î³Î® ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï
+      posted_by: ÎÏÎ¬ÏÏÎ·ÎºÎµ Î±ÏÎ¿ ÏÎ¿ ÏÏÎ®ÏÏÎ· {{link_user}} ÏÏÎ¹Ï {{created}} ÏÏÎ± {{language_link}}
+      reply_link: ÎÏÎ¬Î½ÏÎ·ÏÎ· ÏÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
+    edit: 
+      body: "Î£ÏÎ¼Î±:"
+      language: "ÎÎ»ÏÏÏÎ±:"
+      latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
+      location: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±:"
+      longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
+      marker_text: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï blog
+      save_button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·
+      subject: "ÎÎ­Î¼Î±:"
+      title: ÎÎ»Î»Î±Î³Î· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
+      use_map_link: ÏÏÎ·ÏÎ·Î¼Î¿ÏÎ¿Î¯Î·ÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ·
+    list: 
+      new: ÎÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
+      new_title: Î£ÏÎ½Î¸ÎµÏÎ· ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÏÏÎ¿ blog ÏÏÎ®ÏÏÎ·
+      newer_entries: Î ÏÏÏÏÎ±ÏÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
+      no_entries: ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
+      older_entries: Î Î±Î»Î¯ÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
+      recent_entries: "Î ÏÏÏÎ¿ÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï blog:"
+      title: Blog ÏÏÎ·ÏÏÏÎ½
+      user_title: Blog {{user}}
+    new: 
+      title: ÎÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
+    no_such_entry: 
+      body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog Î® ÏÏÏÎ»Î¹Î¿ Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ± {{id}}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï ÏÎ¿ link.
+      heading: "ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ±: {{id}}"
+    no_such_user: 
+      body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± {{user}}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï ÏÎ¿ link.
+      heading: Î ÏÏÎ®ÏÏÎ·Ï {{user}} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹
+      title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ïr
+    view: 
+      leave_a_comment: ÎÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï
+      login_to_leave_a_comment: "{{login_link}} Î³Î¹Î± ÎµÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï"
+      save_button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·
+      title: Blog ÏÏÎ·ÏÏÏÎ½ | {{user}}
+      user_title: Blog {{user}}
+  export: 
+    start: 
+      add_marker: Î ÏÏÏÎ¸ÎµÏÎ· markerÏÏÎ¿ ÏÎ¬ÏÏÎ·
+      area_to_export: ÎÎ¾Î±Î³ÏÎ³Î® ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      export_button: ÎÎ¾Î±Î³ÏÎ³Î®
+      export_details: OpenStreetMap data are licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: Î¤ÏÏÏÎ¿Ï ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ·Ï
+      format_to_export: ÎÎ¾Î±Î³ÏÎ³Î® ÏÏÏÏÎ¿Ï ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ·Ï
+      image_size: ÎÎ­Î³ÎµÎ¸Î¿Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      latitude: "Î. Î .:"
+      licence: ÎÎ´ÎµÎ¹Î±
+      longitude: "Î. Î.:"
+      manually_select: ÎÎ¹Î¬Î»ÎµÎ¾Îµ ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ
+      mapnik_image: Mapnik ÎµÎ¹ÎºÏÎ½Î±
+      max: max
+      options: ÎÏÎ¹Î»Î¿Î³Î­Ï
+      osm_xml_data: OpenStreetMap XML ÏÏÎ¿Î¹ÏÎµÎ¯Î±
+      osmarender_image: Osmarender ÎµÎ¹ÎºÏÎ½Î±
+      output: ÎÏÏÎ´Î¿ÏÎ·
+      scale: ÎÎ»Î¯Î¼Î±ÎºÎ±
+      zoom: ÎÏÏÎ¯Î±ÏÎ·
+    start_rjs: 
+      export: ÎÎ¾Î±Î³ÏÎ³Î®
+  layouts: 
+    home: ÎºÏÏÎ¹Î± ÏÎµÎ»Î¯Î´Î±
+  map: 
+    coordinates: "Î£ÏÎ½ÏÎµÏÎ±Î³Î¼Î­Î½ÎµÏ:"
+    edit: ÎÎ»Î»Î±Î¾Îµ
+    view: ÎÎ¾Î­ÏÎ±ÏÎµ
+  message: 
+    message_summary: 
+      delete_button: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+    sent_message_summary: 
+      delete_button: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+  notifier: 
+    diary_comment_notification: 
+      hi: ÎÎµÎ¹Î± {{to_user}},
+    email_confirm_html: 
+      greeting: ÎÎµÎ¹Î±,
+    email_confirm_plain: 
+      greeting: ÎÎµÎ¹Î±,
+    gpx_notification: 
+      greeting: ÎÎµÎ¹Î±,
+    lost_password_html: 
+      greeting: ÎÎµÎ¹Î±,
+    lost_password_plain: 
+      greeting: ÎÎµÎ¹Î±,
+    signup_confirm_plain: 
+      greeting: ÎÎµÎ¹Î±!
+  oauth_clients: 
+    new: 
+      submit: ÎÎ³Î³ÏÎ±ÏÎ®
+  trace: 
+    edit: 
+      edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      map: ÏÎ¬ÏÏÎ·Ï
+      owner: "ÎÎ´Î¹Î¿ÎºÏÎ®ÏÎ·Ï:"
+      tags_help: Î¿ÏÎ¹Î¿Î¸ÎµÏÎ·Î¼Î­Î½Î¿ Î±ÏÏ ÏÎ± ÎºÏÎ¼Î¼Î±ÏÎ±
+      visibility: "ÎÏÎ±ÏÏÏÎ·ÏÎ±:"
+      visibility_help: ÏÎ¹ ÏÎ·Î¼Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ;
+    trace: 
+      map: ÏÎ¬ÏÏÎ·Ï
+    view: 
+      map: ÏÎ¬ÏÏÎ·Ï
+  user: 
+    new: 
+      email address: "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0bfba16fc..f6dcc780a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,779 +1,900 @@
-es:
-  html:
-    dir: "ltr"
-  activerecord:
-    models:
-      acl: "Lista de control de acceso"
-      changeset: "Conjunto de cambios"
-      changeset_tag: "Etiqueta del conjunto de cambios"
-      country: "PaÃ­s"
-      diary_comment: "Comentario al diario"
-      diary_entry: "Entada del diario"
-      friend: "Amigo"
-      language: "Idioma"
-      message: "Mensaje"
-      node: "Nodo"
-      node_tag: "Etiqueta del nodo"
-      old_node: "Nodo antiguo"
-      old_node_tag: "Etiqueta del nodo antiguo"
-      old_relation: "RelaciÃ³n antigua"
-      old_relation_member: "Miembro de la relaciÃ³n antigua"
-      old_relation_tag: "Etiqueta de la relaciÃ³n antigua"
-      old_way: "VÃ­Â­a antigua"
-      old_way_node: "Nodo de la vÃ­a antigua"
-      old_way_tag: "Etiqueta de la vÃ­Â­a antigua"
-      relation: "RelaciÃ³n"
-      relation_member: "Miembro de RelaciÃ³n"
-      relation_tag: "Etiqueta de la relaciÃ³n"
-      session: "SesiÃ³n"
-      trace: "Traza "
-      tracepoint: "Punto de la traza"
-      tracetag: "Etiqueta de la traza"
-      user: "Usuario"
-      user_preference: "Preferencias de usuario"
-      user_token: "Token del usuario"
-      way: "VÃ­a"
-      way_node: "Nodo de la vÃ­a"
-      way_tag: "Etiqueta de vÃ­Â­a"
-    attributes:
-      diary_comment:
-        body: "Cuerpo"
-      diary_entry:
-        user: "Usuario"
-        title: "TÃ­tulo"
-        latitude: "Latitud"
-        longitude: "Longitud"
-        language: "Idioma"
-      friend:
-        user: "Usuario"
-        friend: "Amigo"
-      trace:
-        user: "Usuario"
-        visible: "Visible"
-        name: "Nombre"
-        size: "TamaÃ±o"
-        latitude: "Latitud"
-        longitude: "Longitud"
-        public: "PÃºblica"
-        description: "DescripciÃ³n"
-      message:
-        sender: "Remitente"
-        title: "TÃ­tulo"
-        body: "Cuerpo"
-        recipient: "Destinatario"
-      user:
-        email: "Correo"
-        active: "Activo"
-        display_name: "Nombre en pantalla"
-        description: "DescripciÃ³n"
-        languages: "Idiomas"
-        pass_crypt: "ContraseÃ±a"
-  map:
-    view: "Ver"
-    edit: "Editar"
-    coordinates: "Coordenadas"
-  browse:
-    changeset:
-      title: "Conjunto de cambios"
-      changeset: "Conjunto de cambios {{id}}"
-      download: "Descargar {{changeset_xml_link}} o {{osmchange_xml_link}}"
-      changesetxml: "XML del conjunto de cambios"
-      osmchangexml: "XML en formato osmChange"
-    changeset_details:
-      created_at: "Creado en:"
-      closed_at: "Cerrado en:"
-      belongs_to: "Pertenece a"
-      bounding_box: "Envoltura"
-      no_bounding_box: "No se ha guardado una envoltura para este conjunto de cambios"
-      show_area_box: "Mostrar caja del Ãrea"
-      box: "Caja"
-      has_nodes: "Tiene {{count}} nodos:"
-      has_ways: "Tiene {{count}} vÃ­as:"
-      has_relations: "Tiene {{count}} relaciones:"
-    common_details:
-      edited_at: "Editado en"
-      edited_by: "Editado por:"
-      version: "VersiÃ³n:"
-      in_changeset: "En el conjunto de cambios:"
-    containing_relation:
-      entry: "RelaciÃ³n {{relation_name}}"
-      entry_role: "RelaciÃ³n {{relation_name}} (como {{relation_role}})"
-    map:
-      loading: "Cargando..."
-      deleted: "Borrado"
-    node_details:
-      coordinates: "Coordenadas"
-      part_of: "Parte de:"
-    node_history:
-      node_history: "Historial del nodo"
-      download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: "Descargar XML"
-      view_details: "ver detalles"
-    node:
-      node: "Nodo"
-      node_title: "Nodo: {{node_name}}"
-      download: "{{download_xml_link}} o {{view_history_link}}"
-      download_xml: "Descargar XML"
-      view_history: "ver historial"
-    not_found:
-      sorry: "Lo sentimos, {{type}} con ID {{id}} no fue encontrado"
-      type:
-        node: "el nodo"
-        way: "la vÃ­a"
-        relation: "la relaciÃ³n"
-    paging_nav:
-      showing_page: "Mostrando pÃ¡gina"
-      of: "de"
-    relation_details:
-      members: "Miembros"
-      part_of: "Parte de"
-    relation_history:
-      relation_history: "Historial de la relaciÃ³n"
-      relation_history_title: "Historial de la relaciÃ³n {{relation_name}}:"
-    relation:
-      relation: "RelaciÃ³n"
-      relation_title: "RelaciÃ³n {{relation_name}}:"
-      download: "{{download_xml_link}} o {{view_history_link}}"
-      download_xml: "Descargar XML"
-      view_history: "ver historial"
-    start:
-      view_data: "Ver datos para el encuadre actual"
-      manually_select: "Seleccionar manualmente un ÃÂ¡rea diferente"
-    start_rjs:
-      data_layer_name: "Datos"
-      data_frame_title: "Datos"
-      zoom_or_select: "Para ver los datos, haga mÃ¡s zoom o seleccione un Ãrea del mapa"
-      drag_a_box: "Arrastre en el mapa para dibujar un Ãrea de encuadre"
-      manually_select: "Seleccionar manualmente un Ãrea diferente"
-      loaded_an_area_with_num_features: "Ha cargado un Ãrea que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de informaciÃ³n vectorial. Generalmente, el funcionamiento Ãptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si estÃ¡ seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botÃ³n que aparece debajo."
-      load_data: "Cargar datos"
-      unable_to_load_size: "Imposible cargar: El tamaÃ±o de la envoltura ([[bbox_size]] es demasiado grande (debe ser menor que {{max_bbox_size}})"
-      loading: "Cargando..."
-      show_history: "Mostrar historial"
-      wait: "Espere..."
-      history_for_feature: "Historial de [[feature]]"
-      details: "Detalles"
-      private_user: "usuario privado"
-      edited_by_user_at_timestamp: "Editado por [[user]] en [[timestamp]]"
-      object_list:
-        heading: "Lista de objetos"
-        back: "Mostrar lista de objetos"
-        type:
-          node: "Nodo"
-          way: "VÃ­a"
-        api: "Descargar este Ãrea a travÃ©s de la API"
-        details: "Detalles"
-        selected:
-          type:
-            node: "Nodo [[id]]"
-            way: "VÃ­Â­a [[id]]"
-        history:
-            node: "Nodo [[id]]"
-            way: "VÃ­Â­a [[id]]"
-    tag_details:
-      tags: "Etiquetas"
-    way_details:
-      nodes: "Nodos"
-      part_of: "Parte de"
-      also_part_of:
-        one: "tambiÃ©n parte de la vÃ­Â­a {{related_ways}}"
-        other: "tambiÃ©n parte de las vÃ­Â­as {{related_ways}}"
-    way_history:
-      way_history: "Historial de la vÃ­a"
-      way_history_title: "Historial del camino {{way_name}}:"
-      download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: "Descargar XML"
-      view_details: "ver detalles"
-    way:
-      way: "VÃ­a"
-      way_title: "VÃ­a {{way_name}}:"
-      download: "{{download_xml_link}} o {{view_history_link}}"
-      download_xml: "Descargar XML"
-      view_history: "ver historial"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "Mostrando pÃ¡gina"
-      of: "de"
-    changeset:
-      still_editing: "(todavÃ­a en ediciÃ³n)"
-      anonymous: "AnÃ³nimo"
-      no_comment: "(ninguno)"
-      no_edits: "(sin ediciones)"
-      show_area_box: "mostrar caja"
-      big_area: "(grande)"
-      view_changeset_details: "Ver detalles del conjunto de cambios"
-    changesets:
-      id: "ID"
-      saved_at: "Guardado en"
-      user: "Usuario"
-      comment: "Comentario"
-      area: "ÃÂrea"
-    list_bbox:
-      history: "Historial"
-      changesets_within_the_area: "Conjuntos de cambios en el Ãrea:"
-      show_area_box: "mostrar caja"
-      no_changesets: "Sin conjuntos de cambios"
-      all_changes_everywhere: "Para todos los cambios en cualquier lugar vÃ©ase {{recent_changes_link}}"
-      recent_changes: "Cambios Recientes"
-      no_area_specified: "No se especificÃ³ un Ãrea"
-      first_use_view: "Primero usa la {{view_tab_link}} para desplazarte y hacer zoom sobre el Ãrea de interÃ©s, entonces haz clic en la pestaÃ±a de historial."
-      view_the_map: "ver el mapa"
-      view_tab: "pestaÃ±a vista"
-      alternatively_view: "Alternativamente, vea todos los {{recent_changes_link}}"
-    list:
-      recent_changes: "Cambios recientes"
-      recently_edited_changesets: "Conjunto de cambios editados recientemente"
-      for_more_changesets: "Para mÃ¡s conjuntos de cambios, seleccione un usuario y vea sus ediciones, o vea el historial de ediciones de un Ãrea especÃ­Â­fica"
-    list_user:
-      edits_by_username: "Ediciones hechas por {{username_link}}"
-      no_visible_edits_by: "{{name}} no ha hecho ediciones visibles."
-      for_all_changes: "Para los cambios de todos los usuarios vea {{recent_changes_link}}"
-      recent_changes: "Cambios Recientes"
-  diary_entry:
-    new:
-      title: "Nueva entrada en el diario"
-    list:
-      title: "Diarios de usuarios"
-      user_title: "Diario de {{user}}"
-      new: "Nueva entrada en el diario"
-      new_title: "Redactar una nueva entrada en tu diario de usuario"
-      no_entries: "No hay entradas en el diario"
-      recent_entries: "Entradas recientes en el diario:"
-      older_entries: "Entradas mÃ¡s antiguas"
-      newer_entries: "Entradas mÃ¡s modernas"
-    edit:
-      title: "Editar entrada del diario"
-      subject: "Asunto: "
-      body: "Cuerpo: "
-      language: "Idioma: "
-      location: "Lugar:"
-      latitude: "Latitud"
-      longitude: "Longitud"
-      use_map_link: "Usar mapa"
-      save_button: "Guardar"
-      marker_text: "Lugar de la entrada del diario"
-    view:
-      title: "Diarios de usuarios | {{user}}"
-      user_title: "Diario de {{user}}"
-      leave_a_comment: "Dejar un comentario"
-      login_to_leave_a_comment: "{{login_link}} para dejar un comentario"
-      login: "IdentifÃ­quese"
-      save_button: "Guardar"
-    no_such_entry:
-      heading: "No hay entrada con la ID {{id}}"
-      body: "Lo sentimos, no hay ninguna entrada del diario para la ID {{id}}. Por favor, comprueba que la direcciÃ³n estÃ© correctamente escrita."
-    no_such_user:
-      title: "No existe ese usuario"
-      heading: "El usuario {{user}} no existe"
-      body: "Lo sentimos, no hay ningÃºn usuario llamado {{user}}. Por favor, comprueba que la direcciÃ³n es correcta."
-    diary_entry:
-      posted_by: "Posteado por {{link_user}} en {{created}} en {{language_link}}"
-      comment_link: "Comentar esta entrada"
-      reply_link: "Responder a la entrada"
-      comment_count:
-        one: "1 comentario"
-        other: "{{count}} comentarios"
-      edit_link: "Editar entrada"
-    diary_comment:
-      comment_from: "Comentario de {{link_user}} de {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Ãrea a exportar"
-      manually_select: "Seleccionar a mano otra area"
-      format_to_export: "Formato de exportaciÃ³n"
-      osm_xml_data: "Datos formato OpenStreetMap XML"
-      mapnik_image: "Imagen de Mapnik"
-      osmarender_image: "Imagen de Osmarender"
-      embeddable_html: "HTML para pegar"
-      licence: "Licencia"
-      export_details: "Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons AtribuciÃÂ³n-Compartir Igual 2.0</a>."
-      options: "Opciones"
-      format: "Formato"
-      scale: "Escala"
-      max: "max"
-      image_size: "TamaÃ±o de la imagen"
-      zoom: "Zoom"
-      add_marker: "AÃ±adir chinche en el mapa"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Resultado"
-      paste_html: "HTML para empotrar en otro sitio web"
-      export_button: "Exportat"
-    start_rjs:
-      export: "Exportar"
-      drag_a_box: "Arrastre una caja en el mapa para seleccionar un Ãrea"
-      manually_select: "Seleccionar manualmente un Ãrea distinta"
-      click_add_marker: "Pinche en el mapa para aÃ±adir un marcador"
-      change_marker: "Cambiar posiciÃ³n del marcador"
-      add_marker: "AÃ±adir un marcador al mapa"
-      view_larger_map: "Ver mapa mÃ¡s grande"
-  geocoder:
-    search:
-      title:
-        latlon: 'Resultados en <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Resultados en <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Resultados en <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Resultados en <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Resultados en <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Resultados en <a href="http://www.geonames.org/">GeoNames</a>'
-    results:
-      no_results: "No se han encontrado resultados"
-  layouts:
-    project_name:
-      title: "OpenStreetMap"
-      h1: "OpenStreetMap"
-    logo:
-      alt_text: "Logo de OpenStreetMap"
-    welcome_user: "Bienvenido, {{user_link}}"
-    welcome_user_link_tooltip: "Tu pÃ¡gina de usuario"
-    home: "inicio"
-    home_tooltip: "Ir a la pÃ¡gina inicial"
-    inbox: "bandeja de entrada ({{count}})"
-    inbox_tooltip:
-      zero: "Tu bandeja de entrada no tiene mensajes sin leer"
-      one: "Tu bandeja de entrada contiene un mensaje sin leer"
-      other: "Tu bandeja de entrada contiene {{count}} mensajes sin leer"
-    logout: "Salir"
-    logout_tooltip: "Salir"
-    log_in: "identificarse"
-    log_in_tooltip: "Identificarse con una cuenta existente"
-    sign_up: "registrarse"
-    sign_up_tooltip: "Cree una cuenta para editar"
-    view: "Ver"
-    view_tooltip: "Ver mapas"
-    edit: "Editar"
-    edit_tooltip: "Editar mapas"
-    history: "Historial"
-    history_tooltip: "Historial de conjuntos de cambios"
-    export: "Exportar"
-    export_tooltip: "Exportar datos del mapa"
-    gps_traces: "Trazas GPS"
-    gps_traces_tooltip: "Gestionar trazas"
-    user_diaries: "Diarios de usuario"
-    user_diaries_tooltip: "Ver diarios de usuario"
-    tag_line: "El WikiMapaMundi libre"
-    intro_1: "OpenStreetMap es un mapa libremente editable de todo el mundo. EstÃ¡ hecho por personas como usted."
-    intro_2: "OpenStreetMap te permite ver, editar y usar informaciÃ³n geogrÃ¡fica de manera colaborativa desde cualquier lugar del mundo."
-    intro_3: "Agradecimientos al {{ucl}} y {{bytemark}} por apoyar el hospedaje de los servidores de OpenStreetMap."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "La base de datos de OpenStreetMap no estÃ¡ disponible en estos momentos debido a trabajos de mantenimiento."
-    osm_read_only: "La base de datos de OpenStreetMap se encuentra en modo de sÃ³lo lectura debido a trabajos de mantenimiento."
-    donate: "Apoye a OpenStreetMap {{link}} al Fondo de ActualizaciÃ³n de Hardware."
-    donate_link_text: "donando"
-    help_wiki: "Ayuda y Wiki"
-    help_wiki_tooltip: "Ayuda y sitio Wiki del proyecto"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/ES:Main_Page"
-    news_blog: "Blog y noticias"
-    news_blog_tooltip: "Blog de noticias sobre OpenStreetMap, informaciÃ³n geogrÃ¡fica libre, etc."
-    shop: "Tienda"
-    shop_tooltip: "Tienda con productos de OpenStreetMap"
-    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
-    sotm: "Â¡Venga a las conferencias de OpenStreetMap, el State of the Map 2009, del 10 al 12 de julio en Amsterdam!"
-    alt_donation: "Hacer una donaciÃ³n"
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} ha comentado en tu entrada de diario"
-      banner1: "* Por favor no responda a este correo. *"
-      banner2: "* Use el sitio web de OpenStreetMap para responder. *"
-      hi: "Hola {{to_user}},"
-      header: "{{from_user}} ha comentado sobre tu reciente entrada en el diario con el asunto {{subject}}:"
-      footer: "TambiÃ©n puede leer el comentario en {{readurl}} y puedes comentar en {{commenturl}} o responder en {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} te ha enviado un nuevo mensaje"
-      banner1: "* Por favor no responda a este correo. *"
-      banner2: "* Use el sitio Web de OpenStreetMap para responder. *"
-      hi: "Hola {{to_user}},"
-      header: "{{from_user}} te ha enviado un mensaje a travÃ©s de OpenStreetMap con el asunto {{subject}}:"
-      footer1: "TambiÃ©n puedes leer el mensaje en {{readurl}}"
-      footer2: "y puedes responder en {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} te ha aÃ±adido como amigo"
-      had_added_you: "{{user}} te ha aÃ±adido como amigo en OpenStreetMap"
-      see_their_profile: "Puede ver su perfil en {{userurl}} y aÃ±adirle como amigo tambiÃ©n, si asÃ­Â­ lo desea"
-    gpx_notification:
-      greeting: "Hola,"
-      your_gpx_file: "Parece que su archivo GPX"
-      with_description: "con la descripciÃ³n"
-      and_the_tags: "y con las siguientes etiquetas:"
-      and_no_tags: "y sin etiquetas"
-      failure:
-        subject: "[OpenStreetMap] Fallo al importar GPX"
-        failed_to_import: "no ha podido ser importado. El mensaje de error es:"
-        more_info_1: "Puede encontrar mÃ¡s informaciÃ³n sobre fallos de importaciÃ³n "
-        more_info_2: "de GPX y cÃ³mo evitarlos en:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
-        subject: "[OpenStreetMap] Ãxito al importar GPX"
-        loaded_successfully: "ha sido cargada con Ã©xito"
-    signup_confirm:
-      subject: "[OpenStreetMap] Confirme su direcciÃ³n de correo electrÃ³nico"
-    signup_confirm_plain:
-      greeting: "Â¡Hola!"
-      hopefully_you: "Alguien (probablemente usted) ha creado una cuenta en"
-      click_the_link_1: "Si este es usted, Â¡Bienvenido! Por favor, pulse en el enlace mÃ¡s abajo para "
-      click_the_link_2: "confirmar su cuenta y leer mÃ¡s informaciÃ³n sobre OpenStreetMap."
-      introductory_video: "Puede ver un vÃ­deo introductorio sobre OpenStreetMap aquÃ­Â­:"
-      more_videos: "Hay mÃ¡s vÃ­Â­deos aquÃ­Â­:"
-      the_wiki: "Lea mÃ¡s sobre OpenStreetMap en el wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/ES:Beginners_Guide"
-      opengeodata: "OpenGeoData.org es el blog de OpenStreetMap, y tambiÃ­n tiene podcasts:"
-      wiki_signup: "Puede que tambiÃ©n quiera registrarse en el Wiki de OpenStreetMap en:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&returnto=ES:Main_Page"
-      user_wiki_1: "Recomendamos que cree una pÃ¡gina de usuario en el wiki, que incluya"
-      user_wiki_2: "etiquetas de categorÃ­Â­a pasa saber de dÃ³nde es (por ejemplo [[Category:Users_in_Madrid]])"
-      current_user_1: "Una lista de todos los usuarios por categorÃ­Â­as, basado en su procedencia,"
-      current_user_2: "estÃ¡ disponible en:"
-    signup_confirm_html:
-      greeting: "Â¡Hola!"
-      hopefully_you: "Alguien (probablemente usted) ha creado una cuenta en"
-      click_the_link: "Si este es usted, Â¡Bienvenido! Por favor, pulse en el enlace mÃ¡s abajo para confirmar su cuenta y leer mÃ¡s informaciÃ³n sobre OpenStreetMap."
-      introductory_video: "Puede ver un {{introductory_video_link}}"
-      video_to_openstreetmap: "vÃ­Â­deo introductorio a OpenStreetMap."
-      more_videos: "Hay mÃ¡s {{more_videos_link}}"
-      more_videos_here: "vÃ­Â­deos aquÃ­Â­"
-    email_confirm:
-      subject: "[OpenStreetMap] Confirme su direcciÃ³n de correo"
-    email_confirm_plain:
-      greeting: "Hola,"
-      hopefully_you_1: "Alguien (posiblemente usted) quiere cambiar la direcciÃ³n de correo en"
-      hopefully_you_2: "{{server_url}} a {{new_address}}."
-      click_the_link: "Si es usted, por favor pulse el enlace inferior para confirmar el cambio"
-    email_confirm_html:
-      greeting: "Hola,"
-      hopefully_you: "Alguien (posiblemente usted) quiere cambiar la direcciÃ³n de correo en {{server_url}} a {{new_address}}."
-      click_the_link: "Si es usted, por favor pulse el enlace inferior para confirmar el cambio"
-    lost_password:
-      subject: "[OpenStreetMap] PeticiÃ³n para resetear la contraseÃ±a"
-    lost_password_plain:
-      greeting: "Hola,"
-      click_the_link: "Si es usted, por favor pulse el enlace inferior para resetear la contraseÃ±a."
-    lost_password_html:
-      greeting: "Hola,"
-      click_the_link: "Si es usted, por favor pulse el enlace inferior para resetear la contraseÃ±a."
-  message:
-    inbox:
-      title: "BuzÃ³n de entrada"
-      my_inbox: "Mi buzÃ³n de entrada"
-      outbox: "bandeja de salida"
-      you_have: "tienes {{new_count}} mensajes nuevos y {{old_count}} mensajes viejos"
-      from: "De"
-      subject: "Asunto"
-      date: "Fecha"
-      people_mapping_nearby: "gente cercana mapeando"
-    message_summary:
-      unread_button: "Marcar como sin leer"
-      read_button: "Marcar como leÃ­Â­do"
-      reply_button: "Responder"
-    new:
-      title: "Enviar mensaje"
-      send_message_to: "Enviar un mensaje nuevo a {{name}}"
-      subject: "Asunto"
-      body: "Cuerpo"
-      send_button: "Enviar"
-      message_sent: "Mensaje enviado"
-    outbox:
-      title: "Salida"
-      my_inbox: "Mi {{inbox_link}}"
-      inbox: "entrada"
-      outbox: "salida"
-      to: "A"
-      subject: "Asunto"
-      date: "Fecha"
-      people_mapping_nearby: "gente mapeando cerca"
-    read:
-      title: "Leer mensaje"
-      from: "Desde"
-      subject: "Asunto"
-      date: "Fecha"
-      reply_button: "Responder"
-      unread_button: "Marcar como no leÃ­do"
-      to: "A"
-    mark:
-      as_read: "Mensaje marcado como leÃ­do"
-      as_unread: "Mensaje marcado como sin leer"
-  site:
-    index:
-      js_1: "EstÃ¡ usando un navegador que no soporta o tiene desactivado javascript"
-      js_2: "OpenStreetMap utiliza javascript para mostrar su mapa"
-      permalink: "Enlace permanente"
-      license:
-        license_name: "Creative Commons AtribuciÃ³n-Licenciar Igual 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "Proyecto OpenStreetMap"
-        project_url: "http://openstreetmap.org"
-    edit:
-      user_page_link: "pÃ¡gina de usuario"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-    sidebar:
-      search_results: "Resultados de la bÃºsqueda"
-      close: "Cerrar"
-    search:
-      search: "Buscar"
-      where_am_i: "Â¿DÃ³nde estoy?"
-      submit_text: "Ir"
-  trace:
-    visibility:
-      private: "Privado (solo compartido como anonimo, puntos no ordenados)"
-      public: "Publico (mostrado en la lista de trazas y como anonimo, puntos no ordenados)"
-      trackable: "Trazable (solo compartido como anonimo, puntos ordenados con marcas de tiempo)"
-      identifiable: "Identificable (mostrado en la lista de trazas y como identificable, puntos ordenados con marcas de tiempo)"
-    create:
-      upload_trace: "Subir Traza GPS"
-      trace_uploaded: "Su archivo GPX ha sido cargado y estÃ¡ esperando ser agregado a la Base de Datos. Esto normalmente ocurre dentro de la prÃ³xima media hora, y un email le serÃ¡ enviado al terminar."
-    edit:
-      title: "Editando trazo {{name}}"
-      heading: "Editando trazo {{name}}"
-      filename: "Nombre de archivo:"
-      download: "descargar"
-      uploaded_at: "Subido el:"
-      start_coord: "Coordenada Inicial:"
-      map: "mapa"
-      tags_help: "delimitado por comas"
-      visibility: "Visibilidad:"
-      visibility_help: "Â¿Que significa esto?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      points: "Puntos:"
-      edit: "editar"
-      owner: "Propietario"
-      description: "DescripciÃ³n"
-      tags: "Etiquetas"
-      save_button: "Guardar cambios"
-    no_such_user:
-      title: "No existe este usuario"
-      heading: "El usuario {{user}} no existe"
-      body: "Lo sentimo, no hay un usuario con el nombre {{user}}. Por favor revise la redacciÃ³n o quizas el enlace al que hizo click esta errado."
-    trace_form:
-      upload_gpx: "Subir archivo GPX"
-      tags_help: "delimitado por comas"
-      visibility: "Visibilidad"
-      visibility_help: "Â¿Que significa esto?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-      description: "DescripciÃ³n"
-      tags: "Etiquetas"
-      public: "Â¿PÃºblico?"
-      upload_button: "Subir"
-      help: "Ayuda"
-    trace_header:
-      see_just_your_traces: "Ver solo tus trazas, o subir una traza"
-      traces_waiting: "Tienes {{count}} trazas esperando ser agregadas a la Base de Datos. Por favor considera el esperar que estas terminen antes de subir otras, para no bloquear la lista de espera a otros usuario."
-      see_all_traces: "Ver todas las trazas"
-      see_your_traces: "Ver todas tus trazas"
-    trace_optionals:
-      tags: "Etiquetas"
-    view:
-      pending: "PENDIENTE"
-      download: "descargar"
-      points: "Puntos:"
-      start_coordinates: "Coordenadas de inicio:"
-      map: "Mapa"
-      edit: "Editor"
-      owner: "Propietario"
-      description: "DescripciÃ³n:"
-      tags: "Etiquetas"
-      none: "Ninguna"
-      make_public: "Hacer esta traza pÃºblica de forma permanente"
-      edit_track: "Editar esta traza"
-      delete_track: "Borrar esta traza"
-      heading: "Viendo traza {{name}}"
-      trace_not_found: "Â¡No se ha encontrado la traza!"
-    trace_paging_nav:
-      showing: "Mostrando pÃ¡gina"
-      of: "de"
-    trace:
-      pending: "PENDIENTE"
-      count_points: "{{count}} puntos"
-      ago: "hace {{time_in_words_ago}}"
-      more: "mÃ¡s"
-      trace_details: "Ver detalle de la traza"
-      view_map: "Ver mapa"
-      edit: "editar"
-      edit_map: "Editar mapa"
-      public: "PÃBLICO"
-      private: "PRIVADO"
-      by: "por"
-      in: "en"
-      map: "mapa"
-    list:
-      public_traces: "Trazas GPS pÃºblicas"
-      your_traces: "Tus trazas GPS"
-      public_traces_from: "Trazas GPS Publicas de {{user}}"
-      tagged_with: "etiquetado con {{tags}}"
-    delete:
-      scheduled_for_deletion: "Traza programada para eliminaciÃ³n"
-    make_public:
-      made_public: "Traza hecha publica"
-  oauth:
-    oauthorize:
-      request_access: "La aplicaciÃ³n {{app_name}} esta solicitando acceso a su cuenta. Por favor revise si usted quiere que la aplicaciÃ³n tenga las siguientes capacidades. Usted puede elegir tantas o tan pocas como quiera."
-      allow_to: "Permitir a la aplicaciÃ³n cliente:"
-      allow_read_prefs:  "leer sus preferencias de usuario."
-      allow_write_prefs: "modificar sus preferencias de usuario."
-      allow_write_diary: "crear publicaciones en su diario, comentarios y hacer amigos."
-      allow_write_api:   "modificar el mapa."
-      allow_read_gpx:    "leer sus trazas GPS privadas."
-      allow_write_gpx:   "subir trazas GPS."
-    revoke:
-      flash: "Usted ha revocado el token para {{application}}"
-  oauth_clients:
-    new:
-      title: "Registrar una nueva aplicaciÃ³n"
-      submit: "Registrar"
-    edit:
-      title: "Editar su aplicaciÃ³n"
-      submit: "Editar"
-    show:
-      title: "Detalles OAuth para {{app_name}}"
-      key: "Clave de Consumidor:"
-      secret: "Secreto de Consumidor:"
-      url: "URL de Token de Solicitud:"
-      access_url: "URL de Token de Acceso:"
-      authorize_url: "Autorizar URL:"
-      support_notice: "Soportamos hmac-sha1 (recomendado) asi como texto plano en el modo ssl."
-      edit: "Editar Detalles"
-      requests: "Requesting the following permissions from the user:"
-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-    index:
-      title: "Mis detalles OAuth"
-      my_tokens: "Mis aplicaciones autorizadas"
-      list_tokens: "Los siguientes tokens han sido emitidos a aplicaciones en tu nombre:"
-      application: "Nombre de la aplicaciÃ³n"
-      issued_at: "Emitido el"
-      revoke: "Â¡Revocar!"
-      my_apps: "Mis aplicaciones cliente"
-      no_apps: "Â¿Tienes una aplicaciÃ³n que te gustarÃ­a registrar para usar con nosotros utilizando el estÃ¡ndar {{oauth}}? Debes registrar tu aplicaciÃ³n web antes de que pueda hacer solicitudes OAuth a este servicio."
-      registered_apps: "Tu tienes las siguientes aplicaciones cliente registradas:"
-      register_new: "Registra tu aplicaciÃ³n"
-    form:
-      name: "Nombre"
-      required: "Requerido"
-      url: "URL de AplicaciÃ³n Principal"
-      callback_url: "Callback URL"
-      support_url: "URL de Soporte"
-      requests: "Solicita los siguientes permisos del usuario:"
-      allow_read_prefs:  "leer sus preferencias de usuario."
-      allow_write_prefs: "modificar sus preferencias de usuario."
-      allow_write_diary: "crear entradas en el diario, comentarios y hacer amigos."
-      allow_write_api:   "modificar el mapa."
-      allow_read_gpx:    "leer sus trazas GPS privadas."
-      allow_write_gpx:   "subir trazas GPS."
-    not_found: 
-      sorry: "Lo sentimos, ese {{type}} no puede ser encontrado."
-    create:
-      flash: "Registro la informaciÃ³n exitosamente"
-    update:
-      flash: "Actualizo la informaciÃ³n del cliente exitosamente"
-    destroy:
-      flash: "Destruyo el registro de aplicaciÃ³n del cliente"
-  user:
-    login:
-      create_account: "crear una cuenta"
-      email or username: "DirecciÃ³n de correo o nombre de usuario"
-      password: "ContraseÃ±a"
-      lost password link: "Â¿Ha perdido su contraseÃ±a?"
-    lost_password:
-      title: "contraseÃ±a perdida"
-      heading: "Â¿ContraseÃ±a olvidada?"
-      email address: "DirecciÃ³n de correo:"
-      new password button: "Enviarme la nueva contraseÃ±a"
-      notice email cannot find: "Lo siento, no se pudo encontrar la direcciÃ³n de correo electrÃ³nico."
-    reset_password:
-      title: "restablecer contraseÃ±a"
-    new:
-      title: "Crear cuenta"
-      heading: "Crear una cuenta de usuario"
-      email address: "DirecciÃ³n de correo"
-      confirm email address: "Confirmar la direcciÃ³n de correo"
-      display name: "Nombre en pantalla:"
-      password: "ContraseÃ±a: "
-      confirm password: "Confirmar contraseÃ±a: "
-      signup: "Registro"
-    no_such_user:
-      title: "Este usuario no existe"
-      heading: "El usuario {{user}} no existe"
-    view:
-      my diary: "mi diario"
-      new diary entry: "nueva entrada de diario"
-      my edits: "mis ediciones"
-      my traces: "mis trazas"
-      my settings: "mis preferencias"
-      send message: "enviar mensaje"
-      diary: "diario"
-      edits: "ediciones"
-      traces: "trazas"
-      remove as friend: "eliminar como amigo"
-      add as friend: "aÃ±adir como amigo"
-      mapper since: "Mapeador mÃ¡s prÃ³ximo"
-      ago: "(hace {{time_in_words_ago}})"
-      user image heading: "Imagen del usuario"
-      delete image: "Borrar imagen"
-      upload an image: "Subir una imagen"
-      add image: "AÃ±adir imagen"
-      description: "DescripciÃ³n"
-      user location: "LocalizaciÃ³n del usuario"
-      no home location: "No se ha fijado ninguna localizaciÃ³n."
-      if set location: "Si ha configurado su lugar de origen, verÃ¡ un mapa abajo. Puede configurar su lugar de origen en la pÃ¡gina de {{settings_link}}."
-      settings_link_text: "preferencias"
-      your friends: "Tus amigos"
-      no friends: "No has aÃ±adido ningÃºn amigo aÃºn."
-      km away: "{{count}} km de distancia"
-      nearby users: "Usuarios cercanos: "
-      no nearby users: "TodavÃ­a no hay usuarios que reconozcan el estar mapeando cerca."
-      change your settings: "cambiar tu configuraciÃ³n"
-    friend_map:
-      your location: "Tu lugar de origen:"
-      nearby mapper: "Mapeadores cercanos:"
-    account:
-      title: "Editar cuenta"
-      my settings: "Mis preferencias"
-      email never displayed publicly: "(nunca es mostrado pÃºblicamente)"
-      public editing:
-        heading: "Ediciones pÃºblicas:"
-        enabled: "Activadas. No es anÃ³nimo y puede editar datos."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "Â¿QuÃ© es esto?"
-        disabled: "Desactivadas y no puede editar datos; todas las ediciones anteriores son anÃ³nimas."
-        disabled link text: "Â¿Por quÃ© no puedo editar?"
-      profile description: "DescripciÃ³n del perfil:"
-      preferred languages: "Idiomas preferidos:"
-      home location: "Lugar de origen:"
-      no home location: "No has introducido tu lugar de origen."
-      latitude: "Latitud:"
-      longitude: "Longitud:"
-      update home location on click: "Â¿Actualizar tu lugar de origen cuando pulses sobre el mapa?"
-      save changes button: "Guardar cambios"
-      make edits public button: "Hacer que todas mis ediciones sean pÃºblicas"
-      return to profile: "Regresar al perfil"
-      flash update success confirm needed: "La informaciÃ³n del usuario se ha actualizado correctamente. Compruebe su correo electrÃ³nico para ver una nota sobre cÃ³mo confirmar su nueva direcciÃ³n de correo electrÃ³nico."
-      flash update success: "La informaciÃ³n del usuario se ha actualizado correctamente."
-    confirm:
-      heading: "Confirmar la cuenta de usuario"
-      press confirm button: "Pulse botÃ³n de confirmaciÃ³n de abajo para activar su cuenta."
-      button: "Confirmar"
-      success: "Â¡Cuenta confirmada, gracias por registrarse!"
-      failure: "Una cuenta de usuario con esta misma credencial de autentificaciÃ³n ya ha sido confirmada"
-    confirm_email:
-      heading: "Confirmar el cambio de direcciÃ³n de correo electrÃ³nico"
-      press confirm button: "Pulse botÃ³n de confirmaciÃ³n de debajo para confirmar su nueva direcciÃ³n de correo"
-      button: "Confirmar"
-      success: "DirecciÃ³n de correo electrÃ³nico confirmada. Â¡Gracias por registrarse!"
-      failure: "La direcciÃ³n de correo electrÃ³nico ha sido confirmada mediante esta credencial de autentificaciÃ³n"
-    set_home:
-      flash success: "LocalizaciÃ³n guardada con Ãxito"
-    go_public:
-      flash success: ""
-    make_friend:
-      success: "{{name}} es tu amigo ahora"
-      failed: "Lo sentimos, no se ha podido aÃ±adir a {{name}} como un amigo."
-      already_a_friend: "Ya son amigos"
-    remove_friend:
-      success: "Has quitado a {{name}} de tus amigos."
-      not_a_friend: "{{name}} no es uno de tus amigos."
-
+es: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Cuerpo
+      diary_entry: 
+        language: Idioma
+        latitude: Latitud
+        longitude: Longitud
+        title: TÃ­tulo
+        user: Usuario
+      friend: 
+        friend: Amigo
+        user: Usuario
+      message: 
+        body: Cuerpo
+        recipient: Destinatario
+        sender: Remitente
+        title: TÃ­tulo
+      trace: 
+        description: DescripciÃ³n
+        latitude: Latitud
+        longitude: Longitud
+        name: Nombre
+        public: PÃºblica
+        size: TamaÃ±o
+        user: Usuario
+        visible: Visible
+      user: 
+        active: Activo
+        description: DescripciÃ³n
+        display_name: Nombre en pantalla
+        email: Correo
+        languages: Idiomas
+        pass_crypt: ContraseÃ±a
+    models: 
+      acl: Lista de control de acceso
+      changeset: Conjunto de cambios
+      changeset_tag: Etiqueta del conjunto de cambios
+      country: PaÃ­s
+      diary_comment: Comentario al diario
+      diary_entry: Entada del diario
+      friend: Amigo
+      language: Idioma
+      message: Mensaje
+      node: Nodo
+      node_tag: Etiqueta del nodo
+      notifier: Notificador
+      old_node: Nodo antiguo
+      old_node_tag: Etiqueta del nodo antiguo
+      old_relation: RelaciÃ³n antigua
+      old_relation_member: Miembro de la relaciÃ³n antigua
+      old_relation_tag: Etiqueta de la relaciÃ³n antigua
+      old_way: VÃ­Â­a antigua
+      old_way_node: Nodo de la vÃ­a antigua
+      old_way_tag: Etiqueta de la vÃ­Â­a antigua
+      relation: RelaciÃ³n
+      relation_member: Miembro de RelaciÃ³n
+      relation_tag: Etiqueta de la relaciÃ³n
+      session: SesiÃ³n
+      trace: Traza
+      tracepoint: Punto de la traza
+      tracetag: Etiqueta de la traza
+      user: Usuario
+      user_preference: Preferencias de usuario
+      user_token: Token del usuario
+      way: VÃ­a
+      way_node: Nodo de la vÃ­a
+      way_tag: Etiqueta de vÃ­Â­a
+  browse: 
+    changeset: 
+      changeset: Conjunto de cambios {{id}}
+      changesetxml: XML del conjunto de cambios
+      download: Descargar {{changeset_xml_link}} o {{osmchange_xml_link}}
+      feed: 
+        title: Conjunto de cambios {{id}}
+        title_comment: Conjunto de cambios {{id}} - {{comment}}
+      osmchangexml: XML en formato osmChange
+      title: Conjunto de cambios
+    changeset_details: 
+      belongs_to: Pertenece a
+      bounding_box: Envoltura
+      box: Caja
+      closed_at: "Cerrado en:"
+      created_at: "Creado en:"
+      has_nodes: 
+        one: "Tiene el siguiente {{count}} nodo:"
+        other: "Tiene los siguientes {{count}} nodos:"
+      has_relations: 
+        other: "Tiene las siguientes {{count}} relaciones:"
+      has_ways: "Tiene {{count}} vÃ­as:"
+      no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios
+      show_area_box: Mostrar caja del Ãrea
+    changeset_navigation: 
+      all: 
+        next_tooltip: Siguiente conjunto de cambios
+        prev_tooltip: Conjunto de cambios anterior
+      user: 
+        name_tooltip: Ver ediciones hechas por {{user}}
+        next_tooltip: PrÃ³xima ediciÃ³n por {{user}}
+        prev_tooltip: Ediciones previas hechas por {{user}}
+    common_details: 
+      changeset_comment: "Comentario:"
+      edited_at: Editado en
+      edited_by: "Editado por:"
+      in_changeset: "En el conjunto de cambios:"
+      version: "VersiÃ³n:"
+    containing_relation: 
+      entry: RelaciÃ³n {{relation_name}}
+      entry_role: RelaciÃ³n {{relation_name}} (como {{relation_role}})
+    map: 
+      deleted: Borrado
+      larger: 
+        area: Ver Ã¡rea en un mapa mÃ¡s grande
+        node: Ver el nodo en un mapa mÃ¡s grande
+        relation: Ver la relaciÃ³n en un mapa mÃ¡s grande
+        way: Ver la vÃ­a en un mapa mÃ¡s grande
+      loading: Cargando...
+    node: 
+      download: "{{download_xml_link}} o {{view_history_link}}"
+      download_xml: Descargar XML
+      edit: editar
+      node: Nodo
+      node_title: "Nodo: {{node_name}}"
+      view_history: ver historial
+    node_details: 
+      coordinates: Coordenadas
+      part_of: "Parte de:"
+    node_history: 
+      download: "{{download_xml_link}} o {{view_details_link}}"
+      download_xml: Descargar XML
+      node_history: Historial del nodo
+      node_history_title: "Historial del nodo: {{node_name}}"
+      view_details: ver detalles
+    not_found: 
+      sorry: Lo sentimos, {{type}} con ID {{id}} no fue encontrado
+      type: 
+        changeset: conjunto de cambios
+        node: el nodo
+        relation: la relaciÃ³n
+        way: la vÃ­a
+    paging_nav: 
+      of: de
+      showing_page: Mostrando pÃ¡gina
+    relation: 
+      download: "{{download_xml_link}} o {{view_history_link}}"
+      download_xml: Descargar XML
+      relation: RelaciÃ³n
+      relation_title: "RelaciÃ³n {{relation_name}}:"
+      view_history: ver historial
+    relation_details: 
+      members: Miembros
+      part_of: Parte de
+    relation_history: 
+      download: "{{download_xml_link}} o {{view_details_link}}"
+      download_xml: Descargar XML
+      relation_history: Historial de la relaciÃ³n
+      relation_history_title: "Historial de la relaciÃ³n {{relation_name}}:"
+      view_details: ver detalles
+    relation_member: 
+      entry_role: "{{type}} {{name}} como {{role}}"
+      type: 
+        node: Nodo
+        relation: RelaciÃ³n
+        way: VÃ­a
+    start: 
+      manually_select: Seleccionar manualmente un ÃÂ¡rea diferente
+      view_data: Ver datos para el encuadre actual
+    start_rjs: 
+      data_frame_title: Datos
+      data_layer_name: Datos
+      details: Detalles
+      drag_a_box: Arrastre en el mapa para dibujar un Ãrea de encuadre
+      edited_by_user_at_timestamp: Editado por [[user]] en [[timestamp]]
+      history_for_feature: Historial de [[feature]]
+      load_data: Cargar datos
+      loaded_an_area_with_num_features: Ha cargado un Ãrea que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de informaciÃ³n vectorial. Generalmente, el funcionamiento Ãptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si estÃ¡ seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botÃ³n que aparece debajo.
+      loading: Cargando...
+      manually_select: Seleccionar manualmente un Ãrea diferente
+      object_list: 
+        api: Descargar este Ãrea a travÃ©s de la API
+        back: Mostrar lista de objetos
+        details: Detalles
+        heading: Lista de objetos
+        history: 
+          type: 
+            node: Nodo [[id]]
+            way: VÃ­a [[id]]
+        selected: 
+          type: 
+            node: Nodo [[id]]
+            way: VÃ­Â­a [[id]]
+        type: 
+          node: Nodo
+          way: VÃ­a
+      private_user: usuario privado
+      show_history: Mostrar historial
+      unable_to_load_size: "Imposible cargar: El tamaÃ±o de la envoltura ([[bbox_size]] es demasiado grande (debe ser menor que {{max_bbox_size}})"
+      wait: Espere...
+      zoom_or_select: Para ver los datos, haga mÃ¡s zoom o seleccione un Ãrea del mapa
+    tag_details: 
+      tags: Etiquetas
+    way: 
+      download: "{{download_xml_link}} o {{view_history_link}}"
+      download_xml: Descargar XML
+      edit: editar
+      view_history: ver historial
+      way: VÃ­a
+      way_title: "VÃ­a {{way_name}}:"
+    way_details: 
+      also_part_of: 
+        one: tambiÃ©n parte de la vÃ­Â­a {{related_ways}}
+        other: tambiÃ©n parte de las vÃ­Â­as {{related_ways}}
+      nodes: Nodos
+      part_of: Parte de
+    way_history: 
+      download: "{{download_xml_link}} o {{view_details_link}}"
+      download_xml: Descargar XML
+      view_details: ver detalles
+      way_history: Historial de la vÃ­a
+      way_history_title: "Historial del camino {{way_name}}:"
+  changeset: 
+    changeset: 
+      anonymous: AnÃ³nimo
+      big_area: (grande)
+      no_comment: (ninguno)
+      no_edits: (sin ediciones)
+      show_area_box: mostrar caja
+      still_editing: (todavÃ­a en ediciÃ³n)
+      view_changeset_details: Ver detalles del conjunto de cambios
+    changeset_paging_nav: 
+      of: de
+      showing_page: Mostrando pÃ¡gina
+    changesets: 
+      area: ÃÂrea
+      comment: Comentario
+      id: ID
+      saved_at: Guardado en
+      user: Usuario
+    list: 
+      description: Cambios recientes
+      description_bbox: Conjunto de cambios dentro de {{bbox}}
+      description_user: Conjunto de cambios por {{user}}
+      description_user_bbox: Conjunto de cambios por {{user}} dentro de {{bbox}}
+      heading: Conjuntos de cambios
+      heading_bbox: Conjuntos de cambios
+      heading_user: Conjuntos de cambios
+      heading_user_bbox: Conjuntos de cambios
+      title: Conjuntos de cambios
+      title_bbox: Conjunto de cambios dentro de {{bbox}}
+      title_user: Conjunto de cambios por {{user}}
+      title_user_bbox: Conjunto de cambios por {{user}} dentro de {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comentario de {{link_user}} de {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 comentario
+        other: "{{count}} comentarios"
+      comment_link: Comentar esta entrada
+      edit_link: Editar entrada
+      posted_by: Posteado por {{link_user}} en {{created}} en {{language_link}}
+      reply_link: Responder a la entrada
+    edit: 
+      body: "Cuerpo:"
+      language: "Idioma:"
+      latitude: Latitud
+      location: "Lugar:"
+      longitude: Longitud
+      marker_text: Lugar de la entrada del diario
+      save_button: Guardar
+      subject: "Asunto:"
+      title: Editar entrada del diario
+      use_map_link: Usar mapa
+    feed: 
+      all: 
+        title: Entradas en el diario de OpenStreetMap
+      language: 
+        title: Entradas de diario en OpenStreetMap en {{language_name}}
+      user: 
+        title: Entradas de diario de OpenStreetMap de {{user}}
+    list: 
+      in_language_title: Entradas de diario en {{language}}
+      new: Nueva entrada en el diario
+      new_title: Redactar una nueva entrada en tu diario de usuario
+      newer_entries: Entradas mÃ¡s modernas
+      no_entries: No hay entradas en el diario
+      older_entries: Entradas mÃ¡s antiguas
+      recent_entries: "Entradas recientes en el diario:"
+      title: Diarios de usuarios
+      user_title: Diario de {{user}}
+    new: 
+      title: Nueva entrada en el diario
+    no_such_entry: 
+      body: Lo sentimos, no hay ninguna entrada del diario para la ID {{id}}. Por favor, comprueba que la direcciÃ³n estÃ© correctamente escrita.
+      heading: No hay entrada con la ID {{id}}
+    no_such_user: 
+      body: Lo sentimos, no hay ningÃºn usuario llamado {{user}}. Por favor, comprueba que la direcciÃ³n es correcta.
+      heading: El usuario {{user}} no existe
+      title: No existe ese usuario
+    view: 
+      leave_a_comment: Dejar un comentario
+      login: IdentifÃ­quese
+      login_to_leave_a_comment: "{{login_link}} para dejar un comentario"
+      save_button: Guardar
+      title: Diarios de usuarios | {{user}}
+      user_title: Diario de {{user}}
+  export: 
+    start: 
+      add_marker: AÃ±adir chinche en el mapa
+      area_to_export: Ãrea a exportar
+      embeddable_html: HTML para pegar
+      export_button: Exportar
+      export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons AtribuciÃÂ³n-Compartir Igual 2.0</a>.
+      format: Formato
+      format_to_export: Formato de exportaciÃ³n
+      image_size: TamaÃ±o de la imagen
+      latitude: "Lat:"
+      licence: Licencia
+      longitude: "Lon:"
+      manually_select: Seleccionar a mano otra area
+      mapnik_image: Imagen de Mapnik
+      max: max
+      options: Opciones
+      osm_xml_data: Datos formato OpenStreetMap XML
+      osmarender_image: Imagen de Osmarender
+      output: Resultado
+      paste_html: HTML para empotrar en otro sitio web
+      scale: Escala
+      zoom: Zoom
+    start_rjs: 
+      add_marker: AÃ±adir un marcador al mapa
+      change_marker: Cambiar posiciÃ³n del marcador
+      click_add_marker: Pinche en el mapa para aÃ±adir un marcador
+      drag_a_box: Arrastre una caja en el mapa para seleccionar un Ãrea
+      export: Exportar
+      manually_select: Seleccionar manualmente un Ãrea distinta
+      view_larger_map: Ver mapa mÃ¡s grande
+  geocoder: 
+    description: 
+      title: 
+        geonames: UbicaciÃ³n de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: Ciudades
+        places: Lugares
+        towns: Villas
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} de {{type}}"
+    direction: 
+      east: este
+      north: norte
+      north_east: noreste
+      north_west: noroeste
+      south: sur
+      south_east: sureste
+      south_west: suroeste
+      west: oeste
+    distance: 
+      one: aproximadamente 1Km
+      other: aproximadamente {{count}}km
+      zero: menos de 1Km
+    results: 
+      no_results: No se han encontrado resultados
+    search: 
+      title: 
+        ca_postcode: Resultados en <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultados en <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultados en <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Resultados en <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultados en <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultados en <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} de {{placename}}"
+  layouts: 
+    alt_donation: Hacer una donaciÃ³n
+    donate: Apoye a OpenStreetMap {{link}} al Fondo de ActualizaciÃ³n de Hardware.
+    donate_link_text: donando
+    edit: Editar
+    edit_tooltip: Editar mapas
+    export: Exportar
+    export_tooltip: Exportar datos del mapa
+    gps_traces: Trazas GPS
+    gps_traces_tooltip: Gestionar trazas
+    help_wiki: Ayuda y Wiki
+    help_wiki_tooltip: Ayuda y sitio Wiki del proyecto
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/ES:Main_Page
+    history: Historial
+    history_tooltip: Historial de conjuntos de cambios
+    home: inicio
+    home_tooltip: Ir a la pÃ¡gina inicial
+    inbox: bandeja de entrada ({{count}})
+    inbox_tooltip: 
+      one: Tu bandeja de entrada contiene un mensaje sin leer
+      other: Tu bandeja de entrada contiene {{count}} mensajes sin leer
+      zero: Tu bandeja de entrada no tiene mensajes sin leer
+    intro_1: OpenStreetMap es un mapa libremente editable de todo el mundo. EstÃ¡ hecho por personas como usted.
+    intro_2: OpenStreetMap te permite ver, editar y usar informaciÃ³n geogrÃ¡fica de manera colaborativa desde cualquier lugar del mundo.
+    intro_3: Agradecimientos al {{ucl}} y {{bytemark}} por apoyar el hospedaje de los servidores de OpenStreetMap.
+    log_in: identificarse
+    log_in_tooltip: Identificarse con una cuenta existente
+    logo: 
+      alt_text: Logo de OpenStreetMap
+    logout: Salir
+    logout_tooltip: Salir
+    news_blog: Blog y noticias
+    news_blog_tooltip: Blog de noticias sobre OpenStreetMap, informaciÃ³n geogrÃ¡fica libre, etc.
+    osm_offline: La base de datos de OpenStreetMap no estÃ¡ disponible en estos momentos debido a trabajos de mantenimiento.
+    osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sÃ³lo lectura debido a trabajos de mantenimiento.
+    shop: Tienda
+    shop_tooltip: Tienda con productos de OpenStreetMap
+    sign_up: registrarse
+    sign_up_tooltip: Cree una cuenta para editar
+    sotm: Â¡Venga a las conferencias de OpenStreetMap, el State of the Map 2009, del 10 al 12 de julio en Amsterdam!
+    tag_line: El WikiMapaMundi libre
+    user_diaries: Diarios de usuario
+    user_diaries_tooltip: Ver diarios de usuario
+    view: Ver
+    view_tooltip: Ver mapas
+    welcome_user: Bienvenido, {{user_link}}
+    welcome_user_link_tooltip: Tu pÃ¡gina de usuario
+  map: 
+    coordinates: Coordenadas
+    edit: Editar
+    view: Ver
+  message: 
+    delete: 
+      deleted: Mensaje borrado
+    inbox: 
+      date: Fecha
+      from: De
+      my_inbox: Mi buzÃ³n de entrada
+      no_messages_yet: No tienes aÃºn mensajes. PorquÃ© no te pones en contacto con alguno de los {{people_mapping_nearby_link}}?
+      outbox: bandeja de salida
+      people_mapping_nearby: gente cercana mapeando
+      subject: Asunto
+      title: BuzÃ³n de entrada
+      you_have: tienes {{new_count}} mensajes nuevos y {{old_count}} mensajes viejos
+    mark: 
+      as_read: Mensaje marcado como leÃ­do
+      as_unread: Mensaje marcado como sin leer
+    message_summary: 
+      delete_button: Borrar
+      read_button: Marcar como leÃ­Â­do
+      reply_button: Responder
+      unread_button: Marcar como sin leer
+    new: 
+      back_to_inbox: Regresar a la bandeja de entrada
+      body: Cuerpo
+      message_sent: Mensaje enviado
+      send_button: Enviar
+      send_message_to: Enviar un mensaje nuevo a {{name}}
+      subject: Asunto
+      title: Enviar mensaje
+    no_such_user: 
+      body: PerdÃ³n no existe usuario o mensaje con ese nombre o id
+      heading: No hay tal usuario o mensaje
+      title: No hay tal usuario o mensaje
+    outbox: 
+      date: Fecha
+      inbox: entrada
+      my_inbox: Mi {{inbox_link}}
+      no_sent_messages: No tienes aÃºn mensajes enviados. PorquÃ© no te pones en contacto con alguno de los {{people_mapping_nearby_link}}?
+      outbox: salida
+      people_mapping_nearby: gente mapeando cerca
+      subject: Asunto
+      title: Salida
+      to: A
+      you_have_sent_messages: Tienes {{sent_count}} mensajes enviados
+    read: 
+      back_to_inbox: Regresar a la bandeja de entrada
+      back_to_outbox: Regresar a la bandeja de salida
+      date: Fecha
+      from: Desde
+      reading_your_messages: Leyendo tus mensajes
+      reading_your_sent_messages: Leyendo tus mensajes enviados
+      reply_button: Responder
+      subject: Asunto
+      title: Leer mensaje
+      to: A
+      unread_button: Marcar como no leÃ­do
+    sent_message_summary: 
+      delete_button: Borrar
+  notifier: 
+    diary_comment_notification: 
+      banner1: "* Por favor no responda a este correo. *"
+      banner2: "* Use el sitio web de OpenStreetMap para responder. *"
+      footer: TambiÃ©n puede leer el comentario en {{readurl}} y puedes comentar en {{commenturl}} o responder en {{replyurl}}
+      header: "{{from_user}} ha comentado sobre tu reciente entrada en el diario con el asunto {{subject}}:"
+      hi: Hola {{to_user}},
+      subject: "[OpenStreetMap] {{user}} ha comentado en tu entrada de diario"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirme su direcciÃ³n de correo"
+    email_confirm_html: 
+      click_the_link: Si es usted, por favor pulse el enlace inferior para confirmar el cambio
+      greeting: Hola,
+      hopefully_you: Alguien (posiblemente usted) quiere cambiar la direcciÃ³n de correo en {{server_url}} a {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Si es usted, por favor pulse el enlace inferior para confirmar el cambio
+      greeting: Hola,
+      hopefully_you_1: Alguien (posiblemente usted) quiere cambiar la direcciÃ³n de correo en
+      hopefully_you_2: "{{server_url}} a {{new_address}}."
+    friend_notification: 
+      had_added_you: "{{user}} te ha aÃ±adido como amigo en OpenStreetMap"
+      see_their_profile: Puede ver su perfil en {{userurl}} y aÃ±adirle como amigo tambiÃ©n, si asÃ­Â­ lo desea
+      subject: "[OpenStreetMap] {{user}} te ha aÃ±adido como amigo"
+    gpx_notification: 
+      and_no_tags: y sin etiquetas
+      and_the_tags: "y con las siguientes etiquetas:"
+      failure: 
+        failed_to_import: "no ha podido ser importado. El mensaje de error es:"
+        more_info_1: Puede encontrar mÃ¡s informaciÃ³n sobre fallos de importaciÃ³n
+        more_info_2: "de GPX y cÃ³mo evitarlos en:"
+        subject: "[OpenStreetMap] Fallo al importar GPX"
+      greeting: Hola,
+      success: 
+        loaded_successfully: ha sido cargada con Ã©xito
+        subject: "[OpenStreetMap] Ãxito al importar GPX"
+      with_description: con la descripciÃ³n
+      your_gpx_file: Parece que su archivo GPX
+    lost_password: 
+      subject: "[OpenStreetMap] PeticiÃ³n para resetear la contraseÃ±a"
+    lost_password_html: 
+      click_the_link: Si es usted, por favor pulse el enlace inferior para resetear la contraseÃ±a.
+      greeting: Hola,
+    lost_password_plain: 
+      click_the_link: Si es usted, por favor pulse el enlace inferior para resetear la contraseÃ±a.
+      greeting: Hola,
+    message_notification: 
+      banner1: "* Por favor no responda a este correo. *"
+      banner2: "* Use el sitio Web de OpenStreetMap para responder. *"
+      footer1: TambiÃ©n puedes leer el mensaje en {{readurl}}
+      footer2: y puedes responder en {{replyurl}}
+      header: "{{from_user}} te ha enviado un mensaje a travÃ©s de OpenStreetMap con el asunto {{subject}}:"
+      hi: Hola {{to_user}},
+      subject: "[OpenStreetMap] {{user}} te ha enviado un nuevo mensaje"
+    signup_confirm: 
+      subject: "[OpenStreetMap] Confirme su direcciÃ³n de correo electrÃ³nico"
+    signup_confirm_html: 
+      click_the_link: Si este es usted, Â¡Bienvenido! Por favor, pulse en el enlace mÃ¡s abajo para confirmar su cuenta y leer mÃ¡s informaciÃ³n sobre OpenStreetMap.
+      greeting: Â¡Hola!
+      hopefully_you: Alguien (probablemente usted) ha creado una cuenta en
+      introductory_video: Puede ver un {{introductory_video_link}}
+      more_videos: Hay mÃ¡s {{more_videos_link}}
+      more_videos_here: vÃ­Â­deos aquÃ­Â­
+      video_to_openstreetmap: vÃ­Â­deo introductorio a OpenStreetMap.
+    signup_confirm_plain: 
+      click_the_link_1: Si este es usted, Â¡Bienvenido! Por favor, pulse en el enlace mÃ¡s abajo para
+      click_the_link_2: confirmar su cuenta y leer mÃ¡s informaciÃ³n sobre OpenStreetMap.
+      current_user_1: Una lista de todos los usuarios por categorÃ­Â­as, basado en su procedencia,
+      current_user_2: "estÃ¡ disponible en:"
+      greeting: Â¡Hola!
+      hopefully_you: Alguien (probablemente usted) ha creado una cuenta en
+      introductory_video: "Puede ver un vÃ­deo introductorio sobre OpenStreetMap aquÃ­Â­:"
+      more_videos: "Hay mÃ¡s vÃ­Â­deos aquÃ­Â­:"
+      opengeodata: "OpenGeoData.org es el blog de OpenStreetMap, y tambiÃ­n tiene podcasts:"
+      the_wiki: "Lea mÃ¡s sobre OpenStreetMap en el wiki:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/ES:Beginners_Guide
+      user_wiki_1: Recomendamos que cree una pÃ¡gina de usuario en el wiki, que incluya
+      user_wiki_2: etiquetas de categorÃ­Â­a pasa saber de dÃ³nde es (por ejemplo [[Category:Users_in_Madrid]])
+      wiki_signup: "Puede que tambiÃ©n quiera registrarse en el Wiki de OpenStreetMap en:"
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&returnto=ES:Main_Page
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: leer sus trazas GPS privadas.
+      allow_read_prefs: leer sus preferencias de usuario.
+      allow_to: "Permitir a la aplicaciÃ³n cliente:"
+      allow_write_api: modificar el mapa.
+      allow_write_diary: crear publicaciones en su diario, comentarios y hacer amigos.
+      allow_write_gpx: subir trazas GPS.
+      allow_write_prefs: modificar sus preferencias de usuario.
+      request_access: La aplicaciÃ³n {{app_name}} esta solicitando acceso a su cuenta. Por favor revise si usted quiere que la aplicaciÃ³n tenga las siguientes capacidades. Usted puede elegir tantas o tan pocas como quiera.
+    revoke: 
+      flash: Usted ha revocado el token para {{application}}
+  oauth_clients: 
+    create: 
+      flash: Registro la informaciÃ³n exitosamente
+    destroy: 
+      flash: Destruyo el registro de aplicaciÃ³n del cliente
+    edit: 
+      submit: Editar
+      title: Editar su aplicaciÃ³n
+    form: 
+      allow_read_gpx: leer sus trazas GPS privadas.
+      allow_read_prefs: leer sus preferencias de usuario.
+      allow_write_api: modificar el mapa.
+      allow_write_diary: crear entradas en el diario, comentarios y hacer amigos.
+      allow_write_gpx: subir trazas GPS.
+      allow_write_prefs: modificar sus preferencias de usuario.
+      callback_url: Callback URL
+      name: Nombre
+      requests: "Solicita los siguientes permisos del usuario:"
+      required: Requerido
+      support_url: URL de Soporte
+      url: URL de AplicaciÃ³n Principal
+    index: 
+      application: Nombre de la aplicaciÃ³n
+      issued_at: Emitido el
+      list_tokens: "Los siguientes tokens han sido emitidos a aplicaciones en tu nombre:"
+      my_apps: Mis aplicaciones cliente
+      my_tokens: Mis aplicaciones autorizadas
+      no_apps: Â¿Tienes una aplicaciÃ³n que te gustarÃ­a registrar para usar con nosotros utilizando el estÃ¡ndar {{oauth}}? Debes registrar tu aplicaciÃ³n web antes de que pueda hacer solicitudes OAuth a este servicio.
+      register_new: Registra tu aplicaciÃ³n
+      registered_apps: "Tu tienes las siguientes aplicaciones cliente registradas:"
+      revoke: Â¡Revocar!
+      title: Mis detalles OAuth
+    new: 
+      submit: Registrar
+      title: Registrar una nueva aplicaciÃ³n
+    not_found: 
+      sorry: Lo sentimos, ese {{type}} no puede ser encontrado.
+    show: 
+      access_url: "URL de Token de Acceso:"
+      allow_read_gpx: read their private GPS traces.
+      allow_read_prefs: read their user preferences.
+      allow_write_api: modify the map.
+      allow_write_diary: create diary entries, comments and make friends.
+      allow_write_gpx: upload GPS traces.
+      allow_write_prefs: modify their user preferences.
+      authorize_url: "Autorizar URL:"
+      edit: Editar Detalles
+      key: "Clave de Consumidor:"
+      requests: "Requesting the following permissions from the user:"
+      secret: "Secreto de Consumidor:"
+      support_notice: Soportamos hmac-sha1 (recomendado) asi como texto plano en el modo ssl.
+      title: Detalles OAuth para {{app_name}}
+      url: "URL de Token de Solicitud:"
+    update: 
+      flash: Actualizo la informaciÃ³n del cliente exitosamente
+  site: 
+    edit: 
+      not_public: No has configurado tus ediciones como pÃºblicas.
+      user_page_link: pÃ¡gina de usuario
+    index: 
+      js_1: EstÃ¡ usando un navegador que no soporta o tiene desactivado javascript
+      js_2: OpenStreetMap utiliza javascript para mostrar su mapa
+      license: 
+        license_name: Creative Commons AtribuciÃ³n-Licenciar Igual 2.0
+        project_name: Proyecto OpenStreetMap
+      permalink: Enlace permanente
+      shortlink: Atajo
+    key: 
+      map_key: Leyenda del mapa
+      table: 
+        entry: 
+          admin: LÃ­mites administrativos
+          apron: 
+            - terminal
+          bridleway: VÃ­a ecuestre
+          building: Edificio significativo
+          cemetery: Cementerio
+          centre: Centro deportivo
+          commercial: Zona comercial
+          common: 
+            - ComÃºn
+            - pradera
+          construction: VÃ­as en construcciÃ³n
+          cycleway: CiclovÃ­a
+          farm: CampiÃ±a
+          footway: VÃ­a peatonal
+          forest: Bosque
+          golf: Pista de golf
+          industrial: Zona industrial
+          lake: 
+            - Lago
+            - reservorio
+          military: Ãrea militar
+          motorway: Autopista
+          park: Parque
+          permissive: Acceso permisivo
+          primary: VÃ­a primaria
+          private: Acceso privado
+          rail: Ferrocarril
+          reserve: Reserva natural
+          resident: Zona residencial
+          school: 
+            - Escuela
+            - universidad
+          secondary: VÃ­a secundaria
+          station: EstaciÃ³n de tren
+          subway: Metro
+          tourist: AtracciÃ³n turÃ­stica
+          trunk: Carretera principal
+          unclassified: Carretera sin clasificar
+          wood: Madera
+        heading: Leyenda para z{{zoom_level}}
+    search: 
+      search: Buscar
+      submit_text: Ir
+      where_am_i: Â¿DÃ³nde estoy?
+    sidebar: 
+      close: Cerrar
+      search_results: Resultados de la bÃºsqueda
+  trace: 
+    create: 
+      trace_uploaded: Su archivo GPX ha sido cargado y estÃ¡ esperando ser agregado a la Base de Datos. Esto normalmente ocurre dentro de la prÃ³xima media hora, y un email le serÃ¡ enviado al terminar.
+      upload_trace: Subir Traza GPS
+    delete: 
+      scheduled_for_deletion: Traza programada para eliminaciÃ³n
+    edit: 
+      description: DescripciÃ³n
+      download: descargar
+      edit: editar
+      filename: "Nombre de archivo:"
+      heading: Editando trazo {{name}}
+      map: mapa
+      owner: Propietario
+      points: "Puntos:"
+      save_button: Guardar cambios
+      start_coord: "Coordenada Inicial:"
+      tags: Etiquetas
+      tags_help: delimitado por comas
+      title: Editando trazo {{name}}
+      uploaded_at: "Subido el:"
+      visibility: "Visibilidad:"
+      visibility_help: Â¿Que significa esto?
+    list: 
+      public_traces: Trazas GPS pÃºblicas
+      public_traces_from: Trazas GPS Publicas de {{user}}
+      tagged_with: etiquetado con {{tags}}
+      your_traces: Tus trazas GPS
+    make_public: 
+      made_public: Traza hecha publica
+    no_such_user: 
+      body: Lo sentimo, no hay un usuario con el nombre {{user}}. Por favor revise la redacciÃ³n o quizas el enlace al que hizo click esta errado.
+      heading: El usuario {{user}} no existe
+      title: No existe este usuario
+    trace: 
+      ago: hace {{time_in_words_ago}}
+      by: por
+      count_points: "{{count}} puntos"
+      edit: editar
+      edit_map: Editar mapa
+      in: en
+      map: mapa
+      more: mÃ¡s
+      pending: PENDIENTE
+      private: PRIVADO
+      public: PÃBLICO
+      trace_details: Ver detalle de la traza
+      view_map: Ver mapa
+    trace_form: 
+      description: DescripciÃ³n
+      help: Ayuda
+      tags: Etiquetas
+      tags_help: delimitado por comas
+      upload_button: Subir
+      upload_gpx: Subir archivo GPX
+      visibility: Visibilidad
+      visibility_help: Â¿Que significa esto?
+    trace_header: 
+      see_all_traces: Ver todas las trazas
+      see_just_your_traces: Ver solo tus trazas, o subir una traza
+      see_your_traces: Ver todas tus trazas
+      traces_waiting: Tienes {{count}} trazas esperando ser agregadas a la Base de Datos. Por favor considera el esperar que estas terminen antes de subir otras, para no bloquear la lista de espera a otros usuario.
+    trace_optionals: 
+      tags: Etiquetas
+    trace_paging_nav: 
+      of: de
+      showing: Mostrando pÃ¡gina
+    view: 
+      delete_track: Borrar esta traza
+      description: "DescripciÃ³n:"
+      download: descargar
+      edit: Editor
+      edit_track: Editar esta traza
+      filename: "Nombre de archivo:"
+      heading: Viendo traza {{name}}
+      map: Mapa
+      none: Ninguna
+      owner: Propietario
+      pending: PENDIENTE
+      points: "Puntos:"
+      start_coordinates: "Coordenadas de inicio:"
+      tags: Etiquetas
+      title: Viendo traza {{name}}
+      trace_not_found: Â¡No se ha encontrado la traza!
+      uploaded: "Cargado en:"
+      visibility: "Visibilidad:"
+    visibility: 
+      identifiable: Identificable (mostrado en la lista de trazas y como identificable, puntos ordenados con marcas de tiempo)
+      private: Privado (solo compartido como anonimo, puntos no ordenados)
+      public: Publico (mostrado en la lista de trazas y como anonimo, puntos no ordenados)
+      trackable: Trazable (solo compartido como anonimo, puntos ordenados con marcas de tiempo)
+  user: 
+    account: 
+      email never displayed publicly: (nunca es mostrado pÃºblicamente)
+      flash update success: La informaciÃ³n del usuario se ha actualizado correctamente.
+      flash update success confirm needed: La informaciÃ³n del usuario se ha actualizado correctamente. Compruebe su correo electrÃ³nico para ver una nota sobre cÃ³mo confirmar su nueva direcciÃ³n de correo electrÃ³nico.
+      home location: "Lugar de origen:"
+      latitude: "Latitud:"
+      longitude: "Longitud:"
+      make edits public button: Hacer que todas mis ediciones sean pÃºblicas
+      my settings: Mis preferencias
+      no home location: No has introducido tu lugar de origen.
+      preferred languages: "Idiomas preferidos:"
+      profile description: "DescripciÃ³n del perfil:"
+      public editing: 
+        disabled: Desactivadas y no puede editar datos; todas las ediciones anteriores son anÃ³nimas.
+        disabled link text: Â¿Por quÃ© no puedo editar?
+        enabled: Activadas. No es anÃ³nimo y puede editar datos.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: Â¿QuÃ© es esto?
+        heading: "Ediciones pÃºblicas:"
+      return to profile: Regresar al perfil
+      save changes button: Guardar cambios
+      title: Editar cuenta
+      update home location on click: Â¿Actualizar tu lugar de origen cuando pulses sobre el mapa?
+    confirm: 
+      button: Confirmar
+      failure: Una cuenta de usuario con esta misma credencial de autentificaciÃ³n ya ha sido confirmada
+      heading: Confirmar la cuenta de usuario
+      press confirm button: Pulse botÃ³n de confirmaciÃ³n de abajo para activar su cuenta.
+      success: Â¡Cuenta confirmada, gracias por registrarse!
+    confirm_email: 
+      button: Confirmar
+      failure: La direcciÃ³n de correo electrÃ³nico ha sido confirmada mediante esta credencial de autentificaciÃ³n
+      heading: Confirmar el cambio de direcciÃ³n de correo electrÃ³nico
+      press confirm button: Pulse botÃ³n de confirmaciÃ³n de debajo para confirmar su nueva direcciÃ³n de correo
+      success: DirecciÃ³n de correo electrÃ³nico confirmada. Â¡Gracias por registrarse!
+    friend_map: 
+      nearby mapper: "Mapeadores cercanos:"
+      your location: "Tu lugar de origen:"
+    login: 
+      create_account: crear una cuenta
+      email or username: DirecciÃ³n de correo o nombre de usuario
+      heading: Iniciar sesiÃ³n
+      login_button: Iniciar sesiÃ³n
+      lost password link: Â¿Ha perdido su contraseÃ±a?
+      password: ContraseÃ±a
+      title: Iniciar sesiÃ³n
+    lost_password: 
+      email address: "DirecciÃ³n de correo:"
+      heading: Â¿ContraseÃ±a olvidada?
+      new password button: Enviarme la nueva contraseÃ±a
+      notice email cannot find: Lo siento, no se pudo encontrar la direcciÃ³n de correo electrÃ³nico.
+      title: contraseÃ±a perdida
+    make_friend: 
+      already_a_friend: Ya son amigos
+      failed: Lo sentimos, no se ha podido aÃ±adir a {{name}} como un amigo.
+      success: "{{name}} es tu amigo ahora"
+    new: 
+      confirm email address: Confirmar la direcciÃ³n de correo
+      confirm password: "Confirmar contraseÃ±a:"
+      display name: "Nombre en pantalla:"
+      email address: DirecciÃ³n de correo
+      fill_form: Llenar el formulario y te enviaremos un mensaje de correo rÃ¡pidamente para activar tu cuenta.
+      heading: Crear una cuenta de usuario
+      no_auto_account_create: Desafortunadamente no estamos actualmente habilitados para crear una cuenta para ti automÃ¡ticamente.
+      password: "ContraseÃ±a:"
+      signup: Registro
+      title: Crear cuenta
+    no_such_user: 
+      body: PerdÃ³n, No existe usuario con el nombre {{user}}. Por favor verifica las letras, o posiblemente el vÃ­nculo que has hecho click estÃ¡ equivocado.
+      heading: El usuario {{user}} no existe
+      title: Este usuario no existe
+    remove_friend: 
+      not_a_friend: "{{name}} no es uno de tus amigos."
+      success: Has quitado a {{name}} de tus amigos.
+    reset_password: 
+      confirm password: "Confirmar contraseÃ±a:"
+      flash changed: Tu contraseÃ±a ha sido cambiada.
+      heading: Reestablecer contraseÃ±a para {{user}}
+      password: "ContraseÃ±a:"
+      reset: Reestablecer contraseÃ±a
+      title: restablecer contraseÃ±a
+    set_home: 
+      flash success: LocalizaciÃ³n guardada con Ãxito
+    view: 
+      add as friend: aÃ±adir como amigo
+      add image: AÃ±adir imagen
+      ago: (hace {{time_in_words_ago}})
+      change your settings: cambiar tu configuraciÃ³n
+      delete image: Borrar imagen
+      description: DescripciÃ³n
+      diary: diario
+      edits: ediciones
+      if set location: Si ha configurado su lugar de origen, verÃ¡ un mapa abajo. Puede configurar su lugar de origen en la pÃ¡gina de {{settings_link}}.
+      km away: "{{count}} km de distancia"
+      m away: "{{count}}m alejado"
+      mapper since: Mapeador mÃ¡s prÃ³ximo
+      my diary: mi diario
+      my edits: mis ediciones
+      my settings: mis preferencias
+      my traces: mis trazas
+      my_oauth_details: Ver mis detalles OAuth
+      nearby users: "Usuarios cercanos:"
+      new diary entry: nueva entrada de diario
+      no friends: No has aÃ±adido ningÃºn amigo aÃºn.
+      no home location: No se ha fijado ninguna localizaciÃ³n.
+      no nearby users: TodavÃ­a no hay usuarios que reconozcan el estar mapeando cerca.
+      remove as friend: eliminar como amigo
+      send message: enviar mensaje
+      settings_link_text: preferencias
+      traces: trazas
+      upload an image: Subir una imagen
+      user image heading: Imagen del usuario
+      user location: LocalizaciÃ³n del usuario
+      your friends: Tus amigos
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d8e362930..a71401d12 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,261 +1,942 @@
-fr:
-  map:
-    view: "Carte"
-    edit: "Ãdition"
-    coordinates: "CoordonnÃ©es"
-  browse:
-    changeset:
+fr: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Corps
+      diary_entry: 
+        language: Langue
+        latitude: Latitude
+        longitude: Longitude
+        title: Titre
+        user: Utilisateur
+      friend: 
+        friend: Ami
+        user: Utilisateur
+      message: 
+        body: Corps
+        recipient: Destinataire
+        sender: ExpÃ©diteur
+        title: Titre
+      trace: 
+        description: Description
+        latitude: Latitude
+        longitude: Longitude
+        name: Nom
+        public: Public
+        size: Taille
+        user: Utilisateur
+        visible: Visible
+      user: 
+        active: Actif
+        description: Description
+        display_name: Nom affichÃ©
+        email: Courriel
+        languages: Langues
+        pass_crypt: Mot de passe
+    models: 
+      acl: Liste de contrÃ´le d'accÃ¨s
+      changeset: Groupe de modifications
+      changeset_tag: Balise du groupe de modifications
+      country: Pays
+      diary_comment: Commentaire du journal
+      diary_entry: EntrÃ©e du journal
+      friend: Ami
+      language: Langue
+      message: Message
+      node: NÅud
+      node_tag: Balise de nÅud
+      notifier: Notificateur
+      old_node: Ancien nÅud
+      old_node_tag: Balise de l'ancien nÅud
+      old_relation: Ancienne relation
+      old_relation_member: Ancien membre de la relation
+      old_relation_tag: Balise de l'ancienne relation
+      old_way: Ancien chemin
+      old_way_node: NÅud de l'ancien chemin
+      old_way_tag: Balise de l'ancien chemin
+      relation: Relation
+      relation_member: Membre de la relation
+      relation_tag: Balise de relation
+      session: Session
+      trace: Piste
+      tracepoint: Point de la piste
+      tracetag: Balise de la piste
+      user: Utilisateur
+      user_preference: PrÃ©fÃ©rences de l'utilisateur
+      user_token: Jeton de l'utilisateur
+      way: Chemin
+      way_node: NÅud du chemin
+      way_tag: Balise du chemin
+  browse: 
+    changeset: 
       changeset: "Changeset : {{id}}"
-      download: "TÃ©lÃ©charger {{changeset_xml_link}} ou {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "CrÃ©Ã© le :"
-      closed_at: "TerminÃ© le :"
+      changesetxml: Changeset XML
+      download: TÃ©lÃ©charger {{changeset_xml_link}} ou {{osmchange_xml_link}}
+      feed: 
+        title: Groupe de modifications {{id}}
+        title_comment: Groupe de modifications {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Groupe de modifications
+    changeset_details: 
       belongs_to: "Appartient Ã  :"
       bounding_box: "Bounding box :"
-      no_bounding_box: "Aucune bounding box n'a Ã©tÃ© stockÃ©e pour ce changeset."
-      show_area_box: "Montrer la boite"
-      box: "boite"
-      has_nodes: "A les {{count}} points suivants :"
+      box: boite
+      closed_at: "TerminÃ© le :"
+      created_at: "CrÃ©Ã© le :"
+      has_nodes: 
+        one: "Concerne le {{count}} nÅud suivant :"
+        other: "Concerne les {{count}} nÅuds suivants :"
+      has_relations: 
+        other: "Concerne les {{count}} relations suivantes :"
       has_ways: "A les {{count}} ways suivants :"
-      has_relations: "A les {{count}} relations suivantes :"
-    common_details:
+      no_bounding_box: Aucune bounding box n'a Ã©tÃ© stockÃ©e pour ce changeset.
+      show_area_box: Montrer la boite
+    changeset_navigation: 
+      all: 
+        next_tooltip: Groupe de modifications suivant
+        prev_tooltip: Groupe de modifications prÃ©cÃ©dent
+      user: 
+        name_tooltip: Voir les modifications par {{user}}
+        next_tooltip: Prochaines modifications par {{user}}
+        prev_tooltip: Modifications prÃ©cÃ©dentes par {{user}}
+    common_details: 
+      changeset_comment: "Commentaire :"
       edited_at: "ÃditÃ© le :"
       edited_by: "ÃditÃ© par :"
-      version: "Version :"
       in_changeset: "Dans le changeset :"
-    containing_relation:
-      entry: "Relation {{relation_name}}"
-      entry_role: "Relation {{relation_name}} (en tant que {{relation_role}})"
-    map:
-      loading: "Chargement..."
-      deleted: "EffacÃ©"
-    node_details:
-      part_of: "Faisant partie de:"
-    node_history:
-      node_history: "Historique des points"
-      download: "{{download_xml_link}} ou {{view_details_link}}"
-      download_xml: "TÃ©lÃ©charger XML"
-      view_details: "voir dÃ©tails"
-    node:
-      node: "Point"
+      version: "Version :"
+    containing_relation: 
+      entry: Relation {{relation_name}}
+      entry_role: Relation {{relation_name}} (en tant que {{relation_role}})
+    map: 
+      deleted: EffacÃ©
+      larger: 
+        area: Voir la zone dans une carte plus grande
+        node: Voir le nÅud dans une carte plus grande
+        relation: Voir la relation sur une carte plus grande
+        way: Voir le chemin sur une carte plus grande
+      loading: Chargement...
+    node: 
+      download: "{{download_xml_link}} ou {{view_history_link}}"
+      download_xml: TÃ©lÃ©charger XML
+      edit: modifier
+      node: Point
       node_title: "Point : {{node_name}}"
+      view_history: voir l'historique
+    node_details: 
+      coordinates: "CoordonnÃ©es :"
+      part_of: "Faisant partie de :"
+    node_history: 
+      download: "{{download_xml_link}} ou {{view_details_link}}"
+      download_xml: TÃ©lÃ©charger XML
+      node_history: Historique des points
+      node_history_title: "Historique du nÅud : {{node_name}}"
+      view_details: voir dÃ©tails
+    not_found: 
+      sorry: DÃ©solÃ©, le {{type}} avec l'id {{id}}, n'a pas pu Ãªtre trouvÃ©.
+      type: 
+        changeset: groupe de modifications
+        node: nÅud
+        relation: relation
+        way: chemin
+    paging_nav: 
+      of: de
+      showing_page: Page en cours
+    relation: 
       download: "{{download_xml_link}} ou {{view_history_link}}"
-      download_xml: "TÃ©lÃ©charger XML"
-      view_history: "voir l'historique"
-    not_found:
-      sorry: "DÃ©solÃ©, le {{type}} avec l'id {{id}}, n'a pas pu Ãªtre trouvÃ©."
-    paging_nav:
-      showing_page: "Page en cours"
-      of: "de"
-    relation_details:
+      download_xml: TÃ©lÃ©charger le XML
+      relation: Relation
+      relation_title: "Relation : {{relation_name}}"
+      view_history: voir l'historique
+    relation_details: 
       members: "Membres :"
       part_of: "Faisant partie de :"
-    relation_history:
-      relation_history: "Historique des relations"
-      relation_history_title: "Historique des relations : {{relation_name}}"
-    start:
-      view_data: "Voir les donnÃ©es sur la carte actuelle"
-      manually_select: "SÃ©lectionner manuellement une zone diffÃ©rente"
-    start_rjs:
-      data_frame_title: "DonnÃ©es"
-      zoom_or_select: "Zoomer ou sÃ©lectionner une zone de la carte pour la visualiser"
-      drag_a_box: "Dessiner une boite sur la carte pour sÃ©lectionner une zone"
-      manually_select: "SÃ©lectionner manuellement une zone diffÃ©rente"
+    relation_history: 
+      download: "{{download_xml_link}} ou {{view_details_link}}"
+      download_xml: TÃ©lÃ©charger le XML
+      relation_history: Historique de la relation
+      relation_history_title: "Historique de la relation : {{relation_name}}"
+      view_details: afficher les dÃ©tails
+    relation_member: 
+      type: 
+        node: NÅud
+        relation: Relation
+        way: Chemin
+    start: 
+      manually_select: SÃ©lectionner manuellement une zone diffÃ©rente
+      view_data: Voir les donnÃ©es sur la carte actuelle
+    start_rjs: 
+      data_frame_title: DonnÃ©es
+      data_layer_name: DonnÃ©es
+      details: DÃ©tails
+      drag_a_box: Dessiner une boite sur la carte pour sÃ©lectionner une zone
+      edited_by_user_at_timestamp: ÃditÃ© par [[user]] le [[timestamp]]
+      history_for_feature: Historique pour [[feature]]
+      load_data: Charger les donnÃ©es
       loaded_an_area_with_num_features: "Vous avez chargÃ© une zone qui contient [[num_features]] un grand nombre d'Ã©lÃ©ments. En gÃ©nÃ©ral, les navigateurs ne supportent pas bien l'affichage de tant de donnÃ©es, et travaillent mieux lorsqu'ils affichent moins de 100 Ã©lÃ©ments : accepter peut rendre votre navigateur lent ou non fonctionnel. Si vous etes sÃ»r de vouloir afficher ces donnÃ©es, vous pouvez le faire en appuyant sur le bouton ci-dessous."
-      load_data: "Charger les donnÃ©es"
+      loading: Chargement...
+      manually_select: SÃ©lectionner manuellement une zone diffÃ©rente
+      object_list: 
+        api: Obtenir cette zone depuis l'API
+        back: Afficher la liste d'objets
+        details: DÃ©tails
+        heading: Liste d'objets
+        history: 
+          type: 
+            node: NÅud [[id]]
+            way: Chemin [[id]]
+        selected: 
+          type: 
+            node: NÅud [[id]]
+            way: Chemin [[id]]
+        type: 
+          node: NÅud
+          way: Chemin
+      private_user: utilisateur privÃ©
+      show_history: Montrer l'historique
       unable_to_load_size: "Impossible de charger les donnÃ©es : la Bounding box d'une taille de [[bbox_size]] est trop grande (elle doit Ãªtre plus petite que {{max_bbox_size}})"
-      loading: "Chargement..."
-      show_history: "Montrer l'historique"
-      wait: "Patienter..."
-      history_for_feature: "Historique pour [[feature]]"
-      details: "DÃ©tails"
-      private_user: "utilisateur privÃ©"
-      edited_by_user_at_timestamp: "ÃditÃ© par [[user]] le [[timestamp]]"
-  diary_entry:
-    new:
-      title: "Nouvelle entrÃ©e du journal"
-    list:
-      new: "Nouvelle entrÃ©e du journal"
-      new_title: "Ajouter une nouvelle entrÃ©e dans votre journal"
-      no_entries: "Aucune entrÃ©e dans votre journal"
-      recent_entries: "EntrÃ©es rÃ©centes:"
-      older_entries: "EntrÃ©es plus anciennes"
-      newer_entries: "EntrÃ©es plus rÃ©centes"
-    edit:
-      subject: "Sujet:"
+      wait: Patienter...
+      zoom_or_select: Zoomer ou sÃ©lectionner une zone de la carte pour la visualiser
+    tag_details: 
+      tags: "Balises :"
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
+      download_xml: TÃ©lÃ©charger en XML
+      edit: modifier
+      view_history: afficher l'historique
+      way: Chemin
+      way_title: "Chemin : {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: aussi part du chemin {{related_ways}}
+        other: aussi part des chemins {{related_ways}}
+      nodes: "NÅuds :"
+      part_of: "Partie de :"
+    way_history: 
+      download: "{{download_xml_link}} ou {{view_details_link}}"
+      download_xml: TÃ©lÃ©charger le XML
+      view_details: Voir les dÃ©tails
+      way_history: Historique du chemin
+      way_history_title: "Historique du chemin : {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonyme
+      big_area: (grand)
+      no_comment: (aucun)
+      no_edits: (aucune modification)
+      still_editing: (en cours de modification)
+      view_changeset_details: Afficher les dÃ©tails du groupe de modifications
+    changeset_paging_nav: 
+      of: de
+      showing_page: Affichage de la page
+    changesets: 
+      area: Zone
+      comment: Commentaire
+      id: ID
+      saved_at: SauvegardÃ© Ã 
+      user: Utilisateur
+    list: 
+      description: Modifications rÃ©centes
+      description_bbox: Groupes de modifications dans {{bbox}}
+      description_user: Groupes de modifications par {{user}}
+      description_user_bbox: Groupes de modifications par {{user}} dans {{bbox}}
+      heading: Groupes de modifications
+      heading_bbox: Groupes de modifications
+      heading_user: Groupes de modifications
+      heading_user_bbox: Groupes de modifications
+      title: Groupes de modifications
+      title_bbox: Groupes de modifications dans {{bbox}}
+      title_user: Groupes de modifications par {{user}}
+      title_user_bbox: Groupes de modifications par {{user}} dans {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Commentaire de {{link_user}} le {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 commentaire
+        other: "{{count}} commentaires"
+      comment_link: Commenter cette entrÃ©e
+      edit_link: Ãditer cette entrÃ©e
+      posted_by: PostÃ© par {{link_user}} Ã  {{created}} en {{language_link}}
+      reply_link: RÃ©pondre a cette entrÃ©e
+    edit: 
       body: "Message:"
       language: "Langue:"
-      location: "Lieu:"
       latitude: "Latitude:"
+      location: "Lieu:"
       longitude: "Longitude:"
-      use_map_link: "Utiliser la carte"
-      save_button: "Sauvegarder"
-      marker_text: "Emplacement de l'entrÃ©e du journal"
-    no_such_entry:
+      marker_text: Emplacement de l'entrÃ©e du journal
+      save_button: Sauvegarder
+      subject: "Sujet:"
+      title: Modifier l'entrÃ©e du journal
+      use_map_link: Utiliser la carte
+    feed: 
+      all: 
+        description: EntrÃ©es rÃ©centes du journal des utilisateurs d'OpenStreetMap
+        title: EntrÃ©es du journal d'OpenStreetMap
+      language: 
+        description: EntrÃ©es rÃ©centes du journal des utilisateurs d'OpenStreetMap en {{language_name}}
+        title: EntrÃ©es du journal d'OpenStreetMap en {{language_name}}
+      user: 
+        description: EntrÃ©es rÃ©centes du journal d'OpenStreetMap pour {{user}}
+        title: EntrÃ©es du journal d'OpenStreetMap pour {{user}}
+    list: 
+      in_language_title: EntrÃ©es du journal en {{language}}
+      new: Nouvelle entrÃ©e du journal
+      new_title: Ajouter une nouvelle entrÃ©e dans votre journal
+      newer_entries: EntrÃ©es plus rÃ©centes
+      no_entries: Aucune entrÃ©e dans votre journal
+      older_entries: EntrÃ©es plus anciennes
+      recent_entries: "EntrÃ©es rÃ©centes:"
+      title: Journaux des utilisateurs
+      user_title: Journal de {{user}}
+    new: 
+      title: Nouvelle entrÃ©e du journal
+    no_such_entry: 
+      body: DesolÃ©, il n'y a aucune entrÃ©e dans le journal ou commentaires avec l'id {{id}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide.
       heading: "Aucune entrÃ©e avec l'id : {{id}}"
-      body: "DesolÃ©, il n'y a aucune entrÃ©e dans le journal ou commentaires avec l'id {{id}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide."
-    no_such_user:
-      body: "DesolÃ©, il n'y pas d'utilisateur avec le nom {{user}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide."
-    diary_entry:
-      posted_by: "PostÃ© par {{link_user}} Ã  {{created}} en {{language_link}}"
-      comment_link: "Commenter cette entrÃ©e"
-      reply_link: "RÃ©pondre a cette entrÃ©e"
-      comment_count:
-        one: "1 commentaire"
-        other: "{{count}} commentaires"
-      edit_link: "Ãditer cette entrÃ©e"
-    diary_comment:
-      comment_from: "Commentaire de {{link_user}} le {{comment_created_at}}"
-  layouts:
-    welcome_user: "Bienvenue, {{user_link}}"
-    inbox: "Boite aux lettres ({{count}})"
-    logout: "DÃ©connexion"
-    log_in: "Connexion"
-    sign_up: "S'inscrire"
-    view: "Voir"
-    edit: "Ãditer"
-    history: "Historique"
-    export: "Exporter"
-    gps_traces: "Traces GPS"
-    user_diaries: "Journaux"
-    tag_line : La carte coopÃ©rative libre
-    intro_1: "OpenStreetMap est une carte du monde entier librement Ã©ditable, faite par des gens comme vous."
-    intro_2: "OpenStreetMap vous permet de voir, Ã©diter et utiliser des donnÃ©es gÃ©ographiques de n'importe quel endroit dans le monde."
-    intro_3: "OpenStreetMap est gracieusement hÃ©bergÃ© par {{ucl}} et {{bytemark}}."
-    osm_offline: "La base de donnÃ©es de OpenStreetMap est actuellement hors ligne; une maintenance essentielle Ã  son bon fonctionnement est en cours."
-    osm_read_only: "La base de donnÃ©es de OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle Ã  son bon fonctionnement est en cours."
-    donate: "Soutenez OpenStreetMap, {{link}} au fond pour amÃ©liorer le matÃ©riel."
-    donate_link_text: "participez"
-    help_wiki: "Aide &amp; Wiki"
-    news_blog: "Blog de nouvelles"
-    shop: "Boutique"
-    sotm : 'Venez a la confÃ©rence 2009 de OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 juillet Ã  Amsterdam!'
-    alt_donation: "Faites une donation"
-  notifier:
-    diary_comment_notification:
+      title: Aucune entrÃ©e du journal n'a Ã©tÃ© trouvÃ©
+    no_such_user: 
+      body: DesolÃ©, il n'y pas d'utilisateur avec le nom {{user}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide.
+      heading: Lâutilisateur {{user}} nâexiste pas
+      title: Aucun utilisateur trouvÃ©
+    view: 
+      leave_a_comment: Ajouter un commentaire
+      login: Connectez-vous
+      login_to_leave_a_comment: "{{login_link}} pour ajouter un commentaire"
+      save_button: Enregistrer
+      title: Journaux des utilisateurs | {{user}}
+      user_title: Journal de {{user}}
+  export: 
+    start: 
+      add_marker: Ajouter un marqueur Ã  la carte
+      area_to_export: Zone Ã  exporter
+      embeddable_html: HTML incorporable.
+      export_button: Exporter
+      export_details: Les donnÃ©es d'OpenStreetMap sous <a href="http://creativecommons.org/licenses/by-sa/2.0/">licence Creative Commons attribution-partage Ã  l'identique 2.0</a>.
+      format: Format
+      format_to_export: Format Ã  exporter
+      image_size: Taille de l'image
+      latitude: "Lat :"
+      licence: Licence
+      longitude: "Lon :"
+      manually_select: SÃ©lectionner manuellement une autre zone
+      mapnik_image: Image de Mapnik
+      max: max
+      options: Options
+      osm_xml_data: DonnÃ©es XML d'OpenStreetMap
+      osmarender_image: Image d'Osmarender
+      output: Sortie
+      paste_html: Collez le code HTML pour incorporer dans un site web.
+      scale: Ãchelle
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Ajouter un marqueur Ã  la carte
+      change_marker: Modifier la position du marqueur
+      click_add_marker: Cliquer sur la carte pour ajouter un marqueur
+      drag_a_box: Dessiner un cadre sur la carte pour sÃ©lectionner une zone
+      export: Exporter
+      manually_select: SÃ©lectionner manuellement une zone diffÃ©rente
+      view_larger_map: Voir une carte plus grande
+  geocoder: 
+    description: 
+      title: 
+        geonames: Localisation depuis <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} depuis <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: Villes
+        places: Places
+        towns: Villages
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} de {{type}}"
+    direction: 
+      east: est
+      north: nord
+      north_east: nord-est
+      north_west: nord-ouest
+      south: sud
+      south_east: sud-est
+      south_west: sud-ouest
+      west: ouest
+    distance: 
+      one: environ 1 km
+      other: environ {{count}} km
+      zero: moins de 1 km
+    results: 
+      no_results: Aucun rÃ©sultat n'a Ã©tÃ© trouvÃ©
+    search: 
+      title: 
+        ca_postcode: RÃ©sultats depuis <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: RÃ©sultats depuis <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: RÃ©sultats <a href="http://openstreetmap.org/">internes</a>
+        osm_namefinder: RÃ©sultats depuis <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: RÃ©sultats depuis <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: RÃ©sultats depuis <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} de {{placename}}"
+  layouts: 
+    alt_donation: Faites une donation
+    donate: Soutenez OpenStreetMap, {{link}} au fond pour amÃ©liorer le matÃ©riel.
+    donate_link_text: participez
+    edit: Ãditer
+    edit_tooltip: Ãditer des cartes
+    export: Exporter
+    export_tooltip: Exporter les donnÃ©es de la carte
+    gps_traces: Traces GPS
+    gps_traces_tooltip: GÃ©rer les chemins
+    help_wiki: Aide &amp; Wiki
+    help_wiki_tooltip: Aide et site Wiki du projet
+    history: Historique
+    history_tooltip: Historique du groupe de modifications
+    home: Chez moi
+    home_tooltip: Aller Ã  l'emplacement de mon domicile
+    inbox: Boite aux lettres ({{count}})
+    inbox_tooltip: 
+      one: Votre boÃ®te aux lettres contient 1 message non lu
+      other: Votre boÃ®te aux lettres contient {{count}} messages non lus
+      zero: Votre boÃ®te aux lettres ne contient pas de messages non lus
+    intro_1: OpenStreetMap est une carte du monde entier librement Ã©ditable, faite par des gens comme vous.
+    intro_2: OpenStreetMap vous permet de voir, Ã©diter et utiliser des donnÃ©es gÃ©ographiques de n'importe quel endroit dans le monde.
+    intro_3: OpenStreetMap est gracieusement hÃ©bergÃ© par {{ucl}} et {{bytemark}}.
+    log_in: Connexion
+    log_in_tooltip: Se connecter avec un compte existant
+    logo: 
+      alt_text: Logo d'OpenStreetMap
+    logout: DÃ©connexion
+    logout_tooltip: Se dÃ©connecter
+    news_blog: Blog de nouvelles
+    news_blog_tooltip: Blog de nouvelles sur OpenStreetMap, les donnÃ©es gÃ©ographiques libres, etc.
+    osm_offline: La base de donnÃ©es de OpenStreetMap est actuellement hors ligne; une maintenance essentielle Ã  son bon fonctionnement est en cours.
+    osm_read_only: La base de donnÃ©es de OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle Ã  son bon fonctionnement est en cours.
+    shop: Boutique
+    shop_tooltip: Boutique de produits OpenStreetMap
+    sign_up: S'inscrire
+    sign_up_tooltip: CrÃ©er un compte pour l'Ã©dition
+    sotm: Venez a la confÃ©rence 2009 de OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 juillet Ã  Amsterdam!
+    tag_line: La carte coopÃ©rative libre
+    user_diaries: Journaux
+    user_diaries_tooltip: Voir les journaux d'utilisateurs
+    view: Voir
+    view_tooltip: Afficher les cartes
+    welcome_user: Bienvenue, {{user_link}}
+    welcome_user_link_tooltip: Votre page utilisateur
+  map: 
+    coordinates: CoordonnÃ©es
+    edit: Ãdition
+    view: Carte
+  message: 
+    delete: 
+      deleted: Message supprimÃ©
+    inbox: 
+      date: Date
+      from: De
+      my_inbox: Ma boÃ®te de rÃ©ception
+      no_messages_yet: Vous n'avez actuellement aucun message. Pourquoi ne pas entrer en contact avec quelques {{people_mapping_nearby_link}} ?
+      outbox: boÃ®te d'envoi
+      people_mapping_nearby: personnes proche de vous
+      subject: Objet
+      title: BoÃ®te de rÃ©ception
+      you_have: Vous avez {{new_count}} nouveaux messages et {{old_count}} anciens messages
+    mark: 
+      as_read: Message marquÃ© comme lu
+      as_unread: Message marquÃ© comme non-lu
+    message_summary: 
+      delete_button: Supprimer
+      read_button: Marquer comme lu
+      reply_button: RÃ©pondre
+      unread_button: Marquer comme non lu
+    new: 
+      back_to_inbox: Revenir la boÃ®te de rÃ©ception
+      body: Corps
+      message_sent: Message envoyÃ©
+      send_button: Envoyer
+      send_message_to: Envoyer un nouveau message Ã  {{name}}
+      subject: Sujet
+      title: Envoyer un message
+    no_such_user: 
+      body: DÃ©solÃ©, il n'y a aucun utilisateur ni message avec ce nom ou cet identifiant
+      heading: Utilisateur ou message inexistant
+      title: Utilisateur ou message inexistant
+    outbox: 
+      date: Date
+      inbox: boÃ®te de rÃ©ception
+      my_inbox: Ma {{inbox_link}}
+      no_sent_messages: Vous n'avez encore envoyÃ© aucun message. Pourquoi ne pas entrez en contact avec quelques {{people_mapping_nearby_link}} ?
+      outbox: boÃ®te d'envoi
+      people_mapping_nearby: personnes proche de vous
+      subject: Objet
+      title: BoÃ®te d'envoi
+      to: Ã
+      you_have_sent_messages: Vous avez envoyÃ© {{sent_count}} messages
+    read: 
+      back_to_inbox: Revenir Ã  la boÃ®te de rÃ©ception
+      back_to_outbox: Revenir Ã  la boÃ®te d'envoi
+      date: Date
+      from: De
+      reading_your_messages: Lecture de vos messages
+      reading_your_sent_messages: Lecture de vos messages envoyÃ©s
+      reply_button: RÃ©pondre
+      subject: Objet
+      title: Lire le message
+      to: Ã
+      unread_button: Marque comme non lu
+    sent_message_summary: 
+      delete_button: Supprimer
+  notifier: 
+    diary_comment_notification: 
       banner1: "*            Sâil vous plaÃ®t de ne pas rÃ©pondre Ã  ce message.             *"
       banner2: "*           Utilisez le OpenStreetMap site Web pour y rÃ©pondre.           *"
-  site:
-    index:
-      js_1: "Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez dÃ©sactivÃ© Javascript."
-      js_2: "OpenStreetMap utilise Javascript pour ses cartes glissantes."
-      js_3: "Si vous Ãªtes dans l'incapacitÃ© d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>."
-      permalink: "Permalink"
-      license:
-        notice: "Sous license {{license_name}} par le {{project_name}} et ses contributeurs."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        project_name: "projet OpenStreetMap"
-    edit:
-      not_public: "Vous n'avez pas rÃ©glÃ© vos Ã©ditions pour qu'elles soient publiques."
-      not_public_description: "Vous ne pouvez plus Ã©diter la carte a moins que vous ne rendiez vos Ã©ditions publiques. Vous pouvez rendre vos Ã©ditions publiques Ã  partir de votre {{user_page}}."
-      user_page_link: "page utilisateur"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Trouvez pourquoi ici."
-      flash_player_required: "Vous avez besoin d''un lecteur Flash pour utiliser Potlatch, l'Ã©diteur Flash de OpenStreetMap. Vous pouvez <a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>tÃ©lÃ©charger Flash Player sur le site d'Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>D'autres options</a> sont Ã©galement disponibles pour Ã©diter OpenStreetMap."
-      potlatch_unsaved_changes: "Vous avez des modifications non sauvegardÃ©es. (Pour sauvegarder dans Potlatch, vous devez dÃ©-sÃ©lectionner le way ou le node en cours si vous Ã©ditez en mode liste, ou cliquer sur sauvegarder si vous avez un bouton sauvegarder.)"
-    sidebar:
-      search_results: "RÃ©sultats de la recherche"
-      close: "Fermer"
-    search:
-      search: "Recherche"
-      where_am_i: "OÃ¹ suis-je ?"
-      submit_text: "Envoyer"
+      footer: Vous pouvez Ã©galement lire le commentaire sur {{readurl}}, commenter sur {{commenturl}} ou rÃ©pondre sur {{replyurl}}
+      header: "{{from_user}} a ajoutÃ© un commentaire sur un de vos entrÃ©es rÃ©centes du journal d'OpenStreetMap avec le sujet {{subject}} :"
+      hi: Bonjour {{to_user}},
+      subject: "[OpenStreetMap] {{user}} a ajoutÃ© un commentaire sur votre entrÃ©e du journal"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirmation de votre adresse de courriel"
+    email_confirm_html: 
+      click_the_link: Si c'est vous, veuillez cliquer sur le lien ci-dessous pour confirmer la modification.
+      greeting: Bonjour,
+      hopefully_you: Quelqu'un (probablement vous) aimerait changer son adresse de courriel de {{server_url}} Ã  {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Si vous Ãªtes Ã  l'origine de cette requÃªte, cliquez sur le lien ci-dessous pour confirmer cette modification.
+      greeting: Bonjour,
+      hopefully_you_1: Quelqu'un (problablement vous) voudrait changer son adresse de courriel de
+      hopefully_you_2: "{{server_url}} Ã  {{new_address}}."
+    friend_notification: 
+      had_added_you: "{{user}} vous a ajoutÃ© comme ami dans OpenStreetMap."
+      see_their_profile: Vous pouvez voir leur profil sur {{userurl}} et les ajouter comme ami si vous le souhaitez.
+      subject: "[OpenStreetMap] {{user}} vous a ajoutÃ© comme ami"
+    gpx_notification: 
+      and_no_tags: et sans balise.
+      and_the_tags: "et les balises suivantes :"
+      failure: 
+        failed_to_import: "n'a pas pu Ãªtre importÃ©. Voici l'erreur :"
+        more_info_1: Plus d'informations sur les erreurs lors de l'import GPX et comment les Ã©viter
+        more_info_2: "peuvent Ãªtre trouvÃ©s sur :"
+        subject: "[OpenStreetMap] Erreur lors de l'import GPX"
+      greeting: Bonjour,
+      success: 
+        subject: "[OpenStreetMap] Import GPX rÃ©ussi"
+      with_description: avec les description
+      your_gpx_file: Il semble que votre fichier GPX
+    lost_password: 
+      subject: "[OpenStreetMap] Demande de rÃ©initialisation du mot de passe"
+    lost_password_html: 
+      click_the_link: Si c'est vous, veuillez cliquer sur le lien ci-dessous pour rÃ©initialiser votre mot de passe.
+      greeting: Bonjour,
+      hopefully_you: Quelqu'un (probablement vous) a demandÃ© que le mot de passe du compte openstreetmap.org avec cette adresse de courriel soit rÃ©initialisÃ©.
+    lost_password_plain: 
+      click_the_link: Si vous Ãªtes Ã  l'origine de cette requÃªte, cliquez sur le lien ci-dessous pour rÃ©initialiser votre mot de passe.
+      greeting: Bonjour,
+      hopefully_you_1: Quelqu'un (problablement vous) a demandÃ© de rÃ©initialiser le mot de passe du
+      hopefully_you_2: compte openstreetmap.org avec cette adresse de courriel.
+    message_notification: 
+      banner1: "*                  Merci de ne pas rÃ©pondre Ã  cet email.                    *"
+      banner2: "*                Utilisez le site web d'OpenStreetMap pour rÃ©pondre.                *"
+      footer1: Vous pouvez Ã©galement lire le message sur {{readurl}}
+      footer2: et vous pouvez rÃ©pondre sur {{replyurl}}
+      header: "{{from_user}} vous a envoyÃ© un message depuis OpenStreetMap avec le sujet {{subject}} :"
+      hi: Bonjour {{to_user}},
+      subject: "[OpenStreetMap] {{user}} vous a envoyÃ© un message"
+    signup_confirm: 
+      subject: "[OpenStreetMap] Confirmer votre adresse de courriel"
+    signup_confirm_html: 
+      click_the_link: Si vous Ãªtes Ã  l'origine de cette action, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer la crÃ©ation de compte et avoir plus d'informations sur OpenStreetMap
+      get_reading: Plus dâinformations sur OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide">sur le wiki</a> ou <a href="http://www.opengeodata.org/">sur le blog opengeodata</a> qui propose Ã©galement des  <a href="http://www.opengeodata.org/?cat=13">podcasts Ã  Ã©couter</a> !
+      greeting: Bonjour !
+      hopefully_you: Quelqu'un (probablement vous) aimerait crÃ©er un compte sur
+      introductory_video: Vous pouvez visionner une {{introductory_video_link}}.
+      more_videos: Il y a {{more_videos_link}}.
+      more_videos_here: plus de vidÃ©os ici
+      user_wiki_page: Nous vous conseillons de crÃ©er une page utilisateur sur le wiki, et d'y placer des marqueurs de catÃ©gories indiquant oÃ¹ vous Ãªtes, tels que <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Paris">[[Category:Users_in_Paris]]</a>.
+      video_to_openstreetmap: vidÃ©o introductive Ã  OpenStreetMap
+      wiki_signup: Vous pouvez Ã©galement vous <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">crÃ©er un compte sur le wiki d'OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Si vous Ãªtes Ã  l'origine de cette requÃªte, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer votre
+      click_the_link_2: compte et obtenir plus d'informations Ã  propos d'OpenStreetMap.
+      current_user_1: Une liste des utilisateurs actuels, basÃ©e sur leur localisation dans le monde,
+      current_user_2: "est disponible depuis :"
+      greeting: Salut !
+      hopefully_you: Quelqu'un (probablement vous) aimerait crÃ©er un compte sur
+      introductory_video: "Vous pouvez visionner une vidÃ©o introductive Ã  OpenStreetMap ici :"
+      more_videos: "Davantage de vidÃ©os sont disponibles ici :"
+      opengeodata: "OpenGeoData.org est le blog de OpenStreetMap, et il propose Ã©galement des podcasts:"
+      the_wiki: "Lisez Ã  propos d'OpenStreetMap sur le wiki :"
+      user_wiki_1: Il est recommandÃ© de crÃ©er une page utilisateur qui inclut
+      user_wiki_2: des catÃ©gories qui indiquent votre localisation, comme [[Category:Users_in_London]].
+      wiki_signup: "Vous pouvez Ã©galement vous crÃ©er un compte sur le wiki d'OpenStreetMap sur :"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: lire vos traces GPS privÃ©es.
+      allow_read_prefs: lire vos prÃ©fÃ©rences utilisateur.
+      allow_to: "Autoriser l'application client Ã  :"
+      allow_write_api: modifier la carte.
+      allow_write_diary: crÃ©ez des entrÃ©es dans le journal, des commentaire et faÃ®tes-vous des amis.
+      allow_write_gpx: tÃ©lÃ©verser des traces GPS.
+      allow_write_prefs: modifier vos prÃ©fÃ©rences utilisateur.
+      request_access: L'application {{app_name}} demande l'accÃ¨s Ã  votre compte. VÃ©rifiez si vous dÃ©sirez que les applications aient les possibilitÃ©s suivantes. Vous pouvez choisir autant ou aussi peu que vous voulez.
+    revoke: 
+      flash: Vous avez rÃ©voquÃ© le jeton pour {{application}}
+  oauth_clients: 
+    create: 
+      flash: Informations enregistrÃ©es avec succÃ¨s
+    destroy: 
+      flash: Enregistrements de l'application clientes dÃ©truits
+    edit: 
+      submit: Modifier
+      title: Modifier votre application
+    form: 
+      allow_read_gpx: lire ses traces GPS privÃ©es.
+      allow_read_prefs: lire ses prÃ©fÃ©rences utilisateur.
+      allow_write_api: modifier la carte.
+      allow_write_diary: crÃ©ez des entrÃ©es dans les journaux, des commentaires et faÃ®tes-vous des amis.
+      allow_write_gpx: tÃ©lÃ©verser des traces GPS.
+      allow_write_prefs: modifier ses prÃ©fÃ©rences utilisateur.
+      callback_url: URL de rappel
+      name: Nom
+      requests: "Demander les permissions suivantes Ã  l'utilisateur :"
+      required: Requis
+      support_url: URL de support
+      url: URL principale de l'application
+    index: 
+      application: Nom de l'application
+      issued_at: Ã©mis Ã 
+      list_tokens: "Les jetons suivants ont Ã©tÃ© Ã©mis aux applications en votre nom :"
+      my_apps: Mes applications clientes
+      my_tokens: Mes applications enregistrÃ©es
+      register_new: Enregistrez votre application
+      registered_apps: "Vous avez les applications clientes suivantes enregistrÃ©es :"
+      revoke: RÃ©voquer !
+      title: Mes dÃ©tails OAuth
+    new: 
+      submit: Enregistrer
+      title: Enregistrer une nouvelle application
+    not_found: 
+      sorry: DÃ©solÃ©, ce {{type}} nâa pas pu Ãªtre trouvÃ©.
+    show: 
+      access_url: "URL du jeton d'accÃ¨s :"
+      allow_read_gpx: lire leurs chemins GPS privÃ©s.
+      allow_read_prefs: consulter ses prÃ©fÃ©rences utilisateur.
+      allow_write_api: modifier la carte.
+      allow_write_diary: crÃ©ez des entrÃ©es dans le journal, des commentaire et faÃ®tes-vous des amis.
+      allow_write_gpx: envoi trace GPS.
+      allow_write_prefs: modifier ses prÃ©fÃ©rences utilisateur.
+      authorize_url: "URL d'autorisation :"
+      edit: Modifier les dÃ©tails
+      key: "ClÃ© de l'utilisateur :"
+      requests: "Demande des permission suivantes de l'utilisateur :"
+      secret: "Secret de l'utilisateur :"
+      support_notice: Nous supportons hamc-sha1 (recommandÃ©) et texte brut en mode ssl.
+      title: DÃ©tails OAuth pour {{app_name}}
+      url: "URL du jeton de requÃªte :"
+    update: 
+      flash: Informations du client enregistrÃ©es avec succÃ¨s
+  site: 
+    edit: 
+      anon_edits_link_text: Trouvez pourquoi ici.
+      flash_player_required: Vous avez besoin d''un lecteur Flash pour utiliser Potlatch, l'Ã©diteur Flash de OpenStreetMap. Vous pouvez <a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>tÃ©lÃ©charger Flash Player sur le site d'Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>D'autres options</a> sont Ã©galement disponibles pour Ã©diter OpenStreetMap.
+      not_public: Vous n'avez pas rÃ©glÃ© vos Ã©ditions pour qu'elles soient publiques.
+      not_public_description: Vous ne pouvez plus Ã©diter la carte a moins que vous ne rendiez vos Ã©ditions publiques. Vous pouvez rendre vos Ã©ditions publiques Ã  partir de votre {{user_page}}.
+      potlatch_unsaved_changes: Vous avez des modifications non sauvegardÃ©es. (Pour sauvegarder dans Potlatch, vous devez dÃ©-sÃ©lectionner le way ou le node en cours si vous Ã©ditez en mode liste, ou cliquer sur sauvegarder si vous avez un bouton sauvegarder.)
+      user_page_link: page utilisateur
+    index: 
+      js_1: Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez dÃ©sactivÃ© Javascript.
+      js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes.
+      js_3: Si vous Ãªtes dans l'incapacitÃ© d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Sous license {{license_name}} par le {{project_name}} et ses contributeurs.
+        project_name: projet OpenStreetMap
+      permalink: Permalink
+      shortlink: Lien court
+    key: 
+      map_key: LÃ©gende de la carte
+      table: 
+        entry: 
+          admin: Limite administrative
+          allotments: Lotissements
+          apron: 
+            - Piste d'aÃ©roport
+            - terminal
+          bridge: Bord noir = pont
+          bridleway: Sentier pour chevaux
+          brownfield: Zone industrielle
+          building: BÃ¢timent important
+          byway: Route secondaire
+          cable: 
+            - TÃ©lÃ©phÃ©rique
+            - TÃ©lÃ©siÃ¨ge
+          cemetery: CimetiÃ¨re
+          centre: Centre sportif
+          commercial: Zone commerciale
+          common: 
+            - prairie
+          construction: Routes en construction
+          cycleway: Voie cyclable
+          farm: Ferme
+          footway: Voie piÃ©tonne
+          forest: ForÃªt
+          golf: Parcours de golf
+          heathland: Lande
+          industrial: Zone industrielle
+          lake: 
+            - Lac
+            - rÃ©servoir
+          military: Zone militaire
+          motorway: Autoroute
+          park: Parc
+          permissive: AccÃ¨s permissif
+          pitch: Terrain de sport
+          primary: Route principale
+          private: AccÃ¨s privÃ©
+          rail: Voie de chemin de fer
+          reserve: RÃ©serve naturelle
+          resident: Zone rÃ©sidentielle
+          retail: Zone de commerce
+          runway: 
+            - Piste dâaÃ©roport
+            - Voie de taxi
+          school: 
+            - Ãcole
+            - universitÃ©
+          secondary: Route secondaire
+          station: Gare ferroviaire
+          subway: Ligne de mÃ©tro
+          summit: 
+            - Sommet
+            - pic
+          tourist: Attraction touristique
+          track: Piste
+          tram: 
+            - Tramway
+            - tram
+          trunk: Route nationale
+          tunnel: Bord en pointillÃ©s = tunnel
+          unclassified: Route non classifiÃ©e
+          wood: Bois
+        heading: LÃ©gende pour z{{zoom_level}}
+    search: 
+      search: Recherche
       search_help: "exemples : 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ou 'bureaux de poste prÃ¨s de LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Autres d'exemples...</a>"
-    key:
-      map_key: "LÃ©gende de la carte"
-  user:
-    login:
-      heading: "Connexion"
-      please login: "Veuillez vous connecter ou {{create_user_link}}."
-      create_account: "CrÃ©er un compte"
+      submit_text: Envoyer
+      where_am_i: OÃ¹ suis-je ?
+    sidebar: 
+      close: Fermer
+      search_results: RÃ©sultats de la recherche
+  trace: 
+    create: 
+      trace_uploaded: Votre fichier GPX a Ã©tÃ© tÃ©lÃ©versÃ© et est en attente de son intÃ©gration dans la base de donnÃ©es. Cela prend en gÃ©nÃ©ral moins d'une demie heure, et un email vous sera envoyÃ© lorsque cette tÃ¢che sera finie.
+      upload_trace: TÃ©lÃ©verser la trace GPS
+    delete: 
+      scheduled_for_deletion: Piste prÃ©vue pour la suppression
+    edit: 
+      description: "Description :"
+      download: tÃ©lÃ©charger
+      edit: modifier
+      filename: "Nom du fichier :"
+      heading: Modifier le chemin {{name}}
+      map: carte
+      owner: "PropriÃ©taire :"
+      points: "Points :"
+      save_button: Enregistrer les modifications
+      start_coord: "CoordonnÃ©es de dÃ©part :"
+      tags: "Balises :"
+      tags_help: sÃ©parÃ© par des virgules
+      title: Modifier le chemin {{name}}
+      uploaded_at: "EnvoyÃ© Ã  :"
+      visibility: "VisibilitÃ© :"
+      visibility_help: que signifie ceci ?
+    list: 
+      public_traces: Traces GPS publiques
+      public_traces_from: Traces GPS publiques de {{user}}
+      tagged_with: "  balisÃ© avec {{tags}}"
+      your_traces: Vos traces GPS
+    make_public: 
+      made_public: Piste rendue publique
+    no_such_user: 
+      body: DÃ©solÃ©, aucun utilisateur ne porte le nom {{user}}. Veuillez vÃ©rifier l'orthographe. Si vous avez cliquÃ© sur un lien, celui-ci est faux.
+      heading: Lâutilisateur {{user}} nâexiste pas
+      title: Aucun utilisteur trouvÃ©
+    trace: 
+      ago: il y a {{time_in_words_ago}}
+      by: par
+      count_points: "{{count}} points"
+      edit: modifier
+      edit_map: Modifier la carte
+      in: dans
+      map: carte
+      more: plus
+      pending: EN ATTENTE
+      private: PRIVÃ
+      public: PUBLIQUE
+      trace_details: Voir les dÃ©tails du chemin
+      view_map: Voir la carte
+    trace_form: 
+      description: Description
+      help: Aide
+      tags: Balises
+      tags_help: sÃ©parÃ© par des virgules
+      upload_button: TÃ©lÃ©verser
+      upload_gpx: TÃ©lÃ©verser un fichier GPX
+      visibility: VisibilitÃ©
+      visibility_help: qu'est-ce que cela veut dire ?
+    trace_header: 
+      see_all_traces: Voir tous les chemins
+      see_just_your_traces: Voir seulement vos chemins, ou importer un chemin
+      see_your_traces: Voir tous vos chemins
+      traces_waiting: Vous avez {{count}} chemins en attente de tÃ©lÃ©versement. Il serait peut-Ãªtre prÃ©fÃ©rable dâattendre avant dâen importer dâautres, pour ne pas bloquer la file dâattente aux autres utilisateurs.
+    trace_optionals: 
+      tags: Balises
+    trace_paging_nav: 
+      of: de
+      showing: Affichage de la page
+    view: 
+      delete_track: Supprimer cette piste
+      description: "Description :"
+      download: tÃ©lÃ©charger
+      edit: modifier
+      edit_track: Modifier cette piste
+      filename: "Nom du fichier :"
+      heading: Affichage du chemin {{name}}
+      map: carte
+      none: Aucun
+      owner: "PropriÃ©taire :"
+      pending: EN ATTENTE
+      points: "Points :"
+      start_coordinates: "CoordonnÃ©es de dÃ©part :"
+      tags: "Balises :"
+      title: Affichage du chemin {{name}}
+      trace_not_found: Chemin introuvable !
+      uploaded: "TÃ©lÃ©versÃ© dans :"
+      visibility: "VisibilitÃ© :"
+    visibility: 
+      identifiable: Identifiable (affichÃ© dans la liste des chemin et comme identifiable, points ordonnÃ©s avec les dates)
+      private: PrivÃ© (partagÃ© anonymement, points non ordonnÃ©s)
+      public: Public (affichÃ© dans la liste des chemins et anonymement, points non ordonnÃ©s)
+      trackable: Pistable (partagÃ© seulement anonymement, points ordonnÃ©s avec les dates)
+  user: 
+    account: 
+      email never displayed publicly: (jamais affichÃ© publiquement)
+      flash update success: Informations sur l'utilisateur mises Ã  jour avec succÃ¨s.
+      flash update success confirm needed: Informations sur l'utilisateur mises Ã  jour avec succÃ¨s. VÃ©rifiez votre boite mail afin de valider la vÃ©rification de votre nouvelle adresse e-mail.
+      home location: "Emplacement du domicile :"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Rendre toutes mes Ã©ditions publiques
+      my settings: Mes options
+      no home location: Vous n'avez pas indiquÃ© l'emplacement de votre domicile.
+      preferred languages: "Langues prÃ©fÃ©rÃ©es :"
+      profile description: "Description du profil :"
+      public editing: 
+        disabled: DÃ©sactivÃ© et ne peut pas Ã©diter les donnÃ©es ; toutes les prÃ©cÃ©dentes Ã©ditions sont anonymes.
+        disabled link text: pourquoi ne puis-je pas Ã©diter ?
+        enabled: ActivÃ©. Non anonyme et peut Ã©diter les donnÃ©es.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: Qu'est-ce que c'est ?
+        heading: "Ãdition publique :"
+      return to profile: Retourner au profil
+      save changes button: Sauvegarder les changements
+      title: Modifier le compte
+      update home location on click: Mettre a jour l'emplacement de votre domicile quand vous cliquez sur la carte ?
+    confirm: 
+      button: Confirmer
+      failure: Un compte utilisateur avec ce jeton a dÃ©jÃ  Ã©tÃ© confirmÃ©.
+      heading: Confirmer un compte utilisateur
+      press confirm button: Appuyer le bouton confirmer ci-dessous pour activer votre compte.
+      success: Compte confirmÃ©, merci de vous Ãªtre enregistrÃ© !
+    confirm_email: 
+      button: Confirmer
+      failure: Une adresse email a dÃ©jÃ  Ã©tÃ© confirmÃ©e avec ce jeton d'authentification.
+      heading: Confirmer le changement de votre adresse e-mail
+      press confirm button: Appuyer sur le bouton confirmer pour confirmer votre nouvelle adresse e-mail.
+      success: Adresse email confirmÃ©e, merci de vous Ãªtre enregistrÃ© !
+    friend_map: 
+      nearby mapper: "Mappeur dans les environs: [[nearby_user]]"
+      your location: Votre emplacement
+    go_public: 
+      flash success: Toutes vos Ã©ditions sont dorÃ©navant publiques et vous n'Ãªtes pas autorisÃ© a Ã©diter.
+    login: 
+      account not active: DÃ©solÃ©, votre compte n'est pas encore actif.<br/>Veuillez cliquer sur le lien dans l'email de confirmation, pour activer votre compte.
+      auth failure: DÃ©solÃ©, mais les informations fournies nâont pas permis de vous identifier.
+      create_account: CrÃ©er un compte
       email or username: "Adresse e-mail ou nom d'utilisateur :"
+      heading: Connexion
+      login_button: Se connecter
+      lost password link: Vous avez perdu votre mot de passe ?
       password: "Mot de passe:"
-      lost password link: "Vous avez perdu votre mot de passe ?"
-      login_button: "Se connecter"
-    lost_password:
-      heading: "Vous avez perdu votre mot de passe ?"
-      email address: "Adresse e-mail :"
-      new password button: "Envoyer un nouveau mot de passe"
-    new:
-      heading: "CrÃ©er un compte utilisateur"
-      no_auto_account_create: "Malheureusement, nous sommes actuellement dans l'impossibilitÃ© de vous crÃ©er un compte automatiquement."
-      contact_webmaster: "Veuillez contacter le <a href='mailto:webmaster@openstreetmap.org'>webmaster</a> pour qu'il vous crÃ©e un compte - nous essaierons de traiter votre demande le plus rapidement possible."
-      fill_form: "Remplissez le formulaire et nous vous enverrons un e-mail pour activer votre compte."
-      license_agreement: "En crÃ©ant un compte, vous acceptez que tout le travail envoyÃ© sur Openstreetmap.org et toutes les donnÃ©es crÃ©Ã©es par l'utilisation d'outils qui se connectent Ã  Openstreetmap.org soient sous la licence (non exclusive) <a href='http://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons license (by-sa)</a>."
+      please login: Veuillez vous connecter ou {{create_user_link}}.
+      title: Se connecter
+    lost_password: 
       email address: "Adresse e-mail :"
+      heading: Vous avez perdu votre mot de passe ?
+      new password button: Envoyer un nouveau mot de passe
+      notice email cannot find: Adresse email introuvable, dÃ©solÃ©.
+      notice email on way: Un e-mail vous a Ã©tÃ© envoyÃ© pour rÃ©initialiser votre mot de passe.
+      title: Mot de passe perdu
+    make_friend: 
+      already_a_friend: Vous Ãªtes dÃ©jÃ  ami avec {{name}}.
+      failed: DÃ©solÃ©, Ã©chec lors de l'ajout de {{name}} comme votre ami
+      success: "{{name}} est Ã  prÃ©sent votre ami."
+    new: 
       confirm email address: "Confirmer l'adresse e-mail :"
-      not displayed publicly : 'Non affichÃ©e publiquement (voir <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">notre charte sur la confidentialitÃ©</a>)'
+      confirm password: "Confirmer le mot de passe :"
+      contact_webmaster: Veuillez contacter le <a href='mailto:webmaster@openstreetmap.org'>webmaster</a> pour qu'il vous crÃ©e un compte - nous essaierons de traiter votre demande le plus rapidement possible.
       display name: "Nom affichÃ© :"
+      email address: "Adresse e-mail :"
+      fill_form: Remplissez le formulaire et nous vous enverrons un e-mail pour activer votre compte.
+      flash create success message: L'utilisateur a Ã©tÃ© crÃ©Ã© avec succÃ¨s. VÃ©rifier votre e-mail de confirmation, et vous serez prÃªt Ã  mapper dans peu de temps :-)<br /><br />Veuillez noter que vous ne serez pas capable de vous connecter tant que vous n'aurez pas recu le mail de confirmation et confirmÃ© votre e-mail. <br /><br />Si vous utilisez un logiciel anti-spam qui envoie des requÃªtes de confirmation, veuillez mettre dans votre liste blanche webmaster@openstreetmap.org car nous sommes incapables de rÃ©pondre Ã  ces e-mails.
+      heading: CrÃ©er un compte utilisateur
+      license_agreement: En crÃ©ant un compte, vous acceptez que tout le travail envoyÃ© sur Openstreetmap.org et toutes les donnÃ©es crÃ©Ã©es par l'utilisation d'outils qui se connectent Ã  Openstreetmap.org soient sous la licence (non exclusive) <a href='http://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Malheureusement, nous sommes actuellement dans l'impossibilitÃ© de vous crÃ©er un compte automatiquement.
+      not displayed publicly: Non affichÃ©e publiquement (voir <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">notre charte sur la confidentialitÃ©</a>)
       password: "Mot de passe :"
+      signup: S'inscrire
+      title: CrÃ©er un compte
+    no_such_user: 
+      body: DÃ©solÃ©, il n'y a pas d'utilisateur avec le nom {{user}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide.
+      heading: L'utilisateur {{user}} n'existe pas
+      title: Utilisateur inexistant
+    remove_friend: 
+      not_a_friend: "{{name}} n'est pas parmi vos amis."
+      success: "{{name}} a Ã©tÃ© retirÃ© de vos amis."
+    reset_password: 
       confirm password: "Confirmer le mot de passe :"
-      signup: "S'inscrire"
-      flash create success message: "L'utilisateur a Ã©tÃ© crÃ©Ã© avec succÃ¨s. VÃ©rifier votre e-mail de confirmation, et vous serez prÃªt Ã  mapper dans peu de temps :-)<br /><br />Veuillez noter que vous ne serez pas capable de vous connecter tant que vous n'aurez pas recu le mail de confirmation et confirmÃ© votre e-mail. <br /><br />Si vous utilisez un logiciel anti-spam qui envoie des requÃªtes de confirmation, veuillez mettre dans votre liste blanche webmaster@openstreetmap.org car nous sommes incapables de rÃ©pondre Ã  ces e-mails."
-    no_such_user:
-      body: "DÃ©solÃ©, il n'y a pas d'utilisateur avec le nom {{user}}. Veuillez vÃ©rifier l'orthographe, ou le lien que vous avez cliquÃ© n'est pas valide."
-    view:
-      my diary: "Mon journal"
-      new diary entry: "Nouvelle entrÃ©e dans le journal"
-      my edits: "Mes Ã©ditions"
-      my traces: "Mes traces"
-      my settings: "Mes options"
-      send message: "Envoyer un message"
-      diary: "journal"
-      edits: "Ã©ditions"
-      traces: "traces"
-      remove as friend: "enlever en tant qu'ami"
-      add as friend: "ajouter en tant qu'ami"
-      mapper since: "Mappeur depuis:"
-      user image heading: "Image utilisateur"
-      delete image: "Effacer l'image"
-      upload an image: "Envoyer une image"
-      add image: "Ajouter une image"
-      description : Description
-      user location: "Emplacement de l'utilisateur"
-      no home location: "Aucun lieu n'a Ã©tÃ© dÃ©fini."
-      if set location: "Si vous dÃ©finissez un lieu, une jolie carte va apparaÃ®tre en dessous. Vous pouvez dÃ©finir votre lieu sur votre page {{settings_link}}."
-      settings_link_text: "options"
-      your friends: "Vos amis"
-      no friends: "Vous n'avez pas encore ajoutÃ© d'ami"
+      flash changed: Votre mot de passe a Ã©tÃ© modifiÃ©.
+      flash token bad: Vous n'avez pas trouvÃ© ce jeton, avez-vous vÃ©rifiÃ© l'URL ?
+      heading: Mot de passe rÃ©initialisÃ© pour
+      password: "Mot de passe :"
+      reset: RÃ©initialiser le mot de passe
+      title: RÃ©initialiser le mot de passe
+    set_home: 
+      flash success: Emplacement de mon domicile sauvegardÃ© avec succÃ¨s
+    view: 
+      add as friend: ajouter en tant qu'ami
+      add image: Ajouter une image
+      ago: (il y a {{time_in_words_ago}})
+      change your settings: modifiez vos options
+      delete image: Effacer l'image
+      description: Description
+      diary: journal
+      edits: Ã©ditions
+      if set location: Si vous dÃ©finissez un lieu, une jolie carte va apparaÃ®tre en dessous. Vous pouvez dÃ©finir votre lieu sur votre page {{settings_link}}.
       km away: "{{count}} km"
+      m away: distant de {{count}} m
+      mapper since: "Mappeur depuis:"
+      my diary: Mon journal
+      my edits: Mes Ã©ditions
+      my settings: Mes options
+      my traces: Mes traces
+      my_oauth_details: Voir mes dÃ©tails OAuth
       nearby users: "Utilisateurs proches de vous :"
-      no nearby users: "Il n'y a pas encore d'utilisateur Ã  proximitÃ©."
-      change your settings: "modifiez vos options"
-    friend_map:
-      your location: "Votre emplacement"
-      nearby mapper: "Mappeur dans les environs: [[nearby_user]]"
-    account:
-      my settings: "Mes options"
-      email never displayed publicly: "(jamais affichÃ© publiquement)"
-      public editing:
-        heading: "Ãdition publique :"
-        enabled: "ActivÃ©. Non anonyme et peut Ã©diter les donnÃ©es."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "Qu'est-ce que c'est ?"
-        disabled: "DÃ©sactivÃ© et ne peut pas Ã©diter les donnÃ©es ; toutes les prÃ©cÃ©dentes Ã©ditions sont anonymes."
-        disabled link text: "pourquoi ne puis-je pas Ã©diter ?"
-      profile description: "Description du profil :"
-      home location: "Emplacement du domicile :"
-      no home location: "Vous n'avez pas indiquÃ© l'emplacement de votre domicile."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Mettre a jour l'emplacement de votre domicile quand vous cliquez sur la carte ?"
-      save changes button: "Sauvegarder les changements"
-      make edits public button: "Rendre toutes mes Ã©ditions publiques"
-      return to profile: "Retourner au profil"
-      flash update success confirm needed: "Informations sur l'utilisateur mises Ã  jour avec succÃ¨s. VÃ©rifiez votre boite mail afin de valider la vÃ©rification de votre nouvelle adresse e-mail."
-      flash update success: "Informations sur l'utilisateur mises Ã  jour avec succÃ¨s."
-    confirm:
-      heading: "Confirmer un compte utilisateur"
-      press confirm button: "Appuyer le bouton confirmer ci-dessous pour activer votre compte."
-      button: "Confirmer"
-    confirm_email:
-      heading: "Confirmer le changement de votre adresse e-mail"
-      press confirm button: "Appuyer sur le bouton confirmer pour confirmer votre nouvelle adresse e-mail."
-      button: "Confirmer"
-    set_home:
-      flash success: "Emplacement de mon domicile sauvegardÃ© avec succÃ¨s"
-    go_public:
-      flash success: "Toutes vos Ã©ditions sont dorÃ©navant publiques et vous n'Ãªtes pas autorisÃ© a Ã©diter."
+      new diary entry: Nouvelle entrÃ©e dans le journal
+      no friends: Vous n'avez pas encore ajoutÃ© d'ami
+      no home location: Aucun lieu n'a Ã©tÃ© dÃ©fini.
+      no nearby users: Il n'y a pas encore d'utilisateur Ã  proximitÃ©.
+      remove as friend: enlever en tant qu'ami
+      send message: Envoyer un message
+      settings_link_text: options
+      traces: traces
+      upload an image: Envoyer une image
+      user image heading: Image utilisateur
+      user location: Emplacement de l'utilisateur
+      your friends: Vos amis
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 446fb87eb..9c430bdd7 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -1,261 +1,259 @@
-gcf:
-  map:
-    view: "Kat"
-    edit: "ÃditÃ©"
-    coordinates: "Sitiyasion"
-  browse:
-    changeset:
+gcf: 
+  browse: 
+    changeset: 
       changeset: "NimÃ©wo chanjeman : {{id}}"
-      download: "TÃ©lÃ©chajÃ© {{changeset_xml_link}} ouben {{osmchange_xml_link}}"
-      changesetxml: "NimÃ©wo Chanjeman XML"
-      osmchangexml: "osmChanjeman XML"
-    changeset_details:
-      created_at: "KrÃ©yÃ© lÃ¨ :"
-      closed_at: "Fini lÃ¨ :"
+      changesetxml: NimÃ©wo Chanjeman XML
+      download: TÃ©lÃ©chajÃ© {{changeset_xml_link}} ouben {{osmchange_xml_link}}
+      osmchangexml: osmChanjeman XML
+    changeset_details: 
       belongs_to: "SÃ© ta :"
       bounding_box: "karÃ© limit :"
-      no_bounding_box: "Pa ti ni karÃ© limit pou nimÃ©wo chanjeman la sa."
-      show_area_box: "MontrÃ© karÃ© limit la"
-      box: "bwet"
+      box: bwet
+      closed_at: "Fini lÃ¨ :"
+      created_at: "KrÃ©yÃ© lÃ¨ :"
       has_nodes: "Ti ni sÃ© {{count}} pwen la sa :"
-      has_ways: "Ti ni sÃ© {{count}} lin la sa :"
       has_relations: "Ti ni sÃ© {{count}} rÃ¨lasion la sa:"
-    common_details:
+      has_ways: "Ti ni sÃ© {{count}} lin la sa :"
+      no_bounding_box: Pa ti ni karÃ© limit pou nimÃ©wo chanjeman la sa.
+      show_area_box: MontrÃ© karÃ© limit la
+    common_details: 
       edited_at: "ÃditÃ© lÃ¨ :"
       edited_by: "ÃditÃ© pa :"
-      version: "VÃ¨sion :"
       in_changeset: "Adan nimÃ©wo chanjeman :"
-    containing_relation:
-      entry: "RÃ¨lasion {{relation_name}}"
-      entry_role: "RÃ¨lasion {{relation_name}} (adan wol {{relation_role}})"
-    map:
-      loading: "Ka ChajÃ©..."
-      deleted: "FasÃ©"
-    node_details:
-      part_of: "Adan:"
-    node_history:
-      node_history: "istwa Pwen"
-      download: "ChajÃ© {{download_xml_link}} ouben {{view_details_link}}"
-      download_xml: "ChajÃ© XML"
-      view_details: "VwÃ¨ plis biten"
-    node:
-      node: "Pwen"
+      version: "VÃ¨sion :"
+    containing_relation: 
+      entry: RÃ¨lasion {{relation_name}}
+      entry_role: RÃ¨lasion {{relation_name}} (adan wol {{relation_role}})
+    map: 
+      deleted: FasÃ©
+      loading: Ka ChajÃ©...
+    node: 
+      download: ChajÃ© {{download_xml_link}} ouben {{view_history_link}}
+      download_xml: ChajÃ© XML
+      node: Pwen
       node_title: "Pwen : {{node_name}}"
-      download: "ChajÃ© {{download_xml_link}} ouben {{view_history_link}}"
-      download_xml: "ChajÃ© XML"
-      view_history: "VwÃ¨ istwa la"
-    not_found:
-      sorry: "Woy, pa ti ni {{type}} Ã¨vÃ¨ nimÃ©wo {{id}}."
-    paging_nav:
-      showing_page: "Paj la ka vin"
-      of: "a"
-    relation_details:
+      view_history: VwÃ¨ istwa la
+    node_details: 
+      part_of: "Adan:"
+    node_history: 
+      download: ChajÃ© {{download_xml_link}} ouben {{view_details_link}}
+      download_xml: ChajÃ© XML
+      node_history: istwa Pwen
+      view_details: VwÃ¨ plis biten
+    not_found: 
+      sorry: Woy, pa ti ni {{type}} Ã¨vÃ¨ nimÃ©wo {{id}}.
+    paging_nav: 
+      of: a
+      showing_page: Paj la ka vin
+    relation_details: 
       members: "Manm :"
       part_of: "Adan :"
-    relation_history:
-      relation_history: "Istwa rÃ¨lasion"
+    relation_history: 
+      relation_history: Istwa rÃ¨lasion
       relation_history_title: "Istwa rÃ¨lasion: {{relation_name}}"
-    start:
-      view_data: "VwÃ¨ sÃ© donÃ© la asi dÃ¨niÃ© kat la"
-      manually_select: "Chwazi manielman on dÃ´t zonn"
-    start_rjs:
-      data_frame_title: "DonÃ©"
-      zoom_or_select: "Gwosi ouben chwazi on zonn asi kat la pou vwÃ¨y"
-      drag_a_box: "DÃ©sinÃ© on rektang asi kat la pou chwazi on zonn"
-      manually_select: "Chwazi manielman on dot zonn"
+    start: 
+      manually_select: Chwazi manielman on dÃ´t zonn
+      view_data: VwÃ¨ sÃ© donÃ© la asi dÃ¨niÃ© kat la
+    start_rjs: 
+      data_frame_title: DonÃ©
+      details: Plis bitin
+      drag_a_box: DÃ©sinÃ© on rektang asi kat la pou chwazi on zonn
+      edited_by_user_at_timestamp: ÃditÃ© pa [[user]] lÃ¨ [[timestamp]]
+      history_for_feature: Istwa a [[feature]]
+      load_data: ChajÃ© sÃ© donÃ© la
       loaded_an_area_with_num_features: "Ou chwazi on zonn ki ti ni [[num_features]] Ã©lÃ©man  adan. Ti ni onlo navigatÃ¨ ki pa ka sipÃ²tÃ© tou sa zafÃ¨. Yo ka travay miÃ© lÃ¨ yo ti ni mwens ki 100 zÃ©lÃ©man pou vwÃ¨: Si ou di wi navigatÃ¨ aw ka riskÃ© vini mÃ²lÃ²koy ouben pwan pann. Si ou sÃ¨ten ou vlÃ© vwÃ¨ sÃ© donÃ© la ou pÃ© pijÃ© bouton la ki an ba."
-      load_data: "ChajÃ© sÃ© donÃ© la"
+      loading: Y ka chajÃ©...
+      manually_select: Chwazi manielman on dot zonn
+      private_user: ItilizatÃ¨ privÃ©
+      show_history: VwÃ¨ listwa la
       unable_to_load_size: "Pa ni moyen chajÃ© sÃ© donÃ© la: karÃ© limit la ka mÃ¨zirÃ© [[bbox_size]] y tro gran (y dwÃ¨t pli piti ki {{max_bbox_size}})"
-      loading: "Y ka chajÃ©..."
-      show_history: "VwÃ¨ listwa la"
-      wait: "Atann..."
-      history_for_feature: "Istwa a [[feature]]"
-      details: "Plis bitin"
-      private_user: "ItilizatÃ¨ privÃ©"
-      edited_by_user_at_timestamp: "ÃditÃ© pa [[user]] lÃ¨ [[timestamp]]"
-  diary_entry:
-    new:
-      title: "Nouvel nÃ¨f an jounal la"
-    list:
-      new: "Nouvel nÃ¨f an jounal la"
-      new_title: "MÃ¨t on nouvel nÃ¨f an jounal aw"
-      no_entries: "Pa ni nouvel an jounal aw"
-      recent_entries: "Nouvel frÃ©:"
-      older_entries: "Nouvel rasi"
-      newer_entries: "Nouvel pi frÃ©"
-    edit:
-      subject: "SijÃ¨:"
+      wait: Atann...
+      zoom_or_select: Gwosi ouben chwazi on zonn asi kat la pou vwÃ¨y
+  diary_entry: 
+    diary_comment: 
+      comment_from: KomantÃ¨ a {{link_user}} kotÃ© {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: On KomantÃ¨
+        other: "{{count}} KomantÃ¨"
+      comment_link: PalÃ© asi nouvel la sa
+      edit_link: ModifiÃ© nouvel la sa
+      posted_by: SÃ© {{link_user}} ki voyÃ© sa , kotÃ© {{created}} i makÃ© an {{language_link}}
+      reply_link: RÃ©ponn nouvel la sa
+    edit: 
       body: "MÃ©saj:"
       language: "Lang:"
-      location: "Ki kotÃ©:"
       latitude: "Latitid:"
+      location: "Ki kotÃ©:"
       longitude: "Longitid:"
-      use_map_link: "SÃ¨vi Ã¨vÃ¨ kat la"
-      save_button: "EnrÃ¨jistrÃ©"
-      marker_text: "Ola jounal la ka koumansÃ©"
-    no_such_entry:
+      marker_text: Ola jounal la ka koumansÃ©
+      save_button: EnrÃ¨jistrÃ©
+      subject: "SijÃ¨:"
+      use_map_link: SÃ¨vi Ã¨vÃ¨ kat la
+    list: 
+      new: Nouvel nÃ¨f an jounal la
+      new_title: MÃ¨t on nouvel nÃ¨f an jounal aw
+      newer_entries: Nouvel pi frÃ©
+      no_entries: Pa ni nouvel an jounal aw
+      older_entries: Nouvel rasi
+      recent_entries: "Nouvel frÃ©:"
+    new: 
+      title: Nouvel nÃ¨f an jounal la
+    no_such_entry: 
+      body: Woy, pa ti ni pon nouvel adan jounal la ouben komantÃ¨ Ã¨vÃ¨ nimÃ©wo la sa {{id}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon.
       heading: "Pa ti ni nouvel Ã¨vÃ¨ nimÃ©wo la sa : {{id}}"
-      body: "Woy, pa ti ni pon nouvel adan jounal la ouben komantÃ¨ Ã¨vÃ¨ nimÃ©wo la sa {{id}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon."
-    no_such_user:
-      body: "Woy, Pa ti ni pon itilizatÃ¨ non ay sÃ© {{user}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon."
-    diary_entry:
-      posted_by: "SÃ© {{link_user}} ki voyÃ© sa , kotÃ© {{created}} i makÃ© an {{language_link}}"
-      comment_link: "PalÃ© asi nouvel la sa"
-      reply_link: "RÃ©ponn nouvel la sa"
-      comment_count:
-        one: "On KomantÃ¨"
-        other: "{{count}} KomantÃ¨"
-      edit_link: "ModifiÃ© nouvel la sa"
-    diary_comment:
-      comment_from: "KomantÃ¨ a {{link_user}} kotÃ© {{comment_created_at}}"
-  layouts:
-    welcome_user: "Bienvini, {{user_link}}"
-    inbox: "Bwet a let ({{count}})"
-    logout: "ChapÃ©"
-    log_in: "RantrÃ©"
-    sign_up: "Enskriw"
-    view: "VwÃ¨"
-    edit: "ModifiÃ©"
-    history: "Istwa sa ou fÃ¨"
-    export: "VoyÃ© dÃ©wÃ²"
-    gps_traces: "Chimen GPS"
-    user_diaries: "Jounal"
-    tag_line : "Lyannaj pou kat lib"
-    intro_1: "OpenStreetMap sÃ© on lyannaj a moun kon vou pou fÃ¨ on Kat lib tou pa tou asi la TÃ¨."
-    intro_2: "OpenStreetMap ka pewmÃ¨t vou vwÃ¨, modifiÃ©, itilizÃ© donÃ© jÃ©ografik tou pa tou asi la TÃ¨."
-    intro_3: "OpenStreetMap ka rÃ©tÃ© pou ayen aka {{ucl}} Ã©pi {{bytemark}}."
-    osm_offline: "Base a donÃ© a OpenStreetMap dÃ©konektÃ© atchelman ; Yo ka fÃ¨ on gwo travay enpÃ²tan asi-y pou-y machÃ© bien."
-    osm_read_only: "Atchelman ou pÃ© li selamn base a donÃ© a OpenStreetMap ; Yo ka fÃ¨ on gwo travay enpÃ²tan asi-y pou-y machÃ© bien."
-    donate: "Ba OpenStreetMap on FÃ²s, {{link}} Pou fÃ¨ matÃ©riel la vansÃ©."
-    donate_link_text: "Bay Chabon"
-    help_wiki: "On ti pal &amp; Wiki(koman fÃ¨)"
-    news_blog: "Blog a nouvel"
-    shop: "Boutik"
-    sotm : 'Vini ZÃ²t an konfÃ©rans 2009 a OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 juyÃ©  Amsterdanm!'
-    alt_donation: "Ba OpenStreetMap On FÃ²s"
-  notifier:
-    diary_comment_notification:
+    no_such_user: 
+      body: Woy, Pa ti ni pon itilizatÃ¨ non ay sÃ© {{user}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon.
+  layouts: 
+    alt_donation: Ba OpenStreetMap On FÃ²s
+    donate: Ba OpenStreetMap on FÃ²s, {{link}} Pou fÃ¨ matÃ©riel la vansÃ©.
+    donate_link_text: Bay Chabon
+    edit: ModifiÃ©
+    export: VoyÃ© dÃ©wÃ²
+    gps_traces: Chimen GPS
+    help_wiki: On ti pal &amp; Wiki(koman fÃ¨)
+    history: Istwa sa ou fÃ¨
+    inbox: Bwet a let ({{count}})
+    intro_1: OpenStreetMap sÃ© on lyannaj a moun kon vou pou fÃ¨ on Kat lib tou pa tou asi la TÃ¨.
+    intro_2: OpenStreetMap ka pewmÃ¨t vou vwÃ¨, modifiÃ©, itilizÃ© donÃ© jÃ©ografik tou pa tou asi la TÃ¨.
+    intro_3: OpenStreetMap ka rÃ©tÃ© pou ayen aka {{ucl}} Ã©pi {{bytemark}}.
+    log_in: RantrÃ©
+    logout: ChapÃ©
+    news_blog: Blog a nouvel
+    osm_offline: Base a donÃ© a OpenStreetMap dÃ©konektÃ© atchelman ; Yo ka fÃ¨ on gwo travay enpÃ²tan asi-y pou-y machÃ© bien.
+    osm_read_only: Atchelman ou pÃ© li selamn base a donÃ© a OpenStreetMap ; Yo ka fÃ¨ on gwo travay enpÃ²tan asi-y pou-y machÃ© bien.
+    shop: Boutik
+    sign_up: Enskriw
+    sotm: Vini ZÃ²t an konfÃ©rans 2009 a OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 juyÃ©  Amsterdanm!
+    tag_line: Lyannaj pou kat lib
+    user_diaries: Jounal
+    view: VwÃ¨
+    welcome_user: Bienvini, {{user_link}}
+  map: 
+    coordinates: Sitiyasion
+    edit: ÃditÃ©
+    view: Kat
+  notifier: 
+    diary_comment_notification: 
       banner1: "*            SouplÃ© pa rÃ©ponn a mÃ©saj la sa.             *"
       banner2: "*           SÃ¨vi Ã¨vÃ¨ sit a OpenStreetMap pou rÃ©ponn.           *"
-  site:
-    index:
-      js_1: "Ou ka sÃ¨vi Ã¨vÃ¨ on navigatÃ¨ ki pa ka sipÃ²tÃ© Javascript ouben Javascript Ã©ten."
-      js_2: "OpenStreetMap ka sÃ¨vi Ã¨vÃ¨ Javascript pou kat glisad."
-      js_3: "Si ou pÃ© pa sÃ¨vi Ã¨vÃ¨ Javascript, esÃ©yÃ© sÃ¨vi Ã¨vÃ¨<a href='http://tah.openstreetmap.org/Browse/'>navigatÃ¨ fix a Tiles@Home</a>."
-      permalink: "Permalink"
-      license:
-        notice: "Asi lisans {{license_name}} pou {{project_name}} Ã¨vÃ¨ moun ay."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        project_name: "projÃ¨ OpenStreetMap"
-    edit:
-      not_public: "Ou pÃ© pa rÃ©glÃ© Ã©dision aw pou yo piblik."
-      not_public_description: "Pou modifiÃ© kat la fok Ã©dision aw piblik. Ou pÃ© rann Ã©dision aw piblik asi {{user_page}}."
-      user_page_link: "paj_itilizatÃ¨"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Ka y ni la."
-      flash_player_required: "Ou bizwen on lektÃ¨ Flash pou itilizÃ© Potlatch ki sÃ© Ã©ditÃ¨ Flash a OpenStreetMap. Ou pÃ©<a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>tÃ©lÃ©charjÃ© Flash Player asi site a Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>Ni dot opsion</a> pour modifiÃ© OpenStreetMap."
-      potlatch_unsaved_changes: "Ou ti ni modifikasion ou pa anrÃ¨gistrÃ©. (Pou anrÃ¨gistrÃ© adan Potlatch, fow dÃ©sÃ©leksionÃ© lin la ou pwen ou asiy la,si ou ka Ã©ditÃ© an mod list. Ouben klikÃ© asi AnregistrÃ© si ou ti ni bouton la sa.)"
-    sidebar:
-      search_results: "RÃ©zilta a chÃ¨chÃ© aw"
-      close: "FÃ¨mÃ©"
-    search:
-      search: "ChÃ¨chÃ©"
-      where_am_i: "Ki moun an yÃ©?"
-      submit_text: "VoyÃ©"
+  site: 
+    edit: 
+      anon_edits_link_text: Ka y ni la.
+      flash_player_required: Ou bizwen on lektÃ¨ Flash pou itilizÃ© Potlatch ki sÃ© Ã©ditÃ¨ Flash a OpenStreetMap. Ou pÃ©<a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>tÃ©lÃ©charjÃ© Flash Player asi site a Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>Ni dot opsion</a> pour modifiÃ© OpenStreetMap.
+      not_public: Ou pÃ© pa rÃ©glÃ© Ã©dision aw pou yo piblik.
+      not_public_description: Pou modifiÃ© kat la fok Ã©dision aw piblik. Ou pÃ© rann Ã©dision aw piblik asi {{user_page}}.
+      potlatch_unsaved_changes: Ou ti ni modifikasion ou pa anrÃ¨gistrÃ©. (Pou anrÃ¨gistrÃ© adan Potlatch, fow dÃ©sÃ©leksionÃ© lin la ou pwen ou asiy la,si ou ka Ã©ditÃ© an mod list. Ouben klikÃ© asi AnregistrÃ© si ou ti ni bouton la sa.)
+      user_page_link: paj_itilizatÃ¨
+    index: 
+      js_1: Ou ka sÃ¨vi Ã¨vÃ¨ on navigatÃ¨ ki pa ka sipÃ²tÃ© Javascript ouben Javascript Ã©ten.
+      js_2: OpenStreetMap ka sÃ¨vi Ã¨vÃ¨ Javascript pou kat glisad.
+      js_3: Si ou pÃ© pa sÃ¨vi Ã¨vÃ¨ Javascript, esÃ©yÃ© sÃ¨vi Ã¨vÃ¨<a href='http://tah.openstreetmap.org/Browse/'>navigatÃ¨ fix a Tiles@Home</a>.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Asi lisans {{license_name}} pou {{project_name}} Ã¨vÃ¨ moun ay.
+        project_name: projÃ¨ OpenStreetMap
+      permalink: Permalink
+    key: 
+      map_key: LÃ©jann a kat la
+    search: 
+      search: ChÃ¨chÃ©
       search_help: "Egzanp : 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ouben 'biwo la poste owa Fodfrans' <a href='http://wiki.openstreetmap.org/wiki/Search'>LÃ²t Egzanp ...</a>"
-    key:
-      map_key: "LÃ©jann a kat la"
-  user:
-    login:
-      heading: "KonektÃ©"
-      please login: "KonectÃ©w souplÃ© ouben {{create_user_link}}."
-      create_account: "KrÃ©yÃ© kont aw"
+      submit_text: VoyÃ©
+      where_am_i: Ki moun an yÃ©?
+    sidebar: 
+      close: FÃ¨mÃ©
+      search_results: RÃ©zilta a chÃ¨chÃ© aw
+  user: 
+    account: 
+      email never displayed publicly: (Pa janmen makÃ© piblikman)
+      flash update success: Efowmasion asi itilisatÃ¨ la bien anrejistrÃ©.
+      flash update success confirm needed: Enfowmasion asi itilisatÃ¨ la bien anrÃ¨jistrÃ©. GadÃ© bwet imÃ©l aw pou konfirmÃ© adres nouvo imÃ©l aw
+      home location: "La ou ka rÃ©tÃ© :"
+      latitude: "Latitid:"
+      longitude: "Longitid:"
+      make edits public button: MÃ¨t tou sa an fÃ¨ piblik
+      my settings: Mes options
+      no home location: Ou po ko mÃ¨t la ou ka rÃ©tÃ©.
+      profile description: "Deskripsion a profil la :"
+      public editing: 
+        disabled: Inaktif y pÃ© pa Ã©ditÃ© donÃ© ; tout Ã©dision pasÃ© anonim.
+        disabled link text: Poukwa an pÃ© pa Ã©ditÃ©?
+        enabled: Aktif. Y pa anonnim, y pÃ© Ã©ditÃ© donÃ©.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: Ka sa yÃ©?
+        heading: "Ãdision piblik:"
+      return to profile: Rouvin' asi pwofil la
+      save changes button: EnrÃ¨jisrÃ© tout chanjman
+      update home location on click: EskÃ¨ y fo modifiÃ© la ou ka rÃ©tÃ© lÃ¨ ou ka klikÃ© asi kat la?
+    confirm: 
+      button: KonfirmÃ©
+      heading: KonfirmÃ© kont a itilizatÃ¨ la
+      press confirm button: ApiyÃ© asi bouton la ki an ba pou konfirmÃ© kont aw aktif menm.
+    confirm_email: 
+      button: KonfirmÃ©
+      heading: KonfirmÃ© chanjman a adres imÃ©l aw
+      press confirm button: ApiyÃ© asi bouton la ki an ba pou konfirmÃ© nouvo adres imÃ©l aw.
+    friend_map: 
+      nearby mapper: "ArpantÃ¨ owa aw: [[nearby_user]]"
+      your location: KotÃ© ou yÃ©
+    go_public: 
+      flash success: Tou sa ou fÃ¨ jis alÃ¨ ki lÃ© piblik ou pa otorizÃ© Ã©ditÃ©.
+    login: 
+      create_account: KrÃ©yÃ© kont aw
       email or username: "Adres imÃ©l ouben nom itilizatÃ© aw :"
+      heading: KonektÃ©
+      login_button: KonektÃ©w
+      lost password link: Ou pÃ¨d kÃ²d aw?
       password: "KÃ²d aw:"
-      lost password link: "Ou pÃ¨d kÃ²d aw?"
-      login_button: "KonektÃ©w"
-    lost_password:
-      heading: "Ou pÃ¨d kÃ²d aw?"
+      please login: KonectÃ©w souplÃ© ouben {{create_user_link}}.
+    lost_password: 
       email address: "Adres imÃ©l aw :"
-      new password button: "VoyÃ© on nouvo kÃ²d"
-    new:
-      heading: "OuvÃ¨ on kont itilizatÃ¨"
-      no_auto_account_create: "MalÃ©rezman, alÃ¨ kilÃ©, nou pÃ© pa ouvÃ¨ kont automatikman."
-      contact_webmaster: "KontaktÃ© <a href='mailto:webmaster@openstreetmap.org'>mÃ¨t web la</a> pou y ouvÃ¨ an kont baw - nou kÃ© Ã©sÃ©yÃ© travay pli vit posib."
-      fill_form: "Ranpli fÃ²milÃ¨ la aprÃ¨ sa nou kÃ© voyÃ© an imÃ©l pou activÃ© kont aw."
-      license_agreement: "LÃ¨ ou ka krÃ©yÃ© kont aw, ou ka akseptÃ© kÃ¨ tout travay aw voyÃ© asi Openstreetmap.org evÃ¨ tout donÃ© krÃ©yÃ© Ã¨vÃ¨ zouti konektÃ© asi Openstreetmap.org asi lisans (y pa esklisif) <a href='http://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons license (by-sa)</a>."
-      email address: "Adres imÃ©l :"
+      heading: Ou pÃ¨d kÃ²d aw?
+      new password button: VoyÃ© on nouvo kÃ²d
+    new: 
       confirm email address: "konfimÃ© adres imÃ©l :"
-      not displayed publicly : 'Sa pa vizib piblikman (Ay vwÃ¨<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section an email addresses">prencip an nou asi konfidansialitÃ©</a>)'
-      display name: "Non aw afichÃ© :"
-      password: "KÃ²d :"
       confirm password: "KonfirmÃ© kÃ²d aw:"
-      signup: "Enskriw"
+      contact_webmaster: KontaktÃ© <a href='mailto:webmaster@openstreetmap.org'>mÃ¨t web la</a> pou y ouvÃ¨ an kont baw - nou kÃ© Ã©sÃ©yÃ© travay pli vit posib.
+      display name: "Non aw afichÃ© :"
+      email address: "Adres imÃ©l :"
+      fill_form: Ranpli fÃ²milÃ¨ la aprÃ¨ sa nou kÃ© voyÃ© an imÃ©l pou activÃ© kont aw.
       flash create success message: "ItilizatÃ¨ bien krÃ©yÃ©. Ay gadÃ© imÃ©l konfirmasion, ou kay pÃ© travay asi kat la adan on ti moman:-)<br /><br />Ou pÃ© kÃ© pÃ© konektÃ©w si ou pa konfirmÃ© imÃ©l aw aprÃ© ou risivrÃ¨ imÃ©l konfirmasion. <br /><br />Si ou ka itilizÃ© on lojiciel kont spanm ka voyÃ© kestion pou konfirmÃ© si sÃ© on moun aw, mÃ©tÃ© adan list a moun aw adres la sa: webmaster@openstreetmap.org paskÃ¨ nou pÃ© pa rÃ©ponn tou sÃ© imÃ©l la sa."
-    no_such_user:
-      body: "MalÃ©rezman, pa ti ni pon itilisatÃ¨ Ã¨vÃ¨ non la sa {{user}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon."
-    view:
-      my diary: "Jounal an mwen"
-      new diary entry: "On dot nouvel an jounal la"
-      my edits: "Ãdision an mwen"
-      my traces: "Chimen an mwen"
-      my settings: "Opsion an mwen"
-      send message: "VoyÃ© on mÃ©saj"
-      diary: "Jounal"
-      edits: "Ãdision"
-      traces: "Chimen"
-      remove as friend: "WotÃ© on zanmi"
-      add as friend: "AjoutÃ© on zanmi"
-      mapper since: "ArpantÃ¨ dÃ¨pi:"
-      user image heading: "Foto itilizatÃ¨"
-      delete image: "WotÃ© on imaj"
-      upload an image: "VoyÃ© on imaj"
-      add image: "AjoutÃ© on imaj"
-      description : "Deskription"
-      user location: "Ola itilizatÃ¨ yÃ©"
-      no home location: "Pa ni pon kotÃ© dÃ©fini."
-      if set location: "Si ou ka ba on kotÃ© ou yÃ©, On bel ti kat kÃ© aprarÃ¨t. Ou pÃ© dÃ©fini kotÃ© la ou yÃ© la asi paj aw {{settings_link}}."
-      settings_link_text: "Opsion"
-      your friends: "Kanmarad aw"
-      no friends: "Ou poko ni pon zanmi"
+      heading: OuvÃ¨ on kont itilizatÃ¨
+      license_agreement: LÃ¨ ou ka krÃ©yÃ© kont aw, ou ka akseptÃ© kÃ¨ tout travay aw voyÃ© asi Openstreetmap.org evÃ¨ tout donÃ© krÃ©yÃ© Ã¨vÃ¨ zouti konektÃ© asi Openstreetmap.org asi lisans (y pa esklisif) <a href='http://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons license (by-sa)</a>.
+      no_auto_account_create: MalÃ©rezman, alÃ¨ kilÃ©, nou pÃ© pa ouvÃ¨ kont automatikman.
+      not displayed publicly: Sa pa vizib piblikman (Ay vwÃ¨<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section an email addresses">prencip an nou asi konfidansialitÃ©</a>)
+      password: "KÃ²d :"
+      signup: Enskriw
+    no_such_user: 
+      body: MalÃ©rezman, pa ti ni pon itilisatÃ¨ Ã¨vÃ¨ non la sa {{user}}. KontrolÃ© lÃ²tograf la ouben lien la ou klikÃ© asiy la pa bon.
+    set_home: 
+      flash success: La ou ka rÃ©tÃ© la bien anrÃ¨jistrÃ©
+    view: 
+      add as friend: AjoutÃ© on zanmi
+      add image: AjoutÃ© on imaj
+      change your settings: ChanjÃ© opsion aw
+      delete image: WotÃ© on imaj
+      description: Deskription
+      diary: Jounal
+      edits: Ãdision
+      if set location: Si ou ka ba on kotÃ© ou yÃ©, On bel ti kat kÃ© aprarÃ¨t. Ou pÃ© dÃ©fini kotÃ© la ou yÃ© la asi paj aw {{settings_link}}.
       km away: "{{count}} km"
+      mapper since: "ArpantÃ¨ dÃ¨pi:"
+      my diary: Jounal an mwen
+      my edits: Ãdision an mwen
+      my settings: Opsion an mwen
+      my traces: Chimen an mwen
       nearby users: "ItilizatÃ¨ owa aw :"
-      no nearby users: "Ou poko ni itilizatÃ¨ owa aw."
-      change your settings: "ChanjÃ© opsion aw"
-    friend_map:
-      your location: "KotÃ© ou yÃ©"
-      nearby mapper: "ArpantÃ¨ owa aw: [[nearby_user]]"
-    account:
-      my settings: "Mes options"
-      email never displayed publicly: "(Pa janmen makÃ© piblikman)"
-      public editing:
-        heading: "Ãdision piblik:"
-        enabled: "Aktif. Y pa anonnim, y pÃ© Ã©ditÃ© donÃ©."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "Ka sa yÃ©?"
-        disabled: "Inaktif y pÃ© pa Ã©ditÃ© donÃ© ; tout Ã©dision pasÃ© anonim."
-        disabled link text: "Poukwa an pÃ© pa Ã©ditÃ©?"
-      profile description: "Deskripsion a profil la :"
-      home location: "La ou ka rÃ©tÃ© :"
-      no home location: "Ou po ko mÃ¨t la ou ka rÃ©tÃ©."
-      latitude: "Latitid:"
-      longitude: "Longitid:"
-      update home location on click: "EskÃ¨ y fo modifiÃ© la ou ka rÃ©tÃ© lÃ¨ ou ka klikÃ© asi kat la?"
-      save changes button: "EnrÃ¨jisrÃ© tout chanjman"
-      make edits public button: "MÃ¨t tou sa an fÃ¨ piblik"
-      return to profile: "Rouvin' asi pwofil la"
-      flash update success confirm needed: "Enfowmasion asi itilisatÃ¨ la bien anrÃ¨jistrÃ©. GadÃ© bwet imÃ©l aw pou konfirmÃ© adres nouvo imÃ©l aw"
-      flash update success: "Efowmasion asi itilisatÃ¨ la bien anrejistrÃ©."
-    confirm:
-      heading: "KonfirmÃ© kont a itilizatÃ¨ la"
-      press confirm button: "ApiyÃ© asi bouton la ki an ba pou konfirmÃ© kont aw aktif menm."
-      button: "KonfirmÃ©"
-    confirm_email:
-      heading: "KonfirmÃ© chanjman a adres imÃ©l aw"
-      press confirm button: "ApiyÃ© asi bouton la ki an ba pou konfirmÃ© nouvo adres imÃ©l aw."
-      button: "KonfirmÃ©"
-    set_home:
-      flash success: "La ou ka rÃ©tÃ© la bien anrÃ¨jistrÃ©"
-    go_public:
-      flash success: "Tou sa ou fÃ¨ jis alÃ¨ ki lÃ© piblik ou pa otorizÃ© Ã©ditÃ©."
+      new diary entry: On dot nouvel an jounal la
+      no friends: Ou poko ni pon zanmi
+      no home location: Pa ni pon kotÃ© dÃ©fini.
+      no nearby users: Ou poko ni itilizatÃ¨ owa aw.
+      remove as friend: WotÃ© on zanmi
+      send message: VoyÃ© on mÃ©saj
+      settings_link_text: Opsion
+      traces: Chimen
+      upload an image: VoyÃ© on imaj
+      user image heading: Foto itilizatÃ¨
+      user location: Ola itilizatÃ¨ yÃ©
+      your friends: Kanmarad aw
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6c8c270e1..81d49eea4 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,629 +1,596 @@
-he:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
-      country: "××¨×¥"
-      diary_comment: "×ª×××× ×××××"
-      diary_entry: "×¨×©××× ××××× "
-      friend: "Friend"
-      language: "×©×¤×"
-      message: "××¡×¨"
-      node: "Node"
-      node_tag: "Node Tag"
-      notifier: "Notifier"
-      old_node: "Old Node"
-      old_node_tag: "Old Node Tag"
-      old_relation: "Old Relation"
-      old_relation_member: "Old Relation Member"
-      old_relation_tag: "Old Relation Tag"
-      old_way: "Old Way"
-      old_way_node: "Old Way Node"
-      old_way_tag: "Old Way Tag"
-      relation: "Relation"
-      relation_member: "Relation Member"
-      relation_tag: "Relation Tag"
-      session: "Session"
-      trace: "Trace"
-      tracepoint: "Trace Point"
-      tracetag: "Trace Tag"
-      user: "××©×ª××©"
-      user_preference: "User Preference"
-      user_token: "User Token"
-      way: "Way"
-      way_node: "Way Node"
-      way_tag: "Way Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Body"
-      diary_entry:
-        user: "××©×ª××©"
-        title: "×××ª×¨×ª"
-        latitude: "×§× ×¨×××"
-        longitude: "×§× ×××¨×"
-        language: "×©×¤×"
-      friend:
-        user: "××©×ª××©"
-        friend: "×××¨"
-      trace:
-        user: "××©×ª××©"
-        visible: "Visible"
-        name: "Name"
-        size: "Size"
-        latitude: "×§× ×¨×××"
-        longitude: "×§× ×××¨×" 
-        public: "Public"
-        description: "×ª×××¨"
-      message:
-        sender: "×©××××ª"
-        title: "×××ª×¨×ª"
-        body: "×××£"
-        recipient: "× ××¢×"
-      user:
-        email: "Email"
-        active: "×¤×¢××"
-        display_name: "Display Name"
-        description: "×ª×××¨"
-        languages: "×©×¤××ª"
-        pass_crypt: "×¡××¡××"
-  map:
-    view: "×ª×¦×××"
-    edit: "×¢×¨×××"
-    coordinates: "Coordinates:"
-  browse:
-    changeset:
-      title: "Changeset"
+he: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Body
+      diary_entry: 
+        language: ×©×¤×
+        latitude: ×§× ×¨×××
+        longitude: ×§× ×××¨×
+        title: ×××ª×¨×ª
+        user: ××©×ª××©
+      friend: 
+        friend: ×××¨
+        user: ××©×ª××©
+      message: 
+        body: ×××£
+        recipient: × ××¢×
+        sender: ×©××××ª
+        title: ×××ª×¨×ª
+      trace: 
+        description: ×ª×××¨
+        latitude: ×§× ×¨×××
+        longitude: ×§× ×××¨×
+        name: Name
+        public: Public
+        size: Size
+        user: ××©×ª××©
+        visible: Visible
+      user: 
+        active: ×¤×¢××
+        description: ×ª×××¨
+        display_name: Display Name
+        email: Email
+        languages: ×©×¤××ª
+        pass_crypt: ×¡××¡××
+    models: 
+      acl: Access Control List
+      changeset: Changeset
+      changeset_tag: Changeset Tag
+      country: ××¨×¥
+      diary_comment: ×ª×××× ×××××
+      diary_entry: ×¨×©××× ×××××
+      friend: Friend
+      language: ×©×¤×
+      message: ××¡×¨
+      node: Node
+      node_tag: Node Tag
+      notifier: Notifier
+      old_node: Old Node
+      old_node_tag: Old Node Tag
+      old_relation: Old Relation
+      old_relation_member: Old Relation Member
+      old_relation_tag: Old Relation Tag
+      old_way: Old Way
+      old_way_node: Old Way Node
+      old_way_tag: Old Way Tag
+      relation: Relation
+      relation_member: Relation Member
+      relation_tag: Relation Tag
+      session: Session
+      trace: Trace
+      tracepoint: Trace Point
+      tracetag: Trace Tag
+      user: ××©×ª××©
+      user_preference: User Preference
+      user_token: User Token
+      way: Way
+      way_node: Way Node
+      way_tag: Way Tag
+  browse: 
+    changeset: 
       changeset: "Changeset: {{id}}"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Created at:"
-      closed_at: "Closed at:"
+      changesetxml: Changeset XML
+      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: Changeset
+    changeset_details: 
       belongs_to: "Belongs to:"
       bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
+      box: box
+      closed_at: "Closed at:"
+      created_at: "Created at:"
       has_nodes: "Has the following {{count}} nodes:"
-      has_ways: "Has the following {{count}} ways:"
       has_relations: "Has the following {{count}} relations:"
-    common_details:
+      has_ways: "Has the following {{count}} ways:"
+      no_bounding_box: No bounding box has been stored for this changeset.
+      show_area_box: Show Area Box
+    common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
-      version: "Version:"
       in_changeset: "In changeset:"
-    containing_relation:
-      entry: "Relation {{relation_name}}"
-      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "Loading..."
-      deleted: "Deleted"
-    node_details:
+      version: "Version:"
+    containing_relation: 
+      entry: Relation {{relation_name}}
+      entry_role: Relation {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: Deleted
+      loading: Loading...
+    node: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      node: Node
+      node_title: "Node: {{node_name}}"
+      view_history: view history
+    node_details: 
       coordinates: "Coordinates:"
       part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
+    node_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    node:
-      node: "Node"
-      node_title: "Node: {{node_name}}"
+      download_xml: Download XML
+      node_history: Node History
+      view_details: view details
+    not_found: 
+      sorry: Sorry, the {{type}} with the id {{id}}, could not be found.
+    paging_nav: 
+      of: of
+      showing_page: Showing page
+    relation: 
       download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    not_found:
-      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
-    paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    relation_details:
+      download_xml: Download XML
+      relation: Relation
+      relation_title: "Relation: {{relation_name}}"
+      view_history: view history
+    relation_details: 
       members: "Members:"
       part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
+    relation_history: 
+      relation_history: Relation History
       relation_history_title: "Relation History: {{relation_name}}"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: {{relation_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
-    start_rjs:
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
+    start: 
+      manually_select: Manually select a different area
+      view_data: View data for current map view
+    start_rjs: 
+      data_frame_title: Data
+      details: Details
+      drag_a_box: Drag a box on the map to select an area
+      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
+      history_for_feature: History for [[feature]]
+      load_data: Load Data
       loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
-      load_data: "Load Data"
+      loading: Loading...
+      manually_select: Manually select a different area
+      private_user: private user
+      show_history: Show History
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
-      loading: "Loading..."
-      show_history: "Show History"
-      wait: "Wait..."
-      history_for_feature: "History for [[feature]]"
-      details: "Details"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
-    tag_details:
+      wait: Wait...
+      zoom_or_select: Zoom in or select an area of the map to view
+    tag_details: 
       tags: "Tags:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      view_history: view history
+      way: Way
+      way_title: "Way: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: also part of way {{related_ways}}
+        other: also part of ways {{related_ways}}
       nodes: "Nodes:"
       part_of: "Part of:"
-      also_part_of:
-        one: "also part of way {{related_ways}}"
-        other: "also part of ways {{related_ways}}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    way:
-      way: "Way"
-      way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    changeset:
-      still_editing: "(still editing)"
-      anonymous: "Anonymous"
-      no_comment: "(none)"
-      no_edits: "(no edits)"
-      show_area_box: "show area box"
-      big_area: "(big)"
-      view_changeset_details: "View changeset details"
-    changesets:
-      id: "ID"
-      saved_at: "Saved at"
-      user: "××©×ª××©"
-      comment: "Comment"
-      area: "Area"
-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
-    list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-  diary_entry:
-    new:
-      title: New Diary Entry
-    list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
+      download_xml: Download XML
+      view_details: view details
+      way_history: Way History
+      way_history_title: "Way History: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonymous
+      big_area: (big)
+      no_comment: (none)
+      no_edits: (no edits)
+      show_area_box: show area box
+      still_editing: (still editing)
+      view_changeset_details: View changeset details
+    changeset_paging_nav: 
+      of: of
+      showing_page: Showing page
+    changesets: 
+      area: Area
+      comment: Comment
+      id: ID
+      saved_at: Saved at
+      user: ××©×ª××©
+  diary_entry: 
+    diary_comment: 
+      comment_from: "{{comment_created_at}}×  {{link_user}}×ª×××× ×"
+    diary_entry: 
+      comment_count: 
+        one: ×ª×××× 1
+        other: "{{count}} ×ª×××××ª"
+      comment_link: Comment on this entry
+      edit_link: ×¢×¨×××ª ×¨×©×××
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: Reply to this entry
+    edit: 
+      body: "Body:"
+      language: :×©×¤×
+      latitude: :×§× ×¨×××
+      location: "Location:"
+      longitude: :×§× ×××¨×
+      marker_text: Diary entry location
+      save_button: Save
+      subject: "Subject:"
+      title: Edit diary entry
+      use_map_link: use map
+    list: 
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
+      newer_entries: Newer Entries
       no_entries: No diary entries
-      recent_entries: "Recent diary entries:"
       older_entries: Older Entries
-      newer_entries: Newer Entries
-    edit:
-      title: "Edit diary entry"
-      subject: "Subject:"
-      body: "Body:"
-      language: ":×©×¤×"
-      location: "Location:"
-      latitude: ":×§× ×¨×××"
-      longitude: ":×§× ×××¨×" 
-      use_map_link: "use map"
-      save_button: "Save"
-      marker_text: Diary entry location
-    view:
-      title: "Users' diaries | {{user}}"
+      recent_entries: "Recent diary entries:"
+      title: Users' diaries
       user_title: "{{user}}'s diary"
-      leave_a_comment: "Leave a comment"
-      save_button: "Save"
-    no_such_entry:
+    new: 
+      title: New Diary Entry
+    no_such_entry: 
+      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
-      comment_count:
-        one: "×ª×××× 1"
-        other: "{{count}} ×ª×××××ª"
-      edit_link: "×¢×¨×××ª ×¨×©×××"
-    diary_comment:
-      comment_from: "{{comment_created_at}}×  {{link_user}}×ª×××× ×"
-  export:
-    start:
-      area_to_export: "Area to Export"
-      manually_select: "Manually select a different area"
-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "Embeddable HTML"
-      licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+    view: 
+      leave_a_comment: Leave a comment
+      save_button: Save
+      title: Users' diaries | {{user}}
+      user_title: "{{user}}'s diary"
+  export: 
+    start: 
+      add_marker: Add a marker to the map
+      area_to_export: Area to Export
+      embeddable_html: Embeddable HTML
+      export_button: Export
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: Format
+      format_to_export: Format to Export
+      image_size: Image Size
       latitude: "Lat:"
+      licence: Licence
       longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
-  geocoder:
-    results:
-      no_results: "No results found"
-  layouts:
-    welcome_user: "{{user_link}}××¨×× ×××"
-    home: "××××ª×"
-    inbox: "inbox ({{count}})"
-    logout: "××¦××× ××××©×××"
-    log_in: "×× ××¡× ×××©×××"
-    sign_up: "××¨×©××"
-    view: "×ª×¦×××"
-    edit: "×¢×¨×××"
-    history: "×××¡×××¨××"
-    export: "××¦××"
-    gps_traces: GPS Traces
-    user_diaries: "×××× × ××©×ª××©××"
-    tag_line: "×××§× ×××¤×©× ×©× ××¤×ª ××¢×××"
-    intro_1: ".××× ××¤× ×××× × ×©× ×× ××¢×××, ××××¤×©××ª ××¢×¨×××. ×××¦×¨×× ×××ª× ×× ×©×× ×××× OpenStreetMap"
-    intro_2: ".×××¤×©×¨×ª  ×× ××¨×××ª, ××¢×¨×× ××××©×ª××© ×× ×ª×× ×× ××××××¨×¤××× ××¦××¨× ×©××ª××¤××ª ××× ××§×× ××¢××× OpenStreetMap"
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+      manually_select: Manually select a different area
+      mapnik_image: Mapnik Image
+      max: max
+      options: Options
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Osmarender Image
+      output: Output
+      paste_html: Paste HTML to embed in website
+      scale: Scale
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Add a marker to the map
+      change_marker: Change marker position
+      click_add_marker: Click on the map to add a marker
+      drag_a_box: Drag a box on the map to select an area
+      export: Export
+      manually_select: Manually select a different area
+      view_larger_map: View Larger Map
+  geocoder: 
+    results: 
+      no_results: No results found
+  layouts: 
+    alt_donation: Make a Donation
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
     donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
-    news_blog: "News blog"
+    edit: ×¢×¨×××
+    export: ××¦××
+    gps_traces: GPS Traces
+    help_wiki: Help &amp; Wiki
+    history: ×××¡×××¨××
+    home: ××××ª×
+    inbox: inbox ({{count}})
+    intro_1: .××× ××¤× ×××× × ×©× ×× ××¢×××, ××××¤×©××ª ××¢×¨×××. ×××¦×¨×× ×××ª× ×× ×©×× ×××× OpenStreetMap
+    intro_2: .×××¤×©×¨×ª  ×× ××¨×××ª, ××¢×¨×× ××××©×ª××© ×× ×ª×× ×× ××××××¨×¤××× ××¦××¨× ×©××ª××¤××ª ××× ××§×× ××¢××× OpenStreetMap
+    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
+    log_in: ×× ××¡× ×××©×××
+    logout: ××¦××× ××××©×××
+    news_blog: News blog
+    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
+    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
     shop: Shop
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
-  notifier:
-    diary_comment_notification:
+    sign_up: ××¨×©××
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: ×××§× ×××¤×©× ×©× ××¤×ª ××¢×××
+    user_diaries: ×××× × ××©×ª××©××
+    view: ×ª×¦×××
+    welcome_user: "{{user_link}}××¨×× ×××"
+  map: 
+    coordinates: "Coordinates:"
+    edit: ×¢×¨×××
+    view: ×ª×¦×××
+  message: 
+    inbox: 
+      date: Date
+      from: From
+      my_inbox: My inbox
+      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Inbox
+      you_have: You have {{new_count}} new messages and {{old_count}} old messages
+    mark: 
+      as_read: Message marked as read
+      as_unread: Message marked as unread
+    message_summary: 
+      read_button: Mark as read
+      reply_button: Reply
+      unread_button: Mark as unread
+    new: 
+      back_to_inbox: Back to inbox
+      body: Body
+      message_sent: Message sent
+      send_button: Send
+      send_message_to: Send a new message to {{name}}
+      subject: Subject
+      title: Send message
+    no_such_user: 
+      body: Sorry there is no user or message with that name or id
+      heading: No such user or message
+    outbox: 
+      date: Date
+      inbox: inbox
+      my_inbox: My {{inbox_link}}
+      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Outbox
+      to: To
+      you_have_sent_messages: You have {{sent_count}} sent messages
+    read: 
+      back_to_inbox: Back to inbox
+      back_to_outbox: Back to outbox
+      date: Date
+      from: From
+      reading_your_messages: Reading your messages
+      reading_your_sent_messages: Reading your sent messages
+      reply_button: Reply
+      subject: Subject
+      title: Read message
+      to: To
+      unread_button: Mark as unread
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    friend_notification:
+      hi: Hi {{to_user}},
+    friend_notification: 
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      title: "Inbox"
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
-    new:
-      title: "Send message"
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
-      message_sent: "Message sent"
-    no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox:
-      title: "Outbox"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    read:
-      title: "Read message"
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
-      permalink: Permalink
-      license:
-        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: You haven't set your edits to be public.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
+    index: 
+      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
+        project_name: OpenStreetMap project
+      permalink: Permalink
+    key: 
+      map_key: Map key
+    search: 
       search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃÂ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
+      submit_text: Go
+      where_am_i: Where am I?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
+      upload_trace: Upload GPS Trace
+    delete: 
+      scheduled_for_deletion: Track scheduled for deletion
+    edit: 
+      description: :×ª×××¨
+      edit: ×¢×¨×××
       filename: "Filename:"
-      uploaded_at: "Uploaded at:"
+      owner: "Owner:"
       points: "Points:"
+      save_button: Save Changes
       start_coord: "Start coordinate:"
-      edit: "×¢×¨×××"
-      owner: "Owner:"
-      description: ":×ª×××¨"
       tags: "Tags:"
-      save_button: "Save Changes"
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "×ª×××¨"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "PENDING"
+      uploaded_at: "Uploaded at:"
+    list: 
+      public_traces: Public GPS traces
+      public_traces_from: Public GPS traces from {{user}}
+      tagged_with: " tagged with {{tags}}"
+      your_traces: Your GPS traces
+    make_public: 
+      made_public: Track made public
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+    trace: 
+      ago: "{{time_in_words_ago}} ago"
+      by: by
+      count_points: "{{count}} points"
+      edit: ×¢×¨×××
+      edit_map: Edit Map
+      in: in
+      map: map
+      more: more
+      pending: PENDING
+      private: PRIVATE
+      public: PUBLIC
+      trace_details: View Trace Details
+      view_map: View Map
+    trace_form: 
+      description: ×ª×××¨
+      help: Help
+      tags: Tags
+      upload_button: Upload
+      upload_gpx: Upload GPX File
+    trace_header: 
+      see_all_traces: See all traces
+      see_just_your_traces: See just your traces, or upload a trace
+      see_your_traces: See all your traces
+      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: of
+      showing: Showing page
+    view: 
+      delete_track: Delete this track
+      description: :×ª×××¨
+      download: download
+      edit: ×¢×¨×××
+      edit_track: Edit this track
       filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
+      heading: Viewing trace {{name}}
+      map: map
+      none: None
+      owner: "Owner:"
+      pending: PENDING
       points: "Points:"
       start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "×¢×¨×××"
-      owner: "Owner:"
-      description: ":×ª×××¨"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      heading: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "×¢×¨×××"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Login"
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
+      tags: Tags
+      trace_not_found: Trace not found!
+      uploaded: "Uploaded at:"
+  user: 
+    account: 
+      email never displayed publicly: (never displayed publicly)
+      flash update success: User information updated successfully.
+      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
+      home location: "Home Location:"
+      latitude: :×§× ×¨×××
+      longitude: :×§× ×××¨×
+      make edits public button: Make all my edits public
+      my settings: My settings
+      no home location: You have not entered your home location.
+      preferred languages: "Preferred Languages:"
+      profile description: "Profile Description:"
+      public editing: 
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: what's this?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: Save Changes
+      title: Edit account
+      update home location on click: Update home location when I click on the map?
+    confirm: 
+      button: Confirm
+      failure: A user account with this token has already been confirmed.
+      heading: Confirm a user account
+      press confirm button: Press the confirm button below to activate your account.
+      success: Confirmed your account, thanks for signing up!
+    confirm_email: 
+      button: Confirm
+      failure: An email address has already been confirmed with this token.
+      heading: Confirm a change of email address
+      press confirm button: Press the confirm button below to confirm your new email address.
+      success: Confirmed your email address, thanks for signing up!
+    friend_map: 
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      your location: Your location
+    go_public: 
+      flash success: All your edits are now public, and you are now allowed to edit.
+    login: 
+      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
+      auth failure: Sorry, couldn't log in with those details.
+      create_account: create an account
       email or username: "Email Address or Username:"
+      heading: Login
+      login_button: Login
+      lost password link: Lost your password?
       password: "Password:"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
-      auth failure: "Sorry, couldn't log in with those details."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      please login: Please login or {{create_user_link}}.
+      title: Login
+    lost_password: 
       email address: "Email Address:"
+      heading: Forgotten Password?
+      new password button: Send me a new password
+      notice email cannot find: Couldn't find that email address, sorry.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
+      title: lost password
+    make_friend: 
+      already_a_friend: You are already friends with {{name}}.
+      failed: Sorry, failed to add {{name}} as a friend.
+      success: "{{name}} is now your friend."
+    new: 
       confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      confirm password: "Confirm Password:"
+      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
       display name: "Display Name:"
+      email address: "Email Address:"
+      fill_form: Fill in the form and we'll send you a quick email to activate your account.
+      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
+      heading: Create a User Account
+      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
+      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Password:"
-      confirm password: "Confirm Password:"
       signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
+      title: Create account
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      flash token bad: Didn't find that token, check the URL maybe?
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: Add Image
+      ago: ({{time_in_words_ago}} ago)
+      change your settings: change your settings
+      delete image: Delete Image
+      description: ×ª×××¨
+      diary: diary
+      edits: edits
+      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
+      km away: "{{count}}km away"
+      mapper since: "Mapper since:"
       my diary: my diary
-      new diary entry: new diary entry
       my edits: my edits
-      my traces: my traces
       my settings: my settings
+      my traces: my traces
+      nearby users: "Nearby users:"
+      new diary entry: new diary entry
+      no friends: You have not added any friends yet.
+      no home location: No home location has been set.
+      no nearby users: There are no users who admit to mapping nearby yet.
+      remove as friend: remove as friend
       send message: send message
-      diary: diary
-      edits: edits
+      settings_link_text: settings
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
       upload an image: Upload an image
-      add image: Add Image
-      description: "×ª×××¨"
+      user image heading: User image
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
       your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{count}}km away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing:"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      home location: "Home Location:"
-      no home location: "You have not entered your home location."
-      latitude: ":×§× ×¨×××"
-      longitude: ":×§× ×××¨×"
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 44d1acc5f..085d13a72 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -1,685 +1,746 @@
-hi:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
-      country: "à¤¦à¥à¤¶"
-      diary_comment: "Diary Comment"
-      diary_entry: "Diary Entry"
-      friend: "à¤¦à¥à¤¸à¥à¤¤"
-      language: "à¤­à¤¾à¤¶à¤¾"
-      message: "à¤¸à¤à¤¦à¥à¤¶"
-      node: "à¤à¤¸à¤à¤§à¤¿"
-      node_tag: "à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-      notifier: "Notifier"
-      old_node: "à¤ªà¥à¤°à¤¾à¤¨à¥ à¤à¤¸à¤à¤§à¤¿"
-      old_node_tag: "à¤ªà¥à¤°à¤¾à¤¨à¥ à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-      old_relation: "à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤¸à¤à¤¬à¤à¤§"
-      old_relation_member: "à¤ªà¥à¤°à¤¾à¤¨à¥ à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤¸à¤¦à¤¸à¥à¤¯"
-      old_relation_tag: "à¤ªà¥à¤°à¤¾à¤¨à¥ à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-      old_way: "à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾"
-      old_way_node: "à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿"
-      old_way_tag: "à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-      relation: "à¤¸à¤à¤¬à¤à¤§"
-      relation_member: "à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤¸à¤¦à¤¸à¥à¤¯"
-      relation_tag: "à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-      session: "Session"
-      trace: "Trace"
-      tracepoint: "Trace Point"
-      tracetag: "Trace Tag"
-      user: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
-      user_preference: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤µà¤°à¥à¤¯à¤¤à¤¾"
-      user_token: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤à¤à¤à¤¿à¤¤à¤"
-      way: "à¤°à¤¸à¥à¤¤à¤¾"
-      way_node: "à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿"
-      way_tag: "à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "à¤¶à¤°à¥à¤°"
-      diary_entry:
-        user: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
-        title: "à¤¶à¥à¤°à¥à¤·à¤"
-        latitude: "à¤à¤à¥à¤·à¤¾à¤à¤¶"
-        longitude: "à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°"
-        language: "à¤­à¤¾à¤¶à¤¾"
-      friend:
-        user: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
-        friend: "à¤¦à¥à¤¸à¥à¤¤"
-      trace:
-        user: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
-        visible: "à¤¦à¥à¤¶à¥à¤¯"
-        name: "à¤¨à¤¾à¤®"
-        size: "à¤à¤à¤¾à¤°"
-        latitude: "à¤à¤à¥à¤·à¤¾à¤à¤¶"
-        longitude: "à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°"
-        public: "à¤¸à¤¾à¤°à¥à¤µà¤à¤¨à¤¿à¤" 
-        description: "à¤µà¤°à¥à¤£à¤¨"
-      message:
-        sender: "à¤ªà¥à¤°à¥à¤·à¤"
-        title: "à¤¶à¥à¤°à¥à¤·à¤"
-        body: "à¤¸à¤à¤¦à¥à¤¶ à¤à¤¾ à¤¶à¤¾à¤°à¥à¤°"
-        recipient: "à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤à¤à¤°à¥à¤¤à¤¾"
-      user:
-        email: "à¤-à¤®à¥à¤²"
-        active: "à¤¸à¤à¥à¤°à¤¿à¤¯"
-        display_name: "à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤¨à¤¾à¤®"
-        description: "à¤µà¤°à¥à¤£à¤¨"
-        languages: "à¤­à¤¾à¤·à¤¾à¤à¤"
-        pass_crypt: "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
-  map:
-    view: "à¤¦à¥à¤¶à¥à¤¯"
-    edit: "à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤"
-    coordinates: "à¤¨à¤¿à¤°à¥à¤¦à¥à¤¶à¤¾à¤à¤:"
-  browse:
-    changeset:
-      title: "Changeset"
+hi: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: à¤¶à¤°à¥à¤°
+      diary_entry: 
+        language: à¤­à¤¾à¤¶à¤¾
+        latitude: à¤à¤à¥à¤·à¤¾à¤à¤¶
+        longitude: à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°
+        title: à¤¶à¥à¤°à¥à¤·à¤
+        user: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾
+      friend: 
+        friend: à¤¦à¥à¤¸à¥à¤¤
+        user: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾
+      message: 
+        body: à¤¸à¤à¤¦à¥à¤¶ à¤à¤¾ à¤¶à¤¾à¤°à¥à¤°
+        recipient: à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤à¤à¤°à¥à¤¤à¤¾
+        sender: à¤ªà¥à¤°à¥à¤·à¤
+        title: à¤¶à¥à¤°à¥à¤·à¤
+      trace: 
+        description: à¤µà¤°à¥à¤£à¤¨
+        latitude: à¤à¤à¥à¤·à¤¾à¤à¤¶
+        longitude: à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°
+        name: à¤¨à¤¾à¤®
+        public: à¤¸à¤¾à¤°à¥à¤µà¤à¤¨à¤¿à¤
+        size: à¤à¤à¤¾à¤°
+        user: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾
+        visible: à¤¦à¥à¤¶à¥à¤¯
+      user: 
+        active: à¤¸à¤à¥à¤°à¤¿à¤¯
+        description: à¤µà¤°à¥à¤£à¤¨
+        display_name: à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤¨à¤¾à¤®
+        email: à¤-à¤®à¥à¤²
+        languages: à¤­à¤¾à¤·à¤¾à¤à¤
+        pass_crypt: à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡
+    models: 
+      acl: Access Control List
+      changeset: Changeset
+      changeset_tag: Changeset Tag
+      country: à¤¦à¥à¤¶
+      diary_comment: Diary Comment
+      diary_entry: Diary Entry
+      friend: à¤¦à¥à¤¸à¥à¤¤
+      language: à¤­à¤¾à¤¶à¤¾
+      message: à¤¸à¤à¤¦à¥à¤¶
+      node: à¤à¤¸à¤à¤§à¤¿
+      node_tag: à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+      notifier: Notifier
+      old_node: à¤ªà¥à¤°à¤¾à¤¨à¥ à¤à¤¸à¤à¤§à¤¿
+      old_node_tag: à¤ªà¥à¤°à¤¾à¤¨à¥ à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+      old_relation: à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤¸à¤à¤¬à¤à¤§
+      old_relation_member: à¤ªà¥à¤°à¤¾à¤¨à¥ à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤¸à¤¦à¤¸à¥à¤¯
+      old_relation_tag: à¤ªà¥à¤°à¤¾à¤¨à¥ à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+      old_way: à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾
+      old_way_node: à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿
+      old_way_tag: à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+      relation: à¤¸à¤à¤¬à¤à¤§
+      relation_member: à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤¸à¤¦à¤¸à¥à¤¯
+      relation_tag: à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+      session: Session
+      trace: Trace
+      tracepoint: Trace Point
+      tracetag: Trace Tag
+      user: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾
+      user_preference: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤µà¤°à¥à¤¯à¤¤à¤¾
+      user_token: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤à¤à¤à¤¿à¤¤à¤
+      way: à¤°à¤¸à¥à¤¤à¤¾
+      way_node: à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¸à¤à¤§à¤¿
+      way_tag: à¤°à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤à¤à¤¿à¤¤à¤
+  browse: 
+    changeset: 
       changeset: "Changeset: {{id}}"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "à¤¨à¤¿à¤°à¥à¤®à¤¾à¤£ à¤à¥ à¤¸à¤®à¤¯:"
-      closed_at: "à¤¸à¤®à¤¾à¤ªà¤¨ à¤à¥ à¤¸à¤®à¤¯:"
+      changesetxml: Changeset XML
+      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: Changeset
+    changeset_details: 
       belongs_to: "Belongs to:"
       bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
+      box: box
+      closed_at: "à¤¸à¤®à¤¾à¤ªà¤¨ à¤à¥ à¤¸à¤®à¤¯:"
+      created_at: "à¤¨à¤¿à¤°à¥à¤®à¤¾à¤£ à¤à¥ à¤¸à¤®à¤¯:"
       has_nodes: "à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ {{count}}  à¤à¤¸à¤à¤§à¤¿ à¤¹à¥:"
-      has_ways: "à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ {{count}} à¤°à¤¸à¥à¤¤à¥ à¤¹à¥:"
       has_relations: "à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ {{count}} à¤¸à¤à¤¬à¤à¤§ à¤¹à¥:"
+      has_ways: "à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ {{count}} à¤°à¤¸à¥à¤¤à¥ à¤¹à¥:"
+      no_bounding_box: No bounding box has been stored for this changeset.
+      show_area_box: Show Area Box
+    changeset_navigation: 
+      user: 
+        prev_tooltip: "{{user}} à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤ªà¥à¤°à¥à¤µ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤"
     common_details: 
+      changeset_comment: "à¤à¤¿à¤ªà¥à¤ªà¤£à¥:"
       edited_at: "à¤¸à¤®à¤¯, à¤à¤¿à¤¸ à¤ªà¤° à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤:"
       edited_by: "à¤¸à¤à¤ªà¤¾à¤¦à¤:"
-      version: "à¤¸à¤à¤¸à¥à¤à¤°à¤£:"
       in_changeset: "à¤à¤¸ changeset à¤à¤¾ à¤à¤à¤:"
-    containing_relation:
-      entry: "à¤¸à¤à¤¬à¤à¤§ {{relation_name}}"
-      entry_role: "à¤¸à¤à¤¬à¤à¤§ {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "Loading..."
-      deleted: "à¤®à¤¿à¤à¤¾ à¤¦à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ à¤¹à¥"
-    node_details:
+      version: "à¤¸à¤à¤¸à¥à¤à¤°à¤£:"
+    containing_relation: 
+      entry: à¤¸à¤à¤¬à¤à¤§ {{relation_name}}
+      entry_role: à¤¸à¤à¤¬à¤à¤§ {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: à¤®à¤¿à¤à¤¾ à¤¦à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ à¤¹à¥
+      loading: Loading...
+    node: 
+      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
+      download_xml: Download XML
+      edit: à¤¸à¤à¤ªà¤¾à¤¦à¤¨
+      node: à¤à¤¸à¤à¤§à¤¿
+      node_title: "à¤à¤¸à¤à¤§à¤¿: {{node_name}}"
+      view_history: à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤
+    node_details: 
       coordinates: "à¤¨à¤¿à¤°à¥à¤¦à¥à¤¶à¤¾à¤à¤:"
       part_of: "à¤à¤¨ à¤°à¤¾à¤¸à¥à¤¤à¥ à¤à¤¾ à¤¹à¤¿à¤¸à¥à¤¸à¤¾:"
-    node_history:
-      node_history: "à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
+    node_history: 
       download: "{{download_xml_link}} à¤¯à¤¾ {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥à¤"
-    node:
-      node: "à¤à¤¸à¤à¤§à¤¿"
-      node_title: "à¤à¤¸à¤à¤§à¤¿: {{node_name}}"
-      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤"
-    not_found:
-      sorry: "à¤à¥à¤·à¤®à¤¾ à¤à¤°à¥à¤, à¤¯à¥ {{type}} à¤à¤¸ à¤à¤à¤¡à¥ {{id }} à¤à¥ à¤¸à¤¾à¤¥, à¤ªà¤¾à¤¯à¤¾ à¤¨à¤¹à¥à¤ à¤à¤¾ à¤¸à¤à¤¾"
-      type:
-        node: "à¤à¤¸à¤à¤§à¤¿"
-        way: "à¤°à¤¾à¤¸à¥à¤¤à¤¾"
-        relation: "à¤¸à¤à¤¬à¤à¤§"
-    paging_nav:
-      showing_page: "à¤à¤¸ à¤ªà¥à¤·à¥à¤  à¤à¤¾ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
+      download_xml: Download XML
+      node_history: à¤à¤¸à¤à¤§à¤¿ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸
+      node_history_title: "à¤¨à¥à¤¡ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{node_name}}"
+      view_details: à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥à¤
+    not_found: 
+      sorry: à¤à¥à¤·à¤®à¤¾ à¤à¤°à¥à¤, à¤¯à¥ {{type}} à¤à¤¸ à¤à¤à¤¡à¥ {{id }} à¤à¥ à¤¸à¤¾à¤¥, à¤ªà¤¾à¤¯à¤¾ à¤¨à¤¹à¥à¤ à¤à¤¾ à¤¸à¤à¤¾
+      type: 
+        node: à¤à¤¸à¤à¤§à¤¿
+        relation: à¤¸à¤à¤¬à¤à¤§
+        way: à¤°à¤¾à¤¸à¥à¤¤à¤¾
+    paging_nav: 
       of: "à¤ªà¥à¤·à¥à¤  à¤à¤¿à¤¨à¤¤à¥:"
-    relation_details:
+      showing_page: "à¤à¤¸ à¤ªà¥à¤·à¥à¤  à¤à¤¾ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
+    relation: 
+      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
+      download_xml: Download XML
+      relation: à¤¸à¤à¤¬à¤à¤§
+      relation_title: "à¤¸à¤à¤¬à¤à¤§: {{relation_name}}"
+      view_history: à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤
+    relation_details: 
       members: "à¤¸à¤¦à¤¸à¥à¤¯:"
       part_of: "à¤à¤¨ à¤¸à¤à¤¬à¤à¤§à¥ à¤à¤¾ à¤¹à¤¿à¤¸à¥à¤¸à¤¾:"
-    relation_history:
-      relation_history: "à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
+    relation_history: 
+      relation_history: à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸
       relation_history_title: "à¤à¤¸ à¤¸à¤à¤¬à¤à¤§ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{relation_name}}"
-    relation:
-      relation: "à¤¸à¤à¤¬à¤à¤§"
-      relation_title: "à¤¸à¤à¤¬à¤à¤§: {{relation_name}}"
-      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤"
-    start:
-      view_data: "à¤à¤¸ à¤®à¤¾à¤¨à¤à¤¿à¤¤à¥à¤° à¤à¥ à¤¤à¤¥à¥à¤¯à¥à¤ à¤¦à¥à¤à¥à¤"
-      manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¥à¤"
-    start_rjs:
-      data_layer_name: "à¤¤à¤¥à¥à¤¯"
-      data_frame_title: "à¤¤à¤¥à¥à¤¯"
-      zoom_or_select: "à¤à¥à¤ªà¤¯à¤¾ à¤à¤¼à¥à¤® à¤à¤°à¥ à¤¯à¤¾ à¤¨à¤à¥à¤¶à¥ à¤à¥ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤¦à¥à¤à¤¨à¥ à¤à¥ à¤²à¤¿à¤ à¤à¥à¤¨à¥à¤"
-      drag_a_box: "à¤®à¤¾à¤¨à¤à¤¿à¤¤à¥à¤° à¤ªà¤° à¤à¤ à¤¬à¥à¤à¥à¤¸ à¤à¥à¤à¤à¥à¤ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¤¾ à¤à¤¯à¤¨ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤"
-      manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤"
-      loaded_an_area_with_num_features: "à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° à¤®à¥à¤ [[num_features]] à¤µà¤¿à¤¶à¥à¤·à¤¤à¤¾à¤à¤ à¤¶à¤¾à¤®à¤¿à¤² à¤¹à¥| à¤¸à¤¾à¤®à¤¾à¤¨à¥à¤¯ à¤¤à¥à¤° à¤ªà¤°, à¤à¥à¤ à¤¬à¥à¤°à¤¾à¤à¤à¤¼à¤°à¥à¤ à¤à¤¸ à¤®à¤¾à¤¤à¥à¤°à¤¾ à¤à¥ à¤¤à¤¥à¥à¤¯à¥à¤ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤¸à¤à¥à¤·à¤® à¤¨à¤¹à¥à¤ à¤¹à¥ à¤¸à¤à¤¤à¤¾ à¤¹à¥| à¤µà¥ à¤¸à¤¬à¤¸à¥ à¤à¤à¥à¤à¤¾ à¤à¤¾à¤® à¤à¤°à¤¤à¥ à¤¹à¥ à¤à¤¬ à¤à¤ à¤¬à¤¾à¤° à¤®à¥à¤ à¥§à¥¦à¥¦ à¤¸à¥ à¤à¤® à¤¸à¥à¤µà¤¿à¤§à¤¾à¤à¤ à¤à¥ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤à¤°à¤¤à¥ à¤¹à¥: à¤à¥à¤ à¤à¤° à¤à¤°à¤¨à¥ à¤ªà¤° à¤à¤ªà¤à¥ à¤¬à¥à¤°à¤¾à¤à¤à¤° à¤à¤® à¤¤à¥à¤à¤¼ à¤¹à¥ à¤¸à¤à¤¤à¥ à¤¹à¥| à¤¯à¤¦à¤¿ à¤à¤ª à¤à¤¸ à¤¤à¤¥à¥à¤¯à¥à¤ à¤à¥ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ à¤¹à¥à¤, à¤¤à¥ à¤à¤ª à¤¨à¥à¤à¥ à¤¦à¤¿à¤ à¤à¤ à¤¬à¤à¤¨ à¤ªà¤° à¤à¥à¤²à¤¿à¤ à¤à¤°à¥|"
-      load_data: "Load Data"
-      unable_to_load_size: "à¤­à¤°à¤£ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤à¤¸à¤®à¤°à¥à¤¥: à¤à¤¸ à¤à¤à¤¾à¤° [[bbox_size]] à¤à¥ à¤¬à¥à¤à¥à¤¸ à¤¬à¤¹à¥à¤¤ à¤¬à¤¡à¤¼à¥ à¤¹à¥:"
-      must_be_smaller: "à¤¬à¤¹à¥à¤¤ à¤¬à¤¡à¤¼à¥ à¤¹à¥ (0.à¥¨à¥« à¤¸à¥ à¤à¥à¤à¥ à¤¹à¥à¤¨à¥ à¤à¤¾à¤¹à¤¿à¤)"
-      loading: "Loading..."
-      show_history: "à¤à¤¤à¤¹à¤¾à¤¸ à¤¦à¤¿à¤à¤¾à¤à¤"
-      wait: "à¤à¥à¤ªà¤¯à¤¾ à¤ªà¥à¤°à¤¤à¥à¤à¥à¤·à¤¾ à¤à¤°à¥à¤..."
-      history_for: "History for"
+    relation_member: 
+      type: 
+        node: à¤¨à¥à¤¡
+        relation: à¤¸à¤à¤¬à¤à¤§
+        way: à¤à¤°
+    start: 
+      manually_select: à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¥à¤
+      view_data: à¤à¤¸ à¤®à¤¾à¤¨à¤à¤¿à¤¤à¥à¤° à¤à¥ à¤¤à¤¥à¥à¤¯à¥à¤ à¤¦à¥à¤à¥à¤
+    start_rjs: 
+      data_frame_title: à¤¤à¤¥à¥à¤¯
+      data_layer_name: à¤¤à¤¥à¥à¤¯
       details: "à¤µà¤¿à¤µà¤°à¤£:"
-      private_user: "à¤à¤¸à¤¾à¤°à¥à¤µà¤à¤¨à¤¿à¤ à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾"
+      drag_a_box: à¤®à¤¾à¤¨à¤à¤¿à¤¤à¥à¤° à¤ªà¤° à¤à¤ à¤¬à¥à¤à¥à¤¸ à¤à¥à¤à¤à¥à¤ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¤¾ à¤à¤¯à¤¨ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤
       edited_by_user_at_timestamp: "[[user]] à¤¦à¥à¤µà¤¾à¤°à¤¾ [[timestamp]] à¤ªà¤° à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤"
-      object_list:
-        heading: "Object list"
-        back: "Display object list"
-        type:
-          node: "à¤à¤¸à¤à¤§à¤¿"
-          way: "à¤°à¤¸à¥à¤¤à¤¾"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Retrieve this area from the API"
-        details: "à¤µà¤¿à¤µà¤°à¤£"
-        selected:
-          type:
-            node: "à¤à¤¸à¤à¤§à¤¿ [[id]]"
-            way: "à¤°à¤¸à¥à¤¤à¤¾ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "à¤à¤¸à¤à¤§à¤¿ [[id]]"
-            way: "à¤°à¤¸à¥à¤¤à¤¾ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      load_data: Load Data
+      loaded_an_area_with_num_features: "à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° à¤®à¥à¤ [[num_features]] à¤µà¤¿à¤¶à¥à¤·à¤¤à¤¾à¤à¤ à¤¶à¤¾à¤®à¤¿à¤² à¤¹à¥| à¤¸à¤¾à¤®à¤¾à¤¨à¥à¤¯ à¤¤à¥à¤° à¤ªà¤°, à¤à¥à¤ à¤¬à¥à¤°à¤¾à¤à¤à¤¼à¤°à¥à¤ à¤à¤¸ à¤®à¤¾à¤¤à¥à¤°à¤¾ à¤à¥ à¤¤à¤¥à¥à¤¯à¥à¤ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤¸à¤à¥à¤·à¤® à¤¨à¤¹à¥à¤ à¤¹à¥ à¤¸à¤à¤¤à¤¾ à¤¹à¥| à¤µà¥ à¤¸à¤¬à¤¸à¥ à¤à¤à¥à¤à¤¾ à¤à¤¾à¤® à¤à¤°à¤¤à¥ à¤¹à¥ à¤à¤¬ à¤à¤ à¤¬à¤¾à¤° à¤®à¥à¤ à¥§à¥¦à¥¦ à¤¸à¥ à¤à¤® à¤¸à¥à¤µà¤¿à¤§à¤¾à¤à¤ à¤à¥ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤à¤°à¤¤à¥ à¤¹à¥: à¤à¥à¤ à¤à¤° à¤à¤°à¤¨à¥ à¤ªà¤° à¤à¤ªà¤à¥ à¤¬à¥à¤°à¤¾à¤à¤à¤° à¤à¤® à¤¤à¥à¤à¤¼ à¤¹à¥ à¤¸à¤à¤¤à¥ à¤¹à¥| à¤¯à¤¦à¤¿ à¤à¤ª à¤à¤¸ à¤¤à¤¥à¥à¤¯à¥à¤ à¤à¥ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ à¤¹à¥à¤, à¤¤à¥ à¤à¤ª à¤¨à¥à¤à¥ à¤¦à¤¿à¤ à¤à¤ à¤¬à¤à¤¨ à¤ªà¤° à¤à¥à¤²à¤¿à¤ à¤à¤°à¥|"
+      loading: Loading...
+      manually_select: à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤
+      object_list: 
+        api: Retrieve this area from the API
+        back: Display object list
+        details: à¤µà¤¿à¤µà¤°à¤£
+        heading: Object list
+        history: 
+          type: 
+            node: à¤à¤¸à¤à¤§à¤¿ [[id]]
+            way: à¤°à¤¸à¥à¤¤à¤¾ [[id]]
+        selected: 
+          type: 
+            node: à¤à¤¸à¤à¤§à¤¿ [[id]]
+            way: à¤°à¤¸à¥à¤¤à¤¾ [[id]]
+        type: 
+          node: à¤à¤¸à¤à¤§à¤¿
+          way: à¤°à¤¸à¥à¤¤à¤¾
+      private_user: à¤à¤¸à¤¾à¤°à¥à¤µà¤à¤¨à¤¿à¤ à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾
+      show_history: à¤à¤¤à¤¹à¤¾à¤¸ à¤¦à¤¿à¤à¤¾à¤à¤
+      unable_to_load_size: "à¤­à¤°à¤£ à¤à¤°à¤¨à¥ à¤®à¥à¤ à¤à¤¸à¤®à¤°à¥à¤¥: à¤à¤¸ à¤à¤à¤¾à¤° [[bbox_size]] à¤à¥ à¤¬à¥à¤à¥à¤¸ à¤¬à¤¹à¥à¤¤ à¤¬à¤¡à¤¼à¥ à¤¹à¥:"
+      wait: à¤à¥à¤ªà¤¯à¤¾ à¤ªà¥à¤°à¤¤à¥à¤à¥à¤·à¤¾ à¤à¤°à¥à¤...
+      zoom_or_select: à¤à¥à¤ªà¤¯à¤¾ à¤à¤¼à¥à¤® à¤à¤°à¥ à¤¯à¤¾ à¤¨à¤à¥à¤¶à¥ à¤à¥ à¤à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤¦à¥à¤à¤¨à¥ à¤à¥ à¤²à¤¿à¤ à¤à¥à¤¨à¥à¤
+    tag_details: 
       tags: "à¤à¤à¤à¤¿à¤¤à¤:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
+      download_xml: Download XML
+      edit: à¤¸à¤à¤ªà¤¾à¤¦à¤¨
+      view_history: à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤
+      way: à¤°à¤¸à¥à¤¤à¤¾
+      way_title: "à¤°à¤¾à¤¸à¥à¤¤à¥ à¤à¤¾ à¤¨à¤¾à¤®: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: also part of way {{related_ways}}
+        other: also part of ways {{related_ways}}
       nodes: "à¤à¤¸à¤à¤§à¤¿:"
       part_of: "à¤à¤¨à¤à¤¾ à¤¹à¤¿à¤¸à¥à¤¸à¤¾:"
-      also_part_of:
-        one: "also part of way {{related_ways}}"
-        other: "also part of ways {{related_ways}}"
-    way_history:
-      way_history: "à¤°à¤¾à¤¸à¥à¤¤à¥ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
-      way_history_title: "à¤à¤¸ à¤°à¤¾à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} à¤¯à¤¾ {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥à¤"
-    way:
-      way: "à¤°à¤¸à¥à¤¤à¤¾"
-      way_title: "à¤°à¤¾à¤¸à¥à¤¤à¥ à¤à¤¾ à¤¨à¤¾à¤®: {{way_name}}"
-      download: "{{download_xml_link}} à¤¯à¤¾ {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸ à¤¦à¥à¤à¥à¤"
-  changeset:
+      download_xml: Download XML
+      view_details: à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥à¤
+      way_history: à¤°à¤¾à¤¸à¥à¤¤à¥ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸
+      way_history_title: "à¤à¤¸ à¤°à¤¾à¤¸à¥à¤¤à¤¾ à¤à¤¾ à¤à¤¤à¤¿à¤¹à¤¾à¤¸: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: à¤à¤¨à¤¾à¤®
+      big_area: (à¤¬à¤¡à¤¼à¤¾ à¤à¥à¤·à¥à¤¤à¥à¤°)
+      no_comment: (à¤à¥à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤¨à¤¹à¥à¤ à¤¹à¥)
+      no_edits: (à¤à¥à¤ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤¹à¥)
+      show_area_box: show area box
+      still_editing: (à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ à¤°à¤¹à¤¾ à¤¹à¥)
+      view_changeset_details: à¤à¤¸ changeset à¤à¥ à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥
     changeset_paging_nav: 
-      showing_page: "à¤à¤¸ à¤ªà¥à¤·à¥à¤  à¤à¤¾ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
       of: "à¤ªà¥à¤·à¥à¤  à¤à¤¿à¤¨à¤¤à¥:"
-    changeset:
-      still_editing: "(à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ à¤°à¤¹à¤¾ à¤¹à¥)"
-      anonymous: "à¤à¤¨à¤¾à¤®"
-      no_comment: "(à¤à¥à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤¨à¤¹à¥à¤ à¤¹à¥)"
-      no_edits: "(à¤à¥à¤ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤¹à¥)"
-      show_area_box: "show area box"
-      big_area: "(à¤¬à¤¡à¤¼à¤¾ à¤à¥à¤·à¥à¤¤à¥à¤°)"
-      view_changeset_details: "à¤à¤¸ changeset à¤à¥ à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥à¤à¥"
-    changesets:
-      id: "à¤à¤à¤¡à¥"
-      saved_at: "à¤¸à¤®à¤¯ à¤à¤¬ à¤¸à¥à¤°à¤à¥à¤·à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
-      user: "à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾"
-      comment: "à¤à¤¿à¤ªà¥à¤ªà¤£à¥"
-      area: "à¤à¥à¤·à¥à¤¤à¥à¤°"
-    list_bbox:
-      history: "à¤à¤¤à¤¿à¤¹à¤¾à¤¸"
-      changesets_within_the_area: "à¤à¤¸ à¤à¥à¤·à¥à¤¤à¥à¤° à¤®à¥à¤ à¤¨à¤¿à¤®à¥à¤¨à¤²à¤¿à¤à¤¿à¤¤ changesets à¤¹à¥à¤:"
-      show_area_box: "show area box"
-      no_changesets: "à¤à¥à¤ changesets à¤¨à¤¹à¥à¤ à¤¹à¥"
-      all_changes_everywhere: "à¤¹à¤° à¤à¤à¤¹ à¤à¥ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨à¥à¤ à¤à¥ à¤¦à¥à¤à¤¨à¥ à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤¯à¤¹à¤¾à¤ à¤¦à¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
-      recent_changes: "à¤¨à¤¯à¥ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨"
-      no_area_specified: "à¤à¥à¤ à¤à¥à¤·à¥à¤¤à¥à¤°"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "à¤®à¤¾à¤¨à¤à¤¿à¤¤à¥à¤° à¤¦à¥à¤à¤¿à¤¯à¥"
-      view_tab: "view tab"
-      alternatively_view: "à¤à¤¥à¤µà¤¾, à¤¸à¤¬ à¤¦à¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
-    list:
-      recent_changes: "à¤¨à¤¯à¥ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨"
-      recently_edited_changesets: "à¤¨à¤¯à¥  à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ changesets:"
-      for_more_changesets: "à¤à¤§à¤¿à¤ changesets à¤à¥ à¤²à¤¿à¤¯à¤¾, à¤à¤ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ à¤à¥ à¤à¥à¤¨à¥ à¤à¤° à¤à¤¨à¤à¥ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¥ à¤¦à¥à¤à¤¿à¤¯à¥, à¤¯à¤¾ à¤à¤ à¤µà¤¿à¤¶à¤¿à¤·à¥à¤ à¤à¥à¤·à¤¤à¥à¤° à¤à¤¾  see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "à¤à¤¸ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ {{username_link}} à¤à¥ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤à¥ "
-      no_visible_edits_by: "à¤à¤¸ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾ {{name}} à¤à¥ à¤à¥à¤ à¤ªà¥à¤°à¤à¤ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤¹à¥."
-      for_all_changes: "à¤¸à¤¾à¤°à¥ à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¥ à¤à¥ à¤¸à¤­à¥ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨à¥à¤ à¤à¥ à¤¦à¥à¤à¤¨à¥ à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤¯à¤¹à¤¾à¤ à¤¦à¥à¤à¤¿à¤¯à¥ {{recent_changes_link}}"
-      recent_changes: "à¤¨à¤¯à¥ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨"
-  diary_entry:
-    new:
-      title: "à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿"
-    list:
-      title: "à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤à¤ à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥"
-      user_title: "{{user}}' à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥"
-      new: "à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿"
-      new_title: "à¤à¤ªà¤¨à¥ à¤¦à¥à¤¨à¤¿à¤à¥ à¤®à¥à¤, à¤à¤ à¤¨à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤²à¤¿à¤à¥à¤"
-      no_entries: "à¤à¥à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥"
-      recent_entries: "à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤:"
-      older_entries: "à¤ªà¥à¤°à¤¾à¤¨à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤"
-      newer_entries: Newer Entries
-    edit:
-      title: "à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤"
-      subject: "à¤µà¤¿à¤·à¤¯:"
+      showing_page: "à¤à¤¸ à¤ªà¥à¤·à¥à¤  à¤à¤¾ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨:"
+    changesets: 
+      area: à¤à¥à¤·à¥à¤¤à¥à¤°
+      comment: à¤à¤¿à¤ªà¥à¤ªà¤£à¥
+      id: à¤à¤à¤¡à¥
+      saved_at: à¤¸à¤®à¤¯ à¤à¤¬ à¤¸à¥à¤°à¤à¥à¤·à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾
+      user: à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 comment
+        other: "{{count}} comments"
+      comment_link: Comment on this entry
+      edit_link: Edit this entry
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: Reply to this entry
+    edit: 
       body: "à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤à¤¾ à¤¶à¤¾à¤°à¥à¤°:"
       language: "à¤­à¤¾à¤·à¤¾:"
+      latitude: à¤à¤à¥à¤·à¤¾à¤à¤¶
       location: "à¤¸à¥à¤¥à¤¾à¤¨:"
-      latitude: "à¤à¤à¥à¤·à¤¾à¤à¤¶"
-      longitude: "à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°"
-      use_map_link: "à¤¨à¤à¥à¤¶à¤¾ à¤à¤¾ à¤à¤¸à¥à¤¤à¥à¤®à¤¾à¤²"
-      save_button: "à¤¸à¤¹à¥à¤à¤¨à¥"
-      marker_text: "à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤à¥ à¤¸à¥à¤¥à¤¾à¤¨"
-    view:
-      title: "à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾à¤ à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥ | {{user}}"
+      longitude: à¤¦à¥à¤¶à¤¾à¤à¤¤à¤°
+      marker_text: à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤à¥ à¤¸à¥à¤¥à¤¾à¤¨
+      save_button: à¤¸à¤¹à¥à¤à¤¨à¥
+      subject: "à¤µà¤¿à¤·à¤¯:"
+      title: à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤
+      use_map_link: à¤¨à¤à¥à¤¶à¤¾ à¤à¤¾ à¤à¤¸à¥à¤¤à¥à¤®à¤¾à¤²
+    list: 
+      new: à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿
+      new_title: à¤à¤ªà¤¨à¥ à¤¦à¥à¤¨à¤¿à¤à¥ à¤®à¥à¤, à¤à¤ à¤¨à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤²à¤¿à¤à¥à¤
+      newer_entries: Newer Entries
+      no_entries: à¤à¥à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥
+      older_entries: à¤ªà¥à¤°à¤¾à¤¨à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤
+      recent_entries: "à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿à¤¯à¥à¤:"
+      title: à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾à¤à¤ à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥
+      user_title: "{{user}}' à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥"
+    new: 
+      title: à¤¨à¤ à¤¦à¥à¤¨à¤¿à¤à¥ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿
+    no_such_entry: 
+      body: à¤à¥à¤·à¤®à¤¾ à¤à¤°à¥à¤, à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¯à¤¾ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤¨à¤¹à¥à¤ à¤¹à¥| à¤à¥à¤ªà¤¯à¤¾ à¤à¤ªà¤¨à¥ à¤µà¤°à¥à¤¤à¤¨à¥ à¤à¥ à¤à¤¾à¤à¤ à¤à¤°à¥à¤, or maybe the link you clicked is wrong|
+      heading: à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¨à¤¹à¥à¤ à¤¹à¥
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+    view: 
+      leave_a_comment: à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤²à¤¿à¤à¤¿à¤
+      login: à¤¸à¤¤à¥à¤°à¤¾à¤°à¤à¤­
+      login_to_leave_a_comment: à¤¸à¤¤à¥à¤°à¤¾à¤°à¤à¤­ à¤¯à¤¹à¤¾à¤ {{login_link}}, à¤à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤²à¤¿à¤à¤¿à¤¨à¥ à¤à¥ à¤²à¤¿à¤
+      save_button: à¤¸à¤¹à¥à¤à¤¨à¥
+      title: à¤à¤ªà¥à¤¯à¥à¤à¤¿à¤à¤°à¥à¤¤à¤¾à¤ à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥ | {{user}}
       user_title: "{{user}}'s à¤à¥ à¤¦à¥à¤¨à¤¿à¤à¥à¤"
-      leave_a_comment: "à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤²à¤¿à¤à¤¿à¤"
-      login_to_leave_a_comment: "à¤¸à¤¤à¥à¤°à¤¾à¤°à¤à¤­ à¤¯à¤¹à¤¾à¤ {{login_link}}, à¤à¤ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤²à¤¿à¤à¤¿à¤¨à¥ à¤à¥ à¤²à¤¿à¤"
-      login: "à¤¸à¤¤à¥à¤°à¤¾à¤°à¤à¤­"
-      save_button: "à¤¸à¤¹à¥à¤à¤¨à¥"
-    no_such_entry:
-      heading: "à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¨à¤¹à¥à¤ à¤¹à¥ "
-      body: "à¤à¥à¤·à¤®à¤¾ à¤à¤°à¥à¤, à¤à¤¸ à¤à¤à¤¡à¥ {{id}} à¤à¥ à¤²à¤¿à¤¯à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤µà¤¿à¤·à¥à¤à¤¿ à¤¯à¤¾ à¤à¤¿à¤ªà¥à¤ªà¤£à¥ à¤¨à¤¹à¥à¤ à¤¹à¥| à¤à¥à¤ªà¤¯à¤¾ à¤à¤ªà¤¨à¥ à¤µà¤°à¥à¤¤à¤¨à¥ à¤à¥ à¤à¤¾à¤à¤ à¤à¤°à¥à¤, or maybe the link you clicked is wrong|"
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
-      comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "à¤à¥à¤·à¥à¤¤à¥à¤° à¤¨à¤¿à¤°à¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤"
-      manually_select: "à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤"
-      format_to_export: "à¤¸à¥à¤µà¤°à¥à¤ª à¤¨à¤¿à¤°à¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik à¤à¤µà¤¿"
-      osmarender_image: "Osmarender à¤à¤µà¤¿"
-      embeddable_html: "Embeddable HTML"
-      licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
+  export: 
+    start: 
+      add_marker: Add a marker to the map
+      area_to_export: à¤à¥à¤·à¥à¤¤à¥à¤° à¤¨à¤¿à¤°à¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤
+      embeddable_html: Embeddable HTML
+      export_button: Export
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: Format
+      format_to_export: à¤¸à¥à¤µà¤°à¥à¤ª à¤¨à¤¿à¤°à¥à¤¯à¤¾à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤
+      image_size: Image Size
       latitude: "Lat:"
+      licence: Licence
       longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
-  geocoder:
-    results:
-      no_results: "No results found"
-  layouts:
-    welcome_user: "Welcome, {{user_link}}"
-    inbox: "inbox ({{count}})"
-    logout: logout
-    log_in: log in
-    sign_up: sign up
-    view: View
+      manually_select: à¤à¥à¤ªà¤¯à¤¾, à¤à¤ª à¤à¤ à¤à¤²à¤ à¤à¥à¤·à¥à¤¤à¥à¤° à¤à¥à¤¨à¤¿à¤
+      mapnik_image: Mapnik à¤à¤µà¤¿
+      max: max
+      options: Options
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Osmarender à¤à¤µà¤¿
+      output: Output
+      paste_html: Paste HTML to embed in website
+      scale: Scale
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Add a marker to the map
+      change_marker: Change marker position
+      click_add_marker: Click on the map to add a marker
+      drag_a_box: Drag a box on the map to select an area
+      export: Export
+      manually_select: Manually select a different area
+      view_larger_map: View Larger Map
+  geocoder: 
+    description: 
+      types: 
+        cities: à¤¨à¤à¤°
+        places: à¤¸à¥à¤¥à¤²
+        towns: à¤¶à¤¹à¤°
+    direction: 
+      east: à¤ªà¥à¤°à¥à¤µ
+      north: à¤à¤¤à¥à¤¤à¤°
+      north_east: à¤à¤¤à¥à¤¤à¤°-à¤ªà¥à¤°à¥à¤µ
+      north_west: à¤à¤¤à¥à¤¤à¤°-à¤ªà¤¶à¥à¤à¤¿à¤®
+      south: à¤¦à¤à¥à¤·à¤¿à¤£
+      south_east: à¤¦à¤à¥à¤·à¤¿à¤£-à¤ªà¥à¤°à¥à¤µ
+      south_west: à¤¦à¤à¥à¤·à¤¿à¤£-à¤ªà¤¶à¥à¤à¤¿à¤®
+      west: à¤ªà¤¶à¥à¤à¤¿à¤®
+    distance: 
+      one: à¤à¤°à¥à¤¬ 1 à¤à¤¿à¤®à¥
+      other: à¤à¤°à¥à¤¬ {{count}} à¤à¤¿à¤®à¥
+      zero: 1 à¤à¤¿à¤®à¥ à¤¸à¥ à¤à¤®
+    results: 
+      no_results: No results found
+  layouts: 
+    alt_donation: Make a Donation
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
+    donate_link_text: donating
     edit: Edit
-    history: History
+    edit_tooltip: à¤¨à¤à¥à¤¶à¤¾ à¤¸à¤à¤ªà¤¾à¤¦à¤¨
     export: Export
     gps_traces: GPS Traces
-    user_diaries: User Diaries
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
-    news_blog: "News blog"
+    help_wiki: Help &amp; Wiki
+    history: History
+    home: à¤à¥à¤¹
+    inbox: inbox ({{count}})
+    inbox_tooltip: 
+      other: à¤à¤ªà¤à¥ à¤à¤¨à¤¬à¥à¤à¥à¤¸ à¤®à¥à¤ {{count}} à¤à¤ªà¤ à¤¿à¤¤ à¤¸à¤à¤¦à¥à¤¶ à¤¹à¥à¤
+    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
+    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
+    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
+    log_in: log in
+    logout: logout
+    logout_tooltip: à¤¨à¤¿à¤°à¥à¤à¤®
+    news_blog: News blog
+    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
+    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
     shop: Shop
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    sign_up: sign up
+    sign_up_tooltip: à¤¸à¤à¤ªà¤¾à¤¦à¤¨ à¤à¥ à¤²à¤¿à¤ à¤à¤¾à¤¤à¤¾ à¤¬à¤¨à¤¾à¤à¤
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: The Free Wiki World Map
+    user_diaries: User Diaries
+    view: View
+    view_tooltip: à¤¨à¤à¥à¤¶à¤¾ à¤¦à¥à¤à¥à¤
+    welcome_user: Welcome, {{user_link}}
+    welcome_user_link_tooltip: à¤à¤ªà¤à¤¾ à¤ªà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ à¤ªà¤¨à¥à¤¨à¤¾
+  map: 
+    coordinates: "à¤¨à¤¿à¤°à¥à¤¦à¥à¤¶à¤¾à¤à¤:"
+    edit: à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤
+    view: à¤¦à¥à¤¶à¥à¤¯
+  message: 
+    delete: 
+      deleted: à¤¸à¤à¤¦à¥à¤¶ à¤à¤¾à¤¤à¥à¤®à¤¾
+    inbox: 
+      date: Date
+      from: From
+      my_inbox: My inbox
+      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Inbox
+      you_have: You have {{new_count}} new messages and {{old_count}} old messages
+    mark: 
+      as_read: Message marked as read
+      as_unread: Message marked as unread
+    message_summary: 
+      delete_button: à¤à¤¾à¤¤à¥à¤®à¤¾
+      read_button: Mark as read
+      reply_button: Reply
+      unread_button: Mark as unread
+    new: 
+      back_to_inbox: Back to inbox
+      body: Body
+      message_sent: Message sent
+      send_button: Send
+      send_message_to: Send a new message to {{name}}
+      subject: Subject
+      title: Send message
+    no_such_user: 
+      heading: à¤à¤¸ à¤¤à¤°à¤¹ à¤à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ à¤¯à¤¾ à¤¸à¤à¤¦à¥à¤¶ à¤¨à¤¹à¥à¤
+    outbox: 
+      date: Date
+      inbox: inbox
+      my_inbox: My {{inbox_link}}
+      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Outbox
+      to: To
+      you_have_sent_messages: You have {{sent_count}} sent messages
+    read: 
+      back_to_inbox: Back to inbox
+      back_to_outbox: Back to outbox
+      date: Date
+      from: From
+      reading_your_messages: Reading your messages
+      reading_your_sent_messages: Reading your sent messages
+      reply_button: Reply
+      subject: Subject
+      title: Read message
+      to: To
+      unread_button: Mark as unread
+    sent_message_summary: 
+      delete_button: à¤à¤¾à¤¤à¥à¤®à¤¾
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_html: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+    friend_notification: 
+      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
+    gpx_notification: 
+      greeting: à¤¨à¤®à¤¸à¥à¤à¤¾à¤°,
+    lost_password: 
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_html: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
+    lost_password_plain: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
+      hopefully_you_2: email addresses openstreetmap.org account.
+    message_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer1: You can also read the message at {{readurl}}
+      footer2: and you can reply at {{replyurl}}
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      footer1: "You can also read the message at {{readurl}}"
-      footer2: "and you can reply at {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
-      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    signup_confirm:
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    lost_password:
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-  message:
-    inbox:
-      title: "Inbox"
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
-    message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
-    new:
-      title: "Send message"
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
-      message_sent: "Message sent"
-    no_such_user:
-      no_such_user: "No such user or message"
-      sorry: "Sorry there is no user or message with that name or id"
-    outbox: 
-      title: "Outbox"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    read:
-      title: "Read message"
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      home: "home"
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
-      permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+  oauth_clients: 
+    edit: 
+      submit: à¤¸à¤à¤ªà¤¾à¤¦à¤¨
+    form: 
+      allow_write_api: à¤¨à¤à¥à¤¶à¤¾ à¤¸à¤à¤ªà¤¾à¤¦à¤¿à¤¤ à¤à¤°à¥à¤.
+      name: à¤¨à¤¾à¤®
+      required: à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾
+    new: 
+      submit: à¤ªà¤à¤à¥à¤¯à¤¨
+    show: 
+      allow_write_api: à¤¨à¤à¥à¤¶à¥ à¤®à¥à¤ à¤¤à¤¬à¥à¤¦à¥à¤²à¥
+      key: à¤à¤ªà¤­à¥à¤à¥à¤¤à¤¾ à¤à¥à¤à¤à¥
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: You haven't set your edits to be public.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
+    index: 
+      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
+      license: 
+        license_name: à¤à¥à¤°à¤¿à¤à¤à¤¿à¤µ à¤à¤¾à¤®à¤¨à¥à¤¸ à¤à¤à¥à¤°à¥à¤¬à¥à¤¯à¥à¤¶à¤¨-à¤¶à¥à¤¯à¤° à¤à¤²à¤¾à¤à¤ 2.0
+        project_name: à¤à¤ªà¤¨ à¤¸à¥à¤à¥à¤°à¥à¤ à¤®à¥à¤ª à¤ªà¤°à¤¿à¤¯à¥à¤à¤¨à¤¾
+      permalink: Permalink
+    key: 
+      map_key: Map key
+      table: 
+        entry: 
+          allotments: à¤à¤µà¤à¤à¤¨
+          building: à¤®à¤¹à¤¤à¥à¤µà¤ªà¥à¤°à¥à¤£ à¤­à¤µà¤¨
+          cable: 
+            - à¤à¥à¤¬à¤² à¤à¤¾à¤°
+          cemetery: à¤à¤¬à¥à¤°à¤¿à¤¸à¥à¤¤à¤¾à¤¨
+          farm: à¤à¥à¤¤
+          footway: à¤ªà¤à¤¡à¤à¤¡à¥
+          forest: à¤µà¤¨
+          golf: à¤à¥à¤²à¥à¤« à¤®à¥à¤¦à¤¾à¤¨
+          industrial: à¤à¤¦à¥à¤¯à¥à¤à¤¿à¤ à¤à¥à¤·à¥à¤¤à¥à¤°
+          lake: 
+            - à¤à¥à¤²
+          motorway: à¤®à¥à¤à¤°à¤µà¥
+          park: à¤ªà¤¾à¤°à¥à¤
+          primary: à¤¨à¤¿à¤à¥ à¤¸à¤¡à¤¼à¤
+          rail: à¤°à¥à¤²à¤µà¥
+          resident: à¤°à¤¿à¤¹à¤¾à¤¯à¤¶à¥ à¤à¥à¤·à¥à¤¤à¥à¤°
+          runway: 
+            - à¤à¤¯à¤°à¤ªà¥à¤°à¥à¤ à¤°à¤¨à¤µà¥
+          school: 
+            - à¤ªà¤¾à¤ à¤¶à¤¾à¤²à¤¾
+            - à¤µà¤¿à¤¶à¥à¤µà¤µà¤¿à¤¦à¥à¤¯à¤¾à¤²à¤¯
+          secondary: à¤¦à¥à¤µà¤¿à¤¤à¥à¤¯ à¤¸à¤¡à¤¼à¤
+          station: à¤°à¥à¤²à¤µà¥ à¤¸à¥à¤à¥à¤¶à¤¨
+          subway: à¤à¤ªà¤®à¤¾à¤°à¥à¤
+          tourist: à¤ªà¤°à¥à¤¯à¤à¤¨ à¤à¥ à¤à¤à¤°à¥à¤·à¤£
+          track: à¤ªà¤à¥à¤à¥
+          trunk: à¤à¥à¤°à¤à¤ à¤°à¥à¤¡
+          unclassified: à¤à¤µà¤°à¥à¤à¥à¤à¥à¤¤ à¤¸à¤¡à¤¼à¤
+          wood: à¤²à¤à¤¡à¤¼à¥
+    search: 
       search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃÂ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
+      submit_text: Go
+      where_am_i: Where am I?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
+      upload_trace: Upload GPS Trace
+    delete: 
+      scheduled_for_deletion: Track scheduled for deletion
+    edit: 
+      description: "Description:"
+      edit: edit
       filename: "Filename:"
-      uploaded_at: "Uploaded at:"
+      map: à¤¨à¤à¥à¤¶à¤¾
+      owner: "Owner:"
       points: "Points:"
+      save_button: Save Changes
       start_coord: "Start coordinate:"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
       tags: "Tags:"
-      save_button: "Save Changes"
-    no_such_user:
-      no_such_user: "Sorry, there is no user with the name {{name}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "PENDING"
+      uploaded_at: "Uploaded at:"
+      visibility: à¤¦à¥à¤·à¥à¤à¤¤à¤¾
+      visibility_help: à¤à¤¸à¤à¤¾ à¤à¥à¤¯à¤¾ à¤®à¤¤à¤²à¤¬ à¤¹à¥?
+    list: 
+      public_traces: Public GPS traces
+      public_traces_from: Public GPS traces from {{user}}
+      tagged_with: " tagged with {{tags}}"
+      your_traces: Your GPS traces
+    make_public: 
+      made_public: Track made public
+    no_such_user: 
+      body: à¤®à¤¾à¤« à¤à¤°à¥à¤, à¤à¤¸ {{user}} à¤¨à¤¾à¤® à¤à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ à¤¨à¤¹à¥à¤ à¤¹à¥. à¤à¥à¤ªà¤¯à¤¾ à¤à¤à¥à¤·à¤°à¥à¤ à¤ªà¤° à¤à¥à¤° à¤à¤°à¥à¤, à¤¯à¤¾ à¤à¤ªà¤¨à¥ à¤à¤¿à¤¸ à¤²à¤¿à¤à¤ à¤ªà¤° à¤à¥à¤²à¤¿à¤ à¤à¤¿à¤¯à¤¾ à¤¹à¥, à¤µà¤¹ à¤à¤²à¤¤ à¤¹à¥ à¤¸à¤à¤¤à¤¾ à¤¹à¥.
+      title: à¤à¤¸ à¤¤à¤°à¤¹ à¤à¤¾ à¤à¥à¤ à¤ªà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ à¤¨à¤¹à¥à¤
+    trace: 
+      ago: "{{time_in_words_ago}} ago"
+      by: by
+      count_points: "{{count}} points"
+      edit: edit
+      edit_map: Edit Map
+      in: in
+      map: map
+      more: more
+      pending: PENDING
+      private: PRIVATE
+      public: PUBLIC
+      trace_details: View Trace Details
+      view_map: View Map
+    trace_form: 
+      description: Description
+      help: Help
+      tags: Tags
+      upload_button: Upload
+      upload_gpx: Upload GPX File
+      visibility: à¤¦à¥à¤·à¥à¤à¤¤à¤¾
+      visibility_help: à¤à¤¸à¤à¤¾ à¤à¥à¤¯à¤¾ à¤®à¤¤à¤²à¤¬ à¤¹à¥?
+    trace_header: 
+      see_all_traces: See all traces
+      see_just_your_traces: See just your traces, or upload a trace
+      see_your_traces: See all your traces
+      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: of
+      showing: Showing page
+    view: 
+      delete_track: Delete this track
+      description: "Description:"
+      download: download
+      edit: edit
+      edit_track: Edit this track
       filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
+      heading: Viewing trace {{name}}
+      map: map
+      none: None
+      owner: "Owner:"
+      pending: PENDING
       points: "Points:"
       start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      heading: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Login"
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
+      tags: Tags
+      trace_not_found: Trace not found!
+      uploaded: "Uploaded at:"
+      visibility: à¤¦à¥à¤·à¥à¤à¤¤à¤¾
+  user: 
+    account: 
+      email never displayed publicly: (never displayed publicly)
+      flash update success: User information updated successfully.
+      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
+      home location: "Home Location:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Make all my edits public
+      my settings: My settings
+      no home location: You have not entered your home location.
+      preferred languages: "Preferred Languages:"
+      profile description: "Profile Description:"
+      public editing: 
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: what's this?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: Save Changes
+      title: Edit account
+      update home location on click: Update home location when I click on the map?
+    confirm: 
+      button: Confirm
+      failure: A user account with this token has already been confirmed.
+      heading: Confirm a user account
+      press confirm button: Press the confirm button below to activate your account.
+      success: Confirmed your account, thanks for signing up!
+    confirm_email: 
+      button: Confirm
+      failure: An email address has already been confirmed with this token.
+      heading: Confirm a change of email address
+      press confirm button: Press the confirm button below to confirm your new email address.
+      success: Confirmed your email address, thanks for signing up!
+    friend_map: 
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      your location: Your location
+    go_public: 
+      flash success: All your edits are now public, and you are now allowed to edit.
+    login: 
+      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
+      auth failure: Sorry, couldn't log in with those details.
+      create_account: create an account
       email or username: "Email Address or Username:"
+      heading: Login
+      login_button: Login
+      lost password link: Lost your password?
       password: "Password:"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
-      auth failure: "Sorry, couldn't log in with those details."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      please login: Please login or {{create_user_link}}.
+      title: Login
+    lost_password: 
       email address: "Email Address:"
+      heading: Forgotten Password?
+      new password button: Send me a new password
+      notice email cannot find: Couldn't find that email address, sorry.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
+      title: lost password
+    make_friend: 
+      already_a_friend: You are already friends with {{name}}.
+      failed: Sorry, failed to add {{name}} as a friend.
+      success: "{{name}} is now your friend."
+    new: 
       confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      confirm password: "Confirm Password:"
+      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
       display name: "Display Name:"
+      email address: "Email Address:"
+      fill_form: Fill in the form and we'll send you a quick email to activate your account.
+      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
+      heading: Create a User Account
+      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
+      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Password:"
-      confirm password: "Confirm Password:"
       signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
+      title: Create account
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      flash token bad: Didn't find that token, check the URL maybe?
+      password: "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡:"
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: Add Image
+      ago: ({{time_in_words_ago}} ago)
+      change your settings: change your settings
+      delete image: Delete Image
+      description: Description
+      diary: diary
+      edits: edits
+      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
+      km away: "{{count}}km away"
+      mapper since: "Mapper since:"
       my diary: my diary
-      new diary entry: new diary entry
       my edits: my edits
-      my traces: my traces
       my settings: my settings
+      my traces: my traces
+      nearby users: "Nearby users:"
+      new diary entry: new diary entry
+      no friends: You have not added any friends yet.
+      no home location: No home location has been set.
+      no nearby users: There are no users who admit to mapping nearby yet.
+      remove as friend: remove as friend
       send message: send message
-      diary: diary
-      edits: edits
+      settings_link_text: settings
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
       upload an image: Upload an image
-      add image: Add Image
-      description: Description
+      user image heading: User image
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
       your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{count}}km away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing:"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      home location: "Home Location:"
-      no home location: "You have not entered your home location."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 99bf5df53..ba4937b70 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1,995 +1,958 @@
-hu:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "HozzÃ¡fÃ©rÃ©s-vezÃ©rlÃ©si lista"
-      changeset: "MÃ³dosÃ­tÃ¡scsomag"
-      changeset_tag: "MÃ³dosÃ­tÃ¡scsomag cÃ­mkÃ©je"
-      country: "OrszÃ¡g"
-      diary_comment: "NaplÃ³hozzÃ¡szÃ³lÃ¡s"
-      diary_entry: "NaplÃ³bejegyzÃ©s"
-      friend: "BarÃ¡t"
-      language: "Nyelv"
-      message: "Ãzenet"
-      node: "Pont"
-      node_tag: "Pont cÃ­mkÃ©je"
-      notifier: "ÃrtesÃ­tÅ"
-      old_node: "RÃ©gi pont"
-      old_node_tag: "RÃ©gi pont cÃ­mkÃ©je"
-      old_relation: "RÃ©gi kapcsolat"
-      old_relation_member: "RÃ©gi kapcsolat tagja"
-      old_relation_tag: "RÃ©gi kapcsolat cÃ­mkÃ©je"
-      old_way: "RÃ©gi vonal"
-      old_way_node: "RÃ©gi vonal pontja"
-      old_way_tag: "RÃ©gi vonal cÃ­mkÃ©je"
-      relation: "Kapcsolat"
-      relation_member: "Kapcsolat tagja"
-      relation_tag: "Kapcsolat cÃ­mkÃ©je"
-      session: "Folyamat"
-      trace: "Nyomvonal"
-      tracepoint: "Nyomvonal pontja"
-      tracetag: "Nyomvonal cÃ­mkÃ©je"
-      user: "FelhasznÃ¡lÃ³"
-      user_preference: "FelhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡s"
-      user_token: "FelhasznÃ¡lÃ³i utalvÃ¡ny"
-      way: "Vonal"
-      way_node: "Vonal pontja"
-      way_tag: "Vonal cÃ­mkÃ©je"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "SzÃ¶veg"
-      diary_entry:
-        user: "FelhasznÃ¡lÃ³"
-        title: "TÃ¡rgy"
-        latitude: "FÃ¶ldrajzi szÃ©lessÃ©g"
-        longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g"
-        language: "Nyelv"
-      friend:
-        user: "FelhasznÃ¡lÃ³"
-        friend: "BarÃ¡t"
-      trace:
-        user: "FelhasznÃ¡lÃ³"
-        visible: "LÃ¡thatÃ³"
-        name: "NÃ©v"
-        size: "MÃ©ret"
-        latitude: "FÃ¶ldrajzi szÃ©lessÃ©g"
-        longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g"
-        public: "NyilvÃ¡nos"
-        description: "LeÃ­rÃ¡s"
-      message:
-        sender: "KÃ¼ldÅ"
-        title: "TÃ¡rgy"
-        body: "SzÃ¶veg"
-        recipient: "CÃ­mzett"
-      user:
-        email: "E-mail"
-        active: "AktÃ­v"
-        display_name: "MegjelenÃ­tendÅ nÃ©v"
-        description: "LeÃ­rÃ¡s"
-        languages: "Nyelvek"
-        pass_crypt: "JelszÃ³"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: TÃ©rkÃ©p
-    edit: SzerkesztÃ©s
-    coordinates: "KoordinÃ¡tÃ¡k:"
-  browse:
-    changeset:
-      title: "MÃ³dosÃ­tÃ¡scsomag"
+hu: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: SzÃ¶veg
+      diary_entry: 
+        language: Nyelv
+        latitude: FÃ¶ldrajzi szÃ©lessÃ©g
+        longitude: FÃ¶ldrajzi hosszÃºsÃ¡g
+        title: TÃ¡rgy
+        user: FelhasznÃ¡lÃ³
+      friend: 
+        friend: BarÃ¡t
+        user: FelhasznÃ¡lÃ³
+      message: 
+        body: SzÃ¶veg
+        recipient: CÃ­mzett
+        sender: KÃ¼ldÅ
+        title: TÃ¡rgy
+      trace: 
+        description: LeÃ­rÃ¡s
+        latitude: FÃ¶ldrajzi szÃ©lessÃ©g
+        longitude: FÃ¶ldrajzi hosszÃºsÃ¡g
+        name: NÃ©v
+        public: NyilvÃ¡nos
+        size: MÃ©ret
+        user: FelhasznÃ¡lÃ³
+        visible: LÃ¡thatÃ³
+      user: 
+        active: AktÃ­v
+        description: LeÃ­rÃ¡s
+        display_name: MegjelenÃ­tendÅ nÃ©v
+        email: E-mail
+        languages: Nyelvek
+        pass_crypt: JelszÃ³
+    models: 
+      acl: HozzÃ¡fÃ©rÃ©s-vezÃ©rlÃ©si lista
+      changeset: MÃ³dosÃ­tÃ¡scsomag
+      changeset_tag: MÃ³dosÃ­tÃ¡scsomag cÃ­mkÃ©je
+      country: OrszÃ¡g
+      diary_comment: NaplÃ³hozzÃ¡szÃ³lÃ¡s
+      diary_entry: NaplÃ³bejegyzÃ©s
+      friend: BarÃ¡t
+      language: Nyelv
+      message: Ãzenet
+      node: Pont
+      node_tag: Pont cÃ­mkÃ©je
+      notifier: ÃrtesÃ­tÅ
+      old_node: RÃ©gi pont
+      old_node_tag: RÃ©gi pont cÃ­mkÃ©je
+      old_relation: RÃ©gi kapcsolat
+      old_relation_member: RÃ©gi kapcsolat tagja
+      old_relation_tag: RÃ©gi kapcsolat cÃ­mkÃ©je
+      old_way: RÃ©gi vonal
+      old_way_node: RÃ©gi vonal pontja
+      old_way_tag: RÃ©gi vonal cÃ­mkÃ©je
+      relation: Kapcsolat
+      relation_member: Kapcsolat tagja
+      relation_tag: Kapcsolat cÃ­mkÃ©je
+      session: Folyamat
+      trace: Nyomvonal
+      tracepoint: Nyomvonal pontja
+      tracetag: Nyomvonal cÃ­mkÃ©je
+      user: FelhasznÃ¡lÃ³
+      user_preference: FelhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡s
+      user_token: FelhasznÃ¡lÃ³i utalvÃ¡ny
+      way: Vonal
+      way_node: Vonal pontja
+      way_tag: Vonal cÃ­mkÃ©je
+  browse: 
+    changeset: 
       changeset: "MÃ³dosÃ­tÃ¡scsomag: {{id}}"
+      changesetxml: Changeset XML
       download: "{{changeset_xml_link}} vagy {{osmchange_xml_link}} letÃ¶ltÃ©se"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
+      feed: 
         title: "MÃ³dosÃ­tÃ¡scsomag: {{id}}"
         title_comment: "MÃ³dosÃ­tÃ¡scsomag: {{id}} - {{comment}}"
-    changeset_navigation:
-      user:
-        name_tooltip: "{{user}} szerkesztÃ©seinek megtekintÃ©se"
-        prev_tooltip: "{{user}} elÅzÅ szerkesztÃ©se"
-        next_tooltip: "{{user}} kÃ¶vetkezÅ szerkesztÃ©se"
-      all:
-        prev_tooltip: "ElÅzÅ mÃ³dosÃ­tÃ¡scsomag"
-        next_tooltip: "KÃ¶vetkezÅ mÃ³dosÃ­tÃ¡scsomag"
-    changeset_details:
-      created_at: "KÃ©szÃ¼lt:"
-      closed_at: "LezÃ¡rva:"
+      osmchangexml: osmChange XML
+      title: MÃ³dosÃ­tÃ¡scsomag
+    changeset_details: 
       belongs_to: "Tulajdonos:"
       bounding_box: "HatÃ¡rolÃ³nÃ©gyzet:"
-      no_bounding_box: "Nincs eltÃ¡rolva hatÃ¡rolÃ³ ehhez a mÃ³dosÃ­tÃ¡scsomaghoz."
-      show_area_box: "TerÃ¼lethatÃ¡rolÃ³ megtekintÃ©se"
-      box: "hatÃ¡rolÃ³"
-      has_nodes:
+      box: hatÃ¡rolÃ³
+      closed_at: "LezÃ¡rva:"
+      created_at: "KÃ©szÃ¼lt:"
+      has_nodes: 
         one: "A kÃ¶vetkezÅ {{count}} pontot tartalmazza:"
         other: "A kÃ¶vetkezÅ {{count}} pontot tartalmazza:"
-      has_ways:
-        one:  "A kÃ¶vetkezÅ {{count}} vonalat tartalmazza:"
-        other: "A kÃ¶vetkezÅ {{count}} vonalat tartalmazza:"
-      has_relations:
-        one:  "A kÃ¶vetkezÅ {{count}} kapcsolatot tartalmazza:"
+      has_relations: 
+        one: "A kÃ¶vetkezÅ {{count}} kapcsolatot tartalmazza:"
         other: "A kÃ¶vetkezÅ {{count}} kapcsolatot tartalmazza:"
+      has_ways: 
+        one: "A kÃ¶vetkezÅ {{count}} vonalat tartalmazza:"
+        other: "A kÃ¶vetkezÅ {{count}} vonalat tartalmazza:"
+      no_bounding_box: Nincs eltÃ¡rolva hatÃ¡rolÃ³ ehhez a mÃ³dosÃ­tÃ¡scsomaghoz.
+      show_area_box: TerÃ¼lethatÃ¡rolÃ³ megtekintÃ©se
+    changeset_navigation: 
+      all: 
+        next_tooltip: KÃ¶vetkezÅ mÃ³dosÃ­tÃ¡scsomag
+        prev_tooltip: ElÅzÅ mÃ³dosÃ­tÃ¡scsomag
+      user: 
+        name_tooltip: "{{user}} szerkesztÃ©seinek megtekintÃ©se"
+        next_tooltip: "{{user}} kÃ¶vetkezÅ szerkesztÃ©se"
+        prev_tooltip: "{{user}} elÅzÅ szerkesztÃ©se"
     common_details: 
+      changeset_comment: "MegjegyzÃ©s:"
       edited_at: "Szerkesztve:"
       edited_by: "Szerkesztette:"
-      version: "VerziÃ³:"
       in_changeset: "MÃ³dosÃ­tÃ¡scsomag:"
-      changeset_comment: "MegjegyzÃ©s:"
-    containing_relation:
+      version: "VerziÃ³:"
+    containing_relation: 
       entry: "Kapcsolat: {{relation_name}}"
       entry_role: "Kapcsolat: {{relation_name}} (mint {{relation_role}})"
-    map:
-      loading: "BetÃ¶ltÃ©s..."
-      deleted: "TÃ¶rÃ¶lve"
-      larger:
-        area: "TerÃ¼let megtekintÃ©se nagyobb tÃ©rkÃ©pen"
-        node: "Pont megtekintÃ©se nagyobb tÃ©rkÃ©pen"
-        way: "Vonal megtekintÃ©se nagyobb tÃ©rkÃ©pen"
-        relation: "Kapcsolat megtekintÃ©se nagyobb tÃ©rkÃ©pen"
-    node_details:
+    map: 
+      deleted: TÃ¶rÃ¶lve
+      larger: 
+        area: TerÃ¼let megtekintÃ©se nagyobb tÃ©rkÃ©pen
+        node: Pont megtekintÃ©se nagyobb tÃ©rkÃ©pen
+        relation: Kapcsolat megtekintÃ©se nagyobb tÃ©rkÃ©pen
+        way: Vonal megtekintÃ©se nagyobb tÃ©rkÃ©pen
+      loading: BetÃ¶ltÃ©s...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
+      download_xml: XML letÃ¶ltÃ©se
+      edit: szerkesztÃ©s
+      node: Pont
+      node_title: "Pont: {{node_name}}"
+      view_history: tÃ¶rtÃ©net megtekintÃ©se
+    node_details: 
       coordinates: "KoordinÃ¡tÃ¡k:"
       part_of: "RÃ©sze:"
-    node_history:
-      node_history: "Pont tÃ¶rtÃ©nete"
-      node_history_title: "Pont tÃ¶rtÃ©nete: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} vagy {{view_details_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_details: "rÃ©szletek megtekintÃ©se"
-    node:
-      node: "Pont"
-      node_title: "Pont: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_history: "tÃ¶rtÃ©net megtekintÃ©se"
-      edit: "szerkesztÃ©s"
-    not_found:
-      sorry: "SajnÃ¡lom, a(z) {{id}} azonosÃ­tÃ³jÃº {{type}} nem talÃ¡lhatÃ³."
-      type:
+      download_xml: XML letÃ¶ltÃ©se
+      node_history: Pont tÃ¶rtÃ©nete
+      node_history_title: "Pont tÃ¶rtÃ©nete: {{node_name}}"
+      view_details: rÃ©szletek megtekintÃ©se
+    not_found: 
+      sorry: SajnÃ¡lom, a(z) {{id}} azonosÃ­tÃ³jÃº {{type}} nem talÃ¡lhatÃ³.
+      type: 
+        changeset: mÃ³dosÃ­tÃ¡scsomag
         node: pont
-        way: vonal
         relation: kapcsolat
-        changeset: mÃ³dosÃ­tÃ¡scsomag
-    paging_nav:
-      showing_page: "Jelenlegi oldal:"
+        way: vonal
+    paging_nav: 
       of: "Ã¶sszesen:"
-    relation_details:
+      showing_page: "Jelenlegi oldal:"
+    relation: 
+      download: "{{download_xml_link}} vagy {{view_history_link}}"
+      download_xml: XML letÃ¶ltÃ©se
+      relation: Kapcsolat
+      relation_title: "Kapcsolat: {{relation_name}}"
+      view_history: tÃ¶rtÃ©net megtekintÃ©se
+    relation_details: 
       members: "Tagok:"
       part_of: "RÃ©sze:"
-    relation_history:
-      relation_history: "Kapcsolat tÃ¶rtÃ©nete"
-      relation_history_title: "Kapcsolat tÃ¶rtÃ©nete: {{relation_name}}"
+    relation_history: 
       download: "{{download_xml_link}} vagy {{view_details_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_details: "rÃ©szletek megtekintÃ©se"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: XML letÃ¶ltÃ©se
+      relation_history: Kapcsolat tÃ¶rtÃ©nete
+      relation_history_title: "Kapcsolat tÃ¶rtÃ©nete: {{relation_name}}"
+      view_details: rÃ©szletek megtekintÃ©se
+    relation_member: 
       entry_role: "{{type}} {{name}} mint {{role}}"
-      type:
+      type: 
         node: "Pont:"
-        way: "Vonal:"
         relation: "Kapcsolat:"
-    relation:
-      relation: "Kapcsolat"
-      relation_title: "Kapcsolat: {{relation_name}}"
-      download: "{{download_xml_link}} vagy {{view_history_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_history: "tÃ¶rtÃ©net megtekintÃ©se"
-    start:
-      view_data: "Adatok megtekintÃ©se a tÃ©rkÃ©p jelenlegi nÃ©zetÃ©hez"
-      manually_select: "MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se"
-    start_rjs:
-      data_layer_name: "Adatok"
-      data_frame_title: "Adatok"
-      zoom_or_select: "KÃ¶zelÃ­ts rÃ¡ vagy jelÃ¶lj ki egy terÃ¼letet a tÃ©rkÃ©pen a megtekintÃ©shez"
-      drag_a_box: "TerÃ¼let kijelÃ¶lÃ©sÃ©hez rajzolj egy nÃ©gyzetet a tÃ©rkÃ©pen"
-      manually_select: "MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se"
+        way: "Vonal:"
+    start: 
+      manually_select: MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se
+      view_data: Adatok megtekintÃ©se a tÃ©rkÃ©p jelenlegi nÃ©zetÃ©hez
+    start_rjs: 
+      data_frame_title: Adatok
+      data_layer_name: Adatok
+      details: RÃ©szletek
+      drag_a_box: TerÃ¼let kijelÃ¶lÃ©sÃ©hez rajzolj egy nÃ©gyzetet a tÃ©rkÃ©pen
+      edited_by_user_at_timestamp: "[[user]] szerkesztette ekkor: [[timestamp]]"
+      history_for_feature: "[[feature]] tÃ¶rtÃ©nete"
+      load_data: Adatok betÃ¶ltÃ©se
       loaded_an_area_with_num_features: "Olyan terÃ¼letet tÃ¶ltÃ¶ttÃ©l be, amely [[num_features]] elemet tartalmaz. NÃ©hÃ¡ny bÃ¶ngÃ©szÅ lehet, hogy nem birkÃ³zik meg ekkora mennyisÃ©gÅ± adattal. ÃltalÃ¡ban a bÃ¶ngÃ©szÅk egyszerre kevesebb mint 100 elem megjelenÃ­tÃ©sÃ©vel mÅ±kÃ¶dnek a legjobban: minden mÃ¡s esetben a bÃ¶ngÃ©szÅ lelassulhat/nem vÃ¡laszolhat. Ha biztos vagy benne, hogy meg szeretnÃ©d jelenÃ­teni ezeket az adatokat, megteheted ezt az alÃ¡bbi gombra kattintva."
-      load_data: "Adatok betÃ¶ltÃ©se"
+      loading: BetÃ¶ltÃ©s...
+      manually_select: MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se
+      object_list: 
+        api: Ezen terÃ¼let letÃ¶ltÃ©se API-bÃ³l
+        back: Objektumlista megjelenÃ­tÃ©se
+        details: RÃ©szletek
+        heading: Objektumlista
+        history: 
+          type: 
+            node: Pont [[id]]
+            way: Vonal [[id]]
+        selected: 
+          type: 
+            node: Pont [[id]]
+            way: Vonal [[id]]
+        type: 
+          node: Pont
+          way: Vonal
+      private_user: ismeretlen felhasznÃ¡lÃ³
+      show_history: TÃ¶rtÃ©net megjelenÃ­tÃ©se
       unable_to_load_size: "Nem tÃ¶lthetÅ be: a hatÃ¡rolÃ³nÃ©gyzet mÃ©rete ([[bbox_size]]) tÃºl nagy. ({{max_bbox_size}}-nÃ©l kisebbnek kell lennie.)"
-      loading: "BetÃ¶ltÃ©s..."
-      show_history: "TÃ¶rtÃ©net megjelenÃ­tÃ©se"
-      wait: "VÃ¡rjon..."
-      history_for_feature: "[[feature]] tÃ¶rtÃ©nete"
-      details: "RÃ©szletek"
-      private_user: "ismeretlen felhasznÃ¡lÃ³"
-      edited_by_user_at_timestamp: "[[user]] szerkesztette ekkor: [[timestamp]]"
-      object_list:
-        heading: "Objektumlista"
-        back: "Objektumlista megjelenÃ­tÃ©se"
-        type:
-          node: "Pont"
-          way: "Vonal"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Ezen terÃ¼let letÃ¶ltÃ©se API-bÃ³l"
-        details: "RÃ©szletek"
-        selected:
-          type:
-            node: "Pont [[id]]"
-            way: "Vonal [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Pont [[id]]"
-            way: "Vonal [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: VÃ¡rjon...
+      zoom_or_select: KÃ¶zelÃ­ts rÃ¡ vagy jelÃ¶lj ki egy terÃ¼letet a tÃ©rkÃ©pen a megtekintÃ©shez
+    tag_details: 
       tags: "CÃ­mkÃ©k:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
+      download_xml: XML letÃ¶ltÃ©se
+      edit: szerkesztÃ©s
+      view_history: tÃ¶rtÃ©net megtekintÃ©se
+      way: Vonal
+      way_title: "Vonal: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: szintÃ©n rÃ©sze a(z) {{related_ways}} vonalnak
+        other: szintÃ©n rÃ©sze a(z) {{related_ways}} vonalaknak
       nodes: "Pontok:"
       part_of: "RÃ©sze:"
-      also_part_of:
-        one: "szintÃ©n rÃ©sze a(z) {{related_ways}} vonalnak"
-        other: "szintÃ©n rÃ©sze a(z) {{related_ways}} vonalaknak"
-    way_history:
-      way_history: "Vonal tÃ¶rtÃ©nete"
-      way_history_title: "Vonal tÃ¶rtÃ©nete: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} vagy {{view_details_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_details: "rÃ©szletek megtekintÃ©se"
-    way:
-      way: "Vonal"
-      way_title: "Vonal: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
-      download_xml: "XML letÃ¶ltÃ©se"
-      view_history: "tÃ¶rtÃ©net megtekintÃ©se"
-      edit: "szerkesztÃ©s"
-  changeset:
+      download_xml: XML letÃ¶ltÃ©se
+      view_details: rÃ©szletek megtekintÃ©se
+      way_history: Vonal tÃ¶rtÃ©nete
+      way_history_title: "Vonal tÃ¶rtÃ©nete: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: NÃ©vtelen
+      big_area: (nagy)
+      no_comment: (nincs)
+      no_edits: (nincs szerkesztÃ©s)
+      show_area_box: terÃ¼lethatÃ¡rolÃ³ megjelenÃ­tÃ©se
+      still_editing: (szerkesztÃ©s alatt)
+      view_changeset_details: MÃ³dosÃ­tÃ¡scsomag rÃ©szleteinek megtekintÃ©se
     changeset_paging_nav: 
-      showing_page: "Jelenlegi oldal:"
       of: "Ã¶sszesen:"
-    changeset:
-      id: "#{{id}}"
-      still_editing: "(szerkesztÃ©s alatt)"
-      anonymous: "NÃ©vtelen"
-      no_comment: "(nincs)"
-      no_edits: "(nincs szerkesztÃ©s)"
-      show_area_box: "terÃ¼lethatÃ¡rolÃ³ megjelenÃ­tÃ©se"
-      big_area: "(nagy)"
-      view_changeset_details: "MÃ³dosÃ­tÃ¡scsomag rÃ©szleteinek megtekintÃ©se"
-    changesets:
-      id: "AzonosÃ­tÃ³"
-      saved_at: "Mentve"
-      user: "FelhasznÃ¡lÃ³"
-      comment: "MegjegyzÃ©s"
-      area: "TerÃ¼let"
-    list:
-      title: "MÃ³dosÃ­tÃ¡scsomagok"
-      title_user: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai"
-      title_bbox: "MÃ³dosÃ­tÃ¡scsomagok ezen belÃ¼l: {{bbox}}"
-      title_user_bbox: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai ezen belÃ¼l: {{bbox}}"
-
-      heading: "MÃ³dosÃ­tÃ¡scsomagok"
-      heading_user: "MÃ³dosÃ­tÃ¡scsomagok"
-      heading_bbox: "MÃ³dosÃ­tÃ¡scsomagok"
-      heading_user_bbox: "MÃ³dosÃ­tÃ¡scsomagok"
-
-      description: "LegutÃ³bbi mÃ³dosÃ­tÃ¡sok"
-      description_user: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai"
+      showing_page: "Jelenlegi oldal:"
+    changesets: 
+      area: TerÃ¼let
+      comment: MegjegyzÃ©s
+      id: AzonosÃ­tÃ³
+      saved_at: Mentve
+      user: FelhasznÃ¡lÃ³
+    list: 
+      description: LegutÃ³bbi mÃ³dosÃ­tÃ¡sok
       description_bbox: "MÃ³dosÃ­tÃ¡scsomagok ezen belÃ¼l: {{bbox}}"
+      description_user: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai"
       description_user_bbox: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai ezen belÃ¼l: {{bbox}}"
-  diary_entry:
-    new:
-      title: Ãj naplÃ³bejegyzÃ©s
-    list:
-      title: "FelhasznÃ¡lÃ³k naplÃ³i"
-      user_title: "{{user}} naplÃ³ja"
-      in_language_title: "NaplÃ³bejegyzÃ©sek {{language}} nyelven"
-      new: Ãj naplÃ³bejegyzÃ©s
-      new_title: Ãj naplÃ³bejegyzÃ©s Ã­rÃ¡sa a felhasznÃ¡lÃ³i naplÃ³ba
-      no_entries: Nincsenek naplÃ³bejegyzÃ©sek
-      recent_entries: "LegutÃ³bbi naplÃ³bejegyzÃ©sek:"
-      older_entries: RÃ©gebbi bejegyzÃ©sek
-      newer_entries: Ãjabb bejegyzÃ©sek
-    edit:
-      title: "NaplÃ³bejegyzÃ©s szerkesztÃ©se"
-      subject: "TÃ¡rgy:"
+      heading: MÃ³dosÃ­tÃ¡scsomagok
+      heading_bbox: MÃ³dosÃ­tÃ¡scsomagok
+      heading_user: MÃ³dosÃ­tÃ¡scsomagok
+      heading_user_bbox: MÃ³dosÃ­tÃ¡scsomagok
+      title: MÃ³dosÃ­tÃ¡scsomagok
+      title_bbox: "MÃ³dosÃ­tÃ¡scsomagok ezen belÃ¼l: {{bbox}}"
+      title_user: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai"
+      title_user_bbox: "{{user}} mÃ³dosÃ­tÃ¡scsomagjai ezen belÃ¼l: {{bbox}}"
+  diary_entry: 
+    diary_comment: 
+      comment_from: "{{link_user}} hozzÃ¡szÃ³lÃ¡sa ekkor: {{comment_created_at}}"
+    diary_entry: 
+      comment_count: 
+        one: 1 hozzÃ¡szÃ³lÃ¡s
+        other: "{{count}} hozzÃ¡szÃ³lÃ¡s"
+      comment_link: HozzÃ¡szÃ³lÃ¡s ehhez a bejegyzÃ©shez
+      edit_link: Ezen bejegyzÃ©s szerkesztÃ©se
+      posted_by: "{{link_user}} kÃ¼ldte ekkor: {{created}} {{language_link}} nyelven"
+      reply_link: VÃ¡lasz ezen bejegyzÃ©sre
+    edit: 
       body: "SzÃ¶veg:"
       language: "Nyelv:"
-      location: "Hely:"
       latitude: "FÃ¶ldrajzi szÃ©lessÃ©g:"
+      location: "Hely:"
       longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g:"
-      use_map_link: "tÃ©rkÃ©p hasznÃ¡lata"
-      save_button: "MentÃ©s"
       marker_text: NaplÃ³bejegyzÃ©s helye
-    view:
-      title: "FelhasznÃ¡lÃ³k naplÃ³i | {{user}}"
+      save_button: MentÃ©s
+      subject: "TÃ¡rgy:"
+      title: NaplÃ³bejegyzÃ©s szerkesztÃ©se
+      use_map_link: tÃ©rkÃ©p hasznÃ¡lata
+    feed: 
+      all: 
+        description: LegutÃ³bbi naplÃ³bejegyzÃ©sek az OpenStreetMap felhasznÃ¡lÃ³itÃ³l
+        title: OpenStreetMap naplÃ³bejegyzÃ©sek
+      language: 
+        description: LegutÃ³bbi naplÃ³bejegyzÃ©sek az OpenStreetMap felhasznÃ¡lÃ³itÃ³l {{language_name}} nyelven
+        title: OpenStreetMap naplÃ³bejegyzÃ©sek {{language_name}} nyelven
+      user: 
+        description: LegutÃ³bbi OpenStreetMap naplÃ³bejegyzÃ©sek {{user}} felhasznÃ¡lÃ³tÃ³l
+        title: "{{user}} OpenStreetMap naplÃ³bejegyzÃ©sei"
+    list: 
+      in_language_title: NaplÃ³bejegyzÃ©sek {{language}} nyelven
+      new: Ãj naplÃ³bejegyzÃ©s
+      new_title: Ãj naplÃ³bejegyzÃ©s Ã­rÃ¡sa a felhasznÃ¡lÃ³i naplÃ³ba
+      newer_entries: Ãjabb bejegyzÃ©sek
+      no_entries: Nincsenek naplÃ³bejegyzÃ©sek
+      older_entries: RÃ©gebbi bejegyzÃ©sek
+      recent_entries: "LegutÃ³bbi naplÃ³bejegyzÃ©sek:"
+      title: FelhasznÃ¡lÃ³k naplÃ³i
       user_title: "{{user}} naplÃ³ja"
-      leave_a_comment: "HozzÃ¡szÃ³lÃ¡s Ã­rÃ¡sa"
-      login_to_leave_a_comment: "{{login_link}} a hozzÃ¡szÃ³lÃ¡shoz"
-      login: "Jelentkezz be"
-      save_button: "MentÃ©s"
-    no_such_entry:
-      title: "Nincs ilyen naplÃ³bejegyzÃ©s"
+    new: 
+      title: Ãj naplÃ³bejegyzÃ©s
+    no_such_entry: 
+      body: SajnÃ¡lom, de nincs naplÃ³bejegyzÃ©s vagy hozzÃ¡szÃ³lÃ¡s {{id}} azonosÃ­tÃ³val. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz.
       heading: "Nincs naplÃ³bejegyzÃ©s ezzel az azonosÃ­tÃ³val: {{id}}"
-      body: "SajnÃ¡lom, de nincs naplÃ³bejegyzÃ©s vagy hozzÃ¡szÃ³lÃ¡s {{id}} azonosÃ­tÃ³val. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz."
-    no_such_user:
-      title: "Nincs ilyen felhasznÃ¡lÃ³"
+      title: Nincs ilyen naplÃ³bejegyzÃ©s
+    no_such_user: 
+      body: SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz.
       heading: "{{user}} felhasznÃ¡lÃ³ nem lÃ©tezik"
-      body: "SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz."
-    diary_entry:
-      posted_by: "{{link_user}} kÃ¼ldte ekkor: {{created}} {{language_link}} nyelven"
-      comment_link: HozzÃ¡szÃ³lÃ¡s ehhez a bejegyzÃ©shez
-      reply_link: VÃ¡lasz ezen bejegyzÃ©sre
-      comment_count:
-        one: 1 hozzÃ¡szÃ³lÃ¡s
-        other: "{{count}} hozzÃ¡szÃ³lÃ¡s"
-      edit_link: Ezen bejegyzÃ©s szerkesztÃ©se
-    diary_comment:
-      comment_from: "{{link_user}} hozzÃ¡szÃ³lÃ¡sa ekkor: {{comment_created_at}}"
-    feed:
-      user:
-        title: "{{user}} OpenStreetMap naplÃ³bejegyzÃ©sei"
-        description: "LegutÃ³bbi OpenStreetMap naplÃ³bejegyzÃ©sek {{user}} felhasznÃ¡lÃ³tÃ³l"
-      language:
-        title: "OpenStreetMap naplÃ³bejegyzÃ©sek {{language_name}} nyelven"
-        description: "LegutÃ³bbi naplÃ³bejegyzÃ©sek az OpenStreetMap felhasznÃ¡lÃ³itÃ³l {{language_name}} nyelven"
-      all:
-        title: "OpenStreetMap naplÃ³bejegyzÃ©sek"
-        description: "LegutÃ³bbi naplÃ³bejegyzÃ©sek az OpenStreetMap felhasznÃ¡lÃ³itÃ³l"
-  export:
-    start:
-      area_to_export: "ExportÃ¡landÃ³ terÃ¼let"
-      manually_select: "MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se"
-      format_to_export: "ExportÃ¡lÃ¡s formÃ¡tuma"
-      osm_xml_data: "OpenStreetMap XML adat"
-      mapnik_image: "Mapnik kÃ©p"
-      osmarender_image: "Osmarender kÃ©p"
-      embeddable_html: "BeÃ¡gyazhatÃ³ HTML"
-      licence: "Licenc"
-      export_details: 'Az OpenStreetMap adatokra a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.hu">Creative Commons Nevezd meg!-Ãgy add tovÃ¡bb! 2.0 licenc</a> vonatkozik.'
-      options: "BeÃ¡llÃ­tÃ¡sok"
-      format: "FormÃ¡tum"
-      scale: "MÃ©retarÃ¡ny"
-      max: "max."
-      image_size: "KÃ©pmÃ©ret"
-      zoom: "NagyÃ­tÃ¡si szint"
-      add_marker: "JelÃ¶lÅ hozzÃ¡adÃ¡sa a tÃ©rkÃ©phez"
+      title: Nincs ilyen felhasznÃ¡lÃ³
+    view: 
+      leave_a_comment: HozzÃ¡szÃ³lÃ¡s Ã­rÃ¡sa
+      login: Jelentkezz be
+      login_to_leave_a_comment: "{{login_link}} a hozzÃ¡szÃ³lÃ¡shoz"
+      save_button: MentÃ©s
+      title: FelhasznÃ¡lÃ³k naplÃ³i | {{user}}
+      user_title: "{{user}} naplÃ³ja"
+  export: 
+    start: 
+      add_marker: JelÃ¶lÅ hozzÃ¡adÃ¡sa a tÃ©rkÃ©phez
+      area_to_export: ExportÃ¡landÃ³ terÃ¼let
+      embeddable_html: BeÃ¡gyazhatÃ³ HTML
+      export_button: ExportÃ¡lÃ¡s
+      export_details: Az OpenStreetMap adatokra a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.hu">Creative Commons Nevezd meg!-Ãgy add tovÃ¡bb! 2.0 licenc</a> vonatkozik.
+      format: FormÃ¡tum
+      format_to_export: ExportÃ¡lÃ¡s formÃ¡tuma
+      image_size: KÃ©pmÃ©ret
       latitude: "FÃ¶ldrajzi szÃ©lessÃ©g:"
+      licence: Licenc
       longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g:"
-      output: "Kimenet"
-      paste_html: "Webhelyekbe valÃ³ beÃ¡gyazÃ¡shoz illeszd be a HTML kÃ³dot"
-      export_button: "ExportÃ¡lÃ¡s"
-    start_rjs:
-      export: "ExportÃ¡lÃ¡s"
-      drag_a_box: "TerÃ¼let kijelÃ¶lÃ©sÃ©hez rajzolj egy nÃ©gyzetet a tÃ©rkÃ©pen"
-      manually_select: "MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se"
-      click_add_marker: "JelÃ¶lÅ hozzÃ¡adÃ¡sÃ¡hoz kattints a tÃ©rkÃ©pre"
-      change_marker: "JelÃ¶lÅ helyÃ©nek mÃ³dosÃ­tÃ¡sa"
-      add_marker: "JelÃ¶lÅ hozzÃ¡adÃ¡sa a tÃ©rkÃ©phez"
-      view_larger_map: "Nagyobb tÃ©rkÃ©p megtekintÃ©se"
-  geocoder:
-    search:
-      title:
-        latlon: 'EredmÃ©nyek az <a href="http://openstreetmap.org/">Internal</a>rÃ³l'
-        us_postcode: 'EredmÃ©nyek a <a href="http://geocoder.us/">Geocoder.us</a>-rÃ³l'
-        uk_postcode: 'EredmÃ©nyek a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>-rÃ³l'
-        ca_postcode: 'EredmÃ©nyek a <a href="http://geocoder.ca/">Geocoder.CA</a>-rÅl'
-        osm_namefinder: 'EredmÃ©nyek az <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>rÅl'
-        geonames: 'EredmÃ©nyek a <a href="http://www.geonames.org/">GeoNames</a>rÅl'
-    search_osm_namefinder:
-      prefix: "{{type}}:"
-      suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}}-re {{parentdirection}} innen: {{parentname}})"
-      suffix_suburb: "{{suffix}} ({{parentname}})"
-    description:
-      title:
-        osm_namefinder: '{{types}} az <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>rÅl'
-        geonames: 'Helyek a <a href="http://www.geonames.org/">GeoNames</a>rÅl'
-      types:
+      manually_select: MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se
+      mapnik_image: Mapnik kÃ©p
+      max: max.
+      options: BeÃ¡llÃ­tÃ¡sok
+      osm_xml_data: OpenStreetMap XML adat
+      osmarender_image: Osmarender kÃ©p
+      output: Kimenet
+      paste_html: Webhelyekbe valÃ³ beÃ¡gyazÃ¡shoz illeszd be a HTML kÃ³dot
+      scale: MÃ©retarÃ¡ny
+      zoom: NagyÃ­tÃ¡si szint
+    start_rjs: 
+      add_marker: JelÃ¶lÅ hozzÃ¡adÃ¡sa a tÃ©rkÃ©phez
+      change_marker: JelÃ¶lÅ helyÃ©nek mÃ³dosÃ­tÃ¡sa
+      click_add_marker: JelÃ¶lÅ hozzÃ¡adÃ¡sÃ¡hoz kattints a tÃ©rkÃ©pre
+      drag_a_box: TerÃ¼let kijelÃ¶lÃ©sÃ©hez rajzolj egy nÃ©gyzetet a tÃ©rkÃ©pen
+      export: ExportÃ¡lÃ¡s
+      manually_select: MÃ¡s terÃ¼let kÃ©zi kijelÃ¶lÃ©se
+      view_larger_map: Nagyobb tÃ©rkÃ©p megtekintÃ©se
+  geocoder: 
+    description: 
+      title: 
+        geonames: Helyek a <a href="http://www.geonames.org/">GeoNames</a>rÅl
+        osm_namefinder: "{{types}} az <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>rÅl"
+      types: 
         cities: NagyvÃ¡rosok
-        towns: VÃ¡rosok
         places: Helyek
-    description_osm_namefinder:
+        towns: VÃ¡rosok
+    description_osm_namefinder: 
       prefix: "{{type}}: {{distance}}-re {{direction}}"
-    results:
-      no_results: "Nem talÃ¡lhatÃ³k eredmÃ©nyek"
-    distance:
-      zero: "kevesebb mint 1 km"
-      one: "kb. 1 km"
-      other: "kb. {{count}} km"
-    direction:
-      south_west: "dÃ©lnyugatra"
-      south: "dÃ©lre"
-      south_east: "dÃ©lkeletre"
-      east: "keletre"
-      north_east: "Ã©szakkeletre"
-      north: "Ã©szakra"
-      north_west: "Ã©szaknyugatra"
-      west: "nyugatra"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap logÃ³
-    welcome_user: "ÃdvÃ¶zlÃ¼nk {{user_link}}"
-    welcome_user_link_tooltip: FelhasznÃ¡lÃ³i oldalad
+    direction: 
+      east: keletre
+      north: Ã©szakra
+      north_east: Ã©szakkeletre
+      north_west: Ã©szaknyugatra
+      south: dÃ©lre
+      south_east: dÃ©lkeletre
+      south_west: dÃ©lnyugatra
+      west: nyugatra
+    distance: 
+      one: kb. 1 km
+      other: kb. {{count}} km
+      zero: kevesebb mint 1 km
+    results: 
+      no_results: Nem talÃ¡lhatÃ³k eredmÃ©nyek
+    search: 
+      title: 
+        ca_postcode: EredmÃ©nyek a <a href="http://geocoder.ca/">Geocoder.CA</a>-rÅl
+        geonames: EredmÃ©nyek a <a href="http://www.geonames.org/">GeoNames</a>rÅl
+        latlon: EredmÃ©nyek az <a href="http://openstreetmap.org/">Internal</a>rÃ³l
+        osm_namefinder: EredmÃ©nyek az <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>rÅl
+        uk_postcode: EredmÃ©nyek a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>-rÃ³l
+        us_postcode: EredmÃ©nyek a <a href="http://geocoder.us/">Geocoder.us</a>-rÃ³l
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}}-re {{parentdirection}} innen: {{parentname}})"
+      suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
+      suffix_suburb: "{{suffix}} ({{parentname}})"
+  layouts: 
+    alt_donation: AdomÃ¡nyozz
+    donate: TÃ¡mogasd az OpenStreetMapot a HardverfrissÃ­tÃ©si Alapba tÃ¶rtÃ©nÅ {{link}}sal.
+    donate_link_text: adomÃ¡nyozÃ¡s
+    edit: SzerkesztÃ©s
+    edit_tooltip: TÃ©rkÃ©p szerkesztÃ©se
+    export: ExportÃ¡lÃ¡s
+    export_tooltip: TÃ©rkÃ©padatok exportÃ¡lÃ¡sa
+    gps_traces: Nyomvonalak
+    gps_traces_tooltip: GPS nyomvonalak kezelÃ©se
+    help_wiki: SegÃ­tsÃ©g Ã©s wiki
+    help_wiki_tooltip: SegÃ­tsÃ©g Ã©s wikioldal a projekthez
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/HU:Main_Page
+    history: TÃ¶rtÃ©net
+    history_tooltip: MÃ³dosÃ­tÃ¡scsomagok tÃ¶rtÃ©nete
     home: otthon
     home_tooltip: UgrÃ¡s otthonra
-    inbox: "postalÃ¡da ({{count}})"
-    inbox_tooltip:
-      zero: A postalÃ¡da nem tartalmaz olvasatlan Ã¼zenetet
+    inbox: postalÃ¡da ({{count}})
+    inbox_tooltip: 
       one: A postalÃ¡da 1 olvasatlan Ã¼zenetet tartalmaz
       other: A postalÃ¡da {{count}} olvasatlan Ã¼zenetet tartalmaz
-    logout: kijelentkezÃ©s
-    logout_tooltip: "KijelentkezÃ©s"
+      zero: A postalÃ¡da nem tartalmaz olvasatlan Ã¼zenetet
+    intro_1: Az OpenStreetMap egy szabadon szerkeszthetÅ tÃ©rkÃ©p az egÃ©sz vilÃ¡grÃ³l. Olyan emberek kÃ©szÃ­tik, mint Te.
+    intro_2: Az OpenStreetMap lehetÅvÃ© teszi neked, hogy szabadon megtekintsd, szerkeszd Ã©s hasznÃ¡ld a fÃ¶ldrajzi adatokat, bÃ¡rhol is vagy a FÃ¶ldÃ¶n.
+    intro_3: Az OpenStreetMap hostingjÃ¡t a {{ucl}} Ã©s a {{bytemark}} tÃ¡mogatja.
+    intro_3_bytemark: Bytemark
     log_in: bejelentkezÃ©s
     log_in_tooltip: BejelentkezÃ©s egy meglÃ©vÅ felhasznÃ¡lÃ³i fiÃ³kkal
+    logo: 
+      alt_text: OpenStreetMap logÃ³
+    logout: kijelentkezÃ©s
+    logout_tooltip: KijelentkezÃ©s
+    news_blog: HÃ­rblog
+    news_blog_tooltip: HÃ­rblog az OpenStreetMaprÃ³l, szabad fÃ¶ldrajzi adatokrÃ³l stb.
+    osm_offline: Az OpenStreetMap-adatbÃ¡zis jelenleg offline, mikÃ¶zben alapvetÅ adatbÃ¡zis-karbantartÃ¡si munkÃ¡t vÃ©gzeznek.
+    osm_read_only: Az OpenStreetMap-adatbÃ¡zis jelenleg csak olvashatÃ³, mikÃ¶zben alapvetÅ adatbÃ¡zis-karbantartÃ¡si munkÃ¡t vÃ©gzeznek.
+    shop: Bolt
+    shop_tooltip: Bolt mÃ¡rkÃ¡s OpenStreetMap Ã¡rukkal
     sign_up: regisztrÃ¡ciÃ³
     sign_up_tooltip: Ãj felhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sa szerkesztÃ©shez
+    sotm: Gyere a 2009-es OpenStreetMap-konferenciÃ¡ra, a The State of the Mapra jÃºlius 10-12. Amszterdamba!
+    tag_line: A szabad vilÃ¡gtÃ©rkÃ©p
+    user_diaries: NaplÃ³k
+    user_diaries_tooltip: FelhasznÃ¡lÃ³i naplÃ³k megtekintÃ©se
     view: TÃ©rkÃ©p
     view_tooltip: TÃ©rkÃ©p megjelenÃ­tÃ©se
+    welcome_user: ÃdvÃ¶zlÃ¼nk {{user_link}}
+    welcome_user_link_tooltip: FelhasznÃ¡lÃ³i oldalad
+  map: 
+    coordinates: "KoordinÃ¡tÃ¡k:"
     edit: SzerkesztÃ©s
-    edit_tooltip: TÃ©rkÃ©p szerkesztÃ©se
-    history: TÃ¶rtÃ©net
-    history_tooltip: MÃ³dosÃ­tÃ¡scsomagok tÃ¶rtÃ©nete
-    export: ExportÃ¡lÃ¡s
-    export_tooltip: TÃ©rkÃ©padatok exportÃ¡lÃ¡sa
-    gps_traces: Nyomvonalak
-    gps_traces_tooltip: GPS nyomvonalak kezelÃ©se
-    user_diaries: NaplÃ³k
-    user_diaries_tooltip: FelhasznÃ¡lÃ³i naplÃ³k megtekintÃ©se
-    tag_line: A szabad vilÃ¡gtÃ©rkÃ©p
-    intro_1: "Az OpenStreetMap egy szabadon szerkeszthetÅ tÃ©rkÃ©p az egÃ©sz vilÃ¡grÃ³l. Olyan emberek kÃ©szÃ­tik, mint Te."
-    intro_2: "Az OpenStreetMap lehetÅvÃ© teszi neked, hogy szabadon megtekintsd, szerkeszd Ã©s hasznÃ¡ld a fÃ¶ldrajzi adatokat, bÃ¡rhol is vagy a FÃ¶ldÃ¶n."
-    intro_3: "Az OpenStreetMap hostingjÃ¡t a {{ucl}} Ã©s a {{bytemark}} tÃ¡mogatja."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "Bytemark"
-    osm_offline: "Az OpenStreetMap-adatbÃ¡zis jelenleg offline, mikÃ¶zben alapvetÅ adatbÃ¡zis-karbantartÃ¡si munkÃ¡t vÃ©gzeznek."
-    osm_read_only: "Az OpenStreetMap-adatbÃ¡zis jelenleg csak olvashatÃ³, mikÃ¶zben alapvetÅ adatbÃ¡zis-karbantartÃ¡si munkÃ¡t vÃ©gzeznek."
-    donate: "TÃ¡mogasd az OpenStreetMapot a HardverfrissÃ­tÃ©si Alapba tÃ¶rtÃ©nÅ {{link}}sal."
-    donate_link_text: adomÃ¡nyozÃ¡s
-    help_wiki: "SegÃ­tsÃ©g Ã©s wiki"
-    help_wiki_tooltip: "SegÃ­tsÃ©g Ã©s wikioldal a projekthez"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/HU:Main_Page"
-    news_blog: "HÃ­rblog"
-    news_blog_tooltip: "HÃ­rblog az OpenStreetMaprÃ³l, szabad fÃ¶ldrajzi adatokrÃ³l stb."
-    shop: Bolt
-    shop_tooltip: Bolt mÃ¡rkÃ¡s OpenStreetMap Ã¡rukkal
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Gyere a 2009-es OpenStreetMap-konferenciÃ¡ra, a The State of the Mapra jÃºlius 10-12. Amszterdamba!'
-    alt_donation: AdomÃ¡nyozz
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} hozzÃ¡szÃ³lt a naplÃ³bejegyzÃ©sedhez"
+    view: TÃ©rkÃ©p
+  message: 
+    delete: 
+      deleted: Ãzenet tÃ¶rÃ¶lve
+    inbox: 
+      date: Ãrkezett
+      from: FeladÃ³
+      my_inbox: BeÃ©rkezett Ã¼zenetek
+      no_messages_yet: Nincs mÃ©g Ã¼zeneted. MiÃ©rt nem veszed fel a kapcsolatot nÃ©hÃ¡ny {{people_mapping_nearby_link}}vel?
+      outbox: ElkÃ¼ldÃ¶tt Ã¼zenetek
+      people_mapping_nearby: kÃ¶zeli tÃ©rkÃ©pszerkesztÅ
+      subject: TÃ¡rgy
+      title: BeÃ©rkezett Ã¼zenetek
+      you_have: "{{new_count}} Ãºj Ã¼zeneted Ã©s {{old_count}} rÃ©gi Ã¼zeneted van"
+    mark: 
+      as_read: Ãzenet megjelÃ¶lve olvasottkÃ©nt
+      as_unread: Ãzenet megjelÃ¶lve olvasatlankÃ©nt
+    message_summary: 
+      delete_button: TÃ¶rlÃ©s
+      read_button: JelÃ¶lÃ©s olvasottkÃ©nt
+      reply_button: VÃ¡lasz
+      unread_button: JelÃ¶lÃ©s olvasatlankÃ©nt
+    new: 
+      back_to_inbox: Vissza a beÃ©rkezett Ã¼zenetekhez
+      body: SzÃ¶veg
+      message_sent: Ãzenet elkÃ¼ldve
+      send_button: KÃ¼ldÃ©s
+      send_message_to: "Ãj Ã¼zenet kÃ¼ldÃ©se neki: {{name}}"
+      subject: TÃ¡rgy
+      title: Ãzenet kÃ¼ldÃ©se
+    no_such_user: 
+      body: SajnÃ¡lom, nincs felhasznÃ¡lÃ³ vagy Ã¼zenet ezzel a nÃ©vvel vagy azonosÃ­tÃ³val
+      heading: Nincs ilyen felhasznÃ¡lÃ³ vagy Ã¼zenet
+      title: Nincs ilyen felhasznÃ¡lÃ³ vagy Ã¼zenet
+    outbox: 
+      date: ElkÃ¼ldve
+      inbox: BeÃ©rkezett Ã¼zenetek
+      my_inbox: "{{inbox_link}}"
+      no_sent_messages: Nincs mÃ©g elkÃ¼ldÃ¶tt Ã¼zeneted. MiÃ©rt nem veszed fel a kapcsolatot nÃ©hÃ¡ny {{people_mapping_nearby_link}}vel?
+      outbox: ElkÃ¼ldÃ¶tt Ã¼zenetek
+      people_mapping_nearby: kÃ¶zeli tÃ©rkÃ©pszerkesztÅ
+      subject: TÃ¡rgy
+      title: ElkÃ¼ldÃ¶tt Ã¼zenetek
+      to: CÃ­mzett
+      you_have_sent_messages: "{{sent_count}} elkÃ¼ldÃ¶tt Ã¼zeneted van"
+    read: 
+      back_to_inbox: Vissza a beÃ©rkezett Ã¼zenetekhez
+      back_to_outbox: Vissza az elkÃ¼ldÃ¶tt Ã¼zenetekhez
+      date: Ãrkezett
+      from: FeladÃ³
+      reading_your_messages: Ãzenetek olvasÃ¡sa
+      reading_your_sent_messages: ElkÃ¼ldÃ¶tt Ã¼zenetek olvasÃ¡sa
+      reply_button: VÃ¡lasz
+      subject: TÃ¡rgy
+      title: Ãzenet olvasÃ¡sa
+      to: CÃ­mzett
+      unread_button: JelÃ¶lÃ©s olvasatlankÃ©nt
+    sent_message_summary: 
+      delete_button: TÃ¶rlÃ©s
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                 Kerlek, ne vÃ¡laszolj erre az e-mailre.                  *"
       banner2: "*           VÃ¡laszolÃ¡shoz hasznÃ¡ld az OpenStreetMap webhelyet.            *"
-      hi: "Szia {{to_user}}!"
-      header: "{{from_user}} hozzÃ¡szÃ³lt a legutÃ³bbi OpenStreetMap naplÃ³bejegyzÃ©sedhez {{subject}} tÃ¡rggyal:"
       footer: "A hozzÃ¡szÃ³lÃ¡st elolvashatod itt is: {{readurl}} Ã©s hozzÃ¡szÃ³lhatsz itt: {{commenturl}} vagy vÃ¡laszolhatsz rÃ¡ itt: {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} kÃ¼ldÃ¶tt neked egy Ãºj Ã¼zenetet"
-      banner1: "*                 Kerlek, ne vÃ¡laszolj erre az e-mailre.                  *"
-      banner2: "*           VÃ¡laszolÃ¡shoz hasznÃ¡ld az OpenStreetMap webhelyet.            *"
-      hi: "Szia {{to_user}}!"
-      header: "{{from_user}} kÃ¼ldÃ¶tt neked egy Ã¼zenetet az OpenStreetMapon keresztÃ¼l {{subject}} tÃ¡rggyal:"
-      footer1: "Az Ã¼zenetet elolvashatod itt is: {{readurl}}"
-      footer2: "Ã©s vÃ¡laszolhatsz rÃ¡ itt: {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} felvett a barÃ¡tai kÃ¶zÃ©"
+      header: "{{from_user}} hozzÃ¡szÃ³lt a legutÃ³bbi OpenStreetMap naplÃ³bejegyzÃ©sedhez {{subject}} tÃ¡rggyal:"
+      hi: Szia {{to_user}}!
+      subject: "[OpenStreetMap] {{user}} hozzÃ¡szÃ³lt a naplÃ³bejegyzÃ©sedhez"
+    email_confirm: 
+      subject: "[OpenStreetMap] E-mail cÃ­m megerÅsÃ­tÃ©se"
+    email_confirm_html: 
+      click_the_link: Ha ez Te vagy, akkor a mÃ³dosÃ­tÃ¡s megerÅsÃ­tÃ©sÃ©hez kattints az alÃ¡bbi hivatkozÃ¡sra.
+      greeting: Szia!
+      hopefully_you: "Valaki (remÃ©lhetÅleg Te) meg szeretnÃ© vÃ¡ltoztatni az e-mail cÃ­mÃ©t errÅl: {{server_url}} erre: {{new_address}}."
+    email_confirm_plain: 
+      click_the_link: Ha ez Te vagy, akkor a mÃ³dosÃ­tÃ¡s megerÅsÃ­tÃ©sÃ©hez kattints az alÃ¡bbi hivatkozÃ¡sra.
+      greeting: Szia!
+      hopefully_you_1: "Valaki (remÃ©lhetÅleg Te) meg szeretnÃ© vÃ¡ltoztatni az e-mail cÃ­mÃ©t errÅl:"
+      hopefully_you_2: "{{server_url}} erre: {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} felvett a barÃ¡tai kÃ¶zÃ© az OpenStreetMapon."
       see_their_profile: "MegnÃ©zheted a profiljÃ¡t itt: {{userurl}} Ã©s felveheted Åt is barÃ¡tnak, ha szeretnÃ©d."
-    gpx_notification:
-      greeting: "Szia!"
-      your_gpx_file: "Ãgy tÅ±nik, hogy ez a GPX fÃ¡jlod:"
-      with_description: "ezzel a leÃ­rÃ¡ssal:"
+      subject: "[OpenStreetMap] {{user}} felvett a barÃ¡tai kÃ¶zÃ©"
+    gpx_notification: 
+      and_no_tags: Ã©s cÃ­mkÃ©k nÃ©lkÃ¼l
       and_the_tags: "Ã©s a kÃ¶vetkezÅ cÃ­mkÃ©kkel:"
-      and_no_tags: "Ã©s cÃ­mkÃ©k nÃ©lkÃ¼l"
-      failure:
-        subject: "[OpenStreetMap] GPX importÃ¡lÃ¡s sikertelen"
+      failure: 
         failed_to_import: "importÃ¡lÃ¡sa sikertelen. Ez a hiba:"
-        more_info_1: "TovÃ¡bbi informÃ¡ciÃ³ a GPX importÃ¡lÃ¡s sikertelensÃ©geirÅl Ã©s"
+        more_info_1: TovÃ¡bbi informÃ¡ciÃ³ a GPX importÃ¡lÃ¡s sikertelensÃ©geirÅl Ã©s
         more_info_2: "megelÅzÃ©sÃ©rÅl itt talÃ¡lhatÃ³:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX importÃ¡lÃ¡s sikertelen"
+      greeting: Szia!
+      success: 
+        loaded_successfully: "sikeresen betÃ¶ltÅdÃ¶tt {{trace_points}} ponttal a lehetsÃ©ges\n{{possible_points}} pontbÃ³l."
         subject: "[OpenStreetMap] GPX importÃ¡lÃ¡s sikeres"
-        loaded_successfully: |
-          sikeresen betÃ¶ltÅdÃ¶tt {{trace_points}} ponttal a lehetsÃ©ges
-          {{possible_points}} pontbÃ³l.
-    signup_confirm:
+      with_description: "ezzel a leÃ­rÃ¡ssal:"
+      your_gpx_file: "Ãgy tÅ±nik, hogy ez a GPX fÃ¡jlod:"
+    lost_password: 
+      subject: "[OpenStreetMap] JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡nak kÃ©rÃ©se"
+    lost_password_html: 
+      click_the_link: Ha ez Te vagy, akkor a jelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡hoz kattints az alÃ¡bbi hivatkozÃ¡sra.
+      greeting: Szia!
+      hopefully_you: Valaki (esetleg Te) kÃ©rte, hogy az ehhez az e-mail cÃ­mhez tartozÃ³ openstreetmap.org felhasznÃ¡lÃ³i fiÃ³k jelszava kerÃ¼ljÃ¶n alaphelyzetbe.
+    lost_password_plain: 
+      click_the_link: Ha ez Te vagy, akkor a jelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡hoz kattints az alÃ¡bbi hivatkozÃ¡sra.
+      greeting: Szia!
+      hopefully_you_1: Valaki (esetleg Te) kÃ©rte, hogy az ehhez az e-mail cÃ­mhez tartozÃ³
+      hopefully_you_2: openstreetmap.org felhasznÃ¡lÃ³i fiÃ³k jelszava kerÃ¼ljÃ¶n alaphelyzetbe.
+    message_notification: 
+      banner1: "*                 Kerlek, ne vÃ¡laszolj erre az e-mailre.                  *"
+      banner2: "*           VÃ¡laszolÃ¡shoz hasznÃ¡ld az OpenStreetMap webhelyet.            *"
+      footer1: "Az Ã¼zenetet elolvashatod itt is: {{readurl}}"
+      footer2: "Ã©s vÃ¡laszolhatsz rÃ¡ itt: {{replyurl}}"
+      header: "{{from_user}} kÃ¼ldÃ¶tt neked egy Ã¼zenetet az OpenStreetMapon keresztÃ¼l {{subject}} tÃ¡rggyal:"
+      hi: Szia {{to_user}}!
+      subject: "[OpenStreetMap] {{user}} kÃ¼ldÃ¶tt neked egy Ãºj Ã¼zenetet"
+    signup_confirm: 
       subject: "[OpenStreetMap] E-mail cÃ­m megerÅsÃ­tÃ©se"
-    signup_confirm_plain:
-      greeting: "Szia!"
+    signup_confirm_html: 
+      click_the_link: Ha ez Te vagy, Ã¼dvÃ¶zlÃ¼nk! Kattints az alÃ¡bbi hivatkozÃ¡sra a felhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tÃ©sÃ©hez Ã©s tovÃ¡bbi informÃ¡ciÃ³k olvasÃ¡sÃ¡hoz az OpenStreetMaprÃ³l.
+      current_user: "A jelenlegi felhasznÃ¡lÃ³k listÃ¡ja kategÃ³riÃ¡kban, annak megfelelÅen, hogy hol vannak a vilÃ¡gban, elÃ©rhetÅ innen: <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Category:Users_by_geographical_region</a>."
+      get_reading: Olvass az OpenStreetMaprÃ³l <a href="http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide">a wikiben</a> vagy <a href="http://www.opengeodata.org/">az opengeodata blogon</a>, aminek vannak <a href="http://www.opengeodata.org/?cat=13">hallgathatÃ³ podcastjai</a> is!
+      greeting: Szia!
+      hopefully_you: "Valaki (remÃ©lhetÅleg Te) kÃ©szÃ­tene egy felhasznÃ¡lÃ³i fiÃ³kot itt:"
+      introductory_video: MegnÃ©zhetsz egy {{introductory_video_link}}.
+      more_videos: "{{more_videos_link}}."
+      more_videos_here: TovÃ¡bbi videÃ³k itt
+      user_wiki_page: AjÃ¡nlott, hogy kÃ©szÃ­ts egy wiki oldalt, ami tartalmaz kategÃ³riacÃ­mkÃ©ket annak megfelelÅen, ahol vagy. PÃ©ldÃ¡ul <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Budapest">[[Category:Users_in_Budapest]]</a>.
+      video_to_openstreetmap: bevezetÅ videÃ³t az OpenStreetMaphoz
+      wiki_signup: SzintÃ©n <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">regisztrÃ¡lhatsz az OpenStreetMap wikibe</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Ha ez Te vagy, Ã¼dvÃ¶zlÃ¼nk! Kattints az alÃ¡bbi hivatkozÃ¡sra a felhasznÃ¡lÃ³i
+      click_the_link_2: fiÃ³kod megerÅsÃ­tÃ©sÃ©hez Ã©s tovÃ¡bbi informÃ¡ciÃ³k olvasÃ¡sÃ¡hoz az OpenStreetMaprÃ³l.
+      current_user_1: A jelenlegi felhasznÃ¡lÃ³k listÃ¡ja kategÃ³riÃ¡kban, annak megfelelÅen,
+      current_user_2: "hogy hol vannak a vilÃ¡gban, elÃ©rhetÅ innen:"
+      greeting: Szia!
       hopefully_you: "Valaki (remÃ©lhetÅleg Te) kÃ©szÃ­tene egy felhasznÃ¡lÃ³i fiÃ³kot itt:"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Ha ez Te vagy, Ã¼dvÃ¶zlÃ¼nk! Kattints az alÃ¡bbi hivatkozÃ¡sra a felhasznÃ¡lÃ³i"
-      click_the_link_2: "fiÃ³kod megerÅsÃ­tÃ©sÃ©hez Ã©s tovÃ¡bbi informÃ¡ciÃ³k olvasÃ¡sÃ¡hoz az OpenStreetMaprÃ³l."
       introductory_video: "MegnÃ©zhetsz egy bevezetÅ videÃ³t az OpenStreetMaphez itt:"
       more_videos: "TovÃ¡bbi videÃ³kat talÃ¡lsz itt:"
-      the_wiki: "Olvass az OpenStreetMaprÃ³l a wikiben:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide"
       opengeodata: "Az OpenGeoData.org az OpenStreetMap blogja, Ã©s vannak podcastjai is:"
+      the_wiki: "Olvass az OpenStreetMaprÃ³l a wikiben:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide
+      user_wiki_1: AjÃ¡nlott, hogy kÃ©szÃ­ts egy wiki oldalt, ami tartalmaz kategÃ³riacÃ­mkÃ©ket
+      user_wiki_2: annak megfelelÅen, ahol vagy. PÃ©ldÃ¡ul [[Category:Users_in_Budapest]].
       wiki_signup: "SzintÃ©n regisztrÃ¡lhatsz az OpenStreetMap wikibe itt:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "AjÃ¡nlott, hogy kÃ©szÃ­ts egy wiki oldalt, ami tartalmaz kategÃ³riacÃ­mkÃ©ket"
-      user_wiki_2: "annak megfelelÅen, ahol vagy. PÃ©ldÃ¡ul [[Category:Users_in_Budapest]]."
-      current_user_1: "A jelenlegi felhasznÃ¡lÃ³k listÃ¡ja kategÃ³riÃ¡kban, annak megfelelÅen,"
-      current_user_2: "hogy hol vannak a vilÃ¡gban, elÃ©rhetÅ innen:"
-    signup_confirm_html:
-      greeting: "Szia!"
-      hopefully_you: "Valaki (remÃ©lhetÅleg Te) kÃ©szÃ­tene egy felhasznÃ¡lÃ³i fiÃ³kot itt:"
-      click_the_link: "Ha ez Te vagy, Ã¼dvÃ¶zlÃ¼nk! Kattints az alÃ¡bbi hivatkozÃ¡sra a felhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tÃ©sÃ©hez Ã©s tovÃ¡bbi informÃ¡ciÃ³k olvasÃ¡sÃ¡hoz az OpenStreetMaprÃ³l."
-      introductory_video: "MegnÃ©zhetsz egy {{introductory_video_link}}."
-      video_to_openstreetmap: "bevezetÅ videÃ³t az OpenStreetMaphoz"
-      more_videos: "{{more_videos_link}}."
-      more_videos_here: "TovÃ¡bbi videÃ³k itt"
-      get_reading: 'Olvass az OpenStreetMaprÃ³l <a href="http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide">a wikiben</a> vagy <a href="http://www.opengeodata.org/">az opengeodata blogon</a>, aminek vannak <a href="http://www.opengeodata.org/?cat=13">hallgathatÃ³ podcastjai</a> is!'
-      wiki_signup: 'SzintÃ©n <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">regisztrÃ¡lhatsz az OpenStreetMap wikibe</a>.'
-      user_wiki_page: 'AjÃ¡nlott, hogy kÃ©szÃ­ts egy wiki oldalt, ami tartalmaz kategÃ³riacÃ­mkÃ©ket annak megfelelÅen, ahol vagy. PÃ©ldÃ¡ul <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Budapest">[[Category:Users_in_Budapest]]</a>.'
-      current_user: 'A jelenlegi felhasznÃ¡lÃ³k listÃ¡ja kategÃ³riÃ¡kban, annak megfelelÅen, hogy hol vannak a vilÃ¡gban, elÃ©rhetÅ innen: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] E-mail cÃ­m megerÅsÃ­tÃ©se"
-    email_confirm_plain:
-      greeting: "Szia!"
-      hopefully_you_1: "Valaki (remÃ©lhetÅleg Te) meg szeretnÃ© vÃ¡ltoztatni az e-mail cÃ­mÃ©t errÅl:"
-      hopefully_you_2: "{{server_url}} erre: {{new_address}}."
-      click_the_link: "Ha ez Te vagy, akkor a mÃ³dosÃ­tÃ¡s megerÅsÃ­tÃ©sÃ©hez kattints az alÃ¡bbi hivatkozÃ¡sra."
-    email_confirm_html:
-      greeting: "Szia!"
-      hopefully_you: "Valaki (remÃ©lhetÅleg Te) meg szeretnÃ© vÃ¡ltoztatni az e-mail cÃ­mÃ©t errÅl: {{server_url}} erre: {{new_address}}."
-      click_the_link: "Ha ez Te vagy, akkor a mÃ³dosÃ­tÃ¡s megerÅsÃ­tÃ©sÃ©hez kattints az alÃ¡bbi hivatkozÃ¡sra."
-    lost_password:
-      subject: "[OpenStreetMap] JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡nak kÃ©rÃ©se"
-    lost_password_plain:
-      greeting: "Szia!"
-      hopefully_you_1: "Valaki (esetleg Te) kÃ©rte, hogy az ehhez az e-mail cÃ­mhez tartozÃ³"
-      hopefully_you_2: "openstreetmap.org felhasznÃ¡lÃ³i fiÃ³k jelszava kerÃ¼ljÃ¶n alaphelyzetbe."
-      click_the_link: "Ha ez Te vagy, akkor a jelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡hoz kattints az alÃ¡bbi hivatkozÃ¡sra."
-    lost_password_html:
-      greeting: "Szia!"
-      hopefully_you: "Valaki (esetleg Te) kÃ©rte, hogy az ehhez az e-mail cÃ­mhez tartozÃ³ openstreetmap.org felhasznÃ¡lÃ³i fiÃ³k jelszava kerÃ¼ljÃ¶n alaphelyzetbe."
-      click_the_link: "Ha ez Te vagy, akkor a jelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sÃ¡hoz kattints az alÃ¡bbi hivatkozÃ¡sra."
-  message:
-    inbox:
-      title: "BeÃ©rkezett Ã¼zenetek"
-      my_inbox: "BeÃ©rkezett Ã¼zenetek"
-      outbox: "ElkÃ¼ldÃ¶tt Ã¼zenetek"
-      you_have: "{{new_count}} Ãºj Ã¼zeneted Ã©s {{old_count}} rÃ©gi Ã¼zeneted van"
-      from: "FeladÃ³"
-      subject: "TÃ¡rgy"
-      date: "Ãrkezett"
-      no_messages_yet: "Nincs mÃ©g Ã¼zeneted. MiÃ©rt nem veszed fel a kapcsolatot nÃ©hÃ¡ny {{people_mapping_nearby_link}}vel?"
-      people_mapping_nearby: "kÃ¶zeli tÃ©rkÃ©pszerkesztÅ" 
-    message_summary:
-      unread_button: "JelÃ¶lÃ©s olvasatlankÃ©nt"
-      read_button: "JelÃ¶lÃ©s olvasottkÃ©nt"
-      reply_button: "VÃ¡lasz"
-      delete_button: "TÃ¶rlÃ©s"
-    new:
-      title: "Ãzenet kÃ¼ldÃ©se"
-      send_message_to: "Ãj Ã¼zenet kÃ¼ldÃ©se neki: {{name}}"
-      subject: "TÃ¡rgy"
-      body: "SzÃ¶veg"
-      send_button: "KÃ¼ldÃ©s"
-      back_to_inbox: "Vissza a beÃ©rkezett Ã¼zenetekhez"
-      message_sent: "Ãzenet elkÃ¼ldve"
-    no_such_user:
-      title: "Nincs ilyen felhasznÃ¡lÃ³ vagy Ã¼zenet"
-      heading: "Nincs ilyen felhasznÃ¡lÃ³ vagy Ã¼zenet"
-      body: "SajnÃ¡lom, nincs felhasznÃ¡lÃ³ vagy Ã¼zenet ezzel a nÃ©vvel vagy azonosÃ­tÃ³val"
-    outbox: 
-      title: "ElkÃ¼ldÃ¶tt Ã¼zenetek"
-      my_inbox: "{{inbox_link}}"
-      inbox: "BeÃ©rkezett Ã¼zenetek"
-      outbox: "ElkÃ¼ldÃ¶tt Ã¼zenetek"
-      you_have_sent_messages: "{{sent_count}} elkÃ¼ldÃ¶tt Ã¼zeneted van"
-      to: "CÃ­mzett"
-      subject: "TÃ¡rgy"
-      date: "ElkÃ¼ldve"
-      no_sent_messages: "Nincs mÃ©g elkÃ¼ldÃ¶tt Ã¼zeneted. MiÃ©rt nem veszed fel a kapcsolatot nÃ©hÃ¡ny {{people_mapping_nearby_link}}vel?"
-      people_mapping_nearby: "kÃ¶zeli tÃ©rkÃ©pszerkesztÅ"
-    read:
-      title: "Ãzenet olvasÃ¡sa"
-      reading_your_messages: "Ãzenetek olvasÃ¡sa"
-      from: "FeladÃ³"
-      subject: "TÃ¡rgy"
-      date: "Ãrkezett"
-      reply_button: "VÃ¡lasz"
-      unread_button: "JelÃ¶lÃ©s olvasatlankÃ©nt"
-      back_to_inbox: "Vissza a beÃ©rkezett Ã¼zenetekhez"
-      reading_your_sent_messages: "ElkÃ¼ldÃ¶tt Ã¼zenetek olvasÃ¡sa"
-      to: "CÃ­mzett"
-      back_to_outbox: "Vissza az elkÃ¼ldÃ¶tt Ã¼zenetekhez"
-    sent_message_summary:
-      delete_button: "TÃ¶rlÃ©s"
-    mark:
-      as_read: "Ãzenet megjelÃ¶lve olvasottkÃ©nt"
-      as_unread: "Ãzenet megjelÃ¶lve olvasatlankÃ©nt"
-    delete:
-      deleted: "Ãzenet tÃ¶rÃ¶lve"
-  site:
-    index:
-      js_1: "Vagy egy olyan bÃ¶ngÃ©szÅt hasznÃ¡lsz, amely nem tÃ¡mogatja a javascriptet, vagy letiltottad a javascriptet."
-      js_2: "Az OpenStreetMap javascriptet hasznÃ¡l a slippy maphoz."
-      js_3: 'MegprÃ³bÃ¡lhatod a <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statikus csempebÃ¶ngÃ©szÅ</a>t, ha nem tudod engedÃ©lyezni a javascriptet.'
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: magÃ¡n GPS nyomvonalak olvasÃ¡sa.
+      allow_read_prefs: felhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡sok olvasÃ¡sa.
+      allow_to: "Az alÃ¡bbiak engedÃ©lyezÃ©se a kliensalkalmazÃ¡snak:"
+      allow_write_api: a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa.
+      allow_write_diary: naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa.
+      allow_write_gpx: GPS nyomvonalak feltÃ¶ltÃ©se.
+      allow_write_prefs: felhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡sok mÃ³dosÃ­tÃ¡sa.
+      request_access: A(z) {{app_name}} alkalmazÃ¡s hozzÃ¡fÃ©rÃ©st kÃ©r a felhasznÃ¡lÃ³i fiÃ³kodhoz. KÃ©rlek, jelÃ¶ld, ha azt szeretnÃ©d, hogy az alkalmazÃ¡s rendelkezzen a kÃ¶vetkezÅ kÃ©pessÃ©gekkel. VÃ¡laszthatsz olyan sokat vagy keveset, amennyit szeretnÃ©l.
+    revoke: 
+      flash: Visszavontad az utalvÃ¡nyt a(z) {{application}} alkalmazÃ¡shoz
+  oauth_clients: 
+    create: 
+      flash: Az informÃ¡ciÃ³ sikeresen regisztrÃ¡lva
+    destroy: 
+      flash: A kliensalkalmazÃ¡s regisztrÃ¡ciÃ³ja tÃ¶rÃ¶lve
+    edit: 
+      submit: SzerkesztÃ©s
+      title: AlkalmazÃ¡s szerkesztÃ©se
+    form: 
+      allow_read_gpx: magÃ¡n GPS nyomvonalainak olvasÃ¡sa.
+      allow_read_prefs: felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak olvasÃ¡sa.
+      allow_write_api: a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa.
+      allow_write_diary: naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa.
+      allow_write_gpx: GPS nyomvonalak feltÃ¶ltÃ©se.
+      allow_write_prefs: felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak mÃ³dosÃ­tÃ¡sa.
+      callback_url: Callback URL
+      name: NÃ©v
+      requests: "A kÃ¶vetkezÅ engedÃ©lyek kÃ©rÃ©se a felhasznÃ¡lÃ³tÃ³l:"
+      required: SzÃ¼ksÃ©ges
+      support_url: Support URL
+      url: Main Application URL
+    index: 
+      application: AlkalmazÃ¡s neve
+      issued_at: KibocsÃ¡tva ekkor
+      list_tokens: "A kÃ¶vetkezÅ utalvÃ¡nyok kerÃ¼ltek kibocsÃ¡tÃ¡sra a nevedben:"
+      my_apps: KliensalkalmazÃ¡sok
+      my_tokens: EngedÃ©lyezett alkalmazÃ¡sok
+      no_apps: Van olyan alkalmazÃ¡sod, amit szeretnÃ©l regisztrÃ¡lni a velÃ¼nk valÃ³ hasznÃ¡lathoz a(z) {{oauth}} szabvÃ¡ny hasznÃ¡latÃ¡val? RegisztrÃ¡lnod kell a webalkalmazÃ¡sod, mielÅtt OAuth kÃ©rÃ©seket kÃ¼ld ehhez a szolgÃ¡ltatÃ¡shoz.
+      register_new: AlkalmazÃ¡s regisztrÃ¡lÃ¡sa
+      registered_apps: "A kÃ¶vetkezÅ kliensalkalmazÃ¡sok vannak regisztrÃ¡lva:"
+      revoke: VisszavonÃ¡s!"
+      title: OAuth rÃ©szletek
+    new: 
+      submit: RegisztrÃ¡lÃ¡s
+      title: Ãj alkalmazÃ¡s regisztrÃ¡lÃ¡sa
+    not_found: 
+      sorry: SajnÃ¡lom, a(z) {{type}} nem talÃ¡lhatÃ³.
+    show: 
+      access_url: "Access Token URL:"
+      allow_read_gpx: magÃ¡n GPS nyomvonalainak olvasÃ¡sa.
+      allow_read_prefs: felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak olvasÃ¡sa.
+      allow_write_api: a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa.
+      allow_write_diary: naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa.
+      allow_write_gpx: GPS nyomvonalak feltÃ¶ltÃ©se.
+      allow_write_prefs: felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak mÃ³dosÃ­tÃ¡sa.
+      authorize_url: "Authorise URL:"
+      edit: RÃ©szletek szerkesztÃ©se
+      key: "Consumer Key:"
+      requests: "A kÃ¶vetkezÅ engedÃ©lyek kÃ©rÃ©se a felhasznÃ¡lÃ³tÃ³l:"
+      secret: "Consumer Secret:"
+      support_notice: TÃ¡mogatjuk a hmac-sha1 hitelesÃ­tÃ©st (ajÃ¡nlott), valamint a sima szÃ¶veget ssl mÃ³dban.
+      title: "{{app_name}} OAuth rÃ©szletei"
+      url: "Request Token URL:"
+    update: 
+      flash: A kliens informÃ¡ciÃ³i sikeresen frissÃ­tve
+  site: 
+    edit: 
+      anon_edits_link_text: NÃ©zz utÃ¡na, miÃ©rt van ez.
+      flash_player_required: A Potlatch, az OpenStreetMap Flash szerkesztÅ hasznÃ¡latÃ¡hoz Flash Player szÃ¼ksÃ©ges. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">LetÃ¶ltheted a Flash Playert az Adobe.com-rÃ³l</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">SzÃ¡mos mÃ¡s lehetÅsÃ©g</a> is elÃ©rhetÅ az OpenStreetMap szerkesztÃ©sÃ©hez.
+      not_public: Nem Ã¡llÃ­tottad a szerkesztÃ©seidet nyilvÃ¡nossÃ¡.
+      not_public_description: Nem szerkesztheted tovÃ¡bb a tÃ©rkÃ©pet, amÃ­g nem teszed meg. NyilvÃ¡nossÃ¡ teheted szerkesztÃ©seidet a {{user_page}}adrÃ³l.
+      potlatch_unsaved_changes: Nem mentett mÃ³dosÃ­tÃ¡sok vannak. (Potlatchban valÃ³ mentÃ©shez szÃ¼ntesd meg a jelenlegi vonal vagy pont kijelÃ¶lÃ©sÃ©t, ha Ã©lÅ mÃ³dban szerkesztesz, vagy kattints a mentÃ©sre, ha van mentÃ©s gomb.)
+      user_page_link: felhasznÃ¡lÃ³i oldal
+    index: 
+      js_1: Vagy egy olyan bÃ¶ngÃ©szÅt hasznÃ¡lsz, amely nem tÃ¡mogatja a javascriptet, vagy letiltottad a javascriptet.
+      js_2: Az OpenStreetMap javascriptet hasznÃ¡l a slippy maphoz.
+      js_3: MegprÃ³bÃ¡lhatod a <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statikus csempebÃ¶ngÃ©szÅ</a>t, ha nem tudod engedÃ©lyezni a javascriptet.
+      license: 
+        license_name: Creative Commons Nevezd meg!-Ãgy add tovÃ¡bb! 2.0
+        notice: "{{license_name}} licenc alatt az {{project_name}} Ã©s hozzÃ¡jÃ¡rulÃ³i Ã¡ltal."
+        project_name: OpenStreetMap projekt
       permalink: Permalink
       shortlink: Shortlink
-      license:
-        notice: "{{license_name}} licenc alatt az {{project_name}} Ã©s hozzÃ¡jÃ¡rulÃ³i Ã¡ltal."
-        license_name: "Creative Commons Nevezd meg!-Ãgy add tovÃ¡bb! 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/deed.hu"
-        project_name: "OpenStreetMap projekt"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "Nem Ã¡llÃ­tottad a szerkesztÃ©seidet nyilvÃ¡nossÃ¡."
-      not_public_description: "Nem szerkesztheted tovÃ¡bb a tÃ©rkÃ©pet, amÃ­g nem teszed meg. NyilvÃ¡nossÃ¡ teheted szerkesztÃ©seidet a {{user_page}}adrÃ³l."
-      user_page_link: felhasznÃ¡lÃ³i oldal
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "NÃ©zz utÃ¡na, miÃ©rt van ez."
-      flash_player_required: 'A Potlatch, az OpenStreetMap Flash szerkesztÅ hasznÃ¡latÃ¡hoz Flash Player szÃ¼ksÃ©ges. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">LetÃ¶ltheted a Flash Playert az Adobe.com-rÃ³l</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">SzÃ¡mos mÃ¡s lehetÅsÃ©g</a> is elÃ©rhetÅ az OpenStreetMap szerkesztÃ©sÃ©hez.'
-      potlatch_unsaved_changes: "Nem mentett mÃ³dosÃ­tÃ¡sok vannak. (Potlatchban valÃ³ mentÃ©shez szÃ¼ntesd meg a jelenlegi vonal vagy pont kijelÃ¶lÃ©sÃ©t, ha Ã©lÅ mÃ³dban szerkesztesz, vagy kattints a mentÃ©sre, ha van mentÃ©s gomb.)"
-    sidebar:
-      search_results: KeresÃ©s eredmÃ©nyei
-      close: BezÃ¡r
-    search:
-      search: KeresÃ©s
-      where_am_i: "Hol vagyok?"
-      submit_text: "Go"
-      search_help: "pÃ©ldÃ¡k: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near KaposvÃ¡r' <a href='http://wiki.openstreetmap.org/wiki/Search'>tovÃ¡bbi pÃ©ldÃ¡k...</a>"
-    key:
-      map_key: "JelmagyarÃ¡zat"
-      map_key_tooltip: "JelmagyarÃ¡zat a Mapnik renderelÃ©shez ezen a nagyÃ­tÃ¡si szinten"
-      table:
-        heading: "JelmagyarÃ¡zat z{{zoom_level}}"
-        entry:
-          motorway: "AutÃ³pÃ¡lya"
-          trunk: "AutÃ³Ãºt"
-          primary: "FÅÃºt"
-          secondary: "ÃsszekÃ¶tÅ Ãºt"
-          unclassified: "EgyÃ©b Ãºt"
-          unsurfaced: "Burkolatlan Ãºt"
-          track: "FÃ¶ldÃºt"
-          byway: "ÃsvÃ©ny"
-          bridleway: "LovaglÃ³Ãºt"
-          cycleway: "KerÃ©kpÃ¡rÃºt"
-          footway: "GyalogÃºt"
-          rail: "VasÃºt"
-          subway: "MetrÃ³"
-          tram:
-            - HÃV
-            - villamos
-          cable:
-            - FÃ¼lkÃ©s
-            - fÃ¼ggÅszÃ©kes felvonÃ³
-          runway:
-            - KifutÃ³pÃ¡lya
-            - gurulÃ³Ãºt
-          apron:
+    key: 
+      map_key: JelmagyarÃ¡zat
+      map_key_tooltip: JelmagyarÃ¡zat a Mapnik renderelÃ©shez ezen a nagyÃ­tÃ¡si szinten
+      table: 
+        entry: 
+          admin: KÃ¶zigazgatÃ¡si hatÃ¡r
+          allotments: Kert
+          apron: 
             - Forgalmi elÅtÃ©r
             - utasterminÃ¡l
-          admin: "KÃ¶zigazgatÃ¡si hatÃ¡r"
-          forest: "ErdÅ"
-          wood: "ErdÅ"
-          golf: "GolfpÃ¡lya"
-          park: "Park"
-          resident: "Gyalogos Ã¶vezet"
-          tourist: "Turisztikai lÃ¡tvÃ¡nyossÃ¡g"
-          common:
+          bridge: Fekete szegÃ©ly = hÃ­d
+          bridleway: LovaglÃ³Ãºt
+          brownfield: BontÃ¡si terÃ¼let
+          building: Fontosabb Ã©pÃ¼let
+          byway: ÃsvÃ©ny
+          cable: 
+            - FÃ¼lkÃ©s
+            - fÃ¼ggÅszÃ©kes felvonÃ³
+          cemetery: TemetÅ
+          centre: SportkÃ¶zpont
+          commercial: IrodaterÃ¼let
+          common: 
             - FÃ¼ves terÃ¼let
             - rÃ©t
-          retail: "Kereskedelmi terÃ¼let"
-          industrial: "Ipari terÃ¼let"
-          commercial: "IrodaterÃ¼let"
-          heathland: "KopÃ¡r terÃ¼let"
-          lake:
+          construction: Utak Ã©pÃ­tÃ©s alatt
+          cycleway: KerÃ©kpÃ¡rÃºt
+          destination: Csak cÃ©lforgalom
+          farm: Tanya
+          footway: GyalogÃºt
+          forest: ErdÅ
+          golf: GolfpÃ¡lya
+          heathland: KopÃ¡r terÃ¼let
+          industrial: Ipari terÃ¼let
+          lake: 
             - TÃ³
             - vÃ­ztÃ¡rozÃ³
-          farm: "Tanya"
-          brownfield: "BontÃ¡si terÃ¼let"
-          cemetery: "TemetÅ"
-          allotments: "Kert"
-          pitch: "LabdarÃºgÃ³pÃ¡lya"
-          centre: "SportkÃ¶zpont"
-          reserve: "TermÃ©szetvÃ©delmi terÃ¼let"
-          military: "Katonai terÃ¼let"
-          school:
+          military: Katonai terÃ¼let
+          motorway: AutÃ³pÃ¡lya
+          park: Park
+          permissive: BehajtÃ¡s engedÃ©lyezett
+          pitch: LabdarÃºgÃ³pÃ¡lya
+          primary: FÅÃºt
+          private: BehajtÃ¡s csak engedÃ©llyel
+          rail: VasÃºt
+          reserve: TermÃ©szetvÃ©delmi terÃ¼let
+          resident: Gyalogos Ã¶vezet
+          retail: Kereskedelmi terÃ¼let
+          runway: 
+            - KifutÃ³pÃ¡lya
+            - gurulÃ³Ãºt
+          school: 
             - Iskola
             - egyetem
-          building: "Fontosabb Ã©pÃ¼let"
-          station: "VasÃºtÃ¡llomÃ¡s"
-          summit:
+          secondary: ÃsszekÃ¶tÅ Ãºt
+          station: VasÃºtÃ¡llomÃ¡s
+          subway: MetrÃ³
+          summit: 
             - HegycsÃºcs
             - magaslat
-          tunnel: "Szaggatott szegÃ©ly = alagÃºt"
-          bridge: "Fekete szegÃ©ly = hÃ­d"
-          private: "BehajtÃ¡s csak engedÃ©llyel"
-          permissive: "BehajtÃ¡s engedÃ©lyezett"
-          destination: "Csak cÃ©lforgalom"
-          construction: "Utak Ã©pÃ­tÃ©s alatt"
-  trace:
-    visibility:
-      private: "MagÃ¡n (megosztva csak nÃ©vtelenÃ¼l, rendezetlen pontok)"
-      public: "NyilvÃ¡nos (megjelenik a nyomvonalak listÃ¡jÃ¡n nÃ©vtelenÃ¼l, rendezetlen pontok)"
-      trackable: "KÃ¶vethetÅ (megosztva csak nÃ©vtelenÃ¼l, rendezett pontok idÅbÃ©lyeggel)"
-      identifiable: "AzonosÃ­thatÃ³ (megjelenik a nyomvonalak listÃ¡jÃ¡n, Ã©s azonodÃ­thatÃ³, rendezett pontok idÅbÃ©lyeggel)"
-    create:
-      upload_trace: "GPS nyomvonal feltÃ¶ltÃ©se"
-      trace_uploaded: "A GPX fÃ¡jl feltÃ¶ltÃ©se megtÃ¶rtÃ©nt, Ã©s vÃ¡rakozik az adatbÃ¡zisba valÃ³ beillesztÃ©sre. Ez Ã¡ltalÃ¡ban fÃ©l Ã³rÃ¡n belÃ¼l megtÃ¶rtÃ©nik, Ã©s fogsz kapni egy e-mailt, amint elkÃ©szÃ¼lt."
-    edit:
-      title: "Nyomvonal szerkesztÃ©se: {{name}}"
-      heading: "Nyomvonal szerkesztÃ©se: {{name}}"
+          tourist: Turisztikai lÃ¡tvÃ¡nyossÃ¡g
+          track: FÃ¶ldÃºt
+          tram: 
+            - HÃV
+            - villamos
+          trunk: AutÃ³Ãºt
+          tunnel: Szaggatott szegÃ©ly = alagÃºt
+          unclassified: EgyÃ©b Ãºt
+          unsurfaced: Burkolatlan Ãºt
+          wood: ErdÅ
+        heading: JelmagyarÃ¡zat z{{zoom_level}}
+    search: 
+      search: KeresÃ©s
+      search_help: "pÃ©ldÃ¡k: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near KaposvÃ¡r' <a href='http://wiki.openstreetmap.org/wiki/Search'>tovÃ¡bbi pÃ©ldÃ¡k...</a>"
+      submit_text: Go
+      where_am_i: Hol vagyok?
+    sidebar: 
+      close: BezÃ¡r
+      search_results: KeresÃ©s eredmÃ©nyei
+  trace: 
+    create: 
+      trace_uploaded: A GPX fÃ¡jl feltÃ¶ltÃ©se megtÃ¶rtÃ©nt, Ã©s vÃ¡rakozik az adatbÃ¡zisba valÃ³ beillesztÃ©sre. Ez Ã¡ltalÃ¡ban fÃ©l Ã³rÃ¡n belÃ¼l megtÃ¶rtÃ©nik, Ã©s fogsz kapni egy e-mailt, amint elkÃ©szÃ¼lt.
+      upload_trace: GPS nyomvonal feltÃ¶ltÃ©se
+    delete: 
+      scheduled_for_deletion: A nyomvonal tÃ¶rlÃ©sre kijelÃ¶lve
+    edit: 
+      description: "LeÃ­rÃ¡s:"
+      download: letÃ¶ltÃ©s
+      edit: szerkesztÃ©s
       filename: "FÃ¡jlnÃ©v:"
-      download: "letÃ¶ltÃ©s"
-      uploaded_at: "FeltÃ¶ltve:"
+      heading: "Nyomvonal szerkesztÃ©se: {{name}}"
+      map: tÃ©rkÃ©p
+      owner: "Tulajdonos:"
       points: "Pontok szÃ¡ma:"
+      save_button: MÃ³dosÃ­tÃ¡sok mentÃ©se
       start_coord: "KezdÅkoordinÃ¡ta:"
-      map: "tÃ©rkÃ©p"
-      edit: "szerkesztÃ©s"
-      owner: "Tulajdonos:"
-      description: "LeÃ­rÃ¡s:"
       tags: "CÃ­mkÃ©k:"
-      tags_help: "vesszÅvel elvÃ¡lasztva"
-      save_button: "MÃ³dosÃ­tÃ¡sok mentÃ©se"
+      tags_help: vesszÅvel elvÃ¡lasztva
+      title: "Nyomvonal szerkesztÃ©se: {{name}}"
+      uploaded_at: "FeltÃ¶ltve:"
       visibility: "LÃ¡thatÃ³sÃ¡g:"
-      visibility_help: "Mit jelent ez?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      title: "Nincs ilyen felhasznÃ¡lÃ³"
+      visibility_help: Mit jelent ez?
+    list: 
+      public_traces: NyilvÃ¡nos GPS nyomvonalak
+      public_traces_from: "{{user}} nyilvÃ¡nos GPS nyomvonalai"
+      tagged_with: " {{tags}} cÃ­mkÃ©vel"
+      your_traces: SajÃ¡t GPS nyomvonalak
+    make_public: 
+      made_public: A nyomvonal nyilvÃ¡nos lett
+    no_such_user: 
+      body: SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz.
       heading: "{{user}} felhasznÃ¡lÃ³ nem lÃ©tezik"
-      body: "SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz."
-    trace_form:
-      upload_gpx: "GPX fÃ¡jl feltÃ¶ltÃ©se"
-      description: "LeÃ­rÃ¡s"
-      tags: "CÃ­mkÃ©k"
-      tags_help: "vesszÅvel elvÃ¡lasztva"
-      visibility: "LÃ¡thatÃ³sÃ¡g"
-      visibility_help: "Mit jelent ez?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "FeltÃ¶ltÃ©s"
-      help: "SegÃ­tsÃ©g"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "Csak a sajÃ¡t nyomvonalak megtekintÃ©se, vagy nyomvonal feltÃ¶ltÃ©se"
-      see_all_traces: "Ãsszes nyomvonal megtekintÃ©se"
-      see_your_traces: "Ãsszes sajÃ¡t nyomvonal megtekintÃ©se"
+      title: Nincs ilyen felhasznÃ¡lÃ³
+    trace: 
+      ago: "ennyivel ezelÅtt: {{time_in_words_ago}}"
+      by: "kÃ©szÃ­tette:"
+      count_points: "{{count}} pont"
+      edit: szerkesztÃ©s
+      edit_map: TÃ©rkÃ©p szerkesztÃ©se
+      in: "itt:"
+      map: tÃ©rkÃ©p
+      more: tovÃ¡bb
+      pending: FÃGGÅBEN
+      private: NEM NYILVÃNOS
+      public: NYILVÃNOS
+      trace_details: Nyomvonal rÃ©szleteinek megtekintÃ©se
+      view_map: TÃ©rkÃ©p megtekintÃ©se
+    trace_form: 
+      description: LeÃ­rÃ¡s
+      help: SegÃ­tsÃ©g
+      tags: CÃ­mkÃ©k
+      tags_help: vesszÅvel elvÃ¡lasztva
+      upload_button: FeltÃ¶ltÃ©s
+      upload_gpx: GPX fÃ¡jl feltÃ¶ltÃ©se
+      visibility: LÃ¡thatÃ³sÃ¡g
+      visibility_help: Mit jelent ez?
+    trace_header: 
+      see_all_traces: Ãsszes nyomvonal megtekintÃ©se
+      see_just_your_traces: Csak a sajÃ¡t nyomvonalak megtekintÃ©se, vagy nyomvonal feltÃ¶ltÃ©se
+      see_your_traces: Ãsszes sajÃ¡t nyomvonal megtekintÃ©se
       traces_waiting: "{{count}} nyomvonalad vÃ¡rakozik feltÃ¶ltÃ©sre. KÃ©rlek fontold meg, hogy megvÃ¡rod, amÃ­g ezek befejezÅdnek mielÅtt feltÃ¶ltesz tovÃ¡bbiakat, hogy Ã­gy ne tartsd fel a tÃ¶bbi felhasznÃ¡lÃ³t a sorban."
-    trace_optionals:
-      tags: "CÃ­mkÃ©k"
-    view:
-      title: "Nyomvonal megtekintÃ©se: {{name}}"
-      heading: "Nyomvonal megtekintÃ©se: {{name}}"
-      pending: "FÃGGÅBEN"
+    trace_optionals: 
+      tags: CÃ­mkÃ©k
+    trace_paging_nav: 
+      of: "Ã¶sszesen:"
+      showing: "Jelenlegi oldal:"
+    view: 
+      delete_track: Ezen nyomvonal tÃ¶rlÃ©se
+      description: "LeÃ­rÃ¡s:"
+      download: letÃ¶ltÃ©s
+      edit: szerkesztÃ©s
+      edit_track: Ezen nyomvonal szerkesztÃ©se
       filename: "FÃ¡jlnÃ©v:"
-      download: "letÃ¶ltÃ©s"
-      uploaded: "FeltÃ¶ltve:"
+      heading: "Nyomvonal megtekintÃ©se: {{name}}"
+      map: tÃ©rkÃ©p
+      none: nincsenek
+      owner: "Tulajdonos:"
+      pending: FÃGGÅBEN
       points: "Pontok szÃ¡ma:"
       start_coordinates: "KezdÅkoordinÃ¡ta:"
-      map: "tÃ©rkÃ©p"
-      edit: "szerkesztÃ©s"
-      owner: "Tulajdonos:"
-      description: "LeÃ­rÃ¡s:"
       tags: "CÃ­mkÃ©k:"
-      none: "nincsenek"
-      edit_track: "Ezen nyomvonal szerkesztÃ©se"
-      delete_track: "Ezen nyomvonal tÃ¶rlÃ©se"
-      trace_not_found: "Nem talÃ¡lhatÃ³ nyomvonal!"
+      title: "Nyomvonal megtekintÃ©se: {{name}}"
+      trace_not_found: Nem talÃ¡lhatÃ³ nyomvonal!
+      uploaded: "FeltÃ¶ltve:"
       visibility: "LÃ¡thatÃ³sÃ¡g:"
-    trace_paging_nav:
-      showing: "Jelenlegi oldal:"
-      of: "Ã¶sszesen:"
-    trace:
-      pending: "FÃGGÅBEN"
-      count_points: "{{count}} pont"
-      ago: "ennyivel ezelÅtt: {{time_in_words_ago}}"
-      more: "tovÃ¡bb"
-      trace_details: "Nyomvonal rÃ©szleteinek megtekintÃ©se"
-      view_map: "TÃ©rkÃ©p megtekintÃ©se"
-      edit: "szerkesztÃ©s"
-      edit_map: "TÃ©rkÃ©p szerkesztÃ©se"
-      public: "NYILVÃNOS"
-      private: "NEM NYILVÃNOS"
-      by: "kÃ©szÃ­tette:"
-      in: "itt:"
-      map: "tÃ©rkÃ©p"
-    list:
-      public_traces: "NyilvÃ¡nos GPS nyomvonalak"
-      your_traces: "SajÃ¡t GPS nyomvonalak"
-      public_traces_from: "{{user}} nyilvÃ¡nos GPS nyomvonalai"
-      tagged_with: " {{tags}} cÃ­mkÃ©vel"
-    delete:
-      scheduled_for_deletion: "A nyomvonal tÃ¶rlÃ©sre kijelÃ¶lve"
-    make_public:
-      made_public: "A nyomvonal nyilvÃ¡nos lett"
-  oauth:
-    oauthorize:
-      request_access: "A(z) {{app_name}} alkalmazÃ¡s hozzÃ¡fÃ©rÃ©st kÃ©r a felhasznÃ¡lÃ³i fiÃ³kodhoz. KÃ©rlek, jelÃ¶ld, ha azt szeretnÃ©d, hogy az alkalmazÃ¡s rendelkezzen a kÃ¶vetkezÅ kÃ©pessÃ©gekkel. VÃ¡laszthatsz olyan sokat vagy keveset, amennyit szeretnÃ©l."
-      allow_to: "Az alÃ¡bbiak engedÃ©lyezÃ©se a kliensalkalmazÃ¡snak:"
-      allow_read_prefs:  "felhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡sok olvasÃ¡sa."
-      allow_write_prefs: "felhasznÃ¡lÃ³i beÃ¡llÃ­tÃ¡sok mÃ³dosÃ­tÃ¡sa."
-      allow_write_diary: "naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa."
-      allow_write_api:   "a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa."
-      allow_read_gpx:    "magÃ¡n GPS nyomvonalak olvasÃ¡sa."
-      allow_write_gpx:   "GPS nyomvonalak feltÃ¶ltÃ©se."
-    revoke:
-      flash: "Visszavontad az utalvÃ¡nyt a(z) {{application}} alkalmazÃ¡shoz"
-  oauth_clients:
-    new:
-      title: "Ãj alkalmazÃ¡s regisztrÃ¡lÃ¡sa"
-      submit: "RegisztrÃ¡lÃ¡s"
-    edit:
-      title: "AlkalmazÃ¡s szerkesztÃ©se"
-      submit: "SzerkesztÃ©s"
-    show:
-      title: "{{app_name}} OAuth rÃ©szletei"
-      key: "Consumer Key:"
-      secret: "Consumer Secret:"
-      url: "Request Token URL:"
-      access_url: "Access Token URL:"
-      authorize_url: "Authorise URL:"
-      support_notice: "TÃ¡mogatjuk a hmac-sha1 hitelesÃ­tÃ©st (ajÃ¡nlott), valamint a sima szÃ¶veget ssl mÃ³dban."
-      edit: "RÃ©szletek szerkesztÃ©se"
-      requests: "A kÃ¶vetkezÅ engedÃ©lyek kÃ©rÃ©se a felhasznÃ¡lÃ³tÃ³l:"
-      allow_read_prefs:  "felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak olvasÃ¡sa."
-      allow_write_prefs: "felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak mÃ³dosÃ­tÃ¡sa."
-      allow_write_diary: "naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa."
-      allow_write_api:   "a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa."
-      allow_read_gpx:    "magÃ¡n GPS nyomvonalainak olvasÃ¡sa."
-      allow_write_gpx:   "GPS nyomvonalak feltÃ¶ltÃ©se."
-    index:
-      title: "OAuth rÃ©szletek"
-      my_tokens: "EngedÃ©lyezett alkalmazÃ¡sok"
-      list_tokens: "A kÃ¶vetkezÅ utalvÃ¡nyok kerÃ¼ltek kibocsÃ¡tÃ¡sra a nevedben:"
-      application: "AlkalmazÃ¡s neve"
-      issued_at: "KibocsÃ¡tva ekkor"
-      revoke: VisszavonÃ¡s!"
-      my_apps: "KliensalkalmazÃ¡sok"
-      no_apps: "Van olyan alkalmazÃ¡sod, amit szeretnÃ©l regisztrÃ¡lni a velÃ¼nk valÃ³ hasznÃ¡lathoz a(z) {{oauth}} szabvÃ¡ny hasznÃ¡latÃ¡val? RegisztrÃ¡lnod kell a webalkalmazÃ¡sod, mielÅtt OAuth kÃ©rÃ©seket kÃ¼ld ehhez a szolgÃ¡ltatÃ¡shoz."
-      registered_apps: "A kÃ¶vetkezÅ kliensalkalmazÃ¡sok vannak regisztrÃ¡lva:"
-      register_new: "AlkalmazÃ¡s regisztrÃ¡lÃ¡sa"
-    form:
-      name: "NÃ©v"
-      required: "SzÃ¼ksÃ©ges"
-      url: "Main Application URL"
-      callback_url: "Callback URL"
-      support_url: "Support URL"
-      requests: "A kÃ¶vetkezÅ engedÃ©lyek kÃ©rÃ©se a felhasznÃ¡lÃ³tÃ³l:"
-      allow_read_prefs:  "felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak olvasÃ¡sa."
-      allow_write_prefs: "felhasznÃ¡lÃ³ beÃ¡llÃ­tÃ¡sainak mÃ³dosÃ­tÃ¡sa."
-      allow_write_diary: "naplÃ³bejegyzÃ©sek, hozzÃ¡szÃ³lÃ¡sok kÃ©szÃ­tÃ©se Ã©s barÃ¡tok hozzÃ¡adÃ¡sa."
-      allow_write_api:   "a tÃ©rkÃ©p mÃ³dosÃ­tÃ¡sa."
-      allow_read_gpx:    "magÃ¡n GPS nyomvonalainak olvasÃ¡sa."
-      allow_write_gpx:   "GPS nyomvonalak feltÃ¶ltÃ©se."
-    not_found: 
-      sorry: "SajnÃ¡lom, a(z) {{type}} nem talÃ¡lhatÃ³."
-    create:
-      flash: "Az informÃ¡ciÃ³ sikeresen regisztrÃ¡lva"
-    update:
-      flash: "A kliens informÃ¡ciÃ³i sikeresen frissÃ­tve"
-    destroy:
-      flash: "A kliensalkalmazÃ¡s regisztrÃ¡ciÃ³ja tÃ¶rÃ¶lve"
-  user:
-    login:
-      title: "BejelentkezÃ©s"
-      heading: "BejelentkezÃ©s"
-      please login: "Jelentkezz be, vagy {{create_user_link}}."
-      create_account: "hozz lÃ©tre egy Ãºj felhasznÃ¡lÃ³i fiÃ³kot"
+    visibility: 
+      identifiable: AzonosÃ­thatÃ³ (megjelenik a nyomvonalak listÃ¡jÃ¡n, Ã©s azonodÃ­thatÃ³, rendezett pontok idÅbÃ©lyeggel)
+      private: MagÃ¡n (megosztva csak nÃ©vtelenÃ¼l, rendezetlen pontok)
+      public: NyilvÃ¡nos (megjelenik a nyomvonalak listÃ¡jÃ¡n nÃ©vtelenÃ¼l, rendezetlen pontok)
+      trackable: KÃ¶vethetÅ (megosztva csak nÃ©vtelenÃ¼l, rendezett pontok idÅbÃ©lyeggel)
+  user: 
+    account: 
+      email never displayed publicly: (soha nem jelenik meg nyilvÃ¡nosan)
+      flash update success: FelhasznÃ¡lÃ³i informÃ¡ciÃ³k sikeresen frissÃ­tve.
+      flash update success confirm needed: FelhasznÃ¡lÃ³i informÃ¡ciÃ³k sikeresen frissÃ­tve. NÃ©zd meg az e-mailjeidet az Ãºj e-mail cÃ­medet megerÅsÃ­tÅ levÃ©lhez.
+      home location: "Otthon:"
+      latitude: "FÃ¶ldrajzi szÃ©lessÃ©g:"
+      longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g:"
+      make edits public button: SzerkesztÃ©seim nyilvÃ¡nossÃ¡ tÃ©tele
+      my settings: BeÃ¡llÃ­tÃ¡saim
+      no home location: Nem adtad meg az otthonod helyÃ©t.
+      preferred languages: "ElÅnyben rÃ©szesÃ­tett nyelvek:"
+      profile description: "Profil leÃ­rÃ¡sa:"
+      public editing: 
+        disabled: Tiltva, Ã­gy nem szerkesztheted az adatokat, az Ã¶sszes eddigi szerkesztÃ©s nÃ©vtelen.
+        disabled link text: miÃ©rt nem tudok szerkeszteni?
+        enabled: EngedÃ©lyezve. Nem vagy nÃ©vtelen, Ã­gy szerkesztheted az adatokat.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: mi ez?
+        heading: "NyilvÃ¡nos szerkesztÃ©s:"
+      return to profile: Vissza a profilhoz
+      save changes button: MÃ³dosÃ­tÃ¡sok mentÃ©se
+      title: FelhasznÃ¡lÃ³i fiÃ³k szerkesztÃ©se
+      update home location on click: Otthon helyÃ©nek frissÃ­tÃ©se, amikor a tÃ©rkÃ©pre kattintok?
+    confirm: 
+      button: MegerÅsÃ­tÃ©s
+      failure: Egy felhasznÃ¡lÃ³i fiÃ³k mÃ¡r megerÅsÃ­tÃ©sre kerÃ¼lt ezzel az utalvÃ¡nnyal.
+      heading: FelhasznÃ¡lÃ³i fiÃ³k megerÅsÃ­tÃ©se
+      press confirm button: FelhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tÃ©sÃ©hez nyomd meg az alÃ¡bbi megerÅsÃ­tÃ©s gombot.
+      success: FelhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tve, kÃ¶szÃ¶njÃ¼k a regisztrÃ¡ciÃ³t!
+    confirm_email: 
+      button: MegerÅsÃ­tÃ©s
+      failure: Egy e-mail cÃ­m mÃ¡r megerÅsÃ­tÃ©sre kerÃ¼lt ezzel az utalvÃ¡nnyal.
+      heading: E-mail cÃ­m mÃ³dosÃ­tÃ¡sÃ¡nak megerÅsÃ­tÃ©se
+      press confirm button: Ãj e-mail cÃ­med megerÅsÃ­tÃ©sÃ©hez nyomd meg az alÃ¡bbi megerÅsÃ­tÃ©s gombot.
+      success: E-mail cÃ­med megerÅsÃ­tve, kÃ¶szÃ¶njÃ¼k a regisztrÃ¡ciÃ³t!
+    friend_map: 
+      nearby mapper: "KÃ¶zeli tÃ©rkÃ©pszerkesztÅ: [[nearby_user]]"
+      your location: Helyed
+    go_public: 
+      flash success: MostantÃ³l az Ã¶sszes szerkesztÃ©sed nyilvÃ¡nos, Ã©s engedÃ©lyezett a szerkesztÃ©s.
+    login: 
+      account not active: SajnÃ¡lom, a felhasznÃ¡lÃ³i fiÃ³kod mÃ©g nincs aktivÃ¡lva.<br />Az aktivÃ¡lÃ¡shoz, kattints a fiÃ³kodat megerÅsÃ­tÅ e-mailben lÃ©vÅ hivatkozÃ¡sra.
+      auth failure: SajnÃ¡lom, ilyen adatokkal nem tudsz bejelentkezni.
+      create_account: hozz lÃ©tre egy Ãºj felhasznÃ¡lÃ³i fiÃ³kot
       email or username: "E-mail cÃ­m vagy felhasznÃ¡lÃ³nÃ©v:"
+      heading: BejelentkezÃ©s
+      login_button: BejelentkezÃ©s
+      lost password link: Elfelejtetted a jelszavad?
       password: "JelszÃ³:"
-      lost password link: "Elfelejtetted a jelszavad?"
-      login_button: "BejelentkezÃ©s"
-      account not active: "SajnÃ¡lom, a felhasznÃ¡lÃ³i fiÃ³kod mÃ©g nincs aktivÃ¡lva.<br />Az aktivÃ¡lÃ¡shoz, kattints a fiÃ³kodat megerÅsÃ­tÅ e-mailben lÃ©vÅ hivatkozÃ¡sra."
-      auth failure: "SajnÃ¡lom, ilyen adatokkal nem tudsz bejelentkezni."
-    lost_password:
-      title: "Elvesztett jelszÃ³"
-      heading: "Elfelejtetted jelszavad?"
-      email address: "E-mail cÃ­m:"
-      new password button: "JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa"
-      notice email on way: "SajnÃ¡lom, hogy elvesztetted :-( de mÃ¡r Ãºton van egy e-mail, Ã­gy nemsokÃ¡ra alaphelyzetbe Ã¡llÃ­thatod."
-      notice email cannot find: "Az e-mail cÃ­m nem talÃ¡lhatÃ³, sajnÃ¡lom."
-    reset_password:
-      title: "JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa"
-      heading: "{{user}} jelszavÃ¡nak alaphelyzetbe Ã¡llÃ­tÃ¡sa"
-      password: "JelszÃ³:"
-      confirm password: "JelszÃ³ megerÅsÃ­tÃ©se:"
-      reset: "JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa"
-      flash changed: "Jelszavad megvÃ¡ltozott."
-      flash token bad: "Nem talÃ¡lhatÃ³ ez az utalvÃ¡ny, ellenÅrizd az URL-t."
-    new:
-      title: "FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sa"
-      heading: "FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sa"
-      no_auto_account_create: "Sajnos jelenleg nem tudunk neked lÃ©trehozni automatikusan egy felhasznÃ¡lÃ³i fiÃ³kot."
-      contact_webmaster: 'KÃ©rlek fordulj a <a href="mailto:webmaster@openstreetmap.org">webmesterhez</a> (angolul), hogy lehetÅvÃ© tegye felhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sÃ¡t - mi igyekszÃ¼nk olyan gyorsan foglalkozni a kÃ©rÃ©ssel, amilyen gyorsan csak lehet.'
-      fill_form: "TÃ¶ltsd ki az Å±rlapot, Ã©s kÃ¼ldÃ¼nk neked egy gyors e-mailt felhasznÃ¡lÃ³i fiÃ³kod aktivÃ¡lÃ¡sÃ¡hoz."
-      license_agreement: 'FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sÃ¡val vÃ¡llalod, hogy az Ã¶sszes adatra, amivel hozzÃ¡jÃ¡rulsz az Openstreetmap projekthez, (nem kizÃ¡rÃ³lagosan) <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.hu">ez a Creative Commons licenc (by-sa)</a> vonatkozik.'
+      please login: Jelentkezz be, vagy {{create_user_link}}.
+      title: BejelentkezÃ©s
+    lost_password: 
       email address: "E-mail cÃ­m:"
+      heading: Elfelejtetted jelszavad?
+      new password button: JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa
+      notice email cannot find: Az e-mail cÃ­m nem talÃ¡lhatÃ³, sajnÃ¡lom.
+      notice email on way: SajnÃ¡lom, hogy elvesztetted :-( de mÃ¡r Ãºton van egy e-mail, Ã­gy nemsokÃ¡ra alaphelyzetbe Ã¡llÃ­thatod.
+      title: Elvesztett jelszÃ³
+    make_friend: 
+      already_a_friend: "{{name}} mÃ¡r a barÃ¡tod."
+      failed: SajnÃ¡lom, {{name}} felvÃ©tele barÃ¡tnak sikertelen.
+      success: "{{name}} mostantÃ³l a barÃ¡tod."
+    new: 
       confirm email address: "E-mail cÃ­m megerÅsÃ­tÃ©se:"
-      not displayed publicly: 'Nem jelenik meg nyilvÃ¡nosan (lÃ¡sd <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="a wiki adatvÃ©delmi irÃ¡nyelvei tartalmazzÃ¡k az e-mail cÃ­mekrÅl szÃ³lÃ³ rÃ©szt">adatvÃ©delmi irÃ¡nyelvek</a>)'
+      confirm password: "JelszÃ³ megerÅsÃ­tÃ©se:"
+      contact_webmaster: KÃ©rlek fordulj a <a href="mailto:webmaster@openstreetmap.org">webmesterhez</a> (angolul), hogy lehetÅvÃ© tegye felhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sÃ¡t - mi igyekszÃ¼nk olyan gyorsan foglalkozni a kÃ©rÃ©ssel, amilyen gyorsan csak lehet.
       display name: "MegjelenÃ­tendÅ nÃ©v:"
+      email address: "E-mail cÃ­m:"
+      fill_form: TÃ¶ltsd ki az Å±rlapot, Ã©s kÃ¼ldÃ¼nk neked egy gyors e-mailt felhasznÃ¡lÃ³i fiÃ³kod aktivÃ¡lÃ¡sÃ¡hoz.
+      flash create success message: A felhasznÃ¡lÃ³ sikeresen lÃ©trehozva. NÃ©zd meg az e-mailjeidet a megerÅsÃ­tÅ levÃ©lhez, Ã©s pillanatokon belÃ¼l szerkesztheted a tÃ©rkÃ©pet :-)<br /><br />FelhÃ­vom a figyelmed, hogy addig nem tudsz bejelentkezni, amÃ­g nem kaptad meg Ã©s nem erÅsÃ­tetted meg az e-mail cÃ­medet.<br /><br />Ha olyan antispam rendszert hasznÃ¡lsz, ami megerÅsÃ­tÅ kÃ©rÃ©st kÃ¼ld, akkor bizonyosodj meg rÃ³la, hogy engedÃ©lyezÅlistÃ¡ra tetted a webmaster@openstreetmap.org cÃ­met, mivel mi nem tudunk vÃ¡laszolni megerÅsÃ­tÅ kÃ©rÃ©sekre.
+      heading: FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sa
+      license_agreement: FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sÃ¡val vÃ¡llalod, hogy az Ã¶sszes adatra, amivel hozzÃ¡jÃ¡rulsz az Openstreetmap projekthez, (nem kizÃ¡rÃ³lagosan) <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.hu">ez a Creative Commons licenc (by-sa)</a> vonatkozik.
+      no_auto_account_create: Sajnos jelenleg nem tudunk neked lÃ©trehozni automatikusan egy felhasznÃ¡lÃ³i fiÃ³kot.
+      not displayed publicly: Nem jelenik meg nyilvÃ¡nosan (lÃ¡sd <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="a wiki adatvÃ©delmi irÃ¡nyelvei tartalmazzÃ¡k az e-mail cÃ­mekrÅl szÃ³lÃ³ rÃ©szt">adatvÃ©delmi irÃ¡nyelvek</a>)
       password: "JelszÃ³:"
-      confirm password: "JelszÃ³ megerÅsÃ­tÃ©se:"
       signup: RegisztrÃ¡ciÃ³
-      flash create success message: "A felhasznÃ¡lÃ³ sikeresen lÃ©trehozva. NÃ©zd meg az e-mailjeidet a megerÅsÃ­tÅ levÃ©lhez, Ã©s pillanatokon belÃ¼l szerkesztheted a tÃ©rkÃ©pet :-)<br /><br />FelhÃ­vom a figyelmed, hogy addig nem tudsz bejelentkezni, amÃ­g nem kaptad meg Ã©s nem erÅsÃ­tetted meg az e-mail cÃ­medet.<br /><br />Ha olyan antispam rendszert hasznÃ¡lsz, ami megerÅsÃ­tÅ kÃ©rÃ©st kÃ¼ld, akkor bizonyosodj meg rÃ³la, hogy engedÃ©lyezÅlistÃ¡ra tetted a webmaster@openstreetmap.org cÃ­met, mivel mi nem tudunk vÃ¡laszolni megerÅsÃ­tÅ kÃ©rÃ©sekre."
-    no_such_user:
-      title: "Nincs ilyen felhasznÃ¡lÃ³"
+      title: FelhasznÃ¡lÃ³i fiÃ³k lÃ©trehozÃ¡sa
+    no_such_user: 
+      body: SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz.
       heading: "{{user}} felhasznÃ¡lÃ³ nem lÃ©tezik"
-      body: "SajnÃ¡lom, nincs {{user}} nevÅ± felhasznÃ¡lÃ³. EllenÅrizd a helyessÃ©gÃ©t, vagy lehet, hogy a link, amire kattintottÃ¡l, rossz."
-    view:
+      title: Nincs ilyen felhasznÃ¡lÃ³
+    remove_friend: 
+      not_a_friend: "{{name}} nem tartozik a barÃ¡taid kÃ¶zÃ©."
+      success: "{{name}} eltÃ¡volÃ­tva a barÃ¡taid kÃ¶zÃ¼l."
+    reset_password: 
+      confirm password: "JelszÃ³ megerÅsÃ­tÃ©se:"
+      flash changed: Jelszavad megvÃ¡ltozott.
+      flash token bad: Nem talÃ¡lhatÃ³ ez az utalvÃ¡ny, ellenÅrizd az URL-t.
+      heading: "{{user}} jelszavÃ¡nak alaphelyzetbe Ã¡llÃ­tÃ¡sa"
+      password: "JelszÃ³:"
+      reset: JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa
+      title: JelszÃ³ alaphelyzetbe Ã¡llÃ­tÃ¡sa
+    set_home: 
+      flash success: Otthon helye sikeresen mentve
+    view: 
+      add as friend: felvÃ©tel barÃ¡tnak
+      add image: KÃ©p hozzÃ¡adÃ¡sa
+      ago: ({{time_in_words_ago}} Ã³ta)
+      change your settings: beÃ¡llÃ­tÃ¡sok mÃ³dosÃ­tÃ¡sa
+      delete image: KÃ©p tÃ¶rlÃ©se
+      description: LeÃ­rÃ¡s
+      diary: naplÃ³
+      edits: szerkesztÃ©sek
+      if set location: Ha beÃ¡llÃ­tod a helyedet, egy szÃ©p tÃ©rkÃ©p fog megjelenni alÃ¡bb. Az otthonodat a {{settings_link}}nÃ¡l Ã¡llÃ­thatod be.
+      km away: "{{count}} km-re innen"
+      m away: "{{count}} m-re innen"
+      mapper since: "TÃ©rkÃ©pszerkesztÅ ezÃ³ta:"
       my diary: naplÃ³m
-      new diary entry: Ãºj naplÃ³bejegyzÃ©s
       my edits: szerkesztÃ©seim
-      my traces: sajÃ¡t nyomvonalak
       my settings: beÃ¡llÃ­tÃ¡saim
+      my traces: sajÃ¡t nyomvonalak
+      my_oauth_details: OAuth rÃ©szletek megtekintÃ©se
+      nearby users: "KÃ¶zeli felhasznÃ¡lÃ³k:"
+      new diary entry: Ãºj naplÃ³bejegyzÃ©s
+      no friends: MÃ©g nem adtÃ¡l meg egyetlen barÃ¡tot sem.
+      no home location: Nincs otthon beÃ¡llÃ­tva.
+      no nearby users: MÃ©g nincsenek felhasznÃ¡lÃ³k, akik megadtÃ¡k, hogy a kÃ¶zelben szerkesztenek.
+      remove as friend: barÃ¡t eltÃ¡volÃ­tÃ¡sa
       send message: Ã¼zenet kÃ¼ldÃ©se
-      diary: naplÃ³
-      edits: szerkesztÃ©sek
+      settings_link_text: beÃ¡llÃ­tÃ¡sok
       traces: nyomvonalak
-      remove as friend: barÃ¡t eltÃ¡volÃ­tÃ¡sa
-      add as friend: felvÃ©tel barÃ¡tnak
-      mapper since: "TÃ©rkÃ©pszerkesztÅ ezÃ³ta:"
-      ago: "({{time_in_words_ago}} Ã³ta)"
-      user image heading: FelhasznÃ¡lÃ³ kÃ©pe
-      delete image: KÃ©p tÃ¶rlÃ©se
       upload an image: KÃ©p feltÃ¶ltÃ©se
-      add image: KÃ©p hozzÃ¡adÃ¡sa
-      description: LeÃ­rÃ¡s
+      user image heading: FelhasznÃ¡lÃ³ kÃ©pe
       user location: FelhasznÃ¡lÃ³ helye
-      no home location: "Nincs otthon beÃ¡llÃ­tva."
-      if set location: "Ha beÃ¡llÃ­tod a helyedet, egy szÃ©p tÃ©rkÃ©p fog megjelenni alÃ¡bb. Az otthonodat a {{settings_link}}nÃ¡l Ã¡llÃ­thatod be."
-      settings_link_text: beÃ¡llÃ­tÃ¡sok
       your friends: BarÃ¡taid
-      no friends: MÃ©g nem adtÃ¡l meg egyetlen barÃ¡tot sem.
-      km away: "{{count}} km-re innen"
-      m away: "{{count}} m-re innen"
-      nearby users: "KÃ¶zeli felhasznÃ¡lÃ³k:"
-      no nearby users: "MÃ©g nincsenek felhasznÃ¡lÃ³k, akik megadtÃ¡k, hogy a kÃ¶zelben szerkesztenek."
-      change your settings: beÃ¡llÃ­tÃ¡sok mÃ³dosÃ­tÃ¡sa
-      my_oauth_details: "OAuth rÃ©szletek megtekintÃ©se"
-    friend_map:
-      your location: Helyed
-      nearby mapper: "KÃ¶zeli tÃ©rkÃ©pszerkesztÅ: [[nearby_user]]"
-    account:
-      title: "FelhasznÃ¡lÃ³i fiÃ³k szerkesztÃ©se"
-      my settings: BeÃ¡llÃ­tÃ¡saim
-      email never displayed publicly: "(soha nem jelenik meg nyilvÃ¡nosan)"
-      public editing:
-        heading: "NyilvÃ¡nos szerkesztÃ©s:"
-        enabled: "EngedÃ©lyezve. Nem vagy nÃ©vtelen, Ã­gy szerkesztheted az adatokat."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "mi ez?"
-        disabled: "Tiltva, Ã­gy nem szerkesztheted az adatokat, az Ã¶sszes eddigi szerkesztÃ©s nÃ©vtelen."
-        disabled link text: "miÃ©rt nem tudok szerkeszteni?"
-      profile description: "Profil leÃ­rÃ¡sa:"
-      preferred languages: "ElÅnyben rÃ©szesÃ­tett nyelvek:"
-      home location: "Otthon:"
-      no home location: "Nem adtad meg az otthonod helyÃ©t."
-      latitude: "FÃ¶ldrajzi szÃ©lessÃ©g:"
-      longitude: "FÃ¶ldrajzi hosszÃºsÃ¡g:"
-      update home location on click: "Otthon helyÃ©nek frissÃ­tÃ©se, amikor a tÃ©rkÃ©pre kattintok?"
-      save changes button: MÃ³dosÃ­tÃ¡sok mentÃ©se
-      make edits public button: SzerkesztÃ©seim nyilvÃ¡nossÃ¡ tÃ©tele
-      return to profile: Vissza a profilhoz
-      flash update success confirm needed: "FelhasznÃ¡lÃ³i informÃ¡ciÃ³k sikeresen frissÃ­tve. NÃ©zd meg az e-mailjeidet az Ãºj e-mail cÃ­medet megerÅsÃ­tÅ levÃ©lhez."
-      flash update success: "FelhasznÃ¡lÃ³i informÃ¡ciÃ³k sikeresen frissÃ­tve."
-    confirm:
-      heading: FelhasznÃ¡lÃ³i fiÃ³k megerÅsÃ­tÃ©se
-      press confirm button: "FelhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tÃ©sÃ©hez nyomd meg az alÃ¡bbi megerÅsÃ­tÃ©s gombot."
-      button: MegerÅsÃ­tÃ©s
-      success: "FelhasznÃ¡lÃ³i fiÃ³kod megerÅsÃ­tve, kÃ¶szÃ¶njÃ¼k a regisztrÃ¡ciÃ³t!"
-      failure: "Egy felhasznÃ¡lÃ³i fiÃ³k mÃ¡r megerÅsÃ­tÃ©sre kerÃ¼lt ezzel az utalvÃ¡nnyal."
-    confirm_email:
-      heading: E-mail cÃ­m mÃ³dosÃ­tÃ¡sÃ¡nak megerÅsÃ­tÃ©se
-      press confirm button: "Ãj e-mail cÃ­med megerÅsÃ­tÃ©sÃ©hez nyomd meg az alÃ¡bbi megerÅsÃ­tÃ©s gombot."
-      button: MegerÅsÃ­tÃ©s
-      success: "E-mail cÃ­med megerÅsÃ­tve, kÃ¶szÃ¶njÃ¼k a regisztrÃ¡ciÃ³t!"
-      failure: "Egy e-mail cÃ­m mÃ¡r megerÅsÃ­tÃ©sre kerÃ¼lt ezzel az utalvÃ¡nnyal."
-    set_home:
-      flash success: "Otthon helye sikeresen mentve"
-    go_public:
-      flash success: "MostantÃ³l az Ã¶sszes szerkesztÃ©sed nyilvÃ¡nos, Ã©s engedÃ©lyezett a szerkesztÃ©s."
-    make_friend:
-      success: "{{name}} mostantÃ³l a barÃ¡tod."
-      failed: "SajnÃ¡lom, {{name}} felvÃ©tele barÃ¡tnak sikertelen."
-      already_a_friend: "{{name}} mÃ¡r a barÃ¡tod."
-    remove_friend:
-      success: "{{name}} eltÃ¡volÃ­tva a barÃ¡taid kÃ¶zÃ¼l."
-      not_a_friend: "{{name}} nem tartozik a barÃ¡taid kÃ¶zÃ©."
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 493733807..a97fd9284 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1,916 +1,909 @@
-is:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "AÃ°gangslisti"
-      changeset: "Breytingarsett"
-      changeset_tag: "Eigindi breytingarsetts"
-      country: "Land"
-      diary_comment: "Bloggathugasemd"
-      diary_entry: "BloggfÃ¦rsla"
-      friend: "Vinur"
-      language: "TungumÃ¡l"
-      message: "SkilaboÃ°"
-      node: "HnÃºtur"
-      node_tag: "Eigindi hnÃºts"
-      notifier: "Tilkynnandi"
-      old_node: "Gamall hnÃºtur"
-      old_node_tag: "Eigindi gamals hnÃºts"
-      old_relation: "GÃ¶mul vensl"
-      old_relation_member: "Stak Ã­ gÃ¶mlum venslum"
-      old_relation_tag: "Eigindi gamalla vensla"
-      old_way: "Gamall vegur"
-      old_way_node: "HnÃºtur Ã­ gÃ¶mlum vegi"
-      old_way_tag: "Eigindi gamals vegs Tag"
-      relation: "Vensl"
-      relation_member: "Stak Ã­ venslum"
-      relation_tag: "Eigindi vensla"
-      session: "Seta"
-      trace: "Ferill"
-      tracepoint: "Ferilpunktur"
-      tracetag: "Eigindi ferils"
-      user: "Notandi"
-      user_preference: "Notandastillingar"
-      user_token: "Leynistrengur notanda"
-      way: "Vegur"
-      way_node: "VeghnÃºtur"
-      way_tag: "Vegeigindi"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Texit"
-      diary_entry:
-        user: "Notandi"
-        title: "Titill"
-        latitude: "LengdargrÃ¡Ã°a"
-        longitude: "BreiddargrÃ¡Ã°a"
-        language: "TungumÃ¡l"
-      friend:
-        user: "Notandi"
-        friend: "Vinur"
-      trace:
-        user: "Notandi"
-        visible: "SÃ½nileg"
-        name: "Nafn"
-        size: "StÃ¦rÃ°"
-        latitude: "LengdargrÃ¡Ã°a"
-        longitude: "BreiddargrÃ¡Ã°a"
-        public: "SÃ½nileg Ã¶llum"
-        description: "LÃ½sing"
-      message:
-        sender: "Sendandi"
-        title: "Titill"
-        body: "Texti"
-        recipient: "MÃ³ttakandi"
-      user:
-        email: "Netfang"
-        active: "Virkur"
-        display_name: "SÃ½nilegt nafn"
-        description: "LÃ½sing"
-        languages: "TungumÃ¡l"
-        pass_crypt: "LykilorÃ°"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, ÃºtgÃ¡fa {{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: "Kort"
-    edit: "Breyta"
-    coordinates: "Hnit:"
-  browse:
-    changeset:
-      title: "Breytingarsett"
+is: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Texit
+      diary_entry: 
+        language: TungumÃ¡l
+        latitude: LengdargrÃ¡Ã°a
+        longitude: BreiddargrÃ¡Ã°a
+        title: Titill
+        user: Notandi
+      friend: 
+        friend: Vinur
+        user: Notandi
+      message: 
+        body: Texti
+        recipient: MÃ³ttakandi
+        sender: Sendandi
+        title: Titill
+      trace: 
+        description: LÃ½sing
+        latitude: LengdargrÃ¡Ã°a
+        longitude: BreiddargrÃ¡Ã°a
+        name: Nafn
+        public: SÃ½nileg Ã¶llum
+        size: StÃ¦rÃ°
+        user: Notandi
+        visible: SÃ½nileg
+      user: 
+        active: Virkur
+        description: LÃ½sing
+        display_name: SÃ½nilegt nafn
+        email: Netfang
+        languages: TungumÃ¡l
+        pass_crypt: LykilorÃ°
+    models: 
+      acl: AÃ°gangslisti
+      changeset: Breytingarsett
+      changeset_tag: Eigindi breytingarsetts
+      country: Land
+      diary_comment: Bloggathugasemd
+      diary_entry: BloggfÃ¦rsla
+      friend: Vinur
+      language: TungumÃ¡l
+      message: SkilaboÃ°
+      node: HnÃºtur
+      node_tag: Eigindi hnÃºts
+      notifier: Tilkynnandi
+      old_node: Gamall hnÃºtur
+      old_node_tag: Eigindi gamals hnÃºts
+      old_relation: GÃ¶mul vensl
+      old_relation_member: Stak Ã­ gÃ¶mlum venslum
+      old_relation_tag: Eigindi gamalla vensla
+      old_way: Gamall vegur
+      old_way_node: HnÃºtur Ã­ gÃ¶mlum vegi
+      old_way_tag: Eigindi gamals vegs Tag
+      relation: Vensl
+      relation_member: Stak Ã­ venslum
+      relation_tag: Eigindi vensla
+      session: Seta
+      trace: Ferill
+      tracepoint: Ferilpunktur
+      tracetag: Eigindi ferils
+      user: Notandi
+      user_preference: Notandastillingar
+      user_token: Leynistrengur notanda
+      way: Vegur
+      way_node: VeghnÃºtur
+      way_tag: Vegeigindi
+  browse: 
+    changeset: 
       changeset: "Breytingarsett: {{id}}"
-      download: "NiÃ°urhala breytingunni Ã¡ {{changeset_xml_link}} eÃ°a Ã¡ {{osmchange_xml_link}}"
-      changesetxml: "Breytingarsetts XML sniÃ°i"
-      osmchangexml: "osmChange XML sniÃ°i"
-      feed:
-        title: "Breytingarsett {{id}}"
-        title_comment: "Breytingarsett {{id}} - {{comment}}"
-    changeset_navigation:
-      user:
-        name_tooltip: "SkoÃ°a breytingarsett eftir {{user}}"
-        prev_tooltip: "Fyrri breytingarsett eftir {{user}}"
-        next_tooltip: "NÃ¦sta breytingarsett eftir {{user}}"
-      all:
-        prev_tooltip: "Fyrra breytingarsett"
-        next_tooltip: "NÃ¦sta breytingarsett"
-    changeset_details:
-      created_at: "BÃºiÃ° til:"
-      closed_at: "LokaÃ°:"
+      changesetxml: Breytingarsetts XML sniÃ°i
+      download: NiÃ°urhala breytingunni Ã¡ {{changeset_xml_link}} eÃ°a Ã¡ {{osmchange_xml_link}}
+      feed: 
+        title: Breytingarsett {{id}}
+        title_comment: Breytingarsett {{id}} - {{comment}}
+      osmchangexml: osmChange XML sniÃ°i
+      title: Breytingarsett
+    changeset_details: 
       belongs_to: "HÃ¶fundur:"
       bounding_box: "SvÃ¦Ã°ismÃ¶rk:"
-      no_bounding_box: "Engin svÃ¦Ã°ismÃ¶rk voru vistuÃ° Ã¡samt Ã¾essu breytingarsetti."
-      show_area_box: "SÃ½na svÃ¦Ã°ismÃ¶rk Ã¡ aÃ°alkorti"
-      box: "svÃ¦Ã°ismÃ¶rk"
-      has_nodes:
+      box: svÃ¦Ã°ismÃ¶rk
+      closed_at: "LokaÃ°:"
+      created_at: "BÃºiÃ° til:"
+      has_nodes: 
         one: "Inniheldur {{count}} hnÃºt:"
         other: "Inniheldur {{count}} hnÃºta:"
-      has_ways:
-        one:  "Inniheldur {{count}} veg:"
-        other: "Inniheldur {{count}} vegi:"
-      has_relations:
+      has_relations: 
         one: "Inniheldur {{count}} vensl:"
         other: "Inniheldur {{count}} vensl:"
+      has_ways: 
+        one: "Inniheldur {{count}} veg:"
+        other: "Inniheldur {{count}} vegi:"
+      no_bounding_box: Engin svÃ¦Ã°ismÃ¶rk voru vistuÃ° Ã¡samt Ã¾essu breytingarsetti.
+      show_area_box: SÃ½na svÃ¦Ã°ismÃ¶rk Ã¡ aÃ°alkorti
+    changeset_navigation: 
+      all: 
+        next_tooltip: NÃ¦sta breytingarsett
+        prev_tooltip: Fyrra breytingarsett
+      user: 
+        name_tooltip: SkoÃ°a breytingarsett eftir {{user}}
+        next_tooltip: NÃ¦sta breytingarsett eftir {{user}}
+        prev_tooltip: Fyrri breytingarsett eftir {{user}}
     common_details: 
+      changeset_comment: "Athugasemd:"
       edited_at: "Breytt:"
       edited_by: "Breytt af:"
-      version: "ÃtgÃ¡fa:"
       in_changeset: "Ã breytingarsetti:"
-      changeset_comment: "Athugasemd:"
-    containing_relation:
-      entry: "Venslunum {{relation_name}}"
-      entry_role: "Venslunum {{relation_name}} (sem â{{relation_role}}â)"
-    map:
-      loading: "HleÃ°..."
-      deleted: "Eytt"
-      larger:
-        area: "SkoÃ°a Ã¾etta svÃ¦Ã°i Ã¡ stÃ¦rra korti"
-        node: "SkoÃ°a Ã¾ennan hnÃºt Ã¡ stÃ¦rra korti"
-        way: "SkoÃ°a Ã¾ennan veg Ã¡ stÃ¦rra korti"
-        relation: "SkoÃ°a Ã¾essi vensl Ã¡ stÃ¦rra korti"
-    node_details:
+      version: "ÃtgÃ¡fa:"
+    containing_relation: 
+      entry: Venslunum {{relation_name}}
+      entry_role: Venslunum {{relation_name}} (sem â{{relation_role}}â)
+    map: 
+      deleted: Eytt
+      larger: 
+        area: SkoÃ°a Ã¾etta svÃ¦Ã°i Ã¡ stÃ¦rra korti
+        node: SkoÃ°a Ã¾ennan hnÃºt Ã¡ stÃ¦rra korti
+        relation: SkoÃ°a Ã¾essi vensl Ã¡ stÃ¦rra korti
+        way: SkoÃ°a Ã¾ennan veg Ã¡ stÃ¦rra korti
+      loading: HleÃ°...
+    node: 
+      download: "{{download_xml_link}} eÃ°a {{view_history_link}} eÃ°a {{edit_link}}"
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      edit: breyta
+      node: HnÃºtur
+      node_title: "HnÃºtur: {{node_name}}"
+      view_history: sÃ½na breytingarsÃ¶gu
+    node_details: 
       coordinates: "Hnit:"
       part_of: "Hluti af:"
-    node_history:
-      node_history: "BreytingarskrÃ¡ hnÃºts"
-      node_history_title: "BreytingarskrÃ¡ hnÃºts: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} eÃ°a {{view_details_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_details: "sÃ½na breytingarsÃ¶gu"
-    node:
-      node: "HnÃºtur"
-      node_title: "HnÃºtur: {{node_name}}"
-      download: "{{download_xml_link}} eÃ°a {{view_history_link}} eÃ°a {{edit_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_history: "sÃ½na breytingarsÃ¶gu"
-      edit: "breyta"
-    not_found:
-      sorry: "ÃvÃ­ miÃ°ur {{type}} meÃ° kennitÃ¶luna {{id}}."
-      type:
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      node_history: BreytingarskrÃ¡ hnÃºts
+      node_history_title: "BreytingarskrÃ¡ hnÃºts: {{node_name}}"
+      view_details: sÃ½na breytingarsÃ¶gu
+    not_found: 
+      sorry: ÃvÃ­ miÃ°ur {{type}} meÃ° kennitÃ¶luna {{id}}.
+      type: 
+        changeset: fannst ekki breytingarsett
         node: fannst ekki hnÃºtur
-        way: fannst ekki vegur
         relation: fundust ekki vensli
-        changeset: fannst ekki breytingarsett
-    paging_nav:
-      showing_page: "SÃ½ni sÃ­Ã°u"
-      of: "af"
-    relation_details:
+        way: fannst ekki vegur
+    paging_nav: 
+      of: af
+      showing_page: SÃ½ni sÃ­Ã°u
+    relation: 
+      download: "{{download_xml_link}} eÃ°a {{view_history_link}}"
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      relation: Vensl
+      relation_title: "Vensl: {{relation_name}}"
+      view_history: sÃ½na breytingarsÃ¶gu
+    relation_details: 
       members: "StÃ¶k:"
       part_of: "Hluti af:"
-    relation_history:
-      relation_history: "BreytingarskrÃ¡ vensla "
-      relation_history_title: "BreytingarskrÃ¡ vensla: {{relation_name}}"
+    relation_history: 
       download: "{{download_xml_link}} eÃ°a {{view_details_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_details: "sÃ½na breytingarsÃ¶gu"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      relation_history: BreytingarskrÃ¡ vensla
+      relation_history_title: "BreytingarskrÃ¡ vensla: {{relation_name}}"
+      view_details: sÃ½na breytingarsÃ¶gu
+    relation_member: 
       entry_role: "{{type}} {{name}} sem â{{role}}â"
-      type:
-        node: "HnÃºturinn"
-        way: "Vegurinn"
-        relation: "Venslin"
-    relation:
-      relation: "Vensl"
-      relation_title: "Vensl: {{relation_name}}"
-      download: "{{download_xml_link}} eÃ°a {{view_history_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_history: "sÃ½na breytingarsÃ¶gu"
-    start:
-      view_data: "SÃ½na gÃ¶gn fyrir nÃºverandi kortasÃ½n"
-      manually_select: "Velja svÃ¦Ã°i Ã¡ kortinu"
-    start_rjs:
-      data_layer_name: "GÃ¶gn"
-      data_frame_title: "GÃ¶gn"
-      zoom_or_select: "ÃÃº verÃ°ur aÃ° Ã¾ysja aÃ° eÃ°a velja svÃ¦Ã°i Ã¡ kortinu"
-      drag_a_box: "TeiknaÃ°u kassa Ã¡ kortiÃ° til aÃ° velja svÃ¦Ã°i"
-      manually_select: "Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu"
-      loaded_an_area_with_num_features: "ÃÃº hefur valiÃ° svÃ¦Ã°i sem Ã¡ eru [[num_features]] hlutir. Sumir vafrar hÃ¶ndla illa fleiri en 100 hluti Ã­ einu, en Ã¾Ãº getur hlaÃ°iÃ° Ã¾eim inn Ã¾rÃ¡tt fyrir Ã¾aÃ° ef Ã¾Ãº telur Ã¾ig geta hÃ¶ndlaÃ° Ã¾aÃ°."
-      load_data: "HlaÃ°a inn gÃ¶gnum"
+      type: 
+        node: HnÃºturinn
+        relation: Venslin
+        way: Vegurinn
+    start: 
+      manually_select: Velja svÃ¦Ã°i Ã¡ kortinu
+      view_data: SÃ½na gÃ¶gn fyrir nÃºverandi kortasÃ½n
+    start_rjs: 
+      data_frame_title: GÃ¶gn
+      data_layer_name: GÃ¶gn
+      details: NÃ¡nar
+      drag_a_box: TeiknaÃ°u kassa Ã¡ kortiÃ° til aÃ° velja svÃ¦Ã°i
+      edited_by_user_at_timestamp: Breytt af [[user]] klukkan [[timestamp]]
+      history_for_feature: BreytingarskrÃ¡ fyrir [[feature]]
+      load_data: HlaÃ°a inn gÃ¶gnum
+      loaded_an_area_with_num_features: ÃÃº hefur valiÃ° svÃ¦Ã°i sem Ã¡ eru [[num_features]] hlutir. Sumir vafrar hÃ¶ndla illa fleiri en 100 hluti Ã­ einu, en Ã¾Ãº getur hlaÃ°iÃ° Ã¾eim inn Ã¾rÃ¡tt fyrir Ã¾aÃ° ef Ã¾Ãº telur Ã¾ig geta hÃ¶ndlaÃ° Ã¾aÃ°.
+      loading: HleÃ° inn gÃ¶gnum...
+      manually_select: Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu
+      object_list: 
+        api: NiÃ°urhala Ã¾essu svÃ¦Ã°i Ãºr forritunarviÃ°mÃ³tinu
+        back: Aftur Ã¡ listann yfir hluti Ã¡ Ã¾essu svÃ¦Ã°i
+        details: NÃ¡nar
+        heading: Hlutir
+        history: 
+          type: 
+            node: hnÃºt [[id]]
+            way: veg [[id]]
+        selected: 
+          type: 
+            node: HnÃºtur [[id]]
+            way: Vegur [[id]]
+        type: 
+          node: HnÃºturinn
+          way: Vegurinn
+      private_user: Ã³nafngreindum
+      show_history: SÃ½na breytingarsÃ¶gu
       unable_to_load_size: "Gat ekki hlaÃ°iÃ° gÃ¶gnum: SvÃ¦Ã°i af stÃ¦rÃ°inni [[bbox_size]] er of stÃ³rt, svÃ¦Ã°iÃ° verÃ°ur aÃ° vera minna en {{max_bbox_size}}"
-      loading: "HleÃ° inn gÃ¶gnum..."
-      show_history: "SÃ½na breytingarsÃ¶gu"
-      wait: "Augnablik..."
-      history_for_feature: "BreytingarskrÃ¡ fyrir [[feature]]"
-      details: "NÃ¡nar"
-      private_user: "Ã³nafngreindum"
-      edited_by_user_at_timestamp: "Breytt af [[user]] klukkan [[timestamp]]"
-      object_list:
-        heading: "Hlutir"
-        back: "Aftur Ã¡ listann yfir hluti Ã¡ Ã¾essu svÃ¦Ã°i"
-        type:
-          node: "HnÃºturinn"
-          way: "Vegurinn"
-        api: "NiÃ°urhala Ã¾essu svÃ¦Ã°i Ãºr forritunarviÃ°mÃ³tinu"
-        details: "NÃ¡nar"
-        selected:
-          type:
-            node: "HnÃºtur [[id]]"
-            way: "Vegur [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "hnÃºt [[id]]"
-            way: "veg [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: Augnablik...
+      zoom_or_select: ÃÃº verÃ°ur aÃ° Ã¾ysja aÃ° eÃ°a velja svÃ¦Ã°i Ã¡ kortinu
+    tag_details: 
       tags: "Eigindi:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} eÃ°a {{view_history_link}} eÃ°a {{edit_link}}"
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      edit: breyta
+      view_history: sÃ½na breytingarsÃ¶gu
+      way: Vegur
+      way_title: "Vegur: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: einnig hluti af {{related_ways}}
+        other: einnig hluti af {{related_ways}}
       nodes: "HnÃºtar:"
       part_of: "Hluti af:"
-      also_part_of:
-        one: "einnig hluti af {{related_ways}}"
-        other: "einnig hluti af {{related_ways}}"
-    way_history:
-      way_history: "BreytingarskrÃ¡ vegs"
-      way_history_title: "BreytingarskrÃ¡ vegs: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} eÃ°a {{view_details_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_details: "sÃ½na breytingarsÃ¶gu"
-    way:
-      way: "Vegur"
-      way_title: "Vegur: {{way_name}}"
-      download: "{{download_xml_link}} eÃ°a {{view_history_link}} eÃ°a {{edit_link}}"
-      download_xml: "Hala niÃ°ur Ã¡ XML sniÃ°i"
-      view_history: "sÃ½na breytingarsÃ¶gu"
-      edit: "breyta"
-  changeset:
+      download_xml: Hala niÃ°ur Ã¡ XML sniÃ°i
+      view_details: sÃ½na breytingarsÃ¶gu
+      way_history: BreytingarskrÃ¡ vegs
+      way_history_title: "BreytingarskrÃ¡ vegs: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Ãnafngreindur
+      big_area: (stÃ³rt)
+      no_comment: (engin)
+      no_edits: (engar breytingar)
+      show_area_box: sÃ½na svÃ¦Ã°ismÃ¶rk
+      still_editing: (enn aÃ° breyta)
+      view_changeset_details: SkoÃ°a breytingarsett
     changeset_paging_nav: 
-      showing_page: "SÃ½ni sÃ­Ã°u"
-      of: "af"
-    changeset:
-      still_editing: "(enn aÃ° breyta)"
-      anonymous: "Ãnafngreindur"
-      no_comment: "(engin)"
-      no_edits: "(engar breytingar)"
-      show_area_box: "sÃ½na svÃ¦Ã°ismÃ¶rk"
-      big_area: "(stÃ³rt)"
-      view_changeset_details: "SkoÃ°a breytingarsett"
-    changesets:
-      id: "Kennitala"
-      saved_at: "VistaÃ°"
-      user: "Notandi"
-      comment: "Athugasemd"
-      area: "SvÃ¦Ã°i"
-    list:
-      title: "Breytingarsett"
-      title_user: "Breytingar eftir {{user}}"
-      title_bbox: "Breytingar innan {{bbox}}"
-      title_user_bbox: "Breytingar eftir {{user}} innan {{bbox}}"
-
-      heading: "Breytingarsett"
-      heading_user: "Breytingarsett"
-      heading_bbox: "Breytingarsett"
-      heading_user_bbox: "Breytingarsett"
-
-      description: "NÃ½legar breytingar"
-      description_user: "Breytingar eftir {{user}}"
-      description_bbox: "Breytingar innan {{bbox}}"
-      description_user_bbox: "Breytingar eftir {{user}} innan {{bbox}}"
-  diary_entry:
-    new:
-      title: "NÃ½ bloggfÃ¦rsla"
-    list:
-      title: "Blogg notenda"
-      user_title: "Blogg {{user}}"
-      new: "NÃ½ bloggfÃ¦rsla"
-      in_language_title: "BloggfÃ¦rslur Ã¡ {{language}}"
-      new_title: "Semja nÃ½ja fÃ¦rslu Ã¡ bloggiÃ° Ã¾itt"
-      no_entries: "Engar bloggfÃ¦rslur"
-      recent_entries: "NÃ½legar fÃ¦rslur:"
-      older_entries: "Eldri fÃ¦rslur"
-      newer_entries: "NÃ½rri fÃ¦rslur"
-    edit:
-      title: "Breyta bloggfÃ¦rslu"
-      subject: "Titill:"
+      of: af
+      showing_page: SÃ½ni sÃ­Ã°u
+    changesets: 
+      area: SvÃ¦Ã°i
+      comment: Athugasemd
+      id: Kennitala
+      saved_at: VistaÃ°
+      user: Notandi
+    list: 
+      description: NÃ½legar breytingar
+      description_bbox: Breytingar innan {{bbox}}
+      description_user: Breytingar eftir {{user}}
+      description_user_bbox: Breytingar eftir {{user}} innan {{bbox}}
+      heading: Breytingarsett
+      heading_bbox: Breytingarsett
+      heading_user: Breytingarsett
+      heading_user_bbox: Breytingarsett
+      title: Breytingarsett
+      title_bbox: Breytingar innan {{bbox}}
+      title_user: Breytingar eftir {{user}}
+      title_user_bbox: Breytingar eftir {{user}} innan {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Athugasemd eftir {{link_user}} sett inn {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 athugasemd
+        other: "{{count}} athugasemdir"
+      comment_link: BÃ¦ta viÃ° athugasemd
+      edit_link: Breyta Ã¾essari fÃ¦rslu
+      posted_by: Sett inn af {{link_user}} {{created}} Ã¡ {{language_link}}
+      reply_link: Senda hÃ¶fund skilaboÃ°
+    edit: 
       body: "Texti:"
       language: "TungumÃ¡l:"
-      location: "StaÃ°setning:"
       latitude: "LengdargrÃ¡Ã°a:"
+      location: "StaÃ°setning:"
       longitude: "BreiddargrÃ¡Ã°a:"
-      use_map_link: "finna Ã¡ korti"
-      save_button: "Vista"
-      marker_text: "StaÃ°setning bloggfÃ¦rslu"
-    view:
-      title: "Blogg | {{user}}"
-      user_title: "Blogg {{user}}"
-      leave_a_comment: "BÃ¦ta viÃ° athugasemd"
+      marker_text: StaÃ°setning bloggfÃ¦rslu
+      save_button: Vista
+      subject: "Titill:"
+      title: Breyta bloggfÃ¦rslu
+      use_map_link: finna Ã¡ korti
+    feed: 
+      all: 
+        description: NÃ½justu dagbÃ³karfÃ¦rslur frÃ¡ OpenStreetMap
+        title: OpenStreetMap dagbÃ³karfÃ¦rslur
+      language: 
+        description: NÃ½justu dagbÃ³karfÃ¦rslur frÃ¡ OpenStreetMap Ã¡ {{language_name}}
+        title: OpenStreetMap dagbÃ³karfÃ¦rslur Ã¡ {{language_name}}
+      user: 
+        description: NÃ½justu dagbÃ³karfÃ¦rslur eftir {{user}}
+        title: OpenStreetMap dagbÃ³karfÃ¦rslur eftir {{user}}
+    list: 
+      in_language_title: BloggfÃ¦rslur Ã¡ {{language}}
+      new: NÃ½ bloggfÃ¦rsla
+      new_title: Semja nÃ½ja fÃ¦rslu Ã¡ bloggiÃ° Ã¾itt
+      newer_entries: NÃ½rri fÃ¦rslur
+      no_entries: Engar bloggfÃ¦rslur
+      older_entries: Eldri fÃ¦rslur
+      recent_entries: "NÃ½legar fÃ¦rslur:"
+      title: Blogg notenda
+      user_title: Blogg {{user}}
+    new: 
+      title: NÃ½ bloggfÃ¦rsla
+    no_such_entry: 
+      body: BloggfÃ¦rsla nÃºmer er ekki til {{id}}. Kannski slÃ³stu slÃ³Ã°ina vitlaust inn eÃ°a fylgdir Ã³gildum tengli.
+      heading: BloggfÃ¦rsla nÃºmer {{id}} er ekki til
+      title: Ãessi bloggfÃ¦rsla er ekki til
+    no_such_user: 
+      body: ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli.
+      heading: Notandinn {{user}} er ekki til
+      title: Notandi ekki til
+    view: 
+      leave_a_comment: BÃ¦ta viÃ° athugasemd
+      login: InnskrÃ¡Ã°u Ã¾ig
       login_to_leave_a_comment: "{{login_link}} til aÃ° bÃ¦ta viÃ° athugasemd"
-      login: "InnskrÃ¡Ã°u Ã¾ig"
-      save_button: "Vista"
-    no_such_entry:
-      title: "Ãessi bloggfÃ¦rsla er ekki til"
-      heading: "BloggfÃ¦rsla nÃºmer {{id}} er ekki til"
-      body: "BloggfÃ¦rsla nÃºmer er ekki til {{id}}. Kannski slÃ³stu slÃ³Ã°ina vitlaust inn eÃ°a fylgdir Ã³gildum tengli."
-    no_such_user:
-      title: "Notandi ekki til"
-      heading: "Notandinn {{user}} er ekki til"
-      body: "ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli."
-    diary_entry:
-      posted_by: "Sett inn af {{link_user}} {{created}} Ã¡ {{language_link}}"
-      comment_link: "BÃ¦ta viÃ° athugasemd"
-      reply_link: "Senda hÃ¶fund skilaboÃ°"
-      comment_count:
-        one: "1 athugasemd"
-        other: "{{count}} athugasemdir"
-      edit_link: "Breyta Ã¾essari fÃ¦rslu"
-    diary_comment:
-      comment_from: "Athugasemd eftir {{link_user}} sett inn {{comment_created_at}}"
-    feed:
-      user:
-        title: "OpenStreetMap dagbÃ³karfÃ¦rslur eftir {{user}}"
-        description: "NÃ½justu dagbÃ³karfÃ¦rslur eftir {{user}}"
-      language:
-        title: "OpenStreetMap dagbÃ³karfÃ¦rslur Ã¡ {{language_name}}"
-        description: "NÃ½justu dagbÃ³karfÃ¦rslur frÃ¡ OpenStreetMap Ã¡ {{language_name}}"
-      all:
-        title: "OpenStreetMap dagbÃ³karfÃ¦rslur"
-        description: "NÃ½justu dagbÃ³karfÃ¦rslur frÃ¡ OpenStreetMap"
-  export:
-    start:
-      area_to_export: "SvÃ¦Ã°i til aÃ° niÃ°urhala"
-      manually_select: "Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu"
-      format_to_export: "SkrÃ¡asniÃ°"
-      osm_xml_data: "OpenStreetMap XML gÃ¶gn"
-      mapnik_image: "Mapnik mynd"
-      osmarender_image: "Osmarender mynd"
-      embeddable_html: "HTML til aÃ° bÃ¦ta Ã¡ vefsÃ­Ã°u"
-      licence: "Leyfi"
-      export_details: 'OpenStreetMap gÃ¶gnin eru undir <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 leyfinu</a>.'
-      options: "ValmÃ¶guleikar"
-      format: "SniÃ°"
-      scale: "Skali"
-      max: "hÃ¡mark"
+      save_button: Vista
+      title: Blogg | {{user}}
+      user_title: Blogg {{user}}
+  export: 
+    start: 
+      add_marker: BÃ¦ta punkti Ã¡ kortiÃ°
+      area_to_export: SvÃ¦Ã°i til aÃ° niÃ°urhala
+      embeddable_html: HTML til aÃ° bÃ¦ta Ã¡ vefsÃ­Ã°u
+      export_button: NiÃ°urhala
+      export_details: OpenStreetMap gÃ¶gnin eru undir <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 leyfinu</a>.
+      format: SniÃ°
+      format_to_export: SkrÃ¡asniÃ°
       image_size: "StÃ¦rÃ° myndar:"
-      zoom: "Ãys"
-      add_marker: "BÃ¦ta punkti Ã¡ kortiÃ°"
       latitude: "LengdargrÃ¡Ã°a:"
+      licence: Leyfi
       longitude: "BreiddargrÃ¡Ã°a:"
-      output: "Ãttak"
-      paste_html: "NotaÃ°u Ã¾ennan HTML kÃ³Ã°a til aÃ° bÃ¦ta kortinu Ã¡ vefsÃ­Ã°u"
-      export_button: "NiÃ°urhala"
-    start_rjs:
-      export: "NiÃ°urhala"
-      drag_a_box: "TeiknaÃ°u kassa Ã¡ kortiÃ° til aÃ° velja svÃ¦Ã°i"
-      manually_select: "Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu"
-      click_add_marker: "Smelltu Ã¡ kortiÃ° til aÃ° bÃ¦ta viÃ° punkti"
-      change_marker: "Breyta staÃ°setningu punktsins"
-      add_marker: "BÃ¦ta viÃ° punkt Ã¡ kortiÃ°"
-      view_larger_map: "SkoÃ°a Ã¡ stÃ¦rra korti"
-  geocoder:
-    search:
-      title:
-        latlon: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} af {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} frÃ¡ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'StaÃ°setning frÃ¡ <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
+      manually_select: Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu
+      mapnik_image: Mapnik mynd
+      max: hÃ¡mark
+      options: ValmÃ¶guleikar
+      osm_xml_data: OpenStreetMap XML gÃ¶gn
+      osmarender_image: Osmarender mynd
+      output: Ãttak
+      paste_html: NotaÃ°u Ã¾ennan HTML kÃ³Ã°a til aÃ° bÃ¦ta kortinu Ã¡ vefsÃ­Ã°u
+      scale: Skali
+      zoom: Ãys
+    start_rjs: 
+      add_marker: BÃ¦ta viÃ° punkt Ã¡ kortiÃ°
+      change_marker: Breyta staÃ°setningu punktsins
+      click_add_marker: Smelltu Ã¡ kortiÃ° til aÃ° bÃ¦ta viÃ° punkti
+      drag_a_box: TeiknaÃ°u kassa Ã¡ kortiÃ° til aÃ° velja svÃ¦Ã°i
+      export: NiÃ°urhala
+      manually_select: Velja annaÃ° svÃ¦Ã°i Ã¡ kortinu
+      view_larger_map: SkoÃ°a Ã¡ stÃ¦rra korti
+  geocoder: 
+    description: 
+      title: 
+        geonames: StaÃ°setning frÃ¡ <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} frÃ¡ <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
         cities: Borgir
-        towns: BÃ¦ir
         places: StaÃ°ir
-    description_osm_namefinder:
+        towns: BÃ¦ir
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} af{{type}}"
-    results:
-      no_results: "Ekkert fannst"
-    distance:
-      zero: "minna en 1 km"
-      one: "u.Ã¾.b. 1 km"
-      other: "u.Ã¾.b. {{count}} km"
-    direction:
-      south_west: "suÃ°vestur"
-      south: "suÃ°ur"
-      south_east: "suÃ°austur"
-      east: "austur"
-      north_east: "norÃ°austur"
-      north: "norÃ°ur"
-      north_west: "norÃ°vestur"
-      west: "vestur"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap merkiÃ°
-    welcome_user: "HÃ¦ {{user_link}}"
-    welcome_user_link_tooltip: NotandasÃ­Ã°an Ã¾Ã­n
-    home: "heim"
-    home_tooltip: "FÃ¦ra kortasÃ½nina Ã¡ Ã¾Ã­na staÃ°setningu"
-    inbox: "innhÃ³lf ({{count}})"
-    inbox_tooltip:
-      zero: ÃaÃ° eru engin skilaboÃ° Ã­ innhÃ³lfinu Ã¾Ã­nu
+    direction: 
+      east: austur
+      north: norÃ°ur
+      north_east: norÃ°austur
+      north_west: norÃ°vestur
+      south: suÃ°ur
+      south_east: suÃ°austur
+      south_west: suÃ°vestur
+      west: vestur
+    distance: 
+      one: u.Ã¾.b. 1 km
+      other: u.Ã¾.b. {{count}} km
+      zero: minna en 1 km
+    results: 
+      no_results: Ekkert fannst
+    search: 
+      title: 
+        ca_postcode: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: NiÃ°urstÃ¶Ã°ur frÃ¡ <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} af {{placename}}"
+  layouts: 
+    alt_donation: FjÃ¡rframlagssÃ­Ã°a
+    donate: HjÃ¡lpaÃ°u OpenStreetMap verkefninu meÃ° {{link}} Ã­ vÃ©lbÃºnaÃ°arsjÃ³Ã°inn.
+    donate_link_text: fjÃ¡rframlagi
+    edit: Breyta
+    edit_tooltip: Breyta kortagÃ¶gnunum
+    export: NiÃ°urhala
+    export_tooltip: NiÃ°urhala kortagÃ¶gnum Ã¡ hinum Ã½msu sniÃ°um
+    gps_traces: GPS ferlar
+    gps_traces_tooltip: SjÃ¡ alla GPS ferla
+    help_wiki: HjÃ¡lp &amp; Wiki
+    help_wiki_tooltip: HjÃ¡lpar og wiki-sÃ­Ã°a fyrir verkefniÃ°
+    help_wiki_url: http://wiki.openstreetmap.org/index.php?title=Fors%C3%AD%C3%B0a&uselang=is
+    history: BreytingarskrÃ¡
+    history_tooltip: SjÃ¡ skrÃ¡ yfir breytingarsett
+    home: heim
+    home_tooltip: FÃ¦ra kortasÃ½nina Ã¡ Ã¾Ã­na staÃ°setningu
+    inbox: innhÃ³lf ({{count}})
+    inbox_tooltip: 
       one: ÃaÃ° eru ein skilaboÃ° Ã­ innhÃ³lfinu Ã¾Ã­nu
       other: ÃaÃ° eru {{count}} skilaboÃ° Ã­ innhÃ³lfinu Ã¾Ã­nu
-    logout: "ÃºtskrÃ¡"
-    logout_tooltip: "ÃtskrÃ¡"
-    log_in: "innskrÃ¡"
+      zero: ÃaÃ° eru engin skilaboÃ° Ã­ innhÃ³lfinu Ã¾Ã­nu
+    intro_1: OpenStreetMap er frjÃ¡lst heimskort sem hver sem er getur breytt. LÃ­ka Ã¾Ãº!
+    intro_2: OpenStreetMap gerir Ã¾Ã©r kleift aÃ° skoÃ°a, breyta og nota kortagÃ¶gn Ã­ samvinnu viÃ° aÃ°ra.
+    intro_3: HÃ½sÃ­ng verkefnisins er studd af {{ucl}} og {{bytemark}}.
+    log_in: innskrÃ¡
     log_in_tooltip: SkrÃ¡Ã°u Ã¾ig inn meÃ° aÃ°gangi sem er Ã¾egar til
-    sign_up: "bÃºa til aÃ°gang"
-    sign_up_tooltip: "BÃºaÃ°u til aÃ°gang til aÃ° geta breytt kortinu"
-    view: "Kort"
-    view_tooltip: "KortasÃ½n"
-    edit: "Breyta"
-    edit_tooltip: "Breyta kortagÃ¶gnunum"
-    history: "BreytingarskrÃ¡"
-    history_tooltip: "SjÃ¡ skrÃ¡ yfir breytingarsett"
-    export: "NiÃ°urhala"
-    export_tooltip: "NiÃ°urhala kortagÃ¶gnum Ã¡ hinum Ã½msu sniÃ°um"
-    gps_traces: "GPS ferlar"
-    gps_traces_tooltip: "SjÃ¡ alla GPS ferla"
-    user_diaries: "Blogg notenda"
-    user_diaries_tooltip: "SjÃ¡ blogg notenda"
-    tag_line: "FrjÃ¡lsa wiki heimskortiÃ°"
-    intro_1: "OpenStreetMap er frjÃ¡lst heimskort sem hver sem er getur breytt. LÃ­ka Ã¾Ãº!"
-    intro_2: "OpenStreetMap gerir Ã¾Ã©r kleift aÃ° skoÃ°a, breyta og nota kortagÃ¶gn Ã­ samvinnu viÃ° aÃ°ra."
-    intro_3: "HÃ½sÃ­ng verkefnisins er studd af {{ucl}} og {{bytemark}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "OpenStreetMap gagnagrunnurinn er niÃ°ri vegna viÃ°halds."
-    osm_read_only: "Ekki er hÃ¦gt aÃ° skrifa Ã­ OpenStreetMap gagnagrunninn Ã­ augnablikinu vegna viÃ°halds."
-    donate: "HjÃ¡lpaÃ°u OpenStreetMap verkefninu meÃ° {{link}} Ã­ vÃ©lbÃºnaÃ°arsjÃ³Ã°inn."
-    donate_link_text: "fjÃ¡rframlagi"
-    help_wiki: "HjÃ¡lp &amp; Wiki"
-    help_wiki_tooltip: "HjÃ¡lpar og wiki-sÃ­Ã°a fyrir verkefniÃ°"
-    help_wiki_url: "http://wiki.openstreetmap.org/index.php?title=Fors%C3%AD%C3%B0a&uselang=is"
-    news_blog: "FrÃ©ttablogg"
-    news_blog_tooltip: "Blogg um OpenStreetMap, frjÃ¡ls kortagÃ¶gn o.fl."
-    shop: "Verslun"
+    logo: 
+      alt_text: OpenStreetMap merkiÃ°
+    logout: ÃºtskrÃ¡
+    logout_tooltip: ÃtskrÃ¡
+    news_blog: FrÃ©ttablogg
+    news_blog_tooltip: Blogg um OpenStreetMap, frjÃ¡ls kortagÃ¶gn o.fl.
+    osm_offline: OpenStreetMap gagnagrunnurinn er niÃ°ri vegna viÃ°halds.
+    osm_read_only: Ekki er hÃ¦gt aÃ° skrifa Ã­ OpenStreetMap gagnagrunninn Ã­ augnablikinu vegna viÃ°halds.
+    shop: Verslun
     shop_tooltip: Verslun meÃ° vÃ¶rum tengdum OpenStreetMap
-    shop_url: "http://wiki.openstreetmap.org/index.php?title=Merchandise&uselang=is"
-    sotm: 'Komdu Ã¡ âState of the mapâ - OpenStreetMap rÃ¡Ã°stefnuna sem verÃ°ur haldin 10. - 12. jÃºlÃ­ 2009 Ã­ Amsterdam!'
-    alt_donation: "FjÃ¡rframlagssÃ­Ã°a"
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} bÃ¦tti viÃ° athugasemd Ã¡ bloggfÃ¦rslu Ã¾Ã­na"
+    shop_url: http://wiki.openstreetmap.org/index.php?title=Merchandise&uselang=is
+    sign_up: bÃºa til aÃ°gang
+    sign_up_tooltip: BÃºaÃ°u til aÃ°gang til aÃ° geta breytt kortinu
+    sotm: Komdu Ã¡ âState of the mapâ - OpenStreetMap rÃ¡Ã°stefnuna sem verÃ°ur haldin 10. - 12. jÃºlÃ­ 2009 Ã­ Amsterdam!
+    tag_line: FrjÃ¡lsa wiki heimskortiÃ°
+    user_diaries: Blogg notenda
+    user_diaries_tooltip: SjÃ¡ blogg notenda
+    view: Kort
+    view_tooltip: KortasÃ½n
+    welcome_user: HÃ¦ {{user_link}}
+    welcome_user_link_tooltip: NotandasÃ­Ã°an Ã¾Ã­n
+  map: 
+    coordinates: "Hnit:"
+    edit: Breyta
+    view: Kort
+  message: 
+    delete: 
+      deleted: SkilaboÃ°unum var eytt
+    inbox: 
+      date: Dagsetning
+      from: FrÃ¡
+      my_inbox: Mitt innhÃ³lf
+      no_messages_yet: ÃÃº hefur ekki fengiÃ° nein skilboÃ°. HvÃ­ ekki aÃ° hafa samband viÃ° einhverja {{people_mapping_nearby_link}}?
+      outbox: ÃºthÃ³lf
+      people_mapping_nearby: nÃ¡lÃ¦ga notendur
+      subject: Titill
+      title: InnhÃ³lf
+      you_have: ÃÃº hefur {{new_count}} Ã³lesin skilaboÃ° og {{old_count}} lesin skilaboÃ°
+    mark: 
+      as_read: SkilaboÃ°in voru merkt sem lesin
+      as_unread: SkilaboÃ°in voru merkt sem Ã³lesin
+    message_summary: 
+      delete_button: EyÃ°a
+      read_button: Merkja sem lesin
+      reply_button: Svara
+      unread_button: Merkja sem Ã³lesin
+    new: 
+      back_to_inbox: Aftur Ã­ innhÃ³lf
+      body: Texti
+      message_sent: SkilaboÃ°in hafa veriÃ° send
+      send_button: Senda
+      send_message_to: Senda skilaboÃ° til {{name}}
+      subject: Titill
+      title: Senda skilaboÃ°
+    no_such_user: 
+      body: ÃaÃ° eru engin skilaboÃ° eÃ°a notandi til meÃ° nafni
+      heading: Notandi eÃ°a skilaboÃ° ekki til
+      title: Notandi eÃ°a skilaboÃ° ekki til
+    outbox: 
+      date: Dags
+      inbox: innhÃ³lf
+      my_inbox: Mitt {{inbox_link}}
+      no_sent_messages: ÃÃº hefur ekki seint nein skeyti, hvÃ­ ekki aÃ° hafa samband viÃ° einhverja {{people_mapping_nearby_link}}?
+      outbox: ÃºthÃ³lf
+      people_mapping_nearby: nÃ¡lÃ¦ga notendur
+      subject: Titill
+      title: ÃthÃ³lf
+      to: Til
+      you_have_sent_messages: ÃÃº hefur sent {{sent_count}} skeyti
+    read: 
+      back_to_inbox: Aftur Ã­ innhÃ³lf
+      back_to_outbox: Aftur Ã­ ÃºthÃ³lf
+      date: Dags
+      from: FrÃ¡
+      reading_your_messages: Les mÃ³ttekin skilaboÃ°
+      reading_your_sent_messages: Les send skilaboÃ°
+      reply_button: Svara
+      subject: Titill
+      title: Lesa skilaboÃ°
+      to: Til
+      unread_button: Merkja sem Ã³lesin
+    sent_message_summary: 
+      delete_button: EyÃ°a
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                        Ekki svara Ã¾essum pÃ³sti.                         *"
       banner2: "*                NotaÃ°u OpenStreetMap vefinn til aÃ° svara.                *"
-      hi: "HÃ¦ {{to_user}},"
+      footer: ÃÃº getur einnig lesiÃ° athugasemdina Ã¡ {{readurl}} og skrifaÃ° athugasemd Ã¡ {{commenturl}} eÃ°a svaraÃ° Ã¡ {{replyurl}}
       header: "{{from_user}} hefur bÃ¦tt viÃ° athugasemd Ã¡ OpenStreetMap bloggiÃ° Ã¾itt meÃ° titlinum â{{subject}}â:"
-      footer: "ÃÃº getur einnig lesiÃ° athugasemdina Ã¡ {{readurl}} og skrifaÃ° athugasemd Ã¡ {{commenturl}} eÃ°a svaraÃ° Ã¡ {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} sendi Ã¾Ã©r nÃ½ skilaboÃ°"
-      banner1: "*                        Ekki svara Ã¾essum pÃ³sti.                         *"
-      banner2: "*                NotaÃ°u OpenStreetMap vefinn til aÃ° svara.                *"
-      hi: "HÃ¦ {{to_user}},"
-      header: "{{from_user}} hefur send Ã¾Ã©r skilaboÃ° Ã¡ OpenStreetMap meÃ° titlinum â{{subject}}â:"
-      footer1: "ÃÃº getur einnig lesiÃ° skilaboÃ°in Ã¡ {{readurl}}"
-      footer2: "og svaraÃ° Ã¡ {{replyurl}}"
-    friend_notification:
+      hi: HÃ¦ {{to_user}},
+      subject: "[OpenStreetMap] {{user}} bÃ¦tti viÃ° athugasemd Ã¡ bloggfÃ¦rslu Ã¾Ã­na"
+    email_confirm: 
+      subject: "[OpenStreetMap] StaÃ°festu netfangiÃ° Ã¾itt"
+    email_confirm_html: 
+      click_the_link: Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari breytingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna.
+      greeting: HÃ¦,
+      hopefully_you: Einhver (vonandi Ã¾Ãº) vill breyta netfanginu sÃ­nu Ã¡ {{server_url}} Ã­ {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari breytingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna.
+      greeting: HÃ¦,
+      hopefully_you_1: Einhver (vonandi Ã¾Ãº) vill breyta netfanginu sÃ­nu Ã¡
+      hopefully_you_2: "{{server_url}} Ã­ {{new_address}}."
+    friend_notification: 
+      had_added_you: Notandinn {{user}} hefur bÃ¦tt Ã¾Ã©r viÃ° sem vini Ã¡ OpenStreetMap.
+      see_their_profile: ÃÃº getur sÃ©Ã° notandasÃ­Ã°u notandans Ã¡ {{userurl}} og jafnvel bÃ¦tt honum viÃ° sem vini lÃ­ka.
       subject: "[OpenStreetMap] {{user}} bÃ¦tti Ã¾Ã©r viÃ° sem vin"
-      had_added_you: "Notandinn {{user}} hefur bÃ¦tt Ã¾Ã©r viÃ° sem vini Ã¡ OpenStreetMap."
-      see_their_profile: "ÃÃº getur sÃ©Ã° notandasÃ­Ã°u notandans Ã¡ {{userurl}} og jafnvel bÃ¦tt honum viÃ° sem vini lÃ­ka."
-    gpx_notification:
-      greeting: "HÃ¦,"
-      your_gpx_file: "GPX skrÃ¡in Ã¾Ã­n"
-      with_description: "meÃ° lÃ½singuna:"
+    gpx_notification: 
+      and_no_tags: og engin tÃ¶gg.
       and_the_tags: "og eftirfarandi tÃ¶gg:"
-      and_no_tags: "og engin tÃ¶gg."
-      failure:
-        subject: "[OpenStreetMap] Villa viÃ° aÃ° flytja inn GPX skrÃ¡"
+      failure: 
         failed_to_import: "Lenti Ã­ villu Ã¾egar Ã¡tti aÃ° flytja hana inn, hÃ©rna er villan::"
-        more_info_1: "Frekari upplÃ½sinagr um GPX innflutningarvillur og hvernig"
+        import_failures_url: http://wiki.openstreetmap.org/index.php?title=FAQ&uselang=is#Why_didn.27t_my_GPX_file_upload_properly.3F
+        more_info_1: Frekari upplÃ½sinagr um GPX innflutningarvillur og hvernig
         more_info_2: "mÃ¡ forÃ°ast Ã¾Ã¦r er aÃ° finna hÃ©r::"
-        import_failures_url: "http://wiki.openstreetmap.org/index.php?title=FAQ&uselang=is#Why_didn.27t_my_GPX_file_upload_properly.3F"
-      success:
+        subject: "[OpenStreetMap] Villa viÃ° aÃ° flytja inn GPX skrÃ¡"
+      greeting: HÃ¦,
+      success: 
+        loaded_successfully: var innflutt meÃ° {{trace_points}} punkta af {{possible_points}} mÃ¶gulegum.
         subject: "[OpenStreetMap] GPX skrÃ¡ innflutt"
-        loaded_successfully: "var innflutt meÃ° {{trace_points}} punkta af {{possible_points}} mÃ¶gulegum."
-    signup_confirm:
+      with_description: "meÃ° lÃ½singuna:"
+      your_gpx_file: GPX skrÃ¡in Ã¾Ã­n
+    lost_password: 
+      subject: "[OpenStreetMap] BeÃ°ni um aÃ° endurstilla lykilorÃ°"
+    lost_password_html: 
+      click_the_link: Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari endurstillingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna.
+      greeting: HÃ¦,
+      hopefully_you: Einhver (vonandi Ã¾Ãº) hefur beÃ°iÃ° um aÃ° endurstilla lykilorÃ°iÃ° Ã¡ reikningnum meÃ° Ã¾etta netfang Ã¡ openstreetmap.org
+    lost_password_plain: 
+      click_the_link: Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari endurstillingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna.
+      greeting: HÃ¦,
+      hopefully_you_1: Einhver (vonandi Ã¾Ãº) hefur beÃ°iÃ° um aÃ° endurstilla lykilorÃ°iÃ° Ã¡ reikningnum
+      hopefully_you_2: meÃ° Ã¾etta netfang Ã¡ openstreetmap.org
+    message_notification: 
+      banner1: "*                        Ekki svara Ã¾essum pÃ³sti.                         *"
+      banner2: "*                NotaÃ°u OpenStreetMap vefinn til aÃ° svara.                *"
+      footer1: ÃÃº getur einnig lesiÃ° skilaboÃ°in Ã¡ {{readurl}}
+      footer2: og svaraÃ° Ã¡ {{replyurl}}
+      header: "{{from_user}} hefur send Ã¾Ã©r skilaboÃ° Ã¡ OpenStreetMap meÃ° titlinum â{{subject}}â:"
+      hi: HÃ¦ {{to_user}},
+      subject: "[OpenStreetMap] {{user}} sendi Ã¾Ã©r nÃ½ skilaboÃ°"
+    signup_confirm: 
       subject: "[OpenStreetMap] StaÃ°festu netfangiÃ° Ã¾itt"
-    signup_confirm_plain:
-      greeting: "HÃ¦!"
+    signup_confirm_html: 
+      click_the_link: Ef Ã¾etta ert Ã¾Ãº Ã¾Ã¡ vertu velkomin(n)! vinsamlegast fylgdu tenglinum til aÃ° staÃ°festa reikningin Ã¾inn og haltu Ã¡frÃ¡m aÃ° lesa til aÃ° fÃ¡ frekari upplÃ½singar um OpenStreetMap.
+      current_user: Ã flokkakerfinu getur Ã¾Ãº einnig sÃ©Ã° <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Category:Users_by_geographical_region"> hvar Ã­ heiminum OpenStreetMap notendur</a> eru staÃ°settir.
+      get_reading: ÃÃº getur lesiÃ° um OpenStreetMap verkefniÃ° Ã¡ <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide">wiki-sÃ­Ã°unni okkar</a> eÃ°a <a href="http://www.opengeodata.org/">OpenGeoData blogginu</a> Ã¾ar sem einnig er aÃ° finna <a href="http://www.opengeodata.org/?cat=13">hljÃ³Ã°varp</a>.
+      greeting: HÃ¦!
+      hopefully_you: "Einhver (vonandi Ã¾Ãº) vill bÃºa til notanda Ã¡ Ã¾essari vefsÃ­Ã°u:"
+      introductory_video: ÃÃº getur horft Ã¡ {{introductory_video_link}}.
+      more_videos: Fleiri myndbÃ¶nd er {{more_videos_link}}.
+      more_videos_here: hÃ¦gt aÃ° finna hÃ©r
+      user_wiki_page: ÃaÃ° er mÃ¦lt meÃ° Ã¾vÃ­ aÃ° Ã¾Ãº bÃºir ttil notandasÃ­Ã°u Ã¡ wiki-inu Ã¾ar sem tengt er Ã­ flokk sem gefur til kynna hvar Ã¾Ãº ert, t.d. <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Category:Users_in_Iceland">[[Category:Users_in_Iceland]]</a>.
+      video_to_openstreetmap: kynningarmyndband um OpenStreetMap
+      wiki_signup: Kannski viltu einnig <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Fors%C3%AD%C3%B0a">skrÃ¡ Ã¾ig Ã¡ wiki-sÃ­Ã°una</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Ef Ã¾etta ert Ã¾Ãº Ã¾Ã¡ vertu velkomin(n)! vinsamlegast fylgdu tenglinum til aÃ° staÃ°festa
+      click_the_link_2: reikningin Ã¾inn og haltu Ã¡frÃ¡m aÃ° lesa til aÃ° fÃ¡ frekari upplÃ½singar um OpenStreetMap.
+      current_user_1: Ã flokkakerfinu getur Ã¾Ãº sÃ©Ã° hvar Ã­ heiminum OpenStreetMap notendur eru.
+      current_user_2: "HÃ©r er tengill Ã¡ rÃ³tina Ã¡ notendaflokkunum:"
+      greeting: HÃ¦!
       hopefully_you: "Einhver (vonandi Ã¾Ãº) vill bÃºa til notanda Ã¡ Ã¾essari vefsÃ­Ã°u:"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Ef Ã¾etta ert Ã¾Ãº Ã¾Ã¡ vertu velkomin(n)! vinsamlegast fylgdu tenglinum til aÃ° staÃ°festa"
-      click_the_link_2: "reikningin Ã¾inn og haltu Ã¡frÃ¡m aÃ° lesa til aÃ° fÃ¡ frekari upplÃ½singar um OpenStreetMap."
       introductory_video: "ÃÃº getur horft Ã¡ kynningarmyndband um OpenStreetMap hÃ©r:"
       more_videos: "Og fleiri kynningarmyndbÃ¶nd er aÃ° finna hÃ©r:"
-      the_wiki: "ÃÃº getur lesiÃ° um OpenStreetMap verkefniÃ° Ã¡ wiki-sÃ­Ã°unni okkar:"
-      the_wiki_url: "http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide"
       opengeodata: "OpenGeoData.org er aÃ°al-OpenStreetMap bloggiÃ°, Ã¾ar er lÃ­ka hljÃ³Ã°varp:"
+      the_wiki: "ÃÃº getur lesiÃ° um OpenStreetMap verkefniÃ° Ã¡ wiki-sÃ­Ã°unni okkar:"
+      the_wiki_url: http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide
+      user_wiki_1: ÃaÃ° er mÃ¦lt meÃ° Ã¾vÃ­ aÃ° Ã¾Ãº bÃºir til notandasÃ­Ã°u Ã¡ wiki-inu
+      user_wiki_2: og takir fram hvar Ã¾Ãº ert, t.d. meÃ° Ã¾vÃ­ aÃ° bÃ¦ta viÃ° Ã¡ hana [[Category:Users_in_Iceland]].
       wiki_signup: "Kannski viltu einnig skrÃ¡ Ã¾ig Ã¡ wiki-sÃ­Ã°una:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Fors%C3%AD%C3%B0a&uselang=is"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "ÃaÃ° er mÃ¦lt meÃ° Ã¾vÃ­ aÃ° Ã¾Ãº bÃºir til notandasÃ­Ã°u Ã¡ wiki-inu"
-      user_wiki_2: "og takir fram hvar Ã¾Ãº ert, t.d. meÃ° Ã¾vÃ­ aÃ° bÃ¦ta viÃ° Ã¡ hana [[Category:Users_in_Iceland]]."
-      current_user_1: "Ã flokkakerfinu getur Ã¾Ãº sÃ©Ã° hvar Ã­ heiminum OpenStreetMap notendur eru."
-      current_user_2: "HÃ©r er tengill Ã¡ rÃ³tina Ã¡ notendaflokkunum:"
-    signup_confirm_html:
-      greeting: "HÃ¦!"
-      hopefully_you: "Einhver (vonandi Ã¾Ãº) vill bÃºa til notanda Ã¡ Ã¾essari vefsÃ­Ã°u:"
-      click_the_link: "Ef Ã¾etta ert Ã¾Ãº Ã¾Ã¡ vertu velkomin(n)! vinsamlegast fylgdu tenglinum til aÃ° staÃ°festa reikningin Ã¾inn og haltu Ã¡frÃ¡m aÃ° lesa til aÃ° fÃ¡ frekari upplÃ½singar um OpenStreetMap."
-      introductory_video: "ÃÃº getur horft Ã¡ {{introductory_video_link}}."
-      video_to_openstreetmap: "kynningarmyndband um OpenStreetMap"
-      more_videos: "Fleiri myndbÃ¶nd er {{more_videos_link}}."
-      more_videos_here: "hÃ¦gt aÃ° finna hÃ©r"
-      get_reading: 'ÃÃº getur lesiÃ° um OpenStreetMap verkefniÃ° Ã¡ <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide">wiki-sÃ­Ã°unni okkar</a> eÃ°a <a href="http://www.opengeodata.org/">OpenGeoData blogginu</a> Ã¾ar sem einnig er aÃ° finna <a href="http://www.opengeodata.org/?cat=13">hljÃ³Ã°varp</a>.'
-      wiki_signup: 'Kannski viltu einnig <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Fors%C3%AD%C3%B0a">skrÃ¡ Ã¾ig Ã¡ wiki-sÃ­Ã°una</a>.'
-      user_wiki_page: 'ÃaÃ° er mÃ¦lt meÃ° Ã¾vÃ­ aÃ° Ã¾Ãº bÃºir ttil notandasÃ­Ã°u Ã¡ wiki-inu Ã¾ar sem tengt er Ã­ flokk sem gefur til kynna hvar Ã¾Ãº ert, t.d. <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Category:Users_in_Iceland">[[Category:Users_in_Iceland]]</a>.'
-      current_user: 'Ã flokkakerfinu getur Ã¾Ãº einnig sÃ©Ã° <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Category:Users_by_geographical_region"> hvar Ã­ heiminum OpenStreetMap notendur</a> eru staÃ°settir.'
-    email_confirm:
-      subject: "[OpenStreetMap] StaÃ°festu netfangiÃ° Ã¾itt"
-    email_confirm_plain:
-      greeting: "HÃ¦,"
-      hopefully_you_1: "Einhver (vonandi Ã¾Ãº) vill breyta netfanginu sÃ­nu Ã¡"
-      hopefully_you_2: "{{server_url}} Ã­ {{new_address}}."
-      click_the_link: "Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari breytingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna."
-    email_confirm_html:
-      greeting: "HÃ¦,"
-      hopefully_you: "Einhver (vonandi Ã¾Ãº) vill breyta netfanginu sÃ­nu Ã¡ {{server_url}} Ã­ {{new_address}}."
-      click_the_link: "Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari breytingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna."
-    lost_password:
-      subject: "[OpenStreetMap] BeÃ°ni um aÃ° endurstilla lykilorÃ°"
-    lost_password_plain:
-      greeting: "HÃ¦,"
-      hopefully_you_1: "Einhver (vonandi Ã¾Ãº) hefur beÃ°iÃ° um aÃ° endurstilla lykilorÃ°iÃ° Ã¡ reikningnum"
-      hopefully_you_2: "meÃ° Ã¾etta netfang Ã¡ openstreetmap.org"
-      click_the_link: "Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari endurstillingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna."
-    lost_password_html:
-      greeting: "HÃ¦,"
-      hopefully_you: "Einhver (vonandi Ã¾Ãº) hefur beÃ°iÃ° um aÃ° endurstilla lykilorÃ°iÃ° Ã¡ reikningnum meÃ° Ã¾etta netfang Ã¡ openstreetmap.org"
-      click_the_link: "Ef Ã¾Ãº Ã³skaÃ°ir eftir Ã¾essari endurstillingu fylgdu tenglinum hÃ©r fyrir neÃ°an til aÃ° staÃ°festa breytinguna."
-  message:
-    inbox:
-      title: "InnhÃ³lf"
-      my_inbox: "Mitt innhÃ³lf"
-      outbox: "ÃºthÃ³lf"
-      you_have: "ÃÃº hefur {{new_count}} Ã³lesin skilaboÃ° og {{old_count}} lesin skilaboÃ°"
-      from: "FrÃ¡"
-      subject: "Titill"
-      date: "Dagsetning"
-      no_messages_yet: "ÃÃº hefur ekki fengiÃ° nein skilboÃ°. HvÃ­ ekki aÃ° hafa samband viÃ° einhverja {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "nÃ¡lÃ¦ga notendur" 
-    message_summary:
-      unread_button: "Merkja sem Ã³lesin"
-      read_button: "Merkja sem lesin"
-      reply_button: "Svara"
-      delete_button: "EyÃ°a"
-    new:
-      title: "Senda skilaboÃ°"
-      send_message_to: "Senda skilaboÃ° til {{name}}"
-      subject: "Titill"
-      body: "Texti"
-      send_button: "Senda"
-      back_to_inbox: "Aftur Ã­ innhÃ³lf"
-      message_sent: "SkilaboÃ°in hafa veriÃ° send"
-    no_such_user:
-      title: "Notandi eÃ°a skilaboÃ° ekki til"
-      heading: "Notandi eÃ°a skilaboÃ° ekki til"
-      body: "ÃaÃ° eru engin skilaboÃ° eÃ°a notandi til meÃ° nafni"
-    outbox:
-      title: "ÃthÃ³lf"
-      my_inbox: "Mitt {{inbox_link}}"
-      inbox: "innhÃ³lf"
-      outbox: "ÃºthÃ³lf"
-      you_have_sent_messages: "ÃÃº hefur sent {{sent_count}} skeyti"
-      to: "Til"
-      subject: "Titill"
-      date: "Dags"
-      no_sent_messages: "ÃÃº hefur ekki seint nein skeyti, hvÃ­ ekki aÃ° hafa samband viÃ° einhverja {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "nÃ¡lÃ¦ga notendur"
-    read:
-      title: "Lesa skilaboÃ°"
-      reading_your_messages: "Les mÃ³ttekin skilaboÃ°"
-      from: "FrÃ¡"
-      subject: "Titill"
-      date: "Dags"
-      reply_button: "Svara"
-      unread_button: "Merkja sem Ã³lesin"
-      back_to_inbox: "Aftur Ã­ innhÃ³lf"
-      reading_your_sent_messages: "Les send skilaboÃ°"
-      to: "Til"
-      back_to_outbox: "Aftur Ã­ ÃºthÃ³lf"
-    sent_message_summary:
-      delete_button: "EyÃ°a"
-    mark:
-      as_read: "SkilaboÃ°in voru merkt sem lesin"
-      as_unread: "SkilaboÃ°in voru merkt sem Ã³lesin"
-    delete:
-      deleted: "SkilaboÃ°unum var eytt"
-  site:
-    index:
-      js_1: "ÃÃº ert annaÃ°hvort aÃ° nota vafra sem styÃ°ur ekki JavaScript eÃ°a hefur slÃ¶kkt Ã¡ JavaScript stuÃ°ning."
-      js_2: "OpenStreetMap notar JavaScript til aÃ° ÃºtfÃ¦ra gagnvirk kort."
-      js_3: 'ÃÃº getur einnig notaÃ° <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasÃ½nina</a> sem krefst ekki JavaScript stuÃ°nings.'
-      permalink: "Varanlegur tengill"
-      shortlink: "Varanlegur smÃ¡tengill"
-      license:
-        notice: "GefiÃ° Ãºt undir {{license_name}} leyfinu af Ã¾Ã¡ttakendum Ã­ {{project_name}}."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap verkefninu"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "ÃÃº hefur ekki merkt breytingar Ã¾Ã­nar sem opinberar."
-      not_public_description: "ÃÃº getur ekki lengur gert breytingar nema Ã¾Ã¦r sÃ©u merktar opinberar, Ã¾Ãº getur breytt Ã¾eim stillingum Ã¡ {{user_page}}."
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Fors%C3%AD%C3%B0a&uselang=is
+  oauth: 
+    oauthorize: 
+      allow_read_prefs: Lesa notandastillingarnar Ã¾Ã­nar.
+      allow_to: "Leyfa forritinu aÃ°:"
+      allow_write_api: Breyta kortagÃ¶gnunum.
+      allow_write_diary: BÃºa til bloggfÃ¦rslur, setja inn athugasemdir og bÃ¦ta viÃ° vinum.
+      allow_write_gpx: Hala upp GPS ferlum.
+      allow_write_prefs: Breyta notandastillingunum Ã¾Ã­num.
+      request_access: ForritiÃ° {{app_name}} hefur Ã³skaÃ° eftir aÃ° fÃ¡ aÃ°gang aÃ° OpenStreetMap Ã­ gegnum notandann Ã¾inn. HakaÃ°u viÃ° hvaÃ° eiginleika Ã¾Ãº vilt gefa forritinu leyfi fyrir. HÃ¦gt er aÃ° haka viÃ° hvaÃ°a eiginleika sem er.
+  oauth_clients: 
+    new: 
+      submit: SkrÃ¡
+      title: SkrÃ¡ nÃ½tt forrit
+    show: 
+      allow_read_prefs: Lesa notandastillingar Ã¾eirra.
+      allow_write_api: Breyta kortagÃ¶gnunum.
+      allow_write_diary: BÃºa til bloggfÃ¦rslur, setja inn athugasemdir og bÃ¦ta viÃ° vinum.
+      allow_write_gpx: Hala upp GPS ferlum.
+      allow_write_prefs: Breyta notandastillingum Ã¾eirra.
+      requests: "Ãska eftir eftirfarandi leyfum frÃ¡ notendum:"
+  printable_name: 
+    with_version: "{{id}}, ÃºtgÃ¡fa {{version}}"
+  site: 
+    edit: 
+      anon_edits_link_text: Finndu Ãºt afhverju.
+      flash_player_required: ÃÃº Ã¾arft Flash spilara til aÃ° nota Potlatch ritilinn. ÃÃº getur <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">halaÃ° niÃ°ur Flash spilara frÃ¡ Adobe.com</a> eÃ°a notaÃ° <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Editing">aÃ°ra OpenStreetMap ritla</a> sem ekki krefjast Flash.
+      not_public: ÃÃº hefur ekki merkt breytingar Ã¾Ã­nar sem opinberar.
+      not_public_description: ÃÃº getur ekki lengur gert breytingar nema Ã¾Ã¦r sÃ©u merktar opinberar, Ã¾Ãº getur breytt Ã¾eim stillingum Ã¡ {{user_page}}.
+      potlatch_unsaved_changes: ÃÃº ert meÃ° Ã³vistaÃ°ar breytingar. Til aÃ° vista Ã­ Potlatch Ã¾arf aÃ° af-velja nÃºverandi val ef Ã¾Ãº ert Ã­ âLiveâ-ham, eÃ°a Ã½ta Ã¡ âSaveâ hnappinn til aÃ° vista ef sÃ¡ hnappur er sjÃ¡anlegur.
       user_page_link: notandasÃ­Ã°unni Ã¾inni
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/index.php?title=Anonymous_edits&uselang=is"
-      anon_edits_link_text: "Finndu Ãºt afhverju."
-      flash_player_required: 'ÃÃº Ã¾arft Flash spilara til aÃ° nota Potlatch ritilinn. ÃÃº getur <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">halaÃ° niÃ°ur Flash spilara frÃ¡ Adobe.com</a> eÃ°a notaÃ° <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Editing">aÃ°ra OpenStreetMap ritla</a> sem ekki krefjast Flash.'
-      potlatch_unsaved_changes: "ÃÃº ert meÃ° Ã³vistaÃ°ar breytingar. Til aÃ° vista Ã­ Potlatch Ã¾arf aÃ° af-velja nÃºverandi val ef Ã¾Ãº ert Ã­ âLiveâ-ham, eÃ°a Ã½ta Ã¡ âSaveâ hnappinn til aÃ° vista ef sÃ¡ hnappur er sjÃ¡anlegur."
-    sidebar:
-      search_results: "LeitarniÃ°urstÃ¶Ã°ur"
-      close: "Loka"
-    search:
-      search: "Leita"
-      where_am_i: "Hvar er Ã©g?"
-      submit_text: "Ok"
-      search_help: "dÃ¦mi: âAkureyriâ, âLaugavegur, ReykjavÃ­kâ eÃ°a âpost offices near LÃ¼nenâ. SjÃ¡ einnig <a href='http://wiki.openstreetmap.org/index.php?uselang=is&title=Search'>leitarhjÃ¡lpina</a>."
-    key:
-      map_key: "KortaskÃ½ringar"
-      map_key_tooltip: "KortaÃºtskÃ½ringar fyrir mapnik ÃºtgÃ¡funa af kortinu Ã¡ Ã¾essu Ã¾ys-stigi"
-      table:
-        heading: "KortaskÃ½ringar fyrir Ã¾ys {{zoom_level}}"
-        entry:
-          motorway: "HraÃ°braut"
-          trunk: "Stofnbraut (Hringvegurinn)"
-          primary: "Stofnvegur"
-          secondary: "Tengivegur"
-          # tertiary: "Landsvegur"
-          unclassified: "HÃ©raÃ°svegur"
-          unsurfaced: "ÃbundiÃ° slitlag"
-          track: "SlÃ³Ã°i"
-          byway: "Merkt (bresk) hjÃ³laleiÃ°"
-          bridleway: "ReiÃ°stÃ­gur"
-          cycleway: "HjÃ³lastÃ­gur"
-          footway: "GÃ¶ngustÃ­gur"
-          rail: "Lestarteinar"
-          subway: "NeÃ°anjarÃ°arlest"
-          tram:
-            - SmÃ¡lest
-            - âtramâ
-          cable:
-            - SkÃ­Ã°alyfta
-            - stÃ³lalyfta
-          runway:
-            - Flugbraut
-            - akstursbraut
-          apron:
+    index: 
+      js_1: ÃÃº ert annaÃ°hvort aÃ° nota vafra sem styÃ°ur ekki JavaScript eÃ°a hefur slÃ¶kkt Ã¡ JavaScript stuÃ°ning.
+      js_2: OpenStreetMap notar JavaScript til aÃ° ÃºtfÃ¦ra gagnvirk kort.
+      js_3: ÃÃº getur einnig notaÃ° <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home kortasÃ½nina</a> sem krefst ekki JavaScript stuÃ°nings.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: GefiÃ° Ãºt undir {{license_name}} leyfinu af Ã¾Ã¡ttakendum Ã­ {{project_name}}.
+        project_name: OpenStreetMap verkefninu
+      permalink: Varanlegur tengill
+      shortlink: Varanlegur smÃ¡tengill
+    key: 
+      map_key: KortaskÃ½ringar
+      map_key_tooltip: KortaÃºtskÃ½ringar fyrir mapnik ÃºtgÃ¡funa af kortinu Ã¡ Ã¾essu Ã¾ys-stigi
+      table: 
+        entry: 
+          admin: StjÃ³rnsÃ½slumÃ¶rk
+          allotments: RÃ¦ktuÃ° svÃ¦Ã°i ÃºthlutuÃ° Ã­ einkaeigu
+          apron: 
             - FlugbrautarhlaÃ°
             - flugstÃ¶Ã°
-          admin: "StjÃ³rnsÃ½slumÃ¶rk"
-          forest: "RÃ¦ktaÃ°ur skÃ³gur"
-          wood: "NÃ¡ttÃºrulegur skÃ³gur"
-          golf: "GolfvÃ¶llur"
-          park: "AlmenningsgarÃ°ur"
-          resident: "ÃbÃºÃ°asvÃ¦Ã°i"
-          tourist: "FerÃ°amannasvÃ¦Ã°i"
-          common:
+          bridge: Umkringt svartri lÃ­nu = brÃº
+          bridleway: ReiÃ°stÃ­gur
+          brownfield: NÃ½byggingarsvÃ¦Ã°i
+          building: Merkisbygging
+          byway: Merkt (bresk) hjÃ³laleiÃ°
+          cable: 
+            - SkÃ­Ã°alyfta
+            - stÃ³lalyfta
+          cemetery: Grafreitur
+          centre: ÃÃ¾rÃ³ttamiÃ°stÃ¶Ã°
+          commercial: SkrifstoÃ°usvÃ¦Ã°i
+          common: 
             - Almenningur
             - lundur
-          retail: "SmÃ¡sÃ¶lusvÃ¦Ã°i"
-          industrial: "IÃ°naÃ°arsvÃ¦Ã°i"
-          commercial: "SkrifstoÃ°usvÃ¦Ã°i"
-          heathland: "HeiÃ°alÃ¶nd"
-          lake:
+          construction: Vegur Ã­ byggingu
+          cycleway: HjÃ³lastÃ­gur
+          destination: UmferÃ° leyfileg Ã¡ Ã¡kveÃ°inn Ã¡fangastaÃ°
+          farm: BÃ³ndabÃ¦r
+          footway: GÃ¶ngustÃ­gur
+          forest: RÃ¦ktaÃ°ur skÃ³gur
+          golf: GolfvÃ¶llur
+          heathland: HeiÃ°alÃ¶nd
+          industrial: IÃ°naÃ°arsvÃ¦Ã°i
+          lake: 
             - Vatn
             - uppistÃ¶Ã°ulÃ³n
-          farm: "BÃ³ndabÃ¦r"
-          brownfield: "NÃ½byggingarsvÃ¦Ã°i"
-          cemetery: "Grafreitur"
-          allotments: "RÃ¦ktuÃ° svÃ¦Ã°i ÃºthlutuÃ° Ã­ einkaeigu"
-          pitch: "ÃÃ¾rÃ³ttavÃ¶llur"
-          centre: "ÃÃ¾rÃ³ttamiÃ°stÃ¶Ã°"
-          reserve: "NÃ¡ttÃºruverndarsvÃ¦Ã°i"
-          military: "HersvÃ¦Ã°i"
-          school:
+          military: HersvÃ¦Ã°i
+          motorway: HraÃ°braut
+          park: AlmenningsgarÃ°ur
+          permissive: UmferÃ° leyfileg
+          pitch: ÃÃ¾rÃ³ttavÃ¶llur
+          primary: Stofnvegur
+          private: Ã einkaeigu
+          rail: Lestarteinar
+          reserve: NÃ¡ttÃºruverndarsvÃ¦Ã°i
+          resident: ÃbÃºÃ°asvÃ¦Ã°i
+          retail: SmÃ¡sÃ¶lusvÃ¦Ã°i
+          runway: 
+            - Flugbraut
+            - akstursbraut
+          school: 
             - SkÃ³li
             - HÃ¡skÃ³li
-          building: "Merkisbygging"
-          station: "LestarstÃ¶Ã°"
-          summit:
+          secondary: Tengivegur
+          station: LestarstÃ¶Ã°
+          subway: NeÃ°anjarÃ°arlest
+          summit: 
             - Fjallstindur
             - tindur
-          tunnel: "Umkringt punktalÃ­num = gÃ¶ng"
-          bridge: "Umkringt svartri lÃ­nu = brÃº"
-          private: "Ã einkaeigu"
-          permissive: "UmferÃ° leyfileg"
-          destination: "UmferÃ° leyfileg Ã¡ Ã¡kveÃ°inn Ã¡fangastaÃ°"
-          construction: "Vegur Ã­ byggingu"
-  trace:
-    create:
-      upload_trace: "Upphala GPS feril"
-      trace_uploaded: "BÃºiÃ° er aÃ° hlaÃ°a upp GPS ferlinum og bÃ­Ã°ur hann nÃºna eftir Ã¾vÃ­ aÃ° vera settur inn Ã­ gagnagrunninn, sem gerist yfirleitt innan stundar. PÃ³stur verÃ°ur sendur Ã¡ netfangiÃ° Ã¾itt Ã¾egar Ã¾vÃ­ er lokiÃ°."
-    edit:
-      title: "Breyti ferlinum {{name}}"
-      heading: "Breyti ferlinum {{name}}"
+          tourist: FerÃ°amannasvÃ¦Ã°i
+          track: SlÃ³Ã°i
+          tram: 
+            - SmÃ¡lest
+            - âtramâ
+          trunk: Stofnbraut (Hringvegurinn)
+          tunnel: Umkringt punktalÃ­num = gÃ¶ng
+          unclassified: HÃ©raÃ°svegur
+          unsurfaced: ÃbundiÃ° slitlag
+          wood: NÃ¡ttÃºrulegur skÃ³gur
+        heading: KortaskÃ½ringar fyrir Ã¾ys {{zoom_level}}
+    search: 
+      search: Leita
+      search_help: "dÃ¦mi: âAkureyriâ, âLaugavegur, ReykjavÃ­kâ eÃ°a âpost offices near LÃ¼nenâ. SjÃ¡ einnig <a href='http://wiki.openstreetmap.org/index.php?uselang=is&title=Search'>leitarhjÃ¡lpina</a>."
+      submit_text: Ok
+      where_am_i: Hvar er Ã©g?
+    sidebar: 
+      close: Loka
+      search_results: LeitarniÃ°urstÃ¶Ã°ur
+  trace: 
+    create: 
+      trace_uploaded: BÃºiÃ° er aÃ° hlaÃ°a upp GPS ferlinum og bÃ­Ã°ur hann nÃºna eftir Ã¾vÃ­ aÃ° vera settur inn Ã­ gagnagrunninn, sem gerist yfirleitt innan stundar. PÃ³stur verÃ°ur sendur Ã¡ netfangiÃ° Ã¾itt Ã¾egar Ã¾vÃ­ er lokiÃ°.
+      upload_trace: Upphala GPS feril
+    delete: 
+      scheduled_for_deletion: Ãessum feril verÃ°ur eitt
+    edit: 
+      description: "LÃ½sing:"
+      download: niÃ°urhala
+      edit: breyta
       filename: "SkrÃ¡anafn:"
-      download: "niÃ°urhala"
-      uploaded_at: "HlaÃ°iÃ° upp:"
+      heading: Breyti ferlinum {{name}}
+      map: kort
+      owner: "Eigandi:"
       points: "Punktar:"
+      save_button: Vista breytingar
       start_coord: "Byrjunarhnit:"
-      map: "kort"
-      edit: "breyta"
-      owner: "Eigandi:"
-      description: "LÃ½sing:"
       tags: "TÃ¶gg:"
-      tags_help: "aÃ°skilin meÃ° kommum"
-      save_button: "Vista breytingar"
-    no_such_user:
-      title: "Notandi ekki til"
-      heading: "Notandinn {{user}} er ekki til"
-      body: "ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli."
-    trace_form:
-      upload_gpx: "Upphala GPX skrÃ¡"
-      description: "LÃ½sing"
-      tags: "TÃ¶gg"
-      tags_help: "aÃ°skilin meÃ° kommum"
-      public: "SjÃ¡anleg Ã¶Ã°rum?"
-      public_help: "HvaÃ° Ã¾Ã½Ã°ir Ã¾etta?"
-      public_help_url: "http://wiki.openstreetmap.org/index.php?title=Visibility_of_GPS_traces&uselang=is"
-      upload_button: "Upphala"
-      help: "HjÃ¡lp"
-      help_url: "http://wiki.openstreetmap.org/index.php?title=Upload&uselang=is"
-    trace_header:
-      see_just_your_traces: "SÃ½na aÃ°eins Ã¾Ã­na ferla, eÃ°a hlaÃ°a upp feril"
-      see_all_traces: "SjÃ¡ alla ferla"
-      see_your_traces: "SjÃ¡ aÃ°eins Ã¾Ã­na ferla"
-      traces_waiting: "ÃÃº ert meÃ° {{count}} ferla Ã­ biÃ°. ÃhugaÃ°u aÃ° bÃ­Ã°a meÃ° aÃ° upphala fleiri ferlum til aÃ° aÃ°rir notendur komist aÃ°."
-    trace_optionals:
-      tags: "TÃ¶gg"
-    view:
-      title: "SkoÃ°a ferilinn {{name}}"
-      heading: "SkoÃ°a ferilinn {{name}}"
-      pending: "Ã BIÃ"
+      tags_help: aÃ°skilin meÃ° kommum
+      title: Breyti ferlinum {{name}}
+      uploaded_at: "HlaÃ°iÃ° upp:"
+      visibility: "SÃ½nileiki:"
+      visibility_help: hvaÃ° Ã¾Ã½Ã°ir Ã¾etta?
+    list: 
+      public_traces: Allir ferlar
+      public_traces_from: Ferlar eftir {{user}}
+      tagged_with: " meÃ° taggiÃ° {{tags}}"
+      your_traces: ÃÃ­nir ferlar
+    make_public: 
+      made_public: Ferilinn var gerÃ°ur sjÃ¡anlegur
+    no_such_user: 
+      body: ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli.
+      heading: Notandinn {{user}} er ekki til
+      title: Notandi ekki til
+    trace: 
+      ago: "{{time_in_words_ago}} sÃ­Ã°an"
+      by: eftir
+      count_points: "{{count}} punktar"
+      edit: breyta
+      edit_map: Breyta kortinu meÃ° ferilin til hliÃ°sjÃ³nar
+      in: Ã­
+      map: kort
+      more: upplÃ½singar
+      pending: Ã BIÃ
+      private: BARA ÃÃ SÃRÃ
+      public: ALLIR SJÃ
+      trace_details: SÃ½na upplÃ½singar um ferilinn
+      view_map: SjÃ¡ kort
+    trace_form: 
+      description: LÃ½sing
+      help: HjÃ¡lp
+      help_url: http://wiki.openstreetmap.org/index.php?title=Upload&uselang=is
+      tags: TÃ¶gg
+      tags_help: aÃ°skilin meÃ° kommum
+      upload_button: Upphala
+      upload_gpx: Upphala GPX skrÃ¡
+      visibility: SÃ½nileiki
+      visibility_help: hvaÃ° Ã¾Ã½Ã°ir Ã¾etta
+    trace_header: 
+      see_all_traces: SjÃ¡ alla ferla
+      see_just_your_traces: SÃ½na aÃ°eins Ã¾Ã­na ferla, eÃ°a hlaÃ°a upp feril
+      see_your_traces: SjÃ¡ aÃ°eins Ã¾Ã­na ferla
+      traces_waiting: ÃÃº ert meÃ° {{count}} ferla Ã­ biÃ°. ÃhugaÃ°u aÃ° bÃ­Ã°a meÃ° aÃ° upphala fleiri ferlum til aÃ° aÃ°rir notendur komist aÃ°.
+    trace_optionals: 
+      tags: TÃ¶gg
+    trace_paging_nav: 
+      of: af
+      showing: SÃ½ni sÃ­Ã°u
+    view: 
+      delete_track: EyÃ°a
+      description: "LÃ½sing:"
+      download: niÃ°urhala
+      edit: breyta
+      edit_track: Breyta
       filename: "SkrÃ¡arnafn:"
-      download: "niÃ°urhala"
-      uploaded: "HlaÃ°iÃ° upp:"
+      heading: SkoÃ°a ferilinn {{name}}
+      map: kort
+      none: engin
+      owner: "Eigandi:"
+      pending: Ã BIÃ
       points: "Punktar:"
       start_coordinates: "Byrjunarhnit:"
-      map: "kort"
-      edit: "breyta"
-      owner: "Eigandi:"
-      description: "LÃ½sing:"
-      tags: "TÃ¶gg"
-      none: "engin"
-      make_public: "Gera Ã¾ennan feril sjÃ¡anlegan Ã¶Ã°rum til frambÃºÃ°ar"
-      edit_track: "Breyta"
-      delete_track: "EyÃ°a"
-      trace_not_found: "Ãessi ferill fannst ekki!"
-    trace_paging_nav:
-      showing: "SÃ½ni sÃ­Ã°u"
-      of: "af"
-    trace:
-      pending: "Ã BIÃ"
-      count_points: "{{count}} punktar"
-      ago: "{{time_in_words_ago}} sÃ­Ã°an"
-      more: "upplÃ½singar"
-      trace_details: "SÃ½na upplÃ½singar um ferilinn"
-      view_map: "SjÃ¡ kort"
-      edit: "breyta"
-      edit_map: "Breyta kortinu meÃ° ferilin til hliÃ°sjÃ³nar"
-      public: "ALLIR SJÃ"
-      private: "BARA ÃÃ SÃRÃ"
-      by: "eftir"
-      in: "Ã­"
-      map: "kort"
-    list:
-      public_traces: "Allir ferlar"
-      your_traces: "ÃÃ­nir ferlar"
-      public_traces_from: "Ferlar eftir {{user}}"
-      tagged_with: " meÃ° taggiÃ° {{tags}}"
-    delete:
-      scheduled_for_deletion: "Ãessum feril verÃ°ur eitt"
-    make_public:
-      made_public: "Ferilinn var gerÃ°ur sjÃ¡anlegur"
-  user:
-    login:
-      title: "InnskrÃ¡"
-      heading: "InnskrÃ¡"
-      please login: "Vinsamlegast innskrÃ¡Ã°u Ã¾ig eÃ°a {{create_user_link}}."
-      create_account: "stofnaÃ°u aÃ°gang"
+      tags: TÃ¶gg
+      title: SkoÃ°a ferilinn {{name}}
+      trace_not_found: Ãessi ferill fannst ekki!
+      uploaded: "HlaÃ°iÃ° upp:"
+      visibility: "SÃ½nileiki:"
+  user: 
+    account: 
+      email never displayed publicly: (aldrei sÃ½nt opinberlega)
+      flash update success: Stillingarnar Ã¾Ã­nar voru uppfÃ¦rÃ°ar.
+      flash update success confirm needed: Stillingarnar Ã¾Ã­nar voru uppfÃ¦rÃ°ar. PÃ³stur var sendur Ã¡ netfangiÃ° Ã¾itt sem Ã¾Ãº Ã¾arft aÃ° bregÃ°ast viÃ° til aÃ° netfangiÃ° Ã¾itt verÃ°i staÃ°fest.
+      home location: "StaÃ°setning:"
+      latitude: "LengdargrÃ¡Ã°a:"
+      longitude: "BreiddargrÃ¡Ã°a:"
+      make edits public button: Gera allar breytingarnar mÃ­nar opinberar
+      my settings: MÃ­nar stillingar
+      no home location: ÃÃº hefur ekki stillt staÃ°setningu Ã¾Ã­na.
+      preferred languages: "ViÃ°mÃ³tstungumÃ¡l:"
+      profile description: "LÃ½sing Ã¡ Ã¾Ã©r:"
+      public editing: 
+        disabled: Ãvirkur og getur ekki breytt gÃ¶gnum, allar fyrri breytingar eru Ã³nafngreindar.
+        disabled link text: hvÃ­ get Ã©g ekki breytt neinu?
+        enabled: Nei, nafngreindur og getur breytt gÃ¶gnum.
+        enabled link: http://wiki.openstreetmap.org/index.php?uselang=is&title=Anonymous_edits
+        enabled link text: nÃ¡nar
+        heading: "Ãnafngreindur notandi?:"
+      return to profile: Aftur Ã¡ mÃ­na sÃ­Ã°u
+      save changes button: Vista breytingar
+      title: Stillingar
+      update home location on click: UppfÃ¦ra staÃ°setninguna Ã¾egar Ã©g smelli Ã¡ kortiÃ°
+    confirm: 
+      button: StaÃ°festa
+      failure: Notandi hefur Ã¾egar veriÃ° staÃ°festur meÃ° Ã¾essum lykli.
+      heading: StaÃ°festa notanda
+      press confirm button: HÃ©r getur Ã¾Ãº staÃ°fest aÃ° Ã¾Ãº viljir bÃºa til notanda..
+      success: Notandinn Ã¾inn hefur veriÃ° staÃ°festur.
+    confirm_email: 
+      button: StaÃ°festa
+      failure: Netfang hefur Ã¾egar veriÃ° staÃ°fest meÃ° Ã¾essum lykli.
+      heading: StaÃ°festa breytingu Ã¡ netfangi
+      press confirm button: HÃ©r getur Ã¾Ãº staÃ°fest breytingu Ã¡ netfangi.
+      success: NetfangiÃ° Ã¾itt hefur veriÃ° staÃ°fest.
+    friend_map: 
+      nearby mapper: "NÃ¡lÃ¦gur notandi: [[nearby_user]]"
+      your location: ÃÃ­n staÃ°setning
+    go_public: 
+      flash success: Allar breytingar Ã¾Ã­nar eru nÃº opinberar, og Ã¾Ãº getur breytt gÃ¶gnum.
+    login: 
+      account not active: Ãessi reikningur er ekki virkur.<br />Vinsamlegast smelltu Ã¡ tengilinn Ã­ staÃ°festingarpÃ³stinum sem Ã¾Ãº fÃ©kkst til aÃ° virkja reikninginn.
+      auth failure: Ãetta notandanafn eÃ°a lykilorÃ° er rangt.
+      create_account: stofnaÃ°u aÃ°gang
       email or username: "Netfang eÃ°a notandanafn:"
+      heading: InnskrÃ¡
+      login_button: InnskrÃ¡
+      lost password link: Gleymt lykilorÃ°?
       password: "LykilorÃ°:"
-      lost password link: "Gleymt lykilorÃ°?"
-      login_button: "InnskrÃ¡"
-      account not active: "Ãessi reikningur er ekki virkur.<br />Vinsamlegast smelltu Ã¡ tengilinn Ã­ staÃ°festingarpÃ³stinum sem Ã¾Ãº fÃ©kkst til aÃ° virkja reikninginn."
-      auth failure: "Ãetta notandanafn eÃ°a lykilorÃ° er rangt."
-    lost_password:
-      title: "gleymt lykilorÃ°"
-      heading: "Gleymt lykilorÃ°?"
-      email address: "Netfang:"
-      new password button: "Senda nÃ½tt lykilorÃ° Ã¡ netfangiÃ° Ã¾itt"
-      notice email on way: "NÃ½tt lykilorÃ° er Ã¡ leiÃ°inni Ã­ innhÃ³lfiÃ° Ã¾itt."
-      notice email cannot find: "Ãetta netfang fannst ekki."
-    reset_password:
-      title: "LykilorÃ° endurstillt"
-      heading: "Endurstillti lykilorÃ° fyrir notandann {{user}}"
-      password: "LykilorÃ°:"
-      confirm password: "StaÃ°festu lykilorÃ°:"
-      reset: "Endurstilla lykilorÃ°"
-      flash changed: "LykilorÃ°inu Ã¾Ã­nu hefur veriÃ° breytt"
-      flash token bad: "Ãessi leynistrengur fannst ekki, kannski er slÃ³Ã°in rÃ¶ng?"
-    new:
-      title: "NÃ½skrÃ¡"
-      heading: "NÃ½skrÃ¡"
-      no_auto_account_create: "ÃvÃ­ miÃ°ur getum viÃ° eki bÃºiÃ° til reikning fyrir Ã¾ig sjÃ¡lfkrafa."
-      contact_webmaster: 'HafÃ°u samband viÃ° <a href="mailto:webmaster@openstreetmap.org">vefstjÃ³ra</a> til aÃ° fÃ¡ reikning bÃºinn til.'
-      fill_form: "Filltu Ãºt Ã¾etta form og viÃ° munum senda Ã¾Ã©r pÃ³st svo Ã¾Ãº getir virkjaÃ° reikninginn Ã¾inn."
-      license_agreement: 'MeÃ° Ã¾vÃ­ aÃ° bÃºa til reikning samÃ¾ykkiru aÃ° Ã¶ll framlÃ¶g Ã¾Ã­n til verkefnisins falli undir <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-Share Alike (BY-SA)</a> leyfiÃ°.'
+      please login: Vinsamlegast innskrÃ¡Ã°u Ã¾ig eÃ°a {{create_user_link}}.
+      title: InnskrÃ¡
+    lost_password: 
       email address: "Netfang:"
+      heading: Gleymt lykilorÃ°?
+      new password button: Senda nÃ½tt lykilorÃ° Ã¡ netfangiÃ° Ã¾itt
+      notice email cannot find: Ãetta netfang fannst ekki.
+      notice email on way: NÃ½tt lykilorÃ° er Ã¡ leiÃ°inni Ã­ innhÃ³lfiÃ° Ã¾itt.
+      title: gleymt lykilorÃ°
+    make_friend: 
+      already_a_friend: "{{name}} er Ã¾egar vinur Ã¾inn."
+      failed: Gat ekki bÃ¦tt {{name}} Ã¡ vinalistann Ã¾inn.
+      success: "{{name}} er nÃºna vinur Ã¾inn."
+    new: 
       confirm email address: "StaÃ°festu netfang:"
-      not displayed publicly: 'Ekki sÃ½nt opinberlega (sjÃ¡ <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Privacy_Policy" title="MeÃ°ferÃ° persÃ³nuupplÃ½singa, Ã¾.Ã¡.m. netfanga">meÃ°ferÃ° persÃ³nuupplÃ½singa</a>)'
+      confirm password: "StaÃ°festu lykilorÃ°iÃ°:"
+      contact_webmaster: HafÃ°u samband viÃ° <a href="mailto:webmaster@openstreetmap.org">vefstjÃ³ra</a> til aÃ° fÃ¡ reikning bÃºinn til.
       display name: "SÃ½nilegt nafn:"
+      email address: "Netfang:"
+      fill_form: Filltu Ãºt Ã¾etta form og viÃ° munum senda Ã¾Ã©r pÃ³st svo Ã¾Ãº getir virkjaÃ° reikninginn Ã¾inn.
+      flash create success message: NÃ½r notandi var bÃºinn til fyrir Ã¾ig og staÃ°festingarpÃ³stur sendur Ã¡ netfangiÃ° sem Ã¾Ãº gafst upp.<br /><br />ÃÃº muntu ekki geta innskrÃ¡Ã° Ã¾ig fyrr en Ã¾Ãº ert bÃºin(n) aÃ° fylgja leiÃ°beiningunum Ã­ staÃ°festingarpÃ³stinum.<br /><br />Ef Ã¾Ãº notar spamkerfi sem sendir staÃ°festingarbeÃ°nir Ã¾egar Ã¾aÃ° verÃ°ur vart viÃ° nÃ½ja sendendur Ã¾arft Ã¾Ãº aÃ° bÃ¦ta webmaster@openstreetmap.org Ã¡ hvÃ­tlista. ÃaÃ° netfang getur ekki svaraÃ° staÃ°festingarbeiÃ°num.
+      heading: NÃ½skrÃ¡
+      license_agreement: MeÃ° Ã¾vÃ­ aÃ° bÃºa til reikning samÃ¾ykkiru aÃ° Ã¶ll framlÃ¶g Ã¾Ã­n til verkefnisins falli undir <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-Share Alike (BY-SA)</a> leyfiÃ°.
+      no_auto_account_create: ÃvÃ­ miÃ°ur getum viÃ° eki bÃºiÃ° til reikning fyrir Ã¾ig sjÃ¡lfkrafa.
+      not displayed publicly: Ekki sÃ½nt opinberlega (sjÃ¡ <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Privacy_Policy" title="MeÃ°ferÃ° persÃ³nuupplÃ½singa, Ã¾.Ã¡.m. netfanga">meÃ°ferÃ° persÃ³nuupplÃ½singa</a>)
       password: "LykilorÃ°:"
-      confirm password: "StaÃ°festu lykilorÃ°iÃ°:"
-      signup: "NÃ½skrÃ¡"
-      flash create success message: "NÃ½r notandi var bÃºinn til fyrir Ã¾ig og staÃ°festingarpÃ³stur sendur Ã¡ netfangiÃ° sem Ã¾Ãº gafst upp.<br /><br />ÃÃº muntu ekki geta innskrÃ¡Ã° Ã¾ig fyrr en Ã¾Ãº ert bÃºin(n) aÃ° fylgja leiÃ°beiningunum Ã­ staÃ°festingarpÃ³stinum.<br /><br />Ef Ã¾Ãº notar spamkerfi sem sendir staÃ°festingarbeÃ°nir Ã¾egar Ã¾aÃ° verÃ°ur vart viÃ° nÃ½ja sendendur Ã¾arft Ã¾Ãº aÃ° bÃ¦ta webmaster@openstreetmap.org Ã¡ hvÃ­tlista. ÃaÃ° netfang getur ekki svaraÃ° staÃ°festingarbeiÃ°num."
-    no_such_user:
-      title: "Notandi ekki til"
-      heading: "Notandinn {{user}} er ekki til"
-      body: "ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli."
-    view:
+      signup: NÃ½skrÃ¡
+      title: NÃ½skrÃ¡
+    no_such_user: 
+      body: ÃaÃ° er ekki til notandi meÃ° nafninu {{user}}. Kannski slÃ³stu nafniÃ° rangt inn eÃ°a fylgdir Ã³gildum tengli.
+      heading: Notandinn {{user}} er ekki til
+      title: Notandi ekki til
+    remove_friend: 
+      not_a_friend: "{{name}} er ekki vinur Ã¾inn."
+      success: "{{name}} er ekki lengur vinur Ã¾inn."
+    reset_password: 
+      confirm password: "StaÃ°festu lykilorÃ°:"
+      flash changed: LykilorÃ°inu Ã¾Ã­nu hefur veriÃ° breytt
+      flash token bad: Ãessi leynistrengur fannst ekki, kannski er slÃ³Ã°in rÃ¶ng?
+      heading: Endurstillti lykilorÃ° fyrir notandann {{user}}
+      password: "LykilorÃ°:"
+      reset: Endurstilla lykilorÃ°
+      title: LykilorÃ° endurstillt
+    set_home: 
+      flash success: StaÃ°setning Ã¾Ã­n hefur veriÃ° stillt
+    view: 
+      add as friend: bÃ¦ta viÃ° sem vin
+      add image: Upphala
+      ago: ({{time_in_words_ago}} sÃ­Ã°an)
+      change your settings: breyttu stillingunum Ã¾Ã­num
+      delete image: EyÃ°a myndinni
+      description: LÃ½sing
+      diary: blogg
+      edits: breytingar
+      if set location: Ef Ã¾Ãº vistar staÃ°setningu Ã¾Ã­na mun kortasjÃ¡ birtast hÃ©r fyrir neÃ°an meÃ° Ã¾Ã©r og nÃ¡lÃ¦gum notendum. ÃÃº getur stillt staÃ°setninguna Ã¡ {{settings_link}}.
+      km away: Ã­ {{count}} km fjarlÃ¦gÃ°
+      m away: Ã­ {{count}} m fjarlÃ¦gÃ°
+      mapper since: "Notandi sÃ­Ã°an:"
       my diary: bloggiÃ° mitt
-      new diary entry: nÃ½ bloggfÃ¦rsla
       my edits: mÃ­nar breytingar
-      my traces: mÃ­nir ferlar
       my settings: mÃ­nar stillingar
+      my traces: mÃ­nir ferlar
+      nearby users: "NÃ¡lÃ¦gir notendur:"
+      new diary entry: nÃ½ bloggfÃ¦rsla
+      no friends: ÃÃº Ã¡tt enga vini
+      no home location: Engin staÃ°setning hefur veriÃ° stillt..
+      no nearby users: Engir notendur hafa stillt staÃ°setningu sÃ­na nÃ¡lÃ¦gt Ã¾Ã©r.
+      remove as friend: fjarlÃ¦gja sem vin
       send message: senda pÃ³st
-      diary: blogg
-      edits: breytingar
+      settings_link_text: stillingarsÃ­Ã°unni
       traces: ferlar
-      remove as friend: fjarlÃ¦gja sem vin
-      add as friend: bÃ¦ta viÃ° sem vin
-      mapper since: "Notandi sÃ­Ã°an:"
-      ago: "({{time_in_words_ago}} sÃ­Ã°an)"
-      user image heading: Notandamynd
-      delete image: EyÃ°a myndinni
       upload an image: Upphala mynd
-      add image: Upphala
-      description: LÃ½sing
-      user location: "StaÃ°setning"
-      no home location: "Engin staÃ°setning hefur veriÃ° stillt.."
-      if set location: "Ef Ã¾Ãº vistar staÃ°setningu Ã¾Ã­na mun kortasjÃ¡ birtast hÃ©r fyrir neÃ°an meÃ° Ã¾Ã©r og nÃ¡lÃ¦gum notendum. ÃÃº getur stillt staÃ°setninguna Ã¡ {{settings_link}}."
-      settings_link_text: "stillingarsÃ­Ã°unni"
+      user image heading: Notandamynd
+      user location: StaÃ°setning
       your friends: Vinir Ã¾Ã­nir
-      no friends: ÃÃº Ã¡tt enga vini
-      km away: "Ã­ {{count}} km fjarlÃ¦gÃ°"
-      m away: "Ã­ {{count}} m fjarlÃ¦gÃ°"
-      nearby users: "NÃ¡lÃ¦gir notendur:"
-      no nearby users: "Engir notendur hafa stillt staÃ°setningu sÃ­na nÃ¡lÃ¦gt Ã¾Ã©r."
-      change your settings: "breyttu stillingunum Ã¾Ã­num"
-    friend_map:
-      your location: ÃÃ­n staÃ°setning
-      nearby mapper: "NÃ¡lÃ¦gur notandi: [[nearby_user]]"
-    account:
-      title: "Stillingar"
-      my settings: MÃ­nar stillingar
-      email never displayed publicly: "(aldrei sÃ½nt opinberlega)"
-      public editing:
-        heading: "Ãnafngreindur notandi?:"
-        enabled: "Nei, nafngreindur og getur breytt gÃ¶gnum."
-        enabled link: "http://wiki.openstreetmap.org/index.php?uselang=is&title=Anonymous_edits"
-        enabled link text: "nÃ¡nar"
-        disabled: "Ãvirkur og getur ekki breytt gÃ¶gnum, allar fyrri breytingar eru Ã³nafngreindar."
-        disabled link text: "hvÃ­ get Ã©g ekki breytt neinu?"
-      profile description: "LÃ½sing Ã¡ Ã¾Ã©r:"
-      preferred languages: "ViÃ°mÃ³tstungumÃ¡l:"
-      home location: "StaÃ°setning:"
-      no home location: "ÃÃº hefur ekki stillt staÃ°setningu Ã¾Ã­na."
-      latitude: "LengdargrÃ¡Ã°a:"
-      longitude: "BreiddargrÃ¡Ã°a:"
-      update home location on click: "UppfÃ¦ra staÃ°setninguna Ã¾egar Ã©g smelli Ã¡ kortiÃ°"
-      save changes button: "Vista breytingar"
-      make edits public button: "Gera allar breytingarnar mÃ­nar opinberar"
-      return to profile: "Aftur Ã¡ mÃ­na sÃ­Ã°u"
-      flash update success confirm needed: "Stillingarnar Ã¾Ã­nar voru uppfÃ¦rÃ°ar. PÃ³stur var sendur Ã¡ netfangiÃ° Ã¾itt sem Ã¾Ãº Ã¾arft aÃ° bregÃ°ast viÃ° til aÃ° netfangiÃ° Ã¾itt verÃ°i staÃ°fest."
-      flash update success: "Stillingarnar Ã¾Ã­nar voru uppfÃ¦rÃ°ar."
-    confirm:
-      heading: "StaÃ°festa notanda"
-      press confirm button: "HÃ©r getur Ã¾Ãº staÃ°fest aÃ° Ã¾Ãº viljir bÃºa til notanda.."
-      button: "StaÃ°festa"
-      success: "Notandinn Ã¾inn hefur veriÃ° staÃ°festur."
-      failure: "Notandi hefur Ã¾egar veriÃ° staÃ°festur meÃ° Ã¾essum lykli."
-    confirm_email:
-      heading: "StaÃ°festa breytingu Ã¡ netfangi"
-      press confirm button: "HÃ©r getur Ã¾Ãº staÃ°fest breytingu Ã¡ netfangi."
-      button: "StaÃ°festa"
-      success: "NetfangiÃ° Ã¾itt hefur veriÃ° staÃ°fest."
-      failure: "Netfang hefur Ã¾egar veriÃ° staÃ°fest meÃ° Ã¾essum lykli."
-    set_home:
-      flash success: "StaÃ°setning Ã¾Ã­n hefur veriÃ° stillt"
-    go_public:
-      flash success: "Allar breytingar Ã¾Ã­nar eru nÃº opinberar, og Ã¾Ãº getur breytt gÃ¶gnum."
-    make_friend:
-      success: "{{name}} er nÃºna vinur Ã¾inn."
-      failed: "Gat ekki bÃ¦tt {{name}} Ã¡ vinalistann Ã¾inn."
-      already_a_friend: "{{name}} er Ã¾egar vinur Ã¾inn."
-    remove_friend:
-      success: "{{name}} er ekki lengur vinur Ã¾inn."
-      not_a_friend: "{{name}} er ekki vinur Ã¾inn."
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 810a70dee..53be6ce21 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1,635 +1,604 @@
-it:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Lista di controllo degli accessi"
-      changeset: "Gruppo di modifiche"
-      changeset_tag: "Etichetta del gruppo di modifiche"
-      country: "Paese"
-      diary_comment: "Commento al diario"
-      diary_entry: "Voce del diario"
-      friend: "Amico"
-      language: "Lingua"
-      message: "Messaggio"
-      node: "Nodo"
-      node_tag: "Etichetta nodo"
-      notifier: "Promemoria"
-      old_node: "Vecchio nodo"
-      old_node_tag: "Vecchia etichetta del nodo"
-      old_relation: "Vecchia relazione"
-      old_relation_member: "Vecchio membro della relazione"
-      old_relation_tag: "Vecchia etichetta della relazione"
-      old_way: "Vecchio percorso"
-      old_way_node: "Vecchio nodo del percorso"
-      old_way_tag: "Vecchia etichetta del percorso"
-      relation: "Relazione"
-      relation_member: "Membro della relazione"
-      relation_tag: "Etichetta della relazione"
-      session: "Sessione"
-      trace: "Tracciato"
-      tracepoint: "Punto del tracciato"
-      tracetag: "Etichetta del tracciato"
-      user: "Utente"
-      user_preference: "Preferenze dell'utente"
-      user_token: "Codice dell'utente"
-      way: "Percorso"
-      way_node: "Nodo del percorso"
-      way_tag: "Etichetta del percorso"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Corpo del messaggio"
-      diary_entry:
-        user: "Utente"
-        title: "Titolo"
-        latitude: "Latitudine"
-        longitude: "Longitudine"
-        language: "Lingua"
-      friend:
-        user: "Utente"
-        friend: "Amico"
-      trace:
-        user: "Utente"
-        visible: "Visibile"
-        name: "Nome"
-        size: "Dimensione"
-        latitude: "Latitudine"
-        longitude: "Longitudine"
-        public: "Pubblico"
-        description: "Descrizione"
-      message:
-        sender: "Mittente"
-        title: "Titolo"
-        body: "Corpo del messaggio"
-        recipient: "Recipiente"
-      user:
-        email: "Email"
-        active: "Attivo"
-        display_name: "Nome visualizzato"
-        description: "Descrizione"
-        languages: "Lingue"
-        pass_crypt: "Password"
-  map:
-    view: Visualizza
-    edit: Modifica
-    coordinates: "Coordinate:"
-  browse:
-    changeset:
-      title: "Gruppo di modifiche"
+it: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Corpo del messaggio
+      diary_entry: 
+        language: Lingua
+        latitude: Latitudine
+        longitude: Longitudine
+        title: Titolo
+        user: Utente
+      friend: 
+        friend: Amico
+        user: Utente
+      message: 
+        body: Corpo del messaggio
+        recipient: Recipiente
+        sender: Mittente
+        title: Titolo
+      trace: 
+        description: Descrizione
+        latitude: Latitudine
+        longitude: Longitudine
+        name: Nome
+        public: Pubblico
+        size: Dimensione
+        user: Utente
+        visible: Visibile
+      user: 
+        active: Attivo
+        description: Descrizione
+        display_name: Nome visualizzato
+        email: Email
+        languages: Lingue
+        pass_crypt: Password
+    models: 
+      acl: Lista di controllo degli accessi
+      changeset: Gruppo di modifiche
+      changeset_tag: Etichetta del gruppo di modifiche
+      country: Paese
+      diary_comment: Commento al diario
+      diary_entry: Voce del diario
+      friend: Amico
+      language: Lingua
+      message: Messaggio
+      node: Nodo
+      node_tag: Etichetta nodo
+      notifier: Promemoria
+      old_node: Vecchio nodo
+      old_node_tag: Vecchia etichetta del nodo
+      old_relation: Vecchia relazione
+      old_relation_member: Vecchio membro della relazione
+      old_relation_tag: Vecchia etichetta della relazione
+      old_way: Vecchio percorso
+      old_way_node: Vecchio nodo del percorso
+      old_way_tag: Vecchia etichetta del percorso
+      relation: Relazione
+      relation_member: Membro della relazione
+      relation_tag: Etichetta della relazione
+      session: Sessione
+      trace: Tracciato
+      tracepoint: Punto del tracciato
+      tracetag: Etichetta del tracciato
+      user: Utente
+      user_preference: Preferenze dell'utente
+      user_token: Codice dell'utente
+      way: Percorso
+      way_node: Nodo del percorso
+      way_tag: Etichetta del percorso
+  browse: 
+    changeset: 
       changeset: "Gruppo di modifiche: {{id}}"
-      download: "Scarica il {{changeset_xml_link}} oppure le {{osmchange_xml_link}}"
-      changesetxml: "gruppo di modifiche XML"
-      osmchangexml: "modificheOsm XML"
-    changeset_details:
-      created_at: "Creato il:"
-      closed_at: "Chiuso il:"
+      changesetxml: gruppo di modifiche XML
+      download: Scarica il {{changeset_xml_link}} oppure le {{osmchange_xml_link}}
+      osmchangexml: modificheOsm XML
+      title: Gruppo di modifiche
+    changeset_details: 
       belongs_to: "Appartiene a:"
       bounding_box: "Riquadro di selezione:"
-      no_bounding_box: "Per questo gruppo di modifiche non Ã¨ stato memorizzato alcun riquadro di selezione."
-      show_area_box: "Mostra il riquadro dell'area"
-      box: "riquadro"
+      box: riquadro
+      closed_at: "Chiuso il:"
+      created_at: "Creato il:"
       has_nodes: "Possiede i seguenti {{count}} nodi:"
-      has_ways: "Possiede i seguenti {{count}} percorsi:"
       has_relations: "Possiede le seguenti {{count}} relazioni:"
-    common_details:
+      has_ways: "Possiede i seguenti {{count}} percorsi:"
+      no_bounding_box: Per questo gruppo di modifiche non Ã¨ stato memorizzato alcun riquadro di selezione.
+      show_area_box: Mostra il riquadro dell'area
+    common_details: 
       edited_at: "Modificato il:"
       edited_by: "Modificato da:"
-      version: "Versione:"
       in_changeset: "Nel gruppo di modifiche:"
-    containing_relation:
-      entry: "Relazione {{relation_name}}"
-      entry_role: "Relazione {{relation_name}} (come {{relation_role}})"
-    map:
-      loading: "Caricamento in corso..."
-      deleted: "Eliminato"
-    node_details:
+      version: "Versione:"
+    containing_relation: 
+      entry: Relazione {{relation_name}}
+      entry_role: Relazione {{relation_name}} (come {{relation_role}})
+    map: 
+      deleted: Eliminato
+      loading: Caricamento in corso...
+    node: 
+      download: "{{download_xml_link}} oppure {{view_history_link}}"
+      download_xml: Scarica XML
+      node: Nodo
+      node_title: "Nodo: {{node_name}}"
+      view_history: visualizza lo storico
+    node_details: 
       coordinates: "Coordinate:"
       part_of: "Parte di:"
-    node_history:
-      node_history: "Storico del nodo"
+    node_history: 
       download: "{{download_xml_link}} oppure {{view_details_link}}"
-      download_xml: "Scarica XML"
-      view_details: "visualizza i dettagli"
-    node:
-      node: "Nodo"
-      node_title: "Nodo: {{node_name}}"
+      download_xml: Scarica XML
+      node_history: Storico del nodo
+      view_details: visualizza i dettagli
+    not_found: 
+      sorry: Spiacenti, non Ã¨ stato possibile trovare il {{type}} con l'identificativo {{id}}.
+    paging_nav: 
+      of: di
+      showing_page: Visualizzata la pagina
+    relation: 
       download: "{{download_xml_link}} oppure {{view_history_link}}"
-      download_xml: "Scarica XML"
-      view_history: "visualizza lo storico"
-    not_found:
-      sorry: "Spiacenti, non Ã¨ stato possibile trovare il {{type}} con l'identificativo {{id}}."
-    paging_nav:
-      showing_page: "Visualizzata la pagina"
-      of: "di"
-    relation_details:
+      download_xml: Scarica XML
+      relation: Relazione
+      relation_title: "Relazione: {{relation_name}}"
+      view_history: visualizza lo storico
+    relation_details: 
       members: "Membri:"
       part_of: "Parte di:"
-    relation_history:
-      relation_history: "Storico della relazione"
+    relation_history: 
+      relation_history: Storico della relazione
       relation_history_title: "Storico della relazione: {{relation_name}}"
-    relation:
-      relation: "Relazione"
-      relation_title: "Relazione: {{relation_name}}"
-      download: "{{download_xml_link}} oppure {{view_history_link}}"
-      download_xml: "Scarica XML"
-      view_history: "visualizza lo storico"
-    start:
-      view_data: "Visualizza i dati per la visualizzazione corrente della mappa"
-      manually_select: "Seleziona manualmente un'area differente"
-    start_rjs:
-      data_frame_title: "Dati"
-      zoom_or_select: "Ingrandire oppure selezionare l'area della mappa che si desidera visualizzare"
-      drag_a_box: "Tracciare un riquadro sulla mappa per selezionare un'area"
-      manually_select: "Seleziona manualmente un'area differente"
+    start: 
+      manually_select: Seleziona manualmente un'area differente
+      view_data: Visualizza i dati per la visualizzazione corrente della mappa
+    start_rjs: 
+      data_frame_title: Dati
+      details: Dettagli
+      drag_a_box: Tracciare un riquadro sulla mappa per selezionare un'area
+      edited_by_user_at_timestamp: Modificato da [[user]] il [[timestamp]]
+      history_for_feature: Storico per [[feature]]
+      load_data: Carica dati
       loaded_an_area_with_num_features: "E' stata caricata un'area che contiene [[num_features]] caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantitÃ  di dati. Generalmente i browser lavorano al meglio  se si visualizzano meno di 100 caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere piÃ¹. Se si Ã¨ sicuri di voler visualizzare questi dati, allora si puÃ² premere il pulsante sottostante."
-      load_data: "Carica dati"
+      loading: Caricamento in corso...
+      manually_select: Seleziona manualmente un'area differente
+      private_user: utente privato
+      show_history: Visualizza storico
       unable_to_load_size: "Impossibile caricare: la dimensione del riquadro di selezione di [[bbox_size]] Ã¨ troppo grande (deve essere minore di {{max_bbox_size}})"
-      loading: "Caricamento in corso..."
-      show_history: "Visualizza storico"
-      wait: "Attendere..."
-      history_for_feature: "Storico per [[feature]]"
-      details: "Dettagli"
-      private_user: "utente privato"
-      edited_by_user_at_timestamp: "Modificato da [[user]] il [[timestamp]]"
-    tag_details:
+      wait: Attendere...
+      zoom_or_select: Ingrandire oppure selezionare l'area della mappa che si desidera visualizzare
+    tag_details: 
       tags: "Etichette:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} oppure {{view_history_link}}"
+      download_xml: Scarica XML
+      view_history: visualizza lo storico
+      way: Percorso
+      way_title: "Percorso: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: anche parte del percorso {{related_ways}}
+        other: anche parte dei percorsi {{related_ways}}
       nodes: "Nodi:"
       part_of: "Parte di:"
-      also_part_of:
-        one: "anche parte del percorso {{related_ways}}"
-        other: "anche parte dei percorsi {{related_ways}}"
-    way_history:
-      way_history: "Storico del percorso"
-      way_history_title: "Storico del percorso: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} oppure {{view_details_link}}"
-      download_xml: "Scarica XML"
-      view_details: "visualizza i dettagli"
-    way:
-      way: "Percorso"
-      way_title: "Percorso: {{way_name}}"
-      download: "{{download_xml_link}} oppure {{view_history_link}}"
-      download_xml: "Scarica XML"
-      view_history: "visualizza lo storico"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "Visualizzata la pagina"
-      of: "di"
-    changeset:
-      still_editing: "(ancora in modifica)"
-      anonymous: "Anonimo"
-      no_comment: "(nessuno)"
-      no_edits: "(nessuna modifica)"
-      show_area_box: "visualizza il riquadro dell'area"
-      big_area: "(grande)"
-      view_changeset_details: "Visualizza i dettagli del gruppo di modifiche"
-    changesets:
-      id: "ID"
-      saved_at: "Salvato il"
-      user: "Utente"
-      comment: "Commento"
-      area: "Area"
-    list_bbox:
-      history: "Storico"
-      changesets_within_the_area: "Gruppi di modifiche all'interno dell'area:"
-      show_area_box: "mostra il riquadro dell'area"
-      no_changesets: "Nessun gruppo di modifiche"
-      all_changes_everywhere: "Per le modifiche apportate in qualsiasi area vedere le {{recent_changes_link}}"
-      recent_changes: "modifiche recenti"
-      no_area_specified: "Non Ã¨ stata specificata alcuna area"
-      first_use_view: "Prima entra nella {{view_tab_link}} per spostare e ingrandire l'area di interesse, poi clicca sulla scheda dello storico."
-      view_the_map: "visualizza la mappa"
-      view_tab: "scheda di visualizzazione"
-      alternatively_view: "In alternativa visualizza tutte le {{recent_changes_link}}"
-    list:
-      recent_changes: "Modifiche recenti"
-      recently_edited_changesets: "Gruppi di modifiche recenti:"
-      for_more_changesets: "Per ulteriori gruppi di modifiche, selezionare un utente e visualizzare le sue modifiche, oppure vedere lo 'storico' delle modifiche di un'area specifica."
-    list_user:
-      edits_by_username: "Modifiche di {{username_link}}"
-      no_visible_edits_by: "Non c'Ã¨ alcuna modifica visibile di {{name}}."
-      for_all_changes: "Per le modifiche di tutti gli utenti vedere le {{recent_changes_link}}"
-      recent_changes: "modifiche recenti"
-  diary_entry:
-    new:
-      title: Nuova voce del diario
-    list:
-      title: "Diari degli utenti"
-      user_title: "Diario dell'utente {{user}}"
-      new: Nuova voce del diario
-      new_title: Componi una nuova voce nel tuo diario-utente
-      no_entries: Nessuna voce nel diario
-      recent_entries: "Voci del diario recenti:"
-      older_entries: Voci piÃ¹ vecchie
-      newer_entries: Voci piÃ¹ recenti
-    edit:
-      title: "Modifica voce del diario"
-      subject: "Oggetto:"
+      download_xml: Scarica XML
+      view_details: visualizza i dettagli
+      way_history: Storico del percorso
+      way_history_title: "Storico del percorso: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonimo
+      big_area: (grande)
+      no_comment: (nessuno)
+      no_edits: (nessuna modifica)
+      show_area_box: visualizza il riquadro dell'area
+      still_editing: (ancora in modifica)
+      view_changeset_details: Visualizza i dettagli del gruppo di modifiche
+    changeset_paging_nav: 
+      of: di
+      showing_page: Visualizzata la pagina
+    changesets: 
+      area: Area
+      comment: Commento
+      id: ID
+      saved_at: Salvato il
+      user: Utente
+  diary_entry: 
+    diary_comment: 
+      comment_from: Commento di {{link_user}} il {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 commento
+        other: "{{count}} commenti"
+      comment_link: Commento su questa voce
+      edit_link: Modifica questa voce
+      posted_by: Inviato da {{link_user}} il {{created}} in {{language_link}}
+      reply_link: Rispondi a questa voce
+    edit: 
       body: "Corpo:"
       language: "Lingua:"
-      location: "Luogo:"
       latitude: "Latitudine:"
+      location: "Luogo:"
       longitude: "Longitudine:"
-      use_map_link: "utilizza mappa"
-      save_button: "Salva"
       marker_text: Luogo della voce del diario
-    view:
-      title: "Diari degli utenti | {{user}}"
-      user_title: "Diario dell'utente {{user}}"
-      leave_a_comment: "Lascia un commento"
-      save_button: "Salva"
-    no_such_entry:
+      save_button: Salva
+      subject: "Oggetto:"
+      title: Modifica voce del diario
+      use_map_link: utilizza mappa
+    list: 
+      new: Nuova voce del diario
+      new_title: Componi una nuova voce nel tuo diario-utente
+      newer_entries: Voci piÃ¹ recenti
+      no_entries: Nessuna voce nel diario
+      older_entries: Voci piÃ¹ vecchie
+      recent_entries: "Voci del diario recenti:"
+      title: Diari degli utenti
+      user_title: Diario dell'utente {{user}}
+    new: 
+      title: Nuova voce del diario
+    no_such_entry: 
+      body: Spiacenti, non c'Ã¨ alcuna voce del diario o commento con l'identificativo {{id}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato.
       heading: "Nessuna voce con l'identificativo: {{id}}"
-      body: "Spiacenti, non c'Ã¨ alcuna voce del diario o commento con l'identificativo {{id}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato."
-    no_such_user:
-      body: "Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato."
-    diary_entry:
-      posted_by: "Inviato da {{link_user}} il {{created}} in {{language_link}}"
-      comment_link: Commento su questa voce
-      reply_link: Rispondi a questa voce
-      comment_count:
-        one: 1 commento
-        other: "{{count}} commenti"
-      edit_link: Modifica questa voce
-    diary_comment:
-      comment_from: "Commento di {{link_user}} il {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Area da esportare"
-      manually_select: "Seleziona manualmente un'area differente"
-      format_to_export: "Formato di esportazione"
-      osm_xml_data: "Dati XML OpenStreetMap"
-      mapnik_image: "Immagine Mapnik"
-      osmarender_image: "Immagine Osmarender"
-      embeddable_html: "HTML incapsulabile"
-      licence: "Licenza"
-      export_details: 'I dati di OpenStreetMap sono rilasciati sotto la <a href="http://creativecommons.org/licenses/by-sa/2.0/">licenza Creative Commons Attribution-ShareAlike 2.0</a>.'
-      options: "Opzioni"
-      format: "Formato"
-      scale: "Scala"
-      max: "max"
-      image_size: "Dimensione immagine"
-      zoom: "Ingrandimento"
-      add_marker: "Aggiungi un marcatore alla mappa"
+    no_such_user: 
+      body: Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato.
+    view: 
+      leave_a_comment: Lascia un commento
+      save_button: Salva
+      title: Diari degli utenti | {{user}}
+      user_title: Diario dell'utente {{user}}
+  export: 
+    start: 
+      add_marker: Aggiungi un marcatore alla mappa
+      area_to_export: Area da esportare
+      embeddable_html: HTML incapsulabile
+      export_button: Esporta
+      export_details: I dati di OpenStreetMap sono rilasciati sotto la <a href="http://creativecommons.org/licenses/by-sa/2.0/">licenza Creative Commons Attribution-ShareAlike 2.0</a>.
+      format: Formato
+      format_to_export: Formato di esportazione
+      image_size: Dimensione immagine
       latitude: "Lat:"
+      licence: Licenza
       longitude: "Lon:"
-      output: "Risultato"
-      paste_html: "Incolla l'HTML per incapsulare nel sito web"
-      export_button: "Esporta"
-    start_rjs:
-      export: "Esporta"
-      drag_a_box: "Traccia un riquadro sulla mappa per selezionare un'area"
-      manually_select: "Seleziona manualmente un'area differente"
-      click_add_marker: "Clicca sulla mappa per aggiungere un marcatore"
-      change_marker: "Cambia la posizione del marcatore"
-      add_marker: "Aggiungi un marcatore alla mappa"
-      view_larger_map: "Visualizza una mappa piÃ¹ ampia"
-  geocoder:
-    search:
-      title:
-        latlon: 'Risultati da <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Risultati da <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Risultati da <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Risultati da <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Risultati da <a href="http://www.geonames.org/">GeoNames</a>'
-    results:
-      no_results: "Nessun risultato"
-  layouts:
-    welcome_user: "Benvenuto, {{user_link}}"
-    home: "posizione iniziale"
-    inbox: "in arrivo ({{count}})"
-    logout: esci
-    log_in: entra
-    sign_up: iscriviti
-    view: Visualizza
+      manually_select: Seleziona manualmente un'area differente
+      mapnik_image: Immagine Mapnik
+      max: max
+      options: Opzioni
+      osm_xml_data: Dati XML OpenStreetMap
+      osmarender_image: Immagine Osmarender
+      output: Risultato
+      paste_html: Incolla l'HTML per incapsulare nel sito web
+      scale: Scala
+      zoom: Ingrandimento
+    start_rjs: 
+      add_marker: Aggiungi un marcatore alla mappa
+      change_marker: Cambia la posizione del marcatore
+      click_add_marker: Clicca sulla mappa per aggiungere un marcatore
+      drag_a_box: Traccia un riquadro sulla mappa per selezionare un'area
+      export: Esporta
+      manually_select: Seleziona manualmente un'area differente
+      view_larger_map: Visualizza una mappa piÃ¹ ampia
+  geocoder: 
+    results: 
+      no_results: Nessun risultato
+    search: 
+      title: 
+        ca_postcode: Risultati da <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Risultati da <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Risultati da <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
+  layouts: 
+    alt_donation: Fai una donazione
+    donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
+    donate_link_text: donando
     edit: Modifica
-    history: Storico
     export: Esporta
     gps_traces: Tracciati GPS
-    user_diaries: Diari degli utenti
-    tag_line: "La wiki-mappa Libera del Mondo"
-    intro_1: "OpenStreetMap Ã¨ una mappa liberamente modificabile dell'intero pianeta. E' fatta da persone come te."
-    intro_2: "OpenStreetMap permette a chiunque sulla Terra di visualizzare, modificare ed utilizzare dati geografici con un approccio collaborativo."
-    intro_3: "L'hosting di OpenStreetMap Ã¨ supportato gentilmente dalla {{ucl}} e {{bytemark}}."
-    osm_offline: "Il database di OpenStreetMap Ã¨ al momento non in linea per pemettere lo svolgimento di alcuni lavori essenziali su di esso."
-    osm_read_only: "Il database di OpenStreetMap Ã¨ al momento in modalitÃ  sola-lettura per pemettere lo svolgimento di alcuni lavori essenziali su di esso."
-    donate: "Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware."
-    donate_link_text: donando
-    help_wiki: "Aiuto &amp; Wiki"
-    news_blog: "Blog delle notizie"
+    help_wiki: Aiuto &amp; Wiki
+    history: Storico
+    home: posizione iniziale
+    inbox: in arrivo ({{count}})
+    intro_1: OpenStreetMap Ã¨ una mappa liberamente modificabile dell'intero pianeta. E' fatta da persone come te.
+    intro_2: OpenStreetMap permette a chiunque sulla Terra di visualizzare, modificare ed utilizzare dati geografici con un approccio collaborativo.
+    intro_3: L'hosting di OpenStreetMap Ã¨ supportato gentilmente dalla {{ucl}} e {{bytemark}}.
+    log_in: entra
+    logout: esci
+    news_blog: Blog delle notizie
+    osm_offline: Il database di OpenStreetMap Ã¨ al momento non in linea per pemettere lo svolgimento di alcuni lavori essenziali su di esso.
+    osm_read_only: Il database di OpenStreetMap Ã¨ al momento in modalitÃ  sola-lettura per pemettere lo svolgimento di alcuni lavori essenziali su di esso.
     shop: Negozio
-    sotm: 'Vieni alla conferenza OpenStreetMap 2009, The State of the Map, ad Amsterdam il 10-12 Luglio!'
-    alt_donation: Fai una donazione
-  notifier:
-    diary_comment_notification:
+    sign_up: iscriviti
+    sotm: Vieni alla conferenza OpenStreetMap 2009, The State of the Map, ad Amsterdam il 10-12 Luglio!
+    tag_line: La wiki-mappa Libera del Mondo
+    user_diaries: Diari degli utenti
+    view: Visualizza
+    welcome_user: Benvenuto, {{user_link}}
+  map: 
+    coordinates: "Coordinate:"
+    edit: Modifica
+    view: Visualizza
+  message: 
+    inbox: 
+      date: Data
+      from: Da
+      my_inbox: I miei messaggi in arrivo
+      no_messages_yet: Non ci sono ancora messaggi. PerchÃ© non contatti qualcuna di queste {{people_mapping_nearby_link}}?
+      outbox: in uscita
+      people_mapping_nearby: persone che mappano nelle vicinanze
+      subject: Oggetto
+      title: In arrivo
+      you_have: Hai {{new_count}} nuovi messaggi e {{old_count}} vecchi messaggi
+    mark: 
+      as_read: Messaggio marcato come letto
+      as_unread: Messaggio marcato come non letto
+    message_summary: 
+      read_button: Marca come letto
+      reply_button: Rispondi
+      unread_button: Marca come non letto
+    new: 
+      back_to_inbox: Ritorna ai messaggi in arrivo
+      body: Corpo
+      message_sent: Messaggio inviato
+      send_button: Spedisci
+      send_message_to: Spedisci un nuovo messaggio a {{name}}
+      subject: Oggetto
+      title: Spedisci messaggio
+    no_such_user: 
+      body: Spiacenti, ma non c'Ã¨ alcun utente o messaggio con questo nome o identificativo
+      heading: Nessun utente o messaggio
+    outbox: 
+      date: Data
+      inbox: in arrivo
+      my_inbox: Messaggi {{inbox_link}}
+      no_sent_messages: Non ci sono ancora messaggi inviati. PerchÃ© non contatti qualcuno di questi {{people_mapping_nearby_link}}?
+      outbox: in uscita
+      people_mapping_nearby: persone che mappano nelle vicinanze
+      subject: Oggetto
+      title: In uscita
+      to: A
+      you_have_sent_messages: Hai {{sent_count}} messaggi inviati
+    read: 
+      back_to_inbox: Ritorna ai messaggi in arrivo
+      back_to_outbox: Ritorna ai messaggi in uscita
+      date: Data
+      from: Da
+      reading_your_messages: Lettura dei propri messaggi
+      reading_your_sent_messages: Lettura dei propri messaggi inviati
+      reply_button: Rispondi
+      subject: Oggetto
+      title: Leggi messaggio
+      to: A
+      unread_button: Marca come non letto
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                Per favore non rispondere a questa email.                *"
       banner2: "*          Utilizza il sito web di OpenStreetMap per rispondere.          *"
-      hi: "Salve {{to_user}},"
+      footer: Puoi anche leggere il commento su {{readurl}} e puoi commentare su {{commenturl}} oppure rispondere su {{replyurl}}
       header: "{{from_user}} ha commentato la tua recente voce del diario OpenStreetMap con l'oggetto {{subject}}:"
-      footer: "Puoi anche leggere il commento su {{readurl}} e puoi commentare su {{commenturl}} oppure rispondere su {{replyurl}}"
-    friend_notification:
+      hi: Salve {{to_user}},
+    friend_notification: 
       had_added_you: "{{user}} ti ha aggiunto come suo amico su OpenStreetMap."
-      see_their_profile: "Puoi vedere il loro profilo su {{userurl}} e aggiungerli anche come amici, se lo si desidera."
-    signup_confirm_plain:
-      greeting: "Benvenuto!"
-      hopefully_you: "Qualcuno (si spera tu) vuole creare un profilo"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante"
-      click_the_link_2: "per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap."
+      see_their_profile: Puoi vedere il loro profilo su {{userurl}} e aggiungerli anche come amici, se lo si desidera.
+    signup_confirm_html: 
+      click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
+      current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, Ã¨ disponibile su <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Puoi avere altre informazioni su OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">sul wiki</a> oppure <a href="http://www.opengeodata.org/">sul blog opengeodata</a> che mette a disposizione anche <a href="http://www.opengeodata.org/?cat=13">alcuni podcast da ascoltare</a>!
+      greeting: Benvenuto!
+      hopefully_you: Qualcuno (si spera tu) vuole creare un profilo
+      introductory_video: Puoi guardare un {{introductory_video_link}}.
+      more_videos: Ci sono {{more_videos_link}}.
+      more_videos_here: ulteriori video qui
+      user_wiki_page: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria che si riferiscano al luogo in si opera, come ad esempio <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: video introduttivo su OpenStreetMap
+      wiki_signup: Ci si puÃ² anche <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">iscrivere al wiki di OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante
+      click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
+      current_user_1: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui
+      current_user_2: "essi operano, Ã¨ disponibile su:"
+      greeting: Benvenuto!
+      hopefully_you: Qualcuno (si spera tu) vuole creare un profilo
       introductory_video: "Puoi guardare un video introduttivo su OpenStreetMap qui:"
       more_videos: "Ci sono ulteriori video qui:"
-      the_wiki: "Puoi avere altre informazioni su OpenStreetMap sul wiki:"
       opengeodata: "OpenGeoData.org Ã¨ il blog di OpenStreetMap, che mette a disposizione anche dei podcast:"
+      the_wiki: "Puoi avere altre informazioni su OpenStreetMap sul wiki:"
+      user_wiki_1: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria
+      user_wiki_2: che si riferiscano al luogo in si opera, come ad esempio [[Category:Users_in_Friuli-Venezia_Giulia]].
       wiki_signup: "Ci si puÃ² anche iscrivere al wiki di OpenStreetMap a:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria"
-      user_wiki_2: "che si riferiscano al luogo in si opera, come ad esempio [[Category:Users_in_Friuli-Venezia_Giulia]]."
-      current_user_1: "Una lista degli utenti attuali nelle categorie, basate sul luogo in cui"
-      current_user_2: "essi operano, Ã¨ disponibile su:"
-    signup_confirm_html:
-      greeting: "Benvenuto!"
-      hopefully_you: "Qualcuno (si spera tu) vuole creare un profilo"
-      click_the_link: "Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap."
-      introductory_video: "Puoi guardare un {{introductory_video_link}}."
-      video_to_openstreetmap: "video introduttivo su OpenStreetMap"
-      more_videos: "Ci sono {{more_videos_link}}."
-      more_videos_here: "ulteriori video qui"
-      get_reading: 'Puoi avere altre informazioni su OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">sul wiki</a> oppure <a href="http://www.opengeodata.org/">sul blog opengeodata</a> che mette a disposizione anche <a href="http://www.opengeodata.org/?cat=13">alcuni podcast da ascoltare</a>!'
-      wiki_signup: 'Ci si puÃ² anche <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">iscrivere al wiki di OpenStreetMap</a>.'
-      user_wiki_page: 'E'' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria che si riferiscano al luogo in si opera, come ad esempio <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, Ã¨ disponibile su <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      title: "In arrivo"
-      my_inbox: "I miei messaggi in arrivo"
-      outbox: "in uscita"
-      you_have: "Hai {{new_count}} nuovi messaggi e {{old_count}} vecchi messaggi"
-      from: "Da"
-      subject: "Oggetto"
-      date: "Data"
-      no_messages_yet: "Non ci sono ancora messaggi. PerchÃ© non contatti qualcuna di queste {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "persone che mappano nelle vicinanze"
-    message_summary:
-      unread_button: "Marca come non letto"
-      read_button: "Marca come letto"
-      reply_button: "Rispondi"
-    new:
-      title: "Spedisci messaggio"
-      send_message_to: "Spedisci un nuovo messaggio a {{name}}"
-      subject: "Oggetto"
-      body: "Corpo"
-      send_button: "Spedisci"
-      back_to_inbox: "Ritorna ai messaggi in arrivo"
-      message_sent: "Messaggio inviato"
-    no_such_user:
-      heading: "Nessun utente o messaggio"
-      body: "Spiacenti, ma non c'Ã¨ alcun utente o messaggio con questo nome o identificativo"
-    outbox:
-      title: "In uscita"
-      my_inbox: "Messaggi {{inbox_link}}"
-      inbox: "in arrivo"
-      outbox: "in uscita"
-      you_have_sent_messages: "Hai {{sent_count}} messaggi inviati"
-      to: "A"
-      subject: "Oggetto"
-      date: "Data"
-      no_sent_messages: "Non ci sono ancora messaggi inviati. PerchÃ© non contatti qualcuno di questi {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "persone che mappano nelle vicinanze"
-    read:
-      title: "Leggi messaggio"
-      reading_your_messages: "Lettura dei propri messaggi"
-      from: "Da"
-      subject: "Oggetto"
-      date: "Data"
-      reply_button: "Rispondi"
-      unread_button: "Marca come non letto"
-      back_to_inbox: "Ritorna ai messaggi in arrivo"
-      reading_your_sent_messages: "Lettura dei propri messaggi inviati"
-      to: "A"
-      back_to_outbox: "Ritorna ai messaggi in uscita"
-    mark:
-      as_read: "Messaggio marcato come letto"
-      as_unread: "Messaggio marcato come non letto"
-  site:
-    index:
-      js_1: "Si sta utilizzando un browser che non supporta javascript, oppure Ã¨ stato disabilitato javascript."
-      js_2: "OpenStreetMap utilizza javascript per le sua mappa."
-      js_3: 'Se non si riesce ad abilitare javascript si puÃ² provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.'
-      permalink: Permalink
-      license:
-        notice: "Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        project_name: "progetto OpenStreetMap"
-    edit:
-      not_public: "Non si sono impostate come pubbliche le proprie modifiche."
-      not_public_description: "Non Ã¨ possibile modificare la mappa finchÃ© non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}."
+  site: 
+    edit: 
+      anon_edits_link_text: Leggi il perchÃ©.
+      flash_player_required: E' necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si puÃ² <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilitÃ </a> per apportare modifiche a OpenStreetMap.
+      not_public: Non si sono impostate come pubbliche le proprie modifiche.
+      not_public_description: Non Ã¨ possibile modificare la mappa finchÃ© non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}.
+      potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch, si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando nella modalitÃ  'list', o cliccare sul bottone salva se presente.)
       user_page_link: pagina utente
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Leggi il perchÃ©."
-      flash_player_required: 'E'' necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si puÃ² <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilitÃ </a> per apportare modifiche a OpenStreetMap.'
-      potlatch_unsaved_changes: "Ci sono modifiche non salvate. (Per salvare in Potlatch, si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando nella modalitÃ  'list', o cliccare sul bottone salva se presente.)"
-    sidebar:
-      search_results: Risultati della ricerca
-      close: Chiudi
-    search:
+    index: 
+      js_1: Si sta utilizzando un browser che non supporta javascript, oppure Ã¨ stato disabilitato javascript.
+      js_2: OpenStreetMap utilizza javascript per le sua mappa.
+      js_3: Se non si riesce ad abilitare javascript si puÃ² provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Rilasciato sotto la licenza {{license_name}} dal {{project_name}} ed i suoi contributori.
+        project_name: progetto OpenStreetMap
+      permalink: Permalink
+    key: 
+      map_key: Legenda
+    search: 
       search: Cerca
-      where_am_i: "Dove sono?"
-      submit_text: "Vai"
       search_help: "esempi: 'Trieste', 'Via Dante Alighieri, Trieste', 'CB2 5AQ', oppure 'post offices near Trieste' <a href='http://wiki.openstreetmap.org/wiki/Search'>altri esempi...</a>"
-    key:
-      map_key: "Legenda"
-  trace:
-    create:
-      upload_trace: "Carica tracciato GPS"
-      trace_uploaded: "Il tuo file GPX Ã¨ stato caricato ed Ã¨ in attesa del suo inserimento nel database. Questo generalmente accade entro mezz'ora, con il successivo invio al tuo indirizzo di una email di conferma relativo al completamento dell'operazione."
-    edit:
+      submit_text: Vai
+      where_am_i: Dove sono?
+    sidebar: 
+      close: Chiudi
+      search_results: Risultati della ricerca
+  trace: 
+    create: 
+      trace_uploaded: Il tuo file GPX Ã¨ stato caricato ed Ã¨ in attesa del suo inserimento nel database. Questo generalmente accade entro mezz'ora, con il successivo invio al tuo indirizzo di una email di conferma relativo al completamento dell'operazione.
+      upload_trace: Carica tracciato GPS
+    delete: 
+      scheduled_for_deletion: Tracciato in attesa di essere eliminato
+    edit: 
+      description: "Descrizione:"
+      edit: modifica
       filename: "Nome file:"
-      uploaded_at: "Caricato il:"
+      owner: "Proprietario:"
       points: "Punti:"
+      save_button: Salva modifiche
       start_coord: "Coordinata iniziale:"
-      edit: "modifica"
-      owner: "Proprietario:"
-      description: "Descrizione:"
       tags: "Etichette:"
-      save_button: "Salva modifiche"
-    no_such_user:
-      body: "Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato."
-    trace_form:
-      upload_gpx: "Carica file GPX"
-      description: "Descrizione"
-      tags: "Etichette"
-      public: "Pubblico?"
-      upload_button: "Carica"
-      help: "Aiuto"
-    trace_header:
-      see_just_your_traces: "Vedi solo i tuoi tracciati, o carica un tracciato"
-      see_all_traces: "Vedi tutti i tracciati"
-      see_your_traces: "Vedi tutti i tuoi tracciati"
-      traces_waiting: "Ci sono {{count}} tracciati in attesa di caricamento. Si consiglia di aspettare il loro completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti."
-    trace_optionals:
-      tags: "Etichette"
-    view:
-      pending: "IN ATTESA"
+      uploaded_at: "Caricato il:"
+    list: 
+      public_traces: Tracciati GPS pubblici
+      public_traces_from: Tracciati GPS pubblici di {{user}}
+      tagged_with: " etichettati con {{tags}}"
+      your_traces: Tracciati GPS personali
+    make_public: 
+      made_public: Tracciato reso pubblico
+    no_such_user: 
+      body: Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato.
+    trace: 
+      ago: "{{time_in_words_ago}} fa"
+      by: da
+      count_points: "{{count}} punti"
+      edit: modifica
+      edit_map: Modifica mappa
+      in: in
+      map: mappa
+      more: altri
+      pending: IN ATTESA
+      private: PRIVATO
+      public: PUBBLICO
+      trace_details: Visualizza i dettagli del tracciato
+      view_map: Visualizza mappa
+    trace_form: 
+      description: Descrizione
+      help: Aiuto
+      tags: Etichette
+      upload_button: Carica
+      upload_gpx: Carica file GPX
+    trace_header: 
+      see_all_traces: Vedi tutti i tracciati
+      see_just_your_traces: Vedi solo i tuoi tracciati, o carica un tracciato
+      see_your_traces: Vedi tutti i tuoi tracciati
+      traces_waiting: Ci sono {{count}} tracciati in attesa di caricamento. Si consiglia di aspettare il loro completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti.
+    trace_optionals: 
+      tags: Etichette
+    trace_paging_nav: 
+      of: di
+      showing: Visualizzata la pagina
+    view: 
+      delete_track: Elimina questo tracciato
+      description: "Descrizione:"
+      download: scarica
+      edit: modifica
+      edit_track: Modifica questo tracciato
       filename: "Nome file:"
-      download: "scarica"
-      uploaded: "Caricato il:"
+      heading: Visualizzazione del tracciato {{name}}
+      map: mappa
+      none: Nessuno
+      owner: "Proprietario:"
+      pending: IN ATTESA
       points: "Punti:"
       start_coordinates: "Coordinata iniziale:"
-      map: "mappa"
-      edit: "modifica"
-      owner: "Proprietario:"
-      description: "Descrizione:"
-      tags: "Etichette"
-      none: "Nessuno"
-      make_public: "Rendi pubblico questo tracciato in modo permanente"
-      edit_track: "Modifica questo tracciato"
-      delete_track: "Elimina questo tracciato"
-      heading: "Visualizzazione del tracciato {{name}}"
-      trace_not_found: "Tracciato non trovato!"
-    trace_paging_nav:
-      showing: "Visualizzata la pagina"
-      of: "di"
-    trace:
-      pending: "IN ATTESA"
-      count_points: "{{count}} punti"
-      ago: "{{time_in_words_ago}} fa"
-      more: "altri"
-      trace_details: "Visualizza i dettagli del tracciato"
-      view_map: "Visualizza mappa"
-      edit: "modifica"
-      edit_map: "Modifica mappa"
-      public: "PUBBLICO"
-      private: "PRIVATO"
-      by: "da"
-      in: "in"
-      map: "mappa"
-    list:
-      public_traces: "Tracciati GPS pubblici"
-      your_traces: "Tracciati GPS personali"
-      public_traces_from: "Tracciati GPS pubblici di {{user}}"
-      tagged_with: " etichettati con {{tags}}"
-    delete:
-      scheduled_for_deletion: "Tracciato in attesa di essere eliminato"
-    make_public:
-      made_public: "Tracciato reso pubblico"
-  user:
-    login:
-      title: "Entra"
-      heading: "Entra"
-      please login: "Entra o {{create_user_link}}."
-      create_account: "crea un profilo"
+      tags: Etichette
+      trace_not_found: Tracciato non trovato!
+      uploaded: "Caricato il:"
+  user: 
+    account: 
+      email never displayed publicly: (mai visualizzato pubblicamente)
+      flash update success: Informazioni sull'utente aggiornate con successo.
+      flash update success confirm needed: Informazioni sull'utente aggiornate con successo. Controllare la propria email per la conferma del nuovo indirizzo di posta elettronica.
+      home location: "Posizione:"
+      latitude: "Latitudine:"
+      longitude: "Longitudine:"
+      make edits public button: Rendi pubbliche tutte le mie modifiche
+      my settings: Impostazioni personali
+      no home location: Non si Ã¨ inserita la propria posizione.
+      preferred languages: "Lingua preferita:"
+      profile description: "Descrizione del profilo:"
+      public editing: 
+        disabled: Disabilitate senza il permesso di modificare i dati, tutte le modifiche precedenti sono anonime.
+        disabled link text: perchÃ© non posso modificare?
+        enabled: Abilitate. Non anonimo con il permesso di modificare i dati.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: cos'Ã¨ questo?
+        heading: "Modifiche pubbliche:"
+      return to profile: Ritorna al profilo
+      save changes button: Salva modifiche
+      title: Modifica profilo
+      update home location on click: Aggiorna la posizione quando clicco sulla mapppa?
+    confirm: 
+      button: Conferma
+      failure: E' stato giÃ  confermato un profilo utente con questo codice.
+      heading: Conferma un profilo utente
+      press confirm button: Premere sul pulsante di conferma sottostante per attivare il proprio profilo utente.
+      success: Il profilo utente Ã¨ stato confermato, grazie per l'iscrizione!
+    confirm_email: 
+      button: Conferma
+      failure: E' stato giÃ  confermato un indirizzo email con questo codice.
+      heading: Conferma una variazione di indirizzo email
+      press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email.
+      success: L'indirizzo email Ã¨ stato confermato, grazie per l'iscrizione!
+    friend_map: 
+      nearby mapper: "Mappatore vicino: [[nearby_user]]"
+      your location: Propria posizione
+    go_public: 
+      flash success: Tutte le tue modifiche sono ora pubbliche, e hai il permesso di modificare.
+    login: 
+      account not active: Spiacenti, il tuo profilo non Ã¨ ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo.
+      auth failure: Spiacenti, non si puÃ² accedere con questi dettagli.
+      create_account: crea un profilo
       email or username: "Indirizzo email o nome utente:"
+      heading: Entra
+      login_button: Entra
+      lost password link: Persa la password?
       password: "Password:"
-      lost password link: "Persa la password?"
-      login_button: "Entra"
-      account not active: "Spiacenti, il tuo profilo non Ã¨ ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo."
-      auth failure: "Spiacenti, non si puÃ² accedere con questi dettagli."
-    lost_password:
-      title: "password persa"
-      heading: "Password dimenticata?"
-      email address: "Indirizzo email:"
-      new password button: "Spediscimi una nuova password"
-      notice email on way: "Siamo spiacenti che tu l'abbia persa :-( ma una email ti Ã¨ stata spedita in modo che tu la possa presto reimpostare."
-      notice email cannot find: "Spiacenti, ma non Ã¨ possibile trovare l'indirizzo email."
-    reset_password:
-      title: "reimposta la password"
-      flash changed check mail: "La tua password Ã¨ stata cambiata ed Ã¨ stata inoltrata alla tua casella di posta :-)"
-      flash token bad: "Non Ã¨ stato possibile trovare il codice. Controllare l'indirizzo URL."
-    new:
-      title: "Crea profilo"
-      heading: "Crea un profilo utente"
-      no_auto_account_create: "Sfortunatamente in questo momento non Ã¨ possibile creare automaticamente per te un profilo."
-      contact_webmaster: 'Si prega di contattare il <a href="mailto:webmaster@openstreetmap.org">webmaster</a> affinchÃ¨ faccia in modo di creare un profilo. Tenteremo di soddisfare la richiesta il piÃ¹ rapidamente possibile.'
-      fill_form: "Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo."
-      license_agreement: 'Con la creazione di un profilo si accetta che tutto il lavoro caricato nel progetto Openstreetmap Ã¨ da ritenersi (in modo non-esclusivo) rilasciato sotto <a href="http://creativecommons.org/licenses/by-sa/2.0/">questa licenza Creative Commons (by-sa)</a>.'
+      please login: Entra o {{create_user_link}}.
+      title: Entra
+    lost_password: 
       email address: "Indirizzo email:"
+      heading: Password dimenticata?
+      new password button: Spediscimi una nuova password
+      notice email cannot find: Spiacenti, ma non Ã¨ possibile trovare l'indirizzo email.
+      notice email on way: Siamo spiacenti che tu l'abbia persa :-( ma una email ti Ã¨ stata spedita in modo che tu la possa presto reimpostare.
+      title: password persa
+    make_friend: 
+      already_a_friend: Sei giÃ  amico di {{name}}.
+      failed: Spiacenti, non Ã¨ stato possibile aggiungere {{name}} come un amico.
+      success: "{{name}} Ã¨ ora tuo amico."
+    new: 
       confirm email address: "Conferma indirizzo email:"
-      not displayed publicly: 'Non visualizzato pubblicamente (vedi le <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">norme sulla privacy</a>)'
+      confirm password: "Conferma password:"
+      contact_webmaster: Si prega di contattare il <a href="mailto:webmaster@openstreetmap.org">webmaster</a> affinchÃ¨ faccia in modo di creare un profilo. Tenteremo di soddisfare la richiesta il piÃ¹ rapidamente possibile.
       display name: "Nome visualizzato:"
+      email address: "Indirizzo email:"
+      fill_form: Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo.
+      flash create success message: L'utente Ã¨ stato creato con successo. Controllare la propria email per conferma, e si sarÃ  in grado di mappare immediatamente :-)<br /><br />Si ricorda che non si sarÃ  in grado di effettuare l'accesso finchÃ© non si sarÃ  ricevuta e confermata la propria email.<br /><br />Se si utilizza un sistema antispam che spedisce richieste di conferma allora assicurarsi di accreditare l'indirizzo webmaster@openstreetmap.org altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
+      heading: Crea un profilo utente
+      license_agreement: Con la creazione di un profilo si accetta che tutto il lavoro caricato nel progetto Openstreetmap Ã¨ da ritenersi (in modo non-esclusivo) rilasciato sotto <a href="http://creativecommons.org/licenses/by-sa/2.0/">questa licenza Creative Commons (by-sa)</a>.
+      no_auto_account_create: Sfortunatamente in questo momento non Ã¨ possibile creare automaticamente per te un profilo.
+      not displayed publicly: Non visualizzato pubblicamente (vedi le <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">norme sulla privacy</a>)
       password: "Password:"
-      confirm password: "Conferma password:"
       signup: Iscrivi
-      flash create success message: "L'utente Ã¨ stato creato con successo. Controllare la propria email per conferma, e si sarÃ  in grado di mappare immediatamente :-)<br /><br />Si ricorda che non si sarÃ  in grado di effettuare l'accesso finchÃ© non si sarÃ  ricevuta e confermata la propria email.<br /><br />Se si utilizza un sistema antispam che spedisce richieste di conferma allora assicurarsi di accreditare l'indirizzo webmaster@openstreetmap.org altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma."
-    no_such_user:
-      body: "Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato."
-    view:
+      title: Crea profilo
+    no_such_user: 
+      body: Spiacenti, non c'Ã¨ alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si Ã¨ seguito sia errato.
+    remove_friend: 
+      not_a_friend: "{{name}} non Ã¨ uno dei tuoi amici."
+      success: "{{name}} Ã¨ stato rimosso dai tuoi amici."
+    reset_password: 
+      flash token bad: Non Ã¨ stato possibile trovare il codice. Controllare l'indirizzo URL.
+      title: reimposta la password
+    set_home: 
+      flash success: Posizione personale salvata con successo
+    view: 
+      add as friend: aggiungi come amico
+      add image: Aggiungi immagine
+      ago: ({{time_in_words_ago}} fa)
+      change your settings: modifica le impostazioni personali
+      delete image: Elimina immagine
+      description: Descrizione
+      diary: diario
+      edits: modifiche
+      if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. E' possibile impostare la propria posizione sulla pagina delle {{settings_link}}.
+      km away: distante {{count}} km
+      mapper since: "Mappatore dal:"
       my diary: diario personale
-      new diary entry: nuova voce del diario
       my edits: modifiche personali
-      my traces: tracciati personali
       my settings: impostazioni personali
+      my traces: tracciati personali
+      nearby users: "Utenti nelle vicinanze:"
+      new diary entry: nuova voce del diario
+      no friends: Non ci sono ancora amici.
+      no home location: Non Ã¨ stato impostato alcun luogo.
+      no nearby users: Non c'Ã¨ ancora alcun utente che ammette di mappare nelle vicinanze.
+      remove as friend: rimuovi come amico
       send message: spedisci messaggio
-      diary: diario
-      edits: modifiche
+      settings_link_text: impostazioni
       traces: tracciati
-      remove as friend: rimuovi come amico
-      add as friend: aggiungi come amico
-      mapper since: "Mappatore dal:"
-      ago: "({{time_in_words_ago}} fa)"
-      user image heading: "Immagine dell'utente"
-      delete image: Elimina immagine
       upload an image: Carica una immagine
-      add image: Aggiungi immagine
-      description: Descrizione
-      user location: "Luogo dell'utente"
-      no home location: "Non Ã¨ stato impostato alcun luogo."
-      if set location: "Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. E' possibile impostare la propria posizione sulla pagina delle {{settings_link}}."
-      settings_link_text: impostazioni
+      user image heading: Immagine dell'utente
+      user location: Luogo dell'utente
       your friends: Amici personali
-      no friends: Non ci sono ancora amici.
-      km away: "distante {{count}} km"
-      nearby users: "Utenti nelle vicinanze:"
-      no nearby users: "Non c'Ã¨ ancora alcun utente che ammette di mappare nelle vicinanze."
-      change your settings: modifica le impostazioni personali
-    friend_map:
-      your location: Propria posizione
-      nearby mapper: "Mappatore vicino: [[nearby_user]]"
-    account:
-      title: "Modifica profilo"
-      my settings: Impostazioni personali
-      email never displayed publicly: "(mai visualizzato pubblicamente)"
-      public editing:
-        heading: "Modifiche pubbliche:"
-        enabled: "Abilitate. Non anonimo con il permesso di modificare i dati."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "cos'Ã¨ questo?"
-        disabled: "Disabilitate senza il permesso di modificare i dati, tutte le modifiche precedenti sono anonime."
-        disabled link text: "perchÃ© non posso modificare?"
-      profile description: "Descrizione del profilo:"
-      preferred languages: "Lingua preferita:"
-      home location: "Posizione:"
-      no home location: "Non si Ã¨ inserita la propria posizione."
-      latitude: "Latitudine:"
-      longitude: "Longitudine:"
-      update home location on click: "Aggiorna la posizione quando clicco sulla mapppa?"
-      save changes button: Salva modifiche
-      make edits public button: Rendi pubbliche tutte le mie modifiche
-      return to profile: Ritorna al profilo
-      flash update success confirm needed: "Informazioni sull'utente aggiornate con successo. Controllare la propria email per la conferma del nuovo indirizzo di posta elettronica."
-      flash update success: "Informazioni sull'utente aggiornate con successo."
-    confirm:
-      heading: Conferma un profilo utente
-      press confirm button: "Premere sul pulsante di conferma sottostante per attivare il proprio profilo utente."
-      button: Conferma
-      success: "Il profilo utente Ã¨ stato confermato, grazie per l'iscrizione!"
-      failure: "E' stato giÃ  confermato un profilo utente con questo codice."
-    confirm_email:
-      heading: Conferma una variazione di indirizzo email
-      press confirm button: "Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email."
-      button: Conferma
-      success: "L'indirizzo email Ã¨ stato confermato, grazie per l'iscrizione!"
-      failure: "E' stato giÃ  confermato un indirizzo email con questo codice."
-    set_home:
-      flash success: "Posizione personale salvata con successo"
-    go_public:
-      flash success: "Tutte le tue modifiche sono ora pubbliche, e hai il permesso di modificare."
-    make_friend:
-      success: "{{name}} Ã¨ ora tuo amico."
-      failed: "Spiacenti, non Ã¨ stato possibile aggiungere {{name}} come un amico."
-      already_a_friend: "Sei giÃ  amico di {{name}}."
-    remove_friend:
-      success: "{{name}} Ã¨ stato rimosso dai tuoi amici."
-      not_a_friend: "{{name}} non Ã¨ uno dei tuoi amici."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2d0e41571..67711e07d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,763 +1,823 @@
-ja:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã"
-      changeset: "å¤æ´ã»ãã"
-      changeset_tag: "å¤æ´ã»ããã¿ã°"
-      country: "å½"
-      diary_comment: "æ¥è¨ã³ã¡ã³ã"
-      diary_entry: "æ¥è¨ã¨ã³ããªã¼"
-      friend: "åé"
-      language: "è¨èª"
-      message: "ã¡ãã»ã¼ã¸"
-      node: "ãã¼ã"
-      node_tag: "ãã¼ãã¿ã°"
-      notifier: "Notifier"
-      old_node: "å¤ããã¼ã"
-      old_node_tag: "å¤ããã¼ãã¿ã°"
-      old_relation: "å¤ãé¢é£"
-      old_relation_member: "å¤ãé¢é£ã®ã¡ã³ãã¼"
-      old_relation_tag: "å¤ãé¢é£ã®ã¿ã°"
-      old_way: "å¤ãã¦ã¨ã¤"
-      old_way_node: "å¤ãã¦ã¨ã¤ã®ãã¼ã"
-      old_way_tag: "å¤ãã¦ã¨ã¤ã®ã¿ã°"
-      relation: "é¢é£"
-      relation_member: "é¢é£ã®ã¡ã³ãã¼"
-      relation_tag: "é¢é£ã®ã¿ã°"
-      session: "ã»ãã·ã§ã³"
-      trace: "ãã¬ã¼ã¹"
-      tracepoint: "ãã¬ã¼ã¹ãã¤ã³ã"
-      tracetag: "ãã¬ã¼ã¹ã¿ã°"
-      user: "ã¦ã¼ã¶"
-      user_preference: "ã¦ã¼ã¶è¨­å®"
-      user_token: "ã¦ã¼ã¶ãã¼ã¯ã³"
-      way: "ã¦ã¨ã¤"
-      way_node: "ã¦ã¨ã¤ã®ãã¼ã"
-      way_tag: "ã¦ã¨ã¤ã®ã¿ã°"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "æ¬æ"
-      diary_entry:
-        user: "ã¦ã¼ã¶"
-        title: "ã¿ã¤ãã«"
-        latitude: "ç·¯åº¦"
-        longitude: "çµåº¦"
-        language: "è¨èª"
-      friend:
-        user: "ã¦ã¼ã¶"
-        friend: "åé"
-      trace:
-        user: "ã¦ã¼ã¶"
-        visible: "è¡¨ç¤º"
-        name: "åå"
-        size: "ãµã¤ãº"
-        latitude: "ç·¯åº¦"
-        longitude: "çµåº¦"
-        public: "å¬é"
-        description: "èª¬æ"
-      message:
-        sender: "éä¿¡è"
-        title: "ã¿ã¤ãã«"
-        body: "æ¬æ"
-        recipient: "åä¿¡è"
-      user:
-        email: "é»å­ã¡ã¼ã«"
-        active: "ã¢ã¯ãã£ã"
-        display_name: "è¡¨ç¤ºå"
-        description: "èª¬æ"
-        languages: "è¨èª"
-        pass_crypt: "ãã¹ã¯ã¼ã"
-  map:
-    view: "è¡¨ç¤º"
-    edit: "ç·¨é"
-    coordinates: "åº§æ¨:"
-  browse:
-    changeset:
-      title: "å¤æ´ã»ãã"
+ja: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: æ¬æ
+      diary_entry: 
+        language: è¨èª
+        latitude: ç·¯åº¦
+        longitude: çµåº¦
+        title: ã¿ã¤ãã«
+        user: ã¦ã¼ã¶
+      friend: 
+        friend: åé
+        user: ã¦ã¼ã¶
+      message: 
+        body: æ¬æ
+        recipient: åä¿¡è
+        sender: éä¿¡è
+        title: ã¿ã¤ãã«
+      trace: 
+        description: èª¬æ
+        latitude: ç·¯åº¦
+        longitude: çµåº¦
+        name: åå
+        public: å¬é
+        size: ãµã¤ãº
+        user: ã¦ã¼ã¶
+        visible: è¡¨ç¤º
+      user: 
+        active: ã¢ã¯ãã£ã
+        description: èª¬æ
+        display_name: è¡¨ç¤ºå
+        email: é»å­ã¡ã¼ã«
+        languages: è¨èª
+        pass_crypt: ãã¹ã¯ã¼ã
+    models: 
+      acl: ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã
+      changeset: å¤æ´ã»ãã
+      changeset_tag: å¤æ´ã»ããã¿ã°
+      country: å½
+      diary_comment: æ¥è¨ã³ã¡ã³ã
+      diary_entry: æ¥è¨ã¨ã³ããªã¼
+      friend: åé
+      language: è¨èª
+      message: ã¡ãã»ã¼ã¸
+      node: ãã¼ã
+      node_tag: ãã¼ãã¿ã°
+      notifier: Notifier
+      old_node: å¤ããã¼ã
+      old_node_tag: å¤ããã¼ãã¿ã°
+      old_relation: å¤ãé¢é£
+      old_relation_member: å¤ãé¢é£ã®ã¡ã³ãã¼
+      old_relation_tag: å¤ãé¢é£ã®ã¿ã°
+      old_way: å¤ãã¦ã¨ã¤
+      old_way_node: å¤ãã¦ã¨ã¤ã®ãã¼ã
+      old_way_tag: å¤ãã¦ã¨ã¤ã®ã¿ã°
+      relation: é¢é£
+      relation_member: é¢é£ã®ã¡ã³ãã¼
+      relation_tag: é¢é£ã®ã¿ã°
+      session: ã»ãã·ã§ã³
+      trace: ãã¬ã¼ã¹
+      tracepoint: ãã¬ã¼ã¹ãã¤ã³ã
+      tracetag: ãã¬ã¼ã¹ã¿ã°
+      user: ã¦ã¼ã¶
+      user_preference: ã¦ã¼ã¶è¨­å®
+      user_token: ã¦ã¼ã¶ãã¼ã¯ã³
+      way: ã¦ã¨ã¤
+      way_node: ã¦ã¨ã¤ã®ãã¼ã
+      way_tag: ã¦ã¨ã¤ã®ã¿ã°
+  browse: 
+    changeset: 
       changeset: "å¤æ´ã»ãã: {{id}}"
-      download: "ãã¦ã³ã­ã¼ã{{changeset_xml_link}} or {{osmchange_xml_link}}"
-      changesetxml: "å¤æ´ã»ããXML"
-      osmchangexml: "osmå¤æ´XML"
-    changeset_details:
-      created_at: "ä½ææ¥æ:"
-      closed_at: "å®äºæ¥æ:"
+      changesetxml: å¤æ´ã»ããXML
+      download: ãã¦ã³ã­ã¼ã{{changeset_xml_link}} or {{osmchange_xml_link}}
+      osmchangexml: osmå¤æ´XML
+      title: å¤æ´ã»ãã
+    changeset_details: 
       belongs_to: "ã¦ã¼ã¶:"
       bounding_box: "å¢çå²ã¿:"
-      no_bounding_box: "ãã®å¤æ´ã»ããã«å¢çå²ã¿ã¯æ ¼ç´ããªãã"
-      show_area_box: "é åç¯å²è¡¨ç¤º"
-      box: "box"
+      box: box
+      closed_at: "å®äºæ¥æ:"
+      created_at: "ä½ææ¥æ:"
       has_nodes: "ä»¥ä¸ã® {{count}} ãã¼ãã§æ§æããã¦ãã¾ã:"
-      has_ways: "ä»¥ä¸ã® {{count}} ã¦ã§ã¤ã§æ§æããã¦ãã¾ã:"
       has_relations: "Has the following {{count}} relations:"
+      has_ways: "ä»¥ä¸ã® {{count}} ã¦ã§ã¤ã§æ§æããã¦ãã¾ã:"
+      no_bounding_box: ãã®å¤æ´ã»ããã«å¢çå²ã¿ã¯æ ¼ç´ããªãã
+      show_area_box: é åç¯å²è¡¨ç¤º
     common_details: 
+      changeset_comment: "ã³ã¡ã³ã:"
       edited_at: "ç·¨éæ¥:"
       edited_by: "ç·¨éè:"
-      version: "ãã¼ã¸ã§ã³:"
       in_changeset: "å¤æ´ã»ãã:"
-    containing_relation:
-      entry: "é¢é£ {{relation_name}}"
-      entry_role: "é¢é£ {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "ã­ã¼ãä¸­..."
-      deleted: "åé¤æ¸ã¿"
-    node_details:
+      version: "ãã¼ã¸ã§ã³:"
+    containing_relation: 
+      entry: é¢é£ {{relation_name}}
+      entry_role: é¢é£ {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: åé¤æ¸ã¿
+      loading: èª­ã¿è¾¼ã¿ä¸­â¦
+    node: 
+      download: "{{download_xml_link}}ã{{view_history_link}}ãã¾ãã¯ã{{edit_link}}"
+      download_xml: XMLããã¦ã³ã­ã¼ã
+      edit: ç·¨é
+      node: ãã¼ã
+      node_title: "ãã¼ã: {{node_name}}"
+      view_history: å±¥æ­´è¡¨ç¤º
+    node_details: 
       coordinates: "åº§æ¨:"
       part_of: "Part of:"
-    node_history:
-      node_history: "ãã¼ãã®å±¥æ­´"
-      download: "{{download_xml_link}} ã¾ãã¯ {{view_details_link}}"
-      download_xml: "XMLãã¦ã³ã­ã¼ã"
-      view_details: "è©³ç´°è¡¨ç¤º"
-    node:
-      node: "ãã¼ã"
-      node_title: "ãã¼ã: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "XMLããã¦ã³ã­ã¼ã"
-      view_history: "å±¥æ­´è¡¨ç¤º"
-    not_found:
-      sorry: "ID {{id}} ã® {{type}} ã¯è¦ã¤ããã¾ããã"
-      type:
-        node: "ãã¼ã"
-        way: "ã¦ã¨ã¤"
-        relation: "é¢é£"
-    paging_nav:
-      showing_page: "ãã¼ã¸è¡¨ç¤º"
-      of: "of"
-    relation_details:
+    node_history: 
+      download: "{{download_xml_link}}ãã¾ãã¯ã{{view_details_link}}"
+      download_xml: XMLãã¦ã³ã­ã¼ã
+      node_history: ãã¼ãã®å±¥æ­´
+      node_history_title: "ãã¼ãå±¥æ­´: {{node_name}}"
+      view_details: è©³ç´°è¡¨ç¤º
+    not_found: 
+      sorry: ID {{id}} ã® {{type}} ã¯è¦ã¤ããã¾ããã
+      type: 
+        node: ãã¼ã
+        relation: é¢é£
+        way: é
+    paging_nav: 
+      of: of
+      showing_page: ãã¼ã¸è¡¨ç¤º
+    relation: 
+      download: "{{download_xml_link}} ã¾ãã¯ {{view_history_link}}"
+      download_xml: XMLã®ãã¦ã³ã­ã¼ã
+      relation: é¢é£
+      relation_title: "é¢é£: {{relation_name}}"
+      view_history: å±¥æ­´è¡¨ç¤º
+    relation_details: 
       members: "ã¡ã³ãã¼:"
       part_of: "Part of:"
-    relation_history:
-      relation_history: "é¢é£ã®å±¥æ­´"
+    relation_history: 
+      download: "{{download_xml_link}}ãã¾ãã¯ã{{view_details_link}}"
+      download_xml: XML ããã¦ã³ã­ã¼ã
+      relation_history: é¢é£ã®å±¥æ­´
       relation_history_title: "é¢é£ã®å±¥æ­´: {{relation_name}}"
-    relation:
-      relation: "é¢é£"
-      relation_title: "é¢é£: {{relation_name}}"
-      download: "{{download_xml_link}} ã¾ãã¯ {{view_history_link}}"
-      download_xml: "XMLã®ãã¦ã³ã­ã¼ã"
-      view_history: "å±¥æ­´è¡¨ç¤º"
-    start:
-      view_data: "ç¾å¨ã®ãããã®ãã¼ã¿ãè¡¨ç¤º"
-      manually_select: "éãã¨ãªã¢ãæåã§é¸æ"
-    start_rjs:
-      data_layer_name: "ãã¼ã¿"
-      data_frame_title: "ãã¼ã¿"
-      zoom_or_select: "ãºã¼ã ã¢ããããããè¡¨ç¤ºããé åãé¸æ"
-      drag_a_box: "ããã¯ã¹ããããã«ãã©ãã°ãã¦é åãé¸æ"
-      manually_select: "éãé åãæåã§é¸æ"
+      view_details: è©³ç´°ãè¡¨ç¤º
+    relation_member: 
+      type: 
+        node: ãã¼ã
+        relation: é¢ä¿
+        way: é
+    start: 
+      manually_select: éãã¨ãªã¢ãæåã§é¸æ
+      view_data: ç¾å¨ã®ãããã®ãã¼ã¿ãè¡¨ç¤º
+    start_rjs: 
+      data_frame_title: ãã¼ã¿
+      data_layer_name: ãã¼ã¿
+      details: è©³ç´°
+      drag_a_box: ããã¯ã¹ããããã«ãã©ãã°ãã¦é åãé¸æ
+      edited_by_user_at_timestamp: "[[user]]ã«ãã[[timestamp]]æç¹ã®ç·¨é"
+      history_for_feature: "[[feature]]ã®å±¥æ­´"
+      load_data: ãã¼ã¿ã®èª­ã¿è¾¼ã¿
       loaded_an_area_with_num_features: "[[num_features]]åã®å°ç©ãå«ãé åãèª­ã¿è¾¼ã¿ã¾ãããä¸è¬ã«ãä¸é¨ã®ãã©ã¦ã¶ã¼ã§ã¯ããã®éã®ãã¼ã¿è¡¨ç¤ºããã¾ãå¦çã§ããªããã¨ãããããã§ããéå¸¸ããã©ã¦ã¶ã¯ä¸åº¦ã«100æªæºã®å°ç©ãè¡¨ç¤ºãããã¨ããããã§ã: ä½ãããã¨ããã©ã¦ã¶ãéããªã£ãããåå¿ããªããªã£ãããã¾ããããã§ãããã®ãã¼ã¿ãè¡¨ç¤ºããããªãã°ãä»¥ä¸ã®ãã¿ã³ãã¯ãªãã¯ãã¦ãã ããã"
-      load_data: "ãã¼ã¿ã®èª­ã¿è¾¼ã¿"
+      loading: èª­ã¿è¾¼ã¿ä¸­...
+      manually_select: éãé åãæåã§é¸æ
+      object_list: 
+        api: APIãããã®é åãåãè¾¼ã¿
+        back: ãªãã¸ã§ã¯ãä¸è¦§è¡¨ç¤º
+        details: è©³ç´°
+        heading: ãªãã¸ã§ã¯ãä¸è¦§
+        history: 
+          type: 
+            node: ãã¼ã [[id]]
+            way: ã¦ã¨ã¤ [[id]]
+        selected: 
+          type: 
+            node: ãã¼ã [[id]]
+            way: ã¦ã¨ã¤ [[id]]
+        type: 
+          node: ãã¼ã
+          way: ã¦ã¨ã¤
+      private_user: private user
+      show_history: å±¥æ­´è¡¨ç¤º
       unable_to_load_size: "èª­ã¿è¾¼ã¿ã§ãã¾ãã: å¢çå²ã¿ã®ãµã¤ãº [[bbox_size]]ãå¤§ãããã¾ãã({{max_bbox_size}}ããå°ããå¿è¦ãããã¾ã)"
-      loading: "èª­ã¿è¾¼ã¿ä¸­..."
-      show_history: "å±¥æ­´è¡¨ç¤º"
-      wait: "ãå¾ã¡ãã ãã..."
-      history_for_feature: "[[feature]]ã®å±¥æ­´"
-      details: "è©³ç´°"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "[[user]]ã«ãã[[timestamp]]æç¹ã®ç·¨é"
-      object_list:
-        heading: "ãªãã¸ã§ã¯ãä¸è¦§"
-        back: "ãªãã¸ã§ã¯ãä¸è¦§è¡¨ç¤º"
-        type:
-          node: "ãã¼ã"
-          way: "ã¦ã¨ã¤"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "APIãããã®é åãåãè¾¼ã¿"
-        details: "è©³ç´°"
-        selected:
-          type:
-            node: "ãã¼ã [[id]]"
-            way: "ã¦ã¨ã¤ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "ãã¼ã [[id]]"
-            way: "ã¦ã¨ã¤ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: ãå¾ã¡ãã ãã...
+      zoom_or_select: ãºã¼ã ã¢ããããããè¡¨ç¤ºããé åãé¸æ
+    tag_details: 
       tags: "ã¿ã°:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}ã{{view_history_link}}ãã¾ãã¯ã{{edit_link}}"
+      download_xml: XMLãã¦ã³ã­ã¼ã
+      edit: ç·¨é
+      view_history: å±¥æ­´è¡¨ç¤º
+      way: é
+      way_title: "é: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: éã{{related_ways}}ãã®ä¸é¨ã§ãããã¾ã
+        other: éã{{related_ways}}ãã®ä¸é¨ã§ãããã¾ã
       nodes: "ãã¼ã:"
       part_of: "å¤æ´ã»ãã:"
-      also_part_of:
-        one: "ã¦ã§ã¤ {{related_ways}} ã®ä¸é¨ã§ã"
-        other: "ã¦ã§ã¤  {{related_ways}} ã®ä¸é¨ã§ã"
-    way_history:
-      way_history: "ã¦ã¨ã¤ã®å±¥æ­´"
-      way_history_title: "ã¦ã¨ã¤ã®å±¥æ­´: {{way_name}}"
-      download: "{{download_xml_link}} ã¾ãã¯ {{view_details_link}}"
-      download_xml: "XMLãã¦ã³ã­ã¼ã"
-      view_details: "è©³ç´°è¡¨ç¤º"
-    way:
-      way: "ã¦ã¨ã¤"
-      way_title: "ã¦ã¨ã¤: {{way_name}}"
-      download: "{{download_xml_link}} ã¾ãã¯ {{view_history_link}}"
-      download_xml: "XMLãã¦ã³ã­ã¼ã"
-      view_history: "å±¥æ­´è¡¨ç¤º"
-  changeset:
+    way_history: 
+      download: "{{download_xml_link}}ãã¾ãã¯ã{{view_details_link}}"
+      download_xml: XMLãã¦ã³ã­ã¼ã
+      view_details: è©³ç´°è¡¨ç¤º
+      way_history: éã®å±¥æ­´
+      way_history_title: "éã®å±¥æ­´: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: å¿å
+      big_area: ï¼å¤§ï¼
+      no_comment: ï¼ã³ã¡ã³ããããã¾ããï¼
+      no_edits: ï¼ç·¨éãããã¾ããï¼
+      show_area_box: é åå¢çãè¡¨ç¤º
+      still_editing: ï¼ã¾ã ç·¨éä¸­ã§ãï¼
+      view_changeset_details: å¤æ´ã»ããã®è©³ç´°è¡¨ç¤º
     changeset_paging_nav: 
-      showing_page: "ãã¼ã¸è¡¨ç¤º"
-      of: "of"
-    changeset:
-      still_editing: "ï¼ã¾ã ç·¨éä¸­ã§ãï¼"
-      anonymous: "å¿å"
-      no_comment: "ï¼ã³ã¡ã³ããããã¾ããï¼"
-      no_edits: "ï¼ç·¨éãããã¾ããï¼"
-      show_area_box: "é åå¢çãè¡¨ç¤º"
-      big_area: "ï¼å¤§ï¼"
-      view_changeset_details: "å¤æ´ã»ããã®è©³ç´°è¡¨ç¤º"
-    changesets:
-      id: "ID"
-      saved_at: "ä¿å­æ¥æ"
-      user: "ã¦ã¼ã¶"
-      comment: "ã³ã¡ã³ã"
-      area: "é å"
-    list_bbox:
-      history: "å±¥æ­´"
-      changesets_within_the_area: "é ååã®å¤æ´ã»ãã:"
-      show_area_box: "é åå²ã¿ã®è¡¨ç¤º"
-      no_changesets: "å¤æ´ã»ãããªã"
-      all_changes_everywhere: "å¨ä½ã§ã®å¤æ´ã¯ {{recent_changes_link}} ãåç§ãã¦ãã ããã"
-      recent_changes: "ææ°ã®å¤æ´"
-      no_area_specified: "é åã®æå®ãªã"
-      first_use_view: "ã¾ã {{view_tab_link}} ãä½¿ã£ã¦è©³ç´°ãè¦ããç¯å²ããã£ã¨æ¡å¤§ãã¦ããå±¥æ­´ã¿ããã¯ãªãã¯ãã¦ãã ããã"
-      view_the_map: "å°å³è¡¨ç¤º"
-      view_tab: "ã¿ãè¡¨ç¤º"
-      alternatively_view: "ãããã¯ãå¨ã¦ã® {{recent_changes_link}}ãè¡¨ç¤º"
-    list:
-      recent_changes: "ææ°ã®å¤æ´"
-      recently_edited_changesets: "æè¿ç·¨éãããå¤æ´ã»ãã:"
-      for_more_changesets: "ããã«å¤æ´ã»ãããè¦³ãã«ã¯ãã¦ã¼ã¶ãé¸æãã¦ããã®ã¦ã¼ã¶ã®ç·¨éå±¥æ­´ãã¿ãããå ´æãæå®ãã¦ç·¨éã®'å±¥æ­´'ãã¿ãããã«ãã¦ãã ããã"
-    list_user:
-      edits_by_username: "{{username_link}} ã«ããå¤æ´"
-      no_visible_edits_by: "{{name}} ã«ããç·¨éã¯ããã¾ãã"
-      for_all_changes: "å¨ã¦ã®ã¦ã¼ã¶ã«ããå¤æ´ã¯ {{recent_changes_link}} ãåç§ãã¦ãã ãã"
-      recent_changes: "æè¿ã®å¤æ´"
-  diary_entry:
-    new:
-      title: "æ°ããæ¥è¨ã®å¥å"
-    list:
-      title: "ã¦ã¼ã¶ã®æ¥è¨"
-      user_title: "{{user}} ã®æ¥è¨"
-      in_language_title: " {{language}} ã§ã®æ¥è¨å¥å"
-      new: "æ°è¦æ¥è¨å¥å"
-      new_title: "ããªãã®æ¥è¨ã«æ°è¦é ç®ãä½æ"
-      no_entries: "æ¥è¨ã®é ç®ãããã¾ãã"
-      recent_entries: "ææ°ã®æ¥è¨é ç®:"
-      older_entries: "å¤ãé ç®"
-      newer_entries: "æ°ããé ç®"
-    edit:
-      title: "æ¥è¨ã®ç·¨é"
-      subject: "ã¿ã¤ãã«:"
+      of: of
+      showing_page: ãã¼ã¸è¡¨ç¤º
+    changesets: 
+      area: é å
+      comment: ã³ã¡ã³ã
+      id: ID
+      saved_at: ä¿å­æ¥æ
+      user: ã¦ã¼ã¶
+    list: 
+      description: ææ°ã®å¤æ´
+  diary_entry: 
+    diary_comment: 
+      comment_from: "{{comment_created_at}} {{link_user}} ããã®ã³ã¡ã³ã"
+    diary_entry: 
+      comment_count: 
+        one: ï¼ã³ã¡ã³ã
+        other: "{{count}} ã³ã¡ã³ã"
+      comment_link: ãã®ã¨ã³ããªã¸ã®ã³ã¡ã³ã
+      edit_link: ãã®è¨äºã®ç·¨é
+      posted_by: "{{link_user}} ã«ãã {{created}}ï¼{{language_link}}ï¼ã®æç¨¿ã"
+      reply_link: Reply to this entry
+    edit: 
       body: "æ¬æ:"
       language: "è¨èª:"
-      location: "å°å:"
       latitude: "ç·¯åº¦:"
+      location: "å°å:"
       longitude: "çµåº¦:"
-      use_map_link: "å°å³ã§æå®ãã"
-      save_button: "ä¿å­"
-      marker_text: "æ¥è¨ã®ã­ã±ã¼ã·ã§ã³"
-    view:
-      title: "ã¦ã¼ã¶æ¥è¨ | {{user}}"
+      marker_text: æ¥è¨ã®ã­ã±ã¼ã·ã§ã³
+      save_button: ä¿å­
+      subject: "ã¿ã¤ãã«:"
+      title: æ¥è¨ã®ç·¨é
+      use_map_link: å°å³ã§æå®ãã
+    list: 
+      in_language_title: " {{language}} ã§ã®æ¥è¨å¥å"
+      new: æ°è¦æ¥è¨å¥å
+      new_title: ããªãã®æ¥è¨ã«æ°è¦é ç®ãä½æ
+      newer_entries: æ°ããé ç®
+      no_entries: æ¥è¨ã®é ç®ãããã¾ãã
+      older_entries: å¤ãé ç®
+      recent_entries: "ææ°ã®æ¥è¨é ç®:"
+      title: ã¦ã¼ã¶ã®æ¥è¨
       user_title: "{{user}} ã®æ¥è¨"
-      leave_a_comment: "ã³ã¡ã³ããæ¸ãã¦ãã ãã"
-      login_to_leave_a_comment: "ã³ã¡ã³ããæ¸ãã«ã¯{{login_link}}ãã¦ãã ããã"
-      login: "ã­ã°ã¤ã³"
-      save_button: "ä¿å­"
-    no_such_entry:
-      heading: "ID {{id}} ã«ã³ã¡ã³ãã¯ã¾ã ããã¾ããã"
-      body: "ID ã {{id}} ã®ã³ã¡ã³ããæ¥è¨ã¯å­å¨ãã¾ãããURLã«ã¹ãã«ãã¹ãç¡ããç¢ºèªããã¦ãã ããããããã¯ãªã³ã¯åãééã£ã¦ã¾ãã"
-    no_such_user:
-      title: "ã¦ã¼ã¶ãå­å¨ãã¾ããã"
-      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+    new: 
+      title: æ°ããæ¥è¨ã®å¥å
+    no_such_entry: 
+      body: ID ã {{id}} ã®ã³ã¡ã³ããæ¥è¨ã¯å­å¨ãã¾ãããURLã«ã¹ãã«ãã¹ãç¡ããç¢ºèªããã¦ãã ããããããã¯ãªã³ã¯åãééã£ã¦ã¾ãã
+      heading: ID {{id}} ã«ã³ã¡ã³ãã¯ã¾ã ããã¾ããã
+    no_such_user: 
       body: "{{user}} ã¨ããååã®ã¦ã¼ã¶ã¯å­å¨ãã¾ãããã¹ãã«ãç¢ºèªãã¦ãã ããããããã¯ãªã³ã¯åãééã£ã¦ãã¾ãã"
-    diary_entry:
-      posted_by: "{{link_user}} ã«ãã {{created}}ï¼{{language_link}}ï¼ã®æç¨¿ã"
-      comment_link: "ãã®ã¨ã³ããªã¸ã®ã³ã¡ã³ã"
-      reply_link: Reply to this entry
-      comment_count:
-        one: "ï¼ã³ã¡ã³ã"
-        other: "{{count}} ã³ã¡ã³ã"
-      edit_link: "ãã®è¨äºã®ç·¨é"
-    diary_comment:
-      comment_from: "{{comment_created_at}} {{link_user}} ããã®ã³ã¡ã³ã "
-  export:
-    start:
-      area_to_export: "ã¨ã¯ã¹ãã¼ãããç¯å²"
-      manually_select: "å¥ã®é åãæå®ãã"
-      format_to_export: "ã¨ã¯ã¹ãã¼ããããã¡ã¤ã«å½¢å¼"
-      osm_xml_data: "OSM XMLãã¼ã¿"
-      mapnik_image: "Mapnik ç»å"
-      osmarender_image: "Osmarender ç»å"
-      embeddable_html: "åãè¾¼ã¿HTML"
-      licence: "ã©ã¤ã»ã³ã¹"
-      export_details: 'OpenStreetMap ã®ãã¼ã¿ã¯ <a href="http://creativecommons.org/licenses/by-sa/2.0/">ã¯ãªã¨ã¤ãã£ãã³ã¢ã³ãº è¡¨ç¤º-ç¶æ¿ 2.0 (Creative Commons Attribution-ShareAlike 2.0)</a>.ã«ãã£ã¦æä¾ããã¦ãã¾ãã'
-      options: "ãªãã·ã§ã³"
-      format: "ãã¡ã¤ã«å½¢å¼"
-      scale: "ç¸®å°º"
-      max: "æå¤§"
-      image_size: "ç»åãµã¤ãº"
-      zoom: "ãºã¼ã "
-      add_marker: "å°å³ã«ãã¼ã«ã¼ãè¿½å ãã"
+      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+      title: ã¦ã¼ã¶ãå­å¨ãã¾ããã
+    view: 
+      leave_a_comment: ã³ã¡ã³ããæ¸ãã¦ãã ãã
+      login: ã­ã°ã¤ã³
+      login_to_leave_a_comment: ã³ã¡ã³ããæ¸ãã«ã¯{{login_link}}ãã¦ãã ããã
+      save_button: ä¿å­
+      title: ã¦ã¼ã¶æ¥è¨ | {{user}}
+      user_title: "{{user}} ã®æ¥è¨"
+  export: 
+    start: 
+      add_marker: å°å³ã«ãã¼ã«ã¼ãè¿½å ãã
+      area_to_export: ã¨ã¯ã¹ãã¼ãããç¯å²
+      embeddable_html: åãè¾¼ã¿HTML
+      export_button: åºå
+      export_details: OpenStreetMap ã®ãã¼ã¿ã¯ <a href="http://creativecommons.org/licenses/by-sa/2.0/">ã¯ãªã¨ã¤ãã£ãã³ã¢ã³ãº è¡¨ç¤º-ç¶æ¿ 2.0 (Creative Commons Attribution-ShareAlike 2.0)</a>.ã«ãã£ã¦æä¾ããã¦ãã¾ãã
+      format: ãã¡ã¤ã«å½¢å¼
+      format_to_export: ã¨ã¯ã¹ãã¼ããããã¡ã¤ã«å½¢å¼
+      image_size: ç»åãµã¤ãº
       latitude: "ç·¯åº¦:"
+      licence: ã©ã¤ã»ã³ã¹
       longitude: "çµåº¦:"
-      output: "åºå"
-      paste_html: "ä»¥ä¸ã® HTML ãããªãã®ãµã¤ãã«åãè¾¼ãã§ãã ãã"
-      export_button: "åºå"
-    start_rjs:
-      export: "åºå"
-      drag_a_box: "æå®ãããç¯å²ã§ãã¦ã¹ããã©ãã°ãã¦ãã ããã"
-      manually_select: "å¥ã®ç¯å²ãæå®ãã"
-      click_add_marker: "ãã¼ã«ã¼ãè¿½å ããä½ç½®ãã¯ãªãã¯ãã¦ãã ããã"
-      change_marker: "ãã¼ã«ã¼ã®ä½ç½®ãå¤æ´ãã"
-      add_marker: "ãã¼ã«ã¼ãå°å³ã«è¿½å ãã"
-      view_larger_map: "å¤§ããªå°å³ãè¡¨ç¤º..."
-  geocoder:
-    search:
-      title:
-        latlon: '<a href="http://openstreetmap.org/">Internal</a>ããã®çµæ'
-        us_postcode: '<a href="http://geocoder.us/">Geocoder.us</a>ããã®çµæ'
-        uk_postcode: '<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>ããã®çµæ'
-        ca_postcode: '<a href="http://geocoder.ca/">Geocoder.CA</a>ããã®çµæ'
-        osm_namefinder: '<a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ããã®çµæ'
-        geonames: '<a href="http://www.geonames.org/">GeoNames</a>ããã®çµæ'
-    results:
-      no_results: "è¦ã¤ããã¾ããã§ããã"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: "OpenStreetMap ã­ã´"
-    welcome_user: "{{user_link}} ãããããããã"
-    welcome_user_link_tooltip: "ããªãã®åäººãã¼ã¸"
-    home: "ãã¼ã "
-    home_tooltip: "ãã¼ã ã¸æ»ã"
-    inbox: "åä¿¡ç®± ({{count}})"
-    inbox_tooltip:
-      zero: "åä¿¡ç®±ã«æªèª­ã¡ãã»ã¼ã¸ã¯ããã¾ãã"
-      one: "åä¿¡ç®±ã«ã¯ï¼éã®æªèª­ã¡ãã»ã¼ã¸ãããã¾ã"
-      other: "åä¿¡ç®±ã«ã¯ {{count}} éã®æªèª­ã¡ãã»ã¼ã¸ãããã¾ã"
-    logout: "ã­ã°ã¢ã¦ã"
-    logout_tooltip: "ã­ã°ã¢ã¦ã"
-    log_in: "ã­ã°ã¤ã³"
-    log_in_tooltip: "èªåã®ã¢ã«ã¦ã³ãã§ã­ã°ã¤ã³ãã"
-    sign_up: "ç»é²"
-    sign_up_tooltip: "ç·¨éã§ããã¢ã«ã¦ã³ããä½æãã"
-    view: "é²è¦§"
-    view_tooltip: "å°å³ãè¦ã"
-    edit: "ç·¨é"
-    edit_tooltip: "å°å³ãç·¨éãã"
-    history: "å±¥æ­´"
-    history_tooltip: "å¤æ´ã»ããã®å±¥æ­´"
-    export: "ã¨ã¯ã¹ãã¼ã"
-    export_tooltip: "å°å³ãã¼ã¿ã®ã¨ã¯ã¹ãã¼ã"
-    gps_traces: "GPS ãã¬ã¼ã¹"
-    gps_traces_tooltip: "ãã¬ã¼ã¹ã®ç®¡ç"
-    user_diaries: "ã¦ã¼ã¶ã®æ¥è¨"
-    user_diaries_tooltip: "ã¦ã¼ã¶ã®æ¥è¨ãè¦ã"
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap ã¯èªç±ã«ç·¨éã§ããä¸çå°å³ã§ããããªãã®ãããªäººããä½ãã¾ããã"
-    intro_2: "OpenStreetMap ã¯å°çä¸ã®èª°ã§ããã©ãããã§ããã®å±åä½æ¥­ã®çµæã§ããå°å³ãã¼ã¿ãç·¨éãé²è¦§ãããã¨ãå¯è½ã«ãã¦ãã¾ãã"
-    intro_3: "OpenStreetMap ã¯ {{ucl}} ã¨ {{bytemark}}.ã«ãã£ã¦ãã¹ãã£ã³ã°ããã¦ãã¾ãã"
-    intro_3_ucl: "ã¦ãã´ã¡ã¼ã·ãã£ã»ã«ã¬ãã¸ã»ã­ã³ãã³ (UCL) VR ã»ã³ã¿ã¼"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "OpenStreetMap ã®ãã¼ã¿ãã¼ã¹ã¯ã¡ã³ããã³ã¹ã®ããä¸æçã«åæ­¢ãã¦ãã¾ãã"
-    osm_read_only: "OpenStreetMap ã®ãã¼ã¿ãã¼ã¹ã¯ã¡ã³ããã³ã¹ã®ããä¸æçã«èª­ã¿è¾¼ã¿å°ç¨ã¢ã¼ãã«ãªã£ã¦ãã¾ãã"
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: "å¯ä»"
-    help_wiki: "ãã«ãã¨ Wiki"
-    help_wiki_tooltip: "ãã­ã¸ã§ã¯ãã®ãã«ãã¨ Wiki"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "ãã¥ã¼ã¹ãã­ã°"
-    news_blog_tooltip: "OpenStreetMap ã«é¢ãããã¥ã¼ã¹ãã­ã°ãfree geographical data, etc."
+      manually_select: å¥ã®é åãæå®ãã
+      mapnik_image: Mapnik ç»å
+      max: æå¤§
+      options: ãªãã·ã§ã³
+      osm_xml_data: OSM XMLãã¼ã¿
+      osmarender_image: Osmarender ç»å
+      output: åºå
+      paste_html: ä»¥ä¸ã® HTML ãããªãã®ãµã¤ãã«åãè¾¼ãã§ãã ãã
+      scale: ç¸®å°º
+      zoom: ãºã¼ã 
+    start_rjs: 
+      add_marker: ãã¼ã«ã¼ãå°å³ã«è¿½å ãã
+      change_marker: ãã¼ã«ã¼ã®ä½ç½®ãå¤æ´ãã
+      click_add_marker: ãã¼ã«ã¼ãè¿½å ããä½ç½®ãã¯ãªãã¯ãã¦ãã ããã
+      drag_a_box: æå®ãããç¯å²ã§ãã¦ã¹ããã©ãã°ãã¦ãã ããã
+      export: åºå
+      manually_select: å¥ã®ç¯å²ãæå®ãã
+      view_larger_map: å¤§ããªå°å³ãè¡¨ç¤º...
+  geocoder: 
+    description: 
+      types: 
+        cities: é½å¸
+        places: å ´æ
+        towns: çº
+    direction: 
+      east: æ±
+      north: å
+      north_east: åæ±
+      north_west: åè¥¿
+      south: å
+      south_east: åæ±
+      south_west: åè¥¿
+      west: è¥¿
+    distance: 
+      one: ç´1ã­ã­ã¡ã¼ãã«
+      other: ç´{{count}}ã­ã­ã¡ã¼ãã«
+      zero: 1ã­ã­ã¡ã¼ãã«ä»¥ä¸
+    results: 
+      no_results: è¦ã¤ããã¾ããã§ããã
+    search: 
+      title: 
+        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>ããã®çµæ
+        geonames: <a href="http://www.geonames.org/">GeoNames</a>ããã®çµæ
+        latlon: <a href="http://openstreetmap.org/">Internal</a>ããã®çµæ
+        osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ããã®çµæ
+        uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>ããã®çµæ
+        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>ããã®çµæ
+  layouts: 
+    alt_donation: å¯ä»
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
+    donate_link_text: å¯ä»
+    edit: ç·¨é
+    edit_tooltip: å°å³ãç·¨éãã
+    export: ã¨ã¯ã¹ãã¼ã
+    export_tooltip: å°å³ãã¼ã¿ã®ã¨ã¯ã¹ãã¼ã
+    gps_traces: GPS ãã¬ã¼ã¹
+    gps_traces_tooltip: ãã¬ã¼ã¹ã®ç®¡ç
+    help_wiki: ãã«ãã¨ Wiki
+    help_wiki_tooltip: ãã­ã¸ã§ã¯ãã®ãã«ãã¨ Wiki
+    history: å±¥æ­´
+    history_tooltip: å¤æ´ã»ããã®å±¥æ­´
+    home: ãã¼ã 
+    home_tooltip: ãã¼ã ã¸æ»ã
+    inbox: åä¿¡ç®± ({{count}})
+    inbox_tooltip: 
+      one: åä¿¡ç®±ã«ã¯ï¼éã®æªèª­ã¡ãã»ã¼ã¸ãããã¾ã
+      other: åä¿¡ç®±ã«ã¯ {{count}} éã®æªèª­ã¡ãã»ã¼ã¸ãããã¾ã
+      zero: åä¿¡ç®±ã«æªèª­ã¡ãã»ã¼ã¸ã¯ããã¾ãã
+    intro_1: OpenStreetMap ã¯èªç±ã«ç·¨éã§ããä¸çå°å³ã§ããããªãã®ãããªäººããä½ãã¾ããã
+    intro_2: OpenStreetMap ã¯å°çä¸ã®èª°ã§ããã©ãããã§ããã®å±åä½æ¥­ã®çµæã§ããå°å³ãã¼ã¿ãç·¨éãé²è¦§ãããã¨ãå¯è½ã«ãã¦ãã¾ãã
+    intro_3: OpenStreetMap ã¯ {{ucl}} ã¨ {{bytemark}}.ã«ãã£ã¦ãã¹ãã£ã³ã°ããã¦ãã¾ãã
+    intro_3_ucl: ã¦ãã´ã¡ã¼ã·ãã£ã»ã«ã¬ãã¸ã»ã­ã³ãã³ (UCL) VR ã»ã³ã¿ã¼
+    log_in: ã­ã°ã¤ã³
+    log_in_tooltip: èªåã®ã¢ã«ã¦ã³ãã§ã­ã°ã¤ã³ãã
+    logo: 
+      alt_text: OpenStreetMap ã­ã´
+    logout: ã­ã°ã¢ã¦ã
+    logout_tooltip: ã­ã°ã¢ã¦ã
+    news_blog: ãã¥ã¼ã¹ãã­ã°
+    news_blog_tooltip: OpenStreetMap ã«é¢ãããã¥ã¼ã¹ãã­ã°ãfree geographical data, etc.
+    osm_offline: OpenStreetMap ã®ãã¼ã¿ãã¼ã¹ã¯ã¡ã³ããã³ã¹ã®ããä¸æçã«åæ­¢ãã¦ãã¾ãã
+    osm_read_only: OpenStreetMap ã®ãã¼ã¿ãã¼ã¹ã¯ã¡ã³ããã³ã¹ã®ããä¸æçã«èª­ã¿è¾¼ã¿å°ç¨ã¢ã¼ãã«ãªã£ã¦ãã¾ãã
     shop: åº
-    shop_tooltip: "OpenStreetMap ãã©ã³ãã®åºè"
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: '2009 OpenStreetMapã«ã³ãã¡ã¬ã³ã¹ã¸è¡ããï¼ The State of the Map,ã¢ã ã¹ãã«ãã ã«ã¦ï¼æ10-12æ¥éå¬!'
-    alt_donation: "å¯ä»"
-  notifier:
-    # ã¡ã¼ã«é¢ä¿ã¯ãæå­ã³ã¼ãã®åé¡ããããããç¿»è¨³ã«ã¯æéã«ãªãå¿è¦ãã
-    diary_comment_notification:
-      # subjectã®ã¨ã³ã³ã¼ãã£ã³ã°ã¯ISO-2022-JP/MIME/Q-ENCODINGã ããã³ã¼ãå¤æãããï¼
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
-      #bodyã®ã¨ã³ã³ã¼ãã£ã³ã°ã¯UTF-8ã§OKã ããMIMEè¨­å®ã¯ãããï¼
+    shop_tooltip: OpenStreetMap ãã©ã³ãã®åºè
+    sign_up: ç»é²
+    sign_up_tooltip: ç·¨éã§ããã¢ã«ã¦ã³ããä½æãã
+    sotm: 2009 OpenStreetMapã«ã³ãã¡ã¬ã³ã¹ã¸è¡ããï¼ The State of the Map,ã¢ã ã¹ãã«ãã ã«ã¦ï¼æ10-12æ¥éå¬!
+    tag_line: The Free Wiki World Map
+    user_diaries: ã¦ã¼ã¶ã®æ¥è¨
+    user_diaries_tooltip: ã¦ã¼ã¶ã®æ¥è¨ãè¦ã
+    view: é²è¦§
+    view_tooltip: å°å³ãè¦ã
+    welcome_user: "{{user_link}} ãããããããã"
+    welcome_user_link_tooltip: ããªãã®åäººãã¼ã¸
+  map: 
+    coordinates: "åº§æ¨:"
+    edit: ç·¨é
+    view: è¡¨ç¤º
+  message: 
+    delete: 
+      deleted: ã¡ãã»ã¼ã¸ã¯åé¤ããã¾ãã
+    inbox: 
+      date: æ¥ä»
+      from: å·®åºäºº
+      my_inbox: èªåã®åä¿¡ç®±
+      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: è¿æã§ãããã³ã°ãã¦ããäººã
+      subject: ã¿ã¤ãã«
+      title: åä¿¡ç®±
+      you_have: You have {{new_count}} new messages and {{old_count}} old messages
+    mark: 
+      as_read: æ¢èª­ã¡ãã»ã¼ã¸
+      as_unread: æªèª­ã¡ãã»ã¼ã¸
+    message_summary: 
+      delete_button: åé¤
+      read_button: æ¢èª­ã«è¨­å®
+      reply_button: è¿ä¿¡
+      unread_button: æªèª­ã«è¨­å®
+    new: 
+      back_to_inbox: åä¿¡ç®±ã«æ»ã
+      body: æ¬æ
+      message_sent: éä¿¡ããã¡ãã»ã¼ã¸
+      send_button: éä¿¡
+      send_message_to: æ°ããã¡ãã»ã¼ã¸ã{{name}}ã«éä¿¡
+      subject: ã¿ã¤ãã«
+      title: ã¡ãã»ã¼ã¸ã®éä¿¡
+    no_such_user: 
+      body: Sorry there is no user or message with that name or id
+      heading: No such user or message
+      title: No such user or message
+    outbox: 
+      date: æ¥ä»
+      inbox: åä¿¡ç®±
+      my_inbox: ãããã® {{inbox_link}}
+      no_sent_messages: éä¿¡ããã¡ãã»ã¼ã¸ã¯ã¾ã ããã¾ããã{{people_mapping_nearby_link}}ã¨ãè¿ã¥ãã«ãªã£ã¦ã¯ãããã§ãã?
+      outbox: éä¿¡ç®±
+      people_mapping_nearby: è¿æã§ãããã³ã°ãã¦ããäººã
+      subject: ã¿ã¤ãã«
+      title: éä¿¡ç®±
+      to: å®å
+      you_have_sent_messages: "{{sent_count}}ãã®éä¿¡æ¸ã¿ã¡ãã»ã¼ã¸ãããã¾ã"
+    read: 
+      back_to_inbox: åä¿¡ç®±ã«æ»ã
+      back_to_outbox: éä¿¡ç®±ã«æ»ã
+      date: æ¥ä»
+      from: å·®åºäºº
+      reading_your_messages: ã¡ãã»ã¼ã¸ãèª­ã
+      reading_your_sent_messages: éä¿¡ããã¡ãã»ã¼ã¸ãèª­ã
+      reply_button: è¿ä¿¡
+      subject: ã¿ã¤ãã«
+      title: ã¡ãã»ã¼ã¸ãèª­ã
+      to: å®å
+      unread_button: æªèª­ã«è¨­å®
+    sent_message_summary: 
+      delete_button: åé¤
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      footer1: "You can also read the message at {{readurl}}"
-      footer2: "and you can reply at {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_html: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
+      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
+    gpx_notification: 
+      and_no_tags: and no tags.
       and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
+      failure: 
         failed_to_import: "failed to import. Here's the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_1: More information about GPX import failures and how to avoid
         more_info_2: "them can be found at:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX Import failure"
+      greeting: Hi,
+      success: 
+        loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
-    signup_confirm:
+      with_description: with the description
+      your_gpx_file: It looks like your GPX file
+    lost_password: 
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_html: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
+    lost_password_plain: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
+      hopefully_you_2: email addresses openstreetmap.org account.
+    message_notification: 
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      footer1: You can also read the message at {{readurl}}
+      footer2: and you can reply at {{replyurl}}
+      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    lost_password:
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-  message:
-    inbox:
-      title: "åä¿¡ç®±"
-      my_inbox: "èªåã®åä¿¡ç®±"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "å·®åºäºº"
-      subject: "ã¿ã¤ãã«"
-      date: "æ¥ä»"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "è¿æã§ãããã³ã°ãã¦ããäººã" 
-    message_summary:
-      unread_button: "æªèª­ã«è¨­å®"
-      read_button: "æ¢èª­ã«è¨­å®"
-      reply_button: "è¿ä¿¡"
-    new:
-      title: "ã¡ãã»ã¼ã¸ã®éä¿¡"
-      send_message_to: "æ°ããã¡ãã»ã¼ã¸ã{{name}}ã«éä¿¡"
-      subject: "ã¿ã¤ãã«"
-      body: "æ¬æ"
-      send_button: "éä¿¡"
-      back_to_inbox: "åä¿¡ç®±ã«æ»ã"
-      message_sent: "éä¿¡ããã¡ãã»ã¼ã¸"
-    no_such_user:
-      title: "No such user or message"
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox: 
-      title: "éä¿¡ç®±"
-      my_inbox: "ãããã® {{inbox_link}}"
-      inbox: "åä¿¡ç®±"
-      outbox: "éä¿¡ç®±"
-      you_have_sent_messages: "{{sent_count}}ãã®éä¿¡æ¸ã¿ã¡ãã»ã¼ã¸ãããã¾ã"
-      to: "å®å"
-      subject: "ã¿ã¤ãã«"
-      date: "æ¥ä»"
-      no_sent_messages: "éä¿¡ããã¡ãã»ã¼ã¸ã¯ã¾ã ããã¾ããã{{people_mapping_nearby_link}}ã¨ãè¿ã¥ãã«ãªã£ã¦ã¯ãããã§ãã?"
-      people_mapping_nearby: "è¿æã§ãããã³ã°ãã¦ããäººã"
-    read:
-      title: "ã¡ãã»ã¼ã¸ãèª­ã"
-      reading_your_messages: "ã¡ãã»ã¼ã¸ãèª­ã"
-      from: "å·®åºäºº"
-      subject: "ã¿ã¤ãã«"
-      date: "æ¥ä»"
-      reply_button: "è¿ä¿¡"
-      unread_button: "æªèª­ã«è¨­å®"
-      back_to_inbox: "åä¿¡ç®±ã«æ»ã"
-      reading_your_sent_messages: "éä¿¡ããã¡ãã»ã¼ã¸ãèª­ã"
-      to: "å®å"
-      back_to_outbox: "éä¿¡ç®±ã«æ»ã"
-    mark:
-      as_read: "æ¢èª­ã¡ãã»ã¼ã¸"
-      as_unread: "æªèª­ã¡ãã»ã¼ã¸"
-  site:
-    index:
-      js_1: "javascriptããµãã¼ããã¦ããªããã©ã¦ã¶ãä½¿ç¨ãã¦ããããjavascriptãä½¿ç¨ä¸å¯ã«è¨­å®ãã¦ãã¾ãã"
-      js_2: "OpenStreetMapã¯ãå°å³è¡¨ç¤ºã«javascriptãä½¿ç¨ãã¦ãã¾ãã"
-      js_3: 'javascriptãä½¿ããªãå ´åã¯<a href="http://tah.openstreetmap.org/Browse/">Tiles@Homeã®éçãªå°å³ãã©ã¦ã¶</a>ãè©¦ãã¦ã¯ãããã§ããã'
-      permalink: Permalink
-      license:
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: ããªãã®éå¬éGPSãã¬ã¼ã¹ãèª­ã¿è¾¼ãã
+      allow_read_prefs: ããªãã®å©ç¨èè¨­å®ãèª­ã¿è¾¼ãã
+      allow_write_api: å°å³ãä¿®æ­£ããã
+      allow_write_gpx: GPSãã¬ã¼ã¹ãæ´æ°ããã
+      allow_write_prefs: ããªãã®å©ç¨èè¨­å®ãå¤æ´ããã
+  oauth_clients: 
+    edit: 
+      submit: ç·¨é
+    form: 
+      allow_read_prefs: å©ç¨èè¨­å®ãèª­ã¿è¾¼ãã
+      allow_write_api: å°å³ãä¿®æ­£ããã
+    new: 
+      submit: ç»é²
+    show: 
+      allow_read_gpx: éå¬éGPSãã¬ã¼ã¹ãèª­ã¿è¾¼ãã
+      allow_read_prefs: å©ç¨èè¨­å®ãèª­ã¿è¾¼ãã
+      allow_write_api: å°å³ãä¿®æ­£ããã
+      allow_write_prefs: å©ç¨èè¨­å®ãå¤æ´ããã
+      edit: è©³ç´°ã®ç·¨é
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: OpenStreetMap Flashã¨ãã£ã¿ã¼ã®Potlatchãä½¿ãã«ã¯ããã©ãã·ã¥ã»ãã¬ã¼ã¤ã¼ãå¿è¦ã§ãã<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com</a>ããFlash Playerããã¦ã³ã­ã¼ãã§ãã¾ããOpenStreetMapãç·¨éããã«ã¯ã<a href="http://wiki.openstreetmap.org/wiki/Ja:Editing">ä»ã®æ¹æ³</a>ãããã¾ã
+      not_public: ããªãã®ç·¨éçµæãå¬éã§ãã¾ããã
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
+      user_page_link: ã¦ã¼ã¶ãã¼ã¸
+    index: 
+      js_1: javascriptããµãã¼ããã¦ããªããã©ã¦ã¶ãä½¿ç¨ãã¦ããããjavascriptãä½¿ç¨ä¸å¯ã«è¨­å®ãã¦ãã¾ãã
+      js_2: OpenStreetMapã¯ãå°å³è¡¨ç¤ºã«javascriptãä½¿ç¨ãã¦ãã¾ãã
+      js_3: javascriptãä½¿ããªãå ´åã¯<a href="http://tah.openstreetmap.org/Browse/">Tiles@Homeã®éçãªå°å³ãã©ã¦ã¶</a>ãè©¦ãã¦ã¯ãããã§ããã
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: " {{project_name}}ã¨ãã®è²¢ç®èã«ããã{{license_name}} ã©ã¤ã»ã³ã¹ã®åæä¾ããã¦ãã¾ãã"
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMapãã­ã¸ã§ã¯ã"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "ããªãã®ç·¨éçµæãå¬éã§ãã¾ããã"
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
-      user_page_link: "ã¦ã¼ã¶ãã¼ã¸"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'OpenStreetMap Flashã¨ãã£ã¿ã¼ã®Potlatchãä½¿ãã«ã¯ããã©ãã·ã¥ã»ãã¬ã¼ã¤ã¼ãå¿è¦ã§ãã<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com</a>ããFlash Playerããã¦ã³ã­ã¼ãã§ãã¾ããOpenStreetMapãç·¨éããã«ã¯ã<a href="http://wiki.openstreetmap.org/wiki/Ja:Editing">ä»ã®æ¹æ³</a>ãããã¾ã'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: "æ¤ç´¢çµæ"
-      close: "éãã"
-    search:
-      search: "æ¤ç´¢"
-      where_am_i: "ãã¾ã©ã?"
-      submit_text: "è¡ã"
+        project_name: OpenStreetMapãã­ã¸ã§ã¯ã
+      permalink: Permalink
+    key: 
+      map_key: å¡ä¾
+      map_key_tooltip: ãã®ç¸®å°ºã«ãããmapnikã¬ã³ããªã³ã°ã®å¡ä¾
+      table: 
+        entry: 
+          apron: 
+            - ç©ºæ¸¯ãã«
+            - ç©ºæ¸¯ã¿ã¼ããã«
+          bridge: é»æ  = æ©æ¢
+          building: éè¦å»ºé ç©
+          byway: è·¯å°
+          cable: 
+            - ã±ã¼ãã«ã»ã«ã¼
+            - ãªãã
+          commercial: åæ¥­å°å
+          construction: å»ºè¨­ä¸­ã®éè·¯
+          farm: è¾²ç§å ´
+          forest: æ£®
+          golf: ã´ã«ãå ´
+          heathland: èå°
+          industrial: å·¥æ¥­å°å
+          lake: 
+            - æ¹
+            - æºæ± 
+          military: è»ç¨å°å
+          motorway: èªåè»å°ç¨éè·¯
+          park: å¬å
+          primary: å¹¹ç·éè·¯
+          rail: éé
+          resident: ä½å®è¡
+          runway: 
+            - ç©ºæ¸¯æ»èµ°è·¯
+            - ç©ºæ¸¯èªå°è·¯
+          school: 
+            - å­¦æ ¡
+            - å¤§å­¦
+          secondary: ä¸è¬éè·¯
+          station: ééé§
+          subway: å°ä¸é
+          tourist: è¦³ååæ
+          tram: 
+            - è»½ä¾¿éé
+            - è·¯é¢é»è»
+          tunnel: ç¹ç·ã®æ  = ãã³ãã«
+          unclassified: æªåé¡ã®éè·¯
+          unsurfaced: æªèè£éè·¯
+          wood: æ£®æ
+    search: 
+      search: æ¤ç´¢
       search_help: "ä¾: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>ä»ã®ä¾...</a>"
-      #ããããwiki.openstreetmap.org/wiki/Ja:Searchãä½æãããã¨
-    key:
-      map_key: "å¡ä¾"
-      map_key_tooltip: "ãã®ç¸®å°ºã«ãããmapnikã¬ã³ããªã³ã°ã®å¡ä¾"
-  trace:
-    create:
-      upload_trace: "GPS ãã¬ã¼ã¹ã®ã¢ããã­ã¼ã"
-      trace_uploaded: "ããªãã® GPX ãã¡ã¤ã«ã¯ã¢ããã­ã¼ãããã¾ãããããã¼ã¿ãã¼ã¹ã¸ã®ç»é²ã«æ«ãæéããããã¾ããéå¸¸ãã®ä½æ¥­ã¯30åã»ã©ã§çµäºããçµäºããç¥ããããã¡ã¼ã«ãããªãã«éä¿¡ãã¾ãã"
-    edit:
+      submit_text: è¡ã
+      where_am_i: ãã¾ã©ã?
+    sidebar: 
+      close: éãã
+      search_results: æ¤ç´¢çµæ
+  trace: 
+    create: 
+      trace_uploaded: ããªãã® GPX ãã¡ã¤ã«ã¯ã¢ããã­ã¼ãããã¾ãããããã¼ã¿ãã¼ã¹ã¸ã®ç»é²ã«æ«ãæéããããã¾ããéå¸¸ãã®ä½æ¥­ã¯30åã»ã©ã§çµäºããçµäºããç¥ããããã¡ã¼ã«ãããªãã«éä¿¡ãã¾ãã
+      upload_trace: GPS ãã¬ã¼ã¹ã®ã¢ããã­ã¼ã
+    delete: 
+      scheduled_for_deletion: åé¤äºå®ã®ãã©ãã¯
+    edit: 
+      description: "è©³ç´°:"
+      download: ãã¦ã³ã­ã¼ã
+      edit: ç·¨é
       filename: "ãã¡ã¤ã«å:"
-      uploaded_at: "ã¢ããã­ã¼ãæ¥æ:"
+      map: å°å³
+      owner: "ã¢ããã­ã¼ãããã¦ã¼ã¶:"
       points: "ãã¤ã³ãæ°:"
+      save_button: å¤æ´ãä¿å­ãã
       start_coord: "éå§åº§æ¨:"
-      edit: "ç·¨é"
-      owner: "ã¢ããã­ã¼ãããã¦ã¼ã¶:"
-      description: "è©³ç´°:"
       tags: "ã¿ã°:"
-      save_button: "å¤æ´ãä¿å­ãã"
-    no_such_user:
-      title: "ã¦ã¼ã¶ãå­å¨ãã¾ãã"
-      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+      tags_help: ã³ã³ãåºåã
+      uploaded_at: "ã¢ããã­ã¼ãæ¥æ:"
+      visibility: "å¯è¦æ§:"
+      visibility_help: ããã¯ã©ãããæå³ï¼
+    list: 
+      public_traces: å¬éGPSãã¬ã¼ã¹
+      public_traces_from: "{{user}}ããã®å¬éGPSãã¬ã¼ã¹"
+      tagged_with: "{{tags}}ã§ã¿ã°ä»ãããã"
+      your_traces: ããªãã®GPSãã¬ã¼ã¹
+    make_public: 
+      made_public: å¬éããããã©ãã¯
+    no_such_user: 
       body: "{{user}}.ã¨ããååã®ã¦ã¼ã¶ã¯å­å¨ãã¾ãããã¹ãã«ããã§ãã¯ãã¦ãã ããããããã¯ãªã³ã¯åãèª¤ã£ã¦ãã¾ãã"
-    trace_form:
-      upload_gpx: "ã¢ããã­ã¼ãããGPXãã¡ã¤ã«"
-      description: "è©³ç´°"
-      tags: "ã¿ã°"
-      public: "å¬éï¼"
-      upload_button: "ã¢ããã­ã¼ã"
-      help: "ãã«ã"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "ããªãã®ãã¬ã¼ã¹ã ãè¦ããããã¬ã¼ã¹ãã¢ããã­ã¼ãããã"
-      see_all_traces: "å¨ã¦ã®ãã¬ã¼ã¹ãè¦ã"
-      see_your_traces: "ããªãã®ãã¬ã¼ã¹ãå¨ã¦è¦ã"
-      traces_waiting: "ããªãã¯ {{count}} ã®ãã¬ã¼ã¹ãã¢ããã­ã¼ãå¾ã¡ã«ãªã£ã¦ãã¾ãããããã®ã¢ããã­ã¼ããçµäºããã¾ã§ãå¾ã¡ãã ãããä»ã®ã¦ã¼ã¶ã¼ã®ã¢ããã­ã¼ããå¶éããã¦ãã¾ãã¾ãã"
-    trace_optionals:
-      tags: "ã¿ã°ï¼è¤æ°å¯ï¼"
-    view:
-      pending: "ã¢ããã­ã¼ãä¸­"
+      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+      title: ã¦ã¼ã¶ãå­å¨ãã¾ãã
+    trace: 
+      ago: "{{time_in_words_ago}}å"
+      by: by
+      count_points: "{{count}} ãã¤ã³ã"
+      edit: ç·¨é
+      edit_map: å°å³ãç·¨é
+      in: in
+      map: å°å³
+      more: è©³ç´°
+      pending: å¦çä¸­
+      private: éå¬é
+      public: å¬é
+      trace_details: ãã¬ã¼ã¹ã®è©³ç´°è¡¨ç¤º
+      view_map: å°å³ã§è¡¨ç¤º
+    trace_form: 
+      description: è©³ç´°
+      help: ãã«ã
+      tags: ã¿ã°
+      tags_help: ã³ã³ãåºåã
+      upload_button: ã¢ããã­ã¼ã
+      upload_gpx: ã¢ããã­ã¼ãããGPXãã¡ã¤ã«
+      visibility: å¯è¦æ§
+      visibility_help: ããã¯ã©ãããæå³ï¼
+    trace_header: 
+      see_all_traces: å¨ã¦ã®ãã¬ã¼ã¹ãè¦ã
+      see_just_your_traces: ããªãã®ãã¬ã¼ã¹ã ãè¦ããããã¬ã¼ã¹ãã¢ããã­ã¼ãããã
+      see_your_traces: ããªãã®ãã¬ã¼ã¹ãå¨ã¦è¦ã
+      traces_waiting: ããªãã¯ {{count}} ã®ãã¬ã¼ã¹ãã¢ããã­ã¼ãå¾ã¡ã«ãªã£ã¦ãã¾ãããããã®ã¢ããã­ã¼ããçµäºããã¾ã§ãå¾ã¡ãã ãããä»ã®ã¦ã¼ã¶ã¼ã®ã¢ããã­ã¼ããå¶éããã¦ãã¾ãã¾ãã
+    trace_optionals: 
+      tags: ã¿ã°ï¼è¤æ°å¯ï¼
+    trace_paging_nav: 
+      of: of
+      showing: ãã¼ã¸è¡¨ç¤º
+    view: 
+      delete_track: ãã®ãã©ãã¯ã®åé¤
+      description: "è©³ç´°:"
+      download: ãã¦ã³ã­ã¼ã
+      edit: ç·¨é
+      edit_track: ãã®ãã©ãã¯ã®ç·¨é
       filename: "ãã¡ã¤ã«å:"
-      download: "ãã¦ã³ã­ã¼ã"
-      uploaded: "ã¢ããã­ã¼ãæ¥æ:"
+      heading: ãã¬ã¼ã¹{{name}}ã®è¡¨ç¤º
+      map: å°å³
+      none: ç¡ã
+      owner: "ã¢ããã­ã¼ãããã¦ã¼ã¶:"
+      pending: ã¢ããã­ã¼ãä¸­
       points: "ãã¤ã³ãæ°:"
       start_coordinates: "éå§åº§æ¨:"
-      map: "å°å³"
-      edit: "ç·¨é"
-      owner: "ã¢ããã­ã¼ãããã¦ã¼ã¶:"
-      description: "è©³ç´°:"
-      tags: "ã¿ã°"
-      none: "ç¡ã"
-      make_public: "ãã®ãã©ãã¯ãä»å¾å¬éãã"
-      edit_track: "ãã®ãã©ãã¯ã®ç·¨é"
-      delete_track: "ãã®ãã©ãã¯ã®åé¤"
-      heading: "ãã¬ã¼ã¹{{name}}ã®è¡¨ç¤º"
-      trace_not_found: "ãã¬ã¼ã¹ãè¦ã¤ããã¾ãã!"
-    trace_paging_nav:
-      showing: "ãã¼ã¸è¡¨ç¤º"
-      of: "of"
-    trace:
-      pending: "å¦çä¸­"
-      count_points: "{{count}} ãã¤ã³ã"
-      ago: "{{time_in_words_ago}}å"
-      more: "è©³ç´°"
-      trace_details: "ãã¬ã¼ã¹ã®è©³ç´°è¡¨ç¤º"
-      view_map: "å°å³ã§è¡¨ç¤º"
-      edit: "ç·¨é"
-      edit_map: "å°å³ãç·¨é"
-      public: "å¬é"
-      private: "éå¬é"
-      by: "by"
-      in: "in"
-      map: "å°å³"
-    list:
-      public_traces: "å¬éGPSãã¬ã¼ã¹"
-      your_traces: "ããªãã®GPSãã¬ã¼ã¹"
-      public_traces_from: "{{user}}ããã®å¬éGPSãã¬ã¼ã¹"
-      tagged_with: "{{tags}}ã§ã¿ã°ä»ãããã"
-    delete:
-      scheduled_for_deletion: "åé¤äºå®ã®ãã©ãã¯"
-    make_public:
-      made_public: "å¬éããããã©ãã¯"
-  user:
-    login:
-      title: "ã­ã°ã¤ã³"
-      heading: "ã­ã°ã¤ã³"
-      please login: "ã­ã°ã¤ã³ãããã{{create_user_link}}."
-      create_account: "ã¢ã«ã¦ã³ãä½æ"
+      tags: ã¿ã°
+      trace_not_found: ãã¬ã¼ã¹ãè¦ã¤ããã¾ãã!
+      uploaded: "ã¢ããã­ã¼ãæ¥æ:"
+      visibility: "å¯è¦æ§:"
+  user: 
+    account: 
+      email never displayed publicly: ï¼å¬éãã¾ããï¼
+      flash update success: ã¦ã¼ã¶æå ±ã®æ´æ°ã«æåãã¾ããã
+      flash update success confirm needed: ã¦ã¼ã¶æå ±ã®æ´æ°ã«æåãã¾ãããç»é²ããã¡ã¼ã«ã¢ãã¬ã¹ã®ã¡ã¼ã«ãåä¿¡ãã¦ãã¡ã¼ã«ã¢ãã¬ã¹ã®ç¢ºèªãè¡ã£ã¦ãã ããã
+      home location: "æ´»åå°å:"
+      latitude: "ç·¯åº¦:"
+      longitude: "çµåº¦:"
+      make edits public button: ç§ã®ç·¨éãå¨ã¦å¬éãã
+      my settings: ç§ã®è¨­å®
+      no home location: ããªãã¯ã¾ã æ´»åå°åãç»é²ãã¦ãã¾ããã
+      preferred languages: "è¨èªè¨­å®:"
+      profile description: "ã¦ã¼ã¶æå ±ã®è©³ç´°:"
+      public editing: 
+        disabled: Disabled ç·¨éã§ãã¾ãããããã¾ã§ã®ç·¨éã¯å¨ã¦å¿åã®ç©ã¨ãã¦æ±ããã¾ãã
+        disabled link text: ãªãç·¨éã§ããªãã®ã§ããï¼
+        enabled: Enabled. å¿åã§ã¯ãªããç·¨éå¯è½ã§ãã
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: ããã¯ä½ã§ããï¼
+        heading: "å¬éç·¨é:"
+      return to profile: ãã­ãã£ã¼ã«ã«æ»ã
+      save changes button: å¤æ´ãä¿å­
+      title: ã¢ã«ã¦ã³ããç·¨é
+      update home location on click: ã¯ãªãã¯ããå°ç¹ãããªãã®æ´»åå°åã¨ãã¦ç»é²ãæ´æ°ãã¾ããï¼
+    confirm: 
+      button: ç¢ºèª
+      failure: ãã®ã­ã¼ã¯ã¼ãã«ãã£ã¦ãã¦ã¼ã¶ã¢ã«ã¦ã³ãã¯ãã§ã«ç¢ºèªããã¦ãã¾ãã
+      heading: ã¦ã¼ã¶ã¢ã«ã¦ã³ãã®ç¢ºèª
+      press confirm button: ã¢ã«ã¦ã³ããæå¹ã«ãã¦è¯ããã°ãä»¥ä¸ã®ç¢ºèªãã¿ã³ãæ¼ãã¦ãã ããã
+      success: ããªãã®ã¢ã«ã¦ã³ããç¢ºèªãã¾ãããç»é²ãããã¨ããããã¾ãï¼
+    confirm_email: 
+      button: ç¢ºèª
+      failure: ãã®ã¡ã¼ã«ã¢ãã¬ã¹ç¢ºèªãã¼ã¯ã³ã¯æ¢ã«ç¢ºèªãæ¸ãã§ãã¾ãã
+      heading: é»å­ã¡ã¼ã«ã¢ãã¬ã¹å¤æ´ã®ç¢ºèª
+      press confirm button: æ°ããã¡ã¼ã«ã¢ãã¬ã¹ãç¢ºèªããããã«ç¢ºèªãã¿ã³ãæ¼ãã¦ä¸ããã
+      success: ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ãç¢ºèªã§ãã¾ãããç»é²ãããã¨ããããã¾ãã
+    friend_map: 
+      nearby mapper: "å¨è¾ºã®ãããã¼: [[nearby_user]]"
+      your location: ããªãã®ä½ç½®
+    go_public: 
+      flash success: ããªãã®å¨ã¦ã®ç·¨éã¯å¬éããã¾ããä»ããç·¨éã§ãã¾ãã
+    login: 
+      account not active: ç³ãè¨³ããã¾ãããããªãã®ã¢ã«ã¦ã³ãã¯ã¾ã æå¹ã§ã¯ããã¾ããã<br />ã¢ã«ã¦ã³ãç¢ºèªã¡ã¼ã«ã«è¨è¼ããã¦ãããã¢ã«ã¦ã³ããæå¹ã«ãããªã³ã¯ãã¯ãªãã¯ãã¦ãã ããã
+      auth failure: ç³ãè¨³ããã¾ãããä»¥ä¸ã®çç±ã«ããã­ã°ã¤ã³ã§ãã¾ããã
+      create_account: ã¢ã«ã¦ã³ãä½æ
       email or username: "é»å­ã¡ã¼ã«ã¢ãã¬ã¹ãã¦ã¼ã¶å:"
+      heading: ã­ã°ã¤ã³
+      login_button: ã­ã°ã¤ã³
+      lost password link: ãã¹ã¯ã¼ããå¿ãã¾ããã?
       password: "ãã¹ã¯ã¼ã:"
-      lost password link: "ãã¹ã¯ã¼ããå¿ãã¾ããã?"
-      login_button: "ã­ã°ã¤ã³"
-      account not active: "ç³ãè¨³ããã¾ãããããªãã®ã¢ã«ã¦ã³ãã¯ã¾ã æå¹ã§ã¯ããã¾ããã<br />ã¢ã«ã¦ã³ãç¢ºèªã¡ã¼ã«ã«è¨è¼ããã¦ãããã¢ã«ã¦ã³ããæå¹ã«ãããªã³ã¯ãã¯ãªãã¯ãã¦ãã ããã"
-      auth failure: "ç³ãè¨³ããã¾ãããä»¥ä¸ã®çç±ã«ããã­ã°ã¤ã³ã§ãã¾ããã"
-    lost_password:
-      title: "ãã¹ã¯ã¼ãå¤±å¿µ"
-      heading: "ãã¹ã¯ã¼ããå¿ãã¾ããã?"
-      email address: "é»å­ã¡ã¼ã«ã¢ãã¬ã¹:"
-      new password button: "æ°ããã¡ã¼ã«ãéã£ã¦ãã ãã"
-      notice email on way: "æ®å¿µãªãããã¹ã¯ã¼ãããã§ã«æ¶ãã¾ãã (-.-);; ãããããªã»ããç¨ã®é»å­ã¡ã¼ã«ãéã£ã¦ãã¾ãã®ã§ãããã«åå¾©ã§ããã§ãããã"
-      notice email cannot find: "æ®å¿µãªããé»å­ã¡ã¼ã«ã¢ãã¬ã¹ã¯è¦ã¤ããã¾ããã"
-    reset_password:
-      title: "ãã¹ã¯ã¼ãã®ãªã»ãã"
-      flash changed check mail: "ãã¹ã¯ã¼ãã¯å¤æ´ããã¾ãããæ°ãã¹ã¯ã¼ãã¯ãã¡ã¼ã«åä¿¡ç®±ã«ééããã¾ã (^_^)"
-      flash token bad: "ã­ã¼ã¯ã¼ããè¦ã¤ãããã¾ãããURLããã§ãã¯ãã¦ã¯ãããã§ããï¼"
-    new:
-      title: "ã¢ã«ã¦ã³ãä½æ"
-      heading: "ã¦ã¼ã¶ã¢ã«ã¦ã³ãã®ä½æ"
-      no_auto_account_create: "æ®å¿µãªãããèªåçã«ã¢ã«ã¦ã³ããä½ããã¨ãåºæ¥ã¾ããã"
-      contact_webmaster: 'ã¢ã«ã¦ã³ããä½æã§ããããã<a href="mailto:webmaster@openstreetmap.org">webmaster</a>ã«é£çµ¡ãã¦ãã ããã ã§ããã ãæ©æã«ãããªãã®å¸æã«å¯¾å¿ããããã«åªãã¾ãã'
-      fill_form: "ä»¥ä¸ã®ãã©ã¼ã ãåãã¦ãã ãããç»é²ããã¨ãããªãã®ã¢ã«ã¦ã³ããæå¹åããããã«ããªãã«ã¡ã¼ã«ããéããã¾ãã"
-      license_agreement: 'ã¢ã«ã¦ã³ããä½æãããã¨ã§ãããªãã openstreetmap.org ã«ã¢ããã­ã¼ãããå¨ã¦ã®ãã¼ã¿ããã³ä½æ¥­åå®¹ããããã¯ openstreetmap.org ã«æ¥ç¶ãããã¼ã«ã«ããæ´»åãå¨ã¦éæä»çãª <a 
-href="http://creativecommons.org/licenses/by-sa/2.0/">ã¯ãªã¨ã¤ãã£ãã³ã¢ã³ãº è¡¨ç¤º-ç¶æ¿ (Creative Commons by-sa) ã©ã¤ã»ã³ã¹</a>ã§ä½¿ç¨è¨±è«¾ããç©ã¨è¦ãªããã¾ãã'
+      please login: ã­ã°ã¤ã³ãããã{{create_user_link}}.
+      title: ã­ã°ã¤ã³
+    lost_password: 
       email address: "é»å­ã¡ã¼ã«ã¢ãã¬ã¹:"
+      heading: ãã¹ã¯ã¼ããå¿ãã¾ããã?
+      new password button: æ°ããã¡ã¼ã«ãéã£ã¦ãã ãã
+      notice email cannot find: æ®å¿µãªããé»å­ã¡ã¼ã«ã¢ãã¬ã¹ã¯è¦ã¤ããã¾ããã
+      notice email on way: æ®å¿µãªãããã¹ã¯ã¼ãããã§ã«æ¶ãã¾ãã (-.-);; ãããããªã»ããç¨ã®é»å­ã¡ã¼ã«ãéã£ã¦ãã¾ãã®ã§ãããã«åå¾©ã§ããã§ãããã
+      title: ãã¹ã¯ã¼ããå¿ãã
+    make_friend: 
+      already_a_friend: ããªãã¯ {{name}}.ã¨æ¢ã«åéã§ãã
+      failed: "{{name}} ãåéã¨ç»é²ã§ãã¾ããã§ããã"
+      success: "{{name}} ã¯ããªãã®åéã«ãªãã¾ããã"
+    new: 
       confirm email address: "ã¡ã¼ã«ã¢ãã¬ã¹ã®ç¢ºèª:"
-      not displayed publicly: 'å¬éããã¾ãããï¼è©³ç´°ã¯ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" 
-      title="wiki privacy policy including section on email addresses">ãã©ã¤ãã·ã¼ããªã·ã¼</a>ãå¾¡è¦§ä¸ããï¼'
+      confirm password: "ãã¹ã¯ã¼ãã®åå¥å:"
+      contact_webmaster: ã¢ã«ã¦ã³ããä½æã§ããããã<a href="mailto:webmaster@openstreetmap.org">webmaster</a>ã«é£çµ¡ãã¦ãã ããã ã§ããã ãæ©æã«ãããªãã®å¸æã«å¯¾å¿ããããã«åªãã¾ãã
       display name: "è¡¨ç¤ºå:"
+      email address: "é»å­ã¡ã¼ã«ã¢ãã¬ã¹:"
+      fill_form: ä»¥ä¸ã®ãã©ã¼ã ãåãã¦ãã ãããç»é²ããã¨ãããªãã®ã¢ã«ã¦ã³ããæå¹åããããã«ããªãã«ã¡ã¼ã«ããéããã¾ãã
+      flash create success message: ã¦ã¼ã¶ä½æã«æåãã¾ãããããã«ç·¨éãéå§ããããã«é»å­ã¡ã¼ã«ãç¢ºèªãã¦ã¢ã«ã¦ã³ããæå¹ã«ãã¦ãã ããã<br /><br />ããªãã®æå®ããã¢ãã¬ã¹ã«ç¢ºèªã¡ã¼ã«ãå±ãã¾ã§ããªãã¯ã­ã°ã¤ã³ãããã¨ã¯ã§ãã¾ããã<br /><br />ã¡ã¼ã«ããã¯ã¹ã§ã¹ãã ãã£ã«ã¿ãä½¿ã£ã¦ããã¨ãã«ã¯ webmaster@openstreetmap.org ããã®ç¢ºèªã¡ã¼ã«ãåä¿¡ã§ãããããã¯ã¤ããªã¹ããè¨­å®ãã¦ãã ããã
+      heading: ã¦ã¼ã¶ã¢ã«ã¦ã³ãã®ä½æ
+      license_agreement: ã¢ã«ã¦ã³ããä½æãããã¨ã§ãããªãã openstreetmap.org ã«ã¢ããã­ã¼ãããå¨ã¦ã®ãã¼ã¿ããã³ä½æ¥­åå®¹ããããã¯ openstreetmap.org ã«æ¥ç¶ãããã¼ã«ã«ããæ´»åãå¨ã¦éæä»çãª <a  href="http://creativecommons.org/licenses/by-sa/2.0/">ã¯ãªã¨ã¤ãã£ãã³ã¢ã³ãº è¡¨ç¤º-ç¶æ¿ (Creative Commons by-sa) ã©ã¤ã»ã³ã¹</a>ã§ä½¿ç¨è¨±è«¾ããç©ã¨è¦ãªããã¾ãã
+      no_auto_account_create: æ®å¿µãªãããèªåçã«ã¢ã«ã¦ã³ããä½ããã¨ãåºæ¥ã¾ããã
+      not displayed publicly: å¬éããã¾ãããï¼è©³ç´°ã¯ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"  title="wiki privacy policy including section on email addresses">ãã©ã¤ãã·ã¼ããªã·ã¼</a>ãå¾¡è¦§ä¸ããï¼
       password: "ãã¹ã¯ã¼ã:"
-      confirm password: "ãã¹ã¯ã¼ãã®åå¥å:"
-      signup: "ç»é²"
-      flash create success message: "ã¦ã¼ã¶ä½æã«æåãã¾ãããããã«ç·¨éãéå§ããããã«é»å­ã¡ã¼ã«ãç¢ºèªãã¦ã¢ã«ã¦ã³ããæå¹ã«ãã¦ãã ããã<br /><br />ããªãã®æå®ããã¢ãã¬ã¹ã«ç¢ºèªã¡ã¼ã«ãå±ãã¾ã§ããªãã¯ã­ã°ã¤ã³ãããã¨ã¯ã§ãã¾ããã<br /><br />ã¡ã¼ã«ããã¯ã¹ã§ã¹ãã ãã£ã«ã¿ãä½¿ã£ã¦ããã¨ãã«ã¯ webmaster@openstreetmap.org ããã®ç¢ºèªã¡ã¼ã«ãåä¿¡ã§ãããããã¯ã¤ããªã¹ããè¨­å®ãã¦ãã ããã"
-    no_such_user:
-      title: "ã¦ã¼ã¶ãå­å¨ãã¾ãã"
-      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+      signup: ç»é²
+      title: ã¢ã«ã¦ã³ãä½æ
+    no_such_user: 
       body: "{{user}}. ã¨ããååã®ã¦ã¼ã¶ã¯å­å¨ãã¾ãããã¹ãã«ãã¹ãç¡ãããã§ãã¯ãã¦ãã ããããããã¯ãªã³ã¯åãééã£ã¦ãã¾ãã"
-    view:
-      my diary: "ç§ã®æ¥è¨"
-      new diary entry: "æ°ããæ¥è¨ã¨ã³ããª"
-      my edits: "ç§ã®ç·¨é"
-      my traces: "ç§ã®ãã¬ã¼ã¹"
-      my settings: "ã¦ã¼ã¶æå ±ã®è¨­å®"
-      send message: "ã¡ãã»ã¼ã¸éä¿¡"
-      diary: "æ¥è¨"
-      edits: "ç·¨é"
-      traces: "ãã¬ã¼ã¹"
-      remove as friend: "åéããåé¤"
-      add as friend: "åéã«è¿½å "
+      heading: "{{user}} ã¨ããã¦ã¼ã¶ã¯å­å¨ãã¾ããã"
+      title: ã¦ã¼ã¶ãå­å¨ãã¾ãã
+    remove_friend: 
+      not_a_friend: "{{name}} ã¯ããªãã®åéã§ã¯ããã¾ããã"
+      success: "{{name}} ã¯ããªãã®åéããå¤ãã¾ããã"
+    reset_password: 
+      confirm password: ç¢ºèªç¨ãã¹ã¯ã¼ãï¼
+      flash changed: ããªãã®ãã¹ã¯ã¼ãã¯å¤æ´ããã¾ããã
+      flash token bad: ã­ã¼ã¯ã¼ããè¦ã¤ãããã¾ãããURLããã§ãã¯ãã¦ã¯ãããã§ããï¼
+      heading: "{{user}}ã®ãã¹ã¯ã¼ããåæå"
+      password: "ãã¹ã¯ã¼ã:"
+      reset: ãã¹ã¯ã¼ããåæå
+      title: ãã¹ã¯ã¼ãã®ãªã»ãã
+    set_home: 
+      flash success: æ´»åå°åãä¿å­ãã¾ããã
+    view: 
+      add as friend: åéã«è¿½å 
+      add image: ç»åã®è¿½å 
+      ago: ï¼{{time_in_words_ago}} åï¼
+      change your settings: è¨­å®ãå¤æ´ãã
+      delete image: ç»åã®åé¤
+      description: è©³ç´°
+      diary: æ¥è¨
+      edits: ç·¨é
+      if set location: æ´»åå°åãæå®ããã¨ããã®ä¸ã«å¨è¾ºã®å°å³ã¨ãè¿ãã§æ´»åãããããã¼ãè¡¨ç¤ºããã¾ãã{{settings_link}} ããè¨­å®ããã¦ãã ããã
+      km away: è·é¢ {{count}}km
+      m away: "{{count}}ã¡ã¼ãã«"
       mapper since: "ãããã¼æ­´:"
-      ago: "ï¼{{time_in_words_ago}} åï¼"
-      user image heading: "ã¦ã¼ã¶ã®ç»å"
-      delete image: "ç»åã®åé¤"
-      upload an image: "ç»åã®ã¢ããã­ã¼ã"
-      add image: "ç»åè¿½å "
-      description: "è©³ç´°"
-      user location: "ã¦ã¼ã¶ã®ä½ç½®"
-      no home location: "æ´»åå°åãè¨­å®ããã¦ãã¾ããã"
-      if set location: "æ´»åå°åãæå®ããã¨ããã®ä¸ã«å¨è¾ºã®å°å³ã¨ãè¿ãã§æ´»åãããããã¼ãè¡¨ç¤ºããã¾ãã{{settings_link}} ããè¨­å®ããã¦ãã ããã"
-      settings_link_text: "è¨­å®"
-      your friends: "ããªãã®åé"
-      no friends: ããªãã¯èª°ãåéã¨ãã¦ç»é²ãã¦ãã¾ããã
-      km away: "è·é¢ {{count}}km"
+      my diary: ç§ã®æ¥è¨
+      my edits: ç§ã®ç·¨é
+      my settings: ã¦ã¼ã¶æå ±ã®è¨­å®
+      my traces: ç§ã®ãã¬ã¼ã¹
+      my_oauth_details: èªåã® OAuth ã®è©³ç´°ãè¡¨ç¤º
       nearby users: "å¨è¾ºã®ã¦ã¼ã¶:"
-      no nearby users: "ããªãã®æ´»åå°åå¨è¾ºã«ãããã¼ã¯ããªãããã§ãã"
-      change your settings: "è¨­å®ãå¤æ´ãã"
-    friend_map:
-      your location: "ããªãã®ä½ç½®"
-      nearby mapper: "å¨è¾ºã®ãããã¼: [[nearby_user]]"
-    account:
-      title: "ã¢ã«ã¦ã³ããç·¨é"
-      my settings: "ç§ã®è¨­å®"
-      email never displayed publicly: "ï¼å¬éãã¾ããï¼"
-      public editing:
-        heading: "å¬éç·¨é:"
-        enabled: "Enabled. å¿åã§ã¯ãªããç·¨éå¯è½ã§ãã"
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "ããã¯ä½ã§ããï¼"
-        disabled: "Disabled ç·¨éã§ãã¾ãããããã¾ã§ã®ç·¨éã¯å¨ã¦å¿åã®ç©ã¨ãã¦æ±ããã¾ãã"
-        disabled link text: "ãªãç·¨éã§ããªãã®ã§ããï¼"
-      profile description: "ã¦ã¼ã¶æå ±ã®è©³ç´°:"
-      preferred languages: "è¨èªè¨­å®:"
-      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: "ã¦ã¼ã¶ã¢ã«ã¦ã³ãã®ç¢ºèª"
-      press confirm button: "ã¢ã«ã¦ã³ããæå¹ã«ãã¦è¯ããã°ãä»¥ä¸ã®ç¢ºèªãã¿ã³ãæ¼ãã¦ãã ããã"
-      button: "ç¢ºèª"
-      success: "ããªãã®ã¢ã«ã¦ã³ããç¢ºèªãã¾ãããç»é²ãããã¨ããããã¾ãï¼"
-      failure: "ãã®ã­ã¼ã¯ã¼ãã«ãã£ã¦ãã¦ã¼ã¶ã¢ã«ã¦ã³ãã¯ãã§ã«ç¢ºèªããã¦ãã¾ãã"
-    confirm_email:
-      heading: "é»å­ã¡ã¼ã«ã¢ãã¬ã¹å¤æ´ã®ç¢ºèª"
-      press confirm button: "æ°ããã¡ã¼ã«ã¢ãã¬ã¹ãç¢ºèªããããã«ç¢ºèªãã¿ã³ãæ¼ãã¦ä¸ããã"
-      button: "ç¢ºèª"
-      success: "ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ãç¢ºèªã§ãã¾ãããç»é²ãããã¨ããããã¾ãã"
-      failure: "ãã®ã¡ã¼ã«ã¢ãã¬ã¹ç¢ºèªãã¼ã¯ã³ã¯æ¢ã«ç¢ºèªãæ¸ãã§ãã¾ãã"
-    set_home:
-      flash success: "æ´»åå°åãä¿å­ãã¾ããã"
-    go_public:
-      flash success: "ããªãã®å¨ã¦ã®ç·¨éã¯å¬éããã¾ããä»ããç·¨éã§ãã¾ãã"
-    make_friend:
-      success: "{{name}} ã¯ããªãã®åéã«ãªãã¾ããã"
-      failed: "{{name}} ãåéã¨ç»é²ã§ãã¾ããã§ããã"
-      already_a_friend: "ããªãã¯ {{name}}.ã¨æ¢ã«åéã§ãã"
-    remove_friend:
-      success: "{{name}} ã¯ããªãã®åéããå¤ãã¾ããã"
-      not_a_friend: "{{name}} ã¯ããªãã®åéã§ã¯ããã¾ããã"
+      new diary entry: æ°ããæ¥è¨ã¨ã³ããª
+      no friends: ããªãã¯èª°ãåéã¨ãã¦ç»é²ãã¦ãã¾ããã
+      no home location: æ´»åå°åãè¨­å®ããã¦ãã¾ããã
+      no nearby users: ããªãã®æ´»åå°åå¨è¾ºã«ãããã¼ã¯ããªãããã§ãã
+      remove as friend: åéããåé¤
+      send message: ã¡ãã»ã¼ã¸éä¿¡
+      settings_link_text: è¨­å®
+      traces: ãã¬ã¼ã¹
+      upload an image: ç»åã®ã¢ããã­ã¼ã
+      user image heading: ã¦ã¼ã¶ã®ç»å
+      user location: ã¦ã¼ã¶ã®ä½ç½®
+      your friends: ããªãã®åé
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 572cba8e1..fcde6b0bf 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,749 +1,696 @@
-ko:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "ì ê·¼ ì¡°ì  ëª©ë¡"
-      changeset: "ë³ê²½ì¸í¸"
-      changeset_tag: "ë³ê²½ì¸í¸ íê·¸"
-      country: "êµ­ê°"
-      diary_comment: "ì¼ì§ ëê¸"
-      diary_entry: "ì¼ì§ í­ëª©"
-      friend: "ì¹êµ¬"
-      language: "ì¸ì´"
-      message: "ìª½ì§"
-      node: "ë¸ë"
-      node_tag: "ë¸ë íê·¸"
-      notifier: "ìë¦¼ì"
-      old_node: "ì ë¸ë"
-      old_node_tag: "ì ë¸ë íê·¸"
-      old_relation: "ì ê´ê³"
-      old_relation_member: "ì ê´ê³ ë©¤ë²"
-      old_relation_tag: "ì ê´ê³ íê·¸"
-      old_way: "Old Way"
-      old_way_node: "Old Way Node"
-      old_way_tag: "Old Way Tag"
-      relation: "ê´ê³"
-      relation_member: "ê´ê³ ë©¤ë²"
-      relation_tag: "ê´ê³ íê·¸"
-      session: "ì¸ì"
-      trace: "ë°ìì·¨"
-      tracepoint: "ë°ìì·¨ ì§ì "
-      tracetag: "ë°ìì·¨ íê·¸"
-      user: "ì¬ì©ì"
-      user_preference: "ì¬ì©ì íê²½"
-      user_token: "ì¬ì©ì í í°"
-      way: "ê¸¸"
-      way_node: "ê¸¸ë¸ë"
-      way_tag: "ê¸¸íê·¸"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "ë´ì©"
-      diary_entry:
-        user: "ì¬ì©ì"
-        title: "ì ëª©"
-        latitude: "ìë"
-        longitude: "ê²½ë"
-        language: "ì¸ì´"
-      friend:
-        user: "ì¬ì©ì"
-        friend: "ì¹êµ¬"
-      trace:
-        user: "ì¬ì©ì"
-        visible: "ì¼ë ê°ë¥"
-        name: "ì´ë¦"
-        size: "í¬ê¸°"
-        latitude: "ìë"
-        longitude: "ê²½ë"
-        public: "ê³µê°"
-        description: "ì¤ëª"
-      message:
-        sender: "ë³´ë¸ ì¬ë"
-        title: "ì ëª©"
-        body: "ë´ì©"
-        recipient: "ë°ë ì¬ë"
-      user:
-        email: "ì ì ì°í¸"
-        active: "íì±"
-        display_name: "íì ì´ë¦"
-        description: "ì¤ëª"
-        languages: "ì¸ì´"
-        pass_crypt: "ìí¸"
-  map:
-    view: ë³´ê¸°
-    edit: í¸ì§
-    coordinates: "ì¢í:"
-  browse:
-    changeset:
-      title: "ë³ê²½ì"
+ko: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: ë´ì©
+      diary_entry: 
+        language: ì¸ì´
+        latitude: ìë
+        longitude: ê²½ë
+        title: ì ëª©
+        user: ì¬ì©ì
+      friend: 
+        friend: ì¹êµ¬
+        user: ì¬ì©ì
+      message: 
+        body: ë´ì©
+        recipient: ë°ë ì¬ë
+        sender: ë³´ë¸ ì¬ë
+        title: ì ëª©
+      trace: 
+        description: ì¤ëª
+        latitude: ìë
+        longitude: ê²½ë
+        name: ì´ë¦
+        public: ê³µê°
+        size: í¬ê¸°
+        user: ì¬ì©ì
+        visible: ì¼ë ê°ë¥
+      user: 
+        active: íì±
+        description: ì¤ëª
+        display_name: íì ì´ë¦
+        email: ì ì ì°í¸
+        languages: ì¸ì´
+        pass_crypt: ìí¸
+    models: 
+      acl: ì ê·¼ ì¡°ì  ëª©ë¡
+      changeset: ë³ê²½ì¸í¸
+      changeset_tag: ë³ê²½ì¸í¸ íê·¸
+      country: êµ­ê°
+      diary_comment: ì¼ì§ ëê¸
+      diary_entry: ì¼ì§ í­ëª©
+      friend: ì¹êµ¬
+      language: ì¸ì´
+      message: ìª½ì§
+      node: ë¸ë
+      node_tag: ë¸ë íê·¸
+      notifier: ìë¦¼ì
+      old_node: ì ë¸ë
+      old_node_tag: ì ë¸ë íê·¸
+      old_relation: ì ê´ê³
+      old_relation_member: ì ê´ê³ ë©¤ë²
+      old_relation_tag: ì ê´ê³ íê·¸
+      old_way: Old Way
+      old_way_node: Old Way Node
+      old_way_tag: Old Way Tag
+      relation: ê´ê³
+      relation_member: ê´ê³ ë©¤ë²
+      relation_tag: ê´ê³ íê·¸
+      session: ì¸ì
+      trace: ë°ìì·¨
+      tracepoint: ë°ìì·¨ ì§ì 
+      tracetag: ë°ìì·¨ íê·¸
+      user: ì¬ì©ì
+      user_preference: ì¬ì©ì íê²½
+      user_token: ì¬ì©ì í í°
+      way: ê¸¸
+      way_node: ê¸¸ë¸ë
+      way_tag: ê¸¸íê·¸
+  browse: 
+    changeset: 
       changeset: "ë³ê²½ì: {{id}}"
-      download: "ë´ë ¤ë°ê¸° {{changeset_xml_link}} í¹ì {{osmchange_xml_link}}"
-      changesetxml: "ë³ê²½ì XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "ìì±ì¼:"
-      closed_at: "ì¢ë£ì¼:"
+      changesetxml: ë³ê²½ì XML
+      download: ë´ë ¤ë°ê¸° {{changeset_xml_link}} í¹ì {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: ë³ê²½ì
+    changeset_details: 
       belongs_to: "ìì:"
       bounding_box: "ê²½ê³:"
-      no_bounding_box: "ì´ ë³ê²½ìì ìí´ ì ì¥ë ê²½ê³ê° ììµëë¤."
-      show_area_box: "ìì­ íì"
-      box: "box"
+      box: box
+      closed_at: "ì¢ë£ì¼:"
+      created_at: "ìì±ì¼:"
       has_nodes: "ë(ì) ë¤ì {{count}} ê°ì ë¸ëë¥¼ ê°ì§ê³  ììµëë¤:"
-      has_ways: "ë(ì) ë¤ì {{count}} ê°ì ê¸¸ì ê°ì§ê³  ììµëë¤:"
       has_relations: "ë(ì) ë¤ì {{count}} ê°ì ê´ê³ë¥¼ ê°ì§ê³  ììµëë¤:"
+      has_ways: "ë(ì) ë¤ì {{count}} ê°ì ê¸¸ì ê°ì§ê³  ììµëë¤:"
+      no_bounding_box: ì´ ë³ê²½ìì ìí´ ì ì¥ë ê²½ê³ê° ììµëë¤.
+      show_area_box: ìì­ íì
     common_details: 
       edited_at: "í¸ì§ì¼:"
       edited_by: "í¸ì§ì:"
-      version: "ë²ì ¼:"
       in_changeset: "In changeset:"
-    containing_relation:
-      entry: "ê´ê³ {{relation_name}}"
-      entry_role: "ê´ê³ {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "ë¶ë¬ ì¤ë ì¤..."
-      deleted: "ì­ì ë¨"
-    node_details:
+      version: "ë²ì ¼:"
+    containing_relation: 
+      entry: ê´ê³ {{relation_name}}
+      entry_role: ê´ê³ {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: ì­ì ë¨
+      loading: ë¶ë¬ ì¤ë ì¤...
+    node: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: XML ë´ë ¤ë°ê¸°
+      node: ë¸ë
+      node_title: "ë¸ë: {{node_name}}"
+      view_history: ì´ë ¥ ë³´ê¸°
+    node_details: 
       coordinates: "ì¢í:"
       part_of: "Part of:"
-    node_history:
-      node_history: "ë¸ë ì´ë ¥"
+    node_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "XML ë´ë ¤ë°ê¸°"
-      view_details: "ì¸ë¶ ì¬í­ íì"
-    node:
-      node: "ë¸ë"
-      node_title: "ë¸ë: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "XML ë´ë ¤ë°ê¸°"
-      view_history: "ì´ë ¥ ë³´ê¸°"
-    not_found:
-      sorry: "ì£ì¡í©ëë¤. {{id}}ì¸ {{type}}ë¥¼ ë°ê²¬íì§ ëª» íìµëë¤."
-      type:
+      download_xml: XML ë´ë ¤ë°ê¸°
+      node_history: ë¸ë ì´ë ¥
+      view_details: ì¸ë¶ ì¬í­ íì
+    not_found: 
+      sorry: ì£ì¡í©ëë¤. {{id}}ì¸ {{type}}ë¥¼ ë°ê²¬íì§ ëª» íìµëë¤.
+      type: 
         node: ë¸ë
-        way: ê¸¸
         relation: ê´ê³
-    paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    relation_details:
+        way: ê¸¸
+    paging_nav: 
+      of: of
+      showing_page: Showing page
+    relation: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: XML ë´ë ¤ë°ê¸°
+      relation: ê´ê³
+      relation_title: "ê´ê³: {{relation_name}}"
+      view_history: ì´ë ¥ ë³´ê¸°
+    relation_details: 
       members: "Members:"
       part_of: "Part of:"
-    relation_history:
-      relation_history: "ê´ê³ ì´ë ¥"
+    relation_history: 
+      relation_history: ê´ê³ ì´ë ¥
       relation_history_title: "ê´ê³ ì´ë ¥: {{relation_name}}"
-    relation:
-      relation: "ê´ê³"
-      relation_title: "ê´ê³: {{relation_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "XML ë´ë ¤ë°ê¸°"
-      view_history: "ì´ë ¥ ë³´ê¸°"
-    start:
-      view_data: "íì¬ ì§ë íê¸°ë¡ ì ë³´ ë³´ê¸°"
-      manually_select: "ë¤ë¥¸ ì§ì­ ìë ì í"
-    start_rjs:
-      data_layer_name: "Data"
-      data_frame_title: "Data"
-      zoom_or_select: "íë ëë ë³´ê³  ì¶ì ì§ëì ì§ì­ì ì ííì¸ì"
-      drag_a_box: "ì§ì­ì ë³´ê¸° ìí´ ì§ëë¡ ëì´ ëì¼ì¸ì."
-      manually_select: "ë¤ë¥¸ ì§ì­ ì í"
-      loaded_an_area_with_num_features: "ë¹ì ì [[num_features]] ê°ì í¹ì±ì ê°ì§ ì§ì­ì ë¡ëíììµëë¤. ê²½ì°ì ë°ë¼, ì´ë¤ ë¸ë¼ì°ì ììë ì´ ë°ì´í°ë¥¼ ëª¨ë ì²ë¦¬íì§ ëª» í  ìë ììµëë¤. ì¼ë°ì ì¼ë¡, ë¸ë¼ì°ì ë¤ì ëê² 100ê° ì´íì í¹ì±ì ì²ë¦¬íì¬ ë³´ì¬ì¤ ì ììµëë¤. ê·¸ë ì§ ìì ê²½ì°, ë¸ë¼ì°ì ì ìëê° ì íëê±°ë ë¸ë¼ì°ì ì ë°ìì´ ëë ¤ì§ ì ììµëë¤. ì¬ì í ì´ ë°ì´í°ë¥¼ íìíë ¤ë©´, ìëì ë²í¼ì í´ë¦­íì¬ ì£¼ì­ìì¤."
-      load_data: "ì ë³´ ë¶ë¬ ì¤ê¸°"
-      unable_to_load_size: "ë¶ë¬ ì¤ê¸° ì¤í¨: íìíë ¤ë ì§ì­([[bbox_size]])ì ì¤ì  ë°ì¤ê° ëë¬´ í½ëë¤. {{max_bbox_size}}ê¹ì§ íìí  ì ììµëë¤."
-      loading: "ë¶ë¬ ì¤ë ì¤..."
-      show_history: "ì´ë ¥ ë³´ê¸°"
-      wait: "ì ìë§ ê¸°ë¤ë ¤ ì£¼ì¸ì..."
-      history_for_feature: "[[feature]]ì ì´ë ¥"
-      details: "ì¸ë¶ ì¬í­"
-      private_user: "ê°ì¸ ì ì "
+    start: 
+      manually_select: ë¤ë¥¸ ì§ì­ ìë ì í
+      view_data: íì¬ ì§ë íê¸°ë¡ ì ë³´ ë³´ê¸°
+    start_rjs: 
+      data_frame_title: Data
+      data_layer_name: Data
+      details: ì¸ë¶ ì¬í­
+      drag_a_box: ì§ì­ì ë³´ê¸° ìí´ ì§ëë¡ ëì´ ëì¼ì¸ì.
       edited_by_user_at_timestamp: "[[timestamp]]ì [[user]]ê° ìì "
-      object_list:
-        heading: "ê°ì²´ ëª©ë¡"
-        back: "ê°ì²´ ëª©ë¡ íì"
-        type:
-          node: "ë¸ë"
-          way: "ê¸¸"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "APIë¡ë¶í° ì´ ì§ì­ íì"
-        details: "ì¸ë¶ ì¬í­"
-        selected:
-          type:
-            node: "ë¸ë [[id]]"
-            way: "ê¸¸ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "ë¸ë [[id]]"
-            way: "ê¸¸ [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      history_for_feature: "[[feature]]ì ì´ë ¥"
+      load_data: ì ë³´ ë¶ë¬ ì¤ê¸°
+      loaded_an_area_with_num_features: ë¹ì ì [[num_features]] ê°ì í¹ì±ì ê°ì§ ì§ì­ì ë¡ëíììµëë¤. ê²½ì°ì ë°ë¼, ì´ë¤ ë¸ë¼ì°ì ììë ì´ ë°ì´í°ë¥¼ ëª¨ë ì²ë¦¬íì§ ëª» í  ìë ììµëë¤. ì¼ë°ì ì¼ë¡, ë¸ë¼ì°ì ë¤ì ëê² 100ê° ì´íì í¹ì±ì ì²ë¦¬íì¬ ë³´ì¬ì¤ ì ììµëë¤. ê·¸ë ì§ ìì ê²½ì°, ë¸ë¼ì°ì ì ìëê° ì íëê±°ë ë¸ë¼ì°ì ì ë°ìì´ ëë ¤ì§ ì ììµëë¤. ì¬ì í ì´ ë°ì´í°ë¥¼ íìíë ¤ë©´, ìëì ë²í¼ì í´ë¦­íì¬ ì£¼ì­ìì¤.
+      loading: ë¶ë¬ ì¤ë ì¤...
+      manually_select: ë¤ë¥¸ ì§ì­ ì í
+      object_list: 
+        api: APIë¡ë¶í° ì´ ì§ì­ íì
+        back: ê°ì²´ ëª©ë¡ íì
+        details: ì¸ë¶ ì¬í­
+        heading: ê°ì²´ ëª©ë¡
+        history: 
+          type: 
+            node: ë¸ë [[id]]
+            way: ê¸¸ [[id]]
+        selected: 
+          type: 
+            node: ë¸ë [[id]]
+            way: ê¸¸ [[id]]
+        type: 
+          node: ë¸ë
+          way: ê¸¸
+      private_user: ê°ì¸ ì ì 
+      show_history: ì´ë ¥ ë³´ê¸°
+      unable_to_load_size: "ë¶ë¬ ì¤ê¸° ì¤í¨: íìíë ¤ë ì§ì­([[bbox_size]])ì ì¤ì  ë°ì¤ê° ëë¬´ í½ëë¤. {{max_bbox_size}}ê¹ì§ íìí  ì ììµëë¤."
+      wait: ì ìë§ ê¸°ë¤ë ¤ ì£¼ì¸ì...
+      zoom_or_select: íë ëë ë³´ê³  ì¶ì ì§ëì ì§ì­ì ì ííì¸ì
+    tag_details: 
       tags: "íê·¸ë¤:"
-    way_details:
-      nodes: "ë¸ë:"
-      part_of: "í¬í¨ëë ê¸¸:"
-      also_part_of:
+    way: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: XML ë´ë ¤ë°ê¸°
+      view_history: ì´ë ¥ ë³´ê¸°
+      way: ê¸¸
+      way_title: "ê¸¸ì´ë ¥: {{way_name}}"
+    way_details: 
+      also_part_of: 
         one: "{{related_ways}}ì ì¼ë¶"
         other: "{{related_ways}}ì ì¼ë¶"
-    way_history:
-      way_history: "ê¸¸ ì´ë ¥"
-      way_history_title: "ê¸¸ ì´ë ¥: {{way_name}}"
+      nodes: "ë¸ë:"
+      part_of: "í¬í¨ëë ê¸¸:"
+    way_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "XML ë´ë ¤ë°ê¸°"
-      view_details: "ì¸ë¶ ì¬í­ íì"
-    way:
-      way: "ê¸¸"
-      way_title: "ê¸¸ì´ë ¥: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "XML ë´ë ¤ë°ê¸°"
-      view_history: "ì´ë ¥ ë³´ê¸°"
-  changeset:
+      download_xml: XML ë´ë ¤ë°ê¸°
+      view_details: ì¸ë¶ ì¬í­ íì
+      way_history: ê¸¸ ì´ë ¥
+      way_history_title: "ê¸¸ ì´ë ¥: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: ìµëª
+      big_area: (í° ì§ì­)
+      no_comment: (ìì)
+      no_edits: (ìì  ìì)
+      show_area_box: ì§ì­ ë°ì¤ ë³´ê¸°
+      still_editing: (íì¬ ìì  ì¤)
+      view_changeset_details: ë³ê²½ì ì¸ë¶ ì¬í­ ë³´ê¸°
     changeset_paging_nav: 
-      showing_page: "Showing page"
-      of: "of"
-    changeset:
-      still_editing: "(íì¬ ìì  ì¤)"
-      anonymous: "ìµëª"
-      no_comment: "(ìì)"
-      no_edits: "(ìì  ìì)"
-      show_area_box: "ì§ì­ ë°ì¤ ë³´ê¸°"
-      big_area: "(í° ì§ì­)"
-      view_changeset_details: "ë³ê²½ì ì¸ë¶ ì¬í­ ë³´ê¸°"
-    changesets:
-      id: "ID"
-      saved_at: "ì ì¥ ìê°"
-      user: "ì¬ì©ì"
-      comment: "ì¤ëª"
-      area: "ì§ì­"
-    list_bbox:
-      history: "ì´ë ¥"
-      changesets_within_the_area: "ì´ ì§ì­ ë´ì ë³ê²½ì:"
-      show_area_box: "ì§ì­ ë°ì¤ ë³´ê¸°"
-      no_changesets: "ë³ê²½ì ìì"
-      all_changes_everywhere: "ì ì²´ ì§ì­ì ëª¨ë  ë³ê²½ì {{recent_changes_link}}ë¥¼ ë³´ì¸ì"
-      recent_changes: "ìµê·¼ ë³ê²½ ì¬í­"
-      no_area_specified: "ì§ì­ ì¤ì  ì ë¨"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "ì§ë ë³´ê¸°"
-      view_tab: "í­ ë³´ê¸°"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
-    list:
-      recent_changes: "ìµê·¼ ë³ê²½ ì¬í­"
-      recently_edited_changesets: "ìµê·¼ ìì ë ë³ê²½ì:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "ìµê·¼ ë³ê²½ ì¬í­"
-  diary_entry:
-    new:
-      title: ì ì¼ì§ í­ëª©
-    list:
-      title: "ì¬ì©ì ì¼ì§"
-      user_title: "{{user}} ì¼ì§"
-      in_language_title: "{{language}} ì¼ì§ í­ëª©"
-      new: ì ì¼ì§ í­ëª©
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries:"
-      older_entries: ì´ì  í­ëª©ë¤
-      newer_entries: ë¤ì í­ëª©ë¤
-    edit:
-      title: "ì¼ì§ í­ëª© ìì "
-      subject: "ì ëª©:"
+      of: of
+      showing_page: Showing page
+    changesets: 
+      area: ì§ì­
+      comment: ì¤ëª
+      id: ID
+      saved_at: ì ì¥ ìê°
+      user: ì¬ì©ì
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: ëê¸ í ê°
+        other: ëê¸ {{count}} ê°
+      comment_link: ì´ í­ëª©ì ëê¸ ë¨ê¸°ê¸°
+      edit_link: ì´ í­ëª© ìì 
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: ì´ í­ëª©ì ëµë³íê¸°
+    edit: 
       body: "ë´ì©:"
       language: "ì¸ì´:"
-      location: "ìì¹:"
       latitude: "ìë:"
+      location: "ìì¹:"
       longitude: "ê²½ë:"
-      use_map_link: "ì§ë ì¬ì©"
-      save_button: "ì ì¥"
       marker_text: ì¼ì§ í­ëª© ìì¹
-    view:
-      title: "ì¬ì©ì ì¼ì§ | {{user}}"
+      save_button: ì ì¥
+      subject: "ì ëª©:"
+      title: ì¼ì§ í­ëª© ìì 
+      use_map_link: ì§ë ì¬ì©
+    list: 
+      in_language_title: "{{language}} ì¼ì§ í­ëª©"
+      new: ì ì¼ì§ í­ëª©
+      new_title: Compose a new entry in your user diary
+      newer_entries: ë¤ì í­ëª©ë¤
+      no_entries: No diary entries
+      older_entries: ì´ì  í­ëª©ë¤
+      recent_entries: "Recent diary entries:"
+      title: ì¬ì©ì ì¼ì§
       user_title: "{{user}} ì¼ì§"
-      leave_a_comment: "ëë¤ ë¨ê¸°ê¸°"
-      login_to_leave_a_comment: "ëê¸ì ë¨ê¸°ë ¤ë©´ ë¡ê·¸ì¸í´ì¼ í©ëë¤. {{login_link}}"
-      login: "ë¡ê·¸ì¸"
-      save_button: "ì ì¥"
-    no_such_entry:
+    new: 
+      title: ì ì¼ì§ í­ëª©
+    no_such_entry: 
+      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: ì´ í­ëª©ì ëê¸ ë¨ê¸°ê¸°
-      reply_link: ì´ í­ëª©ì ëµë³íê¸°
-      comment_count:
-        one: ëê¸ í ê°
-        other: "ëê¸ {{count}} ê°"
-      edit_link: ì´ í­ëª© ìì 
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "ì§ì­ ì¶ì¶"
-      manually_select: "ë¤ë¥¸ ì§ì­ ì í"
-      format_to_export: "ì¶ì¶ í¬ë§·"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "Embeddable HTML"
-      licence: "ë¼ì´ì¼ì¤"
-      export_details: 'OpenStreetMapì ì ë³´ë <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license ì ìê±°í©ëë¤.</a>.'
-      options: "ì íì¬í­"
-      format: "í¬ë§·"
-      scale: "ì¶ì²"
-      max: "ìµë"
-      image_size: "ì´ë¯¸ì§ í¬ê¸°"
-      zoom: "ì¤"
-      add_marker: "Add a marker to the map"
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    view: 
+      leave_a_comment: ëë¤ ë¨ê¸°ê¸°
+      login: ë¡ê·¸ì¸
+      login_to_leave_a_comment: ëê¸ì ë¨ê¸°ë ¤ë©´ ë¡ê·¸ì¸í´ì¼ í©ëë¤. {{login_link}}
+      save_button: ì ì¥
+      title: ì¬ì©ì ì¼ì§ | {{user}}
+      user_title: "{{user}} ì¼ì§"
+  export: 
+    start: 
+      add_marker: Add a marker to the map
+      area_to_export: ì§ì­ ì¶ì¶
+      embeddable_html: Embeddable HTML
+      export_button: ì¶ì¶
+      export_details: OpenStreetMapì ì ë³´ë <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license ì ìê±°í©ëë¤.</a>.
+      format: í¬ë§·
+      format_to_export: ì¶ì¶ í¬ë§·
+      image_size: ì´ë¯¸ì§ í¬ê¸°
       latitude: "ìë:"
+      licence: ë¼ì´ì¼ì¤
       longitude: "ê²½ë:"
-      output: "ì¶ë ¥"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "ì¶ì¶"
-    start_rjs:
-      export: "ì¶ì¶"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "ë¤ë¥¸ ì§ì­ ì í"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "í° ì§ë ë³´ê¸°"
-  geocoder:
-    results:
-      no_results: "No results found"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap logo
-    welcome_user: "{{user_link}}ë íìí©ëë¤."
-    welcome_user_link_tooltip: Your user page
+      manually_select: ë¤ë¥¸ ì§ì­ ì í
+      mapnik_image: Mapnik Image
+      max: ìµë
+      options: ì íì¬í­
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Osmarender Image
+      output: ì¶ë ¥
+      paste_html: Paste HTML to embed in website
+      scale: ì¶ì²
+      zoom: ì¤
+    start_rjs: 
+      add_marker: Add a marker to the map
+      change_marker: Change marker position
+      click_add_marker: Click on the map to add a marker
+      drag_a_box: Drag a box on the map to select an area
+      export: ì¶ì¶
+      manually_select: ë¤ë¥¸ ì§ì­ ì í
+      view_larger_map: í° ì§ë ë³´ê¸°
+  geocoder: 
+    results: 
+      no_results: No results found
+  layouts: 
+    alt_donation: ê¸°ë¶íê¸°
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
+    donate_link_text: ê¸°ë¶
+    edit: í¸ì§
+    edit_tooltip: ì§ë í¸ì§
+    export: ì¶ì¶
+    export_tooltip: ë§µ ì ë³´ ì¶ì¶
+    gps_traces: GPS ì¶ì 
+    gps_traces_tooltip: ì¶ì  ì¤ì 
+    help_wiki: ëìë§ &amp; ìí¤
+    help_wiki_tooltip: íë¡ì í¸ ëìë§ &amp; ìí¤
+    history: ì´ë ¥
+    history_tooltip: ë³ê²½ì ì´ë ¥
     home: home
     home_tooltip: Go to home location
-    inbox: "ë°ì ìª½ì§í¨ ({{count}})"
-    inbox_tooltip:
-      zero: ì½ì§ ìì ìª½ì§ê° ììµëë¤
+    inbox: ë°ì ìª½ì§í¨ ({{count}})
+    inbox_tooltip: 
       one: í ê°ì ì½ì§ ìì ìª½ì§ê° ììµëë¤.
       other: "{{count}} ê°ì ì½ì§ ìì ìª½ì§ê° ììµëë¤."
-    logout: ë¡ê·¸ ìì
-    logout_tooltip: "ë¡ê·¸ ìì"
+      zero: ì½ì§ ìì ìª½ì§ê° ììµëë¤
+    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
+    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
+    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: ë¡ê·¸ì¸
     log_in_tooltip: ê¸°ì¡´ ê³ì ì¼ë¡ ë¡ê·¸ì¸
+    logo: 
+      alt_text: OpenStreetMap logo
+    logout: ë¡ê·¸ ìì
+    logout_tooltip: ë¡ê·¸ ìì
+    news_blog: ììì¤ ë¸ë¡ê·¸
+    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
+    osm_offline: ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì¤íë¼ì¸ìëë¤.
+    osm_read_only: ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì½ê¸° ì ì©ìëë¤.
+    shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap
     sign_up: ê°ìíê¸°
     sign_up_tooltip: ìì ê°ë¥í ê³ì¢ ì ê· ë±ë¡
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: The Free Wiki World Map
+    user_diaries: ì¬ì©ì ì¼ì§
+    user_diaries_tooltip: ì¬ì©ì ì¼ì§ ë³´ê¸°
     view: ë³´ê¸°
     view_tooltip: ì§ë ë³´ê¸°
+    welcome_user: "{{user_link}}ë íìí©ëë¤."
+    welcome_user_link_tooltip: Your user page
+  map: 
+    coordinates: "ì¢í:"
     edit: í¸ì§
-    edit_tooltip: ì§ë í¸ì§
-    history: ì´ë ¥
-    history_tooltip: ë³ê²½ì ì´ë ¥
-    export: ì¶ì¶
-    export_tooltip: ë§µ ì ë³´ ì¶ì¶
-    gps_traces: GPS ì¶ì 
-    gps_traces_tooltip: ì¶ì  ì¤ì 
-    user_diaries: ì¬ì©ì ì¼ì§
-    user_diaries_tooltip: ì¬ì©ì ì¼ì§ ë³´ê¸°
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì¤íë¼ì¸ìëë¤."
-    osm_read_only: "ë°ì´í°ë² ì´ì¤ ì ê²ì ìí´ OpenStreetMap ì ë°ì´í°ê° íì¬ ì½ê¸° ì ì©ìëë¤."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: ê¸°ë¶
-    help_wiki: "ëìë§ &amp; ìí¤"
-    help_wiki_tooltip: "íë¡ì í¸ ëìë§ &amp; ìí¤"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "ììì¤ ë¸ë¡ê·¸"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap 
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: ê¸°ë¶íê¸°
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¼ì§ í­ëª©ì ëê¸ì ë¨ê²¼ìµëë¤."
+    view: ë³´ê¸°
+  message: 
+    inbox: 
+      date: ë ì§
+      from: From
+      my_inbox: ë´ ìª½ì§í¨
+      no_messages_yet: ë°ì ìª½ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì.
+      outbox: ë³´ë¸ ìª½ì§í¨
+      people_mapping_nearby: ê·¼ì²ë¥¼ ì§ë ìë ¥í ì¬ëë¤
+      subject: ì ëª©
+      title: ë°ì ìª½ì§í¨
+      you_have: "{{new_count}} ê°ì ì ìª½ì§ì {{old_count}} ê°ì ì½ì ìª½ì§ê° ììµëë¤."
+    mark: 
+      as_read: Message marked as read
+      as_unread: Message marked as unread
+    message_summary: 
+      read_button: ì½ìì¼ë¡ íì
+      reply_button: ëµì¥
+      unread_button: ì½ì§ ììì¼ë¡ íì
+    new: 
+      back_to_inbox: ìª½ì§í¨ì¼ë¡ ëìê°ê¸°
+      body: ë´ì©
+      message_sent: ìª½ì§ê° ì ì¡ëììµëë¤.
+      send_button: ë³´ë´ê¸°
+      send_message_to: "{{name}}ìê² ì ìª½ì§ ë³´ë´ê¸°"
+      subject: ì ëª©
+      title: ì ìª½ì§
+    no_such_user: 
+      body: ì£ì¡í©ëë¤. ê·¸ë° ìì´ë ëë ì´ë¦ì ì¬ì©ìê° ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤.
+      heading: ì¬ì©ì ëë ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤
+      title: ì¬ì©ì ëë ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤
+    outbox: 
+      date: ë ì§
+      inbox: ë°ì í¸ì§í¨
+      my_inbox: My {{inbox_link}}
+      no_sent_messages: ë°ì ìª½ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì.
+      outbox: ë³´ë¸ í¸ì§í¨
+      people_mapping_nearby: ê·¼ì²ë¥¼ ì§ë ìë ¥í ì¬ëë¤
+      subject: ì ëª©
+      title: ë³´ë¸ ìª½ì§í¨
+      to: To
+      you_have_sent_messages: "{{sent_count}} ê°ì ìª½ì§ë¥¼ ë³´ëìµëë¤."
+    read: 
+      back_to_inbox: Back to inbox
+      back_to_outbox: Back to outbox
+      date: Date
+      from: From
+      reading_your_messages: Reading your messages
+      reading_your_sent_messages: Reading your sent messages
+      reply_button: Reply
+      subject: Subject
+      title: Read message
+      to: To
+      unread_button: Mark as unread
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                         ì´ emailì ëµì¥íì§ ë§ì¸ì.                          *"
       banner2: "*            ëµì¥ì ìí´ìë OpenStreetMap ì¹ì¬ì´í¸ë¥¼ ì´ì©í´ ì£¼ì¸ì.             *"
-      hi: "{{to_user}}ë ìëíì¸ì."
-      header: "{{from_user}} ëì´ {{subject}} ì ëª©ì OpenStreetMap ì¼ì§ í­ëª©ì ëê¸ì ë¨ê²¼ìµëë¤.:"
       footer: "{{readurl}}ììë ëê¸ì íì¸í  ì ììµëë¤. {{commenturl}}ìì ëê¸ì ë¨ê¸°ê±°ë {{replyurl}}ìì ëµê¸ì ë¨ê¸¸ ì ììµëë¤."
-    message_notification:
-      subject: "[OpenStreetMap] {{user}}ì´ ì ìª½ì§ë¥¼ ë³´ëìµëë¤."
-      banner1: "*                         ì´ emailì ëµì¥íì§ ë§ì¸ì.                          *"
-      banner2: "*            ëµì¥ì ìí´ìë OpenStreetMap ì¹ì¬ì´í¸ë¥¼ ì´ì©í´ ì£¼ì¸ì.             *"
+      header: "{{from_user}} ëì´ {{subject}} ì ëª©ì OpenStreetMap ì¼ì§ í­ëª©ì ëê¸ì ë¨ê²¼ìµëë¤.:"
       hi: "{{to_user}}ë ìëíì¸ì."
-      header: "{{from_user}} ëì´ OpenStreetMapì íµí´ {{subject}} ìª½ì§ë¥¼ ë³´ëìµëë¤."
-      footer1: "{{readurl}} ììë ìª½ì§ë¥¼ íì¸í  ì ììµëë¤."
-      footer2: "{{replyurl}} ìì ëµì¥íì¤ ì ììµëë¤."
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¹êµ¬ë¡ ì¶ê°íììµëë¤."
+      subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¼ì§ í­ëª©ì ëê¸ì ë¨ê²¼ìµëë¤."
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_html: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} ëì´ ë¹ì ì OpenStreetMap ì¹êµ¬ë¡ ì¶ê°íììµëë¤."
       see_their_profile: "{{userurl}} ìì íë¡íì íì¸íê³  ìíë©´ ì¹êµ¬ë¡ ë±ë¡í  ì ììµëë¤."
-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
+      subject: "[OpenStreetMap] {{user}} ëì´ ë¹ì ì ì¹êµ¬ë¡ ì¶ê°íììµëë¤."
+    gpx_notification: 
+      and_no_tags: and no tags.
       and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
+      failure: 
         failed_to_import: "failed to import. Here's the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_1: More information about GPX import failures and how to avoid
         more_info_2: "them can be found at:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX Import failure"
+      greeting: Hi,
+      success: 
+        loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
-    signup_confirm:
+      with_description: with the description
+      your_gpx_file: It looks like your GPX file
+    lost_password: 
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_html: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
+    lost_password_plain: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
+      hopefully_you_2: email addresses openstreetmap.org account.
+    message_notification: 
+      banner1: "*                         ì´ emailì ëµì¥íì§ ë§ì¸ì.                          *"
+      banner2: "*            ëµì¥ì ìí´ìë OpenStreetMap ì¹ì¬ì´í¸ë¥¼ ì´ì©í´ ì£¼ì¸ì.             *"
+      footer1: "{{readurl}} ììë ìª½ì§ë¥¼ íì¸í  ì ììµëë¤."
+      footer2: "{{replyurl}} ìì ëµì¥íì¤ ì ììµëë¤."
+      header: "{{from_user}} ëì´ OpenStreetMapì íµí´ {{subject}} ìª½ì§ë¥¼ ë³´ëìµëë¤."
+      hi: "{{to_user}}ë ìëíì¸ì."
+      subject: "[OpenStreetMap] {{user}}ì´ ì ìª½ì§ë¥¼ ë³´ëìµëë¤."
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    lost_password:
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-  message:
-    inbox:
-      title: "ë°ì ìª½ì§í¨"
-      my_inbox: "ë´ ìª½ì§í¨"
-      outbox: "ë³´ë¸ ìª½ì§í¨"
-      you_have: "{{new_count}} ê°ì ì ìª½ì§ì {{old_count}} ê°ì ì½ì ìª½ì§ê° ììµëë¤."
-      from: "From"
-      subject: "ì ëª©"
-      date: "ë ì§"
-      no_messages_yet: "ë°ì ìª½ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì."
-      people_mapping_nearby: "ê·¼ì²ë¥¼ ì§ë ìë ¥í ì¬ëë¤" 
-    message_summary:
-      unread_button: "ì½ì§ ììì¼ë¡ íì"
-      read_button: "ì½ìì¼ë¡ íì"
-      reply_button: "ëµì¥"
-    new:
-      title: "ì ìª½ì§"
-      send_message_to: "{{name}}ìê² ì ìª½ì§ ë³´ë´ê¸°"
-      subject: "ì ëª©"
-      body: "ë´ì©"
-      send_button: "ë³´ë´ê¸°"
-      back_to_inbox: "ìª½ì§í¨ì¼ë¡ ëìê°ê¸°"
-      message_sent: "ìª½ì§ê° ì ì¡ëììµëë¤."
-    no_such_user:
-      title: "ì¬ì©ì ëë ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤"
-      heading: "ì¬ì©ì ëë ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤"
-      body: "ì£ì¡í©ëë¤. ê·¸ë° ìì´ë ëë ì´ë¦ì ì¬ì©ìê° ìª½ì§ë¥¼ ì°¾ì ì ììµëë¤."
-    outbox: 
-      title: "ë³´ë¸ ìª½ì§í¨"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "ë°ì í¸ì§í¨"
-      outbox: "ë³´ë¸ í¸ì§í¨"
-      you_have_sent_messages: "{{sent_count}} ê°ì ìª½ì§ë¥¼ ë³´ëìµëë¤."
-      to: "To"
-      subject: "ì ëª©"
-      date: "ë ì§"
-      no_sent_messages: "ë°ì ìª½ì§ê° ììµëë¤. {{people_mapping_nearby_link}}ìì ì¹êµ¬ë¥¼ ì°¾ìë³´ì¸ì."
-      people_mapping_nearby: "ê·¼ì²ë¥¼ ì§ë ìë ¥í ì¬ëë¤"
-    read:
-      title: "Read message"
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      js_1: "ìë°ì¤í¬ë¦½í¸ë¥¼ ì§ìíì§ ìë ë¸ë¼ì°ì ì´ê±°ë, ìë°ì¤í¬ë¦½í¸ê° íì±í ëì´ ìì§ ììµëë¤."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
-      permalink: Permalink
-      license:
-        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: You haven't set your edits to be public.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
+    index: 
+      js_1: ìë°ì¤í¬ë¦½í¸ë¥¼ ì§ìíì§ ìë ë¸ë¼ì°ì ì´ê±°ë, ìë°ì¤í¬ë¦½í¸ê° íì±í ëì´ ìì§ ììµëë¤.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
+        project_name: OpenStreetMap project
+      permalink: Permalink
+    key: 
+      map_key: Map key
+      map_key_tooltip: Map key for the mapnik rendering at this zoom level
+    search: 
       search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lì²´nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
+      submit_text: Go
+      where_am_i: Where am I?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
+      upload_trace: Upload GPS Trace
+    delete: 
+      scheduled_for_deletion: Track scheduled for deletion
+    edit: 
+      description: "Description:"
+      edit: edit
       filename: "Filename:"
-      uploaded_at: "Uploaded at:"
+      owner: "Owner:"
       points: "Points:"
+      save_button: Save Changes
       start_coord: "Start coordinate:"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
       tags: "Tags:"
-      save_button: "Save Changes"
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "PENDING"
+      uploaded_at: "Uploaded at:"
+    list: 
+      public_traces: Public GPS traces
+      public_traces_from: Public GPS traces from {{user}}
+      tagged_with: " tagged with {{tags}}"
+      your_traces: Your GPS traces
+    make_public: 
+      made_public: Track made public
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    trace: 
+      ago: "{{time_in_words_ago}} ago"
+      by: by
+      count_points: "{{count}} points"
+      edit: edit
+      edit_map: Edit Map
+      in: in
+      map: map
+      more: more
+      pending: PENDING
+      private: PRIVATE
+      public: PUBLIC
+      trace_details: View Trace Details
+      view_map: View Map
+    trace_form: 
+      description: Description
+      help: Help
+      tags: Tags
+      upload_button: Upload
+      upload_gpx: Upload GPX File
+    trace_header: 
+      see_all_traces: See all traces
+      see_just_your_traces: See just your traces, or upload a trace
+      see_your_traces: See all your traces
+      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: of
+      showing: Showing page
+    view: 
+      delete_track: Delete this track
+      description: "Description:"
+      download: download
+      edit: edit
+      edit_track: Edit this track
       filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
+      heading: Viewing trace {{name}}
+      map: map
+      none: None
+      owner: "Owner:"
+      pending: PENDING
       points: "Points:"
       start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      heading: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Login"
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
+      tags: Tags
+      trace_not_found: Trace not found!
+      uploaded: "Uploaded at:"
+  user: 
+    account: 
+      email never displayed publicly: (never displayed publicly)
+      flash update success: User information updated successfully.
+      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
+      home location: "Home Location:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Make all my edits public
+      my settings: My settings
+      no home location: You have not entered your home location.
+      preferred languages: "Preferred Languages:"
+      profile description: "Profile Description:"
+      public editing: 
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: what's this?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: Save Changes
+      title: Edit account
+      update home location on click: Update home location when I click on the map?
+    confirm: 
+      button: Confirm
+      failure: A user account with this token has already been confirmed.
+      heading: Confirm a user account
+      press confirm button: Press the confirm button below to activate your account.
+      success: Confirmed your account, thanks for signing up!
+    confirm_email: 
+      button: Confirm
+      failure: An email address has already been confirmed with this token.
+      heading: Confirm a change of email address
+      press confirm button: Press the confirm button below to confirm your new email address.
+      success: Confirmed your email address, thanks for signing up!
+    friend_map: 
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      your location: Your location
+    go_public: 
+      flash success: All your edits are now public, and you are now allowed to edit.
+    login: 
+      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
+      auth failure: Sorry, couldn't log in with those details.
+      create_account: create an account
       email or username: "Email Address or Username:"
+      heading: Login
+      login_button: Login
+      lost password link: Lost your password?
       password: "Password:"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
-      auth failure: "Sorry, couldn't log in with those details."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      please login: Please login or {{create_user_link}}.
+      title: Login
+    lost_password: 
       email address: "Email Address:"
+      heading: Forgotten Password?
+      new password button: Send me a new password
+      notice email cannot find: Couldn't find that email address, sorry.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
+      title: lost password
+    make_friend: 
+      already_a_friend: You are already friends with {{name}}.
+      failed: Sorry, failed to add {{name}} as a friend.
+      success: "{{name}} is now your friend."
+    new: 
       confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      confirm password: "Confirm Password:"
+      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
       display name: "Display Name:"
+      email address: "Email Address:"
+      fill_form: Fill in the form and we'll send you a quick email to activate your account.
+      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
+      heading: Create a User Account
+      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
+      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Password:"
-      confirm password: "Confirm Password:"
       signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
+      title: Create account
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      flash token bad: Didn't find that token, check the URL maybe?
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: Add Image
+      ago: ({{time_in_words_ago}} ago)
+      change your settings: change your settings
+      delete image: Delete Image
+      description: Description
+      diary: diary
+      edits: edits
+      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
+      km away: "{{count}}km away"
+      mapper since: "Mapper since:"
       my diary: my diary
-      new diary entry: new diary entry
       my edits: my edits
-      my traces: my traces
       my settings: my settings
+      my traces: my traces
+      nearby users: "Nearby users:"
+      new diary entry: new diary entry
+      no friends: You have not added any friends yet.
+      no home location: No home location has been set.
+      no nearby users: There are no users who admit to mapping nearby yet.
+      remove as friend: remove as friend
       send message: send message
-      diary: diary
-      edits: edits
+      settings_link_text: settings
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
       upload an image: Upload an image
-      add image: Add Image
-      description: Description
+      user image heading: User image
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
       your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{count}}km away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing:"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      home location: "Home Location:"
-      no home location: "You have not entered your home location."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 92a842774..f8d2426df 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1,635 +1,918 @@
-nl:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List" #to be translated
-      changeset: "Changeset"
-      changeset_tag: "Changeset-tag"
-      country: "Land"
-      diary_comment: "Dagboek-commentaar"
-      diary_entry: "Dagboek-artikel"
-      friend: "Vriend"
-      language: "Taal"
-      message: "Bericht"
-      node: "Node"
-      node_tag: "Node-tag"
-      notifier: "Melding" #good translation?
-      old_node: "Oude node"
-      old_node_tag: "Oude node-tag"
-      old_relation: "Oude relatie"
-      old_relation_member: "Oud lid van een relatie"
-      old_relation_tag: "Oude relatie-tag"
-      old_way: "Oude way"
-      old_way_node: "Oude node op een way"
-      old_way_tag: "Oude way-tag"
-      relation: "Relatie"
-      relation_member: "Lid van een relatie"
-      relation_tag: "Relatie-tag"
-      session: "Sessie"
-      trace: "Track"
-      tracepoint: "Trackpunt"
-      tracetag: "Track-tag"
-      user: "Gebruiker"
-      user_preference: "Gebruikersvoorkeuren"
-      user_token: "Gebruikers-id" #good translation?
-      way: "Way"
-      way_node: "Node op een way"
-      way_tag: "Way-tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Tekst"
-      diary_entry:
-        user: "Gebruiker"
-        title: "Titel"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        language: "Taal"
-      friend:
-        user: "Gebruiker"
-        friend: "Vriend"
-      trace:
-        user: "Gebruiker"
-        visible: "Zichtbaar"
-        name: "Naam"
-        size: "Grootte"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        public: "Openbaar"
-        description: "Beschrijving"
-      message:
-        sender: "Afzender"
-        title: "Titel"
-        body: "Tekst"
-        recipient: "Ontvanger"
-      user:
-        email: "E-mail"
-        active: "Actief"
-        display_name: "Weergavenaam"
-        description: "Beschrijving"
-        languages: "Talen"
-        pass_crypt: "Wachtwoord"
-  map:
-    view: Bekijken
-    edit: Bewerken
-    coordinates: "CoÃ¶rdinaten:"
-  browse:
-    changeset:
-      title: "Changeset"
-      changeset: "Changeset: {{id}}"
-      download: "Download {{changeset_xml_link}} of {{osmchange_xml_link}}"
-      changesetxml: "Changeset-XML"
-      osmchangexml: "osmChange-XML"
-    changeset_details:
-      created_at: "Aangemaakt op:"
-      closed_at: "Gesloten op:"
+nl: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Tekst
+      diary_entry: 
+        language: Taal
+        latitude: Breedtegraad
+        longitude: Lengtegraad
+        title: Titel
+        user: Gebruiker
+      friend: 
+        friend: Vriend
+        user: Gebruiker
+      message: 
+        body: Tekst
+        recipient: Ontvanger
+        sender: Afzender
+        title: Titel
+      trace: 
+        description: Beschrijving
+        latitude: Breedtegraad
+        longitude: Lengtegraad
+        name: Naam
+        public: Openbaar
+        size: Grootte
+        user: Gebruiker
+        visible: Zichtbaar
+      user: 
+        active: Actief
+        description: Beschrijving
+        display_name: Weergavenaam
+        email: E-mail
+        languages: Talen
+        pass_crypt: Wachtwoord
+    models: 
+      acl: Rechtenoverzicht
+      changeset: Set wijzigingen
+      changeset_tag: Label van set wijzigingen
+      country: Land
+      diary_comment: Dagboekopmerking
+      diary_entry: Dagboekingave
+      friend: Vriend
+      language: Taal
+      message: Bericht
+      node: Node
+      node_tag: Nodelabel
+      notifier: Melding
+      old_node: Oude node
+      old_node_tag: Oud nodelabel
+      old_relation: Oude relatie
+      old_relation_member: Oud relatielid
+      old_relation_tag: Oud relatielabel
+      old_way: Oude weg
+      old_way_node: Oude node op een weg
+      old_way_tag: Oud weglabel
+      relation: Relatie
+      relation_member: Relatielid
+      relation_tag: Relatielabel
+      session: Sessie
+      trace: Track
+      tracepoint: Trackpunt
+      tracetag: Tracklabel
+      user: Gebruiker
+      user_preference: Gebruikersvoorkeuren
+      user_token: Gebruikersnummer
+      way: Weg
+      way_node: Wegnode
+      way_tag: Weglabel
+  browse: 
+    changeset: 
+      changeset: "Set wijzigingen: {{id}}"
+      changesetxml: Changeset-XML
+      download: "{{changeset_xml_link}} of {{osmchange_xml_link}} downloaden"
+      feed: 
+        title: Set wijzigingen {{id}}
+        title_comment: Set wijzigingen {{id}} - {{comment}}
+      osmchangexml: osmChange-XML
+      title: Set wijzigingen
+    changeset_details: 
       belongs_to: "Gemaakt door:"
-      bounding_box: "Rechthoek:" #good translation?
-      no_bounding_box: "Geen coÃ¶rdinaten opgeslagen voor deze changeset."
-      show_area_box: "Laat gebied zien"
-      box: "vak" #good translation?
-      has_nodes: "Bevat de volgende {{count}} nodes:"
+      bounding_box: "Selectiekader:"
+      box: kader
+      closed_at: "Gesloten op:"
+      created_at: "Aangemaakt op:"
+      has_nodes: 
+        one: "Heeft de volgende node:"
+        other: "Heeft de volgende {{count}} nodes:"
+      has_relations: 
+        other: "Heeft de volgende {{count}} relaties:"
       has_ways: "Bevat de volgende {{count}} ways:"
-      has_relations: "Bevat de volgende {{count}} relaties:"
+      no_bounding_box: Er is geen selectiekader opgeslagen voor deze set wijzigingen.
+      show_area_box: Gebied weergeven
+    changeset_navigation: 
+      all: 
+        next_tooltip: Volgende set wijzigingen
+        prev_tooltip: Vorige set wijzigingen
+      user: 
+        name_tooltip: Bewerkingen van {{user}} bekijken
+        next_tooltip: Volgende beweking door {{user}}
+        prev_tooltip: Vorige bewerking door {{user}}
     common_details: 
+      changeset_comment: "Opmerking:"
       edited_at: "Bewerkt op:"
       edited_by: "Bewerkt door:"
+      in_changeset: "In set wijzigingen:"
       version: "Versie:"
-      in_changeset: "In changeset:"
-    containing_relation:
-      entry: "Relatie {{relation_name}}"
-      entry_role: "Relatie {{relation_name}} (als {{relation_role}})"
-    map:
-      loading: "Laden..."
-      deleted: "Verwijderd"
-    node_details:
+    containing_relation: 
+      entry: Relatie {{relation_name}}
+      entry_role: Relatie {{relation_name}} (als {{relation_role}})
+    map: 
+      deleted: Verwijderd
+      larger: 
+        area: Gebied op grotere kaart bekijken
+        node: Node op grotere kaart bekijken
+        relation: Relatie op grotere kaart bekijken
+        way: Weg op grotere kaart bekijken
+      loading: Bezig met laden...
+    node: 
+      download: "{{download_xml_link}} of {{view_history_link}}"
+      download_xml: XML downloaden
+      edit: bewerken
+      node: Node
+      node_title: "Node: {{node_name}}"
+      view_history: geschiedenis bekijken
+    node_details: 
       coordinates: "CoÃ¶rdinaten:"
-      part_of: "Part of:" #to be translated
-    node_history:
-      node_history: "Node-geschiedenis"
+      part_of: "Onderdeel van:"
+    node_history: 
       download: "{{download_xml_link}} of {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "details zien"
-    node:
-      node: "Node"
-      node_title: "Node: {{node_name}}"
+      download_xml: XML downloaden
+      node_history: Nodegeschiedenis
+      node_history_title: "Nodegeschiedenis: {{node_name}}"
+      view_details: details weergeven
+    not_found: 
+      sorry: Sorry, de {{type}} met id {{id}} kan niet worden gevonden.
+      type: 
+        changeset: set wijzigingen
+        node: node
+        relation: relatie
+        way: weg
+    paging_nav: 
+      of: van
+      showing_page: Bezig met weergeven van pagina
+    relation: 
       download: "{{download_xml_link}} of {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "geschiedenis zien"
-    not_found:
-      sorry: "Sorry, de {{type}} met id {{id}} kan niet worden gevonden."
-    paging_nav:
-      showing_page: "Pagina"
-      of: "van"
-    relation_details:
-      members: "Leden:"
-      part_of: "Deel van:" #good translation?
-    relation_history:
-      relation_history: "Relatie-geschiedenis"
-      relation_history_title: "Relatie-geschiedenis: {{relation_name}}"
-    relation:
-      relation: "Relatie"
+      download_xml: XML downloaden
+      relation: Relatie
       relation_title: "Relatie: {{relation_name}}"
+      view_history: geschiedenis weergeven
+    relation_details: 
+      members: "Leden:"
+      part_of: "Onderdeel van:"
+    relation_history: 
+      download: "{{download_xml_link}} of {{view_details_link}}"
+      download_xml: XML downloaden
+      relation_history: Relatiegeschiedenis
+      relation_history_title: "Relatiegeschiedenis: {{relation_name}}"
+      view_details: details bekijken
+    relation_member: 
+      entry_role: "{{type}} {{name}} als {{role}}"
+      type: 
+        node: Node
+        relation: Relatie
+        way: Weg
+    start: 
+      manually_select: Handmatig een ander gebied selecteren
+      view_data: Gegevens voor de huidige kaartweergave weergeven
+    start_rjs: 
+      data_frame_title: Gegevens
+      data_layer_name: Gegevens
+      details: Details
+      drag_a_box: Sleep een rechthoek op de kaart om een gebied te selecteren
+      edited_by_user_at_timestamp: Bewerkt door [[user]] op [[timestamp]]
+      history_for_feature: Geschiedenis voor [[feature]]
+      load_data: Gegevens laden
+      loaded_an_area_with_num_features: U hebt een gebied geladen dat [[num_features]] objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan honderd objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder.
+      loading: Bezig met laden...
+      manually_select: Handmatig een ander gebied selecteren
+      object_list: 
+        api: Dit gebied via de API ophalen
+        back: Objectenlijst weergeven
+        details: Details
+        heading: Objectenlijst
+        history: 
+          type: 
+            node: Node [[id]]
+            way: Weg [[id]]
+        selected: 
+          type: 
+            node: Node [[id]]
+            way: Weg [[id]]
+        type: 
+          node: Node
+          way: Weg
+      private_user: private gebruiker
+      show_history: Geschiedenis weergeven
+      unable_to_load_size: Laden is niet mogelijk. Het selectiekader van [[bbox_size]] is te groot. Het moet kleiner zijn dan {{max_bbox_size}}
+      wait: Een ogenblik geduld alstublieft...
+      zoom_or_select: Inzoomen of een gebied van de kaart selecteren om te bekijken
+    tag_details: 
+      tags: "Labels:"
+    way: 
       download: "{{download_xml_link}} of {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "geschiedenis zien"
-    start:
-      view_data: "Gegevens voor de huidige kaartweergave weergeven"
-      manually_select: "Handmatig een ander gebied selecteren"
-    start_rjs:
-      data_frame_title: "Gegevens"
-      zoom_or_select: "Zoom in of selecteer een gebied van de kaart om te zien"
-      drag_a_box: "Sleep een rechthoek op de kaart om een gebied te selecteren"
-      manually_select: "Selecteer handmatig een ander gebied"
-      loaded_an_area_with_num_features: "Je hebt een gebied geladen dat [[num_features]] objecten bevat. In het algemeen kunnen sommige browsers niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan 100 objecten: als je meer weergeeft kan de browser traag worden of niet meer reageren. Als je zeker weet dat je de gegevens wilt laten zien, kan dat met de knop hieronder."
-      load_data: "Gegevens laden"
-      unable_to_load_size: "Niet mogelijk om te laden: rechthoek ([[bbox_size]]) is te groot (moet kleiner zijn dan {{max_bbox_size}})"
-      loading: "Laden..."
-      show_history: "Geschiedenis weergeven"
-      wait: "Een ogenblik geduld a.u.b..."
-      history_for_feature: "Geschiedenis voor [[feature]]"
-      details: "Details"
-      private_user: "private user" #to be translated
-      edited_by_user_at_timestamp: "Bewerkt door [[user]] op [[timestamp]]"
-    tag_details:
-      tags: "Tags:"
-    way_details:
+      download_xml: XML downloaden
+      edit: bewerken
+      view_history: geschiedenis weergeven
+      way: Weg
+      way_title: "Weg: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: ook onderdeel van weg {{related_ways}}
+        other: ook deel van ways {{related_ways}}
       nodes: "Nodes:"
-      part_of: "Deel van:"
-      also_part_of:
-        one: "Ook deel van way {{related_ways}}"
-        other: "Ook deel van ways {{related_ways}}"
-    way_history:
-      way_history: "Way-geschiedenis"
-      way_history_title: "Way-geschiedenis: {{way_name}}"
+      part_of: "Onderdeel van:"
+    way_history: 
       download: "{{download_xml_link}} of {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "details weergeven"
-    way:
-      way: "Way"
-      way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}} of {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "geschiedenis weergeven"
-  changeset:
+      download_xml: XML downloaden
+      view_details: details weergeven
+      way_history: Weggeschiedenis
+      way_history_title: "Weggeschiedenis: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anoniem
+      big_area: (groot)
+      no_comment: (geen)
+      no_edits: (geen bewerkingen)
+      show_area_box: toon rechthoek
+      still_editing: (nog aan het bewerken)
+      view_changeset_details: Details wijzigingenset weergeven
     changeset_paging_nav: 
-      showing_page: "Pagina"
-      of: "van"
-    changeset:
-      still_editing: "(nog aan het bewerken)"
-      anonymous: "Anoniem"
-      no_comment: "(geen)"
-      no_edits: "(geen aanpassingen)"
-      show_area_box: "toon rechthoek"
-      big_area: "(groot)"
-      view_changeset_details: "Toon changeset-details"
-    changesets:
-      id: "ID"
-      saved_at: "Opgeslagen op"
-      user: "Gebruiker"
-      comment: "Commentaar"
-      area: "Gebied"
-    list_bbox:
-      history: "Geschiedenis"
-      changesets_within_the_area: "Changesets binnen het gebied:"
-      show_area_box: "rechthoek weergeven"
-      no_changesets: "Geen changesets"
-      all_changes_everywhere: "Voor alle aanpassingen over de hele wereld zie {{recent_changes_link}}"
-      recent_changes: "Recente wijzigingen"
-      no_area_specified: "Geen gebied opgegeven"
-      first_use_view: "Gebruik eerst de {{view_tab_link}} om te schuiven en te zoomen naar het gebied waarin je geÃ¯nteresseerd bent, klik dan op de Geschiedenis-tab."
-      view_the_map: "Bekijk de kaart"
-      view_tab: "Bekijken-tab"
-      alternatively_view: "Of bekijk alle {{recent_changes_link}}"
-    list:
-      recent_changes: "recente wijzigingen"
-      recently_edited_changesets: "Recent gewijzigde changesets:"
-      for_more_changesets: "Selecteer een gebruiker en bekijk de aanpassingen of zie de aanpas-geschiedenis van een specifiek gebied voor meer changesets."
-    list_user:
-      edits_by_username: "Aanpassingen door {{username_link}}"
-      no_visible_edits_by: "Geen zichtbare aanpassingen door {{name}}."
-      for_all_changes: "Voor aanpassingen door alle gebruikers, zie {{recent_changes_link}}"
-      recent_changes: "Recente wijzigingen"
-  diary_entry:
-    new:
-      title: Nieuw dagboek-artikel
-    list:
-      title: "Gebruikersdagboeken"
-      user_title: "Dagboek van {{user}}"
-      new: Nieuw dagboek-artikel
-      new_title: Nieuw artikel in je dagboek zetten
-      no_entries: Geen dagboek-artikelen
-      recent_entries: "Recente dagboek-artikelen:"
-      older_entries: Oudere artikelen
-      newer_entries: Nieuwere artikelen
-    edit:
-      title: "Dagboek-artikel aanpassen"
-      subject: "Onderwerp:"
+      of: van
+      showing_page: Bezig met weergeven van pagina
+    changesets: 
+      area: Gebied
+      comment: Opmerking
+      id: ID
+      saved_at: Opgeslagen op
+      user: Gebruiker
+    list: 
+      description: Recente wijzigingen
+      description_bbox: Wijzigingensets binnen {{bbox}}
+      description_user: Wijzigingensets door {{user}}
+      description_user_bbox: Wijzigingensets door {{user}} binnen {{bbox}}
+      heading: Wijzigingensets
+      heading_bbox: Wijzigingensets
+      heading_user: Wijzigingensets
+      heading_user_bbox: Wijzigingensets
+      title: Wijzigingensets
+      title_bbox: Wijzigingensets binnen {{bbox}}
+      title_user: Wijzigingensets door {{user}}
+      title_user_bbox: Wijzigingensets door {{user}} binnen {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Reactie van {{link_user}}  op {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 reactie
+        other: "{{count}} reacties"
+      comment_link: Reactie op deze ingave geven
+      edit_link: Deze ingave bewerken
+      posted_by: Geplaatst door {{link_user}} op {{created}} in het {{language_link}}
+      reply_link: Op deze ingave reageren
+    edit: 
       body: "Tekst:"
       language: "Taal:"
+      latitude: "Breedtegraad:"
       location: "Locatie:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      use_map_link: "gebruik kaart"
-      save_button: "Opslaan"
-      marker_text: Locatie van het artikel
-    view:
-      title: "Gebruikersdagboeken | {{user}}"
-      user_title: "Dagboek van {{user}}"
-      leave_a_comment: "Commentaar achterlaten"
-      save_button: "Opslaan"
-    no_such_entry:
-      heading: "Geen invoer met id {{id}}"
-      body: "Sorry, er is geen dagboek-artikel of commentaar met {{id}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
-    no_such_user:
-      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
-    diary_entry:
-      posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language_link}}"
-      comment_link: Opmerking over dit artikel plaatsen
-      reply_link: Antwoorden op dit artikel
-      comment_count:
-        one: 1 opmerking
-        other: "{{count}} opmerkingen"
-      edit_link: Dit artikel bewerken
-    diary_comment:
-      comment_from: "Opmerking van {{link_user}}  op {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Gebied om te exporteren"
-      manually_select: "Handmatig een ander gebied selecteren"
-      format_to_export: "Bestandsformaat"
-      osm_xml_data: "OpenStreetMap XML-gegevens"
-      mapnik_image: "Mapnik-afbeelding"
-      osmarender_image: "Osmarender-afbeelding"
-      embeddable_html: "HTML-code"
-      licence: "Licentie"
-      export_details: 'OpenStreetMap-gegevens zijn gelicenseerd onder de <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 licentie</a>.'
-      options: "Opties"
-      format: "Formaat"
-      scale: "Schaal"
-      max: "max"
-      image_size: "Afbeeldingsgrootte"
-      zoom: "Zoom"
-      add_marker: "Marker op de kaart zetten"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Uitvoer"
-      paste_html: "Kopieer de HTML-code en plak hem in je website."
-      export_button: "Export"
-    start_rjs:
-      export: "Exporteren"
-      drag_a_box: "Sleep een rechthoek op de kaart om een gebied te selecteren"
-      manually_select: "Handmatig een ander gebied selecteren"
-      click_add_marker: "Klik op de kaart om een marker te plaatsen"
-      change_marker: "Positie van de marker veranderen"
-      add_marker: "Marker op de kaart zetten"
-      view_larger_map: "Grotere kaart zien"
-  geocoder:
-    search:
-      title:
-        latlon: 'Resultaten van <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Resultaten van <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Resultaten van <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Resultaten van <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Resultaten van <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Resultaten van <a href="http://www.geonames.org/">GeoNames</a>'
-    results:
-      no_results: "Geen resultaten gevonden"
-  layouts:
-    welcome_user: "Welkom, {{user_link}}"
-    home: "home"
-    inbox: "Postvak IN ({{count}})"
-    logout: uitloggen
-    log_in: inloggen
-    sign_up: registreren
-    view: Bekijken
+      longitude: "Lengtegraad:"
+      marker_text: Locatie van ingave
+      save_button: Opslaan
+      subject: "Onderwerp:"
+      title: Dagboekingave bewerken
+      use_map_link: kaart gebruiken
+    feed: 
+      all: 
+        description: Recente dagboekingaven van OpenStreetMap-gebruikers
+        title: OpenStreetMap dagboekingaven
+      language: 
+        description: Recente dagboekingaven van OpenStreetMap-gebruikers in het {{language_name}}
+        title: OpenStreetMap dagboekingaven in het {{language_name}}
+      user: 
+        description: Recente OpenStreetMap dagboekingaven van {{user}}
+        title: OpenStreetMap dagboekingaven van {{user}}
+    list: 
+      in_language_title: Dagboekingaven in het {{language}}
+      new: Nieuwe dagboekingave
+      new_title: Nieuw artikel in je dagboek zetten
+      newer_entries: Nieuwere ingaven
+      no_entries: Geen dagboekingaven
+      older_entries: Oudere ingaven
+      recent_entries: "Recente dagboekingaven:"
+      title: Gebruikersdagboeken
+      user_title: Dagboek van {{user}}
+    new: 
+      title: Nieuwe dagboekingave
+    no_such_entry: 
+      body: Sorry, er is geen dagboekingave of opmerking met het id {{id}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
+      heading: De ingave met het id {{id}} bestaat niet
+      title: De opgevraagde dagboekingave bestaat niet
+    no_such_user: 
+      body: Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
+      heading: De gebruiker {{user}} bestaat niet
+      title: De opgevraagde gebruiker bestaat niet
+    view: 
+      leave_a_comment: Opmerking achterlaten
+      login: aanmelden
+      login_to_leave_a_comment: U moet moet zich {{login_link}} om te kunnen reageren
+      save_button: Opslaan
+      title: Gebruikersdagboeken | {{user}}
+      user_title: Dagboek van {{user}}
+  export: 
+    start: 
+      add_marker: Marker op de kaart zetten
+      area_to_export: Te exporteren gebied
+      embeddable_html: HTML-code
+      export_button: Exporteren
+      export_details: OpenStreetMap-gegevens zijn gelicenseerd onder de licentie <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Naamsvermelding-Gelijk delen 2.0</a>.
+      format: Formaat
+      format_to_export: Bestandsformaat
+      image_size: Afbeeldingsgrootte
+      latitude: "Breedte:"
+      licence: Licentie
+      longitude: "Lengte:"
+      manually_select: Handmatig een ander gebied selecteren
+      mapnik_image: Mapnik-afbeelding
+      max: max
+      options: Instellingen
+      osm_xml_data: OpenStreetMap XML-gegevens
+      osmarender_image: Osmarender-afbeelding
+      output: Uitvoer
+      paste_html: Kopieer de HTML-code en voeg deze toe aan uw website
+      scale: Schaal
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Marker op de kaart zetten
+      change_marker: Positie van de marker veranderen
+      click_add_marker: Klik op de kaart om een marker te plaatsen
+      drag_a_box: Sleep een selectiekader op de kaart om een gebied te selecteren
+      export: Exporteren
+      manually_select: Handmatig een ander gebied selecteren
+      view_larger_map: Grotere kaart bekijken
+  geocoder: 
+    description: 
+      title: 
+        geonames: Locatie van <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} van <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: Steden
+        places: Plaatsen
+        towns: Steden
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} van {{type}}"
+    direction: 
+      east: oost
+      north: noord
+      north_east: noordoost
+      north_west: noordwest
+      south: zuid
+      south_east: zuidoost
+      south_west: zuidwest
+      west: west
+    distance: 
+      one: ongeveer 1 km.
+      other: ongeveer {{count}} km.
+      zero: minder dan 1 km.
+    results: 
+      no_results: Geen resultaten gevonden
+    search: 
+      title: 
+        ca_postcode: Resultaten van <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultaten van <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultaten van <a href="http://openstreetmap.org/">intern</a>
+        osm_namefinder: Resultaten van <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultaten van <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultaten van <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} van {{placename}}"
+  layouts: 
+    alt_donation: Doneren
+    donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
+    donate_link_text: doneren
     edit: Bewerken
-    history: Geschiedenis
+    edit_tooltip: Kaarten bewerken
     export: Exporteren
+    export_tooltip: Kaartgegevens exporteren
     gps_traces: GPS-tracks
-    user_diaries: Gebruikersdagboeken
-    tag_line: De vrije wiki-wereldkaart
-    intro_1: "OpenStreetMap is een vrij bewerkbare kaart van de hele wereld. Hij wordt gemaakt door mensen zoals jij."
-    intro_2: "Met OpenStreetMap kun je geografische gegevens van de hele aarde zien, bewerken en gebruiken op een collaboratieve manier"
-    intro_3: "De hosting van OpenStreetMap wordt ondersteund door het {{ucl}} en {{bytemark}}."
-    osm_offline: "De OpenStreetMap-database is momenteel offline terwijl noodzakelijke onderhoudswerkzaamheden aan de database worden uitgevoerd."
-    osm_read_only: "De OpenStreetMap-database is momenteel alleen-lezen terwijl noodzakelijke onderhoudswerkzaamheden aan de database worden uitgevoerd."
-    donate: "Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds."
-    donate_link_text: doneren
-    help_wiki: "Help &amp; Wiki"
-    news_blog: "Nieuwsblog"
+    gps_traces_tooltip: Tracks beheren
+    help_wiki: Help &amp; Wiki
+    help_wiki_tooltip: Help en wikisite voor het project
+    history: Geschiedenis
+    history_tooltip: Wijzigingensetgeschiedenis
+    home: home
+    home_tooltip: Naar thuislocatie gaan
+    inbox: Postvak IN ({{count}})
+    inbox_tooltip: 
+      one: Uw Postvak IN bevat 1 ongelezen bericht
+      other: Uw Postvak IN bevat {{count}} ongelezen berichten
+      zero: Uw Postvak IN bevat geen nieuwe berichten
+    intro_1: OpenStreetMap is een vrij bewerkbare kaart van de hele wereld. Hij wordt gemaakt door mensen zoals u.
+    intro_2: Met OpenStreetMap kunt u geografische gegevens van de hele aarde bekijken, samen bewerken en gebruiken.
+    intro_3: De hosting van OpenStreetMap wordt ondersteund door {{ucl}} en {{bytemark}}.
+    log_in: aanmelden
+    log_in_tooltip: Aanmelden met bestaande gebruiker
+    logo: 
+      alt_text: Logo OpenStreetMap
+    logout: afmelden
+    logout_tooltip: Afmelden
+    news_blog: Nieuwsblog
+    news_blog_tooltip: Nieuwsblog over OpenStreetMap, vrije geografische gegevens, enzovoort
+    osm_offline: De OpenStreetMap-database is op het moment niet beschikbaar wegens het uitvoeren van onderhoudswerkzaamheden.
+    osm_read_only: De OpenStreetMap-database kan op het moment niet gewijzigd worden wegens het uitvoeren van onderhoudswerkzaamheden.
     shop: Winkel
-    sotm: 'Kom naar de OpenStreetMap-conferentie, de State of the Map, op 10-12 juli 2009 in Amsterdam!'
-    alt_donation: Doneer
-  notifier:
-    diary_comment_notification:
+    shop_tooltip: Winkel met OpenStreetMap-producten
+    sign_up: registreren
+    sign_up_tooltip: Gebruiker voor bewerken aanmaken
+    sotm: Kom naar de OpenStreetMap-conferentie, de State of the Map, op 10-12 juli 2009 in Amsterdam!
+    tag_line: De vrije wikiwereldkaart
+    user_diaries: Gebruikersdagboeken
+    user_diaries_tooltip: Gebruikersdagboeken bekijken
+    view: Bekijken
+    view_tooltip: Kaarten bekijken
+    welcome_user: Welkom, {{user_link}}
+    welcome_user_link_tooltip: Uw gebruikerspagina
+  map: 
+    coordinates: "CoÃ¶rdinaten:"
+    edit: Bewerken
+    view: Bekijken
+  message: 
+    delete: 
+      deleted: Het bericht is verwijderd
+    inbox: 
+      date: Datum
+      from: Van
+      my_inbox: Mijn Postvak IN
+      no_messages_yet: U hebt nog geen berichten. Waarom legt u geen contact met {{people_mapping_nearby_link}}?
+      outbox: Postvak UIT
+      people_mapping_nearby: dichtbijzijnde mappers
+      subject: Onderwerp
+      title: Postvak IN
+      you_have: U hebt {{new_count}} nieuwe berichten en {{old_count}} oude berichten
+    mark: 
+      as_read: Gemarkeerd als gelezen
+      as_unread: Gemarkeerd als ongelezen
+    message_summary: 
+      delete_button: Verwijderen
+      read_button: Markeren als gelezen
+      reply_button: Beantwoorden
+      unread_button: Markeren als ongelezen
+    new: 
+      back_to_inbox: Terug naar Postvak IN
+      body: Tekst
+      message_sent: Bericht verzonden
+      send_button: Verzenden
+      send_message_to: Nieuw bericht naar {{name}} verzenden
+      subject: Onderwerp
+      title: Bericht verzenden
+    no_such_user: 
+      body: Sorry, er is geen gebruiker of bericht met die naam of id
+      heading: Deze gebruiker of dit bericht bestaat niet
+      title: De gebruiker of het bericht bestaat niet
+    outbox: 
+      date: Datum
+      inbox: Postvak IN
+      my_inbox: Mijn {{inbox_link}}
+      no_sent_messages: U hebt nog geen berichten verzonden. Waarom legt u geen contact met {{people_mapping_nearby_link}}?
+      outbox: Postvak UIT
+      people_mapping_nearby: dichtbijzijnde mappers
+      subject: Onderwerp
+      title: Postvak UIT
+      to: Aan
+      you_have_sent_messages: U hebt {{sent_count}} verzonden berichten
+    read: 
+      back_to_inbox: Terug naar Postvak IN
+      back_to_outbox: Terug naar Postvak UIT
+      date: Datum
+      from: Van
+      reading_your_messages: Bezig met het lezen van uw berichten
+      reading_your_sent_messages: Bezig met het lezen van uw verzonden berichten
+      reply_button: Beantwoorden
+      subject: Onderwerp
+      title: Bericht lezen
+      to: Aan
+      unread_button: Markeren als ongelezen
+    sent_message_summary: 
+      delete_button: Verwijderen
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                       Graag niet antwoorden op deze mail.                      *"
       banner2: "*                Gebruik de OpenStreetMap-site om te antwoorden.                 *"
-      hi: "Hallo {{to_user}},"
-      header: "{{from_user}} heeft een opmerking gepost over je recente OpenStreetMap dagboek-artikel met het onderwerp {{subject}}:"
-      footer: "Je kunt de opmerking ook lezen op {{readurl}} en je kunt een opmerking terugschrijven op {{commenturl}} of antwoorden op {{replyurl}}"
-    friend_notification:
-      had_added_you: "{{user}} heeft je toegevoegd als vriend op OpenStreetMap."
-      see_their_profile: "Je kunt zijn/haar profiel zien op {{userurl}} en deze ook als vriend toevoegen."
-    signup_confirm_plain:
-      greeting: "Hallo!"
-      hopefully_you: "Iemand (waarschijnlijk jij) wil een account aanmaken op"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Als jij dat bent, welkom! Volg de link beneden om je account te bevestigen"
-      click_the_link_2: "en om meer informatie over OpenStreetMap te krijgen."
-      introductory_video: "Je kunt hier een introductievideo over OpenStreetMap zien:"
-      more_videos: "Er zijn nog meer video's hier:"
-      the_wiki: "Lees over OpenStreetMap op de wiki:"
+      footer: U kunt de reactie ook lezen op {{readurl}} en u kunt zelf ook reageren op {{commenturl}} of antwoorden op {{replyurl}}
+      header: "{{from_user}} heeft een reactie geplaatst bij uw recente OpenStreetMap-dagboekingave met het onderwerp {{subject}}:"
+      hi: Hallo {{to_user}},
+      subject: "[OpenStreetMap] {{user}} heeft een reactie bij uw dagboek geplaatst"
+    email_confirm: 
+      subject: "[OpenStreetMap] Bevestig uw e-mailadres"
+    email_confirm_html: 
+      greeting: Hallo,
+    email_confirm_plain: 
+      greeting: Hallo,
+      hopefully_you_2: "{{server_url}} naar {{new_address}}."
+    friend_notification: 
+      had_added_you: "{{user}} heeft u toegevoegd als vriend op OpenStreetMap."
+      see_their_profile: U kunt zijn/haar profiel bekijken op {{userurl}} en deze gebruiker ook als vriend toevoegen.
+      subject: "[OpenStreetMap] {{user}} heeft u als vriend toegevoegd"
+    gpx_notification: 
+      and_no_tags: en geen labels.
+      and_the_tags: "en de volgende labels:"
+      failure: 
+        more_info_1: Meer informatie over GPX-importfouten en hoe deze
+        more_info_2: "te vermijden is te vinden op:"
+        subject: "[OpenStreetMap] GPX-import mislukt"
+      greeting: Hallo,
+      success: 
+        subject: "[OpenStreetMap] GPX-import afgerond"
+      with_description: met de beschrijving
+      your_gpx_file: Het lijkt erop dat uw GPX-bestand
+    lost_password: 
+      subject: "[OpenStreetMap] Verzoek wachtwoord opnieuw instellen"
+    lost_password_html: 
+      click_the_link: Als u dit bent, klik dan op de onderstaande verwijzing om uw wachtwoord te wijzigen.
+      greeting: Hallo,
+    lost_password_plain: 
+      greeting: Hallo,
+    message_notification: 
+      banner1: "*               Reageer alstublieft niet op deze e-mail.                 *"
+      banner2: "*            Gebruik de OpenStreetMap-website om te reageren.            *"
+      footer1: U kunt het bericht ook lezen op {{readurl}}
+      footer2: en u kunt antwoorden op {{replyurl}}
+      header: "{{from_user}} heeft u een bericht gezonden via OpenStreetMap met het onderwerp {{subject}}:"
+      hi: Hallo {{to_user}},
+      subject: "[OpenStreetMap] {{user}} heeft u een nieuw bericht gezonden"
+    signup_confirm: 
+      subject: "[OpenStreetMap] Bevestig uw e-mailadres"
+    signup_confirm_html: 
+      click_the_link: Als jij dat bent, welkom! Volg de link beneden om je account te bevestigen en om meer informatie over OpenStreetMap te lezen
+      current_user: Een lijst van gebruikers, gesorteerd op woonplaats, is te zien op <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Lees over OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">op de wiki</a> of <a href="http://www.opengeodata.org/">de OpenGeoData-blog</a> die ook <a href="http://www.opengeodata.org/?cat=13">podcasts</a> aanbiedt!
+      greeting: Hallo!
+      hopefully_you: Iemand (waarschijnlijk jij) wil een account aanmaken op
+      introductory_video: U kunt een {{introductory_video_link}}.
+      more_videos: Er zijn {{more_videos_link}}.
+      more_videos_here: Er zijn nog meer video's
+      user_wiki_page: We adviseren u een gebruikerspagina aan te maken met onder andere categorieÃ«n die aangeven waar u verblijft, zoals <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Amsterdam">[[Category:Users_in_Amsterdam]]</a>.
+      video_to_openstreetmap: This message is substituted in {{msg-osm|Notifier.signup confirm html.introductory video}}.
+      wiki_signup: U kunt je ook <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">registreren op de OpenStreetMap-wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Als u dat bent, welkom! Volg de verwijzing hieronder om uw gebruiker te bevestigen
+      click_the_link_2: en om meer informatie over OpenStreetMap te krijgen.
+      current_user_1: Een lijst van gebruikers, gesorteerd op woonplaats
+      current_user_2: "is beschikbaar op:"
+      greeting: Hallo!
+      hopefully_you: Iemand (waarschijnlijk u) wil een gebruiker aanmaken op
+      introductory_video: "Er is een introductievideo over OpenStreetMap:"
+      more_videos: "Via de volgende verwijzing zijn meer video's beschikbaar:"
       opengeodata: "OpenGeoData.org is de blog van OpenStreetMap en er zijn ook podcasts:"
-      wiki_signup: "Je kunt je ook registreren bij de OpenStreetMap-wiki:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "Het is aanbevolen dat je een gebruikerspagina maakt met onder andere"
-      user_wiki_2: "categorieÃ«n die zeggen waar je bent, zoals [[Category:Users_in_Amsterdam]]."
-      current_user_1: "Een lijst van gebruikers, gesorteerd op woonplaats"
-      current_user_2: "is beschikbaar op:" #good translation?
-    signup_confirm_html:
-      greeting: "Hallo!"
-      hopefully_you: "Iemand (waarschijnlijk jij) wil een account aanmaken op"
-      click_the_link: "Als jij dat bent, welkom! Volg de link beneden om je account te bevestigen en om meer informatie over OpenStreetMap te lezen"
-      introductory_video: "Je kunt een {{introductory_video_link}}."
-      video_to_openstreetmap: "introductievideo over OpenStreetMap bekijken"
-      more_videos: "Er zijn {{more_videos_link}}."
-      more_videos_here: "hier nog meer video's"
-      get_reading: 'Lees over OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">op de wiki</a> of <a href="http://www.opengeodata.org/">de OpenGeoData-blog</a> die ook <a href="http://www.opengeodata.org/?cat=13">podcasts</a> aanbiedt!'
-      wiki_signup: 'Je kunt je ook <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">registreren op de OpenStreetMap-wiki</a>.'
-      user_wiki_page: 'Het is aanbevolen dat je een gebruikerspagina maakt met onder andere categorieÃ«n die zeggen waar je bent, zoals <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Amsterdam">[[Category:Users_in_Amsterdam]]</a>.'
-      current_user: 'Een lijst van gebruikers, gesorteerd op woonplaats, is te zien op <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      title: "Postvak IN"
-      my_inbox: "Mijn inbox"
-      outbox: "Postvak UIT"
-      you_have: "Je hebt {{new_count}} nieuwe berichten en {{old_count}} oude berichten"
-      from: "Van"
-      subject: "Onderwerp"
-      date: "Datum"
-      no_messages_yet: "Je hebt nog geen berichten. Waarom leg je geen contact met {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "dichtbijzijnde mappers" 
-    message_summary:
-      unread_button: "Markeren als ongelezen"
-      read_button: "Markeren als gelezen"
-      reply_button: "Beantwoorden"
-    new:
-      title: "Bericht zenden"
-      send_message_to: "Zend een nieuw bericht naar {{name}}"
-      subject: "Onderwerp"
-      body: "Tekst"
-      send_button: "Verzenden"
-      back_to_inbox: "Terug naar Postvak IN"
-      message_sent: "Bericht verzonden"
-    no_such_user:
-      heading: "Deze gebruiker of dit bericht bestaat niet"
-      body: "Sorry, er is geen gebruiker of bericht met die naam of id"
-    outbox: 
-      title: "Postvak UIT"
-      my_inbox: "Mijn {{inbox_link}}"
-      inbox: "Postvak IN"
-      outbox: "Postvak UIT"
-      you_have_sent_messages: "Je hebt {{sent_count}} verzonden berichten"
-      to: "Aan"
-      subject: "Onderwerp"
-      date: "Datum"
-      no_sent_messages: "Je hebt nog geen berichten verzonden. Waarom leg je geen contact met {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "dichtbijzijnde mappers"
-    read:
-      title: "Lees bericht"
-      reading_your_messages: "Je berichten lezen"
-      from: "Van"
-      subject: "Onderwerp"
-      date: "Datum"
-      reply_button: "Beantwoorden"
-      unread_button: "Markeren als ongelezen"
-      back_to_inbox: "Terug naar Postvak IN"
-      reading_your_sent_messages: "Je verzonden berichten lezen"
-      to: "Aan"
-      back_to_outbox: "Terug naar Postvak UIT"
-    mark:
-      as_read: "Gemarkeerd als gelezen"
-      as_unread: "Gemarkeerd als ongelezen"
-  site:
-    index:
-      js_1: "Of je gebruikt een browser die JavaScript niet ondersteunt, of je hebt het uitstaan."
-      js_2: "OpenStreetMap gebruikt JavaScript voor de slippy-kaart."
-      js_3: 'Je kunt de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> gebruiken als je niet de mogelijkheid hebt om JavaScript aan te zetten.'
-      permalink: Permalink
-      license:
-        notice: "Gelicenseerd onder de {{license_name}} licentie door het {{project_name}} en zijn bijdragers."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        project_name: "OpenStreetMap-project"
-    edit:
-      not_public: "Je hebt ingesteld dat je bewerkingen niet openbaar zijn."
-      not_public_description: "Je kunt de kaart niet meer bewerken, behalve als je je bewerkingen openbaar maak. Je kunt dit instellen op je {{user_page}}."
+      the_wiki: "Lees meer over OpenStreetMap op de wiki:"
+      user_wiki_1: We adviseren u een gebruikerspagina aan te maken met onder andere
+      user_wiki_2: categorieÃ«n die zeggen waar u verblijf, zoals [[Category:Users_in_Amsterdam]].
+      wiki_signup: "U kunt zich ook registreren bij de OpenStreetMap-wiki:"
+  oauth: 
+    oauthorize: 
+      allow_read_prefs: uw gebruikersvoorkeuren te lezen.
+      allow_to: "De client-toepassing toelaten om:"
+      allow_write_api: de kaart te wijzigen.
+      allow_write_diary: Dagboekingaven aanmaken, reacties geven en vrienden maken.
+      allow_write_gpx: GPS-tracks uploaden
+      allow_write_prefs: uw gebruikersvoorkeuren te wijzigen.
+    revoke: 
+      flash: U hebt het token voor {{application}} ingetrokken
+  oauth_clients: 
+    create: 
+      flash: De informatie is geregistreerd
+    destroy: 
+      flash: De clientapplicatieregistratie is verwijderd
+    edit: 
+      submit: Bewerken
+      title: Uw melding bewerken
+    form: 
+      callback_url: Callback-URL
+      name: Naam
+      required: Verplicht
+      support_url: Ondersteunings-URL
+      url: Applicatie-URL
+    index: 
+      application: Applicatienaam
+      issued_at: Uitgegeven op
+      list_tokens: "De volgende tokens zijn op uw naam voor applicaties uitgegeven:"
+      my_apps: Mijn clientapplicaties
+      my_tokens: Mijn geautoriseerde applicaties
+      no_apps: Heeft u een applicatie die u wilt registreren met de {{oauth}}-standaard? Dan moet u uw webapplicatie registreren voordat u OAuth-verzoeken naar deze dienst kunt maken.
+      register_new: Uw applicatie registreren
+      revoke: Intrekken!
+      title: Mijn OAuth-gegeven
+    new: 
+      submit: Registreren
+      title: Nieuwe applicatie registreren
+    not_found: 
+      sorry: Sorry, die {{type}} kan niet gevonden worden.
+    show: 
+      access_url: "URL voor toegangstoken:"
+      authorize_url: "URL voor autorisatie:"
+      edit: Details bewerken
+      key: "Gebruikerssleutel:"
+      secret: "Gebruikersgeheim:"
+      support_notice: HMAC-SHA-1 (aangeraden) wordt ondersteund, als ook platte tekst in SSL-modus.
+      title: OAuth-gegevens voor {{app_name}}
+      url: "URL voor tokenverzoek:"
+    update: 
+      flash: De informatie voor de client is bijgewerkt
+  site: 
+    edit: 
+      anon_edits_link_text: Lees waarom dit het geval is.
+      flash_player_required: U hebt Flash-player nodig om Potlatch, de OpenStreetMap Flash-editor te gebruiken. Je kunt <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash-player van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er zijn ook andere opties</a> om OpenStreetMap te bewerken.
+      not_public: U hebt ingesteld dat uw bewerkingen niet openbaar zijn.
+      not_public_description: U kunt de kaart niet meer bewerken, behalve als u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw {{user_page}}.
+      potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen. Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt als u in livemodus bewerkt, of klikt u op de knop Opslaan.
       user_page_link: gebruikerspagina
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Lees waarom dit het geval is."
-      flash_player_required: 'Je hebt Flash-player nodig om Potlatch, de OpenStreetMap Flash-editor. Je kunt <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash-player van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er zijn ook andere opties</a> om OpenStreetMap te bewerken.'
-      potlatch_unsaved_changes: "Je hebt onopgeslagen wijzigingen. (Om op te slaan, moet je de huidige point of way deselecteren of, als je een save-knop hebt, hierop klikken.)"
-    sidebar:
-      search_results: Zoekresultaten
-      close: Sluiten
-    search:
+    index: 
+      js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld.
+      js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart.
+      js_3: Gebruik de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> als u niet de mogelijkheid hebt om JavaScript aan te zetten.
+      license: 
+        license_name: Creative Commons Naamsvermelding-Gelijk delen 2.0
+        notice: Gelicenseerd onder de {{license_name}} licentie door het {{project_name}} en zijn bijdragers.
+        project_name: OpenStreetMap-project
+      permalink: Permanente verwijzing
+      shortlink: Korte verwijzing
+    key: 
+      map_key: Legenda
+      table: 
+        entry: 
+          admin: Bestuurlijke grens
+          allotments: Volkstuinen
+          apron: 
+            - Luchthavenplatform
+            - terminal
+          bridge: Brug
+          bridleway: Ruiterpad
+          brownfield: Brownfield
+          building: Belangrijk gebouw
+          byway: Ventweg
+          cable: 
+            - Kabelbaan
+            - stoeltjeslift
+          cemetery: Begraafplaats
+          centre: Sportcentrum
+          commercial: Winkelgebied
+          common: 
+            - Algemeen
+            - weide
+          construction: Weg in aanbouw
+          cycleway: Fietspad
+          destination: Bestemmingsverkeer
+          farm: Boerderij
+          footway: Voetpad
+          forest: Bos
+          golf: Golfbaan
+          heathland: Heide
+          industrial: Industriegebied
+          lake: 
+            - Meer
+            - reservoir
+          military: Militair gebied
+          motorway: Snelweg
+          park: Park
+          permissive: Beperkte toegang
+          pitch: Sportvelden
+          primary: Primaire weg
+          private: PrivÃ©toegang
+          rail: Spoor
+          reserve: Natuurreservaat
+          resident: Bewoond gebied
+          retail: Winkelgebied
+          runway: 
+            - Start- en landingsbaan
+            - taxibaan
+          school: 
+            - School
+            - universiteit
+          secondary: Secundaire weg
+          station: Spoorwegstation
+          subway: Metro
+          summit: 
+            - Top
+            - piek
+          tourist: Touristische attractie
+          track: Spoor
+          tram: 
+            - Licht spoor
+            - tram
+          trunk: Rijksweg
+          tunnel: Tunnel
+          unclassified: Ongeclassificeerde weg
+          unsurfaced: Onverharde weg
+          wood: Bos
+        heading: Legenda voor z{{zoom_level}}
+    search: 
       search: Zoeken
-      where_am_i: "Waar ben ik?"
-      submit_text: "Ga"
-      search_help: "voorbeelden: 'Alkmaar', 'Spui, Amsterdam', 'CB2 5AQ', of 'post offices near Leiden' <a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>"
-    key:
-      map_key: "Legenda"
-  trace:
-    create:
-      upload_trace: "Upload GPS-track"
-      trace_uploaded: "Je track is geÃ¼pload en wacht totdat hij in de database wordt opgenomen. Dit gebeurt normaal binnen een half uur. Als het klaar is, zul je een e-mail ontvangen."
-    edit:
+      search_help: "voorbeelden: 'Alkmaar', 'Spui, Amsterdam', '1234 AA', of 'post offices near Leiden' (<a href='http://wiki.openstreetmap.org/wiki/Search'>meer voorbeelden...</a>)."
+      submit_text: OK
+      where_am_i: Waar ben ik?
+    sidebar: 
+      close: Sluiten
+      search_results: Zoekresultaten
+  trace: 
+    create: 
+      trace_uploaded: Uw track is geÃ¼pload en staat te wachten totdat hij in de database wordt opgenomen. Dit gebeurt meestal binnen een half uur. U ontvangt dan een e-mail.
+      upload_trace: Upload GPS-track
+    delete: 
+      scheduled_for_deletion: Track staat op de lijst voor verwijdering
+    edit: 
+      description: "Beschrijving:"
+      download: downloaden
+      edit: bewerken
       filename: "Bestandsnaam:"
-      uploaded_at: "GeÃ¼pload op:"
+      heading: Track {{name}} aan het bewerken
+      map: kaart
+      owner: "Eigenaar:"
       points: "Punten:"
+      save_button: Wijzigingen opslaan
       start_coord: "StartcoÃ¶rdinaat:"
-      edit: "bewerken"
-      owner: "Eigenaar:"
+      tags: "Labels:"
+      tags_help: kommegescheiden
+      title: Track {{name}} aan het bewerken
+      uploaded_at: "GeÃ¼pload op:"
+      visibility: "Zichtbaarheid:"
+      visibility_help: wat betekent dit?
+    list: 
+      public_traces: Openbare GPS-tracks
+      public_traces_from: Openbare GPS-tracks van {{user}}
+      tagged_with: " gelabeld met {{tags}}"
+      your_traces: Uw GPS-tracks
+    make_public: 
+      made_public: Track openbaar gemaakt
+    no_such_user: 
+      body: Sorry, er is geen gebruiker {{user}}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist.
+      heading: De gebruiker {{user}} bestaat niet
+      title: De gebruiker bestaat niet
+    trace: 
+      ago: "{{time_in_words_ago}} geleden"
+      by: door
+      count_points: "{{count}} punten"
+      edit: bewerken
+      edit_map: Kaart bewerken
+      in: in
+      map: kaart
+      more: meer
+      pending: BEZIG
+      private: PRIVÃ
+      public: OPENBAAR
+      trace_details: Trackdetails bekijken
+      view_map: Kaart bekijken
+    trace_form: 
+      description: Beschrijving
+      help: Help
+      tags: Labels
+      tags_help: kommagescheiden
+      upload_button: Uploaden
+      upload_gpx: Upload GPX-bestand
+      visibility: Zichtbaarheid
+      visibility_help: wat betekent dit?
+    trace_header: 
+      see_all_traces: Alle tracks zien
+      see_just_your_traces: Alleen uw eigen tracks weergeven, of een track uploaden
+      see_your_traces: Al uw tracks weergeven
+      traces_waiting: U hebt al {{count}} tracks die wachten om geÃ¼pload te worden. Overweeg om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt.
+    trace_optionals: 
+      tags: Labels
+    trace_paging_nav: 
+      of: van
+      showing: Bezig met weergeven van pagina
+    view: 
+      delete_track: Deze track verwijderen
       description: "Beschrijving:"
-      tags: "Tags:"
-      save_button: "Wijzigingen opslaan"
-    no_such_user:
-      body: "Sorry, er is geen gebruiker {{user}}. Controleer de spelling, of misschien is de link waarop je klikte verkeerd."
-    trace_form:
-      upload_gpx: "Upload GPX-bestand"
-      description: "Beschrijving"
-      tags: "Tags"
-      public: "Openbaar?"
-      upload_button: "Upload"
-      help: "Help"
-    trace_header:
-      see_just_your_traces: "Alleen je eigen tracks zien, of een track uploaden"
-      see_all_traces: "Alle tracks zien"
-      see_your_traces: "Al jouw tracks zien"
-      traces_waiting: "Je hebt al {{count}} tracks die wachten om geÃ¼pload te worden. Overweeg om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "BEZIG"
+      download: downloaden
+      edit: bewerken
+      edit_track: Deze track bewerken
       filename: "Bestandsnaam:"
-      download: "download"
-      uploaded: "GeÃ¼pload op:"
+      heading: Track {{name}} aan het bekijken
+      map: kaart
+      none: Geen
+      owner: "Eigenaar:"
+      pending: BEZIG
       points: "Punten:"
       start_coordinates: "StartcoÃ¶rdinaat:"
-      map: "kaart"
-      edit: "bewerken"
-      owner: "Eigenaar:"
-      description: "Beschrijving:"
-      tags: "Tags"
-      none: "Geen"
-      make_public: "Deze track permanent openbaar maken"
-      edit_track: "Deze track bewerken"
-      delete_track: "Deze track wissen"
-      heading: "Track {{name}} bekijken"
-      trace_not_found: "Track niet gevonden!"
-    trace_paging_nav:
-      showing: "Pagina"
-      of: "van"
-    trace:
-      pending: "BEZIG"
-      count_points: "{{count}} punten"
-      ago: "{{time_in_words_ago}} geleden"
-      more: "meer"
-      trace_details: "Trackdetails zien"
-      view_map: "Kaart zien"
-      edit: "bewerken"
-      edit_map: "Kaart bewerken"
-      public: "OPENBAAR"
-      private: "PRIVÃ"
-      by: "door"
-      in: "in"
-      map: "kaart"
-    list:
-      public_traces: "Openbare GPS-tracks"
-      your_traces: "Jouw GPS-tracks"
-      public_traces_from: "Openbare GPS-tracks van {{user}}"
-      tagged_with: " getagd met {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track staat op de lijst voor verwijdering"
-    make_public:
-      made_public: "Track openbaar gemaakt"
-  user:
-    login:
-      title: "Inloggen"
-      heading: "Inloggen"
-      please login: "Log in of {{create_user_link}}."
-      create_account: "maak een account aan"
+      tags: "Labels:"
+      title: Track {{name}} aan het bekijken
+      trace_not_found: De track is niet gevonden!
+      uploaded: "GeÃ¼pload op:"
+      visibility: "Zichtbaarheid:"
+  user: 
+    account: 
+      email never displayed publicly: (nooit openbaar gemaakt)
+      flash update success: De gebruikersinformatie is bijgewerkt.
+      flash update success confirm needed: De gebruikersinformatie is bijgewerkt. Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen.
+      home location: "Thuislocatie:"
+      latitude: "Breedtegraad:"
+      longitude: "Lengtegraad:"
+      make edits public button: Al mijn wijzigingen  openbaar maken
+      my settings: Mijn instellingen
+      no home location: Er is geen thuislocatie ingevoerd.
+      preferred languages: "Voorkeurstalen:"
+      profile description: "Profielbeschrijving:"
+      public editing: 
+        disabled: Uitgeschakeld. U kunt niet bewerken en al uw eerdere bewerkingen zijn anoniem.
+        disabled link text: waarom kan ik niets bewerken?
+        enabled: Ingeschakeld. U bent niet anoniem en u kunt bewerken.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: wat is dit?
+        heading: "Bewerkingen openbaar:"
+      return to profile: Terug naar profiel
+      save changes button: Wijzgingen opslaan
+      title: Gebruiker bewerken
+      update home location on click: Thuislocatie aanpassen bij klikken op de kaart
+    confirm: 
+      button: Bevestigen
+      failure: Er bestaat al een gebruiker met deze naam.
+      heading: Gebruikers bevestigen
+      press confirm button: Klik op de "Bevestigen" hieronder om uw gebruiker te activeren.
+      success: De gebruiker is geactiveerd. Dank u wel voor het registreren!
+    confirm_email: 
+      button: Bevestigen
+      failure: Er is al een e-mailadres bevestigd met dit token.
+      heading: Veranderd e-mailadres bevestigen
+      press confirm button: Druk op de bevestig-knop hieronder om je e-mailadres te activeren.
+      success: E-mailadres geactiveerd, dankjewel voor het registreren!
+    friend_map: 
+      nearby mapper: "Dichtbijzijnde mapper: [[nearby_user]]"
+      your location: Uw locatie
+    go_public: 
+      flash success: Al uw bewerkingen zijn nu openbaar en u kunt bewerken.
+    login: 
+      account not active: Sorry, uw gebruiker is nog niet actief.<br />Klik op de verwijzing in de bevestigingse-mail om deze te activeren.
+      auth failure: Sorry, met deze gegevens kunt u niet aanmelden.
+      create_account: registreren
       email or username: "E-mailadres of gebruikersnaam:"
+      heading: Aanmelden
+      login_button: Aanmelden
+      lost password link: Wachtwoord vergeten?
       password: "Wachtwoord:"
-      lost password link: "Wachtwoord vergeten?"
-      login_button: "Inloggen"
-      account not active: "Sorry, je account is nog niet actief.<br />Klik op de link in de bevestigingsmail om hem te activeren."
-      auth failure: "Sorry, je kon met deze details niet inloggen."
-    lost_password:
-      title: "vergeten wachtwoord"
-      heading: "Wachtwoord vergeten?"
-      email address: "E-mailadres:"
-      new password button: "Zend een nieuw wachtwoord"
-      notice email on way: "Jammer dat je het wachtwoord kwijt bent :-( maar een e-mail is op weg om het te resetten."
-      notice email cannot find: "Kon dat e-mailadres niet vinden, sorry."
-    reset_password:
-      title: "reset wachtwoord"
-      flash changed check mail: "Je wachtwoord is veranderd en het is onderweg naar je mailbox :-)"
-      flash token bad: "Kon die token niet vinden, controleer de URL." #don't know the translation for token
-    new:
-      title: "Account aanmaken"
-      heading: "Gebruikersaccount aanmaken"
-      no_auto_account_create: "Helaas zijn we niet in staat om automatisch een account aan te maken."
-      contact_webmaster: 'Leg contact met de <a href="mailto:webmaster@openstreetmap.org">webmaster</a> om een account te laten maken - we zullen proberen het zo snel mogelijk af te handelen.'
-      fill_form: "Vul het formulier in en we zullen zo snel mogelijk een mail zenden om het account te activeren."
-      license_agreement: "Door een account aan te maken, ga je akkoord dat al het werk dat je uploadt naar openstreetmap.org en dat alle gegevens die zijn gemaakt met programma's die hierbij horen (niet-exclusief) gelicenseerd zijn <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">deze Creative Commons-licentie (by-sa)</a>." #good translation?
+      please login: Aanmelden of {{create_user_link}}.
+      title: Aanmelden
+    lost_password: 
       email address: "E-mailadres:"
+      heading: Wachtwoord vergeten?
+      new password button: Nieuw wachtwoord verzenden
+      notice email cannot find: Kon dat e-mailadres niet vinden, sorry.
+      notice email on way: Jammer dat je het wachtwoord kwijt bent :-( maar een e-mail is op weg om het te resetten.
+      title: Wachtwoord vergeten
+    make_friend: 
+      already_a_friend: U bent al bevriend met {{name}}.
+      failed: Sorry, het toevoegen van {{name}} als vriend is mislukt.
+      success: "{{name}} is nu uw vriend."
+    new: 
       confirm email address: "E-mailadres bevestigen:"
-      not displayed publicly: 'Niet openbaar gemaakt (zie <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacyovereenkomst met een sectie over e-mailadressen">Privacyovereenkomst (en)</a>)'
+      confirm password: "Wachtwoord bevestigen:"
+      contact_webmaster: Neem contact op met de <a href="mailto:webmaster@openstreetmap.org">webmaster</a> om een gebruiker te laten maken. We proberen uw aanvraag dan zo snel mogelijk af te handelen.
       display name: "Weergavenaam:"
+      email address: "E-mailadres:"
+      fill_form: Vul het formulier in en we sturen u dan zo snel mogelijk een e-mail met gegevens over hoe u uw gebruiker kunt activeren.
+      flash create success message: De gebruiker is aangemaakt. Controleer uw e-mail voor een bevestigingse-mail, en dan kunt u zo gaan mappen :-)<br /><br />Denk eraan dat u niet kunt aanmelden voordat u uw bevestigingse-mail hebt ontvangen en deze hebt bevestigd.<br /><br />Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken.
+      heading: Gebruiker aanmaken
+      license_agreement: Door een gebruiker aan te maken geeft u aan dat u akkoord akkoord gaat met de voorwaarde dat al het werk dat u uploadt naar openstreetmap.org en dat alle gegevens die zijn gemaakt met programma's die hierbij horen (niet-exclusief) gelicenseerd zijn onder <a href="http://creativecommons.org/licenses/by-sa/2.0/">deze Creative Commons-licentie (by-sa)</a>.
+      no_auto_account_create: Helaas is het niet mogelijk om automatisch een gebruiker voor u aan te maken.
+      not displayed publicly: Niet openbaar gemaakt (zie <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacyovereenkomst met een sectie over e-mailadressen">Privacyovereenkomst (en)</a>)
       password: "Wachtwoord:"
-      confirm password: "Wachtwoord bevestigen:"
       signup: Registreren
-      flash create success message: "Gebruiker succesvol gemaakt. Bekijk je e-mail voor een bevestigingsmail, en je bent zÃ³ aan het mappen :-)<br /><br />Denk eraan dat je niet kunt inloggen voordat je je bevestigingsmail hebt ontvangen en bevestigd.<br /><br />Als je een spamfilter gebruikt die bevestigingsmails stuurt, zorg er dan voor dat je webmaster@openstreetmap.org toestaat. Wij kunnen namelijk geen bevestigingsmails terugsturen."
-    no_such_user:
-      body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je klikte onjuist."
-    view:
-      my diary: mijn dagboek
-      new diary entry: nieuw dagboek-artikel
-      my edits: mijn aanpassingen
-      my traces: mijn tracks
-      my settings: mijn instellingen
-      send message: bericht zenden
-      diary: dagboek
-      edits: aanpassingen
-      traces: tracks
-      remove as friend: vriend verwijderen
+      title: Gebruiker aanmaken
+    no_such_user: 
+      body: Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je klikte onjuist.
+      heading: De gebruiker {{user}} bestaat niet
+      title: Deze gebruiker bestaat niet
+    remove_friend: 
+      not_a_friend: "{{name}} staat niet in uw vriendelijst."
+      success: "{{name} is verwijderd uit uw vriendenlijst."
+    reset_password: 
+      confirm password: "Wachtwoord bevestigen:"
+      flash changed: Uw wachtwoord is gewijzigd.
+      flash token bad: Het token kon niet gevonden worden. Controleer de URL.
+      heading: Wachtwoord voor {{user}} opnieuw instellen
+      password: "Wachtwoord:"
+      reset: Wachtwoord opnieuw instellen
+      title: reset wachtwoord
+    set_home: 
+      flash success: De thuislocatie is opgeslagen
+    view: 
       add as friend: vriend toevoegen
-      mapper since: "Mapper sinds:"
-      ago: "({{time_in_words_ago}} geleden)"
-      user image heading: Gebruikersafbeelding
-      delete image: Afbeelding verwijderen
-      upload an image: Afbeelding uploaden
       add image: Afbeelding toevoegen
+      ago: ({{time_in_words_ago}} geleden)
+      change your settings: instellingen aanpassen
+      delete image: Afbeelding verwijderen
       description: Beschrijving
-      user location: Gebruikerslocatie
-      no home location: "Geen thuislocatie ingesteld."
-      if set location: "Als je je locatie instelt, zal er beneden een kaart verschijnen. Je kunt de locatie instellen op je {{settings_link}}."
-      settings_link_text: instellingen-pagina
-      your friends: Je vrienden
-      no friends: Je hebt nog geen vrienden toegevoegd.
+      diary: dagboek
+      edits: bewerkingen
+      if set location: Als u uw locatie instelt, verschijnt er hieronder een kaart. U kunt de locatie instellen in uw {{settings_link}}.
       km away: "{{count}}km ver"
+      m away: "{{count}} m verwijderd"
+      mapper since: "Mapper sinds:"
+      my diary: mijn dagboek
+      my edits: mijn bewerkingen
+      my settings: mijn instellingen
+      my traces: mijn tracks
+      my_oauth_details: Mijn OAuth-gegevens bekijken
       nearby users: "Dichtbijzijnde mappers:"
-      no nearby users: "Er zijn geen dichtbijzijnde mappers."
-      change your settings: instellingen aanpassen
-    friend_map:
-      your location: Jouw locatie
-      nearby mapper: "Dichtbijzijnde mapper: [[nearby_user]]"
-    account:
-      title: "Account bewerken"
-      my settings: Mijn instellingen
-      email never displayed publicly: "(nooit openbaar gemaakt)"
-      public editing:
-        heading: "Openbare aanpassingen"
-        enabled: "Staat aan. Je bent niet anoniem en je kunt bewerken."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "wat is dit?"
-        disabled: "Staat uit. Je kunt niet bewerken en alle eerdere bewerkingen zijn anoniem."
-        disabled link text: "waarom kan ik niets bewerken?"
-      profile description: "Profielbeschrijving:"
-      preferred languages: "Voorkeurstaal:"
-      home location: "Thuislocatie:"
-      no home location: "Er is geen thuislocatie ingevoerd."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Thuislocatie aanpassen als ik op de kaart klik?"
-      save changes button: Aanpassingen opslaan
-      make edits public button: Alle aanpassingen openbaar maken
-      return to profile: Terug naar profiel
-      flash update success confirm needed: "Gebruikersinformatie succesvol bijgewerkt. Controleer je e-mail om je nieuwe e-mailadress te bevestigen."
-      flash update success: "Gebruikersinformatie succesvol bijgewerkt."
-    confirm:
-      heading: Gebruikersaccount bevestigen
-      press confirm button: "Druk op de bevestig-knop hieronder om je account te activeren."
-      button: Bevestigen
-      success: "Account geactiveerd, dankjewel voor het registreren!"
-      failure: "Er is al een account met deze naam gemaakt."
-    confirm_email:
-      heading: Veranderd e-mailadres bevestigen
-      press confirm button: "Druk op de bevestig-knop hieronder om je e-mailadres te activeren."
-      button: Bevestigen
-      success: "E-mailadres geactiveerd, dankjewel voor het registreren!"
-      failure: "Er is al een e-mailadres met deze naam gemaakt."
-    set_home:
-      flash success: "Thuislocatie succesvol opgeslagen"
-    go_public:
-      flash success: "Al je aanpassingen zijn nu openbaar, nu is het toegestaan te bewerken."
-    make_friend:
-      success: "{{name}} is nu je vriend."
-      failed: "Sorry, toevoegen van {{name}} als vriend mislukt."
-      already_a_friend: "Je bent al vrienden met {{name}}."
-    remove_friend:
-      success: "{{name} is verwijderd van je vrienden."
-      not_a_friend: "{{name}} is geen vriend van jou."
+      new diary entry: nieuwe dagboekingave
+      no friends: U hebt nog geen vrienden toegevoegd.
+      no home location: Geen thuislocatie ingesteld.
+      no nearby users: Er zijn geen dichtbijzijnde mappers.
+      remove as friend: vriend verwijderen
+      send message: bericht verzenden
+      settings_link_text: voorkeuren
+      traces: tracks
+      upload an image: Afbeelding uploaden
+      user image heading: Gebruikersafbeelding
+      user location: Gebruikerslocatie
+      your friends: Uw vrienden
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 785fd4f3a..8b6871f19 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1,651 +1,614 @@
-pl:
-  activerecord:
-    # Translates all the model names which are used in error handling on the web site
-    models:
-      acl: "Lista ACL"
-      changeset: "Changeset"
-      changeset_tag: "Tag changesetu"
-      country: "PaÅstwo"
-      diary_comment: "Komentarz dziennika"
-      diary_entry: "Wpis w dzienniku"
-      friend: "Znajomy"
-      language: "JÄzyk"
-      message: "WiadomoÅÄ"
-      node: "WÄzeÅ"
-      node_tag: "Tag wÄzÅa"
-      notifier: "Notifier"
-      old_node: "WczeÅniejszy wÄzeÅ"
-      old_node_tag: "Tag wczeÅniejszego wÄzÅa"
-      old_relation: "Stara relacja"
-      old_relation_member: "CzÅonek wczeÅniejszej relacji"
-      old_relation_tag: "Tag wczeÅniejszej relacji"
-      old_way: "WczeÅniejsza droga"
-      old_way_node: "WÄzeÅ wczeÅniejszej drogi"
-      old_way_tag: "Tag wczeÅniejszej drogi"
-      relation: "Relacja"
-      relation_member: "CzÅonek relacji"
-      relation_tag: "Tag relacji"
-      session: "Sesja"
-      trace: "Ålad"
-      tracepoint: "Punkt Åladu"
-      tracetag: "Tag Åladu"
-      user: "UÅ¼ytkownik"
-      user_preference: "Preferencje uÅ¼ytkownika"
-      user_token: "Token uÅ¼ytkownika"
-      way: "Droga"
-      way_node: "WÄzeÅ drogi"
-      way_tag: "Tag drogi"
-    # Translates all the model attributes which are used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "TreÅÄ"
-      diary_entry:
-        user: "UÅ¼ytkownik"
-        title: "TytuÅ"
-        latitude: "SzerokoÅÄ geograficzna"
-        longitude: "DÅugoÅÄ geograficzna"
-        language: "JÄzyk"
-      friend:
-        user: "UÅ¼ytkownik"
-        friend: "Znajomy"
-      trace:
-        user: "UÅ¼ytkownik"
-        visible: "Widoczny"
-        name: "Nazwa"
-        size: "Rozmiar"
-        latitude: "SzerokoÅÄ geograficzna"
-        longitude: "DÅugoÅÄ geograficzna"
-        public: "Publiczny"
-        description: "Opis"
-      message:
-        sender: "Nadawca"
-        title: "TytuÅ"
-        body: "TreÅÄ"
-        recipient: "Odbiorca"
-      user:
-        email: "Email"
-        active: "Aktywny"
-        display_name: "Przyjazna nazwa"
-        description: "Opis"
-        languages: "JÄzyki"
-        pass_crypt: "HasÅo"
-  map:
-    view: Mapa
-    edit: Edycja
-    coordinates: "WspÃ³ÅrzÄdne:"
-  browse:
-    changeset:
-      title: "Changeset"
+pl: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: TreÅÄ
+      diary_entry: 
+        language: JÄzyk
+        latitude: SzerokoÅÄ geograficzna
+        longitude: DÅugoÅÄ geograficzna
+        title: TytuÅ
+        user: UÅ¼ytkownik
+      friend: 
+        friend: Znajomy
+        user: UÅ¼ytkownik
+      message: 
+        body: TreÅÄ
+        recipient: Odbiorca
+        sender: Nadawca
+        title: TytuÅ
+      trace: 
+        description: Opis
+        latitude: SzerokoÅÄ geograficzna
+        longitude: DÅugoÅÄ geograficzna
+        name: Nazwa
+        public: Publiczny
+        size: Rozmiar
+        user: UÅ¼ytkownik
+        visible: Widoczny
+      user: 
+        active: Aktywny
+        description: Opis
+        display_name: Przyjazna nazwa
+        email: Email
+        languages: JÄzyki
+        pass_crypt: HasÅo
+    models: 
+      acl: Lista ACL
+      changeset: Changeset
+      changeset_tag: Tag changesetu
+      country: PaÅstwo
+      diary_comment: Komentarz dziennika
+      diary_entry: Wpis w dzienniku
+      friend: Znajomy
+      language: JÄzyk
+      message: WiadomoÅÄ
+      node: WÄzeÅ
+      node_tag: Tag wÄzÅa
+      notifier: Notifier
+      old_node: WczeÅniejszy wÄzeÅ
+      old_node_tag: Tag wczeÅniejszego wÄzÅa
+      old_relation: Stara relacja
+      old_relation_member: CzÅonek wczeÅniejszej relacji
+      old_relation_tag: Tag wczeÅniejszej relacji
+      old_way: WczeÅniejsza droga
+      old_way_node: WÄzeÅ wczeÅniejszej drogi
+      old_way_tag: Tag wczeÅniejszej drogi
+      relation: Relacja
+      relation_member: CzÅonek relacji
+      relation_tag: Tag relacji
+      session: Sesja
+      trace: Ålad
+      tracepoint: Punkt Åladu
+      tracetag: Tag Åladu
+      user: UÅ¼ytkownik
+      user_preference: Preferencje uÅ¼ytkownika
+      user_token: Token uÅ¼ytkownika
+      way: Droga
+      way_node: WÄzeÅ drogi
+      way_tag: Tag drogi
+  browse: 
+    changeset: 
       changeset: "Changeset: {{id}}"
-      download: "ÅciÄgnij {{changeset_xml_link}} lub {{osmchange_xml_link}}"
-      changesetxml: "XML w formacie Changesetu"
-      osmchangexml: "XML w formacie osmChange"
-    changeset_details:
-      created_at: "Utworzono:"
-      closed_at: "ZamkniÄto:"
+      changesetxml: XML w formacie Changesetu
+      download: ÅciÄgnij {{changeset_xml_link}} lub {{osmchange_xml_link}}
+      osmchangexml: XML w formacie osmChange
+      title: Changeset
+    changeset_details: 
       belongs_to: "NaleÅ¼y do:"
       bounding_box: "ProstokÄt min/max:"
-      no_bounding_box: "Ten changeset zostaÅ zapisany bez prostokÄtu ograniczajÄcego."
-      show_area_box: "PokaÅ¼ obszar prostokÄtu"
-      box: "prostokÄt"
+      box: prostokÄt
+      closed_at: "ZamkniÄto:"
+      created_at: "Utworzono:"
       has_nodes: "Zawiera nastÄpujÄcych {{count}} wÄzÅÃ³w:"
-      has_ways: "Zawiera nastÄpujÄcych {{count}} drÃ³g:"
       has_relations: "Zawiera nastÄpujÄcych {{count}} relacji:"
+      has_ways: "Zawiera nastÄpujÄcych {{count}} drÃ³g:"
+      no_bounding_box: Ten changeset zostaÅ zapisany bez prostokÄtu ograniczajÄcego.
+      show_area_box: PokaÅ¼ obszar prostokÄtu
     common_details: 
       edited_at: "Edytowano:"
       edited_by: "EdytowaÅ(a):"
-      version: "Wersja:"
       in_changeset: "W changesecie:"
-    containing_relation:
-      entry: "Relacja {{relation_name}}"
-      entry_role: "Relacja {{relation_name}} (jako {{relation_role}})"
-    map:
-      loading: "Wczytywanie..."
-      deleted: "Skasowano"
-    node_details:
+      version: "Wersja:"
+    containing_relation: 
+      entry: Relacja {{relation_name}}
+      entry_role: Relacja {{relation_name}} (jako {{relation_role}})
+    map: 
+      deleted: Skasowano
+      loading: Wczytywanie...
+    node: 
+      download: "{{download_xml_link}} lub {{view_history_link}}"
+      download_xml: ÅciÄgnij XML
+      node: WÄzeÅ
+      node_title: "WÄzeÅ: {{node_name}}"
+      view_history: zobacz historiÄ zmian
+    node_details: 
       coordinates: "WspÃ³ÅrzÄdne:"
       part_of: "Jest czÄÅciÄ:"
-    node_history:
-      node_history: "Historia zmian wÄzÅa"
+    node_history: 
       download: "{{download_xml_link}} lub {{view_details_link}}"
-      download_xml: "ÅciÄgnij XML"
-      view_details: "zobacz szczegÃ³Åy"
-    node:
-      node: "WÄzeÅ"
-      node_title: "WÄzeÅ: {{node_name}}"
+      download_xml: ÅciÄgnij XML
+      node_history: Historia zmian wÄzÅa
+      view_details: zobacz szczegÃ³Åy
+    not_found: 
+      sorry: Niestety {{type}} o id {{id}} nie zostaÅ znaleziony.
+    paging_nav: 
+      of: z
+      showing_page: Widoczna jest strona
+    relation: 
       download: "{{download_xml_link}} lub {{view_history_link}}"
-      download_xml: "ÅciÄgnij XML"
-      view_history: "zobacz historiÄ zmian"
-    not_found:
-      sorry: "Niestety {{type}} o id {{id}} nie zostaÅ znaleziony."
-    paging_nav:
-      showing_page: "Widoczna jest strona"
-      of: "z"
-    relation_details:
+      download_xml: ÅciÄgnij XML
+      relation: Relacja
+      relation_title: "Relacja: {{relation_name}}"
+      view_history: zobacz historiÄ zmian
+    relation_details: 
       members: "Zawiera:"
       part_of: "Jest czÄÅciÄ:"
-    relation_history:
-      relation_history: "Historia zmian relacji"
+    relation_history: 
+      relation_history: Historia zmian relacji
       relation_history_title: "Historia relacji: {{relation_name}}"
-    relation:
-      relation: "Relacja"
-      relation_title: "Relacja: {{relation_name}}"
-      download: "{{download_xml_link}} lub {{view_history_link}}"
-      download_xml: "ÅciÄgnij XML"
-      view_history: "zobacz historiÄ zmian"
-    start:
-      view_data: "Zobacz dane w aktualnym widoku mapy"
-      manually_select: "Manualnie wybierz inny obszar"
-    start_rjs:
-      data_frame_title: "Dane"
-      zoom_or_select: "PrzybliÅ¼ albo wybierz inny obszar mapy"
-      drag_a_box: "Zaznacz prostokÄt na mapie przeciÄgniÄciem myszki aby wybraÄ obszar"
-      manually_select: "Manualnie wybierz inny obszar"
-      loaded_an_area_with_num_features: "ZaÅadowano obszar zawierajÄcy [[num_features]] obiektÃ³w.  PrzeglÄdarki mogÄ nie radziÄ sobie z wyÅwietleniem tej iloÅci danych -- generalnie dziaÅajÄ optymalnie przy wyÅwietlaniu mniej niÅ¼ 100 obiektÃ³w jednoczeÅnie, w przeciwnym wypadku przeglÄdarka moÅ¼e dziaÅac powoli lub przestaÄ odpowiadaÄ.  JeÅli jesteÅ pewien Å¼e chcesz wyÅwietliÄ dane, kliknij przycisk poniÅ¼ej."
-      load_data: "ZaÅaduj dane"
+    start: 
+      manually_select: Manualnie wybierz inny obszar
+      view_data: Zobacz dane w aktualnym widoku mapy
+    start_rjs: 
+      data_frame_title: Dane
+      details: SzczegÃ³Åy
+      drag_a_box: Zaznacz prostokÄt na mapie przeciÄgniÄciem myszki aby wybraÄ obszar
+      edited_by_user_at_timestamp: Edytowany przez [[user]] ostatni raz [[timestamp]]
+      history_for_feature: Historia zmian dla [[feature]]
+      load_data: ZaÅaduj dane
+      loaded_an_area_with_num_features: ZaÅadowano obszar zawierajÄcy [[num_features]] obiektÃ³w.  PrzeglÄdarki mogÄ nie radziÄ sobie z wyÅwietleniem tej iloÅci danych -- generalnie dziaÅajÄ optymalnie przy wyÅwietlaniu mniej niÅ¼ 100 obiektÃ³w jednoczeÅnie, w przeciwnym wypadku przeglÄdarka moÅ¼e dziaÅac powoli lub przestaÄ odpowiadaÄ.  JeÅli jesteÅ pewien Å¼e chcesz wyÅwietliÄ dane, kliknij przycisk poniÅ¼ej.
+      loading: Wczytywanie...
+      manually_select: Manualnie wybierz inny obszar
+      private_user: prywatny uÅ¼ytkownika
+      show_history: PokaÅ¼ zmiany
       unable_to_load_size: "Nie moÅ¼na zaÅadowaÄ: prostokÄt ograniczajÄcy [[bbox_size]] jest zbyt duÅ¼y (nie moÅ¼e przekraczaÄ {{max_bbox_size}} stopnia)"
-      loading: "Wczytywanie..."
-      show_history: "PokaÅ¼ zmiany"
-      wait: "Moment..."
-      history_for_feature: "Historia zmian dla [[feature]]"
-      details: "SzczegÃ³Åy"
-      private_user: "prywatny uÅ¼ytkownika"
-      edited_by_user_at_timestamp: "Edytowany przez [[user]] ostatni raz [[timestamp]]"
-    tag_details:
+      wait: Moment...
+      zoom_or_select: PrzybliÅ¼ albo wybierz inny obszar mapy
+    tag_details: 
       tags: "Tagi:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} lub {{view_history_link}}"
+      download_xml: ÅciÄgnij XML
+      way: Droga
+      way_title: "Droga: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: naleÅ¼y rÃ³wnieÅ¼ do drogi {{related_ways}}
+        other: naleÅ¼y rÃ³wnieÅ¼ do drÃ³g {{related_ways}}
       nodes: "WÄzÅy:"
       part_of: "Jest czÄÅciÄ:"
-      also_part_of:
-        one: "naleÅ¼y rÃ³wnieÅ¼ do drogi {{related_ways}}"
-        other: "naleÅ¼y rÃ³wnieÅ¼ do drÃ³g {{related_ways}}"
-    way_history:
-      way_history: "Historia zmian drogi"
-      way_history_title: "Historia drogi: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} lub {{view_details_link}}"
-      download_xml: "ÅciÄgnij XML"
-      view_details: "zobacz szczegÃ³Åy"
-    way:
-      way: "Droga"
-      way_title: "Droga: {{way_name}}"
-      download: "{{download_xml_link}} lub {{view_history_link}}"
-      download_xml: "ÅciÄgnij XML"
-      view_details: "zobacz szczegÃ³Åy"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "Widoczna jest strona"
-      of: "z"
-    changeset:
-      still_editing: "(nadal edytowany)"
-      anonymous: "Anonim"
-      no_comment: "(brak)"
-      no_edits: "(brak edycji)"
-      show_area_box: "pokaÅ¼ prostokÄt zawierajÄcy"
-      big_area: "(peÅny)"
-      view_changeset_details: "Zobacz szczegÃ³Åy changesetu"
-    changesets:
-      id: "ID"
-      saved_at: "Zapisano"
-      user: "UÅ¼ytkownik"
-      comment: "Komentarz"
-      area: "Obszar"
-    list_bbox:
-      history: "Historia"
-      changesets_within_the_area: "Changesety w tym obszarze:"
-      show_area_box: "pokaÅ¼ prostokÄt"
-      no_changesets: "Brak changesetÃ³w"
-      all_changes_everywhere: "Zobacz teÅ¼ globalnÄ {{recent_changes_link}}."
-      recent_changes: "listÄ ostatnich zmian"
-      no_area_specified: "Nie podano obszaru"
-      first_use_view: "UÅ¼yj najpierw {{view_tab_link}} aby wyÅwietliÄ interesujÄcy CiÄ obszar, nastÄpnie przejdÅº do zakÅadki Zmiany."
-      view_the_map: "zobacz mapÄ"
-      view_tab: "zakÅadki Mapa"
-      alternatively_view: "MoÅ¼esz teÅ¼ objerzeÄ globalnÄ {{recent_changes_link}}"
-    list:
-      recent_changes: "NajÅwieÅ¼sze zmiany"
-      recently_edited_changesets: "Ostatnio edytowane changesety:"
-      for_more_changesets: "PeÅne listy zmian dostÄpne sÄ po wybraniu uÅ¼ytkownika i klikniÄciu na historiÄ jego edycji, a takÅ¼e wedÅug obszarÃ³w w zakÅadce Zmiany."
-    list_user:
-      edits_by_username: "Edycje dokonane przez {{username_link}}"
-      no_visible_edits_by: "Brak edycji autora {{name}} do wyÅwietlenia."
-      for_all_changes: "Å»eby obejrzeÄ zmiany wszystkich autorÃ³w przejdÅº do globalnej {{recent_changes_link}}"
-      recent_changes: "listy ostatnich zmian"
-  diary_entry:
-    new:
-      title: Nowy wpis do dziennika
-    list:
-      title: "Dzienniki uÅ¼ytkownikÃ³w"
-      user_title: "Dziennik dla {{user}}"
-      new: Nowy wpis do dziennika
-      new_title: StwÃ³rz nowy wpis w Twoim dzienniku uÅ¼ytkownika
-      no_entries: Brak wpisÃ³w dziennika
-      recent_entries: "Ostatnie wpisy do dziennika:"
-      older_entries: Starsze wpisy
-      newer_entries: Nowsze wpisy
-    edit:
-      title: "Edycja wpisu dziennika"
-      subject: "Temat:"
+      download_xml: ÅciÄgnij XML
+      view_details: zobacz szczegÃ³Åy
+      way_history: Historia zmian drogi
+      way_history_title: "Historia drogi: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonim
+      big_area: (peÅny)
+      no_comment: (brak)
+      no_edits: (brak edycji)
+      show_area_box: pokaÅ¼ prostokÄt zawierajÄcy
+      still_editing: (nadal edytowany)
+      view_changeset_details: Zobacz szczegÃ³Åy changesetu
+    changeset_paging_nav: 
+      of: z
+      showing_page: Widoczna jest strona
+    changesets: 
+      area: Obszar
+      comment: Komentarz
+      id: ID
+      saved_at: Zapisano
+      user: UÅ¼ytkownik
+  diary_entry: 
+    diary_comment: 
+      comment_from: Komentarz od {{link_user}} z {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 komentarz
+        other: "{{count}} komentarzy"
+      comment_link: Skomentuj ten wpis
+      edit_link: Edytuj ten wpis
+      posted_by: Wpis od {{link_user}} z {{created}} w jÄzyku {{language_link}}
+      reply_link: Odpowiedz na ten wpis
+    edit: 
       body: "TreÅÄ:"
       language: "JÄzyk:"
-      location: "PoÅoÅ¼enie:"
       latitude: "SzerokoÅÄ geograficzna:"
+      location: "PoÅoÅ¼enie:"
       longitude: "DÅugoÅÄ geograficzna:"
-      use_map_link: "na mapie"
-      save_button: "Zapisz"
       marker_text: Umiejscowienie wpisu dziennika
-    view:
-      title: "Wpisy uÅ¼ytkownikÃ³w | {{user}}"
-      user_title: "Dziennik dla {{user}}"
-      leave_a_comment: "Zostaw komentarz"
-      save_button: "Zapisz"
-    no_such_entry:
+      save_button: Zapisz
+      subject: "Temat:"
+      title: Edycja wpisu dziennika
+      use_map_link: na mapie
+    list: 
+      new: Nowy wpis do dziennika
+      new_title: StwÃ³rz nowy wpis w Twoim dzienniku uÅ¼ytkownika
+      newer_entries: Nowsze wpisy
+      no_entries: Brak wpisÃ³w dziennika
+      older_entries: Starsze wpisy
+      recent_entries: "Ostatnie wpisy do dziennika:"
+      title: Dzienniki uÅ¼ytkownikÃ³w
+      user_title: Dziennik dla {{user}}
+    new: 
+      title: Nowy wpis do dziennika
+    no_such_entry: 
+      body: Niestety nie znaleziono wpisu dziennika / komentarza o id {{id}}, sprawdÅº pisowniÄ.  Byc moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny.
       heading: "Brak wpisu o id: {{id}}"
-      body: "Niestety nie znaleziono wpisu dziennika / komentarza o id {{id}}, sprawdÅº pisowniÄ.  Byc moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny."
-    no_such_user:
-      title: "Nie znaleziono uÅ¼ytkownika"
-      body: "Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny."
-    diary_entry:
-      posted_by: "Wpis od {{link_user}} z {{created}} w jÄzyku {{language_link}}"
-      comment_link: Skomentuj ten wpis
-      reply_link: Odpowiedz na ten wpis
-      comment_count:
-        one: 1 komentarz
-        two: 2 komentarze
-        three: 3 komentarze
-        four: 4 komentarze
-        other: "{{count}} komentarzy"
-      edit_link: Edytuj ten wpis
-    diary_comment:
-      comment_from: "Komentarz od {{link_user}} z {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Obszar do eksportu"
-      manually_select: "RÄcznie zaznacz inny obszar"
-      format_to_export: "Format eksportu"
-      osm_xml_data: "Dane XML OpenStreetMap"
-      mapnik_image: "Obrazek z Mapnika"
-      osmarender_image: "Obrazek z Osmarender"
-      embeddable_html: "HTML do wklejenia"
-      licence: "Licencja"
-      export_details: 'Dane OpenStreetMap sÄ na licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.'
-      options: "Opcje"
-      format: "Format"
-      scale: "Skala"
-      max: "max"
+    no_such_user: 
+      body: Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny.
+      title: Nie znaleziono uÅ¼ytkownika
+    view: 
+      leave_a_comment: Zostaw komentarz
+      save_button: Zapisz
+      title: Wpisy uÅ¼ytkownikÃ³w | {{user}}
+      user_title: Dziennik dla {{user}}
+  export: 
+    start: 
+      add_marker: Dodaj pinezkÄ na mapie
+      area_to_export: Obszar do eksportu
+      embeddable_html: HTML do wklejenia
+      export_button: Eksportuj
+      export_details: Dane OpenStreetMap sÄ na licencji <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
+      format: Format
+      format_to_export: Format eksportu
       image_size: "Rozmiar obrazka:"
-      zoom: "Zoom"
-      add_marker: "Dodaj pinezkÄ na mapie"
       latitude: "Szer:"
+      licence: Licencja
       longitude: "DÅ:"
-      output: "Wynik"
-      paste_html: "UÅ¼yj podanego kodu HTML, aby umieÅciÄ na stronie"
-      export_button: "Eksportuj"
-    start_rjs:
-      export: "Eksport"
-      drag_a_box: "PrzeciÄgniÄciem zaznacz prostokÄt na mapie"
-      manually_select: "RÄcznie zaznacz inny obszar"
-      click_add_marker: "Kliknij na mapie aby dodaÄ pinezkÄ"
-      change_marker: "ZmieÅ pozycjÄ pinezki"
-      add_marker: "Dodaj pinezkÄ na mapie"
-      view_larger_map: "WiÄkszy widok mapy"
-  geocoder:
-    search:
-      title:
-        latlon: 'Wyniki z <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Wyniki z <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Wyniki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Wyniki z <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Wyniki z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Wyniki z <a href="http://www.geonames.org/">GeoNames</a>'
-    results:
-      no_results: "Nie znaleziono"
-  layouts:
-    welcome_user: "Witaj, {{user_link}}"
-    welcome_user_link_tooltip: "Strona uÅ¼ytkownika"
-    home: "gÅÃ³wna"
-    home_tooltip: "PrzejdÅº do strony gÅÃ³wnej"
-    inbox: "skrzynka ({{count}})"
-    inbox_tooltip:
-      zero: "Brak nowych wiadomoÅci"
-      one: "Twoja skrzynka zawiera jednÄ nowÄ wiadomoÅÄ"
-      other: "Twoja skrzynka zawiera  {{count}} nowych wiadomoÅci"
-    logout: wyloguj
-    logout_tooltip: "Wyloguj"
-    log_in: zaloguj siÄ
-    log_in_tooltip: "Zaloguj siÄ"
-    sign_up: zarejestruj
-    view: Mapa
+      manually_select: RÄcznie zaznacz inny obszar
+      mapnik_image: Obrazek z Mapnika
+      max: max
+      options: Opcje
+      osm_xml_data: Dane XML OpenStreetMap
+      osmarender_image: Obrazek z Osmarender
+      output: Wynik
+      paste_html: UÅ¼yj podanego kodu HTML, aby umieÅciÄ na stronie
+      scale: Skala
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Dodaj pinezkÄ na mapie
+      change_marker: ZmieÅ pozycjÄ pinezki
+      click_add_marker: Kliknij na mapie aby dodaÄ pinezkÄ
+      drag_a_box: PrzeciÄgniÄciem zaznacz prostokÄt na mapie
+      export: Eksport
+      manually_select: RÄcznie zaznacz inny obszar
+      view_larger_map: WiÄkszy widok mapy
+  geocoder: 
+    results: 
+      no_results: Nie znaleziono
+    search: 
+      title: 
+        ca_postcode: Wyniki z <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Wyniki z <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Wyniki z <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Wyniki z <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Wyniki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Wyniki z <a href="http://geocoder.us/">Geocoder.us</a>
+  layouts: 
+    alt_donation: ZrÃ³b DonacjÄ
+    donate: WspomÃ³Å¼ Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego SprzÄtu.
+    donate_link_text: dokonujÄc darowizny
     edit: Edycja
-    history: Zmiany
     export: Eksport
     gps_traces: Ålady GPS
-    gps_traces_tooltip: "ZarzÄdzaj Åladami"
-    user_diaries: Dzienniczki
-    user_diaries_tooltip: "PrzeglÄdaj dzienniczki uÅ¼ytkownika"
-    tag_line: Swobodna Wiki-Mapa Åwiata
-    intro_1: "OpenStreetMap to mapa caÅego Åwiata ktÃ³rÄ moÅ¼esz swobodnie edytowaÄ.  Tworzona przez ludzi takich jak Ty."
-    intro_2: "OpenStreetMap pozwala oglÄdaÄ, korzystaÄ, i kolaboratywnie tworzyÄ dane geograficzne z dowolnego miejsca na Ziemi."
-    intro_3: "Hosting OpenStreetMap jest wspomagany przez {{ucl}} i {{bytemark}}."
-    osm_offline: "Baza danych OpenStreetMap jest niedostÄpna na czas waÅ¼nych zadaÅ administracyjnych ktÃ³re sÄ w tym momencie wykonywane."
-    osm_read_only: "Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas waÅ¼nych zadaÅ administracyjnych ktÃ³re sÄ w tym momencie wykonywane."
-    donate: "WspomÃ³Å¼ Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego SprzÄtu."
-    donate_link_text: dokonujÄc darowizny
-    help_wiki: "Pomoc &amp; Wiki"
-    news_blog: "Blog wiadomoÅci"
+    gps_traces_tooltip: ZarzÄdzaj Åladami
+    help_wiki: Pomoc &amp; Wiki
+    history: Zmiany
+    home: gÅÃ³wna
+    home_tooltip: PrzejdÅº do strony gÅÃ³wnej
+    inbox: skrzynka ({{count}})
+    inbox_tooltip: 
+      one: Twoja skrzynka zawiera jednÄ nowÄ wiadomoÅÄ
+      other: Twoja skrzynka zawiera  {{count}} nowych wiadomoÅci
+      zero: Brak nowych wiadomoÅci
+    intro_1: OpenStreetMap to mapa caÅego Åwiata ktÃ³rÄ moÅ¼esz swobodnie edytowaÄ.  Tworzona przez ludzi takich jak Ty.
+    intro_2: OpenStreetMap pozwala oglÄdaÄ, korzystaÄ, i kolaboratywnie tworzyÄ dane geograficzne z dowolnego miejsca na Ziemi.
+    intro_3: Hosting OpenStreetMap jest wspomagany przez {{ucl}} i {{bytemark}}.
+    log_in: zaloguj siÄ
+    log_in_tooltip: Zaloguj siÄ
+    logout: wyloguj
+    logout_tooltip: Wyloguj
+    news_blog: Blog wiadomoÅci
+    osm_offline: Baza danych OpenStreetMap jest niedostÄpna na czas waÅ¼nych zadaÅ administracyjnych ktÃ³re sÄ w tym momencie wykonywane.
+    osm_read_only: Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas waÅ¼nych zadaÅ administracyjnych ktÃ³re sÄ w tym momencie wykonywane.
     shop: Zakupy
-    sotm: 'Wpadnij na tegorocznÄ KonferencjÄ OpenStreetMap, The State of the Map, 10-12 Lipca w Amsterdamie!'
-    alt_donation: ZrÃ³b DonacjÄ
-  notifier:
-    diary_comment_notification:
+    sign_up: zarejestruj
+    sotm: Wpadnij na tegorocznÄ KonferencjÄ OpenStreetMap, The State of the Map, 10-12 Lipca w Amsterdamie!
+    tag_line: Swobodna Wiki-Mapa Åwiata
+    user_diaries: Dzienniczki
+    user_diaries_tooltip: PrzeglÄdaj dzienniczki uÅ¼ytkownika
+    view: Mapa
+    welcome_user: Witaj, {{user_link}}
+    welcome_user_link_tooltip: Strona uÅ¼ytkownika
+  map: 
+    coordinates: "WspÃ³ÅrzÄdne:"
+    edit: Edycja
+    view: Mapa
+  message: 
+    inbox: 
+      date: Nadano
+      from: Od
+      my_inbox: Moja skrzynka odbiorcza
+      no_messages_yet: Nie masz jeszcze wiadomoÅci.  Czemu nie podyskutowaÄ z {{people_mapping_nearby_link}}.
+      outbox: nadawcza
+      people_mapping_nearby: mapowiczami w Twojej okolicy
+      subject: Temat
+      title: WiadomoÅci odebrane
+      you_have: Masz {{new_count}} nowych i {{old_count}} przeczytanych wiadomoÅci.
+    mark: 
+      as_read: WiadomoÅÄ zostaÅa oznaczona jako przeczytana
+      as_unread: WiadomoÅÄ zostaÅa oznaczona jako nieprzeczytana
+    message_summary: 
+      read_button: Oznacz jako przeczytanÄ
+      reply_button: Odpowiedz
+      unread_button: Oznacz jako nieprzeczytanÄ
+    new: 
+      back_to_inbox: PowrÃ³t do skrzynki
+      body: TreÅÄ
+      message_sent: WiadomoÅÄ wysÅana
+      send_button: WyÅlij
+      send_message_to: WyÅlij nowÄ wiadomoÅÄ do {{name}}
+      subject: Temat
+      title: WysyÅanie wiadomoÅci
+    no_such_user: 
+      body: Niestety nie znaleziono uÅ¼ytkownika / wiadomoÅci o tej nazwie lub id
+      heading: Nie ma takiego uÅ¼ytkownika / wiadomoÅci
+    outbox: 
+      date: Nadano
+      inbox: odbiorcza
+      my_inbox: Moja skrzynka {{inbox_link}}
+      outbox: nadawcza
+      people_mapping_nearby: mapowiczami w Twojej okolicy
+      subject: Temat
+      title: WiadomoÅci wysÅane
+      to: Do
+      you_have_sent_messages: WysÅaleÅ/aÅ {{sent_count}} wiadomoÅci
+    read: 
+      back_to_inbox: PowrÃ³t do wysÅanych
+      date: Nadano
+      from: Od
+      reading_your_messages: Czytanie odebranej wiadomoÅci
+      reading_your_sent_messages: Czytanie wysÅanej wiadomoÅci
+      reply_button: Odpowiedz
+      subject: Temat
+      title: Czytanie wiadomoÅci
+      to: Do
+      unread_button: Oznacz jako nieprzeczytanÄ
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                     Nie odpowiadaj na tego maila.                       *"
       banner2: "*                 UÅ¼yj strony OpenStreetMap w tym celu.                   *"
-      hi: "Witaj {{to_user}},"
+      footer: MoÅ¼esz rÃ³wnieÅ¼ przeczytaÄ komentarz pod {{readurl}}, skomentowaÄ go pod {{commenturl}} lub odpowiedzieÄ pod {{replyurl}}
       header: "{{from_user}} zostawiÅ(a) komentarz do twojego wpisu w dziennikach OpenStreetMap o temacie {{subject}}:"
-      footer: "MoÅ¼esz rÃ³wnieÅ¼ przeczytaÄ komentarz pod {{readurl}}, skomentowaÄ go pod {{commenturl}} lub odpowiedzieÄ pod {{replyurl}}"
-    friend_notification:
+      hi: Witaj {{to_user}},
+    friend_notification: 
       had_added_you: "{{user}} dodaÅ(a) CiÄ jako swojego znajomego na OpenStreetMap."
-      see_their_profile: "MoÅ¼esz przeczytaÄ jego/jej profil pod {{userurl}} oraz dodaÄ jako Twojego znajomego/Ä jeÅli chcesz."
-    signup_confirm_plain:
-      greeting: "CzeÅÄ!"
-      hopefully_you: "KtoÅ (prawdopodobnie Ty sam(a)) chciaÅby utworzyÄ konto na"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "JeÅli to Ty, witamy!  Kliknij poniÅ¼szy link Å¼eby potwierdziÄ"
-      click_the_link_2: "Twoje nowe konto i dowiedzieÄ siÄ wiÄcej o OpenStreetMap."
+      see_their_profile: MoÅ¼esz przeczytaÄ jego/jej profil pod {{userurl}} oraz dodaÄ jako Twojego znajomego/Ä jeÅli chcesz.
+    signup_confirm_html: 
+      click_the_link: JeÅli to Ty, witamy!  Kliknij poniÅ¼szy link Å¼eby potwierdziÄ Twoje nowe konto i dowiedzieÄ siÄ wiÄcej o OpenStreetMap.
+      current_user: Aktualne listy uÅ¼ytkownikÃ³w wedÅug ich poÅoÅ¼enia na Ziemi znajdziesz na stronie <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Zacznij czytaÄ o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Pl:Beginners_Guide">na naszej wiki</a> i <a href="http://www.opengeodata.org/">blogu opengeodata</a> ktÃ³ry ma nawet <a href="http://www.opengeodata.org/?cat=13">podcasty do posÅuchania</a>!
+      greeting: CzeÅÄ!
+      hopefully_you: KtoÅ (prawdopodobnie Ty sam(a)) chciaÅby utworzyÄ konto na
+      introductory_video: To dobry moment Å¼eby obejrzeÄ {{introductory_video_link}}.
+      more_videos: Mamy  {{more_videos_link}}.
+      more_videos_here: wiÄcej materiaÅu wideo tutuaj
+      user_wiki_page: Najlepiej stwÃ³rz swojÄ stronÄ uÅ¼ytkownika na wiki zawierajÄcÄ odpowiednie kategorie wskazujÄce twojÄ lokalizacjÄ, np. <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Warszawa">[[Category:Users_in_Warszawa]]</a>.
+      video_to_openstreetmap: wideo-wprowadzenie do OpenStreetMap
+      wiki_signup: ZaÅÃ³Å¼ sobie <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">konto na wiki projektu OpenStreetMap</a> jeÅli chcesz.
+    signup_confirm_plain: 
+      click_the_link_1: JeÅli to Ty, witamy!  Kliknij poniÅ¼szy link Å¼eby potwierdziÄ
+      click_the_link_2: Twoje nowe konto i dowiedzieÄ siÄ wiÄcej o OpenStreetMap.
+      current_user_1: Aktualne listy uÅ¼ytkownikÃ³w wedÅug ich poÅoÅ¼enia na Ziemi znajdziesz
+      current_user_2: "tu:"
+      greeting: CzeÅÄ!
+      hopefully_you: KtoÅ (prawdopodobnie Ty sam(a)) chciaÅby utworzyÄ konto na
       introductory_video: "To dobry moment Å¼eby obejrzeÄ wideo-wprowadzenie do OpenStreetMap tutaj:"
       more_videos: "WiÄcej materiaÅu wideo znajdziesz na:"
-      the_wiki: "Zacznij czytaÄ o OpenStreetMap na naszej wiki:"
       opengeodata: "OpenGeoData.org to blog OpenStreetMap, ma nawet podcasty:"
+      the_wiki: "Zacznij czytaÄ o OpenStreetMap na naszej wiki:"
+      user_wiki_1: Najlepiej stwÃ³rz swojÄ stronÄ uÅ¼ytkownika na wiki zawierajÄcÄ odpowiednie
+      user_wiki_2: kategorie wskazujÄce twojÄ lokalizacjÄ, np. [[Category:Users_in_Warszawa]].
       wiki_signup: "ZaÅÃ³Å¼ sobie konto na wiki projektu OpenStreetMap jeÅli chcesz:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "Najlepiej stwÃ³rz swojÄ stronÄ uÅ¼ytkownika na wiki zawierajÄcÄ odpowiednie"
-      user_wiki_2: "kategorie wskazujÄce twojÄ lokalizacjÄ, np. [[Category:Users_in_Warszawa]]."
-      current_user_1: "Aktualne listy uÅ¼ytkownikÃ³w wedÅug ich poÅoÅ¼enia na Ziemi znajdziesz"
-      current_user_2: "tu:"
-    signup_confirm_html:
-      greeting: "CzeÅÄ!"
-      hopefully_you: "KtoÅ (prawdopodobnie Ty sam(a)) chciaÅby utworzyÄ konto na"
-      click_the_link: "JeÅli to Ty, witamy!  Kliknij poniÅ¼szy link Å¼eby potwierdziÄ Twoje nowe konto i dowiedzieÄ siÄ wiÄcej o OpenStreetMap."
-      introductory_video: "To dobry moment Å¼eby obejrzeÄ {{introductory_video_link}}."
-      video_to_openstreetmap: "wideo-wprowadzenie do OpenStreetMap"
-      more_videos: "Mamy  {{more_videos_link}}."
-      more_videos_here: "wiÄcej materiaÅu wideo tutuaj"
-      get_reading: 'Zacznij czytaÄ o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Pl:Beginners_Guide">na naszej wiki</a> i <a href="http://www.opengeodata.org/">blogu opengeodata</a> ktÃ³ry ma nawet <a href="http://www.opengeodata.org/?cat=13">podcasty do posÅuchania</a>!'
-      wiki_signup: 'ZaÅÃ³Å¼ sobie <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">konto na wiki projektu OpenStreetMap</a> jeÅli chcesz.'
-      user_wiki_page: 'Najlepiej stwÃ³rz swojÄ stronÄ uÅ¼ytkownika na wiki zawierajÄcÄ odpowiednie kategorie wskazujÄce twojÄ lokalizacjÄ, np. <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Warszawa">[[Category:Users_in_Warszawa]]</a>.'
-      current_user: 'Aktualne listy uÅ¼ytkownikÃ³w wedÅug ich poÅoÅ¼enia na Ziemi znajdziesz na stronie <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      title: "WiadomoÅci odebrane"
-      my_inbox: "Moja skrzynka odbiorcza"
-      outbox: "nadawcza"
-      you_have: "Masz {{new_count}} nowych i {{old_count}} przeczytanych wiadomoÅci."
-      from: "Od"
-      subject: "Temat"
-      date: "Nadano"
-      no_messages_yet: "Nie masz jeszcze wiadomoÅci.  Czemu nie podyskutowaÄ z {{people_mapping_nearby_link}}."
-      people_mapping_nearby: "mapowiczami w Twojej okolicy"
-    message_summary:
-      unread_button: "Oznacz jako nieprzeczytanÄ"
-      read_button: "Oznacz jako przeczytanÄ"
-      reply_button: "Odpowiedz"
-    new:
-      title: "WysyÅanie wiadomoÅci"
-      send_message_to: "WyÅlij nowÄ wiadomoÅÄ do {{name}}"
-      subject: "Temat"
-      body: "TreÅÄ"
-      send_button: "WyÅlij"
-      back_to_inbox: "PowrÃ³t do skrzynki"
-      message_sent: "WiadomoÅÄ wysÅana"
-    no_such_user:
-      heading: "Nie ma takiego uÅ¼ytkownika / wiadomoÅci"
-      body: "Niestety nie znaleziono uÅ¼ytkownika / wiadomoÅci o tej nazwie lub id"
-    outbox:
-      title: "WiadomoÅci wysÅane"
-      my_inbox: "Moja skrzynka {{inbox_link}}"
-      inbox: "odbiorcza"
-      outbox: "nadawcza"
-      you_have_sent_messages: "WysÅaleÅ/aÅ {{sent_count}} wiadomoÅci"
-      to: "Do"
-      subject: "Temat"
-      date: "Nadano"
-      no_messages_yet: "Jeszcze nie masz wysÅanych wiadomoÅci.  Czemu nie podyskutowaÄ z {{people_mapping_nearby_link}}."
-      people_mapping_nearby: "mapowiczami w Twojej okolicy"
-    read:
-      title: "Czytanie wiadomoÅci"
-      reading_your_messages: "Czytanie odebranej wiadomoÅci"
-      from: "Od"
-      subject: "Temat"
-      date: "Nadano"
-      reply_button: "Odpowiedz"
-      unread_button: "Oznacz jako nieprzeczytanÄ"
-      back_to_inbox: "PowrÃ³t do odebranych"
-      reading_your_sent_messages: "Czytanie wysÅanej wiadomoÅci"
-      to: "Do"
-      back_to_inbox: "PowrÃ³t do wysÅanych"
-    mark:
-      as_read: "WiadomoÅÄ zostaÅa oznaczona jako przeczytana"
-      as_unread: "WiadomoÅÄ zostaÅa oznaczona jako nieprzeczytana"
-  site:
-    index:
-      js_1: "Prawdopodobnie masz wyÅÄczone javaskrypty lub przeglÄdarka ktÃ³rej uÅ¼ywasz ich nie obsÅuguje."
-      js_2: "OpenStreetMap uÅ¼ywa javaskryptÃ³w do wyÅwietlania mapki slippy map."
-      js_3: 'SprÃ³buj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglÄdarki Tiles@Home</a> jeÅli nie masz moÅ¼liwoÅci wÅÄczyÄ javaskryptu.'
-      permalink: Permalink
-      license:
-        notice: "DostÄp na zasadach licencji {{license_name}}, prawa autorskie {{project_name}} i jego uczestnikÃ³w."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        project_name: "projektu OpenStreetMap"
-    edit:
-      not_public: "Nie wybraÅeÅ(aÅ) by twoje edycje byÅy publiczne."
-      not_public_description: "W tym trybie nie moÅ¼na juÅ¼ zmieniaÄ mapy.  MoÅ¼esz ustawiÄ je na publiczne na Twojej {{user_page}}."
+  site: 
+    edit: 
+      anon_edits_link_text: Tu dowiesz siÄ dlaczego.
+      flash_player_required: BÄdziesz potrzebowaÅ wtyczki Flash Å¼eby korzystaÄ z Potlatcha, edytora OpenStreetMap we Flashu.  ÅciÄgnij <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odtwarzacz Flasha z Adobe.com</a>.  MoÅ¼esz rÃ³wnieÅ¼ skorzystaÄ z <a href="http://wiki.openstreetmap.org/wiki/Editing">paru innych dostÄpnych edytorÃ³w</a> Å¼eby kontrybuowaÄ w OpenStreetMap.
+      not_public: Nie wybraÅeÅ(aÅ) by twoje edycje byÅy publiczne.
+      not_public_description: W tym trybie nie moÅ¼na juÅ¼ zmieniaÄ mapy.  MoÅ¼esz ustawiÄ je na publiczne na Twojej {{user_page}}.
+      potlatch_unsaved_changes: Masz niezapisane zmiany. (Å»eby zapisaÄ zmiany w Potlatchu, naleÅ¼y odznaczyÄ aktualnie zaznaczony obiekt jeÅli edytujesz w trybie "na Å¼ywo" lub kliknÄÄ Save (Zapisz) jeÅli widoczny jest przycisk Save.)
       user_page_link: stronie uÅ¼ytkownika
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Tu dowiesz siÄ dlaczego."
-      flash_player_required: 'BÄdziesz potrzebowaÅ wtyczki Flash Å¼eby korzystaÄ z Potlatcha, edytora OpenStreetMap we Flashu.  ÅciÄgnij <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odtwarzacz Flasha z Adobe.com</a>.  MoÅ¼esz rÃ³wnieÅ¼ skorzystaÄ z <a href="http://wiki.openstreetmap.org/wiki/Editing">paru innych dostÄpnych edytorÃ³w</a> Å¼eby kontrybuowaÄ w OpenStreetMap.'
-      potlatch_unsaved_changes: 'Masz niezapisane zmiany. (Å»eby zapisaÄ zmiany w Potlatchu, naleÅ¼y odznaczyÄ aktualnie zaznaczony obiekt jeÅli edytujesz w trybie \"na Å¼ywo\" lub kliknÄÄ Save (Zapisz) jeÅli widoczny jest przycisk Save.)'
-    sidebar:
-      search_results: Wyniki Wyszukiwania
-      close: Zamknij
-    search:
+    index: 
+      js_1: Prawdopodobnie masz wyÅÄczone javaskrypty lub przeglÄdarka ktÃ³rej uÅ¼ywasz ich nie obsÅuguje.
+      js_2: OpenStreetMap uÅ¼ywa javaskryptÃ³w do wyÅwietlania mapki slippy map.
+      js_3: SprÃ³buj <a href="http://tah.openstreetmap.org/Browse/">statycznej przeglÄdarki Tiles@Home</a> jeÅli nie masz moÅ¼liwoÅci wÅÄczyÄ javaskryptu.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: DostÄp na zasadach licencji {{license_name}}, prawa autorskie {{project_name}} i jego uczestnikÃ³w.
+        project_name: projektu OpenStreetMap
+      permalink: Permalink
+    key: 
+      map_key: Legenda
+    search: 
       search: Wyszukiwanie
-      where_am_i: "Gdzie jestem?"
-      submit_text: "Szukaj"
       search_help: "przykÅady: 'WÄchock', 'FranciszkaÅska, PoznaÅ', 'CB2 5AQ', lub 'post offices near MokotÃ³w' <a href='http://wiki.openstreetmap.org/wiki/Search'>wiÄcej przykÅadÃ³w...</a>"
-    key:
-      map_key: "Legenda"
-  trace:
-    create:
-      upload_trace: "Wgraj Ålad GPS"
-      trace_uploaded: "TwÃ³j plik GPX zostaÅ zaÅadowany i czeka na dodanie do bazy danych.  Powinno to nastÄpiÄ w ciÄgu najbliÅ¼szej pÃ³Å godziny i dostaniesz wtedy maila z informacjÄ o tym."
-    edit:
+      submit_text: Szukaj
+      where_am_i: Gdzie jestem?
+    sidebar: 
+      close: Zamknij
+      search_results: Wyniki Wyszukiwania
+  trace: 
+    create: 
+      trace_uploaded: TwÃ³j plik GPX zostaÅ zaÅadowany i czeka na dodanie do bazy danych.  Powinno to nastÄpiÄ w ciÄgu najbliÅ¼szej pÃ³Å godziny i dostaniesz wtedy maila z informacjÄ o tym.
+      upload_trace: Wgraj Ålad GPS
+    delete: 
+      scheduled_for_deletion: Ålad oczekuje na skasowanie
+    edit: 
+      description: "Opis:"
+      edit: edytuj
       filename: "Nazwa pliku:"
-      uploaded_at: "ZaÅadowano:"
+      owner: "Autor:"
       points: "Punkty:"
+      save_button: Zapisz zmiany
       start_coord: "WspÃ³ÅrzÄdne poczÄtkowe:"
-      edit: "edytuj"
-      owner: "Autor:"
-      description: "Opis:"
       tags: "Tagi:"
-      save_button: "Zapisz zmiany"
-    no_such_user:
-      body: "Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny."
-    trace_form:
-      upload_gpx: "Wgraj plik GPX"
-      description: "Opis"
-      tags: "Tagi"
-      public: "Publiczny?"
-      upload_button: "Wgrywaj"
-      help: "Pomoc"
-    trace_header:
-      see_just_your_traces: "Zobacz tylko Twoje Ålady lub wgraj nowy Ålad"
-      see_all_traces: "Zobacz wszystkie Ålady"
-      see_your_traces: "Zobacz wszystkie Twoje Ålady"
-      traces_waiting: "Masz w tym momencie {{count}} ÅladÃ³w nadal oczekujÄcych na dodanie.  Prosimy poczekaj aÅ¼ wgrywanie ich zostanie zakoÅczone przed dodaniem kolejnych aby nie blokowaÄ kolejki innym uÅ¼ytkownikom."
-    trace_optionals:
-      tags: "Tagi"
-    view:
-      pending: "OCZEKUJE"
+      uploaded_at: "ZaÅadowano:"
+    list: 
+      public_traces: Publiczne Ålady GPS
+      public_traces_from: Publiczne Ålady GPS uÅ¼ytkownika {{user}}
+      tagged_with: " otagowane {{tags}}"
+      your_traces: Twoje Ålady GPS
+    make_public: 
+      made_public: Ålad staÅ siÄ publicznie dostÄpny
+    no_such_user: 
+      body: Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny.
+    trace: 
+      ago: "{{time_in_words_ago}} temu"
+      by: utworzony przez uÅ¼ytkownika
+      count_points: "{{count}} punktÃ³w"
+      edit: edycja
+      edit_map: Edytuj MapÄ
+      in: w
+      map: mapa
+      more: wiÄcej
+      pending: OCZEKUJE
+      private: PRYWATNY
+      public: PUBLICZNY
+      trace_details: PokaÅ¼ szczegÃ³Åy Åladu
+      view_map: PokaÅ¼ mapÄ
+    trace_form: 
+      description: Opis
+      help: Pomoc
+      tags: Tagi
+      upload_button: Wgrywaj
+      upload_gpx: Wgraj plik GPX
+    trace_header: 
+      see_all_traces: Zobacz wszystkie Ålady
+      see_just_your_traces: Zobacz tylko Twoje Ålady lub wgraj nowy Ålad
+      see_your_traces: Zobacz wszystkie Twoje Ålady
+      traces_waiting: Masz w tym momencie {{count}} ÅladÃ³w nadal oczekujÄcych na dodanie.  Prosimy poczekaj aÅ¼ wgrywanie ich zostanie zakoÅczone przed dodaniem kolejnych aby nie blokowaÄ kolejki innym uÅ¼ytkownikom.
+    trace_optionals: 
+      tags: Tagi
+    trace_paging_nav: 
+      of: z
+      showing: Widoczna jest strona
+    view: 
+      delete_track: Wykasuj ten Ålad
+      description: "Opis:"
+      download: pobierz
+      edit: edycja
+      edit_track: Edytuj ten Ålad
       filename: "Plik:"
-      download: "pobierz"
-      uploaded: "Dodano:"
+      heading: PrzeglÄdanie Åladu {{name}}
+      map: mapa
+      none: Brak
+      owner: "Autor:"
+      pending: OCZEKUJE
       points: "PunktÃ³w:"
       start_coordinates: "WspÃ³ÅrzÄdne poczÄtkowe:"
-      map: "mapa"
-      edit: "edycja"
-      owner: "Autor:"
-      description: "Opis:"
-      tags: "Tagi"
-      none: "Brak"
-      make_public: "Na staÅe oznacz ten Ålad jako publiczny"
-      edit_track: "Edytuj ten Ålad"
-      delete_track: "Wykasuj ten Ålad"
-      heading: "PrzeglÄdanie Åladu {{name}}"
-      trace_not_found: "Ålad nie znaleziony!"
-    trace_paging_nav:
-      showing: "Widoczna jest strona"
-      of: "z"
-    trace:
-      pending: "OCZEKUJE"
-      count_points: "{{count}} punktÃ³w"
-      ago: "{{time_in_words_ago}} temu"
-      more: "wiÄcej"
-      trace_details: "PokaÅ¼ szczegÃ³Åy Åladu"
-      view_map: "PokaÅ¼ mapÄ"
-      edit: "edycja"
-      edit_map: "Edytuj MapÄ"
-      public: "PUBLICZNY"
-      private: "PRYWATNY"
-      by: "utworzony przez uÅ¼ytkownika"
-      in: "w"
-      map: "mapa"
-    list:
-      public_traces: "Publiczne Ålady GPS"
-      your_traces: "Twoje Ålady GPS"
-      public_traces_from: "Publiczne Ålady GPS uÅ¼ytkownika {{user}}"
-      tagged_with: " otagowane {{tags}}"
-    delete:
-      scheduled_for_deletion: "Ålad oczekuje na skasowanie"
-    make_public:
-      made_public: "Ålad staÅ siÄ publicznie dostÄpny"
-  user:
-    login:
-      title: "Logowanie"
-      heading: "Login"
-      please login: "Zaloguj siÄ lub {{create_user_link}}."
-      create_account: "dodaj konto"
+      tags: Tagi
+      trace_not_found: Ålad nie znaleziony!
+      uploaded: "Dodano:"
+  user: 
+    account: 
+      email never displayed publicly: (nie jest wyÅwietlany publicznie)
+      flash update success: Zaktualizowano profil uÅ¼ytkownika.
+      flash update success confirm needed: Zaktualizowano profil uÅ¼ytkownika.  SprawdÅº czy przyszedÅ juÅ¼ mail potwierdzajÄcy nowy adres mailowy.
+      home location: "Lokalizacja domowa:"
+      latitude: "SzerokoÅÄ:"
+      longitude: "DÅugoÅÄ geograficzna:"
+      make edits public button: Niech wszystkie edycje bÄdÄ publiczne.
+      my settings: Moje ustawienia
+      no home location: Nie wpisaÅeÅ swojej lokalizacji domowej.
+      preferred languages: "Preferowane JÄzyki:"
+      profile description: "Opis profilu:"
+      public editing: 
+        disabled: WyÅÄczone i nieuprawniony do edycji danych, wszystkie wczeÅniejsze edycje sÄ anonimowe.
+        disabled link text: dlaczego nie mogÄ mapowaÄ?
+        enabled: WÅÄczone.  Nie anonimowy i uprawniony do edycji danych.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: co to jest?
+        heading: "Edycje publiczne:"
+      return to profile: PowrÃ³t do profilu.
+      save changes button: Zapisz zmiany
+      title: Zmiana ustawieÅ konta
+      update home location on click: AktualizowaÄ lokalizacjÄ kiedy klikam na mapie?
+    confirm: 
+      button: Potwierdzam
+      failure: Konto o tym kodzie byÅo juÅ¼ potwierdzone.
+      heading: Potwierdzenie nowego uÅ¼ytkownika
+      press confirm button: UÅ¼yj poniÅ¼szego przycisku aby aktywowaÄ Twoje konto.
+      success: Twoje konto zostaÅo zatwierdzone, cieszymy siÄ Å¼e do nas doÅÄczyÅeÅ!
+    confirm_email: 
+      button: Potwierdzam
+      failure: Adres email o tym kodzie byÅ juÅ¼ potwierdzony.
+      heading: Porwierdzenie zmiany adresu mailowego
+      press confirm button: UÅ¼yj poniÅ¼szego przycisku aby potwierdziÄ TwÃ³j nowy adres e-mail.
+      success: TwÃ³j nowy adres zostaÅ zatwierdzony, cieszymy siÄ Å¼e do nas doÅÄczyÅeÅ!
+    friend_map: 
+      nearby mapper: "Mapowicz z okolicy: [[nearby_user]]"
+      your location: Twoje poÅoÅ¼enie
+    go_public: 
+      flash success: Wszystkie Twoje modyfikacje sÄ od teraz publiczne i jesteÅ uprawniony/a do edycji.
+    login: 
+      account not active: Niestety Twoje konto nie jest jeszcze aktywne.<br />OtwÃ³rz link zawarty w mailu potwierdzenia zaÅoÅ¼enia konta aby je aktywowaÄ.
+      auth failure: Niestety podane dane nie pozwoliÅy na zalogowanie CiÄ.
+      create_account: dodaj konto
       email or username: "Adres email lub nazwa uÅ¼ytkownika:"
+      heading: Login
+      login_button: Zaloguj mnie
+      lost password link: Zapomniane hasÅo?
       password: "HasÅo:"
-      lost password link: "Zapomniane hasÅo?"
-      login_button: "Zaloguj mnie"
-      account not active: "Niestety Twoje konto nie jest jeszcze aktywne.<br />OtwÃ³rz link zawarty w mailu potwierdzenia zaÅoÅ¼enia konta aby je aktywowaÄ."
-      auth failure: "Niestety podane dane nie pozwoliÅy na zalogowanie CiÄ."
-    lost_password:
-      title: "zgubione hasÅo"
-      heading: "Zapomniane HasÅo?"
-      email address: "Adres E-mail:"
-      new password button: "WyÅlij mi nowe hasÅo"
-      notice email on way: "Przykro nam Å¼e je zgubiÅeÅ/aÅ ale zaraz dostaniesz maila z pomocÄ ktÃ³rego niedÅugo zresetujesz hasÅo."
-      notice email cannot find: "Niestety nie znaleziono tego adresu e-mail."
-    reset_password:
-      title: "zresetuj hasÅo"
-      flash changed check mail: "Twoje hasÅo zostaÅo zmienione i jest juÅ¼ w drodze do Twojej skrzynki mailowej :-)"
-      flash token bad: "Nie znaleziono tokenu, sprawdÅº URL"
-    new:
-      title: "Nowe konto"
-      heading: "ZakÅadanie Konta UÅ¼ytkownika"
-      no_auto_account_create: "Niestety nie moÅ¼emy aktualnie stworzyÄ Ci konta automatycznie."
-      contact_webmaster: 'Prosimy skontaktuj siÄ z <a href="mailto:webmaster@openstreetmap.org">webmasterem</a> Å¼eby poprosiÄ o stworzenie konta - zajmiemy siÄ Twoim zapytaniem najszybciej jak to moÅ¼liwe.'
-      fill_form: "WypeÅnij formularz a my zaraz wyÅlemy Ci e-mail z instrukcjami aktywacji Twojego konta."
-      license_agreement: 'ZakÅadajÄc konto uÅ¼ytkownika wyraÅ¼asz zgodÄ na publikacjÄ wszystkich wynikÃ³w pracy wgrywanych na openstreetmap.org oraz wszystkich danych powstaÅych w wyniku wykorzystania narzÄdzi ÅÄczÄcych siÄ z openstreetmap.org na prawach (bez wyÅÄcznoÅci) <a href="http://creativecommons.org/licenses/by-sa/2.0/">tej licencji Creative Commons (by-sa)</a>.'
+      please login: Zaloguj siÄ lub {{create_user_link}}.
+      title: Logowanie
+    lost_password: 
       email address: "Adres E-mail:"
+      heading: Zapomniane HasÅo?
+      new password button: WyÅlij mi nowe hasÅo
+      notice email cannot find: Niestety nie znaleziono tego adresu e-mail.
+      notice email on way: Przykro nam Å¼e je zgubiÅeÅ/aÅ ale zaraz dostaniesz maila z pomocÄ ktÃ³rego niedÅugo zresetujesz hasÅo.
+      title: zgubione hasÅo
+    make_friend: 
+      already_a_friend: "{{name}} juÅ¼ jest Twoim gronie znajomych."
+      failed: Niestety dodanie {{name}} jako znajomego nie powiodÅo siÄ.
+      success: "{{name}} jest teraz Twoim znajomym."
+    new: 
       confirm email address: "PotwierdÅº Adres E-mail:"
-      not displayed publicly: 'Informacje nie wyÅwietlane publicznie (zobacz <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="zasady prywatnoÅciÄ ÅÄcznie z sekcjÄ o adresach e-mail na wiki">privacy policy - zasady prywatnoÅci</a>)'
+      confirm password: "Potwierdzenie hasÅa:"
+      contact_webmaster: Prosimy skontaktuj siÄ z <a href="mailto:webmaster@openstreetmap.org">webmasterem</a> Å¼eby poprosiÄ o stworzenie konta - zajmiemy siÄ Twoim zapytaniem najszybciej jak to moÅ¼liwe.
       display name: "Przyjazna nazwa:"
+      email address: "Adres E-mail:"
+      fill_form: WypeÅnij formularz a my zaraz wyÅlemy Ci e-mail z instrukcjami aktywacji Twojego konta.
+      flash create success message: Nowy uÅ¼ytkownik zostaÅ dodany.  SprawdÅº czy juÅ¼ przyszedÅ mail potwierdzajÄcy, a juÅ¼ za moment bÄdziesz mapowaÅ(a) :-)<br /><br />ZauwaÅ¼, Å¼e nie moÅ¼na zalogowaÄ siÄ przed otrzymaniem tego maila i potwierdzeniem adresu.<br /><br />JeÅli korzystasz z rozwiÄzania antyspamowego ktÃ³re prosi nowych nadawcÃ³w o potwierdzenia, bÄdziesz musiaÅ(a) dodaÄ adres webmaster@openstreetmap.org do znanych adresÃ³w bo nie jesteÅmy w stanie odpowiadaÄ na zapytania takich systemÃ³w.
+      heading: ZakÅadanie Konta UÅ¼ytkownika
+      license_agreement: ZakÅadajÄc konto uÅ¼ytkownika wyraÅ¼asz zgodÄ na publikacjÄ wszystkich wynikÃ³w pracy wgrywanych na openstreetmap.org oraz wszystkich danych powstaÅych w wyniku wykorzystania narzÄdzi ÅÄczÄcych siÄ z openstreetmap.org na prawach (bez wyÅÄcznoÅci) <a href="http://creativecommons.org/licenses/by-sa/2.0/">tej licencji Creative Commons (by-sa)</a>.
+      no_auto_account_create: Niestety nie moÅ¼emy aktualnie stworzyÄ Ci konta automatycznie.
+      not displayed publicly: Informacje nie wyÅwietlane publicznie (zobacz <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="zasady prywatnoÅciÄ ÅÄcznie z sekcjÄ o adresach e-mail na wiki">privacy policy - zasady prywatnoÅci</a>)
       password: "HasÅo:"
-      confirm password: "Potwierdzenie hasÅa:"
       signup: Gotowe
-      flash create success message: "Nowy uÅ¼ytkownik zostaÅ dodany.  SprawdÅº czy juÅ¼ przyszedÅ mail potwierdzajÄcy, a juÅ¼ za moment bÄdziesz mapowaÅ(a) :-)<br /><br />ZauwaÅ¼, Å¼e nie moÅ¼na zalogowaÄ siÄ przed otrzymaniem tego maila i potwierdzeniem adresu.<br /><br />JeÅli korzystasz z rozwiÄzania antyspamowego ktÃ³re prosi nowych nadawcÃ³w o potwierdzenia, bÄdziesz musiaÅ(a) dodaÄ adres webmaster@openstreetmap.org do znanych adresÃ³w bo nie jesteÅmy w stanie odpowiadaÄ na zapytania takich systemÃ³w."
-    no_such_user:
-      title: "Nie znaleziono uÅ¼ytkownika"
-      heading: "UÅ¼ytkownik{{user}} nie istnieje"
-      body: "Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny."
-    view:
+      title: Nowe konto
+    no_such_user: 
+      body: Niestety nie znaleziono uÅ¼ytkownika o nazwie {{user}}, sprawdÅº pisowniÄ.  ByÄ moÅ¼e uÅ¼yÅeÅ(aÅ) linku ktÃ³ry byÅ niepoprawny.
+      heading: UÅ¼ytkownik{{user}} nie istnieje
+      title: Nie znaleziono uÅ¼ytkownika
+    remove_friend: 
+      not_a_friend: "{{name}} nie byÅ Twoim znajomym."
+      success: "{{name} zostaÅ wyÅÄczony z grona Twoich znajomych."
+    reset_password: 
+      flash token bad: Nie znaleziono tokenu, sprawdÅº URL
+      title: zresetuj hasÅo
+    set_home: 
+      flash success: Nowa lokalizacja domowa zapisana
+    view: 
+      add as friend: dodaj do znajomych
+      add image: Dodaj ZdjÄcie
+      ago: ({{time_in_words_ago}} temu)
+      change your settings: zmieÅ swoje ustawienia
+      delete image: UsuÅ zdjÄcie
+      description: Opis
+      diary: dziennik
+      edits: edycje
+      if set location: JeÅli ustawisz swojÄ lokalizacje, pojawi siÄ na tej stronie kolorowa mapka i w ogÃ³le.  LokalizacjÄ moÅ¼esz podaÄ na Twojej {{settings_link}}.
+      km away: "{{count}}km stÄd"
+      mapper since: "Mapuje od:"
       my diary: mÃ³j dziennik
-      new diary entry: nowy wpis w dzienniku
       my edits: moje zmiany
-      my traces: moje Ålady
       my settings: moje ustawienia
+      my traces: moje Ålady
+      nearby users: "NajbliÅ¼si uÅ¼ytkownicy:"
+      new diary entry: nowy wpis w dzienniku
+      no friends: Nie dodaÅeÅ/aÅ jeszcze Å¼adnych znajomych.
+      no home location: Lokalizacja domowa nie zostaÅa podana.
+      no nearby users: Nikt nie przyznaÅ siÄ jeszcze do mapowania w tej okolicy.
+      remove as friend: usuÅ ze znajomych
       send message: wyÅlij wiadomoÅÄ
-      diary: dziennik
-      edits: edycje
+      settings_link_text: stronie ustawieÅ
       traces: Ålady
-      remove as friend: usuÅ ze znajomych
-      add as friend: dodaj do znajomych
-      mapper since: "Mapuje od:"
-      ago: "({{time_in_words_ago}} temu)"
-      user image heading: ZdjÄcie uÅ¼ytkownika
-      delete image: UsuÅ zdjÄcie
       upload an image: Wgraj zdjÄcie
-      add image: Dodaj ZdjÄcie
-      description: Opis
+      user image heading: ZdjÄcie uÅ¼ytkownika
       user location: Lokalizacja uÅ¼ytkownika
-      no home location: "Lokalizacja domowa nie zostaÅa podana."
-      if set location: "JeÅli ustawisz swojÄ lokalizacje, pojawi siÄ na tej stronie kolorowa mapka i w ogÃ³le.  LokalizacjÄ moÅ¼esz podaÄ na Twojej {{settings_link}}."
-      settings_link_text: stronie ustawieÅ
       your friends: Twoi znajomi
-      no friends: Nie dodaÅeÅ/aÅ jeszcze Å¼adnych znajomych.
-      km away: "{{count}}km stÄd"
-      nearby users: "NajbliÅ¼si uÅ¼ytkownicy:"
-      no nearby users: "Nikt nie przyznaÅ siÄ jeszcze do mapowania w tej okolicy."
-      change your settings: zmieÅ swoje ustawienia
-    friend_map:
-      your location: Twoje poÅoÅ¼enie
-      nearby mapper: "Mapowicz z okolicy: [[nearby_user]]"
-    account:
-      title: "Zmiana ustawieÅ konta"
-      my settings: Moje ustawienia
-      email never displayed publicly: "(nie jest wyÅwietlany publicznie)"
-      public editing:
-        heading: "Edycje publiczne:"
-        enabled: "WÅÄczone.  Nie anonimowy i uprawniony do edycji danych."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "co to jest?"
-        disabled: "WyÅÄczone i nieuprawniony do edycji danych, wszystkie wczeÅniejsze edycje sÄ anonimowe."
-        disabled link text: "dlaczego nie mogÄ mapowaÄ?"
-      profile description: "Opis profilu:"
-      preferred languages: "Preferowane JÄzyki:"
-      home location: "Lokalizacja domowa:"
-      no home location: "Nie wpisaÅeÅ swojej lokalizacji domowej."
-      latitude: "SzerokoÅÄ:"
-      longitude: "DÅugoÅÄ geograficzna:"
-      update home location on click: "AktualizowaÄ lokalizacjÄ kiedy klikam na mapie?"
-      save changes button: Zapisz zmiany
-      make edits public button: Niech wszystkie edycje bÄdÄ publiczne.
-      return to profile: PowrÃ³t do profilu.
-      flash update success confirm needed: "Zaktualizowano profil uÅ¼ytkownika.  SprawdÅº czy przyszedÅ juÅ¼ mail potwierdzajÄcy nowy adres mailowy."
-      flash update success: "Zaktualizowano profil uÅ¼ytkownika."
-    confirm:
-      heading: Potwierdzenie nowego uÅ¼ytkownika
-      press confirm button: "UÅ¼yj poniÅ¼szego przycisku aby aktywowaÄ Twoje konto."
-      button: Potwierdzam
-      success: "Twoje konto zostaÅo zatwierdzone, cieszymy siÄ Å¼e do nas doÅÄczyÅeÅ!"
-      failure: "Konto o tym kodzie byÅo juÅ¼ potwierdzone."
-    confirm_email:
-      heading: Porwierdzenie zmiany adresu mailowego
-      press confirm button: "UÅ¼yj poniÅ¼szego przycisku aby potwierdziÄ TwÃ³j nowy adres e-mail."
-      button: Potwierdzam
-      success: "TwÃ³j nowy adres zostaÅ zatwierdzony, cieszymy siÄ Å¼e do nas doÅÄczyÅeÅ!"
-      failure: "Adres email o tym kodzie byÅ juÅ¼ potwierdzony."
-    set_home:
-      flash success: "Nowa lokalizacja domowa zapisana"
-    go_public:
-      flash success: "Wszystkie Twoje modyfikacje sÄ od teraz publiczne i jesteÅ uprawniony/a do edycji."
-    make_friend:
-      success: "{{name}} jest teraz Twoim znajomym."
-      failed: "Niestety dodanie {{name}} jako znajomego nie powiodÅo siÄ."
-      already_a_friend: "{{name}} juÅ¼ jest Twoim gronie znajomych."
-    remove_friend:
-      success: "{{name} zostaÅ wyÅÄczony z grona Twoich znajomych."
-      not_a_friend: "{{name}} nie byÅ Twoim znajomym."
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 97c4292a5..5e95ca8b1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1,898 +1,952 @@
-pt-BR:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Lista de Controle de acesso"
-      changeset: "AlteraÃ§Ãµes"
-      changeset_tag: "Etiqueta do Conjunto de AlteraÃ§Ãµes"
-      country: "PaÃ­s"
-      diary_comment: "ComentÃ¡rio"
-      diary_entry: "Entrada do DiÃ¡rio"
-      friend: "Amigo"
-      language: "LÃ­ngua"
-      message: "Mensagem"
-      node: "Ponto"
-      node_tag: "Etiqueta do Ponto"
-      notifier: "Notificador"
-      old_node: "Ponto Antigo"
-      old_node_tag: "Etiqueta do Ponto Antigo"
-      old_relation: "RelaÃ§Ã£o Antiga"
-      old_relation_member: "Membro da RelaÃ§Ã£o Antiga"
-      old_relation_tag: "Etiqueta da RelaÃ§Ã£o Antiga"
-      old_way: "Caminho Antigo"
-      old_way_node: "Ponto do Caminho Antigo"
-      old_way_tag: "Etiqueta do Caminho Antigo"
-      relation: "RelaÃ§Ã£o"
-      relation_member: "Membro da RelaÃ§Ã£o"
-      relation_tag: "Etiqueta da RelaÃ§Ã£o"
-      session: "SessÃ£o"
-      trace: "Trilha"
-      tracepoint: "Ponto da Trilha"
-      tracetag: "Etiqueta da Trilha"
-      user: "UsuÃ¡rio"
-      user_preference: "PreferÃªncias do UsuÃ¡rio"
-      user_token: "Token do UsuÃ¡rio"
-      way: "Caminho"
-      way_node: "Ponto do Caminho"
-      way_tag: "Etiqueta do Caminho"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Corpo"
-      diary_entry:
-        user: "UsuÃ¡rio"
-        title: "TÃ­tulo"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        language: "LÃ­ngua"
-      friend:
-        user: "UsuÃ¡rio"
-        friend: "Amigo"
-      trace:
-        user: "UsuÃ¡rio"
-        visible: "VisÃ­vel"
-        name: "Nome"
-        size: "Tamanho"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        public: "PÃºblico"
-        description: "DescriÃ§Ã£o"
-      message:
-        sender: "Remetente"
-        title: "TÃ­tulo"
-        body: "Corpo"
-        recipient: "DestinatÃ¡rio"
-      user:
-        email: "Email"
-        active: "Ativo"
-        display_name: "Nome para ExibiÃ§Ã£o"
-        description: "DescriÃ§Ã£o"
-        languages: "LÃ­nguas"
-        pass_crypt: "Senha"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: "Ver"
-    edit: "Editar"
-    coordinates: "Coordenadas:"
-  browse:
-    changeset:
-      title: "AlteraÃ§Ãµes"
+pt-BR: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Corpo
+      diary_entry: 
+        language: LÃ­ngua
+        latitude: Latitude
+        longitude: Longitude
+        title: TÃ­tulo
+        user: UsuÃ¡rio
+      friend: 
+        friend: Amigo
+        user: UsuÃ¡rio
+      message: 
+        body: Corpo
+        recipient: DestinatÃ¡rio
+        sender: Remetente
+        title: TÃ­tulo
+      trace: 
+        description: DescriÃ§Ã£o
+        latitude: Latitude
+        longitude: Longitude
+        name: Nome
+        public: PÃºblico
+        size: Tamanho
+        user: UsuÃ¡rio
+        visible: VisÃ­vel
+      user: 
+        active: Ativo
+        description: DescriÃ§Ã£o
+        display_name: Nome para ExibiÃ§Ã£o
+        email: Email
+        languages: LÃ­nguas
+        pass_crypt: Senha
+    models: 
+      acl: Lista de Controle de acesso
+      changeset: AlteraÃ§Ãµes
+      changeset_tag: Etiqueta do Conjunto de AlteraÃ§Ãµes
+      country: PaÃ­s
+      diary_comment: ComentÃ¡rio
+      diary_entry: Entrada do DiÃ¡rio
+      friend: Amigo
+      language: LÃ­ngua
+      message: Mensagem
+      node: Ponto
+      node_tag: Etiqueta do Ponto
+      notifier: Notificador
+      old_node: Ponto Antigo
+      old_node_tag: Etiqueta do Ponto Antigo
+      old_relation: RelaÃ§Ã£o Antiga
+      old_relation_member: Membro da RelaÃ§Ã£o Antiga
+      old_relation_tag: Etiqueta da RelaÃ§Ã£o Antiga
+      old_way: Caminho Antigo
+      old_way_node: Ponto do Caminho Antigo
+      old_way_tag: Etiqueta do Caminho Antigo
+      relation: RelaÃ§Ã£o
+      relation_member: Membro da RelaÃ§Ã£o
+      relation_tag: Etiqueta da RelaÃ§Ã£o
+      session: SessÃ£o
+      trace: Trilha
+      tracepoint: Ponto da Trilha
+      tracetag: Etiqueta da Trilha
+      user: UsuÃ¡rio
+      user_preference: PreferÃªncias do UsuÃ¡rio
+      user_token: Token do UsuÃ¡rio
+      way: Caminho
+      way_node: Ponto do Caminho
+      way_tag: Etiqueta do Caminho
+  browse: 
+    changeset: 
       changeset: "AlteraÃ§Ãµes: {{id}}"
-      download: "Baixar {{changeset_xml_link}} ou {{osmchange_xml_link}}"
-      changesetxml: "XML do conjunto de alteraÃ§Ãµes"
-      osmchangexml: "osmChange XML"
-    changeset_navigation:
-      user:
-        name_tooltip: "Ver ediÃ§Ãµes de {{user}}"
-        prev_tooltip: "Editado anteriormente por {{user}}"
-        next_tooltip: "Editado posteriormente por {{user}}"
-      all:
-        prev_tooltip: "Conjunto de alteraÃ§Ãµes anterior"
-        next_tooltip: "PrÃ³ximo conjunto de alteraÃ§Ãµes"
-    changeset_details:
-      created_at: "Criado em:"
-      closed_at: "Fechado em:"
+      changesetxml: XML do conjunto de alteraÃ§Ãµes
+      download: Baixar {{changeset_xml_link}} ou {{osmchange_xml_link}}
+      feed: 
+        title: Conjunto de mudanÃ§as {{id}}
+        title_comment: Conjunto de mudanÃ§as {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: AlteraÃ§Ãµes
+    changeset_details: 
       belongs_to: "Pertence a:"
       bounding_box: "Limites da Ã¡rea:"
-      no_bounding_box: "Nenhum limite de Ã¡rea foi armazenado para estas alteraÃ§Ãµes."
-      show_area_box: "Ãrea de exibiÃ§Ã£o"
-      box: "Ãrea"
-      has_nodes:
+      box: Ãrea
+      closed_at: "Fechado em:"
+      created_at: "Criado em:"
+      has_nodes: 
         one: "Tem o seguinte {{count}} ponto:"
         other: "Tem os seguintes {{count}} pontos:"
-      has_ways:
-        one: "Tem o seguinte {{count}} caminho:"
-        other: "Tem os seguintes {{count}} caminhos:"
-      has_relations:
+      has_relations: 
         one: "Tem a seguinte {{count}} relaÃ§Ã£o:"
         other: "Tem as seguintes {{count}} relaÃ§Ãµes:"
+      has_ways: 
+        one: "Tem o seguinte {{count}} caminho:"
+        other: "Tem os seguintes {{count}} caminhos:"
+      no_bounding_box: Nenhum limite de Ã¡rea foi armazenado para estas alteraÃ§Ãµes.
+      show_area_box: Ãrea de exibiÃ§Ã£o
+    changeset_navigation: 
+      all: 
+        next_tooltip: PrÃ³ximo conjunto de alteraÃ§Ãµes
+        prev_tooltip: Conjunto de alteraÃ§Ãµes anterior
+      user: 
+        name_tooltip: Ver ediÃ§Ãµes de {{user}}
+        next_tooltip: Editado posteriormente por {{user}}
+        prev_tooltip: Editado anteriormente por {{user}}
     common_details: 
+      changeset_comment: "ComentÃ¡rio:"
       edited_at: "Editado em:"
       edited_by: "Editado por:"
-      version: "VersÃ£o:"
       in_changeset: "No conjunto de alteraÃ§Ãµes:"
-    containing_relation:
-      entry: "RelaÃ§Ã£o {{relation_name}}"
-      entry_role: "RelaÃ§Ã£o {{relation_name}} (como {{relation_role}})"
-    map:
-      loading: "Carregando..."
-      deleted: "Apagado"
-      larger:
-        area: "Ver Ã¡rea em um mapa maior"
-        node: "Ver ponto em um mapa maior"
-        way: "Ver caminho em um mapa maior"
-        relation: "Ver relaÃ§Ã£o em um mapa maior"
-    node_details:
+      version: "VersÃ£o:"
+    containing_relation: 
+      entry: RelaÃ§Ã£o {{relation_name}}
+      entry_role: RelaÃ§Ã£o {{relation_name}} (como {{relation_role}})
+    map: 
+      deleted: Apagado
+      larger: 
+        area: Ver Ã¡rea em um mapa maior
+        node: Ver ponto em um mapa maior
+        relation: Ver relaÃ§Ã£o em um mapa maior
+        way: Ver caminho em um mapa maior
+      loading: Carregando...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
+      download_xml: Baixar XML
+      edit: editar
+      node: Ponto
+      node_title: "Ponto: {{node_name}}"
+      view_history: ver histÃ³rico
+    node_details: 
       coordinates: "Coordenadas:"
       part_of: "Parte de:"
-    node_history:
-      node_history: "HistÃ³rico do ponto"
-      node_history_title: "HistÃ³rico do ponto: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} ou {{view_details_link}}"
-      download_xml: "Baixar XML"
-      view_details: "ver detalhes"
-    node:
-      node: "Ponto"
-      node_title: "Ponto: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
-      download_xml: "Baixar XML"
-      view_history: "ver histÃ³rico"
-      edit: "editar"
-    not_found:
-      sorry: "Desculpe, o {{type}} com o ID {{id}}, nÃ£o pode ser encontrado."
-      type:
-        node: "ponto"
-        way: "caminho"
-        relation: "relaÃ§Ã£o"
-    paging_nav:
-      showing_page: "Exibindo pÃ¡gina"
-      of: "de"
-    relation_details:
+      download_xml: Baixar XML
+      node_history: HistÃ³rico do ponto
+      node_history_title: "HistÃ³rico do ponto: {{node_name}}"
+      view_details: ver detalhes
+    not_found: 
+      sorry: Desculpe, o {{type}} com o ID {{id}}, nÃ£o pode ser encontrado.
+      type: 
+        changeset: conjunto de mudanÃ§as
+        node: ponto
+        relation: relaÃ§Ã£o
+        way: caminho
+    paging_nav: 
+      of: de
+      showing_page: Exibindo pÃ¡gina
+    relation: 
+      download: "{{download_xml_link}} ou {{view_history_link}}"
+      download_xml: Baixar XML
+      relation: RelaÃ§Ã£o
+      relation_title: "RelaÃ§Ã£o: {{relation_name}}"
+      view_history: ver histÃ³rico
+    relation_details: 
       members: "Membros:"
       part_of: "Parte de:"
-    relation_history:
-      relation_history: "HistÃ³rico de RelaÃ§Ã£o"
-      relation_history_title: "HistÃ³rico da RelaÃ§Ã£o: {{relation_name}}"
+    relation_history: 
       download: "{{download_xml_link}} ou {{view_details_link}}"
-      download_xml: "Baixar XML"
-      view_details: "ver detalhes"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: Baixar XML
+      relation_history: HistÃ³rico de RelaÃ§Ã£o
+      relation_history_title: "HistÃ³rico da RelaÃ§Ã£o: {{relation_name}}"
+      view_details: ver detalhes
+    relation_member: 
       entry_role: "{{type}} {{name}} como {{role}}"
-      type:
-        node: "Ponto"
-        way: "Caminho"
-        relation: "RelaÃ§Ã£o"
-    relation:
-      relation: "RelaÃ§Ã£o"
-      relation_title: "RelaÃ§Ã£o: {{relation_name}}"
-      download: "{{download_xml_link}} ou {{view_history_link}}"
-      download_xml: "Baixar XML"
-      view_history: "ver histÃ³rico"
-    start:
-      view_data: "Ver dados para do mapa em visualizaÃ§Ã£o atual"
-      manually_select: "Selecione uma Ã¡rea diferente manualmente"
-    start_rjs:
-      data_layer_name: "Dados"
-      data_frame_title: "Dados"
-      zoom_or_select: "Aproxime ou selecione uma Ã¡rea diferente para visualizar"
-      drag_a_box: "Clique e arraste para selecionar uma Ã¡rea no mapa"
-      manually_select: "Selecione uma Ã¡rea diferente manualmente"
-      loaded_an_area_with_num_features: "VocÃª carregou uma Ã¡rea que contÃ©m [[num_features]] pontos com caracterÃ­sticas. Alguns navegadores podem nÃ£o conseguir exibir todos estes dados. Geralmente, navegadores trabalham melhor exibindo um conjunto de menos de 100 caracterÃ­sticas por vez, ultrapassar isso pode deixÃ¡-lo lento ou travÃ¡-lo. Se vocÃª tem certeza que deseja exibir estes dados, clique no botÃ£o abaixo."
-      load_data: "Carregar dados"
+      type: 
+        node: Ponto
+        relation: RelaÃ§Ã£o
+        way: Caminho
+    start: 
+      manually_select: Selecione uma Ã¡rea diferente manualmente
+      view_data: Ver dados para do mapa em visualizaÃ§Ã£o atual
+    start_rjs: 
+      data_frame_title: Dados
+      data_layer_name: Dados
+      details: Detalhes
+      drag_a_box: Clique e arraste para selecionar uma Ã¡rea no mapa
+      edited_by_user_at_timestamp: Editado por [[user]] at [[timestamp]]
+      history_for_feature: HistÃ³rico para [[feature]]
+      load_data: Carregar dados
+      loaded_an_area_with_num_features: VocÃª carregou uma Ã¡rea que contÃ©m [[num_features]] pontos com caracterÃ­sticas. Alguns navegadores podem nÃ£o conseguir exibir todos estes dados. Geralmente, navegadores trabalham melhor exibindo um conjunto de menos de 100 caracterÃ­sticas por vez, ultrapassar isso pode deixÃ¡-lo lento ou travÃ¡-lo. Se vocÃª tem certeza que deseja exibir estes dados, clique no botÃ£o abaixo.
+      loading: Carregando...
+      manually_select: Selecione uma Ã¡rea diferente manualmente
+      object_list: 
+        api: Obter esta Ã¡rea atravÃ©s da API
+        back: Exibir lista de objetos
+        details: Detalhes
+        heading: Lista de Objetos
+        history: 
+          type: 
+            node: Ponto [[id]]
+            way: Caminho [[id]]
+        selected: 
+          type: 
+            node: Ponto [[id]]
+            way: Caminho [[id]]
+        type: 
+          node: Ponto
+          way: Caminho
+      private_user: usuÃ¡rio privado
+      show_history: Exibir histÃ³rico
       unable_to_load_size: "ImpossÃ­vel carregar dados: tamanho da Ã¡rea de [[bbox_size]] Ã© muito grande (precisa ser menor que {{max_bbox_size}})"
-      loading: "Carregando..."
-      show_history: "Exibir histÃ³rico"
-      wait: "Aguarde..."
-      history_for_feature: "HistÃ³rico para [[feature]]"
-      details: "Detalhes"
-      private_user: "usuÃ¡rio privado"
-      edited_by_user_at_timestamp: "Editado por [[user]] at [[timestamp]]"
-      object_list:
-        heading: "Lista de Objetos"
-        back: "Exibir lista de objetos"
-        type:
-          node: "Ponto"
-          way: "Caminho"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Obter esta Ã¡rea atravÃ©s da API"
-        details: "Detalhes"
-        selected:
-          type:
-            node: "Ponto [[id]]"
-            way: "Caminho [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Ponto [[id]]"
-            way: "Caminho [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: Aguarde...
+      zoom_or_select: Aproxime ou selecione uma Ã¡rea diferente para visualizar
+    tag_details: 
       tags: "Etiquetas:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} ou {{view_history_link}}"
+      download_xml: Baixar XML
+      edit: editar
+      view_history: ver histÃ³rico
+      way: Caminho
+      way_title: "Caminho: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: tambÃ©m parte do caminho {{related_ways}}
+        other: tambÃ©m parte dos caminhos {{related_ways}}
       nodes: "Pontos:"
       part_of: "Parte de:"
-      also_part_of:
-        one: "tambÃ©m parte do caminho {{related_ways}}"
-        other: "tambÃ©m parte dos caminhos {{related_ways}}"
-    way_history:
-      way_history: "HistÃ³rico de caminho"
-      way_history_title: "HistÃ³rico do caminho: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} ou {{view_details_link}}"
-      download_xml: "Baixar XML"
-      view_details: "ver detalhes"
-    way:
-      way: "Caminho"
-      way_title: "Caminho: {{way_name}}"
-      download: "{{download_xml_link}} ou {{view_history_link}}"
-      download_xml: "Baixar XML"
-      view_history: "ver histÃ³rico"
-      edit: "editar"
-  changeset:
+      download_xml: Baixar XML
+      view_details: ver detalhes
+      way_history: HistÃ³rico de caminho
+      way_history_title: "HistÃ³rico do caminho: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: AnÃ´nimo
+      big_area: (grande)
+      no_comment: (nenhum)
+      no_edits: (sem alteraÃ§Ãµes)
+      show_area_box: exibir limite da Ã¡rea
+      still_editing: (ainda editando)
+      view_changeset_details: Ver detalhes das alteraÃ§Ãµes
     changeset_paging_nav: 
-      showing_page: "Exibindo pÃ¡gina"
-      of: "de"
-    changeset:
-      id: "#{{id}}"
-      still_editing: "(ainda editando)"
-      anonymous: "AnÃ´nimo"
-      no_comment: "(nenhum)"
-      no_edits: "(sem alteraÃ§Ãµes)"
-      show_area_box: "exibir limite da Ã¡rea"
-      big_area: "(grande)"
-      view_changeset_details: "Ver detalhes das alteraÃ§Ãµes"
-    changesets:
-      id: "ID"
-      saved_at: "Salvo em"
-      user: "UsuÃ¡rio"
-      comment: "ComentÃ¡rio"
-      area: "Ãrea"
-    list:
-      title: "Conjuntos de alteraÃ§Ãµes"
-      title_user: "Conjuntos de alteraÃ§Ãµes de {{user}}"
-      title_bbox: "Conjuntos de alteraÃ§Ãµes em {{bbox}}"
-      title_user_bbox: "Conjuntos de alteraÃ§Ãµes de {{user}} em {{bbox}}"
-
-      heading: "Conjuntos de alteraÃ§Ãµes"
-      heading_user: "Conjuntos de alteraÃ§Ãµes"
-      heading_bbox: "Conjuntos de alteraÃ§Ãµes"
-      heading_user_bbox: "Conjuntos de alteraÃ§Ãµes"
-
-      description: "AlteraÃ§Ãµes recentes"
-      description_user: "Conjuntos de alteraÃ§Ãµes de {{user}}"
-      description_bbox: "Conjuntos de alteraÃ§Ãµes em {{bbox}}"
-      description_user_bbox: "Conjuntos de alteraÃ§Ãµes de {{user}} em {{bbox}}"
-  diary_entry:
-    new:
-      title: "Nova Entrada de DiÃ¡rio"
-    list:
-      title: "DiÃ¡rios dos UsuÃ¡rios"
-      user_title: "DiÃ¡rio de {{user}}"
-      in_language_title: "Entradas do DiÃ¡rio em {{language}}"
-      new: "Nova Entrada no DiÃ¡rio"
-      new_title: "Escrever nova entrada em seu DiÃ¡rio"
-      no_entries: "Sem entradas no DiÃ¡rio"
-      recent_entries: "Entradas recentes no DiÃ¡rio:"
-      older_entries: "Entradas antigas"
-      newer_entries: "Entradas novas"
-    edit:
-      title: "Editar entrada do diÃ¡rio"
-      subject: "Assunto:"
+      of: de
+      showing_page: Exibindo pÃ¡gina
+    changesets: 
+      area: Ãrea
+      comment: ComentÃ¡rio
+      id: ID
+      saved_at: Salvo em
+      user: UsuÃ¡rio
+    list: 
+      description: AlteraÃ§Ãµes recentes
+      description_bbox: Conjuntos de alteraÃ§Ãµes em {{bbox}}
+      description_user: Conjuntos de alteraÃ§Ãµes de {{user}}
+      description_user_bbox: Conjuntos de alteraÃ§Ãµes de {{user}} em {{bbox}}
+      heading: Conjuntos de alteraÃ§Ãµes
+      heading_bbox: Conjuntos de alteraÃ§Ãµes
+      heading_user: Conjuntos de alteraÃ§Ãµes
+      heading_user_bbox: Conjuntos de alteraÃ§Ãµes
+      title: Conjuntos de alteraÃ§Ãµes
+      title_bbox: Conjuntos de alteraÃ§Ãµes em {{bbox}}
+      title_user: Conjuntos de alteraÃ§Ãµes de {{user}}
+      title_user_bbox: Conjuntos de alteraÃ§Ãµes de {{user}} em {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: ComentÃ¡rio de {{link_user}} em {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 comentÃ¡rio
+        other: "{{count}} comentÃ¡rios"
+      comment_link: Comentar nesta entrada
+      edit_link: Editar esta entrada
+      posted_by: Postado por {{link_user}} em {{created}} em {{language_link}}
+      reply_link: Responder esta entrada
+    edit: 
       body: "Texto:"
       language: "Idioma:"
-      location: "LocalizaÃ§Ã£o:"
       latitude: "Latitude:"
+      location: "LocalizaÃ§Ã£o:"
       longitude: "Longitude:"
-      use_map_link: "usar mapa"
-      save_button: "Salvar"
-      marker_text: "LocalizaÃ§Ã£o da entrada no diÃ¡rio"
-    view:
-      title: "DiÃ¡rios dos usuÃ¡rios | {{user}}"
-      user_title: "DiÃ¡rio de {{user}}"
-      leave_a_comment: "Deixe um comentÃ¡rio"
-      login_to_leave_a_comment: "{{login_link}} para deixar um comentÃ¡rio"
-      login: "Entrar"
-      save_button: "Salvar"
-    no_such_entry:
-      title: "Entrada de diÃ¡rio inexistente"
+      marker_text: LocalizaÃ§Ã£o da entrada no diÃ¡rio
+      save_button: Salvar
+      subject: "Assunto:"
+      title: Editar entrada do diÃ¡rio
+      use_map_link: usar mapa
+    feed: 
+      all: 
+        description: Entradas no diÃ¡rio recentes de usuÃ¡rios do OpenStreetMap
+        title: Entradas no diÃ¡rio OpenStreetMap
+      language: 
+        description: Entradas de diÃ¡rio recentes de usuÃ¡rios do OpenStreetMap em {{language_name}}
+        title: Entradas no diÃ¡rio OpenStreetMap em {{language_name}}
+      user: 
+        description: Entradas recentes no diÃ¡rio OpenStreetMap de {{user}}
+        title: Entradas do diÃ¡rio OpenStreetMap de {{user}}
+    list: 
+      in_language_title: Entradas do DiÃ¡rio em {{language}}
+      new: Nova Entrada no DiÃ¡rio
+      new_title: Escrever nova entrada em seu DiÃ¡rio
+      newer_entries: Entradas novas
+      no_entries: Sem entradas no DiÃ¡rio
+      older_entries: Entradas antigas
+      recent_entries: "Entradas recentes no DiÃ¡rio:"
+      title: DiÃ¡rios dos UsuÃ¡rios
+      user_title: DiÃ¡rio de {{user}}
+    new: 
+      title: Nova Entrada de DiÃ¡rio
+    no_such_entry: 
+      body: Desculpe, nÃ£o hÃ¡ entrada no diÃ¡rio ou comentÃ¡rio com o id {{id}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado.
       heading: "NÃ£o hÃ¡ entrada no diÃ¡rio com o id: {{id}}"
-      body: "Desculpe, nÃ£o hÃ¡ entrada no diÃ¡rio ou comentÃ¡rio com o id {{id}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado."
-    no_such_user:
-      title: "UsuÃ¡rio inexistente"
-      heading: "O usuÃ¡rio {{user}} nÃ£o existe"
-      body: "Desculpe, nÃ£o hÃ¡ usuÃ¡rio com o nome {{user}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado."
-    diary_entry:
-      posted_by: "Postado por {{link_user}} em {{created}} em {{language_link}}"
-      comment_link: "Comentar nesta entrada"
-      reply_link: "Responder esta entrada"
-      comment_count:
-        one: "1 comentÃ¡rio"
-        other: "{{count}} comentÃ¡rios"
-      edit_link: "Editar esta entrada"
-    diary_comment:
-      comment_from: "ComentÃ¡rio de {{link_user}} em {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Ãrea a exportar"
-      manually_select: "Selecior Ã¡rea diferente manualmente"
-      format_to_export: "Formato a Exportar"
-      osm_xml_data: "Dados XML OpenStreetMap"
-      mapnik_image: "Imagem Mapnik"
-      osmarender_image: "Imagem Osmarender"
-      embeddable_html: "HTML para embutir"
-      licence: "LicenÃ§a"
-      export_details: 'Os dados do OpenStreetMap estÃ£o licenciados sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons AtribuiÃ§Ã£o - Compartilhamento pela mesma LicenÃ§a 2.0 GenÃ©rica (CC-BYSA-2.0)</a>.'
-      options: "OpÃ§Ãµes"
-      format: "Formato"
-      scale: "Escala"
-      max: "max"
-      image_size: "Tamanho da Imagem"
-      zoom: "Zoom"
-      add_marker: "Adicionar um marcador ao mapa"
+      title: Entrada de diÃ¡rio inexistente
+    no_such_user: 
+      body: Desculpe, nÃ£o hÃ¡ usuÃ¡rio com o nome {{user}}. Por favor, verifique se digitou corretamente, ou talvez o link que clicou esteja errado.
+      heading: O usuÃ¡rio {{user}} nÃ£o existe
+      title: UsuÃ¡rio inexistente
+    view: 
+      leave_a_comment: Deixe um comentÃ¡rio
+      login: Entrar
+      login_to_leave_a_comment: "{{login_link}} para deixar um comentÃ¡rio"
+      save_button: Salvar
+      title: DiÃ¡rios dos usuÃ¡rios | {{user}}
+      user_title: DiÃ¡rio de {{user}}
+  export: 
+    start: 
+      add_marker: Adicionar um marcador ao mapa
+      area_to_export: Ãrea a exportar
+      embeddable_html: HTML para embutir
+      export_button: Exportar
+      export_details: Os dados do OpenStreetMap estÃ£o licenciados sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">Creative Commons AtribuiÃ§Ã£o - Compartilhamento pela mesma LicenÃ§a 2.0 GenÃ©rica (CC-BYSA-2.0)</a>.
+      format: Formato
+      format_to_export: Formato a Exportar
+      image_size: Tamanho da Imagem
       latitude: "Lat:"
+      licence: LicenÃ§a
       longitude: "Lon:"
-      output: "SaÃ­da"
-      paste_html: "Cole o HTML para publicar no site"
-      export_button: "Exportar"
-    start_rjs:
-      export: "Exportar"
-      drag_a_box: "Marque uma caixa no mapa para selecionar uma Ã¡rea"
-      manually_select: "Selecionar manualmente uma Ã¡rea diferente"
-      click_add_marker: "Clique no mapa para adicionar um marcador"
-      change_marker: "Mudar posiÃ§Ã£o do marcador"
-      add_marker: "Adicionar um marcador ao mapa"
-      view_larger_map: "Ver Mapa Ampliado"
-  geocoder:
-    search:
-      title:
-        latlon: 'Resultados <a href="http://openstreetmap.org/">Internos</a>'
-        us_postcode: 'Resultados do <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Resultados do <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Resultados do <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Resultados do <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Resultados do <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} de {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'LocalizaÃ§Ã£o do <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
-        cities: "Cidades"
-        towns: "Cidades"
-        places: "Lugares"
-    description_osm_namefinder:
+      manually_select: Selecior Ã¡rea diferente manualmente
+      mapnik_image: Imagem Mapnik
+      max: max
+      options: OpÃ§Ãµes
+      osm_xml_data: Dados XML OpenStreetMap
+      osmarender_image: Imagem Osmarender
+      output: SaÃ­da
+      paste_html: Cole o HTML para publicar no site
+      scale: Escala
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Adicionar um marcador ao mapa
+      change_marker: Mudar posiÃ§Ã£o do marcador
+      click_add_marker: Clique no mapa para adicionar um marcador
+      drag_a_box: Marque uma caixa no mapa para selecionar uma Ã¡rea
+      export: Exportar
+      manually_select: Selecionar manualmente uma Ã¡rea diferente
+      view_larger_map: Ver Mapa Ampliado
+  geocoder: 
+    description: 
+      title: 
+        geonames: LocalizaÃ§Ã£o do <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: Cidades
+        places: Lugares
+        towns: Cidades
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} de {{type}}"
-    results:
-      no_results: "Nenhum resultado encontrado"
-    distance:
-      zero: "a menos de 1km"
-      one: "a cerca de 1km"
-      other: "a cerca de {{count}}km"
-    direction:
-      south_west: "sudoeste"
-      south: "sul"
-      south_east: "sudeste"
-      east: "leste"
-      north_east: "nordeste"
-      north: "norte"
-      north_west: "noroeste"
-      west: "oeste"
-  layouts:
-    project_name:
-      # in <title>
-      title: "OpenStreetMap"
-      # in <h1>
-      h1: "OpenStreetMap"
-    logo:
-      alt_text: "OpenStreetMap logo"
-    welcome_user: "Bem vindo, {{user_link}}"
-    welcome_user_link_tooltip: "Sua PÃ¡gina de usuÃ¡rio"
-    home: "inÃ­cio"
-    home_tooltip: "Ir para a sua localizaÃ§Ã£o"
-    inbox: "caixa de entrada ({{count}})"
-    inbox_tooltip:
-      zero: "Sem novas mensagens na sua caixa de entrada"
-      one: "1 Nova mensagem na sua caixa de entrada"
-      other: "Sua caixa de entrada tem {{count}} mensagens nÃ£o lidas"
-    logout: "sair"
-    logout_tooltip: "Sair"
-    log_in: "entrar"
-    log_in_tooltip: "Entrar com uma conta existente"
-    sign_up: "registrar"
-    sign_up_tooltip: "Criar uma conta para editar"
-    view: "Ver"
-    view_tooltip: "Ver mapas"
-    edit: "Editar"
-    edit_tooltip: "Editar mapas"
-    history: "HistÃ³rico"
-    history_tooltip: "HistÃ³rico de alteraÃ§Ãµes"
-    export: "Exportar"
-    export_tooltip: "Exportar dados do mapa"
-    gps_traces: "Trilhas GPS"
-    gps_traces_tooltip: "Gerenciar trilhas"
-    user_diaries: "DiÃ¡rios de UsuÃ¡rio"
-    user_diaries_tooltip: "Ver os diÃ¡rios dos usuÃ¡rios"
-    tag_line: "O Wiki de Mapas Livres"
-    intro_1: "OpenStreetMap Ã© um mapa livre e editÃ¡vel do mundo. Ele Ã© feito por pessoas como vocÃª."
-    intro_2: "OpenStreetMap permite visualizar, editar e usar dados geogrÃ¡ficos de maneira colaborativa de qualquer lugar do mundo."
-    intro_3: "A hospedagem dos dados do OpenStreetMap Ã© cedida gentilmente por {{ucl}} e {{bytemark}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "A base de dados do OpenStreetMap estÃ¡ off-line devido a operaÃ§Ãµes de manutenÃ§Ã£o."
-    osm_read_only: "A base de dados do OpenStreetMap estÃ¡ em modo somente leitura devido a operaÃ§Ãµes de manutenÃ§Ã£o."
+    direction: 
+      east: leste
+      north: norte
+      north_east: nordeste
+      north_west: noroeste
+      south: sul
+      south_east: sudeste
+      south_west: sudoeste
+      west: oeste
+    distance: 
+      one: a cerca de 1km
+      other: a cerca de {{count}}km
+      zero: a menos de 1km
+    results: 
+      no_results: Nenhum resultado encontrado
+    search: 
+      title: 
+        ca_postcode: Resultados do <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Resultados do <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Resultados <a href="http://openstreetmap.org/">Internos</a>
+        osm_namefinder: Resultados do <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Resultados do <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultados do <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} de {{placename}}"
+  layouts: 
+    alt_donation: FaÃ§a uma doaÃ§Ã£o
     donate: "Ajude o OpenStreetMap fazendo doaÃ§Ãµes para o Fundo de Upgrade de Hardware: {{link}}."
-    donate_link_text: "doando"
-    help_wiki: "Ajuda & Wiki"
-    help_wiki_tooltip: "Ajuda &amp; Wiki do projeto"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "Blog de notÃ­cias"
-    news_blog_tooltip: "Blog de notÃ­cias sobre o OpenStreetMap, dados geogrÃ¡ficos livres, etc."
-    shop: "Produtos"
-    shop_tooltip: "Compre produtos com a marca OpenStreetMap" 
-    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
-    sotm: 'Venha para a OpenStreetMap Conference 2009 (The State of the Map) de 10 a 12 de julho em Amsterdam!'
-    alt_donation: "FaÃ§a uma doaÃ§Ã£o"
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} comentou uma entrada de seu diÃ¡rio"
+    donate_link_text: doando
+    edit: Editar
+    edit_tooltip: Editar mapas
+    export: Exportar
+    export_tooltip: Exportar dados do mapa
+    gps_traces: Trilhas GPS
+    gps_traces_tooltip: Gerenciar trilhas
+    help_wiki: Ajuda & Wiki
+    help_wiki_tooltip: Ajuda &amp; Wiki do projeto
+    history: HistÃ³rico
+    history_tooltip: HistÃ³rico de alteraÃ§Ãµes
+    home: inÃ­cio
+    home_tooltip: Ir para a sua localizaÃ§Ã£o
+    inbox: caixa de entrada ({{count}})
+    inbox_tooltip: 
+      one: 1 Nova mensagem na sua caixa de entrada
+      other: Sua caixa de entrada tem {{count}} mensagens nÃ£o lidas
+      zero: Sem novas mensagens na sua caixa de entrada
+    intro_1: OpenStreetMap Ã© um mapa livre e editÃ¡vel do mundo. Ele Ã© feito por pessoas como vocÃª.
+    intro_2: OpenStreetMap permite visualizar, editar e usar dados geogrÃ¡ficos de maneira colaborativa de qualquer lugar do mundo.
+    intro_3: A hospedagem dos dados do OpenStreetMap Ã© cedida gentilmente por {{ucl}} e {{bytemark}}.
+    log_in: entrar
+    log_in_tooltip: Entrar com uma conta existente
+    logo: 
+      alt_text: OpenStreetMap logo
+    logout: sair
+    logout_tooltip: Sair
+    news_blog: Blog de notÃ­cias
+    news_blog_tooltip: Blog de notÃ­cias sobre o OpenStreetMap, dados geogrÃ¡ficos livres, etc.
+    osm_offline: A base de dados do OpenStreetMap estÃ¡ off-line devido a operaÃ§Ãµes de manutenÃ§Ã£o.
+    osm_read_only: A base de dados do OpenStreetMap estÃ¡ em modo somente leitura devido a operaÃ§Ãµes de manutenÃ§Ã£o.
+    shop: Produtos
+    shop_tooltip: Compre produtos com a marca OpenStreetMap
+    sign_up: registrar
+    sign_up_tooltip: Criar uma conta para editar
+    sotm: Venha para a OpenStreetMap Conference 2009 (The State of the Map) de 10 a 12 de julho em Amsterdam!
+    tag_line: O Wiki de Mapas Livres
+    user_diaries: DiÃ¡rios de UsuÃ¡rio
+    user_diaries_tooltip: Ver os diÃ¡rios dos usuÃ¡rios
+    view: Ver
+    view_tooltip: Ver mapas
+    welcome_user: Bem vindo, {{user_link}}
+    welcome_user_link_tooltip: Sua PÃ¡gina de usuÃ¡rio
+  map: 
+    coordinates: "Coordenadas:"
+    edit: Editar
+    view: Ver
+  message: 
+    delete: 
+      deleted: Mensagem apagada
+    inbox: 
+      date: Data
+      from: De
+      my_inbox: Minha caixa de entrada
+      no_messages_yet: VocÃª ainda nÃ£o tem mensagens. Por que nÃ£o entrar em contato com {{people_mapping_nearby_link}}?
+      outbox: caixa de saÃ­da
+      people_mapping_nearby: alguÃ©m mapeando por perto
+      subject: Assunto
+      title: Caixa de Entrada
+      you_have: VocÃª tem {{new_count}} mensagens novas e {{old_count}} mensagens antigas
+    mark: 
+      as_read: Mensagem marcada como lida
+      as_unread: Mensagem marcada como nÃ£o lida
+    message_summary: 
+      delete_button: Apagar
+      read_button: Marcar como lida
+      reply_button: Responder
+      unread_button: Marcar como nÃ£o lida
+    new: 
+      back_to_inbox: Voltar para a caixa de entrada
+      body: Mensagem
+      message_sent: Mensage enviada
+      send_button: Enviar
+      send_message_to: Enviar uma nova mensagem para {{name}}
+      subject: Assunto
+      title: Enviar mensagem
+    no_such_user: 
+      body: Me desculpe, nÃ£o hÃ¡ nenhum usuÃ¡rio ou mensagem com esse nome ou id
+      heading: NÃ£o hÃ¡ tal usuÃ¡rio ou mensagem
+      title: NÃ£o existe usuÃ¡rio ou mensagem
+    outbox: 
+      date: Data
+      inbox: caixa de entrada
+      my_inbox: Minha {{inbox_link}}
+      no_sent_messages: VocÃª ainda nÃ£o enviou nenhuma mensagem. Porque nÃ£o entrar em contato com {{people_mapping_nearby_link}}?
+      outbox: caixa de saÃ­da
+      people_mapping_nearby: alguÃ©m mapeando por perto
+      subject: Assunto
+      title: Caixa de SaÃ­da
+      to: Para
+      you_have_sent_messages: VocÃª tem {{sent_count}} mensagens enviadas
+    read: 
+      back_to_inbox: Voltar para a caixa de entrada
+      back_to_outbox: Voltar para a caixa de saÃ­da
+      date: Data
+      from: De
+      reading_your_messages: Lendo suas mensagens
+      reading_your_sent_messages: Lendo suas mensagens enviadas
+      reply_button: Responder
+      subject: Assunto
+      title: Ler Mensagem
+      to: Para
+      unread_button: Marcar como nÃ£o lida
+    sent_message_summary: 
+      delete_button: Apagar
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                  Por favor nÃ£o responda este e-mail.                    *"
       banner2: "*              Use o Site do OpenStreetMap para respondÃª-lo.              *"
-      hi: "OlÃ¡ {{to_user}},"
+      footer: VocÃª pode ler o comentÃ¡rio em {{readurl}}, pode comentÃ¡-lo em {{commenturl}} ou respondÃª-lo em {{replyurl}}
       header: "{{from_user}} comentou a sua entrada de diÃ¡rio do OpenStreetMap com o assunto {{subject}}:"
-      footer: "VocÃª pode ler o comentÃ¡rio em {{readurl}}, pode comentÃ¡-lo em {{commenturl}} ou respondÃª-lo em {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} enviou uma mensagem para vocÃª"
-      banner1: "*                  Por favor nÃ£o responda este e-mail.                    *"
-      banner2: "*             Use o site do OpenStreetMap para respondÃª-lo.               *"
-      hi: "OlÃ¡ {{to_user}},"
-      header: "{{from_user}} enviou uma mensagem pelo OpenStreetMap para vocÃª com o assunto {{subject}}:"
-      footer1: "VocÃª pode ser a mensagem em {{readurl}}"
-      footer2: "e pode respondÃª-la em {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} adicionou vocÃª como amigo"
+      hi: OlÃ¡ {{to_user}},
+      subject: "[OpenStreetMap] {{user}} comentou uma entrada de seu diÃ¡rio"
+    email_confirm: 
+      subject: "[OpenStreetMap] ConfirmaÃ§Ã£o de endereÃ§o de e-mail"
+    email_confirm_html: 
+      click_the_link: Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para confirmar a alteraÃ§Ã£o.
+      greeting: OlÃ¡,
+      hopefully_you: AlguÃ©m (esperamos que vocÃª) quer alterar seu endereÃ§o de e-mail de {{server_url}} para {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para confirmar a alteraÃ§Ã£o.
+      greeting: OlÃ¡,
+      hopefully_you_1: AlguÃ©m (esperamos que vocÃª) quer alterar seu endereÃ§o de e-mail de
+      hopefully_you_2: "{{server_url}} para {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} adicionou vocÃª como amigo no OpenStreetMap."
-      see_their_profile: "VocÃª pode ver seu perfil em {{userurl}} e adicionÃ¡-lo tambÃ©m se desejar."
-    gpx_notification:
-      greeting: "OlÃ¡,"
-      your_gpx_file: "Este parece ser um arquivo GPX seu"
-      with_description: "com a descriÃ§Ã£o"
+      see_their_profile: VocÃª pode ver seu perfil em {{userurl}} e adicionÃ¡-lo tambÃ©m se desejar.
+      subject: "[OpenStreetMap] {{user}} adicionou vocÃª como amigo"
+    gpx_notification: 
+      and_no_tags: e sem etiquetas.
       and_the_tags: "e as seguintes etiquetas:"
-      and_no_tags: "e sem etiquetas."
-      failure:
-        subject: "[OpenStreetMap] ImportaÃ§Ã£o de arquivo GPX falhou"
+      failure: 
         failed_to_import: "falha ao importar. Veja a mensagem de erro:"
-        more_info_1: "Mais informaÃ§Ãµes sobre erros de importaÃ§Ã£o de arquivos GPX e como evitÃ¡-los"
+        more_info_1: Mais informaÃ§Ãµes sobre erros de importaÃ§Ã£o de arquivos GPX e como evitÃ¡-los
         more_info_2: "podem ser encontradas em:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] ImportaÃ§Ã£o de arquivo GPX falhou"
+      greeting: OlÃ¡,
+      success: 
+        loaded_successfully: "carregado com sucesso com {{trace_points}} pontos alÃ©m dos\n{{possible_points}} pontos possÃ­veis.\""
         subject: "[OpenStreetMap] Arquivo GPX importado com sucesso"
-        loaded_successfully: "|
-          carregado com sucesso com {{trace_points}} pontos alÃ©m dos 
-          {{possible_points}} pontos possÃ­veis."
-    signup_confirm:
+      with_description: com a descriÃ§Ã£o
+      your_gpx_file: Este parece ser um arquivo GPX seu
+    lost_password: 
+      subject: "[OpenStreetMap] SolicitaÃ§Ã£o de nova senha"
+    lost_password_html: 
+      click_the_link: Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para receber uma nova senha.
+      greeting: OlÃ¡,
+      hopefully_you: AlguÃ©m (possivelmente vocÃª) pediu uma nova senha para a conta no openstreetmap.org ligada a este e-mail.
+    lost_password_plain: 
+      click_the_link: Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para receber uma nova senha.
+      greeting: OlÃ¡,
+      hopefully_you_1: AlguÃ©m (possivelmente vocÃª) pediu uma nova senha
+      hopefully_you_2: para a conta no openstreetmap.org ligada a este e-mail.
+    message_notification: 
+      banner1: "*                  Por favor nÃ£o responda este e-mail.                    *"
+      banner2: "*             Use o site do OpenStreetMap para respondÃª-lo.               *"
+      footer1: VocÃª pode ser a mensagem em {{readurl}}
+      footer2: e pode respondÃª-la em {{replyurl}}
+      header: "{{from_user}} enviou uma mensagem pelo OpenStreetMap para vocÃª com o assunto {{subject}}:"
+      hi: OlÃ¡ {{to_user}},
+      subject: "[OpenStreetMap] {{user}} enviou uma mensagem para vocÃª"
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirme seu endereÃ§o de e-mail"
-    signup_confirm_plain:
-      greeting: "OlÃ¡!"
-      hopefully_you: "AlguÃ©m (esperamos que vocÃª) quer criar uma conta em "
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Se esta pessoa Ã© vocÃª, bem-vindo! Clique abaixo para confirmar sua"
-      click_the_link_2: "conta e ler mais informaÃ§Ãµes sobre o OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: Se esta pessoa Ã© vocÃª, bem-vindo! Por favor, clique no link abaixo para confirmar sua inscriÃ§Ã£o e ler mais informaÃ§Ãµes sobre o OpenStreetMap.
+      current_user: A lista de usuÃ¡rios, baseada em suas localizaÃ§Ãµes no mundo, estÃ¡ disponÃ­vel em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Continue lendo sobre o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Pt-br:Beginners_Guide">no wiki</a> ou <a href="http://www.opengeodata.org/">no blog OpenGeoData (em inglÃªs)</a> que tem <a href="http://www.opengeodata.org/?cat=13">podcasts para baixar (em inglÃªs)</a>!
+      greeting: OlÃ¡!
+      hopefully_you: AlguÃ©m (esperamos que vocÃª) quer criar uma conta em
+      introductory_video: VocÃª pode ver um vÃ­deo introdutÃ³rio (em inglÃªs) em {{introductory_video_link}}.
+      more_videos: HÃ¡ tambÃ©m {{more_videos_link}}.
+      more_videos_here: mais vÃ­deos aqui
+      user_wiki_page: Ã recomendÃ¡vel que vocÃª crie sua pÃ¡gina no wiki, incluindo etiquetas sobre sua localizaÃ§Ã£o, como em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Rio_de_Janeiro">[[Category:Users_in_Rio_de_Janeiro]]</a>.
+      video_to_openstreetmap: vÃ­deo introdutÃ³rio ao OpenStreetMap
+      wiki_signup: VocÃª pode querer tambÃ©m <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"> se registrar no wiki do OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Se esta pessoa Ã© vocÃª, bem-vindo! Clique abaixo para confirmar sua
+      click_the_link_2: conta e ler mais informaÃ§Ãµes sobre o OpenStreetMap.
+      current_user_1: Uma lista atualizada de usuÃ¡rios em categorias, baseada em onde eles
+      current_user_2: "estÃ£o, estÃ¡ disponÃ­vel aqui:"
+      greeting: OlÃ¡!
+      hopefully_you: AlguÃ©m (esperamos que vocÃª) quer criar uma conta em
       introductory_video: "VocÃª pode assistir um vÃ­deo introdutÃ³rio (em inglÃªs) sobre o OpenStreetMap aqui:"
       more_videos: "Existem mais vÃ­deos aqui:"
-      the_wiki: "Continue lendo sobre o OpenStreetMap no wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org Ã© o blog do OpenStreetMap, que tambÃ©m dispÃµe de podcasts:"
+      the_wiki: "Continue lendo sobre o OpenStreetMap no wiki:"
+      user_wiki_1: Ã recomendÃ¡vel que vocÃª crie sua pÃ¡gina no wiki, incluindo tags de
+      user_wiki_2: categorias marcando onde vocÃª estÃ¡, como [[Category:Users_in_Brazil]].
       wiki_signup: "VocÃª tambÃ©m pode querer registrar-se no wiki do OpenStreetMap em:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "Ã recomendÃ¡vel que vocÃª crie sua pÃ¡gina no wiki, incluindo tags de "
-      user_wiki_2: "categorias marcando onde vocÃª estÃ¡, como [[Category:Users_in_Brazil]]."
-      current_user_1: "Uma lista atualizada de usuÃ¡rios em categorias, baseada em onde eles "
-      current_user_2: "estÃ£o, estÃ¡ disponÃ­vel aqui:"
-    signup_confirm_html:
-      greeting: "OlÃ¡!"
-      hopefully_you: "AlguÃ©m (esperamos que vocÃª) quer criar uma conta em "
-      click_the_link: "Se esta pessoa Ã© vocÃª, bem-vindo! Por favor, clique no link abaixo para confirmar sua inscriÃ§Ã£o e ler mais informaÃ§Ãµes sobre o OpenStreetMap."
-      introductory_video: "VocÃª pode ver um vÃ­deo introdutÃ³rio (em inglÃªs) em {{introductory_video_link}}."
-      video_to_openstreetmap: "vÃ­deo introdutÃ³rio ao OpenStreetMap"
-      more_videos: "HÃ¡ tambÃ©m {{more_videos_link}}."
-      more_videos_here: "mais vÃ­deos aqui"
-      get_reading: 'Continue lendo sobre o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">no wiki</a> ou <a href="http://www.opengeodata.org/">no blog OpenGeoData</a> que tem <a href="http://www.opengeodata.org/?cat=13">podcasts para baixar</a>!'
-      wiki_signup: 'VocÃª pode querer tambÃ©m <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"> se registrar no wiki do OpenStreetMap</a>.'
-      user_wiki_page: 'Ã recomendÃ¡vel que vocÃª crie sua pÃ¡gina no wiki, incluindo etiquetas sobre sua localizaÃ§Ã£o, como em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Rio_de_Janeiro">[[Category:Users_in_Rio_de_Janeiro]]</a>.'
-      current_user: 'A lista de usuÃ¡rios, baseada em suas localizaÃ§Ãµes no mundo, estÃ¡ disponÃ­vel em <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] ConfirmaÃ§Ã£o de endereÃ§o de e-mail"
-    email_confirm_plain:
-      greeting: "OlÃ¡,"
-      hopefully_you_1: "AlguÃ©m (esperamos que vocÃª) quer alterar seu endereÃ§o de e-mail de "
-      hopefully_you_2: "{{server_url}} para {{new_address}}."
-      click_the_link: "Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para confirmar a alteraÃ§Ã£o."
-    email_confirm_html:
-      greeting: "OlÃ¡,"
-      hopefully_you: "AlguÃ©m (esperamos que vocÃª) quer alterar seu endereÃ§o de e-mail de {{server_url}} para {{new_address}}."
-      click_the_link: "Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para confirmar a alteraÃ§Ã£o."
-    lost_password:
-      subject: "[OpenStreetMap] SolicitaÃ§Ã£o de nova senha"
-    lost_password_plain:
-      greeting: "OlÃ¡,"
-      hopefully_you_1: "AlguÃ©m (possivelmente vocÃª) pediu uma nova senha"
-      hopefully_you_2: "para a conta no openstreetmap.org ligada a este e-mail."
-      click_the_link: "Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para receber uma nova senha."
-    lost_password_html:
-      greeting: "OlÃ¡,"
-      hopefully_you: "AlguÃ©m (possivelmente vocÃª) pediu uma nova senha para a conta no openstreetmap.org ligada a este e-mail."
-      click_the_link: "Se esta pessoa Ã© vocÃª, por favor clique no link abaixo para receber uma nova senha."
-  message:
-    inbox:
-      title: "Caixa de Entrada"
-      my_inbox: "Minha caixa de entrada"
-      outbox: "caixa de saÃ­da"
-      you_have: "VocÃª tem {{new_count}} mensagens novas e {{old_count}} mensagens antigas"
-      from: "De"
-      subject: "Assunto"
-      date: "Data"
-      no_messages_yet: "VocÃª ainda nÃ£o tem mensagens. Por que nÃ£o entrar em contato com {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "alguÃ©m mapeando por perto" 
-    message_summary:
-      unread_button: "Marcar como nÃ£o lida"
-      read_button: "Marcar como lida"
-      reply_button: "Responder"
-      delete_button: "Apagar"
-    new:
-      title: "Enviar mensagem"
-      send_message_to: "Enviar uma nova mensagem para {{name}}"
-      subject: "Assunto"
-      body: "Mensagem"
-      send_button: "Enviar"
-      back_to_inbox: "Voltar para a caixa de entrada"
-      message_sent: "Mensage enviada"
-    no_such_user:
-      title: "NÃ£o existe usuÃ¡rio ou mensagem"
-      no_such_user: "UsuÃ¡rio ou mensagem nÃ£o encontrada"
-      sorry: "Desculpe, nÃ£o existe usuÃ¡rio ou mensagem com esse nome ou id"
-    outbox: 
-      title: "Caixa de SaÃ­da"
-      my_inbox: "Minha {{inbox_link}}"
-      inbox: "caixa de entrada"
-      outbox: "caixa de saÃ­da"
-      you_have_sent_messages: "VocÃª tem {{sent_count}} mensagens enviadas"
-      to: "Para"
-      subject: "Assunto"
-      date: "Data"
-      no_sent_messages: "VocÃª ainda nÃ£o enviou nenhuma mensagem. Porque nÃ£o entrar em contato com {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "alguÃ©m mapeando por perto"
-    read:
-      title: "Ler Mensagem"
-      reading_your_messages: "Lendo suas mensagens"
-      from: "De"
-      subject: "Assunto"
-      date: "Data"
-      reply_button: "Responder"
-      unread_button: "Marcar como nÃ£o lida"
-      back_to_inbox: "Voltar para a caixa de entrada"
-      reading_your_sent_messages: "Lendo suas mensagens enviadas"
-      to: "Para"
-      back_to_outbox: "Voltar para a caixa de saÃ­da"
-    sent_message_summary:
-      delete_button: "Apagar"
-    mark:
-      as_read: "Mensagem marcada como lida"
-      as_unread: "Mensagem marcada como nÃ£o lida"
-    delete:
-      deleted: "Mensagem apagada"
-  site:
-    index:
-      js_1: "VocÃª estÃ¡ usando um navegador sem suporte a javascript, ou estÃ¡ com o javascript desativado."
-      js_2: "O OpenStreetMap usa javascript para a navegaÃ§Ã£o dos mapas."
-      js_3: 'VocÃª pode tentar o <a href="http://tah.openstreetmap.org/Browse/">navegador estÃ¡tico Tiles@Home</a> se nÃ£o for possÃ­vel ativar o javascript.'
-      permalink: "Link Permanente"
-      shortlink: "Atalho"
-      license:
-        notice: "Licenciado sob a {{license_name}} para o {{project_name}} e seus contribuidores."
-        license_name: "Creative Commons de AtribuiÃ§Ã£o-Compartilhamento pela Mesma LicenÃ§a 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "Projeto OpenStreetMap"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "VocÃª nÃ£o configurou suas ediÃ§Ãµes para serem pÃºblicas."
-      not_public_description: "VocÃª nÃ£o pode editar o mapa atÃ© que vocÃª configure suas ediÃ§Ãµes para serem pÃºblicas, o que pode fazer na sua {{user_page}}."
-      user_page_link: "pÃ¡gina de usuÃ¡rio"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits"
-      anon_edits_link_text: "Descubra se Ã© esse o seu caso."
-      flash_player_required: 'VocÃª precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. VocÃª pode <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">baixar o Flash Player da Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Pt-br:Editing">Outras opÃ§Ãµes</a> estÃ£o disponÃ­veis para editar o OpenStreetMap.'
-      potlatch_unsaved_changes: "VocÃª tem alteraÃ§Ãµes nÃ£o salvas. (Para salvar no Potlatch, vocÃª deve deselecionar a linha ou ponto atual, se editando no modo de ediÃ§Ã£o ao vivo, ou clicar em salvar se estiver editando offline."
-    sidebar:
-      search_results: "Resultados da Busca"
-      close: "Fechar"
-    search:
-      search: "Buscar"
-      where_am_i: "Onde estou?"
-      submit_text: "Ir"
-      search_help: "exemplos: 'BrasÃ­lia', 'Av. Paulista, SÃ£o Paulo', ou 'hospitals near Belo Horizonte' <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Search'>mais exemplos...</a>"
-    key:
-      map_key: "Legenda"
-      map_key_tooltip: "Legenda para o mapa renderizado neste nÃ­vel de zoom"
-      table:
-        heading: "Legenda para o zoom nÃ­vel {{zoom_level}}"
-        entry:
-          motorway: "Rodovia expressa"
-          trunk: "Via Expressa"
-          primary: "Via PrimÃ¡ria"
-          secondary: "Via SecundÃ¡ria"
-          unclassified: "Via Sem ClassificaÃ§Ã£o Administrativa"
-          unsurfaced: "Via NÃ£o Pavimentada"
-          track: "Trilha"
-          byway: "Trilha Larga"
-          bridleway: "Trilha de Montaria"
-          cycleway: "Ciclovia"
-          footway: "Passagem para Pedestres"
-          rail: "Trilhos"
-          subway: "Trilhos SubterrÃ¢neos"
-          tram:
-            - Trem metropolitano
-            - Trem de superfÃ­cie (bonde)
-          cable:
-            - VeÃ­culo de cabos
-            - Elevador de Cadeiras
-          runway:
-            - Pista de aterrissagem
-            - Pista de manobras
-          apron:
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: ler suas trilhas de GPS privadas
+      allow_read_prefs: ler suas preferÃªncias
+      allow_to: "Permitir a aplicaÃ§Ã£o cliente:"
+      allow_write_api: modificar o mapa.
+      allow_write_diary: criar entradas de diÃ¡rio, comentÃ¡rios e adicionar amigos.
+      allow_write_gpx: atualizar trilhas de GPS.
+      allow_write_prefs: modificar suas preferÃªncias de usuÃ¡rio.
+      request_access: A aplicaÃ§Ã£o {{app_name}} estÃ¡ pedindo acesso Ã  sua conta. Por favor cheque se vocÃª gostaria que a aplicaÃ§Ã£o tenha as seguintes capacidades. VocÃª pode escolher quaisquer que quiser.
+    revoke: 
+      flash: VocÃª cancelou o token para {{application}}
+  oauth_clients: 
+    create: 
+      flash: A informaÃ§Ã£o foi resgistrada com sucesso
+    destroy: 
+      flash: O registro da aplicaÃ§Ã£o cliente foi apagado
+    edit: 
+      submit: Editar
+      title: Editar sua aplicaÃ§Ã£o
+    form: 
+      allow_read_gpx: ler suas trilhas de GPS privadas.
+      allow_read_prefs: ler as suas preferÃªncias de usuÃ¡rio.
+      allow_write_api: modificar o mapa.
+      allow_write_diary: criar entradas de diÃ¡rio, comentÃ¡rios e adicionar amigos.
+      allow_write_gpx: enviar trilhas de GPS
+      allow_write_prefs: modificar suas preferÃªncias de usuÃ¡rio.
+      callback_url: URL de callback
+      name: Nome
+      requests: "Pedir as seguintes permissÃµes do usuÃ¡rio:"
+      required: ObrigatÃ³rio
+      support_url: URL de suporte
+      url: URL principal da aplicaÃ§Ã£o
+    index: 
+      application: Nome da AplicaÃ§Ã£o
+      issued_at: Distribuido em
+      list_tokens: "Os seguintes tokens foram distribuidos para aplicaÃ§Ãµes em seu nome:"
+      my_apps: Minhas AplicaÃ§Ãµes Cliente
+      my_tokens: Minhas aplicaÃ§Ãµes autorizadas
+      no_apps: VocÃª tem uma aplicaÃ§Ã£o que gostaria de registrar para usar conosco usando o padrÃ£o {{oauth}}? VocÃª deve registrar sua aplicaÃ§Ã£o web antes de ela poder fazer requisiÃ§Ãµes OAuth para esse serviÃ§o.
+      register_new: Registre sua aplicaÃ§Ã£o
+      registered_apps: "VocÃª tem as seguintes aplicaÃ§Ãµes cliente registradas:"
+      revoke: Cancelar!
+      title: Meus detalhes OAuth
+    new: 
+      submit: Registrar
+      title: Registrar uma nova aplicaÃ§Ã£o
+    not_found: 
+      sorry: Me desculpe, esse {{type}} nÃ£o pÃ´de ser encontrado.
+    show: 
+      access_url: "URL do token de acesso:"
+      allow_read_gpx: ler suas trilhas de GPS privadas.
+      allow_read_prefs: ler suas preferÃªncias de usuÃ¡rio.
+      allow_write_api: modificar o mapa
+      allow_write_diary: criar entradas de diÃ¡rio, comentÃ¡rios e adicionar amigos.
+      allow_write_gpx: enviar trilhas de GPS.
+      allow_write_prefs: modificar suas preferÃªncias de usuÃ¡rio.
+      authorize_url: "URL de autorizaÃ§Ã£o:"
+      edit: Editar detalhes
+      key: Chave de Consumidor
+      requests: "Pedindo as seguintes permissÃµes ao usuÃ¡rio:"
+      secret: Segredo do Consumidor
+      support_notice: NÃ³s suportamos HMAC-SHA1 (recomendado) assim como texto simples em modo SSL.
+      title: Detalhes OAuth de {{app_name}}
+      url: URL do token de requisiÃ§Ã£o
+    update: 
+      flash: As informaÃ§Ãµes do cliente foram atualizadas com sucesso
+  site: 
+    edit: 
+      anon_edits_link_text: Descubra se Ã© esse o seu caso.
+      flash_player_required: VocÃª precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. VocÃª pode <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">baixar o Flash Player da Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Pt-br:Editing">Outras opÃ§Ãµes</a> estÃ£o disponÃ­veis para editar o OpenStreetMap.
+      not_public: VocÃª nÃ£o configurou suas ediÃ§Ãµes para serem pÃºblicas.
+      not_public_description: VocÃª nÃ£o pode editar o mapa atÃ© que vocÃª configure suas ediÃ§Ãµes para serem pÃºblicas, o que pode fazer na sua {{user_page}}.
+      potlatch_unsaved_changes: VocÃª tem alteraÃ§Ãµes nÃ£o salvas. (Para salvar no Potlatch, vocÃª deve deselecionar a linha ou ponto atual, se editando no modo de ediÃ§Ã£o ao vivo, ou clicar em salvar se estiver editando offline.
+      user_page_link: pÃ¡gina de usuÃ¡rio
+    index: 
+      js_1: VocÃª estÃ¡ usando um navegador sem suporte a javascript, ou estÃ¡ com o javascript desativado.
+      js_2: O OpenStreetMap usa javascript para a navegaÃ§Ã£o dos mapas.
+      js_3: VocÃª pode tentar o <a href="http://tah.openstreetmap.org/Browse/">navegador estÃ¡tico Tiles@Home</a> se nÃ£o for possÃ­vel ativar o javascript.
+      license: 
+        license_name: Creative Commons de AtribuiÃ§Ã£o-Compartilhamento pela Mesma LicenÃ§a 2.0
+        notice: Licenciado sob a {{license_name}} para o {{project_name}} e seus contribuidores.
+        project_name: Projeto OpenStreetMap
+      permalink: Link Permanente
+      shortlink: Atalho
+    key: 
+      map_key: Legenda
+      map_key_tooltip: Legenda para o mapa renderizado neste nÃ­vel de zoom
+      table: 
+        entry: 
+          admin: Limite Administrativo
+          allotments: Terra Arrendada
+          apron: 
             - Pista de estacionamento de aviÃµes
             - Aeroporto
-          admin: "Limite Administrativo"
-          forest: "Floresta"
-          wood: "Reserva Florestal"
-          golf: "Campo de Golf"
-          park: "Parque"
-          resident: "Ãrea Residencial"
-          tourist: "AtraÃ§Ã£o TurÃ­stica"
-          common:
+          bridge: Ponte/Viaduto (EnvoltÃ³ria SÃ³lida)
+          bridleway: Trilha de Montaria
+          brownfield: Ãrea Livre PÃ³s DemoliÃ§Ã£o
+          building: EdificaÃ§Ã£o
+          byway: Trilha Larga
+          cable: 
+            - VeÃ­culo de cabos
+            - Elevador de Cadeiras
+          cemetery: CemitÃ©rio
+          centre: Centro de Esportes/GinÃ¡sio
+          commercial: Ãrea Commercial (EscritÃ³rios)
+          common: 
             - Ãrea pÃºblica
             - VegetaÃ§Ã£o rasteira
-          retail: "Ãrea Comercial (Lojas)"
-          industrial: "Ãrea Industrial"
-          commercial: "Ãrea Commercial (EscritÃ³rios)"
-          heathland: "Ãrea Sem VegetaÃ§Ã£o"
-          lake:
+          construction: Vias em ConstruÃ§Ã£o
+          cycleway: Ciclovia
+          destination: Acesso Local Apenas
+          farm: Fazenda
+          footway: Passagem para Pedestres
+          forest: Floresta
+          golf: Campo de Golf
+          heathland: Ãrea Sem VegetaÃ§Ã£o
+          industrial: Ãrea Industrial
+          lake: 
             - Lago
             - Represa ou ReservatÃ³rio de Ãgua
-          farm: "Fazenda"
-          brownfield: "Ãrea Livre PÃ³s DemoliÃ§Ã£o"
-          cemetery: "CemitÃ©rio"
-          allotments: "Terra Arrendada"
-          pitch: "Campo para PrÃ¡tica de Esportes"
-          centre: "Centro de Esportes/GinÃ¡sio"
-          reserve: "Reserva Natural"
-          military: "Ãrea Militar"
-          school: "Escola/Universidade"
-          building: "EdificaÃ§Ã£o"
-          station: "EstaÃ§Ã£o de Trem/MetrÃ´"
-          summit:
+          military: Ãrea Militar
+          motorway: Rodovia expressa
+          park: Parque
+          permissive: Acesso Permissivo
+          pitch: Campo para PrÃ¡tica de Esportes
+          primary: Via PrimÃ¡ria
+          private: Acesso Restrito (Propriedade Privada)
+          rail: Trilhos
+          reserve: Reserva Natural
+          resident: Ãrea Residencial
+          retail: Ãrea Comercial (Lojas)
+          runway: 
+            - Pista de aterrissagem
+            - Pista de manobras
+          school: Escola/Universidade
+          secondary: Via SecundÃ¡ria
+          station: EstaÃ§Ã£o de Trem/MetrÃ´
+          subway: Trilhos SubterrÃ¢neos
+          summit: 
             - Monte
             - Pico
-          tunnel: "TÃºnel (EnvoltÃ³ria Tracejada)"
-          bridge: "Ponte/Viaduto (EnvoltÃ³ria SÃ³lida)"
-          private: "Acesso Restrito (Propriedade Privada)"
-          permissive: "Acesso Permissivo"
-          destination: "Acesso Local Apenas"
-          construction: "Vias em ConstruÃ§Ã£o"
-  trace:
-    create:
-      upload: "Enviar Trilha GPS"
-      trace_uploaded: "Seu arquivo GPX foi enviado e estÃ¡ aguardando para ser inserido no banco de dados. Isso normalmente leva meia hora, e um e-mail serÃ¡ enviado para vocÃª quando ocorrer."
-    edit:
-      title: "Editando trilha {{name}}"
-      heading: "Editando trilha {{name}}"
+          tourist: AtraÃ§Ã£o TurÃ­stica
+          track: Trilha
+          tram: 
+            - Trem metropolitano
+            - Trem de superfÃ­cie (bonde)
+          trunk: Via Expressa
+          tunnel: TÃºnel (EnvoltÃ³ria Tracejada)
+          unclassified: Via Sem ClassificaÃ§Ã£o Administrativa
+          unsurfaced: Via NÃ£o Pavimentada
+          wood: Reserva Florestal
+        heading: Legenda para o zoom nÃ­vel {{zoom_level}}
+    search: 
+      search: Buscar
+      search_help: "exemplos: 'BrasÃ­lia', 'Av. Paulista, SÃ£o Paulo', ou 'hospitals near Belo Horizonte' <a href='http://wiki.openstreetmap.org/wiki/Pt-br:Search'>mais exemplos...</a>"
+      submit_text: Ir
+      where_am_i: Onde estou?
+    sidebar: 
+      close: Fechar
+      search_results: Resultados da Busca
+  trace: 
+    create: 
+      trace_uploaded: Seu arquivo GPX foi enviado e estÃ¡ aguardando para ser inserido no banco de dados. Isso normalmente leva meia hora, e um e-mail serÃ¡ enviado para vocÃª quando ocorrer.
+      upload_trace: Envie as trilhas de GPS
+    delete: 
+      scheduled_for_deletion: Trilha marcada para ser apagada
+    edit: 
+      description: "DescriÃ§Ã£o:"
+      download: baixar
+      edit: editar
       filename: "Nome do arquivo:"
-      download: "baixar"
-      uploaded_at: "Enviado em:"
+      heading: Editando trilha {{name}}
+      map: mapa
+      owner: "Dono:"
       points: "Pontos:"
+      save_button: Salvar MudanÃ§as
       start_coord: "Coordenada de inÃ­cio:"
-      map: "mapa"
-      edit: "editar"
-      owner: "Dono:"
-      description: "DescriÃ§Ã£o:"
       tags: "Tags:"
-      tags_help: "separados por vÃ­rgulas"
-      save_button: "Salvar MudanÃ§as"
-    no_such_user:
-      title: "UsuÃ¡rio nÃ£o encontrado"
-      heading: "O usuÃ¡rio {{user}} nÃ£o existe"
-      no_such_user: "Desculpe, nÃ£o existe usuÃ¡rio de nome {{name}}. Verifique a digitaÃ§Ã£o, ou talvez o link que vocÃª tenha clicado esteja errado."
-    trace_form:
-      upload_gpx: "Enviar Arquivo GPX"
-      description: "DescriÃ§Ã£o"
-      tags: "Etiquetas"
-      tags_help: "separados por vÃ­rgulas"
-      public: "PÃºblico?"
-      public_help: "o que significa isso?"
-      public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "Enviar"
-      help: "Ajuda"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "Ver somente suas trilhas, ou subir uma trilha"
-      see_all_traces: "Ver todas as trilhas"
-      see_your_traces: "Ver todas as suas trilhas"
-      traces_waiting: "VocÃª tem {{count}} trilhas esperando para subir. Por favor considere esperar que elas terminem antes de subir mais, para nÃ£o bloquear a fila para outros usuÃ¡rios."
-    trace_optionals:
-      tags: "Etiquetas"
-    view:
-      title: "Visualizando trilha {{name}}"
-      heading: "Visualizando trilha {{name}}"
-      pending: "PENDENTE"
+      tags_help: separados por vÃ­rgulas
+      title: Editando trilha {{name}}
+      uploaded_at: "Enviado em:"
+      visibility: "Visibilidade:"
+      visibility_help: o que isso significa?
+    list: 
+      public_traces: Trilhas PÃºblicas de GPS
+      public_traces_from: Trilhas de GPS pÃºblicas de {{user}}
+      tagged_with: " etiquetadas com {{tags}}"
+      your_traces: Suas Trilhas de GPS
+    make_public: 
+      made_public: Trilha publicada
+    no_such_user: 
+      body: PerdÃ£o, nÃ£o hÃ¡ usuÃ¡rio com o nome {{user}}. Por favor, cheque sua ortografia, ou talvez o link que vocÃª clicou estÃ¡ errado.
+      heading: O usuÃ¡rio {{user}} nÃ£o existe
+      title: UsuÃ¡rio nÃ£o encontrado
+    trace: 
+      ago: "{{time_in_words_ago}} atrÃ¡s"
+      by: por
+      count_points: "{{count}} pontos"
+      edit: editar
+      edit_map: Editar Mapa
+      in: em
+      map: mapa
+      more: mais
+      pending: PENDENTE
+      private: PRIVADO
+      public: PUBLICO
+      trace_details: Ver detalhes da trilha
+      view_map: Ver Mapa
+    trace_form: 
+      description: DescriÃ§Ã£o
+      help: Ajuda
+      tags: Etiquetas
+      tags_help: separados por vÃ­rgulas
+      upload_button: Enviar
+      upload_gpx: Enviar Arquivo GPX
+      visibility: Visibilidade
+      visibility_help: o que isso significa?
+    trace_header: 
+      see_all_traces: Ver todas as trilhas
+      see_just_your_traces: Ver somente suas trilhas, ou subir uma trilha
+      see_your_traces: Ver todas as suas trilhas
+      traces_waiting: VocÃª tem {{count}} trilhas esperando para subir. Por favor considere esperar que elas terminem antes de subir mais, para nÃ£o bloquear a fila para outros usuÃ¡rios.
+    trace_optionals: 
+      tags: Etiquetas
+    trace_paging_nav: 
+      of: de
+      showing: Mostrando pÃ¡gina
+    view: 
+      delete_track: Apague esta trilha
+      description: "DescriÃ§Ã£o:"
+      download: baixar
+      edit: editar
+      edit_track: Edite esta trilha
       filename: "Nome do arquivo:"
-      download: "baixar"
-      uploaded: "Enviado em:"
+      heading: Visualizando trilha {{name}}
+      map: mapa
+      none: Nenhum
+      owner: "Dono:"
+      pending: PENDENTE
       points: "Pontos:"
       start_coordinates: "Coordenada de inÃ­cio:"
-      map: "mapa"
-      edit: "editar"
-      owner: "Dono:"
-      description: "DescriÃ§Ã£o:"
-      tags: "Etiquetas"
-      none: "Nenhum"
-      make_public: "Torne esta trilha permanentemente pÃºblica"
-      edit_track: "Edite esta trilha"
-      delete_track: "Apague esta trilha"
-      trace_not_found: "Trilha nÃ£o encontrada!"
-    trace_paging_nav:
-      showing: "Mostrando pÃ¡gina"
-      of: "de"
-    trace:
-      pending: "PENDENTE"
-      count_points: "{{count}} pontos"
-      ago: "{{time_in_words_ago}} atrÃ¡s"
-      more: "mais"
-      trace_details: "Ver detalhes da trilha"
-      view_map: "Ver Mapa"
-      edit: "editar"
-      edit_map: "Editar Mapa"
-      public: "PUBLICO"
-      private: "PRIVADO"
-      by: "por"
-      in: "em"
-      map: "mapa"
-    list:
-      public_traces: "Trilhas PÃºblicas de GPS"
-      your_traces: "Suas Trilhas de GPS"
-      public_traces_from: "Trilhas de GPS pÃºblicas de {{user}}"
-      tagged_with: " etiquetadas com {{tags}}"
-    delete:
-      scheduled_for_deletion: "Trilha marcada para ser apagada"
-    make_public:
-      made_public: "Trilha publicada"
-  user:
-    login:
-      title: "Entrar"
-      heading: "Entrar"
-      please login: "Por favor entre as informaÃ§Ãµes de sua conta para entrar, ou {{create_user_link}}."
-      create_account: "crie uma nova conta"
+      tags: Etiquetas
+      title: Visualizando trilha {{name}}
+      trace_not_found: Trilha nÃ£o encontrada!
+      uploaded: "Enviado em:"
+      visibility: "Vsibilidade:"
+    visibility: 
+      identifiable: IdentificÃ¡vel (mostrado na lista como pontos identificÃ¡veis, ordenados e com informaÃ§Ã£o de tempo)
+      private: Privado (compartilhado apenas como pontos anÃ´nimos e nÃ£o ordenados)
+      public: PÃºblica (apresentado na lista como pontos anÃ´nimos e desordenados)
+      trackable: AcompanhÃ¡vel (compartilhada anonimamente como pontos ordenados com informaÃ§Ã£o de tempo)
+  user: 
+    account: 
+      email never displayed publicly: (nunca mostrado publicamente)
+      flash update success: InformaÃ§Ã£o de usuÃ¡rio atualizada com sucesso.
+      flash update success confirm needed: InformaÃ§Ã£o de usuÃ¡rio atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereÃ§o.
+      home location: "LocalizaÃ§Ã£o:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Tornar todas as minhas ediÃ§Ãµes pÃºblicas
+      my settings: Minhas configuraÃ§Ãµes
+      no home location: VocÃª ainda nÃ£o entrou a sua localizaÃ§Ã£o.
+      preferred languages: "PreferÃªncia de Idioma:"
+      profile description: "DescriÃ§Ã£o do Perfil:"
+      public editing: 
+        disabled: Desativado e nÃ£o pode editar dados, todas as ediÃ§Ãµes anteriores sÃ£o anÃ´nimas.
+        disabled link text: porque nÃ£o posso editar?
+        enabled: Ativado. NÃ£o Ã© permitido ediÃ§Ã£o anÃ´nima.
+        enabled link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits
+        enabled link text: o que Ã© isso?
+        heading: "EdiÃ§Ã£o pÃºblica:"
+      return to profile: Retornar para o perfil
+      save changes button: Salvar MudanÃ§as
+      title: Editar conta
+      update home location on click: Atualizar localizaÃ§Ã£o ao clicar no mapa?
+    confirm: 
+      button: Confirmar
+      failure: A Conta de usuÃ¡rio jÃ¡ foi confirmada anteriormente.
+      heading: Confirmar uma conta de usuÃ¡rio
+      press confirm button: Pressione o botÃ£o de confirmaÃ§Ã£o abaixo para ativar sua conta.
+      success: Conta ativada, obrigado!
+    confirm_email: 
+      button: Confirmar
+      failure: Um endereÃ§o de email jÃ¡ foi confirmado com esse cÃ³digo.
+      heading: Confirmar uma mudanÃ§a do endereÃ§o de email
+      press confirm button: Pressione o botÃ£o de confirmaÃ§Ã£o abaixo para confirmar seu novo endereÃ§o de email.
+      success: Confirmamos seu endereÃ§o de email. Obrigado por se cadastrar!
+    friend_map: 
+      nearby mapper: "Mapeador prÃ³ximo: [[nearby_user]]"
+      your location: Sua localizaÃ§Ã£o
+    go_public: 
+      flash success: Todas as suas ediÃ§Ãµes agora sÃ£o pÃºblicas, e vocÃª estÃ¡ com permissÃ£o para ediÃ§Ã£o.
+    login: 
+      account not active: Desculpe, sua conta nÃ£o estÃ¡ mais ativa.<br />Por favor clique no link no e-mail de confirmaÃ§Ã£o recebido, para ativar sua conta.
+      auth failure: Desculpe, impossÃ­vel entrar com estas informaÃ§Ãµes.
+      create_account: crie uma nova conta
       email or username: "Email ou Nome de UsuÃ¡rio:"
+      heading: Entrar
+      login_button: Entrar
+      lost password link: Esqueceu sua senha?
       password: "Senha:"
-      lost password link: "Esqueceu sua senha?"
-      login_button: "Entrar"
-      account not active: "Desculpe, sua conta nÃ£o estÃ¡ mais ativa.<br />Por favor clique no link no e-mail de confirmaÃ§Ã£o recebido, para ativar sua conta."
-      auth failure: "Desculpe, impossÃ­vel entrar com estas informaÃ§Ãµes."
-    lost_password:
-      title: "Senha esquecida"
-      heading: "Esqueceu sua senha?"
-      email address: "EndereÃ§o de Email:"
-      new password button: "Me envie uma nova senha"
-      notice email on way: "Um email foi enviado para que vocÃª possa escolher outra senha."
-      notice email cannot find: "Desculpe, nÃ£o foi possÃ­vel encontrar esse endereÃ§o de email."
-    reset_password:
-      title: "Redefinir Senha"
-      flash changed check mail: "Sua senha foi alterada e estÃ¡ a caminho para sua caixa de entrada :-)"
-      flash token bad: "O cÃ³digo nÃ£o confere, verifique a URL."
-    new:
-      title: "Criar Conta"
-      heading: "Criar uma nova conta de usuÃ¡rio"
-      no_auto_account_create: "Infelizmente nÃ£o foi possÃ­vel criar uma conta para vocÃª automaticamente."
-      contact_webmaster: 'Por favor contate o <a href="mailto:webmaster@openstreetmap.org">webmaster</a> (em inglÃªs) para que uma conta seja criada - nÃ³s a criaremos o mais rÃ¡pido possÃ­vel.'
-      fill_form: "Preencha o formulÃ¡rio e lhe enviaremos um email rapidamente para ativar sua conta."
-      license_agreement: 'Ao criar uma conta, vocÃª aceita que todos os dados enviados para o openstreetmap.org serÃ£o licenciados (nÃ£o-exclusivamente) sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/">licenÃ§a Creative Commons de AtribuiÃ§Ã£o e Compartilhamento pela mesma LicenÃ§a</a>.'
+      please login: Por favor entre as informaÃ§Ãµes de sua conta para entrar, ou {{create_user_link}}.
+      title: Entrar
+    lost_password: 
       email address: "EndereÃ§o de Email:"
+      heading: Esqueceu sua senha?
+      new password button: Me envie uma nova senha
+      notice email cannot find: Desculpe, nÃ£o foi possÃ­vel encontrar esse endereÃ§o de email.
+      notice email on way: Um email foi enviado para que vocÃª possa escolher outra senha.
+      title: Senha esquecida
+    make_friend: 
+      already_a_friend: VocÃª jÃ¡ Ã© amigo de {{name}}.
+      failed: Desculpe, erro ao adicionar {{name}} como seu amigo.
+      success: "{{name}} agora Ã© seu amigo."
+    new: 
       confirm email address: "Confirme o EndereÃ§o de Email:"
-      not displayed publicly: 'NÃ£o exibir publicamente (veja a <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="polÃ­tica de privacidade no wiki incluindo seÃ§Ã£o sobre endereÃ§os de email">polÃ­tica de privacidade</a>)'
+      confirm password: "Confirme a Senha:"
+      contact_webmaster: Por favor contate o <a href="mailto:webmaster@openstreetmap.org">webmaster</a> (em inglÃªs) para que uma conta seja criada - nÃ³s a criaremos o mais rÃ¡pido possÃ­vel.
       display name: "Nome a ser exibido:"
+      email address: "EndereÃ§o de Email:"
+      fill_form: Preencha o formulÃ¡rio e lhe enviaremos um email rapidamente para ativar sua conta.
+      flash create success message: UsuÃ¡rio criado com sucesso. Verifique seu email para uma nota de confirmaÃ§Ã£o, e vocÃª estarÃ¡ mapeando logo logo :-)<br /><br />Por favor note que vocÃª nÃ£o poderÃ¡ entrar no sistema atÃ© ter recebido e confirmado seu endereÃ§o de email.<br /><br />Se vocÃª utiliza algum sistema de antispam que envia mensagens de confirmaÃ§Ã£o, tenha certeza de incluir webmaster@openstreetmap.org na lista de remetentes confiÃ¡veis (whitelist) pois nÃ£o poderemos responder pedidos de confirmaÃ§Ã£o.
+      heading: Criar uma nova conta de usuÃ¡rio
+      license_agreement: Ao criar uma conta, vocÃª aceita que todos os dados enviados para o openstreetmap.org serÃ£o licenciados (nÃ£o-exclusivamente) sob a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.pt">licenÃ§a Creative Commons de AtribuiÃ§Ã£o e Compartilhamento pela mesma LicenÃ§a</a>.
+      no_auto_account_create: Infelizmente nÃ£o foi possÃ­vel criar uma conta para vocÃª automaticamente.
+      not displayed publicly: NÃ£o exibir publicamente (veja a <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="polÃ­tica de privacidade no wiki incluindo seÃ§Ã£o sobre endereÃ§os de email">polÃ­tica de privacidade</a>)
       password: "Senha:"
-      confirm password: "Confirme a Senha:"
-      signup: "Registrar"
-      flash create success message: "UsuÃ¡rio criado com sucesso. Verifique seu email para uma nota de confirmaÃ§Ã£o, e vocÃª estarÃ¡ mapeando logo logo :-)<br /><br />Por favor note que vocÃª nÃ£o poderÃ¡ entrar no sistema atÃ© ter recebido e confirmado seu endereÃ§o de email.<br /><br />Se vocÃª utiliza algum sistema de antispam que envia mensagens de confirmaÃ§Ã£o, tenha certeza de incluir webmaster@openstreetmap.org na lista de remetentes confiÃ¡veis (whitelist) pois nÃ£o poderemos responder pedidos de confirmaÃ§Ã£o."
-    no_such_user:
-      title: "UsuÃ¡rio nÃ£o existe"
-      heading: "O usuÃ¡rio {{user}} nÃ£o existe"
-      body: "Desculpe, nÃ£o hÃ¡ nenhum usuÃ¡rio com o nome {{user}}. Por favor verifique se vocÃª digitou corretamente, ou talvez o link que vocÃª tenha clicado esteja errado."
-    view:
-      my diary: "meu diÃ¡rio"
-      new diary entry: "nova entrada de diÃ¡rio"
-      my edits: "minhas ediÃ§Ãµes"
-      my traces: "minhas trilhas"
-      my settings: "minhas configuraÃ§Ãµes"
-      send message: "enviar mensagem"
-      diary: "diÃ¡rio"
-      edits: "ediÃ§Ãµes"
-      traces: "trilhas"
-      remove as friend: "remover da lista de amigos"
-      add as friend: "adicionar como amigos"
-      mapper since: "Mapeador desde:"
-      ago: "({{time_in_words_ago}} atrÃ¡s)"
-      user image heading: "Imagem do usuÃ¡rio"
-      delete image: "Apagar Imagem"
-      upload an image: "Enviar uma Imagem"
-      add image: "Adicionar Imagem"
-      description: "DescriÃ§Ã£o"
-      user location: "Local do usuÃ¡rio"
-      no home location: "Nenhuma localizaÃ§Ã£o foi definida."
-      if set location: "Se vocÃª definir a sua localizaÃ§Ã£o, um mapa bonito vai aparecer abaixo. VocÃª pode definir sua localizaÃ§Ã£o na pÃ¡gina de {{settings_link}}."
-      settings_link_text: "configuraÃ§Ãµes"
-      your friends: "Seus amigos"
-      no friends: "VocÃª ainda nÃ£o adicionou amigos."
+      signup: Registrar
+      title: Criar Conta
+    no_such_user: 
+      body: Desculpe, nÃ£o hÃ¡ nenhum usuÃ¡rio com o nome {{user}}. Por favor verifique se vocÃª digitou corretamente, ou talvez o link que vocÃª tenha clicado esteja errado.
+      heading: O usuÃ¡rio {{user}} nÃ£o existe
+      title: UsuÃ¡rio nÃ£o existe
+    remove_friend: 
+      not_a_friend: "{{name}} nÃ£o Ã© um de seus amigos."
+      success: "{{name}} foi removido de seus amigos."
+    reset_password: 
+      confirm password: "Confirmar senha:"
+      flash changed: Sua senha foi alterada.
+      flash token bad: O cÃ³digo nÃ£o confere, verifique a URL.
+      heading: Resetar senha de {{user}}
+      password: "Senha:"
+      reset: Resetar senha
+      title: Redefinir Senha
+    set_home: 
+      flash success: LocalizaÃ§Ã£o salva com sucesso
+    view: 
+      add as friend: adicionar como amigos
+      add image: Adicionar Imagem
+      ago: ({{time_in_words_ago}} atrÃ¡s)
+      change your settings: mudar suas configuraÃ§Ãµes
+      delete image: Apagar Imagem
+      description: DescriÃ§Ã£o
+      diary: diÃ¡rio
+      edits: ediÃ§Ãµes
+      if set location: Se vocÃª definir a sua localizaÃ§Ã£o, um mapa bonito vai aparecer abaixo. VocÃª pode definir sua localizaÃ§Ã£o na pÃ¡gina de {{settings_link}}.
       km away: "{{count}}km de distÃ¢ncia"
       m away: "{{count}}m de distÃ¢ncia"
+      mapper since: "Mapeador desde:"
+      my diary: meu diÃ¡rio
+      my edits: minhas ediÃ§Ãµes
+      my settings: minhas configuraÃ§Ãµes
+      my traces: minhas trilhas
+      my_oauth_details: Ver meus detalhes OAuth
       nearby users: "UsuÃ¡rios prÃ³ximos:"
-      no nearby users: "NÃ£o existem usuÃ¡rios mapeando por perto."
-      change your settings: "mudar suas configuraÃ§Ãµes"
-    friend_map:
-      your location: "Sua localizaÃ§Ã£o"
-      nearby mapper: "Mapeador prÃ³ximo: [[nearby_user]]"
-    account:
-      title: "Editar conta"
-      my settings: "Minhas configuraÃ§Ãµes"
-      email never displayed publicly: "(nunca mostrado publicamente)"
-      public editing:
-        heading: "EdiÃ§Ã£o pÃºblica:"
-        enabled: "Ativado. NÃ£o Ã© permitido ediÃ§Ã£o anÃ´nima."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits"
-        enabled link text: "o que Ã© isso?"
-        disabled: "Desativado e nÃ£o pode editar dados, todas as ediÃ§Ãµes anteriores sÃ£o anÃ´nimas."
-        disabled link text: "porque nÃ£o posso editar?"
-      profile description: "DescriÃ§Ã£o do Perfil:"
-      preferred languages: "PreferÃªncia de Idioma:"
-      home location: "LocalizaÃ§Ã£o:"
-      no home location: "VocÃª ainda nÃ£o entrou a sua localizaÃ§Ã£o."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Atualizar localizaÃ§Ã£o ao clicar no mapa?"
-      save changes button: "Salvar MudanÃ§as"
-      make edits public button: "Tornar todas as minhas ediÃ§Ãµes pÃºblicas"
-      return to profile: "Retornar para o perfil"
-      flash update success confirm needed: "InformaÃ§Ã£o de usuÃ¡rio atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereÃ§o."
-      flash update success: "InformaÃ§Ã£o de usuÃ¡rio atualizada com sucesso."
-    confirm:
-      heading: "Confirmar uma conta de usuÃ¡rio"
-      press confirm button: "Pressione o botÃ£o de confirmaÃ§Ã£o abaixo para ativar sua conta."
-      button: "Confirmar"
-      success: "Conta ativada, obrigado!"
-      failure: "A Conta de usuÃ¡rio jÃ¡ foi confirmada anteriormente."
-    confirm email:
-      heading: "Confirmar uma mudanÃ§a de endereÃ§o de email"
-      press confirm button: "Pressione o botÃ£o de confirmaÃ§Ã£o abaixo para confirmar seu novo endereÃ§o de email."
-      button: "Confirmar"
-      success: "Conta ativada, obrigado!"
-      failure: "Este endereÃ§o de e-mail jÃ¡ estÃ¡ em uso em outra conta."
-    set_home:
-      flash success: "LocalizaÃ§Ã£o salva com sucesso"
-    go_public:
-      flash success: "Todas as suas ediÃ§Ãµes agora sÃ£o pÃºblicas, e vocÃª estÃ¡ com permissÃ£o para ediÃ§Ã£o."
-    make_friend:
-      success: "{{name}} agora Ã© seu amigo."
-      failed: "Desculpe, erro ao adicionar {{name}} como seu amigo."
-      already_a_friend: "VocÃª jÃ¡ Ã© amigo de {{name}}."
-    remove_friend:
-      success: "{{name}} foi removido de seus amigos."
-      not_a_friend: "{{name}} nÃ£o Ã© um de seus amigos."
+      new diary entry: nova entrada de diÃ¡rio
+      no friends: VocÃª ainda nÃ£o adicionou amigos.
+      no home location: Nenhuma localizaÃ§Ã£o foi definida.
+      no nearby users: NÃ£o existem usuÃ¡rios mapeando por perto.
+      remove as friend: remover da lista de amigos
+      send message: enviar mensagem
+      settings_link_text: configuraÃ§Ãµes
+      traces: trilhas
+      upload an image: Enviar uma Imagem
+      user image heading: Imagem do usuÃ¡rio
+      user location: Local do usuÃ¡rio
+      your friends: Seus amigos
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 5faee46b6..ed406cc83 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1,881 +1,857 @@
-ro:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Set de modificÄri"
-      changeset_tag: "EtichetÄ set de modificÄri"
-      country: "ÈarÄ"
-      diary_comment: "Comentariu jurnal"
-      diary_entry: "Intrare Ã®n jurnal"
-      friend: "Prieten"
-      language: "LimbÄ"
-      message: "Mesaj"
-      node: "Nod"
-      node_tag: "EtichetÄ nod"
-      notifier: "Notificator"
-      old_node: "Nod vechi"
-      old_node_tag: "EtichetÄ nod vechi"
-      old_relation: "RelaÈie veche"
-      old_relation_member: "Membru al relaÈiei vechi"
-      old_relation_tag: "EtichetÄ pentru relaÈia veche"
-      old_way: "Cale veche"
-      old_way_node: "Nod cale veche"
-      old_way_tag: "EtichetÄ cale veche"
-      relation: "RelaÈie"
-      relation_member: "Membru relaÈie"
-      relation_tag: "EtichetÄ relaÈie"
-      session: "Sesiune"
-      trace: "Ãnregistrare GPS"
-      tracepoint: "Punct al unei Ã®nregistrÄri GPS"
-      tracetag: "EtichetÄ Ã®nregistrare GPS"
-      user: "Utilizator"
-      user_preference: "PreferinÈe utilizator"
-      user_token: "User Token"
-      way: "Cale"
-      way_node: "Nod cale"
-      way_tag: "EtichetÄ cale"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Corp"
-      diary_entry:
-        user: "Utilizator"
-        title: "Titlu"
-        latitude: "Latitudine"
-        longitude: "Longitudine"
-        language: "LimbÄ"
-      friend:
-        user: "Utilizator"
-        friend: "Prieten"
-      trace:
-        user: "Utilizator"
-        visible: "VizibilÄ"
-        name: "Nume"
-        size: "Dimensiune"
-        latitude: "Latitudine"
-        longitude: "Longitudine"
-        public: "Public"
-        description: "Descriere"
-      message:
-        sender: "Expeditor"
-        title: "Titlu"
-        body: "Corp"
-        recipient: "Destinatar"
-      user:
-        email: "Email"
-        active: "Activ"
-        display_name: "AfiÈare nume"
-        description: "Descriere"
-        languages: "Limbi"
-        pass_crypt: "ParolÄ"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: Vizualizare
-    edit: Editare
-    coordinates: "Coordonate:"
-  browse:
-    changeset:
-      title: "Set de modificÄri"
+ro: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Corp
+      diary_entry: 
+        language: LimbÄ
+        latitude: Latitudine
+        longitude: Longitudine
+        title: Titlu
+        user: Utilizator
+      friend: 
+        friend: Prieten
+        user: Utilizator
+      message: 
+        body: Corp
+        recipient: Destinatar
+        sender: Expeditor
+        title: Titlu
+      trace: 
+        description: Descriere
+        latitude: Latitudine
+        longitude: Longitudine
+        name: Nume
+        public: Public
+        size: Dimensiune
+        user: Utilizator
+        visible: VizibilÄ
+      user: 
+        active: Activ
+        description: Descriere
+        display_name: AfiÈare nume
+        email: Email
+        languages: Limbi
+        pass_crypt: ParolÄ
+    models: 
+      acl: Access Control List
+      changeset: Set de modificÄri
+      changeset_tag: EtichetÄ set de modificÄri
+      country: ÈarÄ
+      diary_comment: Comentariu jurnal
+      diary_entry: Intrare Ã®n jurnal
+      friend: Prieten
+      language: LimbÄ
+      message: Mesaj
+      node: Nod
+      node_tag: EtichetÄ nod
+      notifier: Notificator
+      old_node: Nod vechi
+      old_node_tag: EtichetÄ nod vechi
+      old_relation: RelaÈie veche
+      old_relation_member: Membru al relaÈiei vechi
+      old_relation_tag: EtichetÄ pentru relaÈia veche
+      old_way: Cale veche
+      old_way_node: Nod cale veche
+      old_way_tag: EtichetÄ cale veche
+      relation: RelaÈie
+      relation_member: Membru relaÈie
+      relation_tag: EtichetÄ relaÈie
+      session: Sesiune
+      trace: Ãnregistrare GPS
+      tracepoint: Punct al unei Ã®nregistrÄri GPS
+      tracetag: EtichetÄ Ã®nregistrare GPS
+      user: Utilizator
+      user_preference: PreferinÈe utilizator
+      user_token: User Token
+      way: Cale
+      way_node: Nod cale
+      way_tag: EtichetÄ cale
+  browse: 
+    changeset: 
       changeset: "Set de modificÄri:"
-      download: "DescarcÄ {{changeset_xml_link}} sau {{osmchange_xml_link}}"
-      changesetxml: "Set de modificÄri XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Creat la:"
-      closed_at: "Ãnchis la:"
+      changesetxml: Set de modificÄri XML
+      download: DescarcÄ {{changeset_xml_link}} sau {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: Set de modificÄri
+    changeset_details: 
       belongs_to: "AparÈine lui:"
       bounding_box: "Cutie Ã®mprejmuitoare:"
-      no_bounding_box: "Nicio cutie Ã®mprejmuitoare nu a fost salvatÄ pentru acest set de modificÄri."
-      show_area_box: "AfiÈeazÄ cutia zonei"
-      box: "cutie"
+      box: cutie
+      closed_at: "Ãnchis la:"
+      created_at: "Creat la:"
       has_nodes: "Are urmÄtoarele {{count}} noduri:"
-      has_ways: "Are urmÄtoarele {{count}} cÄi:"
       has_relations: "Are urmÄtoarele {{count}} relaÈii:"
+      has_ways: "Are urmÄtoarele {{count}} cÄi:"
+      no_bounding_box: Nicio cutie Ã®mprejmuitoare nu a fost salvatÄ pentru acest set de modificÄri.
+      show_area_box: AfiÈeazÄ cutia zonei
+    changeset_navigation: 
+      user: 
+        name_tooltip: Vezi editÄrile lui {{user}}
+        next_tooltip: UrmÄtoarea editare de {{user}}
+        prev_tooltip: Editarea precedentÄ de {{user}}
     common_details: 
+      changeset_comment: "Comentariu:"
       edited_at: "Editat la:"
       edited_by: "Editat de:"
-      version: "Versiune:"
       in_changeset: "Ãn setul de schimbÄri:"
-    containing_relation:
-      entry: "RelaÈie {{relation_name}}"
-      entry_role: "RelaÈie {{relation_name}} (ca {{relation_role}})"
-    map:
-      loading: "Se Ã®ncarcÄ..."
-      deleted: "A fost Èters"
-      larger:
-        area: "Vizualizare zonÄ pe hartÄ mai mare"
-        node: "Vizualizare nod pe hartÄ mai mare"
-        way: "Vizualizare cale pe hartÄ mai mare"
-        relation: "Vizualizare relaÈie pe hartÄ mai mare"
-    node_details:
+      version: "Versiune:"
+    containing_relation: 
+      entry: RelaÈie {{relation_name}}
+      entry_role: RelaÈie {{relation_name}} (ca {{relation_role}})
+    map: 
+      deleted: A fost Èters
+      larger: 
+        area: Vizualizare zonÄ pe hartÄ mai mare
+        node: Vizualizare nod pe hartÄ mai mare
+        relation: Vizualizare relaÈie pe hartÄ mai mare
+        way: Vizualizare cale pe hartÄ mai mare
+      loading: Se Ã®ncarcÄ...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} sau {{edit_link}}"
+      download_xml: DescÄrcare XML
+      edit: editare
+      node: Nod
+      node_title: "Nod: {{node_name}}"
+      view_history: vizualizare istoric
+    node_details: 
       coordinates: "Coordonate:"
       part_of: "Parte din:"
-    node_history:
-      node_history: "Istoric nod"
-      node_history_title: "Istoric nod: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} sau {{view_details_link}}"
-      download_xml: "DescÄrcare XML"
-      view_details: "vizualizare detalii"
-    node:
-      node: "Nod"
-      node_title: "Nod: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} sau {{edit_link}}"
-      download_xml: "DescÄrcare XML"
-      view_history: "vizualizare istoric"
-      edit: "editare"
-    not_found:
-      sorry: "Ne pare rÄu, dar {{type}} cu identificatorul {{id}}, nu a putut fi ."
-      type:
+      download_xml: DescÄrcare XML
+      node_history: Istoric nod
+      node_history_title: "Istoric nod: {{node_name}}"
+      view_details: vizualizare detalii
+    not_found: 
+      sorry: Ne pare rÄu, dar {{type}} cu identificatorul {{id}}, nu a putut fi .
+      type: 
         node: node
-        way: way
         relation: relation
-    paging_nav:
-      showing_page: "Se afiÈeazÄ pagina"
-      of: "din"
-    relation_details:
+        way: way
+    paging_nav: 
+      of: din
+      showing_page: Se afiÈeazÄ pagina
+    relation: 
+      download: "{{download_xml_link}} sau {{view_history_link}}"
+      download_xml: DescÄrcare XML
+      relation: RelaÈie
+      relation_title: "RelaÈie: {{relation_name}}"
+      view_history: vizualizare istoric
+    relation_details: 
       members: "Membrii:"
       part_of: "Parte din:"
-    relation_history:
-      relation_history: "Istoric relaÈii"
+    relation_history: 
+      relation_history: Istoric relaÈii
       relation_history_title: "Istoric relaÈii: {{relation_name}}"
-    relation_member:
-      entry: "{{type}} {{name}}"
+    relation_member: 
       entry_role: "{{type}} {{name}} ca {{role}}"
-      type:
-        node: "Nod"
-        way: "Cale"
-        relation: "RelaÈie"
-    relation:
-      relation: "RelaÈie"
-      relation_title: "RelaÈie: {{relation_name}}"
-      download: "{{download_xml_link}} sau {{view_history_link}}"
-      download_xml: "DescÄrcare XML"
-      view_history: "vizualizare istoric"
-    start:
-      view_data: "Vizualizare date pentru perspectiva curentÄ a hÄrÈii"
-      manually_select: "Selectare manualÄ a unei alte zone"
-    start_rjs:
-      data_layer_name: "Date"
-      data_frame_title: "Date"
-      zoom_or_select: "MÄriÈi sau selectaÈi o zonÄ a hÄrÈii pentru a o vizualiza"
-      drag_a_box: "TrageÈi cu mouse-ul Èi creaÈi un dreptunghi pentru a selecta zona hÄrÈii"
-      manually_select: "Selectare manualÄ a unei alte zone"
+      type: 
+        node: Nod
+        relation: RelaÈie
+        way: Cale
+    start: 
+      manually_select: Selectare manualÄ a unei alte zone
+      view_data: Vizualizare date pentru perspectiva curentÄ a hÄrÈii
+    start_rjs: 
+      data_frame_title: Date
+      data_layer_name: Date
+      details: Detalii
+      drag_a_box: TrageÈi cu mouse-ul Èi creaÈi un dreptunghi pentru a selecta zona hÄrÈii
+      edited_by_user_at_timestamp: Editat de [[user]] la [[timestamp]]
+      history_for_feature: Istoric pentru [[feature]]
+      load_data: ÃncÄrcare date
       loaded_an_area_with_num_features: "AÈi Ã®ncÄrcat o zonÄ care conÈine [[num_features]] puncte. Ãn general, unele navigatoare nu sunt capabile sÄ facÄ faÈÄ afiÈÄrii unei asemenea cantitÄÈi de date. Navigatoarele funcÈioneazÄ cel mai bine atunci cÃ¢nd afiÈeazÄ mai puÈin de 100 de puncte simultan: dacÄ mai faceÈi Èi alte operaÈii cu navigatorul dumneavoastrÄ Ã®n paralel veÈi observa o Ã®ncetinire / lipsÄ de rÄspuns din partea navigatorului. DacÄ doriÈi sÄ afiÈaÈi aceste puncte apÄsaÈi butonul de mai jos."
-      load_data: "ÃncÄrcare date"
+      loading: Se Ã®ncarcÄ...
+      manually_select: Selectare manualÄ a unei alte zone
+      object_list: 
+        api: ObÈine aceastÄ zonÄ prin API
+        back: AfiÈeazÄ lista obiectelor
+        details: Detalii
+        heading: Lista obiectelor
+        history: 
+          type: 
+            node: Nod [[id]]
+            way: Cale [[id]]
+        selected: 
+          type: 
+            node: Nod [[id]]
+            way: cale [[id]]
+        type: 
+          node: Nod
+          way: Cale
+      private_user: utilizator privat
+      show_history: AfiÈare istoric
       unable_to_load_size: "Imposibil de Ã®ncÄrcat: Cutia Ã®mprejmuitoare de dimensiune [[bbox_size]] este prea mare (trebuie sÄ fie mai micÄ de {{max_bbox_size}})"
-      loading: "Se Ã®ncarcÄ..."
-      show_history: "AfiÈare istoric"
-      wait: "AÈteptaÈi..."
-      history_for_feature: "Istoric pentru [[feature]]"
-      details: "Detalii"
-      private_user: "utilizator privat"
-      edited_by_user_at_timestamp: "Editat de [[user]] la [[timestamp]]"
-      object_list:
-        heading: "Lista obiectelor"
-        back: "AfiÈeazÄ lista obiectelor"
-        type:
-          node: "Nod"
-          way: "Cale"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "ObÈine aceastÄ zonÄ prin API"
-        details: "Detalii"
-        selected:
-          type:
-            node: "Nod [[id]]"
-            way: "cale [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Nod [[id]]"
-            way: "Cale [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: AÈteptaÈi...
+      zoom_or_select: MÄriÈi sau selectaÈi o zonÄ a hÄrÈii pentru a o vizualiza
+    tag_details: 
       tags: "Etichete:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} sau {{edit_link}}"
+      download_xml: DescÄrcare XML
+      edit: editare
+      view_history: vizualizare istoric
+      way: Cale
+      way_title: "Cale: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: de asemenea parte din calea {{related_ways}}
+        other: de asemenea parte din cÄile {{related_ways}}
       nodes: "Noduri:"
       part_of: "Parte din:"
-      also_part_of:
-        one: "de asemenea parte din calea {{related_ways}}"
-        other: "de asemenea parte din cÄile {{related_ways}}"
-    way_history:
-      way_history: "Istoric cale"
-      way_history_title: "Istoric cale: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} sau {{view_details_link}}"
-      download_xml: "DescÄrcare XML"
-      view_details: "vizualizare detalii"
-    way:
-      way: "Cale"
-      way_title: "Cale: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} sau {{edit_link}}"
-      download_xml: "DescÄrcare XML"
-      view_history: "vizualizare istoric"
-      edit: "editare"
-  changeset:
+      download_xml: DescÄrcare XML
+      view_details: vizualizare detalii
+      way_history: Istoric cale
+      way_history_title: "Istoric cale: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonim
+      big_area: (mare)
+      no_comment: (niciunul)
+      no_edits: (nu existÄ editÄri)
+      show_area_box: afiÈeazÄ chenarul zonei
+      still_editing: (Ã®ncÄ se editeazÄ)
+      view_changeset_details: Vizualizare detalii set de schimbÄri
     changeset_paging_nav: 
-      showing_page: "Se afiÈeazÄ pagina"
-      of: "din"
-    changeset:
-      still_editing: "(Ã®ncÄ se editeazÄ)"
-      anonymous: "Anonim"
-      no_comment: "(niciunul)"
-      no_edits: "(nu existÄ editÄri)"
-      show_area_box: "afiÈeazÄ chenarul zonei"
-      big_area: "(mare)"
-      view_changeset_details: "Vizualizare detalii set de schimbÄri"
-    changesets:
-      id: "ID"
-      saved_at: "Salvat la"
-      user: "Utilizator"
-      comment: "Comentariu"
-      area: "ZonÄ"
-    list_bbox:
-      history: "Istoric"
-      changesets_within_the_area: "Seturi de schimbÄri din zonÄ:"
-      show_area_box: "afiÈare chenar zonÄ"
-      no_changesets: "Nu existÄ seturi de schimbÄri"
-      all_changes_everywhere: "Pentru toate modificÄrile de peste tot vedeÈi {{recent_changes_link}}"
-      recent_changes: "ModificÄri recente"
-      no_area_specified: "Nicio zonÄ specificatÄ"
-      first_use_view: "Prima datÄ folosiÈi {{view_tab_link}} pentru a parcurge harta Èi pentru a mÄri pe o zonÄ de interes, apoi clic pe fila cu istoricul."
-      view_the_map: "vizualizare hartÄ"
-      view_tab: "vizualizare filÄ"
-      alternatively_view: "Alternativ, vizualizaÈi toate {{recent_changes_link}}"
-    list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-  diary_entry:
-    new:
-      title: New Diary Entry
-    list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
-      in_language_title: "Diary Entries in {{language}}"
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries:"
-      older_entries: Older Entries
-      newer_entries: Newer Entries
-    edit:
-      title: "Edit diary entry"
-      subject: "Subject:"
+      of: din
+      showing_page: Se afiÈeazÄ pagina
+    changesets: 
+      area: ZonÄ
+      comment: Comentariu
+      id: ID
+      saved_at: Salvat la
+      user: Utilizator
+    list: 
+      description: SchimbÄri recente
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 comment
+        other: "{{count}} comments"
+      comment_link: Comment on this entry
+      edit_link: Edit this entry
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: Reply to this entry
+    edit: 
       body: "Body:"
       language: "Language:"
-      location: "Location:"
       latitude: "Latitude:"
+      location: "Location:"
       longitude: "Longitude:"
-      use_map_link: "use map"
-      save_button: "Save"
       marker_text: Diary entry location
-    view:
-      title: "Users' diaries | {{user}}"
+      save_button: Save
+      subject: "Subject:"
+      title: Edit diary entry
+      use_map_link: use map
+    list: 
+      in_language_title: Diary Entries in {{language}}
+      new: New Diary Entry
+      new_title: Compose a new entry in your user diary
+      newer_entries: Newer Entries
+      no_entries: No diary entries
+      older_entries: Older Entries
+      recent_entries: "Recent diary entries:"
+      title: Users' diaries
       user_title: "{{user}}'s diary"
-      leave_a_comment: "Leave a comment"
-      login_to_leave_a_comment: "{{login_link}} to leave a comment"
-      login: "Login"
-      save_button: "Save"
-    no_such_entry:
-      title: "No such diary entry"
+    new: 
+      title: New Diary Entry
+    no_such_entry: 
+      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
-      comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Area to Export"
-      manually_select: "Manually select a different area"
-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "Embeddable HTML"
-      licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
+      title: No such diary entry
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    view: 
+      leave_a_comment: Leave a comment
+      login: Login
+      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      save_button: Save
+      title: Users' diaries | {{user}}
+      user_title: "{{user}}'s diary"
+  export: 
+    start: 
+      add_marker: Add a marker to the map
+      area_to_export: Area to Export
+      embeddable_html: Embeddable HTML
+      export_button: Export
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: Format
+      format_to_export: Format to Export
+      image_size: Image Size
       latitude: "Lat:"
+      licence: Licence
       longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
-  geocoder:
-    search:
-      title:
-        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} of {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
+      manually_select: Manually select a different area
+      mapnik_image: Mapnik Image
+      max: max
+      options: Options
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Osmarender Image
+      output: Output
+      paste_html: Paste HTML to embed in website
+      scale: Scale
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Add a marker to the map
+      change_marker: Change marker position
+      click_add_marker: Click on the map to add a marker
+      drag_a_box: Drag a box on the map to select an area
+      export: Export
+      manually_select: Manually select a different area
+      view_larger_map: View Larger Map
+  geocoder: 
+    description: 
+      title: 
+        geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} from <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
         cities: Cities
-        towns: Towns
         places: Places
-    description_osm_namefinder:
+        towns: Towns
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} of {{type}}"
-    results:
-      no_results: "No results found"
-    distance:
-      zero: "less than 1km"
-      one: "about 1km"
-      other: "about {{count}}km"
-    direction:
-      south_west: "south-west"
-      south: "south"
-      south_east: "south-east"
-      east: "east"
-      north_east: "north-east"
-      north: "north"
-      north_west: "north-west"
-      west: "west"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap logo
-    welcome_user: "Welcome, {{user_link}}"
-    welcome_user_link_tooltip: Your user page
+    direction: 
+      east: east
+      north: north
+      north_east: north-east
+      north_west: north-west
+      south: south
+      south_east: south-east
+      south_west: south-west
+      west: west
+    distance: 
+      one: about 1km
+      other: about {{count}}km
+      zero: less than 1km
+    results: 
+      no_results: No results found
+    search: 
+      title: 
+        ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Results from <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Results from <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} of {{placename}}"
+  layouts: 
+    alt_donation: Make a Donation
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
+    donate_link_text: donating
+    edit: Edit
+    edit_tooltip: Edit maps
+    export: Export
+    export_tooltip: Export map data
+    gps_traces: GPS Traces
+    gps_traces_tooltip: Manage traces
+    help_wiki: Help &amp; Wiki
+    help_wiki_tooltip: Help &amp; Wiki site for the project
+    history: History
+    history_tooltip: Changeset history
     home: home
     home_tooltip: Go to home location
-    inbox: "inbox ({{count}})"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
+    inbox: inbox ({{count}})
+    inbox_tooltip: 
       one: Your inbox contians 1 unread message
       other: Your inbox contains {{count}} unread messages
-    logout: logout
-    logout_tooltip: "Log out"
+      zero: Your inbox contains no unread messages
+    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
+    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
+    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: log in
     log_in_tooltip: Log in with an existing account
+    logo: 
+      alt_text: OpenStreetMap logo
+    logout: logout
+    logout_tooltip: Log out
+    news_blog: News blog
+    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
+    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
+    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
+    shop: Shop
+    shop_tooltip: Shop with branded OpenStreetMap merchandise
     sign_up: sign up
     sign_up_tooltip: Create an account for editing
-    view: View
-    view_tooltip: View maps
-    edit: Edit
-    edit_tooltip: Edit maps
-    history: History
-    history_tooltip: Changeset history
-    export: Export
-    export_tooltip: Export map data
-    gps_traces: GPS Traces
-    gps_traces_tooltip: Manage traces
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: The Free Wiki World Map
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
-    help_wiki_tooltip: "Help &amp; Wiki site for the project"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "News blog"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap merchandise
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    view: View
+    view_tooltip: View maps
+    welcome_user: Welcome, {{user_link}}
+    welcome_user_link_tooltip: Your user page
+  map: 
+    coordinates: "Coordonate:"
+    edit: Editare
+    view: Vizualizare
+  message: 
+    delete: 
+      deleted: Mesaj Åters
+    inbox: 
+      date: Date
+      from: From
+      my_inbox: My inbox
+      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Inbox
+      you_have: You have {{new_count}} new messages and {{old_count}} old messages
+    mark: 
+      as_read: Message marked as read
+      as_unread: Message marked as unread
+    message_summary: 
+      delete_button: Återge
+      read_button: Mark as read
+      reply_button: Reply
+      unread_button: Mark as unread
+    new: 
+      back_to_inbox: Back to inbox
+      body: Body
+      message_sent: Message sent
+      send_button: Send
+      send_message_to: Send a new message to {{name}}
+      subject: Subject
+      title: Send message
+    no_such_user: 
+      body: Sorry there is no user or message with that name or id
+      heading: No such user or message
+      title: No such user or message
+    outbox: 
+      date: Date
+      inbox: inbox
+      my_inbox: My {{inbox_link}}
+      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Outbox
+      to: To
+      you_have_sent_messages: You have {{sent_count}} sent messages
+    read: 
+      back_to_inbox: Back to inbox
+      back_to_outbox: Back to outbox
+      date: Date
+      from: From
+      reading_your_messages: Reading your messages
+      reading_your_sent_messages: Reading your sent messages
+      reply_button: Reply
+      subject: Subject
+      title: Read message
+      to: To
+      unread_button: Mark as unread
+    sent_message_summary: 
+      delete_button: Återge
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      footer1: "You can also read the message at {{readurl}}"
-      footer2: "and you can reply at {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_html: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
+      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
+    gpx_notification: 
+      and_no_tags: and no tags.
       and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
+      failure: 
         failed_to_import: "failed to import. Here's the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_1: More information about GPX import failures and how to avoid
         more_info_2: "them can be found at:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX Import failure"
+      greeting: Hi,
+      success: 
+        loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
-    signup_confirm:
+      with_description: with the description
+      your_gpx_file: It looks like your GPX file
+    lost_password: 
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_html: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
+    lost_password_plain: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
+      hopefully_you_2: email addresses openstreetmap.org account.
+    message_notification: 
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      footer1: You can also read the message at {{readurl}}
+      footer2: and you can reply at {{replyurl}}
+      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    lost_password:
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-  message:
-    inbox:
-      title: "Inbox"
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
-    message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
-    new:
-      title: "Send message"
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
-      message_sent: "Message sent"
-    no_such_user:
-      title: "No such user or message"
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox: 
-      title: "Outbox"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    read:
-      title: "Read message"
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+  oauth: 
+    oauthorize: 
+      request_access: AplicaÅ£ia {{app_name}} cere acces la contul dvs. VÄ rugÄm sÄ alegeÅ£i care din urmÄtoarele capabilitÄÅ£i le poate avea aplicaÅ£ia. PuteÅ£i alege cÃ¢t de multe sau de puÅ£ine doriÅ£i.
+  oauth_clients: 
+    edit: 
+      submit: EditeazÄ
+    form: 
+      name: Nume
+      required: Necesar
+    index: 
+      revoke: RevocÄ!
+    new: 
+      submit: ÃnregistreazÄ
+      title: ÃnregistreazÄ o nouÄ aplicaÅ£ie
+    show: 
+      allow_write_api: modificÄ harta.
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: You haven't set your edits to be public.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)
+      user_page_link: user page
+    index: 
+      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
+        project_name: OpenStreetMap project
       permalink: Permalink
       shortlink: Shortlink
-      license:
-        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
-      user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
-      search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
-      table:
-        heading: "Legend for z{{zoom_level}}"
-        entry:
-          motorway: "Motorway"
-          trunk: "Trunk road"
-          primary: "Primary road"
-          secondary: "Secondary road"
-          unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
-          track: "Track"
-          byway: "Byway"
-          bridleway: "Bridleway"
-          cycleway: "Cycleway"
-          footway: "Footway"
-          rail: "Railway"
-          subway: "Subway"
-          tram:
-            - Light rail
-            - tram
-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
+    key: 
+      map_key: Map key
+      map_key_tooltip: Map key for the mapnik rendering at this zoom level
+      table: 
+        entry: 
+          admin: Administrative boundary
+          allotments: Allotments
+          apron: 
             - Airport apron
             - terminal
-          admin: "Administrative boundary"
-          forest: "Forest"
-          wood: "Wood"
-          golf: "Golf course"
-          park: "Park"
-          resident: "Residential area"
-          tourist: "Tourist attraction"
-          common:
+          bridge: Black casing = bridge
+          bridleway: Bridleway
+          brownfield: Brownfield site
+          building: Significant building
+          byway: Byway
+          cable: 
+            - Cable car
+            - chair lift
+          cemetery: Cemetery
+          centre: Sports centre
+          commercial: Commercial area
+          common: 
             - Common
             - meadow
-          retail: "Retail area"
-          industrial: "Industrial area"
-          commercial: "Commercial area"
-          heathland: "Heathland"
-          lake:
+          construction: Roads under construction
+          cycleway: Cycleway
+          destination: Destination access
+          farm: Farm
+          footway: Footway
+          forest: Forest
+          golf: Golf course
+          heathland: Heathland
+          industrial: Industrial area
+          lake: 
             - Lake
             - reservoir
-          farm: "Farm"
-          brownfield: "Brownfield site"
-          cemetery: "Cemetery"
-          allotments: "Allotments"
-          pitch: "Sports pitch"
-          centre: "Sports centre"
-          reserve: "Nature reserve"
-          military: "Military area"
-          school: "School; university"
-          building: "Significant building"
-          station: "Railway station"
-          summit:
+          military: Military area
+          motorway: Motorway
+          park: Park
+          permissive: Permissive access
+          pitch: Sports pitch
+          primary: Primary road
+          private: Private access
+          rail: Railway
+          reserve: Nature reserve
+          resident: Residential area
+          retail: Retail area
+          runway: 
+            - Airport Runway
+            - taxiway
+          school: School; university
+          secondary: Secondary road
+          station: Railway station
+          subway: Subway
+          summit: 
             - Summit
             - peak
-          tunnel: "Dashed casing = tunnel"
-          bridge: "Black casing = bridge"
-          private: "Private access"
-          permissive: "Permissive access"
-          destination: "Destination access"
-          construction: "Roads under construction"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
-      title: "Editing trace {{name}}"
-      heading: "Editing trace {{name}}"
+          tourist: Tourist attraction
+          track: Track
+          tram: 
+            - Light rail
+            - tram
+          trunk: Trunk road
+          tunnel: Dashed casing = tunnel
+          unclassified: Unclassified road
+          unsurfaced: Unsurfaced road
+          wood: Wood
+        heading: Legend for z{{zoom_level}}
+    search: 
+      search: Search
+      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
+      submit_text: Go
+      where_am_i: Where am I?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
+      upload_trace: Upload GPS Trace
+    delete: 
+      scheduled_for_deletion: Track scheduled for deletion
+    edit: 
+      description: "Description:"
+      download: download
+      edit: edit
       filename: "Filename:"
-      download: "download"
-      uploaded_at: "Uploaded at:"
+      heading: Editing trace {{name}}
+      map: map
+      owner: "Owner:"
       points: "Points:"
+      save_button: Save Changes
       start_coord: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
       tags: "Tags:"
-      tags_help: "comma delimited"
-      save_button: "Save Changes"
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      tags_help: "use commas"
-      public: "Public?"
-      public_help: "what does this mean?"
-      public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "Upload"
-      help: "Help"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      title: "Viewing trace {{name}}"
-      heading: "Viewing trace {{name}}"
-      pending: "PENDING"
+      tags_help: comma delimited
+      title: Editing trace {{name}}
+      uploaded_at: "Uploaded at:"
+      visibility: "Vizibilitate:"
+      visibility_help: ce Ã®nseamnÄ asta?
+    list: 
+      public_traces: Public GPS traces
+      public_traces_from: Public GPS traces from {{user}}
+      tagged_with: " tagged with {{tags}}"
+      your_traces: Your GPS traces
+    make_public: 
+      made_public: Track made public
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    trace: 
+      ago: "{{time_in_words_ago}} ago"
+      by: by
+      count_points: "{{count}} points"
+      edit: edit
+      edit_map: Edit Map
+      in: in
+      map: map
+      more: more
+      pending: PENDING
+      private: PRIVATE
+      public: PUBLIC
+      trace_details: View Trace Details
+      view_map: View Map
+    trace_form: 
+      description: Description
+      help: Help
+      tags: Tags
+      tags_help: use commas
+      upload_button: Upload
+      upload_gpx: Upload GPX File
+      visibility: Vizibilitate
+      visibility_help: ce Ã®nseamnÄ asta?
+    trace_header: 
+      see_all_traces: See all traces
+      see_just_your_traces: See just your traces, or upload a trace
+      see_your_traces: See all your traces
+      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: of
+      showing: Showing page
+    view: 
+      delete_track: Delete this track
+      description: "Description:"
+      download: download
+      edit: edit
+      edit_track: Edit this track
       filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
+      heading: Viewing trace {{name}}
+      map: map
+      none: None
+      owner: "Owner:"
+      pending: PENDING
       points: "Points:"
       start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
       tags: "Tags:"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Login"
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
+      title: Viewing trace {{name}}
+      trace_not_found: Trace not found!
+      uploaded: "Uploaded at:"
+      visibility: "Vizibilitate:"
+  user: 
+    account: 
+      email never displayed publicly: (never displayed publicly)
+      flash update success: User information updated successfully.
+      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
+      home location: "Home Location:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Make all my edits public
+      my settings: My settings
+      no home location: You have not entered your home location.
+      preferred languages: "Preferred Languages:"
+      profile description: "Profile Description:"
+      public editing: 
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: what's this?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: Save Changes
+      title: Edit account
+      update home location on click: Update home location when I click on the map?
+    confirm: 
+      button: Confirm
+      failure: A user account with this token has already been confirmed.
+      heading: Confirm a user account
+      press confirm button: Press the confirm button below to activate your account.
+      success: Confirmed your account, thanks for signing up!
+    confirm_email: 
+      button: Confirm
+      failure: An email address has already been confirmed with this token.
+      heading: Confirm a change of email address
+      press confirm button: Press the confirm button below to confirm your new email address.
+      success: Confirmed your email address, thanks for signing up!
+    friend_map: 
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      your location: Your location
+    go_public: 
+      flash success: All your edits are now public, and you are now allowed to edit.
+    login: 
+      account not active: Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account.
+      auth failure: Sorry, couldn't log in with those details.
+      create_account: create an account
       email or username: "Email Address or Username:"
+      heading: Login
+      login_button: Login
+      lost password link: Lost your password?
       password: "Password:"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
-      auth failure: "Sorry, couldn't log in with those details."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      please login: Please login or {{create_user_link}}.
+      title: Login
+    lost_password: 
       email address: "Email Address:"
+      heading: Forgotten Password?
+      new password button: Send me a new password
+      notice email cannot find: Couldn't find that email address, sorry.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
+      title: lost password
+    make_friend: 
+      already_a_friend: You are already friends with {{name}}.
+      failed: Sorry, failed to add {{name}} as a friend.
+      success: "{{name}} is now your friend."
+    new: 
       confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      confirm password: "Confirm Password:"
+      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
       display name: "Display Name:"
+      email address: "Email Address:"
+      fill_form: Fill in the form and we'll send you a quick email to activate your account.
+      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
+      heading: Create a User Account
+      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
+      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Password:"
-      confirm password: "Confirm Password:"
       signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
+      title: Create account
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      confirm password: "ConfirmaÅ£i parola:"
+      flash changed: Parola dumneavoastrÄ a fost schimbatÄ.
+      flash token bad: Didn't find that token, check the URL maybe?
+      password: "Parola:"
+      reset: ReseteazÄ parola
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: Add Image
+      ago: ({{time_in_words_ago}} ago)
+      change your settings: change your settings
+      delete image: Delete Image
+      description: Description
+      diary: diary
+      edits: edits
+      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
+      km away: "{{count}}km away"
+      m away: "{{count}}m away"
+      mapper since: "Mapper since:"
       my diary: my diary
-      new diary entry: new diary entry
       my edits: my edits
-      my traces: my traces
       my settings: my settings
+      my traces: my traces
+      nearby users: "Nearby users:"
+      new diary entry: new diary entry
+      no friends: You have not added any friends yet.
+      no home location: No home location has been set.
+      no nearby users: There are no users who admit to mapping nearby yet.
+      remove as friend: remove as friend
       send message: send message
-      diary: diary
-      edits: edits
+      settings_link_text: settings
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
       upload an image: Upload an image
-      add image: Add Image
-      description: Description
+      user image heading: User image
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
       your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{count}}km away"
-      m away: "{{count}}m away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing:"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      home location: "Home Location:"
-      no home location: "You have not entered your home location."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 24b1f9768..82a1e543b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,753 +1,956 @@
-ru:
-  html:
-    dir: "ltr"
-  activerecord:
-    models:
-      acl: "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°"
-      changeset: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-      changeset_tag: "Ð¢ÐµÐ³ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-      country: "Ð¡ÑÑÐ°Ð½Ð°"
-      diary_comment: "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ðº Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÑ"
-      diary_entry: "ÐÐ°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ"
-      friend: "ÐÑÑÐ³"
-      language: "Ð¯Ð·ÑÐº"
-      message: "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
-      node: "Ð£Ð·ÐµÐ»"
-      node_tag: "Ð¢ÐµÐ³ ÑÐ·Ð»Ð°"
-      notifier: "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð¸ÑÐµÐ»Ñ"
-      old_node: "Ð¡ÑÐ°ÑÑÐ¹ ÑÐ·ÐµÐ»"
-      old_node_tag: "Ð¡ÑÐ°ÑÑÐ¹ ÑÐµÐ³ ÑÐ·Ð»Ð°"
-      old_relation: "Ð¡ÑÐ°ÑÐ¾Ðµ ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
-      old_relation_member: "Ð¡ÑÐ°ÑÑÐ¹ ÑÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      old_relation_tag: "Ð¡ÑÐ°ÑÑÐ¹ ÑÐµÐ³ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      old_way: "Ð¡ÑÐ°ÑÐ°Ñ Ð»Ð¸Ð½Ð¸Ñ"
-      old_way_node: "Ð£Ð·ÐµÐ» ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
-      old_way_tag: "Ð¢ÐµÐ³ ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
-      relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
-      relation_member: "Ð£ÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      relation_tag: "Ð¢ÐµÐ³ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      session: "Ð¡ÐµÑÑÐ¸Ñ"
-      trace: "Ð¢ÑÐµÐº"
-      tracepoint: "Ð¢Ð¾ÑÐºÐ° ÑÑÐµÐºÐ°"
-      tracetag: "Ð¢ÐµÐ³ ÑÑÐµÐºÐ°"
-      user: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      user_preference: "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      user_token: "ÐÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      way: "ÐÐ¸Ð½Ð¸Ñ"
-      way_node: "Ð£Ð·ÐµÐ» Ð»Ð¸Ð½Ð¸Ð¸"
-      way_tag: "Ð¢ÐµÐ³ Ð»Ð¸Ð½Ð¸Ð¸"
-    attributes:
-      diary_comment:
-        body: "Ð¢ÐµÐºÑÑ"
-      diary_entry:
-        user: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-        title: "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
-        latitude: "Ð¨Ð¸ÑÐ¾ÑÐ°"
-        longitude: "ÐÐ¾Ð»Ð³Ð¾ÑÐ°"
-        language: "Ð¯Ð·ÑÐº"
-      friend:
-        user: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-        friend: "ÐÑÑÐ³"
-      trace:
-        user: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-        visible: "ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ"
-        name: "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
-        size: "Ð Ð°Ð·Ð¼ÐµÑ"
-        latitude: "Ð¨Ð¸ÑÐ¾ÑÐ°"
-        longitude: "ÐÐ¾Ð»Ð³Ð¾ÑÐ°"
-        public: "ÐÐ±ÑÐ¸Ð¹"
-        description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-      message:
-        sender: "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ"
-        title: "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"
-        body: "Ð¢ÐµÐºÑÑ"
-        recipient: "ÐÐ¾Ð»ÑÑÐ°ÑÐµÐ»Ñ"
-      user:
-        email: "E-mail"
-        active: "ÐÐºÑÐ¸Ð²ÐµÐ½"
-        display_name: "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
-        description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-        languages: "Ð¯Ð·ÑÐºÐ¸"
-        pass_crypt: "ÐÐ°ÑÐ¾Ð»Ñ"
-  map:
-    view: ÐÐ°ÑÑÐ°
-    edit: ÐÑÐ°Ð²ÐºÐ°
-    coordinates: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ:"
-  browse:
-    changeset:
-      title: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-      changeset: "ÐÐ°ÐºÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹:"
-      download: "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ {{changeset_xml_link}} Ð¸Ð»Ð¸ {{osmchange_xml_link}}"
-      changesetxml: "XML Ð¿Ð°ÐºÐµÑÐ° Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Ð¡Ð¾Ð·Ð´Ð°Ð½:"
-      closed_at: "ÐÐ°ÐºÑÑÑ:"
+ru: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Ð¢ÐµÐºÑÑ
+      diary_entry: 
+        language: Ð¯Ð·ÑÐº
+        latitude: Ð¨Ð¸ÑÐ¾ÑÐ°
+        longitude: ÐÐ¾Ð»Ð³Ð¾ÑÐ°
+        title: ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº
+        user: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      friend: 
+        friend: ÐÑÑÐ³
+        user: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      message: 
+        body: Ð¢ÐµÐºÑÑ
+        recipient: ÐÐ¾Ð»ÑÑÐ°ÑÐµÐ»Ñ
+        sender: ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ
+        title: ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº
+      trace: 
+        description: ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ
+        latitude: Ð¨Ð¸ÑÐ¾ÑÐ°
+        longitude: ÐÐ¾Ð»Ð³Ð¾ÑÐ°
+        name: ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ
+        public: ÐÐ±ÑÐ¸Ð¹
+        size: Ð Ð°Ð·Ð¼ÐµÑ
+        user: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+        visible: ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ
+      user: 
+        active: ÐÐºÑÐ¸Ð²ÐµÐ½
+        description: ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ
+        display_name: ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ
+        email: Ð­Ð». Ð°Ð´ÑÐµÑ
+        languages: Ð¯Ð·ÑÐºÐ¸
+        pass_crypt: ÐÐ°ÑÐ¾Ð»Ñ
+    models: 
+      acl: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑÑÐ¿Ð°
+      changeset: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      changeset_tag: ÐÐµÑÐºÐ° Ð½Ð°Ð±Ð¾ÑÐ° Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      country: Ð¡ÑÑÐ°Ð½Ð°
+      diary_comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ðº Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÑ
+      diary_entry: ÐÐ°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
+      friend: ÐÑÑÐ³
+      language: Ð¯Ð·ÑÐº
+      message: Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ
+      node: Ð£Ð·ÐµÐ»
+      node_tag: ÐÐµÑÐºÐ° ÑÐ·Ð»Ð°
+      notifier: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð¸ÑÐµÐ»Ñ
+      old_node: Ð¡ÑÐ°ÑÑÐ¹ ÑÐ·ÐµÐ»
+      old_node_tag: ÐÐµÑÐºÐ° ÑÑÐ°ÑÐ¾Ð³Ð¾ ÑÐ·Ð»Ð°
+      old_relation: Ð¡ÑÐ°ÑÐ¾Ðµ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
+      old_relation_member: Ð¡ÑÐ°ÑÑÐ¹ ÑÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ
+      old_relation_tag: ÐÐµÑÐºÐ° ÑÑÐ°ÑÐ¾Ð³Ð¾ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ
+      old_way: Ð¡ÑÐ°ÑÐ°Ñ Ð»Ð¸Ð½Ð¸Ñ
+      old_way_node: Ð£Ð·ÐµÐ» ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸
+      old_way_tag: ÐÐµÑÐºÐ° ÑÑÐ°ÑÐ¾Ð¹ Ð»Ð¸Ð½Ð¸Ð¸
+      relation: ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
+      relation_member: Ð£ÑÐ°ÑÑÐ½Ð¸Ðº Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ
+      relation_tag: ÐÐµÑÐºÐ° Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ
+      session: Ð¡ÐµÑÑÐ¸Ñ
+      trace: Ð¢ÑÐµÐº
+      tracepoint: Ð¢Ð¾ÑÐºÐ° ÑÑÐµÐºÐ°
+      tracetag: ÐÐµÑÐºÐ° ÑÑÐµÐºÐ°
+      user: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      user_preference: ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      user_token: ÐÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      way: ÐÐ¸Ð½Ð¸Ñ
+      way_node: Ð£Ð·ÐµÐ» Ð»Ð¸Ð½Ð¸Ð¸
+      way_tag: ÐÐµÑÐºÐ° Ð»Ð¸Ð½Ð¸Ð¸
+  browse: 
+    changeset: 
+      changeset: "ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹: {{id}}"
+      changesetxml: XML Ð½Ð°Ð±Ð¾ÑÐ° Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      download: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ {{changeset_xml_link}} Ð¸Ð»Ð¸ {{osmchange_xml_link}}
+      feed: 
+        title: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ {{id}}
+        title_comment: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ {{id}} â {{comment}}
+      osmchangexml: osmChange XML
+      title: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+    changeset_details: 
       belongs_to: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
       bounding_box: "ÐÑÐ°Ð½Ð¸ÑÑ:"
-      no_bounding_box: "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ° Ð³ÑÐ°Ð½Ð¸ÑÑ Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ."
-      show_area_box: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
-      box: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ"
-      box: "Ð³ÑÐ°Ð½Ð¸ÑÐ°"
-      has_nodes: "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ {{count}} ÑÐ·Ð»Ð°(Ð¾Ð²):"
+      box: Ð³ÑÐ°Ð½Ð¸ÑÐ°
+      closed_at: "ÐÐ°ÐºÑÑÑ:"
+      created_at: "Ð¡Ð¾Ð·Ð´Ð°Ð½:"
+      has_nodes: 
+        one: "ÐÐ¼ÐµÐµÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ {{count}} ÑÐ·ÐµÐ»:"
+        other: "ÐÐ¼ÐµÐµÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ {{count}} ÑÐ·Ð»Ð¾Ð²:"
+      has_relations: 
+        other: "ÐÐ¼ÐµÐµÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ {{count}} Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ð¹:"
       has_ways: "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ {{count}} Ð»Ð¸Ð½Ð¸Ð¹:"
-      has_relations: "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ {{count}} Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ð¹:"
-    common_details:
+      no_bounding_box: ÐÐ»Ñ ÑÑÐ¾Ð³Ð¾ Ð½Ð°Ð±Ð¾ÑÐ° Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð³ÑÐ°Ð½Ð¸ÑÑ Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ.
+      show_area_box: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ
+    changeset_navigation: 
+      all: 
+        next_tooltip: Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ð¹ Ð½Ð°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+        prev_tooltip: ÐÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¹ Ð½Ð°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      user: 
+        name_tooltip: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¿ÑÐ°Ð²Ð¾Ðº {{user}}
+        next_tooltip: Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ Ð¿ÑÐ°Ð²ÐºÐ° {{user}}
+        prev_tooltip: ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ Ð¿ÑÐ°Ð²ÐºÐ° {{user}}
+    common_details: 
+      changeset_comment: "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹:"
       edited_at: "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¾:"
       edited_by: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
+      in_changeset: "ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹:"
       version: "ÐÐµÑÑÐ¸Ñ:"
-      in_changeset: "Ð¡ÐµÐ°Ð½Ñ:"
-    containing_relation:
-      relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}}"
-      relation_as: "(Ð² ÑÐ¾Ð»Ð¸ {{relation_role}})"
-    map:
-      loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
-      deleted: "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾"
-      view_larger_map: "ÐÐ° Ð±Ð¾Ð»ÑÑÐ¾Ð¹ ÐºÐ°ÑÑÐµ"
-    node_details:
+    containing_relation: 
+      entry: ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}}
+      entry_role: ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ {{relation_name}} (ÐºÐ°Ðº {{relation_role}})
+    map: 
+      deleted: Ð£Ð´Ð°Ð»ÐµÐ½Ð¾
+      larger: 
+        area: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¾Ð±Ð»Ð°ÑÑÐ¸ Ð½Ð° Ð±Ð¾Ð»ÐµÐµ ÐºÑÑÐ¿Ð½Ð¾Ð¹ ÐºÐ°ÑÑÐµ
+        node: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ·Ð»Ð° Ð½Ð° Ð±Ð¾Ð»ÐµÐµ ÐºÑÑÐ¿Ð½Ð¾Ð¹ ÐºÐ°ÑÑÐµ
+        relation: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ Ð½Ð° Ð±Ð¾Ð»ÐµÐµ ÐºÑÑÐ¿Ð½Ð¾Ð¹ ÐºÐ°ÑÑÐµ
+        way: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð»Ð¸Ð½Ð¸Ð¸ Ð½Ð° Ð±Ð¾Ð»ÐµÐµ ÐºÑÑÐ¿Ð½Ð¾Ð¹ ÐºÐ°ÑÑÐµ
+      loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} Ð¸Ð»Ð¸ {{edit_link}}"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      edit: Ð¿ÑÐ°Ð²Ð¸ÑÑ
+      node: Ð£Ð·ÐµÐ»
+      node_title: "Ð£Ð·ÐµÐ»: {{node_name}}"
+      view_history: Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ
+    node_details: 
       coordinates: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ:"
       part_of: "ÐÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ Ðº:"
-    node_history:
-      node_history: "ÐÑÑÐ¾ÑÐ¸Ñ ÑÐ·Ð»Ð°"
+    node_history: 
       download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_details_link}}"
-      download_xml: "Ð¡ÐºÐ°ÑÐ°ÑÑ XML"
-      view_details: "Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ"
-    node:
-      node: "Ð£Ð·ÐµÐ»"
-      node_title: "Ð£Ð·ÐµÐ»: {{node_name}}"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      node_history: ÐÑÑÐ¾ÑÐ¸Ñ ÑÐ·Ð»Ð°
+      node_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ ÑÐ·Ð»Ð°: {{node_name}}"
+      view_details: Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ
+    not_found: 
+      sorry: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, {{type}} Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ¾Ð¼ {{id}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½.
+      type: 
+        changeset: Ð½Ð°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+        node: ÑÐ·ÐµÐ»
+        relation: Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
+        way: Ð»Ð¸Ð½Ð¸Ñ
+    paging_nav: 
+      of: Ð¸Ð·
+      showing_page: ÐÐ¾ÐºÐ°Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ
+    relation: 
       download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_history_link}}"
-      download_xml: "Ð¡ÐºÐ°ÑÐ°ÑÑ XML"
-      view_history: "Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ"
-    not_found:
-      sorry: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, {{type}} Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ¾Ð¼ {{id}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½."
-      type:
-        node: "ÑÐ·ÐµÐ»"
-        way: "Ð»Ð¸Ð½Ð¸Ñ"
-        relation: "Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
-    paging_nav:
-      showing_page: "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"
-      of: "Ð¸Ð·"
-    relation_details:
-      members: "Ð£ÑÐ°ÑÑÐ½Ð¸ÐºÐ¸:"
-      part_of: "Ð§Ð°ÑÑÑ:"
-    relation_history:
-      relation_history: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ"
-      relation_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ {{relation_name}}"
-    relation_member:
-      as: "Ð² ÑÐ¾Ð»Ð¸"
-    relation:
-      relation: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      relation: ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
       relation_title: "ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ: {{relation_name}}"
-      download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_history_link}}"
-      download_xml: "Ð¡ÐºÐ°ÑÐ°ÑÑ XML"
-      view_history: "Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ"
-    start:
-      view_data: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð²Ð¸Ð´Ð°"
-      manually_select: "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
-    start_rjs:
-      data_layer_name: "ÐÐ°Ð½Ð½ÑÐµ"
-      data_frame_title: "ÐÐ°Ð½Ð½ÑÐµ"
-      zoom_or_select: "Ð£Ð²ÐµÐ»Ð¸ÑÑÑÐµ Ð¸Ð»Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°"
-      drag_a_box: "ÐÐ»Ñ Ð²ÑÐ±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ°ÑÑÑÐ½Ð¸ÑÐµ ÑÐ°Ð¼ÐºÑ Ð¿Ð¾ ÐºÐ°ÑÑÐµ"
-      manually_select: "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
-      loaded_an_area_with_num_features: "ÐÑ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð»Ð¸ Ð¾Ð±Ð»Ð°ÑÑÑ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ [[num_features]] Ð¾Ð±ÑÐµÐºÑÐ¾Ð². ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ°ÑÐ·ÐµÑÑ Ð¼Ð¾Ð³ÑÑ Ð½Ðµ ÑÐ¿ÑÐ°Ð²Ð¸ÑÑÑÑ Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÐ¼ ÑÐ°ÐºÐ¾Ð³Ð¾ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° Ð´Ð°Ð½Ð½ÑÑ. ÐÐ±ÑÑÐ½Ð¾ Ð±ÑÐ°ÑÐ·ÐµÑÑ Ð»ÑÑÑÐµÐ³Ð¾ Ð²ÑÐµÐ³Ð¾ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ Ð´Ð¾ 100 Ð¾Ð±ÑÐµÐºÑÐ¾Ð² Ð¾Ð´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾. ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð±Ð¾Ð»ÑÑÐµÐ³Ð¾ ÑÐ¸ÑÐ»Ð° Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¼ÐµÐ´Ð»Ð¸ÑÑ Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·ÐµÑ Ð¸Ð»Ð¸ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸Ñ. ÐÑÐ»Ð¸ Ð²Ñ Ð²ÑÐµ ÑÐ°Ð²Ð½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÐ¸ Ð´Ð°Ð½Ð½ÑÐµ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ Ð½Ð¸Ð¶Ðµ."
-      load_data: "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ"
+      view_history: Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ
+    relation_details: 
+      members: "Ð£ÑÐ°ÑÑÐ½Ð¸ÐºÐ¸:"
+      part_of: "ÐÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ Ðº:"
+    relation_history: 
+      download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_details_link}}"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      relation_history: ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ
+      relation_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ: {{relation_name}}"
+      view_details: Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ
+    relation_member: 
+      entry_role: "{{type}} {{name}} ÐºÐ°Ðº {{role}}"
+      type: 
+        node: Ð£Ð·ÐµÐ»
+        relation: ÐÑÐ½Ð¾ÑÐµÐ½Ð¸Ðµ
+        way: ÐÐ¸Ð½Ð¸Ñ
+    start: 
+      manually_select: ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ
+      view_data: ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð²Ð¸Ð´Ð°
+    start_rjs: 
+      data_frame_title: ÐÐ°Ð½Ð½ÑÐµ
+      data_layer_name: ÐÐ°Ð½Ð½ÑÐµ
+      details: ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸
+      drag_a_box: ÐÐ»Ñ Ð²ÑÐ±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ°ÑÑÑÐ½Ð¸ÑÐµ ÑÐ°Ð¼ÐºÑ Ð¿Ð¾ ÐºÐ°ÑÑÐµ
+      edited_by_user_at_timestamp: ÐÐ·Ð¼ÐµÐ½Ð¸Ð» [[user]] Ð² [[timestamp]]
+      history_for_feature: ÐÑÑÐ¾ÑÐ¸Ñ [[feature]]
+      load_data: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ
+      loaded_an_area_with_num_features: ÐÑ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð»Ð¸ Ð¾Ð±Ð»Ð°ÑÑÑ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ [[num_features]] Ð¾Ð±ÑÐµÐºÑÐ¾Ð². ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð±ÑÐ°ÑÐ·ÐµÑÑ Ð¼Ð¾Ð³ÑÑ Ð½Ðµ ÑÐ¿ÑÐ°Ð²Ð¸ÑÑÑÑ Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÐ¼ ÑÐ°ÐºÐ¾Ð³Ð¾ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° Ð´Ð°Ð½Ð½ÑÑ. ÐÐ±ÑÑÐ½Ð¾ Ð±ÑÐ°ÑÐ·ÐµÑÑ Ð»ÑÑÑÐµÐ³Ð¾ Ð²ÑÐµÐ³Ð¾ Ð¾Ð±ÑÐ°Ð±Ð°ÑÑÐ²Ð°ÑÑ Ð´Ð¾ 100 Ð¾Ð±ÑÐµÐºÑÐ¾Ð² Ð¾Ð´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾. ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð±Ð¾Ð»ÑÑÐµÐ³Ð¾ ÑÐ¸ÑÐ»Ð° Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð¼ÐµÐ´Ð»Ð¸ÑÑ Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·ÐµÑ Ð¸Ð»Ð¸ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸Ñ. ÐÑÐ»Ð¸ Ð²Ñ Ð²ÑÐµ ÑÐ°Ð²Ð½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÐ¸ Ð´Ð°Ð½Ð½ÑÐµ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ Ð½Ð¸Ð¶Ðµ.
+      loading: ÐÐ°Ð³ÑÑÐ·ÐºÐ°...
+      manually_select: ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ
+      object_list: 
+        api: ÐÐ¾Ð»ÑÑÐ¸ÑÑ ÑÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¸Ð· API
+        back: ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¾Ð±ÑÐµÐºÑÐ¾Ð²
+        details: ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸
+        heading: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¾Ð±ÑÐµÐºÑÐ¾Ð²
+        history: 
+          type: 
+            node: Ð£Ð·ÐµÐ» [[id]]
+            way: ÐÐ¸Ð½Ð¸Ñ [[id]]
+        selected: 
+          type: 
+            node: Ð£Ð·ÐµÐ» [[id]]
+            way: ÐÐ¸Ð½Ð¸Ñ [[id]]
+        type: 
+          node: Ð£Ð·ÐµÐ»
+          way: ÐÐ¸Ð½Ð¸Ñ
+      private_user: ÑÐ°ÑÑÐ½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      show_history: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ
       unable_to_load_size: "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°: ÑÐ°Ð·Ð¼ÐµÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ° [[bbox_size]] ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ð¹ (Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð¼ÐµÐ½ÑÑÐµ {{max_bbox_size}})"
-      loading: "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..."
-      show_history: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ"
-      wait: "ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ..."
-      history_for_feature: "ÐÑÑÐ¾ÑÐ¸Ñ [[feature]]"
-      details: "ÐÐµÑÐ°Ð»Ð¸"
-      private_user: "ÑÐ°ÑÑÐ½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      edited_by_user_at_timestamp: "ÐÐ·Ð¼ÐµÐ½Ð¸Ð» [[user]] Ð² [[timestamp]]"
-      object_list:
-        heading: "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¾Ð±ÑÐµÐºÑÐ¾Ð²"
-        back: "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¾Ð±ÑÐµÐºÑÐ¾Ð²"
-        type:
-          node: "Ð£Ð·ÐµÐ»"
-          way: "ÐÐ¸Ð½Ð¸Ñ"
-        api: "ÐÐ¾Ð»ÑÑÐ¸ÑÑ ÑÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¸Ð· API"
-        details: "ÐÐµÑÐ°Ð»Ð¸"
-        selected:
-          type:
-            node: "Ð£Ð·ÐµÐ» [[id]]"
-            way: "ÐÐ¸Ð½Ð¸Ñ [[id]]"
-        history:
-            node: "Ð£Ð·ÐµÐ» [[id]]"
-            way: "ÐÐ¸Ð½Ð¸Ñ [[id]]"
-    tag_details:
-      tags: "Ð¢ÐµÐ³Ð¸:"
-    way_details:
+      wait: ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ...
+      zoom_or_select: Ð£Ð²ÐµÐ»Ð¸ÑÑÑÐµ Ð¸Ð»Ð¸ Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°
+    tag_details: 
+      tags: "ÐÐµÑÐºÐ¸:"
+    way: 
+      download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_history_link}}"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      edit: Ð¿ÑÐ°Ð²Ð¸ÑÑ
+      view_history: Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ
+      way: Ð»Ð¸Ð½Ð¸Ñ
+      way_title: "ÐÐ¸Ð½Ð¸Ñ: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½Ð¸Ð¸ {{related_ways}}
+        other: ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½ÐµÐ¹ {{related_ways}}
       nodes: "Ð£Ð·Ð»Ñ:"
       part_of: "Ð¯Ð²Ð»ÑÐµÑÑÑ ÑÐ°ÑÑÑÑ:"
-      also_part_of:
-        one: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½Ð¸Ð¸ {{related_ways}}"
-        other: "ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÑÑ Ð»Ð¸Ð½ÐµÐ¹ {{related_ways}}"
-    way_history:
-      way_history: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸"
-      way_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_details_link}}"
-      download_xml: "Ð¡ÐºÐ°ÑÐ°ÑÑ XML"
-      view_details: "Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´ÐµÑÐ°Ð»Ð¸"
-    way:
-      way: "Ð»Ð¸Ð½Ð¸Ñ"
-      way_title: "ÐÐ¸Ð½Ð¸Ñ: {{way_name}}"
-      download: "{{download_xml_link}} Ð¸Ð»Ð¸ {{view_history_link}}"
-      download_xml: "Ð¡ÐºÐ°ÑÐ°ÑÑ XML"
-      view_history: "Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸ÑÑÐ¾ÑÐ¸Ñ"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"
-      of: "Ð¸Ð·"
-    changeset:
-      still_editing: "(ÐµÑÑ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÑÑÑ)"
-      anonymous: "ÐÐ½Ð¾Ð½Ð¸Ð¼"
-      no_comment: "(Ð½ÐµÑ)"
-      no_edits: "(Ð½ÐµÑ Ð¿ÑÐ°Ð²Ð¾Ðº)"
-      show_area_box: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ ÑÐµÐ°Ð½ÑÐ°"
-      big_area: "(Ð±Ð¾Ð»ÑÑÐ°Ñ)"
-      view_changeset_details: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÐµÐ°Ð½ÑÐ°"
-      more: "Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ"
-    changesets:
-      id: "ID"
-      saved_at: "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¾"
-      user: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      comment: "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹"
-      area: "ÐÐ±Ð»Ð°ÑÑÑ"
-    list_bbox:
-      history: "ÐÑÑÐ¾ÑÐ¸Ñ"
-      changesets_within_the_area: "Ð¡ÐµÐ°Ð½ÑÑ Ð² ÑÑÐ¾Ð¹ Ð¾Ð±Ð»Ð°ÑÑÐ¸:"
-      show_area_box: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ Ð½Ð° ÐºÐ°ÑÑÐµ"
-      no_changesets: "ÐÐµÑ ÑÐµÐ°Ð½ÑÐ¾Ð²"
-      all_changes_everywhere: "ÐÑÐµ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ Ð¿ÑÐ°Ð²ÐºÐ¸: {{recent_changes_link}}"
-      recent_changes: "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
-      no_area_specified: "ÐÐ±Ð»Ð°ÑÑÑ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°"
-      first_use_view: "Ð¡Ð½Ð°ÑÐ°Ð»Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ {{view_tab_link}}, ÑÑÐ¾Ð±Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð¸Ð´ Ð¸ Ð¿ÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÑ Ð¸Ð½ÑÐµÑÐµÑÑÑÑÑÑ Ð²Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ, Ð° Ð¿Ð¾ÑÐ¾Ð¼ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÑ &laquo;ÐÑÑÐ¾ÑÐ¸Ñ&raquo;."
-      view_the_map: "ÑÐ¼Ð¾ÑÑÐµÑÑ ÐºÐ°ÑÑÑ"
-      view_tab: "Ð²ÐºÐ»Ð°Ð´ÐºÑ &laquo;ÐÐ°ÑÑÐ°&raquo;"
-      alternatively_view: "ÐÐ»Ð¸ Ð¶Ðµ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð²ÑÐµ {{recent_changes_link}}"
-    list:
-      recent_changes: "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
-      recently_edited_changesets: "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ ÑÐµÐ°Ð½ÑÑ:"
-      for_more_changesets: "ÐÐ»Ñ ÑÐ¾Ð³Ð¾, ÑÑÐ¾Ð±Ñ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð±Ð¾Ð»ÑÑÐµ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ Ð¿ÑÐ°Ð²ÐºÐ°Ñ, Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ ÐµÐ³Ð¾ Ð¸ÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð¸Ð»Ð¸ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð¸ÑÑÐ¾ÑÐ¸Ñ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ð¹ Ð¾Ð±Ð»Ð°ÑÑÐ¸."
-    list_user:
-      edits_by_username: "ÐÑÐ°Ð²ÐºÐ¸ {{username_link}}"
-      no_visible_edits_by: "ÐÐµÑ Ð²Ð¸Ð´Ð¸Ð¼ÑÑ Ð¿ÑÐ°Ð²Ð¾Ðº {{name}}."
-      for_all_changes: "ÐÐ»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° Ð¿ÑÐ°Ð²Ð¾Ðº Ð²ÑÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð½Ð° {{recent_changes_link}}"
-      recent_changes: "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
-  diary_entry:
-    new:
-      title: ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
-    list:
-      title: "ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹"
-      user_title: "ÐÐ½ÐµÐ²Ð½Ð¸Ðº {{user}}"
-      in_language_title: "ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð² {{language}}"
-      new: ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
-      new_title: ÐÐ°Ð¿Ð¸ÑÐ°ÑÑ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² ÑÐ²Ð¾ÐµÐ¼ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
-      no_entries: Ð Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ Ð½ÐµÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹
-      recent_entries: "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸:"
-      older_entries: ÐÐ¾Ð»ÐµÐµ ÑÑÐ°ÑÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸
-      newer_entries: ÐÐ¾Ð»ÐµÐµ Ð½Ð¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸
-    edit:
-      title: "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-      subject: "Ð¢ÐµÐ¼Ð°:"
+      download_xml: Ð¡ÐºÐ°ÑÐ°ÑÑ XML
+      view_details: Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ
+      way_history: ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸
+      way_history_title: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð»Ð¸Ð½Ð¸Ð¸: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: ÐÐ½Ð¾Ð½Ð¸Ð¼
+      big_area: (Ð±Ð¾Ð»ÑÑÐ°Ñ)
+      no_comment: (Ð½ÐµÑ)
+      no_edits: (Ð½ÐµÑ Ð¿ÑÐ°Ð²Ð¾Ðº)
+      show_area_box: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð³ÑÐ°Ð½Ð¸ÑÑ ÑÐµÐ°Ð½ÑÐ°
+      still_editing: (ÐµÑÑ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÑÑÑ)
+      view_changeset_details: ÐÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÐµÐ°Ð½ÑÐ°
+    changeset_paging_nav: 
+      of: Ð¸Ð·
+      showing_page: Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°
+    changesets: 
+      area: ÐÐ±Ð»Ð°ÑÑÑ
+      comment: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
+      id: ID
+      saved_at: ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¾
+      user: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+    list: 
+      description: ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
+      description_bbox: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² ÑÐ°Ð¼ÐºÐ°Ñ {{bbox}}
+      description_user: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð°Ð²ÑÐ¾ÑÑÑÐ²Ð° ((USER))
+      description_user_bbox: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð°Ð²ÑÐ¾ÑÑÑÐ²Ð° {{user}} Ð² ÑÐ°Ð¼ÐºÐ°Ñ {{bbox}}
+      heading: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      heading_bbox: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      heading_user: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      heading_user_bbox: ÐÐ°Ð±Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      title: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+      title_bbox: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² ÑÐ°Ð¼ÐºÐ°Ñ {{bbox}}
+      title_user: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð°Ð²ÑÐ¾ÑÑÑÐ²Ð° {{user}}
+      title_user_bbox: ÐÐ°Ð±Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð°Ð²ÑÐ¾ÑÑÑÐ²Ð° {{user}} Ð² ÑÐ°Ð¼ÐºÐ°Ñ {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð¾Ñ {{link_user}}, {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
+        other: "{{count}} ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸ÐµÐ²"
+      comment_link: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ
+      edit_link: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ
+      posted_by: "ÐÑÐ¿ÑÐ°Ð²Ð¸Ð» {{link_user}} Ð² {{created}}, ÑÐ·ÑÐº: {{language_link}}"
+      reply_link: ÐÑÐ²ÐµÑÐ¸ÑÑ
+    edit: 
       body: "Ð¢ÐµÐºÑÑ:"
       language: "Ð¯Ð·ÑÐº:"
-      location: "ÐÐµÑÑÐ¾:"
       latitude: "Ð¨Ð¸ÑÐ¾ÑÐ°:"
+      location: "ÐÐµÑÑÐ¾:"
       longitude: "ÐÐ¾Ð»Ð³Ð¾ÑÐ°:"
-      use_map_link: "Ð£ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° ÐºÐ°ÑÑÐµ"
-      save_button: "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
       marker_text: ÐÐµÑÑÐ¾ Ð½Ð°Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð·Ð°Ð¼ÐµÑÐºÐ¸
-    view:
-      title: "ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ | {{user}}"
-      user_title: "ÐÐ½ÐµÐ²Ð½Ð¸Ðº {{user}}"
-      leave_a_comment: "ÐÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹"
+      save_button: Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ
+      subject: "Ð¢ÐµÐ¼Ð°:"
+      title: Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      use_map_link: Ð£ÐºÐ°Ð·Ð°ÑÑ Ð½Ð° ÐºÐ°ÑÑÐµ
+    feed: 
+      all: 
+        description: ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ OpenStreetMap
+        title: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ OpenStreetMap
+      language: 
+        description: ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ OpenStreetMap Ð½Ð° {{language_name}}
+        title: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ OpenStreetMap Ð½Ð° {{language_name}}
+      user: 
+        description: ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ OpenStreetMap Ð´Ð»Ñ {{user}}
+        title: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ OpenStreetMap Ð´Ð»Ñ {{user}}
+    list: 
+      in_language_title: ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð² {{language}}
+      new: ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
+      new_title: ÐÐ°Ð¿Ð¸ÑÐ°ÑÑ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² ÑÐ²Ð¾ÐµÐ¼ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
+      newer_entries: ÐÐ¾Ð»ÐµÐµ Ð½Ð¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      no_entries: Ð Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ Ð½ÐµÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹
+      older_entries: ÐÐ¾Ð»ÐµÐµ ÑÑÐ°ÑÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      recent_entries: "ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸:"
+      title: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹
+      user_title: ÐÐ½ÐµÐ²Ð½Ð¸Ðº {{user}}
+    new: 
+      title: ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ
+    no_such_entry: 
+      body: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð·Ð°Ð¿Ð¸ÑÑ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ñ id {{id}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð° Ð°Ð´ÑÐµÑÐ°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°.
+      heading: ÐÐµÑ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ñ id {{id}}
+      title: ÐÐµÑ ÑÐ°ÐºÐ¾Ð¹ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
+    no_such_user: 
+      body: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°.
+      heading: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ
+      title: ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+    view: 
+      leave_a_comment: ÐÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
+      login: ÐÐ¾Ð³Ð¸Ð½
       login_to_leave_a_comment: "{{login_link}}, ÑÑÐ¾Ð±Ñ Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹"
-      login: "ÐÐ¾Ð³Ð¸Ð½"
-      save_button: "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
-    no_such_entry:
-      heading: "ÐÐµÑ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ñ id {{id}}"
-      body: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð·Ð°Ð¿Ð¸ÑÑ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ñ id {{id}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð° Ð°Ð´ÑÐµÑÐ°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°."
-    no_such_user:
-      title: "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      heading: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ"
-      body: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°."
-    diary_entry:
-      posted_by: "ÐÑÐ¿ÑÐ°Ð²Ð¸Ð» {{link_user}} Ð² {{created}}, ÑÐ·ÑÐº: {{language_link}}"
-      comment_link: ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ
-      reply_link: ÐÑÐ²ÐµÑÐ¸ÑÑ
-      comment_count:
-        one: 1 ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹
-        other: "{{count}} ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸ÐµÐ²"
-      edit_link: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ
-    diary_comment:
-      comment_from: "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð¾Ñ {{link_user}}, {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "ÐÐ±Ð»Ð°ÑÑÑ Ð´Ð»Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ°"
-      manually_select: "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
-      format_to_export: "Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ°"
-      osm_xml_data: "ÐÐ°Ð½Ð½ÑÐµ (OpenStreetMap XML)"
-      mapnik_image: "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ (ÑÐµÐ½Ð´ÐµÑÐµÑ Mapnik)"
-      osmarender_image: "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ (ÑÐµÐ½Ð´ÐµÑÐµÑ Osmarender)"
-      embeddable_html: "ÐÑÑÑÐ°Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ HTML"
-      licence: "ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ"
-      export_details: 'ÐÐ°Ð½Ð½ÑÐµ OpenStreetMap ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÑÑ Ð¿Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "ÐÐ¿ÑÐ¸Ð¸"
-      format: "Ð¤Ð¾ÑÐ¼Ð°Ñ"
-      scale: "ÐÐ°ÑÑÑÐ°Ð±"
-      max: "Ð¼Ð°ÐºÑ."
-      image_size: "Ð Ð°Ð·Ð¼ÐµÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ"
-      zoom: "ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÑ"
-      add_marker: "ÐÐ¾ÑÑÐ°Ð²Ð¸ÑÑ Ð½Ð° ÐºÐ°ÑÑÑ Ð¼Ð°ÑÐºÐµÑ"
+      save_button: Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ
+      title: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ | {{user}}
+      user_title: ÐÐ½ÐµÐ²Ð½Ð¸Ðº {{user}}
+  export: 
+    start: 
+      add_marker: ÐÐ¾ÑÑÐ°Ð²Ð¸ÑÑ Ð½Ð° ÐºÐ°ÑÑÑ Ð¼Ð°ÑÐºÐµÑ
+      area_to_export: ÐÐ±Ð»Ð°ÑÑÑ Ð´Ð»Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ°
+      embeddable_html: ÐÑÑÑÐ°Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ HTML
+      export_button: Ð­ÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ
+      export_details: ÐÐ°Ð½Ð½ÑÐµ OpenStreetMap ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÑÑ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
+      format: Ð¤Ð¾ÑÐ¼Ð°Ñ
+      format_to_export: Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐºÑÐ¿Ð¾ÑÑÐ°
+      image_size: Ð Ð°Ð·Ð¼ÐµÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ
       latitude: "Ð¨Ð¸ÑÐ¾ÑÐ°:"
+      licence: ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ
       longitude: "ÐÐ¾Ð»Ð³Ð¾ÑÐ°:"
-      output: "Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ"
-      paste_html: "HTML-ÐºÐ¾Ð´ Ð´Ð»Ñ Ð²ÑÑÑÐ°Ð¸Ð²Ð°Ð½Ð¸Ñ Ð² ÑÐ°Ð¹Ñ"
-      export_button: "Ð­ÐºÑÐ¿Ð¾ÑÑ"
-    start_rjs:
-      export: "Ð­ÐºÑÐ¿Ð¾ÑÑ"
-      drag_a_box: "ÐÐ»Ñ Ð²ÑÐ±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ°ÑÑÑÐ½Ð¸ÑÐµ ÑÐ°Ð¼ÐºÑ Ð¿Ð¾ ÐºÐ°ÑÑÐµ"
-      manually_select: "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ"
-      click_add_marker: "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ Ð¿Ð¾ ÐºÐ°ÑÑÐµ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð°ÑÐºÐµÑÐ°"
-      change_marker: "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¼Ð°ÑÐºÐµÑÐ°"
-      add_marker: "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ"
-      view_larger_map: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð±Ð¾&#769;Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ"
-  geocoder:
-    results:
-      results: "Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ"
-      type_from_source: "{{type}} Ð¸Ð· {{source_link}}"
-      no_results: "ÐÐ¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
-  layouts:
-    project_name:
-      title: "OpenStreetMap"
-      h1: "OpenStreetMap"
-    logo:
-      alt_text: "ÐÐ¾Ð³Ð¾ÑÐ¸Ð¿ OpenStreetMap"
-    welcome_user: "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ, {{user_link}}"
-    welcome_user_link_tooltip: "ÐÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-    home: "Ð´Ð¾Ð¼Ð¾Ð¹"
-    home_tooltip: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð¾Ð¹ Ð´Ð¾Ð¼"
-    inbox: "Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ ({{count}})"
-    inbox_tooltip:
-      zero: "Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ Ð½ÐµÑ Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹"
-      one: "Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ ÐµÑÑÑ 1 Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
-      other: "Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ ÐµÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½."
-    logout: Ð²ÑÐ¹ÑÐ¸
-    logout_tooltip: "ÐÑÐ¹ÑÐ¸"
-    log_in: Ð²Ð¾Ð¹ÑÐ¸
-    log_in_tooltip: "ÐÐ¾Ð¹ÑÐ¸ Ñ ÑÑÑÐµÑÑÐ²ÑÑÑÐ¸Ð¼ Ð°ÐºÐºÐ°ÑÐ½ÑÐ¾Ð¼"
-    sign_up: ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ
-    sign_up_tooltip: "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð´Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ"
-    view: ÐÐ°ÑÑÐ°
-    view_tooltip: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÐºÐ°ÑÑÑ"
+      manually_select: ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ
+      mapnik_image: ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Mapnik
+      max: Ð¼Ð°ÐºÑ.
+      options: ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      osm_xml_data: ÐÐ°Ð½Ð½ÑÐµ (OpenStreetMap XML)
+      osmarender_image: ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Osmarender
+      output: Ð ÐµÐ·ÑÐ»ÑÑÐ°Ñ
+      paste_html: HTML-ÐºÐ¾Ð´ Ð´Ð»Ñ Ð²ÑÑÑÐ°Ð¸Ð²Ð°Ð½Ð¸Ñ Ð½Ð° ÑÐ°Ð¹Ñ
+      scale: ÐÐ°ÑÑÑÐ°Ð±
+      zoom: ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÑ
+    start_rjs: 
+      add_marker: ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¼Ð°ÑÐºÐµÑ Ð½Ð° ÐºÐ°ÑÑÑ
+      change_marker: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¼Ð°ÑÐºÐµÑÐ°
+      click_add_marker: Ð©ÑÐ»ÐºÐ½Ð¸ÑÐµ Ð¿Ð¾ ÐºÐ°ÑÑÐµ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¼Ð°ÑÐºÐµÑÐ°
+      drag_a_box: ÐÐ»Ñ Ð²ÑÐ±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÐ¸ ÑÐ°ÑÑÑÐ½Ð¸ÑÐµ ÑÐ°Ð¼ÐºÑ Ð¿Ð¾ ÐºÐ°ÑÑÐµ
+      export: Ð­ÐºÑÐ¿Ð¾ÑÑ
+      manually_select: ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð´ÑÑÐ³ÑÑ Ð¾Ð±Ð»Ð°ÑÑÑ
+      view_larger_map: ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð±Ð¾&#769;Ð»ÑÑÑÑ ÐºÐ°ÑÑÑ
+  geocoder: 
+    description: 
+      title: 
+        geonames: ÐÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸Ð· <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} Ð¸Ð· <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: ÐÐ¾ÑÐ¾Ð´Ð°
+        places: ÐÐµÑÑÐ°
+        towns: ÐÐ¾ÑÐ¾Ð´ÑÐºÐ¸Ðµ Ð¿Ð¾ÑÐµÐ»ÐµÐ½Ð¸Ñ
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} {{type}}"
+    direction: 
+      east: Ð²Ð¾ÑÑÐ¾ÑÐ½ÐµÐµ
+      north: ÑÐµÐ²ÐµÑÐ½ÐµÐµ
+      north_east: ÑÐµÐ²ÐµÑÐ¾-Ð²Ð¾ÑÑÐ¾ÑÐ½ÐµÐµ
+      north_west: ÑÐµÐ²ÐµÑÐ¾-Ð·Ð°Ð¿Ð°Ð´Ð½ÐµÐµ
+      south: ÑÐ¶Ð½ÐµÐµ
+      south_east: ÑÐ³Ð¾-Ð²Ð¾ÑÑÐ¾ÑÐ½ÐµÐµ
+      south_west: ÑÐ³Ð¾-Ð·Ð°Ð¿Ð°Ð´Ð½ÐµÐµ
+      west: Ð·Ð°Ð¿Ð°Ð´Ð½ÐµÐµ
+    distance: 
+      one: Ð¾ÐºÐ¾Ð»Ð¾ 1 ÐºÐ¼
+      other: Ð¾ÐºÐ¾Ð»Ð¾ {{count}} ÐºÐ¼
+      zero: Ð¼ÐµÐ½ÐµÐµ 1 ÐºÐ¼
+    results: 
+      no_results: ÐÐ¸ÑÐµÐ³Ð¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾
+    search: 
+      title: 
+        ca_postcode: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¾Ñ <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¾Ñ <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: <a href="http://openstreetmap.org/">ÐÐ½ÑÑÑÐµÐ½Ð½Ð¸Ðµ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ</a>
+        osm_namefinder: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¾Ñ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¾Ñ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¾Ñ <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} {{placename}}"
+  layouts: 
+    alt_donation: Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ðµ
+    donate: ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸ÑÐµ OpenStreetMap {{link}} Ð² Ð¤Ð¾Ð½Ð´ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ.
+    donate_link_text: Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸ÑÐ¼Ð¸
     edit: ÐÑÐ°Ð²ÐºÐ°
-    edit_tooltip: "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ"
-    history: ÐÑÑÐ¾ÑÐ¸Ñ
-    history_tooltip: "ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹"
+    edit_tooltip: Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ
     export: Ð­ÐºÑÐ¿Ð¾ÑÑ
-    export_tooltip: "Ð­ÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÐºÐ°ÑÑÑ"
+    export_tooltip: Ð­ÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÐºÐ°ÑÑÑ
     gps_traces: GPS-ÑÑÐµÐºÐ¸
-    gps_traces_tooltip: "Ð Ð°Ð±Ð¾ÑÐ°ÑÑ Ñ ÑÑÐµÐºÐ°Ð¼Ð¸"
-    user_diaries: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹
-    user_diaries_tooltip: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹"
-    tag_line: Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Wiki-ÐºÐ°ÑÑÐ° Ð¼Ð¸ÑÐ°
-    intro_1: "OpenStreetMap - ÑÑÐ¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÐ¼Ð°Ñ ÐºÐ°ÑÑÐ° Ð²ÑÐµÐ³Ð¾ Ð¼Ð¸ÑÐ°. ÐÐ½Ð° ÑÐ´ÐµÐ»Ð°Ð½Ð° ÑÐ°ÐºÐ¸Ð¼Ð¸ Ð¶Ðµ Ð»ÑÐ´ÑÐ¼Ð¸, ÐºÐ°Ðº Ð¸ Ð²Ñ."
-    intro_2: "OpenStreetMap Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ ÑÐ¾Ð²Ð¼ÐµÑÑÐ½Ð¾ Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑ, Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð³ÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ Ð´Ð°Ð½Ð½ÑÐµ Ð² Ð»ÑÐ±Ð¾Ð¹ ÑÐ¾ÑÐºÐµ ÐÐµÐ¼Ð»Ð¸"
-    intro_3: "Ð£ÑÐ»ÑÐ³Ð¸ ÑÐ¾ÑÑÐ¸Ð½Ð³Ð° Ð´Ð»Ñ OpenStreetMap Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ñ {{ucl}} Ð¸ {{bytemark}}."
-    intro_3_ucl: "Ð¦ÐµÐ½ÑÑ UCL VR"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "ÐÐ°Ð·Ð° Ð´Ð°Ð½Ð½ÑÑ OpenStreetMap Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿Ð½Ð°, ÑÐ°Ðº ÐºÐ°Ðº Ð¿ÑÐ¾Ð²Ð¾Ð´Ð¸ÑÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ðµ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ."
-    osm_read_only: "ÐÐ°Ð·Ð° Ð´Ð°Ð½Ð½ÑÑ OpenStreetMap Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ, ÑÐ°Ðº ÐºÐ°Ðº Ð¿ÑÐ¾Ð²Ð¾Ð´Ð¸ÑÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ðµ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ."
-    donate: "ÐÐ¾Ð´Ð´ÐµÑÐ¶Ð¸ÑÐµ OpenStreetMap {{link}} Ð² Ð¤Ð¾Ð½Ð´ ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ."
-    donate_link_text: Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸ÑÐ¼Ð¸
-    help_wiki: "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Ð¸ ÐÐ¸ÐºÐ¸"
-    help_wiki_tooltip: "Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Ð¸ ÑÐ°Ð¹Ñ ÐÐ¸ÐºÐ¸"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Main_Page"
-    news_blog: "ÐÐ»Ð¾Ð³ Ð½Ð¾Ð²Ð¾ÑÑÐµÐ¹"
-    news_blog_tooltip: "ÐÐ»Ð¾Ð³ Ð½Ð¾Ð²Ð¾ÑÑÐµÐ¹ OpenStreetMap, Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÐµ Ð³ÐµÐ¾Ð´Ð°Ð½Ð½ÑÐµ, Ð¸ Ñ.Ð´."
+    gps_traces_tooltip: Ð Ð°Ð±Ð¾ÑÐ°ÑÑ Ñ ÑÑÐµÐºÐ°Ð¼Ð¸
+    help_wiki: Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Ð¸ Ð²Ð¸ÐºÐ¸
+    help_wiki_tooltip: Ð¡Ð¿ÑÐ°Ð²ÐºÐ° Ð¸ Ð²Ð¸ÐºÐ¸-ÑÐ°Ð¹Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Main_Page
+    history: ÐÑÑÐ¾ÑÐ¸Ñ
+    history_tooltip: ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹
+    home: Ð´Ð¾Ð¼Ð¾Ð¹
+    home_tooltip: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¼Ð¾Ð¹ Ð´Ð¾Ð¼
+    inbox: Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ ({{count}})
+    inbox_tooltip: 
+      one: Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ ÐµÑÑÑ 1 Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ
+      other: Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ ÐµÑÑÑ {{count}} Ð½Ð¾Ð²ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½.
+      zero: Ð Ð²Ð°ÑÐµÐ¼ ÑÑÐ¸ÐºÐµ Ð½ÐµÑ Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹
+    intro_1: OpenStreetMap â ÑÑÐ¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÐ¼Ð°Ñ ÐºÐ°ÑÑÐ° Ð²ÑÐµÐ³Ð¾ Ð¼Ð¸ÑÐ°. ÐÐ½Ð° ÑÐ´ÐµÐ»Ð°Ð½Ð° ÑÐ°ÐºÐ¸Ð¼Ð¸ Ð¶Ðµ Ð»ÑÐ´ÑÐ¼Ð¸, ÐºÐ°Ðº Ð¸ Ð²Ñ.
+    intro_2: OpenStreetMap Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ ÑÐ¾Ð²Ð¼ÐµÑÑÐ½Ð¾ Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑ, Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð³ÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ Ð´Ð°Ð½Ð½ÑÐµ Ð² Ð»ÑÐ±Ð¾Ð¹ ÑÐ¾ÑÐºÐµ ÐÐµÐ¼Ð»Ð¸.
+    intro_3: Ð£ÑÐ»ÑÐ³Ð¸ ÑÐ¾ÑÑÐ¸Ð½Ð³Ð° Ð´Ð»Ñ OpenStreetMap Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ñ {{ucl}} Ð¸ {{bytemark}}.
+    intro_3_ucl: Ð¦ÐµÐ½ÑÑ UCL VR
+    log_in: Ð²Ð¾Ð¹ÑÐ¸
+    log_in_tooltip: ÐÐ¾Ð¹ÑÐ¸ Ð¿Ð¾Ð´ ÑÑÑÐµÑÑÐ²ÑÑÑÐµÐ¹ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÑÑ
+    logo: 
+      alt_text: ÐÐ¾Ð³Ð¾ÑÐ¸Ð¿ OpenStreetMap
+    logout: Ð²ÑÐ¹ÑÐ¸
+    logout_tooltip: ÐÑÐ¹ÑÐ¸
+    news_blog: ÐÐ»Ð¾Ð³ Ð½Ð¾Ð²Ð¾ÑÑÐµÐ¹
+    news_blog_tooltip: ÐÐ¾Ð²Ð¾ÑÑÐ½Ð¾Ð¹ Ð±Ð»Ð¾Ð³ OpenStreetMap, ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð³ÐµÐ¾Ð´Ð°Ð½Ð½ÑÐµ, Ð¸ Ñ. Ð´.
+    osm_offline: ÐÐ°Ð·Ð° Ð´Ð°Ð½Ð½ÑÑ OpenStreetMap Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿Ð½Ð°, ÑÐ°Ðº ÐºÐ°Ðº Ð¿ÑÐ¾Ð²Ð¾Ð´Ð¸ÑÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ðµ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ.
+    osm_read_only: ÐÐ°Ð·Ð° Ð´Ð°Ð½Ð½ÑÑ OpenStreetMap Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ, ÑÐ°Ðº ÐºÐ°Ðº Ð¿ÑÐ¾Ð²Ð¾Ð´Ð¸ÑÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ ÑÐµÑÐ½Ð¸ÑÐµÑÐºÐ¾Ðµ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ.
     shop: ÐÐ°Ð³Ð°Ð·Ð¸Ð½
-    shop_tooltip: "ÐÐ°Ð³Ð°Ð·Ð¸Ð½ Ñ ÑÐ¸ÑÐ¼ÐµÐ½Ð½Ð¾Ð¹ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ÐºÐ¾Ð¹ OpenStreetMap"
-    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise"
-    sotm: 'ÐÑÐ¸Ð³Ð»Ð°ÑÐ°ÐµÐ¼ Ð½Ð° ÐºÐ¾Ð½ÑÐµÑÐµÐ½ÑÐ¸Ñ OpenStreetMap 2009, The State of the Map, Ð¿ÑÐ¾ÑÐ¾Ð´ÑÑÑÑ 10-12 Ð¸ÑÐ»Ñ Ð² ÐÐ¼ÑÑÐµÑÐ´Ð°Ð¼Ðµ!'
-    alt_donation: Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð¿Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ðµ
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} Ð¾ÑÑÐ°Ð²Ð¸Ð» ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð² Ð²Ð°ÑÐµÐ¼ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ"
+    shop_tooltip: ÐÐ°Ð³Ð°Ð·Ð¸Ð½ Ñ ÑÐ¸ÑÐ¼ÐµÐ½Ð½Ð¾Ð¹ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ÐºÐ¾Ð¹ OpenStreetMap
+    sign_up: ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ
+    sign_up_tooltip: Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð´Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ
+    sotm: ÐÑÐ¸Ð³Ð»Ð°ÑÐ°ÐµÐ¼ Ð½Ð° ÐºÐ¾Ð½ÑÐµÑÐµÐ½ÑÐ¸Ñ OpenStreetMap 2009, The State of the Map, Ð¿ÑÐ¾ÑÐ¾Ð´ÑÑÑÑ 10-12 Ð¸ÑÐ»Ñ Ð² ÐÐ¼ÑÑÐµÑÐ´Ð°Ð¼Ðµ!
+    tag_line: Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð²Ð¸ÐºÐ¸-ÐºÐ°ÑÑÐ° Ð¼Ð¸ÑÐ°
+    user_diaries: ÐÐ½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹
+    user_diaries_tooltip: ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹
+    view: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ
+    view_tooltip: ÐÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ ÐºÐ°ÑÑÑ
+    welcome_user: ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ, {{user_link}}
+    welcome_user_link_tooltip: ÐÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+  map: 
+    coordinates: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ:"
+    edit: ÐÑÐ°Ð²ÐºÐ°
+    view: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ
+  message: 
+    delete: 
+      deleted: Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¾
+    inbox: 
+      date: ÐÐ°ÑÐ°
+      from: ÐÑ
+      my_inbox: ÐÐ¾Ð¸ Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ
+      no_messages_yet: ÐÐµÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹. ÐÐ¾ÑÐµÐ¼Ñ Ð±Ñ Ð½Ðµ Ð¿Ð¾Ð¾Ð±ÑÐ°ÑÑÑÑ Ñ {{people_mapping_nearby_link}}?
+      outbox: Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ðµ
+      people_mapping_nearby: Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸
+      subject: Ð¢ÐµÐ¼Ð°
+      title: ÐÑÐ¾Ð´ÑÑÐ¸Ðµ
+      you_have: Ð£ Ð²Ð°Ñ {{new_count}} Ð½Ð¾Ð²ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð¸ {{old_count}} ÑÑÐ°ÑÑÑ
+    mark: 
+      as_read: Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ
+      as_unread: Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ
+    message_summary: 
+      delete_button: Ð£Ð´Ð°Ð»Ð¸ÑÑ
+      read_button: ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ
+      reply_button: ÐÑÐ²ÐµÑÐ¸ÑÑ
+      unread_button: ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ
+    new: 
+      back_to_inbox: ÐÐ°Ð·Ð°Ð´ ÐºÐ¾ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¼
+      body: "Ð¢ÐµÐºÑÑ:"
+      message_sent: Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾
+      send_button: ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ
+      send_message_to: ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ {{name}}
+      subject: "Ð¢ÐµÐ¼Ð°:"
+      title: ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ
+    no_such_user: 
+      body: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ ÑÐ°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¸Ð»Ð¸ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ¾Ð¼
+      heading: ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ/ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ
+      title: ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ/ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ
+    outbox: 
+      date: ÐÐ°ÑÐ°
+      inbox: Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ
+      my_inbox: ÐÐ¾Ð¸ {{inbox_link}}
+      no_sent_messages: ÐÐµÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹. ÐÐ¾ÑÐµÐ¼Ñ Ð±Ñ Ð½Ðµ Ð¿Ð¾Ð¾Ð±ÑÐ°ÑÑÑÑ Ñ {{people_mapping_nearby_link}}?
+      outbox: Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ðµ
+      people_mapping_nearby: Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸
+      subject: Ð¢ÐµÐ¼Ð°
+      title: ÐÑÑÐ¾Ð´ÑÑÐ¸Ðµ
+      to: ÐÐ¾Ð¼Ñ
+      you_have_sent_messages: ÐÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð»Ð¸ {{sent_count}} ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹
+    read: 
+      back_to_inbox: ÐÐ°Ð·Ð°Ð´ ÐºÐ¾ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¼
+      back_to_outbox: ÐÐ°Ð·Ð°Ð´ Ðº Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ð¼
+      date: ÐÐ°ÑÐ°
+      from: ÐÑ
+      reading_your_messages: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ
+      reading_your_sent_messages: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ
+      reply_button: ÐÑÐ²ÐµÑÐ¸ÑÑ
+      subject: Ð¢ÐµÐ¼Ð°
+      title: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ
+      to: "ÐÐ¾Ð¼Ñ:"
+      unread_button: ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ
+    sent_message_summary: 
+      delete_button: Ð£Ð´Ð°Ð»Ð¸ÑÑ
+  notifier: 
+    diary_comment_notification: 
       banner1: "* ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°Ð¹ÑÐµ Ð½Ð° ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ. *"
       banner2: "* ÐÐ»Ñ Ð¾ÑÐ²ÐµÑÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
-      hi: "ÐÑÐ¸Ð²ÐµÑ, {{to_user}},"
+      footer: ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ â {{readurl}}, Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ²Ð¾Ð¹ â {{commenturl}} Ð¸Ð»Ð¸ Ð¾ÑÐ²ÐµÑÐ¸ÑÑ â {{replyurl}}
       header: "{{from_user}} Ð¿ÑÐ¾ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð» Ð²Ð°ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ Ð½Ð° OpenStreetMap Ñ ÑÐµÐ¼Ð¾Ð¹ {{subject}}:"
-      footer: "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ - {{readurl}}, Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ²Ð¾Ð¹ - {{commenturl}} Ð¸Ð»Ð¸ Ð¾ÑÐ²ÐµÑÐ¸ÑÑ - {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} Ð¿ÑÐ¸ÑÐ»Ð°Ð» Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
-      banner1: "* ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°Ð¹ÑÐµ Ð½Ð° ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ. *"
-      banner2: "* ÐÐ»Ñ Ð¾ÑÐ²ÐµÑÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
-      hi: "ÐÑÐ¸Ð²ÐµÑ, {{to_user}},"
-      header: "{{from_user}} Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð» Ð²Ð°Ð¼ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ ÑÐµÐ¼Ð¾Ð¹ {{subject}} ÑÐµÑÐµÐ· OpenStreetMap:"
-      footer1: "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ - {{readurl}}"
-      footer2: "Ð¸ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÐ²ÐµÑÐ¸ÑÑ Ð½Ð° {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} Ð´Ð¾Ð±Ð°Ð²Ð¸Ð» Ð²Ð°Ñ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ²Ð¾Ð¸Ñ Ð´ÑÑÐ·ÐµÐ¹"
+      hi: ÐÑÐ¸Ð²ÐµÑ, {{to_user}},
+      subject: "[OpenStreetMap] {{user}} Ð¾ÑÑÐ°Ð²Ð¸Ð» ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð² Ð²Ð°ÑÐµÐ¼ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐµ"
+    email_confirm: 
+      subject: "[OpenStreetMap] ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ"
+    email_confirm_html: 
+      click_the_link: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ.
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,
+      hopefully_you: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð² {{server_url}} Ð½Ð° Ð°Ð´ÑÐµÑ: {{new_address}}."
+    email_confirm_plain: 
+      click_the_link: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ.
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,
+      hopefully_you_1: ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð²
+      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐµÑ: {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} Ð´Ð¾Ð±Ð°Ð²Ð¸Ð» Ð²Ð°Ñ Ð² Ð´ÑÑÐ·ÑÑ Ð½Ð° OpenStreetMap."
       see_their_profile: "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð½ÐµÐ¼ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ: {{userurl}} Ð¸ ÑÐ¾Ð¶Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÐ³Ð¾ Ð² Ð´ÑÑÐ·ÑÑ."
-    gpx_notification:
-      greeting: "ÐÑÐ¸Ð²ÐµÑ,"
-      your_gpx_file: "Ð­ÑÐ¾ Ð²ÑÐ³Ð»ÑÐ´Ð¸Ñ ÐºÐ°Ðº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX"
-      with_description: "Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼"
-      and_the_tags: "Ð¸ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¼Ð¸ ÑÐµÐ³Ð°Ð¼Ð¸:"
-      and_no_tags: "Ð¸ Ð±ÐµÐ· ÑÐµÐ³Ð¾Ð²."
-      failure:
-        subject: "[OpenStreetMap] Ð¡Ð±Ð¾Ð¹ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° GPX"
+      subject: "[OpenStreetMap] {{user}} Ð´Ð¾Ð±Ð°Ð²Ð¸Ð» Ð²Ð°Ñ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ²Ð¾Ð¸Ñ Ð´ÑÑÐ·ÐµÐ¹"
+    gpx_notification: 
+      and_no_tags: Ð¸ Ð±ÐµÐ· Ð¼ÐµÑÐ¾Ðº.
+      and_the_tags: "Ð¸ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¼Ð¸ Ð¼ÐµÑÐºÐ°Ð¼Ð¸:"
+      failure: 
         failed_to_import: "ÑÐ±Ð¾Ð¹ Ð¸Ð¼Ð¿Ð¾ÑÑÐ°. ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ°:"
-        more_info_1: "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ±Ð¾Ðµ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° GPX Ð¸ Ð¾ ÑÐ¾Ð¼, ÐºÐ°Ðº Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ"
-        more_info_2: "ÑÐ±Ð¾Ð¹,  Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ Ð·Ð´ÐµÑÑ: "
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        more_info_1: ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ±Ð¾Ðµ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° GPX Ð¸ Ð¾ ÑÐ¾Ð¼, ÐºÐ°Ðº Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ
+        more_info_2: "ÑÐ±Ð¾Ð¹,  Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ Ð·Ð´ÐµÑÑ:"
+        subject: "[OpenStreetMap] Ð¡Ð±Ð¾Ð¹ Ð¸Ð¼Ð¿Ð¾ÑÑÐ° GPX"
+      greeting: ÐÑÐ¸Ð²ÐµÑ,
+      success: 
+        loaded_successfully: "ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð¾ {{trace_points}} ÑÐ¾ÑÐµÐº Ð¸Ð·\n{{possible_points}} Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½ÑÑ."
         subject: "[OpenStreetMap] ÐÐ¼Ð¿Ð¾ÑÑ GPX Ð¿ÑÐ¾ÑÑÐ» ÑÑÐ¿ÐµÑÐ½Ð¾"
-        loaded_successfully: " |"
-    signup_confirm:
+      with_description: Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼
+      your_gpx_file: Ð­ÑÐ¾ Ð²ÑÐ³Ð»ÑÐ´Ð¸Ñ ÐºÐ°Ðº Ð²Ð°Ñ ÑÐ°Ð¹Ð» GPX
+    lost_password: 
+      subject: "[OpenStreetMap] ÐÐ°Ð¿ÑÐ¾Ñ Ð½Ð° ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
+    lost_password_html: 
+      click_the_link: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,
+      hopefully_you: ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð» ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð° openstreetmap.org.
+    lost_password_plain: 
+      click_the_link: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ.
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,
+      hopefully_you_1: ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð» ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾
+      hopefully_you_2: Ð°Ð´ÑÐµÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð° openstreetmap.org.
+    message_notification: 
+      banner1: "* ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°Ð¹ÑÐµ Ð½Ð° ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ. *"
+      banner2: "* ÐÐ»Ñ Ð¾ÑÐ²ÐµÑÐ° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÐ°Ð¹Ñ OpenStreetMap. *"
+      footer1: ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ â {{readurl}}
+      footer2: Ð¸ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÐ²ÐµÑÐ¸ÑÑ Ð½Ð° {{replyurl}}
+      header: "{{from_user}} Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð» Ð²Ð°Ð¼ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ ÑÐµÐ¼Ð¾Ð¹ {{subject}} ÑÐµÑÐµÐ· OpenStreetMap:"
+      hi: ÐÑÐ¸Ð²ÐµÑ, {{to_user}},
+      subject: "[OpenStreetMap] {{user}} Ð¿ÑÐ¸ÑÐ»Ð°Ð» Ð²Ð°Ð¼ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
+    signup_confirm: 
       subject: "[OpenStreetMap] ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ"
-    signup_confirm_plain:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ!"
-      hopefully_you: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÐ» ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð°"
-      click_the_link_1: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ Ð²Ñ â Ð´Ð¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ! ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ"
-      click_the_link_2: "ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ Ð¸ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑÐµ Ð¾Ð± OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ Ð²Ñ â Ð´Ð¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ! ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ Ð¸ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± OpenStreetMap
+      current_user: "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð½Ð° Ð¸Ñ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸, Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð·Ð´ÐµÑÑ: <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Category:Users_by_geographical_region</a>."
+      get_reading: Ð£Ð·Ð½Ð°Ð¹ÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð¾Ð± OpenStreetMap Ð² <a href="http://wiki.openstreetmap.org/wiki/Ru:Beginners_Guide">Ð²Ð¸ÐºÐ¸</p> Ð¸Ð»Ð¸ <a href="http://www.opengeodata.org/">Ð±Ð»Ð¾Ð³Ðµ OpenGeoData</a>, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ ÐµÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ»ÑÑÐ°ÑÑ <a href="http://www.opengeodata.org/?cat=13">Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ</a>!
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ!
+      hopefully_you: ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÐ» ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð°
+      introductory_video: ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ {{introductory_video_link}}.
+      more_videos: ÐÐ¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ {{more_videos_link}}.
+      more_videos_here: Ð±Ð¾Ð»ÑÑÐµ Ð²Ð¸Ð´ÐµÐ¾ Ð·Ð´ÐµÑÑ
+      user_wiki_page: Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ²Ð¾Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÑÑ Ð²Ð¸ÐºÐ¸-ÑÑÑÐ°Ð½Ð¸ÑÑ, Ð²ÐºÐ»ÑÑÐ¸Ð² Ð² Ð½ÐµÑ Ð¼ÐµÑÐºÐ¸ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¹, Ð¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ñ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Moscow">[[Category:Users_in_Moscow]]</a>.
+      video_to_openstreetmap: Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²Ð¸Ð´ÐµÐ¾ Ð¾Ð± OpenStreetMap
+      wiki_signup: ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Ru:Main_Page">Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð² Ð²Ð¸ÐºÐ¸ OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: ÐÑÐ»Ð¸ ÑÑÐ¾ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ Ð²Ñ â Ð´Ð¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ! ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ
+      click_the_link_2: ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ Ð¸ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÑ Ð±Ð¾Ð»ÑÑÐµ Ð¾Ð± OpenStreetMap.
+      current_user_1: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð½Ð° Ð¸Ñ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ð¸,
+      current_user_2: "Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð·Ð´ÐµÑÑ:"
+      greeting: ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ!
+      hopefully_you: ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÐ» ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð°
       introductory_video: "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²Ð¸Ð´ÐµÐ¾ Ð¾Ð± OpenStreetMap Ð·Ð´ÐµÑÑ:"
       more_videos: "ÐÐ´ÐµÑÑ ÐµÑÑ Ð±Ð¾Ð»ÑÑÐµ Ð²Ð¸Ð´ÐµÐ¾:"
-      the_wiki: "ÐÐ¾ÑÐ¸ÑÐ°ÑÑ Ð¾Ð± OpenStreetMap Ð½Ð° wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide"
       opengeodata: "OpenGeoData.org â ÑÑÐ¾ Ð±Ð»Ð¾Ð³ OpenStreetMap, Ð° ÐµÑÑ ÐµÑÑÑ Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ:"
-      wiki_signup: "ÐÑ ÑÐ°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð½Ð° OpenStreetMap wiki Ð·Ð´ÐµÑÑ:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page"
-      user_wiki_1: "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ²Ð¾Ñ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ, Ð²ÐºÐ»ÑÑÐ¸Ð² Ð² Ð½ÐµÑ"
-      user_wiki_2: "ÑÐµÐ³ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¸, Ð¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ð¹ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ: [[Category:Users_in_Moscow]]."
-      current_user_1: "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð½Ð° Ð¸Ñ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ð¸,"
-      current_user_2: "Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð·Ð´ÐµÑÑ:"
-    signup_confirm_html:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ!"
-      hopefully_you: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÐ» ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð½Ð°"
-      click_the_link: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ Ð²Ñ â Ð´Ð¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ! ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ Ð¸ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± OpenStreetMap"
-      introductory_video: "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÑÑ {{introductory_video_link}}."
-      video_to_openstreetmap: "Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²Ð¸Ð´ÐµÐ¾ Ð¾Ð± OpenStreetMap"
-      more_videos: "ÐÐ¾ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ {{more_videos_link}}."
-      more_videos_here: "Ð±Ð¾Ð»ÑÑÐµ Ð²Ð¸Ð´ÐµÐ¾ Ð·Ð´ÐµÑÑ"
-      get_reading: 'Ð£Ð·Ð½Ð°Ð¹ÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð¾Ð± OpenStreetMap Ð² <a href="http://wiki.openstreetmap.org/wiki/Ru:Beginners_Guide">ÐÐ¸ÐºÐ¸</p> Ð¸Ð»Ð¸ Ð½Ð° <a href="http://www.opengeodata.org/">Ð±Ð»Ð¾Ð³Ðµ OpenGeoData</a>, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ ÐµÑÐµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ»ÑÑÐ°ÑÑ <a href="http://www.opengeodata.org/?cat=13">Ð¿Ð¾Ð´ÐºÐ°ÑÑÑ</a>!'
-      wiki_signup: 'ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Ru:Main_Page">Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð½Ð° ÐÐ¸ÐºÐ¸ OpenStreetMap</a>.'
-      user_wiki_page: 'Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ²Ð¾Ñ ÑÑÑÐ°Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ, Ð²ÐºÐ»ÑÑÐ¸Ð² Ð² Ð½ÐµÑ ÑÐµÐ³ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¸, Ð¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ð¹ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Moscow">[[Category:Users_in_Moscow]]</a>.'
-      current_user: 'Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð½Ð° Ð¸Ñ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸, Ð´Ð¾ÑÑÑÐ¿ÐµÐ½ Ð·Ð´ÐµÑÑ: <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ"
-    email_confirm_plain:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,"
-      hopefully_you_1: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð²  "
-      hopefully_you_2: "{{server_url}} Ð½Ð° Ð°Ð´ÑÐµÑ: {{new_address}}."
-      click_the_link: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ."
-    email_confirm_html:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ, "
-      hopefully_you: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) ÑÐ¾ÑÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð² {{server_url}} Ð½Ð° Ð°Ð´ÑÐµÑ: {{new_address}}."
-      click_the_link: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, ÑÐ¾ Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ."
-    lost_password:
-      subject: "[OpenStreetMap] ÐÐ°Ð¿ÑÐ¾Ñ Ð½Ð° ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
-    lost_password_plain:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,"
-      hopefully_you_1: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð» ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾"
-      hopefully_you_2: "Ð°Ð´ÑÐµÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð° openstreetmap.org."
-      click_the_link: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
-    lost_password_html:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,"
-      hopefully_you: "ÐÑÐ¾-ÑÐ¾ (Ð½Ð°Ð´ÐµÐµÐ¼ÑÑ, ÑÑÐ¾ Ð²Ñ) Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð» ÑÐ¼ÐµÐ½Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ, Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð° openstreetmap.org."
-      click_the_link: "ÐÑÐ»Ð¸ ÑÑÐ¾ Ð²Ñ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ, ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ ÑÐ¼ÐµÐ½Ð¸ÑÑ Ð²Ð°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ."
-    reset_password:
-      subject: "[OpenStreetMap] Ð¡Ð¼ÐµÐ½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ"
-    reset_password_plain:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,"
-      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð·Ð°Ð¼ÐµÐ½ÑÐ½ Ð½Ð° {{new_password}}"
-    reset_password_html:
-      greeting: "ÐÐ´ÑÐ°Ð²ÑÑÐ²ÑÐ¹ÑÐµ,"
-      reset: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð·Ð°Ð¼ÐµÐ½ÑÐ½ Ð½Ð° {{new_password}}"
-  message:
-    inbox:
-      title: "ÐÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      my_inbox: "ÐÐ¾Ð¸ Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      outbox: "Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      you_have: "Ð£ Ð²Ð°Ñ {{new_count}} Ð½Ð¾Ð²ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹ Ð¸ {{old_count}} ÑÑÐ°ÑÑÑ"
-      from: "ÐÑ"
-      subject: "Ð¢ÐµÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      no_messages_yet: "ÐÐµÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹. ÐÐ¾ÑÐµÐ¼Ñ Ð±Ñ Ð½Ðµ Ð¿Ð¾Ð¾Ð±ÑÐ°ÑÑÑÑ Ñ {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸"
-    message_summary:
-      unread_button: "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ"
-      read_button: "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ"
-      reply_button: "ÐÑÐ²ÐµÑÐ¸ÑÑ"
-    new:
-      title: "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
-      send_message_to: "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ {{name}}"
-      subject: "Ð¢ÐµÐ¼Ð°:"
-      body: "Ð¢ÐµÐºÑÑ:"
-      send_button: "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ"
-      back_to_inbox: "ÐÐ°Ð·Ð°Ð´ ÐºÐ¾ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¼"
-      message_sent: "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾"
-    no_such_user:
-      title: "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ/ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
-      heading: "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ/ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
-      body: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ ÑÐ°ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¸Ð»Ð¸ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾ÑÐ¾Ð¼"
-    outbox:
-      title: "ÐÑÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      my_inbox: "ÐÐ¾Ð¸ {{inbox_link}}"
-      inbox: "Ð²ÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      outbox: "Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ðµ"
-      you_have_sent_messages: "ÐÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð»Ð¸ {{sent_count}} ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹"
-      to: "ÐÐ¾Ð¼Ñ"
-      subject: "Ð¢ÐµÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      no_sent_messages: "ÐÐµÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹. ÐÐ¾ÑÐµÐ¼Ñ Ð±Ñ Ð½Ðµ Ð¿Ð¾Ð¾Ð±ÑÐ°ÑÑÑÑ Ñ {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸ Ð¿Ð¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸"
-    read:
-      title: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
-      reading_your_messages: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
-      from: "ÐÑ"
-      subject: "Ð¢ÐµÐ¼Ð°"
-      date: "ÐÐ°ÑÐ°"
-      reply_button: "ÐÑÐ²ÐµÑÐ¸ÑÑ"
-      unread_button: "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ"
-      back_to_inbox: "ÐÐ°Ð·Ð°Ð´ ÐºÐ¾ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¼"
-      reading_your_sent_messages: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ"
-      to: "ÐÐ¾Ð¼Ñ:"
-      back_to_outbox: "ÐÐ°Ð·Ð°Ð´ Ðº Ð¸ÑÑÐ¾Ð´ÑÑÐ¸Ð¼"
-    mark:
-      as_read: "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ"
-      as_unread: "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾ ÐºÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ"
-  site:
-    index:
-      js_1: "ÐÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸Ð»Ð¸ Ð¾ÑÐºÐ»ÑÑÐµÐ½ JavaScript."
-      js_2: "OpenStreetMap Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ JavaScript Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°ÑÑ."
-      js_3: 'ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÐ¸ÑÐ½ÑÑ ÐºÐ°ÑÑÑ Ð¾Ñ Tiles@Home</a>, ÐµÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÐºÐ»ÑÑÐ¸ÑÑ JavaScript.'
-      permalink: ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð°Ñ ÑÑÑÐ»ÐºÐ°
-      license:
-        notice: "ÐÐ°ÑÐ¸ÑÐµÐ½Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ {{license_name}} Ð¿ÑÐ¾ÐµÐºÑÐ¾Ð¼ {{project_name}} Ð¸ ÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "ÐÑ Ð½Ðµ ÑÐ´ÐµÐ»Ð°Ð»Ð¸ ÑÐ²Ð¾Ð¸ Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼Ð¸."
-      not_public_description: "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ Ð²Ð°ÑÐ¸ Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼Ð¸ Ð·Ð´ÐµÑÑ {{user_page}}."
+      the_wiki: "ÐÐ¾ÑÐ¸ÑÐ°ÑÑ Ð¾Ð± OpenStreetMap Ð² Ð²Ð¸ÐºÐ¸:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners_Guide
+      user_wiki_1: Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ²Ð¾Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÑÑ Ð²Ð¸ÐºÐ¸-ÑÑÑÐ°Ð½Ð¸ÑÑ, Ð²ÐºÐ»ÑÑÐ¸Ð² Ð² Ð½ÐµÑ
+      user_wiki_2: Ð¼ÐµÑÐºÐ¸ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ð¹, Ð¾Ð¿Ð¸ÑÑÐ²Ð°ÑÑÐ¸Ñ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, [[Category:Users_in_Moscow]].
+      wiki_signup: "ÐÑ ÑÐ°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð² Ð²Ð¸ÐºÐ¸ OpenStreetMap Ð·Ð´ÐµÑÑ:"
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=RU%3AMain_Page
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: ÑÐ¸ÑÐ°ÑÑ Ð²Ð°ÑÐ¸ ÑÐ°ÑÑÐ½ÑÐµ GPS-ÑÑÐµÐºÐ¸
+      allow_read_prefs: ÑÐ¸ÑÐ°ÑÑ Ð²Ð°ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      allow_to: "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÑÐºÐ¾Ð¼Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ:"
+      allow_write_api: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ ÐºÐ°ÑÑÑ
+      allow_write_diary: ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÑÑ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸, ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸, ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð´ÑÑÐ·ÐµÐ¹
+      allow_write_gpx: Ð·Ð°ÐºÐ°ÑÐ¸Ð²Ð°ÑÑ GPS-ÑÑÐµÐºÐ¸
+      allow_write_prefs: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð²Ð°ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      request_access: ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ {{app_name}} Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð´Ð¾ÑÑÑÐ¿ Ðº Ð²Ð°ÑÐµÐ¹ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¶ÐµÐ»Ð°ÐµÑÐµ Ð»Ð¸ Ð²Ñ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ»Ð¾ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÑÐ±ÑÐ°ÑÑ Ð»ÑÐ±Ð¾Ðµ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾.
+    revoke: 
+      flash: ÐÑ Ð¾ÑÐ¾Ð·Ð²Ð°Ð»Ð¸ ÑÐ¾ÐºÐµÐ½ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ {{application}}
+  oauth_clients: 
+    create: 
+      flash: ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð°
+    destroy: 
+      flash: Ð£Ð½Ð¸ÑÑÐ¾Ð¶ÐµÐ½Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ ÐºÐ»Ð¸ÐµÐ½ÑÑÐºÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+    edit: 
+      submit: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ
+      title: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð²Ð°ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
+    form: 
+      allow_read_gpx: ÑÐ¸ÑÐ°ÑÑ Ð¸Ñ ÑÐ°ÑÑÐ½ÑÐµ GPS-ÑÑÐµÐºÐ¸
+      allow_read_prefs: ÑÐ¸ÑÐ°ÑÑ Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      allow_write_api: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ ÐºÐ°ÑÑÑ
+      allow_write_diary: ÑÐ¾Ð·Ð´Ð°ÑÑ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸, ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸, ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð´ÑÑÐ·ÐµÐ¹
+      allow_write_gpx: Ð·Ð°ÐºÐ°ÑÐ¸Ð²Ð°ÑÑ GPS-ÑÑÐµÐºÐ¸
+      allow_write_prefs: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      callback_url: URL Ð¾Ð±ÑÐ°ÑÐ½Ð¾Ð³Ð¾ Ð²ÑÐ·Ð¾Ð²Ð°
+      name: ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ
+      requests: "ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÑ Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ:"
+      required: Ð¢ÑÐµÐ±ÑÐµÑÑÑ
+      support_url: URL Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¸
+      url: ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ URL Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+    index: 
+      application: ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+      issued_at: ÐÑÐ´Ð°Ð½ Ð²
+      list_tokens: "Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ðµ ÑÐ¾ÐºÐµÐ½Ñ Ð±ÑÐ»Ð¸ Ð²ÑÐ¿ÑÑÐµÐ½Ñ Ð´Ð»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð½Ð° Ð²Ð°ÑÐµ Ð¸Ð¼Ñ:"
+      my_apps: ÐÐ¾Ð¸ ÐºÐ»Ð¸ÐµÐ½ÑÑÐºÐ¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+      my_tokens: ÐÐ¾Ð¸ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+      no_apps: ÐÑÑÑ Ð»Ð¸ Ñ Ð²Ð°Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð±Ñ Ð²Ñ ÑÐ¾ÑÐµÐ»Ð¸ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ñ Ð½Ð°Ð¼Ð¸ ÑÐµÑÐµÐ· ÑÑÐ°Ð½Ð´Ð°ÑÑ {{oauth}}? ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð²Ð°ÑÐµ Ð²ÐµÐ±-Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ´ ÑÐµÐ¼, ÐºÐ°Ðº Ð¾Ð½Ð¾ ÑÐ¼Ð¾Ð¶ÐµÑ ÑÐ´ÐµÐ»Ð°ÑÑ OAuth-Ð·Ð°Ð¿ÑÐ¾Ñ Ðº ÑÑÐ¾Ð¹ ÑÐ»ÑÐ¶Ð±Ðµ.
+      register_new: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð²Ð°ÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
+      registered_apps: "Ð£ Ð²Ð°Ñ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ñ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ»Ð¸ÐµÐ½ÑÑÐºÐ¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ:"
+      revoke: ÐÑÐ¾Ð·Ð²Ð°ÑÑ!
+      title: ÐÐ¾Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ OAuth
+    new: 
+      submit: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ
+      title: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð½Ð¾Ð²Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
+    not_found: 
+      sorry: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, ÑÑÐ¾Ñ {{type}} Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð½Ð°Ð¹Ð´ÐµÐ½.
+    show: 
+      access_url: "URL ÑÐ¾ÐºÐµÐ½Ð° Ð´Ð¾ÑÑÑÐ¿Ð°:"
+      allow_read_gpx: ÑÐ¸ÑÐ°ÑÑ Ð¸Ñ ÑÐ°ÑÑÐ½ÑÐµ GPS-ÑÑÐµÐºÐ¸
+      allow_read_prefs: ÑÐ¸ÑÐ°ÑÑ Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      allow_write_api: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ ÐºÐ°ÑÑÑ
+      allow_write_diary: ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÑÑ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ¾Ð²ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸, ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸, ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð´ÑÑÐ·ÐµÐ¹
+      allow_write_gpx: Ð·Ð°ÐºÐ°ÑÐ¸Ð²Ð°ÑÑ GPS-ÑÑÐµÐºÐ¸
+      allow_write_prefs: Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      authorize_url: "ÐÐ²ÑÐ¾ÑÐ¸Ð·ÑÑÑÐ¸Ð¹ URL:"
+      edit: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸
+      key: "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÐºÐ»ÑÑ:"
+      requests: "ÐÐ°Ð¿ÑÐ¾Ñ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ð¹ ÑÐ¾ ÑÑÐ¾ÑÐ¾Ð½Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
+      secret: "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑÐºÐ¸Ð¹ ÑÐµÐºÑÐµÑ:"
+      support_notice: ÐÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ HMAC-SHA1 (ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ) Ð¸ Ð¾Ð±ÑÑÐ½ÑÐ¹ ÑÐµÐºÑÑ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ SSL.
+      title: ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ OAuth Ð´Ð»Ñ {{app_name}}
+      url: "URL ÑÐ¾ÐºÐµÐ½Ð° Ð·Ð°Ð¿ÑÐ¾ÑÐ°:"
+    update: 
+      flash: ÐÐ»Ð¸ÐµÐ½ÑÑÐºÐ°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°
+  site: 
+    edit: 
+      anon_edits_link_text: ÐÑÑÑÐ½Ð¸ÑÑ, Ð² ÑÑÐ¼ Ð´ÐµÐ»Ð¾.
+      flash_player_required: ÐÐ»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Potlatch Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Flash-Ð¿Ð»ÐµÐµÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Flash-Ð¿Ð»ÐµÐµÑ Ñ Adobe.com</a>. Ð¡ÑÑÐµÑÑÐ²ÑÑÑ Ð¸ <a href="http://wiki.openstreetmap.org/wiki/Editing">Ð´ÑÑÐ³Ð¸Ðµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ</a> ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ OpenStreetMap.
+      not_public: ÐÑ Ð½Ðµ ÑÐ´ÐµÐ»Ð°Ð»Ð¸ ÑÐ²Ð¾Ð¸ Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐ¼Ð¸.
+      not_public_description: "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð±Ð¾Ð»ÑÑÐµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°ÑÑÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´ÐµÐ»Ð°ÑÑ Ð²Ð°ÑÐ¸ Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐ¼Ð¸ Ð·Ð´ÐµÑÑ: {{user_page}}."
+      potlatch_unsaved_changes: ÐÐ¼ÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÑÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. (ÐÐ»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð² Potlatch ÑÐ½Ð¸Ð¼Ð¸ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ Ð¿ÑÑÐ¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐºÐ¸, ÐµÑÐ»Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÑÐµ Ð² Â«Ð¶Ð¸Ð²Ð¾Ð¼Â» ÑÐµÐ¶Ð¸Ð¼Ðµ, Ð»Ð¸Ð±Ð¾ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Â«ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑÂ», ÐµÑÐ»Ð¸ Ð²Ñ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ Ð¾ÑÐ»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ.)
       user_page_link: ÑÑÑÐ°Ð½Ð¸ÑÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "ÐÑÑÑÐ½Ð¸ÑÑ, Ð² ÑÐµÐ¼ Ð´ÐµÐ»Ð¾."
-      flash_player_required: 'ÐÐ»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Potlatch Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Flash-Ð¿Ð»ÐµÐµÑ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Flash-Ð¿Ð»ÐµÐµÑ Ñ Adobe.com</a>. Ð¡ÑÑÐµÑÑÐ²ÑÑÑ Ð¸ <a href="http://wiki.openstreetmap.org/wiki/Editing">Ð´ÑÑÐ³Ð¸Ðµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ</a> ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ OpenStreetMap.'
-      potlatch_unsaved_changes: "ÐÐ¼ÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. (ÐÐ»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð² Potlatch ÑÐ½Ð¸Ð¼Ð¸ÑÐµ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñ Ð¿ÑÑÐ¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐºÐ¸, ÐµÑÐ»Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÑÐµÑÐµ Ð² Â«Ð¶Ð¸Ð²Ð¾Ð¼Â» ÑÐµÐ¶Ð¸Ð¼Ðµ, Ð»Ð¸Ð±Ð¾ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Â«ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑÂ», ÐµÑÐ»Ð¸ Ð²Ñ Ð² ÑÐµÐ¶Ð¸Ð¼Ðµ Ð¾ÑÐ»Ð¾Ð¶ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ.)"
-    sidebar:
-      search_results: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¿Ð¾Ð¸ÑÐºÐ°
-      close: ÐÐ°ÐºÑÑÑÑ
-    search:
+    index: 
+      js_1: ÐÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð¸Ð»Ð¸ Ð¾ÑÐºÐ»ÑÑÐµÐ½ JavaScript.
+      js_2: OpenStreetMap Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ JavaScript Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°ÑÑ.
+      js_3: ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ <a href="http://tah.openstreetmap.org/Browse/">ÑÑÐ°ÑÐ¸ÑÐ½ÑÑ ÐºÐ°ÑÑÑ Ð¾Ñ Tiles@Home</a>, ÐµÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÐºÐ»ÑÑÐ¸ÑÑ JavaScript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: ÐÐ¸ÑÐµÐ½Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ {{license_name}} Ð¿ÑÐ¾ÐµÐºÑÐ¾Ð¼ {{project_name}} Ð¸ ÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼Ð¸.
+        project_name: OpenStreetMap
+      permalink: ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð°Ñ ÑÑÑÐ»ÐºÐ°
+      shortlink: ÐÐ¾ÑÐ¾ÑÐºÐ°Ñ ÑÑÑÐ»ÐºÐ°
+    key: 
+      map_key: ÐÐµÐ³ÐµÐ½Ð´Ð°
+      map_key_tooltip: ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ ÑÐµÐ½Ð´ÐµÑÐ¸Ð½Ð³Ð° mapnik Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÐ¾Ð²Ð½Ðµ Ð¼Ð°ÑÑÑÐ°Ð±Ð°
+      table: 
+        entry: 
+          admin: ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¸Ð²Ð½Ð°Ñ Ð³ÑÐ°Ð½Ð¸ÑÐ°
+          allotments: ÐÐ³Ð¾ÑÐ¾Ð´Ñ
+          apron: 
+            - ÐÐµÑÑÐ¾Ð½ Ð°ÑÑÐ¾Ð´ÑÐ¾Ð¼Ð°
+            - ÑÐµÑÐ¼Ð¸Ð½Ð°Ð»
+          bridge: ÐÐ¸ÑÐ½Ð°Ñ Ð»Ð¸Ð½Ð¸Ñ = Ð¼Ð¾ÑÑ
+          bridleway: ÐÐ¾ÑÐ¾Ð³Ð° Ð´Ð»Ñ Ð²ÑÐ°Ð´Ð½Ð¸ÐºÐ¾Ð²
+          brownfield: ÐÐ°Ð±ÑÐ¾ÑÐµÐ½Ð½Ð°Ñ Ð·Ð¾Ð½Ð°
+          building: ÐÐ½Ð°ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð·Ð´Ð°Ð½Ð¸Ðµ
+          byway: Ð¢ÑÐ¾Ð¿Ð¸Ð½ÐºÐ°
+          cable: 
+            - ÐÐ°Ð½Ð°ÑÐ½Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+            - ÐºÑÐµÑÐµÐ»ÑÐ½ÑÐ¹ Ð¿Ð¾Ð´ÑÑÐ¼Ð½Ð¸Ðº
+          cemetery: ÐÐ»Ð°Ð´Ð±Ð¸ÑÐµ
+          centre: Ð¡Ð¿Ð¾ÑÑÐ¸Ð²Ð½ÑÐ¹ ÑÐµÐ½ÑÑ
+          commercial: ÐÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¸Ð¹ ÑÐ°Ð¹Ð¾Ð½
+          common: 
+            - ÐÐ±ÑÐµÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð·ÐµÐ¼Ð»Ñ
+            - Ð»ÑÐ³
+          construction: Ð¡ÑÑÐ¾Ð¸ÑÐµÐ»ÑÑÑÐ²Ð¾ Ð´Ð¾ÑÐ¾Ð³Ð¸
+          cycleway: ÐÐµÐ»Ð¾ÑÐ¸Ð¿ÐµÐ´Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+          destination: Ð¦ÐµÐ»ÐµÐ²Ð¾Ð¹ Ð´Ð¾ÑÑÑÐ¿
+          farm: Ð¤ÐµÑÐ¼Ð°
+          footway: ÐÐµÑÐµÑÐ¾Ð´Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð¶ÐºÐ°
+          forest: ÐÐµÑ
+          golf: ÐÐ»Ð¾ÑÐ°Ð´ÐºÐ° Ð´Ð»Ñ Ð³Ð¾Ð»ÑÑÐ°
+          heathland: ÐÑÑÑÐ¾ÑÑ
+          industrial: ÐÑÐ¾Ð¼ÑÑÐ»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð¾Ð½
+          lake: 
+            - ÐÐ·ÐµÑÐ¾
+            - Ð²Ð¾Ð´Ð¾ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ
+          military: ÐÐ¾ÐµÐ½Ð½Ð°Ñ Ð·Ð¾Ð½Ð°
+          motorway: ÐÐ²ÑÐ¾Ð¼Ð°Ð³Ð¸ÑÑÑÐ°Ð»Ñ
+          park: ÐÐ°ÑÐº
+          permissive: Ð Ð°Ð·ÑÐµÑÐ¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð´Ð¾ÑÑÑÐ¿
+          pitch: Ð¡Ð¿Ð¾ÑÑÐ¸Ð²Ð½Ð°Ñ Ð¿Ð»Ð¾ÑÐ°Ð´ÐºÐ°
+          primary: ÐÐ°Ð³Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+          private: Ð§Ð°ÑÑÐ½ÑÐ¹ Ð´Ð¾ÑÑÑÐ¿
+          rail: ÐÐµÐ»ÐµÐ·Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+          reserve: ÐÐ°Ð¿Ð¾Ð²ÐµÐ´Ð½Ð¸Ðº
+          resident: ÐÐ¸Ð»Ð¾Ð¹ ÑÐ°Ð¹Ð¾Ð½
+          retail: Ð¢Ð¾ÑÐ³Ð¾Ð²ÑÐ¹ ÑÐ°Ð¹Ð¾Ð½
+          runway: 
+            - ÐÐ·Ð»ÑÑÐ½Ð¾-Ð¿Ð¾ÑÐ°Ð´Ð¾ÑÐ½Ð°Ñ Ð¿Ð¾Ð»Ð¾ÑÐ° Ð°ÑÑÐ¾Ð¿Ð¾ÑÑÐ°
+            - ÑÑÐ»ÑÐ¶Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð¶ÐºÐ°
+          school: 
+            - Ð¨ÐºÐ¾Ð»Ð°
+            - ÑÐ½Ð¸Ð²ÐµÑÑÐ¸ÑÐµÑ
+          secondary: ÐÑÐ¾ÑÐ¾ÑÑÐµÐ¿ÐµÐ½Ð½Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+          station: ÐÐµÐ»ÐµÐ·Ð½Ð¾Ð´Ð¾ÑÐ¾Ð¶Ð½Ð°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ
+          subway: ÐÐµÑÑÐ¾
+          summit: 
+            - ÐÐµÑÑÐ¸Ð½Ð°
+            - Ð¿Ð¸Ðº
+          tourist: ÐÐ¾ÑÑÐ¾Ð¿ÑÐ¸Ð¼ÐµÑÐ°ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ
+          track: ÐÑÐ¾ÑÑÐ»Ð¾Ðº
+          tram: 
+            - ÐÐµÐ³ÐºÐ¾-ÑÐµÐ»ÑÑÐ¾Ð²ÑÐ¹ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑ
+            - ÑÑÐ°Ð¼Ð²Ð°Ð¹
+          trunk: Ð¨Ð¾ÑÑÐµ
+          tunnel: ÐÑÐ½ÐºÑÐ¸Ñ = ÑÑÐ½Ð½ÐµÐ»Ñ
+          unclassified: ÐÐ¾ÑÐ¾Ð³Ð° Ð¼ÐµÑÑÐ½Ð¾Ð³Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ
+          unsurfaced: ÐÑÑÐ½ÑÐ¾Ð²Ð°Ñ Ð´Ð¾ÑÐ¾Ð³Ð°
+          wood: Ð Ð¾ÑÐ°
+        heading: ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ Ð¼{{zoom_level}}
+    search: 
       search: ÐÐ¾Ð¸ÑÐº
-      where_am_i: "ÐÐ´Ðµ Ñ?"
-      submit_text: "->"
-      searching: "ÐÐ¾Ð¸ÑÐº..."
-      search_help: "Ð¿ÑÐ¸Ð¼ÐµÑÑ: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', Ð¸Ð»Ð¸ 'post offices near LÐ£Ðnen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Ð±Ð¾Ð»ÑÑÐµ Ð¿ÑÐ¸Ð¼ÐµÑÐ¾Ð²...</a>"
-    key:
-      map_key: "ÐÐµÐ³ÐµÐ½Ð´Ð°"
-      map_key_tooltip: "ÐÐµÐ³ÐµÐ½Ð´Ð° Ð´Ð»Ñ ÑÐµÐ½Ð´ÐµÑÐ¸Ð½Ð³Ð° mapnik Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÐ¾Ð²Ð½Ðµ Ð¼Ð°ÑÑÑÐ°Ð±Ð°"
-  trace:
-    create:
-      upload_trace: "ÐÑÐ³ÑÑÐ·Ð¸ÑÑ GPS-ÑÑÐµÐº"
-      trace_uploaded: "ÐÐ°Ñ ÑÐ°Ð¹Ð» GPX Ð±ÑÐ» Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½ Ð¸ ÑÐµÐ¹ÑÐ°Ñ Ð²Ð½Ð¾ÑÐ¸ÑÑÑ Ð² Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ. ÐÐ±ÑÑÐ½Ð¾ ÑÑÐ¾ Ð·Ð°Ð½Ð¸Ð¼Ð°ÐµÑ Ð¾Ñ Ð¼Ð¸Ð½ÑÑÑ Ð´Ð¾ Ð¿Ð¾Ð»ÑÑÐ°ÑÐ°. ÐÐ¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ð¸ Ð²Ð°Ð¼ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¸ÑÐ»Ð°Ð½Ð¾ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ."
-    edit:
+      search_help: "Ð¿ÑÐ¸Ð¼ÐµÑÑ: 'ÐÑÐ·ÑÐ¼Ð°', 'Regent Street, Cambridge', 'CB2 5AQ', Ð¸Ð»Ð¸ 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>Ð±Ð¾Ð»ÑÑÐµ Ð¿ÑÐ¸Ð¼ÐµÑÐ¾Ð²â¦</a>"
+      submit_text: ->
+      where_am_i: ÐÐ´Ðµ Ñ?
+    sidebar: 
+      close: ÐÐ°ÐºÑÑÑÑ
+      search_results: Ð ÐµÐ·ÑÐ»ÑÑÐ°ÑÑ Ð¿Ð¾Ð¸ÑÐºÐ°
+  trace: 
+    create: 
+      trace_uploaded: ÐÐ°Ñ ÑÐ°Ð¹Ð» GPX Ð±ÑÐ» Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½ Ð¸ ÑÐµÐ¹ÑÐ°Ñ Ð²Ð½Ð¾ÑÐ¸ÑÑÑ Ð² Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ. ÐÐ±ÑÑÐ½Ð¾ ÑÑÐ¾ Ð·Ð°Ð½Ð¸Ð¼Ð°ÐµÑ Ð¾Ñ Ð¼Ð¸Ð½ÑÑÑ Ð´Ð¾ Ð¿Ð¾Ð»ÑÑÐ°ÑÐ°. ÐÐ¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ð¸ Ð²Ð°Ð¼ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¸ÑÐ»Ð°Ð½Ð¾ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ.
+      upload_trace: ÐÑÐ³ÑÑÐ·Ð¸ÑÑ GPS-ÑÑÐµÐº
+    delete: 
+      scheduled_for_deletion: ÐÐ°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ
+    edit: 
+      description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:"
+      download: Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ
+      edit: Ð¿ÑÐ°Ð²Ð¸ÑÑ
       filename: "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°:"
-      uploaded_at: "ÐÐ°Ð³ÑÑÐ¶ÐµÐ½:"
+      heading: Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÐµÐºÐ° {{name}}
+      map: ÐºÐ°ÑÑÐ°
+      owner: "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ:"
       points: "Ð¢Ð¾ÑÐµÐº:"
+      save_button: Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
       start_coord: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ Ð½Ð°ÑÐ°Ð»Ð°:"
-      edit: "Ð¿ÑÐ°Ð²Ð¸ÑÑ"
-      owner: "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ:"
-      description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:"
       tags: "ÐÐµÑÐºÐ¸:"
-      save_button: "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
-    no_such_user:
-      title: "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      heading: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ"
-      body: "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð½Ð°Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÑÐ¸ÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°."
-    trace_form:
-      upload_gpx: "Ð¤Ð°Ð¹Ð» GPX"
-      description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-      tags: "ÐÐµÑÐºÐ¸"
-      public: "ÐÑÐ±Ð»Ð¸ÑÐ½ÑÐ¹?"
-      upload_button: "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ"
-      help: "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°"
-      help_url: "http://wiki.openstreetmap.org/wiki/RU:Upload"
-    trace_header:
-      see_just_your_traces: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð²Ð°ÑÐ¸ ÑÑÐµÐºÐ¸, Ð»Ð¸Ð±Ð¾ Ð²ÑÐ³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐº"
-      see_all_traces: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐµ ÑÑÐµÐºÐ¸"
-      see_your_traces: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐµ Ð²Ð°ÑÐ¸ ÑÑÐµÐºÐ¸"
-      traces_waiting: "{{count}} Ð²Ð°ÑÐ¸Ñ ÑÑÐµÐºÐ¾Ð² Ð¾Ð¶Ð¸Ð´Ð°ÐµÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÑÑÐ¸Ñ ÑÑÐµÐºÐ¾Ð², Ð° Ð¿Ð¾ÑÐ¾Ð¼ Ð²ÑÐ³ÑÑÐ¶Ð°Ð¹ÑÐµ ÐµÑÑ. Ð­ÑÐ¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐµÑÐ²ÐµÑ Ð´Ð»Ñ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹."
-    trace_optionals:
+      tags_help: ÑÐµÑÐµÐ· Ð·Ð°Ð¿ÑÑÑÑ
+      title: Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÐµÐºÐ° {{name}}
+      uploaded_at: "ÐÐ°Ð³ÑÑÐ¶ÐµÐ½:"
+      visibility: "ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ:"
+      visibility_help: Ð§ÑÐ¾ ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸Ñ?
+    list: 
+      public_traces: ÐÐ±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐµ GPS-ÑÑÐµÐºÐ¸
+      public_traces_from: ÐÐ±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐµ ÑÑÐµÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}}
+      tagged_with: " Ð¾ÑÐ¼ÐµÑÐµÐ½Ð½ÑÐµ {{tags}}"
+      your_traces: ÐÐ°ÑÐ¸ GPS-ÑÑÐµÐºÐ¸
+    make_public: 
+      made_public: Ð¢ÑÐµÐº ÑÐ´ÐµÐ»Ð°Ð½ Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐ¼
+    no_such_user: 
+      body: ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð½Ð°Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÑÐ¸ÑÐ»Ð¸, Ð½ÐµÐ²ÐµÑÐ½Ð°.
+      heading: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ
+      title: ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+    trace: 
+      ago: "{{time_in_words_ago}} Ð½Ð°Ð·Ð°Ð´"
+      by: Ð°Ð²ÑÐ¾ÑÑÑÐ²Ð°
+      count_points: "{{count}} ÑÐ¾ÑÐµÐº"
+      edit: Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ
+      edit_map: ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ°ÑÑÑ
+      in: Ð²
+      map: ÐºÐ°ÑÑÐ°
+      more: Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ
+      pending: ÐÐÐ ÐÐÐÐ¢ÐÐ
+      private: Ð§ÐÐ¡Ð¢ÐÐ«Ð
+      public: ÐÐÐ©ÐÐÐÐ¡Ð¢Ð£ÐÐÐ«Ð
+      trace_details: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÑÐµÐºÐ°
+      view_map: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÐºÐ°ÑÑÑ
+    trace_form: 
+      description: ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ
+      help: Ð¡Ð¿ÑÐ°Ð²ÐºÐ°
+      help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
+      tags: ÐÐµÑÐºÐ¸
+      tags_help: ÑÐµÑÐµÐ· Ð·Ð°Ð¿ÑÑÑÑ
+      upload_button: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ
+      upload_gpx: ÐÐ°Ð³ÑÑÐ¶ÐµÐ½Ð½ÑÐ¹ GPX-ÑÐ°Ð¹Ð»
+      visibility: ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ
+      visibility_help: Ð§ÑÐ¾ ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸Ñ?
+    trace_header: 
+      see_all_traces: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐµ ÑÑÐµÐºÐ¸
+      see_just_your_traces: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð²Ð°ÑÐ¸ ÑÑÐµÐºÐ¸, Ð¸Ð»Ð¸ Ð²ÑÐ³ÑÑÐ·Ð¸ÑÑ ÑÑÐµÐº
+      see_your_traces: ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð²ÑÐµ Ð²Ð°ÑÐ¸ ÑÑÐµÐºÐ¸
+      traces_waiting: "{{count}} Ð²Ð°ÑÐ¸Ñ ÑÑÐµÐºÐ¾Ð² Ð¾Ð¶Ð¸Ð´Ð°ÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÑÑÐ¸Ñ ÑÑÐµÐºÐ¾Ð², Ð° Ð¿Ð¾ÑÐ¾Ð¼ Ð²ÑÐ³ÑÑÐ¶Ð°Ð¹ÑÐµ ÐµÑÑ. Ð­ÑÐ¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐµÑÐ²ÐµÑ Ð´Ð»Ñ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹."
+    trace_optionals: 
       tags: "ÐÐµÑÐºÐ¸:"
-    view:
-      pending: "ÐÐÐ ÐÐÐÐ¢ÐÐ"
+    trace_paging_nav: 
+      of: Ð¸Ð·
+      showing: Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°
+    view: 
+      delete_track: Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐµÐº
+      description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:"
+      download: ÑÐºÐ°ÑÐ°ÑÑ
+      edit: Ð¿ÑÐ°Ð²Ð¸ÑÑ
+      edit_track: Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°
       filename: "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°:"
-      download: "ÑÐºÐ°ÑÐ°ÑÑ"
-      uploaded: "ÐÐ°Ð³ÑÑÐ¶ÐµÐ½:"
+      heading: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÑÐµÐºÐ° {{name}}
+      map: Ð½Ð° ÐºÐ°ÑÑÐµ
+      none: ÐÐµÑ
+      owner: "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ:"
+      pending: ÐÐÐ ÐÐÐÐ¢ÐÐ
       points: "Ð¢Ð¾ÑÐµÐº:"
       start_coordinates: "ÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÑ Ð½Ð°ÑÐ°Ð»Ð°:"
-      map: "Ð½Ð° ÐºÐ°ÑÑÐµ"
-      edit: "Ð¿ÑÐ°Ð²Ð¸ÑÑ"
-      owner: "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ:"
-      description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:"
       tags: "ÐÐµÑÐºÐ¸:"
-      none: "ÐÐµÑ"
-      make_public: "Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÑÐ¾Ñ ÑÑÐµÐº Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼ Ð±ÐµÑÑÑÐ¾ÑÐ½Ð¾"
-      edit_track: "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°"
-      delete_track: "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐµÐº"
-      viewing_trace: "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÑÐµÐºÐ° {{name}}"
-      trace_not_found: "Ð¢ÑÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½!"
-    trace_paging_nav:
-      showing: "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"
-      of: "Ð¸Ð·"
-    trace:
-      pending: "ÐÐÐ ÐÐÐÐ¢ÐÐ"
-      count_points: "{{count}} ÑÐ¾ÑÐµÐº"
-      ago: "{{time_in_words_ago}} Ð½Ð°Ð·Ð°Ð´"
-      more: "Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ"
-      trace_details: "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÑÐµÐºÐ°"
-      view_map: "Ð¡Ð¼Ð¾ÑÑÐµÑÑ ÐºÐ°ÑÑÑ"
-      edit: "Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ"
-      edit_map: "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ°ÑÑÑ"
-      public: "ÐÐ£ÐÐÐÐ§ÐÐ«Ð"
-      private: "Ð§ÐÐ¡Ð¢ÐÐ«Ð"
-      by: "Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ"
-      in: "Ð²"
-      map: "ÐºÐ°ÑÑÐ°"
-    list:
-      public_traces: "ÐÑÐ±Ð»Ð¸ÑÐ½ÑÐµ ÑÑÐµÐºÐ¸ GPS"
-      your_traces: "ÐÐ°ÑÐ¸ ÑÑÐµÐºÐ¸ GPS"
-      public_traces_from: "ÐÑÐ±Ð»Ð¸ÑÐ½ÑÐµ ÑÑÐµÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}}"
-      tagged_with: " Ð¢ÐµÐ³Ð¸ {{tags}}"
-    delete:
-      scheduled_for_deletion: "ÐÐ°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
-    make_public:
-      made_public: "Ð¢ÑÐµÐº ÑÐ´ÐµÐ»Ð°Ð½ Ð¿ÑÐ±Ð»Ð¸ÑÐ½ÑÐ¼"
-  user:
-    login:
-      title: "ÐÐ¾Ð³Ð¸Ð½"
-      heading: "ÐÐ¾Ð³Ð¸Ð½"
-      please login: "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð¾Ð¹Ð´Ð¸ÑÐµ Ð¸Ð»Ð¸ {{create_user_link}}."
-      create_account: "Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ"
-      email or username: "Email Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
+      title: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÑÐµÐºÐ° {{name}}
+      trace_not_found: Ð¢ÑÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½!
+      uploaded: "ÐÐ°Ð³ÑÑÐ¶ÐµÐ½:"
+      visibility: "ÐÐ¸Ð´Ð¸Ð¼Ð¾ÑÑÑ:"
+    visibility: 
+      identifiable: ÐÐ´ÐµÐ½ÑÐ¸ÑÐ¸ÑÐ¸ÑÑÐµÐ¼ÑÐ¹ (Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑÑÑ Ð² ÑÐ¿Ð¸ÑÐºÐµ ÑÑÐµÐºÐ¾Ð² Ð¸ Ð¿ÐµÑÑÐ¾Ð½Ð°Ð»ÑÐ½Ð¾, ÑÐ¿Ð¾ÑÑÐ´Ð¾ÑÐµÐ½Ð½ÑÐµ ÑÐ¾ÑÐºÐ¸ Ñ Ð¾ÑÐ¼ÐµÑÐºÐ°Ð¼Ð¸ Ð²ÑÐµÐ¼ÐµÐ½Ð¸)
+      private: Ð§Ð°ÑÑÐ½ÑÐ¹ (Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾, Ð½ÐµÑÐ¿Ð¾ÑÑÐ´Ð¾ÑÐµÐ½Ð½ÑÐµ ÑÐ¾ÑÐºÐ¸)
+      public: ÐÐ±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½ÑÐ¹ (Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑÑÑ Ð² ÑÐ¿Ð¸ÑÐºÐµ ÑÑÐµÐºÐ¾Ð² Ð¸ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾, Ð½ÐµÑÐ¿Ð¾ÑÑÐ´Ð¾ÑÐµÐ½Ð½ÑÐµ ÑÐ¾ÑÐºÐ¸)
+      trackable: ÐÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ (Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾, ÑÐ¿Ð¾ÑÑÐ´Ð¾ÑÐµÐ½Ð½ÑÐµ ÑÐ¾ÑÐºÐ¸ Ñ Ð¾ÑÐ¼ÐµÑÐºÐ°Ð¼Ð¸ Ð²ÑÐµÐ¼ÐµÐ½Ð¸)
+  user: 
+    account: 
+      email never displayed publicly: (Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½)
+      flash update success: ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°.
+      flash update success confirm needed: ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ²Ð¾Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð´ÑÐµÑ.
+      home location: "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ðµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ:"
+      latitude: "Ð¨Ð¸ÑÐ¾ÑÐ°:"
+      longitude: "ÐÐ¾Ð»Ð³Ð¾ÑÐ°:"
+      make edits public button: Ð¡Ð´ÐµÐ»Ð°ÑÑ Ð²ÑÐµ Ð¼Ð¾Ð¸ Ð¿ÑÐ°Ð²ÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐ¼Ð¸
+      my settings: ÐÐ¾Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      no home location: ÐÑ Ð½Ðµ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐ¸Ð»Ð¸ ÑÐ²Ð¾Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ðµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ.
+      preferred languages: "ÐÑÐµÐ´Ð¿Ð¾ÑÐ¸ÑÐ°ÐµÐ¼ÑÐµ ÑÐ·ÑÐºÐ¸:"
+      profile description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ:"
+      public editing: 
+        disabled: ÐÑÐºÐ»ÑÑÑÐ½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²Ð½Ð¾ÑÐ¸ÑÑ Ð¿ÑÐ°Ð²ÐºÐ¸, Ð²ÑÐµ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñ.
+        disabled link text: Ð¿Ð¾ÑÐµÐ¼Ñ Ñ Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð²Ð½Ð¾ÑÐ¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ?
+        enabled: ÐÐºÐ»ÑÑÐµÐ½Ð¾. ÐÐ¾Ð¶Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ. ÐÑÐ°Ð²ÐºÐ¸ Ð½Ðµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñ.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: ÑÑÐ¾ ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸Ñ?
+        heading: "ÐÑÐ±Ð»Ð¸ÑÐ½Ð¾Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ:"
+      return to profile: ÐÐ¾Ð·Ð²ÑÐ°Ñ Ðº Ð¿ÑÐ¾ÑÐ¸Ð»Ñ
+      save changes button: Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
+      title: ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      update home location on click: ÐÐ±Ð½Ð¾Ð²Ð»ÑÑÑ Ð¼Ð¾Ñ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, ÐºÐ¾Ð³Ð´Ð° Ñ Ð½Ð°Ð¶Ð¸Ð¼Ð°Ñ Ð½Ð° ÐºÐ°ÑÑÑ?
+    confirm: 
+      button: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ
+      failure: Ð£ÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ ÑÐ°ÐºÐ¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ ÑÐ¶Ðµ Ð±ÑÐ»Ð° Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°Ð½Ð° ÑÐ°Ð½ÐµÐµ.
+      heading: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+      press confirm button: ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð²Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ.
+      success: ÐÐ°ÑÐ° ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð°, ÑÐ¿Ð°ÑÐ¸Ð±Ð¾ Ð·Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ!
+    confirm_email: 
+      button: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ
+      failure: ÐÐ´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ ÑÐ¶Ðµ Ð±ÑÐ» Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½ ÑÑÐ¸ ÑÐ¾ÐºÐµÐ½Ð¾Ð¼.
+      heading: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ
+      press confirm button: ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ.
+      success: ÐÐ°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½, ÑÐ¿Ð°ÑÐ¸Ð±Ð¾ Ð·Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ!
+    friend_map: 
+      nearby mapper: "ÐÐ»Ð¸Ð¶Ð°Ð¹ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: [[nearby_user]]"
+      your location: ÐÐ°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
+    go_public: 
+      flash success: ÐÑÐµ Ð²Ð°ÑÐ¸ Ð¿ÑÐ°Ð²ÐºÐ¸ ÑÐµÐ¿ÐµÑÑ Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ñ, Ð¸ Ð²Ñ ÑÐµÐ¿ÐµÑÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ.
+    login: 
+      account not active: ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð²Ð°ÑÐ° ÑÑÑÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ ÐµÑÑ Ð½Ðµ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°Ð½Ð°.<br />Ð§ÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐµÑ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð²Ð°Ñ Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÑÑÐ¸Ðº Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ»ÐºÑ Ð² Ð¿Ð¸ÑÑÐ¼Ðµ Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ Ð¾ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ð¸.
+      auth failure: ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð²ÑÐ¾Ð´ Ñ ÑÑÐ¸Ð¼Ð¸ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¸Ð»Ð¸ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½.
+      create_account: Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ
+      email or username: "Ð­Ð». Ð¿Ð¾ÑÑÐ° Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
+      heading: ÐÐ¾Ð³Ð¸Ð½
+      login_button: ÐÐ¾Ð¹ÑÐ¸
+      lost password link: ÐÐ°Ð±ÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ?
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      lost password link: "ÐÐ°Ð±ÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ?"
-      login_button: "ÐÐ¾Ð¹ÑÐ¸"
-      account not active: "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð²Ð°ÑÐ° ÑÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ ÐµÑÑ Ð½Ðµ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°Ð½Ð°.<br />Ð§ÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐµÐµ, Ð¿Ð¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð²Ð°Ñ Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÑÑÐ¸Ðº Ð¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ»ÐºÑ Ð² Ð¿Ð¸ÑÑÐ¼Ðµ Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ Ð¾ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ð¸."
-      auth failure: "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð²ÑÐ¾Ð´ Ñ ÑÑÐ¸Ð¼Ð¸ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¸Ð»Ð¸ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¼ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½."
-    lost_password:
-      title: "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      heading: "ÐÐ°Ð±ÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ?"
-      email address: "E-mail Ð°Ð´ÑÐµÑ:"
-      new password button: "ÐÑÑÐ»Ð¸ÑÐµ Ð¼Ð½Ðµ Ð½Ð¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      notice email on way: "ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ Ð¿Ð¾ÑÐµÑÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ :-( Ð½Ð¾ Ð½Ð¸ÑÐµÐ³Ð¾, ÑÐºÐ¾ÑÐ¾ Ð¿ÑÐ¸Ð´ÑÑ e-mail Ð¸ Ð²Ñ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð¼ÐµÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ."
-      notice email cannot find: "Ð¢Ð°ÐºÐ¾Ð¹ e-mail Ð½Ðµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½."
-    reset_password:
-      title: "ÑÐ±ÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ"
-      flash changed check mail: "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ Ð¸ ÑÐµÐ¹ÑÐ°Ñ Ð¿ÑÐ¸Ð´ÐµÑ Ð²Ð°Ð¼ Ð½Ð° e-mail :-)"
-      flash token bad: "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°ÐºÐ¾Ð¹ ÐºÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ ÑÑÑÐ»ÐºÑ."
-    new:
-      title: "Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ"
-      heading: "Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ"
-      no_auto_account_create: "Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, ÑÐµÐ¹ÑÐ°Ñ Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
-      contact_webmaster: 'ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ <a href="mailto:webmaster@openstreetmap.org">Ð²ÐµÐ±Ð¼Ð°ÑÑÐµÑÐ¾Ð¼</a> Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð¾Ð´Ð¾Ð±Ð½ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ. ÐÑ Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐµÐ¼ Ð¸ Ð¾ÑÐ²ÐµÑÐ¸Ð¼ ÐºÐ°Ðº ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐ¾ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑÑÑÑÐ¾.'
-      fill_form: "ÐÐ°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµ ÑÐ¾ÑÐ¼Ñ, Ð¸ Ð¼Ñ Ð²ÑÑÐ»ÐµÐ¼ Ð²Ð°Ð¼ Ð½Ð° email Ð¿Ð¸ÑÑÐ¼Ð¾ Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ Ð¾Ð± Ð°ÐºÑÐ¸Ð²Ð°ÑÐ¸Ð¸."
-      license_agreement: 'Ð¡Ð¾Ð·Ð´Ð°Ð²Ð°Ñ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð¿ÑÐ¾ÐµÐºÑÐµ, Ð²Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ, ÑÑÐ¾ Ð²ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ, Ð·Ð°Ð³ÑÑÐ¶Ð°ÐµÐ¼ÑÐµ Ð½Ð° openstreetmap.org, Ð¸ Ð²ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ, ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÐµÐ¼ÑÐµ ÑÑÐµÐ´ÑÑÐ²Ð°Ð¼Ð¸, ÑÐ²ÑÐ·Ð°Ð½Ð½ÑÐ¼Ð¸ Ñ openstreetmap.org, Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÑÑÑÑÑÑ (Ð±ÐµÐ· Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ) Ð¿Ð¾ <a href="http://creativecommons.org/licenses/by-sa/2.0/">ÑÑÐ¾Ð¹ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ Creative Commons (by-sa)</a>.'
-      email address: "ÐÐ´ÑÐµÑ email:"
-      confirm email address: "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð°Ð´ÑÐµÑ email:"
-      not displayed publicly: 'ÐÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑÑÑ Ð¿ÑÐ±Ð»Ð¸ÑÐ½Ð¾ (ÑÐ¼. <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð²ÐºÐ»ÑÑÐ°Ñ ÑÐ°ÑÑÑ Ð¿ÑÐ¾ Ð°Ð´ÑÐµÑ email">Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸</a>)'
+      please login: ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð¾Ð¹Ð´Ð¸ÑÐµ Ð¸Ð»Ð¸ {{create_user_link}}.
+      title: ÐÐ¾Ð³Ð¸Ð½
+    lost_password: 
+      email address: "ÐÐ°Ð´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ:"
+      heading: ÐÐ°Ð±ÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ?
+      new password button: ÐÑÑÐ»Ð¸ÑÐµ Ð¼Ð½Ðµ Ð½Ð¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ
+      notice email cannot find: Ð¢Ð°ÐºÐ¾Ð¹ Ð°Ð´ÑÐµÑ Ð½Ðµ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½.
+      notice email on way: ÐÐ°Ð»Ñ, ÑÑÐ¾ Ð²Ñ Ð¿Ð¾ÑÐµÑÑÐ»Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ :-( Ð½Ð¾ Ð½Ð¸ÑÐµÐ³Ð¾, ÑÐºÐ¾ÑÐ¾ Ð¿ÑÐ¸Ð´ÑÑ Ð¿Ð¸ÑÑÐ¼Ð¾ Ð¸ Ð²Ñ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð¼ÐµÐ½ÑÑÑ ÑÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ.
+      title: ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ
+    make_friend: 
+      already_a_friend: ÐÑ ÑÐ¶Ðµ Ð´ÑÑÐ·ÑÑ Ñ {{name}}.
+      failed: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ {{name}} Ð² Ð´ÑÑÐ·ÑÑ.
+      success: Ð¢ÐµÐ¿ÐµÑÑ {{name}} ÑÐ²Ð»ÑÐµÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð´ÑÑÐ³Ð¾Ð¼.
+    new: 
+      confirm email address: "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð°Ð´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ:"
+      confirm password: "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
+      contact_webmaster: ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ²ÑÐ¶Ð¸ÑÐµÑÑ Ñ <a href="mailto:webmaster@openstreetmap.org">Ð²ÐµÐ±Ð¼Ð°ÑÑÐµÑÐ¾Ð¼</a> Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¿Ð¾Ð´Ð¾Ð±Ð½ÑÑ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ. ÐÑ Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐµÐ¼ Ð¸ Ð¾ÑÐ²ÐµÑÐ¸Ð¼ Ð½Ð°ÑÑÐ¾Ð»ÑÐºÐ¾ Ð±ÑÑÑÑÐ¾, Ð½Ð°ÑÐºÐ¾Ð»ÑÐºÐ¾ ÑÐ¼Ð¾Ð¶ÐµÐ¼.
       display name: "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ:"
+      email address: "ÐÐ´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ:"
+      fill_form: ÐÐ°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµ ÑÐ¾ÑÐ¼Ñ, Ð¸ Ð¼Ñ Ð²ÑÑÐ»ÐµÐ¼ Ð²Ð°Ð¼ Ð½Ð° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ Ð¿Ð¸ÑÑÐ¼Ð¾ Ñ Ð¿ÑÐ¾ÑÑÐ±Ð¾Ð¹ Ð¾Ð± Ð°ÐºÑÐ¸Ð²Ð°ÑÐ¸Ð¸.
+      flash create success message: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð±ÑÐ» ÑÐ´Ð°ÑÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð²Ð°ÑÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð¿Ð¾ÑÑÑ Ð½Ð° Ð½Ð°Ð»Ð¸ÑÐ¸Ðµ Ð¿Ð¸ÑÑÐ¼Ð° Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ»ÐºÑ Ð² Ð½ÑÐ¼ Ð¸ Ð²Ñ ÑÑÑ Ð¶Ðµ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°Ð½ÑÑÑÑÑ Ð²Ð½ÐµÑÐµÐ½Ð¸ÐµÐ¼ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ :-)<br /><br />ÐÐ±ÑÐ°ÑÐ¸ÑÐµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, ÑÑÐ¾ Ð²Ñ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð²Ð¾Ð¹ÑÐ¸, Ð¿Ð¾ÐºÐ° Ð²Ñ Ð½Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ.<br /><br />ÐÑÐ»Ð¸ Ð²Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Ð°Ð½ÑÐ¸ÑÐ¿Ð°Ð¼, Ð¿Ð¾ÑÑÐ»Ð°ÑÑÐ¸Ð¹ Ð·Ð°Ð¿ÑÐ¾ÑÑ Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ, Ð²Ð½ÐµÑÐ¸ÑÐµ Ð°Ð´ÑÐµÑ webmaster@openstreetmap.org Ð² Ð²Ð°Ñ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº, ÑÐ°Ðº ÐºÐ°Ðº Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð¾ÑÐ²ÐµÑÐ°ÑÑ Ð½Ð° ÑÐ°ÐºÐ¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÑ.
+      heading: Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÑÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      license_agreement: Ð¡Ð¾Ð·Ð´Ð°Ð²Ð°Ñ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð² Ð¿ÑÐ¾ÐµÐºÑÐµ, Ð²Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´Ð°ÐµÑÐµ, ÑÑÐ¾ Ð²ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ, Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐµ Ð² Openstreetmap Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÑÑÑÑÑÑ Ð½Ð° ÑÑÐ»Ð¾Ð²Ð¸ÑÑ <a href="http://creativecommons.org/licenses/by-sa/2.0/">ÑÑÐ¾Ð¹ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ Creative Commons (BY-SA)</a>.
+      no_auto_account_create: Ð ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, ÑÐµÐ¹ÑÐ°Ñ Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð´Ð»Ñ Ð²Ð°Ñ ÑÑÑÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ.
+      not displayed publicly: ÐÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑÑÑ Ð¿ÑÐ±Ð»Ð¸ÑÐ½Ð¾ (ÑÐ¼. <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Ð²Ð¸ÐºÐ¸ Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð²ÐºÐ»ÑÑÐ°Ñ ÑÐ°ÑÑÑ Ð¿ÑÐ¾ Ð°Ð´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ">Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸</a>)
       password: "ÐÐ°ÑÐ¾Ð»Ñ:"
-      confirm password: "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
       signup: Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ
-      flash create success message: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð±ÑÐ» ÑÐ¾Ð·Ð´Ð°Ð½ ÑÐ´Ð°ÑÐ½Ð¾. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð²Ð°Ñ email Ð½Ð° Ð½Ð°Ð»Ð¸ÑÐ¸Ðµ Ð¿Ð¸ÑÑÐ¼Ð° Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÑÑÐ»ÐºÑ Ð² Ð½ÐµÐ¼ Ð¸ Ð²Ñ ÑÑÑ Ð¶Ðµ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°Ð½ÑÑÑÑÑ Ð²Ð½ÐµÑÐµÐ½Ð¸ÐµÐ¼ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ :-)<br /><br />ÐÐ±ÑÐ°ÑÐ¸ÑÐµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, ÑÑÐ¾ Ð²Ñ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑÐµ Ð²Ð¾Ð¹ÑÐ¸, Ð¿Ð¾ÐºÐ° Ð²Ñ Ð½Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð²Ð°Ñ Ð°Ð´ÑÐµÑ email.<br /><br />ÐÑÐ»Ð¸ Ð²Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Ð°Ð½ÑÐ¸ÑÐ¿Ð°Ð¼, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð¿Ð¾ÑÑÐ»Ð°ÐµÑ Ð·Ð°Ð¿ÑÐ¾ÑÑ Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ, ÑÐ¾Ð³Ð´Ð° Ð²Ð½ÐµÑÐ¸ÑÐµ Ð°Ð´ÑÐµÑ webmaster@openstreetmap.org Ð² Ð²Ð°Ñ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº, ÑÐ°Ðº ÐºÐ°Ðº Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼ Ð¾ÑÐ²ÐµÑÐ°ÑÑ Ð½Ð° ÑÐ°ÐºÐ¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÑ."
-    no_such_user:
-      title: "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
-      heading: "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ"
-      body: "ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð½ÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}}. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ»ÐºÐ°, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ Ð¿ÑÐ¸ÑÐ»Ð¸ Ð½Ðµ Ð²ÐµÑÐ½Ð°."
-    view:
+      title: Ð ÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ
+    no_such_user: 
+      body: ÐÐ·Ð²Ð¸Ð½Ð¸ÑÐµ, Ð½ÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ {{user}}. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÑ Ð²Ð²Ð¾Ð´Ð°. ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ñ Ð¿ÐµÑÐµÑÐ»Ð¸ Ð¿Ð¾ Ð¾ÑÐ¸Ð±Ð¾ÑÐ½Ð¾Ð¹ ÑÑÑÐ»ÐºÐµ.
+      heading: ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ {{user}} Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ
+      title: ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
+    remove_friend: 
+      not_a_friend: "{{name}} Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð´ÑÑÐ³Ð¾Ð¼."
+      success: "{{name}} ÑÐ´Ð°Ð»ÑÐ½ Ð¸Ð· Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´ÑÑÐ·ÐµÐ¹."
+    reset_password: 
+      confirm password: "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ:"
+      flash changed: ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð¸Ð·Ð¼ÐµÐ½ÑÐ½.
+      flash token bad: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°ÐºÐ¾Ð¹ ÐºÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ ÑÑÑÐ»ÐºÑ.
+      heading: ÐÐ¾Ð²ÑÐ¾ÑÐ½Ð°Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ {{user}}
+      password: "ÐÐ°ÑÐ¾Ð»Ñ:"
+      reset: Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ
+      title: ÐÐ¾Ð²ÑÐ¾ÑÐ½Ð°Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¿Ð°ÑÐ¾Ð»Ñ
+    set_home: 
+      flash success: ÐÐ°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¾
+    view: 
+      add as friend: Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð´ÑÑÐ·ÑÑ
+      add image: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ
+      ago: ({{time_in_words_ago}} Ð½Ð°Ð·Ð°Ð´)
+      change your settings: Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      delete image: Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð°Ð²Ð°ÑÐ°Ñ
+      description: ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ
+      diary: Ð´Ð½ÐµÐ²Ð½Ð¸Ðº
+      edits: Ð¿ÑÐ°Ð²ÐºÐ¸
+      if set location: ÐÑÐ»Ð¸ Ð²Ñ ÑÐºÐ°Ð¶ÐµÑÐµ ÑÐ²Ð¾Ðµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, ÐºÐ°ÑÑÐ° Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ Ð¿Ð¾ÑÐ²ÑÑÑÑ Ð½Ð¸Ð¶Ðµ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° Ð²Ð°ÑÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ {{settings_link}}.
+      km away: "{{count}} ÐºÐ¼ Ð¾Ñ Ð²Ð°Ñ"
+      m away: "{{count}} Ð¼ Ð¾Ñ Ð²Ð°Ñ"
+      mapper since: "ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½:"
       my diary: Ð¼Ð¾Ð¹ Ð´Ð½ÐµÐ²Ð½Ð¸Ðº
-      new diary entry: Ð½Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ
-      my edits: Ð¼Ð¾Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
-      my traces: Ð¼Ð¾Ð¸ ÑÑÐµÐºÐ¸
+      my edits: Ð¼Ð¾Ð¸ Ð¿ÑÐ°Ð²ÐºÐ¸
       my settings: Ð¼Ð¾Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
+      my traces: Ð¼Ð¾Ð¸ ÑÑÐµÐºÐ¸
+      my_oauth_details: ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐµÐ¹ OAuth
+      nearby users: "ÐÐ»Ð¸Ð¶Ð°Ð¹ÑÐ¸Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸:"
+      new diary entry: Ð½Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ
+      no friends: ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÐµÑÑ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð´ÑÑÐ³Ð°.
+      no home location: ÐÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ»Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð¾.
+      no nearby users: ÐÐ¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð·Ð°Ð½Ð¸Ð¼Ð°ÑÑÐ¸ÑÑÑ ÑÐ¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼ ÐºÐ°ÑÑÑ.
+      remove as friend: ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¸Ð· Ð´ÑÑÐ·ÐµÐ¹
       send message: Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ
-      diary: Ð´Ð½ÐµÐ²Ð½Ð¸Ðº
-      edits: Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
+      settings_link_text: Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
       traces: ÑÑÐµÐºÐ¸
-      remove as friend: ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¸Ð· Ð´ÑÑÐ·ÐµÐ¹
-      add as friend: Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð´ÑÑÐ·ÑÑ
-      mapper since: "ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½:"
-      ago: "({{time_in_words_ago}} Ð½Ð°Ð·Ð°Ð´)"
-      user image heading: ÐÐ²Ð°ÑÐ°Ñ
-      delete image: Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð°Ð²Ð°ÑÐ°Ñ
       upload an image: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ Ð°Ð²Ð°ÑÐ°Ñ
-      add image: ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ
-      description: ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ
+      user image heading: ÐÐ²Ð°ÑÐ°Ñ
       user location: ÐÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
-      no home location: "ÐÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ»Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð¾."
-      if set location: "ÐÑÐ»Ð¸ Ð²Ñ ÑÐºÐ°Ð¶ÐµÑÐµ ÑÐ²Ð¾Ðµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, ÐºÐ°ÑÑÐ° Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ Ð¿Ð¾ÑÐ²ÑÑÑÑ Ð½Ð¸Ð¶Ðµ. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð²Ð°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ð° Ð²Ð°ÑÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ {{settings_link}}."
-      settings_link_text: Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
       your friends: ÐÐ°ÑÐ¸ Ð´ÑÑÐ·ÑÑ
-      no friends: ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÐµÑÑ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð´ÑÑÐ³Ð°.
-      km away: "{{count}} ÐºÐ¼. Ð¾Ñ Ð²Ð°Ñ"
-      nearby users: "ÐÐ»Ð¸Ð¶Ð°Ð¹ÑÐ¸Ðµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸:"
-      no nearby users: "ÐÐ¾Ð±Ð»Ð¸Ð·Ð¾ÑÑÐ¸ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹, Ð·Ð°Ð½Ð¸Ð¼Ð°ÑÑÐ¸ÑÑÑ ÑÐ¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼ ÐºÐ°ÑÑÑ."
-      change your settings: Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
-    friend_map:
-      your location: ÐÐ°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
-      nearby mapper: "ÐÐ»Ð¸Ð¶Ð°Ð¹ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: [[nearby_user]]"
-    account:
-      title: "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÐµÑÐ½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸"
-      my settings: ÐÐ¾Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸
-      email never displayed publicly: "(Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½)"
-      public editing:
-        heading: "ÐÑÐ±Ð»Ð¸ÑÐ½Ð¾Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ:"
-        enabled: "ÐÐºÐ»ÑÑÐµÐ½Ð¾. ÐÐ¾Ð¶Ð½Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ. ÐÑÐ°Ð²ÐºÐ¸ Ð½Ðµ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñ."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "ÑÑÐ¾ ÑÑÐ¾ Ð·Ð½Ð°ÑÐ¸Ñ?"
-        disabled: "ÐÑÐºÐ»ÑÑÐµÐ½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð²Ð½Ð¾ÑÐ¸ÑÑ Ð¿ÑÐ°Ð²ÐºÐ¸, Ð²ÑÐµ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñ."
-        disabled link text: "Ð¿Ð¾ÑÐµÐ¼Ñ Ñ Ð½Ðµ Ð¼Ð¾Ð³Ñ Ð²Ð½Ð¾ÑÐ¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ?"
-      profile description: "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ:"
-      preferred languages: "ÐÑÐµÐ´Ð¿Ð¾ÑÐ¸ÑÐ°ÐµÐ¼ÑÐµ ÑÐ·ÑÐºÐ¸:"
-      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: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ
-      press confirm button: "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð²Ð°ÑÑ ÑÑÐµÑÐ½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
-      button: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ
-      success: "ÐÐ°ÑÐ° ÑÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð°, ÑÐ¿Ð°ÑÐ¸Ð±Ð¾ Ð·Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ!"
-      failure: "Ð£ÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ ÑÐ°ÐºÐ¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ ÑÐ¶Ðµ Ð±ÑÐ»Ð° Ð°ÐºÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°Ð½Ð° ÑÐ°Ð½ÐµÐµ."
-    confirm_email:
-      heading: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð°Ð´ÑÐµÑÐ° email
-      press confirm button: "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ Ð²Ð°Ñ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð´ÑÐµÑ email."
-      button: ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ
-      success: "ÐÐ°Ñ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½, ÑÐ¿Ð°ÑÐ¸Ð±Ð¾ Ð·Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ñ!"
-      failure: "ÐÐ´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ ÑÐ¶Ðµ Ð±ÑÐ» Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½."
-    set_home:
-      flash success: "ÐÐ°ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¾"
-    go_public:
-      flash success: "ÐÑÐµ Ð²Ð°ÑÐ¸ Ð¿ÑÐ°Ð²ÐºÐ¸ ÑÐµÐ¿ÐµÑÑ Ð¾Ð±ÑÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ñ, Ð¸ Ð²Ñ ÑÐµÐ¿ÐµÑÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ."
-    make_friend:
-      success: "Ð¢ÐµÐ¿ÐµÑÑ {{name}} Ð²Ð°Ñ Ð´ÑÑÐ³."
-      failed: "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ {{name}} Ð² Ð´ÑÑÐ·ÑÑ."
-      already_a_friend: "ÐÑ Ñ {{name}} ÑÐ¶Ðµ Ð´ÑÑÐ·ÑÑ."
-    remove_friend:
-      success: "{{name}} ÑÐ´Ð°Ð»ÐµÐ½ Ð¸Ð· Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´ÑÑÐ·ÐµÐ¹."
-      not_a_friend: "{{name}} Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð´ÑÑÐ³Ð¾Ð¼."
-
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b5362bd91..4bba2f707 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1,924 +1,847 @@
-sl:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Paket sprememb"
-      changeset_tag: "Changeset Tag"
-      country: "DrÅ¾ava"
-      diary_comment: "Komentar v dnevniku"
-      diary_entry: "Vpis v dnevnik"
-      friend: "Prijatelj"
-      language: "Jezik"
-      message: "SporoÄilo"
-      node: "VozliÅ¡Äe"
-      node_tag: "Oznaka vozliÅ¡Äa"
-      notifier: "ObveÅ¡Äevalec"
-      old_node: "Old Node"
-      old_node_tag: "Old Node Tag"
-      old_relation: "Old Relation"
-      old_relation_member: "Old Relation Member"
-      old_relation_tag: "Old Relation Tag"
-      old_way: "Old Way"
-      old_way_node: "Old Way Node"
-      old_way_tag: "Old Way Tag"
-      relation: "Relacija"
-      relation_member: "Älan relacije"
-      relation_tag: "Oznaka relacije"
-      session: "Session"
-      trace: "Sled"
-      tracepoint: "ToÄka sledi"
-      tracetag: "Oznaka sledi"
-      user: "Uporabnik"
-      user_preference: "UporabniÅ¡ke nastavitve"
-      user_token: "UporabniÅ¡ki Å¾eton"
-      way: "Pot"
-      way_node: "VozliÅ¡Äe poti"
-      way_tag: "Oznaka poti"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Besedilo"
-      diary_entry:
-        user: "Uporabnik"
-        title: "Naslov"
-        latitude: "Zemljepisna Å¡irina"
-        longitude: "Zemljepisna dolÅ¾ina"
-        language: "Jezik"
-      friend:
-        user: "Uporabnik"
-        friend: "Prijatelj"
-      trace:
-        user: "Uporabnik"
-        visible: "Vidnost sledi"
-        name: "Ime"
-        size: "Velikost"
-        latitude: "Zemljepisna Å¡irina"
-        longitude: "Zemljepisna dolÅ¾ina"
-        public: "Javnost sledi"
-        description: "Opis"
-      message:
-        sender: "PoÅ¡iljatelj"
-        title: "Naslov"
-        body: "Besedilo"
-        recipient: "Prejemnik"
-      user:
-        email: "Naslov e-poÅ¡te"
-        active: "Active"
-        display_name: "Prikazno ime"
-        description: "Opis"
-        languages: "Jeziki"
-        pass_crypt: "Geslo"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, {{version}}. razliÄica"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: Zemljevid
-    edit: Urejanje
-    coordinates: "Koordinate:"
-  browse:
-    changeset:
-      title: "Paket sprememb"
+sl: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Besedilo
+      diary_entry: 
+        language: Jezik
+        latitude: Zemljepisna Å¡irina
+        longitude: Zemljepisna dolÅ¾ina
+        title: Naslov
+        user: Uporabnik
+      friend: 
+        friend: Prijatelj
+        user: Uporabnik
+      message: 
+        body: Besedilo
+        recipient: Prejemnik
+        sender: PoÅ¡iljatelj
+        title: Naslov
+      trace: 
+        description: Opis
+        latitude: Zemljepisna Å¡irina
+        longitude: Zemljepisna dolÅ¾ina
+        name: Ime
+        public: Javnost sledi
+        size: Velikost
+        user: Uporabnik
+        visible: Vidnost sledi
+      user: 
+        active: Active
+        description: Opis
+        display_name: Prikazno ime
+        email: Naslov e-poÅ¡te
+        languages: Jeziki
+        pass_crypt: Geslo
+    models: 
+      acl: Access Control List
+      changeset: Paket sprememb
+      changeset_tag: Changeset Tag
+      country: DrÅ¾ava
+      diary_comment: Komentar v dnevniku
+      diary_entry: Vpis v dnevnik
+      friend: Prijatelj
+      language: Jezik
+      message: SporoÄilo
+      node: VozliÅ¡Äe
+      node_tag: Oznaka vozliÅ¡Äa
+      notifier: ObveÅ¡Äevalec
+      old_node: Old Node
+      old_node_tag: Old Node Tag
+      old_relation: Old Relation
+      old_relation_member: Old Relation Member
+      old_relation_tag: Old Relation Tag
+      old_way: Old Way
+      old_way_node: Old Way Node
+      old_way_tag: Old Way Tag
+      relation: Relacija
+      relation_member: Älan relacije
+      relation_tag: Oznaka relacije
+      session: Session
+      trace: Sled
+      tracepoint: ToÄka sledi
+      tracetag: Oznaka sledi
+      user: Uporabnik
+      user_preference: UporabniÅ¡ke nastavitve
+      user_token: UporabniÅ¡ki Å¾eton
+      way: Pot
+      way_node: VozliÅ¡Äe poti
+      way_tag: Oznaka poti
+  browse: 
+    changeset: 
       changeset: "Paket sprememb: {{id}}"
-      download: "Prenesi {{changeset_xml_link}} ali {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_navigation:
-      user:
-        name_tooltip: "Prikaz prispevkov uporabnika {{user}}"
-        prev_tooltip: "PrejÅ¡nji prispevek uporabnika {{user}}"
-        next_tooltip: "Naslednji prispevek uporabnika {{user}}"
-      all:
-        prev_tooltip: "PrejÅ¡nji paket sprememb"
-        next_tooltip: "Naslednji paket sprememb"
-    changeset_details:
-      created_at: "Ustvarjen:"
-      closed_at: "ZakljuÄen:"
+      changesetxml: Changeset XML
+      download: Prenesi {{changeset_xml_link}} ali {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: Paket sprememb
+    changeset_details: 
       belongs_to: "Pripada:"
       bounding_box: "Pravokotno podroÄje:"
-      no_bounding_box: "Ta paket nima doloÄenega pravokotnega podroÄja."
-      show_area_box: "PrikaÅ¾i pravokotno podroÄje"
-      box: "podroÄje"
-      has_nodes:
+      box: podroÄje
+      closed_at: "ZakljuÄen:"
+      created_at: "Ustvarjen:"
+      has_nodes: 
         one: "Vsebuje naslednje {{count}} vozliÅ¡Äe:"
-        two: "Vsebuje naslednji {{count}} vozliÅ¡Äi:"
-        few: "Vsebuje naslednja {{count}} vozliÅ¡Äa:"
         other: "Vsebuje naslednjih {{count}} vozliÅ¡Ä:"
-      has_ways: 
-        one: "Vsebuje naslednjo {{count}} pot:"
-        two: "Vsebuje naslednji {{count}} poti:"
-        few: "Vsebuje naslednje {{count}} poti:"
-        other: "Vsebuje naslednjih {{count}} poti:"
       has_relations: 
         one: "Vsebuje naslednjo {{count}} relacijo:"
-        two: "Vsebuje naslednji {{count}} relaciji:"
-        few: "Vsebuje naslednje {{count}} relacije:"
         other: "Vsebuje naslednjih {{count}} relacij:"
+      has_ways: 
+        one: "Vsebuje naslednjo {{count}} pot:"
+        other: "Vsebuje naslednjih {{count}} poti:"
+      no_bounding_box: Ta paket nima doloÄenega pravokotnega podroÄja.
+      show_area_box: PrikaÅ¾i pravokotno podroÄje
+    changeset_navigation: 
+      all: 
+        next_tooltip: Naslednji paket sprememb
+        prev_tooltip: PrejÅ¡nji paket sprememb
+      user: 
+        name_tooltip: Prikaz prispevkov uporabnika {{user}}
+        next_tooltip: Naslednji prispevek uporabnika {{user}}
+        prev_tooltip: PrejÅ¡nji prispevek uporabnika {{user}}
     common_details: 
       edited_at: "Urejeno ob:"
       edited_by: "Uredil:"
-      version: "RazliÄica:"
       in_changeset: "V paketu sprememb:"
-    containing_relation:
-      entry: "Relacija {{relation_name}}"
-      entry_role: "Relacija {{relation_name}} (kot {{relation_role}})"
-    map:
-      loading: "Nalaganje..."
-      deleted: "Izbrisano"
-      larger:
-        area: "Prikaz podroÄja na veÄjem zemljevidu"
-        node: "Prikaz vozliÅ¡Äa na veÄjem zemljevidu"
-        way: "Prikaz poti na veÄjem zemljevidu"
-        relation: "Prikaz relacije na veÄjem zemljevidu"
-    node_details:
+      version: "RazliÄica:"
+    containing_relation: 
+      entry: Relacija {{relation_name}}
+      entry_role: Relacija {{relation_name}} (kot {{relation_role}})
+    map: 
+      deleted: Izbrisano
+      larger: 
+        area: Prikaz podroÄja na veÄjem zemljevidu
+        node: Prikaz vozliÅ¡Äa na veÄjem zemljevidu
+        relation: Prikaz relacije na veÄjem zemljevidu
+        way: Prikaz poti na veÄjem zemljevidu
+      loading: Nalaganje...
+    node: 
+      download: "{{download_xml_link}} ali {{view_history_link}}"
+      download_xml: prenesi XML
+      edit: uredi
+      node: VozliÅ¡Äe
+      node_title: "VozliÅ¡Äe: {{node_name}}"
+      view_history: poglej zgodovino
+    node_details: 
       coordinates: "Koordinate:"
       part_of: "Del:"
-    node_history:
-      node_history: "Zgodovina vozliÅ¡Äa"
-      node_history_title: "Zgodovina vozliÅ¡Äa: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} ali {{view_details_link}}"
-      download_xml: "prenesi XML"
-      view_details: "poglej podrobnosti"
-    node:
-      node: "VozliÅ¡Äe"
-      node_title: "VozliÅ¡Äe: {{node_name}}"
-      download: "{{download_xml_link}} ali {{view_history_link}}"
-      download_xml: "prenesi XML"
-      view_history: "poglej zgodovino"
-      edit: "uredi"
-    not_found:
-      sorry: "Oprostite, {{type}} z ID-jem {{id}} ne obstaja v bazi."
-      type:
+      download_xml: prenesi XML
+      node_history: Zgodovina vozliÅ¡Äa
+      node_history_title: "Zgodovina vozliÅ¡Äa: {{node_name}}"
+      view_details: poglej podrobnosti
+    not_found: 
+      sorry: Oprostite, {{type}} z ID-jem {{id}} ne obstaja v bazi.
+      type: 
         node: vozliÅ¡Äe
-        way: pot
         relation: relacija
-    paging_nav:
-      showing_page: "Prikazana stran"
-      of: "od"
-    relation_details:
+        way: pot
+    paging_nav: 
+      of: od
+      showing_page: Prikazana stran
+    relation: 
+      download: "{{download_xml_link}} ali {{view_history_link}}"
+      download_xml: prenesi XML
+      relation: Relacija
+      relation_title: "Relacija: {{relation_name}}"
+      view_history: poglej zgodovino
+    relation_details: 
       members: "Älani:"
       part_of: "Del:"
-    relation_history:
-      relation_history: "Zgodovina relacije"
+    relation_history: 
+      relation_history: Zgodovina relacije
       relation_history_title: "Zgodovina relacije: {{relation_name}}"
-    relation_member:
-      entry: "{{type}} {{name}}"
+    relation_member: 
       entry_role: "{{type}} {{name}} kot {{role}}"
-      type:
-        node: "VozliÅ¡Äe"
-        way: "Pot"
-        relation: "Relacija"
-    relation:
-      relation: "Relacija"
-      relation_title: "Relacija: {{relation_name}}"
-      download: "{{download_xml_link}} ali {{view_history_link}}"
-      download_xml: "prenesi XML"
-      view_history: "poglej zgodovino"
-    start:
-      view_data: "Ogled podatkov trenutno prikazanega zemljevida"
-      manually_select: "RoÄno izberite drugo podroÄje"
-    start_rjs:
-      data_layer_name: "Podatki"
-      data_frame_title: "Podatki"
-      zoom_or_select: "PoveÄajte zemljevid ali izberite podroÄje za prikaz"
-      drag_a_box: "Za izbor podroÄja povlecite pravokotnik na zemljevidu"
-      manually_select: "RoÄno izberite drugo podroÄje"
+      type: 
+        node: VozliÅ¡Äe
+        relation: Relacija
+        way: Pot
+    start: 
+      manually_select: RoÄno izberite drugo podroÄje
+      view_data: Ogled podatkov trenutno prikazanega zemljevida
+    start_rjs: 
+      data_frame_title: Podatki
+      data_layer_name: Podatki
+      details: Podrobnosti
+      drag_a_box: Za izbor podroÄja povlecite pravokotnik na zemljevidu
+      edited_by_user_at_timestamp: Uredil [[user]] v [[timestamp]]
+      history_for_feature: Zgodovina [[feature]]
+      load_data: NaloÅ¾i podatke
       loaded_an_area_with_num_features: "NaloÅ¾ili ste podroÄje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takÅ¡ne koliÄine podatkov. Na sploÅ¡no brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upoÄasni vaÅ¡ brskalnik ali ga naredi neodzivnega. Äe ste prepriÄani, da Å¾elite prikazati vse te podatke, pritisnite na spodnji gumb."
-      load_data: "NaloÅ¾i podatke"
+      loading: Nalaganje...
+      manually_select: RoÄno izberite drugo podroÄje
+      object_list: 
+        api: Pridobi podroÄje iz programskega vmesnika (API)
+        back: PrikaÅ¾i seznam predmetov
+        details: Podrobnosti
+        heading: Seznam predmetov
+        history: 
+          type: 
+            node: VozliÅ¡Äe [[id]]
+            way: Pot [[id]]
+        selected: 
+          type: 
+            node: VozliÅ¡Äe [[id]]
+            way: Pot [[id]]
+        type: 
+          node: VozliÅ¡Äe
+          way: Pot
+      private_user: anonimni uporabnik
+      show_history: PrikaÅ¾i zgodovino
       unable_to_load_size: "Ni mogoÄe naloÅ¾iti: Pravokotno podroÄje velikosti [[bbox_size]] je preveliko (mora biti manjÅ¡e od {{max_bbox_size}})"
-      loading: "Nalaganje..."
-      show_history: "PrikaÅ¾i zgodovino"
-      wait: "PoÄakajte..."
-      history_for_feature: "Zgodovina [[feature]]"
-      details: "Podrobnosti"
-      private_user: "anonimni uporabnik"
-      edited_by_user_at_timestamp: "Uredil [[user]] v [[timestamp]]"
-      object_list:
-        heading: "Seznam predmetov"
-        back: "PrikaÅ¾i seznam predmetov"
-        type:
-          node: "VozliÅ¡Äe"
-          way: "Pot"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Pridobi podroÄje iz programskega vmesnika (API)"
-        details: "Podrobnosti"
-        selected:
-          type:
-            node: "VozliÅ¡Äe [[id]]"
-            way: "Pot [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "VozliÅ¡Äe [[id]]"
-            way: "Pot [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: PoÄakajte...
+      zoom_or_select: PoveÄajte zemljevid ali izberite podroÄje za prikaz
+    tag_details: 
       tags: "Oznake:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} ali {{edit_link}}"
+      download_xml: prenesi XML
+      edit: uredi
+      view_history: poglej zgodovino
+      way: Pot
+      way_title: "Pot: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        other: tudi del poti {{related_ways}}
       nodes: "VozliÅ¡Äa:"
       part_of: "Del:"
-      also_part_of: 
-         other: "tudi del poti {{related_ways}}" 
-    way_history:
-      way_history: "Zgodovina poti"
-      way_history_title: "Zgodovina poti: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} ali {{view_details_link}}"
-      download_xml: "prenesi XML"
-      view_details: "poglej podrobnosti"
-    way:
-      way: "Pot"
-      way_title: "Pot: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}} ali {{edit_link}}"
-      download_xml: "prenesi XML"
-      view_history: "poglej zgodovino"
-      edit: "uredi"
-  changeset:
+      download_xml: prenesi XML
+      view_details: poglej podrobnosti
+      way_history: Zgodovina poti
+      way_history_title: "Zgodovina poti: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonimen
+      big_area: (veliko)
+      id: Å¡t. {{id}}
+      no_comment: (brez)
+      no_edits: (brez sprememb)
+      show_area_box: prikaÅ¾i pravokotno podroÄje
+      still_editing: (Å¡e ureja)
+      view_changeset_details: Ogled podrobnosti paketa sprememb
     changeset_paging_nav: 
-      showing_page: "Prikaz strani"
-      of: "od"
-    changeset:
-      id: "Å¡t. {{id}}"
-      still_editing: "(Å¡e ureja)"
-      anonymous: "Anonimen"
-      no_comment: "(brez)"
-      no_edits: "(brez sprememb)"
-      show_area_box: "prikaÅ¾i pravokotno podroÄje"
-      big_area: "(veliko)"
-      view_changeset_details: "Ogled podrobnosti paketa sprememb"
-    changesets:
-      id: "ID"
-      saved_at: "Shranjen"
-      user: "Uporabnik"
-      comment: "Komentar"
-      area: "PodroÄje"
-    list:
-      title: "Paketi sprememb"
-      title_user: "Paketi sprememb uporabnika {{user}}"
-      title_bbox: "Paketi sprememb znotraj podroÄja {{bbox}}"
-      title_user_bbox: "Paketi sprememb uporabnika {{user}} znotraj {{bbox}}"
-
-      heading: "Paketi sprememb"
-      heading_user: "Paketi sprememb uporabnika {{user}}"
-      heading_bbox: "Paketi sprememb znotraj podroÄja {{bbox}}"
-      heading_user_bbox: "Paketi sprememb uporabnika {{user}} znotraj {{bbox}}"
-
-      description: "Nedavne spremembe"
-      description_user: "Paketi sprememb uporabnika {{user}}"
-      description_bbox: "Paketi sprememb znotraj podroÄja {{bbox}}"
-      description_user_bbox: "Paketi sprememb uporabnika {{user}} znotraj {{bbox}}"
-  diary_entry:
-    new:
-      title: Nov zapis v dnevnik uporabnikov
-    list:
-      title: "Dnevniki uporabnikov"
-      user_title: "Dnevnik uporabnika {{user}}"
-      in_language_title: "Dnevniki v jeziku {{language}}"
-      new: Nov zapis v dnevnik uporabnikov
-      new_title: NapiÅ¡ite nov zapis v vaÅ¡ uporabniÅ¡ki dnevnik
-      no_entries: Ni zapisov v dnevnik
-      recent_entries: "Nedavni zapisi v dnevnik:"
-      older_entries: StarejÅ¡i zapisi
-      newer_entries: NovejÅ¡i zapisi
-    edit:
-      title: "Uredi zapis v dnevnik"
-      subject: "Naslov:"
+      of: od
+      showing_page: Prikaz strani
+    changesets: 
+      area: PodroÄje
+      comment: Komentar
+      id: ID
+      saved_at: Shranjen
+      user: Uporabnik
+    list: 
+      description: Nedavne spremembe
+      description_bbox: Paketi sprememb znotraj podroÄja {{bbox}}
+      description_user: Paketi sprememb uporabnika {{user}}
+      description_user_bbox: Paketi sprememb uporabnika {{user}} znotraj {{bbox}}
+      heading: Paketi sprememb
+      heading_bbox: Paketi sprememb znotraj podroÄja {{bbox}}
+      heading_user: Paketi sprememb uporabnika {{user}}
+      heading_user_bbox: Paketi sprememb uporabnika {{user}} znotraj {{bbox}}
+      title: Paketi sprememb
+      title_bbox: Paketi sprememb znotraj podroÄja {{bbox}}
+      title_user: Paketi sprememb uporabnika {{user}}
+      title_user_bbox: Paketi sprememb uporabnika {{user}} znotraj {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: Komentar uporabnika {{link_user}} v {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: "{{count}} komentar"
+        other: "{{count}} komentarjev"
+      comment_link: Komentiraj ta vnos
+      edit_link: Uredi ta vnos
+      posted_by: Objavil {{link_user}} v {{created}} v jeziku {{language_link}}
+      reply_link: Odgovori na ta vnos
+    edit: 
       body: "Besedilo:"
       language: "Jezki:"
-      location: "Lokacija:"
       latitude: "Z. Å¡irina:"
+      location: "Lokacija:"
       longitude: "Z. dolÅ¾ina:"
-      use_map_link: "uporabi zemljevid"
-      save_button: "Shrani"
       marker_text: Lokacija, na katero se nanaÅ¡a zapis
+      save_button: Shrani
+      subject: "Naslov:"
+      title: Uredi zapis v dnevnik
+      use_map_link: uporabi zemljevid
+    feed: 
+      all: 
+        description: Nedavni zapisi v dnevnik uporabnikov OpenStreetmap
+        title: Dnevnik OpenStreetMap
+      language: 
+        description: Nedavni zapisi v dnevnik uporabnikov OpenStreetmap v jeziku {{language_name}}
+        title: Dnevnik OpenStreetMap v jeziku {{language_name}}
+      user: 
+        description: Nedavni zapisi v dnevnik OpenStreetmap uporabnika {{user}}
+        title: Dnevnik OpenStreetMap uporabnika {{user}}
+    list: 
+      in_language_title: Dnevniki v jeziku {{language}}
+      new: Nov zapis v dnevnik uporabnikov
+      new_title: NapiÅ¡ite nov zapis v vaÅ¡ uporabniÅ¡ki dnevnik
+      newer_entries: NovejÅ¡i zapisi
+      no_entries: Ni zapisov v dnevnik
+      older_entries: StarejÅ¡i zapisi
+      recent_entries: "Nedavni zapisi v dnevnik:"
+      title: Dnevniki uporabnikov
+      user_title: Dnevnik uporabnika {{user}}
+    new: 
+      title: Nov zapis v dnevnik uporabnikov
+    no_such_entry: 
+      body: Oprostite, vnosa v dnevnik Å¡t. {{id}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili.
+      heading: "Vnosa v dnevnik z id-jem: {{id}} ni"
+      title: TakÅ¡nega vnosa v dnevnik ni
+    no_such_user: 
+      body: Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili.
+      heading: Uporabnik {{user}} ne obstaja
+      title: Ni tega uporabnika
     view: 
-      title: "Dnevnik uporabnika {{user}}" 
-      user_title: "Dnevnik uporabnika {{user}}"
-      leave_a_comment: "NapiÅ¡i komentar" 
+      leave_a_comment: NapiÅ¡i komentar
+      login: Prijavite se
       login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
-      login: "Prijavite se"
-      save_button: "Shrani"
-    no_such_entry:
-      title: "TakÅ¡nega vnosa v dnevnik ni"
-      heading: "Vnosa v dnevnik z id-jem: {{id}} ni"
-      body: "Oprostite, vnosa v dnevnik Å¡t. {{id}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili."
-    no_such_user:
-      title: "Ni tega uporabnika"
-      heading: "Uporabnik {{user}} ne obstaja"
-      body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili."
-    diary_entry:
-      posted_by: "Objavil {{link_user}} v {{created}} v jeziku {{language_link}}"
-      comment_link: Komentiraj ta vnos
-      reply_link: Odgovori na ta vnos
-      comment_count: 
-        zero: "brez komentarjev"
-        one: "{{count}} komentar"
-        two: "{{count}} komentarja"
-        few: "{{count}} komentarji"
-        other: "{{count}} komentarjev"
-      edit_link: Uredi ta vnos
-    diary_comment:
-      comment_from: "Komentar uporabnika {{link_user}} v {{comment_created_at}}"
-    feed:
-      user:
-        title: "Dnevnik OpenStreetMap uporabnika {{user}}"
-        description: "Nedavni zapisi v dnevnik OpenStreetmap uporabnika {{user}}"
-      language:
-        title: "Dnevnik OpenStreetMap v jeziku {{language_name}}"
-        description: "Nedavni zapisi v dnevnik uporabnikov OpenStreetmap v jeziku {{language_name}}"
-      all:
-        title: "Dnevnik OpenStreetMap"
-        description: "Nedavni zapisi v dnevnik uporabnikov OpenStreetmap"
-  export:
-    start:
-      area_to_export: "PodroÄje za izvoz"
-      manually_select: "RoÄno izberite drugo podroÄje"
-      format_to_export: "Oblika izvoÅ¾enih podatkov"
-      osm_xml_data: "OpenStreetMap podatki v XML zapisu"
-      mapnik_image: "Mapnik slika zemljevida"
-      osmarender_image: "Osmarender slika zemljevida"
-      embeddable_html: "HTML za vkljuÄitev na spletno stran"
-      licence: "Licenca"
-      export_details: 'OpenStreetMap podatki imajo licenco <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0</a>.'
-      options: "MoÅ¾nosti"
-      format: "Oblika zapisa"
-      scale: "Merilo"
-      max: "najveÄ"
-      image_size: "Velikost slike"
-      zoom: "PoveÄava"
-      add_marker: "Dodaj zaznamek na zemljevid"
+      save_button: Shrani
+      title: Dnevnik uporabnika {{user}}
+      user_title: Dnevnik uporabnika {{user}}
+  export: 
+    start: 
+      add_marker: Dodaj zaznamek na zemljevid
+      area_to_export: PodroÄje za izvoz
+      embeddable_html: HTML za vkljuÄitev na spletno stran
+      export_button: Izvozi
+      export_details: OpenStreetMap podatki imajo licenco <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0</a>.
+      format: Oblika zapisa
+      format_to_export: Oblika izvoÅ¾enih podatkov
+      image_size: Velikost slike
       latitude: "Å ir:"
+      licence: Licenca
       longitude: "Dol:"
-      output: "Rezultat"
-      paste_html: "Uporabite ta HTML za vkljuÄitev zemljevida na spletno stran"
-      export_button: "Izvozi"
-    start_rjs:
-      export: "Izvoz"
-      drag_a_box: "Za izbor podroÄja povlecite pravokotnik na zemljevidu"
-      manually_select: "RoÄno izberite drugo podroÄje"
-      click_add_marker: "S klikom na zemljevid pripnite zaznamek."
-      change_marker: "Premakni zaznamek"
-      add_marker: "Dodaj zaznamek na zemljevid"
-      view_larger_map: "VeÄji zemljevid" 
-  geocoder:
-    search:
-      title:
-        latlon: '<a href="http://openstreetmap.org/">Interni</a> zadetki'
-        us_postcode: 'Zadetki iz <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Zadetki iz <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Zadetki iz <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Zadetki iz <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Zadetki iz <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} {{direction}} od {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} iz <a href="http://gazetteer.openstreetmap.org/namefinder/">iskalca po OpenStreetMap-u</a>'
-        geonames: 'Lokacija iz <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
+      manually_select: RoÄno izberite drugo podroÄje
+      mapnik_image: Mapnik slika zemljevida
+      max: najveÄ
+      options: MoÅ¾nosti
+      osm_xml_data: OpenStreetMap podatki v XML zapisu
+      osmarender_image: Osmarender slika zemljevida
+      output: Rezultat
+      paste_html: Uporabite ta HTML za vkljuÄitev zemljevida na spletno stran
+      scale: Merilo
+      zoom: PoveÄava
+    start_rjs: 
+      add_marker: Dodaj zaznamek na zemljevid
+      change_marker: Premakni zaznamek
+      click_add_marker: S klikom na zemljevid pripnite zaznamek.
+      drag_a_box: Za izbor podroÄja povlecite pravokotnik na zemljevidu
+      export: Izvoz
+      manually_select: RoÄno izberite drugo podroÄje
+      view_larger_map: VeÄji zemljevid
+  geocoder: 
+    description: 
+      title: 
+        geonames: Lokacija iz <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} iz <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">iskalca po OpenStreetMap-u</a>"
+      types: 
         cities: Velemesta
-        towns: Mesta
         places: Kraji
-    description_osm_namefinder:
+        towns: Mesta
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} od {{type}}"
-    results:
-      no_results: "Ni zadetkov"
-    distance:
-      zero: "manj kot 1 km"
-      one: "pribliÅ¾no {{count}} km"
-      two: "pribliÅ¾no {{count}} km"
-      few: "pribliÅ¾no {{count}} km"
-      other: "pribliÅ¾no {{count}} km"
-    direction:
-      south_west: "jugozahodno"
-      south: "juÅ¾no"
-      south_east: "jugovzhodno"
-      east: "vzhodno"
-      north_east: "severovzhodno"
-      north: "severno"
-      north_west: "severozahodno"
-      west: "zahodno"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap logotip
-    welcome_user: "DobrodoÅ¡li, {{user_link}}"
-    welcome_user_link_tooltip: VaÅ¡a uporabniÅ¡ka stran
-    home: "domov"
+    direction: 
+      east: vzhodno
+      north: severno
+      north_east: severovzhodno
+      north_west: severozahodno
+      south: juÅ¾no
+      south_east: jugovzhodno
+      south_west: jugozahodno
+      west: zahodno
+    distance: 
+      one: pribliÅ¾no {{count}} km
+      other: pribliÅ¾no {{count}} km
+      zero: manj kot 1 km
+    results: 
+      no_results: Ni zadetkov
+    search: 
+      title: 
+        ca_postcode: Zadetki iz <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Zadetki iz <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: <a href="http://openstreetmap.org/">Interni</a> zadetki
+        osm_namefinder: Zadetki iz <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Zadetki iz <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Zadetki iz <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} od {{placename}}"
+  layouts: 
+    alt_donation: Prispevajte finanÄna sredstva
+    donate: Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme.
+    donate_link_text: donacijo
+    edit: Uredi
+    edit_tooltip: Uredite zemljevid
+    export: Izvoz
+    export_tooltip: Izvozite podatke zemljevida
+    gps_traces: GPS sledi
+    gps_traces_tooltip: Upravljanje z GPS sledmi
+    help_wiki: PomoÄ in Wiki
+    help_wiki_tooltip: PomoÄ in Wiki strani projekta
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/Sl:Main_Page
+    history: Zgodovina
+    history_tooltip: Zgodovina sprememb
+    home: domov
     home_tooltip: PrikaÅ¾i domaÄi kraj
-    inbox:
-      zero: "Ni sporoÄil"
-      one: "{{count}} sporoÄilo"
-      two: "{{count}} sporoÄili"
-      few: "{{count}} sporoÄila"
-      other: "{{count}} sporoÄil"
-    inbox_tooltip:
-      zero: Niste prejeli novih sproÄil
+    inbox_tooltip: 
       one: Prejeli ste {{count}} novo sporoÄilo
-      two: Prejeli ste {{count}} novi sporoÄili
-      few: Prejeli ste {{count}} nova sporoÄila
       other: Prejeli ste {{count}} novih sporoÄil
-    logout: odjava
-    logout_tooltip: "Odjava iz sistema"
+      zero: Niste prejeli novih sproÄil
+    intro_1: OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi.
+    intro_2: OpenStreetMap vam omogoÄa ogled, urejanje in souporabo geografskih podatkov kjerkoli na Zemlji.
+    intro_3: StreÅ¾niki OpenStreetMap projekta prijazno gostujejo pri {{ucl}} in {{bytemark}}.
+    intro_3_bytemark: bytemarku
+    intro_3_ucl: UCL VR Centru
     log_in: prijava
     log_in_tooltip: Vstop s svojim obstojeÄim uporabniÅ¡kim raÄunom
+    logo: 
+      alt_text: OpenStreetMap logotip
+    logout: odjava
+    logout_tooltip: Odjava iz sistema
+    news_blog: Novice
+    news_blog_tooltip: Novice o OpenStreetMap, prostih geografskih podatkih, ipd.
+    osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrÅ¾evalnih del trenutno ni dostopna.
+    osm_read_only: Baza OpenStreetMap je zaradi izvajanja nujnih vzdrÅ¾evalnih del trenutno dostopna le za branje.
+    shop: Trgovina
+    shop_tooltip: Nakup izdelkov z OpenStreetMap logotipi
     sign_up: vpis
     sign_up_tooltip: Ustvarite si nov uporabniÅ¡ki raÄun za urejanje
-    view: Zemljevid
-    view_tooltip: Prikaz zemljevida
-    edit: Uredi
-    edit_tooltip: Uredite zemljevid
-    history: Zgodovina
-    history_tooltip: Zgodovina sprememb
-    export: Izvoz
-    export_tooltip: Izvozite podatke zemljevida
-    gps_traces: GPS sledi
-    gps_traces_tooltip: Upravljanje z GPS sledmi
+    sotm: UdeleÅ¾ite se letoÅ¡nje OpenStreetMap konference, The State of the Map, ki bo od 10 do 12 Julija v Amsterdamu!
+    tag_line: Prost wiki zemljevid sveta
     user_diaries: Dnevnik
     user_diaries_tooltip: Pregled dnevnikov uporabnikov
-    tag_line: Prost wiki zemljevid sveta
-    intro_1: "OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi."
-    intro_2: "OpenStreetMap vam omogoÄa ogled, urejanje in souporabo geografskih podatkov kjerkoli na Zemlji."
-    intro_3: "StreÅ¾niki OpenStreetMap projekta prijazno gostujejo pri {{ucl}} in {{bytemark}}."
-    intro_3_ucl: "UCL VR Centru"
-    intro_3_bytemark: "bytemarku"
-    osm_offline: "Baza OpenStreetMap zaradi izvajanja nujnih vzdrÅ¾evalnih del trenutno ni dostopna."
-    osm_read_only: "Baza OpenStreetMap je zaradi izvajanja nujnih vzdrÅ¾evalnih del trenutno dostopna le za branje."
-    donate: "Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme."
-    donate_link_text: donacijo
-    help_wiki: "PomoÄ in Wiki"
-    help_wiki_tooltip: "PomoÄ in Wiki strani projekta"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/Sl:Main_Page"
-    news_blog: "Novice"
-    news_blog_tooltip: "Novice o OpenStreetMap, prostih geografskih podatkih, ipd."
-    shop: Trgovina
-    shop_tooltip: Nakup izdelkov z OpenStreetMap logotipi
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'UdeleÅ¾ite se letoÅ¡nje OpenStreetMap konference, The State of the Map, ki bo od 10 do 12 Julija v Amsterdamu!'
-    alt_donation: Prispevajte finanÄna sredstva
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} je komentiral vaÅ¡ vnos v dnevnik"
+    view: Zemljevid
+    view_tooltip: Prikaz zemljevida
+    welcome_user: DobrodoÅ¡li, {{user_link}}
+    welcome_user_link_tooltip: VaÅ¡a uporabniÅ¡ka stran
+  map: 
+    coordinates: "Koordinate:"
+    edit: Urejanje
+    view: Zemljevid
+  message: 
+    delete: 
+      deleted: SporoÄilo izbrisano
+    inbox: 
+      date: Datum
+      from: Od
+      my_inbox: Moja prejeta
+      no_messages_yet: Prejeli niste Å¡e nobenih sporoÄil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?
+      outbox: poslana poÅ¡ta
+      people_mapping_nearby: ljudmi, ki kartirajo blizu vas
+      subject: Zadeva
+      title: Prejeta poÅ¡ta
+      you_have: Imate {{new_count}} novih, neprebranih in {{old_count}} starih, Å¾e prebranih sporoÄil
+    mark: 
+      as_read: SporoÄilo oznaÄeno kot prebrano
+      as_unread: SporoÄilo oznaÄeno kot neprebrano
+    message_summary: 
+      delete_button: IzbriÅ¡i
+      read_button: OznaÄi kot prebrano
+      reply_button: Odgovori
+      unread_button: OznaÄi kot neprebrano
+    new: 
+      back_to_inbox: Nazaj na prejeto poÅ¡to
+      body: Besedilo
+      message_sent: SporoÄilo poslano
+      send_button: PoÅ¡lji
+      send_message_to: PoÅ¡lji novo sporoÄilo uporabniku {{name}}
+      subject: Zadeva
+      title: PoÅ¡iljanje sporoÄila
+    no_such_user: 
+      body: Oprostite, uporabnika s tem imenom ali sporoÄila s tem ID-jem ni
+      heading: Ni ustreznega uporabnika ali sporoÄila
+      title: Ni ustreznega uporabnika ali sporoÄila
+    outbox: 
+      date: Datum
+      inbox: prejeta
+      my_inbox: Moja {{inbox_link}}
+      no_sent_messages: Poslali niste Å¡e nobenih sporoÄil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?
+      outbox: poslana poÅ¡ta
+      people_mapping_nearby: ljudmi, ki kartirajo blizu vas
+      subject: Zadeva
+      title: Poslana poÅ¡ta
+      to: Za
+      you_have_sent_messages: Poslali ste {{sent_count}} sporoÄil
+    read: 
+      back_to_inbox: Nazaj na prejeto poÅ¡to
+      back_to_outbox: Nazaj na poslano poÅ¡to
+      date: Datum
+      from: Od
+      reading_your_messages: Prebiranje vaÅ¡ih sporoÄil
+      reading_your_sent_messages: Prebiranje vaÅ¡ih poslanih sporoÄil
+      reply_button: Odgovori
+      subject: Zadeva
+      title: Branje sporoÄila
+      to: Za
+      unread_button: OznaÄi kot neprebrano
+    sent_message_summary: 
+      delete_button: IzbriÅ¡i
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                    Ne odgovarjajte na to sporoÄilo.                     *"
       banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
-      hi: "Pozdravljen, {{to_user}}!"
+      footer: Komentar lahko preberete tudi na {{readurl}}, komentirate lahko na {{commenturl}} ali odgovorite na {{replyurl}}
       header: "{{from_user}} je komentiral vaÅ¡ nedavni vnos v OpenStreetMap dnevnik z naslovom {{subject}}:"
-      footer: "Komentar lahko preberete tudi na {{readurl}}, komentirate lahko na {{commenturl}} ali odgovorite na {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} vam je poslal novo sporoÄilo"
-      banner1: "*                    Ne odgovarjajte na to sporoÄilo.                     *"
-      banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
-      hi: "Pozdravljeni, {{to_user}},"
-      header: "Uporabnik {{from_user}}  vam je prek OpenStreetMap poslal novo sporoÄilo glede {{subject}}:"
-      footer1: "SporoÄilo lahko preberete tudi na {{readurl}}"
-      footer2: "in nanj odgovorite na naslovu {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} vas je dodal med prijatelje"
+      hi: Pozdravljen, {{to_user}}!
+      subject: "[OpenStreetMap] {{user}} je komentiral vaÅ¡ vnos v dnevnik"
+    email_confirm: 
+      subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
+    email_confirm_html: 
+      click_the_link: Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe.
+      greeting: Pozdravljeni,
+      hopefully_you: Nekdo (upamo, da vi) je zahteval spremembo svojega e-poÅ¡tnega naslova v {{server_url}} na {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe.
+      greeting: Pozdravljeni,
+      hopefully_you_1: Nekdo (upamo, da vi) je zahteval spremembo svojega e-poÅ¡tnega naslova v
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} vas je dodal med prijatelje na OpenStreetMap."
-      see_their_profile: "Uporabnikov profil lahko vidite na naslovu {{userurl}} in ga po Å¾elji lahko dodate med svoje prijatelje."
-    gpx_notification:
-      greeting: "Pozdravljeni,"
-      your_gpx_file: "Izgleda, da je vaÅ¡a datoteka GPX"
-      with_description: "z opisom"
+      see_their_profile: Uporabnikov profil lahko vidite na naslovu {{userurl}} in ga po Å¾elji lahko dodate med svoje prijatelje.
+      subject: "[OpenStreetMap] {{user}} vas je dodal med prijatelje"
+    gpx_notification: 
+      and_no_tags: in brez oznak.
       and_the_tags: "in naslednjimi oznakami:"
-      and_no_tags: "in brez oznak."
-      failure:
-        subject: "[OpenStreetMap] Neuspeh uvoza datoteke GPX"
+      failure: 
         failed_to_import: " vsebovala neko napako, zaradi katere je ni bilo mogoÄe uvoziti. Napaka:"
-        more_info_1: "VeÄ informacij o moÅ¾nih napakah v datotekah GPX in kako se jim izogniti"
+        more_info_1: VeÄ informacij o moÅ¾nih napakah v datotekah GPX in kako se jim izogniti
         more_info_2: "si lahko preberete na:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] Neuspeh uvoza datoteke GPX"
+      greeting: Pozdravljeni,
+      success: 
+        loaded_successfully: "bila uspeÅ¡no uvoÅ¾ena z {{trace_points}} od vseh moÅ¾nih\n{{possible_points}} toÄk."
         subject: "[OpenStreetMap] Uspeh uvoza datoteke GPX"
-        loaded_successfully: |
-          bila uspeÅ¡no uvoÅ¾ena z {{trace_points}} od vseh moÅ¾nih 
-          {{possible_points}} toÄk.
-    signup_confirm:
+      with_description: z opisom
+      your_gpx_file: Izgleda, da je vaÅ¡a datoteka GPX
+    lost_password: 
+      subject: "[OpenStreetMap] Zahteva za ponastavitev gesla"
+    lost_password_html: 
+      click_the_link: Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla.
+      greeting: Pozdravljeni,
+      hopefully_you: Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org uporabniÅ¡kega raÄuna s tem naslovom e-poÅ¡te.
+    lost_password_plain: 
+      click_the_link: Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla.
+      greeting: Pozdravljeni,
+      hopefully_you_1: Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org
+      hopefully_you_2: uporabniÅ¡kega raÄuna s tem naslovom e-poÅ¡te.
+    message_notification: 
+      banner1: "*                    Ne odgovarjajte na to sporoÄilo.                     *"
+      banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
+      footer1: SporoÄilo lahko preberete tudi na {{readurl}}
+      footer2: in nanj odgovorite na naslovu {{replyurl}}
+      header: "Uporabnik {{from_user}}  vam je prek OpenStreetMap poslal novo sporoÄilo glede {{subject}}:"
+      hi: Pozdravljeni, {{to_user}},
+      subject: "[OpenStreetMap] {{user}} vam je poslal novo sporoÄilo"
+    signup_confirm: 
       subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
-    signup_confirm_plain:
-      greeting: "Pozdravljeni!"
-      hopefully_you: "Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki raÄun na"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Äe ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za "
-      click_the_link_2: "potrditev raÄuna in veÄ informacij o projektu OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: Äe ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za potrditev raÄuna in veÄ informacij o projektu OpenStreetMap.
+      current_user: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski poloÅ¾aj je na voljo v kategoriji <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Preberite si veÄ o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">v wiki-ju</a> ali <a href="http://www.opengeodata.org/">na opengeodata blog-u</a> ki vsebuje tudi <a href="http://www.opengeodata.org/?cat=13">zvoÄne podcast-e</a>!
+      greeting: Pozdravljeni!
+      hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki raÄun na
+      introductory_video: Ogledate si lahko {{introductory_video_link}}.
+      more_videos: Ogledate si lahko {{more_videos_link}}.
+      more_videos_here: Å¡e veÄ video posnetkov
+      user_wiki_page: PriporoÄljivo je, da si naredite svojo uporabniÅ¡ko wiki stran, ki naj vsebuje oznako kategorije, ki doloÄa vaÅ¡ poloÅ¾aj, npr <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Slovenia">[[Category:Users_in_Slovenia]]</a>.
+      video_to_openstreetmap: uvodni video posnetek o OpenStreetMap
+      wiki_signup: Lahko se <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">vpiÅ¡ete tudi na wiki projekta OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Äe ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za
+      click_the_link_2: potrditev raÄuna in veÄ informacij o projektu OpenStreetMap.
+      current_user_1: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski
+      current_user_2: "poloÅ¾aj je na voljo na naslovu:"
+      greeting: Pozdravljeni!
+      hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki raÄun na
       introductory_video: "Uvodni video posnetek si lahko pogledate na naslovu:"
       more_videos: "VeÄ video posnetkov je na naslovu:"
-      the_wiki: "VeÄ o projektu OpenStreetMap si preberite v wiki-ju:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "Blog o OpenStreetMap z zvoÄnimi podcasti je na OpenGeoData.org:"
+      the_wiki: "VeÄ o projektu OpenStreetMap si preberite v wiki-ju:"
+      user_wiki_1: PriporoÄljivo je, da si naredite svojo uporabniÅ¡ko wiki stran, ki naj vsebuje
+      user_wiki_2: oznako kategorije, ki doloÄa vaÅ¡ poloÅ¾aj, npr [[Category:Users_in_Slovenia]].
       wiki_signup: "Lahko se vpiÅ¡ete tudi na wiki projekta OpenStreetMap na naslovu:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "PriporoÄljivo je, da si naredite svojo uporabniÅ¡ko wiki stran, ki naj vsebuje"
-      user_wiki_2: "oznako kategorije, ki doloÄa vaÅ¡ poloÅ¾aj, npr [[Category:Users_in_Slovenia]]."
-      current_user_1: "Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski"
-      current_user_2: "poloÅ¾aj je na voljo na naslovu:"
-    signup_confirm_html:
-      greeting: "Pozdravljeni!"
-      hopefully_you: "Nekdo (najverjetneje vi) bi rad naredil uporabniÅ¡ki raÄun na"
-      click_the_link: "Äe ste to vi, dobrodoÅ¡li! Kliknite na spodnjo povezavo za potrditev raÄuna in veÄ informacij o projektu OpenStreetMap."
-      introductory_video: "Ogledate si lahko {{introductory_video_link}}."
-      video_to_openstreetmap: "uvodni video posnetek o OpenStreetMap"
-      more_videos: "Ogledate si lahko {{more_videos_link}}."
-      more_videos_here: "Å¡e veÄ video posnetkov"
-      get_reading: 'Preberite si veÄ o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">v wiki-ju</a> ali <a href="http://www.opengeodata.org/">na opengeodata blog-u</a> ki vsebuje tudi <a href="http://www.opengeodata.org/?cat=13">zvoÄne podcast-e</a>!'
-      wiki_signup: 'Lahko se <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">vpiÅ¡ete tudi na wiki projekta OpenStreetMap</a>.'
-      user_wiki_page: 'PriporoÄljivo je, da si naredite svojo uporabniÅ¡ko wiki stran, ki naj vsebuje oznako kategorije, ki doloÄa vaÅ¡ poloÅ¾aj, npr <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Slovenia">[[Category:Users_in_Slovenia]]</a>.'
-      current_user: 'Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski poloÅ¾aj je na voljo v kategoriji <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Potrdite svoj elektronski naslov"
-    email_confirm_plain:
-      greeting: "Pozdravljeni,"
-      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poÅ¡tnega naslova v"
-      hopefully_you_2: "{{server_url}} na {{new_address}}."
-      click_the_link: "Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
-    email_confirm_html:
-      greeting: "Pozdravljeni,"
-      hopefully_you: "Nekdo (upamo, da vi) je zahteval spremembo svojega e-poÅ¡tnega naslova v {{server_url}} na {{new_address}}."
-      click_the_link: "Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe."
-    lost_password:
-      subject: "[OpenStreetMap] Zahteva za ponastavitev gesla"
-    lost_password_plain:
-      greeting: "Pozdravljeni,"
-      hopefully_you_1: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org"
-      hopefully_you_2: "uporabniÅ¡kega raÄuna s tem naslovom e-poÅ¡te."
-      click_the_link: "Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
-    lost_password_html:
-      greeting: "Pozdravljeni,"
-      hopefully_you: "Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org uporabniÅ¡kega raÄuna s tem naslovom e-poÅ¡te."
-      click_the_link: "Äe ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla."
-  message:
-    inbox:
-      title: "Prejeta poÅ¡ta"
-      my_inbox: "Moja prejeta"
-      outbox: "poslana poÅ¡ta"
-      you_have: "Imate {{new_count}} novih, neprebranih in {{old_count}} starih, Å¾e prebranih sporoÄil"
-      from: "Od"
-      subject: "Zadeva"
-      date: "Datum"
-      no_messages_yet: "Prejeli niste Å¡e nobenih sporoÄil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas" 
-    message_summary:
-      unread_button: "OznaÄi kot neprebrano"
-      read_button: "OznaÄi kot prebrano"
-      reply_button: "Odgovori"
-      delete_button: "IzbriÅ¡i"
-    new:
-      title: "PoÅ¡iljanje sporoÄila"
-      send_message_to: "PoÅ¡lji novo sporoÄilo uporabniku {{name}}"
-      subject: "Zadeva"
-      body: "Besedilo"
-      send_button: "PoÅ¡lji"
-      back_to_inbox: "Nazaj na prejeto poÅ¡to"
-      message_sent: "SporoÄilo poslano"
-    no_such_user:
-      title: "Ni ustreznega uporabnika ali sporoÄila"
-      heading: "Ni ustreznega uporabnika ali sporoÄila"
-      body: "Oprostite, uporabnika s tem imenom ali sporoÄila s tem ID-jem ni"
-    outbox: 
-      title: "Poslana poÅ¡ta"
-      my_inbox: "Moja {{inbox_link}}"
-      inbox: "prejeta"
-      outbox: "poslana poÅ¡ta"
-      you_have_sent_messages: "Poslali ste {{sent_count}} sporoÄil"
-      to: "Za"
-      subject: "Zadeva"
-      date: "Datum"
-      no_sent_messages: "Poslali niste Å¡e nobenih sporoÄil. Zakaj ne bi stopili v stik z {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "ljudmi, ki kartirajo blizu vas"
-    read:
-      title: "Branje sporoÄila"
-      reading_your_messages: "Prebiranje vaÅ¡ih sporoÄil"
-      from: "Od"
-      subject: "Zadeva"
-      date: "Datum"
-      reply_button: "Odgovori"
-      unread_button: "OznaÄi kot neprebrano"
-      back_to_inbox: "Nazaj na prejeto poÅ¡to"
-      reading_your_sent_messages: "Prebiranje vaÅ¡ih poslanih sporoÄil"
-      to: "Za"
-      back_to_outbox: "Nazaj na poslano poÅ¡to"
-    sent_message_summary:
-      delete_button: "IzbriÅ¡i"
-    mark:
-      as_read: "SporoÄilo oznaÄeno kot prebrano"
-      as_unread: "SporoÄilo oznaÄeno kot neprebrano"
-    delete:
-      deleted: "SporoÄilo izbrisano"
-  site:
-    index:
-      js_1: "Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogoÄeno."
-      js_2: "OpenStreetMap za prikaz zemljevida uporablja Javascript."
-      js_3: 'Äe Javascripta ne morete omogoÄiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statiÄen pregledovalnik zemljevida Tiles@Home</a>.'
+  printable_name: 
+    with_version: "{{id}}, {{version}}. razliÄica"
+  site: 
+    edit: 
+      anon_edits_link_text: Pojasnilo zakaj je temu tako.
+      flash_player_required: Za uporabo Potlatch-a, urejevalnika OpenStreetMap potrebujete predvajalnik Flash. Lahko ga <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">prenesete iz Adobe.com</a>. Na voljo vam je tudi <a href="http://wiki.openstreetmap.org/wiki/Editing">veÄ drugih moÅ¾nosti</a> za urejanje zemljevida OpenStreetMap.
+      not_public: Svojih prispevkov Å¡e niste oznaÄili za javne.
+      not_public_description: Urejanje zemljevida ni mogoÄe dokler vaÅ¡i prispevki niso javni. OznaÄite jih lahko kot javne na {{user_page}}.
+      potlatch_unsaved_changes: Imate neshranjene spremembe. (Za shranjevanje v Potlatch-u, od-izberite trenutno pot ali vozliÅ¡Äe (v naÄinu v Å¾ivo), ali pa kliknite na gumb Save (shrani), Äe ga imate.)
+      user_page_link: strani vaÅ¡ega uporabniÅ¡kega raÄuna
+    index: 
+      js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogoÄeno.
+      js_2: OpenStreetMap za prikaz zemljevida uporablja Javascript.
+      js_3: Äe Javascripta ne morete omogoÄiti lahko poizkusite <a href="http://tah.openstreetmap.org/Browse/">statiÄen pregledovalnik zemljevida Tiles@Home</a>.
+      license: 
+        license_name: Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0
+        notice: "{{project_name}} z avtorji objavlja pod licenco {{license_name}}."
+        project_name: Projekt OpenStreetMap
       permalink: Trajna povezava
       shortlink: Kratka povezava
-      license:
-        notice: "{{project_name}} z avtorji objavlja pod licenco {{license_name}}."
-        license_name: "Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/deed.sl"
-        project_name: "Projekt OpenStreetMap"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "Svojih prispevkov Å¡e niste oznaÄili za javne."
-      not_public_description: "Urejanje zemljevida ni mogoÄe dokler vaÅ¡i prispevki niso javni. OznaÄite jih lahko kot javne na {{user_page}}."
-      user_page_link: strani vaÅ¡ega uporabniÅ¡kega raÄuna
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Pojasnilo zakaj je temu tako."
-      flash_player_required: 'Za uporabo Potlatch-a, urejevalnika OpenStreetMap potrebujete predvajalnik Flash. Lahko ga <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">prenesete iz Adobe.com</a>. Na voljo vam je tudi <a href="http://wiki.openstreetmap.org/wiki/Editing">veÄ drugih moÅ¾nosti</a> za urejanje zemljevida OpenStreetMap.'
-      potlatch_unsaved_changes: "Imate neshranjene spremembe. (Za shranjevanje v Potlatch-u, od-izberite trenutno pot ali vozliÅ¡Äe (v naÄinu v Å¾ivo), ali pa kliknite na gumb Save (shrani), Äe ga imate.)"
-    sidebar:
-      search_results: Rezultati iskanja
-      close: Zapri
-    search:
+    key: 
+      map_key: Legenda
+      map_key_tooltip: Legenda mapnik zemljevida na prikazanem nivoju poveÄave
+      table: 
+        entry: 
+          admin: Upravna razmejitev
+          allotments: VrtiÄki
+          apron: LetaliÅ¡ka ploÅ¡Äad; terminal
+          bridge: Krepka obroba = most
+          bridleway: Bridleway
+          brownfield: Brownfield site
+          building: Pomembna zgradba
+          byway: Byway
+          cable: Kabinska Å¾iÄnica; sedeÅ¾nica
+          cemetery: PokopaliÅ¡Äe
+          centre: Sports centre
+          commercial: Poslovno obmoÄje
+          common: Common; meadow
+          construction: Ceste v gradnji
+          cycleway: Kolesarska steza
+          destination: Dovoljeno za dostavo
+          farm: Kmetija
+          footway: PeÅ¡pot
+          forest: Forest
+          golf: IgriÅ¡Äe za Golf
+          heathland: GrmiÄevje
+          industrial: Industrijsko obmoÄje
+          lake: Jezero; vodni zbiralnik
+          military: VojaÅ¡ko podroÄje
+          motorway: Avtocesta
+          park: Park
+          permissive: Permissive access
+          pitch: Sports pitch
+          primary: Glavna cesta
+          private: Private access
+          rail: Å½eleznica
+          reserve: Naravni rezervat
+          resident: Naselje
+          retail: Trgovsko obmoÄje
+          runway: Vzletno-pristajalna steza; povezave
+          school: Å ola; univerza
+          secondary: Regionalna cesta
+          station: Å½elezniÅ¡ka postaja
+          subway: Podzemna Å¾eleznica
+          summit: Vrh
+          tourist: TuristiÄna znamenitost
+          track: Kolovoz
+          tram: Ozkotirna Å¾eleznica; tramvaj
+          trunk: Hitra cesta
+          tunnel: Ärtkana obroba = predor
+          unclassified: Ostale ceste izven naselij
+          unsurfaced: Neasfaltirana cesta
+          wood: Wood
+        heading: Legenda poveÄave {{zoom_level}}
+    search: 
       search: Iskanje
-      where_am_i: "Kje sem?"
-      submit_text: "IÅ¡Äi"
       search_help: "primeri: 'Bovec', 'PreÅ¡ernova, Celje', 'Å½ivalski vrt' ali 'vzpenjaÄa' <a href='http://wiki.openstreetmap.org/wiki/Search'>VeÄ primerov...</a>"
-    key:
-      map_key: "Legenda"
-      map_key_tooltip: "Legenda mapnik zemljevida na prikazanem nivoju poveÄave"
-      table:
-        heading: "Legenda poveÄave {{zoom_level}}"
-        entry:
-          motorway: "Avtocesta"
-          trunk: "Hitra cesta"
-          primary: "Glavna cesta"
-          secondary: "Regionalna cesta"
-          unclassified: "Ostale ceste izven naselij"
-          unsurfaced: "Neasfaltirana cesta"
-          track: "Kolovoz"
-          byway: "Byway"
-          bridleway: "Bridleway"
-          cycleway: "Kolesarska steza"
-          footway: "PeÅ¡pot"
-          rail: "Å½eleznica"
-          subway: "Podzemna Å¾eleznica"
-          tram: "Ozkotirna Å¾eleznica; tramvaj"
-          cable: "Kabinska Å¾iÄnica; sedeÅ¾nica"
-          runway: "Vzletno-pristajalna steza; povezave"
-          apron: "LetaliÅ¡ka ploÅ¡Äad; terminal"
-          admin: "Upravna razmejitev"
-          forest: "Forest"
-          wood: "Wood"
-          golf: "IgriÅ¡Äe za Golf"
-          park: "Park"
-          resident: "Naselje"
-          tourist: "TuristiÄna znamenitost"
-          common: "Common; meadow"
-          retail: "Trgovsko obmoÄje"
-          industrial: "Industrijsko obmoÄje"
-          commercial: "Poslovno obmoÄje"
-          heathland: "GrmiÄevje"
-          lake: "Jezero; vodni zbiralnik"
-          farm: "Kmetija"
-          brownfield: "Brownfield site"
-          cemetery: "PokopaliÅ¡Äe"
-          allotments: "VrtiÄki"
-          pitch: "Sports pitch"
-          centre: "Sports centre"
-          reserve: "Naravni rezervat"
-          military: "VojaÅ¡ko podroÄje"
-          school: "Å ola; univerza"
-          building: "Pomembna zgradba"
-          station: "Å½elezniÅ¡ka postaja"
-          summit: "Vrh"
-          tunnel: "Ärtkana obroba = predor"
-          bridge: "Krepka obroba = most"
-          private: "Private access"
-          permissive: "Permissive access"
-          destination: "Dovoljeno za dostavo"
-          construction: "Ceste v gradnji"
-  trace:
-    create:
-      upload_trace: "PoÅ¡lji GPS sled"
-      trace_uploaded: "VaÅ¡a datoteka z GPS sledjo v datoteki GPX je bila poslana na streÅ¾nik in Äaka na uvoz v bazo. To se ponavadi zgodi v roku pol ure. O uvozu boste obveÅ¡Äeni po elektronski poÅ¡ti." 
-    edit:
-      title: "Urejanje sledi {{name}}"
-      heading: "Urejanje sledi {{name}}"
+      submit_text: IÅ¡Äi
+      where_am_i: Kje sem?
+    sidebar: 
+      close: Zapri
+      search_results: Rezultati iskanja
+  trace: 
+    create: 
+      trace_uploaded: VaÅ¡a datoteka z GPS sledjo v datoteki GPX je bila poslana na streÅ¾nik in Äaka na uvoz v bazo. To se ponavadi zgodi v roku pol ure. O uvozu boste obveÅ¡Äeni po elektronski poÅ¡ti.
+      upload_trace: PoÅ¡lji GPS sled
+    delete: 
+      scheduled_for_deletion: Sled bo izbrisana
+    edit: 
+      description: "Opis:"
+      download: prenos
+      edit: uredi
       filename: "Ime datoteke:"
-      download: "prenos"
-      uploaded_at: "Poslano na streÅ¾nik:"
+      heading: Urejanje sledi {{name}}
+      map: zemljevid
+      owner: "Lastnik:"
       points: "ToÄk:"
+      save_button: Shrani spremembe
       start_coord: "ZaÄetna koordinata:"
-      map: "zemljevid"
-      edit: "uredi"
-      owner: "Lastnik:"
-      description: "Opis:"
       tags: "Oznake:"
-      tags_help: "loÄene z vejicami"
-      save_button: "Shrani spremembe"
-    no_such_user:
-      title: "Ni tega uporabnika"
-      heading: "Uporabnik {{user}} ne obstaja"
-      body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili."
-    trace_form:
-      upload_gpx: "PoÅ¡ljite datoteko GPX"
-      description: "Opis"
-      tags: "Oznake"
-      tags_help: "uporabite vejice"
-      public: "Javna?"
-      public_help: "Kaj to pomeni?"
-      public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "PoÅ¡lji"
-      help: "PomoÄ"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "Seznam le mojih in poÅ¡iljanje novih sledi"
-      see_all_traces: "Seznam vseh sledi"
-      see_your_traces: "Seznam vseh mojih sledi"
-      traces_waiting:
-        one: "V Äakalni vrsti na uvoz Äaka {{count}} sled. Prosim, razmislite o tem, da bi poÄakali, da se te sledi uvozijo preden poÅ¡ljete nove in s tem ne podaljÅ¡ujete vrste drugim uporabnikom."
-        two: "V Äakalni vrsti na uvoz Äakata {{count}} sledi. Prosim, razmislite o tem, da bi poÄakali, da se te sledi uvozijo preden poÅ¡ljete nove in s tem ne podaljÅ¡ujete vrste drugim uporabnikom."
-        few: "V Äakalni vrsti na uvoz Äakajo {{count}} sledi. Prosim, razmislite o tem, da bi poÄakali, da se te sledi uvozijo preden poÅ¡ljete nove in s tem ne podaljÅ¡ujete vrste drugim uporabnikom."
-        other: "V Äakalni vrsti na uvoz Äaka {{count}} sledi. Prosim, razmislite o tem, da bi poÄakali, da se te sledi uvozijo preden poÅ¡ljete nove in s tem ne podaljÅ¡ujete vrste drugim uporabnikom."
-    trace_optionals:
-      tags: "Oznake"
-    view:
-      title: "Prikaz sledi {{name}}"
-      heading: "Prikaz sledi {{name}}" 
-      pending: "ÄAKAJOÄA"
+      tags_help: loÄene z vejicami
+      title: Urejanje sledi {{name}}
+      uploaded_at: "Poslano na streÅ¾nik:"
+    list: 
+      public_traces: Javne GPS sledi
+      public_traces_from: Javne GPS sledi uporabnika {{user}}
+      tagged_with: " z oznako {{tags}}"
+      your_traces: VaÅ¡e GPS sledi
+    make_public: 
+      made_public: Sled je postala javna
+    no_such_user: 
+      body: Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili.
+      heading: Uporabnik {{user}} ne obstaja
+      title: Ni tega uporabnika
+    trace: 
+      ago: "{{time_in_words_ago}} nazaj"
+      by: Uporabnik
+      edit: uredi
+      edit_map: Uredi zemljevid
+      in: v
+      map: zemljevid
+      more: veÄ
+      pending: ÄAKAJOÄA
+      private: ZASEBNA
+      public: JAVNA
+      trace_details: Ogled podrobnnosti zemljevida
+      view_map: Ogled zemljevida
+    trace_form: 
+      description: Opis
+      help: PomoÄ
+      tags: Oznake
+      tags_help: uporabite vejice
+      upload_button: PoÅ¡lji
+      upload_gpx: PoÅ¡ljite datoteko GPX
+    trace_header: 
+      see_all_traces: Seznam vseh sledi
+      see_just_your_traces: Seznam le mojih in poÅ¡iljanje novih sledi
+      see_your_traces: Seznam vseh mojih sledi
+    trace_optionals: 
+      tags: Oznake
+    trace_paging_nav: 
+      of: od
+      showing: Prikaz strani
+    view: 
+      delete_track: IzbriÅ¡i to sled
+      description: "Opis:"
+      download: prenos
+      edit: uredi
+      edit_track: Uredi to sled
       filename: "Datoteka:"
-      download: "prenos"
-      uploaded: "Poslano:"
+      heading: Prikaz sledi {{name}}
+      map: zemljevid
+      none: Brez
+      owner: "Lastnik:"
+      pending: ÄAKAJOÄA
       points: "ToÄk:"
       start_coordinates: "ZaÄetna koordinata:"
-      map: "zemljevid"
-      edit: "uredi"
-      owner: "Lastnik:"
-      description: "Opis:"
       tags: "Oznake:"
-      none: "Brez"
-      make_public: "Naj ta sled postane trajno javna"
-      edit_track: "Uredi to sled"
-      delete_track: "IzbriÅ¡i to sled"
-      trace_not_found: "Sledi ni bilo mogoÄe najti!" 
-    trace_paging_nav:
-      showing: "Prikaz strani"
-      of: "od"
-    trace:
-      pending: "ÄAKAJOÄA"
-      count_points:
-        one: "{{count}} toÄka"
-        two: "{{count}} toÄi"
-        few: "{{count}} toÄke"
-        other: "{{count}} toÄk"
-      ago: "{{time_in_words_ago}} nazaj" 
-      more: "veÄ"
-      trace_details: "Ogled podrobnnosti zemljevida"
-      view_map: "Ogled zemljevida"
-      edit: "uredi"
-      edit_map: "Uredi zemljevid"
-      public: "JAVNA"
-      private: "ZASEBNA"
-      by: "Uporabnik"
-      in: "v"
-      map: "zemljevid" 
-    list: 
-      public_traces: "Javne GPS sledi" 
-      your_traces: "VaÅ¡e GPS sledi" 
-      public_traces_from: "Javne GPS sledi uporabnika {{user}}" 
-      tagged_with: " z oznako {{tags}}" 
-    delete: 
-      scheduled_for_deletion: "Sled bo izbrisana" 
-    make_public: 
-      made_public: "Sled je postala javna" 
-  user:
-    login:
-      title: "Prijava"
-      heading: "Prijava"
-      please login: "Prijavite se ali {{create_user_link}}."
-      create_account: "ustvarite uporabniÅ¡ki raÄun"
+      title: Prikaz sledi {{name}}
+      trace_not_found: Sledi ni bilo mogoÄe najti!
+      uploaded: "Poslano:"
+  user: 
+    account: 
+      email never displayed publicly: (nikoli javno objavljen)
+      flash update success: Podatki o uporabniku so bili uspeÅ¡no posodobljeni.
+      flash update success confirm needed: Podatki o uporabniku so bili uspeÅ¡no posodobljeni. Preverite svojo e-poÅ¡to in potrdite spremembo e-poÅ¡tnega naslova.
+      home location: "DomaÄa lokacija:"
+      latitude: "Zemljepisna Å¡irina:"
+      longitude: "Zemljepisna dolÅ¾ina:"
+      make edits public button: Naj bodo vsi moji prispevki javni
+      my settings: Moje nastavitve
+      no home location: Niste nastavili vaÅ¡e domaÄe lokacije.
+      preferred languages: "Jezikovne preference:"
+      profile description: "Opis uporabnika:"
+      public editing: 
+        disabled: OnemogoÄeno in ne morete urejati podatkov. Vsi vaÅ¡i prejÅ¡nji prispevki so anonimni.
+        disabled link text: Zakaj ne morem urejati?
+        enabled: OmogoÄeno. Niste anonimni in lahko urejate podatke.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Kaj je to?
+        heading: "Javno urejanje:"
+      return to profile: Nazaj na profil
+      save changes button: Shrani spremembe
+      title: Urejanje uporabniÅ¡kega raÄuna
+      update home location on click: Posodobi domaÄo lokacijo ob kliku na zemljevid?
+    confirm: 
+      button: Potrdi
+      failure: UporabniÅ¡li raÄun je Å¾e bil potrjen s tem Å¾etonom.
+      heading: Potrdite uporabniÅ¡ki raÄun
+      press confirm button: Za aktivacijo vaÅ¡ega uporabniÅ¡kega raÄuna pritisnite na gumb Potrdi spodaj.
+      success: VaÅ¡ uporabniÅ¡ki raÄun je potrjen. Hvala, da ste se vpisali!
+    confirm_email: 
+      button: Potrdi
+      failure: Naslov elektronske poÅ¡te je Å¾e bil potrjen s tem Å¾etonom.
+      heading: Potrdite spremembo naslova e-poÅ¡te
+      press confirm button: Za potrditev spremembe vaÅ¡ega naslova elektronske poÅ¡te pritisnite na gumb Potrdi spodaj.
+      success: VaÅ¡ naslov elektronske poÅ¡te je potrjen. Hvala, da ste se vpisali!
+    friend_map: 
+      nearby mapper: "BliÅ¾nji kartograf: [[nearby_user]]"
+      your location: VaÅ¡a lokacija
+    go_public: 
+      flash success: Vsi vaÅ¡i prispevki so sedaj javni in sedaj imate pravico do urejanja.
+    login: 
+      account not active: Oprostite, vaÅ¡ uporabniÅ¡ki raÄun Å¡e ni aktiven.<br />Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporoÄilu za potrditev uporabniÅ¡kega raÄuna.
+      auth failure: Oprostite, prijava s temi podatki ni uspela.
+      create_account: ustvarite uporabniÅ¡ki raÄun
       email or username: "Naslov e-poÅ¡te ali uporabniÅ¡ko ime:"
+      heading: Prijava
+      login_button: Prijava
+      lost password link: Ste pozabili geslo?
       password: "Geslo:"
-      lost password link: "Ste pozabili geslo?"
-      login_button: "Prijava"
-      account not active: "Oprostite, vaÅ¡ uporabniÅ¡ki raÄun Å¡e ni aktiven.<br />Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporoÄilu za potrditev uporabniÅ¡kega raÄuna."
-      auth failure: "Oprostite, prijava s temi podatki ni uspela."
-    lost_password:
-      title: "pozabljeno geslo"
-      heading: "Ste pozabili geslo?"
+      please login: Prijavite se ali {{create_user_link}}.
+      title: Prijava
+    lost_password: 
       email address: "Naslove e-poÅ¡te:"
-      new password button: "PoÅ¡lji mi novo geslo"
-      notice email on way: "Elektronsko sporoÄilo z vsemi potrebnimi podatki za nastavitev novega gesla je Å¾e na poti."
-      notice email cannot find: "Oprostite, a vneÅ¡enega naslova elektronske poÅ¡te ni bilo mogoÄe najti."
-    reset_password:
-      title: "ponastavitev gesla"
-      flash changed check mail: "VaÅ¡e geslo je bilo spremenjeno in je Å¾e na poti v vaÅ¡ poÅ¡tni predal :-)"
-      flash token bad: "Tega Å¾etona ni bilo mogoÄe najti.  Predlagamo, da preverite naslov URL."
-    new:
-      title: "Nov uporabniÅ¡ki raÄun"
-      heading: "Ustvarite si uporabniÅ¡ki raÄun"
-      no_auto_account_create: "Na Å¾alost vam trenutno ne moremo samodejno ustvariti uporabniÅ¡kega raÄuna."
-      contact_webmaster: 'Prosimo, piÅ¡ite <a href="mailto:webmaster@openstreetmap.org">webmastru</a> (v angleÅ¡Äini) in se dogovorite za ustvarjenje uporabniÅ¡kega raÄuna - potrudili se bomo za ÄimprejÅ¡njo obravnavo vaÅ¡ega zahtevka.'
-      fill_form: "Izpolnite obrazec in poslali vam bomo elektronsko sporoÄilce s katerim boste aktivirali svoj uporabniÅ¡ki raÄun."
-      license_agreement: 'Z ustvarjanjem uporabniÅ¡kega raÄuna se strinjate, da bodo vsi vaÅ¡i prispevki, ki jih boste poslali na openstreetmap.org in vsi podatki, ki jih boste ustvarili z orodji, ki se povezujejo z openstreetmap.org licencirani (ne-izkljuÄno) pod pogoji <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">te Creative Commons licence (Priznanje avtorstva-Deljenje pod enakimi pogoji)</a>.'
-      email address: "Naslov e-poÅ¡te:"
+      heading: Ste pozabili geslo?
+      new password button: PoÅ¡lji mi novo geslo
+      notice email cannot find: Oprostite, a vneÅ¡enega naslova elektronske poÅ¡te ni bilo mogoÄe najti.
+      notice email on way: Elektronsko sporoÄilo z vsemi potrebnimi podatki za nastavitev novega gesla je Å¾e na poti.
+      title: pozabljeno geslo
+    make_friend: 
+      already_a_friend: Z uporabnikom {{name}} ste Å¾e prijatelja.
+      failed: Oprostite, uporabnika {{name}} ni bilo mogoÄe dodati med prijatelje.
+      success: Uporabnik {{name}} je sedaj vaÅ¡ prijatelj.
+    new: 
       confirm email address: "Potrdite naslov e-poÅ¡te:"
-      not displayed publicly: 'Ne bo javno objavljeno (glej <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="politika zasebnosti z razdelkom o naslovu elektronske poÅ¡te v wiki-ju">politiko zasebnosti</a>)'
+      confirm password: "Potrdite geslo:"
+      contact_webmaster: Prosimo, piÅ¡ite <a href="mailto:webmaster@openstreetmap.org">webmastru</a> (v angleÅ¡Äini) in se dogovorite za ustvarjenje uporabniÅ¡kega raÄuna - potrudili se bomo za ÄimprejÅ¡njo obravnavo vaÅ¡ega zahtevka.
       display name: "Prikazno ime:"
+      email address: "Naslov e-poÅ¡te:"
+      fill_form: Izpolnite obrazec in poslali vam bomo elektronsko sporoÄilce s katerim boste aktivirali svoj uporabniÅ¡ki raÄun.
+      flash create success message: UporabniÅ¡ki raÄun narejen. Preverite vaÅ¡ poÅ¡tni predal s sporoÄilom za potrditev in Å¾e boste lahko kartirali :-)<br /><br />Prosimo, upoÅ¡tevajte, da prijava v sistem ne bo mogoÄa dokler ne potrdite svojega e-poÅ¡tnega naslova.<br /><br />V kolikor vaÅ¡ filter neÅ¾elene poÅ¡te (anti spam filter) pred sprejemom sporoÄil neznanih poÅ¡iljateljev zahteva potrditev vas prosimo, da poÅ¡iljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih poÅ¡iljateljev. Sistem paÄ ne zmore dovolj inteligentno odgovarjati na vse take zahtevke.
+      heading: Ustvarite si uporabniÅ¡ki raÄun
+      license_agreement: Z ustvarjanjem uporabniÅ¡kega raÄuna se strinjate, da bodo vsi vaÅ¡i prispevki, ki jih boste poslali na openstreetmap.org in vsi podatki, ki jih boste ustvarili z orodji, ki se povezujejo z openstreetmap.org licencirani (ne-izkljuÄno) pod pogoji <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">te Creative Commons licence (Priznanje avtorstva-Deljenje pod enakimi pogoji)</a>.
+      no_auto_account_create: Na Å¾alost vam trenutno ne moremo samodejno ustvariti uporabniÅ¡kega raÄuna.
+      not displayed publicly: Ne bo javno objavljeno (glej <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="politika zasebnosti z razdelkom o naslovu elektronske poÅ¡te v wiki-ju">politiko zasebnosti</a>)
       password: "Geslo:"
-      confirm password: "Potrdite geslo:"
-      signup: "Å½elim se vpisati"
-      flash create success message: "UporabniÅ¡ki raÄun narejen. Preverite vaÅ¡ poÅ¡tni predal s sporoÄilom za potrditev in Å¾e boste lahko kartirali :-)<br /><br />Prosimo, upoÅ¡tevajte, da prijava v sistem ne bo mogoÄa dokler ne potrdite svojega e-poÅ¡tnega naslova.<br /><br />V kolikor vaÅ¡ filter neÅ¾elene poÅ¡te (anti spam filter) pred sprejemom sporoÄil neznanih poÅ¡iljateljev zahteva potrditev vas prosimo, da poÅ¡iljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih poÅ¡iljateljev. Sistem paÄ ne zmore dovolj inteligentno odgovarjati na vse take zahtevke."
-    no_such_user:
-      title: "Ni tega uporabnika"
-      heading: "Uporabnik {{user}} ne obstaja"
-      body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili."
-    view:
+      signup: Å½elim se vpisati
+      title: Nov uporabniÅ¡ki raÄun
+    no_such_user: 
+      body: Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite Ärkovanje in povezavo, ki ste jo kliknili.
+      heading: Uporabnik {{user}} ne obstaja
+      title: Ni tega uporabnika
+    remove_friend: 
+      not_a_friend: Uporabnika {{name}} ni med vaÅ¡imi prijatelji.
+      success: Uporabnika {{name}} ste odstranili izmed svojih prijateljev.
+    reset_password: 
+      flash token bad: Tega Å¾etona ni bilo mogoÄe najti.  Predlagamo, da preverite naslov URL.
+      title: ponastavitev gesla
+    set_home: 
+      flash success: DomaÄa lokacija uspeÅ¡no shranjena
+    view: 
+      add as friend: dodaj med prijatelje
+      add image: Dodaj sliko
+      ago: ({{time_in_words_ago}} nazaj)
+      change your settings: uredite vaÅ¡e nastavitve
+      delete image: IzbriÅ¡i sliko
+      description: Opis
+      diary: dnevnik
+      edits: prispevki
+      if set location: Äe nastavite vaÅ¡o domaÄo lokacijo bo tu prikazan lep zemljevd in podobne dobrote. DomaÄo lokacijo lahko nastavite v {{settings_link}}.
+      mapper since: "Kartograf od:"
       my diary: moj dnevnik
-      new diary entry: nov vnos v dnevnik
       my edits: moji prispevki
-      my traces: moje sledi
       my settings: moje nastavitve
+      my traces: moje sledi
+      nearby users: "BliÅ¾nji uporabniki:"
+      new diary entry: nov vnos v dnevnik
+      no friends: Niste Å¡e dodali nobenih prijateljev.
+      no home location: DomaÄa lokacija uporabnika Å¡e ni bila nastavljena.
+      no nearby users: Ni uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i bliÅ¾ini.
+      remove as friend: odstrani izmed prijateljev
       send message: poÅ¡lji sporoÄilo
-      diary: dnevnik
-      edits: prispevki
+      settings_link_text: vaÅ¡ih nastavitvah
       traces: sledi
-      remove as friend: odstrani izmed prijateljev
-      add as friend: dodaj med prijatelje
-      mapper since: "Kartograf od:"
-      ago: "({{time_in_words_ago}} nazaj)"
-      user image heading: Slika uporabnika
-      delete image: IzbriÅ¡i sliko
       upload an image: Objavite sliko
-      add image: Dodaj sliko
-      description: Opis
+      user image heading: Slika uporabnika
       user location: Lokacija uporabnika
-      no home location: "DomaÄa lokacija uporabnika Å¡e ni bila nastavljena."
-      if set location: "Äe nastavite vaÅ¡o domaÄo lokacijo bo tu prikazan lep zemljevd in podobne dobrote. DomaÄo lokacijo lahko nastavite v {{settings_link}}."
-      settings_link_text: vaÅ¡ih nastavitvah
       your friends: VaÅ¡i prijatelji
-      no friends: Niste Å¡e dodali nobenih prijateljev.
-      km away:
-        one: "Oddaljen {{count}} kilometer"
-        two: "Oddaljen {{count}} kilometra"
-        few: "Oddaljen {{count}} kilometre"
-        other: "Oddaljen {{count}} kilometrov"
-      m away:
-        one: "Oddaljen {{count}} meter"
-        two: "Oddaljen {{count}} metra"
-        few: "Oddaljen {{count}} metre"
-        other: "Oddaljen {{count}} metrov"
-      nearby users: "BliÅ¾nji uporabniki:"
-      no nearby users: "Ni uporabnikov, ki bi priznali, da kartirajo v vaÅ¡i bliÅ¾ini."
-      change your settings: uredite vaÅ¡e nastavitve
-    friend_map:
-      your location: VaÅ¡a lokacija
-      nearby mapper: "BliÅ¾nji kartograf: [[nearby_user]]"
-    account:
-      title: "Urejanje uporabniÅ¡kega raÄuna"
-      my settings: Moje nastavitve
-      email never displayed publicly: "(nikoli javno objavljen)"
-      public editing:
-        heading: "Javno urejanje:"
-        enabled: "OmogoÄeno. Niste anonimni in lahko urejate podatke."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "Kaj je to?"
-        disabled: "OnemogoÄeno in ne morete urejati podatkov. Vsi vaÅ¡i prejÅ¡nji prispevki so anonimni."
-        disabled link text: "Zakaj ne morem urejati?"
-      profile description: "Opis uporabnika:"
-      preferred languages: "Jezikovne preference:"
-      home location: "DomaÄa lokacija:"
-      no home location: "Niste nastavili vaÅ¡e domaÄe lokacije."
-      latitude: "Zemljepisna Å¡irina:"
-      longitude: "Zemljepisna dolÅ¾ina:"
-      update home location on click: "Posodobi domaÄo lokacijo ob kliku na zemljevid?"
-      save changes button: Shrani spremembe
-      make edits public button: Naj bodo vsi moji prispevki javni
-      return to profile: Nazaj na profil
-      flash update success confirm needed: "Podatki o uporabniku so bili uspeÅ¡no posodobljeni. Preverite svojo e-poÅ¡to in potrdite spremembo e-poÅ¡tnega naslova."
-      flash update success: "Podatki o uporabniku so bili uspeÅ¡no posodobljeni."
-    confirm:
-      heading: Potrdite uporabniÅ¡ki raÄun
-      press confirm button: "Za aktivacijo vaÅ¡ega uporabniÅ¡kega raÄuna pritisnite na gumb Potrdi spodaj."
-      button: Potrdi
-      success: "VaÅ¡ uporabniÅ¡ki raÄun je potrjen. Hvala, da ste se vpisali!"
-      failure: "UporabniÅ¡li raÄun je Å¾e bil potrjen s tem Å¾etonom."
-    confirm_email:
-      heading: Potrdite spremembo naslova e-poÅ¡te
-      press confirm button: "Za potrditev spremembe vaÅ¡ega naslova elektronske poÅ¡te pritisnite na gumb Potrdi spodaj."
-      button: Potrdi
-      success: "VaÅ¡ naslov elektronske poÅ¡te je potrjen. Hvala, da ste se vpisali!"
-      failure: "Naslov elektronske poÅ¡te je Å¾e bil potrjen s tem Å¾etonom."
-    set_home:
-      flash success: "DomaÄa lokacija uspeÅ¡no shranjena"
-    go_public:
-      flash success: "Vsi vaÅ¡i prispevki so sedaj javni in sedaj imate pravico do urejanja."
-    make_friend:
-      success: "Uporabnik {{name}} je sedaj vaÅ¡ prijatelj."
-      failed: "Oprostite, uporabnika {{name}} ni bilo mogoÄe dodati med prijatelje."
-      already_a_friend: "Z uporabnikom {{name}} ste Å¾e prijatelja."
-    remove_friend:
-      success: "Uporabnika {{name}} ste odstranili izmed svojih prijateljev."
-      not_a_friend: "Uporabnika {{name}} ni med vaÅ¡imi prijatelji."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c741faaeb..5a0493f0d 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1,993 +1,959 @@
-vi:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Danh sÃ¡ch Äiá»u khiá»n Truy cáº­p"
-      changeset: "Bá» thay Äá»i"
-      changeset_tag: "Tháº» Bá» thay Äá»i"
-      country: "Quá»c gia"
-      diary_comment: "BÃ¬nh luáº­n Nháº­t kÃ½"
-      diary_entry: "Má»¥c Nháº­t kÃ½"
-      friend: "NgÆ°á»i báº¡n"
-      language: "NgÃ´n ngá»¯"
-      message: "ThÆ°"
-      node: "Ná»t"
-      node_tag: "Tháº» Ná»t"
-      notifier: "TrÃ¬nh bÃ¡o"
-      old_node: "Ná»t CÅ©"
-      old_node_tag: "Tháº» Ná»t CÅ©"
-      old_relation: "Quan há» CÅ©"
-      old_relation_member: "ThÃ nh viÃªn Quan há» CÅ©"
-      old_relation_tag: "Tháº» Quan há» CÅ©"
-      old_way: "Lá»i CÅ©"
-      old_way_node: "Ná»t Lá»i CÅ©"
-      old_way_tag: "Tháº» Lá»i CÅ©"
-      relation: "Quan há»"
-      relation_member: "ThÃ nh viÃªn Quan há»"
-      relation_tag: "Tháº» Quan há»"
-      session: "PhiÃªn"
-      trace: "Tuyáº¿n ÄÆ°á»ng"
-      tracepoint: "Äiá»m Tuyáº¿n ÄÆ°á»ng"
-      tracetag: "Tháº» Tuyáº¿n ÄÆ°á»ng"
-      user: "NgÆ°á»i dÃ¹ng"
-      user_preference: "TÃ¹y chá»n CÃ¡ nhÃ¢n"
-      user_token: "Dáº¥u hiá»u CÃ¡ nhÃ¢n"
-      way: "Lá»i"
-      way_node: "Ná»t Lá»i"
-      way_tag: "Tháº» Lá»i"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Ná»i dung"
-      diary_entry:
-        user: "NgÆ°á»i dÃ¹ng"
-        title: "TiÃªu Äá»"
-        latitude: "VÄ© Äá»"
-        longitude: "Kinh Äá»"
-        language: "NgÃ´n ngá»¯"
-      friend:
-        user: "NgÆ°á»i dÃ¹ng"
-        friend: "NgÆ°á»i báº¡n"
-      trace:
-        user: "NgÆ°á»i dÃ¹ng"
-        visible: "Tháº¥y ÄÆ°á»£c"
-        name: "TÃªn"
-        size: "KÃ­ch cá»¡"
-        latitude: "VÄ© Äá»"
-        longitude: "Kinh Äá»"
-        public: "CÃ´ng khai"
-        description: "MiÃªu táº£"
-      message:
-        sender: "NgÆ°á»i gá»­i"
-        title: "TiÃªu Äá»"
-        body: "Ná»i dung"
-        recipient: "NgÆ°á»i nháº­n"
-      user:
-        email: "ThÆ° Äiá»n tá»­"
-        active: "TÃ­ch cá»±c"
-        display_name: "TÃªn Hiá»n thá»"
-        description: "MiÃªu táº£"
-        languages: "NgÃ´n ngá»¯"
-        pass_crypt: "Máº­t kháº©u"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: "Hiá»n thá»"
-    edit: "Sá»­a Äá»i"
-    coordinates: "Tá»a Äá»:"
-  browse:
-    changeset:
-      title: "Bá» thay Äá»i"
+vi: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Ná»i dung
+      diary_entry: 
+        language: NgÃ´n ngá»¯
+        latitude: VÄ© Äá»
+        longitude: Kinh Äá»
+        title: TiÃªu Äá»
+        user: NgÆ°á»i dÃ¹ng
+      friend: 
+        friend: NgÆ°á»i báº¡n
+        user: NgÆ°á»i dÃ¹ng
+      message: 
+        body: Ná»i dung
+        recipient: NgÆ°á»i nháº­n
+        sender: NgÆ°á»i gá»­i
+        title: TiÃªu Äá»
+      trace: 
+        description: MiÃªu táº£
+        latitude: VÄ© Äá»
+        longitude: Kinh Äá»
+        name: TÃªn
+        public: CÃ´ng khai
+        size: KÃ­ch cá»¡
+        user: NgÆ°á»i dÃ¹ng
+        visible: Tháº¥y ÄÆ°á»£c
+      user: 
+        active: TÃ­ch cá»±c
+        description: MiÃªu táº£
+        display_name: TÃªn Hiá»n thá»
+        email: ThÆ° Äiá»n tá»­
+        languages: NgÃ´n ngá»¯
+        pass_crypt: Máº­t kháº©u
+    models: 
+      acl: Danh sÃ¡ch Äiá»u khiá»n Truy cáº­p
+      changeset: Bá» thay Äá»i
+      changeset_tag: Tháº» Bá» thay Äá»i
+      country: Quá»c gia
+      diary_comment: BÃ¬nh luáº­n Nháº­t kÃ½
+      diary_entry: Má»¥c Nháº­t kÃ½
+      friend: NgÆ°á»i báº¡n
+      language: NgÃ´n ngá»¯
+      message: ThÆ°
+      node: Ná»t
+      node_tag: Tháº» Ná»t
+      notifier: TrÃ¬nh bÃ¡o
+      old_node: Ná»t CÅ©
+      old_node_tag: Tháº» Ná»t CÅ©
+      old_relation: Quan há» CÅ©
+      old_relation_member: ThÃ nh viÃªn Quan há» CÅ©
+      old_relation_tag: Tháº» Quan há» CÅ©
+      old_way: Lá»i CÅ©
+      old_way_node: Ná»t Lá»i CÅ©
+      old_way_tag: Tháº» Lá»i CÅ©
+      relation: Quan há»
+      relation_member: ThÃ nh viÃªn Quan há»
+      relation_tag: Tháº» Quan há»
+      session: PhiÃªn
+      trace: Tuyáº¿n ÄÆ°á»ng
+      tracepoint: Äiá»m Tuyáº¿n ÄÆ°á»ng
+      tracetag: Tháº» Tuyáº¿n ÄÆ°á»ng
+      user: NgÆ°á»i dÃ¹ng
+      user_preference: TÃ¹y chá»n CÃ¡ nhÃ¢n
+      user_token: Dáº¥u hiá»u CÃ¡ nhÃ¢n
+      way: Lá»i
+      way_node: Ná»t Lá»i
+      way_tag: Tháº» Lá»i
+  browse: 
+    changeset: 
       changeset: "Bá» thay Äá»i: {{id}}"
-      download: "Táº£i xuá»ng {{changeset_xml_link}} hoáº·c {{osmchange_xml_link}}"
-      changesetxml: "Bá» thay Äá»i XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Bá» thay Äá»i {{id}}"
-        title_comment: "Bá» thay Äá»i {{id}} - {{comment}}"
-    changeset_navigation:
-      user:
-        name_tooltip: "Xem cÃ¡c ÄÃ³ng gÃ³p cá»§a {{user}}"
-        prev_tooltip: "ÄÃ³ng gÃ³p trÆ°á»c cá»§a {{user}}"
-        next_tooltip: "ÄÃ³ng gÃ³p sau cá»§a {{user}}"
-      all:
-        prev_tooltip: "Bá» thay Äá»i trÆ°á»c"
-        next_tooltip: "Bá» thay Äá»i sau"
-    changeset_details:
-      created_at: "LÃºc Táº¡o:"
-      closed_at: "LÃºc ÄÃ³ng:"
+      changesetxml: Bá» thay Äá»i XML
+      download: Táº£i xuá»ng {{changeset_xml_link}} hoáº·c {{osmchange_xml_link}}
+      feed: 
+        title: Bá» thay Äá»i {{id}}
+        title_comment: Bá» thay Äá»i {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Bá» thay Äá»i
+    changeset_details: 
       belongs_to: "NgÆ°á»i Sá»­a Äá»i:"
       bounding_box: "Há»p bao:"
-      no_bounding_box: "KhÃ´ng lÆ°u há»p bao cá»§a bá» thay Äá»i nÃ y."
-      show_area_box: "Hiá»n Há»p vÃ¹ng"
-      box: "há»p"
-      has_nodes:
+      box: há»p
+      closed_at: "LÃºc ÄÃ³ng:"
+      created_at: "LÃºc Táº¡o:"
+      has_nodes: 
         one: "CÃ³ {{count}} ná»t sau:"
         other: "CÃ³ {{count}} ná»t sau:"
-      has_ways:
-        one: "CÃ³ {{count}} lá»i sau:"
-        other: "CÃ³ {{count}} lá»i sau:"
-      has_relations:
+      has_relations: 
         one: "CÃ³ {{count}} quan há» sau:"
         other: "CÃ³ {{count}} quan há» sau:"
+      has_ways: 
+        one: "CÃ³ {{count}} lá»i sau:"
+        other: "CÃ³ {{count}} lá»i sau:"
+      no_bounding_box: KhÃ´ng lÆ°u há»p bao cá»§a bá» thay Äá»i nÃ y.
+      show_area_box: Hiá»n Há»p vÃ¹ng
+    changeset_navigation: 
+      all: 
+        next_tooltip: Bá» thay Äá»i sau
+        prev_tooltip: Bá» thay Äá»i trÆ°á»c
+      user: 
+        name_tooltip: Xem cÃ¡c ÄÃ³ng gÃ³p cá»§a {{user}}
+        next_tooltip: ÄÃ³ng gÃ³p sau cá»§a {{user}}
+        prev_tooltip: ÄÃ³ng gÃ³p trÆ°á»c cá»§a {{user}}
     common_details: 
+      changeset_comment: "MiÃªu táº£:"
       edited_at: "LÃºc Sá»­a Äá»i:"
       edited_by: "NgÆ°á»i Sá»­a Äá»i:"
-      version: "PhiÃªn báº£n:"
       in_changeset: "Thuá»c bá» thay Äá»i:"
-      changeset_comment: "MiÃªu táº£:"
-    containing_relation:
-      entry: "Quan há» {{relation_name}}"
+      version: "PhiÃªn báº£n:"
+    containing_relation: 
+      entry: Quan há» {{relation_name}}
       entry_role: "Quan há» {{relation_name}} (vai trÃ²: {{relation_role}})"
-    map:
-      loading: "Äang táº£i..."
-      deleted: "ÄÃ£ xÃ³a"
-      larger:
-        area: "Xem vÃ¹ng trÃªn báº£n Äá» rá»ng hÆ¡n"
-        node: "Xem ná»t trÃªn báº£n Äá» rá»ng hÆ¡n"
-        way: "Xem lá»i trÃªn báº£n Äá» rá»ng hÆ¡n"
-        relation: "Xem quan há» trÃªn báº£n Äá» rá»ng hÆ¡n"
-    node_details:
+    map: 
+      deleted: ÄÃ£ xÃ³a
+      larger: 
+        area: Xem vÃ¹ng trÃªn báº£n Äá» rá»ng hÆ¡n
+        node: Xem ná»t trÃªn báº£n Äá» rá»ng hÆ¡n
+        relation: Xem quan há» trÃªn báº£n Äá» rá»ng hÆ¡n
+        way: Xem lá»i trÃªn báº£n Äá» rá»ng hÆ¡n
+      loading: Äang táº£i...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}}, hoáº·c {{edit_link}}"
+      download_xml: Táº£i xuá»ng XML
+      edit: sá»­a Äá»i
+      node: Ná»t
+      node_title: "Ná»t: {{node_name}}"
+      view_history: xem lá»ch sá»­
+    node_details: 
       coordinates: "Tá»a Äá»:"
       part_of: "Trá»±c thuá»c:"
-    node_history:
-      node_history: "Lá»ch sá»­ Ná»t"
-      node_history_title: "Lá»ch sá»­ Ná»t: {{node_name}}"
+    node_history: 
       download: "{{download_xml_link}} hoáº·c {{view_details_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_details: "xem chi tiáº¿t"
-    node:
-      node: "Ná»t"
-      node_title: "Ná»t: {{node_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}}, hoáº·c {{edit_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_history: "xem lá»ch sá»­"
-      edit: "sá»­a Äá»i"
-    not_found:
-      sorry: "Ráº¥t tiáº¿c, khÃ´ng thá» tÃ¬m tháº¥y {{type}} vá»i ID {{id}}."
-      type:
-        node: "ná»t"
-        way: "lá»i"
-        relation: "quan há»"
-        changeset: "bá» thay Äá»i"
-    paging_nav:
-      showing_page: "Äang hiá»n trang"
-      of: "trong"
-    relation_details:
+      download_xml: Táº£i xuá»ng XML
+      node_history: Lá»ch sá»­ Ná»t
+      node_history_title: "Lá»ch sá»­ Ná»t: {{node_name}}"
+      view_details: xem chi tiáº¿t
+    not_found: 
+      sorry: Ráº¥t tiáº¿c, khÃ´ng thá» tÃ¬m tháº¥y {{type}} vá»i ID {{id}}.
+      type: 
+        changeset: bá» thay Äá»i
+        node: ná»t
+        relation: quan há»
+        way: lá»i
+    paging_nav: 
+      of: trong
+      showing_page: Äang hiá»n trang
+    relation: 
+      download: "{{download_xml_link}} hoáº·c {{view_history_link}}"
+      download_xml: Táº£i xuá»ng XML
+      relation: Quan há»
+      relation_title: "Quan há»: {{relation_name}}"
+      view_history: xem lá»ch sá»­
+    relation_details: 
       members: "ThÃ nh viÃªn:"
       part_of: "Trá»±c thuá»c:"
-    relation_history:
-      relation_history: "Lá»ch sá»­ Quan há»"
-      relation_history_title: "Lá»ch sá»­ Quan há»: {{relation_name}}"
+    relation_history: 
       download: "{{download_xml_link}} hoáº·c {{view_details_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_details: "xem chi tiáº¿t"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: Táº£i xuá»ng XML
+      relation_history: Lá»ch sá»­ Quan há»
+      relation_history_title: "Lá»ch sá»­ Quan há»: {{relation_name}}"
+      view_details: xem chi tiáº¿t
+    relation_member: 
       entry_role: "{{type}} {{name}} vá»i vai trÃ² {{role}}"
-      type:
-        node: "Ná»t"
-        way: "Lá»i"
-        relation: "Quan há»"
-    relation:
-      relation: "Quan há»"
-      relation_title: "Quan há»: {{relation_name}}"
-      download: "{{download_xml_link}} hoáº·c {{view_history_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_history: "xem lá»ch sá»­"
-    start:
-      view_data: "Xem dá»¯ liá»u cá»§a pháº§n báº£n Äá» Äang xem"
-      manually_select: "Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng"
-    start_rjs:
-      data_layer_name: "Dá»¯ liá»u"
-      data_frame_title: "Dá»¯ liá»u"
-      zoom_or_select: "PhÃ³ng to hoáº·c chá»n vÃ¹ng báº£n Äá» Äá» xem"
-      drag_a_box: "KÃ©o há»p trÃªn báº£n Äá» Äá» chá»n vÃ¹ng"
-      manually_select: "Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng"
+      type: 
+        node: Ná»t
+        relation: Quan há»
+        way: Lá»i
+    start: 
+      manually_select: Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng
+      view_data: Xem dá»¯ liá»u cá»§a pháº§n báº£n Äá» Äang xem
+    start_rjs: 
+      data_frame_title: Dá»¯ liá»u
+      data_layer_name: Dá»¯ liá»u
+      details: Chi tiáº¿t
+      drag_a_box: KÃ©o há»p trÃªn báº£n Äá» Äá» chá»n vÃ¹ng
+      edited_by_user_at_timestamp: ÄÆ°á»£c sá»­a Äá»i bá»i [[user]] lÃºc [[timestamp]]
+      history_for_feature: Lá»ch sá»­ [[feature]]
+      load_data: Táº£i Dá»¯ liá»u
       loaded_an_area_with_num_features: "Báº¡n ÄÃ£ táº£i vÃ¹ng chá»©a [[num_features]] nÃ©t. Má»t sá» trÃ¬nh duyá»t khÃ´ng hiá»n thá» ná»i nhiá»u dá»¯ liá»u nhÆ° tháº¿. NÃ³i chung, trÃ¬nh duyá»t hoáº¡t Äá»ng tá»t khi nÃ o chá» cÃ³ 100 nÃ©t cÃ¹ng lÃºc: hÆ¡n thÃ¬ trÃ¬nh duyá»t sáº½ cháº­m cháº¡p. Náº¿u báº¡n cháº¯c cháº¯n muá»n xem dá»¯ liá»u nÃ y, hÃ£y báº¥m nÃºt á» dÆ°á»i."
-      load_data: "Táº£i Dá»¯ liá»u"
+      loading: Äang táº£i...
+      manually_select: Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng
+      object_list: 
+        api: Láº¥y vÃ¹ng nÃ y dÃ¹ng API
+        back: Liá»t kÃª cÃ¡c Äá»i tÆ°á»£ng
+        details: Chi tiáº¿t
+        heading: Danh sÃ¡ch Äá»i tÆ°á»£ng
+        history: 
+          type: 
+            node: Ná»t [[id]]
+            way: Lá»i [[id]]
+        selected: 
+          type: 
+            node: Ná»t [[id]]
+            way: Lá»i [[id]]
+        type: 
+          node: Ná»t
+          way: Lá»i
+      private_user: ngÆ°á»i bÃ­ máº­t
+      show_history: Xem Lá»ch sá»­
       unable_to_load_size: "KhÃ´ng thá» táº£i: Há»p bao vá»i cá»¡ [[bbox_size]] quÃ¡ lá»n (pháº£i nhá» hÆ¡n {{max_bbox_size}})"
-      loading: "Äang táº£i..."
-      show_history: "Xem Lá»ch sá»­"
-      wait: "Xin chá»..."
-      history_for_feature: "Lá»ch sá»­ [[feature]]"
-      details: "Chi tiáº¿t"
-      private_user: "ngÆ°á»i bÃ­ máº­t"
-      edited_by_user_at_timestamp: "ÄÆ°á»£c sá»­a Äá»i bá»i [[user]] lÃºc [[timestamp]]"
-      object_list:
-        heading: "Danh sÃ¡ch Äá»i tÆ°á»£ng"
-        back: "Liá»t kÃª cÃ¡c Äá»i tÆ°á»£ng"
-        type:
-          node: "Ná»t"
-          way: "Lá»i"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Láº¥y vÃ¹ng nÃ y dÃ¹ng API"
-        details: "Chi tiáº¿t"
-        selected:
-          type:
-            node: "Ná»t [[id]]"
-            way: "Lá»i [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Ná»t [[id]]"
-            way: "Lá»i [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: Xin chá»...
+      zoom_or_select: PhÃ³ng to hoáº·c chá»n vÃ¹ng báº£n Äá» Äá» xem
+    tag_details: 
       tags: "Tháº»:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}}, hoáº·c {{edit_link}}"
+      download_xml: Táº£i xuá»ng XML
+      edit: sá»­a Äá»i
+      view_history: xem lá»ch sá»­
+      way: Lá»i
+      way_title: "Lá»i: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: cÅ©ng thuá»c vá» lá»i {{related_ways}}
+        other: cÅ©ng thuá»c vá» cÃ¡c lá»i {{related_ways}}
       nodes: "Ná»t:"
       part_of: "Thuá»c vá»:"
-      also_part_of:
-        one: "cÅ©ng thuá»c vá» lá»i {{related_ways}}"
-        other: "cÅ©ng thuá»c vá» cÃ¡c lá»i {{related_ways}}"
-    way_history:
-      way_history: "Lá»ch sá»­ Lá»i"
-      way_history_title: "Lá»ch sá»­ Lá»i: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} hoáº·c {{view_details_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_details: "xem chi tiáº¿t"
-    way:
-      way: "Lá»i"
-      way_title: "Lá»i: {{way_name}}"
-      download: "{{download_xml_link}}, {{view_history_link}}, hoáº·c {{edit_link}}"
-      download_xml: "Táº£i xuá»ng XML"
-      view_history: "xem lá»ch sá»­"
-      edit: "sá»­a Äá»i"
-  changeset:
+      download_xml: Táº£i xuá»ng XML
+      view_details: xem chi tiáº¿t
+      way_history: Lá»ch sá»­ Lá»i
+      way_history_title: "Lá»ch sá»­ Lá»i: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: VÃ´ danh
+      big_area: (lá»n)
+      no_comment: (khÃ´ng cÃ³)
+      no_edits: (khÃ´ng cÃ³ thay Äá»i)
+      show_area_box: hiá»n há»p vÃ¹ng
+      still_editing: (Äang má»)
+      view_changeset_details: Xem chi tiáº¿t cá»§a bá» thay Äá»i
     changeset_paging_nav: 
-      showing_page: "Äang hiá»n trang"
-      of: "trong"
-    changeset:
-      id: "#{{id}}"
-      still_editing: "(Äang má»)"
-      anonymous: "VÃ´ danh"
-      no_comment: "(khÃ´ng cÃ³)"
-      no_edits: "(khÃ´ng cÃ³ thay Äá»i)"
-      show_area_box: "hiá»n há»p vÃ¹ng"
-      big_area: "(lá»n)"
-      view_changeset_details: "Xem chi tiáº¿t cá»§a bá» thay Äá»i"
-    changesets:
-      id: "ID"
-      saved_at: "LÃºc LÆ°u"
-      user: "NgÆ°á»i dÃ¹ng"
-      comment: "MiÃªu táº£"
-      area: "VÃ¹ng"
-    list:
-      title: "CÃ¡c bá» thay Äá»i"
-      description: "Nhá»¯ng ÄÃ³ng gÃ³p gáº§n ÄÃ¢y"
-      title_user: "Nhá»¯ng bá» thay Äá»i cá»§a {{user}}"
-      title_bbox: "Nhá»¯ng bá» thay Äá»i á» trong {{bbox}}"
-      title_user_bbox: "v bá» thay Äá»i cá»§a {{user}} á» trong {{bbox}}"
-
-      heading: "CÃ¡c bá» thay Äá»i"
-      heading_user: "CÃ¡c bá» thay Äá»i"
-      heading_bbox: "CÃ¡c bá» thay Äá»i"
-      heading_user_bbox: "CÃ¡c bá» thay Äá»i"
-
-      description: "Nhá»¯ng thay Äá»i gáº§n ÄÃ¢y"
-      description_user: "Nhá»¯ng bá» thay Äá»i cá»§a {{user}}"
-      description_bbox: "Nhá»¯ng bá» thay Äá»i á» trong {{bbox}}"
-      description_user_bbox: "Nhá»¯ng bá» thay Äá»i cá»§a {{user}} á» trong {{bbox}}"
-  diary_entry:
-    new:
-      title: "Má»¥c Nháº­t kÃ½ Má»i"
-    list:
-      title: "CÃ¡c Nháº­t kÃ½ CÃ¡ nhÃ¢n"
-      user_title: "Nháº­t kÃ½ cá»§a {{user}}"
-      in_language_title: "CÃ¡c Má»¥c Nháº­t kÃ½ báº±ng {{language}}"
-      new: "Má»¥c Nháº­t kÃ½ Má»i"
-      new_title: "Soáº¡n tháº£o má»¥c má»i trong nháº­t kÃ½ cá»§a báº¡n"
-      no_entries: "ChÆ°a cÃ³ má»¥c nháº­t kÃ½"
-      recent_entries: "Má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y:"
-      older_entries: "Má»¥c TrÆ°á»c"
-      newer_entries: "Má»¥c Sau"
-    edit:
-      title: "Sá»­a Äá»i má»¥c nháº­t kÃ½"
-      subject: "TiÃªu Äá»:"
+      of: trong
+      showing_page: Äang hiá»n trang
+    changesets: 
+      area: VÃ¹ng
+      comment: MiÃªu táº£
+      id: ID
+      saved_at: LÃºc LÆ°u
+      user: NgÆ°á»i dÃ¹ng
+    list: 
+      description: Nhá»¯ng thay Äá»i gáº§n ÄÃ¢y
+      description_bbox: Nhá»¯ng bá» thay Äá»i á» trong {{bbox}}
+      description_user: Nhá»¯ng bá» thay Äá»i cá»§a {{user}}
+      description_user_bbox: Nhá»¯ng bá» thay Äá»i cá»§a {{user}} á» trong {{bbox}}
+      heading: CÃ¡c bá» thay Äá»i
+      heading_bbox: CÃ¡c bá» thay Äá»i
+      heading_user: CÃ¡c bá» thay Äá»i
+      heading_user_bbox: CÃ¡c bá» thay Äá»i
+      title: CÃ¡c bá» thay Äá»i
+      title_bbox: Nhá»¯ng bá» thay Äá»i á» trong {{bbox}}
+      title_user: Nhá»¯ng bá» thay Äá»i cá»§a {{user}}
+      title_user_bbox: v bá» thay Äá»i cá»§a {{user}} á» trong {{bbox}}
+  diary_entry: 
+    diary_comment: 
+      comment_from: BÃ¬nh luáº­n cá»§a {{link_user}} lÃºc {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 bÃ¬nh luáº­n
+        other: "{{count}} bÃ¬nh luáº­n"
+      comment_link: BÃ¬nh luáº­n vá» má»¥c nÃ y
+      edit_link: Sá»­a Äá»i má»¥c nÃ y
+      posted_by: ÄÆ°á»£c ÄÄng bá»i {{link_user}} lÃºc {{created}} báº±ng {{language_link}}
+      reply_link: Tráº£ lá»i má»¥c nÃ y
+    edit: 
       body: "Ná»i dung:"
       language: "NgÃ´n ngá»¯:"
-      location: "Vá» trÃ­:"
       latitude: "VÄ© Äá»:"
+      location: "Vá» trÃ­:"
       longitude: "Kinh Äá»:"
-      use_map_link: "sá»­ dá»¥ng báº£n Äá»"
-      save_button: "LÆ°u"
-      marker_text: "Vá» trÃ­ cá»§a má»¥c nháº­t kÃ½"
-    view:
-      title: "CÃ¡c Nháº­t kÃ½ CÃ¡ nhÃ¢n | {{user}}"
-      user_title: "Nháº­t kÃ½ cá»§a {{user}}"
-      leave_a_comment: "BÃ¬nh luáº­n"
-      login_to_leave_a_comment: "{{login_link}} Äá» bÃ¬nh luáº­n"
-      login: "ÄÄng nháº­p"
-      save_button: "LÆ°u"
-    no_such_entry:
-      title: "Má»¥c nháº­t kÃ½ khÃ´ng tá»n táº¡i"
+      marker_text: Vá» trÃ­ cá»§a má»¥c nháº­t kÃ½
+      save_button: LÆ°u
+      subject: "TiÃªu Äá»:"
+      title: Sá»­a Äá»i má»¥c nháº­t kÃ½
+      use_map_link: sá»­ dá»¥ng báº£n Äá»
+    feed: 
+      all: 
+        description: Nhá»¯ng má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y cá»§a ngÆ°á»i dÃ¹ng OpenStreetMap
+        title: CÃ¡c má»¥c nháº­t kÃ½ OpenStreetMap
+      language: 
+        description: Nhá»¯ng má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y cá»§a ngÆ°á»i dÃ¹ng OpenStreetMap báº±ng {{language_name}}
+        title: CÃ¡c má»¥c nháº­t kÃ½ OpenStreetMap báº±ng {{language_name}}
+      user: 
+        description: Nhá»¯ng má»¥c gáº§n ÄÃ¢y trong nháº­t kÃ½ OpenStreetMap cá»§a {{user}}
+        title: CÃ¡c má»¥c nháº­t kÃ½ cá»§a {{user}}
+    list: 
+      in_language_title: CÃ¡c Má»¥c Nháº­t kÃ½ báº±ng {{language}}
+      new: Má»¥c Nháº­t kÃ½ Má»i
+      new_title: Soáº¡n tháº£o má»¥c má»i trong nháº­t kÃ½ cá»§a báº¡n
+      newer_entries: Má»¥c Sau
+      no_entries: ChÆ°a cÃ³ má»¥c nháº­t kÃ½
+      older_entries: Má»¥c TrÆ°á»c
+      recent_entries: "Má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y:"
+      title: CÃ¡c Nháº­t kÃ½ CÃ¡ nhÃ¢n
+      user_title: Nháº­t kÃ½ cá»§a {{user}}
+    new: 
+      title: Má»¥c Nháº­t kÃ½ Má»i
+    no_such_entry: 
+      body: Ráº¥t tiáº¿c, khÃ´ng cÃ³ má»¥c hoáº·c bÃ¬nh luáº­n trong nháº­t kÃ½ vá»i ID {{id}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai.
       heading: "KhÃ´ng cÃ³ má»¥c vá»i ID: {{id}}"
-      body: "Ráº¥t tiáº¿c, khÃ´ng cÃ³ má»¥c hoáº·c bÃ¬nh luáº­n trong nháº­t kÃ½ vá»i ID {{id}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai."
-    no_such_user:
-      title: "NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i"
-      heading: "NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i"
-      body: "Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai."
-    diary_entry:
-      posted_by: "ÄÆ°á»£c ÄÄng bá»i {{link_user}} lÃºc {{created}} báº±ng {{language_link}}"
-      comment_link: "BÃ¬nh luáº­n vá» má»¥c nÃ y"
-      reply_link: "Tráº£ lá»i má»¥c nÃ y"
-      comment_count:
-        one: "1 bÃ¬nh luáº­n"
-        other: "{{count}} bÃ¬nh luáº­n"
-      edit_link: "Sá»­a Äá»i má»¥c nÃ y"
-    diary_comment:
-      comment_from: "BÃ¬nh luáº­n cá»§a {{link_user}} lÃºc {{comment_created_at}}"
-    feed:
-      user:
-        title: "CÃ¡c má»¥c nháº­t kÃ½ cá»§a {{user}}"
-        description: "Nhá»¯ng má»¥c gáº§n ÄÃ¢y trong nháº­t kÃ½ OpenStreetMap cá»§a {{user}}"
-      language:
-        title: "CÃ¡c má»¥c nháº­t kÃ½ OpenStreetMap báº±ng {{language_name}}"
-        description: "Nhá»¯ng má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y cá»§a ngÆ°á»i dÃ¹ng OpenStreetMap báº±ng {{language_name}}"
-      all:
-        title: "CÃ¡c má»¥c nháº­t kÃ½ OpenStreetMap"
-        description: "Nhá»¯ng má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y cá»§a ngÆ°á»i dÃ¹ng OpenStreetMap"
-  export:
-    start:
-      area_to_export: "VÃ¹ng Äá» Xuáº¥t"
-      manually_select: "Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng"
-      format_to_export: "Äá»nh dáº¡ng Xuáº¥t"
-      osm_xml_data: "Dá»¯ liá»u OpenStreetMap XML"
-      mapnik_image: "HÃ¬nh Mapnik"
-      osmarender_image: "HÃ¬nh Osmarender"
-      embeddable_html: "HTML Äá» NhÃºng"
-      licence: "Giáº¥y phÃ©p"
-      export_details: 'Dá»¯ liá»u OpenStreetMap ÄÆ°á»£c phÃ©p sá»­ dá»¥ng theo <a href="http://creativecommons.org/licenses/by-sa/2.0/">giáº¥y phÃ©p Ghi cÃ´ngâChia sáº» tÆ°Æ¡ng tá»± Creative Commons 2.0</a>.'
-      options: "TÃ¹y chá»n"
-      format: "Äá»nh dáº¡ng"
-      scale: "Tá»· lá»"
-      max: "tá»i Äa"
-      image_size: "KÃ­ch cá»¡ HÃ¬nh"
-      zoom: "Thu phÃ³ng"
-      add_marker: "ÄÃ¡nh dáº¥u vÃ o báº£n Äá»"
+      title: Má»¥c nháº­t kÃ½ khÃ´ng tá»n táº¡i
+    no_such_user: 
+      body: Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai.
+      heading: NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i
+      title: NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i
+    view: 
+      leave_a_comment: BÃ¬nh luáº­n
+      login: ÄÄng nháº­p
+      login_to_leave_a_comment: "{{login_link}} Äá» bÃ¬nh luáº­n"
+      save_button: LÆ°u
+      title: CÃ¡c Nháº­t kÃ½ CÃ¡ nhÃ¢n | {{user}}
+      user_title: Nháº­t kÃ½ cá»§a {{user}}
+  export: 
+    start: 
+      add_marker: ÄÃ¡nh dáº¥u vÃ o báº£n Äá»
+      area_to_export: VÃ¹ng Äá» Xuáº¥t
+      embeddable_html: HTML Äá» NhÃºng
+      export_button: Xuáº¥t
+      export_details: Dá»¯ liá»u OpenStreetMap ÄÆ°á»£c phÃ©p sá»­ dá»¥ng theo <a href="http://creativecommons.org/licenses/by-sa/2.0/">giáº¥y phÃ©p Ghi cÃ´ngâChia sáº» tÆ°Æ¡ng tá»± Creative Commons 2.0</a>.
+      format: Äá»nh dáº¡ng
+      format_to_export: Äá»nh dáº¡ng Xuáº¥t
+      image_size: KÃ­ch cá»¡ HÃ¬nh
       latitude: "VÄ© Äá»:"
+      licence: Giáº¥y phÃ©p
       longitude: "Kinh Äá»:"
-      output: "Äáº§u ra"
-      paste_html: "DÃ¡n HTML Äá» nhÃºng vÃ o trang Web"
-      export_button: "Xuáº¥t"
-    start_rjs:
-      export: "Xuáº¥t"
-      drag_a_box: "KÃ©o há»p trÃªn báº£n Äá» Äá» chá»n vÃ¹ng"
-      manually_select: "Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng"
-      click_add_marker: "Nháº¥n chuá»t vÃ o báº£n Äá» Äá» ÄÃ¡nh dáº¥u"
-      change_marker: "Thay Äá»i vá» trÃ­ ÄÃ¡nh dáº¥u"
-      add_marker: "ÄÃ¡nh dáº¥u vÃ o báº£n Äá»"
-      view_larger_map: "Xem Báº£n Äá» Rá»ng hÆ¡n"
-  geocoder:
-    search:
-      title:
-        latlon: 'Káº¿t quáº£ <a href="http://www.openstreetmap.org/">ná»i bá»</a>'
-        us_postcode: 'Káº¿t quáº£ <a href="http://www.geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Káº¿t quáº£ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Káº¿t quáº£ <a href="http://www.geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'Káº¿t quáº£ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Káº¿t quáº£ <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{distance}} vá» phÃ­a {{direction}} cá»§a {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} vá» phÃ­a {{parentdirection}} cá»§a {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} tá»« <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'Vá» trÃ­ tá»« <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
-        cities: "ThÃ nh phá»"
-        towns: "Thá» xÃ£"
-        places: "Äá»a Äiá»m"
-    description_osm_namefinder:
+      manually_select: Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng
+      mapnik_image: HÃ¬nh Mapnik
+      max: tá»i Äa
+      options: TÃ¹y chá»n
+      osm_xml_data: Dá»¯ liá»u OpenStreetMap XML
+      osmarender_image: HÃ¬nh Osmarender
+      output: Äáº§u ra
+      paste_html: DÃ¡n HTML Äá» nhÃºng vÃ o trang Web
+      scale: Tá»· lá»
+      zoom: Thu phÃ³ng
+    start_rjs: 
+      add_marker: ÄÃ¡nh dáº¥u vÃ o báº£n Äá»
+      change_marker: Thay Äá»i vá» trÃ­ ÄÃ¡nh dáº¥u
+      click_add_marker: Nháº¥n chuá»t vÃ o báº£n Äá» Äá» ÄÃ¡nh dáº¥u
+      drag_a_box: KÃ©o há»p trÃªn báº£n Äá» Äá» chá»n vÃ¹ng
+      export: Xuáº¥t
+      manually_select: Chá»n vÃ¹ng khÃ¡c thá»§ cÃ´ng
+      view_larger_map: Xem Báº£n Äá» Rá»ng hÆ¡n
+  geocoder: 
+    description: 
+      title: 
+        geonames: Vá» trÃ­ tá»« <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} tá»« <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: ThÃ nh phá»
+        places: Äá»a Äiá»m
+        towns: Thá» xÃ£
+    description_osm_namefinder: 
       prefix: "{{distance}} vá» phÃ­a {{direction}} cá»§a {{type}}"
-    results:
-      no_results: "KhÃ´ng tÃ¬m tháº¥y káº¿t quáº£"
-    distance:
-      zero: "khÃ´ng tá»i 1 km"
-      one: "khoáº£ng 1 km"
-      other: "khoáº£ng {{count}} km"
-    direction:
-      south_west: "tÃ¢y nam"
-      south: "nam"
-      south_east: "ÄÃ´ng nam"
-      east: "ÄÃ´ng"
-      north_east: "ÄÃ´ng báº¯c"
-      north: "báº¯c"
-      north_west: "tÃ¢y báº¯c"
-      west: "tÃ¢y"
-  layouts:
-    project_name:
-      # in <title>
-      title: "OpenStreetMap"
-      # in <h1>
-      h1: "OpenStreetMap"
-    logo:
-      alt_text: "Biá»u trÆ°ng OpenStreetMap"
-    welcome_user: "Hoan nghÃªnh, {{user_link}}"
-    welcome_user_link_tooltip: "Trang cÃ¡ nhÃ¢n cá»§a báº¡n"
-    home: "nhÃ "
-    home_tooltip: "Vá» vá» trÃ­ nhÃ "
-    inbox: "há»p thÆ° ({{count}})"
-    inbox_tooltip:
-      zero: "Há»p thÆ° cá»§a báº¡n khÃ´ng cÃ³ thÆ° chÆ°a Äá»c"
-      one: "Há»p thÆ° cá»§a báº¡n cÃ³ 1 thÆ° chÆ°a Äá»c"
-      other: "Há»p thÆ° cá»§a báº¡n cÃ³ {{count}} thÆ° chÆ°a Äá»c"
-    logout: "ÄÄng xuáº¥t"
-    logout_tooltip: "ÄÄng xuáº¥t"
-    log_in: "ÄÄng nháº­p"
-    log_in_tooltip: "ÄÄng nháº­p vá»i tÃ i khoáº£n ÄÃ£ tá»n táº¡i"
-    sign_up: "ÄÄng kÃ½"
-    sign_up_tooltip: "Má» tÃ i khoáº£n Äá» sá»­a Äá»i"
-    view: "Xem"
-    view_tooltip: "Xem báº£n Äá»"
-    edit: "Sá»­a Äá»i"
-    edit_tooltip: "Sá»­a Äá»i báº£n Äá»"
-    history: "Lá»ch sá»­"
-    history_tooltip: "Lá»ch sá»­ bá» thay Äá»i"
-    export: "Xuáº¥t"
-    export_tooltip: "Xuáº¥t dá»¯ liá»u báº£n Äá»"
-    gps_traces: "Tuyáº¿n ÄÆ°á»ng GPS"
-    gps_traces_tooltip: "Quáº£n lÃ½ tuyáº¿n ÄÆ°á»ng"
-    user_diaries: "Nháº­t kÃ½ CÃ¡ nhÃ¢n"
-    user_diaries_tooltip: "Äá»c cÃ¡c nháº­t kÃ½ cÃ¡ nhÃ¢n"
-    tag_line: "Báº£n Äá» Wiki cá»§a Tháº¿ giá»i Má»"
-    intro_1: "OpenStreetMap lÃ  báº£n Äá» tháº¿ giá»i nguá»n má», do nhá»¯ng ngÆ°á»i nhÆ° báº¡n váº½."
-    intro_2: "OpenStreetMap cho phÃ©p xem, sá»­a Äá»i, vÃ  sá»­ dá»¥ng dá»¯ liá»u Äá»a lÃ½ má»t cÃ¡ch cá»ng tÃ¡c á» má»i nÆ¡i trÃªn tháº¿ giá»i."
-    intro_3: "OpenStreetMap hoáº¡t Äá»ng do sá»± há» trá»£ hosting cá»§a {{ucl}} vÃ  {{bytemark}}."
-    intro_3_ucl: "Trung tÃ¢m VR táº¡i UCL"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "CÆ¡ sá» dá»¯ liá»u OpenStreetMap Äang ngoáº¡i tuyáº¿n trong lÃºc Äang thá»±c hiá»n nhá»¯ng cÃ´ng viá»c báº£o quáº£n cÆ¡ sá» dá»¯ liá»u cáº§n thiáº¿t."
-    osm_read_only: "CÆ¡ sá» dá»¯ liá»u OpenStreetMap Äang bá» khÃ³a khÃ´ng ÄÆ°á»£c sá»­a Äá»i trong lÃºc Äang thá»±c hiá»n nhá»¯ng cÃ´ng viá»c báº£o quáº£n cÆ¡ sá» dá»¯ liá»u cáº§n thiáº¿t."
-    donate: "Há» trá»£ OpenStreetMap báº±ng cÃ¡ch {{link}} cho Quá»¹ NÃ¢ng cáº¥p Pháº§n cá»©ng."
-    donate_link_text: "quyÃªn gÃ³p"
-    help_wiki: "Trá»£ giÃºp &amp; Wiki"
-    help_wiki_tooltip: "Site trá»£ giÃºp &amp; wiki cá»§a dá»± Ã¡n"
-    help_wiki_url: "http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi"
-    news_blog: "Blog Tin tá»©c"
-    news_blog_tooltip: "Blog cÃ³ tin tá»©c vá» OpenStreetMap, dá»¯ liá»u Äá»a lÃ½ má», v.v."
-    shop: "Tiá»m"
-    shop_tooltip: "Tiá»m bÃ¡n hÃ ng hÃ³a OpenStreetMap"
-    shop_url: "http://wiki.openstreetmap.org/wiki/Merchandise?uselang=vi"
-    sotm: "Má»i tham gia Há»i nghá» OpenStreetMap 2009, The State of the Map (TrÃ¬nh tráº¡ng Báº£n Äá»), ngÃ y 10-12 thÃ¡ng 7 táº¡i Amsterdam!"
-    alt_donation: "QuyÃªn gÃ³p"
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} ÄÃ£ bÃ¬nh luáº­n vá» má»¥c nháº­t kÃ½ cá»§a báº¡n"
+    direction: 
+      east: ÄÃ´ng
+      north: báº¯c
+      north_east: ÄÃ´ng báº¯c
+      north_west: tÃ¢y báº¯c
+      south: nam
+      south_east: ÄÃ´ng nam
+      south_west: tÃ¢y nam
+      west: tÃ¢y
+    distance: 
+      one: khoáº£ng 1 km
+      other: khoáº£ng {{count}} km
+      zero: khÃ´ng tá»i 1 km
+    results: 
+      no_results: KhÃ´ng tÃ¬m tháº¥y káº¿t quáº£
+    search: 
+      title: 
+        ca_postcode: Káº¿t quáº£ <a href="http://www.geocoder.ca/">Geocoder.CA</a>
+        geonames: Káº¿t quáº£ <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Káº¿t quáº£ <a href="http://www.openstreetmap.org/">ná»i bá»</a>
+        osm_namefinder: Káº¿t quáº£ <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: Káº¿t quáº£ <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Káº¿t quáº£ <a href="http://www.geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} vá» phÃ­a {{parentdirection}} cá»§a {{parentname}})"
+      suffix_place: ", {{distance}} vá» phÃ­a {{direction}} cá»§a {{placename}}"
+  layouts: 
+    alt_donation: QuyÃªn gÃ³p
+    donate: Há» trá»£ OpenStreetMap báº±ng cÃ¡ch {{link}} cho Quá»¹ NÃ¢ng cáº¥p Pháº§n cá»©ng.
+    donate_link_text: quyÃªn gÃ³p
+    edit: Sá»­a Äá»i
+    edit_tooltip: Sá»­a Äá»i báº£n Äá»
+    export: Xuáº¥t
+    export_tooltip: Xuáº¥t dá»¯ liá»u báº£n Äá»
+    gps_traces: Tuyáº¿n ÄÆ°á»ng GPS
+    gps_traces_tooltip: Quáº£n lÃ½ tuyáº¿n ÄÆ°á»ng
+    help_wiki: Trá»£ giÃºp &amp; Wiki
+    help_wiki_tooltip: Site trá»£ giÃºp &amp; wiki cá»§a dá»± Ã¡n
+    help_wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi
+    history: Lá»ch sá»­
+    history_tooltip: Lá»ch sá»­ bá» thay Äá»i
+    home: nhÃ 
+    home_tooltip: Vá» vá» trÃ­ nhÃ 
+    inbox: há»p thÆ° ({{count}})
+    inbox_tooltip: 
+      one: Há»p thÆ° cá»§a báº¡n cÃ³ 1 thÆ° chÆ°a Äá»c
+      other: Há»p thÆ° cá»§a báº¡n cÃ³ {{count}} thÆ° chÆ°a Äá»c
+      zero: Há»p thÆ° cá»§a báº¡n khÃ´ng cÃ³ thÆ° chÆ°a Äá»c
+    intro_1: OpenStreetMap lÃ  báº£n Äá» tháº¿ giá»i nguá»n má», do nhá»¯ng ngÆ°á»i nhÆ° báº¡n váº½.
+    intro_2: OpenStreetMap cho phÃ©p xem, sá»­a Äá»i, vÃ  sá»­ dá»¥ng dá»¯ liá»u Äá»a lÃ½ má»t cÃ¡ch cá»ng tÃ¡c á» má»i nÆ¡i trÃªn tháº¿ giá»i.
+    intro_3: OpenStreetMap hoáº¡t Äá»ng do sá»± há» trá»£ hosting cá»§a {{ucl}} vÃ  {{bytemark}}.
+    intro_3_ucl: Trung tÃ¢m VR táº¡i UCL
+    log_in: ÄÄng nháº­p
+    log_in_tooltip: ÄÄng nháº­p vá»i tÃ i khoáº£n ÄÃ£ tá»n táº¡i
+    logo: 
+      alt_text: Biá»u trÆ°ng OpenStreetMap
+    logout: ÄÄng xuáº¥t
+    logout_tooltip: ÄÄng xuáº¥t
+    news_blog: Blog Tin tá»©c
+    news_blog_tooltip: Blog cÃ³ tin tá»©c vá» OpenStreetMap, dá»¯ liá»u Äá»a lÃ½ má», v.v.
+    osm_offline: CÆ¡ sá» dá»¯ liá»u OpenStreetMap Äang ngoáº¡i tuyáº¿n trong lÃºc Äang thá»±c hiá»n nhá»¯ng cÃ´ng viá»c báº£o quáº£n cÆ¡ sá» dá»¯ liá»u cáº§n thiáº¿t.
+    osm_read_only: CÆ¡ sá» dá»¯ liá»u OpenStreetMap Äang bá» khÃ³a khÃ´ng ÄÆ°á»£c sá»­a Äá»i trong lÃºc Äang thá»±c hiá»n nhá»¯ng cÃ´ng viá»c báº£o quáº£n cÆ¡ sá» dá»¯ liá»u cáº§n thiáº¿t.
+    shop: Tiá»m
+    shop_tooltip: Tiá»m bÃ¡n hÃ ng hÃ³a OpenStreetMap
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise?uselang=vi
+    sign_up: ÄÄng kÃ½
+    sign_up_tooltip: Má» tÃ i khoáº£n Äá» sá»­a Äá»i
+    sotm: Má»i tham gia Há»i nghá» OpenStreetMap 2009, The State of the Map (TrÃ¬nh tráº¡ng Báº£n Äá»), ngÃ y 10-12 thÃ¡ng 7 táº¡i Amsterdam!
+    tag_line: Báº£n Äá» Wiki cá»§a Tháº¿ giá»i Má»
+    user_diaries: Nháº­t kÃ½ CÃ¡ nhÃ¢n
+    user_diaries_tooltip: Äá»c cÃ¡c nháº­t kÃ½ cÃ¡ nhÃ¢n
+    view: Xem
+    view_tooltip: Xem báº£n Äá»
+    welcome_user: Hoan nghÃªnh, {{user_link}}
+    welcome_user_link_tooltip: Trang cÃ¡ nhÃ¢n cá»§a báº¡n
+  map: 
+    coordinates: "Tá»a Äá»:"
+    edit: Sá»­a Äá»i
+    view: Hiá»n thá»
+  message: 
+    delete: 
+      deleted: ÄÃ£ xÃ³a thÆ°
+    inbox: 
+      date: NgÃ y
+      from: Tá»«
+      my_inbox: Há»p thÆ° Äáº¿n
+      no_messages_yet: Báº¡n chÆ°a nháº­n thÆ° nÃ o. HÃ£y thá»­ liÃªn láº¡c vá»i {{people_mapping_nearby_link}}?
+      outbox: ÄÃ£ gá»­i
+      people_mapping_nearby: nhá»¯ng ngÆ°á»i á» gáº§n
+      subject: TiÃªu Äá»
+      title: Há»p thÆ°
+      you_have: Báº¡n cÃ³ {{new_count}} thÆ° má»i vÃ  {{old_count}} thÆ° cÅ©
+    mark: 
+      as_read: ThÆ° ÄÃ£ Äá»c
+      as_unread: ThÆ° chÆ°a Äá»c
+    message_summary: 
+      delete_button: XÃ³a
+      read_button: ÄÃ¡nh dáº¥u lÃ  ÄÃ£ Äá»c
+      reply_button: Tráº£ lá»i
+      unread_button: ÄÃ¡nh dáº¥u lÃ  chÆ°a Äá»c
+    new: 
+      back_to_inbox: Trá» vá» há»p thÆ° Äáº¿n
+      body: Ná»i dung
+      message_sent: ThÆ° ÄÃ£ gá»­i
+      send_button: Gá»­i
+      send_message_to: Gá»­i thÆ° má»i cho {{name}}
+      subject: TiÃªu Äá»
+      title: Gá»­i thÆ°
+    no_such_user: 
+      body: Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng hoáº·c thÆ° vá»i tÃªn hoáº·c ID ÄÃ³
+      heading: NgÆ°á»i dÃ¹ng hoáº·c thÆ° khÃ´ng tá»n táº¡i
+      title: NgÆ°á»i dÃ¹ng hoáº·c thÆ° khÃ´ng tá»n táº¡i
+    outbox: 
+      date: NgÃ y
+      inbox: thÆ° Äáº¿n
+      my_inbox: Há»p {{inbox_link}}
+      no_sent_messages: Báº¡n chÆ°a gá»­i thÆ° cho ngÆ°á»i nÃ o. HÃ£y thá»­ liÃªn láº¡c vá»i {{people_mapping_nearby_link}}?
+      outbox: thÆ° ÄÃ£ gá»­i
+      people_mapping_nearby: nhá»¯ng ngÆ°á»i á» gáº§n
+      subject: TiÃªu Äá»
+      title: Há»p thÆ° ÄÃ£ gá»­i
+      to: Tá»i
+      you_have_sent_messages: Báº¡n ÄÃ£ gá»­i {{sent_count}} thÆ°
+    read: 
+      back_to_inbox: Trá» vá» há»p thÆ° Äáº¿n
+      back_to_outbox: Trá» vá» há»p thÆ° ÄÃ£ gá»­i
+      date: NgÃ y
+      from: Tá»«
+      reading_your_messages: Äá»c thÆ°
+      reading_your_sent_messages: Äá»c thÆ° ÄÃ£ gá»­i
+      reply_button: Tráº£ lá»i
+      subject: TiÃªu Äá»
+      title: Äá»c thÆ°
+      to: Tá»i
+      unread_button: ÄÃ¡nh dáº¥u lÃ  chÆ°a Äá»c
+    sent_message_summary: 
+      delete_button: XÃ³a
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                 Vui lÃ²ng Äá»«ng tráº£ lá»i thÆ° Äiá»n tá»­ nÃ y.                  *"
       banner2: "*              HÃ£y sá»­ dá»¥ng website OpenStreetMap Äá» tráº£ lá»i.              *"
-      hi: "ChÃ o {{to_user}},"
+      footer: Báº¡n cÅ©ng cÃ³ thá» Äá»c bÃ¬nh luáº­n táº¡i {{readurl}}, bÃ¬nh luáº­n táº¡i {{commenturl}}, hoáº·c tráº£ lá»i táº¡i {{replyurl}}
       header: "{{from_user}} ÄÃ£ bÃ¬nh luáº­n vá» má»¥c nháº­t kÃ½ gáº§n ÄÃ¢y cá»§a báº¡n táº¡i OpenStreetMap vá»i tiÃªu Äá» {{subject}}:"
-      footer: "Báº¡n cÅ©ng cÃ³ thá» Äá»c bÃ¬nh luáº­n táº¡i {{readurl}}, bÃ¬nh luáº­n táº¡i {{commenturl}}, hoáº·c tráº£ lá»i táº¡i {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} ÄÃ£ gá»­i thÆ° má»i cho báº¡n"
-      banner1: "*                 Vui lÃ²ng Äá»«ng tráº£ lá»i thÆ° Äiá»n tá»­ nÃ y.                  *"
-      banner2: "*              HÃ£y sá»­ dá»¥ng website OpenStreetMap Äá» tráº£ lá»i.              *"
-      hi: "ChÃ o {{to_user}},"
-      header: "{{from_user}} ÄÃ£ gá»­i thÆ° cho báº¡n dÃ¹ng OpenStreetMap cÃ³ tiÃªu Äá» {{subject}}:"
-      footer1: "Báº¡n cÅ©ng cÃ³ thá» Äá»c thÆ° nÃ y táº¡i {{readurl}}"
-      footer2: "vÃ  tráº£ lá»i táº¡i {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} ÄÃ£ thÃªm báº¡n lÃ  ngÆ°á»i báº¡n"
+      hi: ChÃ o {{to_user}},
+      subject: "[OpenStreetMap] {{user}} ÄÃ£ bÃ¬nh luáº­n vá» má»¥c nháº­t kÃ½ cá»§a báº¡n"
+    email_confirm: 
+      subject: "[OpenStreetMap] XÃ¡c nhÃ¢n Äá»a chá» thÆ° Äiá»n tá»­ cá»§a báº¡n"
+    email_confirm_html: 
+      click_the_link: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nháº­n thay Äá»i nÃ y.
+      greeting: ChÃ o báº¡n,
+      hopefully_you: Ai (cháº¯c báº¡n) muá»n Äá»i Äá»a chá» thÆ° Äiá»n tá»­ bÃªn {{server_url}} thÃ nh {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nháº­n thay Äá»i nÃ y.
+      greeting: ChÃ o báº¡n,
+      hopefully_you_1: Ai (cháº¯c báº¡n) muá»n Äá»i Äá»a chá» thÆ° Äiá»n tá»­ bÃªn
+      hopefully_you_2: "{{server_url}} thÃ nh {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} ÄÃ£ thÃªm báº¡n vÃ o danh sÃ¡ch báº¡n táº¡i OpenStreetMap."
-      see_their_profile: "CÃ³ thá» xem trang cÃ¡ nhÃ¢n cá»§a há» táº¡i {{userurl}} vÃ  cÅ©ng thÃªm há» vÃ o danh sÃ¡ch cá»§a báº¡n tÃ¹y Ã½."
-    gpx_notification:
-      greeting: "ChÃ o báº¡n,"
-      your_gpx_file: "HÃ¬nh nhÆ° táº­p tin GPX cá»§a báº¡n"
-      with_description: "vá»i miÃªu táº£"
+      see_their_profile: CÃ³ thá» xem trang cÃ¡ nhÃ¢n cá»§a há» táº¡i {{userurl}} vÃ  cÅ©ng thÃªm há» vÃ o danh sÃ¡ch cá»§a báº¡n tÃ¹y Ã½.
+      subject: "[OpenStreetMap] {{user}} ÄÃ£ thÃªm báº¡n lÃ  ngÆ°á»i báº¡n"
+    gpx_notification: 
+      and_no_tags: vÃ  khÃ´ng cÃ³ tháº»
       and_the_tags: "vÃ  cÃ¡c tháº» sau:"
-      and_no_tags: "vÃ  khÃ´ng cÃ³ tháº»"
-      failure:
-        subject: "[OpenStreetMap] Nháº­p GPX tháº¥t báº¡i"
+      failure: 
         failed_to_import: "khÃ´ng nháº­p thÃ nh cÃ´ng. ÄÃ£ gáº·p lá»i nÃ y:"
-        more_info_1: "CÃ³ thÃªm chi tiáº¿t vá» vá»¥ nháº­p GPX bá» tháº¥t báº¡i vÃ  cÃ¡ch trÃ¡nh"
+        more_info_1: CÃ³ thÃªm chi tiáº¿t vá» vá»¥ nháº­p GPX bá» tháº¥t báº¡i vÃ  cÃ¡ch trÃ¡nh
         more_info_2: "váº¥n Äá» nÃ y táº¡i:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] Nháº­p GPX tháº¥t báº¡i"
+      greeting: ChÃ o báº¡n,
+      success: 
+        loaded_successfully: "{{trace_points}} Äiá»m ÄÆ°á»£c táº£i thÃ nh cÃ´ng trÃªn tá»ng sá»\n{{possible_points}} Äiá»m."
         subject: "[OpenStreetMap] Nháº­p GPX thÃ nh cÃ´ng"
-        loaded_successfully: |
-          {{trace_points}} Äiá»m ÄÆ°á»£c táº£i thÃ nh cÃ´ng trÃªn tá»ng sá»
-          {{possible_points}} Äiá»m.
-    signup_confirm:
+      with_description: vá»i miÃªu táº£
+      your_gpx_file: HÃ¬nh nhÆ° táº­p tin GPX cá»§a báº¡n
+    lost_password: 
+      subject: "[OpenStreetMap] YÃªu cáº§u Äáº·t láº¡i máº­t kháº©u"
+    lost_password_html: 
+      click_the_link: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» Äáº·t láº¡i máº­t kháº©u.
+      greeting: ChÃ o báº¡n,
+      hopefully_you: Ai (cháº¯c báº¡n) ÄÃ£ xin Äáº·t láº¡i máº­t kháº©u cá»§a tÃ i khoáº£n openstreetmap.org cÃ³ Äá»a chá» thÆ° Äiá»n tá»­ nÃ y.
+    lost_password_plain: 
+      click_the_link: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» Äáº·t láº¡i máº­t kháº©u.
+      greeting: Hi,
+      hopefully_you_1: Ai (cháº¯c báº¡n) ÄÃ£ xin Äáº·t láº¡i máº­t kháº©u cá»§a tÃ i khoáº£n openstreetmap.org
+      hopefully_you_2: cÃ³ Äá»a chá» thÆ° Äiá»n tá»­ nÃ y.
+    message_notification: 
+      banner1: "*                 Vui lÃ²ng Äá»«ng tráº£ lá»i thÆ° Äiá»n tá»­ nÃ y.                  *"
+      banner2: "*              HÃ£y sá»­ dá»¥ng website OpenStreetMap Äá» tráº£ lá»i.              *"
+      footer1: Báº¡n cÅ©ng cÃ³ thá» Äá»c thÆ° nÃ y táº¡i {{readurl}}
+      footer2: vÃ  tráº£ lá»i táº¡i {{replyurl}}
+      header: "{{from_user}} ÄÃ£ gá»­i thÆ° cho báº¡n dÃ¹ng OpenStreetMap cÃ³ tiÃªu Äá» {{subject}}:"
+      hi: ChÃ o {{to_user}},
+      subject: "[OpenStreetMap] {{user}} ÄÃ£ gá»­i thÆ° má»i cho báº¡n"
+    signup_confirm: 
       subject: "[OpenStreetMap] XÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ cá»§a báº¡n"
-    signup_confirm_plain:
-      greeting: "ChÃ o báº¡n!"
-      hopefully_you: "Ai (cháº¯c báº¡n) muá»n má» tÃ i khoáº£n bÃªn"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, hoan nghÃªnh! Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá»"
-      click_the_link_2: "xÃ¡c nháº­n tÃ i khoáº£n cá»§a báº¡n vÃ  Äá»c tiáº¿p Äá» tÃ¬m hiá»u thÃªm vá» OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, hoan nghÃªnh! Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nhÃ¢n tÃ i khoáº£n ÄÃ³ vÃ  Äá»c tiáº¿p Äá» tÃ¬m hiá»u thÃªm vá» OpenStreetMap.
+      current_user: CÃ³ danh sÃ¡ch cÃ¡c ngÆ°á»i dÃ¹ng, xáº¿p thá» loáº¡i theo nÆ¡i á», táº¡i <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region?uselang=vi">Category:Users by geographical region</a>.
+      get_reading: Báº¯t Äáº§u tÃ¬m hiá»u vá» OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide?uselang=vi">táº¡i wiki</a> hoáº·c <a href="http://www.opengeodata.org/">blog OpenGeoData</a>, blog nÃ y cÅ©ng chá»©a <a href="http://www.opengeodata.org/?cat=13">podcast Äá» nghe</a>!
+      greeting: ChÃ o báº¡n!
+      hopefully_you: Ai (cháº¯c báº¡n) muá»n má» tÃ i khoáº£n bÃªn
+      introductory_video: Báº¡n cÃ³ thá» coi {{introductory_video_link}}.
+      more_videos: CÅ©ng cÃ³ {{more_videos_link}}.
+      more_videos_here: thÃªm video táº¡i ÄÃ¢y
+      user_wiki_page: Báº¡n nÃªn táº¡o ra trang cÃ¡ nhÃ¢n trÃªn wiki vÃ  gáº¯n cÃ¡c tháº» thá» loáº¡i Äá» cho ngÆ°á»i ta biáº¿t báº¡n á» ÄÃ¢u, thÃ­ dá»¥ nhÆ° <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Hanoi?uselang=vi">[[Category:Users in Hanoi]]</a>.
+      video_to_openstreetmap: video giá»i thiá»u vá» OpenStreetMap
+      wiki_signup: CÃ³ láº½ báº¡n cÅ©ng muá»n <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page&uselang=vi">má» tÃ i khoáº£n á» wiki OpenStreetMap</a>.
+    signup_confirm_plain: 
+      click_the_link_1: Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, hoan nghÃªnh! Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá»
+      click_the_link_2: xÃ¡c nháº­n tÃ i khoáº£n cá»§a báº¡n vÃ  Äá»c tiáº¿p Äá» tÃ¬m hiá»u thÃªm vá» OpenStreetMap.
+      current_user_1: CÃ³ danh sÃ¡ch cÃ¡c ngÆ°á»i dÃ¹ng, xáº¿p thá» loáº¡i theo nÆ¡i á»,
+      greeting: ChÃ o báº¡n!
+      hopefully_you: Ai (cháº¯c báº¡n) muá»n má» tÃ i khoáº£n bÃªn
       introductory_video: "Báº¡n cÃ³ thá» coi video giá»i thiá»u OpenStreetMap táº¡i ÄÃ¢y:"
       more_videos: "CÃ³ thÃªm video táº¡i ÄÃ¢y:"
-      the_wiki: "Báº¯t Äáº§u tÃ¬m hiá»u vá» OpenStreetMap trÃªn wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide"
       opengeodata: "OpenGeoData.org lÃ  blog cá»§a OpenStreetMap, nÃ³ cÅ©ng chá»©a podcast:"
+      the_wiki: "Báº¯t Äáº§u tÃ¬m hiá»u vá» OpenStreetMap trÃªn wiki:"
+      the_wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide
+      user_wiki_1: Báº¡n nÃªn táº¡o ra trang cÃ¡ nhÃ¢n trÃªn wiki vÃ  gáº¯n cÃ¡c tháº» thá» loáº¡i Äá» cho
+      user_wiki_2: ngÆ°á»i ta biáº¿t báº¡n á» ÄÃ¢u, thÃ­ dá»¥ nhÆ° [[Category:Users in Hanoi]].
       wiki_signup: "CÃ³ láº½ báº¡n cÅ©ng muá»n má» tÃ i khoáº£n á» wiki OpenStreetMap táº¡i:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "Báº¡n nÃªn táº¡o ra trang cÃ¡ nhÃ¢n trÃªn wiki vÃ  gáº¯n cÃ¡c tháº» thá» loáº¡i Äá» cho"
-      user_wiki_2: "ngÆ°á»i ta biáº¿t báº¡n á» ÄÃ¢u, thÃ­ dá»¥ nhÆ° [[Category:Users in Hanoi]]."
-      current_user_1: "CÃ³ danh sÃ¡ch cÃ¡c ngÆ°á»i dÃ¹ng, xáº¿p thá» loáº¡i theo nÆ¡i á»,"
-      current_user_2: ""
-    signup_confirm_html:
-      greeting: "ChÃ o báº¡n!"
-      hopefully_you: "Ai (cháº¯c báº¡n) muá»n má» tÃ i khoáº£n bÃªn"
-      click_the_link: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, hoan nghÃªnh! Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nhÃ¢n tÃ i khoáº£n ÄÃ³ vÃ  Äá»c tiáº¿p Äá» tÃ¬m hiá»u thÃªm vá» OpenStreetMap."
-      introductory_video: "Báº¡n cÃ³ thá» coi {{introductory_video_link}}."
-      video_to_openstreetmap: "video giá»i thiá»u vá» OpenStreetMap"
-      more_videos: "CÅ©ng cÃ³ {{more_videos_link}}."
-      more_videos_here: "thÃªm video táº¡i ÄÃ¢y"
-      get_reading: 'Báº¯t Äáº§u tÃ¬m hiá»u vá» OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide?uselang=vi">táº¡i wiki</a> hoáº·c <a href="http://www.opengeodata.org/">blog OpenGeoData</a>, blog nÃ y cÅ©ng chá»©a <a href="http://www.opengeodata.org/?cat=13">podcast Äá» nghe</a>!'
-      wiki_signup: 'CÃ³ láº½ báº¡n cÅ©ng muá»n <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page&uselang=vi">má» tÃ i khoáº£n á» wiki OpenStreetMap</a>.'
-      user_wiki_page: 'Báº¡n nÃªn táº¡o ra trang cÃ¡ nhÃ¢n trÃªn wiki vÃ  gáº¯n cÃ¡c tháº» thá» loáº¡i Äá» cho ngÆ°á»i ta biáº¿t báº¡n á» ÄÃ¢u, thÃ­ dá»¥ nhÆ° <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Hanoi?uselang=vi">[[Category:Users in Hanoi]]</a>.'
-      current_user: 'CÃ³ danh sÃ¡ch cÃ¡c ngÆ°á»i dÃ¹ng, xáº¿p thá» loáº¡i theo nÆ¡i á», táº¡i <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region?uselang=vi">Category:Users by geographical region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] XÃ¡c nhÃ¢n Äá»a chá» thÆ° Äiá»n tá»­ cá»§a báº¡n"
-    email_confirm_plain:
-      greeting: "ChÃ o báº¡n,"
-      hopefully_you_1: "Ai (cháº¯c báº¡n) muá»n Äá»i Äá»a chá» thÆ° Äiá»n tá»­ bÃªn"
-      hopefully_you_2: "{{server_url}} thÃ nh {{new_address}}."
-      click_the_link: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nháº­n thay Äá»i nÃ y."
-    email_confirm_html:
-      greeting: "ChÃ o báº¡n,"
-      hopefully_you: "Ai (cháº¯c báº¡n) muá»n Äá»i Äá»a chá» thÆ° Äiá»n tá»­ bÃªn {{server_url}} thÃ nh {{new_address}}."
-      click_the_link: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» xÃ¡c nháº­n thay Äá»i nÃ y."
-    lost_password:
-      subject: "[OpenStreetMap] YÃªu cáº§u Äáº·t láº¡i máº­t kháº©u"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Ai (cháº¯c báº¡n) ÄÃ£ xin Äáº·t láº¡i máº­t kháº©u cá»§a tÃ i khoáº£n openstreetmap.org"
-      hopefully_you_2: "cÃ³ Äá»a chá» thÆ° Äiá»n tá»­ nÃ y."
-      click_the_link: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» Äáº·t láº¡i máº­t kháº©u."
-    lost_password_html:
-      greeting: "ChÃ o báº¡n,"
-      hopefully_you: "Ai (cháº¯c báº¡n) ÄÃ£ xin Äáº·t láº¡i máº­t kháº©u cá»§a tÃ i khoáº£n openstreetmap.org cÃ³ Äá»a chá» thÆ° Äiá»n tá»­ nÃ y."
-      click_the_link: "Náº¿u báº¡n lÃ  ngÆ°á»i ÄÃ³, xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t á» dÆ°á»i Äá» Äáº·t láº¡i máº­t kháº©u."
-  message:
-    inbox:
-      title: "Há»p thÆ°"
-      my_inbox: "Há»p thÆ° Äáº¿n"
-      outbox: "ÄÃ£ gá»­i"
-      you_have: "Báº¡n cÃ³ {{new_count}} thÆ° má»i vÃ  {{old_count}} thÆ° cÅ©"
-      from: "Tá»«"
-      subject: "TiÃªu Äá»"
-      date: "NgÃ y"
-      no_messages_yet: "Báº¡n chÆ°a nháº­n thÆ° nÃ o. HÃ£y thá»­ liÃªn láº¡c vá»i {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "nhá»¯ng ngÆ°á»i á» gáº§n"
-    message_summary:
-      unread_button: "ÄÃ¡nh dáº¥u lÃ  chÆ°a Äá»c"
-      read_button: "ÄÃ¡nh dáº¥u lÃ  ÄÃ£ Äá»c"
-      reply_button: "Tráº£ lá»i"
-      delete_button: "XÃ³a"
-    new:
-      title: "Gá»­i thÆ°"
-      send_message_to: "Gá»­i thÆ° má»i cho {{name}}"
-      subject: "TiÃªu Äá»"
-      body: "Ná»i dung"
-      send_button: "Gá»­i"
-      back_to_inbox: "Trá» vá» há»p thÆ° Äáº¿n"
-      message_sent: "ThÆ° ÄÃ£ gá»­i"
-    no_such_user:
-      title: "NgÆ°á»i dÃ¹ng hoáº·c thÆ° khÃ´ng tá»n táº¡i"
-      heading: "NgÆ°á»i dÃ¹ng hoáº·c thÆ° khÃ´ng tá»n táº¡i"
-      body: "Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng hoáº·c thÆ° vá»i tÃªn hoáº·c ID ÄÃ³"
-    outbox: 
-      title: "Há»p thÆ° ÄÃ£ gá»­i"
-      my_inbox: "Há»p {{inbox_link}}"
-      inbox: "thÆ° Äáº¿n"
-      outbox: "thÆ° ÄÃ£ gá»­i"
-      you_have_sent_messages: "Báº¡n ÄÃ£ gá»­i {{sent_count}} thÆ°"
-      to: "Tá»i"
-      subject: "TiÃªu Äá»"
-      date: "NgÃ y"
-      no_sent_messages: "Báº¡n chÆ°a gá»­i thÆ° cho ngÆ°á»i nÃ o. HÃ£y thá»­ liÃªn láº¡c vá»i {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "nhá»¯ng ngÆ°á»i á» gáº§n"
-    read:
-      title: "Äá»c thÆ°"
-      reading_your_messages: "Äá»c thÆ°"
-      from: "Tá»«"
-      subject: "TiÃªu Äá»"
-      date: "NgÃ y"
-      reply_button: "Tráº£ lá»i"
-      unread_button: "ÄÃ¡nh dáº¥u lÃ  chÆ°a Äá»c"
-      back_to_inbox: "Trá» vá» há»p thÆ° Äáº¿n"
-      reading_your_sent_messages: "Äá»c thÆ° ÄÃ£ gá»­i"
-      to: "Tá»i"
-      back_to_outbox: "Trá» vá» há»p thÆ° ÄÃ£ gá»­i"
-    sent_message_summary:
-      delete_button: "XÃ³a"
-    mark:
-      as_read: "ThÆ° ÄÃ£ Äá»c"
-      as_unread: "ThÆ° chÆ°a Äá»c"
-    delete:
-      deleted: "ÄÃ£ xÃ³a thÆ°"
-  site:
-    index:
-      js_1: "Hoáº·c trÃ¬nh duyá»t cá»§a báº¡n khÃ´ng há» trá»£ JavaScript, hoáº·c báº¡n ÄÃ£ táº¯t JavaScript."
-      js_2: "OpenStreetMap sá»­ dá»¥ng JavaScript cho chá»©c nÄng báº£n Äá» trÆ¡n."
-      js_3: 'Báº¡n váº«n cÃ³ thá» sá»­ dá»¥ng <a href="http://tah.openstreetmap.org/Browse/">báº£n Äá» tÄ©nh Tiles@Home</a> náº¿u khÃ´ng báº­t lÃªn JavaScript ÄÆ°á»£c.'
-      permalink: "LiÃªn káº¿t ThÆ°á»ng trá»±c"
-      shortlink: "LiÃªn káº¿t Ngáº¯n gá»n"
-      license:
+      wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a báº¡n.
+      allow_read_prefs: truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      allow_to: "Cho phÃ©p trÃ¬nh khÃ¡ch:"
+      allow_write_api: sá»­a Äá»i báº£n Äá».
+      allow_write_diary: táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n.
+      allow_write_gpx: táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS.
+      allow_write_prefs: thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      request_access: ChÆ°Æ¡ng trÃ¬nh {{app_name}} xin phÃ©p truy cáº­p tÃ i khoáº£n cá»§a báº¡n. Xin hÃ£y chá»n nhá»¯ng kháº£ nÄng mÃ  báº¡n muá»n cho chÆ°Æ¡ng trÃ¬nh nÃ y. Báº¡n cÃ³ thá» chá»n nhiá»u hay Ã­t kháº£ nÄng tÃ¹y Ã½.
+    revoke: 
+      flash: Báº¡n ÄÃ£ thu há»i dáº¥u cá»§a {{application}}
+  oauth_clients: 
+    create: 
+      flash: ÄÃ£ ÄÄng kÃ½ thÃ´ng tin thÃ nh cÃ´ng
+    destroy: 
+      flash: ÄÃ£ xÃ³a ÄÄng kÃ½ trÃ¬nh khÃ¡ch
+    edit: 
+      submit: Sá»­a Äá»i
+      title: Sá»­a Äá»i chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n
+    form: 
+      allow_read_gpx: truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a há».
+      allow_read_prefs: truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      allow_write_api: sá»­a Äá»i báº£n Äá».
+      allow_write_diary: táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n.
+      allow_write_gpx: táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS.
+      allow_write_prefs: thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      callback_url: URL Gá»i láº¡i
+      name: TÃªn
+      requests: "YÃªu cáº§u cÃ¡c kháº£ nÄng cá»§a ngÆ°á»i dÃ¹ng á» dÆ°á»i:"
+      required: Báº¯t buá»c
+      support_url: URL Trá»£ giÃºp
+      url: URL Trang chá»§ ChÆ°Æ¡ng trÃ¬nh
+    index: 
+      application: TÃªn ChÆ°Æ¡ng trÃ¬nh
+      issued_at: LÃºc Cho phÃ©p
+      list_tokens: "CÃ¡c dáº¥u á» dÆ°á»i ÄÆ°á»£c gá»­i cho chÆ°Æ¡ng trÃ¬nh dÃ¹ng tÃªn cá»§a báº¡n:"
+      my_apps: TrÃ¬nh khÃ¡ch cá»§a TÃ´i
+      my_tokens: ChÆ°Æ¡ng trÃ¬nh TÃ´i Cho phÃ©p
+      no_apps: Báº¡n cÃ³ muá»n ÄÄng ky chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n vá»i chÃºng tÃ´i dÃ¹ng tiÃªu chuáº©n {{oauth}}? Báº¡n cáº§n pháº£i ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh Web trÆ°á»c khi gá»­i yÃªu cáº§u OAuth ÄÆ°á»£c.
+      register_new: ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n
+      registered_apps: "CÃ¡c trÃ¬nh khÃ¡ á» dÆ°á»i ÄÃ£ ÄÆ°á»£c ÄÄng kÃ½:"
+      revoke: Thu há»i!
+      title: Chi tiáº¿t OAuth cá»§a TÃ´i
+    new: 
+      submit: ÄÄng kÃ½
+      title: ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh má»i
+    not_found: 
+      sorry: Ráº¥t tiáº¿c, khÃ´ng tÃ¬m tháº¥y {{type}} ÄÃ³.
+    show: 
+      access_url: "URL cá»§a Dáº¥u Truy cáº­p:"
+      allow_read_gpx: truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a há».
+      allow_read_prefs: truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      allow_write_api: sá»­a Äá»i báº£n Äá».
+      allow_write_diary: táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n.
+      allow_write_gpx: táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS.
+      allow_write_prefs: thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n.
+      authorize_url: "Cho phÃ©p URL:"
+      edit: Sá»­a Äá»i Chi tiáº¿t
+      key: "Tá»« khÃ³a TiÃªu dÃ¹ng:"
+      requests: "YÃªu cáº§u cÃ¡c kháº£ nÄng cá»§a ngÆ°á»i dÃ¹ng á» dÆ°á»i:"
+      secret: "Máº­t kháº©u TiÃªu dÃ¹ng:"
+      support_notice: ChÃºng tÃ´i há» trá»£ mÃ£ hÃ³a hmac-sha1 (khuyÃªn dÃ¹ng) cÅ©ng nhÆ° vÄn báº£n thuáº§n vá»i cháº¿ Äá» ssl.
+      title: Chi tiáº¿t OAuth cá»§a {{app_name}}
+      url: "URL cá»§a Dáº¥u YÃªu cáº§u:"
+    update: 
+      flash: ÄÃ£ cáº­p nháº­t thÃ´ng tin trÃ¬nh khÃ¡ch thÃ nh cÃ´ng
+  site: 
+    edit: 
+      anon_edits_link_text: Táº¡i sao váº­y?
+      flash_player_required: Báº¡n cáº§n cÃ³ Flash Player Äá» sá»­ dá»¥ng Potlatch, trÃ¬nh váº½ OpenStreetMap báº±ng Flash. Báº¡n cÃ³ thá» <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">táº£i xuá»ng Flash Player tá»« Adobe.com</a>. CÅ©ng cÃ³ sáºµn <a href="http://wiki.openstreetmap.org/wiki/Editing?uselang=vi">vÃ i cÃ¡ch khÃ¡c</a> Äá» sá»­a Äá»i OpenStreetMap.
+      not_public: Báº¡n chÆ°a ÄÆ°a ra cÃ´ng khai cÃ¡c sá»­a Äá»i cá»§a báº¡n.
+      not_public_description: Náº¿u khÃ´ng ÄÆ°a ra cÃ´ng khai, báº¡n khÃ´ng cÃ²n ÄÆ°á»£c phÃ©p sá»­a Äá»i báº£n Äá». Báº¡n cÃ³ thá» ÄÆ°a ra cÃ´ng khai táº¡i {{user_page}}.
+      potlatch_unsaved_changes: Báº¡n cÃ³ thay Äá»i chÆ°a lÆ°u. (Äá» lÆ°u trong Potlatch, hÃ£y bá» chá»n lá»i hoáº·c Äá»a Äiá»m Äang ÄÆ°á»£c chá»n, náº¿u Äáº¿n sá»­a Äá»i trong cháº¿ Äá» Ãp dá»¥ng Ngay, hoáº·c báº¥m nÃºt LÆ°u náº¿u cÃ³.)
+      user_page_link: trang cÃ¡ nhÃ¢n
+    index: 
+      js_1: Hoáº·c trÃ¬nh duyá»t cá»§a báº¡n khÃ´ng há» trá»£ JavaScript, hoáº·c báº¡n ÄÃ£ táº¯t JavaScript.
+      js_2: OpenStreetMap sá»­ dá»¥ng JavaScript cho chá»©c nÄng báº£n Äá» trÆ¡n.
+      js_3: Báº¡n váº«n cÃ³ thá» sá»­ dá»¥ng <a href="http://tah.openstreetmap.org/Browse/">báº£n Äá» tÄ©nh Tiles@Home</a> náº¿u khÃ´ng báº­t lÃªn JavaScript ÄÆ°á»£c.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
         notice: "{{project_name}} vÃ  nhá»¯ng ngÆ°á»i ÄÃ³ng gÃ³p cho phÃ©p sá»­ dá»¥ng theo giáº¥y phÃ©p {{license_name}}."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://www.creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "Dá»± Ã¡n OpenStreetMap"
-        project_url: "http://www.openstreetmap.org/"
-    edit:
-      not_public: "Báº¡n chÆ°a ÄÆ°a ra cÃ´ng khai cÃ¡c sá»­a Äá»i cá»§a báº¡n."
-      not_public_description: "Náº¿u khÃ´ng ÄÆ°a ra cÃ´ng khai, báº¡n khÃ´ng cÃ²n ÄÆ°á»£c phÃ©p sá»­a Äá»i báº£n Äá». Báº¡n cÃ³ thá» ÄÆ°a ra cÃ´ng khai táº¡i {{user_page}}."
-      user_page_link: "trang cÃ¡ nhÃ¢n"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits?uselang=vi"
-      anon_edits_link_text: "Táº¡i sao váº­y?"
-      flash_player_required: 'Báº¡n cáº§n cÃ³ Flash Player Äá» sá»­ dá»¥ng Potlatch, trÃ¬nh váº½ OpenStreetMap báº±ng Flash. Báº¡n cÃ³ thá» <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">táº£i xuá»ng Flash Player tá»« Adobe.com</a>. CÅ©ng cÃ³ sáºµn <a href="http://wiki.openstreetmap.org/wiki/Editing?uselang=vi">vÃ i cÃ¡ch khÃ¡c</a> Äá» sá»­a Äá»i OpenStreetMap.'
-      potlatch_unsaved_changes: "Báº¡n cÃ³ thay Äá»i chÆ°a lÆ°u. (Äá» lÆ°u trong Potlatch, hÃ£y bá» chá»n lá»i hoáº·c Äá»a Äiá»m Äang ÄÆ°á»£c chá»n, náº¿u Äáº¿n sá»­a Äá»i trong cháº¿ Äá» Ãp dá»¥ng Ngay, hoáº·c báº¥m nÃºt LÆ°u náº¿u cÃ³.)"
-    sidebar:
-      search_results: "Káº¿t quáº£ TÃ¬m kiáº¿m"
-      close: "ÄÃ³ng"
-    search:
-      search: "TÃ¬m kiáº¿m"
-      where_am_i: "TÃ´i á» ÄÃ¢u?"
-      submit_text: "Äi"
-      search_help: 'thÃ­ dá»¥: "Alkmaar", "Regent Street, Cambridge", "CB2 5AQ", hoáº·c "post offices near LÃ¼nen" - <a href="http://wiki.openstreetmap.org/wiki/Search?uselang=vi">thÃªm thÃ­ dá»¥...</a>'
-    key:
-      map_key: "ChÃº giáº£i"
-      map_key_tooltip: "ChÃº giáº£i kiá»u báº£n Äá» Mapnik táº¡i má»©c thu phÃ³ng nÃ y"
-      table:
-        heading: "ChÃº giáº£i táº¡i má»©c {{zoom_level}}"
-        entry:
-          motorway: "ÄÆ°á»ng cao tá»c"
-          trunk: "Xa lá»"
-          primary: "ÄÆ°á»ng chÃ­nh"
-          secondary: "ÄÆ°á»ng lá»n"
-          unclassified: "ÄÆ°á»ng khÃ´ng phÃ¢n loáº¡i"
-          unsurfaced: "ÄÆ°á»ng khÃ´ng lÃ¡t"
-          track: "ÄÆ°á»ng mÃ²n"
-          byway: "ÄÆ°á»ng mÃ²n Äa má»t"
-          bridleway: "ÄÆ°á»ng cÆ°á»¡i ngá»±a"
-          cycleway: "ÄÆ°á»ng xe Äáº¡p"
-          footway: "ÄÆ°á»ng Äi bá»"
-          rail: "ÄÆ°á»ng sáº¯t"
-          subway: "ÄÆ°á»ng ngáº§m"
-          tram:
-            - "ÄÆ°á»ng sáº¯t nháº¹"
-            - "xe Äiá»n"
-          cable:
-            - "ÄÆ°á»ng xe cÃ¡p"
-            - "ski lift"
-          runway:
-            - "ÄÆ°á»ng bÄng"
-            - "ÄÆ°á»ng lÄn"
-          apron:
-            - "SÃ¢n Äáº­u mÃ¡y bay"
-            - "nhÃ  ga hÃ nh khÃ¡ch"
-          admin: "BiÃªn giá»i hÃ nh chÃ­nh"
-          forest: "Rá»«ng trá»ng cÃ¢y"
-          wood: "Rá»«ng"
-          golf: "SÃ¢n golf"
-          park: "CÃ´ng viÃªn"
-          resident: "Khu vá»±c nhÃ  á»"
-          tourist: "NÆ¡i du lá»ch"
-          common:
-            - "Äáº¥t cÃ´ng"
-            - "bÃ£i cá»"
-          retail: "Khu vá»±c buÃ´n bÃ¡n"
-          industrial: "Khu vá»±c cÃ´ng nghiá»p"
-          commercial: "Khu vá»±c thÆ°Æ¡ng máº¡i"
-          heathland: "VÃ¹ng cÃ¢y bá»¥i"
-          lake:
-            - "Há»"
-            - "bá» nÆ°á»c"
-          farm: "Ruá»ng"
-          brownfield: "SÃ¢n Äá» trá»ng"
-          cemetery: "NghÄ©a Äá»a"
-          allotments: "Khu vÆ°á»n gia ÄÃ¬nh"
-          pitch: "SÃ¢n thá» thao"
-          centre: "Trung tÃ¢m thá» thao"
-          reserve: "Khu báº£o tá»n thiÃªn niÃªn"
-          military: "Khu vá»±c quÃ¢n sá»±"
-          school: "TrÆ°á»ng há»c"
-          building: "Kiáº¿n trÃºc quan trá»ng"
-          station: "NhÃ  ga"
-          summit:
-            - "Äá»nh nÃºi"
-            - "Äá»i"
-          tunnel: "ÄÆ°á»ng Äá»©t nÃ©t = ÄÆ°á»ng háº§m"
-          bridge: "ÄÆ°á»ng ráº¯n = cáº§u"
-          private: "ÄÆ°á»ng riÃªng"
-          permissive: "ÄÆ°á»ng cho phÃ©p"
-          destination: "Chá» giao thÃ´ng Äá»a phÆ°Æ¡ng"
-          construction: "ÄÆ°á»ng Äang xÃ¢y"
-  trace:
-    visibility:
-      private: "BÃ­ máº­t (chá» hiá»n thá» cÃ¡c Äiá»m vÃ´ danh khÃ´ng cÃ³ thá»© tá»±)"
-      public: "CÃ´ng khai (hiá»n thá» trong danh sÃ¡ch tuyáº¿n ÄÆ°á»ng lÃ  cÃ¡c Äiá»m vÃ´ danh khÃ´ng cÃ³ thá»© tá»±)"
-      trackable: "Theo dÃµi ÄÆ°á»£c (chá» hiá»n thá» má»t dÃ£y Äiá»m vÃ´ danh cÃ³ thá»i Äiá»m)"
-      identifiable: "Nháº­n ra ÄÆ°á»£c (hiá»n thá» trong danh sÃ¡ch tuyáº¿n ÄÆ°á»ng lÃ  má»t dÃ£y Äiá»m cÃ³ tÃªn vÃ  thá»i Äiá»m)"
-    create:
-      upload_trace: "Táº£i lÃªn Tuyáº¿n ÄÆ°á»ng GPS"
-      trace_uploaded: "Táº­p tin GPX cá»§a báº¡n ÄÃ£ ÄÆ°á»£c táº£i lÃªn vÃ  Äang chá» ÄÆ°á»£c chÃ¨n vÃ o cÆ¡ sá» dá»¯ liá»u. ThÆ°á»ng chá» cáº§n chá» Äá»£i trong vÃ²ng ná»­a tiáº¿ng, vÃ  báº¡n sáº½ nháº­n thÆ° Äiá»n tá»­ lÃºc khi nÃ³ xong."
-    edit:
-      title: "Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng {{name}}"
-      heading: "Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng {{name}}"
+        project_name: Dá»± Ã¡n OpenStreetMap
+      permalink: LiÃªn káº¿t ThÆ°á»ng trá»±c
+      shortlink: LiÃªn káº¿t Ngáº¯n gá»n
+    key: 
+      map_key: ChÃº giáº£i
+      map_key_tooltip: ChÃº giáº£i kiá»u báº£n Äá» Mapnik táº¡i má»©c thu phÃ³ng nÃ y
+      table: 
+        entry: 
+          admin: BiÃªn giá»i hÃ nh chÃ­nh
+          allotments: Khu vÆ°á»n gia ÄÃ¬nh
+          apron: 
+            - SÃ¢n Äáº­u mÃ¡y bay
+            - nhÃ  ga hÃ nh khÃ¡ch
+          bridge: ÄÆ°á»ng ráº¯n = cáº§u
+          bridleway: ÄÆ°á»ng cÆ°á»¡i ngá»±a
+          brownfield: SÃ¢n Äá» trá»ng
+          building: Kiáº¿n trÃºc quan trá»ng
+          byway: ÄÆ°á»ng mÃ²n Äa má»t
+          cable: 
+            - ÄÆ°á»ng xe cÃ¡p
+            - ski lift
+          cemetery: NghÄ©a Äá»a
+          centre: Trung tÃ¢m thá» thao
+          commercial: Khu vá»±c thÆ°Æ¡ng máº¡i
+          common: 
+            - Äáº¥t cÃ´ng
+            - bÃ£i cá»
+          construction: ÄÆ°á»ng Äang xÃ¢y
+          cycleway: ÄÆ°á»ng xe Äáº¡p
+          destination: Chá» giao thÃ´ng Äá»a phÆ°Æ¡ng
+          farm: Ruá»ng
+          footway: ÄÆ°á»ng Äi bá»
+          forest: Rá»«ng trá»ng cÃ¢y
+          golf: SÃ¢n golf
+          heathland: VÃ¹ng cÃ¢y bá»¥i
+          industrial: Khu vá»±c cÃ´ng nghiá»p
+          lake: 
+            - Há»
+            - bá» nÆ°á»c
+          military: Khu vá»±c quÃ¢n sá»±
+          motorway: ÄÆ°á»ng cao tá»c
+          park: CÃ´ng viÃªn
+          permissive: ÄÆ°á»ng cho phÃ©p
+          pitch: SÃ¢n thá» thao
+          primary: ÄÆ°á»ng chÃ­nh
+          private: ÄÆ°á»ng riÃªng
+          rail: ÄÆ°á»ng sáº¯t
+          reserve: Khu báº£o tá»n thiÃªn niÃªn
+          resident: Khu vá»±c nhÃ  á»
+          retail: Khu vá»±c buÃ´n bÃ¡n
+          runway: 
+            - ÄÆ°á»ng bÄng
+            - ÄÆ°á»ng lÄn
+          school: TrÆ°á»ng há»c
+          secondary: ÄÆ°á»ng lá»n
+          station: NhÃ  ga
+          subway: ÄÆ°á»ng ngáº§m
+          summit: 
+            - Äá»nh nÃºi
+            - Äá»i
+          tourist: NÆ¡i du lá»ch
+          track: ÄÆ°á»ng mÃ²n
+          tram: 
+            - ÄÆ°á»ng sáº¯t nháº¹
+            - xe Äiá»n
+          trunk: Xa lá»
+          tunnel: ÄÆ°á»ng Äá»©t nÃ©t = ÄÆ°á»ng háº§m
+          unclassified: ÄÆ°á»ng khÃ´ng phÃ¢n loáº¡i
+          unsurfaced: ÄÆ°á»ng khÃ´ng lÃ¡t
+          wood: Rá»«ng
+        heading: ChÃº giáº£i táº¡i má»©c {{zoom_level}}
+    search: 
+      search: TÃ¬m kiáº¿m
+      search_help: "thÃ­ dá»¥: \"Alkmaar\", \"Regent Street, Cambridge\", \"CB2 5AQ\", hoáº·c \"post offices near LÃ¼nen\" - <a href=\"http://wiki.openstreetmap.org/wiki/Search?uselang=vi\">thÃªm thÃ­ dá»¥...</a>"
+      submit_text: Äi
+      where_am_i: TÃ´i á» ÄÃ¢u?
+    sidebar: 
+      close: ÄÃ³ng
+      search_results: Káº¿t quáº£ TÃ¬m kiáº¿m
+  trace: 
+    create: 
+      trace_uploaded: Táº­p tin GPX cá»§a báº¡n ÄÃ£ ÄÆ°á»£c táº£i lÃªn vÃ  Äang chá» ÄÆ°á»£c chÃ¨n vÃ o cÆ¡ sá» dá»¯ liá»u. ThÆ°á»ng chá» cáº§n chá» Äá»£i trong vÃ²ng ná»­a tiáº¿ng, vÃ  báº¡n sáº½ nháº­n thÆ° Äiá»n tá»­ lÃºc khi nÃ³ xong.
+      upload_trace: Táº£i lÃªn Tuyáº¿n ÄÆ°á»ng GPS
+    delete: 
+      scheduled_for_deletion: Tuyáº¿n ÄÆ°á»ng chá» ÄÆ°á»£c xÃ³a
+    edit: 
+      description: "MiÃªu táº£:"
+      download: táº£i xuá»ng
+      edit: sá»­a Äá»i
       filename: "TÃªn táº­p tin:"
-      download: "táº£i xuá»ng"
-      uploaded_at: "LÃºc táº£i lÃªn:"
+      heading: Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng {{name}}
+      map: báº£n Äá»
+      owner: "TÃ¡c giáº£:"
       points: "Sá» ná»t:"
+      save_button: LÆ°u cÃ¡c Thay Äá»i
       start_coord: "Tá»a Äá» Äáº§u ÄÆ°á»ng:"
-      map: "báº£n Äá»"
-      edit: "sá»­a Äá»i"
-      owner: "TÃ¡c giáº£:"
-      description: "MiÃªu táº£:"
       tags: "Tháº»:"
-      tags_help: "dáº¥u pháº©y phÃ¢n cÃ¡ch"
-      save_button: "LÆ°u cÃ¡c Thay Äá»i"
+      tags_help: dáº¥u pháº©y phÃ¢n cÃ¡ch
+      title: Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng {{name}}
+      uploaded_at: "LÃºc táº£i lÃªn:"
       visibility: "Má»©c Äá» truy cáº­p:"
-      visibility_help: "cÃ³ nghÄ©a lÃ  gÃ¬?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi"
-    no_such_user:
-      title: "NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i"
-      heading: "NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i"
-      body: "Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng nÃ o vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai."
-    trace_form:
-      upload_gpx: "Táº£i lÃªn Táº­p tin GPX"
-      description: "MiÃªu táº£"
-      tags: "Tháº»"
-      tags_help: "dáº¥u pháº©y phÃ¢n cÃ¡ch"
+      visibility_help: cÃ³ nghÄ©a lÃ  gÃ¬?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi
+    list: 
+      public_traces: Tuyáº¿n ÄÆ°á»ng GPS cÃ´ng khai
+      public_traces_from: Tuyáº¿n ÄÆ°á»ng GPS cÃ´ng khai cá»§a {{user}}
+      tagged_with: " cÃ³ tháº» {{tags}}"
+      your_traces: Tuyáº¿n ÄÆ°á»ng GPS cá»§a báº¡n
+    make_public: 
+      made_public: Tuyáº¿n ÄÆ°á»ng ÄÆ°á»£c phÃ¡t hÃ nh cÃ´ng khai
+    no_such_user: 
+      body: Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng nÃ o vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai.
+      heading: NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i
+      title: NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i
+    trace: 
+      ago: cÃ¡ch ÄÃ¢y {{time_in_words_ago}}
+      by: bá»i
+      count_points: "{{count}} ná»t"
+      edit: sá»­a Äá»i
+      edit_map: Sá»­a Äá»i Báº£n Äá»
+      in: trong
+      map: báº£n Äá»
+      more: thÃªm
+      pending: CHÆ¯A Xá»¬
+      private: RIÃNG
+      public: CÃNG KHAI
+      trace_details: Xem Chi tiáº¿t Tuyáº¿n ÄÆ°á»ng
+      view_map: Xem Báº£n Äá»
+    trace_form: 
+      description: MiÃªu táº£
+      help: Trá»£ giÃºp
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=vi
+      tags: Tháº»
+      tags_help: dáº¥u pháº©y phÃ¢n cÃ¡ch
+      upload_button: Táº£i lÃªn
+      upload_gpx: Táº£i lÃªn Táº­p tin GPX
       visibility: "Má»©c Äá» truy cáº­p:"
-      visibility_help: "cÃ³ nghÄ©a lÃ  gÃ¬?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi"
-      upload_button: "Táº£i lÃªn"
-      help: "Trá»£ giÃºp"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload?uselang=vi"
-    trace_header:
-      see_just_your_traces: "Chá» xem cÃ¡c tuyáº¿n ÄÆ°á»ng cá»§a báº¡n, hoáº·c táº£i lÃªn tuyáº¿n ÄÆ°á»ng"
-      see_all_traces: "Xem táº¥t cáº£ cÃ¡c tuyáº¿n ÄÆ°á»ng"
-      see_your_traces: "Xem cÃ¡c tuyáº¿n ÄÆ°á»ng cá»§a báº¡n"
-      traces_waiting: "Báº¡n cÃ³ {{count}} tuyáº¿n ÄÆ°á»ng Äang chá» ÄÆ°á»£c táº£i lÃªn. Xin hÃ£y chá» Äá»£i viá»c xong trÆ°á»c khi táº£i lÃªn thÃªm tuyáº¿n ÄÆ°á»ng, Äá» cho ngÆ°á»i khÃ¡c vÃ o hÃ ng Äá»£i ká»p."
-    trace_optionals:
-      tags: "Tháº»"
-    view:
-      title: "Xem tuyáº¿n ÄÆ°á»ng {{name}}"
-      heading: "Xem tuyáº¿n ÄÆ°á»ng {{name}}"
-      pending: "CHÆ¯A Xá»¬"
+      visibility_help: cÃ³ nghÄ©a lÃ  gÃ¬?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi
+    trace_header: 
+      see_all_traces: Xem táº¥t cáº£ cÃ¡c tuyáº¿n ÄÆ°á»ng
+      see_just_your_traces: Chá» xem cÃ¡c tuyáº¿n ÄÆ°á»ng cá»§a báº¡n, hoáº·c táº£i lÃªn tuyáº¿n ÄÆ°á»ng
+      see_your_traces: Xem cÃ¡c tuyáº¿n ÄÆ°á»ng cá»§a báº¡n
+      traces_waiting: Báº¡n cÃ³ {{count}} tuyáº¿n ÄÆ°á»ng Äang chá» ÄÆ°á»£c táº£i lÃªn. Xin hÃ£y chá» Äá»£i viá»c xong trÆ°á»c khi táº£i lÃªn thÃªm tuyáº¿n ÄÆ°á»ng, Äá» cho ngÆ°á»i khÃ¡c vÃ o hÃ ng Äá»£i ká»p.
+    trace_optionals: 
+      tags: Tháº»
+    trace_paging_nav: 
+      of: trong
+      showing: Xem trang
+    view: 
+      delete_track: XÃ³a tuyáº¿n ÄÆ°á»ng nÃ y
+      description: "MiÃªu táº£:"
+      download: táº£i xuá»ng
+      edit: sá»­a Äá»i
+      edit_track: Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng nÃ y
       filename: "TÃªn táº­p tin:"
-      download: "táº£i xuá»ng"
-      uploaded: "LÃºc táº£i lÃªn:"
+      heading: Xem tuyáº¿n ÄÆ°á»ng {{name}}
+      map: báº£n Äá»
+      none: KhÃ´ng cÃ³
+      owner: "TÃ¡c giáº£:"
+      pending: CHÆ¯A Xá»¬
       points: "Sá» ná»t:"
       start_coordinates: "Tá»a Äá» Äáº§u ÄÆ°á»ng:"
-      map: "báº£n Äá»"
-      edit: "sá»­a Äá»i"
-      owner: "TÃ¡c giáº£:"
-      description: "MiÃªu táº£:"
       tags: "Tháº»:"
-      none: "KhÃ´ng cÃ³"
-      edit_track: "Sá»­a Äá»i tuyáº¿n ÄÆ°á»ng nÃ y"
-      delete_track: "XÃ³a tuyáº¿n ÄÆ°á»ng nÃ y"
-      trace_not_found: "KhÃ´ng tÃ¬m tháº¥y tuyáº¿n ÄÆ°á»ng!"
+      title: Xem tuyáº¿n ÄÆ°á»ng {{name}}
+      trace_not_found: KhÃ´ng tÃ¬m tháº¥y tuyáº¿n ÄÆ°á»ng!
+      uploaded: "LÃºc táº£i lÃªn:"
       visibility: "Má»©c Äá» truy cáº­p:"
-    trace_paging_nav:
-      showing: "Xem trang"
-      of: "trong"
-    trace:
-      pending: "CHÆ¯A Xá»¬"
-      count_points: "{{count}} ná»t"
-      ago: "cÃ¡ch ÄÃ¢y {{time_in_words_ago}}"
-      more: "thÃªm"
-      trace_details: "Xem Chi tiáº¿t Tuyáº¿n ÄÆ°á»ng"
-      view_map: "Xem Báº£n Äá»"
-      edit: "sá»­a Äá»i"
-      edit_map: "Sá»­a Äá»i Báº£n Äá»"
-      public: "CÃNG KHAI"
-      private: "RIÃNG"
-      by: "bá»i"
-      in: "trong"
-      map: "báº£n Äá»"
-    list:
-      public_traces: "Tuyáº¿n ÄÆ°á»ng GPS cÃ´ng khai"
-      your_traces: "Tuyáº¿n ÄÆ°á»ng GPS cá»§a báº¡n"
-      public_traces_from: "Tuyáº¿n ÄÆ°á»ng GPS cÃ´ng khai cá»§a {{user}}"
-      tagged_with: " cÃ³ tháº» {{tags}}"
-    delete:
-      scheduled_for_deletion: "Tuyáº¿n ÄÆ°á»ng chá» ÄÆ°á»£c xÃ³a"
-    make_public:
-      made_public: "Tuyáº¿n ÄÆ°á»ng ÄÆ°á»£c phÃ¡t hÃ nh cÃ´ng khai"
-  oauth:
-    oauthorize:
-      request_access: "ChÆ°Æ¡ng trÃ¬nh {{app_name}} xin phÃ©p truy cáº­p tÃ i khoáº£n cá»§a báº¡n. Xin hÃ£y chá»n nhá»¯ng kháº£ nÄng mÃ  báº¡n muá»n cho chÆ°Æ¡ng trÃ¬nh nÃ y. Báº¡n cÃ³ thá» chá»n nhiá»u hay Ã­t kháº£ nÄng tÃ¹y Ã½."
-      allow_to: "Cho phÃ©p trÃ¬nh khÃ¡ch:"
-      allow_read_prefs:  "truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_prefs: "thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_diary: "táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n."
-      allow_write_api:   "sá»­a Äá»i báº£n Äá»."
-      allow_read_gpx:    "truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a báº¡n."
-      allow_write_gpx:   "táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS."
-    revoke:
-      flash: "Báº¡n ÄÃ£ thu há»i dáº¥u cá»§a {{application}}"
-  oauth_clients:
-    new:
-      title: "ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh má»i"
-      submit: "ÄÄng kÃ½"
-    edit:
-      title: "Sá»­a Äá»i chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n"
-      submit: "Sá»­a Äá»i"
-    show:
-      title: "Chi tiáº¿t OAuth cá»§a {{app_name}}"
-      key: "Tá»« khÃ³a TiÃªu dÃ¹ng:"
-      secret: "Máº­t kháº©u TiÃªu dÃ¹ng:"
-      url: "URL cá»§a Dáº¥u YÃªu cáº§u:"
-      access_url: "URL cá»§a Dáº¥u Truy cáº­p:"
-      authorize_url: "Cho phÃ©p URL:"
-      support_notice: "ChÃºng tÃ´i há» trá»£ mÃ£ hÃ³a hmac-sha1 (khuyÃªn dÃ¹ng) cÅ©ng nhÆ° vÄn báº£n thuáº§n vá»i cháº¿ Äá» ssl."
-      edit: "Sá»­a Äá»i Chi tiáº¿t"
-      requests: "YÃªu cáº§u cÃ¡c kháº£ nÄng cá»§a ngÆ°á»i dÃ¹ng á» dÆ°á»i:"
-      allow_read_prefs:  "truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_prefs: "thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_diary: "táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n."
-      allow_write_api:   "sá»­a Äá»i báº£n Äá»."
-      allow_read_gpx:    "truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a há»."
-      allow_write_gpx:   "táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS."
-    index:
-      title: "Chi tiáº¿t OAuth cá»§a TÃ´i"
-      my_tokens: "ChÆ°Æ¡ng trÃ¬nh TÃ´i Cho phÃ©p"
-      list_tokens: "CÃ¡c dáº¥u á» dÆ°á»i ÄÆ°á»£c gá»­i cho chÆ°Æ¡ng trÃ¬nh dÃ¹ng tÃªn cá»§a báº¡n:"
-      application: "TÃªn ChÆ°Æ¡ng trÃ¬nh"
-      issued_at: "LÃºc Cho phÃ©p"
-      revoke: "Thu há»i!"
-      my_apps: "TrÃ¬nh khÃ¡ch cá»§a TÃ´i"
-      no_apps: "Báº¡n cÃ³ muá»n ÄÄng ky chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n vá»i chÃºng tÃ´i dÃ¹ng tiÃªu chuáº©n {{oauth}}? Báº¡n cáº§n pháº£i ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh Web trÆ°á»c khi gá»­i yÃªu cáº§u OAuth ÄÆ°á»£c."
-      registered_apps: "CÃ¡c trÃ¬nh khÃ¡ á» dÆ°á»i ÄÃ£ ÄÆ°á»£c ÄÄng kÃ½:"
-      register_new: "ÄÄng kÃ½ chÆ°Æ¡ng trÃ¬nh cá»§a báº¡n"
-    form:
-      name: "TÃªn"
-      required: "Báº¯t buá»c"
-      url: "URL Trang chá»§ ChÆ°Æ¡ng trÃ¬nh"
-      callback_url: "URL Gá»i láº¡i"
-      support_url: "URL Trá»£ giÃºp"
-      requests: "YÃªu cáº§u cÃ¡c kháº£ nÄng cá»§a ngÆ°á»i dÃ¹ng á» dÆ°á»i:"
-      allow_read_prefs:  "truy cáº­p tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_prefs: "thay Äá»i tÃ¹y chá»n cÃ¡ nhÃ¢n."
-      allow_write_diary: "táº¡o má»¥c trong nháº­t kÃ½, bÃ¬nh luáº­n, vÃ  thÃªm ngÆ°á»i báº¡n."
-      allow_write_api:   "sá»­a Äá»i báº£n Äá»."
-      allow_read_gpx:    "truy cáº­p cÃ¡c tuyáº¿n ÄÆ°á»ng GPS bÃ­ máº­t cá»§a há»."
-      allow_write_gpx:   "táº£i lÃªn tuyáº¿n ÄÆ°á»ng GPS."
-    not_found:
-      sorry: "Ráº¥t tiáº¿c, khÃ´ng tÃ¬m tháº¥y {{type}} ÄÃ³."
-    create:
-      flash: "ÄÃ£ ÄÄng kÃ½ thÃ´ng tin thÃ nh cÃ´ng"
-    update:
-      flash: "ÄÃ£ cáº­p nháº­t thÃ´ng tin trÃ¬nh khÃ¡ch thÃ nh cÃ´ng"
-    destroy:
-      flash: "ÄÃ£ xÃ³a ÄÄng kÃ½ trÃ¬nh khÃ¡ch"
-  user:
-    login:
-      title: "ÄÄng nháº­p"
-      heading: "ÄÄng nháº­p"
-      please login: "Xin hÃ£y ÄÄng nháº­p hoáº·c {{create_user_link}}."
-      create_account: "má» tÃ i khoáº£n"
+    visibility: 
+      identifiable: Nháº­n ra ÄÆ°á»£c (hiá»n thá» trong danh sÃ¡ch tuyáº¿n ÄÆ°á»ng lÃ  má»t dÃ£y Äiá»m cÃ³ tÃªn vÃ  thá»i Äiá»m)
+      private: BÃ­ máº­t (chá» hiá»n thá» cÃ¡c Äiá»m vÃ´ danh khÃ´ng cÃ³ thá»© tá»±)
+      public: CÃ´ng khai (hiá»n thá» trong danh sÃ¡ch tuyáº¿n ÄÆ°á»ng lÃ  cÃ¡c Äiá»m vÃ´ danh khÃ´ng cÃ³ thá»© tá»±)
+      trackable: Theo dÃµi ÄÆ°á»£c (chá» hiá»n thá» má»t dÃ£y Äiá»m vÃ´ danh cÃ³ thá»i Äiá»m)
+  user: 
+    account: 
+      email never displayed publicly: (khÃ´ng lÃºc nÃ o hiá»n cÃ´ng khai)
+      flash update success: ÄÃ£ cáº­p nháº­t thÃ´ng tin cÃ¡ nhÃ¢n thÃ nh cÃ´ng.
+      flash update success confirm needed: ÄÃ£ cáº­p nháº­t thÃ´ng tin cÃ¡ nhÃ¢n thÃ nh cÃ´ng. Kiá»m tra thÆ° Äiá»n tá»­ xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i.
+      home location: "Vá» trÃ­ NhÃ :"
+      latitude: "VÄ© Äá»:"
+      longitude: "Kinh Äá»:"
+      make edits public button: PhÃ¡t hÃ nh cÃ´ng khai cÃ¡c sá»­a Äá»i cá»§a tÃ´i
+      my settings: TÃ¹y chá»n
+      no home location: Báº¡n chÆ°a Äá»nh vá» trÃ­ nhÃ .
+      preferred languages: "NgÃ´n ngá»¯ Æ¯u tiÃªn:"
+      profile description: "Tá»± giá»i thiá»u:"
+      public editing: 
+        disabled: VÃ´ hiá»u. KhÃ´ng thá» sá»­a Äá»i dá»¯ liá»u. all previous edits are anonymous.
+        disabled link text: táº¡i sao khÃ´ng thá» sá»­a Äá»i?
+        enabled: KÃ­ch hoáº¡t. KhÃ´ng vÃ´ danh vÃ  cÃ³ thá» sá»­a Äá»i dá»¯ liá»u.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi
+        enabled link text: cÃ³ nghÄ©a lÃ  gÃ¬?
+        heading: "Sá»­a Äá»i cÃ´ng khai:"
+      return to profile: Trá» vá» trang cÃ¡ nhÃ¢n
+      save changes button: LÆ°u cÃ¡c Thay Äá»i
+      title: Chá»nh sá»­a tÃ i khoáº£n
+      update home location on click: Cáº­p nháº­t vá» trÃ­ nhÃ  khi tÃ´i nháº¥n chuá»t vÃ o báº£n Äá»?
+    confirm: 
+      button: XÃ¡c nháº­n
+      failure: TÃ i khoáº£n vá»i dáº¥u hiá»u nÃ y ÄÃ£ ÄÆ°á»£c xÃ¡c nháº­n.
+      heading: XÃ¡c nháº­n tÃ i khoáº£n ngÆ°á»i dÃ¹ng
+      press confirm button: Báº¥m nÃºt XÃ¡c nháº­n á» dÆ°á»i Äá» xÃ¡c nháº­n tÃ i khoáº£n.
+      success: ÄÃ£ xÃ¡c nháº­n tÃ i khoáº£n cá»§a báº¡n. CÃ¡m Æ¡n báº¡n ÄÃ£ ÄÄng kÃ½!
+    confirm_email: 
+      button: XÃ¡c nháº­n
+      failure: Má»t Äá»a chá» thÆ° Äiá»n tá»­ ÄÃ£ ÄÆ°á»£c xÃ¡c nháº­n dÃ¹ng dáº¥u hiá»u nÃ y.
+      heading: XÃ¡c nháº­n thay Äá»i Äá»a chá» thÆ° Äiá»n tá»­
+      press confirm button: Báº¥m nÃºt XÃ¡c nháº­n á» dÆ°á»i Äá» xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i.
+      success: ÄÃ£ xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i. CÃ¡m Æ¡n báº¡n ÄÃ£ ÄÄng kÃ½!
+    friend_map: 
+      nearby mapper: "NgÆ°á»i váº½ báº£n Äá» á» gáº§n: [[nearby_user]]"
+      your location: Vá» trÃ­ cá»§a báº¡n
+    go_public: 
+      flash success: Táº¥t cáº£ cÃ¡c sá»­a Äá»i cá»§a báº¡n ÄÆ°á»£c phÃ¡t hÃ nh cÃ´ng khai, vÃ  báº¡n má»i ÄÆ°á»£c phÃ©p sá»­a Äá»i.
+    login: 
+      account not active: Ráº¥t tiáº¿c, tÃ i khoáº£n cá»§a báº¡n chÆ°a ÄÆ°á»£c kÃ­ch hoáº¡t.<br />Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t trong thÆ° Äiá»n tá»­ xÃ¡c nháº­n tÃ i khoáº£n Äá» kÃ­ch hoáº¡t tÃ i khoáº£n.
+      auth failure: Ráº¥t tiáº¿c, khÃ´ng thá» ÄÄng nháº­p vá»i nhá»¯ng chi tiáº¿t ÄÃ³.
+      create_account: má» tÃ i khoáº£n
       email or username: "Äá»a chá» ThÆ° Äiá»n tá»­ hoáº·c TÃªn ÄÄng kÃ½:"
+      heading: ÄÄng nháº­p
+      login_button: ÄÄng nháº­p
+      lost password link: QuÃªn máº¥t Máº­t kháº©u?
       password: "Máº­t kháº©u:"
-      lost password link: "QuÃªn máº¥t Máº­t kháº©u?"
-      login_button: "ÄÄng nháº­p"
-      account not active: "Ráº¥t tiáº¿c, tÃ i khoáº£n cá»§a báº¡n chÆ°a ÄÆ°á»£c kÃ­ch hoáº¡t.<br />Xin hÃ£y nháº¥n chuá»t vÃ o liÃªn káº¿t trong thÆ° Äiá»n tá»­ xÃ¡c nháº­n tÃ i khoáº£n Äá» kÃ­ch hoáº¡t tÃ i khoáº£n."
-      auth failure: "Ráº¥t tiáº¿c, khÃ´ng thá» ÄÄng nháº­p vá»i nhá»¯ng chi tiáº¿t ÄÃ³."
-    lost_password:
-      title: "QuÃªn máº¥t máº­t kháº©u"
-      heading: "QuÃªn máº¥t Máº­t kháº©u?"
-      email address: "Äá»a chá» ThÆ° Äiá»n tá»­:"
-      new password button: "Äáº·t láº¡i máº­t kháº©u"
-      notice email on way: "ÄÃ¡ng tiáº¿c lÃ  báº¡n quÃªn nÃ³. :-( May lÃ  thÆ° Äiá»n tá»­ sáº¯p tá»i Äá» báº¡n Äáº·t nÃ³ láº¡i."
-      notice email cannot find: "Ráº¥t tiáº¿c, khÃ´ng tÃ¬m tháº¥y Äá»a chá» thÆ° Äiá»n tá»­."
-    reset_password:
-      title: "Äáº·t láº¡i máº­t kháº©u"
-      heading: "Äáº·t láº¡i Máº­t kháº©u cá»§a {{user}}"
-      password: "Máº­t kháº©u:"
-      confirm password: "XÃ¡c nháº­n Máº­t kháº©u:"
-      reset: "Äáº·t láº¡i Máº­t kháº©u"
-      flash changed: "Máº­t kháº©u cá»§a báº¡n ÄÃ£ ÄÆ°á»£c thay Äá»i."
-      flash token bad: "KhÃ´ng tÃ¬m tháº¥y dáº¥u hiá»u ÄÃ³. CÃ³ láº½ kiá»m tra URL?"
-    new:
-      title: "Má» tÃ i khoáº£n"
-      heading: "Má» TÃ i khoáº£n NgÆ°á»i dÃ¹ng"
-      no_auto_account_create: "Ráº¥t tiáº¿c, chÃºng ta hiá»n khÃ´ng cÃ³ kháº£ nÄng táº¡o ra tÃ i khoáº£n tá»± Äá»ng cho báº¡n."
-      contact_webmaster: 'Xin hÃ£y liÃªn láº¡c vá»i <a href="mailto:webmaster@openstreetmap.org">webmaster</a> Äá» xin há» táº¡o ra tÃ i khoáº£n - chÃºng tÃ´i sáº½ cá» gáº¯ng thá»a mÃ£n yÃªu cáº§u nhanh láº¹.'
-      fill_form: "Äiá»n biá»u máº«u rá»i chÃºng tÃ´i sáº½ gá»­i thÆ° Äiá»n tá»­ cho báº¡n Äá» kÃ­ch hoáº¡t tÃ i khoáº£n."
-      license_agreement: 'Khi má» tÃ i khoáº£n, báº¡n ÄÃ£ cháº¥p nháº­n ráº±ng táº¥t cáº£ dá»¯ liá»u ÄÆ°á»£c báº¡n ÄÄng lÃªn dá»± Ã¡n OpenStreetMap ÄÆ°á»£c cho phÃ©p (khÃ´ng Äá»c quyá»n) sá»­ dá»¥ng theo <a href="http://www.creativecommons.org/licenses/by-sa/2.0/">giáº¥y phÃ©p Creative Commons nÃ y (by-sa)</a>.'
+      please login: Xin hÃ£y ÄÄng nháº­p hoáº·c {{create_user_link}}.
+      title: ÄÄng nháº­p
+    lost_password: 
       email address: "Äá»a chá» ThÆ° Äiá»n tá»­:"
+      heading: QuÃªn máº¥t Máº­t kháº©u?
+      new password button: Äáº·t láº¡i máº­t kháº©u
+      notice email cannot find: Ráº¥t tiáº¿c, khÃ´ng tÃ¬m tháº¥y Äá»a chá» thÆ° Äiá»n tá»­.
+      notice email on way: ÄÃ¡ng tiáº¿c lÃ  báº¡n quÃªn nÃ³. :-( May lÃ  thÆ° Äiá»n tá»­ sáº¯p tá»i Äá» báº¡n Äáº·t nÃ³ láº¡i.
+      title: QuÃªn máº¥t máº­t kháº©u
+    make_friend: 
+      already_a_friend: "{{name}} ÄÃ£ lÃ  ngÆ°á»i báº¡n."
+      failed: Ráº¥t tiáº¿c, viá»c thÃªm {{name}} lÃ  ngÆ°á»i báº¡n bá» tháº¥t báº¡i.
+      success: "{{name}} má»i lÃ  ngÆ°á»i báº¡n."
+    new: 
       confirm email address: "XÃ¡c nháº­n Äá»a chá» ThÆ° Äiá»n tá»­:"
-      not displayed publicly: 'KhÃ´ng ÄÆ°á»£c hiá»n thá» cÃ´ng khai (xem <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy?uselang=vi" title="ChÃ­nh sÃ¡ch riÃªng tÆ° wiki, cÃ³ Äoáº¡n nÃ³i vá» Äá»a chá» thÆ° Äiá»n tá»­ including section on email addresses">chÃ­nh sÃ¡ch riÃªng tÆ°</a>)'
+      confirm password: "XÃ¡c nháº­n Máº­t kháº©u:"
+      contact_webmaster: Xin hÃ£y liÃªn láº¡c vá»i <a href="mailto:webmaster@openstreetmap.org">webmaster</a> Äá» xin há» táº¡o ra tÃ i khoáº£n - chÃºng tÃ´i sáº½ cá» gáº¯ng thá»a mÃ£n yÃªu cáº§u nhanh láº¹.
       display name: "TÃªn hiá»n thá»:"
+      email address: "Äá»a chá» ThÆ° Äiá»n tá»­:"
+      fill_form: Äiá»n biá»u máº«u rá»i chÃºng tÃ´i sáº½ gá»­i thÆ° Äiá»n tá»­ cho báº¡n Äá» kÃ­ch hoáº¡t tÃ i khoáº£n.
+      flash create success message: TÃ i khoáº£n ngÆ°á»i dÃ¹ng ÄÆ°á»£c táº¡o ra thÃ nh cÃ´ng. Kiá»m tra há»p thÆ° Äiá»n tá»­ cho thÆ° xÃ¡c nháº­n Äá» báº¯t Äáº§u váº½ báº£n Äá» ngay láº­p tá»©c. :-)<br /><br />Xin lÆ°u Ã½ ráº±ng báº¡n cáº§n pháº£i nháº­n thÆ° xÃ¡c nháº­n vÃ  xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ trÆ°á»c khi cÃ³ thá» ÄÄng nháº­p.<br /><br />Náº¿u há» thá»ng thÆ° Äiá»n tá»­ cá»§a báº¡n cÃ³ tÃ­nh nÄng chá»ng spam báº±ng cÃ¡ch yÃªu cáº§u xÃ¡c nháº­n láº¡i, xin hÃ£y cháº¯c cháº¯n thÃªm webmaster@openstreetmap.org vÃ o danh sÃ¡ch tráº¯ng, táº¡i vÃ¬ chÃºng tÃ´i khÃ´ng thá» tráº£ lá»i nhá»¯ng yÃªu cáº§u xÃ¡c nháº­n nÃ y.
+      heading: Má» TÃ i khoáº£n NgÆ°á»i dÃ¹ng
+      license_agreement: Khi má» tÃ i khoáº£n, báº¡n ÄÃ£ cháº¥p nháº­n ráº±ng táº¥t cáº£ dá»¯ liá»u ÄÆ°á»£c báº¡n ÄÄng lÃªn dá»± Ã¡n OpenStreetMap ÄÆ°á»£c cho phÃ©p (khÃ´ng Äá»c quyá»n) sá»­ dá»¥ng theo <a href="http://www.creativecommons.org/licenses/by-sa/2.0/">giáº¥y phÃ©p Creative Commons nÃ y (by-sa)</a>.
+      no_auto_account_create: Ráº¥t tiáº¿c, chÃºng ta hiá»n khÃ´ng cÃ³ kháº£ nÄng táº¡o ra tÃ i khoáº£n tá»± Äá»ng cho báº¡n.
+      not displayed publicly: KhÃ´ng ÄÆ°á»£c hiá»n thá» cÃ´ng khai (xem <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy?uselang=vi" title="ChÃ­nh sÃ¡ch riÃªng tÆ° wiki, cÃ³ Äoáº¡n nÃ³i vá» Äá»a chá» thÆ° Äiá»n tá»­ including section on email addresses">chÃ­nh sÃ¡ch riÃªng tÆ°</a>)
       password: "Máº­t kháº©u:"
+      signup: ÄÄng kÃ½
+      title: Má» tÃ i khoáº£n
+    no_such_user: 
+      body: Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai.
+      heading: NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i
+      title: NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i
+    remove_friend: 
+      not_a_friend: "{{name}} ÄÃ£ khÃ´ng pháº£i ngÆ°á»i báº¡n."
+      success: "{{name}} khÃ´ng cÃ²n lÃ  ngÆ°á»i báº¡n."
+    reset_password: 
       confirm password: "XÃ¡c nháº­n Máº­t kháº©u:"
-      signup: "ÄÄng kÃ½"
-      flash create success message: "TÃ i khoáº£n ngÆ°á»i dÃ¹ng ÄÆ°á»£c táº¡o ra thÃ nh cÃ´ng. Kiá»m tra há»p thÆ° Äiá»n tá»­ cho thÆ° xÃ¡c nháº­n Äá» báº¯t Äáº§u váº½ báº£n Äá» ngay láº­p tá»©c. :-)<br /><br />Xin lÆ°u Ã½ ráº±ng báº¡n cáº§n pháº£i nháº­n thÆ° xÃ¡c nháº­n vÃ  xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ trÆ°á»c khi cÃ³ thá» ÄÄng nháº­p.<br /><br />Náº¿u há» thá»ng thÆ° Äiá»n tá»­ cá»§a báº¡n cÃ³ tÃ­nh nÄng chá»ng spam báº±ng cÃ¡ch yÃªu cáº§u xÃ¡c nháº­n láº¡i, xin hÃ£y cháº¯c cháº¯n thÃªm webmaster@openstreetmap.org vÃ o danh sÃ¡ch tráº¯ng, táº¡i vÃ¬ chÃºng tÃ´i khÃ´ng thá» tráº£ lá»i nhá»¯ng yÃªu cáº§u xÃ¡c nháº­n nÃ y."
-    no_such_user:
-      title: "NgÆ°á»i dÃ¹ng khÃ´ng tá»n táº¡i"
-      heading: "NgÆ°á»i dÃ¹ng {{user}} khÃ´ng tá»n táº¡i"
-      body: "Ráº¥t tiáº¿c, khÃ´ng cÃ³ ngÆ°á»i dÃ¹ng vá»i tÃªn {{user}}. Xin hÃ£y kiá»m tra chÃ­nh táº£, hoáº·c cÃ³ láº½ báº¡n ÄÃ£ theo má»t liÃªn káº¿t sai."
-    view:
-      my diary: "nháº­t kÃ½ cá»§a tÃ´i"
-      new diary entry: "má»¥c nháº­t kÃ½ má»i"
-      my edits: "ÄÃ³ng gÃ³p cá»§a tÃ´i"
-      my traces: "tuyáº¿n ÄÆ°á»ng cá»§a tÃ´i"
-      my settings: "tÃ¹y chá»n"
-      send message: "gá»­i thÆ°"
-      diary: "nháº­t kÃ½"
-      edits: "ÄÃ³ng gÃ³p"
-      traces: "tuyáº¿n ÄÆ°á»ng"
-      remove as friend: "dá»i ngÆ°á»i báº¡n"
-      add as friend: "thÃªm lÃ  ngÆ°á»i báº¡n"
+      flash changed: Máº­t kháº©u cá»§a báº¡n ÄÃ£ ÄÆ°á»£c thay Äá»i.
+      flash token bad: KhÃ´ng tÃ¬m tháº¥y dáº¥u hiá»u ÄÃ³. CÃ³ láº½ kiá»m tra URL?
+      heading: Äáº·t láº¡i Máº­t kháº©u cá»§a {{user}}
+      password: "Máº­t kháº©u:"
+      reset: Äáº·t láº¡i Máº­t kháº©u
+      title: Äáº·t láº¡i máº­t kháº©u
+    set_home: 
+      flash success: ÄÃ£ lÆ°u vá» trÃ­ nhÃ  thÃ nh cÃ´ng
+    view: 
+      add as friend: thÃªm lÃ  ngÆ°á»i báº¡n
+      add image: ThÃªm HÃ¬nh
+      ago: (cÃ¡ch ÄÃ¢y {{time_in_words_ago}})
+      change your settings: thay Äá»i tÃ¹y chá»n cá»§a báº¡n
+      delete image: XÃ³a HÃ¬nh
+      description: MiÃªu táº£
+      diary: nháº­t kÃ½
+      edits: ÄÃ³ng gÃ³p
+      if set location: Náº¿u Äáº·t vá» trÃ­, báº£n Äá» Äáº¹p Äáº½ vÃ  nhá»¯ng thá»© ÄÃ³ sáº½ ÄÆ°á»£c hiá»n thá» á» dÆ°á»i. Báº¡n cÃ³ thá» Äáº·t vá» trÃ­ nhÃ  táº¡i trang {{settings_link}}.
+      km away: cÃ¡ch {{count}} km
+      m away: cÃ¡ch {{count}} m
       mapper since: "Tham gia:"
-      ago: "(cÃ¡ch ÄÃ¢y {{time_in_words_ago}})"
-      user image heading: "HÃ¬nh ngÆ°á»i dÃ¹ng"
-      delete image: "XÃ³a HÃ¬nh"
-      upload an image: "Táº£i lÃªn hÃ¬nh"
-      add image: "ThÃªm HÃ¬nh"
-      description: "MiÃªu táº£"
-      user location: "Vá» trÃ­ cá»§a ngÆ°á»i dÃ¹ng"
-      no home location: "ChÆ°a Äáº·t vá» trÃ­ nhÃ ."
-      if set location: "Náº¿u Äáº·t vá» trÃ­, báº£n Äá» Äáº¹p Äáº½ vÃ  nhá»¯ng thá»© ÄÃ³ sáº½ ÄÆ°á»£c hiá»n thá» á» dÆ°á»i. Báº¡n cÃ³ thá» Äáº·t vá» trÃ­ nhÃ  táº¡i trang {{settings_link}}."
-      settings_link_text: "tÃ¹y chá»n"
-      your friends: "NgÆ°á»i báº¡n cá»§a báº¡n"
-      no friends: "Báº¡n chÆ°a thÃªm ngÆ°á»i báº¡n."
-      km away: "cÃ¡ch {{count}} km"
-      m away: "cÃ¡ch {{count}} m"
+      my diary: nháº­t kÃ½ cá»§a tÃ´i
+      my edits: ÄÃ³ng gÃ³p cá»§a tÃ´i
+      my settings: tÃ¹y chá»n
+      my traces: tuyáº¿n ÄÆ°á»ng cá»§a tÃ´i
+      my_oauth_details: Xem chi tiáº¿t OAuth cá»§a tÃ´i
       nearby users: "NgÆ°á»i dÃ¹ng á» gáº§n:"
-      no nearby users: "ChÆ°a cÃ³ ngÆ°á»i dÃ¹ng nÃ o nháº­n lÃ  há» á» gáº§n."
-      change your settings: "thay Äá»i tÃ¹y chá»n cá»§a báº¡n"
-    friend_map:
-      your location: "Vá» trÃ­ cá»§a báº¡n"
-      nearby mapper: "NgÆ°á»i váº½ báº£n Äá» á» gáº§n: [[nearby_user]]"
-    account:
-      title: "Chá»nh sá»­a tÃ i khoáº£n"
-      my settings: "TÃ¹y chá»n"
-      email never displayed publicly: "(khÃ´ng lÃºc nÃ o hiá»n cÃ´ng khai)"
-      public editing:
-        heading: "Sá»­a Äá»i cÃ´ng khai:"
-        enabled: "KÃ­ch hoáº¡t. KhÃ´ng vÃ´ danh vÃ  cÃ³ thá» sá»­a Äá»i dá»¯ liá»u."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi"
-        enabled link text: "cÃ³ nghÄ©a lÃ  gÃ¬?"
-        disabled: "VÃ´ hiá»u. KhÃ´ng thá» sá»­a Äá»i dá»¯ liá»u. all previous edits are anonymous."
-        disabled link text: "táº¡i sao khÃ´ng thá» sá»­a Äá»i?"
-      profile description: "Tá»± giá»i thiá»u:"
-      preferred languages: "NgÃ´n ngá»¯ Æ¯u tiÃªn:"
-      home location: "Vá» trÃ­ NhÃ :"
-      no home location: "Báº¡n chÆ°a Äá»nh vá» trÃ­ nhÃ ."
-      latitude: "VÄ© Äá»:"
-      longitude: "Kinh Äá»:"
-      update home location on click: "Cáº­p nháº­t vá» trÃ­ nhÃ  khi tÃ´i nháº¥n chuá»t vÃ o báº£n Äá»?"
-      save changes button: "LÆ°u cÃ¡c Thay Äá»i"
-      make edits public button: "PhÃ¡t hÃ nh cÃ´ng khai cÃ¡c sá»­a Äá»i cá»§a tÃ´i"
-      return to profile: "Trá» vá» trang cÃ¡ nhÃ¢n"
-      flash update success confirm needed: "ÄÃ£ cáº­p nháº­t thÃ´ng tin cÃ¡ nhÃ¢n thÃ nh cÃ´ng. Kiá»m tra thÆ° Äiá»n tá»­ xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i."
-      flash update success: "ÄÃ£ cáº­p nháº­t thÃ´ng tin cÃ¡ nhÃ¢n thÃ nh cÃ´ng."
-    confirm:
-      heading: "XÃ¡c nháº­n tÃ i khoáº£n ngÆ°á»i dÃ¹ng"
-      press confirm button: "Báº¥m nÃºt XÃ¡c nháº­n á» dÆ°á»i Äá» xÃ¡c nháº­n tÃ i khoáº£n."
-      button: "XÃ¡c nháº­n"
-      success: "ÄÃ£ xÃ¡c nháº­n tÃ i khoáº£n cá»§a báº¡n. CÃ¡m Æ¡n báº¡n ÄÃ£ ÄÄng kÃ½!"
-      failure: "TÃ i khoáº£n vá»i dáº¥u hiá»u nÃ y ÄÃ£ ÄÆ°á»£c xÃ¡c nháº­n."
-    confirm_email:
-      heading: "XÃ¡c nháº­n thay Äá»i Äá»a chá» thÆ° Äiá»n tá»­"
-      press confirm button: "Báº¥m nÃºt XÃ¡c nháº­n á» dÆ°á»i Äá» xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i."
-      button: "XÃ¡c nháº­n"
-      success: "ÄÃ£ xÃ¡c nháº­n Äá»a chá» thÆ° Äiá»n tá»­ má»i. CÃ¡m Æ¡n báº¡n ÄÃ£ ÄÄng kÃ½!"
-      failure: "Má»t Äá»a chá» thÆ° Äiá»n tá»­ ÄÃ£ ÄÆ°á»£c xÃ¡c nháº­n dÃ¹ng dáº¥u hiá»u nÃ y."
-    set_home:
-      flash success: "ÄÃ£ lÆ°u vá» trÃ­ nhÃ  thÃ nh cÃ´ng"
-    go_public:
-      flash success: "Táº¥t cáº£ cÃ¡c sá»­a Äá»i cá»§a báº¡n ÄÆ°á»£c phÃ¡t hÃ nh cÃ´ng khai, vÃ  báº¡n má»i ÄÆ°á»£c phÃ©p sá»­a Äá»i."
-    make_friend:
-      success: "{{name}} má»i lÃ  ngÆ°á»i báº¡n."
-      failed: "Ráº¥t tiáº¿c, viá»c thÃªm {{name}} lÃ  ngÆ°á»i báº¡n bá» tháº¥t báº¡i."
-      already_a_friend: "{{name}} ÄÃ£ lÃ  ngÆ°á»i báº¡n."
-    remove_friend:
-      success: "{{name}} khÃ´ng cÃ²n lÃ  ngÆ°á»i báº¡n."
-      not_a_friend: "{{name}} ÄÃ£ khÃ´ng pháº£i ngÆ°á»i báº¡n."
+      new diary entry: má»¥c nháº­t kÃ½ má»i
+      no friends: Báº¡n chÆ°a thÃªm ngÆ°á»i báº¡n.
+      no home location: ChÆ°a Äáº·t vá» trÃ­ nhÃ .
+      no nearby users: ChÆ°a cÃ³ ngÆ°á»i dÃ¹ng nÃ o nháº­n lÃ  há» á» gáº§n.
+      remove as friend: dá»i ngÆ°á»i báº¡n
+      send message: gá»­i thÆ°
+      settings_link_text: tÃ¹y chá»n
+      traces: tuyáº¿n ÄÆ°á»ng
+      upload an image: Táº£i lÃªn hÃ¬nh
+      user image heading: HÃ¬nh ngÆ°á»i dÃ¹ng
+      user location: Vá» trÃ­ cá»§a ngÆ°á»i dÃ¹ng
+      your friends: NgÆ°á»i báº¡n cá»§a báº¡n
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index e4c5ffefb..0927bc9b3 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -1,750 +1,696 @@
-yo:
-  html:
-    dir: ltr
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "Access Control List"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
-      country: "Orile Ede"
-      diary_comment: "Diary Comment"
-      diary_entry: "Diary Entry"
-      friend: "Ore"
-      language: "Ede"
-      message: "ihinoroiye riran"
-      node: "Node"
-      node_tag: "Node Tag"
-      notifier: "Notifier"
-      old_node: "Old Node"
-      old_node_tag: "Old Node Tag"
-      old_relation: "Ã¬sÃ¶tÃ n agba"
-      old_relation_member: "arÃ¡Ã¬bÃ¡tanÃ§bÃ­iyÃ¨kan agba"
-      old_relation_tag: "Old Relation Tag"
-      old_way: "Ona Atijo"
-      old_way_node: "Old Way Node"
-      old_way_tag: "Old Way Tag"
-      relation: "Ã¬sÃ¶tÃ n"
-      relation_member: "arÃ¡Ã¬bÃ¡tanÃ§bÃ­iyÃ¨kan"
-      relation_tag: "Relation Tag"
-      session: "Ã¬jokÃ²Ã³ Ã wÃ±n onÃ­dÃ Ã¡jÃ´"
-      trace: "Trace"
-      tracepoint: "Trace Point"
-      tracetag: "Trace Tag"
-      user: "Oniti nlo nykan"
-      user_preference: "User Preference"
-      user_token: "User Token"
-      way: "Way"
-      way_node: "Way Node"
-      way_tag: "Way Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "Ara"
-      diary_entry:
-        user: "User"
-        title: "oyÃ©orÃºkÃ´Ã mÃ¬ Ã¬dÃ¡ nkan sÃ¶tÃµorÃ­kÃ¬"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        language: "Ede"
-      friend:
-        user: "User"
-        friend: "Ore"
-      trace:
-        user: "User"
-        visible: "Visible"
-        name: "Name"
-        size: "Size"
-        latitude: "Latitude"
-        longitude: "Longitude"
-        public: "Public"
-        description: "Description"
-      message:
-        sender: "Sender"
-        title: "Title"
-        body: "Ara"
-        recipient: "Recipient"
-      user:
-        email: "Email"
-        active: "Active"
-        display_name: "Display Name"
-        description: "Description"
-        languages: "Ede"
-        pass_crypt: "Password"
-  map:
-    view: View
-    edit: Edit
-    coordinates: "Coordinates:"
-  browse:
-    changeset:
-      title: "Changeset"
+yo: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Ara
+      diary_entry: 
+        language: Ede
+        latitude: Latitude
+        longitude: Longitude
+        title: oyÃ©orÃºkÃ´Ã mÃ¬ Ã¬dÃ¡ nkan sÃ¶tÃµorÃ­kÃ¬
+        user: User
+      friend: 
+        friend: Ore
+        user: User
+      message: 
+        body: Ara
+        recipient: Recipient
+        sender: Sender
+        title: Title
+      trace: 
+        description: Description
+        latitude: Latitude
+        longitude: Longitude
+        name: Name
+        public: Public
+        size: Size
+        user: User
+        visible: Visible
+      user: 
+        active: Active
+        description: Description
+        display_name: Display Name
+        email: Email
+        languages: Ede
+        pass_crypt: Password
+    models: 
+      acl: Access Control List
+      changeset: Changeset
+      changeset_tag: Changeset Tag
+      country: Orile Ede
+      diary_comment: Diary Comment
+      diary_entry: Diary Entry
+      friend: Ore
+      language: Ede
+      message: ihinoroiye riran
+      node: Node
+      node_tag: Node Tag
+      notifier: Notifier
+      old_node: Old Node
+      old_node_tag: Old Node Tag
+      old_relation: Ã¬sÃ¶tÃ n agba
+      old_relation_member: arÃ¡Ã¬bÃ¡tanÃ§bÃ­iyÃ¨kan agba
+      old_relation_tag: Old Relation Tag
+      old_way: Ona Atijo
+      old_way_node: Old Way Node
+      old_way_tag: Old Way Tag
+      relation: Ã¬sÃ¶tÃ n
+      relation_member: arÃ¡Ã¬bÃ¡tanÃ§bÃ­iyÃ¨kan
+      relation_tag: Relation Tag
+      session: Ã¬jokÃ²Ã³ Ã wÃ±n onÃ­dÃ Ã¡jÃ´
+      trace: Trace
+      tracepoint: Trace Point
+      tracetag: Trace Tag
+      user: Oniti nlo nykan
+      user_preference: User Preference
+      user_token: User Token
+      way: Way
+      way_node: Way Node
+      way_tag: Way Tag
+  browse: 
+    changeset: 
       changeset: "Changeset: {{id}}"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "Created at:"
-      closed_at: "Closed at:"
+      changesetxml: Changeset XML
+      download: Download {{changeset_xml_link}} or {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: Changeset
+    changeset_details: 
       belongs_to: "Belongs to:"
       bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
+      box: box
+      closed_at: "Closed at:"
+      created_at: "Created at:"
       has_nodes: "Has the following {{count}} nodes:"
-      has_ways: "Has the following {{count}} ways:"
       has_relations: "Has the following {{count}} relations:"
+      has_ways: "Has the following {{count}} ways:"
+      no_bounding_box: No bounding box has been stored for this changeset.
+      show_area_box: Show Area Box
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
-      version: "Version:"
       in_changeset: "In changeset:"
-    containing_relation:
-      entry: "Relation {{relation_name}}"
-      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "Loading..."
-      deleted: "Deleted"
-    node_details:
+      version: "Version:"
+    containing_relation: 
+      entry: Relation {{relation_name}}
+      entry_role: Relation {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: Deleted
+      loading: Loading...
+    node: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      node: Node
+      node_title: "Node: {{node_name}}"
+      view_history: view history
+    node_details: 
       coordinates: "Coordinates:"
       part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
+    node_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    node:
-      node: "Node"
-      node_title: "Node: {{node_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    not_found:
-      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
-      type:
+      download_xml: Download XML
+      node_history: Node History
+      view_details: view details
+    not_found: 
+      sorry: Sorry, the {{type}} with the id {{id}}, could not be found.
+      type: 
         node: node
-        way: way
         relation: relation
-    paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    relation_details:
+        way: way
+    paging_nav: 
+      of: of
+      showing_page: Showing page
+    relation: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      relation: Relation
+      relation_title: "Relation: {{relation_name}}"
+      view_history: view history
+    relation_details: 
       members: "Members:"
       part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
+    relation_history: 
+      relation_history: Relation History
       relation_history_title: "Relation History: {{relation_name}}"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: {{relation_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
-    start_rjs:
-      data_layer_name: "Data"
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
+    start: 
+      manually_select: Manually select a different area
+      view_data: View data for current map view
+    start_rjs: 
+      data_frame_title: Data
+      data_layer_name: Data
+      details: Details
+      drag_a_box: Drag a box on the map to select an area
+      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
+      history_for_feature: History for [[feature]]
+      load_data: Load Data
       loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
-      load_data: "Load Data"
+      loading: Loading...
+      manually_select: Manually select a different area
+      object_list: 
+        api: Retrieve this area from the API
+        back: Display object list
+        details: Details
+        heading: Object list
+        history: 
+          type: 
+            node: Node [[id]]
+            way: Way [[id]]
+        selected: 
+          type: 
+            node: Node [[id]]
+            way: Ona [[id]]
+        type: 
+          node: Node
+          way: Ona
+      private_user: private user
+      show_history: Show History
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"
-      loading: "Loading..."
-      show_history: "Show History"
-      wait: "Duro..."
-      history_for_feature: "History for [[feature]]"
-      details: "Details"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
-      object_list:
-        heading: "Object list"
-        back: "Display object list"
-        type:
-          node: "Node"
-          way: "Ona"
-          # There's no 'relation' type because it isn't represented in OpenLayers
-        api: "Retrieve this area from the API"
-        details: "Details"
-        selected:
-          type:
-            node: "Node [[id]]"
-            way: "Ona [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-        history:
-          type:
-            node: "Node [[id]]"
-            way: "Way [[id]]"
-            # There's no 'relation' type because it isn't represented in OpenLayers
-    tag_details:
+      wait: Duro...
+      zoom_or_select: Zoom in or select an area of the map to view
+    tag_details: 
       tags: "Tags:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: Download XML
+      view_history: view history
+      way: Way
+      way_title: "Way: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: also part of way {{related_ways}}
+        other: also part of ways {{related_ways}}
       nodes: "Nodes:"
       part_of: "Part of:"
-      also_part_of:
-        one: "also part of way {{related_ways}}"
-        other: "also part of ways {{related_ways}}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} or {{view_details_link}}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    way:
-      way: "Way"
-      way_title: "Way: {{way_name}}"
-      download: "{{download_xml_link}} or {{view_history_link}}"
-      download_xml: "Download XML"
-      view_history: "view history"
-  changeset:
+      download_xml: Download XML
+      view_details: view details
+      way_history: Way History
+      way_history_title: "Way History: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonymous
+      big_area: (big)
+      no_comment: (none)
+      no_edits: (no edits)
+      show_area_box: show area box
+      still_editing: (still editing)
+      view_changeset_details: View changeset details
     changeset_paging_nav: 
-      showing_page: "Showing page"
-      of: "of"
-    changeset:
-      still_editing: "(still editing)"
-      anonymous: "Anonymous"
-      no_comment: "(none)"
-      no_edits: "(no edits)"
-      show_area_box: "show area box"
-      big_area: "(big)"
-      view_changeset_details: "View changeset details"
-    changesets:
-      id: "ID"
-      saved_at: "Saved at"
-      user: "User"
-      comment: "Comment"
-      area: "Area"
-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
-    list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-  diary_entry:
-    new:
-      title: New Diary Entry
-    list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
-      in_language_title: "Diary Entries in {{language}}"
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries:"
-      older_entries: Older Entries
-      newer_entries: Newer Entries
-    edit:
-      title: "Edit diary entry"
-      subject: "Subject:"
+      of: of
+      showing_page: Showing page
+    changesets: 
+      area: Area
+      comment: Comment
+      id: ID
+      saved_at: Saved at
+      user: User
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1 comment
+        other: "{{count}} comments"
+      comment_link: Comment on this entry
+      edit_link: Edit this entry
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: Reply to this entry
+    edit: 
       body: "Ara:"
       language: "ede:"
-      location: "Location:"
       latitude: "Latitude:"
+      location: "Location:"
       longitude: "Longitude:"
-      use_map_link: "Lo map"
-      save_button: "Save"
       marker_text: Diary entry location
-    view:
-      title: "Users' diaries | {{user}}"
+      save_button: Save
+      subject: "Subject:"
+      title: Edit diary entry
+      use_map_link: Lo map
+    list: 
+      in_language_title: Diary Entries in {{language}}
+      new: New Diary Entry
+      new_title: Compose a new entry in your user diary
+      newer_entries: Newer Entries
+      no_entries: No diary entries
+      older_entries: Older Entries
+      recent_entries: "Recent diary entries:"
+      title: Users' diaries
       user_title: "{{user}}'s diary"
-      leave_a_comment: "Leave a comment"
-      login_to_leave_a_comment: "{{login_link}} to leave a comment"
-      login: "wole"
-      save_button: "Save"
-    no_such_entry:
+    new: 
+      title: New Diary Entry
+    no_such_entry: 
+      body: Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong.
       heading: "No entry with the id: {{id}}"
-      body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
-      comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "Area to Export"
-      manually_select: "Manually select a different area"
-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "Embeddable HTML"
-      licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    view: 
+      leave_a_comment: Leave a comment
+      login: wole
+      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      save_button: Save
+      title: Users' diaries | {{user}}
+      user_title: "{{user}}'s diary"
+  export: 
+    start: 
+      add_marker: Add a marker to the map
+      area_to_export: Area to Export
+      embeddable_html: Embeddable HTML
+      export_button: Export
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: Format
+      format_to_export: Format to Export
+      image_size: Image Size
       latitude: "Lat:"
+      licence: Licence
       longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
-  geocoder:
-    results:
-      no_results: "No results found"
-  layouts:
-    project_name:
-      # in <title>
-      title: OpenStreetMap
-      # in <h1>
-      h1: OpenStreetMap
-    logo:
-      alt_text: OpenStreetMap logo
-    welcome_user: "Kabo, {{user_link}}"
-    welcome_user_link_tooltip: Your user page
+      manually_select: Manually select a different area
+      mapnik_image: Mapnik Image
+      max: max
+      options: Options
+      osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Osmarender Image
+      output: Output
+      paste_html: Paste HTML to embed in website
+      scale: Scale
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Add a marker to the map
+      change_marker: Change marker position
+      click_add_marker: Click on the map to add a marker
+      drag_a_box: Drag a box on the map to select an area
+      export: Export
+      manually_select: Manually select a different area
+      view_larger_map: View Larger Map
+  geocoder: 
+    results: 
+      no_results: No results found
+  layouts: 
+    alt_donation: Da wo si openstreetmap.org
+    donate: Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund.
+    donate_link_text: idawo
+    edit: Edit
+    edit_tooltip: Edit maps
+    export: Export
+    export_tooltip: Export map data
+    gps_traces: GPS Traces
+    gps_traces_tooltip: Manage traces
+    help_wiki: Help &amp; Wiki
+    help_wiki_tooltip: Help &amp; Wiki site for the project
+    history: History
+    history_tooltip: Changeset history
     home: ile
-    home_tooltip: Lo si ile 
-    inbox: "inbox ({{count}})"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
+    home_tooltip: Lo si ile
+    inbox: inbox ({{count}})
+    inbox_tooltip: 
       one: Your inbox contians 1 unread message
       other: Your inbox contains {{count}} unread messages
-    logout: jade
-    logout_tooltip: "Jade"
+      zero: Your inbox contains no unread messages
+    intro_1: OpenStreetMap is a free editable map of the whole world. It is made by people like you.
+    intro_2: OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
+    intro_3: OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}.
     log_in: Wole
     log_in_tooltip: wole pelu with an existing account
+    logo: 
+      alt_text: OpenStreetMap logo
+    logout: jade
+    logout_tooltip: Jade
+    news_blog: News blog
+    news_blog_tooltip: News blog about OpenStreetMap, free geographical data, etc.
+    osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out.
+    osm_read_only: The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.
+    shop: Oja
+    shop_tooltip: Oja oni OpenStreetMap
     sign_up: sign up
     sign_up_tooltip: Create an account for editing
+    sotm: Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!
+    tag_line: The Free Wiki World Map
+    user_diaries: User Diaries
+    user_diaries_tooltip: View user diaries
     view: wo
     view_tooltip: wo maps
+    welcome_user: Kabo, {{user_link}}
+    welcome_user_link_tooltip: Your user page
+  map: 
+    coordinates: "Coordinates:"
     edit: Edit
-    edit_tooltip: Edit maps
-    history: History
-    history_tooltip: Changeset history
-    export: Export
-    export_tooltip: Export map data
-    gps_traces: GPS Traces
-    gps_traces_tooltip: Manage traces
-    user_diaries: User Diaries
-    user_diaries_tooltip: View user diaries
-    tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
-    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
-    donate_link_text: idawo
-    help_wiki: "Help &amp; Wiki"
-    help_wiki_tooltip: "Help &amp; Wiki site for the project"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "News blog"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Oja
-    shop_tooltip: Oja oni OpenStreetMap 
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Wa si 2009 Ipade OpenStreetMap, The State of the Map, July 10-12 ni ilu  Amsterdam!'
-    alt_donation: Da wo si openstreetmap.org
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    view: View
+  message: 
+    inbox: 
+      date: Date
+      from: From
+      my_inbox: My inbox
+      no_messages_yet: You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Inbox
+      you_have: You have {{new_count}} new messages and {{old_count}} old messages
+    mark: 
+      as_read: Message marked as read
+      as_unread: Message marked as unread
+    message_summary: 
+      read_button: Mark as read
+      reply_button: Reply
+      unread_button: Mark as unread
+    new: 
+      back_to_inbox: Back to inbox
+      body: Body
+      message_sent: Message sent
+      send_button: Send
+      send_message_to: Send a new message to {{name}}
+      subject: Subject
+      title: Send message
+    no_such_user: 
+      body: Sorry there is no user or message with that name or id
+      heading: No such user or message
+      title: No such user or message
+    outbox: 
+      date: Date
+      inbox: inbox
+      my_inbox: My {{inbox_link}}
+      no_sent_messages: You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?
+      outbox: outbox
+      people_mapping_nearby: people mapping nearby
+      subject: Subject
+      title: Outbox
+      to: To
+      you_have_sent_messages: O ni {{sent_count}} sent messages
+    read: 
+      back_to_inbox: Pada si inbox
+      back_to_outbox: Pad si outbox
+      date: Date
+      from: From
+      reading_your_messages: Ka messages eh
+      reading_your_sent_messages: Ka sent messages
+      reply_button: Reply
+      subject: Subject
+      title: Ka message
+      to: To
+      unread_button: Mark as unread
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
+      footer: You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
-      footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
-      hi: "Hi {{to_user}},"
-      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
-      footer1: "You can also read the message at {{readurl}}"
-      footer2: "and you can reply at {{replyurl}}"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} added you as a friend"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_html: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you: Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}.
+    email_confirm_plain: 
+      click_the_link: If this is you, please click the link below to confirm the change.
+      greeting: Hi,
+      hopefully_you_1: Someone (hopefully you) would like to change their email address over at
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+    friend_notification: 
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
+      see_their_profile: You can see their profile at {{userurl}} and add them as a friend too if you wish.
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
+    gpx_notification: 
+      and_no_tags: and no tags.
       and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
+      failure: 
         failed_to_import: "failed to import. Here's the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
+        more_info_1: More information about GPX import failures and how to avoid
         more_info_2: "them can be found at:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+        subject: "[OpenStreetMap] GPX Import failure"
+      greeting: Hi,
+      success: 
+        loaded_successfully: "loaded successfully with {{trace_points}} out of a possible\n{{possible_points}} points."
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
-    signup_confirm:
+      with_description: with the description
+      your_gpx_file: It looks like your GPX file
+    lost_password: 
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_html: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account.
+    lost_password_plain: 
+      click_the_link: If this is you, please click the link below to reset your password.
+      greeting: Hi,
+      hopefully_you_1: Someone (possibly you) has asked for the password to be reset on this
+      hopefully_you_2: email addresses openstreetmap.org account.
+    message_notification: 
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      footer1: You can also read the message at {{readurl}}
+      footer2: and you can reply at {{replyurl}}
+      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+      hi: Hi {{to_user}},
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+    signup_confirm: 
       subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
+    signup_confirm_html: 
+      click_the_link: If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap
+      current_user: A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
+      introductory_video: You can watch an {{introductory_video_link}}.
+      more_videos: There are {{more_videos_link}}.
+      more_videos_here: more videos here
+      user_wiki_page: It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: introductory video to OpenStreetMap
+      wiki_signup: You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: If this is you, welcome! Please click the link below to confirm your
+      click_the_link_2: account and read on for more information about OpenStreetMap.
+      current_user_1: A list of current users in categories, based on where in the world
+      current_user_2: "they are, is available from:"
+      greeting: Hi there!
+      hopefully_you: Someone (hopefully you) would like to create an account over at
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      user_wiki_1: It is recommended that you create a user wiki page, which includes
+      user_wiki_2: category tags noting where you are, such as [[Category:Users_in_London]].
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-    email_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "{{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    lost_password:
-      subject: "[OpenStreetMap] Password reset request"
-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-  message:
-    inbox:
-      title: "Inbox"
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
-    message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
-    new:
-      title: "Send message"
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
-      message_sent: "Message sent"
-    no_such_user:
-      title: "No such user or message"
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox: 
-      title: "Outbox"
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "O ni {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
-    read:
-      title: "Ka message"
-      reading_your_messages: "Ka messages eh"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Pada si inbox"
-      reading_your_sent_messages: "Ka sent messages"
-      to: "To"
-      back_to_outbox: "Pad si outbox"
-    mark:
-      as_read: "Message marked as read"
-      as_unread: "Message marked as unread"
-  site:
-    index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
-      permalink: Permalink
-      license:
-        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.
+      not_public: You haven't set your edits to be public.
+      not_public_description: You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}.
+      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: user page
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
-    sidebar:
-      search_results: Search Results
-      close: Close
-    search:
+    index: 
+      js_1: You are either using a browser that doesn't support javascript, or you have disabled javascript.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
+        project_name: OpenStreetMap project
+      permalink: Permalink
+    key: 
+      map_key: Map key
+      map_key_tooltip: Map key for the mapnik rendering at this zoom level
+    search: 
       search: Search
-      where_am_i: "Ni bo ni mo wa?"
-      submit_text: "Lo"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
-    key:
-      map_key: "Map key"
-      map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
-  trace:
-    create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-    edit:
+      submit_text: Lo
+      where_am_i: Ni bo ni mo wa?
+    sidebar: 
+      close: Close
+      search_results: Search Results
+  trace: 
+    create: 
+      trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion.
+      upload_trace: Upload GPS Trace
+    delete: 
+      scheduled_for_deletion: Track scheduled for deletion
+    edit: 
+      description: "Description:"
+      edit: edit
       filename: "Filename:"
-      uploaded_at: "Uploaded at:"
+      owner: "Owner:"
       points: "Points:"
+      save_button: Save Changes
       start_coord: "Start coordinate:"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
       tags: "Tags:"
-      save_button: "Save Changes"
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
-    trace_optionals:
-      tags: "Tags"
-    view:
-      pending: "PENDING"
+      uploaded_at: "Uploaded at:"
+    list: 
+      public_traces: Public GPS traces
+      public_traces_from: Public GPS traces from {{user}}
+      tagged_with: " tagged with {{tags}}"
+      your_traces: Your GPS traces
+    make_public: 
+      made_public: Track made public
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    trace: 
+      ago: "{{time_in_words_ago}} ago"
+      by: by
+      count_points: "{{count}} points"
+      edit: edit
+      edit_map: Edit Map
+      in: in
+      map: map
+      more: more
+      pending: PENDING
+      private: PRIVATE
+      public: PUBLIC
+      trace_details: View Trace Details
+      view_map: View Map
+    trace_form: 
+      description: Description
+      help: Help
+      tags: Tags
+      upload_button: Upload
+      upload_gpx: Upload GPX File
+    trace_header: 
+      see_all_traces: See all traces
+      see_just_your_traces: See just your traces, or upload a trace
+      see_your_traces: See all your traces
+      traces_waiting: You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users.
+    trace_optionals: 
+      tags: Tags
+    trace_paging_nav: 
+      of: of
+      showing: Showing page
+    view: 
+      delete_track: Delete this track
+      description: "Description:"
+      download: download
+      edit: edit
+      edit_track: Edit this track
       filename: "Filename:"
-      download: "download"
-      uploaded: "Uploaded at:"
+      heading: Viewing trace {{name}}
+      map: map
+      none: None
+      owner: "Owner:"
+      pending: PENDING
       points: "Points:"
       start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      heading: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
-    trace_paging_nav:
-      showing: "Showing page"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
-      by: "by"
-      in: "in"
-      map: "map"
-    list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
-    delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
-    make_public:
-      made_public: "Track made public"
-  user:
-    login:
-      title: "Wole"
-      heading: "Wole"
-      please login: "Ejo e Wolw abi {{create_user_link}}."
-      create_account: "create an account"
+      tags: Tags
+      trace_not_found: Trace not found!
+      uploaded: "Uploaded at:"
+  user: 
+    account: 
+      email never displayed publicly: (never displayed publicly)
+      flash update success: User information updated successfully.
+      flash update success confirm needed: User information updated successfully. Check your email for a note to confirm your new email address.
+      home location: "Home Location:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"
+      make edits public button: Make all my edits public
+      my settings: My settings
+      no home location: You have not entered your home location.
+      preferred languages: "Preferred Languages:"
+      profile description: "Profile Description:"
+      public editing: 
+        disabled: Disabled and cannot edit data, all previous edits are anonymous.
+        disabled link text: why can't I edit?
+        enabled: Enabled. Not anonymous and can edit data.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: what's this?
+        heading: "Public editing:"
+      return to profile: Return to profile
+      save changes button: Save Changes
+      title: Edit account
+      update home location on click: Update home location when I click on the map?
+    confirm: 
+      button: Confirm
+      failure: A user account with this token has already been confirmed.
+      heading: Confirm a user account
+      press confirm button: Press the confirm button below to activate your account.
+      success: Confirmed your account, thanks for signing up!
+    confirm_email: 
+      button: Confirm
+      failure: An email address has already been confirmed with this token.
+      heading: Confirm a change of email address
+      press confirm button: Press the confirm button below to confirm your new email address.
+      success: Confirmed your email address, thanks for signing up!
+    friend_map: 
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      your location: Your location
+    go_public: 
+      flash success: All your edits are now public, and you are now allowed to edit.
+    login: 
+      account not active: Pele, account yin ko wa active .<br />Jo eh te link ni nu account confirmation email lati tan account eh.
+      auth failure: Pele, e le wole pelu details yi.
+      create_account: create an account
       email or username: "Email Address or Username:"
+      heading: Wole
+      login_button: Login
+      lost password link: Se eh ti san password nu?
       password: "Password:"
-      lost password link: "Se eh ti san password nu?"
-      login_button: "Login"
-      account not active: "Pele, account yin ko wa active .<br />Jo eh te link ni nu account confirmation email lati tan account eh."
-      auth failure: "Pele, e le wole pelu details yi."
-    lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
-    new:
-      title: "Create account"
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      please login: Ejo e Wolw abi {{create_user_link}}.
+      title: Wole
+    lost_password: 
       email address: "Email Address:"
+      heading: Forgotten Password?
+      new password button: Send me a new password
+      notice email cannot find: Couldn't find that email address, sorry.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you can reset it soon.
+      title: lost password
+    make_friend: 
+      already_a_friend: You are already friends with {{name}}.
+      failed: Sorry, failed to add {{name}} as a friend.
+      success: "{{name}} is now your friend."
+    new: 
       confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      confirm password: "Confirm Password:"
+      contact_webmaster: Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.
       display name: "Display Name:"
+      email address: "Email Address:"
+      fill_form: Fill in the form and we'll send you a quick email to activate your account.
+      flash create success message: User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests.
+      heading: Create a User Account
+      license_agreement: By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.
+      no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically.
+      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)
       password: "Password:"
-      confirm password: "Confirm Password:"
       signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
-    no_such_user:
-      title: "No such user"
-      heading: "The user {{user}} does not exist"
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
-    view:
+      title: Create account
+    no_such_user: 
+      body: Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong.
+      heading: The user {{user}} does not exist
+      title: No such user
+    remove_friend: 
+      not_a_friend: "{{name}} is not one of your friends."
+      success: "{{name}} was removed from your friends."
+    reset_password: 
+      flash token bad: Didn't find that token, check the URL maybe?
+      title: reset password
+    set_home: 
+      flash success: Home location saved successfully
+    view: 
+      add as friend: add as friend
+      add image: Add Image
+      ago: ({{time_in_words_ago}} ago)
+      change your settings: change your settings
+      delete image: Delete Image
+      description: Description
+      diary: diary
+      edits: edits
+      if set location: If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page.
+      km away: "{{count}}km away"
+      mapper since: "Mapper since:"
       my diary: my diary
-      new diary entry: new diary entry
       my edits: my edits
-      my traces: my traces
       my settings: my settings
+      my traces: my traces
+      nearby users: "Nearby users:"
+      new diary entry: new diary entry
+      no friends: You have not added any friends yet.
+      no home location: No home location has been set.
+      no nearby users: There are no users who admit to mapping nearby yet.
+      remove as friend: remove as friend
       send message: send message
-      diary: diary
-      edits: edits
+      settings_link_text: settings
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
       upload an image: Upload an image
-      add image: Add Image
-      description: Description
+      user image heading: User image
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
       your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{count}}km away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
-      public editing:
-        heading: "Public editing:"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      home location: "Home Location:"
-      no home location: "You have not entered your home location."
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
-    confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your email address, thanks for signing up!"
-      failure: "An email address has already been confirmed with this token."
-    set_home:
-      flash success: "Home location saved successfully"
-    go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
-    make_friend:
-      success: "{{name}} is now your friend."
-      failed: "Sorry, failed to add {{name}} as a friend."
-      already_a_friend: "You are already friends with {{name}}."
-    remove_friend:
-      success: "{{name}} was removed from your friends."
-      not_a_friend: "{{name}} is not one of your friends."
-
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ebad737d9..a3db1d5d6 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,664 +1,621 @@
-zh-CN:
-  activerecord:
-    # Translates all the model names, which is used in error handling on the web site
-    models:
-      acl: "ç»éæ§å¶è¡¨"
-      changeset: "ä¿®æ¹éå"
-      changeset_tag: "ä¿®æ¹éåæ ç­¾"
-      country: "å½å®¶"
-      diary_comment: "æ¥å¿è¯è®º"
-      diary_entry: "è¿å¥æ¥å¿"
-      friend: "æå"
-      language: "è¯­è¨"
-      message: "ä¿¡æ¯"
-      node: "ç»ç¹"
-      node_tag: "ç»ç¹æ ç­¾"
-      notifier: "Notifier"
-      old_node: "æ§ç»ç¹"
-      old_node_tag: "æ§ç»ç¹æ ç­¾"
-      old_relation: "æ§å³ç³»"
-      old_relation_member: "æ§å³ç³»å¯¹è±¡"
-      old_relation_tag: "æ§å³ç³»æ ç­¾"
-      old_way: "æ§è·¯å¾"
-      old_way_node: "æ§è·¯å¾ç»ç¹"
-      old_way_tag: "æ§è·¯å¾æ ç­¾"
-      relation: "å³ç³»"
-      relation_member: "å³ç³»å¯¹è±¡"
-      relation_tag: "å³ç³»æ ç­¾"
-      session: "Session"
-      trace: "è·è¸ª"
-      tracepoint: "è·è¸ªç¹"
-      tracetag: "è·è¸ªæ ç­¾"
-      user: "ç¨æ·"
-      user_preference: "ç¨æ·éæ©"
-      user_token: "User Token"
-      way: "è·¯ç»"
-      way_node: "è·¯ç»ç»ç¹"
-      way_tag: "è·¯ç»æ ç­¾"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
-    attributes:
-      diary_comment:
-        body: "åå®¹"
-      diary_entry:
-        user: "ç¨æ·"
-        title: "æ é¢"
-        latitude: "çº¬åº¦"
-        longitude: "ç»åº¦"
-        language: "è¯­è¨"
-      friend:
-        user: "ç¨æ·"
-        friend: "æå"
-      trace:
-        user: "ç¨æ·"
-        visible: "å¯è§å"
-        name: "å§å"
-        size: "å°ºå¯¸"
-        latitude: "çº¬åº¦"
-        longitude: "ç»åº¦"
-        public: "å¬å±"
-        description: "æè¿°"
-      message:
-        sender: "åéäºº"
-        title: "æ é¢"
-        body: "åå®¹"
-        recipient: "æ¶ä»¶äºº"
-      user:
-        email: "é®ä»¶"
-        active: "æ¿æ´»"
-        display_name: "æ¾ç¤ºå§å"
-        description: "æè¿°"
-        languages: "è¯­è¨"
-        pass_crypt: "å¯ç "
-  map:
-    view: "æ¥ç"
-    edit: "ç¼è¾"
-    coordinates: "åæ :"
-  browse:
-    changeset:
-      title: "ä¿®æ¹éå"
+zh-CN: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: åå®¹
+      diary_entry: 
+        language: è¯­è¨
+        latitude: çº¬åº¦
+        longitude: ç»åº¦
+        title: æ é¢
+        user: ç¨æ·
+      friend: 
+        friend: æå
+        user: ç¨æ·
+      message: 
+        body: åå®¹
+        recipient: æ¶ä»¶äºº
+        sender: åéäºº
+        title: æ é¢
+      trace: 
+        description: æè¿°
+        latitude: çº¬åº¦
+        longitude: ç»åº¦
+        name: å§å
+        public: å¬å±
+        size: å°ºå¯¸
+        user: ç¨æ·
+        visible: å¯è§å
+      user: 
+        active: æ¿æ´»
+        description: æè¿°
+        display_name: æ¾ç¤ºå§å
+        email: é®ä»¶
+        languages: è¯­è¨
+        pass_crypt: å¯ç 
+    models: 
+      acl: ç»éæ§å¶è¡¨
+      changeset: ä¿®æ¹éå
+      changeset_tag: ä¿®æ¹éåæ ç­¾
+      country: å½å®¶
+      diary_comment: æ¥å¿è¯è®º
+      diary_entry: è¿å¥æ¥å¿
+      friend: æå
+      language: è¯­è¨
+      message: ä¿¡æ¯
+      node: ç»ç¹
+      node_tag: ç»ç¹æ ç­¾
+      notifier: Notifier
+      old_node: æ§ç»ç¹
+      old_node_tag: æ§ç»ç¹æ ç­¾
+      old_relation: æ§å³ç³»
+      old_relation_member: æ§å³ç³»å¯¹è±¡
+      old_relation_tag: æ§å³ç³»æ ç­¾
+      old_way: æ§è·¯å¾
+      old_way_node: æ§è·¯å¾ç»ç¹
+      old_way_tag: æ§è·¯å¾æ ç­¾
+      relation: å³ç³»
+      relation_member: å³ç³»å¯¹è±¡
+      relation_tag: å³ç³»æ ç­¾
+      session: Session
+      trace: è·è¸ª
+      tracepoint: è·è¸ªç¹
+      tracetag: è·è¸ªæ ç­¾
+      user: ç¨æ·
+      user_preference: ç¨æ·éæ©
+      user_token: User Token
+      way: è·¯ç»
+      way_node: è·¯ç»ç»ç¹
+      way_tag: è·¯ç»æ ç­¾
+  browse: 
+    changeset: 
       changeset: "ä¿®æ¹éå: {{id}}"
-      download: "ä¸è½½ {{changeset_xml_link}} æ {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-    changeset_details:
-      created_at: "åå»ºäº:"
-      closed_at: "å³é­äº:"
+      changesetxml: Changeset XML
+      download: ä¸è½½ {{changeset_xml_link}} æ {{osmchange_xml_link}}
+      osmchangexml: osmChange XML
+      title: ä¿®æ¹éå
+    changeset_details: 
       belongs_to: "å±äº:"
       bounding_box: "éå®çªå£:"
-      no_bounding_box: "æ²¡æä¸ºè¯¥ä¿®æ¹éåæå¨å­çéå®çªå£ã"
-      show_area_box: "æ¾ç¤ºåºåçªå£"
-      box: "çªå£"
+      box: çªå£
+      closed_at: "å³é­äº:"
+      created_at: "åå»ºäº:"
       has_nodes: "æå¦ä¸{{count}}ä¸ªç¹:"
-      has_ways: "æå¦ä¸è·¯å¾ {{count}} :"
       has_relations: "æå¦ä¸{{count}}ç§å³ç³»:"
+      has_ways: "æå¦ä¸è·¯å¾ {{count}} :"
+      no_bounding_box: æ²¡æä¸ºè¯¥ä¿®æ¹éåæå¨å­çéå®çªå£ã
+      show_area_box: æ¾ç¤ºåºåçªå£
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
-      version: "çæ¬:"
       in_changeset: "å¨ä¿®æ¹éåä¸­:"
-    containing_relation:
-      entry: "å³ç³» {{relation_name}}"
-      entry_role: "å³ç³» {{relation_name}} (as {{relation_role}})"
-    map:
-      loading: "è¯»åä¸­..."
-      deleted: "å é¤"
-    node_details:
+      version: "çæ¬:"
+    containing_relation: 
+      entry: å³ç³» {{relation_name}}
+      entry_role: å³ç³» {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: å é¤
+      loading: è¯»åä¸­...
+    node: 
+      download: "{{download_xml_link}} æè {{view_history_link}}"
+      download_xml: ä¸è½½ XML
+      node: ç»ç¹
+      node_title: "ç»ç¹: {{node_name}}"
+      view_history: æ¥çåå²
+    node_details: 
       coordinates: "åæ :"
       part_of: "é¨å:"
-    node_history:
-      node_history: "ç»ç¹åå²"
+    node_history: 
       download: "{{download_xml_link}} æè {{view_details_link}}"
-      download_xml: "ä¸è½½ XML"
-      view_details: "æµè§å·ä½åå®¹"
-    node:
-      node: "ç»ç¹"
-      node_title: "ç»ç¹: {{node_name}}"
+      download_xml: ä¸è½½ XML
+      node_history: ç»ç¹åå²
+      view_details: æµè§å·ä½åå®¹
+    not_found: 
+      sorry: æ±æ­, æ æ³æ¾å°idä¸º{{id}}çç±»å{{type}}ã
+      type: 
+        node: ç»ç¹
+        relation: å³ç³»
+        way: è·¯å¾
+    paging_nav: 
+      of: of
+      showing_page: æ¾ç¤ºç½é¡µ
+    relation: 
       download: "{{download_xml_link}} æè {{view_history_link}}"
-      download_xml: "ä¸è½½ XML"
-      view_history: "æ¥çåå²"
-    not_found:
-      sorry: "æ±æ­, æ æ³æ¾å°idä¸º{{id}}çç±»å{{type}}ã"
-      type:
-        node: "ç»ç¹"
-        way: "è·¯å¾"
-        relation: "å³ç³»"
-    paging_nav:
-      showing_page: "æ¾ç¤ºç½é¡µ"
-      of: "of"
-    relation_details:
+      download_xml: ä¸è½½ XML
+      relation: å³ç³»
+      relation_title: "å³ç³»: {{relation_name}}"
+      view_history: æ¥çåå²
+    relation_details: 
       members: "æå:"
       part_of: "é¨å:"
-    relation_history:
-      relation_history: "å³ç³»åå²"
+    relation_history: 
+      relation_history: å³ç³»åå²
       relation_history_title: "å³ç³»åå²: {{relation_name}}"
-    relation:
-      relation: "å³ç³»"
-      relation_title: "å³ç³»: {{relation_name}}"
-      download: "{{download_xml_link}} æè {{view_history_link}}"
-      download_xml: "ä¸è½½ XML"
-      view_history: "æ¥çåå²"
-    start:
-      view_data: "æ¥çå³äºæ¬å°å¾çæ°æ®"
-      manually_select: "æå¨éæ©ä¸ä¸ªä¸ååºå"
-    start_rjs:
-      data_frame_title: "æ°æ®"
-      zoom_or_select: "æ¾å¤§æéæ©æ¥çä¸ä¸ªå°å¾åºå"
-      drag_a_box: "éè¿ææ³çªå£æ¥éæ©åºå"
-      manually_select: "æå¨éæ©ä¸ä¸ªä¸ååºå"
-      loaded_an_area_with_num_features: "ä½ å·²ç»éæ©äºä¸ä¸ªåºååæ¬äº[[num_features]] features. éå¸¸ï¼ä¸äºæµè§å¨ä¸è½å¾å¥½æ¾ç¤ºé«ç²¾åº¦çæ°æ®ãä¸è¬æ¥è®²ï¼å½åç´ ç¹å¨100ä¸ä¸æµè§å¨çæ¾ç¤ºæææå¥½ãå¦æååå«çä»»å¡ï¼å¯è½ä¼å¯¼è´æ¨çæµè§å¨åæ¢/ä¸ååºå¦ææ¨ç¡®å®æ¨æ³è¦æ¾ç¤ºè¿äºæ°æ®ï¼æ¨å¯è½è¦ç¹å»ä¸é¢çæé®ã"
-      load_data: "è¯»åæ°æ®"
-      unable_to_load_size: "æ æ³è¯»åï¼éå¶çªå£çå°ºå¯¸[[bbox_size]] è¿å¤§ (éå°äº {{max_bbox_size}})"
-      loading: "è¯»åä¸­"
-      show_history: "æ¾ç¤ºåå²"
-      wait: "ç­å¾ä¸­..."
-      history_for_feature: "åå² [[feature]]"
-      details: "ç»è"
-      private_user: "ä¸ªäººç¨æ·"
-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
-    tag_details:
+    start: 
+      manually_select: æå¨éæ©ä¸ä¸ªä¸ååºå
+      view_data: æ¥çå³äºæ¬å°å¾çæ°æ®
+    start_rjs: 
+      data_frame_title: æ°æ®
+      details: ç»è
+      drag_a_box: éè¿ææ³çªå£æ¥éæ©åºå
+      edited_by_user_at_timestamp: Edited by [[user]] at [[timestamp]]
+      history_for_feature: åå² [[feature]]
+      load_data: è¯»åæ°æ®
+      loaded_an_area_with_num_features: ä½ å·²ç»éæ©äºä¸ä¸ªåºååæ¬äº[[num_features]] features. éå¸¸ï¼ä¸äºæµè§å¨ä¸è½å¾å¥½æ¾ç¤ºé«ç²¾åº¦çæ°æ®ãä¸è¬æ¥è®²ï¼å½åç´ ç¹å¨100ä¸ä¸æµè§å¨çæ¾ç¤ºæææå¥½ãå¦æååå«çä»»å¡ï¼å¯è½ä¼å¯¼è´æ¨çæµè§å¨åæ¢/ä¸ååºå¦ææ¨ç¡®å®æ¨æ³è¦æ¾ç¤ºè¿äºæ°æ®ï¼æ¨å¯è½è¦ç¹å»ä¸é¢çæé®ã
+      loading: è¯»åä¸­
+      manually_select: æå¨éæ©ä¸ä¸ªä¸ååºå
+      private_user: ä¸ªäººç¨æ·
+      show_history: æ¾ç¤ºåå²
+      unable_to_load_size: æ æ³è¯»åï¼éå¶çªå£çå°ºå¯¸[[bbox_size]] è¿å¤§ (éå°äº {{max_bbox_size}})
+      wait: ç­å¾ä¸­...
+      zoom_or_select: æ¾å¤§æéæ©æ¥çä¸ä¸ªå°å¾åºå
+    tag_details: 
       tags: "æ ç­¾:"
-    way_details:
+    way: 
+      download: "{{download_xml_link}} æè {{view_history_link}}"
+      download_xml: ä¸è½½ XML
+      view_history: æ¥çåå²
+      way: è·¯ç»
+      way_title: "è·¯ç»: {{way_name}}"
+    way_details: 
+      also_part_of: ä¹æ¯ {{related_ways}}è·¯ç»çä¸é¨å
       nodes: "ç»ç¹:"
       part_of: "é¨å:"
-      also_part_of: "ä¹æ¯ {{related_ways}}è·¯ç»çä¸é¨å"
-    way_history:
-      way_history: "è·¯ç»åå²"
-      way_history_title: "è·¯ç»åå²: {{way_name}}"
+    way_history: 
       download: "{{download_xml_link}} æè {{view_details_link}}"
-      download_xml: "ä¸è½½ XML"
-      view_details: "æ¥çè¯¦ç»æåµ"
-    way:
-      way: "è·¯ç»"
-      way_title: "è·¯ç»: {{way_name}}"
-      download: "{{download_xml_link}} æè {{view_history_link}}"
-      download_xml: "ä¸è½½ XML"
-      view_history: "æ¥çåå²"
-  changeset:
+      download_xml: ä¸è½½ XML
+      view_details: æ¥çè¯¦ç»æåµ
+      way_history: è·¯ç»åå²
+      way_history_title: "è·¯ç»åå²: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: å¿å
+      big_area: (å¤§)
+      no_comment: (ç©º)
+      no_edits: (æ²¡æç¼è¾)
+      show_area_box: æ¾ç¤ºåºåçªå£
+      still_editing: (ä»å¨ç¼è¾ä¸­)
+      view_changeset_details: æ¥çè¯¦ç»åæ´
     changeset_paging_nav: 
-      showing_page: "æ¾ç¤ºç½é¡µ"
-      of: "of"
-    changeset:
-      still_editing: "(ä»å¨ç¼è¾ä¸­)"
-      anonymous: "å¿å"
-      no_comment: "(ç©º)"
-      no_edits: "(æ²¡æç¼è¾)"
-      show_area_box: "æ¾ç¤ºåºåçªå£"
-      big_area: "(å¤§)"
-      view_changeset_details: "æ¥çè¯¦ç»åæ´"
-    changesets:
-      id: "ID"
-      saved_at: "ä¿å­å¨"
-      user: "ç¨æ·"
-      comment: "è¯è®º"
-      area: "åºå"
-    list_bbox:
-      history: "åå²"
-      changesets_within_the_area: "å¨ä¸ä¸ªåºååçä¿®æ¹éå:"
-      show_area_box: "æ¾ç¤ºåºåçªå£"
-      no_changesets: "æ æ´æ¹éå"
-      all_changes_everywhere: "å¯¹äºææå°æ¹çä¿®æ¹è¯·ç {{recent_changes_link}}"
-      recent_changes: "æè¿çåæ´"
-      no_area_specified: "æ æå®åºå"
-      first_use_view: "é¦åä½¿ç¨{{æ¥çæ ç­¾é¾æ¥}}ç¡®å®æå´è¶£çåºåï¼ç¶åç¹å»åå²æ ç­¾ã"
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "æèï¼å¯çæææè¿æ¹åçé¾æ¥{{æè¿æ¹åçé¾æ¥}}"
-    list:
-      recent_changes: "æè¿çæ´æ¹"
-      recently_edited_changesets: "æè¿ç¼è¾è¿çä¿®æ¹éå:"
-      for_more_changesets: "å¯¹äºæ´å¤çä¿®æ¹ï¼éæ©ä¸ä¸ªç¨æ·å¹¶æ¥çä»ä»¬çç¼è¾, æèæ¥çä¸ä¸ªéå®åºåçç¼è¾âåå²âã"
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "æ²¡æå³äº{{name}}çå¯è§ç¼è¾ã"
-      for_all_changes: "å³äºææç¨æ·çæ´æ¹ï¼å¯ç{{recent_changes_link}}"
-      recent_changes: "æè¿çæ´æ¹"
-  diary_entry:
-    new:
-      title: æ°ç¨æ·æ¡ç®
-    list:
-      title: "ç¨æ·çæ¥å¿"
-      user_title: "{{user}}çæ¥å¿"
-      new: æ°æ¥å¿æ¡ç®
-      new_title: å¨æ¨çç¨æ·æ¥å¿ä¸­åå»ºä¸ä¸ªæ°æ¡ç®
-      no_entries: æ²¡ææ¥è®°æ¡ç®
-      recent_entries: "æè¿çæ¥å¿æ¡ç®:"
-      older_entries: æ´æ©çæ¡ç®
-      newer_entries: æ´æ°çæ¡ç®
-    edit:
-      title: "ç¼è¾æ¥å¿æ¡ç®"
-      subject: "æ é¢:"
+      of: of
+      showing_page: æ¾ç¤ºç½é¡µ
+    changesets: 
+      area: åºå
+      comment: è¯è®º
+      id: ID
+      saved_at: ä¿å­å¨
+      user: ç¨æ·
+  diary_entry: 
+    diary_comment: 
+      comment_from: Comment from {{link_user}}  at {{comment_created_at}}
+    diary_entry: 
+      comment_count: 
+        one: 1åå¤
+        other: "{{count}} åå¤"
+      comment_link: å³äºæ­¤ç¯è¯è®º
+      edit_link: ç¼è¾æ­¤ç¯
+      posted_by: Posted by {{link_user}} at {{created}} in {{language_link}}
+      reply_link: å¯¹æ­¤ç¯è¿è¡åå¤
+    edit: 
       body: "ä¸»ä½:"
       language: "è¯­è¨:"
-      location: "å°åº:"
       latitude: "çº¬åº¦:"
+      location: "å°åº:"
       longitude: "ç»åº¦:"
-      use_map_link: "ä½¿ç¨å°å¾"
-      save_button: "ä¿å­"
       marker_text: æ¥è®°æ¡ç®ä½ç½®
-    view:
-      title: "ç¨æ·æ¥å¿| {{user}}"
-      user_title: "{{user}}'s diary"
-      leave_a_comment: "çä¸è¯è®º"
-      save_button: "ä¿å­"
-    no_such_entry:
+      save_button: ä¿å­
+      subject: "æ é¢:"
+      title: ç¼è¾æ¥å¿æ¡ç®
+      use_map_link: ä½¿ç¨å°å¾
+    list: 
+      new: æ°æ¥å¿æ¡ç®
+      new_title: å¨æ¨çç¨æ·æ¥å¿ä¸­åå»ºä¸ä¸ªæ°æ¡ç®
+      newer_entries: æ´æ°çæ¡ç®
+      no_entries: æ²¡ææ¥è®°æ¡ç®
+      older_entries: æ´æ©çæ¡ç®
+      recent_entries: "æè¿çæ¥å¿æ¡ç®:"
+      title: ç¨æ·çæ¥å¿
+      user_title: "{{user}}çæ¥å¿"
+    new: 
+      title: æ°ç¨æ·æ¡ç®
+    no_such_entry: 
+      body: æ±æ­ï¼ æ²¡æå³äºæ­¤id {{id}}çæ¥è®°æ¡ç®æèè¯è®ºãè¯·æ£æ¥æ¼åï¼æèæ¨ç¹å»çé¾æ¥æè¯¯ã
       heading: "å³äºæ­¤id: {{id}}æ²¡ææ¡ç®"
-      body: "æ±æ­ï¼ æ²¡æå³äºæ­¤id {{id}}çæ¥è®°æ¡ç®æèè¯è®ºãè¯·æ£æ¥æ¼åï¼æèæ¨ç¹å»çé¾æ¥æè¯¯ã"
-    no_such_user:
-      title: "æ²¡æè¿ä¸ªç¨æ·"
-      heading: "æ­¤ç¨æ·{{user}}ä¸å­å¨"
-      body: "æ±æ­ï¼æ²¡æåå«{{user}}çç¨æ·ãè¯·æ£æ¥æ¼åï¼æèæ¨ç¹å»çé¾æ¥æè¯¯ã"
-    diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
-      comment_link: å³äºæ­¤ç¯è¯è®º
-      reply_link: å¯¹æ­¤ç¯è¿è¡åå¤
-      comment_count:
-        one: 1åå¤
-        other: "{{count}} åå¤"
-      edit_link: ç¼è¾æ­¤ç¯
-    diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
-  export:
-    start:
-      area_to_export: "è¾åºåºå"
-      manually_select: "æå¨éæ©ä¸ä¸ªä¸ååºå"
-      format_to_export: "è¾åºæ ¼å¼"
-      osm_xml_data: "OpenStreetMap XML æ°æ®"
-      mapnik_image: "Mapnik å¾å"
-      osmarender_image: "Osmarender å¾å"
-      embeddable_html: "åµå¥ HTML"
-      licence: "æ§ç§"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "éé¡¹"
-      format: "æ ¼å¼"
-      scale: "æ¯ç"
-      max: "æå¤§"
-      image_size: "å¾åå°ºå¯¸"
-      zoom: "åç¦"
-      add_marker: "å¯¹å°å¾æ·»å ä¸ä¸ªæ è®°"
+    no_such_user: 
+      body: æ±æ­ï¼æ²¡æåå«{{user}}çç¨æ·ãè¯·æ£æ¥æ¼åï¼æèæ¨ç¹å»çé¾æ¥æè¯¯ã
+      heading: æ­¤ç¨æ·{{user}}ä¸å­å¨
+      title: æ²¡æè¿ä¸ªç¨æ·
+    view: 
+      leave_a_comment: çä¸è¯è®º
+      save_button: ä¿å­
+      title: ç¨æ·æ¥å¿| {{user}}
+      user_title: "{{user}}'s diary"
+  export: 
+    start: 
+      add_marker: å¯¹å°å¾æ·»å ä¸ä¸ªæ è®°
+      area_to_export: è¾åºåºå
+      embeddable_html: åµå¥ HTML
+      export_button: è¾åº
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: æ ¼å¼
+      format_to_export: è¾åºæ ¼å¼
+      image_size: å¾åå°ºå¯¸
       latitude: "çº¬åº¦:"
+      licence: æ§ç§
       longitude: "ç»åº¦:"
-      output: "è¾åº"
-      paste_html: "å¨ç½é¡µä¸ç²è´´ HTML"
-      export_button: "è¾åº"
-    start_rjs:
-      export: "è¾åº"
-      drag_a_box: "éè¿ææ³çªå£æ¥éæ©åºå"
-      manually_select: "æå¨éæ©ä¸ä¸ªä¸ååºå"
-      click_add_marker: "ç¹å»å°å¾æ¥æ·»å ä¸ä¸ªæ è®°"
-      change_marker: "æ´æ¹æ è®°ä½ç½®"
-      add_marker: "æ è®°å°å¾"
-      view_larger_map: "æ¥çæ¾å¤§å°å¾"
-  geocoder:
-    search:
-      title:
-        latlon: 'ç»æ ä» <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'ç»æ ä» <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'ç»æ ä» <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'ç»æ ä» <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_namefinder: 'ç»æ ä» <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'ç»æ ä» <a href="http://www.geonames.org/">GeoNames</a>'
-    results:
-      no_results: "æ²¡æåç°ç»æ"
-  layouts:
-    welcome_user: "æ¬¢è¿, {{user_link}}"
-    welcome_user_link_tooltip: "æ¨çç¨æ·é¡µé¢"
-    home: "ä¸»é¡µ"
-    home_tooltip: "åå°ä¸»é¡µä½ç½®"
-    inbox: "æ¶ä»¶ç®± ({{count}})"
-    inbox_tooltip:
-      zero: "æ¨çæ¶ä»¶ç®±æ²¡ææªè¯»æ¶æ¯"
-      one: "æ¨çæ¶ä»¶ç®±æ1å°æªè¯»æ¶æ¯"
-      other: "æ¨çæ¶ä»¶ç®±æ{{count}}å°æªè¯»æ¶æ¯"
-    logout: éåº
-    logout_tooltip: "éåº"
-    log_in: ç»é
-    log_in_tooltip: "ç¨å·²å­å¨è´¦æ·ç»é"
-    sign_up: æ³¨å
-    sign_up_tooltip: "åå»ºä¸ä¸ªå¯ç¼è¾è´¦æ·"
-    view: æ¥ç
-    view_tooltip: "æ¥çå°å¾"
+      manually_select: æå¨éæ©ä¸ä¸ªä¸ååºå
+      mapnik_image: Mapnik å¾å
+      max: æå¤§
+      options: éé¡¹
+      osm_xml_data: OpenStreetMap XML æ°æ®
+      osmarender_image: Osmarender å¾å
+      output: è¾åº
+      paste_html: å¨ç½é¡µä¸ç²è´´ HTML
+      scale: æ¯ç
+      zoom: åç¦
+    start_rjs: 
+      add_marker: æ è®°å°å¾
+      change_marker: æ´æ¹æ è®°ä½ç½®
+      click_add_marker: ç¹å»å°å¾æ¥æ·»å ä¸ä¸ªæ è®°
+      drag_a_box: éè¿ææ³çªå£æ¥éæ©åºå
+      export: è¾åº
+      manually_select: æå¨éæ©ä¸ä¸ªä¸ååºå
+      view_larger_map: æ¥çæ¾å¤§å°å¾
+  geocoder: 
+    results: 
+      no_results: æ²¡æåç°ç»æ
+    search: 
+      title: 
+        ca_postcode: ç»æ ä» <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: ç»æ ä» <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: ç»æ ä» <a href="http://openstreetmap.org/">Internal</a>
+        osm_namefinder: ç»æ ä» <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        uk_postcode: ç»æ ä» <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: ç»æ ä» <a href="http://geocoder.us/">Geocoder.us</a>
+  layouts: 
+    alt_donation: ææ¬¾
+    donate: éè¿ä¸é¢çlinkå°Hardware Upgrade Fundæ¥æ¯æã
+    donate_link_text: ææ¬¾
     edit: ç¼è¾
-    edit_tooltip: "ç¼è¾å°å¾"
-    history: åå²
-    history_tooltip: "Changesetåå²"
+    edit_tooltip: ç¼è¾å°å¾
     export: è¾åº
-    export_tooltip: "è¾åºå°å¾æ°æ®"
+    export_tooltip: è¾åºå°å¾æ°æ®
     gps_traces: GPS è¿½è¸ª
-    gps_traces_tooltip: "ç®¡çè¿½è¸ª"
-    user_diaries: ç¨æ·æ¥å¿
-    user_diaries_tooltip: "æ¥çç¨æ·æ¥å¿"
-    tag_line: åè´¹ç»´åºä¸çå°å¾
-    intro_1: "OpenStreetMapæ¯ä¸ä¸ªå¯ä¾èªç±ç¼è¾çä¸çå°å¾ï¼å®æ¯ç±åæ¨è¿æ ·çç¨æ·åé ç"
-    intro_2: "OpenStreetMapåè®¸æ¨æ¥çï¼ç¼è¾æèä½¿ç¨ä¸çåå°çå°çæ°æ®æ¥å¸®å©æ¨ã"
-    intro_3: "OpenStreetMapè½¯ä»¶æ¯ç±{{ucl}} å{{bytemark}}å±åå¼åç»´æ¤çã"
-    osm_offline: "OpenStreetMapçæ°æ®åºç®åæ²¡æè¿çº¿ï¼æ°æ®åºçç»´æ¤å·¥ä½æ­£å¨è¿è¡ã"
-    osm_read_only: "OpenStreetMapæ°æ®åºç®åå¤äºåªè¯»æ¨¡å¼ä¸­ï¼æ°æ®åºçç»´æ¤å·¥ä½æ­£å¨è¿è¡ä¸­ã"
-    donate: "éè¿ä¸é¢çlinkå°Hardware Upgrade Fundæ¥æ¯æã"
-    donate_link_text: ææ¬¾
-    help_wiki: "å¸®å© &amp; Wiki"
-    news_blog: "æ°é»åå®¢"
-    news_blog_tooltip: "å³äºOpenStreetMapçæ°é»åå®¢ï¼åè´¹å°çæ°æ®ç­ç­ã"
+    gps_traces_tooltip: ç®¡çè¿½è¸ª
+    help_wiki: å¸®å© &amp; Wiki
+    history: åå²
+    history_tooltip: Changesetåå²
+    home: ä¸»é¡µ
+    home_tooltip: åå°ä¸»é¡µä½ç½®
+    inbox: æ¶ä»¶ç®± ({{count}})
+    inbox_tooltip: 
+      one: æ¨çæ¶ä»¶ç®±æ1å°æªè¯»æ¶æ¯
+      other: æ¨çæ¶ä»¶ç®±æ{{count}}å°æªè¯»æ¶æ¯
+      zero: æ¨çæ¶ä»¶ç®±æ²¡ææªè¯»æ¶æ¯
+    intro_1: OpenStreetMapæ¯ä¸ä¸ªå¯ä¾èªç±ç¼è¾çä¸çå°å¾ï¼å®æ¯ç±åæ¨è¿æ ·çç¨æ·åé ç
+    intro_2: OpenStreetMapåè®¸æ¨æ¥çï¼ç¼è¾æèä½¿ç¨ä¸çåå°çå°çæ°æ®æ¥å¸®å©æ¨ã
+    intro_3: OpenStreetMapè½¯ä»¶æ¯ç±{{ucl}} å{{bytemark}}å±åå¼åç»´æ¤çã
+    log_in: ç»é
+    log_in_tooltip: ç¨å·²å­å¨è´¦æ·ç»é
+    logout: éåº
+    logout_tooltip: éåº
+    news_blog: æ°é»åå®¢
+    news_blog_tooltip: å³äºOpenStreetMapçæ°é»åå®¢ï¼åè´¹å°çæ°æ®ç­ç­ã
+    osm_offline: OpenStreetMapçæ°æ®åºç®åæ²¡æè¿çº¿ï¼æ°æ®åºçç»´æ¤å·¥ä½æ­£å¨è¿è¡ã
+    osm_read_only: OpenStreetMapæ°æ®åºç®åå¤äºåªè¯»æ¨¡å¼ä¸­ï¼æ°æ®åºçç»´æ¤å·¥ä½æ­£å¨è¿è¡ä¸­ã
     shop: Shop
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: ææ¬¾
-  notifier:
-    diary_comment_notification:
+    sign_up: æ³¨å
+    sign_up_tooltip: åå»ºä¸ä¸ªå¯ç¼è¾è´¦æ·
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: åè´¹ç»´åºä¸çå°å¾
+    user_diaries: ç¨æ·æ¥å¿
+    user_diaries_tooltip: æ¥çç¨æ·æ¥å¿
+    view: æ¥ç
+    view_tooltip: æ¥çå°å¾
+    welcome_user: æ¬¢è¿, {{user_link}}
+    welcome_user_link_tooltip: æ¨çç¨æ·é¡µé¢
+  map: 
+    coordinates: "åæ :"
+    edit: ç¼è¾
+    view: æ¥ç
+  message: 
+    inbox: 
+      date: æ¥æ
+      from: æ¥èª
+      my_inbox: æçæ¶ä»¶ç®±
+      no_messages_yet: æ¨è¿æ²¡ææ¶æ¯ï¼ä½ä¸èç³»ä¸äº{{people_mapping_nearby_link}}?
+      outbox: åä»¶ç®±
+      people_mapping_nearby: å¨æ¨éè¿çäºº
+      subject: æ é¢
+      you_have: æ¨æ {{new_count}} æ°æ¶æ¯å{{old_count}} æ§æ¶æ¯
+    message_summary: 
+      read_button: æ è®°ä¸ºå·²è¯»
+      reply_button: åå¤
+      unread_button: æ è®°ä¸ºæªè¯»
+    new: 
+      back_to_inbox: è¿åæ¶ä»¶ç®±
+      body: ä¸»ä½
+      send_button: åé
+      send_message_to: åæ°æ¶æ¯ç»{{name}}
+      subject: æ é¢
+    no_such_user: 
+      body: å¯¹ä¸èµ·ï¼æ²¡æå³äºæ­¤åå­æidçç¨æ·ææ¶æ¯
+      heading: æ²¡ææ­¤ç¨æ·æä¿¡æ¯
+    outbox: 
+      date: æ¥æ
+      inbox: æ¶ä»¶ç®±
+      my_inbox: æç {{inbox_link}}
+      no_sent_messages: æ¨å°æªåéä¿¡æ¯ãä½ä¸èç³»ä¸äº{{people_mapping_nearby_link}}?
+      outbox: åä»¶ç®±
+      people_mapping_nearby: å¨æ¨éè¿çäºº
+      subject: ä¸»ä½
+      to: ç»
+      you_have_sent_messages: æ¨æ{{sent_count}} å·²åéé®ä»¶
+    read: 
+      back_to_inbox: è¿åæ¶ä»¶ç®±
+      back_to_outbox: è¿ååä»¶ç®±
+      date: æ¥æ
+      from: æ¥èª
+      reading_your_messages: æ­£å¨éè¯»æ¨çä¿¡æ¯
+      reading_your_sent_messages: æ­£å¨éè¯»æ¨æåéçä¿¡æ¯
+      reply_button: åå¤
+      subject: ä¸»é¢
+      to: ç»
+      unread_button: æ è®°ä¸ºæªè¯»
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   è¯·å¿åå¤æ­¤é®ä»¶ã                    *"
-      banner2: "*                ä½¿ç¨OpenStreetMapç½ç«åå¤ã		   *"
-      hi: "æ¨å¥½ {{to_user}},"
+      banner2: "*                ä½¿ç¨OpenStreetMapç½ç«åå¤ã\t\t   *"
+      footer: æ¨ä¹å¯ä»¥éè¿{{readurl}}æ¥è¯»åè¯è®ºï¼å¹¶ä¸å¨{{commenturl}}æ¥æ°åè¯è®ºæèéè¿{{replyurl}}åå¤
       header: "{{from_user}}éè¿æ é¢{{subject}}å¯¹æ¨æè¿çOpenStreetMapæ¥å¿æ¡ç®è¿è¡è¯è®ºã"
-      footer: "æ¨ä¹å¯ä»¥éè¿{{readurl}}æ¥è¯»åè¯è®ºï¼å¹¶ä¸å¨{{commenturl}}æ¥æ°åè¯è®ºæèéè¿{{replyurl}}åå¤"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}}ç»æ¨åéæ°æ¶æ¯"
+      hi: æ¨å¥½ {{to_user}},
+    friend_notification: 
+      had_added_you: "{{user}}å·²ç»å¨Openstreetmapä¸å æ¨ä¸ºå¥½åã"
+      see_their_profile: æ¨å¯ä»¥å¨{{userurl}}ä¸æ¥çä»ä»¬çä¸ªäººä¿¡æ¯ï¼å¹¶ä¸å¦ææ¨æ¿æï¼å¯ä»¥å°ä»ä»¬å ä¸ºæ¨çå¥½åã
+      subject: "[OpenStreetMap] {{user}}å·²å æ¨ä¸ºå¥½å"
+    gpx_notification: 
+      greeting: æ¨å¥½ï¼
+    message_notification: 
       banner1: "*è¯·å¿åå¤æ­¤é®ä»¶ã*"
       banner2: "* ä½¿ç¨OpenStreetMapç½ç«åå¤ã*"
-      hi: "æ¨å¥½{{to_user}},"
+      footer1: æ¨å¯ä»¥å¨{{replyurl}}éè¯»è¿æ¡æ¶æ¯
+      footer2: å¹¶ä¸æ¨å¯ä»¥å¨{{replyurl}}åå¤
       header: "{{from_user}}å·²ç»éè¿OpenStreetMapåæ¨åéæ é¢ä¸º{{subject}}çæ¶æ¯:"
-      footer1: "æ¨å¯ä»¥å¨{{replyurl}}éè¯»è¿æ¡æ¶æ¯"
-      footer2: "å¹¶ä¸æ¨å¯ä»¥å¨{{replyurl}}åå¤"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}}å·²å æ¨ä¸ºå¥½å"
-      had_added_you: "{{user}}å·²ç»å¨Openstreetmapä¸å æ¨ä¸ºå¥½åã"
-      see_their_profile: "æ¨å¯ä»¥å¨{{userurl}}ä¸æ¥çä»ä»¬çä¸ªäººä¿¡æ¯ï¼å¹¶ä¸å¦ææ¨æ¿æï¼å¯ä»¥å°ä»ä»¬å ä¸ºæ¨çå¥½åã"
-    gpx_notification:
-      greeting: "æ¨å¥½ï¼"
-    signup_confirm_plain:
-      greeting: "æ¨å¥½!"
-      hopefully_you: "æäººï¼æ¨ï¼å¸æåå»ºä¸ä¸ªè´¦å·"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "æ¬¢è¿ï¼å¦ææ¨æ¯ç¨æ·æ¬äººï¼è¯·ç¹å»ä¸é¢çé¾æ¥æ¥ç¡®è®¤æ¨ç"
-      click_the_link_2: "å¸æ·å¹¶è¯»åæ´å¤å³äºOpenStreetMapçä¿¡æ¯."
+      hi: æ¨å¥½{{to_user}},
+      subject: "[OpenStreetMap] {{user}}ç»æ¨åéæ°æ¶æ¯"
+    signup_confirm_html: 
+      click_the_link: å¦ææ¯æ¨æ¬äººï¼é£ä¹æ¬¢è¿æ¨ï¼è¯·ç¹å»ä¸ä¸é¾æ¥ç¡®è®¤å¸æ·å¹¶éè¯»æ´å¤å³äºOpenStreetMapçä¿¡æ¯
+      current_user: ä¸ä¸ªåºäºå¶æå¤ä½ç½®çï¼å½åç¨æ·åç±»åè¡¨å¯ä»è¿éè·å¾<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: å¼å§éè¯»å¨wikiä¸å³äºOpenStreetMapçä¿¡æ¯ <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></a> æ  <a href="http://www.opengeodata.org/">å¨ opengeodata blog</a> ä¸ä¹æ<a href="http://www.opengeodata.org/?cat=13">podcasts å¯ä»¥å¾å¬</a>!
+      greeting: æ¨å¥½!
+      hopefully_you: æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸ä¸ªè´¦æ·
+      introductory_video: æ¨å¯ä»¥è§çä¸é¨{{introductory_video_link}}.
+      more_videos: è¿é{{more_videos_link}}.
+      more_videos_here: ææ´å¤çå½±ç
+      user_wiki_page: æ¨èæ¨åç«ä¸ä¸ªç¨æ·wikiç½é¡µï¼å®åæ¬åç±»æ ç­¾ï¼ç¨æ¥æéæ¨æå¨ä½ç½®ï¼ä¾å¦ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: å³äºOpenStreetMapçä»ç»å½±ç
+      wiki_signup: æ¨å¯è½ä¹æ³è¦ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">æ³¨åå° OpenStreetMap wiki</a>.
+    signup_confirm_plain: 
+      click_the_link_1: æ¬¢è¿ï¼å¦ææ¨æ¯ç¨æ·æ¬äººï¼è¯·ç¹å»ä¸é¢çé¾æ¥æ¥ç¡®è®¤æ¨ç
+      click_the_link_2: å¸æ·å¹¶è¯»åæ´å¤å³äºOpenStreetMapçä¿¡æ¯.
+      current_user_1: ä¸ä¸ªå½åä¸ååç±»çç¨æ·åè¡¨ï¼ä»ä»¬æ¯åºäºæå¨å°çä½ç½®æ¥åç±»
+      current_user_2: "æ¥èªäº:"
+      greeting: æ¨å¥½!
+      hopefully_you: æäººï¼æ¨ï¼å¸æåå»ºä¸ä¸ªè´¦å·
       introductory_video: "æ¨å¯ä»¥å¨è¿éè§çå³äºOpenStreetMapçä»ç»è§é¢:"
       more_videos: "æ´å¤çè§é¢è¯·çè¿é:"
-      the_wiki: "æ¥çWikiä¸çOpenStreetMapä»ç»:"
       opengeodata: "OpenGeoData.orgæ¯OpenStreetMapçåå®¢ï¼æä»¬å¨ä¸é¢ä¹ææ­å®¢:"
+      the_wiki: "æ¥çWikiä¸çOpenStreetMapä»ç»:"
+      user_wiki_1: æ¨èæ¨åå»ºä¸ä¸ªwikiçç¨æ·é¡µï¼å®åæ¬
+      user_wiki_2: åç±»æ ç­¾è¡¨ææ¨çä½ç½®ï¼ä¾å¦[[Category:Users_in_London]].
       wiki_signup: "ä½ å¯è½æ³è¦ç»å½å°OpenStreetMap wiki:"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "æ¨èæ¨åå»ºä¸ä¸ªwikiçç¨æ·é¡µï¼å®åæ¬"
-      user_wiki_2: "åç±»æ ç­¾è¡¨ææ¨çä½ç½®ï¼ä¾å¦[[Category:Users_in_London]]."
-      current_user_1: "ä¸ä¸ªå½åä¸ååç±»çç¨æ·åè¡¨ï¼ä»ä»¬æ¯åºäºæå¨å°çä½ç½®æ¥åç±»"
-      current_user_2: "æ¥èªäº:"
-    signup_confirm_html:
-      greeting: "æ¨å¥½!"
-      hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸ä¸ªè´¦æ·"
-      click_the_link: "å¦ææ¯æ¨æ¬äººï¼é£ä¹æ¬¢è¿æ¨ï¼è¯·ç¹å»ä¸ä¸é¾æ¥ç¡®è®¤å¸æ·å¹¶éè¯»æ´å¤å³äºOpenStreetMapçä¿¡æ¯"
-      introductory_video: "æ¨å¯ä»¥è§çä¸é¨{{introductory_video_link}}."
-      video_to_openstreetmap: "å³äºOpenStreetMapçä»ç»å½±ç"
-      more_videos: "è¿é{{more_videos_link}}."
-      more_videos_here: "ææ´å¤çå½±ç"
-      get_reading: 'å¼å§éè¯»å¨wikiä¸å³äºOpenStreetMapçä¿¡æ¯ <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></a> æ  <a href="http://www.opengeodata.org/">å¨ opengeodata blog</a> ä¸ä¹æ<a href="http://www.opengeodata.org/?cat=13">podcasts å¯ä»¥å¾å¬</a>!'
-      wiki_signup: 'æ¨å¯è½ä¹æ³è¦ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">æ³¨åå° OpenStreetMap wiki</a>.'
-      user_wiki_page: 'æ¨èæ¨åç«ä¸ä¸ªç¨æ·wikiç½é¡µï¼å®åæ¬åç±»æ ç­¾ï¼ç¨æ¥æéæ¨æå¨ä½ç½®ï¼ä¾å¦ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'ä¸ä¸ªåºäºå¶æå¤ä½ç½®çï¼å½åç¨æ·åç±»åè¡¨å¯ä»è¿éè·å¾<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
-  message:
-    inbox:
-      my_inbox: "æçæ¶ä»¶ç®±"
-      outbox: "åä»¶ç®±"
-      you_have: "æ¨æ {{new_count}} æ°æ¶æ¯å{{old_count}} æ§æ¶æ¯"
-      from: "æ¥èª"
-      subject: "æ é¢"
-      date: "æ¥æ"
-      no_messages_yet: "æ¨è¿æ²¡ææ¶æ¯ï¼ä½ä¸èç³»ä¸äº{{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "å¨æ¨éè¿çäºº" 
-    message_summary:
-      unread_button: "æ è®°ä¸ºæªè¯»"
-      read_button: "æ è®°ä¸ºå·²è¯»"
-      reply_button: "åå¤"
-    new:
-      send_message_to: "åæ°æ¶æ¯ç»{{name}}"
-      subject: "æ é¢"
-      body: "ä¸»ä½"
-      send_button: "åé"
-      back_to_inbox: "è¿åæ¶ä»¶ç®±"
-    no_such_user:
-      heading: "æ²¡ææ­¤ç¨æ·æä¿¡æ¯"
-      body: "å¯¹ä¸èµ·ï¼æ²¡æå³äºæ­¤åå­æidçç¨æ·ææ¶æ¯"
-    outbox: 
-      my_inbox: "æç {{inbox_link}}"
-      inbox: "æ¶ä»¶ç®±"
-      outbox: "åä»¶ç®±"
-      you_have_sent_messages: "æ¨æ{{sent_count}} å·²åéé®ä»¶"
-      to: "ç»"
-      subject: "ä¸»ä½"
-      date: "æ¥æ"
-      no_sent_messages: "æ¨å°æªåéä¿¡æ¯ãä½ä¸èç³»ä¸äº{{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "å¨æ¨éè¿çäºº"
-    read:
-      reading_your_messages: "æ­£å¨éè¯»æ¨çä¿¡æ¯"
-      from: "æ¥èª"
-      subject: "ä¸»é¢"
-      date: "æ¥æ"
-      reply_button: "åå¤"
-      unread_button: "æ è®°ä¸ºæªè¯»"
-      back_to_inbox: "è¿åæ¶ä»¶ç®±"
-      reading_your_sent_messages: "æ­£å¨éè¯»æ¨æåéçä¿¡æ¯"
-      to: "ç»"
-      back_to_outbox: "è¿ååä»¶ç®±"
-  site:
-    index:
-      js_1: "æè®¸æ¨æ­£å¨ä½¿ç¨çæµè§å¨ä¸æ¯æjavascript, æè®¸æ¨ç¦ç¨äºjavascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'æ¨æè®¸å¯ä»¥å°è¯ <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> å¦ææ¨æ æ³å¯ç¨javascript.'
-      permalink: Permalink
-      license:
-        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "æ¨å°æªå¬å¼æ¨çç¼è¾ã"
-      not_public_description: "æ¨å°æ æ³åç¼è¾æ­¤å°å¾ï¼ç´å°æ¨åå°å¦ä¸æè¿°ãæ¨å¯ä»¥å¬å¼æ¨çç¼è¾ï¼éè¿æ¨ç{{user_page}}ã"
+  site: 
+    edit: 
+      anon_edits_link_text: Find out why this is the case.
+      flash_player_required: æ¨éè¦ä¸ä¸ªFlash Playeræ¥ä½¿ç¨OpenStreetMapçFlashç¼è¾å¨Potlatchãæ¨å¯ä»¥éè¿<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ä»Adobe.comä¸è½½ Flash Player </a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">ä¸äºå¶ä»éæ©</a> ä¹å¯ä»¥ç¨æ¥ç¼è¾OpenStreetMap.
+      not_public: æ¨å°æªå¬å¼æ¨çç¼è¾ã
+      not_public_description: æ¨å°æ æ³åç¼è¾æ­¤å°å¾ï¼ç´å°æ¨åå°å¦ä¸æè¿°ãæ¨å¯ä»¥å¬å¼æ¨çç¼è¾ï¼éè¿æ¨ç{{user_page}}ã
+      potlatch_unsaved_changes: æ¨æå°æªä¿å­çæ¹å¨. (ä¸ºä¿å­å°Potlatch, å¦æå¨åè¡¨æ¨¡å¼ä¸ç¼è¾ï¼æ¨éè¦åæ¶å½åæéæ©çè·¯å¾æç»ç¹ï¼æèç¹å»ä¿å­ï¼å¦ææ¨çå°ä¿å­æé®ã)
       user_page_link: ç¨æ·é¡µ
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'æ¨éè¦ä¸ä¸ªFlash Playeræ¥ä½¿ç¨OpenStreetMapçFlashç¼è¾å¨Potlatchãæ¨å¯ä»¥éè¿<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ä»Adobe.comä¸è½½ Flash Player </a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">ä¸äºå¶ä»éæ©</a> ä¹å¯ä»¥ç¨æ¥ç¼è¾OpenStreetMap.'
-      potlatch_unsaved_changes: "æ¨æå°æªä¿å­çæ¹å¨. (ä¸ºä¿å­å°Potlatch, å¦æå¨åè¡¨æ¨¡å¼ä¸ç¼è¾ï¼æ¨éè¦åæ¶å½åæéæ©çè·¯å¾æç»ç¹ï¼æèç¹å»ä¿å­ï¼å¦ææ¨çå°ä¿å­æé®ã)"
-    sidebar:
-      search_results: æç´¢ç»æ
-      close: å³é­
-    search:
+    index: 
+      js_1: æè®¸æ¨æ­£å¨ä½¿ç¨çæµè§å¨ä¸æ¯æjavascript, æè®¸æ¨ç¦ç¨äºjavascript.
+      js_2: OpenStreetMap uses javascript for its slippy map.
+      js_3: æ¨æè®¸å¯ä»¥å°è¯ <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> å¦ææ¨æ æ³å¯ç¨javascript.
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: Licensed under the {{license_name}} license by the {{project_name}} and its contributors.
+        project_name: OpenStreetMap project
+      permalink: Permalink
+    key: 
+      map_key: å°å¾ç¬¦å·
+    search: 
       search: æç´¢
-      where_am_i: "æå¨åªå¿?"
-      submit_text: "å¼å§"
       search_help: "ä¾å¦: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', æè 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>æ´å¤ä¾å­...</a>"
-    key:
-      map_key: "å°å¾ç¬¦å·"
-  trace:
-    create:
-      upload_trace: "ä¸ä¼  GPS è·è¸ª"
-      trace_uploaded: "æ¨ç GPX æä»¶å·²ç»è¢«ä¸ä¼ ï¼æ­£ç­å¾è¢«è¾å¥æ°æ®åºãè¿éå¸¸è¦åå°æ¶ï¼å½ä¸ä¼ ç»æåä¼åé®ä»¶éç¥æ¨ã"
-    edit:
+      submit_text: å¼å§
+      where_am_i: æå¨åªå¿?
+    sidebar: 
+      close: å³é­
+      search_results: æç´¢ç»æ
+  trace: 
+    create: 
+      trace_uploaded: æ¨ç GPX æä»¶å·²ç»è¢«ä¸ä¼ ï¼æ­£ç­å¾è¢«è¾å¥æ°æ®åºãè¿éå¸¸è¦åå°æ¶ï¼å½ä¸ä¼ ç»æåä¼åé®ä»¶éç¥æ¨ã
+      upload_trace: ä¸ä¼  GPS è·è¸ª
+    delete: 
+      scheduled_for_deletion: è®¡åè¢«å é¤çè·¯å¾
+    edit: 
+      description: "æè¿°:"
+      edit: ç¼è¾
       filename: "æä»¶å:"
-      uploaded_at: "Uploaded at:"
+      owner: "Owner:"
       points: "åæ ç¹:"
+      save_button: ä¿å­ä¿®æ¹
       start_coord: "å¼å§åæ :"
-      edit: "ç¼è¾"
-      owner: "Owner:"
-      description: "æè¿°:"
       tags: "æ ç­¾:"
-      save_button: "ä¿å­ä¿®æ¹"
-    no_such_user:
-      body: "å¯¹ä¸èµ·ï¼æ²¡ææ­¤å{{user}}æå¯¹åºçç¨æ·ãè¯·æ¥çæ¨çæ¼åï¼æèå¯è½æ¨ç¹å»æè¯¯ã"
-    trace_form:
-      upload_gpx: "ä¸ä¼  GPX æä»¶"
-      description: "æè¿°"
-      tags: "æ ç­¾"
-      public: "å¬å¼?"
-      upload_button: "ä¸ä¼ "
-      help: "å¸®å©"
-    trace_header:
-      see_just_your_traces: "æ¥çæ¨çè¿½è¸ªï¼æä¸ä¼ ä¸æ¡è¿½è¸ªè·¯å¾"
-      see_all_traces: "æ¥çææçè¿½è¸ªè·¯å¾"
-      see_your_traces: "æ¥çæ¨ææçè¿½è¸ªè·¯å¾"
-      traces_waiting: "æ¨æ {{count}} æ¡è¿½è¸ªè·¯å¾æ­£ç­å¾ä¸ä¼ ï¼è¯·åæ¨ä¸ä¼ æ´å¤è·¯å¾åç­å¾è¿äºä¼ å®ï¼ä»¥ç¡®ä¿ä¸ä¼ç»å¶ä»ç¨æ·é æéåæ¥å µã"
-    trace_optionals:
-      tags: "æ ç­¾"
-    view:
-      pending: "PENDING"
+      uploaded_at: "Uploaded at:"
+    list: 
+      public_traces: å¬å±GPSè¿½è¸ªè·¯å¾
+      public_traces_from: å¬å± GPS è¿½è¸ªè·¯å¾æ¥èª {{user}}
+      tagged_with: " æ è®°ä¸º {{tags}}"
+      your_traces: æ¨çGPSè¿½è¸ªè·¯å¾
+    make_public: 
+      made_public: å¬å¼åè·¯å¾
+    no_such_user: 
+      body: å¯¹ä¸èµ·ï¼æ²¡ææ­¤å{{user}}æå¯¹åºçç¨æ·ãè¯·æ¥çæ¨çæ¼åï¼æèå¯è½æ¨ç¹å»æè¯¯ã
+    trace: 
+      ago: "{{time_in_words_ago}} ä¹å"
+      by: by
+      count_points: "{{count}} ä¸ªç¹"
+      edit: ç¼è¾
+      edit_map: ç¼è¾å°å¾
+      in: in
+      map: å°å¾
+      more: æ´å¤
+      pending: PENDING
+      private: ç§æ
+      public: å¬å¼
+      trace_details: æ¥çè·¯å¾è¯¦æ
+      view_map: æ¥çå°å¾
+    trace_form: 
+      description: æè¿°
+      help: å¸®å©
+      tags: æ ç­¾
+      upload_button: ä¸ä¼ 
+      upload_gpx: ä¸ä¼  GPX æä»¶
+    trace_header: 
+      see_all_traces: æ¥çææçè¿½è¸ªè·¯å¾
+      see_just_your_traces: æ¥çæ¨çè¿½è¸ªï¼æä¸ä¼ ä¸æ¡è¿½è¸ªè·¯å¾
+      see_your_traces: æ¥çæ¨ææçè¿½è¸ªè·¯å¾
+      traces_waiting: æ¨æ {{count}} æ¡è¿½è¸ªè·¯å¾æ­£ç­å¾ä¸ä¼ ï¼è¯·åæ¨ä¸ä¼ æ´å¤è·¯å¾åç­å¾è¿äºä¼ å®ï¼ä»¥ç¡®ä¿ä¸ä¼ç»å¶ä»ç¨æ·é æéåæ¥å µã
+    trace_optionals: 
+      tags: æ ç­¾
+    trace_paging_nav: 
+      of: of
+      showing: æ¾ç¤ºé¡µ
+    view: 
+      delete_track: å é¤è¿æ¡è·¯å¾
+      description: "æè¿°:"
+      download: ä¸è½½
+      edit: ç¼è¾
+      edit_track: ç¼è¾è¿æ¡è·¯å¾
       filename: "æä»¶å:"
-      download: "ä¸è½½"
-      uploaded: "Uploaded at:"
+      heading: æ¥çè·¯å¾ {{name}}
+      map: å°å¾
+      none: ç©º
+      owner: "ææè:"
+      pending: PENDING
       points: "ç»ç¹:"
       start_coordinates: "å¼å§åæ :"
-      map: "å°å¾"
-      edit: "ç¼è¾"
-      owner: "ææè:"
-      description: "æè¿°:"
-      tags: "æ ç­¾"
-      none: "ç©º"
-      make_public: "æ°¸ä¹å¬å¼è¿æ¡è·¯å¾"
-      edit_track: "ç¼è¾è¿æ¡è·¯å¾"
-      delete_track: "å é¤è¿æ¡è·¯å¾"
-      heading: "æ¥çè·¯å¾ {{name}}"
-      trace_not_found: "è·¯å¾ä¸ºæ¾å°!"
-    trace_paging_nav:
-      showing: "æ¾ç¤ºé¡µ"
-      of: "of"
-    trace:
-      pending: "PENDING"
-      count_points: "{{count}} ä¸ªç¹"
-      ago: "{{time_in_words_ago}} ä¹å"
-      more: "æ´å¤"
-      trace_details: "æ¥çè·¯å¾è¯¦æ"
-      view_map: "æ¥çå°å¾"
-      edit: "ç¼è¾"
-      edit_map: "ç¼è¾å°å¾"
-      public: "å¬å¼"
-      private: "ç§æ"
-      by: "by"
-      in: "in"
-      map: "å°å¾"
-    list:
-      public_traces: "å¬å±GPSè¿½è¸ªè·¯å¾"
-      your_traces: "æ¨çGPSè¿½è¸ªè·¯å¾"
-      public_traces_from: "å¬å± GPS è¿½è¸ªè·¯å¾æ¥èª {{user}}"
-      tagged_with: " æ è®°ä¸º {{tags}}"
-    delete:
-      scheduled_for_deletion: "è®¡åè¢«å é¤çè·¯å¾"
-    make_public:
-      made_public: "å¬å¼åè·¯å¾"
-  user:
-    login:
-      title: "ç»é"
-      heading: "ç»é"
-      please login: "è¯·ç»éæ{{create_user_link}}."
-      create_account: "åå»ºä¸ä¸ªè´¦æ·"
+      tags: æ ç­¾
+      trace_not_found: è·¯å¾ä¸ºæ¾å°!
+      uploaded: "Uploaded at:"
+  user: 
+    account: 
+      email never displayed publicly: (ä»ä¸å¬å¼æ¾ç¤º)
+      flash update success: æåæ´æ°ç¨æ·ä¿¡æ¯ã
+      flash update success confirm needed: æåæ´æ°ç¨æ·ä¿¡æ¯ã æ¥çæ¨çé®ç®±ä»¥ç¡®è®¤æ¨çæ°é®ç®±å°åã
+      home location: "æå¨ä½ç½®:"
+      latitude: "çº¬åº¦:"
+      longitude: "ç»åº¦:"
+      make edits public button: å¬å¼æææçç¼è¾
+      my settings: æçè®¾ç½®
+      no home location: æ¨å°æªè¾å¥æå¨ä½ç½®ã
+      preferred languages: "éæ©è¯­è¨:"
+      profile description: "åºæ¬ä¿¡æ¯æè¿°:"
+      public editing: 
+        disabled: ç¦ç¨ä¸æ æ³ç¼è¾æ°æ®ï¼ææè¿å»çç¼è¾åä¸ºå¿åã
+        disabled link text: ä¸ºä»ä¹æ æ³ç¼è¾?
+        enabled: å¯å¨ãéå¿åå¹¶å¯ç¼è¾æ°æ®ã
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: è¿æ¯ä»ä¹?
+        heading: "å¬å¼ç¼è¾:"
+      return to profile: è¿ååºæ¬ä¿¡æ¯
+      save changes button: ä¿å­æ´æ¹
+      title: ç¼è¾è´¦æ·
+      update home location on click: ç¹å»å°å¾æ¶æ´æ°æå¨ä½ç½®?
+    confirm: 
+      button: ç¡®è®¤
+      heading: ç¡®è®¤ç¨æ·å¸æ·
+      press confirm button: æä¸é¢çç¡®è®¤é®æ¿æ´»æ¨çå¸æ·ã
+      success: ç¡®è®¤æ¨çè´¦å·ï¼æè°¢æ¨çæ³¨åï¼
+    friend_map: 
+      nearby mapper: "éè¿ç¨æ·: [[nearby_user]]"
+      your location: æ¨çä½ç½®
+    go_public: 
+      flash success: æ¨çææç¼è¾ç°å¨åå·²å¬å¼ï¼ç°å¨åè®¸æ¨å¼å§ç¼è¾ã
+    login: 
+      account not active: æ±æ­ï¼æ¨çè´¦æ·å°æªæ¿æ´»ã<br />è¯·ç¹å»å¨è´¦æ·ç¡®è®¤é®ä»¶ä¸­çé¾æ¥æ¥æ¿æ´»æ¨çè´¦æ·ã
+      auth failure: æ±æ­ï¼å­è¿äºä¿¡æ¯æ¨æ æ³ç»éã
+      create_account: åå»ºä¸ä¸ªè´¦æ·
       email or username: "é®ç®±æç¨æ·å:"
+      heading: ç»é
+      login_button: ç»é
+      lost password link: æ¾åå¯ç ?
       password: "å¯ç :"
-      lost password link: "æ¾åå¯ç ?"
-      login_button: "ç»é"
-      account not active: "æ±æ­ï¼æ¨çè´¦æ·å°æªæ¿æ´»ã<br />è¯·ç¹å»å¨è´¦æ·ç¡®è®¤é®ä»¶ä¸­çé¾æ¥æ¥æ¿æ´»æ¨çè´¦æ·ã"
-      auth failure: "æ±æ­ï¼å­è¿äºä¿¡æ¯æ¨æ æ³ç»éã"
-    lost_password:
-      title: "ä¸¢å¤±å¯ç "
-      heading: "å¿è®°å¯ç ?"
-      email address: "é®ç®±:"
-      new password button: "åéæ°å¯ç "
-      notice email on way: "æ±æ­æ¨çå¯ç ä¸¢å¤± :-( ä½æ¯æ¨å¯ä»¥æ ¹æ®åéçé®ä»¶éè®¾å¯ç ã"
-      notice email cannot find: "å¯¹ä¸èµ·ï¼æ æ³æ¾å°é®ç®±ã"
-    reset_password:
-      title: "éè®¾å¯ç "
-      flash changed check mail: "æ¨çå¯ç ä»¥æ´æ¹ï¼æ­£è¢«åéå°æ¨çé®ç®±:-)"
-      flash token bad: "æªæ¾å°ä»£ç¬¦, å»ºè®®æ¥çURL?"
-    new:
-      heading: "åå»ºç¨æ·å¸å·"
-      no_auto_account_create: "å¾éæ¾æä»¬ç°å¨ä¸è½ä¸ºæ¨èªå¨åç«ä¸ä¸ªè´¦æ·ã"
-      contact_webmaster: 'è¯·èç³» <a href="mailto:webmaster@openstreetmap.org">webmaster</a> æ¥å®æä¸ä¸ªè´¦æ·åç« - æä»¬å°å°½å¿«å°è¯å¤çæ¨çè¯·æ±ã'
-      fill_form: "å¡«åè¡¨æ ¼ï¼æä»¬å°å°½å¿«åæ¨åéä¸å°é®ä»¶æ¥æ¿æ´»æ¨çå¸æ·ã"
-      license_agreement: 'åç«æ­¤è´¦æ·ï¼æå³æ¨åæææä¸ä¼ å°openstreetmap.orgçå·¥ä½ä»¥åææå©ç¨ä¸openstreetmap.orgç¸å³çå·¥å·æåå»ºçä»»ä½æ°æ®é½å°ï¼éç¬å®¶ï¼ææäº<a href="http://creativecommons.org/licenses/by-sa/2.0/">è¿ç§åä½å±ç¨åè®® (by-sa)</a>.'
+      please login: è¯·ç»éæ{{create_user_link}}.
+      title: ç»é
+    lost_password: 
       email address: "é®ç®±:"
+      heading: å¿è®°å¯ç ?
+      new password button: åéæ°å¯ç 
+      notice email cannot find: å¯¹ä¸èµ·ï¼æ æ³æ¾å°é®ç®±ã
+      notice email on way: æ±æ­æ¨çå¯ç ä¸¢å¤± :-( ä½æ¯æ¨å¯ä»¥æ ¹æ®åéçé®ä»¶éè®¾å¯ç ã
+      title: ä¸¢å¤±å¯ç 
+    make_friend: 
+      already_a_friend: æ¨å·²ç»æ¯æåäº
+      failed: å¯¹ä¸èµ·ï¼å {{name}} ä¸ºå¥½åå¤±è´¥ã
+      success: "{{name}}ç°å¨æ¯æ¨çæå"
+    new: 
       confirm email address: "ç¡®è®¤é®ç®±:"
-      not displayed publicly: 'ä¸å¬å¼æ¾ç¤º(æ¥ç <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">éç§æ¿ç­</a>)'
+      confirm password: "å¯ç ç¡®è®¤:"
+      contact_webmaster: è¯·èç³» <a href="mailto:webmaster@openstreetmap.org">webmaster</a> æ¥å®æä¸ä¸ªè´¦æ·åç« - æä»¬å°å°½å¿«å°è¯å¤çæ¨çè¯·æ±ã
       display name: "æ¾ç¤ºå§å:"
+      email address: "é®ç®±:"
+      fill_form: å¡«åè¡¨æ ¼ï¼æä»¬å°å°½å¿«åæ¨åéä¸å°é®ä»¶æ¥æ¿æ´»æ¨çå¸æ·ã
+      flash create success message: æååå»ºç¨æ·ãæ¥çç¡®è®¤é®ä»¶ï¼Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />è¯·æ³¨ææ¨å°ä¸è½ç»éç´å°æ¨æ¶å°å¹¶ç¡®è®¤æ¨çé®ç®±å°åã<br /><br />å¦ææ¨ä½¿ç¨ååå¾ç³»ç»åéç¡®è®¤è¯·æ±ï¼è¯·ä¿è¯å°webmaster@openstreetmap.orgåå¥åå¥½ååï¼å ä¸ºæä»¬ä¸è½åå¤ä»»ä½ç¡®è®¤è¯·æ±ã
+      heading: åå»ºç¨æ·å¸å·
+      license_agreement: åç«æ­¤è´¦æ·ï¼æå³æ¨åæææä¸ä¼ å°openstreetmap.orgçå·¥ä½ä»¥åææå©ç¨ä¸openstreetmap.orgç¸å³çå·¥å·æåå»ºçä»»ä½æ°æ®é½å°ï¼éç¬å®¶ï¼ææäº<a href="http://creativecommons.org/licenses/by-sa/2.0/">è¿ç§åä½å±ç¨åè®® (by-sa)</a>.
+      no_auto_account_create: å¾éæ¾æä»¬ç°å¨ä¸è½ä¸ºæ¨èªå¨åç«ä¸ä¸ªè´¦æ·ã
+      not displayed publicly: ä¸å¬å¼æ¾ç¤º(æ¥ç <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">éç§æ¿ç­</a>)
       password: "å¯ç :"
-      confirm password: "å¯ç ç¡®è®¤:"
       signup: æ³¨å
-      flash create success message: "æååå»ºç¨æ·ãæ¥çç¡®è®¤é®ä»¶ï¼Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />è¯·æ³¨ææ¨å°ä¸è½ç»éç´å°æ¨æ¶å°å¹¶ç¡®è®¤æ¨çé®ç®±å°åã<br /><br />å¦ææ¨ä½¿ç¨ååå¾ç³»ç»åéç¡®è®¤è¯·æ±ï¼è¯·ä¿è¯å°webmaster@openstreetmap.orgåå¥åå¥½ååï¼å ä¸ºæä»¬ä¸è½åå¤ä»»ä½ç¡®è®¤è¯·æ±ã"
-    no_such_user:
-      title: "æ²¡ææ­¤ç¨æ·"
-      heading: "è¿ä¸ªç¨æ·{{user}} ä¸å­å¨"
-      body: "å¯¹ä¸èµ·ï¼æ²¡ææ­¤å{{user}}æå¯¹åºçç¨æ·ãè¯·æ£æ¥æ¨çæ¼åï¼æèå¯è½æ¨ç¹å»äºéè¯¯é¾æ¥ã"
-    view:
+    no_such_user: 
+      body: å¯¹ä¸èµ·ï¼æ²¡ææ­¤å{{user}}æå¯¹åºçç¨æ·ãè¯·æ£æ¥æ¨çæ¼åï¼æèå¯è½æ¨ç¹å»äºéè¯¯é¾æ¥ã
+      heading: è¿ä¸ªç¨æ·{{user}} ä¸å­å¨
+      title: æ²¡ææ­¤ç¨æ·
+    remove_friend: 
+      not_a_friend: "{{name}}ä¸æ¯æ¨çæåã"
+      success: "{{name}} ä»æ¨çæåä¸­å é¤ã"
+    reset_password: 
+      flash token bad: æªæ¾å°ä»£ç¬¦, å»ºè®®æ¥çURL?
+      title: éè®¾å¯ç 
+    set_home: 
+      flash success: æåä¿å­æ¨æå¨ä½ç½®
+    view: 
+      add as friend: æ·»å ä¸ºå¥½å
+      add image: æ·»å å¾ç
+      ago: ({{time_in_words_ago}} ä»¥å)
+      change your settings: æ´æ¹æ¨çè®¾ç½®
+      delete image: å é¤å¤´å
+      description: æè¿°
+      diary: æ¥å¿
+      edits: ç¼è¾
+      if set location: å¦ææ¨è®¾å®æ¨çä½ç½®ï¼ä¸å¼ ç²¾ç¾çå°å¾åå¶ä»ç¸å³ä¿¡æ¯å°åºç°å¨ä¸æ¹ãæ¨å¯ä»¥éè¿æ¨ç{{settings_link}}é¡µé¢æ¥è®¾ç½®æ¨çä½ç½®ã
+      km away: "{{count}}å¬éä¹å¤"
+      mapper since: "Mapper since:"
       my diary: æçæ¥å¿
-      new diary entry: æ°æ¥å¿å¥å£
       my edits: æçç¼è¾
-      my traces: æçè¿½è¸ªè·¯å¾
       my settings: æçè®¾ç½®
+      my traces: æçè¿½è¸ªè·¯å¾
+      nearby users: "éè¿ç¨æ·:"
+      new diary entry: æ°æ¥å¿å¥å£
+      no friends: æ¨è¿æ²¡ææ·»å ä»»ä½å¥½åã
+      no home location: æªè®¾å®æå¨ä½ç½®ã
+      no nearby users: è¿éæ²¡æå¨æ¨éè¿çç¨æ·ã
+      remove as friend: å é¤å¥½å
       send message: åéä¿¡æ¯
-      diary: æ¥å¿
-      edits: ç¼è¾
+      settings_link_text: è®¾å®
       traces: traces
-      remove as friend: å é¤å¥½å
-      add as friend: æ·»å ä¸ºå¥½å
-      mapper since: "Mapper since:"
-      ago: "({{time_in_words_ago}} ä»¥å)"
-      user image heading: ç¨æ·å¤´å
-      delete image: å é¤å¤´å
       upload an image: ä¸ä¼ å¾ç
-      add image: æ·»å å¾ç
-      description: æè¿°
+      user image heading: ç¨æ·å¤´å
       user location: ç¨æ·ä½ç½®
-      no home location: "æªè®¾å®æå¨ä½ç½®ã"
-      if set location: "å¦ææ¨è®¾å®æ¨çä½ç½®ï¼ä¸å¼ ç²¾ç¾çå°å¾åå¶ä»ç¸å³ä¿¡æ¯å°åºç°å¨ä¸æ¹ãæ¨å¯ä»¥éè¿æ¨ç{{settings_link}}é¡µé¢æ¥è®¾ç½®æ¨çä½ç½®ã" 
-      settings_link_text: è®¾å®
       your friends: æ¨çæå
-      no friends: æ¨è¿æ²¡ææ·»å ä»»ä½å¥½åã
-      km away: "{{count}}å¬éä¹å¤"
-      nearby users: "éè¿ç¨æ·:"
-      no nearby users: "è¿éæ²¡æå¨æ¨éè¿çç¨æ·ã"
-      change your settings: æ´æ¹æ¨çè®¾ç½®
-    friend_map:
-      your location: æ¨çä½ç½®
-      nearby mapper: "éè¿ç¨æ·: [[nearby_user]]"
-    account:
-      title: "ç¼è¾è´¦æ·"
-      my settings: æçè®¾ç½®
-      email never displayed publicly: "(ä»ä¸å¬å¼æ¾ç¤º)"
-      public editing:
-        heading: "å¬å¼ç¼è¾:"
-        enabled: "å¯å¨ãéå¿åå¹¶å¯ç¼è¾æ°æ®ã"
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "è¿æ¯ä»ä¹?"
-        disabled: "ç¦ç¨ä¸æ æ³ç¼è¾æ°æ®ï¼ææè¿å»çç¼è¾åä¸ºå¿åã"
-        disabled link text: "ä¸ºä»ä¹æ æ³ç¼è¾?"
-      profile description: "åºæ¬ä¿¡æ¯æè¿°:"
-      preferred languages: "éæ©è¯­è¨:"
-      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: ç¡®è®¤ç¨æ·å¸æ·
-      press confirm button: "æä¸é¢çç¡®è®¤é®æ¿æ´»æ¨çå¸æ·ã"
-      button: ç¡®è®¤
-      success: "ç¡®è®¤æ¨çè´¦å·ï¼æè°¢æ¨çæ³¨åï¼"
-    confirm email:
-      heading: "ç¡®è®¤é®ç®±ä¿®æ¹"
-      press confirm button: "ç¹å»ä¸é¢çç¡®è®¤é®ç¡®è®¤æ¨çæ°é®ç®±å°å"
-      button: "ç¡®è®¤"
-      success: "ç¡®è®¤æ¨çé®ç®±å°åï¼æè°¢æ¨çæ³¨åï¼"
-    set_home:
-      flash success: "æåä¿å­æ¨æå¨ä½ç½®"
-    go_public:
-      flash success: "æ¨çææç¼è¾ç°å¨åå·²å¬å¼ï¼ç°å¨åè®¸æ¨å¼å§ç¼è¾ã"
-    make_friend:
-      success: "{{name}}ç°å¨æ¯æ¨çæå"
-      failed: "å¯¹ä¸èµ·ï¼å {{name}} ä¸ºå¥½åå¤±è´¥ã"
-      already_a_friend: "æ¨å·²ç»æ¯æåäº"
-    remove_friend:
-      success: "{{name}} ä»æ¨çæåä¸­å é¤ã"
-      not_a_friend: "{{name}}ä¸æ¯æ¨çæåã"
-    confirm email:
-      heading: ç¡®è®¤é®ç®±å°åçåæ´
-      press confirm button: "æä¸é¢ç¡®è®¤é®ç¡®è®¤æ¨çæ°é®ç®±å°åã"
-      button: ç¡®è®¤
-
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index cef1a2377..17627477f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,982 +1,950 @@
-zh-TW:
-  html:
-    dir: ltr
-  activerecord:
-  
-    models:
-      acl: "å­åæ§å¶æ¸å®"
-      changeset: "è®æ´çµå"
-      changeset_tag: "è®æ´çµåæ¨ç±¤"
-      country: "åå®¶"
-      diary_comment: "æ¥è¨è¨»è§£"
-      diary_entry: "æ¥è¨é ç®"
-      friend: "æå"
-      language: "èªè¨"
-      message: "è¨æ¯"
-      node: "ç¯é»"
-      node_tag: "ç¯é»æ¨ç±¤"
-      notifier: "Notifier"
-      old_node: "èçç¯é»"
-      old_node_tag: "èçç¯é»æ¨ç±¤"
-      old_relation: "èçéä¿"
-      old_relation_member: "èçéä¿æå¡"
-      old_relation_tag: "èçéä¿æ¨ç±¤"
-      old_way: "èçè·¯å¾"
-      old_way_node: "èçè·¯å¾ç¯é»"
-      old_way_tag: "èçè·¯å¾æ¨ç±¤"
-      relation: "éä¿"
-      relation_member: "éä¿æå¡"
-      relation_tag: "éä¿æ¨ç±¤"
-      session: "ä½æ¥­éæ®µ"
-      trace: "è»è·¡"
-      tracepoint: "è»è·¡é»"
-      tracetag: "è»è·¡æ¨ç±¤"
-      user: "ä½¿ç¨è"
-      user_preference: "ä½¿ç¨èåå¥½è¨­å®"
-      user_token: "ä½¿ç¨èè¨è"
-      way: "è·¯å¾"
-      way_node: "è·¯å¾ç¯é»"
-      way_tag: "è·¯å¾æ¨ç±¤"
-    attributes:
-      diary_comment:
-        body: "å§æ"
-      diary_entry:
-        user: "ä½¿ç¨è"
-        title: "æ¨é¡"
-        latitude: "ç·¯åº¦"
-        longitude: "ç¶åº¦"
-        language: "èªè¨"
-      friend:
-        user: "ä½¿ç¨è"
-        friend: "æå"
-      trace:
-        user: "ä½¿ç¨è"
-        visible: "å¯è¦æ§"
-        name: "åç¨±"
-        size: "å¤§å°"
-        latitude: "ç·¯åº¦"
-        longitude: "ç¶åº¦"
-        public: "å¬é"
-        description: "æè¿°"
-      message:
-        sender: "å¯ä»¶è"
-        title: "æ¨é¡"
-        body: "å§æ"
-        recipient: "æ¶ä»¶è"
-      user:
-        email: "Email"
-        active: "åç¨"
-        display_name: "é¡¯ç¤ºåç¨±"
-        description: "æè¿°"
-        languages: "èªè¨"
-        pass_crypt: "å¯ç¢¼"
-  printable_name:
-    with_id: "{{id}}"
-    with_version: "{{id}}, v{{version}}"
-    with_name: "{{name}} ({{id}})"
-  map:
-    view: "æª¢è¦"
-    edit: "ç·¨è¼¯"
-    coordinates: "åæ¨ï¼"
-  browse:
-    changeset:
-      title: "è®æ´çµå"
-      changeset: "è®æ´çµåï¼"
-      download: "ä¸è¼ {{changeset_xml_link}} æ {{osmchange_xml_link}}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "è®æ´çµå {{id}}"
-        title_comment: "è®æ´çµå {{id}} - {{comment}}"
-    changeset_navigation:
-      user:
-        name_tooltip: "æª¢è¦ç± {{user}} é²è¡çç·¨è¼¯"
-        prev_tooltip: "ä¸ä¸å {{user}} çç·¨è¼¯"
-        next_tooltip: "ä¸ä¸å {{user}} çç·¨è¼¯"
-      all:
-        prev_tooltip: "ä¸ä¸åè®æ´çµå"
-        next_tooltip: "ä¸ä¸åè®æ´çµå"
-    changeset_details:
-      created_at: "å»ºç«æ¼ï¼"
-      closed_at: "ééæ¼ï¼"
-      belongs_to: "å±¬æ¼ï¼"
-      bounding_box: "ç¶å®æ¹å¡ï¼"
-      no_bounding_box: "éåè®æ´çµåæ²æå²å­ç¶å®æ¹å¡ã"
-      show_area_box: "é¡¯ç¤ºååæ¹å¡"
-      box: "æ¹å¡"
-      has_nodes:
-        one: "æä¸å {{count}} åç¯é»ï¼"
-        other: "æä¸å {{count}} åç¯é»ï¼"
-      has_ways:
-        one:  "æä¸å {{count}} åè·¯å¾ï¼"
-        other: "æä¸å {{count}} åè·¯å¾ï¼"
-      has_relations:
-        one:  "æä¸å {{count}} åéä¿ï¼"
-        other: "æä¸å {{count}} åéä¿ï¼"
-    common_details:
-      edited_at: "ç·¨è¼¯æ¼ï¼"
-      edited_by: "ç·¨è¼¯èï¼"
-      version: "çæ¬ï¼"
-      in_changeset: "æ¼è®æ´çµåï¼"
-    containing_relation:
-      entry: "éä¿ {{relation_name}}"
-      entry_role: "éä¿ {{relation_name}} (åçº {{relation_role}})"
-    map:
-      loading: "æ­£å¨è¼å¥..."
-      deleted: "å·²åªé¤"
-      larger:
-        area: "å¨è¼å¤§çå°åæª¢è¦åå"
-        node: "å¨è¼å¤§çå°åæª¢è¦ç¯é»"
-        way: "å¨è¼å¤§çå°åæª¢è¦è·¯å¾"
-        relation: "å¨è¼å¤§çå°åæª¢è¦éä¿"
-    node_details:
-      coordinates: "åæ¨ï¼"
-      part_of: "é¨åï¼"
-    node_history:
-      node_history: "ç¯é»æ­·å²"
-      node_history_title: "ç¯é»æ­·å²ï¼ {{node_name}}"
+zh-TW: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: å§æ
+      diary_entry: 
+        language: èªè¨
+        latitude: ç·¯åº¦
+        longitude: ç¶åº¦
+        title: æ¨é¡
+        user: ä½¿ç¨è
+      friend: 
+        friend: æå
+        user: ä½¿ç¨è
+      message: 
+        body: å§æ
+        recipient: æ¶ä»¶è
+        sender: å¯ä»¶è
+        title: æ¨é¡
+      trace: 
+        description: æè¿°
+        latitude: ç·¯åº¦
+        longitude: ç¶åº¦
+        name: åç¨±
+        public: å¬é
+        size: å¤§å°
+        user: ä½¿ç¨è
+        visible: å¯è¦æ§
+      user: 
+        active: åç¨
+        description: æè¿°
+        display_name: é¡¯ç¤ºåç¨±
+        email: Email
+        languages: èªè¨
+        pass_crypt: å¯ç¢¼
+    models: 
+      acl: å­åæ§å¶æ¸å®
+      changeset: è®æ´çµå
+      changeset_tag: è®æ´çµåæ¨ç±¤
+      country: åå®¶
+      diary_comment: æ¥è¨è¨»è§£
+      diary_entry: æ¥è¨é ç®
+      friend: æå
+      language: èªè¨
+      message: è¨æ¯
+      node: ç¯é»
+      node_tag: ç¯é»æ¨ç±¤
+      notifier: Notifier
+      old_node: èçç¯é»
+      old_node_tag: èçç¯é»æ¨ç±¤
+      old_relation: èçéä¿
+      old_relation_member: èçéä¿æå¡
+      old_relation_tag: èçéä¿æ¨ç±¤
+      old_way: èçè·¯å¾
+      old_way_node: èçè·¯å¾ç¯é»
+      old_way_tag: èçè·¯å¾æ¨ç±¤
+      relation: éä¿
+      relation_member: éä¿æå¡
+      relation_tag: éä¿æ¨ç±¤
+      session: ä½æ¥­éæ®µ
+      trace: è»è·¡
+      tracepoint: è»è·¡é»
+      tracetag: è»è·¡æ¨ç±¤
+      user: ä½¿ç¨è
+      user_preference: ä½¿ç¨èåå¥½è¨­å®
+      user_token: ä½¿ç¨èè¨è
+      way: è·¯å¾
+      way_node: è·¯å¾ç¯é»
+      way_tag: è·¯å¾æ¨ç±¤
+  browse: 
+    changeset: 
+      changeset: è®æ´çµåï¼
+      changesetxml: Changeset XML
+      download: ä¸è¼ {{changeset_xml_link}} æ {{osmchange_xml_link}}
+      feed: 
+        title: è®æ´çµå {{id}}
+        title_comment: è®æ´çµå {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: è®æ´çµå
+    changeset_details: 
+      belongs_to: å±¬æ¼ï¼
+      bounding_box: ç¶å®æ¹å¡ï¼
+      box: æ¹å¡
+      closed_at: ééæ¼ï¼
+      created_at: å»ºç«æ¼ï¼
+      has_nodes: 
+        one: æä¸å {{count}} åç¯é»ï¼
+        other: æä¸å {{count}} åç¯é»ï¼
+      has_relations: 
+        one: æä¸å {{count}} åéä¿ï¼
+        other: æä¸å {{count}} åéä¿ï¼
+      has_ways: 
+        one: æä¸å {{count}} åè·¯å¾ï¼
+        other: æä¸å {{count}} åè·¯å¾ï¼
+      no_bounding_box: éåè®æ´çµåæ²æå²å­ç¶å®æ¹å¡ã
+      show_area_box: é¡¯ç¤ºååæ¹å¡
+    changeset_navigation: 
+      all: 
+        next_tooltip: ä¸ä¸åè®æ´çµå
+        prev_tooltip: ä¸ä¸åè®æ´çµå
+      user: 
+        name_tooltip: æª¢è¦ç± {{user}} é²è¡çç·¨è¼¯
+        next_tooltip: ä¸ä¸å {{user}} çç·¨è¼¯
+        prev_tooltip: ä¸ä¸å {{user}} çç·¨è¼¯
+    common_details: 
+      edited_at: ç·¨è¼¯æ¼ï¼
+      edited_by: ç·¨è¼¯èï¼
+      in_changeset: æ¼è®æ´çµåï¼
+      version: çæ¬ï¼
+    containing_relation: 
+      entry: éä¿ {{relation_name}}
+      entry_role: éä¿ {{relation_name}} (åçº {{relation_role}})
+    map: 
+      deleted: å·²åªé¤
+      larger: 
+        area: å¨è¼å¤§çå°åæª¢è¦åå
+        node: å¨è¼å¤§çå°åæª¢è¦ç¯é»
+        relation: å¨è¼å¤§çå°åæª¢è¦éä¿
+        way: å¨è¼å¤§çå°åæª¢è¦è·¯å¾
+      loading: æ­£å¨è¼å¥...
+    node: 
+      download: "{{download_xml_link}} æ {{view_history_link}}"
+      download_xml: ä¸è¼ XML
+      edit: ç·¨è¼¯
+      node: ç¯é»
+      node_title: ç¯é»ï¼ {{node_name}}
+      view_history: æª¢è¦æ­·å²
+    node_details: 
+      coordinates: åæ¨ï¼
+      part_of: é¨åï¼
+    node_history: 
       download: "{{download_xml_link}} æ {{view_details_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_details: "æª¢è¦è©³ç´°è³è¨"
-    node:
-      node: "ç¯é»"
-      node_title: "ç¯é»ï¼ {{node_name}}"
+      download_xml: ä¸è¼ XML
+      node_history: ç¯é»æ­·å²
+      node_history_title: ç¯é»æ­·å²ï¼ {{node_name}}
+      view_details: æª¢è¦è©³ç´°è³è¨
+    not_found: 
+      sorry: æ±æ­ï¼æ¾ä¸å° id {{id}} ç {{type}}ã
+      type: 
+        changeset: è®æ´çµå
+        node: ç¯é»
+        relation: éä¿
+        way: è·¯å¾
+    paging_nav: 
+      of: ï¼
+      showing_page: æ­£å¨é¡¯ç¤ºé é¢
+    relation: 
       download: "{{download_xml_link}} æ {{view_history_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_history: "æª¢è¦æ­·å²"
-      edit: "ç·¨è¼¯"	  
-    not_found:
-      sorry: "æ±æ­ï¼æ¾ä¸å° id {{id}} ç {{type}}ã"
-      type:
-        node: "ç¯é»"
-        way: "è·¯å¾"
-        relation: "éä¿"
-        changeset: "è®æ´çµå"
-    paging_nav:
-      showing_page: "æ­£å¨é¡¯ç¤ºé é¢"
-      of: "ï¼"
-    relation_details:
-      members: "æå¡ï¼"
-      part_of: "é¨åï¼"
-    relation_history:
-      relation_history: "éä¿æ­·å²"
-      relation_history_title: "éä¿æ­·å²ï¼ {{relation_name}}"
+      download_xml: ä¸è¼ XML
+      relation: éä¿
+      relation_title: éä¿ï¼ {{relation_name}}
+      view_history: æª¢è¦æ­·å²
+    relation_details: 
+      members: æå¡ï¼
+      part_of: é¨åï¼
+    relation_history: 
       download: "{{download_xml_link}} æ {{view_details_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_details: "æª¢è¦è©³ç´°è³æ"
-    relation_member:
-      entry: "{{type}} {{name}}"
+      download_xml: ä¸è¼ XML
+      relation_history: éä¿æ­·å²
+      relation_history_title: éä¿æ­·å²ï¼ {{relation_name}}
+      view_details: æª¢è¦è©³ç´°è³æ
+    relation_member: 
       entry_role: "{{type}} {{name}} åçº {{role}}"
-      type:
-        node: "ç¯é»"
-        way: "è·¯å¾"
-        relation: "éä¿"
-    relation:
-      relation: "éä¿"
-      relation_title: "éä¿ï¼ {{relation_name}}"
-      download: "{{download_xml_link}} æ {{view_history_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_history: "æª¢è¦æ­·å²"
-    start:
-      view_data: "ç®åå°åæª¢è¦çæª¢è¦è³æ"
-      manually_select: "æåé¸æä¸åçåå"
-    start_rjs:
-      data_layer_name: "è³æ"
-      data_frame_title: "è³æ"
-      zoom_or_select: "æ¾å¤§æé¸æè¦æª¢è¦çå°ååå"
-      drag_a_box: "å¨å°åä¸ææ³åºä¸åæ¹å¡ä¾é¸æä¸ååå"
-      manually_select: "æåé¸æä¸åçåå"
-      loaded_an_area_with_num_features: "æ¨å·²ç¶è¼å¥äºåå« [[num_features]] é åè½çååãéå¸¸ï¼æäºçè¦½å¨ç¡æ³æ­£å¸¸é¡¯ç¤ºéåæ¸éçè³æãä¸è¬èè¨ï¼çè¦½å¨å¨ä¸æ¬¡é¡¯ç¤º 100 åä»¥ä¸çåè½ææé©ç¶ï¼è¶ééåæ¸éæä½¿æ¨ççè¦½å¨è®æ¢/åæ­¢åæãå¦æç¢ºå®è¦é¡¯ç¤ºéåè³æï¼è«æä¸é¢çæéã"
-      load_data: "è¼å¥è³æ"
-      unable_to_load_size: "ç¡æ³è¼å¥ï¼ç¶å®æ¹å¡çå¤§å° [[bbox_size]] å¤ªéå·¨å¤§ (å¿é å°æ¼ {{max_bbox_size}})"
-      loading: "æ­£å¨è¼å¥..."
-      show_history: "é¡¯ç¤ºæ­·å²"
-      wait: "Wait..."
+      type: 
+        node: ç¯é»
+        relation: éä¿
+        way: è·¯å¾
+    start: 
+      manually_select: æåé¸æä¸åçåå
+      view_data: ç®åå°åæª¢è¦çæª¢è¦è³æ
+    start_rjs: 
+      data_frame_title: è³æ
+      data_layer_name: è³æ
+      details: è©³ç´°è³è¨
+      drag_a_box: å¨å°åä¸ææ³åºä¸åæ¹å¡ä¾é¸æä¸ååå
+      edited_by_user_at_timestamp: ç± [[user]] æ¼ [[timestamp]] ç·¨è¼¯
       history_for_feature: "[[feature]] çæ­·å²"
-      details: "è©³ç´°è³è¨"
-      private_user: "åäººä½¿ç¨è"
-      edited_by_user_at_timestamp: "ç± [[user]] æ¼ [[timestamp]] ç·¨è¼¯"
-      object_list:
-        heading: "ç©ä»¶æ¸å®"
-        back: "é¡¯ç¤ºç©ä»¶æ¸å®"
-        type:
-          node: "ç¯é»"
-          way: "è·¯å¾"
-        api: "å¾ API ååéååå"
-        details: "è©³ç´°è³è¨"
-        selected:
-          type:
-            node: "ç¯é» [[id]]"
-            way: "è·¯å¾ [[id]]"
-        history:
-          type:
-            node: "ç¯é» [[id]]"
-            way: "è·¯å¾ [[id]]"
-    tag_details:
-      tags: "æ¨ç±¤ï¼"
-    way_details:
-      nodes: "ç¯é»ï¼"
-      part_of: "é¨åï¼"
-      also_part_of:
-        one: "ä¹æ¯è·¯å¾ {{related_ways}} çä¸é¨å"
-        other: "ä¹æ¯è·¯å¾ {{related_ways}} çä¸é¨å"
-    way_history:
-      way_history: "è·¯å¾æ­·å²"
-      way_history_title: "è·¯å¾æ­·å²ï¼ {{way_name}}"
-      download: "{{download_xml_link}} æ {{view_details_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_details: "æª¢è¦è©³ç´°è³è¨"
-    way:
-      way: "è·¯å¾"
-      way_title: "è·¯å¾ï¼ {{way_name}}"
+      load_data: è¼å¥è³æ
+      loaded_an_area_with_num_features: æ¨å·²ç¶è¼å¥äºåå« [[num_features]] é åè½çååãéå¸¸ï¼æäºçè¦½å¨ç¡æ³æ­£å¸¸é¡¯ç¤ºéåæ¸éçè³æãä¸è¬èè¨ï¼çè¦½å¨å¨ä¸æ¬¡é¡¯ç¤º 100 åä»¥ä¸çåè½ææé©ç¶ï¼è¶ééåæ¸éæä½¿æ¨ççè¦½å¨è®æ¢/åæ­¢åæãå¦æç¢ºå®è¦é¡¯ç¤ºéåè³æï¼è«æä¸é¢çæéã
+      loading: æ­£å¨è¼å¥...
+      manually_select: æåé¸æä¸åçåå
+      object_list: 
+        api: å¾ API ååéååå
+        back: é¡¯ç¤ºç©ä»¶æ¸å®
+        details: è©³ç´°è³è¨
+        heading: ç©ä»¶æ¸å®
+        history: 
+          type: 
+            node: ç¯é» [[id]]
+            way: è·¯å¾ [[id]]
+        selected: 
+          type: 
+            node: ç¯é» [[id]]
+            way: è·¯å¾ [[id]]
+        type: 
+          node: ç¯é»
+          way: è·¯å¾
+      private_user: åäººä½¿ç¨è
+      show_history: é¡¯ç¤ºæ­·å²
+      unable_to_load_size: ç¡æ³è¼å¥ï¼ç¶å®æ¹å¡çå¤§å° [[bbox_size]] å¤ªéå·¨å¤§ (å¿é å°æ¼ {{max_bbox_size}})
+      wait: Wait...
+      zoom_or_select: æ¾å¤§æé¸æè¦æª¢è¦çå°ååå
+    tag_details: 
+      tags: æ¨ç±¤ï¼
+    way: 
       download: "{{download_xml_link}} æ {{view_history_link}}"
-      download_xml: "ä¸è¼ XML"
-      view_history: "æª¢è¦æ­·å²"
-      edit: "ç·¨è¼¯"
-  changeset:
-    changeset_paging_nav:
-      showing_page: "æ­£å¨é¡¯ç¤ºé é¢"
-      of: "ï¼"
-    changeset:
-      id: "#{{id}}"
-      still_editing: "(å°å¨ç·¨è¼¯)"
-      anonymous: "å¿å"
-      no_comment: "(æ²æ)"
-      no_edits: "(æ²æç·¨è¼¯)"
-      show_area_box: "é¡¯ç¤ºååæ¹å¡"
-      big_area: "(big)"
-      view_changeset_details: "æª¢è¦è®æ´çµåè©³ç´°è³è¨"
-    changesets:
-      id: "ID"
-      saved_at: "å²å­æ¼"
-      user: "ä½¿ç¨è"
-      comment: "è¨»è§£"
-      area: "åå"
-    list:
-      title: "è®æ´çµå"
-      title_user: "{{user}} çè®æ´çµå"
-      title_bbox: "{{bbox}} è£¡çè®æ´çµå"
-      title_user_bbox: "{{user}} å¨ {{bbox}} è£¡çè®æ´çµå"
-
-      heading: "è®æ´çµå"
-      heading_user: "è®æ´çµå"
-      heading_bbox: "è®æ´çµå"
-      heading_user_bbox: "è®æ´çµå"
-
-      description: "æè¿çè®æ´çµå"
-      description_user: "{{user}} çè®æ´çµå"
+      download_xml: ä¸è¼ XML
+      edit: ç·¨è¼¯
+      view_history: æª¢è¦æ­·å²
+      way: è·¯å¾
+      way_title: è·¯å¾ï¼ {{way_name}}
+    way_details: 
+      also_part_of: 
+        one: ä¹æ¯è·¯å¾ {{related_ways}} çä¸é¨å
+        other: ä¹æ¯è·¯å¾ {{related_ways}} çä¸é¨å
+      nodes: ç¯é»ï¼
+      part_of: é¨åï¼
+    way_history: 
+      download: "{{download_xml_link}} æ {{view_details_link}}"
+      download_xml: ä¸è¼ XML
+      view_details: æª¢è¦è©³ç´°è³è¨
+      way_history: è·¯å¾æ­·å²
+      way_history_title: è·¯å¾æ­·å²ï¼ {{way_name}}
+  changeset: 
+    changeset: 
+      anonymous: å¿å
+      big_area: (big)
+      no_comment: (æ²æ)
+      no_edits: (æ²æç·¨è¼¯)
+      show_area_box: é¡¯ç¤ºååæ¹å¡
+      still_editing: (å°å¨ç·¨è¼¯)
+      view_changeset_details: æª¢è¦è®æ´çµåè©³ç´°è³è¨
+    changeset_paging_nav: 
+      of: ï¼
+      showing_page: æ­£å¨é¡¯ç¤ºé é¢
+    changesets: 
+      area: åå
+      comment: è¨»è§£
+      id: ID
+      saved_at: å²å­æ¼
+      user: ä½¿ç¨è
+    list: 
+      description: æè¿çè®æ´çµå
       description_bbox: "{{bbox}} è£¡çè®æ´çµå"
+      description_user: "{{user}} çè®æ´çµå"
       description_user_bbox: "{{user}} å¨ {{bbox}} è£¡çè®æ´çµå"
-  diary_entry:
-    new:
-      title: "æ°æ¥è¨é ç®"
-    list:
-      title: "æ¥è¨"
-      user_title: "{{user}} çæ¥è¨"
-      in_language_title: "æ¥è¨ (èªè¨çº {{language}})"
-      new: "æ°å¢æ¥è¨é ç®"
-      new_title: "å¨æ¨çæ¥è¨ä¸­æ°å¯«æ°çé ç®"
-      no_entries: "æ²ææ¥è¨é ç®"
-      recent_entries: "æè¿çæ¥è¨é ç®ï¼"
-      older_entries: "è¼èçé ç®"
-      newer_entries: "è¼æ°çé ç®"
-    edit:
-      title: "ç·¨è¼¯æ¥è¨é ç®"
-      subject: "ä¸»æ¨ï¼"
-      body: "å§æï¼"
-      language: "èªè¨ï¼"
-      location: "ä½ç½®ï¼"
-      latitude: "ç·¯åº¦ï¼"
-      longitude: "ç¶åº¦ï¼"
-      use_map_link: "ä½¿ç¨å°å"
-      save_button: "å²å­"
-      marker_text: "æ¥è¨é ç®ä½ç½®"
-    view:
-      title: "ä½¿ç¨èçæ¥è¨ | {{user}}"
-      user_title: "{{user}}çæ¥è¨"
-      leave_a_comment: "çä¸è©è«"
-      login_to_leave_a_comment: "{{login_link}} ä»¥çä¸è©è«"
-      login: "ç»å¥"
-      save_button: "å²å­"
-    no_such_entry:
-      title: "æ²æéåæ¥è¨é ç®"
-      heading: "æ²æé ç®ç id çºï¼ {{id}}"
-      body: "æ±æ­ï¼æ²ææ¥è¨é ç®æè©è«ç id æ¯ {{id}}ãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã"
-    no_such_user:
-      title: "æ²æéåä½¿ç¨è"
-      heading: "ä½¿ç¨è {{user}} ä¸å­å¨"
-      body: "æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã"
-    diary_entry:
-      posted_by: "ç± {{link_user}} æ¼ {{created}} ä»¥ {{language_link}} å¼µè²¼"
-      comment_link: "å°éåé ç®çè©è«"
-      reply_link: "åè¦éåé ç®"
-      comment_count:
-        one: "1 åè©è«"
+      heading: è®æ´çµå
+      heading_bbox: è®æ´çµå
+      heading_user: è®æ´çµå
+      heading_user_bbox: è®æ´çµå
+      title: è®æ´çµå
+      title_bbox: "{{bbox}} è£¡çè®æ´çµå"
+      title_user: "{{user}} çè®æ´çµå"
+      title_user_bbox: "{{user}} å¨ {{bbox}} è£¡çè®æ´çµå"
+  diary_entry: 
+    diary_comment: 
+      comment_from: ç± {{link_user}}  æ¼ {{comment_created_at}} ç¼è¡¨è©è«
+    diary_entry: 
+      comment_count: 
+        one: 1 åè©è«
         other: "{{count}} åè©è«"
-      edit_link: "ç·¨è¼¯éåé ç®"
-    diary_comment:
-      comment_from: "ç± {{link_user}}  æ¼ {{comment_created_at}} ç¼è¡¨è©è«"
-    feed:
-      user:
-        title: "{{user}} ç OpenStreetMap æ¥è¨"
+      comment_link: å°éåé ç®çè©è«
+      edit_link: ç·¨è¼¯éåé ç®
+      posted_by: ç± {{link_user}} æ¼ {{created}} ä»¥ {{language_link}} å¼µè²¼
+      reply_link: åè¦éåé ç®
+    edit: 
+      body: å§æï¼
+      language: èªè¨ï¼
+      latitude: ç·¯åº¦ï¼
+      location: ä½ç½®ï¼
+      longitude: ç¶åº¦ï¼
+      marker_text: æ¥è¨é ç®ä½ç½®
+      save_button: å²å­
+      subject: ä¸»æ¨ï¼
+      title: ç·¨è¼¯æ¥è¨é ç®
+      use_map_link: ä½¿ç¨å°å
+    feed: 
+      all: 
+        description: ä½¿ç¨èæè¿ç OpenStreetMap æ¥è¨
+        title: OpenStreetMap æ¥è¨
+      language: 
+        description: Rä½¿ç¨èæè¿ç OpenStreetMap (èªè¨çº {{language_name}})
+        title: OpenStreetMap æ¥è¨ (èªè¨çº {{language_name}})
+      user: 
         description: "{{user}} æè¿ç OpenStreetMap æ¥è¨"
-      language:
-        title: "OpenStreetMap æ¥è¨ (èªè¨çº {{language_name}})"
-        description: "Rä½¿ç¨èæè¿ç OpenStreetMap (èªè¨çº {{language_name}})"
-      all:
-        title: "OpenStreetMap æ¥è¨"
-        description: "ä½¿ç¨èæè¿ç OpenStreetMap æ¥è¨"
-  export:
-    start:
-      area_to_export: "è¦å¯åºçåå"
-      manually_select: "æåé¸æä¸åçåå"
-      format_to_export: "è¦å¯åºçæ ¼å¼"
-      osm_xml_data: "OpenStreetMap XML è³æ"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
-      embeddable_html: "å§åµå¼ HTML"
-      licence: "ææ¬"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
-      options: "é¸é "
-      format: "æ ¼å¼"
-      scale: "æ¯ä¾"
-      max: "æå¤§"
-      image_size: "åçå¤§å°"
-      zoom: "è®ç¦"
-      add_marker: "å¨å°åå ä¸æ¨è¨"
-      latitude: "ç·¯åº¦ï¼"
-      longitude: "ç¶åº¦ï¼"
-      output: "è¼¸åº"
-      paste_html: "è²¼ä¸ HTML å§åµæ¼ç¶²ç«"
-      export_button: "å¯åº"
-    start_rjs:
-      export: "å¯åº"
-      drag_a_box: "å¨å°åä¸ææ³åºä¸åæ¹å¡ä»¥é¸æåå"
-      manually_select: "æåé¸æä¸åçåå"
-      click_add_marker: "å¨å°åä¸é»é¸ä»¥å ä¸æ¨è¨"
-      change_marker: "æ¹è®æ¨è¨å°é»"
-      add_marker: "å å¥æ¨è¨è³å°å"
-      view_larger_map: "æª¢è¦è¼å¤§çå°å"
-  geocoder:
-    search:
-      title:
-        latlon: 'ä¾èª<a href="http://openstreetmap.org/">å§é¨</a>ççµæ'
-        us_postcode: 'ä¾èª<a href="http://geocoder.us/">Geocoder.us</a>ççµæ'
-        uk_postcode: 'ä¾èª<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>ççµæ'
-        ca_postcode: 'ä¾èª<a href="http://geocoder.ca/">Geocoder.CA</a>ççµæ'
-        osm_namefinder: 'ä¾èª<a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ççµæ'
-        geonames: 'ä¾èª<a href="http://www.geonames.org/">GeoNames</a>ççµæ'
-    search_osm_namefinder:
-      prefix: "{{type}}"
-      suffix_place: ", {{direction}} {{distance}} ï¼ {{placename}}"
-      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ï¼ {{parentname}})"
-      suffix_suburb: "{{suffix}}, {{parentname}}"
-    description:
-      title:
-        osm_namefinder: '{{types}} ä¾èª <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
-        geonames: 'ä½ç½®ä¾èª <a href="http://www.geonames.org/">GeoNames</a>'
-      types:
-        cities: "åå¸"
-        towns: "éé®"
-        places: "å°å"
-    description_osm_namefinder:
+        title: "{{user}} ç OpenStreetMap æ¥è¨"
+    list: 
+      in_language_title: æ¥è¨ (èªè¨çº {{language}})
+      new: æ°å¢æ¥è¨é ç®
+      new_title: å¨æ¨çæ¥è¨ä¸­æ°å¯«æ°çé ç®
+      newer_entries: è¼æ°çé ç®
+      no_entries: æ²ææ¥è¨é ç®
+      older_entries: è¼èçé ç®
+      recent_entries: æè¿çæ¥è¨é ç®ï¼
+      title: æ¥è¨
+      user_title: "{{user}} çæ¥è¨"
+    new: 
+      title: æ°æ¥è¨é ç®
+    no_such_entry: 
+      body: æ±æ­ï¼æ²ææ¥è¨é ç®æè©è«ç id æ¯ {{id}}ãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã
+      heading: æ²æé ç®ç id çºï¼ {{id}}
+      title: æ²æéåæ¥è¨é ç®
+    no_such_user: 
+      body: æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã
+      heading: ä½¿ç¨è {{user}} ä¸å­å¨
+      title: æ²æéåä½¿ç¨è
+    view: 
+      leave_a_comment: çä¸è©è«
+      login: ç»å¥
+      login_to_leave_a_comment: "{{login_link}} ä»¥çä¸è©è«"
+      save_button: å²å­
+      title: ä½¿ç¨èçæ¥è¨ | {{user}}
+      user_title: "{{user}}çæ¥è¨"
+  export: 
+    start: 
+      add_marker: å¨å°åå ä¸æ¨è¨
+      area_to_export: è¦å¯åºçåå
+      embeddable_html: å§åµå¼ HTML
+      export_button: å¯åº
+      export_details: OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+      format: æ ¼å¼
+      format_to_export: è¦å¯åºçæ ¼å¼
+      image_size: åçå¤§å°
+      latitude: ç·¯åº¦ï¼
+      licence: ææ¬
+      longitude: ç¶åº¦ï¼
+      manually_select: æåé¸æä¸åçåå
+      mapnik_image: Mapnik Image
+      max: æå¤§
+      options: é¸é 
+      osm_xml_data: OpenStreetMap XML è³æ
+      osmarender_image: Osmarender Image
+      output: è¼¸åº
+      paste_html: è²¼ä¸ HTML å§åµæ¼ç¶²ç«
+      scale: æ¯ä¾
+      zoom: è®ç¦
+    start_rjs: 
+      add_marker: å å¥æ¨è¨è³å°å
+      change_marker: æ¹è®æ¨è¨å°é»
+      click_add_marker: å¨å°åä¸é»é¸ä»¥å ä¸æ¨è¨
+      drag_a_box: å¨å°åä¸ææ³åºä¸åæ¹å¡ä»¥é¸æåå
+      export: å¯åº
+      manually_select: æåé¸æä¸åçåå
+      view_larger_map: æª¢è¦è¼å¤§çå°å
+  geocoder: 
+    description: 
+      title: 
+        geonames: ä½ç½®ä¾èª <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "{{types}} ä¾èª <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+      types: 
+        cities: åå¸
+        places: å°å
+        towns: éé®
+    description_osm_namefinder: 
       prefix: "{{distance}} {{direction}} ï¼ {{type}}"
-    results:
-      no_results: "æ¾ä¸å°ä»»ä½çµæ"
-    distance:
-      zero: "1 å¬éä»¥å§"
-      one: "å¤§ç´ 1 å¬é"
-      other: "å¤§ç´ {{count}} å¬é"
-    direction:
-      south_west: "è¥¿åæ¹"
-      south: "åæ¹"
-      south_east: "æ±åæ¹"
-      east: "æ±æ¹"
-      north_east: "æ±åæ¹"
-      north: "åæ¹"
-      north_west: "è¥¿åæ¹"
-      west: "è¥¿æ¹"
-  layouts:
-    project_name:
-      title: OpenStreetMap
-      h1: OpenStreetMap
-    logo:
+    direction: 
+      east: æ±æ¹
+      north: åæ¹
+      north_east: æ±åæ¹
+      north_west: è¥¿åæ¹
+      south: åæ¹
+      south_east: æ±åæ¹
+      south_west: è¥¿åæ¹
+      west: è¥¿æ¹
+    distance: 
+      one: å¤§ç´ 1 å¬é
+      other: å¤§ç´ {{count}} å¬é
+      zero: 1 å¬éä»¥å§
+    results: 
+      no_results: æ¾ä¸å°ä»»ä½çµæ
+    search: 
+      title: 
+        ca_postcode: ä¾èª<a href="http://geocoder.ca/">Geocoder.CA</a>ççµæ
+        geonames: ä¾èª<a href="http://www.geonames.org/">GeoNames</a>ççµæ
+        latlon: ä¾èª<a href="http://openstreetmap.org/">å§é¨</a>ççµæ
+        osm_namefinder: ä¾èª<a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ççµæ
+        uk_postcode: ä¾èª<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>ççµæ
+        us_postcode: ä¾èª<a href="http://geocoder.us/">Geocoder.us</a>ççµæ
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ï¼ {{parentname}})"
+      suffix_place: ", {{direction}} {{distance}} ï¼ {{placename}}"
+  layouts: 
+    alt_donation: é²è¡ææ¬¾
+    donate: ä»¥ {{link}} çµ¦ç¡¬é«åç´åºéä¾æ¯æ´ OpenStreetMapã
+    donate_link_text: æç»
+    edit: ç·¨è¼¯
+    edit_tooltip: ç·¨è¼¯å°å
+    export: å¯åº
+    export_tooltip: å¯åºå°åè³æ
+    gps_traces: GPS è»è·¡
+    gps_traces_tooltip: ç®¡çè»è·¡
+    help_wiki: æ±å© &amp; Wiki
+    help_wiki_tooltip: æ¬è¨ç«çæ±å© &amp; Wiki ç¶²ç«
+    history: æ­·å²
+    history_tooltip: è®æ´çµåæ­·å²
+    home: å®¶
+    home_tooltip: ç§»è³å®¶ä½ç½®
+    inbox: æ¶ä»¶å£ ({{count}})
+    inbox_tooltip: 
+      one: æ¨çæ¶ä»¶å£æ 1 åæªé±è®çè¨æ¯
+      other: æ¨çæ¶ä»¶å£æ {{count}} åæªé±è®çè¨æ¯
+      zero: æ¨çæ¶ä»¶å£æ²ææªé±è®çè¨æ¯
+    intro_1: OpenStreetMap æ¯ä¸åèªç±ãå¯ç·¨è¼¯çå¨ä¸çå°åãå®æ¯ç±åæ¨éæ¨£çäººæè£½ä½çã
+    intro_2: OpenStreetMap è®æ¨å¯ä»¥å¾å°çä¸çä»»ä½å°æ¹ä»¥åä½çæ¹å¼æª¢è¦ãç·¨è¼¯èä½¿ç¨å°åè³æã
+    intro_3: OpenStreetMap çä¸»æ©æ¯ç± {{ucl}} å {{bytemark}} å¾å¤§æ¹çæä¾çã
+    log_in: ç»å¥
+    log_in_tooltip: ä»¥è¨­å®å¥½çå¸³èç»å¥
+    logo: 
       alt_text: OpenStreetMap logo
-    welcome_user: "æ­¡è¿ï¼{{user_link}}"
-    welcome_user_link_tooltip: "æ¨çä½¿ç¨èé é¢"
-    home: "å®¶"
-    home_tooltip: "ç§»è³å®¶ä½ç½®"
-    inbox: "æ¶ä»¶å£ ({{count}})"
-    inbox_tooltip:
-      zero: "æ¨çæ¶ä»¶å£æ²ææªé±è®çè¨æ¯"
-      one: "æ¨çæ¶ä»¶å£æ 1 åæªé±è®çè¨æ¯"
-      other: "æ¨çæ¶ä»¶å£æ {{count}} åæªé±è®çè¨æ¯"
-    logout: "ç»åº"
-    logout_tooltip: "ç»åº"
-    log_in: "ç»å¥"
-    log_in_tooltip: "ä»¥è¨­å®å¥½çå¸³èç»å¥"
-    sign_up: "è¨»å"
-    sign_up_tooltip: "å»ºç«ä¸åå¸³èä»¥ä¾¿è½ç·¨è¼¯"
-    view: "æª¢è¦"
-    view_tooltip: "æª¢è¦å°å"
-    edit: "ç·¨è¼¯"
-    edit_tooltip: "ç·¨è¼¯å°å"
-    history: "æ­·å²"
-    history_tooltip: "è®æ´çµåæ­·å²"
-    export: "å¯åº"
-    export_tooltip: "å¯åºå°åè³æ"
-    gps_traces: "GPS è»è·¡"
-    gps_traces_tooltip: "ç®¡çè»è·¡"
-    user_diaries: "æ¥è¨"
-    user_diaries_tooltip: "æª¢è¦æ¥è¨"
-    tag_line: "èªç±ç Wiki ä¸çå°å"
-    intro_1: "OpenStreetMap æ¯ä¸åèªç±ãå¯ç·¨è¼¯çå¨ä¸çå°åãå®æ¯ç±åæ¨éæ¨£çäººæè£½ä½çã"
-    intro_2: "OpenStreetMap è®æ¨å¯ä»¥å¾å°çä¸çä»»ä½å°æ¹ä»¥åä½çæ¹å¼æª¢è¦ãç·¨è¼¯èä½¿ç¨å°åè³æã"
-    intro_3: "OpenStreetMap çä¸»æ©æ¯ç± {{ucl}} å {{bytemark}} å¾å¤§æ¹çæä¾çã"
-    intro_3_ucl: "UCL VR Centre"
-    intro_3_bytemark: "bytemark"
-    osm_offline: "OpenStreetMap è³æåº«ç®åé¢ç·ä¸­ï¼ç´å°å¿è¦çè³æåº«ç¶­è­·å·¥ä½å®æçºæ­¢ã"
-    osm_read_only: "OpenStreetMap è³æåº«ç®åæ¯å¯è®æ¨¡å¼ï¼ç´å°å¿è¦çè³æåº«ç¶­è­·å·¥ä½å®æçºæ­¢ã"
-    donate: "ä»¥ {{link}} çµ¦ç¡¬é«åç´åºéä¾æ¯æ´ OpenStreetMapã"
-    donate_link_text: "æç»"
-    help_wiki: "æ±å© &amp; Wiki"
-    help_wiki_tooltip: "æ¬è¨ç«çæ±å© &amp; Wiki ç¶²ç«"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "æ°èé¨è½æ ¼"
-    news_blog_tooltip: "éæ¼ OpenStreetMapãèªç±å°åè³æç­çæ°èé¨è½æ ¼"
-    shop: "è³¼è²·"
-    shop_tooltip: "è³¼è²· OpenStreetMap ç¸éå» åçç¢å"
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: "é²è¡ææ¬¾"
-  notifier:
-    diary_comment_notification:
-      subject: "[OpenStreetMap] {{user}} å¨æ¨çæ¥è¨é ç®çä¸è©è«"
+    logout: ç»åº
+    logout_tooltip: ç»åº
+    news_blog: æ°èé¨è½æ ¼
+    news_blog_tooltip: éæ¼ OpenStreetMapãèªç±å°åè³æç­çæ°èé¨è½æ ¼
+    osm_offline: OpenStreetMap è³æåº«ç®åé¢ç·ä¸­ï¼ç´å°å¿è¦çè³æåº«ç¶­è­·å·¥ä½å®æçºæ­¢ã
+    osm_read_only: OpenStreetMap è³æåº«ç®åæ¯å¯è®æ¨¡å¼ï¼ç´å°å¿è¦çè³æåº«ç¶­è­·å·¥ä½å®æçºæ­¢ã
+    shop: è³¼è²·
+    shop_tooltip: è³¼è²· OpenStreetMap ç¸éå» åçç¢å
+    sign_up: è¨»å
+    sign_up_tooltip: å»ºç«ä¸åå¸³èä»¥ä¾¿è½ç·¨è¼¯
+    sotm: Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!
+    tag_line: èªç±ç Wiki ä¸çå°å
+    user_diaries: æ¥è¨
+    user_diaries_tooltip: æª¢è¦æ¥è¨
+    view: æª¢è¦
+    view_tooltip: æª¢è¦å°å
+    welcome_user: æ­¡è¿ï¼{{user_link}}
+    welcome_user_link_tooltip: æ¨çä½¿ç¨èé é¢
+  map: 
+    coordinates: åæ¨ï¼
+    edit: ç·¨è¼¯
+    view: æª¢è¦
+  message: 
+    delete: 
+      deleted: è¨æ¯å·²åªé¤
+    inbox: 
+      date: æ¥æ
+      from: å¯ä»¶è
+      my_inbox: æçæ¶ä»¶å£
+      no_messages_yet: æ¨éæ²æè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼
+      outbox: å¯ä»¶å£
+      people_mapping_nearby: éè¿è£½ä½å°å
+      subject: ä¸»æ¨
+      title: æ¶ä»¶å£
+      you_have: æ¨æ {{new_count}} åæ°è¨æ¯å {{old_count}} åèè¨æ¯
+    mark: 
+      as_read: è¨æ¯æ¨è¨çºå·²è®
+      as_unread: è¨æ¯æ¨è¨çºæªè®
+    message_summary: 
+      delete_button: åªé¤
+      read_button: æ¨è¨çºå·²è®
+      reply_button: åè¦
+      unread_button: æ¨è¨çºæªè®
+    new: 
+      back_to_inbox: åå°æ¶ä»¶å£
+      body: å§æ
+      message_sent: è¨æ¯å·²å¯åº
+      send_button: å¯åº
+      send_message_to: å¯åºæ°è¨æ¯çµ¦ {{name}}
+      subject: ä¸»æ¨
+      title: å¯åºè¨æ¯
+    no_such_user: 
+      body: æ±æ­æ²æéååå­çä½¿ç¨èææ­¤ id çè¨æ¯
+      heading: æ²æéåä½¿ç¨èæè¨æ¯
+      title: æ²æéåä½¿ç¨èæè¨æ¯
+    outbox: 
+      date: æ¥æ
+      inbox: æ¶ä»¶å£
+      my_inbox: æç{{inbox_link}}
+      no_sent_messages: æ¨éæ²æå¯åºè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼
+      outbox: å¯ä»¶å£
+      people_mapping_nearby: éè¿è£½ä½å°å
+      subject: ä¸»æ¨
+      title: å¯ä»¶å£
+      to: æ¶ä»¶è
+      you_have_sent_messages: æ¨æ {{sent_count}} åå¯éçè¨æ¯
+    read: 
+      back_to_inbox: åå°æ¶ä»¶å£
+      back_to_outbox: åå°å¯ä»¶å£
+      date: æ¥æ
+      from: å¯ä»¶è
+      reading_your_messages: é±è®æ¨çè¨æ¯
+      reading_your_sent_messages: é±è®æ¨å¯åºçè¨æ¯
+      reply_button: åè¦
+      subject: ä¸»æ¨
+      title: é±è®è¨æ¯
+      to: æ¶ä»¶è
+      unread_button: æ¨è¨çºæªè®
+    sent_message_summary: 
+      delete_button: åªé¤
+  notifier: 
+    diary_comment_notification: 
       banner1: "*                   è«å¿åè¦éå°é»å­éµä»¶ã                    *"
       banner2: "*                ä½¿ç¨ OpenStreetMap ç¶²ç«åè¦ã                *"
-      hi: "{{to_user}}æ¨å¥½ï¼"
+      footer: æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è©è«ï¼ä¸¦ä¸å¨ {{commenturl}} çä¸è©è«æå¨ {{replyurl}} åè¦
       header: "{{from_user}} å¨æ¨æè¿ OpenStreetMap ä¸»æ¨çº {{subject}} çæ¥è¨é ç®çä¸è©è«ï¼"
-      footer: "æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è©è«ï¼ä¸¦ä¸å¨ {{commenturl}} çä¸è©è«æå¨ {{replyurl}} åè¦"
-    message_notification:
-      subject: "[OpenStreetMap] {{user}} å¯çµ¦æ¨æ°çè¨æ¯"
-      banner1: "*                   è«å¿åè¦éå°é»å­éµä»¶ã                    *"
-      banner2: "*                ä½¿ç¨ OpenStreetMap ç¶²ç«åè¦ã                 *"
       hi: "{{to_user}}æ¨å¥½ï¼"
-      header: "{{from_user}} éé OpenStreetMap å¯çµ¦æ¨ä¸»æ¨çº {{subject}} çè¨æ¯ï¼"
-      footer1: "æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è¨æ¯ï¼"
-      footer2: "ä¸¦å¨ {{replyurl}} åè¦"
-    friend_notification:
-      subject: "[OpenStreetMap] {{user}} å°æ¨å å¥æå"
+      subject: "[OpenStreetMap] {{user}} å¨æ¨çæ¥è¨é ç®çä¸è©è«"
+    email_confirm: 
+      subject: "[OpenStreetMap] ç¢ºèªæ¨çé»å­éµä»¶ä½å"
+    email_confirm_html: 
+      click_the_link: å¦æéæ¯æ¨ï¼è«æä¸åé£çµç¢ºèªæ­¤è®æ´ã
+      greeting: æ¨å¥½ï¼
+      hopefully_you: æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»å­éµä»¶ä½å {{server_url}} çº {{new_address}}ã
+    email_confirm_plain: 
+      click_the_link: å¦æéæ¯æ¨ï¼è«æä¸åé£çµç¢ºèªæ­¤è®æ´ã
+      greeting: æ¨å¥½ï¼
+      hopefully_you_1: æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»å­éµä»¶ä½å
+      hopefully_you_2: "{{server_url}} çº {{new_address}}ã"
+    friend_notification: 
       had_added_you: "{{user}} å·²å¨ OpenStreetMap å°æ¨å å¥çºæåã"
-      see_their_profile: "æ¨å¯ä»¥å¨ {{userurl}} æ¥çä»çè³æï¼é¡æçè©±ä¹å¯ä»¥æä»åå å¥æåã"
-    gpx_notification:
-      greeting: "æ¨å¥½ï¼"
-      your_gpx_file: "æ¨ç GPX æªæ¡"
-      with_description: "æè¿°çº"
-      and_the_tags: "ä¸æ¨ç±¤çºï¼"
-      and_no_tags: "ä¸æ²ææ¨ç±¤ã"
-      failure:
+      see_their_profile: æ¨å¯ä»¥å¨ {{userurl}} æ¥çä»çè³æï¼é¡æçè©±ä¹å¯ä»¥æä»åå å¥æåã
+      subject: "[OpenStreetMap] {{user}} å°æ¨å å¥æå"
+    gpx_notification: 
+      and_no_tags: ä¸æ²ææ¨ç±¤ã
+      and_the_tags: ä¸æ¨ç±¤çºï¼
+      failure: 
+        failed_to_import: å¯å¥å¤±æãéè£¡æ¯é¯èª¤è¨æ¯ï¼
+        more_info_1: æ´å¤éæ¼ GPX å¯å¥å¤±æèå¦ä½é¿åå®åç
+        more_info_2: è³è¨å¯å¨éè£¡æ¾å°ï¼
         subject: "[OpenStreetMap] GPX å¯å¥å¤±æ"
-        failed_to_import: "å¯å¥å¤±æãéè£¡æ¯é¯èª¤è¨æ¯ï¼"
-        more_info_1: "æ´å¤éæ¼ GPX å¯å¥å¤±æèå¦ä½é¿åå®åç"
-        more_info_2: "è³è¨å¯å¨éè£¡æ¾å°ï¼"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
+      greeting: æ¨å¥½ï¼
+      success: 
+        loaded_successfully: "æåè¼å¥å¯è½ {{possible_points}} é»ä¸­ç\n{{trace_points}} é»ã"
         subject: "[OpenStreetMap] GPX å¯å¥æå"
-        loaded_successfully: |
-          æåè¼å¥å¯è½ {{possible_points}} é»ä¸­ç
-          {{trace_points}} é»ã
-    signup_confirm:
-      subject: "[OpenStreetMap] ç¢ºèªæ¨çé»å­éµä»¶"
-    signup_confirm_plain:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°"
-      click_the_link_1: "å¦æéæ¯æ¨ï¼æ­¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨ç"
-      click_the_link_2: "å¸³èä¸¦äºè§£æ´å¤ OpenStreetMap çè³è¨ã"
-      introductory_video: "æ¨å¯ä»¥å¨éè£¡è§ç OpenStreetMap çå°è¦½å½±çï¼"
-      more_videos: "éè£¡éææ´å¤å½±çï¼"
-      the_wiki: "å¨ wiki ä¸­é±è®æ´å¤ OpenStreetMap è¨æ¯ï¼"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
-      opengeodata: "OpenGeoData.org æ¯ OpenStreetMap çé¨è½æ ¼ï¼å®ä¹æ podcastsï¼"
-      wiki_signup: "æ¨å¯è½ä¹æ³å¨ OpenStreetMap wiki è¨»åï¼"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      user_wiki_1: "å»ºè­°æ¨å»ºç«ä¸åä½¿ç¨è wiki é é¢ï¼å¶ä¸­åå«"
-      user_wiki_2: "è¨»è¨æ¨ä½åªè£¡çåé¡æ¨ç±¤ï¼å¦ [[Category:Users_in_London]]ã"
-      current_user_1: "ä¸ä»½ç®åä½¿ç¨èçæ¸å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤"
-      current_user_2: "çåé¡ï¼å¯å¨éè£¡åå¾ï¼"
-    signup_confirm_html:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°"
-      click_the_link: "å¦æéæ¯æ¨ï¼æ­¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨çå¸³èä¸¦äºè§£æ´å¤ OpenStreetMap çè³è¨ã"
-      introductory_video: "æ¨å¯ä»¥å¨ {{introductory_video_link}}ã"
-      video_to_openstreetmap: "è§ç OpenStreetMap çå°è¦½å½±ç"
-      more_videos: "éè£¡éææ´å¤ {{more_videos_link}}ã"
-      more_videos_here: "å½±ç"
-      get_reading: 'å¨ wiki ä¸­é±è®æ´å¤ <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></p> æ <a href="http://www.opengeodata.org/">opengeodata é¨è½æ ¼ï¼</a> å¶ä¸­ä¹æ <a href="http://www.opengeodata.org/?cat=13">podcasts å¯ä»¥è½</a>ï¼'
-      wiki_signup: 'æ¨å¯è½ä¹æ³å¨ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"> OpenStreetMap wiki è¨»å</a>ã'
-      user_wiki_page: 'å»ºè­°æ¨å»ºç«ä¸åä½¿ç¨è wiki é é¢ï¼å¶ä¸­åå«è¨»è¨æ¨ä½åªè£¡çåé¡æ¨ç±¤ï¼å¦ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>ã'
-      current_user: 'ä¸ä»½ç®åä½¿ç¨èçæ¸å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤çåé¡ï¼å¯å¨éè£¡åå¾ï¼<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>ã'
-    email_confirm:
-      subject: "[OpenStreetMap] ç¢ºèªæ¨çé»å­éµä»¶ä½å"
-    email_confirm_plain:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you_1: "æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»å­éµä»¶ä½å"
-      hopefully_you_2: "{{server_url}} çº {{new_address}}ã"
-      click_the_link: "å¦æéæ¯æ¨ï¼è«æä¸åé£çµç¢ºèªæ­¤è®æ´ã"
-    email_confirm_html:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you: "æäºº (å¸ææ¯æ¨) æ³è¦æ¹è®ä»çé»å­éµä»¶ä½å {{server_url}} çº {{new_address}}ã"
-      click_the_link: "å¦æéæ¯æ¨ï¼è«æä¸åé£çµç¢ºèªæ­¤è®æ´ã"
-    lost_password:
+      with_description: æè¿°çº
+      your_gpx_file: æ¨ç GPX æªæ¡
+    lost_password: 
       subject: "[OpenStreetMap] å¯ç¢¼éè¨­è¦æ±"
-    lost_password_plain:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you_1: "æäºº (å¸ææ¯æ¨) è¦æ±éè¨­éåé»å­éµä»¶ä½å"
-      hopefully_you_2: "ç openstreetmap.org å¸³èå¯ç¢¼ã"
-      click_the_link: "å¦æéæ¯æ¨ï¼è«æä¸åé£çµéè¨­æ¨çå¯ç¢¼ã"
-    lost_password_html:
-      greeting: "æ¨å¥½ï¼"
-      hopefully_you: "æäºº (å¸ææ¯æ¨) è¦æ±éè¨­éåé»å­éµä»¶ä½åç openstreetmap.org å¸³èå¯ç¢¼ã"
-      click_the_link: "å¦æéæ¯æ¨ï¼è«æä¸åé£çµéè¨­æ¨çå¯ç¢¼ã"
-  message:
-    inbox:
-      title: "æ¶ä»¶å£"
-      my_inbox: "æçæ¶ä»¶å£"
-      outbox: "å¯ä»¶å£"
-      you_have: "æ¨æ {{new_count}} åæ°è¨æ¯å {{old_count}} åèè¨æ¯"
-      from: "å¯ä»¶è"
-      subject: "ä¸»æ¨"
-      date: "æ¥æ"
-      no_messages_yet: "æ¨éæ²æè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼"
-      people_mapping_nearby: "éè¿è£½ä½å°å"
-    message_summary:
-      unread_button: "æ¨è¨çºæªè®"
-      read_button: "æ¨è¨çºå·²è®"
-      reply_button: "åè¦"
-      delete_button: "åªé¤"
-    new:
-      title: "å¯åºè¨æ¯"
-      send_message_to: "å¯åºæ°è¨æ¯çµ¦ {{name}}"
-      subject: "ä¸»æ¨"
-      body: "å§æ"
-      send_button: "å¯åº"
-      back_to_inbox: "åå°æ¶ä»¶å£"
-      message_sent: "è¨æ¯å·²å¯åº"
-    no_such_user:
-      title: "æ²æéåä½¿ç¨èæè¨æ¯"
-      heading: "æ²æéåä½¿ç¨èæè¨æ¯"
-      body: "æ±æ­æ²æéååå­çä½¿ç¨èææ­¤ id çè¨æ¯"
-    outbox:
-      title: "å¯ä»¶å£"
-      my_inbox: "æç{{inbox_link}}"
-      inbox: "æ¶ä»¶å£"
-      outbox: "å¯ä»¶å£"
-      you_have_sent_messages: "æ¨æ {{sent_count}} åå¯éçè¨æ¯"
-      to: "æ¶ä»¶è"
-      subject: "ä¸»æ¨"
-      date: "æ¥æ"
-      no_sent_messages: "æ¨éæ²æå¯åºè¨æ¯ãä½ä¸è· {{people_mapping_nearby_link}} çäººåæ¥è§¸ççï¼"
-      people_mapping_nearby: "éè¿è£½ä½å°å"
-    read:
-      title: "é±è®è¨æ¯"
-      reading_your_messages: "é±è®æ¨çè¨æ¯"
-      from: "å¯ä»¶è"
-      subject: "ä¸»æ¨"
-      date: "æ¥æ"
-      reply_button: "åè¦"
-      unread_button: "æ¨è¨çºæªè®"
-      back_to_inbox: "åå°æ¶ä»¶å£"
-      reading_your_sent_messages: "é±è®æ¨å¯åºçè¨æ¯"
-      to: "æ¶ä»¶è"
-      back_to_outbox: "åå°å¯ä»¶å£"
-    sent_message_summary:
-      delete_button: "åªé¤"
-    mark:
-      as_read: "è¨æ¯æ¨è¨çºå·²è®"
-      as_unread: "è¨æ¯æ¨è¨çºæªè®"
-    delete:
-      deleted: "è¨æ¯å·²åªé¤"
-  site:
-    index:
-      js_1: "æ¨ä½¿ç¨ä¸æ¯æ´ javascript ççè¦½å¨ï¼æèåç¨äº javascriptã"
-      js_2: "OpenStreetMap ä½¿ç¨ javascript è®å°åæ´å¹³é ã"
-      js_3: 'å¦ææ¨ç¡æ³åç¨ javascriptï¼å¯ä»¥è©¦è©¦ <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home éææ¼è²¼çè¦½å¨</a>ã'
-      permalink: "éæé£çµ"
-      shortlink: "ç°¡ç­é£çµ"
-      license:
-        notice: "ç± {{project_name}} åå®çè²¢ç»èä¾ {{license_name}} æ¢æ¬¾ææ¬ã"
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
-        project_url: "http://openstreetmap.org"
-    edit:
-      not_public: "æ¨å°æªå°æ¨çç·¨è¼¯éæ¾è³å¬é åã"
-      not_public_description: "å¨æ¨ééº¼åä¹åå°ç¡æ³åç·¨è¼¯å°åãæ¨å¯ä»¥å¨æ¨ç{{user_page}}å°èªå·±çç·¨è¼¯è¨­å®çºå¬é åã"
-      user_page_link: "ä½¿ç¨èé é¢"
-      anon_edits: "({{link}})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-      anon_edits_link_text: "äºè§£çºä»éº¼éå¾éè¦ã"
-      flash_player_required: 'æ¨éè¦ Flash player æè½ä½¿ç¨ Potlatchï¼OpenStreetMap Flash ç·¨è¼¯å¨ãæ¨å¯ä»¥<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">å¨ Adobe.com ä¸è¼ Flash Player</a>ã<a href="http://wiki.openstreetmap.org/wiki/Editing">éæå¶ä»è¨±å¤é¸æ</a>ä¹å¯ä»¥ç·¨è¼¯ OpenStreetMapã'
-      potlatch_unsaved_changes: "æ¨éææªå²å­çè®æ´ã (è¦å¨ Potlatch ä¸­å²å­ï¼æ¨æè©²åæ¶é¸æç®åçè·¯å¾æç¯é»(å¦ææ¯å¨æ¸å®æ¨¡å¼ç·¨è¼¯)ï¼ææ¯é»é¸å²å­(å¦ææå²å­æé)ã)"
-    sidebar:
-      search_results: "æå°çµæ"
-      close: "éé"
-    search:
-      search: "æå°"
-      where_am_i: "æå¨åªè£¡ï¼"
-      submit_text: "åºç¼"
-      search_help: "ç¯ä¾ï¼ 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', æ 'post offices near Lç¾¹nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>æ´å¤ç¯ä¾...</a>"
-    key:
-      map_key: "åä¾"
-      map_key_tooltip: "å¨éåç¸®æ¾ç­ç´æé¡¯ç¤ºçåä¾"
-      table:
-        heading: "z{{zoom_level}} çåä¾"
-        entry:
-          motorway: "é«éå¬è·¯"
-          trunk: "å¿«ééè·¯"
-          primary: "ä¸»è¦éè·¯"
-          secondary: "æ¬¡è¦éè·¯"
-          unclassified: "æªåé¡éè·¯"
-          unsurfaced: "ç¡éªé¢éè·¯"
-          track: "ç¢æ¥­éè·¯"
-          byway: "ééå°è·¯"
-          bridleway: "é¦¬é"
-          cycleway: "èªè¡è»é"
-          footway: "æ­¥é"
-          rail: "éµè·¯"
-          subway: "å°ä¸éµ"
-          tram:
-            - è¼è»é»è»
-            - tram
-          cable:
-            - çºè»
-            - chair lift
-          runway:
-            - æ©å ´è·é
-            - é£æ©æ»è¡é
-          apron:
+    lost_password_html: 
+      click_the_link: å¦æéæ¯æ¨ï¼è«æä¸åé£çµéè¨­æ¨çå¯ç¢¼ã
+      greeting: æ¨å¥½ï¼
+      hopefully_you: æäºº (å¸ææ¯æ¨) è¦æ±éè¨­éåé»å­éµä»¶ä½åç openstreetmap.org å¸³èå¯ç¢¼ã
+    lost_password_plain: 
+      click_the_link: å¦æéæ¯æ¨ï¼è«æä¸åé£çµéè¨­æ¨çå¯ç¢¼ã
+      greeting: æ¨å¥½ï¼
+      hopefully_you_1: æäºº (å¸ææ¯æ¨) è¦æ±éè¨­éåé»å­éµä»¶ä½å
+      hopefully_you_2: ç openstreetmap.org å¸³èå¯ç¢¼ã
+    message_notification: 
+      banner1: "*                   è«å¿åè¦éå°é»å­éµä»¶ã                    *"
+      banner2: "*                ä½¿ç¨ OpenStreetMap ç¶²ç«åè¦ã                 *"
+      footer1: æ¨ä¹å¯ä»¥å¨ {{readurl}} é±è®è¨æ¯ï¼
+      footer2: ä¸¦å¨ {{replyurl}} åè¦
+      header: "{{from_user}} éé OpenStreetMap å¯çµ¦æ¨ä¸»æ¨çº {{subject}} çè¨æ¯ï¼"
+      hi: "{{to_user}}æ¨å¥½ï¼"
+      subject: "[OpenStreetMap] {{user}} å¯çµ¦æ¨æ°çè¨æ¯"
+    signup_confirm: 
+      subject: "[OpenStreetMap] ç¢ºèªæ¨çé»å­éµä»¶"
+    signup_confirm_html: 
+      click_the_link: å¦æéæ¯æ¨ï¼æ­¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨çå¸³èä¸¦äºè§£æ´å¤ OpenStreetMap çè³è¨ã
+      current_user: ä¸ä»½ç®åä½¿ç¨èçæ¸å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤çåé¡ï¼å¯å¨éè£¡åå¾ï¼<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>ã
+      get_reading: å¨ wiki ä¸­é±è®æ´å¤ <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></p> æ <a href="http://www.opengeodata.org/">opengeodata é¨è½æ ¼ï¼</a> å¶ä¸­ä¹æ <a href="http://www.opengeodata.org/?cat=13">podcasts å¯ä»¥è½</a>ï¼
+      greeting: æ¨å¥½ï¼
+      hopefully_you: æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°
+      introductory_video: æ¨å¯ä»¥å¨ {{introductory_video_link}}ã
+      more_videos: éè£¡éææ´å¤ {{more_videos_link}}ã
+      more_videos_here: å½±ç
+      user_wiki_page: å»ºè­°æ¨å»ºç«ä¸åä½¿ç¨è wiki é é¢ï¼å¶ä¸­åå«è¨»è¨æ¨ä½åªè£¡çåé¡æ¨ç±¤ï¼å¦ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>ã
+      video_to_openstreetmap: è§ç OpenStreetMap çå°è¦½å½±ç
+      wiki_signup: æ¨å¯è½ä¹æ³å¨ <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"> OpenStreetMap wiki è¨»å</a>ã
+    signup_confirm_plain: 
+      click_the_link_1: å¦æéæ¯æ¨ï¼æ­¡è¿ï¼è«æä¸åé£çµä¾ç¢ºèªæ¨ç
+      click_the_link_2: å¸³èä¸¦äºè§£æ´å¤ OpenStreetMap çè³è¨ã
+      current_user_1: ä¸ä»½ç®åä½¿ç¨èçæ¸å®ï¼ä»¥ä»åå¨ä¸çä¸ä½èçºåºç¤
+      current_user_2: çåé¡ï¼å¯å¨éè£¡åå¾ï¼
+      greeting: æ¨å¥½ï¼
+      hopefully_you: æäºº (å¸ææ¯æ¨) æ³è¦å»ºç«ä¸åæ°å¸³èå°
+      introductory_video: æ¨å¯ä»¥å¨éè£¡è§ç OpenStreetMap çå°è¦½å½±çï¼
+      more_videos: éè£¡éææ´å¤å½±çï¼
+      opengeodata: OpenGeoData.org æ¯ OpenStreetMap çé¨è½æ ¼ï¼å®ä¹æ podcastsï¼
+      the_wiki: å¨ wiki ä¸­é±è®æ´å¤ OpenStreetMap è¨æ¯ï¼
+      user_wiki_1: å»ºè­°æ¨å»ºç«ä¸åä½¿ç¨è wiki é é¢ï¼å¶ä¸­åå«
+      user_wiki_2: è¨»è¨æ¨ä½åªè£¡çåé¡æ¨ç±¤ï¼å¦ [[Category:Users_in_London]]ã
+      wiki_signup: æ¨å¯è½ä¹æ³å¨ OpenStreetMap wiki è¨»åï¼
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: è®åæ¨çç§äºº GPS è»è·¡ã
+      allow_read_prefs: è®åæ¨çä½¿ç¨èåå¥½è¨­å®ã
+      allow_to: åè¨±å®¢æ¶ç«¯æç¨ç¨å¼ï¼
+      allow_write_api: ä¿®æ¹å°åã
+      allow_write_diary: å»ºç«æ¥è¨ãè¨»è§£åè¨­å®æåã
+      allow_write_gpx: ä¸å³ GPS è»è·¡ã
+      allow_write_prefs: ä¿®æ¹æ¨çä½¿ç¨èåå¥½è¨­å®ã
+      request_access: æç¨ç¨å¼ {{app_name}} è¦æ±å­åæ¨çå¸³èãè«ç¢ºå®æ¨è¦è®æ­¤æç¨ç¨å¼ä½¿ç¨ä¸ååè½ãæ¨å¯ä»¥ä¾èªå·±çææé¸æã
+    revoke: 
+      flash: æ¨å·²ç¶è¨»é· {{application}} çè¨èã
+  oauth_clients: 
+    create: 
+      flash: è¨»åè³è¨æå
+    destroy: 
+      flash: å·²ç ´å£æ­¤å®¢æ¶ç«¯æç¨ç¨å¼è¨»å
+    edit: 
+      submit: ç·¨è¼¯
+      title: ç·¨è¼¯æ¨çæç¨ç¨å¼
+    form: 
+      allow_read_gpx: è®åä»åçç§äºº GPS è»è·¡ã
+      allow_read_prefs: è®åä»åçä½¿ç¨èåå¥½è¨­å®ã
+      allow_write_api: ä¿®æ¹å°åã
+      allow_write_diary: å»ºç«æ¥è¨ãè¨»è§£åè¨­å®æåã
+      allow_write_gpx: ä¸å³ GPS è»è·¡ã
+      allow_write_prefs: ä¿®æ¹ä»åçä½¿ç¨èåå¥½è¨­å®ã
+      callback_url: å¬å URL
+      name: åç¨±
+      requests: åä½¿ç¨èè¦æ±ä¸åæ¬éï¼
+      required: å¿è¦ç
+      support_url: æ¯æ´ URL
+      url: ä¸»è¦æç¨ç¨å¼ URL
+    index: 
+      application: æç¨ç¨å¼åç¨±
+      issued_at: ç°½ç¼æ¼
+      list_tokens: ä¸åè¨èå·²ç¼çµ¦æ¨åä¸çæç¨ç¨å¼ï¼
+      my_apps: æçå®¢æ¶ç«¯æç¨ç¨å¼
+      my_tokens: æææ¬çæç¨ç¨å¼
+      no_apps: æ¨æ¯å¦ææ³è¦è¨»åä»¥ä½¿ç¨æ¼ {{oauth}} æ¨æºçæç¨ç¨å¼ï¼æ¨å¿é åè¨»åæ¨çç¶²é æç¨ç¨å¼ï¼æè½å°éåæåé²è¡ OAuth è¦æ±ã
+      register_new: è¨»åæ¨çæç¨ç¨å¼
+      registered_apps: æ¨å·²ç¶è¨»åä¸åå®¢æ¶ç«¯æç¨ç¨å¼ï¼
+      revoke: è¨»é·ï¼
+      title: æç OAuth è©³ç´°è³æ
+    new: 
+      submit: è¨»å
+      title: è¨»åæ°çæç¨ç¨å¼
+    not_found: 
+      sorry: æ±æ­ï¼æ¾ä¸å°æ­¤ {{type}}ã
+    show: 
+      access_url: å­åè¨è URLï¼
+      allow_read_gpx: è®åä»åçç§äºº GPS è»è·¡ã
+      allow_read_prefs: è®åä»åçä½¿ç¨èåå¥½è¨­å®ã
+      allow_write_api: ä¿®æ¹å°åã
+      allow_write_diary: å»ºç«æ¥è¨ãè¨»è§£åè¨­å®æåã
+      allow_write_gpx: ä¸å³ GPS è»è·¡ã
+      allow_write_prefs: ä¿®æ¹ä»åçä½¿ç¨èåå¥½è¨­å®ã
+      authorize_url: ææ¬ URLï¼
+      edit: ç·¨è¼¯è©³ç´°è³æ
+      key: æ¶è²»èéé°ï¼
+      requests: åä½¿ç¨èè¦æ±ä¸åæ¬éï¼
+      secret: æ¶è²»èå¯é°ï¼
+      support_notice: æåæ¯æ´ hmac-sha1 (å»ºè­°å¼) å ssl æ¨¡å¼çç´æå­ã
+      title: "{{app_name}} ç OAuth è©³ç´°è³æ"
+      url: è¦æ±è¨è URLï¼
+    update: 
+      flash: æ´æ°å®¢æ¶ç«¯è³è¨æå
+  site: 
+    edit: 
+      anon_edits_link_text: äºè§£çºä»éº¼éå¾éè¦ã
+      flash_player_required: æ¨éè¦ Flash player æè½ä½¿ç¨ Potlatchï¼OpenStreetMap Flash ç·¨è¼¯å¨ãæ¨å¯ä»¥<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">å¨ Adobe.com ä¸è¼ Flash Player</a>ã<a href="http://wiki.openstreetmap.org/wiki/Editing">éæå¶ä»è¨±å¤é¸æ</a>ä¹å¯ä»¥ç·¨è¼¯ OpenStreetMapã
+      not_public: æ¨å°æªå°æ¨çç·¨è¼¯éæ¾è³å¬é åã
+      not_public_description: å¨æ¨ééº¼åä¹åå°ç¡æ³åç·¨è¼¯å°åãæ¨å¯ä»¥å¨æ¨ç{{user_page}}å°èªå·±çç·¨è¼¯è¨­å®çºå¬é åã
+      potlatch_unsaved_changes: æ¨éææªå²å­çè®æ´ã (è¦å¨ Potlatch ä¸­å²å­ï¼æ¨æè©²åæ¶é¸æç®åçè·¯å¾æç¯é»(å¦ææ¯å¨æ¸å®æ¨¡å¼ç·¨è¼¯)ï¼ææ¯é»é¸å²å­(å¦ææå²å­æé)ã)
+      user_page_link: ä½¿ç¨èé é¢
+    index: 
+      js_1: æ¨ä½¿ç¨ä¸æ¯æ´ javascript ççè¦½å¨ï¼æèåç¨äº javascriptã
+      js_2: OpenStreetMap ä½¿ç¨ javascript è®å°åæ´å¹³é ã
+      js_3: å¦ææ¨ç¡æ³åç¨ javascriptï¼å¯ä»¥è©¦è©¦ <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home éææ¼è²¼çè¦½å¨</a>ã
+      license: 
+        license_name: Creative Commons Attribution-Share Alike 2.0
+        notice: ç± {{project_name}} åå®çè²¢ç»èä¾ {{license_name}} æ¢æ¬¾ææ¬ã
+        project_name: OpenStreetMap project
+      permalink: éæé£çµ
+      shortlink: ç°¡ç­é£çµ
+    key: 
+      map_key: åä¾
+      map_key_tooltip: å¨éåç¸®æ¾ç­ç´æé¡¯ç¤ºçåä¾
+      table: 
+        entry: 
+          admin: è¡æ¿åéç
+          allotments: Allotments
+          apron: 
             - Airport apron
             - terminal
-          admin: "è¡æ¿åéç"
-          forest: "æ£®æ"
-          wood: "æ¨¹æ¨"
-          golf: "é«ç¾å¤«çé"
-          park: "å¬å"
-          resident: "ä½å®å"
-          tourist: "Tourist attraction"
-          common:
+          bridge: Black casing = bridge
+          bridleway: é¦¬é
+          brownfield: Brownfield site
+          building: ç¹æ®å»ºç¯
+          byway: ééå°è·¯
+          cable: 
+            - çºè»
+            - chair lift
+          cemetery: Cemetery
+          centre: éåä¸­å¿
+          commercial: åæ¥­å
+          common: 
             - Common
             - meadow
-          retail: "Retail area"
-          industrial: "å·¥æ¥­å"
-          commercial: "åæ¥­å"
-          heathland: "Heathland"
-          lake:
+          construction: å»ºç¯ä¸­è·¯æ®µ
+          cycleway: èªè¡è»é
+          destination: Destination access
+          farm: è¾²ç°
+          footway: æ­¥é
+          forest: æ£®æ
+          golf: é«ç¾å¤«çé
+          heathland: Heathland
+          industrial: å·¥æ¥­å
+          lake: 
             - æ¹æ³
             - reservoir
-          farm: "è¾²ç°"
-          brownfield: "Brownfield site"
-          cemetery: "Cemetery"
-          allotments: "Allotments"
-          pitch: "Sports pitch"
-          centre: "éåä¸­å¿"
-          reserve: "èªç¶ä¿çå"
-          military: "è»äºå"
-          school: "å­¸æ ¡ï¼å¤§å­¸"
-          building: "ç¹æ®å»ºç¯"
-          station: "ç«è»ç«"
-          summit:
+          military: è»äºå
+          motorway: é«éå¬è·¯
+          park: å¬å
+          permissive: Permissive access
+          pitch: Sports pitch
+          primary: ä¸»è¦éè·¯
+          private: Private access
+          rail: éµè·¯
+          reserve: èªç¶ä¿çå
+          resident: ä½å®å
+          retail: Retail area
+          runway: 
+            - æ©å ´è·é
+            - é£æ©æ»è¡é
+          school: å­¸æ ¡ï¼å¤§å­¸
+          secondary: æ¬¡è¦éè·¯
+          station: ç«è»ç«
+          subway: å°ä¸éµ
+          summit: 
             - Summit
             - peak
-          tunnel: "Dashed casing = tunnel"
-          bridge: "Black casing = bridge"
-          private: "Private access"
-          permissive: "Permissive access"
-          destination: "Destination access"
-          construction: "å»ºç¯ä¸­è·¯æ®µ" 
-  trace:
-    visibility:
-      private: "ç§äºº (ä»¥å¿åæ¹å¼åäº«ï¼ç¯é»ç¡é åº)"
-      public: "å¬é (ä»¥å¿åæ¹å¼é¡¯ç¤ºæ¼è»è·¡æ¸å®ï¼ç¯é»ç¡é åº)"
-      trackable: "å¯è¿½è¹¤ (ä»¥å¿åæ¹å¼åäº«ï¼ç¯é»ææéæ³è¨)"
-      identifiable: "å¯è¾¨è­ (ä»¥å¯è¾¨èªçæ¹å¼é¡¯ç¤ºæ¼è»è·¡æ¸å®ï¼ç¯é»ææéæ³è¨)"
-    create:
-      upload_trace: "ä¸å³ GPS è»è·¡"
-      trace_uploaded: "æ¨ç GPX æªæ¡å·²ç¶ä¸å³ä¸¦ä¸å¨ç­åé²å¥è³æåº«ä¸­ãééå¸¸ä¸æè¶éåå°æï¼å®æææä»¥é»å­éµä»¶éç¥æ¨ã"
-    edit:
-      title: "ç·¨è¼¯è»è·¡ {{name}}"
-      heading: "ç·¨è¼¯è»è·¡ {{name}}"
-      filename: "æªæ¡åç¨±ï¼"
-      download: "ä¸è¼"
-      uploaded_at: "ä¸å³æ¼ï¼"
-      points: "é»æ¸ï¼"
-      start_coord: "éå§åæ¨ï¼"
-      map: "å°å"
-      edit: "ç·¨è¼¯"
-      owner: "ææèï¼"
-      description: "æè¿°ï¼"
-      tags: "æ¨ç±¤ï¼"
-      tags_help: "ä»¥éé»åé"
-      save_button: "å²å­è®æ´"
-      visibility: "å¯è¦æ§ï¼"
-      visibility_help: "éæ¯ä»éº¼ææï¼"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      title: "æ²æéåä½¿ç¨è"
-      heading: "ä½¿ç¨è {{user}} ä¸å­å¨"
-      body: "æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã"
-    trace_form:
-      upload_gpx: "ä¸å³ GPX æªæ¡"
-      description: "æè¿°"
-      tags: "æ¨ç±¤"
-      tags_help: "ä»¥éé»åé"
-      visibility: "å¯è¦æ§"
-      visibility_help: "éæ¯ä»éº¼ææï¼"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-      upload_button: "ä¸å³"
-      help: "æ±å©"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
-    trace_header:
-      see_just_your_traces: "åªæ¥çæ¨çè»è·¡ï¼ææ¯ä¸å³ä¸åè»è·¡"
-      see_all_traces: "æ¥çææçè»è·¡"
-      see_your_traces: "æ¥çæ¨ææçè»è·¡"
-      traces_waiting: "æ¨æ {{count}} åè»è·¡ç­å¾ä¸å³ãè«åç­å¾éäºçµæå¾æåé²ä¸æ­¥çä¸å³ï¼å¦æ­¤æä¸æé»æå¶ä»ä½¿ç¨èçæç¨ã"
-    trace_optionals:
-      tags: "æ¨ç±¤"
-    view:
-      title: "æª¢è¦è»è·¡ {{name}}"
-      heading: "æª¢è¦è»è·¡ {{name}}"
-      pending: "ç­å"
-      filename: "æªæ¡åç¨±ï¼"
-      download: "ä¸è¼"
-      uploaded: "ä¸å³æ¼ï¼"
-      points: "é»æ¸ï¼"
-      start_coordinates: "éå§åæ¨ï¼"
-      map: "å°å"
-      edit: "ç·¨è¼¯"
-      owner: "ææèï¼"
-      description: "æè¿°ï¼"
-      tags: "æ¨ç±¤"
-      none: "æ²æ"
-      edit_track: "ç·¨è¼¯éåè»è·¡"
-      delete_track: "åªé¤éåè»è·¡"
-      trace_not_found: "æ¾ä¸å°è»è·¡ï¼"
-      visibility: "å¯è¦æ§ï¼"
-    trace_paging_nav:
-      showing: "æ­£å¨é¡¯ç¤ºé é¢"
-      of: "ï¼"
-    trace:
-      pending: "ç­å"
-      count_points: "{{count}} åé»"
-      ago: "{{time_in_words_ago}} ä¹å"
-      more: "æ´å¤"
-      trace_details: "æª¢è¦è»è·¡è©³ç´°è³è¨"
-      view_map: "æª¢è¦å°å"
-      edit: "ç·¨è¼¯"
-      edit_map: "ç·¨è¼¯å°å"
-      public: "å¬é"
-      private: "ç§äºº"
-      by: "ç±"
-      in: "æ¼"
-      map: "å°å"
-    list:
-      public_traces: "å¬é GPS è»è·¡"
-      your_traces: "æ¨ç GPS è»è·¡"
+          tourist: Tourist attraction
+          track: ç¢æ¥­éè·¯
+          tram: 
+            - è¼è»é»è»
+            - tram
+          trunk: å¿«ééè·¯
+          tunnel: Dashed casing = tunnel
+          unclassified: æªåé¡éè·¯
+          unsurfaced: ç¡éªé¢éè·¯
+          wood: æ¨¹æ¨
+        heading: z{{zoom_level}} çåä¾
+    search: 
+      search: æå°
+      search_help: ç¯ä¾ï¼ 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', æ 'post offices near Lç¾¹nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>æ´å¤ç¯ä¾...</a>
+      submit_text: åºç¼
+      where_am_i: æå¨åªè£¡ï¼
+    sidebar: 
+      close: éé
+      search_results: æå°çµæ
+  trace: 
+    create: 
+      trace_uploaded: æ¨ç GPX æªæ¡å·²ç¶ä¸å³ä¸¦ä¸å¨ç­åé²å¥è³æåº«ä¸­ãééå¸¸ä¸æè¶éåå°æï¼å®æææä»¥é»å­éµä»¶éç¥æ¨ã
+      upload_trace: ä¸å³ GPS è»è·¡
+    delete: 
+      scheduled_for_deletion: è»è·¡å·²é å®åªé¤
+    edit: 
+      description: æè¿°ï¼
+      download: ä¸è¼
+      edit: ç·¨è¼¯
+      filename: æªæ¡åç¨±ï¼
+      heading: ç·¨è¼¯è»è·¡ {{name}}
+      map: å°å
+      owner: ææèï¼
+      points: é»æ¸ï¼
+      save_button: å²å­è®æ´
+      start_coord: éå§åæ¨ï¼
+      tags: æ¨ç±¤ï¼
+      tags_help: ä»¥éé»åé
+      title: ç·¨è¼¯è»è·¡ {{name}}
+      uploaded_at: ä¸å³æ¼ï¼
+      visibility: å¯è¦æ§ï¼
+      visibility_help: éæ¯ä»éº¼ææï¼
+    list: 
+      public_traces: å¬é GPS è»è·¡
       public_traces_from: "{{user}} çå¬é GPS è»è·¡"
       tagged_with: " æ¨ç±¤çº {{tags}}"
-    delete:
-      scheduled_for_deletion: "è»è·¡å·²é å®åªé¤"
-    make_public:
-      made_public: "è»è·¡æ¨è¨çºå¬é"
-  oauth:
-    oauthorize:
-      request_access: "æç¨ç¨å¼ {{app_name}} è¦æ±å­åæ¨çå¸³èãè«ç¢ºå®æ¨è¦è®æ­¤æç¨ç¨å¼ä½¿ç¨ä¸ååè½ãæ¨å¯ä»¥ä¾èªå·±çææé¸æã"
-      allow_to: "åè¨±å®¢æ¶ç«¯æç¨ç¨å¼ï¼"
-      allow_read_prefs:  "è®åæ¨çä½¿ç¨èåå¥½è¨­å®ã"
-      allow_write_prefs: "ä¿®æ¹æ¨çä½¿ç¨èåå¥½è¨­å®ã"
-      allow_write_diary: "å»ºç«æ¥è¨ãè¨»è§£åè¨­å®æåã"
-      allow_write_api:   "ä¿®æ¹å°åã"
-      allow_read_gpx:    "è®åæ¨çç§äºº GPS è»è·¡ã"
-      allow_write_gpx:   "ä¸å³ GPS è»è·¡ã"
-    revoke:
-      flash: "æ¨å·²ç¶è¨»é· {{application}} çè¨èã"
-  oauth_clients:
-    new:
-      title: "è¨»åæ°çæç¨ç¨å¼"
-      submit: "è¨»å"
-    edit:
-      title: "ç·¨è¼¯æ¨çæç¨ç¨å¼"
-      submit: "ç·¨è¼¯"
-    show:
-      title: "{{app_name}} ç OAuth è©³ç´°è³æ"
-      key: "æ¶è²»èéé°ï¼"
-      secret: "æ¶è²»èå¯é°ï¼"
-      url: "è¦æ±è¨è URLï¼"
-      access_url: "å­åè¨è URLï¼"
-      authorize_url: "ææ¬ URLï¼"
-      support_notice: "æåæ¯æ´ hmac-sha1 (å»ºè­°å¼) å ssl æ¨¡å¼çç´æå­ã"
-      edit: "ç·¨è¼¯è©³ç´°è³æ"
-      requests: "åä½¿ç¨èè¦æ±ä¸åæ¬éï¼"
-      allow_read_prefs:  "è®åä»åçä½¿ç¨èåå¥½è¨­å®ã"
-      allow_write_prefs: "ä¿®æ¹ä»åçä½¿ç¨èåå¥½è¨­å®ã"
-      allow_write_diary: "å»ºç«æ¥è¨ãè¨»è§£åè¨­å®æåã"
-      allow_write_api:   "ä¿®æ¹å°åã"
-      allow_read_gpx:    "è®åä»åçç§äºº GPS è»è·¡ã"
-      allow_write_gpx:   "ä¸å³ GPS è»è·¡ã"
-    index:
-      title: "æç OAuth è©³ç´°è³æ"
-      my_tokens: "æææ¬çæç¨ç¨å¼"
-      list_tokens: "ä¸åè¨èå·²ç¼çµ¦æ¨åä¸çæç¨ç¨å¼ï¼"
-      application: "æç¨ç¨å¼åç¨±"
-      issued_at: "ç°½ç¼æ¼"
-      revoke: "è¨»é·ï¼"
-      my_apps: "æçå®¢æ¶ç«¯æç¨ç¨å¼"
-      no_apps: "æ¨æ¯å¦ææ³è¦è¨»åä»¥ä½¿ç¨æ¼ {{oauth}} æ¨æºçæç¨ç¨å¼ï¼æ¨å¿é åè¨»åæ¨çç¶²é æç¨ç¨å¼ï¼æè½å°éåæåé²è¡ OAuth è¦æ±ã"
-      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 è»è·¡ã"
-    not_found: 
-      sorry: "æ±æ­ï¼æ¾ä¸å°æ­¤ {{type}}ã"
-    create:
-      flash: "è¨»åè³è¨æå"
-    update:
-      flash: "æ´æ°å®¢æ¶ç«¯è³è¨æå"
-    destroy:
-      flash: "å·²ç ´å£æ­¤å®¢æ¶ç«¯æç¨ç¨å¼è¨»å"
-  user:
-    login:
-      title: "ç»å¥"
-      heading: "ç»å¥"
-      please login: "è«ç»å¥æ{{create_user_link}}ã"
-      create_account: "å»ºç«ä¸åå¸³è"
-      email or username: "é»å­éµä»¶ä½åæä½¿ç¨èåç¨±ï¼"
-      password: "å¯ç¢¼ï¼"
-      lost password link: "å¿è¨æ¨çå¯ç¢¼ï¼"
-      login_button: "ç»å¥"
-      account not active: "æ±æ­ï¼æ¨çå¸³èå°æªåç¨ã<br />è«é»é¸å¸³èç¢ºèªé»å­éµä»¶ä¸­çé£çµä¾åç¨æ¨çå¸³èã"
-      auth failure: "æ±æ­ï¼ç¡æ³ä»¥éäºè³æç»å¥ã"
-    lost_password:
-      title: "éºå¤±å¯ç¢¼"
-      heading: "å¿è¨å¯ç¢¼ï¼"
-      email address: "é»å­éµä»¶ä½åï¼"
-      new password button: "å³éçµ¦ææ°çå¯ç¢¼"
-      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: "å»ºç«å¸³è"
-      heading: "å»ºç«ä½¿ç¨èå¸³è"
-      no_auto_account_create: "å¾ä¸å¹¸çæåç¾å¨ç¡æ³èªåçºæ¨å»ºç«å¸³èã"
-      contact_webmaster: 'è«é£çµ¡ <a href="mailto:webmaster@openstreetmap.org">ç¶²ç«ç®¡çè</a>å®æè¦å»ºç«çå¸³èï¼æåæåå¿«åè©¦ä¸¦èçéåè¦æ±ã'
-      fill_form: "å¡«å¥½ä¸åè¡¨å®ï¼æåæå¯çµ¦æ¨ä¸å°é»å­éµä»¶ä¾åç¨æ¨çå¸³èã"
-      license_agreement: 'èç±å»ºç«å¸³èï¼æ¨åæææä¸å³å° Openstreetmap è¨ç«çè³æé½ä»¥ (éæé¤) <a href="http://creativecommons.org/licenses/by-sa/2.0/">éååµç¨ CC ææ¬ (by-sa)</a>ä¾ææ¬ã'
-      email address: "é»å­éµä»¶ä½åï¼"
-      confirm email address: "ç¢ºèªé»å­éµä»¶ä½åï¼"
-      not displayed publicly: 'ä¸è¦å¬éé¡¯ç¤º (è«ç <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">é±ç§æ¬æ¿ç­</a>)'
-      display name: "é¡¯ç¤ºåç¨±ï¼"
-      password: "å¯ç¢¼ï¼"
-      confirm password: "ç¢ºèªå¯ç¢¼ï¼"
-      signup: "è¨»å"
-      flash create success message: "ä½¿ç¨èå·²æåå»ºç«ãæª¢æ¥æ¨çé»å­éµä»¶ææ²æç¢ºèªä¿¡ï¼æ¥èå°±è¦å¿èè£½ä½å°åäº :-)<br /><br />è«æ³¨æå¨æ¶å°ä¸¦ç¢ºèªæ¨çé»å­éµä»¶ä½ååæ¯ç¡æ³ç»å¥çã<br /><br />å¦ææ¨ä½¿ç¨æéåºç¢ºèªè¦æ±çé²åå¾ä¿¡ç³»çµ±ï¼è«ç¢ºå®æ¨å° webmaster@openstreetmap.org å å¥ç½åå®ä¸­ï¼å çºæåç¡æ³åè¦ä»»ä½ç¢ºèªè¦æ±ã"
-    no_such_user:
-      title: "æ²æéåä½¿ç¨è"
-      heading: "ä½¿ç¨è {{user}} ä¸å­å¨"
-      body: "æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã"
-    view:
-      my diary: "æçæ¥è¨"
-      new diary entry: "æ°å¢æ¥è¨"
-      my edits: "æçç·¨è¼¯"
-      my traces: "æçè»è·¡"
-      my settings: "æçè¨­å®å¼"
-      send message: "å³éè¨æ¯"
-      diary: "æ¥è¨"
-      edits: "åç·¨è¼¯"
-      traces: "åè»è·¡"
-      remove as friend: "ç§»é¤æå"
-      add as friend: "å å¥æå"
-      mapper since: "æçºè£½åèæ¼ï¼"
-      ago: "({{time_in_words_ago}} ä¹å)"
-      user image heading: "ä½¿ç¨èåç"
-      delete image: "åªé¤åç"
-      upload an image: "ä¸å³ä¸å¼µåç"
-      add image: "å å¥åç"
-      description: "æè¿°"
-      user location: "ä½¿ç¨èä½ç½®"
-      no home location: "å°æªè¨­å®å®¶çä½ç½®ã"
-      if set location: "å¦ææ¨è¨­å®äºä½ç½®ï¼ä¸å¼µæ¼äº®çå°ååå°ææ¨æåºç¾å¨ä¸é¢ãæ¨å¯ä»¥å¨{{settings_link}}é é¢è¨­å®æ¨çå®¶ä½ç½®ã"
-      settings_link_text: "è¨­å®å¼"
-      your friends: "æ¨çæå"
-      no friends: "æ¨å°æªå å¥ä»»ä½æåã"
-      km away: "{{count}} å¬éé "
-      m away: "{{count}} å¬å°ºé "
-      nearby users: "éè¿çä½¿ç¨èï¼"
-      no nearby users: "éè¿æ²æå¨é²è¡è£½åçä½¿ç¨èã"
-      change your settings: "æ¹è®æ¨çè¨­å®å¼"
-    friend_map:
-      your location: "æ¨çä½ç½®"
-      nearby mapper: "éè¿çè£½åèï¼"
-    account:
-      title: "ç·¨è¼¯å¸³è"
-      my settings: "æçè¨­å®å¼"
-      email never displayed publicly: "(æ°¸é ä¸å¬éé¡¯ç¤º)"
-      public editing:
-        heading: "å¬éç·¨è¼¯ï¼"
-        enabled: "å·²åç¨ãéå¿åä¸å¯ä»¥ç·¨è¼¯è³æã"
-        enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "éæ¯ä»éº¼ï¼"
-        disabled: "å·²åç¨ä¸ä¸è½ç·¨è¼¯è³æï¼ææååçç·¨è¼¯é½ææçºå¿åçã"
-        disabled link text: "çºä»éº¼æä¸è½ç·¨è¼¯ï¼"
-      profile description: "åäººæªæ¡æè¿°ï¼"
-      preferred languages: "åå¥½çèªè¨ï¼"
-      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: "ç¢ºèªä½¿ç¨èå¸³è"
-      press confirm button: "æä¸ç¢ºèªæéä»¥åç¨æ¨çå¸³èã"
-      button: "ç¢ºèª"
-      success: "å·²ç¢ºèªæ¨çå¸³èï¼æè¬æ¨çè¨»åï¼"
-      failure: "å·ææ­¤è¨èçä½¿ç¨èå¸³èå·²ç¶ç¢ºèªéäºã"
-    confirm_email:
-      heading: "ç¢ºèªé»å­éµä»¶ä½åçè®æ´"
-      press confirm button: "æä¸ç¢ºèªæéä»¥ç¢ºèªæ¨çæ°é»å­éµä»¶ä½åã"
+      your_traces: æ¨ç GPS è»è·¡
+    make_public: 
+      made_public: è»è·¡æ¨è¨çºå¬é
+    no_such_user: 
+      body: æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã
+      heading: ä½¿ç¨è {{user}} ä¸å­å¨
+      title: æ²æéåä½¿ç¨è
+    trace: 
+      ago: "{{time_in_words_ago}} ä¹å"
+      by: ç±
+      count_points: "{{count}} åé»"
+      edit: ç·¨è¼¯
+      edit_map: ç·¨è¼¯å°å
+      in: æ¼
+      map: å°å
+      more: æ´å¤
+      pending: ç­å
+      private: ç§äºº
+      public: å¬é
+      trace_details: æª¢è¦è»è·¡è©³ç´°è³è¨
+      view_map: æª¢è¦å°å
+    trace_form: 
+      description: æè¿°
+      help: æ±å©
+      tags: æ¨ç±¤
+      tags_help: ä»¥éé»åé
+      upload_button: ä¸å³
+      upload_gpx: ä¸å³ GPX æªæ¡
+      visibility: å¯è¦æ§
+      visibility_help: éæ¯ä»éº¼ææï¼
+    trace_header: 
+      see_all_traces: æ¥çææçè»è·¡
+      see_just_your_traces: åªæ¥çæ¨çè»è·¡ï¼ææ¯ä¸å³ä¸åè»è·¡
+      see_your_traces: æ¥çæ¨ææçè»è·¡
+      traces_waiting: æ¨æ {{count}} åè»è·¡ç­å¾ä¸å³ãè«åç­å¾éäºçµæå¾æåé²ä¸æ­¥çä¸å³ï¼å¦æ­¤æä¸æé»æå¶ä»ä½¿ç¨èçæç¨ã
+    trace_optionals: 
+      tags: æ¨ç±¤
+    trace_paging_nav: 
+      of: ï¼
+      showing: æ­£å¨é¡¯ç¤ºé é¢
+    view: 
+      delete_track: åªé¤éåè»è·¡
+      description: æè¿°ï¼
+      download: ä¸è¼
+      edit: ç·¨è¼¯
+      edit_track: ç·¨è¼¯éåè»è·¡
+      filename: æªæ¡åç¨±ï¼
+      heading: æª¢è¦è»è·¡ {{name}}
+      map: å°å
+      none: æ²æ
+      owner: ææèï¼
+      pending: ç­å
+      points: é»æ¸ï¼
+      start_coordinates: éå§åæ¨ï¼
+      tags: æ¨ç±¤
+      title: æª¢è¦è»è·¡ {{name}}
+      trace_not_found: æ¾ä¸å°è»è·¡ï¼
+      uploaded: ä¸å³æ¼ï¼
+      visibility: å¯è¦æ§ï¼
+    visibility: 
+      identifiable: å¯è¾¨è­ (ä»¥å¯è¾¨èªçæ¹å¼é¡¯ç¤ºæ¼è»è·¡æ¸å®ï¼ç¯é»ææéæ³è¨)
+      private: ç§äºº (ä»¥å¿åæ¹å¼åäº«ï¼ç¯é»ç¡é åº)
+      public: å¬é (ä»¥å¿åæ¹å¼é¡¯ç¤ºæ¼è»è·¡æ¸å®ï¼ç¯é»ç¡é åº)
+      trackable: å¯è¿½è¹¤ (ä»¥å¿åæ¹å¼åäº«ï¼ç¯é»ææéæ³è¨)
+  user: 
+    account: 
+      email never displayed publicly: (æ°¸é ä¸å¬éé¡¯ç¤º)
+      flash update success: ä½¿ç¨èè³è¨æåçæ´æ°ã
+      flash update success confirm needed: ä½¿ç¨èè³è¨æåçæ´æ°ãè«æª¢æ¥æ¨çé»å­éµä»¶æ¯å¦æ¶å°ç¢ºèªæ°é»å­éµä»¶ä½åçéç¥ã
+      home location: å®¶çä½ç½®ï¼
+      latitude: ç·¯åº¦ï¼
+      longitude: ç¶åº¦ï¼
+      make edits public button: å°æææçç·¨è¼¯è¨­çºå¬é
+      my settings: æçè¨­å®å¼
+      no home location: æ¨å°æªè¼¸å¥å®¶çä½ç½®ã
+      preferred languages: åå¥½çèªè¨ï¼
+      profile description: åäººæªæ¡æè¿°ï¼
+      public editing: 
+        disabled: å·²åç¨ä¸ä¸è½ç·¨è¼¯è³æï¼ææååçç·¨è¼¯é½ææçºå¿åçã
+        disabled link text: çºä»éº¼æä¸è½ç·¨è¼¯ï¼
+        enabled: å·²åç¨ãéå¿åä¸å¯ä»¥ç·¨è¼¯è³æã
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: éæ¯ä»éº¼ï¼
+        heading: å¬éç·¨è¼¯ï¼
+      return to profile: åå°è¨­å®æª
+      save changes button: å²å­è®æ´
+      title: ç·¨è¼¯å¸³è
+      update home location on click: ç¶æé»é¸å°åææ´æ°å®¶çä½ç½®ï¼
+    confirm: 
+      button: ç¢ºèª
+      failure: å·ææ­¤è¨èçä½¿ç¨èå¸³èå·²ç¶ç¢ºèªéäºã
+      heading: ç¢ºèªä½¿ç¨èå¸³è
+      press confirm button: æä¸ç¢ºèªæéä»¥åç¨æ¨çå¸³èã
+      success: å·²ç¢ºèªæ¨çå¸³èï¼æè¬æ¨çè¨»åï¼
+    confirm_email: 
       button: ç¢ºèª
-      success: "å·²ç¢ºèªæ¨çé»å­éµä»¶ä½åï¼æè¬æ¨çè¨»åï¼"
-      failure: "å·ææ­¤è¨èçé»å­éµä»¶ä½åå·²ç¶ç¢ºèªéäºã"
-    set_home:
-      flash success: "å®¶çä½ç½®æåçå²å­"
-    go_public:
-      flash success: "ç¾å¨æ¨ææçç·¨è¼¯é½æ¯å¬éçï¼å æ­¤æ¨å·²æç·¨è¼¯çæ¬å©ã"
-    make_friend:
+      failure: å·ææ­¤è¨èçé»å­éµä»¶ä½åå·²ç¶ç¢ºèªéäºã
+      heading: ç¢ºèªé»å­éµä»¶ä½åçè®æ´
+      press confirm button: æä¸ç¢ºèªæéä»¥ç¢ºèªæ¨çæ°é»å­éµä»¶ä½åã
+      success: å·²ç¢ºèªæ¨çé»å­éµä»¶ä½åï¼æè¬æ¨çè¨»åï¼
+    friend_map: 
+      nearby mapper: éè¿çè£½åèï¼
+      your location: æ¨çä½ç½®
+    go_public: 
+      flash success: ç¾å¨æ¨ææçç·¨è¼¯é½æ¯å¬éçï¼å æ­¤æ¨å·²æç·¨è¼¯çæ¬å©ã
+    login: 
+      account not active: æ±æ­ï¼æ¨çå¸³èå°æªåç¨ã<br />è«é»é¸å¸³èç¢ºèªé»å­éµä»¶ä¸­çé£çµä¾åç¨æ¨çå¸³èã
+      auth failure: æ±æ­ï¼ç¡æ³ä»¥éäºè³æç»å¥ã
+      create_account: å»ºç«ä¸åå¸³è
+      email or username: é»å­éµä»¶ä½åæä½¿ç¨èåç¨±ï¼
+      heading: ç»å¥
+      login_button: ç»å¥
+      lost password link: å¿è¨æ¨çå¯ç¢¼ï¼
+      password: å¯ç¢¼ï¼
+      please login: è«ç»å¥æ{{create_user_link}}ã
+      title: ç»å¥
+    lost_password: 
+      email address: é»å­éµä»¶ä½åï¼
+      heading: å¿è¨å¯ç¢¼ï¼
+      new password button: å³éçµ¦ææ°çå¯ç¢¼
+      notice email cannot find: æ¾ä¸å°è©²é»å­éµä»¶ä½åï¼æ±æ­ã
+      notice email on way: å¾éºæ¾æ¨å¿äºå® :-( ä½æ¯ä¸å°è®æ¨å¯ä»¥éè¨­å®çéµä»¶å·²ç¶å¯åºã
+      title: éºå¤±å¯ç¢¼
+    make_friend: 
+      already_a_friend: æ¨å·²ç¶æ¯ {{name}} çæåäºã
+      failed: æ±æ­ï¼ç¡æ³å° {{name}} å å¥çºæåã
       success: "{{name}} ç¾å¨æçºæ¨çæåã"
-      failed: "æ±æ­ï¼ç¡æ³å° {{name}} å å¥çºæåã"
-      already_a_friend: "æ¨å·²ç¶æ¯ {{name}} çæåäºã"
-    remove_friend:
-      success: "{{name}} å·²å¾æ¨çæåä¸­ç§»é¤ã"
+    new: 
+      confirm email address: ç¢ºèªé»å­éµä»¶ä½åï¼
+      confirm password: ç¢ºèªå¯ç¢¼ï¼
+      contact_webmaster: è«é£çµ¡ <a href="mailto:webmaster@openstreetmap.org">ç¶²ç«ç®¡çè</a>å®æè¦å»ºç«çå¸³èï¼æåæåå¿«åè©¦ä¸¦èçéåè¦æ±ã
+      display name: é¡¯ç¤ºåç¨±ï¼
+      email address: é»å­éµä»¶ä½åï¼
+      fill_form: å¡«å¥½ä¸åè¡¨å®ï¼æåæå¯çµ¦æ¨ä¸å°é»å­éµä»¶ä¾åç¨æ¨çå¸³èã
+      flash create success message: ä½¿ç¨èå·²æåå»ºç«ãæª¢æ¥æ¨çé»å­éµä»¶ææ²æç¢ºèªä¿¡ï¼æ¥èå°±è¦å¿èè£½ä½å°åäº :-)<br /><br />è«æ³¨æå¨æ¶å°ä¸¦ç¢ºèªæ¨çé»å­éµä»¶ä½ååæ¯ç¡æ³ç»å¥çã<br /><br />å¦ææ¨ä½¿ç¨æéåºç¢ºèªè¦æ±çé²åå¾ä¿¡ç³»çµ±ï¼è«ç¢ºå®æ¨å° webmaster@openstreetmap.org å å¥ç½åå®ä¸­ï¼å çºæåç¡æ³åè¦ä»»ä½ç¢ºèªè¦æ±ã
+      heading: å»ºç«ä½¿ç¨èå¸³è
+      license_agreement: èç±å»ºç«å¸³èï¼æ¨åæææä¸å³å° Openstreetmap è¨ç«çè³æé½ä»¥ (éæé¤) <a href="http://creativecommons.org/licenses/by-sa/2.0/">éååµç¨ CC ææ¬ (by-sa)</a>ä¾ææ¬ã
+      no_auto_account_create: å¾ä¸å¹¸çæåç¾å¨ç¡æ³èªåçºæ¨å»ºç«å¸³èã
+      not displayed publicly: ä¸è¦å¬éé¡¯ç¤º (è«ç <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">é±ç§æ¬æ¿ç­</a>)
+      password: å¯ç¢¼ï¼
+      signup: è¨»å
+      title: å»ºç«å¸³è
+    no_such_user: 
+      body: æ±æ­ï¼æ²æåçº {{user}} çä½¿ç¨èãè«æª¢æ¥æ¨çæ¼å­ï¼æèå¯è½æ¯æå°é¯èª¤çé£çµã
+      heading: ä½¿ç¨è {{user}} ä¸å­å¨
+      title: æ²æéåä½¿ç¨è
+    remove_friend: 
       not_a_friend: "{{name}} ä¸¦ä¸å¨æ¨çæåè£¡ã"
+      success: "{{name}} å·²å¾æ¨çæåä¸­ç§»é¤ã"
+    reset_password: 
+      confirm password: ç¢ºèªå¯ç¢¼ï¼
+      flash changed: æ¨çå¯ç¢¼å·²ç¶è®æ´ã
+      flash token bad: æ¾ä¸å°è©²è¨èï¼å¯è½è¦æª¢æ¥ä¸ä¸ URLï¼
+      heading: éè¨­ {{user}} çå¯ç¢¼
+      password: å¯ç¢¼ï¼
+      reset: éè¨­å¯ç¢¼
+      title: éè¨­å¯ç¢¼
+    set_home: 
+      flash success: å®¶çä½ç½®æåçå²å­
+    view: 
+      add as friend: å å¥æå
+      add image: å å¥åç
+      ago: ({{time_in_words_ago}} ä¹å)
+      change your settings: æ¹è®æ¨çè¨­å®å¼
+      delete image: åªé¤åç
+      description: æè¿°
+      diary: æ¥è¨
+      edits: åç·¨è¼¯
+      if set location: å¦ææ¨è¨­å®äºä½ç½®ï¼ä¸å¼µæ¼äº®çå°ååå°ææ¨æåºç¾å¨ä¸é¢ãæ¨å¯ä»¥å¨{{settings_link}}é é¢è¨­å®æ¨çå®¶ä½ç½®ã
+      km away: "{{count}} å¬éé "
+      m away: "{{count}} å¬å°ºé "
+      mapper since: æçºè£½åèæ¼ï¼
+      my diary: æçæ¥è¨
+      my edits: æçç·¨è¼¯
+      my settings: æçè¨­å®å¼
+      my traces: æçè»è·¡
+      nearby users: éè¿çä½¿ç¨èï¼
+      new diary entry: æ°å¢æ¥è¨
+      no friends: æ¨å°æªå å¥ä»»ä½æåã
+      no home location: å°æªè¨­å®å®¶çä½ç½®ã
+      no nearby users: éè¿æ²æå¨é²è¡è£½åçä½¿ç¨èã
+      remove as friend: ç§»é¤æå
+      send message: å³éè¨æ¯
+      settings_link_text: è¨­å®å¼
+      traces: åè»è·¡
+      upload an image: ä¸å³ä¸å¼µåç
+      user image heading: ä½¿ç¨èåç
+      user location: ä½¿ç¨èä½ç½®
+      your friends: æ¨çæå
-- 
2.39.5