From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 21 Nov 2011 21:02:37 +0000 (+0100)
Subject: Localisation updates from http://translatewiki.net.
X-Git-Tag: live~5987
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/370918ca84dde78d0acca48c6089ea02406e4b30

Localisation updates from http://translatewiki.net.
---

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index ac0ae7e53..36e93550c 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -894,7 +894,7 @@ ast:
   layouts: 
     community_blogs: Blogues de la ComunidÃ¡
     community_blogs_title: Blogues de miembros de la comunidÃ¡ d'OpenStreetMap
-    copyright: Copyright & Llicencia
+    copyright: Drechos d'autor y llicencia
     documentation: DocumentaciÃ³n
     documentation_title: DocumentaciÃ³n del proyeutu
     donate: Sofita OpenStreetMap %{link} al Fondu pal Anovamientu del Hardware.
diff --git a/config/locales/be-TARASK.yml b/config/locales/be-TARASK.yml
index af32be911..ff3983329 100644
--- a/config/locales/be-TARASK.yml
+++ b/config/locales/be-TARASK.yml
@@ -937,6 +937,8 @@ be-TARASK:
       text: ÐÑ Ð¿ÑÐ°Ð³Ð»ÑÐ´Ð°ÐµÑÐµ Ð°Ð½Ð³ÐµÐ»ÑÑÐºÑÑ Ð²ÑÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ð¾Ñ. ÐÑ Ð¼Ð¾Ð¶Ð°ÑÐµ Ð²ÑÑÐ½ÑÑÑÐ° Ð´Ð° %{native_link} Ð³ÑÑÐ°Ð¹ ÑÑÐ°ÑÐ¾Ð½ÐºÑ ÑÑ ÑÐ¿ÑÐ½ÑÑÑ ÑÑÑÐ°Ð½ÑÐ½Ðµ Ð¿ÑÐ° Ð°ÑÑÐ°ÑÑÐºÑÑ Ð¿ÑÐ°Ð²Ñ Ñ %{mapping_link}.
       title: ÐÑÐ° Ð³ÑÑÑÑ ÑÑÐ°ÑÐ¾Ð½ÐºÑ
   message: 
+    delete: 
+      deleted: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ Ð²ÑÐ´Ð°Ð»ÐµÐ½Ð°Ðµ
     inbox: 
       date: ÐÐ°ÑÐ°
       from: ÐÐ´
@@ -947,21 +949,57 @@ be-TARASK:
       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: Ð¢ÑÐºÑÑ
+      limit_exceeded: ÐÑ Ð´Ð°ÑÐ»Ð°Ð»Ñ ÑÐ¼Ð°Ñ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½ÑÑ Ñ Ð°Ð¿Ð¾ÑÐ½Ñ ÑÐ°Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ°ÐºÐ°Ð¹ÑÐµ, Ð¿ÐµÑÐ°Ð´ ÑÑÐ¼, ÑÐº Ð°Ð´Ð¿ÑÐ°ÑÐ»ÑÑÑ Ð·Ð½Ð¾Ñ.
+      message_sent: ÐÐ°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ Ð´Ð°ÑÐ»Ð°Ð½Ð°Ðµ
+      send_button: ÐÐ°ÑÐ»Ð°ÑÑ
       send_message_to: ÐÐ°ÑÐ»Ð°ÑÑ Ð½Ð¾Ð²Ð°Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ Ð´Ð° %{name}
       subject: Ð¢ÑÐ¼Ð°
       title: ÐÐ°ÑÐ»Ð°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ
+    no_such_message: 
+      body: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÑÐ¼Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ Ð· ÑÐ°ÐºÑÐ¼ ÑÐ´ÑÐ½ÑÑÑÑÐºÐ°ÑÐ°ÑÐ°Ð¼.
+      heading: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ñ
+      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: ÐÑ Ð¼Ð°ÐµÑÐµ %{count} Ð°Ð´Ð¿ÑÐ°ÑÐ»ÐµÐ½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½ÑÑ
     read: 
+      back_to_inbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° ÑÐ²Ð°ÑÐ¾Ð´Ð½ÑÑ
+      back_to_outbox: ÐÑÑÐ½ÑÑÑÐ° Ð´Ð° Ð²ÑÑÐ¾Ð´Ð½ÑÑ
+      date: ÐÐ°ÑÐ°
+      from: ÐÐ´
+      reading_your_messages: Ð§ÑÑÐ°Ð½ÑÐ½Ðµ ÐÐ°ÑÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½ÑÑ
+      reading_your_sent_messages: Ð§ÑÑÐ°Ð½ÑÐ½Ðµ ÐÐ°ÑÑÑ Ð´Ð°ÑÐ»Ð°Ð½ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½ÑÑ
       reply_button: ÐÐ´ÐºÐ°Ð·Ð°ÑÑ
       subject: Ð¢ÑÐ¼Ð°
+      title: Ð§ÑÑÐ°ÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ
+      to: ÐÐ°
+      unread_button: ÐÐ°Ð·Ð½Ð°ÑÑÑÑ ÑÐº Ð½ÐµÐ¿ÑÐ°ÑÑÑÐ°Ð½Ð°Ðµ
+      wrong_user: ÐÑ ÑÐ²Ð°Ð¹ÑÐ»Ñ Ñ ÑÑÑÑÑÐ¼Ñ ÑÐº `%{user}', Ð°Ð»Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ, ÑÐºÐ¾Ðµ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð¿ÑÐ°ÑÑÑÐ°ÑÑ, Ð±ÑÐ»Ð¾ Ð´Ð°ÑÐ»Ð°Ð½Ð°Ðµ Ð½Ðµ Ð³ÑÑÑÐ¼ ÑÑ Ð³ÑÑÐ°Ð¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº, Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½Ð° Ð·Ð°Ð¿ÑÑÑ, ÐºÐ°Ð± Ð¿ÑÐ°ÑÑÑÐ°ÑÑ.
+    reply: 
+      wrong_user: ÐÑ ÑÐ²Ð°Ð¹ÑÐ»Ñ Ñ ÑÑÑÑÑÐ¼Ñ ÑÐº `%{user}', Ð°Ð»Ðµ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑÐ½Ðµ, Ð½Ð° ÑÐºÐ¾Ðµ ÐÑ Ð¶Ð°Ð´Ð°ÐµÑÐµ Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ, Ð½Ðµ Ð±ÑÐ»Ð¾ Ð´Ð°ÑÐ»Ð°Ð½Ð°Ðµ Ð³ÑÑÐ°Ð¼Ñ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÑ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÑÐ²Ð°Ð¹Ð´Ð·ÑÑÐµ ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐº, Ð°Ð´Ð¿Ð°Ð²ÐµÐ´Ð½Ð° Ð·Ð°Ð¿ÑÑÑ, ÐºÐ°Ð± Ð°Ð´ÐºÐ°Ð·Ð°ÑÑ.
     sent_message_summary: 
       delete_button: ÐÑÐ´Ð°Ð»ÑÑÑ
   notifier: 
@@ -1050,6 +1088,27 @@ be-TARASK:
   oauth_clients: 
     edit: 
       submit: Ð ÑÐ´Ð°Ð³Ð°Ð²Ð°ÑÑ
+  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}.
+      potlatch2_not_configured: Potlatch 2 Ð½Ñ Ð±ÑÑ Ð½Ð°Ð»Ð°Ð´Ð¶Ð°Ð½Ñ. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°Ð³Ð»ÑÐ´Ð·ÑÑÐµ http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 Ð´Ð»Ñ Ð´Ð°Ð´Ð°ÑÐºÐ¾Ð²Ð°Ð¹ ÑÐ½ÑÐ°ÑÐ¼Ð°ÑÑÑ
+      potlatch2_unsaved_changes: ÐÑ Ð¼Ð°ÐµÑÐµ Ð½ÐµÐ·Ð°ÑÐ°Ð²Ð°Ð½ÑÑ Ð·ÑÐ¼ÐµÐ½Ñ. (ÐÐ°Ð± Ð·Ð°ÑÐ°Ð²Ð°ÑÑ Ñ Potlatch 2, ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð½Ð°ÑÑÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Â«Ð·Ð°ÑÐ°Ð²Ð°ÑÑÂ».)
+      potlatch_unsaved_changes: ÐÑ Ð¼Ð°ÐµÑÐµ Ð½ÐµÐ·Ð°ÑÐ°Ð²Ð°Ð½ÑÑ Ð·ÑÐ¼ÐµÐ½Ñ. (ÐÐ»Ñ ÑÐ°Ð³Ð¾ ÐºÐ°Ð± Ð·Ð°ÑÐ°Ð²Ð°ÑÑ Ð·ÑÐ¼ÐµÐ½Ñ Ñ Potlatch, ÐÐ°Ð¼ Ð½ÐµÐ°Ð±ÑÐ¾Ð´Ð½Ð° Ð·ÑÐ½ÑÑÑ Ð¿Ð°Ð·Ð½Ð°ÑÑÐ½ÑÐ½Ðµ Ð· ÑÑÐ¿ÐµÑÐ°ÑÐ½ÑÐ¹ Ð´Ð°ÑÐ¾Ð³Ñ ÑÑ Ð¿ÑÐ½ÐºÑÑ, ÐºÐ°Ð»Ñ ÑÑÐ´Ð°Ð³ÑÐµÑÐµ ÑÐ¶ÑÐ²ÑÑ, ÑÑ Ð½Ð°ÑÑÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Â«Ð·Ð°ÑÐ°Ð²Ð°ÑÑÂ».)
+      user_page_link: ÑÑÐ°ÑÐ¾Ð½ÑÑ ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ°
+    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: Ð¡ÑÐ°Ð»Ð°Ñ ÑÐ¿Ð°ÑÑÐ»ÐºÐ°
+      remote_failed: ÐÐ°Ð¼ÑÐ»ÐºÐ° ÑÑÐ´Ð°Ð³Ð°Ð²Ð°Ð½ÑÐ½Ñ. Ð£Ð¿ÑÑÐ½ÑÑÐµÑÑ, ÑÑÐ¾ JOSM ÑÑ Merkaartor Ð·Ð°Ð³ÑÑÐ¶Ð°Ð½ÑÑ Ñ Ð´Ð°Ð·Ð²Ð¾Ð»ÐµÐ½Ð°Ñ Ð¼Ð°Ð³ÑÑÐ¼Ð°ÑÑÑÑ Ð°Ð´Ð´Ð°Ð»ÐµÐ½Ð°Ð³Ð° ÐºÑÑÐ°Ð²Ð°Ð½ÑÐ½Ñ
+      shortlink: ÐÐ°ÑÐ¾ÑÐºÐ°Ñ ÑÐ¿Ð°ÑÑÐ»ÐºÐ°
   time: 
     formats: 
       friendly: "%e %B %Y Ñ %H:%M"
@@ -1086,7 +1145,7 @@ be-TARASK:
     no_such_user: 
       body: ÐÑÐ°Ð±Ð°ÑÑÐµ, Ð½ÑÐ¼Ð° ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ° Ð· ÑÐ¼ÐµÐ¼ %{user}. ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÑÐ°Ð²ÐµÑÑÐµ Ð´Ð°ÐºÐ»Ð°Ð´Ð½Ð°ÑÑÑÑ Ð½Ð°Ð¿ÑÑÐ°Ð½ÑÐ½Ñ, ÑÑ, Ð¼Ð°Ð³ÑÑÐ¼Ð°, ÑÐ¿Ð°ÑÑÐ»ÐºÐ° Ð¿Ð° ÑÐºÐ¾Ð¹ ÐÑ Ð¿ÐµÑÐ°Ð¹ÑÐ»Ñ, Ð½ÑÑÐ»ÑÑÐ½Ð°Ñ.
       heading: Ð£Ð´Ð·ÐµÐ»ÑÐ½ÑÐº %{user} Ð½Ðµ ÑÑÐ½ÑÐµ
-      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°
+      title: ÐÑÐ¼Ð° ÑÐ°ÐºÐ¾Ð³Ð° ÑÐ´Ð·ÐµÐ»ÑÐ½ÑÐºÐ°
     offline: 
       heading: GPX-ÑÑÐ¾Ð²ÑÑÑÐ° Ð°Ð´ÐºÐ»ÑÑÐ°Ð½Ð°Ðµ
       message: Ð¡ÑÐ¾Ð²ÑÑÑÐ° GPX-ÑÐ°Ð¹Ð»Ð°Ñ Ñ ÑÑÑÑÑÐ¼Ð° ÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÑ, Ñ ÑÑÐ¿ÐµÑÐ°ÑÐ½Ñ Ð¼Ð¾Ð¼Ð°Ð½Ñ, Ð½ÐµÐ´Ð°ÑÑÑÐ¿Ð½Ð°Ñ.
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 0f5272893..cc3896f2b 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -271,7 +271,7 @@ br:
       view_changeset_details: Gwelet munudoÃ¹ ar strollad kemmoÃ¹
     changeset_paging_nav: 
       next: War-lerc'h Â»
-      previous: "Â« Kent"
+      previous: Â« Kent
       showing_page: O tiskouez ar bajenn %{page}
     changesets: 
       area: Takad
@@ -1353,7 +1353,7 @@ br:
       tags: BalizennoÃ¹
     trace_paging_nav: 
       next: War-lerc'h Â»
-      previous: "Â« Kent"
+      previous: Â« Kent
       showing_page: O tiskouez ar bajenn %{page}
     view: 
       delete_track: Dilemel ar roudenn-maÃ±
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8003318ec..e3a0d88b1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3,6 +3,7 @@
 # Export driver: syck-pecl
 # Author: Aleator
 # Author: El libre
+# Author: Gemmaa
 # Author: Jconstanti
 # Author: Jmontane
 # Author: Martorell
@@ -80,6 +81,12 @@ ca:
       way: CamÃ­
       way_node: Node del camÃ­
       way_tag: Etiqueta del camÃ­
+  application: 
+    require_cookies: 
+      cookies_needed: Sembla tenir les galetes inhabilitats - heu d'habilitar les galetes al seu navegador abans de continuar.
+    setup_user_auth: 
+      blocked: S'ha blocat l'accÃ©s a l'API. Si us plau, log-in a la interfÃ­cie de web per obtenir mÃ©s informaciÃ³.
+      need_to_see_terms: L'accÃ©s a l'API Ã©s temporalment suspeses. Si us plau, log-in a la interfÃ­cie de web per veure els termes de col. laborador. VostÃ¨ no necessita estar d'acord, perÃ² cal veure-les.
   browse: 
     changeset: 
       changeset: Conjunt de canvis %{id}
@@ -101,6 +108,7 @@ ca:
       has_ways: 
         one: "TÃ© la segÃ¼ent via:"
         other: "TÃ© les segÃ¼ents %{count} vies:"
+      no_bounding_box: No hi ha bounding box s'ha emmagatzemat per a aquest el conjunt de canvis.
       show_area_box: Mostra caixa de l'Ã rea
     common_details: 
       changeset_comment: "Comentari:"
@@ -115,6 +123,11 @@ ca:
       entry_role: RelaciÃ³ %{relation_name} (com a  %{relation_role})
     map: 
       deleted: Esborrat
+      edit: 
+        area: Editar Ã rea
+        node: Editar node
+        relation: Edita la relaciÃ³
+        way: EdiciÃ³ de manera
       larger: 
         area: Visualitza l'Ã rea en un mapa mÃ©s gran
         node: Visualitza el node en un mapa mÃ©s gran
@@ -194,6 +207,7 @@ ca:
       hide_areas: Oculta les zones
       history_for_feature: Historial per a [[feature]]
       load_data: Carrega dades
+      loaded_an_area_with_num_features: "Heu carregat una Ã rea que contÃ© trets de [[num_features]]. En general, alguns navegadors poden no fer front tambÃ© mostrar aquesta quantitat de dades. En general, els navegadors funcionen millor de es mostren trets de menys de 100 a la vegada: fer qualsevol altra cosa pot fer que el seu navegador lent/insensible. Si esteu segurs que voleu visualitzar aquestes dades, pot fer-ho fent clic al botÃ³ de sota."
       loading: S'estÃ  carregant...
       manually_select: Selecciona manualment una Ã rea diferent
       object_list: 
@@ -215,6 +229,7 @@ ca:
       private_user: usuari privat
       show_areas: Mostra les zones
       show_history: Mostra l'historial
+      unable_to_load_size: "No es pot carregar: Bounding mida de caixa de [[bbox_size]] Ã©s massa gran (ha de ser mÃ©s petita que % {max_bbox_size})"
       wait: Espereu...
       zoom_or_select: Ampliar o seleccionar una Ã rea del mapa per veure
     tag_details: 
@@ -260,7 +275,7 @@ ca:
       view_changeset_details: Mostra els detalls del conjunt de canvis
     changeset_paging_nav: 
       next: SegÃ¼ent Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrant pÃ gina %{page}
     changesets: 
       area: Ãrea
@@ -336,9 +351,11 @@ ca:
     new: 
       title: Nova Entrada de Diari
     no_such_entry: 
+      body: Ho sentim, que no hi ha cap entrada del diari o comentari amb l'id % {id}. Si us plau, comproveu l'ortografia, o potser l'enllaÃ§ que es fa clic estÃ  malament.
       heading: No hi ha cap entrada amb la id %{id}
       title: No hi ha entrada al diari com
     no_such_user: 
+      body: Ho sentim, no hi ha cap usuari amb el nom % (usuari). Si us plau, comproveu l'ortografia, o potser l'enllaÃ§ que es fa clic estÃ  malament.
       heading: L'usuari/a %{user} no existeix
       title: Aquest usuari/a no existeix
     view: 
@@ -382,6 +399,7 @@ ca:
       paste_html: Enganxa HTML per incloure'l al lloc web
       scale: Escala
       too_large: 
+        body: Aquesta zona Ã©s massa gran per exportar com a dades XML de OpenStreetMap. Si us plau entrar rÃ pidament o seleccioneu una Ã rea mÃ©s petita.
         heading: L'Ã rea Ã©s massa gran
       zoom: Zoom
     start_rjs: 
@@ -396,6 +414,7 @@ ca:
     description: 
       title: 
         geonames: LocalitzaciÃ³ des de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "% {tipus} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
         osm_nominatim: LocalitzaciÃ³ des de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Ciutats
@@ -570,6 +589,10 @@ ca:
           ford: Fiord
           gate: Porta
           living_street: Carrer habitat
+          minor: CamÃ­ secundari
+          motorway: L'autopista
+          motorway_junction: L'autopista
+          motorway_link: L'autopista Road
           path: CamÃ­
           pedestrian: Via Peatonal
           platform: Perron
@@ -581,48 +604,72 @@ ca:
           secondary: Carretera secundÃ ria
           secondary_link: Carretera secundÃ ria
           service: Carretera de Servei
+          services: Serveis en ruta
           steps: Graons
           stile: Escala per a travessar reixats
           tertiary: Carretera terciÃ ria
+          track: Pista
           trail: Sendera
-          unclassified: Carretera sense classificar
+          trunk: Autovia de
+          trunk_link: Autovia de
+          unclassified: Sense classificar Road
           unsurfaced: Pista sense asfaltar
         historic: 
           archaeological_site: Lloc arqueolÃ²gic
           battlefield: Camp de batalla
+          boundary_stone: Pedra de la frontera
           building: Edifici
           castle: Castell
           church: EsglÃ©sia
           house: Casa
           icon: Icona
+          manor: Manor
           memorial: Memorial
           mine: Mina
           monument: Monument
           museum: Museu
           ruins: RuÃ¯nes
           tower: Torre
+          wayside_cross: CamÃ­ de la creu
+          wayside_shrine: Santuari de carreteres
+          wreck: Wreck
         landuse: 
+          allotments: Horts
+          basin: Conca
+          brownfield: Brownfield terra
           cemetery: Cementiri
           commercial: Zona comercial
+          conservation: ConservaciÃ³
           construction: ConstrucciÃ³
           farm: Granja
+          farmland: Terres de conreu
+          farmyard: Corral
           forest: Bosc
           grass: Herba
+          greenfield: Greenfield terra
           industrial: Zona industrial
+          landfill: Abocador
+          meadow: Prat
           military: Zona Militar
           mine: Mina
           mountain: Muntanya
           nature_reserve: Reserva Natural
           park: Parc
+          piste: Pista d'aterratge
           plaza: PlaÃ§a
           quarry: Pedrera
           railway: Ferrocarril
           recreation_ground: Zona d'Esbarjo
           reservoir: Embassament
           residential: Ãrea residencial
+          retail: Al detall
+          village_green: Village Green
+          vineyard: Vinya
           wetland: Aiguamoll
           wood: Fusta
         leisure: 
+          beach_resort: Beach Resort
+          common: Terra comÃº
           fishing: Ãrea de pesca
           garden: JardÃ­
           golf_course: Camp de golf
@@ -631,9 +678,14 @@ ca:
           miniature_golf: Minigolf
           nature_reserve: Reserva natural
           park: Parc
+          pitch: Camp d'esports
+          playground: Parc infantil
+          recreation_ground: Terra de recreaciÃ³
+          slipway: Slipway
           sports_centre: Centre esportiu
           stadium: Estadi
           swimming_pool: Piscina
+          track: Pista
           water_park: Parc aquÃ tic
         natural: 
           bay: Badia
@@ -652,6 +704,8 @@ ca:
           heath: Bruguerar
           hill: Pujol
           island: Illa
+          land: Terra
+          marsh: Marsh
           moor: Amarratge
           mud: Llot
           peak: Pic
@@ -661,6 +715,7 @@ ca:
           river: Riu
           rock: Roca
           scree: Pedregar
+          scrub: Scrub
           shoal: Banc
           spring: Deu
           strait: Estret
@@ -697,42 +752,97 @@ ca:
         railway: 
           abandoned: Ferrocarril fora de Servei
           construction: Ferrocarril en ConstrucciÃ³
+          disused: Ferrocarril en desÃºs
           disused_station: EstaciÃ³ de tren tancada
+          funicular: Funicular Railway
+          halt: Parada de tren
           historic_station: EstaciÃ³ de tren antiga
           junction: CruÃ¯lla de tren
           level_crossing: Pas a nivell
+          light_rail: Tren lleuger
           monorail: Monorail
+          narrow_gauge: Ample ferroviari mÃ¨tric
           platform: Andana
+          preserved: Conservat ferrocarril
+          spur: EsperÃ³ de ferrocarril
           station: EstaciÃ³ de tren
           subway: EstaciÃ³ de metro
           subway_entrance: AccÃ©s al Metro
+          switch: Punts de ferrocarril
           tram: Tramvia
           tram_stop: Parada de tramvia
+          yard: Pati de ferrocarril
         shop: 
+          alcohol: De llicÃ¨ncia
+          apparel: Roba de la botiga
           art: Galeria d'Art
           bakery: Fleca
+          beauty: SalÃ³ de bellesa
+          beverages: Botiga de begudes
           bicycle: Tenda de bicicletes
           books: Llibreria
           butcher: Carnisseria
           car: Venda de Cotxes
           car_dealer: Compra-venda de cotxes
+          car_parts: Peces de cotxes
           car_repair: ReparaciÃ³ d'automÃ²bils
+          carpet: Botiga de catifes
+          charity: Botiga de caritat
           chemist: FarmÃ cia
+          clothes: Botiga de roba
+          computer: Botiga d'informÃ tica
+          confectionery: Confiteria botiga
+          convenience: Botiga de conveniÃ¨ncia
+          copyshop: Copisteria
+          cosmetics: Botiga CosmÃ¨tica
+          department_store: Department Store
+          discount: Botiga d'articles de descompte
+          doityourself: Bricolatge
+          drugstore: FarmÃ cia
+          dry_cleaning: Tintoreria
+          electronics: Botiga d'electrÃ²nica
           estate_agent: ImmobiliÃ ria
+          farm: Agrobotiga
+          fashion: Botiga de moda
           fish: Peixateria
           florist: Floristeria
+          food: Botiga de menjar
+          funeral_directors: Funeral d'administraciÃ³
+          furniture: Mobles
+          gallery: Galeria de fotos
+          garden_centre: Centre de jardÃ­
+          general: Magatzem General
           gift: Botiga de regals
+          greengrocer: Greengrocer
+          grocery: Botiga de queviures
           hairdresser: Perruqueria o barberia
+          hardware: Botiga de maquinari
+          hifi: Hi-Fi
+          insurance: Homes For Sale
           jewelry: Joieria
+          kiosk: Quiosc botiga
           laundry: Bugaderia
           mall: Centre comercial
           market: Mercat
+          mobile_phone: Botiga de telÃ¨fon mÃ²bil
+          motorcycle: Botiga de motocicletes
+          music: Botiga de mÃºsica
+          newsagent: Quiosc
           optician: Ãptica
+          organic: Botiga d'aliments orgÃ nics
+          outdoor: Botiga exterior
           pet: Botiga d'animals
+          photo: Botiga de foto
+          salon: Sala d'estar
           shoes: Sabateria
+          shopping_centre: Centre comercial
+          sports: Botiga d'esports
+          stationery: Botiga de papereria
           supermarket: Supermercat
           toys: Botiga de joguines
           travel_agency: AgÃ¨ncia de viatges
+          video: Video de la botiga
+          wine: De llicÃ¨ncia
         tourism: 
           alpine_hut: Cabanya alpina
           artwork: IlÂ·lustraciÃ³
@@ -755,14 +865,26 @@ ca:
           viewpoint: Mirador
           zoo: ZoolÃ²gic
         waterway: 
+          boatyard: Drassana
           canal: Canal
+          connector: Connector de Waterway
+          dam: Dam
+          derelict_canal: Hi Canal
           ditch: SÃ©quia
+          dock: No obstant aixÃ²,
+          drain: De drenatge
+          lock: Pany
+          lock_gate: Porta de panys
+          mineral_spring: Mineral primavera
           mooring: Amarradors
           rapids: RÃ pids
           river: Riu
+          riverbank: Riverbank
+          stream: Stream
           wadi: Torrent
           water_point: Punt d'aigua
           waterfall: Cascada
+          weir: Weir
   javascripts: 
     map: 
       base: 
@@ -771,25 +893,43 @@ ca:
     site: 
       edit_disabled_tooltip: Augmenteu el zoom per modificar el mapa
       edit_tooltip: Modifica el mapa
+      edit_zoom_alert: S'ha ampliar editar el mapa
+      history_disabled_tooltip: Amplia per visualitzar les modificacions d'aquesta Ã rea
       history_tooltip: Mostra les modificacions d'aquesta Ã rea
+      history_zoom_alert: VostÃ¨ ha amplia per visualitzar les modificacions per a aquesta Ã rea
   layouts: 
+    community_blogs: Blocs de comunitat
+    community_blogs_title: Blogs dels membres de la comunitat OpenStreetMap
+    copyright: Drets d'autor i llicÃ¨ncia
     documentation: DocumentaciÃ³
+    documentation_title: DocumentaciÃ³ del projecte
+    donate: Suport OpenStreetMap % {enllaÃ§} el fons de rampa de maquinari.
     donate_link_text: donatius
     edit: ModificaciÃ³
+    edit_with: Edita amb % {editor}
     export: Exporta
     export_tooltip: Exporta les dades del mapa
     foundation: FundaciÃ³
+    foundation_title: La FundaciÃ³ OpenStreetMap
     gps_traces: Traces de GPS
     gps_traces_tooltip: Gestiona registres GPS
     help: Ajuda
     help_centre: Centre d'ajuda
+    help_title: Lloc d'ajuda per al projecte
     history: Historial
     home: Inici
     home_tooltip: VÃ©s a la posiciÃ³ inicial
     inbox: safata d'entrada (% {count})
+    inbox_tooltip: 
+      other: one no llegits = el seu inbox contÃ© 1 message
+      zero: el seu inbox contÃ© cap messages
     intro_1: L'OpenStreetMap Ã©s un mapa editable i lliure de tot el mÃ³n. EstÃ  fet per gent com vÃ³s.
     intro_2: OpenStreetMap us permet veure, editar i utilitzar informaciÃ³ geogrÃ fica comunitÃ ria de qualsevol lloc del planeta
+    intro_3: OpenStreetMap hosting Ã©s amable amb el suport de % {ucl}, % {ic} i % {bytemark}. Altres partidaris del projecte s'enumeren en el % {socis}.
+    intro_3_ic: Imperial College de Londres
     intro_3_partners: wiki
+    license: 
+      title: OpenStreetMap dades es concedeix una llicÃ¨ncia sota la llicÃ¨ncia Creative Commons Reconeixement-Compartir Igual 2.0 genÃ¨rica
     log_in: inicia una sessiÃ³
     log_in_tooltip: Inicia una sessiÃ³ amb un compte existent
     logo: 
@@ -799,19 +939,30 @@ ca:
     make_a_donation: 
       text: Feu una donaciÃ³
       title: Ajuda OpenStreetMap amb una donaciÃ³ exonÃ²mica
+    osm_offline: La base de dades OpenStreetMap estÃ  fora de lÃ­nia, mentre que les actuacions de manteniment essencials de base de dades es porta a terme.
+    osm_read_only: La base de dades OpenStreetMap actualment Ã©s en el mode read-only mentre que les actuacions de manteniment essencials de base de dades es porta a terme.
     sign_up: registre
     sign_up_tooltip: Crea un usuari per editar
+    sotm2011: Vine a la conferÃ¨ncia de OpenStreetMap de 2011, L'estat del mapa, 9-11 de setembre a Denver!
+    tag_line: El mapa del mÃ³n de Wiki lliure
     user_diaries: DIaris de usuari
     user_diaries_tooltip: Veure els diaris d'usuari
     view: Veure
     view_tooltip: Visualitza el mapa
     welcome_user: Benvingut/da, %{user_link}
     welcome_user_link_tooltip: La teva pÃ gina d'usuari
+    wiki: Wikia
+    wiki_title: Lloc web de wiki per al projecte
   license_page: 
     foreign: 
       english_link: l'original en anglÃ¨s
+      text: En cas de conflicte entre aquesta pÃ gina traduÃ¯da i % {english_original_link}, la pÃ gina en anglÃ¨s tindrÃ  prioritat
       title: Quant a la traducciÃ³
+    legal_babble: "<h2>Drets d'autor i llicÃ¨ncia</h2>\n<p>\n   OpenStreetMap Ã©s <i>obrir dades</i>, concedeix una llicÃ¨ncia sota el <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n   LlicÃ¨ncia Commons Attribution-ShareAlike 2.0 (CC-BY-SA).\n<p>\n<p>\n  VostÃ¨ Ã©s lliure de copiar, distribuir, transmetre i adaptar-se a nostres mapes\n  i les dades, sempre que li doni crÃ¨dit OpenStreetMap i la seva\n  col. laboradors. Si alterar o construir sobre els nostres mapes o dades, vostÃ¨\n  distribuir el resultat nomÃ©s sota la mateixa llicÃ¨ncia. La\n  Full <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">legal\n  codi explica els seus drets i responsabilitats.\n<p>\n\n<h3>Com a crÃ¨dit OpenStreetMap</h3>\n<p>\n  Si estÃ  utilitzant imatges de mapa de OpenStreetMap, us preguem que\n  el seu crÃ¨dit llegeix com a mÃ­nim \"Â© OpenStreetMap\n  col. laboradors, CC-BY-SA\". Si estÃ  utilitzant les dades de mapa nomÃ©s\n  demanem \"mapa dades Â© OpenStreetMap colÂ·laboradors\n  CC-BY-SA\".\n</p>\n<p>\n  Sempre que sigui possible, OpenStreetMap ha de ser un hipervincle a <a\n href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/\n  i CC-BY-SA a <a\n href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/. Si\n  estÃ  utilitzant un mitjÃ  on enllaÃ§os no sÃ³n possibles (per exemple, un\n  treball impresa), us suggerim que directa als seus lectors a\n  www.OpenStreetMap.org (potser per l'ampliaciÃ³\n  'OpenStreetMap' a aquesta adreÃ§a completa) i a\n  www.creativecommons.org.\n<p>\n\n<h3>Saber-ne mÃ©s</h3>\n<p>\n  Llegiu mÃ©s informaciÃ³ sobre com utilitzar les nostres dades a les <a\n href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal\n  PREGUNTES MÃS FREQÃENTS.\n<p>\n<p>\n  Col. laboradors OSM se li va recordar mai per afegir les dades des de qualsevol\n  drets d'autor fonts (p. ex. Google Maps o mapes impreses) sense\n  permÃ­s explÃ­cit dels titulars del copyright.\n</p>\n<p>\n  Encara que OpenStreetMap Ã©s oberts les dades, no podem oferir un\n  mapa de Free-of-charge API per a desenvolupadors de tercera festa.\n\n  Consulti la nostra <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">PolÃ­tica d'Ãºs de l'API</a>\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PolÃ­tica d'Ãºs de rajoles</a>\n  i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">polÃ­tica d'Ãºs de Nominatim</a>.\n</p>\n\n<h3>Nostres col. laboradors</h3>\n<p>\n  La nostra llicÃ¨ncia CC-BY-SA requereix que \"doni l'Original\n  Autor de crÃ¨dit raonable per al suport i mitjÃ  que ets\n  utilitzaciÃ³\". No tornis a solÂ·licitar individuals dibuixants de mapes de OSM un\n  de crÃ¨dit mÃ©s enllÃ  de que a \"OpenStreetMap\n  col. laboradors\", perÃ² on les dades des d'un mapatge Nacional\n  AgÃ¨ncia o l'altra font important ha estat inclÃ²s en\n  OpenStreetMap, pot ser raonable per crÃ¨dit per directament\n  reproduir el seu crÃ¨dit o per vincular-hi d'aquesta pÃ gina.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n<li><strong>AustrÃ lia</strong>: contÃ© dades suburbi basats\n    en les dades d'AustrÃ lia Oficina d'estadÃ­stiques.</li>\n<li><strong>Ãustria</strong>: contÃ© dades de\n    <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> sota\n    <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n<li><strong>CanadÃ </strong>: contÃ© dades de\n    GeoBase Â®, GeoGratis (Â© Departament de Natural\n    Recursos CanadÃ ), CanVec (Â© Departament de Natural\n    Recursos CanadÃ ) i StatCan (DivisiÃ³ de Geografia,\n    CanadÃ  de EstadÃ­stiques).</li>\n<li><strong>FranÃ§a</strong>: contÃ© dades d'origen de\n    DirecciÃ³ GÃ©nÃ©rale des ImpÃ´ts.</li>\n<li><strong>Nova Zelanda</strong>: contÃ© dades d'origen de\n    InformaciÃ³ Nova Zelanda de la terra. Corona de drets d'autor reservat.</li>\n<li><strong>PolÃ²nia</strong>: contÃ© dades de mapes de <a\n href=\"http://ump.waw.pl/\">UMP-pcPL. Drets d'autor\n    Col. laboradors de la UMP-pcPL.</a\n></li>\n<li><strong>Regne Unit</strong>: contÃ© cartografia\n    Enquesta dades Â© Crown copyright i base de dades correcte\n    2010.</li>\n</ul>\n\n<p>\n  InclusiÃ³ de dades en OpenStreetMap no implica que l'original\n  el proveÃ¯dor de dades recolza OpenStreetMap, proporciona cap garantia, o\n  accepta qualsevol responsabilitat.\n</p></a\n></a\n></a\n></a\n></a\n>"
     native: 
+      mapping_link: Inici d'assignaciÃ³
+      native_link: VersiÃ³ THIS_LANGUAGE_NAME_HERE
+      text: EstÃ s veient la versiÃ³ anglesa de la pÃ gina de drets d'autor. Es pot tornar posterior al % {native_link} d'aquesta pÃ gina o vostÃ¨ pot deixar de llegir sobre el copyright i % {mapping_link}.
       title: Sobre aquesta pÃ gina
   message: 
     delete: 
@@ -819,9 +970,16 @@ ca:
     inbox: 
       date: Data
       from: De
+      my_inbox: La meva safata d'entrada
+      no_messages_yet: No tens missatges encara. Per quÃ¨ no entrar en contacte amb alguns dels % {people_mapping_nearby_link}?
       outbox: sortida
+      people_mapping_nearby: Cartografia de prop la gent
       subject: Assumpte
       title: Safata d'entrada
+      you_have: Teniu missatges nous % {new_count} i els missatges antics % {old_count}
+    mark: 
+      as_read: Missatge marcat com a llegits
+      as_unread: Missatge marcat com a no llegit
     message_summary: 
       delete_button: Suprimeix
       read_button: Marca com a llegit
@@ -830,40 +988,65 @@ ca:
     new: 
       back_to_inbox: Tornar a la safata d'entrada
       body: Cos
+      limit_exceeded: He enviat un munt de missatges recentment. Si us plau, espereu una estona abans d'intentar d'enviar qualsevol mÃ©s.
       message_sent: S'ha enviat el missatge
       send_button: Envia
+      send_message_to: Enviar un missatge nou a % {name}
       subject: Assumpte
       title: Enviar missatge
     no_such_message: 
+      body: Trist que no hi ha cap missatge amb que id.
       heading: No existeix aquest missatge
       title: No existeix aquest missatge
+    no_such_user: 
+      body: Trist que no hi ha cap usuari amb aquest nom.
+      heading: Aquest usuari no
+      title: Aquest usuari no
     outbox: 
       date: Data
       inbox: Entrada
       my_inbox: El meu %{inbox_link}
+      no_sent_messages: Encara no has cap els missatges enviats. Per quÃ¨ no entrar en contacte amb alguns dels % {people_mapping_nearby_link}?
       outbox: sortida
+      people_mapping_nearby: Cartografia de prop la gent
       subject: Assumpte
       title: Sortida
       to: A
+      you_have_sent_messages: Tens % {count} enviar missatges
     read: 
+      back_to_inbox: Torna a la safata d'entrada
+      back_to_outbox: Torna a la safata de sortida
       date: Data
       from: De
+      reading_your_messages: Llegir els missatges
+      reading_your_sent_messages: Llegir els missatges enviats
       reply_button: Respon
       subject: Assumpte
       title: Llegir missatge
       to: Per a
       unread_button: Marca com a no llegit
+      wrong_user: Heu iniciat la sessiÃ³ com "% {user}", perÃ² el missatge que han demanat a llegir a no va ser enviat per o a que l'usuari. Si us plau connecti's com l'usuari correcte per a llegir-lo.
+    reply: 
+      wrong_user: Heu iniciat la sessiÃ³ com "% {user}", perÃ² el missatge que han demanat que respongui a no s'ha enviat a que l'usuari. Si us plau connecti's com l'usuari correcte per a respondre.
     sent_message_summary: 
       delete_button: Suprimeix
   notifier: 
     diary_comment_notification: 
+      footer: TambÃ© podeu llegir el comentari a les % {readurl} i es pot comentar als % {commenturl} o respondre a les % {replyurl}
+      header: "% {from_user} ha comentat en el seu recent entrada del diari OpenStreetMap amb el tema % {tema}:"
       hi: Hola %{to_user},
+      subject: "[OpenStreetMap] % (usuari), va comentar sobre la seva entrada del diari"
     email_confirm: 
       subject: "[OpenStreetMap] Confirmeu l'adreÃ§a de correu"
     email_confirm_html: 
+      click_the_link: Si aixÃ² Ã©s vostÃ¨, si us plau, feu clic a l'enllaÃ§ sota per confirmar el canvi.
       greeting: Hola,
+      hopefully_you: AlgÃº (esperem que vostÃ¨) com canviar la seva adreÃ§a d'e-mail % {server_url} % {new_address}.
     email_confirm_plain: 
+      click_the_link: Si aixÃ² Ã©s vostÃ¨, si us plau, feu clic a l'enllaÃ§ sota per confirmar el canvi.
       greeting: Hola,
+      hopefully_you_1: AlgÃº (esperem que vostÃ¨) li agradaria canviar la seva adreÃ§a d'e-mail a
+      hopefully_you_2: "% {server_url} % {new_address}."
     friend_notification: 
       befriend_them: TambÃ© el pots afegir com a amic a % {befriendurl}.
       had_added_you: "% {user} t'ha afegit com a amic a OpenStreetMap."
@@ -872,55 +1055,203 @@ ca:
     gpx_notification: 
       and_no_tags: i cap etiqueta.
       and_the_tags: "i les etiquetes segÃ¼ents:"
+      failure: 
+        failed_to_import: "no es pot importar. AquÃ­ estÃ  l'error:"
+        more_info_1: MÃ©s informaciÃ³ en relaciÃ³ a GPX d'importaciÃ³ fracassos i com evitar
+        more_info_2: "ells es pot trobar a:"
+        subject: "[OpenStreetMap] Error d'importaciÃ³ de GPX"
       greeting: Hola,
+      success: 
+        loaded_successfully: carregat amb % {trace_points} fora d'un punts possibles % {possible_points}.
+        subject: "[OpenStreetMap] L'Ã¨xit de GPX importaciÃ³"
+      with_description: amb la descripciÃ³
+      your_gpx_file: Sembla que el seu arxiu GPX
+    lost_password: 
+      subject: "[OpenStreetMap] Sol. licitud de reinicialitzaciÃ³ de contrasenya"
     lost_password_html: 
+      click_the_link: Si aixÃ² Ã©s vostÃ¨, si us plau, feu clic a l'enllaÃ§ de sota per restaurar la seva contrasenya.
       greeting: Hola,
+      hopefully_you: AlgÃº (possiblement vostÃ¨) ha demanat per a la contrasenya restaurar el compte de openstreetmap.org d'aquesta adreÃ§a de correu electrÃ²nic.
     lost_password_plain: 
+      click_the_link: Si aixÃ² Ã©s vostÃ¨, si us plau, feu clic a l'enllaÃ§ de sota per restaurar la seva contrasenya.
       greeting: Hola,
+      hopefully_you_1: AlgÃº (possiblement vostÃ¨) ha demanat per a la contrasenya restaurar en aixÃ²
+      hopefully_you_2: adreces d'e-mail openstreetmap.org compte.
     message_notification: 
       footer1: TambÃ© pots llegir el missatge a %{readurl}
       footer2: i el pots replicar a %{replyurl}
+      header: "% {from_user} ha enviat un missatge a travÃ©s de OpenStreetMap amb el tema % {tema}:"
       hi: Hola %{to_user},
     signup_confirm: 
       subject: "[OpenStreetMap] Confirmeu la vostra adreÃ§a electrÃ²nica"
     signup_confirm_html: 
+      ask_questions: Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a la nostra <a href="http://help.openstreetmap.org/">pregunta i resposta lloc</a>.
+      click_the_link: Si aixÃ² Ã©s vostÃ¨, Benvingut! Si us plau, feu clic a l'enllaÃ§ de sota per confirmar que compte i seguiu llegint per obtenir mÃ©s informaciÃ³ sobre OpenStreetMap
+      current_user: "Una llista d'usuaris actuals en categories, basades en on en el mÃ³n que sÃ³n, estÃ  disponible des de <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region\">Categoria: Users_by_geographical_region</a>."
+      get_reading: Obtenir de lectura sobre OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">al wiki</a>, posarÃ  al dia amb les Ãºltimes notÃ­cies via <a href="http://blog.openstreetmap.org/">OpenStreetMap bloc</a> o <a href="http://twitter.com/openstreetmap">Twitter</a>o navegar a travÃ©s de OpenStreetMap fundador Steve Costa <a href="http://www.opengeodata.org/">OpenGeoData blog</a> per a la breu histÃ²ria del projecte, que disposa de <a href="http://www.opengeodata.org/?cat=13">podcasts d'escoltar</a> !
+      greeting: Hola, quÃ¨ tal?
+      hopefully_you: AlgÃº (esperem que vostÃ¨) would com crear un compte per a les
+      introductory_video: VostÃ¨ pot veure un % {introductory_video_link}.
+      more_videos: Hi ha % {more_videos_link}.
       more_videos_here: mÃ©s de vÃ­deos aquÃ­
+      user_wiki_page: "Es recomana que es crea una pÃ gina de wiki de l'usuari, que inclou Etiquetes de categoria assenyalant on estÃ s, com <a href=\"http://wiki.openstreetmap.org/wiki/Category:Users_in_London\">[[Categoria: Users_in_London]]</a>."
+      video_to_openstreetmap: vÃ­deo d'introducciÃ³ a OpenStreetMap
+      wiki_signup: VostÃ¨ tambÃ© pot <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">inscriure s a la wiki OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a les nostres preguntes i lloc de resposta:"
+      blog_and_twitter: "PosarÃ  al dia amb les Ãºltimes notÃ­cies via el blog de OpenStreetMap o Twitter:"
+      click_the_link_1: Si aixÃ² Ã©s vostÃ¨, Benvingut! Si us plau, feu clic a l'enllaÃ§ sota per confirmar el seu
+      click_the_link_2: compte i seguiu llegint per obtenir mÃ©s informaciÃ³ sobre OpenStreetMap.
+      current_user_1: Una llista d'usuaris actuals en categories, basades en on en el mÃ³n
+      current_user_2: "ells sÃ³n, estÃ  disponible des de:"
       greeting: Hola, quÃ¨ tal?
+      hopefully_you: AlgÃº (esperem que vostÃ¨) would com crear un compte per a les
+      introductory_video: "Podeu veure un vÃ­deo d'introducciÃ³ a OpenStreetMap aquÃ­:"
       more_videos: "Hi ha mÃ©s videos aquÃ­:"
+      opengeodata: "OpenGeoData.org Ã©s blog fundador OpenStreetMap Steve Costa, i tÃ© podcasts tambÃ©:"
+      the_wiki: "Obtenir llegint sobre OpenStreetMap al wiki:"
+      user_wiki_1: Es recomana que es crea una pÃ gina de wiki de l'usuari, que inclou
+      user_wiki_2: "Categoria Etiquetes assenyalant on es troba, com [[Categoria: Users_in_London]]."
+      wiki_signup: "VostÃ¨ tambÃ© pot inscriure s a la wiki OpenStreetMap a:"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: llegir el seu privats traces GPS.
+      allow_read_prefs: llegir les seves preferÃ¨ncies d'usuari.
+      allow_to: "Permet la solÂ·licitud de client per:"
+      allow_write_api: modificar el mapa.
+      allow_write_diary: crear entrades de diari, comentaris i fer amics.
+      allow_write_gpx: carregar traces GPS.
+      allow_write_prefs: modificar les seves preferÃ¨ncies d'usuari.
+      request_access: L'aplicaciÃ³ % {app_name} solÂ·licita accÃ©s al seu compte, % (usuari). Si us plau marqui si vostÃ¨ would com l'aplicaciÃ³ tÃ© les segÃ¼ents capacitats. VostÃ¨ pot triar tantes o tan poc com vulgui.
+    revoke: 
+      flash: He estat revocat el sÃ­mbol % {aplicaciÃ³}
   oauth_clients: 
+    create: 
+      flash: Registrar la informaciÃ³ amb Ã¨xit
+    destroy: 
+      flash: DestruÃ¯t la matrÃ­cula d'aplicaciÃ³ de client
     edit: 
       submit: ModificaciÃ³
+      title: Editar la seva aplicaciÃ³
     form: 
+      allow_read_gpx: llegir les seves traces GPS privats.
+      allow_read_prefs: llegir les seves preferÃ¨ncies d'usuari.
+      allow_write_api: modificar el mapa.
+      allow_write_diary: crear entrades de diari, comentaris i fer amics.
+      allow_write_gpx: carregar traces GPS.
+      allow_write_prefs: modificar les seves preferÃ¨ncies d'usuari.
+      callback_url: Resposta d'URL
       name: Nom
+      requests: "SolÂ·licitar els permisos segÃ¼ents des de l'usuari:"
       required: Requerit
+      support_url: URL de suport
+      url: Principal aplicaciÃ³ URL
+    index: 
+      application: Nom d'aplicaciÃ³
+      issued_at: EmÃ¨s A
+      list_tokens: "Les fitxes segÃ¼ents s'han emÃ¨s per aplicacions en el seu nom:"
+      my_apps: Meves aplicacions de Client
+      my_tokens: Meves aplicacions autoritzada
+      no_apps: TÃ© una aplicaciÃ³ que li agradaria inscriure's per al seu Ãºs amb nosaltres utilitzant l'estÃ ndard % {oauth}? Heu de registrar la seva aplicaciÃ³ web abans que pugui fer peticions OAuth a aquest servei.
+      register_new: Registrar-se l'aplicaciÃ³
+      registered_apps: "VostÃ¨ tÃ© les segÃ¼ents aplicacions client registrats:"
+      revoke: Revocar!
+      title: Les meves dades OAuth
+    new: 
+      submit: Registrar-se
+      title: Registrar-se una nova aplicaciÃ³
+    not_found: 
+      sorry: Ho sento, que no s'ha pogut trobar el que % {tipus}.
+    show: 
+      access_url: "AccÃ©s Fitxa URL:"
+      allow_read_gpx: llegir les seves traces GPS privats.
+      allow_read_prefs: llegir les seves preferÃ¨ncies d'usuari.
+      allow_write_api: modificar el mapa.
+      allow_write_diary: crear entrades de diari, comentaris i fer amics.
+      allow_write_gpx: carregar traces GPS.
+      allow_write_prefs: modificar les seves preferÃ¨ncies d'usuari.
+      authorize_url: "Autoritzar URL:"
+      edit: Editar els detalls
+      key: "Clau de consum:"
+      requests: "SolÂ·licitar els permisos segÃ¼ents des de l'usuari:"
+      secret: "Secret de consum:"
+      support_notice: Donem suport a HMAC-SHA1 (recomanat), aixÃ­ com text sense format en el mode de ssl.
+      title: OAuth detalls % {app_name}
+      url: "Sol. licitud Token URL:"
+    update: 
+      flash: La informaciÃ³ de client ha actualitzat correctament
   site: 
     edit: 
+      anon_edits_link_text: Esbrinar per quÃ¨ aquest Ã©s el cas.
+      flash_player_required: VostÃ¨ necessita un intÃ¨rpret de flaix per utilitzar Potlatch, l'editor de OpenStreetMap Flash. VostÃ¨ pot <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Descarregar Flash Player des de Adobe.com</a>. TambÃ© hi ha <a href="http://wiki.openstreetmap.org/wiki/Editing">diverses altres opcions</a> per editar-lo OpenStreetMap.
+      no_iframe_support: El seu navegador no suporta iframes HTML, que sÃ³n necessÃ ries per a aquest tret.
+      not_public: No ha posat les modificacions per ser pÃºblic.
+      not_public_description: Ja no es pot editar el mapa a menys que vostÃ¨ fer-ho. Pot configurar les modificacions com a pÃºblic del seu % {user_page}.
+      potlatch2_not_configured: No s'ha configurat Potlatch 2 - si us plau, veure http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 per a mÃ©s informaciÃ³
+      potlatch2_unsaved_changes: VostÃ¨ tÃ© canvis no desats. (D'estalviar en Potlatch 2, hauria de fer clic Salvar.)
+      potlatch_unsaved_changes: VostÃ¨ tÃ© canvis no desats. (Per salvar a Potlatch, vostÃ¨ ha desseleccionar la manera actual o punt, si d'ediciÃ³ en mode en viu, o clic Salvar si vostÃ¨ tÃ© un salvar botÃ³.)
       user_page_link: pÃ gina d'usuari
     index: 
+      js_1: Tampoc estÃ  utilitzant un navegador que no suporta JavaScript o tÃ© deshabilitat JavaScript.
+      js_2: OpenStreetMap utilitza JavaScript per a la seva mapa slippy.
+      js_3: Pot voler provar el <a href="http://tah.openstreetmap.org/Browse/">navegador mosaic estÃ tica de Tiles@Home</a> si Ã©s incapaÃ§ d'activar JavaScript.
       license: 
         license_name: Creative Commons Reconeixement-Compartir Igual 2.0
+        notice: Llicenciat sota la llicÃ¨ncia % {license_name} per % {project_name} i els seus contribuents.
         project_name: projecte OpenStreetMap
       permalink: EnllaÃ§ permanent
+      remote_failed: EdiciÃ³ ha fallat - assegureu-vos que JOSM o Merkaartor es carrega i l'opciÃ³ de comandament a distÃ ncia Ã©s habilitat
       shortlink: EnllaÃ§ curt
     key: 
+      map_key: Mapa clau
+      map_key_tooltip: Clau per al mapa
       table: 
         entry: 
+          admin: LÃ­mits administratius
+          allotments: Horts
           apron: 
-            1: terminal
+            - Davantal de l'Aeroport
+            - terminal
+          bridge: Embolcall negre = bridge
+          bridleway: Bridleway
+          brownfield: Lloc Brownfield
+          building: Edifici significatiu
+          byway: Byway
+          cable: 
+            - Cable car
+            - telecadira
           cemetery: Cementiri
           centre: Centre esportiu
+          commercial: Zona comercial
+          common: 
+            - ComÃº
+            - Prat
+          construction: Carreteres en construcciÃ³
+          cycleway: Cycleway
+          destination: AccÃ©s de destinaciÃ³
           farm: Granja
+          footway: Footway
           forest: Bosc
           golf: Camp de golf
+          heathland: Bruguerar
           industrial: Zona industrial
           lake: 
             - Llac
+            - Embassament
           military: Ãrea militar
+          motorway: L'autopista
+          park: Parc
+          permissive: Permissiva accÃ©s
+          pitch: Camp d'esports
+          primary: Carretera principal
           private: AccÃ©s privat
           rail: Ferrocarril
           reserve: Reserva natural
           resident: Zona residencial
+          retail: Zona de venda al detall
+          runway: 
+            - Pista d'Aeroport
+            - TAXIWAY
           school: 
             - Escola
             - Universitat
@@ -928,13 +1259,24 @@ ca:
           station: EstaciÃ³ de tren
           subway: Metro
           summit: 
-            1: pic
+            - Cimera
+            - pic
+          tourist: AtracciÃ³ turÃ­stica
           track: Pista
+          tram: 
+            - Tren lleuger
+            - tramvia
+          trunk: Autovia de
+          tunnel: Carcassa de guions = tÃºnel
+          unclassified: Sense classificar road
+          unsurfaced: Unsurfaced road
           wood: Fusta
     search: 
       search: Cerca
+      search_help: "exemples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' o 'oficines de CORREOS a prop LÃ¼nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>mÃ©s exemples...</a>"
       submit_text: VÃ©s-hi
       where_am_i: On sÃ³c?
+      where_am_i_title: Descriure la localitzaciÃ³ actual que utilitzen el motor de cerca
     sidebar: 
       close: Tanca
       search_results: Resultats de la cerca
@@ -943,7 +1285,10 @@ ca:
       friendly: "%e %B %Y a les %H.%M"
   trace: 
     create: 
+      trace_uploaded: El seu arxiu GPX s'ha pujat i estÃ  pendent d'inserciÃ³ a la base de dades. AixÃ² passarÃ  en general dins d'una mitja hora, i s'enviarÃ  un correu electrÃ²nic a vostÃ¨ en finalitzar.
       upload_trace: Pujar traÃ§a de GPS
+    delete: 
+      scheduled_for_deletion: Water programat per a la supressiÃ³
     edit: 
       description: "DescripciÃ³:"
       download: descÃ rrega
@@ -963,11 +1308,20 @@ ca:
       visibility_help: QuÃ¨ vol dir aixÃ²?
     list: 
       public_traces: Traces GPS pÃºbliques
+      public_traces_from: PÃºblics traces GPS de % (usuari)
       tagged_with: " etiquetat amb %{tags}"
       your_traces: Les teves traces GPS
+    make_public: 
+      made_public: Water fet pÃºblic
     no_such_user: 
+      body: Ho sentim, no hi ha cap usuari amb el nom % (usuari). Si us plau, comproveu l'ortografia, o potser l'enllaÃ§ que es fa clic estÃ  malament.
       heading: No existeix l'usuari %{user}
       title: No existeix l`usuari
+    offline: 
+      heading: GPX emmagatzematge fora de lÃ­nia
+      message: Al GPX d'emmagatzematge i carregar sistema d'arxiu no estÃ  disponible actualment.
+    offline_warning: 
+      message: El sistema de cÃ rrega de fitxers GPX no estÃ  disponible actualment
     trace: 
       ago: fa %{time_in_words_ago}
       by: en
@@ -985,22 +1339,24 @@ ca:
       trackable: RASTREABLE
       view_map: Visualitza el mapa
     trace_form: 
-      description: DescripciÃ³
+      description: "DescripciÃ³:"
       help: Ajuda
-      tags: Etiquetes
+      tags: "Etiquetes:"
       tags_help: separat per comas
       upload_button: Pujar
-      upload_gpx: Carregar arxiu GPX
-      visibility: Visibilitat
+      upload_gpx: "Carregui l'arxiu GPX:"
+      visibility: "Visibilitat:"
       visibility_help: quÃ¨ significa aixÃ²?
     trace_header: 
       see_all_traces: Veure totes les traces
       see_your_traces: Veure totes les teves traces
+      traces_waiting: VostÃ¨ tÃ© % {count} traces d'espera per a carregar. Si us plau consideri espera per a aquests per acabar abans de pujar mÃ©s, per tal de bloquejar la cua per a altres usuaris.
+      upload_trace: Carregar una traÃ§a
     trace_optionals: 
       tags: Etiquetes
     trace_paging_nav: 
       next: SegÃ¼ent Â»
-      previous: "Â« Previ"
+      previous: Â« Previ
       showing_page: Mostrant pÃ gina %{page}
     view: 
       delete_track: Elimina aquesta traÃ§a
@@ -1021,50 +1377,133 @@ ca:
       trace_not_found: No s'ha trobat la traÃ§a!
       uploaded: "Pujat el:"
       visibility: "Visibilitat:"
+    visibility: 
+      identifiable: Identifiable (mostrat en llista de traÃ§a i com a punts d'identificaciÃ³, ordenades amb timestamps)
+      private: Privat (nomÃ©s compartit com anÃ²nims, desordenada punts)
+      public: PÃºblic (mostrat en llista de traÃ§a i com anÃ²nims, desordenada punts)
+      trackable: Seguiments (nomÃ©s compartit com punts anÃ²nims, ordenades amb timestamps)
   user: 
     account: 
       contributor terms: 
+        agreed: Que han accedit a les noves condicions de col. laborador.
+        agreed_with_pd: VostÃ¨ tambÃ© s'han declarat que consideri les modificacions d'estar en el domini pÃºblic.
+        heading: "Col. laborador termes:"
         link text: quÃ¨ Ã©s aixÃ²?
+        not yet agreed: Que han no encara s'ha accedit a les noves condicions de col. laborador.
+        review link text: Si us plau, seguiu aquest enllaÃ§ a la seva conveniÃ¨ncia de revisar i acceptar els termes de col. laborador nou.
       current email address: "AdreÃ§a de correu electrÃ²nic actual:"
+      delete image: Treure la imatge actual
       email never displayed publicly: (no es mostrarÃ  mai en pÃºblic)
+      flash update success: InformaciÃ³ de l'usuari ha actualitzat correctament.
+      flash update success confirm needed: InformaciÃ³ de l'usuari ha actualitzat correctament. Comprovi el seu e-mail per a una nota per confirmar la seva adreÃ§a de correu electrÃ²nic nou.
+      home location: "LocalitzaciÃ³ del inici:"
       image: "Imatge:"
+      image size hint: (PlaÃ§a imatges com a mÃ­nim 100 x 100 treball millor)
+      keep image: Mantenir la imatge actual
       latitude: "Latitud:"
       longitude: "Longitud:"
+      make edits public button: Fer totes les meves modificacions pÃºblic
       my settings: PreferÃ¨ncies
+      new email address: "Nova adreÃ§a d'E-mail:"
       new image: Afegeix una imatge
+      no home location: No heu especificat la ubicaciÃ³ d'origen.
       openid: 
+        link: http://wiki.OpenStreetMap.org/wiki/OpenID
         link text: quÃ¨ Ã©s aixÃ²?
+        openid: "OpenID:"
       preferred editor: "Editor preferit:"
       preferred languages: "LlengÃ¼es preferents:"
       profile description: "DescripciÃ³ del perfil:"
       public editing: 
+        disabled: Impossibilitat i no es pot editar les dades, totes les anteriors edicions sÃ³n anÃ²nims.
+        disabled link text: per quÃ¨ no es pot editar?
+        enabled: PermÃ¨s. No anÃ²nims i editar les dades.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: quÃ¨ Ã©s aixÃ²?
         heading: "EdiciÃ³ pÃºblica:"
       public editing note: 
         heading: EdiciÃ³ pÃºblica
+        text: Actualment les vostres modificacions estan anÃ²nims i la gent no pot enviar missatges o veure la vostra ubicaciÃ³. Per mostrar el que editat i permetre que la gent en contacte amb vostÃ¨ a travÃ©s del web, feu clic al botÃ³ de sota. <b>Des de canvi de l'API 0.6, nomÃ©s els usuaris pÃºblics pot editar les dades de mapa</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">esbrinar per quÃ¨</a>).<ul><li>Adreces de correu electrÃ²nic no serÃ  revelada per convertir-se en pÃºblic.</li><li>Aquesta acciÃ³ no es pot fer la inversiÃ³ i els nous usuaris ara sÃ³n pÃºblics per defecte.</li></ul>
+      replace image: Substituir la imatge actual
       return to profile: Torna al perfil
       save changes button: Desa els canvis
       title: Edita el compte
+      update home location on click: LocalitzaciÃ³ de casa d'actualitzaciÃ³ quan faig clic al mapa?
     confirm: 
+      already active: Aquest compte ja ha estat confirmat.
+      before you start: Sabem que vostÃ¨ estÃ  probablement en una pressa per comenÃ§ar a mapatge, perÃ² abans de fer que t'agradaria omplir una mica mÃ©s informaciÃ³ sobre si mateix en el formulari a continuaciÃ³.
       button: Confirma
+      heading: Confirmar un compte d'usuari
+      press confirm button: Premeu el botÃ³ de confirmar sota per activar el seu compte.
+      reconfirm: Si ha estat una estona ja que s'inscrivia podria necessitar <a href="%{reconfirm}">enviar-se un nou correu electrÃ²nic de confirmaciÃ³</a>.
+      success: Confirmar el seu compte, grÃ cies per registrar-te!
+      unknown token: Aquesta mostra no sembla que hi ha.
     confirm_email: 
       button: Confirma
+      failure: Una adreÃ§a de correu electrÃ²nic ja ha estat confirmat amb aquesta fitxa.
+      heading: Confirmar un canvi d'adreÃ§a d'e-mail
+      press confirm button: Premeu el botÃ³ de confirmar sota per confirmar la seva adreÃ§a de correu electrÃ²nic nou.
+      success: Confirma l'adreÃ§a electrÃ²nica, grÃ cies per registrar-te!
+    confirm_resend: 
+      failure: L'usuari % {name} no s'ha trobat.
+      success: Hem enviat un bitllet de confirmaciÃ³ nou per % {email} i tan aviat com vostÃ¨ confirmar el seu compte es podrÃ  aconseguir d'assignaciÃ³.<br><br>Si utilitzeu un sistema que envia les solÂ·licituds de confirmaciÃ³ llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaÃ§os de respondre a qualsevol solÂ·licituds de confirmaciÃ³.
+    filter: 
+      not_an_administrator: Cal que sigueu administrador per dur a terme aquesta acciÃ³.
     go_public: 
       flash success: Ara totes les teves edicions sÃ³n pÃºbliques i ja estÃ s autoritzat per a editar
     list: 
+      confirm: Confirmar usuaris seleccionats
+      empty: No hi ha usuaris que coincideixin s'ha trobat
       heading: Usuaris
+      hide: Amaga els usuaris seleccionats
+      showing: 
+        one: "mostrant pÃ gina % {page} (% {first_item} de % {elements}) "
+        other: Mostrant pÃ gina % {page} ( %{first_item}-% {last_item} de % {elements})
+      summary: "% {name} creat a partir de % {direcciÃ³nIP} el % {data}"
+      summary_no_ip: "% {name} creat el % {data}"
       title: Usuaris
     login: 
+      account not active: Ho sentim, el teu compte encara no estÃ  actiu.<br>Si us plau utilitzi l'enllaÃ§ a l'e-mail de confirmaciÃ³ de compte d'activar el seu compte, o <a href="%{reconfirm}">demanar un nou correu electrÃ²nic de confirmaciÃ³</a>.
+      account suspended: Ho sentim, el seu compte ha estat suspÃ¨s a causa de l'activitat sospitosa.<br>Si us plau contacti's amb % {webmaster} si vostÃ¨ desitja discutir aixÃ².
+      auth failure: Ho sentim, no pot registrar en amb els detalls.
+      create account minute: Crear un compte. NomÃ©s es triga un minut.
       email or username: "AdreÃ§a de correu o usuari:"
       heading: AccÃ©s
       login_button: AccÃ©s
       lost password link: Heu perdut la contrasenya?
+      new to osm: Nou a OpenStreetMap?
+      notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Esbrinar mÃ©s sobre el canvi de llicÃ¨ncia futura de OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">traduccions</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">discussiÃ³</a>)
+      openid: "% {logo} OpenID:"
+      openid invalid: Ho sentim, el seu OpenID sembla ser no vÃ lida
+      openid missing provider: Ho sento, podria no en contacte amb el seu proveÃ¯dor d'OpenID
+      openid_logo_alt: Connecti's amb un OpenID
+      openid_providers: 
+        aol: 
+          alt: Connecti's amb un AOL OpenID
+          title: Connecti's amb AOL
+        google: 
+          alt: Connecti's amb un OpenID de Google
+          title: Connecti's amb Google
+        myopenid: 
+          alt: Connecti's amb un myOpenID OpenID
+          title: Connecti's amb myOpenID
+        openid: 
+          alt: Connecti's amb un URL d'OpenID
+          title: Connecti's amb OpenID
+        wordpress: 
+          alt: Connecti's amb un Wordpress OpenID
+          title: Connecti's amb Wordpress
+        yahoo: 
+          alt: Connecti's amb un OpenID Yahoo
+          title: Connecti's amb Yahoo
       password: "Contrasenya:"
       register now: Registreu-vos-hi ara
       remember: "Recorda'm:"
       title: AccÃ©s
+      to make changes: Per fer canvis a les dades de OpenStreetMap, ha de tenir un compte.
       webmaster: webmestre
+      with openid: "Alternativament, si us plau utilitzi el seu OpenID per connectar-se:"
+      with username: "Ja teniu un compte de OpenStreetMap? Si us plau connecti's amb el seu nom d'usuari i contrasenya:"
     logout: 
       heading: Finalitza la sessiÃ³ d'OpenStreetMap
       logout_button: Finalitza la sessiÃ³
@@ -1072,41 +1511,85 @@ ca:
     lost_password: 
       email address: "AdreÃ§a de correu electrÃ²nic:"
       heading: Heu oblidat la contrasenya?
+      help_text: IntroduÃ¯u l'adreÃ§a de correu electrÃ²nic que va utilitzar per registrar-se, us enviarem un enllaÃ§ a ella que pot utilitzar per restablir la contrasenya.
       new password button: Restableix la contrasenya
+      notice email cannot find: Podria no trobar que l'e-mail adreÃ§ar, ho sento.
+      notice email on way: Trist que perdia:-(perÃ² un correu electrÃ²nic estÃ  en camÃ­ aixÃ­ pot restaurar aixÃ² aviat.
       title: contrasenya perduda
     make_friend: 
+      already_a_friend: Que ja sÃ³n amics amb % {name}.
+      failed: Ho sentim, no afegir % {name} com un amic.
       success: "%{name} ara Ã©s el vostre amic."
     new: 
+      confirm email address: "Confirmar adreÃ§a de correu electrÃ²nic:"
       confirm password: "Confirmeu la contrasenya:"
+      contact_webmaster: Si us plau, contactar amb el <a href="mailto:webmaster@openstreetmap.org">webmaster</a> per organitzar un compte de ser creat - anem a provar i tractar amb la sol. licitud tan aviat com sigui possible.
       continue: Continua
       display name: "Nom en pantalla:"
+      display name description: El vostre usuari mostrat pÃºblicament. AixÃ² pot canviar mÃ©s tard en les preferÃ¨ncies.
       email address: "AdreÃ§a de correu:"
+      fill_form: Ompli el formulari i us enviarem un correu electrÃ²nic rÃ pid per activar el seu compte.
+      flash create success message: GrÃ cies per registrar-se. Hem enviat un bitllet de confirmaciÃ³ a % {email} i tan aviat com vostÃ¨ confirmar el seu compte es podrÃ  aconseguir d'assignaciÃ³.<br><br>Si utilitzeu un sistema que envia les solÂ·licituds de confirmaciÃ³ llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaÃ§os de respondre a qualsevol solÂ·licituds de confirmaciÃ³.
       heading: Crea un compte d'usuari
+      license_agreement: Quan vostÃ¨ confirmar el seu compte necessita estar d'acord amb els <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">termes de col. laborador</a>.
+      no_auto_account_create: Per desgrÃ cia no som actualment capaÃ§os de crear un compte per a vostÃ¨ automÃ ticament.
+      not displayed publicly: No mostraran pÃºblicament (vegeu la <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">polÃ­tica de privacitat</a>)
+      openid: "% {logo} OpenID:"
+      openid association: "<p>El seu OpenID encara no estÃ  associat a un compte de OpenStreetMap.</p>\n<ul>\n<li>Si sou nous a OpenStreetMap, si us plau, crear un compte nou utilitzant el formulari a continuaciÃ³.</li>\n<li>\n    Si ja teniu un compte, es pot connectar al seu compte\n    utilitzant el seu nom d'usuari i contrasenya i llavors associat el compte\n    amb el seu OpenID en les seves escenes d'usuari.\n</li>\n</ul>"
+      openid no password: Amb OpenID una contrasenya no Ã©s necessÃ ria, perÃ² algunes eines extres o servidor pot encara necessita un.
       password: "Contrasenya:"
+      terms accepted: GrÃ cies per a l'acceptaciÃ³ de les condicions de col. laborador nou!
+      terms declined: Lamentem que vostÃ¨ ha decidit no acceptar els nous termes de col. laborador. Per a mÃ©s informaciÃ³, si us plau vegi <a href="%{url}">aquesta pÃ gina de wiki</a>.
+      title: Crear compte
+      use openid: Alternativament, utilitzi % {logo} OpenID per connectar-se
     no_such_user: 
+      body: Ho sentim, no hi ha cap usuari amb el nom % (usuari). Si us plau, comproveu l'ortografia, o potser l'enllaÃ§ que es fa clic estÃ  malament.
+      heading: No existeix l'usuari % (usuari)
       title: No existeix aquest usuari
     popup: 
       friend: Amic
+      nearby mapper: L'Assignador proper
       your location: La teva situaciÃ³
+    remove_friend: 
+      not_a_friend: "% {name} no Ã©s un dels seus amics."
+      success: "% {name} s'ha suprimit dels teus amics."
     reset_password: 
       confirm password: "Confirmeu la contrasenya:"
       flash changed: S'ha canviat la contrasenya.
+      flash token bad: No ha trobat que comproven token, l'URL potser?
       heading: Restablir la contrasenya per %{user}
       password: "Contrasenya:"
       reset: Restableix la contrasenya
       title: Restablir la contrasenya
+    set_home: 
+      flash success: LocalitzaciÃ³ de casa desat correctament
+    suspended: 
+      body: "<p>\n  Ho sentim, el seu compte ha estat automÃ ticament suspÃ¨s a causa de\n  l'activitat sospitosa.\n</p>\n<p>\n  Aquesta decisiÃ³ serÃ  revisat per un administrador en breu, o\n  es pot contactar amb el % {webmaster} si vostÃ¨ desitja discutir aixÃ².\n</p>"
+      heading: Compte suspÃ¨s
+      title: Compte suspÃ¨s
+      webmaster: per a administradors web
     terms: 
       agree: D'acord
+      consider_pd: A mÃ©s de l'acord de dalt, que considero el meu contribucions d'estar en el domini pÃºblic
       consider_pd_why: quÃ¨ Ã©s aixÃ²?
       decline: Declinar
+      guidance: "InformaciÃ³ per ajudar a entendre aquestes condicions: un <a href=\"%{summary}\">resum llegible humÃ </a> i algunes <a href=\"%{translations}\">traduccions informals</a>"
+      heading: Termes de col. laborador
       legale_names: 
         france: FranÃ§a
         italy: ItÃ lia
         rest_of_world: Resta del mÃ³n
+      legale_select: "Si us plau seleccioni el seu paÃ­s de residÃ¨ncia:"
+      read and accept: Si us plau llegeixi l'acord de sota i premeu el botÃ³ d'acord per confirmar que vostÃ¨ accepta els termes d'aquest acord per les seves contribucions existents i futures.
+      title: Termes de col. laborador
+      you need to accept or decline: Si us plau, llegiu i llavors acceptar o disminuciÃ³ de les condicions de col. laborador nou per continuar.
     view: 
       activate_user: activa aquest usuari
       add as friend: afegir com a amic
       ago: (fa %{time_in_words_ago})
+      block_history: veure blocs va rebre
+      blocks by me: blocs per mi
+      blocks on me: blocs en mi
       confirm: Confirmeu
       confirm_user: confirma aquest usuari
       create_block: bloca aquest usuari
@@ -1118,44 +1601,128 @@ ca:
       edits: modificacions
       email address: "AdreÃ§a de correu:"
       hide_user: amagar aquest usuari
+      if set location: Si establiu la vostra ubicaciÃ³, un mapa forÃ§a i matÃ¨ria es mostrarÃ  aquÃ­. Podeu configurar la vostra ubicaciÃ³ de casa a la seva pÃ gina % {settings_link}.
       km away: "%{count}km de distÃ ncia"
+      latest edit: "Ãltimes editar % {fa}:"
       m away: "%{count}m de distÃ ncia"
       mapper since: "Mapejant des de:"
+      moderator_history: veure blocs donats
       my diary: el meu diari
       my edits: les meves edicions
       my settings: les meves preferÃ¨ncies
       my traces: les meves traces
       nearby users: Altres usuaris propers
+      new diary entry: Nova entrada del diari
+      no friends: No has afegit cap amics encara.
+      no nearby users: Hi ha altres usuaris que admetre a Cartografia prop encara.
       oauth settings: configuraciÃ³ OAuth
+      remove as friend: Elimina com a amic
       role: 
         administrator: Aquest usuari Ã©s administrador
+        grant: 
+          administrator: Concedir accÃ©s d'administrador
+          moderator: Concedir accÃ©s de moderador
         moderator: Aquest usuari Ã©s moderador
+        revoke: 
+          administrator: Revocar l'accÃ©s d'administrador
+          moderator: Revocar l'accÃ©s de moderador
       send message: enviar missatge
       settings_link_text: preferÃ¨ncies
+      spam score: "Spam PuntuaciÃ³:"
       status: "Estat:"
       traces: traces
+      unhide_user: Inamagui's d'aquest usuari
       user location: UbicaciÃ³ de l'usuari
       your friends: Els vostres amics
   user_block: 
+    blocks_by: 
+      empty: "% {name} no ha fet cap blocs encara."
+      heading: Llista de blocs % {name}
+      title: Blocs % {name}
+    blocks_on: 
+      empty: "% {name} no ha estat bloquejat encara."
+      heading: Llista de quadres a % {name}
+      title: Blocs en % {name}
+    create: 
+      flash: Crear un bloc a l'usuari % {name}.
+      try_contacting: Si us plau, intentar contactar-se amb l'usuari abans de bloqueig d'ells i donar-los un termini raonable per respondre.
+      try_waiting: Si us plau tracti de donar l'usuari d'un termini raonable per respondre abans de bloqueig d'ells.
+    edit: 
+      back: Veure tots els blocs
+      heading: Bloc d'ediciÃ³ en % {name}
+      needs_view: L'usuari necessita connectar abans d'aquest bloc se suprimiran?
+      period: Quant de temps, a partir d'ara, l'usuari es bloqueja des de l'API per a.
+      reason: La raÃ³ per quÃ¨ estÃ  sent bloquejat % {name}. Si us plau, ser tan tranquil i tan raonable com sigui possible, donant amb tant detall com sigui possible sobre la situaciÃ³. Tingueu en compte que no tots els usuaris de comprendre l'argot de la comunitat, aixÃ­ que si us plau, intenti utilitzar termes de l'home comÃº.
+      show: Veure aquest bloc
+      submit: Bloc d'ActualitzaciÃ³
+      title: Bloc d'ediciÃ³ en % {name}
+    filter: 
+      block_expired: El bloc ja ha expirat i no es pot editar.
+      block_period: El perÃ­ode de blocatge ha de ser un dels valors seleccionables de la llista desplegable.
+      not_a_moderator: VostÃ¨ necessita ser un moderador per dur a terme aquesta acciÃ³.
+    helper: 
+      time_future: Finalitza en % {time}.
+      time_past: Va acabar % {time} fa.
+      until_login: Activa fins que l'usuari es connecta.
+    index: 
+      empty: No hi ha blocs s'han fet encara.
+      heading: Llista de quadres de l'usuari
+      title: Blocs de l'usuari
+    model: 
+      non_moderator_revoke: Ha de ser un moderador per crear o un bloc d'actualitzaciÃ³.
+      non_moderator_update: Ha de ser un moderador per crear o un bloc d'actualitzaciÃ³.
+    new: 
+      back: Veure tots els blocs
+      heading: CreaciÃ³ de bloc % {name}
+      needs_view: L'usuari necessita connectar abans d'aquest bloc se suprimirÃ 
+      period: Quant de temps, a partir d'ara, l'usuari es bloqueja des de l'API per a.
+      reason: La raÃ³ per quÃ¨ estÃ  sent bloquejat % {name}. Si us plau, ser tan tranquil i tan raonable com sigui possible, donant amb tant detall com sigui possible sobre la situaciÃ³, recordant que el missatge serÃ  visible pÃºblicament. Tingueu en compte que no tots els usuaris de comprendre l'argot de la comunitat, aixÃ­ que si us plau, intenti utilitzar termes de l'home comÃº.
+      submit: Crear bloc
+      title: CreaciÃ³ de bloc % {name}
+      tried_contacting: Vaig posar en contacte amb l'usuari i els va demanar d'aturar.
+      tried_waiting: Li he donat una quantitat raonable de temps per a l'usuari per a respondre a aquestes comunicacions.
     not_found: 
       back: Torna a l'Ã­ndex
+      sorry: Ho sentim, que el bloc de l'usuari amb ID % {id} no s'ha pogut trobar.
     partial: 
       confirm: N'esteu segur?
       creator_name: Creador
       display_name: Usuari blocat
       edit: EdiciÃ³
+      not_revoked: (no revocat)
       reason: Motiu del blocatge
       revoke: Revoca!
+      revoker_name: Revocat per
       show: Mostra
       status: Estat
     period: 
       one: 1 hora
       other: "%{count} hores"
+    revoke: 
+      confirm: Esteu segur que voleu revocar aquest bloc?
+      flash: Aquest bloc ha estat revocat.
+      heading: RevocaciÃ³ de bloc en % {block_on} % {block_by}
+      past: Aquest bloc va acabar % {time} fa i no pot ser revocat ara.
+      revoke: Revocar!
+      time_future: Aquest bloc va a acabar en % {time}.
+      title: RevocaciÃ³ de bloc en % {block_on}
     show: 
+      back: Veure tots els blocs
       confirm: N'esteu segur?
       edit: EdiciÃ³
+      heading: "% {block_on} bloquejat per % {block_by}"
+      needs_view: L'usuari ha d'iniciar sessiÃ³ abans d'aquest bloc se suprimirÃ .
+      reason: "RaÃ³ de bloc:"
+      revoke: Revocar!
+      revoker: "Revoker:"
       show: Mostra
       status: Estat
+      time_future: Finalitza en % {time}
+      time_past: Va acabar % {time} fa
+      title: "% {block_on} bloquejat per % {block_by}"
+    update: 
+      only_creator_can_edit: NomÃ©s el moderador que ha creat aquest bloc pot editar-lo.
+      success: Bloc d'actualitzaciÃ³.
   user_role: 
     filter: 
       already_has_role: L'usuari ja tÃ© un rol %{role}.
@@ -1163,11 +1730,14 @@ ca:
       not_a_role: La cadena `%{role}' no Ã©s un rol vÃ lid.
       not_an_administrator: NomÃ©s els administradors poden realitzar l'administraciÃ³ de rols de usuaris, i vostÃ© no Ã©s un administrador.
     grant: 
+      are_you_sure: Esteu segur que voleu concedir el paper "% {paper}" a l'usuari "% {name}"?
       confirm: Confirmar
+      fail: Podria concedeix paper "% {paper}" a l'usuari "% {name}". Si us plau, comproveu que l'usuari i el paper sÃ³n vÃ lids.
       heading: Confirmi la concessiÃ³ de rol
       title: Confirmi la concessiÃ³ de rol
     revoke: 
       are_you_sure: Esteu segur que voleu revocar el rol `%{role}' de l'usuari `%{name}'?
       confirm: Confirma
+      fail: No s'ha pogut revocar el paper "% {paper}" des de l'usuari "% {name}". Si us plau, comproveu que l'usuari i el paper sÃ³n vÃ lids.
       heading: Confirmar revocaciÃ³ de rol
       title: Confirmar revocaciÃ³ de rol
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index ceb141928..f5ad63433 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -279,7 +279,7 @@ cs:
       view_changeset_details: Zobrazit detaily sady zmÄn
     changeset_paging_nav: 
       next: NÃ¡sledujÃ­cÃ­ Â»
-      previous: "Â« PÅedchozÃ­"
+      previous: Â« PÅedchozÃ­
       showing_page: Zobrazuji stranu %{page}
     changesets: 
       area: Oblast
@@ -1367,7 +1367,7 @@ cs:
       tags: Å tÃ­tky
     trace_paging_nav: 
       next: NÃ¡sledujÃ­cÃ­ Â»
-      previous: "Â« PÅedchozÃ­"
+      previous: Â« PÅedchozÃ­
       showing_page: Zobrazuji stranu %{page}
     view: 
       delete_track: Smazat tuto stopu
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e138e974b..66b1bd2a7 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -6,6 +6,7 @@
 # Author: Freek
 # Author: Hylle
 # Author: OleLaursen
+# Author: The real emj
 # Author: Winbladh
 da: 
   activerecord: 
@@ -272,7 +273,7 @@ da:
       view_changeset_details: Vis detaljer for Ã¦ndringssÃ¦t
     changeset_paging_nav: 
       next: NÃ¦ste Â»
-      previous: "Â« Forrige"
+      previous: Â« Forrige
       showing_page: Viser side %{page}
     changesets: 
       area: OmrÃ¥de
@@ -1302,7 +1303,7 @@ da:
       tags: Egenskaber
     trace_paging_nav: 
       next: NÃ¦ste Â»
-      previous: "Â« Forrige"
+      previous: Â« Forrige
       showing_page: Viser side %{page}
     view: 
       delete_track: Slet dette spor
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c8745c787..5edd7f3c8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -60,8 +60,8 @@ de:
         pass_crypt: Passwort
     models: 
       acl: Liste fÃ¼r Zugangskontrolle
-      changeset: Changeset
-      changeset_tag: Changeset-Tag
+      changeset: Ãnderungssatz
+      changeset_tag: Ãnderungssatz-Tag
       country: Staat
       diary_comment: Blog-Kommentar
       diary_entry: Blogeintrag
@@ -100,14 +100,14 @@ de:
       need_to_see_terms: Dein Zugriff auf die API wurde vorÃ¼bergehend ausgesetzt. Bitte melde Dich in Deinem Benutzerkonto an, um die âBedingungen fÃ¼r Mitwirkendeâ einzusehen. Du musst nicht einverstanden sein, aber Du musst sie gesehen haben.
   browse: 
     changeset: 
-      changeset: "Changeset: %{id}"
-      changesetxml: Changeset XML
+      changeset: "Ãnderungssatz: %{id}"
+      changesetxml: Ãnderungssatz-XML
       download: Als %{changeset_xml_link} oder %{osmchange_xml_link} herunterladen.
       feed: 
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
+        title: "Ãnderungssatz: %{id}"
+        title_comment: Ãnderungssatz %{id} - %{comment}
       osmchangexml: osmChange XML
-      title: Changeset
+      title: Ãnderungssatz
     changeset_details: 
       belongs_to: "Erstellt von:"
       bounding_box: "Bereich:"
@@ -123,7 +123,7 @@ de:
       has_ways: 
         one: "EnthÃ¤lt folgenden Weg:"
         other: "EnthÃ¤lt folgende %{count} Wege:"
-      no_bounding_box: FÃ¼r dieses Changeset wurde kein Bereich gespeichert.
+      no_bounding_box: FÃ¼r diesen Ãnderungssatz wurde kein Bereich gespeichert.
       show_area_box: Bereichsgrenze anzeigen
     common_details: 
       changeset_comment: "Kommentar:"
@@ -131,7 +131,7 @@ de:
       deleted_by: "GelÃ¶scht von:"
       edited_at: "Bearbeitet am:"
       edited_by: "Bearbeitet von:"
-      in_changeset: "Im Changeset:"
+      in_changeset: "Im Ãnderungssatz:"
       version: "Version:"
     containing_relation: 
       entry: Relation %{relation_name}
@@ -151,11 +151,11 @@ de:
       loading: Am Laden â¦
     navigation: 
       all: 
-        next_changeset_tooltip: NÃ¤chstes Changeset
+        next_changeset_tooltip: NÃ¤chster Ãnderungssatz
         next_node_tooltip: NÃ¤chster Knoten
         next_relation_tooltip: NÃ¤chste Relation
         next_way_tooltip: NÃ¤chster Weg
-        prev_changeset_tooltip: Vorheriges Changeset
+        prev_changeset_tooltip: Vorheriger Ãnderungssatz
         prev_node_tooltip: Vorheriger Knoten
         prev_relation_tooltip: Vorherige Relation
         prev_way_tooltip: Vorheriger Weg
@@ -254,12 +254,12 @@ de:
         tag: ErlÃ¤uterungsseite fÃ¼r das %{key}=%{value}-Tag
       wikipedia_link: Artikel zu %{page} in der Wikipedia
     timeout: 
-      sorry: Entschuldigung, es dauerte zu lange die Daten fÃ¼r den/die %{type} mit der ID %{id} abzurufen.
+      sorry: Entschuldigung, es dauerte zu lange die Daten fÃ¼r %{type} mit der ID %{id} abzurufen.
       type: 
-        changeset: Ãnderungssatz
-        node: Knoten
-        relation: Relation
-        way: Weg
+        changeset: den Ãnderungssatz
+        node: den Knoten
+        relation: die Relation
+        way: den Weg
     way: 
       download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}"
       download_xml: Als XML herunterladen
@@ -287,10 +287,10 @@ de:
       no_edits: (keine Bearbeitung)
       show_area_box: Bereich anzeigen
       still_editing: (in Bearbeitung)
-      view_changeset_details: Details des Changesets
+      view_changeset_details: Details des Ãnderungssatzes
     changeset_paging_nav: 
       next: NÃ¤chste Â»
-      previous: "Â« Vorige"
+      previous: Â« Vorige
       showing_page: Seite %{page}
     changesets: 
       area: Bereich
@@ -303,16 +303,16 @@ de:
       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}
+      heading: ÃnderungssÃ¤tze
+      heading_bbox: ÃnderungssÃ¤tze
+      heading_user: ÃnderungssÃ¤tze
+      heading_user_bbox: ÃnderungssÃ¤tze
+      title: ÃnderungssÃ¤tze
+      title_bbox: ÃnderungssÃ¤tze in %{bbox}
+      title_user: ÃnderungssÃ¤tze von %{user}
+      title_user_bbox: ÃnderungssÃ¤tze von %{user} in %{bbox}
     timeout: 
-      sorry: Es hat leider zu lange gedauert, die von dir angeforderten Changesets abzurufen.
+      sorry: Es hat leider zu lange gedauert, die von dir angeforderten ÃnderungssÃ¤tze abzurufen.
   diary_entry: 
     diary_comment: 
       comment_from: Kommentar von %{link_user} am %{comment_created_at}
@@ -1162,41 +1162,41 @@ de:
       callback_url: Callback-URL
       name: Name
       requests: "Die Benutzer um die folgenden Dinge um Erlaubnis bitten:"
-      required: Erforderlich
-      support_url: Support URL
-      url: Applikations URL
+      required: erforderlich
+      support_url: Support-URL
+      url: Applikations-URL
     index: 
       application: Anwendungsname
-      issued_at: Ausgestellt Am
-      list_tokens: "Die folgenden Token wurde an Applikationen in Ihrem Namen vergeben:"
+      issued_at: Ausgestellt am
+      list_tokens: "Die folgenden Token wurde an Anwendungen in Ihrem Namen vergeben:"
       my_apps: Meine Client-Anwendungen
       my_tokens: Meine autorisierten Anwendungen
       no_apps: Wenn du mit einer Anwendung gerne den %{oauth}-Standard verwenden wÃ¼rdest, musst du sie hier registrieren.
       register_new: Anwendung registrieren
       registered_apps: "Du hast die folgenden Client-Anwendungen registriert:"
       revoke: Widerrufen!
-      title: Meine OAuth Details
+      title: Meine OAuth-Details
     new: 
       submit: Registrieren
       title: Eine neue Anwendung registrieren
     not_found: 
       sorry: Es tut mir leid, aber %{type} wurde nicht gefunden.
     show: 
-      access_url: "Zugriffstoken URL:"
+      access_url: "Zugriffstoken-URL:"
       allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks.
       allow_read_prefs: Ihre Einstellungen auslesen.
       allow_write_api: Karte Ã¤ndern
       allow_write_diary: TagebucheintrÃ¤ge und -kommentare schreiben und Freunde hinzufÃ¼gen.
       allow_write_gpx: GPS-Spuren hochladen
       allow_write_prefs: Nutzereinstellungen verÃ¤ndern.
-      authorize_url: "Berechtigungs URL:"
+      authorize_url: "Berechtigungs-URL:"
       edit: Details bearbeiten
       key: "SchlÃ¼ssel:"
       requests: "Die Benutzer werden um Folgendes um Erlaubnis gebeten:"
       secret: "Geheimnis:"
       support_notice: Wir unterstÃ¼tzen HMAC-SHA1 (empfolen) und Reintext im SSL-Modus.
-      title: OAuth Details fÃ¼r %{app_name}
-      url: "Tokenanfrage URL:"
+      title: OAuth-Details fÃ¼r %{app_name}
+      url: "Tokenanfrage-URL:"
     update: 
       flash: Client-Informationen erfolgreich aktualisiert
   site: 
@@ -1648,7 +1648,7 @@ de:
           moderator: Moderator-Rechte entziehen
       send message: Nachricht senden
       settings_link_text: Einstellungen
-      spam score: "Spam Bewertung:"
+      spam score: "Spam-Bewertung:"
       status: "Status:"
       traces: Tracks
       unhide_user: Benutzer nicht mehr verstecken
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index ff42586a6..713565d7f 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -76,6 +76,7 @@ dsb:
       cookies_needed: Zda se, aÅ¾ cookieje su znjemÃ³Å¾njone - pÅ¡osym zmÃ³Å¾ni cookieje w swÃ³jom wobglÄdowaku, njeÅ¾li aÅ¾ pÃ³kÅ¡acujoÅ¡.
     setup_user_auth: 
       blocked: TwÃ³j pÅistup k API jo se zablokÄrowaÅ. PÅ¡osym pÅizjaw se do webpÃ³wjercha, aby wÄcej zgÃ³niÅ.
+      need_to_see_terms: TwÃ³j pÅistup na API jo nachylu wusajÅºony. PÅ¡osym pÅizjaw se k webpÃ³wjerchoju, aby se wuÅ¾ywarske wumÄnjenja woglÄdaÅ. NjetrjebaÅ¡ zwÃ³liÅ do nich, musyÅ¡ se je jano woglÄdaÅ.
   browse: 
     changeset: 
       changeset: "SajÅºba zmÄnow: %{id}"
@@ -276,7 +277,7 @@ dsb:
       view_changeset_details: Drobnostki sajÅºbow zmÄnow pokazaÅ
     changeset_paging_nav: 
       next: PÅiducy Â»
-      previous: "Â« PjerwjejÅ¡ny"
+      previous: Â« PjerwjejÅ¡ny
       showing_page: Pokazujo se bok %{page}
     changesets: 
       area: WurÄzk
@@ -964,7 +965,7 @@ dsb:
       english_link: engelskim originalom
       text: W paÅºe konflikta mjazy pÅeÅoÅ¾onym bokom a %{english_original_link}, engelski bok ma prÄdnosÄ mÄÅ
       title: WÃ³ toÅ tom pÅeÅoÅ¾ku
-    legal_babble: "<h2>Awtorske pÅ¡awo a licenca</h2>\n<p>\n   OpenStreetMap jo <i>zjawne daty</i>, licencÄrowane pÃ³d licencu <a\n   href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.de\">Creative\n   Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  MÃ³Å¾oÅ¡ naÅ¡e kÃ³rty a daty kopÄrowaÅ, rozdÅºÄliÄ, pÅenjasÄ a pÅimÄriÅ, tak dÅujko ako naspomnjejoÅ¡ OpenStreetMap a jich pÅinosowarjow. Jolic zmÄnjaÅ¡ naÅ¡e kÃ³rty abo daty abo zepÄraÅ¡ se na nje, mÃ³Å¾oÅ¡ wuslÄdk jano pÃ³d teju samkeju licencu rozdÅºÄliÅ. DopoÅny <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">pÅ¡awniski kod</a> wujasnjujo twÃ³je pÅ¡awa a zagronitosÄi.\n</p>\n\n<h3>Kak OpenStreetMap naspomnjeÅ</h3>\n<p>\n  Jolic wuÅ¾ywaÅ¡ kÃ³rtowe wobraze z OpenStreetMap, pominamy, aÅ¾ twÃ³jo ÅºÄkowanje zni nanejmjenjej   &ldquo;&copy; OpenStreetMap  contributors, CC-BY-SA&rdquo;. Jolic jano wuÅ¾ywaÅ¡ kÃ³rtowe daty, pominamy &ldquo;Map data &copy; OpenStreetMap contributors,  CC-BY-SA&rdquo;.\n</p>\n<p>\n  GaÅ¾ jo mÃ³Å¾no, OpenStreetMap mÄÅ wÃ³tkaz do <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  a CC-BY-SA to <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> mÄÅ. Jolic wuÅ¾ywaÅ¡ medij, ÅºoÅ¾ wÃ³tkaze njejsu mÃ³Å¾no (na pÅ. ÅiÅ¡Äane ÅºÄÅo), naraÅºujomy, aÅ¾ pokazujoÅ¡ swÃ³jich cytarjow na  www.openstreetmap.org (snaÅº pÅez wumÄnjenje &lsquo;OpenStreetMap&rsquo; pÅez pÃ³Ånu adresu) a na  www.creativecommons.org.\n</p>\n\n<h3>DalÅ¡ne informacije</h3>\n<p>\n  Cytaj wÄcej wÃ³ wuÅ¾ywanju naÅ¡ych datow <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Ceste pÅ¡awniske pÅ¡aÅ¡anja</a>.\n</p>\n<p>\n  PÅinosowarjow OSM dopominaju, aÅ¾ njepÅidawaju nigda daty ze Å¾rÄdÅo, kÃ³tareÅ¾ su pÅez awtorske pÅ¡awo Å¡Äitane,  (na pÅ. z Google Maps abo z ÅiÅ¡Äanych kÃ³rtow) bÅºez eksplicitnego dowolenja awtorow.\n</p>\n<p>\n  LÄcrownoÅ¾ OpenStreetMap jo zjawne daty, njamÃ³Å¾omy dermotny kÃ³rtowy API za wuwiwarjow tÅeÅich pobitowaÅ.\n\n  GlÄdaj na <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">PÅ¡awidÅa za wuÅ¾ywanje API</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PÅ¡awidÅa za wuÅ¾ywanje polow</a>\n  a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PÅ¡awidÅa za wuÅ¾ywanje Nominatim</a>.\n</p>\n\n<h3>NaÅ¡e pÅinosowarje</h3>\n<p>\n NaÅ¡a licenca CC-BY-SA pomina, aÅ¾ &ldquo;daÅ¡ spÃ³cetnemu awtoroju ÅºÄk, pÅimÄrjony medijeju abo srÄdkoju, kÃ³taryÅ¾ wuÅ¾ywaÅ¡&rdquo;. Jadnotliwe kartÄrowarje OSM njepominaju pÅidatne ÅºÄkowanje k &ldquo;OpenStreetMap  contributors&rdquo;, ale gaÅ¾ se daty zapÅimuju z narodnego kartÄrowaÅskego pÅedewzeÅa abo z drugego wuznamnego Å¾rÄdÅa w OpenStreetMap, jo pÅimÄrjone, se jim pÅez direktne pÅewzeÅe jich ÅºÄkowanja abo pÅez wÃ³tkazowanje na njo na toÅ tym boku ÅºÄkowaÅ.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n   <li><strong>Australska</strong>: WopÅimujo pÅedmÄsÄaÅske daty na zakÅaÅºe datow Australian Bureau of Statistics (Awstralski amt za statistiku).</li>\n   <li><strong>Kanada</strong>: WopÅimujo daty z GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), a StatCan (Geography Division,\n   Statistics Canada).</li>\n   <li><strong>Nowoseelandska</strong>: WopÅimujo daty ze Å¾rÄdÅow wÃ³t Land Information New Zealand. Awtorske pÅ¡awo wumÄnjone.</li>\n  <li><strong>PÃ³lska</strong>: WopÅimujo daty z <a  href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske pÅ¡awo pÅinosowarjow UMP-pcPL.</li>\n   <li><strong>ZjadnoÅone kralojstwo</strong>: WopÅimujo daty z Ordnance\n   Survey (Amtske rozmÄrjenje kraja) &copy; Awtorske pÅ¡awo a p3awo za datowe banki 2010.</li>\n</ul>\n\n<p>\n  ZapÅijimanje datow do OpenStreetMap njegroni, aÅ¾ pÃ³bitowaÅ originalnych datow pÅipÃ³znawa OpenStreetMap, dawa nÄkaku garantiju abo pÅewzejo rukowanje.\n</p>"
+    legal_babble: "<h2>Awtorske pÅ¡awo a licenca</h2>\n<p> \nOpenStreetMap wobstoj ze <i>zjawnych datow</i>, licencÄrowanych pÃ³d licencu <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA). </p> <p> MÃ³Å¾oÅ¡ naÅ¡e kÃ³rty a daty kopÄrowaÅ, rozdÅºÄliÅ, pÅenjasÄ a pÅimÄriÅ, tak dÅujko ako  naspomnjejoÅ¡ OpenStreetMap a jich sobustatkujucych. Jolic zmÄnijoÅ¡ naÅ¡e kÃ³rty abo daty abo zepÄraÅ¡ se na nje, mÃ³Å¾oÅ¡ wuslÄdk jano pÃ³d teju sameju licencu rozdÅºÄliÅ. DopoÅny <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">pÅ¡awniski code</a> wujasnjujo twÃ³je pÅ¡awa a zagronitosÄi.</p>\n\n<h3>Kak naspomnjeÅ awtorstwo OpenStreetMap</h3>\n<p> Jolic wuÅ¾ywaÅ¡ kÃ³rtowe wobraze z OpenStreetMap, pominamy se, aÅ¾ nanejmjenjej pÃ³dawaÅ¡ &ldquo;&copy; OpenStreetMap a sobustatkujucych, CC-BY-SA&rdquo;. Jolic wuÅ¾ywaÅ¡ jano kÃ³rtowe daty, musyÅ¡ &ldquo;kÃ³rtowe daty &copy; OpenStreetMap a sobustatkujucych, CC-BY-SA&rdquo; pÃ³daÅ. </p> <p> Å¹oÅ¾ jo mÃ³Å¾no, OpenStreetMap by mÄÅ wÃ³tkaz do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC-BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> mÄÅ. Jolic wuÅ¾ywaÅ¡ medij, ÅºoÅ¾ wÃ³tkaze njejsu mÃ³Å¾no (na pÅ. wuÅiÅ¡Äane ÅºÄÅo), naraÅºujomy, aÅ¾ pokazujoÅ¡ swÃ³jich cytarjow na www.openstreetmap.org a na www.creativecommons.org.</p>\n\n<h3>DalÅ¡ne informacije</h3>\n<p>Cytaj wÄcej wÃ³ wuÅ¾ywanju naÅ¡ych datow <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Ceste pÅ¡awniske pÅ¡aÅ¡enja</a>.</p><p> Sobustatkujucych OSM napominamy, aÅ¾ njedodawaju nigda daty ze Å¾rÄdÅow, kÃ³tareÅ¾ su pÅez awtorske pÅ¡awo Å¡Äitane (na pÅ. z Google Maps abo z wuÅiÅ¡Äanych kÃ³rtow) bÅºez wurazneje dowÃ³lnosÄi awtorow. </p> <p> LÄcrownoÅ¾ OpenStreetMap wobstoj ze zjawnych datow, njamÃ³Å¾omy dermotny kÃ³rtowy API za wuwiwarjow tÅeÅich pÃ³bitowaÅ. \n\nGlÄdaj naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">pÅ¡awidÅa za wuÅ¾ywanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PÅ¡awidÅa za wuÅ¾ywanje pÃ³low</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PÅ¡awidÅa za wuÅ¾ywanje Nominatim</a>. </p> \n\n<h3>NaÅ¡e sobustatkujuce</h3>\n<p> NaÅ¡a licenca CC-BY-SA pomina se, aÅ¾ &ldquo;dajoÅ¡ spÃ³cetnemu awtoroju ÅºÄk pÅimÄrjonemu medijoju abo srÄdkoju, kÃ³taryÅ¾ wuÅ¾ywaÅ¡&rdquo;. Jadnotliwe kartÄrowarje OSM njepominaju se pÅidatne ÅºÄkowanje k &ldquo;sobustatkujucym OpenStreetMap&rdquo;, ale gaÅ¾ se daty z narodnego kartÄrowaÅskego pÅedewzeÅa abo z drugego wuznamnego Å¾rÄdÅa w OpenStreetMap zapÅimuju, jo pÅimÄrjone, jim pÅez direktne pÅewzeÄe jich ÅºÄkowanja abo pÅez wÃ³tkazowanje na njo na toÅ tom boku wuÅºÄkowaÅ. </p>\n\n<!-- Information for page editors The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data. Any additions here must be discussed with OSM sysadmins first. --> \n<ul id=\"contributors\"><li><strong>Awstralska</strong>: WopÅimujo pÅedmÄsÄaÅske daty na zakÅaÅºe datow awstralskego  amta za statistiku (Australian Bureau of Statistics).</li>\n<li><strong>Awstriska</strong>: WopÅimujo daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> pÃ³d <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: WopÅimujo daty z GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).</li>\n<li><strong>Francojska</strong>: WopÅimujo daty z Direction GÃ©nÃ©rale des ImpÃ´ts.</li>\n<li><strong>Nowoseelandska</strong>: WopÅimujo daty ze Å¾rÄdÅow wÃ³t Land Information New Zealand. Awtorske pÅ¡awo wumÄnjone.</li> \n<li><strong>PÃ³lska</strong>: WopÅimujo daty z <a\n   href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske pÅ¡awo sobustatkujucych UMP-pcPL.</li>\n<li><strong>ZjadnoÅone kralojstwo</strong>: WopÅimujo daty z Ordnance Survey (Amtske rozmÄrjenje kraja) &copy; Awtorske pÅ¡awo a pÅ¡awo za datowe banki 2010.</li> </ul>\n\n<p> ZapÅimowanje datow do OpenStreetMap njegroni, aÅ¾ pÃ³bitowaÅ originalnych datow pÅipÃ³znawa OpenStreetMap, dawa nÄkaku garantiju abo pÅewzejo rukowanje. </p>"
     native: 
       mapping_link: kartÄrowanje zachopiÅ
       native_link: dolnoserbskej wersiji
@@ -1193,6 +1194,7 @@ dsb:
       no_iframe_support: TwÃ³j wobglÄdowak njepÃ³dpÄrujo HTML-elementy iframe, kÃ³tareÅ¾ su trÄbne za toÅ tu funkciju.
       not_public: Njejsy swÃ³je zmÄny ako zjawne markÄrowaÅ.
       not_public_description: NjamÃ³Å¾oÅ¡ wÄcej kÃ³rtu wobzÄÅaÅ, snaÅºkuli cyniÅ to rowno. MÃ³Å¾oÅ¡ swÃ³je zmÄny na swÃ³jom %{user_page} ako zjawne markÄrowaÅ.
+      potlatch2_not_configured: Potlach 2 njejo se konfigurÄrowaÅ - pÅ¡osym glÄdaj http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 za dalÅ¡ne informacije
       potlatch2_unsaved_changes: Sy njeskÅadowane zmÄny. (Aby je w Potlatch 2 skÅadowaÅ, klikni na "SkÅadowaÅ".)
       potlatch_unsaved_changes: MaÅ¡ njeskÅaÅºone zmÄny. (Aby skÅadowaÅ w Potlatch, ty by dejaÅ aktualny puÅ abo dypk wÃ³twÃ³liÅ, jolic wobÅºÄÅujoÅ¡ w livemodusu, abo klikni na SkÅadowaÅ, jolic maÅ¡ tÅocaÅ¡k SkÅadowaÅ.)
       user_page_link: wuÅ¾ywarskem boku
@@ -1361,7 +1363,7 @@ dsb:
       tags: Atributy
     trace_paging_nav: 
       next: PÅiducy Â»
-      previous: "Â« PjerwjejÅ¡ny"
+      previous: Â« PjerwjejÅ¡ny
       showing_page: Pokazujo se bok %{page}
     view: 
       delete_track: ToÅ tu ceru wulaÅ¡owaÅ
@@ -1479,16 +1481,36 @@ dsb:
       new to osm: Nowy w OpenStreetMap?
       notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">WÄcej wÃ³ pÅichodnej licencnej zmÄnje OpenStreetMap</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">pÅeÅoÅ¾ki</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">diskusija</a>)
       openid: "%{logo} OpenID:"
+      openid invalid: BÃ³Å¾ko zda se, aÅ¾ twÃ³j OpenID jo njepÅaÅiwy
+      openid missing provider: BÃ³Å¾ko njejsmy mÃ³gli z twÃ³jim OpenID-pÃ³bitowarjom zwÄzaÅ
       openid_logo_alt: Z OpenID se pÅizjawiÅ
       openid_providers: 
+        aol: 
+          alt: Z OpenID z AOL pÅizjawiÅ
+          title: Z AOL pÅizjawiÅ
+        google: 
+          alt: Z OpenID z Google pÅizjawiÅ
+          title: Z Google pÅizjawiÅ
+        myopenid: 
+          alt: Z OpenID z myOpenID pÅizjawiÅ
+          title: Z myOpenID pÅizjawiÅ
         openid: 
+          alt: Z OpenID-URL se pÅizjawiÅ
           title: Z OpenID se pÅizjawiÅ
+        wordpress: 
+          alt: Z OpenID z Wordpress pÅizjawiÅ
+          title: Z Wordpress pÅizjawiÅ
+        yahoo: 
+          alt: Z OpenID z Yahoo pÅizjawiÅ
+          title: Z Yahoo pÅizjawiÅ
       password: "GronidÅo:"
       register now: NÄnto registrÄrowaÅ
       remember: "SpomnjeÅ se:"
       title: PÅizjawjenje
       to make changes: Aby daty OpenStreetMap zmÄniÅ, musyÅ¡ konto mÄÅ.
       webmaster: webmejstaÅ
+      with openid: "Alternatiwnje mÃ³Å¾oÅ¡ swÃ³j OpenID za pÅizjawjenje wuÅ¾ywaÅ:"
+      with username: "MaÅ¡ juÅ¾o konto pla OpenStreetMap? PÅ¡osym pÅizjaw se ze swÃ³jim wuÅ¾ywarskim mjenim a gronidÅom:"
     logout: 
       heading: Z OpenStreetMap se wÃ³tzjawiÅ
       logout_button: WÃ³tzjawjenje
@@ -1520,9 +1542,13 @@ dsb:
       no_auto_account_create: BÃ³Å¾ko njamÃ³Å¾omy tuchylu za tebje konto awtomatiski zaÅoÅ¾yÅ.
       not displayed publicly: Njejo zjawnje widobny (glÄdaj <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wikipÅ¡awidÅa priwatnosÄi z wurÄzkom wÃ³ e-mailowych adresach">pÅ¡awidÅa priwatnosÄi</a>)
       openid: "%{logo} OpenID:"
+      openid association: "<p>TwÃ³j OpenID hyÅ¡Äi njejo zwÄzany z kontom OpenStreetMap.</p>\n<ul>\n<li>Jolic sy nowy w OpenStreetMap, zaÅoÅ¾ nowe konto z pomocu slÄdujucego formulara.</li>\n<li>\nJolic maÅ¡ juÅ¾o konto, mÃ³Å¾oÅ¡ se z wuÅ¾ywarskim mjenim a gronidÅom pÅizjawiÅ a pÃ³tom konto ze swÃ³jim OpenID w swÃ³jich wuÅ¾ywarskich nastajenjach zwÄzaÅ.\n</li>\n</ul>"
+      openid no password: Za OpenID gronidÅo njejo trÄbne, ale nÄkotare wÃ³sebne rÄdy abo serwer by mÃ³gli gronidÅo pÃ³trjebaÅ.
       password: "GronidÅo:"
       terms accepted: Å¹Äkujomy se, aÅ¾ sy nowe wumÄnjenja za sobuskutkajucuch akceptÄrowaÅ!
+      terms declined: Woblutujomy, aÅ¾ sy se rozsuÅºiÅ, nowe wuÅ¾ywarske wumÄnjenja njeakceptÄrowaÅ. Za dalÅ¡ne informacije glÄdaj pÅ¡osym <a href="%{url}">toÅ ten wikibok</a>.
       title: Konto zaÅoÅ¾yÅ
+      use openid: Alternatiwnje mÃ³Å¾oÅ¡ OpenID %{logo} za pÅizjawjenje wuÅ¾ywaÅ
     no_such_user: 
       body: BÃ³Å¾ko njejo wuÅ¾ywaÅ z mjenim %{user}. PÅ¡osym pÅekontrolÄruj swÃ³j pÅ¡awopis, abo wÃ³tkaz, na kÃ³taryÅ¾ sy kliknuÅ, jo njepÅaÅiwy.
       heading: WuÅ¾ywaÅ %{user} njeeksistÄrujo
@@ -1554,6 +1580,7 @@ dsb:
       consider_pd: PÅidatnje ku gÃ³rjejce dojadnanjeju, mam swÃ³je pÅinoski za zjawnosÄ pÅistupne.
       consider_pd_why: Co to jo?
       decline: WÃ³tpokazaÅ
+      guidance: "Informacije, kÃ³tareÅ¾ pomagaju toÅ te wumÄnjenja rozmÄÅ: <a href=\"%{summary}\">zbadne zespominanje</a> a nÄkotare <a href=\"%{translations}\">njeoficielne pÅeÅoÅ¾ki</a>"
       heading: WumÄnjenja za pÅinosowarjow
       legale_names: 
         france: Francojska
@@ -1562,6 +1589,7 @@ dsb:
       legale_select: "PÅ¡osym wubjeÅ kraj swÃ³jogo bydleÅskego sedla:"
       read and accept: PÅ¡osym pÅecytaj slÄdujuce dojadnanje a klikni na tÅocaÅ¡k AkceptÄrowaÅ, aby wobkÅ¡uÅiÅ, aÅ¾ akceptÄrujoÅ¡ wumÄnjenja toÅ togo dojadnanja za twÃ³je eksistÄrowace a pÅichodne pÅinoski.
       title: WumÄnjenja za sobustatkujucych
+      you need to accept or decline: PÅ¡osym pÅecytaj nowe wuÅ¾ywarske wumÄnjenja a akceptÄruj abo wÃ³tpokaÅ¾ je, njeÅ¾li aÅ¾ dalej cyniÅ¡.
     view: 
       activate_user: toÅ togo wuÅ¾ywarja aktiwÄrowaÅ
       add as friend: ako pÅijaÅela pÅidaÅ
diff --git a/config/locales/el.yml b/config/locales/el.yml
index d67582ed7..6b2886d71 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1,6 +1,7 @@
 # Messages for Greek (ÎÎ»Î»Î·Î½Î¹ÎºÎ¬)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Aitolos
 # Author: Consta
 # Author: Crazymadlover
 # Author: Evropi
@@ -24,7 +25,7 @@ el:
         user: Î§ÏÎ®ÏÏÎ·Ï
       message: 
         body: Î£ÏÎ¼Î±
-        recipient: ÎÎ®ÏÏÎ·Ï
+        recipient: Î Î±ÏÎ±Î»Î®ÏÏÎ·Ï
         sender: ÎÏÎ¿ÏÏÎ¿Î»Î­Î±Ï
         title: Î¤Î¯ÏÎ»Î¿Ï
       trace: 
@@ -45,25 +46,25 @@ el:
         pass_crypt: ÎÏÎ´Î¹ÎºÏÏ
     models: 
       acl: Î ÏÏÏÎ²Î±ÏÎ· ÏÏÎ· Î»Î¯ÏÏÎ± ÎµÎ»Î­Î³ÏÎ¿Ï
-      changeset: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï
-      changeset_tag: ÎÏÎ¹ÎºÎ­ÏÎ± Î±Î»Î»Î±Î³Î®Ï ÏÏÎ»Î»Î¿Î³Î®Ï
+      changeset: ÎÎ¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
+      changeset_tag: ÎÏÎ¹ÎºÎ­ÏÎ± Î¿Î¼Î¬Î´Î±Ï Î±Î»Î»Î±Î³ÏÎ½
       country: Î§ÏÏÎ±
       diary_comment: Î£ÏÏÎ»Î¹Î¿ ÏÏÎ¿ blog
       diary_entry: ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
       friend: Î¦Î¯Î»Î¿Ï
       language: ÎÎ»ÏÏÏÎ±
       message: ÎÎ®Î½ÏÎ¼Î±
-      node: Î£Î·Î¼ÎµÎ¯Î¿
-      node_tag: Î£Î·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±
+      node: ÎÏÎ¼Î²Î¿Ï
+      node_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÎÏÎ¼Î²Î¿Ï
       notifier: ÎÎ¹Î´Î¿ÏÎ¿Î¹Î·ÏÎ®Ï
-      old_node: Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿
-      old_node_tag: Î Î±Î»Î¹Ï ÏÎ·Î¼ÎµÎ¯Î¿ ÎµÏÎ¹ÎºÎ­ÏÎ±
-      old_relation: Î Î±Î»Î¹Î¬ ÏÏÎ­ÏÎ·
+      old_node: Î Î±Î»Î¹ÏÏ ÎÏÎ¼Î²Î¿Ï
+      old_node_tag: Î Î±Î»Î¹Î¬ ÎÏÎ¹ÎºÎ­ÏÎ± ÎÏÎ¼Î²Î¿Ï
+      old_relation: Î Î±Î»Î¹Î¬ Î£ÏÎ­ÏÎ·
       old_relation_member: Î Î±Î»Î¹Ï Î¼Î­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
       old_relation_tag: Î Î±Î»Î¹Î¬ ÎµÏÎ¹ÎºÎ­ÏÎ± ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
-      old_way: Î Î±Î»Î¯Î± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·
-      old_way_node: Î£Î·Î¼ÎµÎ¯Î¿ ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
-      old_way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÏÎ±Î»Î¯Î±Ï ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
+      old_way: Î Î±Î»Î¹Î¬ ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
+      old_way_node: ÎÏÎ¼Î²Î¿Ï Î Î±Î»Î¹Î¬Ï ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï
+      old_way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± Î Î±Î»Î¹Î¬Ï ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï
       relation: Î£ÏÎ­ÏÎ·
       relation_member: ÎÎ­Î»Î¿Ï ÏÎ·Ï ÏÏÎ­ÏÎ·Ï
       relation_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÏÏÎ­ÏÎ·Ï
@@ -74,37 +75,52 @@ el:
       user: Î§ÏÎ®ÏÏÎ·Ï
       user_preference: Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï ÏÏÎ®ÏÏÎ·
       user_token: Î¤ÎµÎºÎ¼Î®ÏÎ¹Î¿ ÏÏÎ®ÏÏÎ·
-      way: ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·
-      way_node: ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ·Î¼ÎµÎ¯Î¿Ï
-      way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï
+      way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
+      way_node: ÎÏÎ¼Î²Î¿Ï ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï
+      way_tag: ÎÏÎ¹ÎºÎ­ÏÎ± ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï
   application: 
     require_cookies: 
       cookies_needed: Î¦Î±Î¯Î½ÎµÏÎ±Î¹ ÏÏÎ¹ Î­ÏÎµÏÎµ ÏÎ± cookies Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼Î­Î½Î± - ÏÎ±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ± cookies ÏÏÎ¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ®Ï ÏÎ±Ï ÏÏÎ¹Î½ ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ.
   browse: 
     changeset: 
-      changeset: "ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï: %{id}"
-      changesetxml: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï XML
-      osmchangexml: osmÎ±Î»Î»Î±Î³Î® XML
-      title: ÎÎ»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï
+      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: "ÎÎ½Î®ÎºÎµÎ¹ ÏÏÎ¿Î½/ÏÏÎ·Î½:"
-      box: ÎºÎ¿ÏÏÎ¹
+      bounding_box: "Î Î»Î±Î¯ÏÎ¹Î¿ Î¿ÏÎ¹Î¿Î¸Î­ÏÎ·ÏÎ·Ï:"
+      box: ÎºÎ¿ÏÏÎ¯
       closed_at: "ÎÎºÎ»ÎµÎ¹ÏÎµ ÏÏÎ¹Ï:"
-      created_at: "ÎÎ·Î¼Î¿Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ ÏÏÎ¹Ï:"
-      has_nodes: "ÎÏÎµÎ¹ ÏÎ± ÎµÏÏÎ¼ÎµÎ½Î± %{count} ÏÎ·Î¼ÎµÎ¯Î±:"
+      created_at: "ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ ÏÏÎ¹Ï:"
+      has_nodes: 
+        one: "ÎÏÎµÎ¹ ÏÎ¿Î½ ÎµÏÏÎ¼ÎµÎ½Î¿ %{count} ÎºÏÎ¼Î²Î¿:"
+        other: "ÎÏÎµÎ¹ ÏÎ¿ÏÏ ÎµÏÏÎ¼ÎµÎ½Î¿ÏÏ %{count} ÎºÏÎ¼Î²Î¿ÏÏ:"
       has_relations: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ %{count} ÏÏÎ­ÏÎµÎ¹Ï:"
-      has_ways: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ %{count} ÎºÎ±ÏÎµÏÎ¸Î®Î½ÏÎµÎ¹Ï:"
-      show_area_box: ÎÎµÎ¯Î¾Îµ ÎºÎ¿ÏÏÎ¹ ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      has_ways: "ÎÏÎµÎ¹ ÏÎ¹Ï ÎµÏÏÎ¼ÎµÎ½ÎµÏ %{count} Î´Î¹Î±Î´ÏÎ¿Î¼Î­Ï:"
+      show_area_box: ÎÎµÎ¯Î¾Îµ ÎºÎ¿ÏÏÎ¯ ÏÎµÏÎ¹Î¿ÏÎ®Ï
     common_details: 
       changeset_comment: "Î£ÏÏÎ»Î¹Î¿:"
-      deleted_at: "ÎÎ¹Î±Î³ÏÎ¬ÏÎ·ÎºÎµ Î±ÏÏ:"
-      deleted_by: "ÎÎ¹Î±Î³ÏÎ¬ÏÎ¿Î½ÏÎ±Î¹:"
-      edited_at: "ÎÎ»Î»Î¬Î¾Îµ ÏÏÎ¹Ï:"
-      edited_by: "ÎÎ»Î»Î±Î³Î® Î­Î³Î¹Î½Îµ Î±ÏÏ:"
-      in_changeset: "Î£ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î·Ï:"
+      deleted_at: "ÎÎ¹Î±Î³ÏÎ¬ÏÎ·ÎºÎµ ÏÏÎ¹Ï:"
+      deleted_by: "ÎÎ¹Î±Î³ÏÎ¬ÏÎ·ÎºÎµ Î±ÏÏ:"
+      edited_at: "ÎÏÎµÎ¾ÎµÏÎ³Î¬ÏÏÎ·ÎºÎµ ÏÏÎ¹Ï:"
+      edited_by: "ÎÏÎµÎ¾ÎµÏÎ³Î¬ÏÏÎ·ÎºÎµ Î±ÏÏ:"
+      in_changeset: "Î£ÏÎ·Î½ Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½:"
       version: "ÎÎºÎ´Î¿ÏÎ®:"
+    containing_relation: 
+      entry: Î£ÏÎ­ÏÎ· %{relation_name}
+      entry_role: Î£ÏÎ­ÏÎ· %{relation_name} (ÏÏ %{relation_role})
     map: 
-      deleted: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
+      deleted: ÎÎ¹Î±Î³ÏÎ±Î¼Î¼Î­Î½Î¿
+      edit: 
+        area: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎµÏÎ¹Î¿ÏÎ®Ï
+        node: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÎºÏÎ¼Î²Î¿Ï
+        relation: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÏÎ­ÏÎ·Ï
+        way: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï
       larger: 
         area: ÎÎµÎ¯ÏÎµ ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ® ÏÎµ Î¼ÎµÎ³Î±Î»ÏÏÎµÏÎ¿ ÏÎ¬ÏÏÎ·.
         node: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ¿Ï ÎºÏÎ¼Î²Î¿Ï ÏÎµ Î¼ÎµÎ³Î±Î»ÏÏÎµÏÎ¿ ÏÎ¬ÏÏÎ·
@@ -113,140 +129,182 @@ el:
       loading: Î¦ÏÏÏÏÏÎ·...
     navigation: 
       all: 
-        next_way_tooltip: ÎÏÏÎ¼ÎµÎ½Î· ÏÏÏÏÎ¿
+        next_changeset_tooltip: ÎÏÏÎ¼ÎµÎ½Î· Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
+        next_node_tooltip: ÎÏÏÎ¼ÎµÎ½Î¿Ï ÎºÏÎ¼Î²Î¿Ï
+        next_relation_tooltip: ÎÏÏÎ¼ÎµÎ½Î· ÏÏÎ­ÏÎ·
+        next_way_tooltip: ÎÏÏÎ¼ÎµÎ½Î· Î´Î¹Î±Î´ÏÎ¿Î¼Î®
+        prev_changeset_tooltip: Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
+        prev_node_tooltip: Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿Ï ÎºÏÎ¼Î²Î¿Ï
+        prev_relation_tooltip: Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÏÏÎ­ÏÎ·
+        prev_way_tooltip: Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· Î´Î¹Î±Î´ÏÎ¿Î¼Î®
+      user: 
+        name_changeset_tooltip: Î ÏÎ¿Î²Î¿Î»Î® Î±Î»Î»Î±Î³ÏÎ½ Î±ÏÏ %{user}
+        next_changeset_tooltip: ÎÏÏÎ¼ÎµÎ½Î· ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î±ÏÏ %{user}
+        prev_changeset_tooltip: Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î±ÏÏ %{user}
     node: 
-      download: "%{download_xml_link} Î® %{view_history_link}"
+      download: "%{download_xml_link}, %{view_history_link} Î® %{edit_link}"
       download_xml: ÎÎ®ÏÎ· XML
-      edit: Î¤ÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÏÎµ
-      node: Î£Î·Î¼ÎµÎ¯Î¿
-      node_title: "Î£Î®Î¼ÎµÎ¿: %{node_name}"
-      view_history: ÎÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
+      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
-      node_history: ÎÏÏÎ¿ÏÎ¯Î± ÏÎ·Î¼ÎµÎ¯Î¿Ï
+      node_history: ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎÏÎ¼Î²Î¿Ï
+      node_history_title: "ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎÏÎ¼Î²Î¿Ï: %{node_name}"
       view_details: ÎÎµÏ Î»ÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
     not_found: 
-      sorry: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î· %{type} Î¼Îµ ÏÎ·Î½ ÏÎ±ÏÏÏÏÎ·ÏÎ± %{id}, Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯.
+      sorry: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î¿/Î· %{type} Î¼Îµ ÏÎ·Î½ ÏÎ±ÏÏÏÏÎ·ÏÎ± %{id}, Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯.
       type: 
-        changeset: ÎÎ»Î»Î±Î³Î® ÏÎ»Î±ÏÏ
-        node: Î£Î·Î¼ÎµÎ¯Î¿
+        changeset: Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
+        node: ÎÏÎ¼Î²Î¿Ï
         relation: ÏÏÎ­ÏÎ·
-        way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·
+        way: Î´Î¹Î±Î´ÏÎ¿Î¼Î®
     paging_nav: 
       of: ÏÎ¿Ï
-      showing_page: ÎÎµÎ¯ÏÎ½ÎµÎ¹ ÏÎµÎ»Î¯Î´Î±
+      showing_page: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÎ»Î¯Î´Î±Ï
     relation: 
       download: "%{download_xml_link} Î® %{view_history_link}"
       download_xml: ÎÎ®ÏÎ· XML
       relation: Î£ÏÎ­ÏÎ·
       relation_title: "Î£ÏÎ­ÏÎ·: %{relation_name}"
-      view_history: Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
+      view_history: Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¹ÎºÏ
     relation_details: 
       members: "ÎÎ­Î»Î·:"
-      part_of: "ÎÎ¿Î¼Î¼Î¬ÏÎ¹ ÏÎ¿Ï:"
+      part_of: "ÎÎ­ÏÎ¿Ï ÏÎ¿Ï:"
     relation_history: 
+      download: "%{download_xml_link} Î® %{view_details_link}"
       download_xml: ÎÎ®ÏÎ· XML
-      relation_history: ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï
-      relation_history_title: "ÎÏÏÎ¿ÏÎ¹Î± ÏÏÎ­ÏÎ·Ï: %{relation_name}"
+      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: ÎÎµÏ ÏÏÎ¿Î¹ÏÎµÎ¯Î± Î³Î¹Î± Î±ÏÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·
+      manually_select: Î§ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·ÏÎ· ÎµÏÎ¹Î»Î¿Î³Î® Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ®Ï ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      view_data: Î ÏÎ¿Î²Î¿Î»Î® Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½ Î³Î¹Î± ÏÎ·Î½ ÏÏÎ­ÏÎ¿ÏÏÎ± ÏÏÎ¿Î²Î¿Î»Î® ÏÎ¬ÏÏÎ·
     start_rjs: 
-      data_frame_title: Î£ÏÎ¿Î¹ÏÎµÎ¯Î±
-      data_layer_name: Î£ÏÎ¿Î¹ÏÎµÎ¯Î±
+      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 Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î³Î¯Î½ÎµÎ¹ Î±ÏÎ³ÏÏ Î® Î½Î± Î¼Î·Î½ Î±Î½ÏÎ¹Î´ÏÎ¬. ÎÎ½ ÎµÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï Î¿ÏÎ¹ Î¸ÎµÏ Î½Î± Î´ÎµÎ¹Ï Î±ÏÏÎ¬ ÏÎ± ÏÏÎ¿Î¹ÏÎµÎ¯Î±, ÎºÎ¬Î½Îµ ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÏÏÎ¼ÎµÎ½Î¿ ÎºÎ¿ÏÎ¼ÏÎ¯."
+      drag_a_box: Î£ÏÏÎµÏÎµ Î­Î½Î± ÏÎ»Î±Î¯ÏÎ¹Î¿ ÏÏÎ¿ ÏÎ¬ÏÏÎ· Î³Î¹Î± Î½Î± ÎµÏÎ¹Î»Î­Î¾ÎµÏÎµ Î¼Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ®
+      edited_by_user_at_timestamp: ÎÏÎµÎ¾ÎµÏÎ³Î¬ÏÏÎ·ÎºÎµ Î±ÏÏ [[user]] ÏÏÎ¹Ï [[timestamp]]
+      hide_areas: ÎÏÏÎºÏÏÏÎ· ÏÎµÏÎ¹Î¿ÏÏÎ½
+      history_for_feature: ÎÏÏÎ¿ÏÎ¹ÎºÏ Î³Î¹Î± [[feature]]
+      load_data: Î¦ÏÏÏÏÏÎ· Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½
+      loaded_an_area_with_num_features: "ÎÏÎµÎ¹Ï ÏÎ¿ÏÏÏÏÎµÎ¹ Î¼Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® ÏÎ¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ [[num_features]] ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬. ÎÎµÎ½Î¹ÎºÎ¬, Î¼ÎµÏÎ¹ÎºÎ¿Î¯ browsers Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î¼Î·Î½ Î±Î½ÏÎ­ÏÎ¿ÏÎ½ Î½Î± Î´ÎµÎ¯Î¾Î¿ÏÎ½ ÏÏÏÎ± ÏÎ¿Î»Î»Î¬ ÏÏÎ¿Î¹ÏÎµÎ¯Î±. ÎÎµÎ½Î¹ÎºÎ¬, Î¿Î¹ browsers Î´Î¿ÏÎ»ÎµÏÎ¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ± Î´ÎµÎ¯ÏÎ½Î¿Î½ÏÎ±Ï Î»Î¹Î³ÏÏÎµÏÎ± Î±ÏÏ 100 ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ· ÏÎ¿ÏÎ¬: Î¼Îµ Î¿ÏÎ¹Î´Î®ÏÎ¿ÏÎµ Î¬Î»Î»Î¿ Î¿ browser Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î³Î¯Î½ÎµÎ¹ Î±ÏÎ³ÏÏ Î® Î½Î± Î¼Î·Î½ Î±Î½ÏÎ¹Î´ÏÎ¬. ÎÎ½ ÎµÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï ÏÏÎ¹ Î¸ÎµÏ Î½Î± Î´ÎµÎ¹Ï Î±ÏÏÎ¬ ÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î±, ÎºÎ¬Î½Îµ ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÏÏÎ¼ÎµÎ½Î¿ ÎºÎ¿ÏÎ¼ÏÎ¯."
       loading: Î¦ÏÏÏÏÏÎ·...
-      manually_select: ÎÎ¹Î¬Î»ÎµÎ¾Îµ Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ
+      manually_select: Î§ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·ÏÎ· ÎµÏÎ¹Î»Î¿Î³Î® Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ®Ï ÏÎµÏÎ¹Î¿ÏÎ®Ï
       object_list: 
-        api: ÎÏÎ±Î½Î¬ÎºÏÎ·ÏÎ· ÏÎµÏÎ¹Î¿ÏÎ®Ï Î±ÏÏ ÏÎ¿ API
-        back: ÎÎµÎ¯Î¾Îµ Î»Î¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½
+        api: ÎÎ½Î¬ÎºÏÎ·ÏÎ· ÏÎµÏÎ¹Î¿ÏÎ®Ï Î±ÏÏ ÏÎ¿ API
+        back: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· Î»Î¯ÏÏÎ±Ï Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½
         details: ÎÎµÏÏÎ¿Î¼Î­ÏÎµÎ¹ÎµÏ
         heading: ÎÎ¯ÏÏÎ± Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼Î­Î½ÏÎ½
         history: 
           type: 
-            node: Î£Î·Î¼ÎµÎ¯Î¿ [[id]]
-            way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]
+            node: ÎÏÎ¼Î²Î¿Ï [[id]]
+            way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î® [[id]]
         selected: 
           type: 
-            node: Î£Î·Î¼ÎµÎ¯Î¿ [[id]]
-            way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ· [[id]]
+            node: ÎÏÎ¼Î²Î¿Ï [[id]]
+            way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î® [[id]]
         type: 
-          node: Î£Î·Î¼ÎµÎ¯Î¿
-          way: ÎÎ±ÏÎµÏÎ¸Î·Î½ÏÎ·
+          node: ÎÏÎ¼Î²Î¿Ï
+          way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
       private_user: Î¹Î´Î¹ÏÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï
-      show_history: ÎÎµÎ¯Î¾Îµ Î¹ÏÏÎ¿ÏÎ¯Î±
-      unable_to_load_size: "ÎÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎ¿ÏÏÏÏÎµÎ¹: Î¤Î¿ Î¼Î­Î³ÎµÎ¸Î¿Ï ÏÎ¿Ï bounding box [[bbox_size]] ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¹ÎºÏÏÏÎµÏÎ¿ Î±ÏÎ¿ %{max_bbox_size})"
+      show_areas: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÏÎ¹Î¿ÏÏÎ½
+      show_history: Î ÏÎ¿Î²Î¿Î»Î® Î¹ÏÏÎ¿ÏÎ¹ÎºÎ¿Ï
+      unable_to_load_size: "ÎÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´ÏÎ½Î±ÏÎ® Î· ÏÏÏÏÏÏÎ·: ÏÎ¿ Î¼Î­Î³ÎµÎ¸Î¿Ï [[bbox_size]] ÏÎ¿Ï ÏÎ»Î±Î¹ÏÎ¯Î¿Ï Î¿ÏÎ¹Î¿Î¸Î­ÏÎ·ÏÎ·Ï ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¹ÎºÏÏÏÎµÏÎ¿ Î±ÏÏ %{max_bbox_size})"
       wait: ÎÎ½Î±Î¼Î¿Î½Î®...
-      zoom_or_select: ÎÏÏÎ¯Î±ÏÎµ Î® Î´Î¹Î¬Î»ÎµÎ¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® Î±ÏÎ¿ ÏÎ¿ ÏÎ¬ÏÏÎ·
+      zoom_or_select: ÎÎµÎ³Î­Î¸ÏÎ½ÏÎ· Î® ÎµÏÎ¹Î»Î¿Î³Î® ÏÎµÏÎ¹Î¿ÏÎ®Ï ÏÎ¿Ï ÏÎ¬ÏÏÎ· Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ
     tag_details: 
       tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
-      wikipedia_link: Î¤Î¿ Î¬ÏÎ¸ÏÎ¿ %{ÏÎµÎ»Î¯Î´Î±} Î³Î¹Î± ÎÎ¹ÎºÎ¹ÏÎ±Î¯Î´ÎµÎ¹Î±
+      wiki_link: 
+        key: Î wiki ÏÎµÎ»Î¯Î´Î± ÏÎµÏÎ¹Î³ÏÎ±ÏÎ®Ï Î³Î¹Î± ÏÎ·Î½ ÎµÏÎ¹ÎºÎ­ÏÎ± %{key}
+        tag: Î wiki ÏÎµÎ»Î¯Î´Î± ÏÎµÏÎ¹Î³ÏÎ±ÏÎ®Ï Î³Î¹Î± ÏÎ·Î½ ÎµÏÎ¹ÎºÎ­ÏÎ± %{key}=%{value}
+      wikipedia_link: Î¤Î¿ Î¬ÏÎ¸ÏÎ¿ %{page} ÏÏÎ· ÎÎ¹ÎºÎ¹ÏÎ±Î¯Î´ÎµÎ¹Î±
     timeout: 
+      sorry: Î£ÏÎ³Î³Î½ÏÎ¼Î·, ÏÎ± Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î³Î¹Î± ÏÎ¿/ÏÎ· %{type} Î¼Îµ Î±Î½Î±Î³Î½ÏÏÎ¹ÏÏÎ¹ÎºÏ %{id}, ÏÏÎµÎ¹Î¬ÏÏÎ·ÎºÎµ ÏÎ¿Î»Ï ÏÏÏÎ½Î¿ Î³Î¹Î± Î½Î± Î±Î½Î±ÎºÏÎ·Î¸ÎµÎ¯.
       type: 
-        changeset: ÎÎ»Î»Î±Î³Î® ÏÎ»Î±ÏÏ
+        changeset: Î¿Î¼Î¬Î´Î± Î±Î»Î»Î±Î³ÏÎ½
         node: ÎÏÎ¼Î²Î¿Ï
-        relation: Î£ÏÎ­ÏÎ·
+        relation: ÏÏÎ­ÏÎ·
         way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
     way: 
-      download: "%{download_xml_link} Î® %{view_history_link}"
+      download: "%{download_xml_link}, %{view_history_link} Î® %{edit_link}"
       download_xml: ÎÎ®ÏÎ· XML
-      edit: Î¤ÏÎ¿ÏÎ¿ÏÎ¿Î¯Î·ÏÏÎµ
-      view_history: Î´ÎµÏ Î¹ÏÏÎ¿ÏÎ¯Î±
-      way: ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·
-      way_title: "ÎÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·: %{way_name}"
+      edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      view_history: Î ÏÎ¿Î²Î¿Î»Î® Î¹ÏÏÎ¿ÏÎ¹ÎºÎ¿Ï
+      way: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
+      way_title: "ÎÎ¹Î±Î´ÏÎ¿Î¼Î®: %{way_name}"
     way_details: 
       also_part_of: 
-        one: ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎ·Ï %{related_ways}
-        other: ÎµÏÎ¯ÏÎ·Ï ÎºÎ¿Î¼Î¼Î¬ÏÎ¹ ÎºÎ±ÏÎµÏÎ¸ÏÎ½ÏÎµÏÎ½ %{related_ways}
-      nodes: "Î£Î·Î¼ÎµÎ¯Î±:"
-      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}"
+      view_details: Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
+      way_history: ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï
+      way_history_title: "ÎÏÏÎ¿ÏÎ¹ÎºÏ ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï: %{way_name}"
   changeset: 
     changeset: 
-      anonymous: ÎÎ½ÏÎ½ÏÎ¼Î¿Ï
-      show_area_box: Î´ÎµÎ¯Î¾Îµ ÏÎµÏÎ¹Î¿ÏÎ® ÎºÎ¿ÏÏÎ¹Î¿Ï
-      view_changeset_details: ÎÎµÏ Î±Î»Î»Î±Î³Î® ÏÏÎ»Î»Î¿Î³Î®Ï Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½
+      anonymous: ÎÎ½ÏÎ½ÏÎ¼Î¿Ï
+      big_area: (Î¼ÎµÎ³Î¬Î»Î¿)
+      no_comment: (ÎºÎ±Î½Î­Î½Î±)
+      no_edits: (ÏÏÏÎ¯Ï ÏÏÎ¿ÏÎ¿ÏÎ¿Î¹Î®ÏÎµÎ¹Ï)
+      show_area_box: Î´ÎµÎ¯Î¾Îµ ÎºÎ¿ÏÏÎ¯ ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      still_editing: (Î±ÎºÏÎ¼Î· ÏÎµ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±)
+      view_changeset_details: Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏÏÎ¿Î¼ÎµÏÎµÎ¹ÏÎ½ Î¿Î¼Î¬Î´Î±Ï Î±Î»Î»Î±Î³ÏÎ½
     changeset_paging_nav: 
-      showing_page: EÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÎ»Î¯Î´Î±Ï %{page}
+      next: ÎÏÏÎ¼ÎµÎ½Î¿ Â»
+      previous: Â« Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿
+      showing_page: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎµÎ»Î¯Î´Î±Ï %{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}
+    timeout: 
+      sorry: ÎÏÏÎ¬Î¼Î±Î¹, Î¿ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿Ï ÏÏÎ½ Î¿Î¼Î¬Î´ÏÎ½ Î±Î»Î»Î±Î³ÏÎ½ ÏÎ¿Ï Î¶Î·ÏÎ®ÏÎ±ÏÎµ ÏÏÎµÎ¹Î¬ÏÏÎ·ÎºÎµ ÏÎ¿Î»Ï ÏÏÏÎ½Î¿ Î½Î± Î±Î½Î±ÎºÏÎ·Î¸ÎµÎ¯.
   diary_entry: 
     diary_comment: 
-      comment_from: Î£ÏÏÎ»Î¹Î¿ Î±ÏÎ¿ ÏÎ¿Î½ %{link_user} ÏÏÎ¹Ï %{comment_created_at}
+      comment_from: Î£ÏÏÎ»Î¹Î¿ Î±ÏÏ ÏÎ¿Î½ %{link_user} ÏÏÎ¹Ï %{comment_created_at}
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
       hide_link: ÎÏÏÎºÏÏÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ¿Î»Î¯Î¿Ï
     diary_entry: 
       comment_count: 
         one: 1 ÏÏÏÎ»Î¹Î¿
         other: "%{count} ÏÏÏÎ»Î¹Î±"
-      comment_link: Î£ÏÏÎ»Î¹Î± Î³Î¹Î± ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
+      comment_link: Î£ÏÏÎ»Î¹Î¿ Î³Î¹Î± ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
-      edit_link: ÎÎ»Î»Î±Î³Î® ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï
+      edit_link: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï
       hide_link: ÎÏÏÎºÏÏÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï
-      posted_by: ÎÏÎ¬ÏÏÎ·ÎºÎµ Î±ÏÎ¿ ÏÎ¿ ÏÏÎ®ÏÏÎ· %{link_user} ÏÏÎ¹Ï %{created} ÏÏÎ± %{language_link}
+      posted_by: ÎÏÎ¬ÏÏÎ·ÎºÎµ Î±ÏÏ ÏÎ¿ ÏÏÎ®ÏÏÎ· %{link_user} ÏÏÎ¹Ï %{created} ÏÏÎ± %{language_link}
       reply_link: ÎÏÎ¬Î½ÏÎ·ÏÎ· ÏÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·
     edit: 
       body: "Î£ÏÎ¼Î±:"
@@ -254,82 +312,105 @@ el:
       latitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï
       location: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±:"
       longitude: ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï
-      marker_text: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï blog
+      marker_text: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       save_button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·
       subject: "ÎÎ­Î¼Î±:"
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ·Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
-      use_map_link: ÏÏÎ·ÏÎ·Î¼Î¿ÏÎ¿Î¯Î·ÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ·
+      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: Î£ÏÎ½Î¸ÎµÏÎ· ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÏÏÎ¿ blog ÏÏÎ®ÏÏÎ·
-      newer_entries: Î ÏÏÏÏÎ±ÏÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
-      no_entries: ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· blog
-      older_entries: Î Î±Î»Î¯ÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
-      recent_entries: "Î ÏÏÏÎ¿ÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï blog:"
-      title: Blog ÏÏÎ·ÏÏÏÎ½
-      user_title: Blog %{user}
+      new: ÎÎ­Î± ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÎÎ¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
+      new_title: Î£ÏÎ½Î¸Î­ÏÏÎµ Î¼Î¹Î± Î½Î­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÏÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿ ÏÏÎ®ÏÏÎ· ÏÎ±Ï
+      newer_entries: ÎÎµÏÏÎµÏÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
+      no_entries: ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
+      older_entries: Î Î±Î»Î¹ÏÏÎµÏÎµÏ ÎÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï
+      recent_entries: "Î ÏÏÏÏÎ±ÏÎµÏ ÎºÎ±ÏÎ±ÏÏÏÎ®ÏÎµÎ¹Ï Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï:"
+      title: ÎÎ¼ÎµÏÎ¿Î»ÏÎ³Î¹Î± ÏÏÎ·ÏÏÏÎ½
+      user_title: Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿ ÏÎ¿Ï %{user}
     location: 
       edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       location: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î±:"
       view: Î ÏÎ¿Î²Î¿Î»Î®
     new: 
-      title: ÎÎ­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
+      title: ÎÎ­Î± ÎÎ±ÏÎ±ÏÏÏÎ·ÏÎ· ÎÎ¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
     no_such_entry: 
-      body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï Î® ÏÏÏÎ»Î¹Î¿ Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ± %{id}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î¼Î­ÏÎ¿ ÏÎ¿Ï Î¿ÏÎ¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
+      body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï Î® ÏÏÏÎ»Î¹Î¿ Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ± %{id}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î¼Î­ÏÎ¿ ÏÎ¿Ï Î¿ÏÎ¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
       heading: "ÎÎ±Î¼Î¯Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î¼Îµ ÏÎ· ÏÎ±ÏÏÏÏÎ·ÏÎ±: %{id}"
+      title: ÎÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÎ­ÏÎ¿Î¹Î± ÎµÎ³Î³ÏÎ±ÏÎ® Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
     no_such_user: 
-      body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± %{user}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î¼Î­ÏÎ¿ ÏÎ¿Ï Î¿ÏÎ¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
+      body: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± %{user}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î¼Î­ÏÎ¿ ÏÎ¿Ï Î¿ÏÎ¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
       heading: Î ÏÏÎ®ÏÏÎ·Ï %{user} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹
-      title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ïr
+      title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï
     view: 
-      leave_a_comment: ÎÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï
-      login: ÎÎ¯ÏÎ¿Î´Î¿Ï
-      login_to_leave_a_comment: "%{login_link} Î³Î¹Î± ÎµÎ³Î³ÏÎ±ÏÎ® ÏÏÏÎ»Î¹Î¿Ï"
+      leave_a_comment: ÎÏÎ®ÏÏÎµ Î­Î½Î± ÏÏÏÎ»Î¹Î¿
+      login: Î£ÏÎ½Î´ÎµÏÎ·
+      login_to_leave_a_comment: "%{login_link} Î³Î¹Î± Î½Î± Î±ÏÎ®ÏÎµÏÎµ Î­Î½Î± ÏÏÏÎ»Î¹Î¿"
       save_button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·
-      title: ÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿Ï ÏÎ¿ %{user} | %{title}
-      user_title: Blog %{user}
+      title: ÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿ ÏÎ¿Ï %{user} | %{title}
+      user_title: Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿ ÏÎ¿Ï %{user}
   editor: 
-    default: Î ÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î® (ÏÏÏÎ± ÎµÎ¯Î½Î±Î¹ ÏÎ¿ %{name})
+    default: Î ÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î® (ÏÏÏÎ± ÎµÎ¯Î½Î±Î¹ %{name})
     potlatch: 
-      description: Potlatch 1 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÏÎ¿Ï ÏÎ¬ÏÏÎ· Î¼Î­ÏÎ± ÏÏÎ¿ ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï)
+      description: Potlatch 1 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î­ÏÎ± ÏÏÎ¿ ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï)
       name: Potlatch 1
     potlatch2: 
-      description: Potlatch 2 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï ÏÎ¿Ï ÏÎ¬ÏÏÎ· Î¼Î­ÏÎ± ÏÏÎ¿ ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï)
+      description: Potlatch 2 (ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î­ÏÎ± ÏÏÎ¿ ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï)
       name: Potlatch 2
     remote: 
       description: ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿Ï Î­Î»ÎµÎ³ÏÎ¿Ï (JOSM Î® Merkaartor)
       name: ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼Î­Î½Î¿Ï Î­Î»ÎµÎ³ÏÎ¿Ï
   export: 
     start: 
-      add_marker: Î ÏÏÏÎ¸ÎµÏÎ· markerÏÏÎ¿ ÏÎ¬ÏÏÎ·
-      area_to_export: ÎÎ¾Î±Î³ÏÎ³Î® ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      add_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>.
+      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: "Î. Î .:"
+      format_to_export: ÎÎ¿ÏÏÎ® ÏÏÎ¿Ï ÎµÎ¾Î±Î³ÏÎ³Î®
+      image_size: ÎÎ­Î³ÎµÎ¸Î¿Ï ÎÎ¹ÎºÏÎ½Î±Ï
+      latitude: "ÎÎµÏ. Î Î»:"
       licence: ÎÎ´ÎµÎ¹Î±
-      longitude: "Î. Î.:"
-      manually_select: ÎÎ¹Î¬Î»ÎµÎ¾Îµ ÎºÎ±Î¹Î½Î¿ÏÏÎ³Î¹Î± ÏÎµÏÎ¹Î¿ÏÎ® Î´Î¹Î± ÏÎµÎ¹ÏÏÏ
-      mapnik_image: Mapnik ÎµÎ¹ÎºÏÎ½Î±
+      longitude: "ÎÎµÏ. ÎÎ·.:"
+      manually_select: Î§ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·ÏÎ· ÎµÏÎ¹Î»Î¿Î³Î® Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ®Ï ÏÎµÏÎ¹Î¿ÏÎ®Ï
+      mapnik_image: ÎÎ¹ÎºÏÎ½Î± Mapnik
+      max: Î¼ÎµÎ³
       options: ÎÏÎ¹Î»Î¿Î³Î­Ï
-      osm_xml_data: OpenStreetMap XML ÏÏÎ¿Î¹ÏÎµÎ¯Î±
-      osmarender_image: Osmarender ÎµÎ¹ÎºÏÎ½Î±
+      osm_xml_data: ÎÎµÎ´Î¿Î¼Î­Î½Î± OpenStreetMap XML
+      osmarender_image: ÎÎ¹ÎºÏÎ½Î± Osmarender
       output: ÎÏÏÎ´Î¿ÏÎ·
       scale: ÎÎ»Î¯Î¼Î±ÎºÎ±
+      too_large: 
+        body: ÎÏÏÎ® Î· ÏÎµÏÎ¹Î¿ÏÎ® ÎµÎ¯Î½Î±Î¹ ÏÎ¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· Î³Î¹Î± Î½Î± ÎµÎ¾Î±ÏÎ¸ÎµÎ¯ ÏÏ Î´ÎµÎ´Î¿Î¼Î­Î½Î± OpenStreetMap XML. Î Î±ÏÎ±ÎºÎ±Î»Ï ÎºÎ¬Î½ÎµÏÎµ Î¼ÎµÎ³Î­Î¸ÏÎ½ÏÎ· Î® ÎµÏÎ¹Î»Î­Î¾ÏÎµ Î¼Î¹ÎºÏÏÏÎµÏÎ· ÏÎµÏÎ¹Î¿ÏÎ®.
+        heading: Î Î¿Î»Ï ÎÎµÎ³Î¬Î»Î· Î ÎµÏÎ¹Î¿ÏÎ®
       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>"
+        osm_nominatim: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±ÏÏ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Î ÏÎ»ÎµÎ¹Ï
         places: ÎÎ­ÏÎ·
-        towns: ÎÎ¹ÎºÏÎ­Ï Î ÏÎ»ÎµÎ¹Ï
+        towns: ÎÏÎ¼Î¿ÏÏÎ»ÎµÎ¹Ï
     direction: 
       east: Î±Î½Î±ÏÎ¿Î»Î¹ÎºÎ¬
       north: Î²ÏÏÎµÎ¹Î±
@@ -339,41 +420,66 @@ el:
       south_east: Î½Î¿ÏÎ¹Î¿Î±Î½Î±ÏÎ¿Î»Î¹ÎºÎ¬
       south_west: Î½Î¿ÏÎ¹Î¿Î´ÏÏÎ¹ÎºÎ¬
       west: Î´ÏÏÎ¹ÎºÎ¬
+    distance: 
+      one: ÏÎµÏÎ¯ÏÎ¿Ï 1ÏÎ»Î¼
+      other: ÏÎµÏÎ¯ÏÎ¿Ï %{count}ÏÎ»Î¼
+      zero: Î»Î¹Î³ÏÏÎµÏÎ¿ Î±ÏÏ 1ÏÎ»Î¼
     results: 
       more_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>
+        osm_nominatim: ÎÏÎ¿ÏÎµÎ»Î­ÏÎ¼Î±ÏÎ± Î±ÏÏ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</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: 
+      prefix: "%{type}"
+      suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} Î±ÏÏ %{parentname})"
+      suffix_place: ", %{distance} %{direction} Î±ÏÏ %{placename}"
     search_osm_nominatim: 
       prefix: 
         amenity: 
           airport: ÎÎµÏÎ¿Î´ÏÏÎ¼Î¹Î¿
           arts_centre: ÎÎ­Î½ÏÏÎ¿ Î¤ÎµÏÎ½ÏÎ½
+          atm: ATM
           auditorium: ÎÎ¼ÏÎ¹Î¸Î­Î±ÏÏÎ¿
           bank: Î¤ÏÎ¬ÏÎµÎ¶Î±
           bar: ÎÏÎ±Ï
           bench: Î Î¬Î³ÎºÎ¿Ï
-          brothel: Î Î¿ÏÎ½ÎµÎ¯Î¿
+          brothel: ÎÎ¯ÎºÎ¿Ï Î±Î½Î¿ÏÎ®Ï
           bus_station: Î£ÏÎ±Î¸Î¼ÏÏ ÎÎµÏÏÎ¿ÏÎµÎ¯Î¿Ï
           cafe: ÎÎ±ÏÎµÏÎ­ÏÎ¹Î±
           car_rental: ÎÎ½Î¿Î¹ÎºÎ¯Î±ÏÎ· Î±ÏÏÎ¿ÎºÎ¹Î½Î®ÏÎ¿Ï
+          car_sharing: ÎÎ¿Î¹Î½Î® ÏÏÎ®ÏÎ· Î±ÏÏÎ¿ÎºÎ¹Î½Î®ÏÏÎ½
           car_wash: Î Î»ÏÏÎ¹Î¼Î¿ ÎÏÏÎ¿ÎºÎ¹Î½Î®ÏÏÎ½
           casino: ÎÎ±Î¶Î¯Î½Î¿
           cinema: ÎÎ¹Î½Î·Î¼Î±ÏÎ¿Î³ÏÎ¬ÏÎ¿Ï
           clinic: ÎÎ»Î¹Î½Î¹ÎºÎ®
           club: Club
           college: ÎÎ¿Î»Î­Î³Î¹Î¿
+          community_centre: ÎÎ¿Î¹Î½Î¿ÏÎ¹ÎºÏ ÎÎ­Î½ÏÏÎ¿
           courthouse: ÎÎ¹ÎºÎ±ÏÏÎ®ÏÎ¹Î¿
           crematorium: ÎÏÎµÎ¼Î±ÏÏÏÎ¹Î¿
           dentist: ÎÎ´Î¿Î½ÏÎ¯Î±ÏÏÎ¿Ï
           doctors: ÎÎ±ÏÏÎ¿Î¯
+          dormitory: ÎÎ¿Î¹ÏÏÎ½Î±Ï
           drinking_water: Î ÏÏÎ¹Î¼Î¿ ÎÎµÏÏ
           driving_school: Î£ÏÎ¿Î»Î® ÎÎ´Î·Î³ÏÎ½
           embassy: Î ÏÎµÏÎ²ÎµÎ¯Î±
           emergency_phone: Î¤Î·Î»Î­ÏÏÎ½Î¿ ÎÎºÏÎ±ÎºÏÎ·Ï ÎÎ½Î¬Î³ÎºÎ·Ï
           fast_food: Î¤Î±ÏÏÏÎ±Î³ÎµÎ¯Î¿
+          ferry_terminal: Î£ÏÎ±Î¸Î¼ÏÏ Î Î¿ÏÎ¸Î¼ÎµÎ¯ÏÎ½
+          fire_hydrant: ÎÏÎ¿ÏÎ½ÏÏ ÏÏÏÎ¿ÏÎ²ÎµÏÏÎ¹ÎºÎ®Ï
+          fire_station: Î ÏÏÎ¿ÏÎ²ÎµÏÏÎ¹ÎºÏÏ ÏÏÎ±Î¸Î¼ÏÏ
           fountain: Î£ÏÎ½ÏÏÎ¹Î²Î¬Î½Î¹
           fuel: ÎÎ±ÏÏÎ¹Î¼Î±
           grave_yard: ÎÎµÎºÏÎ¿ÏÎ±ÏÎµÎ¯Î¿
           gym: ÎÏÎ¼Î½Î±ÏÏÎ®ÏÎ¹Î¿
+          health_centre: ÎÎ­Î½ÏÏÎ¿ Î¥Î³ÎµÎ¯Î±Ï
           hospital: ÎÎ¿ÏÎ¿ÎºÎ¿Î¼ÎµÎ¯Î¿
           hotel: ÎÎµÎ½Î¿Î´Î¿ÏÎµÎ¯Î¿
           ice_cream: Î Î±Î³ÏÏÏ
@@ -381,69 +487,118 @@ el:
           library: ÎÎ¹Î²Î»Î¹Î¿Î¸Î®ÎºÎ·
           market: ÎÎ³Î¿ÏÎ¬
           marketplace: ÎÎ³Î¿ÏÎ¬
-          nightclub: Night Club
+          nightclub: ÎÏÏÏÎµÏÎ¹Î½Ï ÎÎ­Î½ÏÏÎ¿
+          nursery: Î Î±Î¹Î´Î¹ÎºÏÏ ÏÏÎ±Î¸Î¼ÏÏ
+          nursing_home: ÎÎ¯ÎºÎ¿Ï ÎÏÎ³Î·ÏÎ¯Î±Ï
           office: ÎÏÎ±ÏÎµÎ¯Î¿
           park: Î Î¬ÏÎºÎ¿
+          parking: Î§ÏÏÎ¿Ï ÏÏÎ¬Î¸Î¼ÎµÏÏÎ·Ï
+          pharmacy: Î¦Î±ÏÎ¼Î±ÎºÎµÎ¯Î¿
+          place_of_worship: Î¤ÏÏÎ¿Ï Î»Î±ÏÏÎµÎ¯Î±Ï
           police: ÎÏÏÏÎ½Î¿Î¼Î¯Î±
           post_box: Î¤Î±ÏÏÎ´ÏÎ¿Î¼Î¹ÎºÎ® ÎÏÏÎ¯Î´Î±
           post_office: Î¤Î±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿
           preschool: Î ÏÎ¿ÏÏÎ¿Î»Î¹ÎºÎ® ÎÎºÏÎ±Î¯Î´ÎµÏÏÎ·
           prison: Î¦ÏÎ»Î±ÎºÎ®
           pub: Î Î±Î¼Ï
+          public_building: ÎÎ·Î¼ÏÏÎ¹Î¿ ÎºÏÎ¯ÏÎ¹Î¿
+          public_market: ÎÎ·Î¼ÏÏÎ¹Î± Î±Î³Î¿ÏÎ¬
           reception_area: Î§ÏÏÎ¿Ï Î¥ÏÎ¿Î´Î¿ÏÎ®Ï
+          recycling: Î£Î·Î¼ÎµÎ¯Î¿ ÎÎ½Î±ÎºÏÎºÎ»ÏÏÎ·Ï
           restaurant: ÎÏÏÎ¹Î±ÏÏÏÎ¹Î¿
           sauna: Î£Î¬Î¿ÏÎ½Î±
           school: Î£ÏÎ¿Î»ÎµÎ¯Î¿
+          shelter: ÎÎ±ÏÎ±ÏÏÎ³Î¹Î¿
           shop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î±
+          shopping: ÎÎ³Î¿ÏÎ­Ï
           studio: Î£ÏÎ¿ÏÎ½ÏÎ¹Î¿
           supermarket: Î£Î¿ÏÏÎµÏÎ¼Î¬ÏÎºÎµÏ
           taxi: Î¤Î±Î¾Î¯
+          telephone: ÎÎ·Î¼ÏÏÎ¹Î¿ Î¤Î·Î»Î­ÏÏÎ½Î¿
           theatre: ÎÎ­Î±ÏÏÎ¿
           toilets: Î¤Î¿ÏÎ±Î»Î­ÏÎµÏ
           townhall: ÎÎ·Î¼Î±ÏÏÎµÎ¯Î¿
           university: Î Î±Î½ÎµÏÎ¹ÏÏÎ®Î¼Î¹Î¿
+          vending_machine: ÎÎ·ÏÎ¬Î½Î·Î¼Î± ÎÏÏÏÎ¼Î±ÏÎ·Ï Î ÏÎ»Î·ÏÎ·Ï
           veterinary: ÎÏÎ·Î½Î¹Î±ÏÏÎ¹ÎºÎ® Î§ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÎ®
+          waste_basket: ÎÎ±Î»Î¬Î¸Î¹ ÎÏÎ¿ÏÏÎ¹Î¼Î¼Î¬ÏÏÎ½
           wifi: Î ÏÏÏÎ²Î±ÏÎ· WiFi
-          youth_centre: Î Î¿Î»ÏÎºÎµÎ½ÏÏÎ¿ ÎÎµÎ¿Î»Î±Î¯Î±Ï
+          youth_centre: ÎÎ­Î½ÏÏÎ¿ ÎÎµÎ¿Î»Î±Î¯Î±Ï
+        boundary: 
+          administrative: ÎÎ¹Î¿Î¹ÎºÎ·ÏÎ¹ÎºÏ ÎÏÎ¹Î¿
         building: 
           bunker: ÎÏÏÏÏ
           chapel: Î Î±ÏÎµÎºÎºÎ»Î®ÏÎ¹
           church: ÎÎºÎºÎ»Î·ÏÎ¯Î±
+          city_hall: ÎÎ·Î¼Î±ÏÏÎµÎ¯Î¿
           dormitory: ÎÎ¿Î¹ÏÏÎ½Î±Ï
+          entrance: ÎÎ¯ÏÎ¿Î´Î¿Ï ÎÏÎ¹ÏÎ¯Î¿Ï
           flats: ÎÎ¹Î±Î¼ÎµÏÎ¯ÏÎ¼Î±ÏÎ±
           garage: ÎÎºÎ±ÏÎ¬Î¶
+          hospital: ÎÏÎ®ÏÎ¹Î¿ ÎÎ¿ÏÎ¿ÎºÎ¿Î¼ÎµÎ¯Î¿Ï
           hotel: ÎÎµÎ½Î¿Î´Î¿ÏÎµÎ¯Î¿
           house: Î£ÏÎ¯ÏÎ¹
+          industrial: ÎÎ¹Î¿Î¼Î·ÏÎ±Î½Î¹ÎºÏ ÎÏÎ®ÏÎ¹Î¿
+          office: ÎÏÎ®ÏÎ¹Î¿ ÎÏÎ±ÏÎµÎ¯ÏÎ½
+          public: ÎÎ·Î¼ÏÏÎ¹Î¿ ÎºÏÎ®ÏÎ¹Î¿
           residential: Î Î¿Î»ÏÎºÎ±ÏÎ¿Î¹ÎºÎ¯Î±
+          school: Î£ÏÎ¿Î»Î¹ÎºÏ ÎÏÎ®ÏÎ¹Î¿
+          shop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î±
           stadium: Î£ÏÎ¬Î´Î¹Î¿
           tower: Î ÏÏÎ³Î¿Ï
           train_station: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ Î£ÏÎ±Î¸Î¼ÏÏ
+          university: ÎÏÎ®ÏÎ¹Î¿ Î Î±Î½ÎµÏÎ¹ÏÏÎ·Î¼Î¯Î¿Ï
         highway: 
           bridleway: ÎÎ¿Î½Î¿ÏÎ¬ÏÎ¹ Î³Î¹Î± Î¬Î»Î¿Î³Î±
           bus_stop: Î£ÏÎ¬ÏÎ· ÎÎµÏÏÎ¿ÏÎµÎ¯Î¿Ï
+          construction: ÎÏÏÎ¼Î¿Ï ÏÏÏ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ®
+          distance_marker: ÎÎµÎ¯ÎºÏÎ·Ï ÎÏÏÏÏÎ±ÏÎ·Ï
+          emergency_access_point: Î£Î·Î¼ÎµÎ¯Î¿ Î ÏÏÏÎ²Î±ÏÎ·Ï ÎÎºÏÎ±ÎºÏÎ·Ï ÎÎ½Î¬Î³ÎºÎ·Ï
           footway: ÎÎ¿Î½Î¿ÏÎ¬ÏÎ¹
+          ford: ÎÎ¿Î¹ÏÏÏÏÏÏÏÎ·
           gate: Î ÏÎ»Î·
+          motorway: ÎÏÏÎ¿ÎºÎ¹Î½Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
+          motorway_junction: ÎÎ¹Î±ÏÏÎ±ÏÏÏÏÎ· ÎÏÏÎ¿ÎºÎ¹Î½Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
           path: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
-          pedestrian: Î ÎµÎ¶ÏÎ´ÏÎ¿Î¼Î¹Î¿
+          pedestrian: Î ÎµÎ¶ÏÎ´ÏÎ¿Î¼Î¿Ï
+          platform: Î Î»Î±ÏÏÏÏÎ¼Î±
+          primary: ÎÏÏÎ¹Î± ÎÎ´ÏÏ
+          primary_link: ÎÏÏÎ¹Î± ÎÎ´ÏÏ
           residential: ÎÎ±ÏÎ¿Î¹ÎºÎ¯ÎµÏ
           road: ÎÏÏÎ¼Î¿Ï
+          secondary: ÎÎµÏÏÎµÏÎµÏÎ¿ÏÏÎ± ÎÎ´ÏÏ
+          secondary_link: ÎÎµÏÏÎµÏÎµÏÎ¿ÏÏÎ± ÎÎ´ÏÏ
+          services: Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ ÎÏÏÎ¿ÎºÎ¹Î½Î·ÏÎ¿Î´ÏÏÎ¼Î¿Ï
+          steps: Î£ÎºÎ±Î»Î¿ÏÎ¬ÏÎ¹Î±
           trail: ÎÎ¹Î±Î´ÏÎ¿Î¼Î®
+          unclassified: ÎÏÎ±Î¾Î¹Î½ÏÎ¼Î·ÏÎ· ÎÎ´ÏÏ
+          unsurfaced: ÎÏÏÎ¼Î¿Ï ÏÏÏÎ¯Ï ÎÏÎ¯ÏÏÏÏÏÎ·
         historic: 
           archaeological_site: ÎÏÏÎ±Î¹Î¿Î»Î¿Î³Î¹ÎºÏÏ Î§ÏÏÎ¿Ï
+          battlefield: Î ÎµÎ´Î¯Î¿ Î¼Î¬ÏÎ·Ï
           building: ÎÏÎ¯ÏÎ¹Î¿
-          memorial: ÎÎ½Î·Î¼ÏÏÏÎ½Î¿
+          castle: ÎÎ¬ÏÏÏÎ¿
+          church: ÎÎºÎºÎ»Î·ÏÎ¯Î±
+          house: Î£ÏÎ¯ÏÎ¹
+          icon: ÎÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿
+          memorial: ÎÎ½Î·Î¼ÎµÎ¯Î¿
           mine: ÎÏÏÏÎµÎ¯Î¿
           monument: ÎÎ½Î·Î¼ÎµÎ¯Î¿
           museum: ÎÎ¿ÏÏÎµÎ¯Î¿
+          ruins: ÎÏÎµÎ¯ÏÎ¹Î±
+          tower: Î ÏÏÎ³Î¿Ï
+          wreck: ÎÎ±ÏÎ¬Î³Î¹Î¿
         landuse: 
           basin: ÎÎµÎºÎ±Î½Î¿ÏÎ­Î´Î¹Î¿
           cemetery: ÎÎ¿Î¹Î¼Î·ÏÎ®ÏÎ¹Î¿
           commercial: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÎ® Î ÎµÏÎ¹Î¿ÏÎ®
           farm: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
-          farmland: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
+          farmland: ÎÎµÏÏÎ³Î¹ÎºÎ® Î³Î·
           farmyard: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
           forest: ÎÎ¬ÏÎ¿Ï
           grass: ÎÏÎ±ÏÎ¯Î´Î¹
+          industrial: ÎÎ¹Î¿Î¼Î·ÏÎ±Î½Î¹ÎºÎ® Î ÎµÏÎ¹Î¿ÏÎ®
+          meadow: ÎÎ¹Î²Î¬Î´Î¹
           military: Î£ÏÏÎ±ÏÎ¹ÏÏÎ¹ÎºÎ® Î ÎµÏÎ¹Î¿ÏÎ®
           mine: ÎÏÏÏÎµÎ¯Î¿
           mountain: ÎÎ¿ÏÎ½Ï
@@ -451,6 +606,8 @@ el:
           plaza: Î Î»Î±ÏÎµÎ¯Î±
           quarry: ÎÎ±ÏÎ¿Î¼ÎµÎ¯Î¿
           railway: Î£Î¹Î´Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
+          recreation_ground: Î§ÏÏÎ¿Ï ÎÎ½Î±ÏÏÏÎ®Ï
+          reservoir: Î¤Î±Î¼Î¹ÎµÏÏÎ®ÏÎ±Ï
           residential: ÎÎ±ÏÎ¿Î¹ÎºÎ·Î¼Î­Î½Î· Î ÎµÏÎ¹Î¿ÏÎ®
           vineyard: ÎÎ¼ÏÎ­Î»Î¹
           wood: ÎÎ· ÏÏÎ¿ÏÎµÎ³Î¼Î­Î½Î¿ Î´Î¬ÏÎ¿Ï
@@ -462,25 +619,32 @@ el:
           miniature_golf: ÎÎ¯Î½Î¹ ÎÎºÎ¿Î»Ï
           park: Î Î¬ÏÎºÎ¿
           playground: Î Î±Î¹Î´Î¹ÎºÎ® Î§Î±ÏÎ¬
+          recreation_ground: Î§ÏÏÎ¿Ï ÎÎ½Î±ÏÏÏÎ®Ï
           sports_centre: ÎÎ¸Î»Î·ÏÎ¹ÎºÏ ÎÎ­Î½ÏÏÎ¿
           stadium: Î£ÏÎ¬Î´Î¹Î¿
           swimming_pool: Î Î¹ÏÎ¯Î½Î±
         natural: 
+          bay: ÎÏÎ»ÏÎ¿Ï
           beach: Î Î±ÏÎ±Î»Î¯Î±
           cape: ÎÎºÏÏÏÎ®ÏÎ¹Î¿
           cave_entrance: ÎÎ¯ÏÎ¿Î´Î¿Ï Î£ÏÎ·Î»Î¹Î¬Ï
           channel: ÎÎ±Î½Î¬Î»Î¹
           cliff: ÎÎºÏÎµÎ¼ÏÏ
+          coastline: ÎÎºÏÎ¿Î³ÏÎ±Î¼Î¼Î®
           crater: ÎÏÎ±ÏÎ®ÏÎ±Ï
           feature: Î§Î±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ
           fjord: Î¦Î¹ÏÏÎ´
+          geyser: ÎÎµÏÎ¼Î¿ÏÎ¯Î´Î±ÎºÎ±Ï
           glacier: Î Î±Î³ÎµÏÏÎ½Î±Ï
           hill: ÎÏÏÎ¿Ï
           island: ÎÎ·ÏÎ¯
+          land: ÎÎ·ÏÎ¬
           marsh: ÎÎ¬Î»ÏÎ¿Ï
           mud: ÎÎ¬ÏÏÎ·
           peak: ÎÎ¿ÏÏÏÎ®
+          point: Î£Î·Î¼ÎµÎ¯Î¿
           reef: ÎÏÎ±Î»Î¿Ï
+          ridge: Î£ÎºÏÏÎµÎ»Î¿Ï
           river: Î Î¿ÏÎ¬Î¼Î¹
           rock: ÎÏÎ¬ÏÎ¿Ï
           strait: Î Î¿ÏÎ¸Î¼ÏÏ
@@ -488,15 +652,16 @@ el:
           valley: ÎÎ¿Î¹Î»Î¬Î´Î±
           volcano: ÎÏÎ±Î¯ÏÏÎµÎ¹Î¿
           water: ÎÎµÏÏ
+          wetland: Î¥Î³ÏÏÏÎ¿ÏÎ¿Ï
           wetlands: Î¥Î³ÏÏÏÎ¿ÏÎ¿Î¹
-          wood: ÎÎ· ÏÏÎ¿ÏÎµÎ³Î¼Î­Î½Î¿ Î´Î¬ÏÎ¿Ï
+          wood: ÎÎ¬ÏÎ¿Ï
         place: 
           airport: ÎÎµÏÎ¿Î´ÏÏÎ¼Î¹Î¿
           city: Î ÏÎ»Î·
           country: Î§ÏÏÎ±
           county: ÎÎ¿Î¼Î·ÏÎµÎ¯Î±
           farm: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
-          hamlet: Î§ÏÏÎ¹Î¿ÏÎ´Î¬ÎºÎ¹
+          hamlet: ÎÎ¹ÎºÎ¹ÏÎ¼ÏÏ
           house: Î£ÏÎ¯ÏÎ¹
           houses: Î£ÏÎ¯ÏÎ¹Î±
           island: ÎÎ·ÏÎ¯
@@ -509,51 +674,88 @@ el:
           state: Î Î¿Î»Î¹ÏÎµÎ¯Î±
           subdivision: Î¥ÏÎ¿Î´Î¹Î±Î¯ÏÎµÏÎ·
           suburb: Î ÏÎ¿Î¬ÏÏÎ¹Î¿
-          town: ÎÎ¹ÎºÏÎ® Î ÏÎ»Î·
+          town: ÎÏÎ¼ÏÏÎ¿Î»Î·
           village: Î§ÏÏÎ¹Ï
         railway: 
           abandoned: ÎÎ³ÎºÎ±ÏÎ±Î»ÎµÎ»ÎµÎ¹Î¼Î¼Î­Î½Î¿Ï Î£Î¹Î´Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
           construction: Î£Î¹Î´Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï Î¥ÏÏ ÎÎ±ÏÎ±ÏÎºÎµÏÎ®
           disused: Î£Î¹Î´Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï ÎÎºÏÏÏ Î§ÏÎ®ÏÎ·Ï
           disused_station: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ Î£ÏÎ±Î¸Î¼ÏÏ ÎÎºÏÏÏ Î§ÏÎ®ÏÎ·Ï
+          halt: Î£ÏÎ±Î¸Î¼ÏÏ Î¤ÏÎ±Î¯Î½Î¿Ï
           historic_station: ÎÏÏÎ¿ÏÎ¹ÎºÎ® Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ Î£ÏÎ±Î¸Î¼ÏÏ
+          level_crossing: ÎÏÏÏÎµÎ´Î· ÎÎ¹Î¬Î²Î±ÏÎ·
           station: Î£Î¹Î´Î·ÏÎ¿Î´ÏÎ¿Î¼Î¹ÎºÏÏ Î£ÏÎ±Î¸Î¼ÏÏ
           subway: Î£ÏÎ±Î¸Î¼ÏÏ ÎÎµÏÏÏ
           subway_entrance: ÎÎ¯ÏÎ¿Î´Î¿Ï Î£ÏÎ¿ ÎÎµÏÏÏ
+          tram: Î¤ÏÎ±Î¼
           tram_stop: Î£ÏÎ¬ÏÎ· Î¤ÏÎ±Î¼
         shop: 
           bakery: Î¦Î¿ÏÏÎ½Î¿Ï
+          bicycle: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î Î¿Î´Î·Î»Î¬ÏÏÎ½
           books: ÎÎ¹Î²Î»Î¹Î¿ÏÏÎ»ÎµÎ¯Î¿
           butcher: ÎÏÎµÎ¿ÏÏÎ»ÎµÎ¯Î¿
           car_parts: ÎÎ¾Î±ÏÏÎ®Î¼Î±ÏÎ± ÎÏÏÎ¿ÎºÎ¹Î½Î®ÏÎ¿Ï
+          car_repair: ÎÏÎ¹ÏÎºÎµÏÎ® ÎÏÏÎ¿ÎºÎ¹Î½Î®ÏÏÎ½
+          carpet: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î§Î±Î»Î¹ÏÎ½
+          chemist: Î§Î·Î¼Î¹ÎºÏÏ
+          clothes: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¡Î¿ÏÏÏÎ½
+          computer: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¥ÏÎ¿Î»Î¿Î³Î¹ÏÏÏÎ½
           confectionery: ÎÎ±ÏÎ±ÏÎ¿ÏÎ»Î±ÏÏÎ¹ÎºÎ®
+          convenience: Î Î±Î½ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
+          copyshop: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÏÏÏÎ¿Î±Î½ÏÎ¹Î³ÏÎ¬ÏÏÎ½
+          cosmetics: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎÎ±Î»Î»ÏÎ½ÏÎ¹ÎºÏÎ½
+          department_store: Î Î¿Î»ÏÎºÎ±ÏÎ¬ÏÏÎ·Î¼Î±
+          doityourself: ÎÎ´Î¹Î¿ÎºÎ±ÏÎ±ÏÎºÎµÏÎ­Ï
           drugstore: Î¦Î±ÏÎ¼Î±ÎºÎµÎ¯Î¿
           dry_cleaning: Î£ÏÎµÎ³Î½Ï ÎÎ±Î¸Î¬ÏÎ¹ÏÎ¼Î±
+          electronics: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎÎ»ÎµÎºÏÏÎ¿Î½Î¹ÎºÏÎ½
           fish: ÎÏÎ¸ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
-          florist: ÎÎ½Î¸Î¿ÎºÎ¿Î¼ÎµÎ¯Î¿
+          florist: ÎÎ½Î¸Î¿ÏÏÎ»Î·Ï
+          food: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¤ÏÎ¿ÏÎ¯Î¼ÏÎ½
+          furniture: ÎÏÎ¹ÏÎ»Î±
           greengrocer: ÎÎ±Î½Î¬Î²Î·Ï
           hairdresser: ÎÎ¿Î¼Î¼ÏÏÎ®ÏÎ¹Î¿
           insurance: ÎÏÏÎ±Î»Î¹ÏÏÎ¹ÎºÎ®
           jewelry: ÎÎ¿ÏÎ¼Î·Î¼Î±ÏÎ¿ÏÏÎ»ÎµÎ¯Î¿
           kiosk: Î ÎµÏÎ¯ÏÏÎµÏÎ¿
+          laundry: Î Î»ÏÎ½ÏÎ®ÏÎ¹Î¿
           mall: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÏ ÎÎ­Î½ÏÏÎ¿
+          market: ÎÎ³Î¿ÏÎ¬
+          music: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎÎ¿ÏÏÎ¹ÎºÎ®Ï
+          optician: ÎÏÏÎ¹ÎºÏÏ
+          photo: Î¦ÏÏÎ¿Î³ÏÎ±ÏÎµÎ¯Î¿
+          shoes: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î¥ÏÎ¿Î´Î·Î¼Î¬ÏÏÎ½
           sports: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± ÎÎ¸Î»Î·ÏÎ¹ÎºÏÎ½
           supermarket: Î£Î¿ÏÏÎµÏÎ¼Î¬ÏÎºÎµÏ
+          toys: ÎÎ±ÏÎ¬ÏÏÎ·Î¼Î± Î Î±Î¹Î³Î½Î¹Î´Î¹ÏÎ½
           travel_agency: Î¤Î±Î¾Î¹Î´Î¹ÏÏÎ¹ÎºÏ Î ÏÎ±ÎºÏÎ¿ÏÎµÎ¯Î¿
         tourism: 
+          guest_house: ÎÎµÎ½ÏÎ½Î±Ï
           hotel: ÎÎµÎ½Î¿Î´Î¿ÏÎµÎ¯Î¿
+          information: Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ
           museum: ÎÎ¿ÏÏÎµÎ¯Î¿
+          picnic_site: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î³Î¹Î± ÏÎ¹Îº-Î½Î¹Îº
+          theme_park: ÎÎµÎ¼Î±ÏÎ¹ÎºÏ Î Î¬ÏÎºÎ¿
+          valley: ÎÎ¿Î¹Î»Î¬Î´Î±
+          zoo: ÎÏÎ¿Î»Î¿Î³Î¹ÎºÏÏ ÎºÎ®ÏÎ¿Ï
         waterway: 
           boatyard: ÎÎ±ÏÏÎ·Î³ÎµÎ¯Î¿
           dam: Î¦ÏÎ¬Î³Î¼Î±
           ditch: Î§Î±Î½ÏÎ¬ÎºÎ¹
           river: Î Î¿ÏÎ¬Î¼Î¹
-          waterfall: ÎÎ±ÏÎ±ÏÎ¬ÏÏÎ·Ï
+          riverbank: ÎÏÎ¸Î· ÏÎ¿ÏÎ±Î¼Î¿Ï
+          stream: Î¡Î­Î¼Î±
+          waterfall: ÎÎ±ÏÎ±ÏÏÎ¬ÏÏÎ·Ï
   javascripts: 
     site: 
       edit_disabled_tooltip: ÎÎ¬Î½ÎµÏÎµ Î¼ÎµÎ³Î­Î¸ÏÎ½ÏÎ· Î³Î¹Î± Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ·
       edit_tooltip: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ¿Ï ÏÎ¬ÏÏÎ·
+      edit_zoom_alert: Î ÏÎ­ÏÎµÎ¹ Î½Î± Î¼ÎµÎ³ÎµÎ¸ÏÎ½ÎµÏÎµ Î³Î¹Î± Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÏÎ¿ ÏÎ¬ÏÏÎ·
+      history_disabled_tooltip: ÎÎµÎ³Î­Î¸ÏÎ½ÏÎ· Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¹Ï Î±Î»Î»Î±Î³Î­Ï Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®
+      history_tooltip: Î ÏÎ¿Î²Î¿Î»Î® Î±Î»Î»Î±Î³ÏÎ½ Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®
+      history_zoom_alert: Î ÏÎ­ÏÎµÎ¹ Î½Î± Î¼ÎµÎ³ÎµÎ¸ÏÎ½ÎµÏÎµ Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¹Ï Î±Î»Î»Î±Î³Î­Ï Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Î½ ÏÎµÏÎ¹Î¿ÏÎ®
   layouts: 
+    community_blogs: ÎÏÏÎ¿Î»ÏÎ³Î¹Î± ÏÎ·Ï ÎÎ¿Î¹Î½ÏÏÎ·ÏÎ±Ï
     community_blogs_title: Blogs Î±ÏÏ ÏÎ± Î¼Î­Î»Î· ÏÎ·Ï ÎºÎ¿Î¹Î½ÏÏÎ·ÏÎ±Ï ÏÎ¿Ï OpenStreetMap
     copyright: Î Î½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± & ÎÎ´ÎµÎ¹Î±Ï ÏÏÎ®ÏÎ·Ï
     documentation: Î¤ÎµÎºÎ¼Î·ÏÎ¯ÏÏÎ·
@@ -561,15 +763,22 @@ el:
     edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
     edit_with: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î¼Îµ %{editor}
     export: ÎÎ¾Î±Î³ÏÎ³Î®
+    export_tooltip: ÎÎ¾Î±Î³ÏÎ³Î® Î´ÎµÎ´Î¿Î¼Î­Î½ÏÎ½ ÏÎ¬ÏÏÎ·
     foundation: ÎÎ´ÏÏÎ¼Î±
     foundation_title: Î¤Î¿ ÎÎ´ÏÏÎ¼Î± OpenStreetMap
+    gps_traces: ÎÏÎ½Î· GPS
+    gps_traces_tooltip: ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î¹ÏÎ½ÏÎ½ GPS
     help: ÎÎ¿Î®Î¸ÎµÎ¹Î±
     help_centre: ÎÎ­Î½ÏÏÎ¿ ÎÎ¿Î®Î¸ÎµÎ¹Î±Ï
     help_title: ÎÏÏÎ¿ÏÎµÎ»Î¯Î´Î± Î²Î¿Î®Î¸ÎµÎ¹Î±Ï Î³Î¹Î± ÏÎ¿ Î­ÏÎ³Î¿
     history: ÎÏÏÎ¿ÏÎ¹ÎºÏ
     home: ÎºÏÏÎ¹Î± ÏÎµÎ»Î¯Î´Î±
     inbox: ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± (%{count})
-    intro_1: Î OpenStreetMap ÎµÎ¯Î½Î±Î¹ Î´ÏÏÎµÎ±Î½, ÎµÏÎµÎ¾ÎµÏÎ³Î¬ÏÎ¹Î¼Î¿Ï ÏÎ¬ÏÏÎ·Ï Î¿Î»ÏÎºÎ»Î·ÏÎ¿Ï ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï. ÎÎ¯Î½Î±Î¹ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ±ÏÎ¼Î­Î½Î¿ Î±ÏÏ Î±Î½Î¸ÏÏÏÎ¿ÏÏ ÏÎ±Î½ ÎºÎ¹ ÎµÏÎ¬Ï.
+    inbox_tooltip: 
+      one: Î¤Î± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± ÏÎ±Ï ÏÎµÏÎ¹Î­ÏÎ¿ÏÎ½ 1 Î±Î´Î¹Î¬Î²Î±ÏÏÎ¿ Î¼Î®Î½ÏÎ¼Î±
+      other: Î¤Î± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± ÏÎ±Ï ÏÎµÏÎ¹Î­ÏÎ¿ÏÎ½ %{count} Î±Î´Î¹Î¬Î²Î±ÏÏÎ± Î¼Î·Î½ÏÎ¼Î±ÏÎ±
+      zero: Î¤Î± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± ÏÎ±Ï Î´ÎµÎ½ ÏÎµÏÎ¹Î­ÏÎ¿ÏÎ½ ÎºÎ±Î½Î­Î½Î± Î±Î´Î¹Î¬Î²Î±ÏÏÎ¿ Î¼Î®Î½ÏÎ¼Î±
+    intro_1: Î OpenStreetMap ÎµÎ¯Î½Î±Î¹ Î´ÏÏÎµÎ¬Î½, ÎµÏÎµÎ¾ÎµÏÎ³Î¬ÏÎ¹Î¼Î¿Ï ÏÎ¬ÏÏÎ·Ï Î¿Î»ÏÎºÎ»Î·ÏÎ¿Ï ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï. ÎÎ¯Î½Î±Î¹ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ±ÏÎ¼Î­Î½Î¿ Î±ÏÏ Î±Î½Î¸ÏÏÏÎ¿ÏÏ ÏÎ±Î½ ÎºÎ¹ ÎµÏÎ¬Ï.
     intro_2: Î¤Î¿ OpenStreetMap ÏÎ¬Ï ÎµÏÎ¹ÏÏÎ­ÏÎµÎ¹ Î½Î± ÏÏÎ¿Î²Î¬Î»ÎµÏÎµ, Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ± Î³ÎµÏÎ³ÏÎ±ÏÎ¹ÎºÎ¬ Î´ÎµÎ´Î¿Î¼Î­Î½Î± Î¼Îµ Î­Î½Î± ÏÏÎ½ÎµÏÎ³Î±ÏÎ¹ÎºÏ ÏÏÏÏÎ¿ Î±ÏÏ Î¿ÏÎ¿ÏÎ´Î®ÏÎ¿ÏÎµ ÏÏÎ· ÎÎ·.
     intro_3_partners: Î²Î¯ÎºÎ¹
     log_in: ÎµÎ¯ÏÎ¿Î´Î¿Ï
@@ -578,6 +787,9 @@ el:
       alt_text: ÎÎ¿Î³ÏÏÏÏÎ¿ OpenStreetMap
     logout: Î­Î¾Î¿Î´Î¿Ï
     logout_tooltip: ÎÎ¾Î¿Î´Î¿Ï
+    make_a_donation: 
+      text: ÎÎ¬Î½ÏÎµ Î¼Î¹Î± ÎÏÏÎµÎ¬
+      title: Î¥ÏÎ¿ÏÏÎ®ÏÎ¹Î¾Îµ ÏÎ¿ OpenStreetMap Î¼Îµ Î´ÏÏÎµÎ¬ ÏÏÎ·Î¼Î¬ÏÏÎ½
     sign_up: ÎµÎ³Î³ÏÎ±ÏÎ®
     sign_up_tooltip: ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï Î³Î¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
     tag_line: Î ÎÎ»ÎµÏÎ¸ÎµÏÎ¿Ï Î Î±Î³ÎºÏÏÎ¼Î¹Î¿Ï Î§Î¬ÏÏÎ·Ï ÎÎ¯ÎºÎ¹
@@ -591,23 +803,73 @@ el:
     wiki_title: ÎÏÏÎ¿ÏÎµÎ»Î¯Î´Î± Î²Î¯ÎºÎ¹ Î³Î¹Î± ÏÎ¿ Î­ÏÎ³Î¿
   license_page: 
     foreign: 
+      english_link: ÏÎ·Ï ÏÏÏÏÏÏÏÏÎ·Ï ÎÎ³Î³Î»Î¹ÎºÎ®Ï
+      text: Î£Îµ ÏÎµÏÎ¯ÏÏÏÏÎ· Î´Î¹Î­Î½ÎµÎ¾Î·Ï Î¼ÎµÏÎ±Î¾Ï Î±ÏÏÎ®Ï ÏÎ·Ï Î¼ÎµÏÎ±ÏÏÎ±ÏÎ¼Î­Î½Î·Ï ÏÎµÎ»Î¯Î´Î±Ï ÎºÎ±Î¹ %{english_original_link}, Î ÎÎ³Î³Î»Î¹ÎºÎ® ÏÎµÎ»Î¯Î´Î± Î¸Î± ÏÏÎ¿ÏÎ¹Î¼Î·Î¸ÎµÎ¯
       title: Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ Î±ÏÏÎ® ÏÎ·Î½ Î¼ÎµÏÎ¬ÏÏÎ±ÏÎ·
     native: 
       mapping_link: Î±ÏÏÎ¯ÏÏÎµ ÏÎ· ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ·
       native_link: ÎµÎ»Î»Î·Î½Î¹ÎºÎ® Î­ÎºÎ´Î¿ÏÎ·
-      text: Î ÏÎ¿Î²Î¬Î»Î»ÎµÏÎµ Î· Î±Î³Î³Î»Î¹ÎºÎ® Î­ÎºÎ´Î¿ÏÎ· ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÏÎ½ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î¬ÏÏÎ½. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹ÏÏÏÎ­ÏÎµÏÎµ ÏÏÎ·Î½ %{native_link} ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï Î® Î½Î± ÏÏÎ±Î¼Î±ÏÎ®ÏÎµÏÎµ Î½Î± Î´Î¹Î±Î²Î¬Î¶ÎµÏÎµ Î³Î¹Î± ÏÎ± ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± ÎºÎ±Î¹ %{mapping_link}.
+      text: Î ÏÎ¿Î²Î¬Î»Î»ÎµÏÎµ Î· Î±Î³Î³Î»Î¹ÎºÎ® Î­ÎºÎ´Î¿ÏÎ· ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÏÎ½ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î¬ÏÏÎ½. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹ÏÏÏÎ­ÏÎµÏÎµ ÏÏÎ·Î½ %{native_link} ÏÎ·Ï ÏÎµÎ»Î¯Î´Î±Ï Î® Î½Î± ÏÏÎ±Î¼Î±ÏÎ®ÏÎµÏÎµ Î½Î± Î´Î¹Î±Î²Î¬Î¶ÎµÏÎµ Î³Î¹Î± ÏÎ± ÏÎ½ÎµÏÎ¼Î±ÏÎ¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏÎ¼Î±ÏÎ± ÎºÎ±Î¹ Î½Î± %{mapping_link}.
       title: Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ Î±ÏÏÎ®Î½ ÏÎ· ÏÎµÎ»Î¯Î´Î±
   message: 
+    inbox: 
+      date: ÎÎ¼/Î½Î¯Î±
+      from: ÎÏÏ
+      my_inbox: Î¤Î± ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± Î¼Î¿Ï
+      outbox: ÎµÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î±
+      subject: ÎÎ­Î¼Î±
+      title: ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î±
+      you_have: ÎÏÎµÎ¹Ï %{new_count} Î½Î­Î± Î¼Î·Î½ÏÎ¼Î±ÏÎ± ÎºÎ±Î¹ %{old_count} ÏÎ±Î»Î¹Î¬ Î¼Î·Î½ÏÎ¼Î±ÏÎ±
     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_message: 
+      heading: ÎÎ±Î½Î­Î½Î± ÏÎ­ÏÎ¿Î¹Î¿ Î¼Î®Î½ÏÎ¼Î±
+      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: Î ÏÎ¿Ï
+    read: 
+      back_to_inbox: Î Î¯ÏÏ ÏÏÎ± ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î±
+      back_to_outbox: Î Î¯ÏÏ ÏÏÎ± ÎÎ¾ÎµÏÏÏÎ¼ÎµÎ½Î±
+      date: ÎÎ¼/Î½Î¯Î±
+      from: ÎÏÏ
+      reply_button: ÎÏÎ¬Î½ÏÎ·ÏÎ·
+      subject: ÎÎ­Î¼Î±
+      title: ÎÎ½Î¬Î³Î½ÏÏÎ· Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï
+      to: Î ÏÎ¿Ï
+      unread_button: Î£Î®Î¼Î±Î½ÏÎ· ÏÏ Î±Î´Î¹Î¬Î²Î±ÏÏÎ¿
     sent_message_summary: 
       delete_button: ÎÎ¹Î±Î³ÏÎ±ÏÎ®
   notifier: 
     diary_comment_notification: 
       footer: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ ÏÏÏÎ»Î¹Î¿ ÏÏÎ¿ %{readurl} ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ¿Î»Î¹Î¬ÏÎµÏÎµ ÏÏÎ¿ %{commenturl} Î® Î½Î± Î±ÏÎ±Î½ÏÎ®ÏÎµÏÎµ ÏÏÎ¿ %{replyurl}
-      header: "Î ÏÏÎ®ÏÏÎ·Ï %{from_user} Î­ÏÎµÎ¹ ÏÏÎ¿Î»Î¹Î¬ÏÎµÎ¹ ÏÎ· ÏÏÏÏÏÎ±ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Î¿Ï ÏÎ±Ï ÏÏÎ¿ OpenStreetMap Î¼Îµ ÏÎ¿ Î¸Î­Î¼Î± %{subject}:"
-      hi: ÎÎµÎ¹Î± %{to_user},
+      header: "Î ÏÏÎ®ÏÏÎ·Ï %{from_user} Î­ÏÎµÎ¹ ÏÏÎ¿Î»Î¹Î¬ÏÎµÎ¹ ÏÎ· ÏÏÏÏÏÎ±ÏÎ· ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ±Ï ÏÏÎ¿ OpenStreetMap Î¼Îµ Î¸Î­Î¼Î± %{subject}:"
+      hi: ÎÎµÎ¹Î± ÏÎ¿Ï %{to_user},
       subject: "[OpenStreetMap] Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÏÎ¿Î»Î¯Î±ÏÎµ ÏÎ·Î½ ÎºÎ±ÏÎ±ÏÏÏÎ¹ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï ÏÎ±Ï"
+    email_confirm: 
+      subject: "[OpenStreetMap] ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï"
     email_confirm_html: 
       greeting: ÎÎµÎ¹Î±,
     email_confirm_plain: 
@@ -615,10 +877,17 @@ el:
     friend_notification: 
       befriend_them: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± ÏÎ¿ÏÏ ÏÏÎ¿ÏÎ¸Î­ÏÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿ÏÏ ÏÏÎ¿ %{befriendurl}.
       had_added_you: Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÎ±Ï ÏÏÏÏÎ¸ÎµÏÎµ ÏÏ ÏÎ¯Î»Î¿ ÏÏÎ¿ OpenStreetMap.
-      see_their_profile: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ¿ÏÏ ÏÏÎ¿ %{userurl}.
+      see_their_profile: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î» ÏÎ¿Ï ÏÏÎ¿ %{userurl}.
       subject: "[OpenStreetMap] Î ÏÏÎ®ÏÏÎ·Ï %{user} ÏÎ±Ï ÏÏÎ¿ÏÎ¸Î­ÏÎµ ÏÏ ÏÎ¯Î»Î¿"
     gpx_notification: 
+      and_no_tags: ÏÏÏÎ¯Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ
+      and_the_tags: ÎºÎ±Î¹ ÏÎ¹Ï ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÎµÏÎ¹ÎºÎ­ÏÎµÏ
+      failure: 
+        failed_to_import: "ÎÏÎ­ÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î®. Î¤Î¿ ÏÏÎ¬Î»Î¼Î± ÎµÎ¯Î½Î±Î¹:"
+        subject: "[OpenStreetMap] Î ÎµÎ¹ÏÎ±Î³ÏÎ³Î® GPX Î±ÏÎ­ÏÏÏÎµ"
       greeting: ÎÎµÎ¹Î±,
+      with_description: Î¼Îµ ÏÎµÏÎ¹Î³ÏÎ±ÏÎ®
+      your_gpx_file: ÎÎ¿Î¹Î¬Î¶ÎµÎ¹ Î¼Îµ Î´Î¹ÎºÏ ÏÎ±Ï Î±ÏÏÎµÎ¯Î¿ GPX
     lost_password_html: 
       greeting: ÎÎµÎ¹Î±,
     lost_password_plain: 
@@ -627,22 +896,41 @@ el:
       footer1: ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎµÏÎ¯ÏÎ·Ï Î½Î± Î´Î¹Î±Î²Î¬ÏÎµÏÎµ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿ %{readurl}
       footer2: ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± Î±ÏÎ±Î½ÏÎ®ÏÎµÏÎµ ÏÏÎ¿ %{replyurl}
       header: "Î ÏÏÎ®ÏÏÎ·Ï %{from_user} ÏÎ¬Ï Î­ÏÎµÎ¹ ÏÏÎµÎ¯Î»ÎµÎ¹ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î¼Î­ÏÏ ÏÎ¿Ï OpenStreetMap Î¼Îµ Î¸Î­Î¼Î± %{subject}:"
-      hi: ÎÎµÎ¹Î± ÏÎ±Ï %{to_user},
+      hi: ÎÎµÎ¹Î± ÏÎ¿Ï %{to_user},
     signup_confirm: 
       subject: "[OpenStreetMap] ÎÏÎ¹Î²ÎµÎ²Î±Î¹ÏÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï"
     signup_confirm_html: 
+      click_the_link: ÎÎ¬Î½ ÏÏÏÎºÎµÎ¹ÏÎ±Î¹ Î³Î¹Î± ÏÎ±Ï, ÎÎ±Î»ÏÏ Î®ÏÎ¸Î±ÏÎµ! ÎÎ¬Î½ÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ, Î³Î¹Î± Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ±Ï ÎºÎ±Î¹ Î´Î¹Î±Î²Î¬ÏÏÎµ Î³Î¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ OpenStreetMap
       greeting: ÎÎµÎ¹Î±!
+      hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÎµÎ»ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÎµÏÏ) Î¸Î­Î»ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÏÎ¿
+      introductory_video: ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÎµÏÎµ Î­Î½Î± %{introductory_video_link}.
+      more_videos: Î¥ÏÎ¬ÏÏÎ¿ÏÎ½ {more_videos_link} %.
+      more_videos_here: ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î²Î¯Î½ÏÎµÎ¿ ÎµÎ´Ï
+      video_to_openstreetmap: ÎµÎ¹ÏÎ±Î³ÏÎ³Î¹ÎºÏ Î²Î¯Î½ÏÎµÎ¿ Î³Î¹Î± ÏÎ¿ OpenStreetMap
     signup_confirm_plain: 
+      click_the_link_1: ÎÎ½ Î±ÏÏÏÏ ÎµÎ¯ÏÎ±Î¹ ÎµÏÏ, ÎºÎ±Î»ÏÏ Î®ÏÎ¸ÎµÏ! Î Î±ÏÎ±ÎºÎ±Î»Ï ÎºÎ¬Î½Îµ ÎºÎ»Î¯Îº ÏÏÎ¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿ Î±ÏÏ ÎºÎ¬ÏÏ ÏÏÏÎµ Î½Î± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¸ÎµÎ¯
+      click_the_link_2: Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ¿Ï ÎºÎ±Î¹ Î´Î¹Î¬Î²Î±ÏÎµ Î³Î¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ OpenStreetMap.
       greeting: ÎÎµÎ¹Î±!
+      hopefully_you: ÎÎ¬ÏÎ¿Î¹Î¿Ï (ÎµÎ»ÏÎ¯Î¶Î¿ÏÎ¼Îµ ÎµÏÏ) Î¸Î­Î»ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÏÎ¿
+      introductory_video: "ÎÏÎ¿ÏÎµÎ¯Ï Î½Î± ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î®ÏÎµÎ¹Ï Î­Î½Î± ÎµÎ¹ÏÎ±Î³ÏÎ³Î¹ÎºÏ Î²Î¯Î½ÏÎµÎ¿ Î³Î¹Î± ÏÎ¿ OpenStreetMap ÎµÎ´Ï:"
+      more_videos: "Î¥ÏÎ¬ÏÏÎ¿ÏÎ½ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î²Î¯Î½ÏÎµÎ¿ ÎµÎ´Ï:"
+      the_wiki: "ÎÎ¹Î¬Î²Î±ÏÎµ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ¿ OpenStreetMap ÏÏÎ¿ wiki:"
   oauth_clients: 
     edit: 
       submit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ·Ï Î±Î¯ÏÎ·ÏÎ®Ï ÏÎ±Ï
+    form: 
+      name: ÎÎ½Î¿Î¼Î±
+      required: ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹
     index: 
+      application: ÎÎ½Î¿Î¼Î± ÎÏÎ±ÏÎ¼Î¿Î³Î®Ï
       register_new: ÎÎ³Î³ÏÎ±ÏÎ® Î±Î¯ÏÎ·ÏÎ®Ï
       revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ·!
     new: 
       submit: ÎÎ³Î³ÏÎ±ÏÎ®
+  printable_name: 
+    with_id: "%{id}"
+    with_name: "%{name} (%{id})"
   site: 
     edit: 
       anon_edits_link_text: ÎÎ¬Î¸ÎµÏÎµ Î³Î¹Î±ÏÎ¯ ÏÏÎ¼Î²Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ.
@@ -650,7 +938,7 @@ el:
       potlatch2_unsaved_changes: ÎÏÎµÏÎµ Î¼Î· Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼Î­Î½ÎµÏ Î±Î»Î»Î±Î³Î­Ï. (ÎÎ¹Î± Î½Î± Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎµÏÎµ ÏÏÎ¿ Potlatch 2, ÏÏÎ­ÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Â«ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Â».)
       user_page_link: ÏÎµÎ»Î¯Î´Î± ÏÏÎ®ÏÏÎ·
     index: 
-      js_1: ÎÎ¯ÏÎµ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï ÏÎ¿Ï Î´ÎµÎ½ ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ JavaScript Î® Î­ÏÎµÏÎµ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹ ÏÎ¿ JavaScript.
+      js_1: ÎÎ¯ÏÎµ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï ÏÎ¿Ï Î´ÎµÎ½ ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹ JavaScript Î® Î­ÏÎµÏÎµ Î±ÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹ ÏÎ·Î½ JavaScript.
       license: 
         notice: Î¥ÏÏ ÏÎ·Î½ Î¬Î´ÎµÎ¹Î± ÏÎ¿Ï %{license_name} Î¬Î´ÎµÎ¹Î± Î±ÏÏ ÏÎ¿ %{project_name} ÎºÎ±Î¹ ÏÎ¿ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï.
         project_name: Î­ÏÎ³Î¿ OpenStreetMap
@@ -667,12 +955,14 @@ el:
           commercial: ÎÎ¼ÏÎ¿ÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ®
           common: 
             1: Î»Î¹Î²Î¬Î´Î¹
+          construction: ÎÏÏÎ¼Î¿Î¹ ÏÏÏ ÎºÎ±ÏÎ±ÏÎºÎµÏÎ®
           farm: ÎÎ³ÏÏÎºÏÎ·Î¼Î±
           forest: ÎÎ¬ÏÎ¿Ï
           golf: ÎÎ®ÏÎµÎ´Î¿ Î³ÎºÎ¿Î»Ï
           industrial: ÎÎ¹Î¿Î¼Î·ÏÎ±Î½Î¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ®
           lake: 
             - ÎÎ¯Î¼Î½Î·
+            - Î¤Î±Î¼Î¹ÎµÏÏÎ®ÏÎ±Ï
           military: Î£ÏÏÎ±ÏÎ¹ÏÏÎ¹ÎºÎ® ÏÎµÏÎ¹Î¿ÏÎ®
           motorway: ÎÏÏÎ¿ÎºÎ¹Î½Î·ÏÏÎ´ÏÎ¿Î¼Î¿Ï
           park: Î Î¬ÏÎºÎ¿
@@ -693,7 +983,7 @@ el:
           tourist: Î¤Î¿ÏÏÎ¹ÏÏÎ¹ÎºÏ Î±Î¾Î¹Î¿Î¸Î­Î±ÏÎ¿
           tram: 
             1: ÏÏÎ±Î¼
-          wood: ÎÎ· ÏÏÎ¿ÏÎµÎ³Î¼Î­Î½Î¿ Î´Î¬ÏÎ¿Ï
+          wood: Î¦ÏÏÎ¹ÎºÏ ÎÎ¬ÏÎ¿Ï
     search: 
       search: ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ·
       search_help: "ÏÎ±ÏÎ±Î´ÎµÎ¯Î³Î¼Î±ÏÎ±: Â«AlkmaarÂ», Â«Regent Street, CambridgeÂ», Â«CB2 5AQÂ», Î® Â«ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î± ÎºÎ¿Î½ÏÎ¬ ÏÏÎ¿ LÃ¼nenÂ» <a href='http://wiki.openstreetmap.org/wiki/Search'>ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± ÏÎ±ÏÎ±Î´ÎµÎ¯Î³Î¼Î±ÏÎ±...</a>"
@@ -707,45 +997,74 @@ el:
       friendly: "%e %B %Y ÏÏÎ¹Ï %H:%M"
   trace: 
     edit: 
+      description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:"
       download: Î»Î®ÏÎ·
       edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       filename: "ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï:"
       map: ÏÎ¬ÏÏÎ·Ï
       owner: "ÎÎ´Î¹Î¿ÎºÏÎ®ÏÎ·Ï:"
       points: "Î£Î·Î¼ÎµÎ¯Î±:"
-      tags_help: Î¿ÏÎ¹Î¿Î¸ÎµÏÎ·Î¼Î­Î½Î¿ Î±ÏÏ ÏÎ± ÎºÏÎ¼Î¼Î±ÏÎ±
+      save_button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÎÎ»Î»Î±Î³ÏÎ½
+      tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
+      tags_help: Î¿ÏÎ¹Î¿Î¸ÎµÏÎ·Î¼Î­Î½Î¿ Î¼Îµ ÎºÏÎ¼Î¼Î±ÏÎ±
       visibility: "ÎÏÎ±ÏÏÏÎ·ÏÎ±:"
       visibility_help: ÏÎ¹ ÏÎ·Î¼Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ;
+    no_such_user: 
+      body: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±Î½Î­Î½Î±Ï ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± % {user}. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎµÎ»Î­Î³Î¾ÏÎµ ÏÎ·Î½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¯Î±, Î® Î¯ÏÏÏ Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î®ÏÎ±Î½ Î»Î¬Î¸Î¿Ï.
+      heading: Î ÏÏÎ®ÏÏÎ·Ï % {user} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹
+      title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï
     trace: 
+      by: Î±ÏÏ
       count_points: "%{count} ÏÎ·Î¼ÎµÎ¯Î±"
+      edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       edit_map: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î§Î¬ÏÏÎ·
       map: ÏÎ¬ÏÏÎ·Ï
       private: ÎÎÎÎ©Î¤ÎÎÎ
       public: ÎÎÎÎÎ£ÎÎ
+      view_map: Î ÏÎ¿Î²Î¿Î»Î® Î§Î¬ÏÏÎ·
     trace_form: 
-      description: Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®
+      description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:"
       help: ÎÎ¿Î®Î¸ÎµÎ¹Î±
-      tags: ÎÏÎ¹ÎºÎ­ÏÎµÏ
-      visibility: ÎÏÎ±ÏÏÏÎ·ÏÎ±
+      tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
+      tags_help: Î¿ÏÎ¹Î¿Î¸ÎµÏÎ·Î¼Î­Î½Î¿ Î¼Îµ ÎºÏÎ¼Î¼Î±ÏÎ±
+      upload_button: ÎÏÎ¿ÏÏÎ¿Î»Î®
+      visibility: "ÎÏÎ±ÏÏÏÎ·ÏÎ±:"
+      visibility_help: ÏÎ¹ ÏÎ·Î¼Î±Î¯Î½ÎµÎ¹ Î±ÏÏÏ;
     trace_optionals: 
       tags: ÎÏÎ¹ÎºÎ­ÏÎµÏ
+    trace_paging_nav: 
+      next: ÎÏÏÎ¼ÎµÎ½Î¿ Â»
+      previous: Â« Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿
     view: 
       description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:"
       download: Î»Î®ÏÎ·
       edit: ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       filename: "ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï:"
       map: ÏÎ¬ÏÏÎ·Ï
+      none: ÎÎ±Î½Î­Î½Î±
       owner: "ÎÎ´Î¹Î¿ÎºÏÎ®ÏÎ·Ï:"
+      points: "Î£Î·Î¼ÎµÎ¯Î±:"
       tags: "ÎÏÎ¹ÎºÎ­ÏÎµÏ:"
       visibility: "ÎÏÎ±ÏÏÏÎ·ÏÎ±:"
   user: 
     account: 
+      contributor terms: 
+        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
       current email address: "Î¤ÏÏÎ¹Î½Î® ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:"
+      delete image: ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      email never displayed publicly: (ÏÏÎ¹ Î´Î·Î¼ÏÏÎ¹Î± ÎµÎ¼ÏÎ¬Î½Î¹ÏÎ·)
+      flash update success: ÎÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎ®ÏÏÎ· ÎµÎ½Î·Î¼ÎµÏÏÎ¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏÎ¹ÏÏÏÎ¯Î±.
+      home location: "Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î£ÏÎ¹ÏÎ¹Î¿Ï:"
       image: "ÎÎ¹ÎºÏÎ½Î±:"
+      image size hint: (ÏÎµÏÏÎ¬Î³ÏÎ½ÎµÏ ÎµÎ¹ÎºÏÎ½ÎµÏ ÏÎ¿ÏÎ»Î¬ÏÎ¹ÏÏÎ¿Î½ 100 x 100 Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎ½ ÎºÎ±Î»ÏÏÎµÏÎ±)
+      keep image: ÎÎ¹Î±ÏÎ®ÏÎ·ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      latitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ ÏÎ»Î¬ÏÎ¿Ï:"
       longitude: "ÎÎµÏÎ³ÏÎ±ÏÎ¹ÎºÏ Î¼Î®ÎºÎ¿Ï:"
       my settings: ÎÎ¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¼Î¿Ï
       new email address: "ÎÎ­Î± ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:"
       new image: Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÎµÎ¹ÎºÏÎ½Î±Ï
+      openid: 
+        link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
       preferred editor: "Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½Î¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±Ï:"
       preferred languages: "Î ÏÎ¿ÏÎ¹Î¼ÏÎ¼ÎµÎ½ÎµÏ Î³Î»ÏÏÏÎµÏ:"
       profile description: "Î ÎµÏÎ¹Î³ÏÎ±ÏÎ® ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï:"
@@ -754,6 +1073,10 @@ el:
         enabled: ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î®Î¸Î·ÎºÎµ. ÎÎµÎ½ ÎµÎ¯ÏÏÎµ ÏÎ¹Î± Î±Î½ÏÎ½ÏÎ¼Î¿Ï ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ Î´ÎµÎ´Î¿Î¼Î­Î½Î±.
         enabled link text: ÏÎ¹ ÎµÎ¯Î½Î±Î¹ Î±ÏÏÏ;
         heading: "ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±:"
+      public editing note: 
+        heading: "ÎÎ·Î¼ÏÏÎ¹Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±:"
+      replace image: ÎÎ½ÏÎ¹ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ·Ï ÏÏÎ­ÏÎ¿ÏÏÎ±Ï ÎµÎ¹ÎºÏÎ½Î±Ï
+      return to profile: ÎÏÎ¹ÏÏÏÎ¿ÏÎ® ÏÏÎ¿ ÏÏÎ¿ÏÎ¯Î»
       save changes button: ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÎÎ»Î»Î±Î³ÏÎ½
       title: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï
     confirm: 
@@ -791,6 +1114,26 @@ el:
       login_button: ÎÎ¯ÏÎ¿Î´Î¿Ï
       lost password link: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ;
       new to osm: ÎÎ­Î¿Ï ÏÏÎ¿ OpenStreetMap;
+      openid_logo_alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± OpenID
+      openid_providers: 
+        aol: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ AOL OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ AOL
+        google: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Google OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Google
+        myopenid: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± myOpenID OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ myOpenID
+        openid: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± URL OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ OpenID
+        wordpress: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Wordpress OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Wordpress
+        yahoo: 
+          alt: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Î­Î½Î± Yahoo OpenID
+          title: Î£ÏÎ½Î´ÎµÏÎ· Î¼Îµ Yahoo
       password: "ÎÏÎ´Î¹ÎºÏÏ:"
       register now: ÎÎ³Î³ÏÎ±ÏÎ®
       remember: "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·:"
@@ -803,8 +1146,11 @@ el:
     lost_password: 
       email address: "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:"
       heading: ÎÎµÏÎ¬ÏÎ±ÏÎµ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÏÎ±Ï;
+      help_text: Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ¿Ï ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ±ÏÎµ Î³Î¹Î± Î½Î± ÎµÎ³Î³ÏÎ±ÏÎµÎ¯ÏÎµ, Î¸Î± ÏÏÎµÎ¯Î»Î¿ÏÎ¼Îµ Î­Î½Î± ÏÏÎ½Î´ÎµÏÎ¼Î¿, ÏÏÎ¹ Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î³Î¹Î± Î½Î± ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÏÏÏÏÎ²Î±ÏÎ®Ï ÏÎ±Ï.
       new password button: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÎºÏÎ´Î¹ÎºÎ¿Ï
       notice email cannot find: ÎÏÏÏÎ¼Î±ÏÏÎµ, Î´ÎµÎ½ Î²ÏÎ­Î¸Î·ÎºÎµ Î±ÏÏÎ® Î· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï.
+      notice email on way: ÎÏÏÎ¬Î¼Î±Î¹ ÏÎ¿Ï ÏÎ¿Î½ ÏÎ¬ÏÎ±ÏÎµ:-(, Î±Î»Î»Î¬ Î­Î½Î± Î¼Î®Î½ÏÎ¼Î± Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÏÏÎ¿ Î´ÏÏÎ¼Î¿, ÏÏÏÎµ Î½Î± Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿Î½ ÎµÏÎ±Î½Î±ÏÎ­ÏÎµÏÎµ ÏÏÎ½ÏÎ¿Î¼Î±.
+      title: Î§Î¬ÏÎ±ÏÎµ ÏÏÎ½ ÎºÏÎ´Î¹ÎºÏ ÏÎ±Ï
     make_friend: 
       already_a_friend: ÎÎ¯ÏÏÎµ Î®Î´Î· ÏÎ¯Î»Î¿Î¹ Î¼Îµ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· %{name}.
       failed: ÎÏÏÎ¿ÏÎ¼Î±ÏÏÎµ, Î±ÏÎ­ÏÏÏÎµ Î· ÏÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ¿Ï ÏÏÎ®ÏÏÎ· %{name} ÏÏ ÏÎ¯Î»Î¿.
@@ -823,13 +1169,14 @@ el:
     no_such_user: 
       body: Î£ÏÎ³Î³Î½ÏÎ¼Î·, Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÏÎ®ÏÏÎ·Ï Î¼Îµ ÏÎ¿ ÏÎ½Î¿Î¼Î± %{user}. ÎÎ¯Î½Î±Î¹ ÏÎ¹Î¸Î±Î½Ï Î½Î± ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¿ÏÎ¸Î¿Î³ÏÎ±ÏÎ¹ÎºÎ¬ Î»Î¬Î¸Î· Î® Î½Î± ÎµÎ¯Î½Î±Î¹ Î»Î¬Î¸Î¿Ï Î¿ ÏÏÎ½Î´ÎµÏÎ¼Î¿Ï Î¼Î­ÏÎ¿ ÏÎ¿Ï Î¿ÏÎ¯Î¿Ï ÏÏÎ¬ÏÎ±ÏÎµ ÏÎµ Î±ÏÏÎ®Î½ ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±.
       heading: Î ÏÏÎ®ÏÏÎ·Ï %{user} Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹
+      title: ÎÎ³Î½ÏÏÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï
     popup: 
       friend: Î¦Î¯Î»Î¿Ï
       nearby mapper: ÎÎ¿Î½ÏÎ¹Î½ÏÏ ÏÎ±ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï
       your location: Î ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÎ±Ï
     remove_friend: 
       not_a_friend: Î ÏÏÎ®ÏÏÎ·Ï %{name} Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î­Î½Î±Ï Î±ÏÏ ÏÎ¿ÏÏ ÏÎ¯Î»Î¿ÏÏ ÏÎ±Ï.
-      success: Î ÏÏÎ®ÏÏÎ·Ï %{name} ÎºÎ±ÏÎ±ÏÎ³Î®Î¸Î·ÎºÎµ ÏÏ ÏÎ¯Î»Î¿Ï.
+      success: Î ÏÏÎ®ÏÏÎ·Ï %{name} ÎºÎ±ÏÎ±ÏÎ³Î®Î¸Î·ÎºÎµ Î±ÏÏ ÏÎ¯Î»Î¿Ï.
     reset_password: 
       confirm password: "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÎÏÎ´Î¹ÎºÎ¿Ï:"
       flash changed: Î ÎºÏÎ´Î¹ÎºÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±Î»Î»Î¬Î¾ÎµÎ¹.
@@ -838,9 +1185,9 @@ el:
       reset: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÎÏÎ´Î¹ÎºÎ¿Ï
       title: ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ ÎºÏÎ´Î¹ÎºÎ¿Ï
     suspended: 
-      body: "<p>\nÎ£ÏÎ³Î½ÏÎ¼Î·, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±ÏÏÏÎ¼Î±ÏÎ± Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ Î»ÏÎ³Ï\nÏÏÎ¿ÏÏÎ·Ï Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï.\n</p>\n<p>\nÎ ÏÎ±ÏÎ¿ÏÏÎ± Î±ÏÏÏÎ±ÏÎ· Î¸Î± ÎµÎ¾ÎµÏÎ±ÏÏÎµÎ¯ Î±ÏÏ Î­Î½Î± Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® ÏÏÎ½ÏÎ¿Î¼Î±, Î®\nÎ¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÎµÏÎµ Î¼Îµ ÏÎ¿Î½ %{webmaster} Î±Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÎ¿ ÏÏÎ¶Î·ÏÎ®ÏÎµÏÎµ Î±ÏÏÏ ÏÎ¿ Î¸Î­Î¼Î±.\n</p>"
-      heading: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
-      title: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
+      body: "<p>\nÎ£ÏÎ³Î½ÏÎ¼Î·, Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ ÏÎ±Ï Î­ÏÎµÎ¹ Î±ÏÏÏÎ¼Î±ÏÎ± Î±Î½Î±ÏÏÎ±Î»ÎµÎ¯ Î»ÏÎ³Ï\nÏÏÎ¿ÏÏÎ·Ï Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï.\n</p>\n<p>\nÎ ÏÎ±ÏÎ¿ÏÏÎ± Î±ÏÏÏÎ±ÏÎ· Î¸Î± ÎµÎ¾ÎµÏÎ±ÏÏÎµÎ¯ Î±ÏÏ Î­Î½Î± Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ® ÏÏÎ½ÏÎ¿Î¼Î±, Î®\nÎ¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½Î®ÏÎµÏÎµ Î¼Îµ ÏÎ¿Î½ %{webmaster} Î±Î½ Î¸Î­Î»ÎµÏÎµ Î½Î± ÏÏÎ¶Î·ÏÎ®ÏÎµÏÎµ Î±ÏÏÏ ÏÎ¿ Î¸Î­Î¼Î±.\n</p>"
+      heading: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
+      title: Î ÎÎ¿Î³Î±ÏÎ¹Î±ÏÎ¼ÏÏ Î­ÏÎµÎ¹ ÎÎ½Î±ÏÏÎ±Î»ÎµÎ¯
     terms: 
       agree: Î£ÏÎ¼ÏÏÎ½Ï
       decline: ÎÎ¹Î±ÏÏÎ½Ï
@@ -849,9 +1196,11 @@ el:
         france: ÎÎ±Î»Î»Î¯Î±
         italy: ÎÏÎ±Î»Î¯Î±
         rest_of_world: Î¥ÏÏÎ»Î¿Î¹ÏÎ¿Ï ÎºÏÏÎ¼Î¿Ï
+      legale_select: "ÎÏÎ¹Î»Î­Î¾ÏÎµ ÏÎ· ÏÏÏÎ± ÎºÎ±ÏÎ¿Î¹ÎºÎ¯Î±Ï ÏÎ±Ï:"
     view: 
       activate_user: ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÏÎ®ÏÏÎ·
       add as friend: ÏÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÏ ÏÎ¯Î»Î¿Ï
+      ago: (%{time_in_words_ago} ÏÏÎ¹Î½)
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
       confirm_user: ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿ ÏÏÎ®ÏÏÎ·
       create_block: ÏÏÎ±Î³Î® Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·
@@ -864,24 +1213,27 @@ el:
       email address: "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· Î·Î»ÎµÎºÏÏÎ¿Î½Î¹ÎºÎ¿Ï ÏÎ±ÏÏÎ´ÏÎ¿Î¼ÎµÎ¯Î¿Ï:"
       hide_user: Î±ÏÏÎºÏÏÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·
       km away: "%{count}ÏÎ»Î¼ Î¼Î±ÎºÏÎ¹Î¬"
+      latest edit: "Î¤ÎµÎ»ÎµÏÏÎ±Î¯Î± ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± %{ago}:"
       m away: "%{count}Î¼ Î¼Î±ÎºÏÎ¹Î¬"
       mapper since: "Î§Î±ÏÏÎ¿Î³ÏÎ¬ÏÎ¿Ï Î±ÏÏ:"
       my diary: ÏÎ¿ Î·Î¼ÎµÏÎ¿Î»ÏÎ³Î¹Ï Î¼Î¿Ï
       my edits: Î¿Î¹ ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯ÎµÏ Î¼Î¿Ï
       my settings: Î¿Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î¼Î¿Ï
+      nearby users: ÎÎ»Î»Î¿Î¹ ÎºÎ¿Î½ÏÎ¹Î½Î¿Î¯ ÏÏÎ®ÏÏÎµÏ
       new diary entry: Î½Î­Î± ÎºÎ±ÏÎ±ÏÏÏÎ·ÏÎ· Î·Î¼ÎµÏÎ¿Î»Î¿Î³Î¯Î¿Ï
       no friends: ÎÎµÎ½ Î­ÏÎµÏÎµ ÏÏÎ¿ÏÎ¸Î­ÏÎµÎ¹ ÏÎ¯Î»Î¿ÏÏ Î±ÎºÏÎ¼Î±.
       no nearby users: ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ Î¬Î»Î»Î¿Î¹ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï ÏÎ±ÏÎ±Î´Î­ÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ¹ ÏÎ±ÏÏÎ¿Î³ÏÎ±ÏÎ¿ÏÎ½ ÎºÎ¿Î½ÏÎ¬ ÏÎ±Ï ÏÏÎ¿Ï ÏÎ¿ ÏÎ±ÏÏÎ½.
       oauth settings: ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï oauth
+      remove as friend: Î±ÏÎ±Î¯ÏÎµÏÎ· Î±ÏÏ ÏÎ¯Î»Î¿Ï
       role: 
-        administrator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ Î¿ Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®Ï
+        administrator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®Ï
         grant: 
           administrator: Î§Î¿ÏÎ®Î³Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®
-          moderator: Î§Î¿ÏÎ®Î³Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®
-        moderator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï
+          moderator: Î§Î¿ÏÎ®Î³Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®
+        moderator: ÎÏÏÏÏ Î¿ ÏÏÎ®ÏÏÎ·Ï ÎµÎ¯Î½Î±Î¹ ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®Ï
         revoke: 
           administrator: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î´Î¹Î±ÏÎµÎ¹ÏÎ¹ÏÏÎ®
-          moderator: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ®
+          moderator: ÎÎ½Î¬ÎºÎ»Î·ÏÎ· ÏÏÏÏÎ²Î±ÏÎ·Ï ÏÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®
       send message: Î±ÏÎ¿ÏÏÎ¿Î»Î® Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï
       settings_link_text: ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï
       status: "ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ·:"
@@ -889,28 +1241,51 @@ el:
       user location: Î¤Î¿ÏÎ¿Î¸ÎµÏÎ¯Î± ÏÏÎ®ÏÏÎ·
       your friends: ÎÎ¹ ÏÎ¯Î»Î¿Î¹ ÏÎ±Ï
   user_block: 
+    blocks_on: 
+      heading: ÎÎ±ÏÎ¬Î»Î¿Î³Î¿Ï ÏÏÎ±Î³ÏÎ½ ÏÏÎ¿Î½ %{name}
+      title: Î¦ÏÎ±Î³Î­Ï ÏÏÎ¿Î½ %{name}
+    edit: 
+      back: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ±Î³ÏÎ½
     helper: 
       time_future: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time}.
       time_past: Î¤ÎµÎ»ÎµÎ¯ÏÏÎ· %{time} ÏÏÎ¹Î½.
       until_login: ÎÎ½ÎµÏÎ³Ï Î­ÏÏ ÏÏÎ¿Ï Î¿ ÏÏÎ®ÏÏÎ·Ï ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯.
+    new: 
+      back: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ±Î³ÏÎ½
     partial: 
       confirm: ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹;
       creator_name: ÎÎ·Î¼Î¹Î¿ÏÏÎ³ÏÏ
       edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
       not_revoked: (Î´ÎµÎ½ Î­ÏÎµÎ¹ Î±Î½Î±ÎºÎ»Î·Î¸ÎµÎ¯)
+      reason: ÎÎ¹ÏÎ¯Î± ÏÏÎ±Î³Î®Ï
       revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ·!
+      revoker_name: ÎÎ½Î±ÎºÎ»Î®Î¸Î·ÎºÎµ Î±ÏÏ
       show: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·
       status: ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ·
+    period: 
+      one: 1 ÏÏÎ±
+      other: "%{count} ÏÏÎµÏ"
     revoke: 
+      flash: ÎÏÏÎ® Î· ÏÏÎ±Î³Î® Î­ÏÎµÎ¹ Î±Î½Î±ÎºÎ»Î·Î¸ÎµÎ¯.
       revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ·!
     show: 
+      back: Î ÏÎ¿Î²Î¿Î»Î® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÏÎ±Î³ÏÎ½
+      confirm: ÎÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï?
       edit: ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î±
+      reason: "ÎÎ¹ÏÎ¯Î± ÏÏÎ±Î³Î®Ï:"
       revoke: ÎÎ½Î¬ÎºÎ»Î·ÏÎ·!
+      show: ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·
       status: ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ·
       time_future: Î¤ÎµÎ»ÎµÎ¹ÏÎ½ÎµÎ¹ ÏÎµ %{time}
-      time_past: Î¤ÎµÎ»ÎµÎ¯ÏÏÎ· %{time} ÏÏÎ¹Î½
+      time_past: Î¤ÎµÎ»ÎµÎ¯ÏÏÎµ %{time} ÏÏÎ¹Î½
   user_role: 
+    filter: 
+      already_has_role: Î ÏÏÎ®ÏÏÎ·Ï Î­ÏÎµÎ¹ Î®Î´Î· ÏÏÎ»Î¿ %{role}.
+      doesnt_have_role: Î ÏÏÎ®ÏÏÎ·Ï Î´ÎµÎ½ Î­ÏÎµÎ¹ ÏÏÎ»Î¿ %{role}.
     grant: 
+      are_you_sure: ÎÎ¯ÏÏÎµ Î²Î­Î²Î±Î¹Î¿Î¹ ÏÏÎ¹ Î¸Î­Î»ÎµÏÎµ Î½Î± ÎµÎºÏÏÏÎ®ÏÎµÏÎµ ÏÎ¿ ÏÏÎ»Î¿ `%{role}' ÏÏÎ¿Î½ ÏÏÎ®ÏÏÎ· `%{name}'?
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
+      heading: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÏÎ¿ÏÎ®Î³Î·ÏÎ·Ï ÏÏÎ»Î¿Ï
+      title: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÏÎ¿ÏÎ®Î³Î·ÏÎ·Ï ÏÏÎ»Î¿Ï
     revoke: 
       confirm: ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 7a617bdf7..98f73d618 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -232,7 +232,7 @@ eo:
       still_editing: (estas ankoraÅ­ redaktata)
     changeset_paging_nav: 
       next: Sekvanta Â»
-      previous: "Â« AntaÅ­a"
+      previous: Â« AntaÅ­a
       showing_page: Montrante paÄon
     changesets: 
       area: Areo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 463d31b01..046106f63 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -278,7 +278,7 @@ es:
       view_changeset_details: Ver detalles del conjunto de cambios
     changeset_paging_nav: 
       next: Siguiente Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrando pÃ¡gina %{page}
     changesets: 
       area: Ãrea
@@ -1362,7 +1362,7 @@ es:
       tags: Etiquetas
     trace_paging_nav: 
       next: Siguiente Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrando pÃ¡gina %{page}
     view: 
       delete_track: Borrar esta traza
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 7bed0860f..b1c1614f5 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -213,7 +213,7 @@ et:
       still_editing: redigeerimine pooleli
     changeset_paging_nav: 
       next: JÃ¤rgmine Â»
-      previous: "Â« Eelmine"
+      previous: Â« Eelmine
       showing_page: NÃ¤itan lehekÃ¼lge %{page}
     changesets: 
       area: Ala
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4d0811507..85b7eaba0 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -152,7 +152,7 @@ eu:
       no_comment: (bat ere)
     changeset_paging_nav: 
       next: Hurrengoa Â»
-      previous: "Â« Aurrekoa"
+      previous: Â« Aurrekoa
     changesets: 
       id: ID
       saved_at: Noiz gordeta
@@ -632,7 +632,7 @@ eu:
       user_page_link: Lankide orria
     index: 
       license: 
-        license_name: Creative Commons-en Aitortu-Partekatu 2.0
+        license_name: Creative Commons Aitortu-PartekatuBerdin 2.0
         project_name: OpenStreetMap proiektua
     key: 
       table: 
@@ -717,7 +717,7 @@ eu:
       tags: Etiketak
     trace_paging_nav: 
       next: Hurrengoa Â»
-      previous: "Â« Aurrekoa"
+      previous: Â« Aurrekoa
     view: 
       description: "Deskribapena:"
       download: jaitsi
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c80855225..1a8da2b07 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -215,7 +215,7 @@ fa:
       big_area: (Ø¨Ø²Ø±Ú¯)
     changeset_paging_nav: 
       next: Ø¨Ø¹Ø¯Û Â»
-      previous: "Â« ÙØ¨ÙÛ"
+      previous: Â« ÙØ¨ÙÛ
     changesets: 
       area: ÙÙØ·ÙÙ
       user: Ú©Ø§Ø±Ø¨Ø±
@@ -660,7 +660,7 @@ fa:
       tags: Ø¨Ø±ÚØ³Ø¨âÙØ§
     trace_paging_nav: 
       next: Ø¨Ø¹Ø¯Û Â»
-      previous: "Â« ÙØ¨ÙÛ"
+      previous: Â« ÙØ¨ÙÛ
       showing_page: ÙÙØ§ÛØ´ ØµÙØ­Ù %{page}
     view: 
       delete_track: Ø­Ø°Ù Ø§ÛÙ Ø±ÙÚ¯ÛØ±Û
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1c3802770..7b1b9f086 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1238,7 +1238,7 @@ fi:
       tags: TÃ¤git
     trace_paging_nav: 
       next: Seuraava Â»
-      previous: "Â« Edellinen"
+      previous: Â« Edellinen
       showing_page: Sivu %{page}
     view: 
       delete_track: Poista tÃ¤mÃ¤ jÃ¤lki
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ca5dc8d68..6011d3339 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -286,7 +286,7 @@ fr:
       view_changeset_details: Afficher les dÃ©tails du groupe de modifications
     changeset_paging_nav: 
       next: Suivant Â»
-      previous: "Â« PrÃ©cÃ©dent"
+      previous: Â« PrÃ©cÃ©dent
       showing_page: Affichage de la page %{page}
     changesets: 
       area: Zone
@@ -1369,7 +1369,7 @@ fr:
       tags: Balises
     trace_paging_nav: 
       next: Suivant Â»
-      previous: "Â« PrÃ©cÃ©dent"
+      previous: Â« PrÃ©cÃ©dent
       showing_page: Affichage de la page %{page}
     view: 
       delete_track: Supprimer cette piste
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index f0daf7f7f..d39fe37b0 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -247,7 +247,7 @@ fur:
       view_changeset_details: ViÃ´t detais dal grup di cambiaments
     changeset_paging_nav: 
       next: SuccessÃ®f Â»
-      previous: "Â« Precedent"
+      previous: Â« Precedent
       showing_page: DaÃ»r a mostrÃ¢ la pagjine %{page}
     changesets: 
       area: Aree
@@ -936,7 +936,7 @@ fur:
       tags: Etichetis
     trace_paging_nav: 
       next: SucessÃ®f Â»
-      previous: "Â« Precedent"
+      previous: Â« Precedent
       showing_page: DaÃ»r a mostrÃ¢ la pagjine %{page}
     view: 
       delete_track: Elimine chest percors
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 94dd458ed..f5d1f9bb1 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -104,7 +104,7 @@ gl:
         one: "Ten o seguinte camiÃ±o:"
         other: "Ten os seguintes %{count} camiÃ±os:"
       no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios.
-      show_area_box: Amosar a caixa de zona
+      show_area_box: Mostrar o cadro da zona
     common_details: 
       changeset_comment: "Comentario:"
       deleted_at: "Borrado o:"
@@ -270,7 +270,7 @@ gl:
       view_changeset_details: Ollar os detalles do conxunto de cambios
     changeset_paging_nav: 
       next: Seguinte Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrando a pÃ¡xina %{page}
     changesets: 
       area: Zona
@@ -1352,7 +1352,7 @@ gl:
       tags: Etiquetas
     trace_paging_nav: 
       next: Seguinte Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrando a pÃ¡xina "%{page}"
     view: 
       delete_track: Borrar esta pista
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 6d52ce67b..d963ac245 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -268,7 +268,7 @@ hr:
       view_changeset_details: PrikaÅ¾i detalje changeseta
     changeset_paging_nav: 
       next: SlijedeÄa Â»
-      previous: "Â« Prethodna"
+      previous: Â« Prethodna
       showing_page: Prikazujem stranicu %{page}
     changesets: 
       area: PodruÄje
@@ -1352,7 +1352,7 @@ hr:
       tags: Oznake
     trace_paging_nav: 
       next: SlijedeÄa Â»
-      previous: "Â« Prethodna"
+      previous: Â« Prethodna
       showing_page: Prikazujem stranicu %{page}
     view: 
       delete_track: IzbriÅ¡i ovu trasu
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 879cc6060..251c80d52 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -277,7 +277,7 @@ hsb:
       view_changeset_details: PodrobnosÄe sadÅºby zmÄnow pokazaÄ
     changeset_paging_nav: 
       next: PÅichodna Â»
-      previous: "Â« PÅedchadna"
+      previous: Â« PÅedchadna
       showing_page: Pokazuje so strona %{page}
     changesets: 
       area: WobÅuk
@@ -966,7 +966,7 @@ hsb:
       english_link: jendÅºelskim originalom
       text: W padÅºe konflikta mjez pÅeÅoÅ¾enej stronje a %{english_original_link}, jendÅºelska strona dyrbi prioritatu mÄÄ
       title: Wo tutym pÅeÅoÅ¾ku
-    legal_babble: "<h2>Awtorske prawo a licenca</h2>\n<p> \nOpenStreetMap wobsteji z <i>zjawnych datow</i>, licencowanych pod licencu <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA). </p> <p> MÃ³Å¾eÅ¡ naÅ¡e karty a daty kopÄrowaÄ, rozdÅºÄliÄ, pÅenjesÄ a pÅimÄriÄ, tak doÅho kaÅ¾ OpenStreetMap a jich sobuskutkowacych naspominaÅ¡. Jeli zmÄniÅ¡ naÅ¡e karty abo daty abo zepÄraÅ¡ so na nje, mÃ³Å¾eÅ¡ wuslÄdk jenoÅ¾ pod samsnej licencu rozdÅºÄliÄ. DospoÅny <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">prawniski kod</a> wujasnja twoje prawa a zamoÅwitosÄe.</p>\n\n<h3>Kak awtorstwo OpenStreetMap naspomniÄ</h3>\n<p> Jeli kartowe wobrazy z OpenStreetMap wuÅ¾iwaÅ¡, Å¾adamy sej, zo znajmjeÅÅ¡a podawaÅ¡ &ldquo;&copy; OpenStreetMap a sobuskutkowacych, CC-BY-SA&rdquo;. Jeli jenoÅ¾ kartowe daty wuÅ¾iwaÅ¡, dyrbiÅ¡ &ldquo;kartowe daty &copy; OpenStreetMap a suboskutkowacych, CC-BY-SA&rdquo; podaÄ. </p> <p> HdÅºeÅ¾ je mÃ³Å¾no, OpenStreetMap mÄÅ wotkaz do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC-BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> mÄÄ. Jeli medij wuÅ¾iwaÅ¡, hdÅºeÅ¾ wotkazy mÃ³Å¾no njejsu (na pÅ. wuÄiÅ¡Äane dÅºÄÅo), namjetujemy, zo pokazujeÅ¡ swojich Äitarjow na www.openstreetmap.org a na www.creativecommons.org.</p>\n\n<h3>DalÅ¡e informacije</h3>\n<p>Äitaj wjace wo wuÅ¾iwanju naÅ¡ich datow <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Huste prawniske praÅ¡enja</a>.</p><p> PÅinoÅ¡owarjow OSM namoÅwjamy, zo Å¾enje daty ze Å¾Ã³rÅow njepÅidawaja, kotreÅ¾ su pÅez awtorske prawo Å¡kitane (na pÅ. z Google Maps abo z wuÄiÅ¡Äanych kartow) bjez wurazneje dowolnosÄe awtorow. </p> <p> HaÄrunjeÅ¾ OpenStreetMap wobsteji ze zjawnych datow, njemÃ³Å¾emy darmotny kartowy API za wuwiwarjow tÅeÄich poskiÄiÄ. \n\nHlej naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidÅa za wuÅ¾iwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PrawidÅa za wuÅ¾iwanje polow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PrawidÅa za wuÅ¾iwanje Nominatim</a>. </p> \n\n<h3>NaÅ¡i sobuskutkowacy</h3>\n<p> NaÅ¡a licenca CC-BY-SA Å¾ada sej, zo &ldquo;daÅ¡ prÄnjotnemu awtorej dÅºak pÅimÄrjeny medijej abo srÄdkej, kotryÅ¾ wuÅ¾iwaÅ¡&rdquo;. Jednotliwi kartÄrowarjo OSM njeÅ¾adaja sej pÅidatne dÅºakprajenje k &ldquo;sobuskutkowarjam OpenStreetMap&rdquo;, ale hdyÅ¾ so daty z narodneho kartÄrowanskeho pÅedewzaÄa abo z druheho wuznamneho Å¾Ã³rÅa w OpenStreetMap zapÅijimaja, je pÅimÄrjene, jim pÅez direktne pÅewzaÄe jich dÅºakprajenja abo pÅez wotkazowanje na njo na tutej stronje dÅºak prajiÄ. </p>\n\n<!-- Information for page editors The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data. Any additions here must be discussed with OSM sysadmins first. --> \n<ul id=\"contributors\"><li><strong>Australska</strong>: Wobsahuje pÅedmÄÅ¡Äanske daty na zakÅadÅºe datow Awstralskeho  zarjada za statistiku (Australian Bureau of Statistics).</li>\n<li><strong>Awstriska</strong>: Wobsahuje daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: Wobsahuje daty z GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).</li>\n<li><strong>Francoska</strong>: Wobsahuje daty z Direction GÃ©nÃ©rale des ImpÃ´ts.</li>\n<li><strong>Nowoseelandska</strong>: Wobsahuje daty ze Å¾Ã³rÅow wot Land Information New Zealand. Awtorske prawo wumÄnjene.</li> \n<li><strong>PÃ³lska</strong>: Wobsahuje daty z <a\n   href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske prawo sobuskutkowacych UMP-pcPL.</li>\n<li><strong>ZjednoÄene kralestwo</strong>: Wobsahuje daty z Ordnance Survey (Zarjadniske krajmÄrjenstwo) &copy; Awtorske prawo a prawo za datowe banki 2010.</li> </ul>\n\n<p> ZapÅijimanje datow do OpenStreetMap njerÄka, zo poskiÄowar originalnych datow OpenStreetMap pÅipÃ³znawa, nÄkajku garantiju dodawa abo rukowanje pÅewozmje. </p>"
+    legal_babble: "<h2>Awtorske prawo a licenca</h2>\n<p> \nOpenStreetMap wobsteji ze <i>zjawnych datow</i>, licencowanych pod licencu <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA). </p> <p> MÃ³Å¾eÅ¡ naÅ¡e karty a daty kopÄrowaÄ, rozdÅºÄliÄ, pÅenjesÄ a pÅimÄriÄ, tak doÅho kaÅ¾ OpenStreetMap a jich sobuskutkowacych naspominaÅ¡. Jeli zmÄniÅ¡ naÅ¡e karty abo daty abo zepÄraÅ¡ so na nje, mÃ³Å¾eÅ¡ wuslÄdk jenoÅ¾ pod samsnej licencu rozdÅºÄliÄ. DospoÅny <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">prawniski kod</a> wujasnja twoje prawa a zamoÅwitosÄe.</p>\n\n<h3>Kak awtorstwo OpenStreetMap naspomniÄ</h3>\n<p> Jeli kartowe wobrazy z OpenStreetMap wuÅ¾iwaÅ¡, Å¾adamy sej, zo znajmjeÅÅ¡a podawaÅ¡ &ldquo;&copy; OpenStreetMap a sobuskutkowacych, CC-BY-SA&rdquo;. Jeli jenoÅ¾ kartowe daty wuÅ¾iwaÅ¡, dyrbiÅ¡ &ldquo;kartowe daty &copy; OpenStreetMap a sobuskutkowacych, CC-BY-SA&rdquo; podaÄ. </p> <p> HdÅºeÅ¾ je mÃ³Å¾no, OpenStreetMap mÄÅ wotkaz do <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> a CC-BY-SA do <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a> mÄÄ. Jeli medij wuÅ¾iwaÅ¡, hdÅºeÅ¾ wotkazy mÃ³Å¾no njejsu (na pÅ. wuÄiÅ¡Äane dÅºÄÅo), namjetujemy, zo pokazujeÅ¡ swojich Äitarjow na www.openstreetmap.org a na www.creativecommons.org.</p>\n\n<h3>DalÅ¡e informacije</h3>\n<p>Äitaj wjace wo wuÅ¾iwanju naÅ¡ich datow <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Huste prawniske praÅ¡enja</a>.</p><p> PÅinoÅ¡owarjow OSM namoÅwjamy, zo Å¾enje daty ze Å¾Ã³rÅow njepÅidawaja, kotreÅ¾ su pÅez awtorske prawo Å¡kitane (na pÅ. z Google Maps abo z wuÄiÅ¡Äanych kartow) bjez wurazneje dowolnosÄe awtorow. </p> <p> HaÄrunjeÅ¾ OpenStreetMap wobsteji ze zjawnych datow, njemÃ³Å¾emy darmotny kartowy API za wuwiwarjow tÅeÄich poskiÄiÄ. \n\nHlej naÅ¡e <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">prawidÅa za wuÅ¾iwanje API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">PrawidÅa za wuÅ¾iwanje polow</a> a <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">PrawidÅa za wuÅ¾iwanje Nominatim</a>. </p> \n\n<h3>NaÅ¡i sobuskutkowacy</h3>\n<p> NaÅ¡a licenca CC-BY-SA Å¾ada sej, zo &ldquo;daÅ¡ prÄnjotnemu awtorej dÅºak pÅimÄrjeny medijej abo srÄdkej, kotryÅ¾ wuÅ¾iwaÅ¡&rdquo;. Jednotliwi kartÄrowarjo OSM njeÅ¾adaja sej pÅidatne dÅºakprajenje k &ldquo;sobuskutkowarjam OpenStreetMap&rdquo;, ale hdyÅ¾ so daty z narodneho kartÄrowanskeho pÅedewzaÄa abo z druheho wuznamneho Å¾Ã³rÅa w OpenStreetMap zapÅijimaja, je pÅimÄrjene, jim pÅez direktne pÅewzaÄe jich dÅºakprajenja abo pÅez wotkazowanje na njo na tutej stronje dÅºak prajiÄ. </p>\n\n<!-- Information for page editors The following lists only those organisations who require attribution as a condition of their data being used in OpenStreetMap. It is not a general catalogue of imports, and must not be used except when attribution is required to comply with the licence of the imported data. Any additions here must be discussed with OSM sysadmins first. --> \n<ul id=\"contributors\"><li><strong>Awstralska</strong>: Wobsahuje pÅedmÄÅ¡Äanske daty na zakÅadÅºe datow Awstralskeho  zarjada za statistiku (Australian Bureau of Statistics).</li>\n<li><strong>Awstriska</strong>: Wobsahuje daty z <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> pod <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n <li><strong>Kanada</strong>: Wobsahuje daty z GeoBase&reg;, GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy; Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).</li>\n<li><strong>Francoska</strong>: Wobsahuje daty z Direction GÃ©nÃ©rale des ImpÃ´ts.</li>\n<li><strong>Nowoseelandska</strong>: Wobsahuje daty ze Å¾Ã³rÅow wot Land Information New Zealand. Awtorske prawo wumÄnjene.</li> \n<li><strong>PÃ³lska</strong>: Wobsahuje daty z <a\n   href=\"http://ump.waw.pl/\">UMP-pcPL maps</a>. Awtorske prawo sobuskutkowacych UMP-pcPL.</li>\n<li><strong>ZjednoÄene kralestwo</strong>: Wobsahuje daty z Ordnance Survey (Zarjadniske krajmÄrjenstwo) &copy; Awtorske prawo a prawo za datowe banki 2010.</li> </ul>\n\n<p> ZapÅijimanje datow do OpenStreetMap njerÄka, zo poskiÄowar originalnych datow OpenStreetMap pÅipÃ³znawa, nÄkajku garantiju dodawa abo rukowanje pÅewozmje. </p>"
     native: 
       mapping_link: kartÄrowanje zapoÄeÄ
       native_link: hornjoserbskej wersiji
@@ -1364,7 +1364,7 @@ hsb:
       tags: Atributy
     trace_paging_nav: 
       next: PÅichodny Â»
-      previous: "Â« PÅedchadny"
+      previous: Â« PÅedchadny
       showing_page: Pokazuje so strona %{page}
     view: 
       delete_track: Tutu Äaru zniÄiÄ
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 45951d119..fa72bb9fe 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -273,7 +273,7 @@ hu:
       view_changeset_details: MÃ³dosÃ­tÃ¡scsomag rÃ©szleteinek megtekintÃ©se
     changeset_paging_nav: 
       next: kÃ¶vetkezÅ Â»
-      previous: "Â« elÅzÅ"
+      previous: Â« elÅzÅ
       showing_page: "Jelenlegi oldal: %{page}"
     changesets: 
       area: TerÃ¼let
@@ -1364,7 +1364,7 @@ hu:
       tags: CÃ­mkÃ©k
     trace_paging_nav: 
       next: KÃ¶vetkezÅ Â»
-      previous: "Â« ElÅzÅ"
+      previous: Â« ElÅzÅ
       showing_page: "Jelenlegi oldal: %{page}"
     view: 
       delete_track: Ezen nyomvonal tÃ¶rlÃ©se
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index e70660cc0..02e8ad3c3 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -269,7 +269,7 @@ ia:
       view_changeset_details: Vider detalios del gruppo de modificationes
     changeset_paging_nav: 
       next: Sequente Â»
-      previous: "Â« Precedente"
+      previous: Â« Precedente
       showing_page: Pagina %{page} monstrate
     changesets: 
       area: Area
@@ -1353,7 +1353,7 @@ ia:
       tags: Etiquettas
     trace_paging_nav: 
       next: Sequente Â»
-      previous: "Â« Precedente"
+      previous: Â« Precedente
       showing_page: Pagina %{page} monstrate
     view: 
       delete_track: Deler iste tracia
diff --git a/config/locales/is.yml b/config/locales/is.yml
index ccbd5d8b1..495c544a3 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -259,7 +259,7 @@ is:
       view_changeset_details: SkoÃ°a breytingarsett
     changeset_paging_nav: 
       next: NÃ¦sta Â»
-      previous: "Â« Fyrri"
+      previous: Â« Fyrri
       showing_page: SÃ½ni sÃ­Ã°u %{page}
     changesets: 
       area: SvÃ¦Ã°i
@@ -980,7 +980,7 @@ is:
       tags: TÃ¶gg
     trace_paging_nav: 
       next: NÃ¦sta Â»
-      previous: "Â« Fyrri"
+      previous: Â« Fyrri
       showing_page: SÃ½ni sÃ­Ã°u %{page}
     view: 
       delete_track: EyÃ°a
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 4ff9375d5..875f2feef 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -272,7 +272,7 @@ it:
       view_changeset_details: Visualizza i dettagli del gruppo di modifiche
     changeset_paging_nav: 
       next: Successivo Â»
-      previous: "Â« Precedente"
+      previous: Â« Precedente
       showing_page: Visualizzata la pagina %{page}
     changesets: 
       area: Area
@@ -1349,7 +1349,7 @@ it:
       tags: Etichette
     trace_paging_nav: 
       next: Successivo Â»
-      previous: "Â« Precedente"
+      previous: Â« Precedente
       showing_page: Visualizzata la pagina %{page}
     view: 
       delete_track: Elimina questo tracciato
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 06776b850..427d642e9 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -268,7 +268,7 @@ ja:
       view_changeset_details: å¤æ´ã»ããã®è©³ç´°è¡¨ç¤º
     changeset_paging_nav: 
       next: æ§ Â»
-      previous: "Â« æ°"
+      previous: Â« æ°
       showing_page: ãã¼ã¸ %{page} è¡¨ç¤ºä¸­
     changesets: 
       area: é å
@@ -1226,7 +1226,7 @@ ja:
       tags: ã¿ã°ï¼è¤æ°å¯ï¼
     trace_paging_nav: 
       next: æ¬¡ã¸ Â»
-      previous: "Â« åã¸"
+      previous: Â« åã¸
       showing_page: " %{page} ãã¼ã¸"
     view: 
       delete_track: ãã®ãã©ãã¯ã®åé¤
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index fc829f12f..c7304a7c9 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -179,7 +179,7 @@ lb:
       no_edits: (keng Ãnnerungen)
     changeset_paging_nav: 
       next: NÃ¤chst Â»
-      previous: "Â« Vireg"
+      previous: Â« Vireg
       showing_page: D'SÃ¤it %{page} gÃ«tt gewisen
     changesets: 
       area: BerÃ¤ich
@@ -600,7 +600,7 @@ lb:
       visibility_help: wat heescht dat?
     trace_paging_nav: 
       next: NÃ¤chst Â»
-      previous: "Â« Vireg"
+      previous: Â« Vireg
       showing_page: D'SÃ¤it %{page} gÃ«tt gewisen
     view: 
       description: "Beschreiwung:"
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index edb5a4024..a625834a5 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -266,7 +266,7 @@ lt:
       view_changeset_details: Å½iÅ«rÄti pakeitimo detales
     changeset_paging_nav: 
       next: Kitas Â»
-      previous: "Â« Ankstesnis"
+      previous: Â« Ankstesnis
       showing_page: Rodomas puslapis %{page}
     changesets: 
       area: Plotas
@@ -1265,7 +1265,7 @@ lt:
       tags: Å½ymos
     trace_paging_nav: 
       next: Kitas Â»
-      previous: "Â« Ankstesnis"
+      previous: Â« Ankstesnis
       showing_page: Rodomas puslapis %{page}
     view: 
       delete_track: Naikinti Å¡Ä¯ pÄdsakÄ
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 65cd131e1..53a1e6b23 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -236,7 +236,7 @@ lv:
       view_changeset_details: SkatÄ«t sÄ«kÄku informÄciju par izmaiÅu kopu
     changeset_paging_nav: 
       next: NÄkamÄ Â»
-      previous: "Â« IepriekÅ¡ÄjÄ"
+      previous: Â« IepriekÅ¡ÄjÄ
       showing_page: RÄda lapu %{page}
     changesets: 
       area: Apgabals
@@ -1159,7 +1159,7 @@ lv:
       tags: Birkas
     trace_paging_nav: 
       next: NÄkamÄ Â»
-      previous: "Â« IepriekÅ¡ÄjÄ"
+      previous: Â« IepriekÅ¡ÄjÄ
       showing_page: RÄda lapu %{page}
     view: 
       delete_track: DzÄst Å¡o trasi
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 129d12102..c40bf4356 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -270,7 +270,7 @@ mk:
       view_changeset_details: ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð´ÐµÑÐ°Ð»Ð¸ Ð¾Ð´ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÐµ
     changeset_paging_nav: 
       next: Ð¡Ð»ÐµÐ´Ð½Ð¾ Â»
-      previous: "Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð¾"
+      previous: Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð¾
       showing_page: ÐÑÐ¸ÐºÐ°Ð¶Ð°Ð½Ð° Ðµ ÑÑÑÐ°Ð½Ð¸ÑÐ° %{page}
     changesets: 
       area: ÐÐ¾Ð²ÑÑÐ¸Ð½Ð°
@@ -901,7 +901,7 @@ mk:
     documentation: ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°
     documentation_title: ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ° Ð·Ð° Ð¿ÑÐ¾ÐµÐºÑÐ¾Ñ
     donate: ÐÐ¾Ð´Ð´ÑÐ¶ÐµÑÐµ ÑÐ° OpenStreetMap ÑÐ¾ %{link} Ð·Ð° Ð¤Ð¾Ð½Ð´Ð¾Ñ Ð·Ð° Ð¾Ð±Ð½Ð¾Ð²Ð° Ð½Ð° Ð¼Ð°ÑÐ¸Ð½ÑÐºÐ°ÑÐ° Ð¾Ð¿ÑÐµÐ¼Ð°.
-    donate_link_text: Ð´Ð¾Ð½Ð¸ÑÐ°ÑÐµ
+    donate_link_text: Ð´Ð¾Ð±ÑÐ¾Ð²Ð¾Ð»ÐµÐ½ Ð¿ÑÐ¸Ð»Ð¾Ð³
     edit: Ð£ÑÐµÐ´Ð¸
     edit_with: Ð£ÑÐµÐ´Ð¸ ÑÐ¾ %{editor}
     export: ÐÐ·Ð²ÐµÐ·Ð¸
@@ -1367,7 +1367,7 @@ mk:
       tags: ÐÐ·Ð½Ð°ÐºÐ¸
     trace_paging_nav: 
       next: Ð¡Ð»ÐµÐ´Ð½Ð° Â»
-      previous: "Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð°"
+      previous: Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð°
       showing_page: ÐÑÐ¸ÐºÐ°Ð¶ÑÐ²Ð°Ð¼ ÑÑÑÐ°Ð½Ð¸ÑÐ° %{page}
     view: 
       delete_track: ÐÐ·Ð±ÑÐ¸ÑÐ¸ ÑÐ° ÑÑÐ°Ð³Ð°Ð²Ð°
@@ -1422,7 +1422,7 @@ mk:
         link: http://wiki.openstreetmap.org/wiki/MK:OpenID?uselang=mk
         link text: ÑÑÐ¾ Ðµ Ð¾Ð²Ð°?
         openid: OpenID
-      preferred editor: "ÐÑÐµÑÐ¿Ð¾ÑÐ¸ÑÐ°Ð½ ÑÑÐµÐ½Ð´Ð¸Ðº:"
+      preferred editor: "ÐÑÐµÑÐ¿Ð¾ÑÐ¸ÑÐ°Ð½ ÑÑÐµÐ´Ð½Ð¸Ðº:"
       preferred languages: "ÐÑÐµÑÐ¿Ð¾ÑÐ¸ÑÐ°Ð½Ð¸ ÑÐ°Ð·Ð¸ÑÐ¸:"
       profile description: "ÐÐ¿Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾ÑÐ¸Ð»Ð¾Ñ:"
       public editing: 
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
new file mode 100644
index 000000000..7cc3ec5c8
--- /dev/null
+++ b/config/locales/ms.yml
@@ -0,0 +1,1246 @@
+# Messages for Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+# Export driver: syck-pecl
+# Author: Anakmalaysia
+ms: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Isi
+      diary_entry: 
+        language: Bahasa
+        latitude: Garis Lintang
+        longitude: Garis Bujur
+        title: Tajuk
+        user: Pengguna
+      friend: 
+        friend: Rakan
+        user: Pengguna
+      message: 
+        body: Isi
+        recipient: Penerima
+        sender: Pengirim
+        title: Tajuk
+      trace: 
+        description: Keterangan
+        latitude: Garis Lintang
+        longitude: Garis Bujur
+        name: Nama
+        public: Umum
+        size: Saiz
+        user: Pengguna
+        visible: Kelihatan
+      user: 
+        active: Aktif
+        description: Keterangan
+        display_name: Nama Paparan
+        email: E-mel
+        languages: Bahasa
+        pass_crypt: Kata laluan
+    models: 
+      acl: Senarai Kawalan Capaian
+      changeset: Set Ubah
+      changeset_tag: Tag Set Ubah
+      country: Negara
+      diary_comment: Ulasan Diari
+      diary_entry: Catatan Diari
+      friend: Rakan
+      language: Bahasa
+      message: Pesanan
+      node: Nod
+      node_tag: Tag Nod
+      notifier: Pemberitahu
+      old_node: Nod Lama
+      old_node_tag: Tag Nod Lama
+      old_relation: Hubungan Lama
+      old_relation_member: Anggota Hubungan Lama
+      old_relation_tag: Tag Hubungan Lama
+      old_way: Arah Lama
+      old_way_node: Nod Arah Lama
+      old_way_tag: Tag Arah Lama
+      relation: Hubungan
+      relation_member: Anggota Hubungan
+      relation_tag: Tag Hubungan
+      session: Sesi
+      trace: Jejak
+      tracepoint: Titik Jejak
+      tracetag: Tag Jejak
+      user: Pengguna
+      user_preference: Keutamaan Pengguna
+      user_token: Token Pengguna
+      way: Arah
+      way_node: Nod Arah
+      way_tag: Tag Arah
+  browse: 
+    changeset: 
+      changeset: "Set Ubah: %{id}"
+      changesetxml: XML Set Ubah
+      download: Muat turun %{changeset_xml_link} atau %{osmchange_xml_link}
+      feed: 
+        title: Set Ubah %{id}
+        title_comment: Set Ubah %{id} - %{comment}
+      osmchangexml: XML osmChange
+      title: Set Ubah
+    changeset_details: 
+      belongs_to: "Milik:"
+      bounding_box: "Petak pembatasan:"
+      box: petak
+      closed_at: "Ditutup pada:"
+      created_at: "Dibuat pada:"
+      has_nodes: "Mempunyai %{count} nodus yang berikut:"
+      has_relations: "Mempunyai %{count} hubungan yang berikut:"
+      has_ways: "Mempunyai %{count} arah yang berikut:"
+      no_bounding_box: Tiada petak pembatasan telah ditetapkan untuk set ubah ini.
+      show_area_box: Tunjukkan Petak Kawasan
+    common_details: 
+      changeset_comment: Komen
+      deleted_at: "Dihapuskan pada:"
+      deleted_by: "Dihapuskan oleh:"
+      edited_at: "Disunting pada:"
+      edited_by: "Disunting oleh:"
+      in_changeset: "Dalam set ubah:"
+      version: "Versi:"
+    containing_relation: 
+      entry: Hubungan %{relation_name}
+      entry_role: Hubungan %{relation_name} (sebagai %{relation_role})
+    map: 
+      deleted: Dihapuskan
+      edit: 
+        area: Sunting kawasan
+        node: Sunting nod
+        relation: Sunting hubungan
+        way: Sunting arah
+      larger: 
+        area: Lihat kawasan pada peta yang lebih besar
+        node: Lihat nod pada peta yang lebih besar
+        relation: Lihat hubungan pada peta yang lebih besar
+        way: Lihat arah pada peta yang lebih besar
+      loading: Memuatkan...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Set ubah berikutnya
+        next_node_tooltip: Nod berikutnya
+        next_relation_tooltip: Hubungan berikutnya
+        next_way_tooltip: Arah berikutnya
+        prev_changeset_tooltip: Set ubah sebelumnya
+        prev_node_tooltip: Nod sebelumnya
+        prev_relation_tooltip: Hubungan sebelumnya
+        prev_way_tooltip: Arah sebelumnya
+      user: 
+        name_changeset_tooltip: Lihat suntingan oleh %{user}
+        next_changeset_tooltip: Suntingan berikutnya oleh %{user}
+        prev_changeset_tooltip: Suntingan sebelumnya oleh %{user}
+    node: 
+      download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}"
+      download_xml: Muat Turun XML
+      edit: sunting
+      node: Nod
+      node_title: "Nod: %{node_name}"
+      view_history: lihat sejarah
+    node_details: 
+      coordinates: "Koordinat:"
+      part_of: "Sebahagian:"
+    node_history: 
+      download: "%{download_xml_link} atau %{view_details_link}"
+      download_xml: Muat Turun XML
+      node_history: Sejarah Nod
+      node_history_title: "Sejarah Nod: %{node_name}"
+      view_details: lihat butiran
+    not_found: 
+      sorry: Maaf, %{type} dengan id %{id} tidak dapat dijumpai.
+      type: 
+        changeset: set ubah
+        node: nod
+        relation: hubungan
+        way: arah
+    paging_nav: 
+      of: daripada
+      showing_page: Memaparkan laman
+    relation: 
+      download: "%{download_xml_link} atau %{view_history_link}"
+      download_xml: Muat Turun XML
+      relation: Hubungan
+      relation_title: "Hubungan: %{relation_name}"
+      view_history: lihat sejarah
+    relation_details: 
+      members: "Anggota:"
+      part_of: "Sebahagian:"
+    relation_history: 
+      download: "%{download_xml_link} atau %{view_details_link}"
+      download_xml: Muat Turun XML
+      relation_history: Sejarah Hubungan
+      relation_history_title: "Sejarah Hubungan: %{relation_name}"
+      view_details: lihat butiran
+    relation_member: 
+      entry_role: "%{type} %{name} sebagai %{role}"
+      type: 
+        node: Nod
+        relation: Hubungan
+        way: Arah
+    start: 
+      manually_select: Pilih kawasan yang lain secara insani
+      view_data: Lihat data untuk paparan peta semasa
+    start_rjs: 
+      data_frame_title: Data
+      data_layer_name: Data
+      details: Butiran
+      drag_a_box: Seretkan petak di atas peta untuk memilih kawasan
+      edited_by_user_at_timestamp: Disunting oleh [[user]] pada [[timestamp]]
+      hide_areas: Sorokkan kawasan
+      history_for_feature: Sejarah [[feature]]
+      load_data: Muatkan Data
+      loaded_an_area_with_num_features: Anda telah memilih satu kawasan yang mengandungi [[num_features]] ciri. Pada umumnya, sesetengah pelayar web tidak mungkin mampu memaparkan sebegini banyak data dengan betul. Lazimnya, pelayar paling berkemampuan apabila memaparkan kurang daripada 100 ciri sekaligus; lebih daripada itu mungkin akan melambatkan pelayar anda atau membuatnya tidak responsif. Jika anda betul-betul ingin memaparkan data ini, anda boleh berbuat demikian dengan mengklik butang di bawah.
+      loading: Memuatkan...
+      manually_select: Pilih kawasan yang lain secara insani
+      object_list: 
+        api: Ambil kawasan in dari API
+        back: Paparkan senarai objek
+        details: Butiran
+        heading: Senarai objek
+        history: 
+          type: 
+            node: Nod [[id]]
+            way: Arah [[id]]
+        selected: 
+          type: 
+            node: Nod [[id]]
+            way: Arah [[id]]
+        type: 
+          node: Nod
+          way: Arah
+      private_user: pengguna persendirian
+      show_areas: Tunjukkan kawasan
+      show_history: Tunjukkan Sejarah
+      unable_to_load_size: "Tidak dapat muat: Saiz petak pembatasan [[bbox_size]] terlalu besar (mesti lebih kecil daripada %{max_bbox_size})"
+      wait: Tunggu...
+      zoom_or_select: Zum dekat atau pilih satu kawasan pada peta untuk dilihat
+    tag_details: 
+      tags: "Tag:"
+      wiki_link: 
+        key: Laman wiki keterangan tag %{key}
+        tag: Laman wiki keterangan tag %{key}=%{value}
+      wikipedia_link: Rencana %{page} di Wikipedia
+    timeout: 
+      sorry: Maaf, data untuk %{type} dengan id %{id} mengambil masa yang terlalu lama untuk diambil.
+      type: 
+        changeset: set ubah
+        node: nod
+        relation: hubungan
+        way: arah
+    way: 
+      download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}"
+      download_xml: Muat Turun XML
+      edit: sunting
+      view_history: lihat sejarah
+      way: Arah
+      way_title: "Arah: %{way_name}"
+    way_details: 
+      also_part_of: 
+        one: juga sebahagian daripada arah %{related_ways}
+        other: juga sebahagian daripada arah-arah %{related_ways}
+      nodes: "Nod:"
+      part_of: "Sebahagian:"
+    way_history: 
+      download: "%{download_xml_link} atau %{view_details_link}"
+      download_xml: Muat Turun XML
+      view_details: lihat butiran
+      way_history: Sejarah Arah
+      way_history_title: "Sejarah Arah: %{way_name}"
+  changeset: 
+    changeset: 
+      anonymous: Tanpa nama
+      big_area: (besar)
+      no_comment: (tiada)
+      no_edits: (tiada suntingan)
+      show_area_box: tunjukkan petak kawasan
+      still_editing: (masih dalam penyuntingan)
+      view_changeset_details: Lihat butiran set ubah
+    changeset_paging_nav: 
+      next: Berikutnya Â»
+      previous: "Â« Sebelumnya"
+      showing_page: Memaparkan halaman %{page}
+    changesets: 
+      area: Kawasan
+      comment: Komen
+      id: ID
+      saved_at: Disimpan pada
+      user: Pengguna
+    list: 
+      description: Perubahan terkini
+      description_bbox: Set Ubah di dalam %{bbox}
+      description_user: Set Ubah oleh %{user}
+      description_user_bbox: Set Ubah oleh %{user} di dalam %{bbox}
+      heading: Set Ubah
+      heading_bbox: Set Ubah
+      heading_user: Set Ubah
+      heading_user_bbox: Set Ubah
+      title: Set Ubah
+      title_bbox: Set Ubah di dalam %{bbox}
+      title_user: Set Ubah oleh %{user}
+      title_user_bbox: Set Ubah oleh %{user} di dalam %{bbox}
+    timeout: 
+      sorry: Maaf, senarai set ubah yang anda pohon itu mengambil masa yang terlalu lama untuk diambil.
+  diary_entry: 
+    diary_comment: 
+      comment_from: Ulasan %{link_user} terhadap %{comment_created_at}
+      confirm: Sahkan
+      hide_link: Sorokkan komen ini
+    diary_entry: 
+      comment_count: "%{count} komen"
+      comment_link: Ulas catatan ini
+      confirm: Sahkan
+      edit_link: Sunting catatan ini
+      hide_link: Sorokkan catatan ini
+      posted_by: Diposkan oleh %{link_user} pada %{created} dalam %{language_link}
+      reply_link: Balas catatan ini
+    edit: 
+      body: "Isi:"
+      language: "Bahasa:"
+      latitude: "Garis Lintang:"
+      location: "Lokasi:"
+      longitude: "Garis Bujur:"
+      marker_text: Lokasi catatan diari
+      save_button: Simpan
+      subject: "Subjek:"
+      title: Sunting catatan diari
+      use_map_link: gunakan peta
+    feed: 
+      all: 
+        description: Catatan-catatan diari terbaru oleh pengguna OpenStreetMap
+        title: Catatan diari OpenStreetMap
+      language: 
+        description: Catatan-catatan diari terbaru oleh pengguna OpenStreetMap dalam %{language_name}
+        title: Catatan diari OpenStreetMap dalam %{language_name}
+      user: 
+        description: Catatan diari OpenStreetMap terkini oleh %{user}
+        title: Catatan diari OpenStreetMap oleh %{user}
+    list: 
+      in_language_title: Catatan Diari dalam %{language}
+      new: Catatan Diari Baru
+      new_title: Karang catatan baru dalam diari pengguna anda
+      newer_entries: Catatan Terkini
+      no_entries: Tiada catatan diari
+      older_entries: Catatan Terdahulu
+      recent_entries: "Catatan diari terkini:"
+      title: Diari pengguna
+      user_title: Diari %{user}
+    location: 
+      edit: Sunting
+      location: "Lokasi:"
+      view: Lihat
+    new: 
+      title: Catatan Diari Baru
+    no_such_entry: 
+      body: Maaf, tiada catatan atau komen diari dengan id %{id}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul.
+      heading: "Tiada catatan dengan id: %{id}"
+      title: Catatan diari ini tidak wujud
+    no_such_user: 
+      body: Maaf, tiada pengguna dengan id %{id}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul.
+      heading: Pengguna %{url} tidak wujud
+      title: Pengguna ini tidak wujud
+    view: 
+      leave_a_comment: Tinggalkan komen
+      login: Log masuk
+      login_to_leave_a_comment: "%{login_link} untuk meninggalkan komen"
+      save_button: Simpan
+      title: Diari %{user} | %{title}
+      user_title: Diari %{user}
+  editor: 
+    default: Asali (kini %{name})
+    potlatch: 
+      description: Potlatch 1 (alat sunting dalam pelayar)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (alat sunting dalam pelayar)
+      name: Potlatch 2
+    remote: 
+      description: Kawalan Jauh (JOSM atau Merkaartor)
+      name: Kawalan Jauh
+  export: 
+    start: 
+      add_marker: Bubuh penanda pada peta
+      area_to_export: Kawasan untuk Dieksport
+      embeddable_html: HTML Boleh Benam
+      export_button: Eksport
+      export_details: Data OpenStreetMap dilesenkan di bawah lesen <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Pengiktirafan-PerkongsianSerupa 2.0 Umum</a>.
+      format: Format
+      format_to_export: Format untuk Dieksport
+      image_size: Saiz Imej
+      latitude: "GL:"
+      licence: Lesen
+      longitude: "GB:"
+      manually_select: Pilih kawasan yang lain secara insani
+      mapnik_image: Imej Mapnik
+      max: maks
+      options: Pilihan
+      osm_xml_data: Data XML OpenStreetMap
+      osmarender_image: Imej Osmarender
+      output: Output
+      paste_html: Tampalkan HTML untuk dibenamkan dalam tapak web
+      scale: Skala
+      too_large: 
+        body: Kawasan ini terlalu besar untuk dieksport dalam bentuk Data XML OpenStreetMap. Sila zum dekat atau pilih kawasan yang lebih kecil.
+        heading: Kawasan Terlalu Besar
+      zoom: Zum
+    start_rjs: 
+      add_marker: Bubuh penanda pada peta
+      change_marker: Ubah kedudukan penanda
+      click_add_marker: Klik pada peta untuk membubuh penanda
+      drag_a_box: Seretkan petak di atas peta untuk memilih kawasan
+      export: Eksport
+      manually_select: Pilih kawasan yang lain secara insani
+      view_larger_map: Lihat Peta yang Lebih Besar
+  geocoder: 
+    description: 
+      title: 
+        geonames: Lokasi carian <a href="http://www.geonames.org/">GeoNames</a>
+        osm_namefinder: "%{types} carian <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Lokasi carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+      types: 
+        cities: Bandaraya
+        places: Tempat
+        towns: Pekan
+    description_osm_namefinder: 
+      prefix: "%{distance} ke %{direction} dari %{type}"
+    direction: 
+      east: timur
+      north: utara
+      north_east: timur laut
+      north_west: barat laut
+      south: selatan
+      south_east: tenggara
+      south_west: barat daya
+      west: barat
+    distance: 
+      one: sekitar 1km
+      other: sekitar %{count}km
+      zero: kurang daripada 1km
+    results: 
+      more_results: Lebih banyak hasil
+      no_results: Tiada hasil carian
+    search: 
+      title: 
+        ca_postcode: Hasil carian <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames: Hasil carian <a href="http://www.geonames.org/">GeoNames</a>
+        latlon: Hasil carian <a href="http://openstreetmap.org/">dalaman</a>
+        osm_namefinder: Hasil Carian <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Hasil Carian <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        uk_postcode: Hasil carian <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Hasil carian <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "%{suffix} (%{parentdistance} ke %{parentdirection} dari %{parentname})"
+      suffix_place: ", %{distance} ke %{direction} dari %{placename}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Lapangan Terbang
+          arts_centre: Pusat Seni
+          atm: ATM
+          auditorium: Auditorium
+          bank: Bank
+          bar: Kedai Arak
+          bench: Bangku
+          bicycle_parking: Letak Basikal
+          bicycle_rental: Sewa Basikal
+          brothel: Rumah Pelacuran
+          bureau_de_change: Pengurup Wang
+          bus_station: Stesen Bas
+          cafe: Kafe
+          car_rental: Sewa Kereta
+          car_sharing: Kongsi Kereta
+          car_wash: Cuci Kereta
+          casino: Kasino
+          cinema: Pawagam
+          clinic: Klinik
+          club: Kelab
+          college: Maktab
+          community_centre: Pusat Komuniti
+          courthouse: Mahkamah
+          crematorium: Bakar Mayat
+          dentist: Doktor Gigi
+          doctors: Doktor
+          dormitory: Asrama
+          drinking_water: Air Minuman
+          driving_school: Sekolah Memandu
+          embassy: Kedutaan
+          emergency_phone: Telefon Kecemasan
+          fast_food: Makanan Segera
+          ferry_terminal: Terminal Feri
+          fire_hydrant: Pili Bomba
+          fire_station: Balai Bomba
+          fountain: Air Pancutan
+          fuel: Minyak
+          grave_yard: Perkuburan
+          gym: Pusat Senaman / Gim
+          hall: Dewan
+          health_centre: Pusat Kesihatan
+          hospital: Hospital
+          hotel: Hotel
+          hunting_stand: Pondok Memburu
+          ice_cream: Aiskrim
+          kindergarten: Tadika
+          library: Perpustakaan
+          market: Pasar
+          marketplace: Tempat Pasar
+          mountain_rescue: Penyelamat Gunung
+          nightclub: Kelab Malam
+          nursery: Tabika
+          nursing_home: Rumah Penjagaan
+          office: Pejabat
+          park: Taman
+          parking: Letak Kereta
+          pharmacy: Farmasi
+          place_of_worship: Tempat Ibadat
+          police: Polis
+          post_box: Peti Surat
+          post_office: Pejabat Pos
+          preschool: Prasekolah
+          prison: Penjara
+          pub: Pab
+          public_building: Bangunan Awam
+          public_market: Pasar Awam
+          reception_area: Sambut Tetamu
+          recycling: Kitar Semula
+          restaurant: Kedai Makan
+          retirement_home: Rumah Persaraan
+          sauna: Sauna
+          school: Sekolah
+          shelter: Perteduhan
+          shop: Kedai
+          shopping: Beli-Belah
+          social_club: Kelab Sosial
+          studio: Studio
+          supermarket: Pasar Raya
+          taxi: Teksi
+          telephone: Telefon Awam
+          theatre: Teater
+          toilets: Tandas
+          townhall: Dewan Bandar
+          university: Universiti
+          vending_machine: Mesin Layan Diri
+          veterinary: Doktor Haiwan
+          village_hall: Balai Raya
+          waste_basket: Bakul Sampah
+          wifi: Capaian WiFi
+          youth_centre: Pusat Belia
+        boundary: 
+          administrative: Sempadan Pentadbiran
+        building: 
+          apartments: Blok Rumah Pangsa
+          block: Blok Bangunan
+          bunker: Bunker
+          chapel: Gereja Kecil
+          church: Gereja
+          city_hall: Dewan Bandaraya
+          commercial: Bangunan Perdagangan
+          dormitory: Asrama
+          entrance: Pintu Masuk Bangunan
+          faculty: Bangunan Fakulti
+          farm: Bangunan Ladang
+          flats: Rumah Pangsa
+          garage: Garaj
+          hall: Dewan
+          hospital: Bangunan Hospital
+          hotel: Hotel
+          house: Rumah
+          industrial: Bangunan Industri
+          office: Bangunan Pejabat
+          public: Bangunan Awam
+          residential: Bangunan Perumahan
+          retail: Bangunan Peruncitan
+          school: Bangunan Sekolah
+          shop: Kedai
+          stadium: Stadium
+          store: Gedung
+          terrace: Teres
+          tower: Menara
+          train_station: Stesen Keretapi
+          university: Bangunan Universiti
+        highway: 
+          bridleway: Lorong Kuda
+          bus_guideway: Lorong Bas Berpandu
+          bus_stop: Perhentian Bas
+          byway: Jalan Kecil
+          construction: Lebuhraya dalam Pembinaan
+          cycleway: Lorong Basikal
+          distance_marker: Penanda Jarak
+          emergency_access_point: Titik Capaian Kecemasan
+          footway: Lorong Pejalan Kaki
+          ford: Harungan
+          gate: Pintu Besar
+          living_street: Jalan Masyarakat
+          minor: Jalan Sampingan
+          motorway: Lebuhraya
+          motorway_junction: Simpang Lebuhraya
+          motorway_link: Jalan Lebuhraya
+          path: Lorong
+          pedestrian: Laluan Pejalan Kaki
+          platform: Platform
+          primary: Jalan Utama
+          primary_link: Jalan Utama
+          raceway: Jalan Lumba
+          residential: Perumahan
+          road: Jalan Raya
+          secondary: Jalan Sekunder
+          secondary_link: Jalan Sekunder
+          service: Jalan Perkhidmatan
+          services: Perkhidmatan Lebuhraya
+          steps: Tangga
+          stile: Tangga Pagar
+          tertiary: Jalan Tertier
+          track: Laluan
+          trail: Denai
+          trunk: Jalan Utama
+          trunk_link: Jalan Utama
+          unclassified: Jalan Tidak Terkelas
+          unsurfaced: Jalan Tanpa Turapan
+        historic: 
+          archaeological_site: Tapak Kaji Purba
+          battlefield: Medan Pertempuran
+          boundary_stone: Batu Sempadan
+          building: Bangunan
+          castle: Istana
+          church: Gereja
+          house: Rumah
+          icon: Patung
+          manor: Manor
+          memorial: Peringatan
+          mine: Lombong
+          monument: Tugu
+          museum: Muzium
+          ruins: Puing
+          tower: Menara
+          wayside_cross: Salib Tepi Jalan
+          wayside_shrine: Tempat Suci Tepi Jalan
+          wreck: Ranap
+        landuse: 
+          allotments: Taman petak
+          basin: Lembangan
+          brownfield: Tanah Terbiar
+          cemetery: Perkuburan
+          commercial: Kawasan Perdagangan
+          conservation: Pemuliharaan
+          construction: Pembinaan
+          farm: Ladang
+          farmland: Tanah Ladang
+          farmyard: Laman Ladang
+          forest: Hutan
+          grass: Rumput
+          greenfield: Tanah Tak Terbangun
+          industrial: Kawasan Perindustrian
+          landfill: Kambus Tanah
+          meadow: Padang Rumput
+          military: Kawasan Tentera
+          mine: Lombong
+          mountain: Gunung
+          nature_reserve: Cagar Alam
+          park: Taman
+          piste: Padang Luncur Ais
+          plaza: Plaza
+          quarry: Kuari
+          railway: Landasan Keretapi
+          recreation_ground: Tempat Berekreasi
+          reservoir: Takungan
+          residential: Kawasan Perumahan
+          retail: Peruncitan
+          village_green: Padang Kampung
+          vineyard: Ladang Anggur
+          wetland: Tanah Lembap
+          wood: Hutan Kecil
+        leisure: 
+          beach_resort: Peranginan Pantai
+          common: Tanah Awam
+          fishing: Tempat Memancing
+          garden: Kebun
+          golf_course: Padang Golf
+          ice_rink: Gelanggang Ais
+          marina: Marina
+          miniature_golf: Golf Miniatur
+          nature_reserve: Cagar Alam
+          park: Taman
+          pitch: Padang Sukan
+          playground: Taman Permainan
+          recreation_ground: Tempat Berekreasi
+          slipway: Landasan Kapal
+          sports_centre: Pusat Sukan
+          stadium: Stadium
+          swimming_pool: Kolam Renang
+          track: Balapan Lumba Lari
+          water_park: Taman Air
+        natural: 
+          bay: Teluk
+          beach: Pantai
+          cape: Tanjung
+          cave_entrance: Liang Gua
+          channel: Alur
+          cliff: Cenuram
+          coastline: Garis Pinggir Laut
+          crater: Kawah
+          feature: Rupa Muka
+          fell: Fell
+          fjord: Fjord
+          geyser: Geiser
+          glacier: Glasier
+          heath: Kerangas
+          hill: Bukit
+          island: Pulau
+          land: Daratan
+          marsh: Tanah Rawang
+          moor: Mur
+          mud: Lumpur
+          peak: Puncak
+          point: Titik
+          reef: Terumbu
+          ridge: Rabung
+          river: Sungai
+          rock: Batu
+          scree: Batu Runtuh
+          scrub: Belukar
+          shoal: Beting
+          spring: Mata Air
+          strait: Selat
+          tree: Pokok
+          valley: Lembah
+          volcano: Gunung Berapi
+          water: Air
+          wetland: Tanah Lembap
+          wetlands: Tanah Lembap
+          wood: Hutan Kecil
+        place: 
+          airport: Lapangan Terbang
+          city: Bandar
+          country: Negara
+          county: Kaunti
+          farm: Ladang
+          hamlet: Dukuh
+          house: Rumah
+          houses: Rumah-Rumah
+          island: Pulau
+          islet: Anak Pulau
+          locality: Lokaliti
+          moor: Mur
+          municipality: Perbandaran
+          postcode: Poskod
+          region: Kawasan
+          sea: Laut
+          state: Negeri
+          subdivision: Subbahagian
+          suburb: Subbandar
+          town: Pekan
+          unincorporated_area: Kawasan Tak Terperbadan
+          village: Desa
+        railway: 
+          abandoned: Landasan Keretapi Terbiar
+          construction: Landasan Keretapi dalam Pembinaan
+          disused: Landasan Keretapi yang Tidak Digunakan Lagi
+          disused_station: Stesen Keretapi yang Tidak Digunakan Lagi
+          funicular: Landasan Keretapi Funikular
+          halt: Perhentian Keretapi
+          historic_station: Stesen Keretapi Bersejarah
+          junction: Simpang Landasan Keretapi
+          level_crossing: Lintasan Keretapi Rata
+          light_rail: Rel Ringan
+          monorail: Monorel
+          narrow_gauge: Landasan Keretapi Sempit
+          platform: Platform Keretapi
+          preserved: Landasan Keretapi Terpelihara
+          spur: Cabang Landasan Keretapi
+          station: Stesen Keretapi
+          subway: Stesen Bawah Tanah
+          subway_entrance: Pintu Masuk Bawah Tanah
+          switch: Titik Landasan Keretapi
+          tram: Landasan Trem
+          tram_stop: Perhentian Trem
+          yard: Laman Keretapi
+        shop: 
+          alcohol: Kedai Arak Tanpa Lesen
+          apparel: Kedai Busana
+          art: Kedai Seni
+          bakery: Kedai Roti
+          beauty: Kedai Kecantikan
+          beverages: Kedai Minuman
+          bicycle: Kedai Basikal
+          books: Kedai Buku
+          butcher: Kedai Daging
+          car: Kedai Kereta
+          car_dealer: Peniaga Kereta
+          car_parts: Alat Ganti Kereta
+          car_repair: Baiki Kereta
+          carpet: Kedai Permaidani
+          charity: Kedai Amal
+          chemist: Farmasi
+          clothes: Kedai Pakaian
+          computer: Kedai Komputer
+          confectionery: Kedai Konfeksi
+          convenience: Kedai Mudah Beli
+          copyshop: Kedai Fotokopi
+          cosmetics: Kedai Komestik
+          department_store: Gedung Serbaneka
+          discount: Kedai Diskaun
+          doityourself: DIY
+          drugstore: Kedai Ubat
+          dry_cleaning: Kedai Cuci Kering
+          electronics: Kedai Elektronik
+          estate_agent: Ejen Hartanah
+          farm: Kedai Ladang
+          fashion: Kedai Fesyen
+          fish: Kedai Ikan
+          florist: Kedai Bunga
+          food: Kedai Makanan
+          funeral_directors: Kedai Urus Mayat
+          furniture: Perabot
+          gallery: Balai Seni
+          garden_centre: Pusat Kebun
+          general: Kedai Am
+          gift: Kedai Hadiah
+          greengrocer: Kedai Jual Sayur
+          grocery: Kedai Runcit
+          hairdresser: Kedai Dandan Rambut
+          hardware: Kedai Barang Besi
+          hifi: Hi-Fi
+          insurance: Insurans
+          jewelry: Kedai Barang Kemas
+          kiosk: Gerai
+          laundry: Dobi
+          mall: Medan Beli-Belah
+          market: Pasar
+          mobile_phone: Kedai Telefon Bimbit
+          motorcycle: Kedai Motosikal
+          music: Kedai Muzik
+          newsagent: Gerai Surat Khabar
+          optician: Kedai Optik
+          organic: Kedai Makanan Organik
+          outdoor: Kedai Luaran
+          pet: Kedai Haiwan
+          photo: Kedai Foto
+          salon: Salon
+          shoes: Kedai Kasut
+          shopping_centre: Pusat Beli-Belah
+          sports: Kedai Sukan
+          stationery: Kedai Alat Tulis
+          supermarket: Pasar Raya
+          toys: Kedai Mainan
+          travel_agency: Agensi Pelancongan
+          video: Kedai Video
+          wine: Kedai Arak Tanpa Lesen
+        tourism: 
+          alpine_hut: Pondok Gunung
+          artwork: Karya Seni
+          attraction: Tarikan
+          bed_and_breakfast: Rumah Tumpangan
+          cabin: Pondok
+          camp_site: Tapak Perkhemahan
+          caravan_site: Tapak Karavan
+          chalet: Chalet
+          guest_house: Rumah Tamu
+          hostel: Hostel
+          hotel: Hotel
+          information: Maklumat
+          lean_to: Bangsal Pisang Sesikat
+          motel: Motel
+          museum: Muzium
+          picnic_site: Tapak Berkelah
+          theme_park: Taman Tema
+          valley: Lembah
+          viewpoint: Sudut Pandangan
+          zoo: Taman Haiwan
+        waterway: 
+          boatyard: Limbungan Bot
+          canal: Terusan
+          connector: Penyambung Jalan Air
+          dam: Empangan
+          derelict_canal: Terusan Terbiar
+          ditch: Parit
+          dock: Dok
+          drain: Longkang
+          lock: Pintu Air
+          lock_gate: Pintu Air
+          mineral_spring: Mata Air Mineral
+          mooring: Tambatan
+          rapids: Jeram
+          river: Sungai
+          riverbank: Tebing Sungai
+          stream: Anak Sungai
+          wadi: Wadi
+          water_point: Titik Jalan Air
+          waterfall: Air Terjun
+          weir: Tebat
+  layouts: 
+    community_blogs: Blog Komuniti
+    community_blogs_title: Blog-blog ahli komuniti OpenStreetMap
+    copyright: Hak Cipta & Lesen
+    documentation: Dokumentasi
+    documentation_title: Dokumentasi projek
+    donate: Sokong OpenStreetMap dengan %{link} kepada Dana Penaiktarafan Perkakas.
+    donate_link_text: menderma
+    edit: Sunting
+    edit_with: Sunting dengan %{editor}
+    export: Eksport
+    export_tooltip: Eksport data peta
+    foundation: Yayasan
+    foundation_title: Yayasan OpenStreetMap
+    gps_traces: Jejak GPS
+    gps_traces_tooltip: Uruskan jejak GPS
+    help: Bantuan
+    help_centre: Pusat Bantuan
+    help_title: Tapak bantuan projek
+    history: Sejarah
+    home: laman utama
+    home_tooltip: Pergi ke lokasi rumah
+    inbox: peti masuk (%{count})
+    inbox_tooltip: 
+      one: Peti masuk anda mengandungi sepucuk pesanan yang belum dibaca
+      other: Peti masuk anda mengandungi %{count} pesanan yang belum dibaca
+      zero: Peti masuk anda tidak mengandungi sebarang pesanan yang belum dibaca
+    intro_1: OpenStreetMap ialah peta seluruh dunia yang boleh disunting. Ia dihasilkan oleh insan-insan seperti anda.
+    intro_2: OpenStreetMap membolehkan anda untuk melihat, menyunting dan menggunakan data geografi secara kolaborasi dari mana-mana di atas muka Bumi.
+    intro_3: Pengehosan OpenStreetMap disokong dengan sepenuh hati oleh %{ucl}, %{ic} dan %{bytemark}. Penyokong-penyokong projek yang lain tersenarai dalam %{partners}.
+    intro_3_ic: Imperial College London
+    intro_3_partners: wiki
+    license: 
+      title: Data OpenStreetMap dilesenkan di bawah lesen Creative Commons Pengiktirafan-PerkongsianSerupa 2.0 Umum
+    log_in: log masuk
+    log_in_tooltip: Log masuk dengan akaun yang sedia ada
+    logo: 
+      alt_text: Logo OpenStreetMap
+    logout: log keluar
+    logout_tooltip: Log keluar
+    make_a_donation: 
+      text: Derma
+      title: Sokonglah OpenStreetMap dengan dermaan dalam bentuk wang
+    osm_offline: Pangkalan data OpenStreetMap kini diputuskan sambungannya sementara kerja penyelenggaran mustahak dilangsungkan.
+    osm_read_only: Pangkalan data OpenStreetMap sekarang ditetapkan pada mod baca sahaja sementara kerja penyelenggaran mustahak dilangsungkan.
+    sign_up: daftar diri
+    sign_up_tooltip: Buka akaun untuk menyunting
+    sotm2011: "-"
+    tag_line: Peta Dunia Wiki Bebas
+    user_diaries: Diari Pengguna
+    user_diaries_tooltip: Lihat diari pengguna
+    view: Lihat
+    view_tooltip: Lihat peta
+    welcome_user: Selamat datang, %{user_link}
+    welcome_user_link_tooltip: Laman pengguna anda
+    wiki: Wiki
+    wiki_title: Tapak wiki projek
+  license_page: 
+    foreign: 
+      english_link: teks asal bahasa Inggeris
+      text: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan %{english_original_link}, maka versi bahasa Inggeris itu akan diberi keutamaan
+      title: Perihal terjemahan ini
+    legal_babble: "<h2>Hak Cipta dan Lesen</h2>\n<p>\n   OpenStreetMap merupakan <i>data terbuka</i> yang dilesenkan di bawah lesen <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Pengiktirafan-PerkongsianSerupa 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  Anda diberi kebebasan untuk menyalin, mengedarkan, memancarkan dan mengubah suai peta-peta dan data kami asalkan anda memberikan penghargaan kepada OpenStreetMap dan para penyumbangnya. Sekiranya anda mengubah atau menokok tambah peta-peta atau data kami, anda boleh mengedarkan hasilnya di bawah lesen yang sama sahaja. <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Hukum undang-undang</a> yang penuh ini menjelaskan hak-hak dan tanggungjawab anda.\n</p>\n\n<h3>Cara memberikan penghargaan kepada OpenStreetMap</h3>\n<p>\n  Sekiranya anda menggunakan imej-imej peta OpenStreetMap map images, kami memohon supaya penghargaan anda menyatakan sekurang-kurangnya yang berikut: âÂ© para penyumbang OpenStreetMap, CC-BY-SAâ. Jika anda menggunakan data peta sahaja, kami memohon âData peta Â© penyumbang OpenStreetMap, CC-BY-SAâ.\n</p>\n<p>\n  Di mana mungkin, OpenStreetMap sewajarnya dihiperpautkan dengan <a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a> dan CC-BY-SA dengan <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Jika anda menggunakan bahantara yang tidak membolehkan pautan (cth. hasil cetakan), kami mencadangkan agar anda melencongkan para pembaca anda kepada www.openstreetmap.org (mungkin dengan mengembangkan âOpenStreetMapâ kepada alamat penuh ini) dan juga www.creativecommons.org.\n</p>\n\n<h3>Mengetahui lebih lanjut</h3>\n<p>\n  Baca lebih lanjut tentang penggunaan data kami di <a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Soalan Lazim Undang-Undang</a>.\n</p>\n<p>\n  Para penyumbang OSM diingatkan supaya tidak sesekali menambahkan data dari mana-mana sumber yang berhak cipta (cth. Google Maps atau peta cetakan) tanpa kebenaran yang tersurat daripada pemegang hak cipta.\n</p>\n<p>\n  Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma untuk pemaju pihak ketiga.\n\n  Bacalah <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">Dasar Penggunaan API</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">Dasar Penggunaan Jubin</a> dan <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">Dasar Penggunaan Nominatim</a> kami.\n</p>\n\n<h3>Penyumbang kami</h3>\n<p>\n  Lesen CC-BY-SA kami mengehendaki anda untuk âmemberikan penghargaan Pengarang Asal yang berpatutan dengan bahantara atau kaedah yang Anda sedang gunakanâ. Setiap seorang pemeta OSM tidak memohon penghargaan yang melebihi penghargaan kepada âpara penyumbang OpenStreetMapâ, tetapi seandainya data daripada agensi pemetaan kebangsaan atau sebarang sumber utama yang lain telah disertakan dalam OpenStreetMap, maka adalah wajar untuk memberikan penghargaan kepadanya dengan terus mengeluarkan semula penghargaannya atau membubuh pautan kepadanya dalam laman ini.\n</p>\n\n<!--\nMakluman untuk penyunting halaman\n\nSenarai berikut hanya menyertakan pihak-pihak yang memerlukan atribusi sebagai syarat penggunaan data di OpenStreetMap. Ia bukan katalog import am dan tidak boleh digunakan melainkan apabila atribusi diperlukan untuk mematuhi lesen data yang diimport itu.\n\nSebarang tambahan di sini mesti dibincangkan dengan penyelia sistem OSM terlebih dahulu.\n-->\n\n<ul id=\"contributors\">\n    <li><strong>Australia</strong>: Mengandungi data subbandar berasaskan data Australian Bureau of Statistics.</li>\n    <li><strong>Austria</strong>: Mengandungi data daripada <a href=\"http://data.wien.gv.at/\">Stadt Wien</a> di bawah <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n    <li><strong>Kanada</strong>: Mengandungi data daripada GeoBaseÂ®, GeoGratis (Â© Department of Natural Resources Canada), CanVec (Â© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).</li>\n    <li><strong>New Zealand</strong>: Mengandungi data yang disumberkan daripada Land Information New Zealand. Crown Copyright reserved.</li>\n    <li><strong>Perancis</strong>: Mengandungi data yang disumberkan daripada Direction GÃ©nÃ©rale des ImpÃ´ts.</li>\n    <li><strong>Poland</strong>: Mengandungi data daripada <a href=\"http://ump.waw.pl/\">peta-peta UMP-pcPL</a>. Hak cipta penyumbang UMP-pcPL.</li>\n    <li><strong>United Kingdom</strong>: Mengandungi data Ordnance Survey data Â© Crown copyright and database right 2010.</li>\n</ul>\n\n<p>\n  Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan.\n</p>"
+    native: 
+      mapping_link: mula membuat peta
+      native_link: versi Bahasa Melayu
+      text: Anda sedang membaca halaman hak cipta dalam versi bahasa Inggeris. Anda boleh kembali kepada %{native_link} halaman ini, atau berhenti membaca perihal hak cipta dan %{mapping_link}.
+      title: Perihal laman ini
+  message: 
+    delete: 
+      deleted: Pesanan dibuang
+    inbox: 
+      date: Tarikh
+      from: Daripada
+      my_inbox: Peti masuk saya
+      outbox: peti keluar
+      subject: Subjek
+      title: Peti Masuk
+      you_have: Anda mempunyai %{new_count} pesanan baru dan %{old_count} pesanan lama
+    mark: 
+      as_read: Pesanan ditandai sebagai sudah dibaca
+      as_unread: Pesanan ditandai sebagai belum dibaca
+    message_summary: 
+      delete_button: Hapuskan
+      read_button: Tanda sebagai sudah dibaca
+      reply_button: Balas
+      unread_button: Tanda sebagai belum dibaca
+    new: 
+      back_to_inbox: Kembali ke peti masuk
+      body: Isi
+      limit_exceeded: Anda telah banyak menghantar pesanan baru-baru ini. Sila tunggu sebentar sebelum cuba mengirim banyak lagi pesanan.
+      message_sent: Pesanan dikirim
+      send_button: Kirim
+      send_message_to: Hantar pesanan baru kepada %{name}
+      subject: Subjek
+      title: Hantar pesanan
+    no_such_message: 
+      heading: Pesanan ini tidak wujud
+      title: Pesanan ini tidak wujud
+    no_such_user: 
+      heading: Pengguna ini tidak wujud
+      title: Pengguna ini tidak wujud
+    outbox: 
+      date: Tarikh
+      inbox: Peti masuk
+      my_inbox: "%{inbox_link} saya"
+      outbox: peti keluar
+      subject: Subjek
+      title: Peti Keluar
+      to: Kepada
+      you_have_sent_messages: Anda mempunyai %{count} pesanan terhantar
+    read: 
+      back_to_inbox: Kembali ke peti masuk
+      back_to_outbox: Kembali ke peti keluar
+      date: Tarikh
+      from: Daripada
+      reading_your_sent_messages: Membaca pesanan yang dihantar
+      reply_button: Balas
+      subject: Subjek
+      title: Baca pesanan
+      to: Kepada
+      wrong_user: Anda telah log masuk sebagai `%{user}' tetapi pesanan yang anda pohon untuk dibaca itu tidak dihantar oleh/kepada pengguna itu. Sila log masuk sebagai pengguna yang betul untuk membacanya.
+    sent_message_summary: 
+      delete_button: Hapuskan
+  notifier: 
+    diary_comment_notification: 
+      footer: Anda juga boleh membaca komen di %{readurl} serta mengulas di %{commenturl} atau membalas di %{replyurl}
+      header: "%{from_user} telah mengulas catatan diari OpenStreetMap anda yang terbaru dengan tajuk %{subject}:"
+      hi: Apa khabar %{to_user},
+      subject: "[OpenStreetMap] %{user} mengulas catatan diari anda"
+    email_confirm_html: 
+      greeting: Apa khabar,
+    email_confirm_plain: 
+      greeting: Apa khabar,
+    friend_notification: 
+      subject: "[OpenStreetMap] %{user} menjadikan anda sebagai rakannya"
+    gpx_notification: 
+      and_no_tags: and tiada tag.
+      and_the_tags: "dan tag-tag yang berikut:"
+      failure: 
+        failed_to_import: "tidak dapat diimport. Berikut ialah ralatnya:"
+        more_info_1: Maklumat lanjut tentang kegagalan import GPX dan cara mengelakkannya
+        more_info_2: "boleh didapati di:"
+        subject: "[OpenStreetMap] GPX gagal diimport"
+      greeting: Apa khabar,
+      success: 
+        loaded_successfully: berjaya dimuatkan dengan %{trace_points} daripada sejumlah %{possible_points} mata.
+        subject: "[OpenStreetMap] GPX berjaya diimport"
+      with_description: dengan keterangan
+      your_gpx_file: Nampaknya fail GPX anda
+    lost_password_html: 
+      greeting: Apa khabar,
+    lost_password_plain: 
+      greeting: Apa khabar,
+    message_notification: 
+      footer1: Anda juga boleh membaca pesanan ini di %{readurl}
+      header: "%{from_user} telah menghantar sepucuk pesanan kepada anda melalui OpenStreetMap dengan subjek %{subject}:"
+      hi: Apa khabar %{to_user},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Sahkan alamat e-mel anda"
+    signup_confirm_html: 
+      greeting: Apa khabar!
+    signup_confirm_plain: 
+      greeting: Apa khabar!
+      more_videos: "Ada banyak lagi video di sini:"
+      opengeodata: "OpenGeoData.org merupakan blog milik pengasas OpenStreetMap, Steve Coast, dan juga mempunyai podcast:"
+      the_wiki: "Bacalah perihal OpenStreetMap di wiki:"
+  oauth_clients: 
+    edit: 
+      submit: Sunting
+      title: Sunting aplikasi anda
+    form: 
+      name: Nama
+      required: Wajib
+    new: 
+      submit: Daftar
+      title: Daftarkan aplikasi baru
+    show: 
+      support_notice: Kami menyokong HMAC-SHA1 (disyorkan) dan juga teks biasa dalam mod ssl.
+  site: 
+    edit: 
+      anon_edits_link_text: Ketahuilah sebab jadinya begini.
+      not_public: Anda belum menetapkan suntingan anda untuk untuk ditunjukkan kepada orang awam.
+      user_page_link: laman pengguna
+    index: 
+      js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun anda tidak menghidupkan JavaScript.
+      js_2: OpenStreetMap menggunakan JavaScript untuk peta licinnya.
+      js_3: Apa kata anda cuba <a href="http://tah.openstreetmap.org/Browse/">pelayar jubin statik Tiles@Home</a> seandainya anda tidak dapat menghidupkan JavaScript.
+      license: 
+        project_name: Projek OpenStreetMap
+      permalink: Pautan Kekal
+      shortlink: Pautan Ringkas
+    key: 
+      map_key: Petunjuk
+      map_key_tooltip: Petunjuk peta
+      table: 
+        entry: 
+          admin: Sempadan pentadbiran
+          apron: 
+            - Kawasan gerak lapangan terbang
+            - terminal
+          bridleway: Lorong kuda
+          building: Bangunan penting
+          byway: Jalan kecil
+          cable: 
+            - Kereta kabel
+            - lif kerusi
+          cemetery: Perkuburan
+          centre: Pusat sukan
+          commercial: Kawasan perdagangan
+          cycleway: Lorong basikal
+          farm: Ladang
+          footway: Laluan pejalan kaki
+          forest: Hutan
+          golf: Padang golf
+          industrial: Kawasan perindustrian
+          lake: 
+            - Tasik
+            - takungan
+          military: Kawasan tentera
+          motorway: Lebuhraya
+          park: Taman
+          pitch: Padang sukan
+          primary: Jalan utama
+          rail: Landasan keretapi
+          resident: Kawasan perumahan
+          retail: Kawasan peruncitan
+          runway: 
+            - Landasan kapal terbang
+            - jalan rayap
+          school: 
+            - Sekolah
+            - universiti
+          secondary: Jalan sekunder
+          station: Stesen keretapi
+          subway: Landasan bawah tanah
+          summit: 
+            - Kemuncak
+            - puncak
+          tourist: Tarikan pelancong
+          track: Laluan
+          tram: 
+            - Rel ringan
+            - tram
+          trunk: Jalan utama
+          unclassified: Jalan tidak terkelas
+          unsurfaced: Jalan tanpa turapan
+          wood: Hutan kecil
+    search: 
+      search: Cari
+      submit_text: Pergi
+      where_am_i: Saya di mana?
+    sidebar: 
+      close: Tutup
+      search_results: Hasil Carian
+  time: 
+    formats: 
+      friendly: "%e %B %Y, %H:%M"
+  trace: 
+    edit: 
+      description: "Keterangan:"
+      download: muat turun
+      edit: sunting
+      filename: "Nama fail:"
+      map: peta
+      owner: "Pemilik:"
+      save_button: Simpan Perubahan
+      tags: "Tag:"
+      uploaded_at: "Dimuat naik:"
+      visibility: "Keterlihatan:"
+    trace: 
+      edit: sunting
+      map: peta
+      public: UMUM
+    trace_form: 
+      description: Keterangan
+      help: Bantuan
+      tags: "Tag:"
+      upload_button: Muat naik
+      visibility: "Keterlihatan:"
+    trace_paging_nav: 
+      next: Berikutnya Â»
+      previous: "Â« Sebelumnya"
+    view: 
+      description: "Keterangan:"
+      download: muat turun
+      edit: sunting
+      filename: "Nama fail:"
+      map: peta
+      none: Tiada
+      owner: "Pemilik:"
+      tags: "Tag:"
+      uploaded: "Dimuat naik:"
+      visibility: "Keterlihatan:"
+  user: 
+    account: 
+      latitude: "Garis Lintang:"
+      longitude: "Garis Bujur:"
+      save changes button: Simpan Perubahan
+    confirm: 
+      button: Sahkan
+    confirm_email: 
+      button: Sahkan
+    list: 
+      heading: Pengguna
+      title: Pengguna
+    login: 
+      heading: Log masuk
+      login_button: Log masuk
+      openid_logo_alt: Log masuk dengan OpenID
+      openid_providers: 
+        aol: 
+          alt: Log masuk dengan OpenID AOL
+          title: Log masuk dengan AOL
+        google: 
+          alt: Log masuk dengan OpenID Google
+          title: Log masuk dengan Google
+        myopenid: 
+          alt: Log masuk dengan OpenID myOpenID
+          title: Log masuk dengan myOpenID
+        openid: 
+          alt: Log masuk dengan URL OpenID
+          title: Log masuk dengan OpenID
+        wordpress: 
+          alt: Log masuk dengan OpenID Wordpress
+          title: Log masuk dengan Wordpress
+        yahoo: 
+          alt: Log masuk dengan OpenID Yahoo
+          title: Log masuk dengan Yahoo
+      password: "Kata laluan:"
+      remember: "Ingati saya:"
+      title: Log masuk
+      webmaster: pentadbir web
+    logout: 
+      heading: Log keluar dari OpenStreetMap
+      logout_button: Log keluar
+      title: Log keluar
+    lost_password: 
+      email address: "Alamat E-mel:"
+      heading: Lupa Kata Laluan?
+      help_text: Isikan alamat e-mel yang anda gunakan untuk mendaftar. Kami akan menge-melkan pautan untuk anda mengeset semula kata laluan anda.
+      new password button: Set semula kata laluan
+      title: Terlupa kata laluan
+    new: 
+      confirm email address: "Sahkan Alamat E-mel:"
+      confirm password: "Sahkan Kata Laluan:"
+      continue: Teruskan
+      display name: "Nama Paparan:"
+      display name description: Nama pengguna anda yang dipaparkan kepada awam. Anda boleh menukarnya dalam keutamaan anda pada bila-bila masa.
+      email address: "Alamat E-mel:"
+      openid: "OpenID %{logo}:"
+      password: "Kata laluan:"
+      title: Buka akaun
+      use openid: Ataupun gunakan OpenID %{logo} untuk log masuk
+    reset_password: 
+      confirm password: "Sahkan Kata Laluan:"
+      heading: Set Semula Kata Laluan untuk %{user}
+      password: "Kata laluan:"
+      reset: Set Semula Kata Laluan
+      title: Set semula kata laluan
+    terms: 
+      agree: Setuju
+      decline: Tolak
+    view: 
+      ago: (%{time_in_words_ago} lalu)
+      confirm: Sahkan
+      description: Keterangan
+      edits: suntingan
+      email address: "Alamat e-mel:"
+      latest edit: "Suntingan terkini %{ago}:"
+      my diary: diari saya
+      new diary entry: catatan diari baru
+      settings_link_text: tetapan
+      status: "Status:"
+  user_role: 
+    grant: 
+      confirm: Sahkan
+    revoke: 
+      confirm: Sahkan
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 464c18380..3e8633c82 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -274,7 +274,7 @@ nl:
       view_changeset_details: Details wijzigingenset weergeven
     changeset_paging_nav: 
       next: Volgende Â»
-      previous: "Â« Vorige"
+      previous: Â« Vorige
       showing_page: Pagina %{page}
     changesets: 
       area: Gebied
@@ -1357,7 +1357,7 @@ nl:
       tags: Labels
     trace_paging_nav: 
       next: Volgende Â»
-      previous: "Â« Vorige"
+      previous: Â« Vorige
       showing_page: Pagina %{page}
     view: 
       delete_track: Deze track verwijderen
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 3613edb04..a49de1a2e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -8,6 +8,7 @@
 # Author: Laaknor
 # Author: Nghtwlkr
 # Author: Oyvind
+# Author: The real emj
 "no": 
   activerecord: 
     attributes: 
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 37c64b136..171d7e56f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -279,7 +279,7 @@ pl:
       view_changeset_details: Zobacz szczegÃ³Åy zestawu zmian
     changeset_paging_nav: 
       next: NastÄpna Â»
-      previous: "Â« Poprzednia"
+      previous: Â« Poprzednia
       showing_page: Strona %{page}
     changesets: 
       area: Obszar
@@ -1326,7 +1326,7 @@ pl:
       tags: Znaczniki
     trace_paging_nav: 
       next: NastÄpny Â»
-      previous: "Â« Poprzedni"
+      previous: Â« Poprzedni
       showing_page: WyÅwietlanie strony %{page}
     view: 
       delete_track: Wykasuj ten Ålad
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c2d654552..d7b26846f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -146,10 +146,10 @@ pt-BR:
       paging: 
         all: 
           next: "%{id} Â»"
-          prev: "Â« %{id}"
+          prev: Â« %{id}
         user: 
           next: "%{id} Â»"
-          prev: "Â« %{id}"
+          prev: Â« %{id}
       user: 
         name_changeset_tooltip: Ver ediÃ§Ãµes de %{user}
         next_changeset_tooltip: Editado posteriormente por %{user}
@@ -283,7 +283,7 @@ pt-BR:
       view_changeset_details: Ver detalhes das alteraÃ§Ãµes
     changeset_paging_nav: 
       next: Seguinte Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Exibindo pÃ¡gina %{page}
     changesets: 
       area: Ãrea
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 48b7b7fb6..69f8bf45c 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -214,7 +214,7 @@ pt:
   changeset: 
     changeset_paging_nav: 
       next: Seguinte Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
     changesets: 
       area: Ãrea
       comment: ComentÃ¡rio
@@ -628,7 +628,7 @@ pt:
       tags: Etiquetas
     trace_paging_nav: 
       next: PrÃ³ximo Â»
-      previous: "Â« Anterior"
+      previous: Â« Anterior
       showing_page: Mostrando pÃ¡gina %{page}
     view: 
       delete_track: Apagar este caminho
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3e9bb885c..8ea93bcd7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -245,7 +245,7 @@ sk:
       view_changeset_details: ZobraziÅ¥ detaily zmenovÃ©ho sÃºboru
     changeset_paging_nav: 
       next: ÄalÅ¡ia Â»
-      previous: "Â« PredoÅ¡lÃ¡"
+      previous: Â« PredoÅ¡lÃ¡
       showing_page: ZobrazenÃ¡ strÃ¡nka %{page}
     changesets: 
       area: OblasÅ¥
@@ -1224,7 +1224,7 @@ sk:
       tags: Tagy
     trace_paging_nav: 
       next: Dopredu Â»
-      previous: "Â« NaspÃ¤Å¥"
+      previous: Â« NaspÃ¤Å¥
       showing_page: Strana %{page}
     view: 
       delete_track: VymazaÅ¥ tÃºto stopu
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1140216a6..60272e8d3 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -272,7 +272,7 @@ sl:
       view_changeset_details: Ogled podrobnosti paketa sprememb
     changeset_paging_nav: 
       next: Naslednja Â»
-      previous: "Â« PrejÅ¡nja"
+      previous: Â« PrejÅ¡nja
       showing_page: Prikazovanje strani %{page}
     changesets: 
       area: PodroÄje
@@ -1357,7 +1357,7 @@ sl:
       tags: Oznake
     trace_paging_nav: 
       next: Naslednja Â»
-      previous: "Â« PrejÅ¡nja"
+      previous: Â« PrejÅ¡nja
       showing_page: Prikazujem stran %{page}
     view: 
       delete_track: IzbriÅ¡i to sled
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index fcb37100d..2a5d532fd 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -494,7 +494,7 @@ sq:
       tags: Etiketa
     trace_paging_nav: 
       next: Vazhdo Â»
-      previous: "Â« Paraprake"
+      previous: Â« Paraprake
       showing_page: Duke shfaqun faqen %{page}
     view: 
       delete_track: Fshij ket gjurm
diff --git a/config/locales/sr-EC.yml b/config/locales/sr-EC.yml
index 8a5908e0c..55b1647e6 100644
--- a/config/locales/sr-EC.yml
+++ b/config/locales/sr-EC.yml
@@ -277,7 +277,7 @@ sr-EC:
       view_changeset_details: ÐÐ¾Ð³Ð»ÐµÐ´Ð°Ñ Ð´ÐµÑÐ°ÑÐµ ÑÐºÑÐ¿Ð° Ð¸Ð·Ð¼ÐµÐ½Ð°
     changeset_paging_nav: 
       next: Ð¡Ð»ÐµÐ´ÐµÑÐ° Â»
-      previous: "Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð°"
+      previous: Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð°
       showing_page: ÐÑÐ¸ÐºÐ°Ð· ÑÑÑÐ°Ð½Ð¸ÑÐµ %{page}
     changesets: 
       area: ÐÐ¾Ð´ÑÑÑÑÐµ
@@ -1359,7 +1359,7 @@ sr-EC:
       tags: ÐÐ·Ð½Ð°ÐºÐµ
     trace_paging_nav: 
       next: Ð¡Ð»ÐµÐ´ÐµÑÐ¸ Â»
-      previous: "Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð¸"
+      previous: Â« ÐÑÐµÑÑÐ¾Ð´Ð½Ð¸
       showing_page: ÐÑÐ¸ÐºÐ°Ð· ÑÑÑÐ°Ð½Ð¸ÑÐµ %{page}
     view: 
       delete_track: ÐÐ±ÑÐ¸ÑÐ¸ Ð¾Ð²Ð°Ñ ÑÑÐ°Ð³
diff --git a/config/locales/sr-EL.yml b/config/locales/sr-EL.yml
new file mode 100644
index 000000000..286078aaa
--- /dev/null
+++ b/config/locales/sr-EL.yml
@@ -0,0 +1,1741 @@
+# Messages for Serbian (Latin script) (âªSrpski (latinica)â¬)
+# Exported from translatewiki.net
+# Export driver: syck-pecl
+# Author: Rancher
+sr-EL: 
+  activerecord: 
+    attributes: 
+      diary_comment: 
+        body: Tekst
+      diary_entry: 
+        language: Jezik
+        latitude: Geografska Å¡irina
+        longitude: Geografska duÅ¾ina
+        title: Naslov
+        user: Korisnik
+      friend: 
+        friend: Prijatelj
+        user: Korisnik
+      message: 
+        body: Tekst
+        recipient: Primalac
+        sender: PoÅ¡iljalac
+        title: Naslov
+      trace: 
+        description: Opis
+        latitude: Geografska Å¡irina
+        longitude: Geografska duÅ¾ina
+        name: Ime
+        public: Javno
+        size: VeliÄina
+        user: Korisnik
+        visible: Vidljivo
+      user: 
+        active: Aktivan
+        description: Opis
+        display_name: Ime prikaza
+        email: E-poÅ¡ta
+        languages: Jezici
+        pass_crypt: Lozinka
+    models: 
+      acl: Upravljanje pristupom
+      changeset: Skup izmena
+      changeset_tag: Oznaka skupa izmena
+      country: Zemlja
+      diary_comment: Komentar na dnevnik
+      diary_entry: Unos u dnevniku
+      friend: Prijatelj
+      language: Jezik
+      message: Poruka
+      node: Ävor
+      node_tag: Oznaka Ävora
+      notifier: Izvestilac
+      old_node: Stari Ävor
+      old_node_tag: Oznaka starog Ävora
+      old_relation: Stari odnos
+      old_relation_member: Älan starog odnosa
+      old_relation_tag: Oznaka starog odnosa
+      old_way: Stara putanja
+      old_way_node: Ävor stare putanje
+      old_way_tag: Oznaka starog puta
+      relation: Odnos
+      relation_member: Älan odnosa
+      relation_tag: Oznaka odnosa
+      session: Sesija
+      trace: Trag
+      tracepoint: TaÄka traga
+      tracetag: Oznaka traga
+      user: Korisnik
+      user_preference: KorisniÄke postavke
+      user_token: KorisniÄki znak
+      way: Putanja
+      way_node: Ävor putanje
+      way_tag: Oznaka puta
+  application: 
+    require_cookies: 
+      cookies_needed: Izgleda da ste onemoguÄili kolaÄiÄe. OmoguÄite ih pre nego Å¡to nastavite.
+    setup_user_auth: 
+      blocked: VaÅ¡ pristup API-ju je blokiran. Prijavite se da saznate viÅ¡e.
+      need_to_see_terms: VaÅ¡ pristup API-ju je privremeno ukinut. Prijavite se da biste pogledali uslove ureÄivanja. Ne morate da ih prihvatite, veÄ samo da ih vidite.
+  browse: 
+    changeset: 
+      changeset: "Skup izmena: %{id}"
+      changesetxml: XML skup izmena
+      download: Preuzmi %{changeset_xml_link} ili %{osmchange_xml_link}
+      feed: 
+        title: Skup izmena %{id}
+        title_comment: Skup izmena %{id} â %{comment}
+      osmchangexml: osmChange XML
+      title: Skup izmena
+    changeset_details: 
+      belongs_to: "Pripada:"
+      bounding_box: "GraniÄni okvir:"
+      box: okvir
+      closed_at: "Zatvoreno:"
+      created_at: "Napravljeno:"
+      has_nodes: 
+        few: "Ima sledeÄa %{count} Ävora:"
+        one: "Ima sledeÄi Ävor:"
+        other: "Ima sledeÄih %{count} Ävorova:"
+      has_relations: 
+        few: "Ima sledeÄa %{count} odnosa:"
+        one: "Ima sledeÄi odnos:"
+        other: "Ima sledeÄih %{count} odnosa:"
+      has_ways: 
+        few: "Ima sledeÄe %{count} putanje:"
+        one: "Ima sledeÄu putanju:"
+        other: "Ima sledeÄih %{count} putanja:"
+      no_bounding_box: Nijedan graniÄni okvir nije saÄuvan za ovaj skup izmena.
+      show_area_box: PrikaÅ¾i okvir podruÄja
+    common_details: 
+      changeset_comment: "Komentar:"
+      deleted_at: "Obrisano:"
+      deleted_by: "Obrisao:"
+      edited_at: "Izmenjeno:"
+      edited_by: "Izmenio:"
+      in_changeset: "U skupu izmena:"
+      version: "Izdanje:"
+    containing_relation: 
+      entry: Odnos %{relation_name}
+      entry_role: Odnos %{relation_name} (kao %{relation_role})
+    map: 
+      deleted: Obrisano
+      edit: 
+        area: Uredi podruÄje
+        node: Uredi Ävor
+        relation: Uredi odnos
+        way: Uredi putanju
+      larger: 
+        area: Pogledaj podruÄje na veÄoj mapi
+        node: Pogledaj Ävor na veÄoj mapi
+        relation: Pogledaj odnos na veÄoj mapi
+        way: Pogledaj putanju na veÄoj mapi
+      loading: UÄitavamâ¦
+    navigation: 
+      all: 
+        next_changeset_tooltip: SledeÄi skup izmena
+        next_node_tooltip: SledeÄi Ävor
+        next_relation_tooltip: SledeÄi odnos
+        next_way_tooltip: SledeÄa putanja
+        prev_changeset_tooltip: Prethodni skup izmena
+        prev_node_tooltip: Prethodni Ävor
+        prev_relation_tooltip: Prethodni odnos
+        prev_way_tooltip: Prethodna putanja
+      user: 
+        name_changeset_tooltip: Pogledaj izmene korisnika %{user}
+        next_changeset_tooltip: SledeÄa izmena korisnika %{user}
+        prev_changeset_tooltip: Prethodna izmena korisnika %{user}
+    node: 
+      download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}"
+      download_xml: Preuzmi XML
+      edit: uredi
+      node: Ävor
+      node_title: "Ävor: %{node_name}"
+      view_history: prikaÅ¾i istoriju
+    node_details: 
+      coordinates: "Koordinate:"
+      part_of: "Deo:"
+    node_history: 
+      download: "%{download_xml_link} ili %{view_details_link}"
+      download_xml: Preuzmi XML
+      node_history: Istorija Ävora
+      node_history_title: "Istorija Ävora: %{node_name}"
+      view_details: prikaÅ¾i detalje
+    not_found: 
+      sorry: Å½ao nam je, ali %{type} s IB %{id} nije pronaÄen.
+      type: 
+        changeset: skup izmena
+        node: Ävor
+        relation: odnos
+        way: putanja
+    paging_nav: 
+      of: od
+      showing_page: Prikaz stranice
+    relation: 
+      download: "%{download_xml_link} ili %{view_history_link}"
+      download_xml: Preuzmi XML
+      relation: Odnos
+      relation_title: "Odnos: %{relation_name}"
+      view_history: prikaÅ¾i istoriju
+    relation_details: 
+      members: "Älanovi:"
+      part_of: "Deo:"
+    relation_history: 
+      download: "%{download_xml_link} ili %{view_details_link}"
+      download_xml: Preuzmi XML
+      relation_history: Istorija odnosa
+      relation_history_title: "Istorija odnosa: %{relation_name}"
+      view_details: pogledaj detalje
+    relation_member: 
+      entry_role: "%{type} %{name} kao %{role}"
+      type: 
+        node: Ävor
+        relation: Odnos
+        way: Putanja
+    start: 
+      manually_select: RuÄno izaberite drugo podruÄje
+      view_data: Pogledaj podatke trenutnog prikaza mape
+    start_rjs: 
+      data_frame_title: Podaci
+      data_layer_name: Podaci
+      details: Detalji
+      drag_a_box: Prevucite okvir na mapi da biste izabrali podruÄje
+      edited_by_user_at_timestamp: Izmenio [[user]] u [[timestamp]]
+      hide_areas: Sakrij podruÄja
+      history_for_feature: Istorija za [[feature]]
+      load_data: UÄitaj podatke
+      loaded_an_area_with_num_features: "UÄitali ste podruÄje koje sadrÅ¾i [[num_features]] moguÄnosti. Neki pregledaÄi se ne mogu nositi s tolikom koliÄinom podataka. Oni najbolje rade kada prikazuju manje od sto moguÄnosti istovremeno: ako radite joÅ¡ neÅ¡to, to moÅ¾e usporiti pregledaÄ ili ga zakoÄiti. Ako ste sigurni da Å¾elite da prikaÅ¾ete ove podatke, moÅ¾ete to uraditi klikom na dugme ispod."
+      loading: UÄitavamâ¦
+      manually_select: RuÄno izaberite drugo podruÄje
+      object_list: 
+        api: Dobavi ovo podruÄje pomoÄu API-ja
+        back: PrikaÅ¾i spisak predmeta
+        details: Detalji
+        heading: Spisak predmeta
+        history: 
+          type: 
+            node: Ävor [[id]]
+            way: Putanja [[id]]
+        selected: 
+          type: 
+            node: Ävor [[id]]
+            way: Putanja [[id]]
+        type: 
+          node: Ävor
+          way: Putanja
+      private_user: privatni korisnik
+      show_areas: PrikaÅ¾i podruÄja
+      show_history: PrikaÅ¾i istoriju
+      unable_to_load_size: "Ne mogu da uÄitam: graniÄna veliÄina okvira [[bbox_size]] je prevelika (mora biti manja od %{max_bbox_size})"
+      wait: PriÄekajteâ¦
+      zoom_or_select: UveÄajte ili izaberite podruÄje koje Å¾elite da pogledate
+    tag_details: 
+      tags: "Oznake:"
+      wiki_link: 
+        key: Stranica s opisom za oznaku %{key}
+        tag: Stranica s opisom za oznaku %{key}=%{value}
+      wikipedia_link: "%{page} Älanak na Vikipediji"
+    timeout: 
+      sorry: Å½ao nam je, ali dobavljanje podataka za %{type} s IB %{id} predugo traje.
+      type: 
+        changeset: skup izmena
+        node: taÄka
+        relation: odnos
+        way: putanja
+    way: 
+      download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}"
+      download_xml: Preuzmi XML
+      edit: uredi
+      view_history: pogledaj istoriju
+      way: Putanja
+      way_title: "Putanja: %{way_name}"
+    way_details: 
+      also_part_of: 
+        one: takoÄe deo putanje %{related_ways}
+        other: takoÄe deo putanja %{related_ways}
+      nodes: "Ävorovi:"
+      part_of: "Deo:"
+    way_history: 
+      download: "%{download_xml_link} ili %{view_details_link}"
+      download_xml: Preuzmi XML
+      view_details: pogledaj detalje
+      way_history: Istorija putanje
+      way_history_title: "Istorija putanje: %{way_name}"
+  changeset: 
+    changeset: 
+      anonymous: Anonimno
+      big_area: (veliko)
+      no_comment: (nema komentara)
+      no_edits: (nema izmena)
+      show_area_box: pogledaj okvir podruÄja
+      still_editing: (joÅ¡ uvek ureÄuje)
+      view_changeset_details: Pogledaj detalje skupa izmena
+    changeset_paging_nav: 
+      next: SledeÄa Â»
+      previous: "Â« Prethodna"
+      showing_page: Prikaz stranice %{page}
+    changesets: 
+      area: PodruÄje
+      comment: Komentar
+      id: IB
+      saved_at: SaÄuvano u
+      user: Korisnik
+    list: 
+      description: SkoraÅ¡nje izmene
+      description_bbox: Skupovi izmena unutar %{bbox}
+      description_user: Skupovi izmena korisnika %{user}
+      description_user_bbox: Skupovi izmena korisnika %{user} unutar %{bbox}
+      heading: Skupovi izmena
+      heading_bbox: Skupovi izmena
+      heading_user: Skupovi izmena
+      heading_user_bbox: Skupovi izmena
+      title: Skupovi izmena
+      title_bbox: Skupovi izmena unutar %{bbox}
+      title_user: Skupovi izmena korisnika %{user}
+      title_user_bbox: Skupovi izmena korisnika %{user} unutar %{bbox}
+    timeout: 
+      sorry: Å½ao nam je, ali spisak izmena koji ste zahtevali je predugaÄak.
+  diary_entry: 
+    diary_comment: 
+      comment_from: Komentar korisnika %{link_user} u %{comment_created_at}
+      confirm: Potvrdi
+      hide_link: Sakrij ovaj komentar
+    diary_entry: 
+      comment_count: 
+        one: 1 komentar
+        other: "%{count} komentara"
+      comment_link: ProkomentariÅ¡i ovaj unos
+      confirm: Potvrdi
+      edit_link: Uredi ovaj unos
+      hide_link: Sakrij ovaj unos
+      posted_by: Postavio korisnik %{link_user} u %{created} na %{language_link}
+      reply_link: Odgovori na ovaj unos
+    edit: 
+      body: "Tekst:"
+      language: "Jezik:"
+      latitude: "Geografska Å¡irina:"
+      location: "Lokacija:"
+      longitude: "Geografska duÅ¾ina:"
+      marker_text: Lokacija unosa u dnevniku
+      save_button: SaÄuvaj
+      subject: "Tema:"
+      title: Uredi unos u dnevniku
+      use_map_link: koristi mapu
+    feed: 
+      all: 
+        description: SkoraÅ¡nji unosi u dnevniku od korisnika Openstritmapa
+        title: Unosi u dnevniku Openstritmapa
+      language: 
+        description: SkoraÅ¡nji unosi u dnevniku od korisnika na %{language_name}
+        title: Unosi u dnevniku na %{language_name}
+      user: 
+        description: SkoraÅ¡nji unosi u dnevniku od korisnika %{user}
+        title: Unosi u dnevniku za korisnika %{user}
+    list: 
+      in_language_title: Dnevnici na %{language}
+      new: Novi unos u dnevniku
+      new_title: ZapiÅ¡ite novi unos u korisniÄki dnevnik
+      newer_entries: Noviji unosi
+      no_entries: Nema unosa u dnevniku
+      older_entries: Stariji unosi
+      recent_entries: "SkoraÅ¡nji unosi u dnevniku:"
+      title: KorisniÄki dnevnici
+      user_title: Dnevnik korisnika %{user}
+    location: 
+      edit: Uredi
+      location: "Lokacija:"
+      view: Pogledaj
+    new: 
+      title: Novi unos u dnevniku
+    no_such_entry: 
+      body: Å½ao nam je, ali nema unosa u dnevniku ili komentar s IB %{id}. Proverite ispravnost upisa ili veze koju ste kliknuli.
+      heading: "Nema unosa s IB: %{id}"
+      title: Nema takvog unosa u dnevniku
+    no_such_user: 
+      body: Å½ao nam je, ali nema korisnika s imenom %{user}. Proverite ispravnost upisa ili veze koju ste kliknuli.
+      heading: Korisnik %{user} ne postoji
+      title: Nema takvog korisnika
+    view: 
+      leave_a_comment: Ostavite komentar
+      login: Prijavite se
+      login_to_leave_a_comment: "%{login_link} da ostavite komentar"
+      save_button: SaÄuvaj
+      title: Dnevnik korisnika %{user} | %{title}
+      user_title: Dnevnik korisnika %{user}
+  editor: 
+    default: Podrazumevano (trenutno %{name})
+    potlatch: 
+      description: PotlaÄ 1 (ureÄivaÄ u pregledaÄu)
+      name: PotlaÄ 1
+    potlatch2: 
+      description: PotlaÄ 2 (ureÄivaÄ u pregledaÄu)
+      name: PotlaÄ 2
+    remote: 
+      description: Daljinsko upravljanje (JOSM ili Merkaartor)
+      name: Daljinsko upravljanje
+  export: 
+    start: 
+      add_marker: Dodaj marker na mapu
+      area_to_export: PodruÄje za izvoz
+      embeddable_html: Ugradivi HTML kÃ´d
+      export_button: Izvezi
+      export_details: Podaci Openstritmapa su dostupni pod licencom <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sr">Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a>.
+      format: Format
+      format_to_export: Format za izvoz
+      image_size: VeliÄina slike
+      latitude: "GÅ :"
+      licence: Licenca
+      longitude: "GD:"
+      manually_select: RuÄno izaberite drugo podruÄje
+      mapnik_image: Mapnik slika
+      max: najviÅ¡e
+      options: MoguÄnosti
+      osm_xml_data: Openstritmap XML podaci
+      osmarender_image: Osmarender slika
+      output: Izlaz
+      paste_html: Ubacite HTML kod za ugraÄivanje na stranice
+      scale: Razmera
+      too_large: 
+        body: Ovo podruÄje je preveliko da bi bilo izvezeno u formatu XML. UveÄajte prikaz ili izaberite manju povrÅ¡inu.
+        heading: PodruÄje je preveliko
+      zoom: UveÄanje
+    start_rjs: 
+      add_marker: Dodaj marker na mapu
+      change_marker: Promeni poloÅ¾aj markera
+      click_add_marker: Kliknite na mapu da biste dodali marker
+      drag_a_box: Prevucite okvir na mapi da biste izabrali podruÄje
+      export: Izvezi
+      manually_select: RuÄno izaberite drugo podruÄje
+      view_larger_map: Pogledaj veÄu mapu
+  geocoder: 
+    description: 
+      title: 
+        geonames: Lokacija iz <a href="http://www.geonames.org/">Geografskih imena</a>
+        osm_namefinder: "%{types} iz <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">TragaÄa naziva</a>"
+        osm_nominatim: Lokacija iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
+      types: 
+        cities: Gradovi
+        places: Mesta
+        towns: VaroÅ¡ice
+    description_osm_namefinder: 
+      prefix: "%{distance} %{direction} od %{type}"
+    direction: 
+      east: istoÄno
+      north: severno
+      north_east: severoistoÄno
+      north_west: severozapadno
+      south: juÅ¾no
+      south_east: jugoistoÄno
+      south_west: jugozapadno
+      west: zapadno
+    distance: 
+      one: oko jednog kilometra
+      other: oko %{count} kilometra
+      zero: manje od jednog kilometra
+    results: 
+      more_results: ViÅ¡e rezultata
+      no_results: Nema rezultata
+    search: 
+      title: 
+        ca_postcode: Rezultati iz <a href="http://geocoder.ca/">Geokodera</a>
+        geonames: Rezultati iz <a href="http://www.geonames.org/">Geografskih imena</a>
+        latlon: Rezultati iz <a href="http://openstreetmap.org/">Internala</a>
+        osm_namefinder: Rezultati iz <a href="http://gazetteer.openstreetmap.org/namefinder/">TragaÄa naziva</a>
+        osm_nominatim: Rezultati iz <a href="http://nominatim.openstreetmap.org/">Nominatima</a>
+        uk_postcode: Rezultati iz <a href="http://www.npemap.org.uk/">NPEMap-a</a>
+        us_postcode: Rezultati iz <a href="http://geocoder.us/">Geokodera</a>
+    search_osm_namefinder: 
+      suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})"
+      suffix_place: ", %{distance} %{direction} od %{placename}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Aerodrom
+          arts_centre: UmetniÄki centar
+          atm: Bankomat
+          auditorium: Dvorana
+          bank: Banka
+          bar: Bar
+          bench: Klupa
+          bicycle_parking: BiciklistiÄki parking
+          bicycle_rental: Iznajmljivanje bicikla
+          brothel: Javna kuÄa
+          bureau_de_change: MenjaÄnica
+          bus_station: Autobuska stanica
+          cafe: Kafe
+          car_rental: Iznajmljivanje automobila
+          car_sharing: ZajedniÄko koriÅ¡Äenje automobila
+          car_wash: Auto-perionica
+          casino: Kazino
+          cinema: Bioskop
+          clinic: Klinika
+          club: Klub
+          college: Fakultet
+          community_centre: DruÅ¡tveni centar
+          courthouse: Sud
+          crematorium: Krematorijum
+          dentist: Zubar
+          doctors: Doktor
+          dormitory: Studentski dom
+          drinking_water: PijaÄa voda
+          driving_school: Auto-Å¡kola
+          embassy: Ambasada
+          emergency_phone: Telefon za hitne sluÄajeve
+          fast_food: Brza hrana
+          ferry_terminal: Skela
+          fire_hydrant: Hidrant
+          fire_station: Vatrogasna stanica
+          fountain: Fontana
+          fuel: Benzinska pumpa
+          grave_yard: Groblje
+          gym: Fitnes centar
+          hall: Hala
+          health_centre: Dom zdravlja
+          hospital: Bolnica
+          hotel: Hotel
+          hunting_stand: LovaÄki dom
+          ice_cream: Prodavnica sladoleda
+          kindergarten: ObdaniÅ¡te
+          library: Biblioteka
+          market: Pijaca
+          marketplace: Pijaca
+          mountain_rescue: Gorska sluÅ¾ba
+          nightclub: 'NoÄni klub'
+          nursery: Jaslice
+          nursing_home: StaraÄki dom
+          office: Poslovnica
+          park: Park
+          parking: Parking
+          pharmacy: Apoteka
+          place_of_worship: Mesto bogosluÅ¾enja
+          police: Policija
+          post_box: PoÅ¡tansko sanduÄe
+          post_office: PoÅ¡ta
+          preschool: PredÅ¡kolska ustanova
+          prison: Zatvor
+          pub: Pab
+          public_building: Ustanova
+          public_market: Pijaca
+          reception_area: Prijemno podruÄje
+          recycling: Mesto za reciklaÅ¾u
+          restaurant: Restoran
+          retirement_home: StaraÄki dom
+          sauna: Sauna
+          school: Å kola
+          shelter: SkloniÅ¡te
+          shop: Prodavnica
+          shopping: TrgovaÄki centar
+          social_club: DruÅ¡tveni klub
+          studio: Studio
+          supermarket: Supermarket
+          taxi: Taksi
+          telephone: Telefonska govornica
+          theatre: PozoriÅ¡te
+          toilets: Toaleti
+          townhall: Gradska skupÅ¡tina
+          university: Univerzitet
+          vending_machine: Automat
+          veterinary: Veterinarska hirurgija
+          village_hall: Seoski dom
+          waste_basket: Korpa za otpatke
+          wifi: Vi-Fi pristup
+          youth_centre: Dom omladine
+        boundary: 
+          administrative: Administrativna granica
+        building: 
+          apartments: Stambeni blok
+          block: Blok zgrada
+          bunker: Bunker
+          chapel: Kapela
+          church: Crkva
+          city_hall: Gradska skupÅ¡tina
+          commercial: Poslovna zgrada
+          dormitory: Studentski dom
+          entrance: Ulaz u zgradu
+          faculty: Zgrada fakulteta
+          farm: Zgrada farme
+          flats: Stanovi
+          garage: GaraÅ¾a
+          hall: Hala
+          hospital: Bolnica
+          hotel: Hotel
+          house: KuÄa
+          industrial: Industrijska zgrada
+          office: Poslovnica
+          public: Javna zgrada
+          residential: Stambena zgrada
+          retail: Maloprodajna radnja
+          school: Å kola
+          shop: Prodavnica
+          stadium: Stadion
+          store: Prodavnica
+          terrace: Terasa
+          tower: Toranj
+          train_station: Å½elezniÄka stanica
+          university: Univerzitetska zgrada
+        highway: 
+          bridleway: KonjiÄka staza
+          bus_guideway: Autobuska traka
+          bus_stop: Autobuska stanica
+          byway: PreÄica
+          construction: Auto-put u izgradnji
+          cycleway: BiciklistiÄka staza
+          distance_marker: Oznaka udaljenosti
+          emergency_access_point: Izlaz za sluÄaj opasnosti
+          footway: PeÅ¡aÄka staza
+          ford: Gaz
+          gate: Kapija
+          living_street: Ulica smirenog prometa
+          minor: Drugorazredni put
+          motorway: Auto-put
+          motorway_junction: Petlja
+          motorway_link: Moto-put
+          path: Staza
+          pedestrian: PeÅ¡aÄka staza
+          platform: Platforma
+          primary: Glavni put
+          primary_link: Glavni put
+          raceway: TrkaÄka staza
+          residential: Ulica
+          road: Put
+          secondary: Sporedni put
+          secondary_link: Sporedni put
+          service: Servisni put
+          services: Usluge na auto-putu
+          steps: Stepenice
+          stile: Prelaz preko ograde
+          tertiary: Lokalni put
+          track: Makadam
+          trail: Staza
+          trunk: Magistralni put
+          trunk_link: Magistralni put
+          unclassified: Nekategorisani put
+          unsurfaced: Neasfaltirani put
+        historic: 
+          archaeological_site: ArheoloÅ¡ko nalaziÅ¡te
+          battlefield: BojiÅ¡te
+          boundary_stone: GraniÄni kamen
+          building: Zgrada
+          castle: Dvorac
+          church: Crkva
+          house: KuÄa
+          icon: Ikona
+          manor: PlemiÄko imanje
+          memorial: Spomenik
+          mine: Rudnik
+          monument: Spomenik
+          museum: Muzej
+          ruins: RuÅ¡evine
+          tower: Toranj
+          wayside_cross: KrajputaÅ¡
+          wayside_shrine: Usputno svetiÅ¡te
+          wreck: Olupina
+        landuse: 
+          allotments: BaÅ¡te
+          basin: Basen
+          brownfield: ZemljiÅ¡te za prenamenu
+          cemetery: Groblje
+          commercial: Poslovno podruÄje
+          conservation: ZaÅ¡tiÄeno podruÄje
+          construction: GradiliÅ¡te
+          farm: Farma
+          farmland: Polje
+          farmyard: Farma
+          forest: Å uma
+          grass: Trava
+          greenfield: Zeleno polje
+          industrial: Industrijsko podruÄje
+          landfill: Deponija
+          meadow: Livada
+          military: Vojno podruÄje
+          mine: Rudnik
+          mountain: Planina
+          nature_reserve: Rezervat prirode
+          park: Park
+          piste: SkijaÅ¡ka staza
+          plaza: Å etaliÅ¡te
+          quarry: Kamenolom
+          railway: Å½elezniÄka pruga
+          recreation_ground: Rekreacijsko podruÄje
+          reservoir: Rezervoar
+          residential: Stambeno podruÄje
+          retail: Maloprodaja
+          village_green: Seosko polje
+          vineyard: Vinograd
+          wetland: MoÄvara
+          wood: Å uma
+        leisure: 
+          beach_resort: Morsko odmaraliÅ¡te
+          common: OpÅ¡tinsko zemljiÅ¡te
+          fishing: Ribolovno podruÄje
+          garden: BaÅ¡ta
+          golf_course: Golf teren
+          ice_rink: KlizaliÅ¡te
+          marina: Marina
+          miniature_golf: Mini golf
+          nature_reserve: Rezervat prirode
+          park: Park
+          pitch: Sportsko igraliÅ¡te
+          playground: IgraliÅ¡te
+          recreation_ground: Rekreacijsko podruÄje
+          slipway: Navoz
+          sports_centre: Sportski centar
+          stadium: Stadion
+          swimming_pool: Bazen
+          track: Staza za trÄanje
+          water_park: Vodeni park
+        natural: 
+          bay: Zaliv
+          beach: PlaÅ¾a
+          cape: Rt
+          cave_entrance: Ulaz u peÄinu
+          channel: Kanal
+          cliff: Litica
+          coastline: Obala
+          crater: Krater
+          feature: ObeleÅ¾je
+          fell: Brdo
+          fjord: Fjord
+          geyser: Gejzir
+          glacier: GleÄer
+          heath: Ravnica
+          hill: Brdo
+          island: Ostrvo
+          land: ZemljiÅ¡te
+          marsh: MoÄvara
+          moor: MoÄvara
+          mud: Blato
+          peak: Vrh
+          point: TaÄka
+          reef: Greben
+          ridge: Greben
+          river: Reka
+          rock: Stena
+          scree: Osulina
+          scrub: GuÅ¡tara
+          shoal: Sprud
+          spring: Izvor
+          strait: Moreuz
+          tree: Drvo
+          valley: Dolina
+          volcano: Vulkan
+          water: Voda
+          wetland: MoÄvara
+          wetlands: MoÄvara
+          wood: Å uma
+        place: 
+          airport: Aerodrom
+          city: Grad
+          country: DrÅ¾ava
+          county: Okrug
+          farm: Farma
+          hamlet: Zaselak
+          house: KuÄa
+          houses: KuÄe
+          island: Ostrvo
+          islet: Hrid
+          locality: Lokalitet
+          moor: MoÄvara
+          municipality: OpÅ¡tina
+          postcode: PoÅ¡tanski broj
+          region: PodruÄje
+          sea: More
+          state: Savezna drÅ¾ava
+          subdivision: Podgrupa
+          suburb: PredgraÄe
+          town: VaroÅ¡ica
+          unincorporated_area: Slobodna zemlja
+          village: Selo
+        railway: 
+          abandoned: NapuÅ¡tena Å¾eleznica
+          construction: Å½elezniÄka pruga u izgradnji
+          disused: NapuÅ¡tena Å¾eleznica
+          disused_station: NapuÅ¡tena Å¾elezniÄka stanica
+          funicular: Å½iÄana Å¾eleznica
+          halt: Å½elezniÄko stajaliÅ¡te
+          historic_station: Istorijska Å¾elezniÄka stanica
+          junction: Å½elezniÄki Ävor
+          level_crossing: PruÅ¾ni prelaz
+          light_rail: Laka Å¾eleznica
+          monorail: JednotraÄna pruga
+          narrow_gauge: UskotraÄna pruga
+          platform: Å½elezniÄka platforma
+          preserved: OÄuvana Å¾eleznica
+          spur: Pruga
+          station: Å½elezniÄka stanica
+          subway: Metro stanica
+          subway_entrance: Ulaz u metro
+          switch: Skretnica
+          tram: Tramvaj
+          tram_stop: Tramvajsko stajaliÅ¡te
+          yard: RanÅ¾irna stanica
+        shop: 
+          alcohol: Trgovina piÄem
+          apparel: Trgovina odeÄom
+          art: Atelje
+          bakery: Pekara
+          beauty: Parfimerija
+          beverages: Prodavnica piÄa
+          bicycle: Prodavnica bicikala
+          books: KnjiÅ¾ara
+          butcher: Mesara
+          car: Auto-kuÄa
+          car_dealer: Auto-diler
+          car_parts: Auto-delovi
+          car_repair: Auto-servis
+          carpet: Prodavnica tepiha
+          charity: Dobrotvorna prodavnica
+          chemist: Apotekar
+          clothes: Butik
+          computer: RaÄunarska oprema
+          confectionery: PoslastiÄarnica
+          convenience: PotrepÅ¡tine
+          copyshop: Kopirnica
+          cosmetics: KozmetiÄarska radnja
+          department_store: Robna kuÄa
+          discount: Diskont
+          doityourself: Uradi sam
+          drugstore: Drogerija
+          dry_cleaning: Hemijsko ÄiÅ¡Äenje
+          electronics: Elektronska oprema
+          estate_agent: Agent za nekretnine
+          farm: Poljoprivredna apoteka
+          fashion: Modna prodavnica
+          fish: Ribarnica
+          florist: CveÄara
+          food: Bakalnica
+          funeral_directors: Pogrebno preduzeÄe
+          furniture: NameÅ¡taj
+          gallery: Galerija
+          garden_centre: Vrtni centar
+          general: Prodavnica meÅ¡ovite robe
+          gift: Suvenirnica
+          greengrocer: Piljarnica
+          grocery: Bakalnica
+          hairdresser: Frizerski salon
+          hardware: GvoÅ¾Äara
+          hifi: MuziÄka oprema
+          insurance: Osiguranje
+          jewelry: Zlatara
+          kiosk: Kiosk
+          laundry: Perionica rublja
+          mall: TrÅ¾ni centar
+          market: Market
+          mobile_phone: Prodavnica mobilnih telefona
+          motorcycle: Prodavnica motocikala
+          music: MuziÄka prodavnica
+          newsagent: Novinar
+          optician: OptiÄar
+          organic: Prodavnica zdrave hrane
+          outdoor: Å tand
+          pet: Prodavnica kuÄnih ljubimaca
+          photo: Fotografska radnja
+          salon: Salon
+          shoes: Prodavnica obuÄe
+          shopping_centre: TrÅ¾ni centar
+          sports: Sportska oprema
+          stationery: Papirnica
+          supermarket: Supermarket
+          toys: Prodavnica igraÄaka
+          travel_agency: TuristiÄka agencija
+          video: Videoteka
+          wine: Trgovina piÄem
+        tourism: 
+          alpine_hut: Planinarski dom
+          artwork: Galerija
+          attraction: Atrakcija
+          bed_and_breakfast: Polupansion
+          cabin: Koliba
+          camp_site: Kamp
+          caravan_site: Kamp-prikolice
+          chalet: Planinska koliba
+          guest_house: Gostinska kuÄa
+          hostel: Hostel
+          hotel: Hotel
+          information: Podaci
+          lean_to: SkloniÅ¡te
+          motel: Motel
+          museum: Muzej
+          picnic_site: Mesto za piknik
+          theme_park: Tematski park
+          valley: Dolina
+          viewpoint: Vidikovac
+          zoo: ZooloÅ¡ki vrt
+        waterway: 
+          boatyard: BrodogradiliÅ¡te
+          canal: Kanal
+          connector: Spoj vodnih puteva
+          dam: Brana
+          derelict_canal: OdbaÄeni kanal
+          ditch: Jarak
+          dock: Dok
+          drain: Odvod
+          lock: Brana
+          lock_gate: Vrata brane
+          mineral_spring: Mineralni izvor
+          mooring: SidriÅ¡te
+          rapids: Brzaci
+          river: Reka
+          riverbank: ReÄna obala
+          stream: Potok
+          wadi: Suvo korito reke
+          water_point: TaÄka vodotoka
+          waterfall: Vodopad
+          weir: Brana
+  javascripts: 
+    map: 
+      base: 
+        cycle_map: BiciklistiÄka mapa
+        noname: Bezimene ulice
+    site: 
+      edit_disabled_tooltip: UveÄajte prikaz da biste uredili mapu
+      edit_tooltip: Uredite mapu
+      edit_zoom_alert: Morate uveÄati prikaz da biste uredili mapu
+      history_disabled_tooltip: UveÄajte prikaz da biste videli izmene za ovo podruÄje
+      history_tooltip: Pogledajte izmene za ovo podruÄje
+      history_zoom_alert: Morate uveÄati prikaz da biste videli izmene za ovo podruÄje
+  layouts: 
+    community_blogs: Blogovi zajednice
+    community_blogs_title: Blogovi Älanova zajednice
+    copyright: Autorska prava i licenca
+    documentation: Dokumentacija
+    documentation_title: Dokumentacija projekta
+    donate: Pomozite nam tako Å¡to Äete %{link} radi odrÅ¾avanja potrebnog hardvera.
+    donate_link_text: priloÅ¾iti novac
+    edit: Uredi
+    edit_with: Uredi ureÄivaÄem %{editor}
+    export: Izvezi
+    export_tooltip: Izvezite podatke mape
+    foundation: ZaduÅ¾bina
+    foundation_title: ZaduÅ¾bina Openstritmap
+    gps_traces: GPS tragovi
+    gps_traces_tooltip: Upravljajte GPS tragovima
+    help: PomoÄ
+    help_centre: Centar za pomoÄ
+    help_title: Stranica pomoÄi za projekat
+    history: Istorija
+    home: dom
+    home_tooltip: Idi na lokaciju doma
+    inbox: primljene (%{count})
+    inbox_tooltip: 
+      one: VaÅ¡e sanduÄe sadrÅ¾i jednu neproÄitanu poruku
+      other: VaÅ¡e sanduÄe sadrÅ¾i %{count} neproÄitane poruke
+      zero: VaÅ¡e sanduÄe ne sadrÅ¾i neproÄitane poruke
+    intro_1: Openstritmap je slobodna karta celog sveta. SaÄinjavaju je korisnici kao Å¡to ste vi.
+    intro_2: Openstritmap vam omoguÄava da pregledate, ureÄujete i koristite geografske podatke s bilo kog mesta na zemlji.
+    intro_3: OdrÅ¾avanje Openstritmapa podrÅ¾ava %{ucl}, %{ic} i %{bytemark}. Ostale pristalice projekta su na spisku %{partners}.
+    intro_3_ic: Londonski kraljevski koledÅ¾
+    intro_3_partners: viki
+    license: 
+      title: Podaci Openstritmapa su objavljeni pod licencom Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0
+    log_in: prijavi me
+    log_in_tooltip: Prijavite se s postojeÄim nalogom
+    logo: 
+      alt_text: Logotip Openstritmapa
+    logout: odjavi me
+    logout_tooltip: Odjavite se
+    make_a_donation: 
+      text: PriloÅ¾ite novac
+      title: PodrÅ¾ite Openstritmap novÄanim prilogom
+    osm_offline: Baza podataka Openstritmapa je trenutno nedostupna dok se ne zavrÅ¡e vaÅ¾ni radovi na odrÅ¾avanju.
+    osm_read_only: Zbog radova na odrÅ¾avanju baze podataka Openstritmapa, istu trenutno nije moguÄe menjati.
+    sign_up: otvori nalog
+    sign_up_tooltip: Otvorite nalog da biste ureÄivali
+    sotm2011: DoÄite na Konferenciju Openstritmapa 2011, Stanje mape, od 9. do 11. septembra  u Denveru!
+    tag_line: Slobodna viki mapa sveta
+    user_diaries: Dnevnici
+    user_diaries_tooltip: Pogledajte korisniÄke dnevnike
+    view: Pregled
+    view_tooltip: Pogledajte mapu
+    welcome_user: Dobro doÅ¡li, %{user_link}
+    welcome_user_link_tooltip: VaÅ¡a korisniÄka stranica
+    wiki: viki
+    wiki_title: Viki stranice projekta
+  license_page: 
+    foreign: 
+      english_link: engleskog originala
+      text: U sluÄaju sukoba izmeÄu prevedene stranice i %{english_original_link}, engleska stranica ima prednost
+      title: O prevodu
+    legal_babble: "<h2>Autorska prava i licenca</h2>\n<p>\n   Openstritmap Äine <i>slobodni podaci</i> koji su objavljeni pod\n   licencom <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">\n   Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  Slobodni ste da umnoÅ¾avate, delite, prenosite i prilagoÄavate\n  naÅ¡e mape i podatke, sve dok imenujete Openstritmap i njene\n  ureÄivaÄe. Ako Å¾elite da menjate i dograÄujete naÅ¡e podatke,\n  moÅ¾ete ih deliti samo pod istom licencom.\n  Ceo <a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">\n  tekst ugovora</a> objaÅ¡njava vam vaÅ¡a prava i odgovornosti.\n</p>\n\n<h3>Kako da imenujete Openstritmap</h3>\n<p>\n  Ako koristite naÅ¡e slike mapa, traÅ¾imo da zasluge sadrÅ¾e\n  bar âÂ© OpenStreetMap\n  contributors, CC-BY-SAâ. Ako koristite samo podatke mapa,\n  navedite âMap data Â© OpenStreetMap contributors,\n  CC-BY-SAâ.\n</p>\n<p>\n  Gde je moguÄe, Openstritmap bi trebalo da vodi ka adresi <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  i CC-BY-SA ka <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\n  Ako koristite medijum gde veze nije moguÄe postaviti\n  (npr. Å¡tampani rad), predlaÅ¾emo da usmerite vaÅ¡e\n  Äitaoce na www.openstreetmap.org (po moguÄstvu\n  proÅ¡iravanjem âOpenStreetMapâ na celu adresu)\n  i na www.creativecommons.org.\n</p>\n\n<h3>Saznajte viÅ¡e</h3>\n<p>\n  ProÄitajte viÅ¡e o koriÅ¡Äenju naÅ¡ih podataka na <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">ÄPP</a>.\n</p>\n<p>\n  OSM ureÄivaÄi se podseÄaju da nikada ne dodaju podatke\n  od bilo kog izvora zaÅ¡tiÄenog autorskim pravima (npr.\n  Gugl mape ili Å¡tampane mape) bez izriÄite dozvole\n  nosioca autorskog prava.\n</p>\n<p>\n  Iako Openstritmap Äine slobodni podaci, ne moÅ¾emo da\n  obezbedimo besplatne API-je mapa drugim programerima.\n\n  Pogledajte naÅ¡u <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politiku\n  o koriÅ¡Äenju API-ja</a>, <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politiku\n  o prikazivanju mapa</a> i <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politiku\n  o koriÅ¡Äenju Nominatima</a>.\n\n<h3>NaÅ¡i saradnici</h3>\n<p>\n  NaÅ¡a licenca CC-BY-SA zahteva od vas da âmorate\n  navesti ime izvornog autora ili davaoca licenceâ.\n  PojedinaÄni maperi ne zahtevaju isticanje zasluga osim\n  âOpenstritmap saradnikaâ, ali kada podaci\n  pripadaju nacionalnoj geografskoj agenciji ili drugom\n  veÄem izvoru koji je ukljuÄen u Openstritmap, razumno je\n  navesti izvor ili ostaviti hipervezu do izvora.\n</p>\n\n<!--\nPodaci za ureÄivaÄe stranica\n\nSledeÄi spisak sadrÅ¾i samo one organizacije koje zahtevaju pripisivanje\nkao uslov da se njihovi podaci koriste u Openstritmapu. Ovo nije celi\nkatalog âuvozaâ podataka i ne sme se koristiti osim kada se zahteva da\npripisivanje bude u skladu s licencom uvezenih podataka.\n\nDa biste bilo Å¡ta dodali ispod, prvo morate popriÄati s administratorima.\n-->\n\n<ul id=\"contributors\">\n    <li><strong>Australija</strong>: sadrÅ¾i podatke o opÅ¡tinama\n    na osnovu podataka Australijskog biroa za statistiku.</li>\n<li><strong>Austrija</strong>: sadrÅ¾i podatke iz\n   <a href=\"http://data.wien.gv.at/\">Å tata Viena</a> pod licencom\n   <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC-BY</a>.</li>\n    <li><strong>Kanada</strong>: sadrÅ¾i podatke iz\n    BeobazeÂ®, Geogratisa (Â© Odeljenje za prirodne\n    resurse Kanade), Kanvek (Â© Odeljenje za prirodne\n    resurse Kanade) i Statkan (Geografski odsek,\n    Zavod za statistiku Kanade).</li>\n    <li><strong>Francuska</strong>: sadrÅ¾i podatke koji potiÄu od\n    Generalne direkcije za oporezivanje.</li>\n    <li><strong>Novi Zeland</strong>: sadrÅ¾i podatke koji potiÄu od\n    Land Information New Zealand. Crown Copyright reserved.</li>\n    <li><strong>Poljska</strong>: sadrÅ¾i podatke iz <a\n    href=\"http://ump.waw.pl/\">UMP-pcPL mapa</a>. Autorska prava\n    UMP-pcPL saradnici.</li>\n    <li><strong>Ujedinjeno Kraljevstvo</strong>: sadrÅ¾i ZvaniÄne\n    podatke geodetskog premeravanja Â© Autorska prava 2010.</li>\n</ul>\n\n<p>\n  UkljuÄivanje podataka u Openstritmap ne podrazumeva da izvorni\n  vlasnik podataka prihvata Openstritmap, obezbeÄuje bilo kakvu\n  garanciju ili prihvata odgovornost.\n</p>"
+    native: 
+      mapping_link: poÄnite s mapiranjem
+      native_link: srpsko izdanje
+      text: Trenutno posmatrate englesko izdanje stranice o autorskim pravima. MoÅ¾ete se vratiti na %{native_link} ove stranice ili jednostavno zaboravite na autorska prava i %{mapping_link}.
+      title: O stranici
+  message: 
+    delete: 
+      deleted: Poruka je obrisana
+    inbox: 
+      date: Datum
+      from: Od
+      my_inbox: Primljene
+      no_messages_yet: JoÅ¡ uvek nemate poruka. ZaÅ¡to ne biste stupili u kontakt s %{people_mapping_nearby_link}?
+      outbox: poslate
+      people_mapping_nearby: maperima u vaÅ¡oj okolini
+      subject: Naslov
+      title: Primljene
+      you_have: Imate %{new_count} novih i %{old_count} starih poruka
+    mark: 
+      as_read: Poruka je oznaÄena kao proÄitana
+      as_unread: Poruka je oznaÄena kao neproÄitana
+    message_summary: 
+      delete_button: ObriÅ¡i
+      read_button: OznaÄi kao proÄitano
+      reply_button: Odgovori
+      unread_button: OznaÄi kao neproÄitano
+    new: 
+      back_to_inbox: Nazad na primljene
+      body: Tekst
+      limit_exceeded: Nedavno ste poslali mnogo poruka. SaÄekajte neko vreme pre nego pokuÅ¡avate da poÅ¡aljete joÅ¡ neku.
+      message_sent: Poruka je poslata.
+      send_button: PoÅ¡alji
+      send_message_to: PoÅ¡alji novu poruku za %{name}
+      subject: Naslov
+      title: PoÅ¡alji poruku
+    no_such_message: 
+      body: NaÅ¾alost, nema poruke s tim IB.
+      heading: Nema takve poruke
+      title: Nema takve poruke
+    no_such_user: 
+      body: NaÅ¾alost, ne postoji korisnik s tim imenom.
+      heading: Nema takvog korisnika
+      title: Nema takvog korisnika
+    outbox: 
+      date: Datum
+      inbox: primljene
+      my_inbox: "%{inbox_link}"
+      no_sent_messages: JoÅ¡ uvek nemate poslatih poruka. ZaÅ¡to ne biste stupili u kontakt s %{people_mapping_nearby_link}?
+      outbox: poslate
+      people_mapping_nearby: maperima u vaÅ¡oj okolini
+      subject: Naslov
+      title: Poslate
+      to: Za
+      you_have_sent_messages: Imate %{count} poslatih poruka
+    read: 
+      back_to_inbox: Nazad na primljene
+      back_to_outbox: Nazad na poslate
+      date: Datum
+      from: Od
+      reading_your_messages: VaÅ¡e poruke
+      reading_your_sent_messages: VaÅ¡e poslate poruke
+      reply_button: Odgovori
+      subject: Naslov
+      title: ProÄitaj poruku
+      to: Za
+      unread_button: OznaÄi kao neproÄitano
+      wrong_user: Prijavljeni ste kao %{user}, ali poruka koju ste Å¾eleli da proÄitate nije poslata tom korisniku. Prijavite se kao ispravan korisnik da biste je proÄitali.
+    reply: 
+      wrong_user: Prijavljeni ste kao %{user}, ali poruka na koju ste Å¾eleli da odgovorite nije poslata tom korisniku. Prijavite se kao ispravan korisnik da biste odgovorili.
+    sent_message_summary: 
+      delete_button: ObriÅ¡i
+  notifier: 
+    diary_comment_notification: 
+      footer: MoÅ¾ete proÄitati komentare na %{readurl}, prokomentarisati na %{commenturl} ili odgovoriti na %{replyurl}
+      header: "%{from_user} prokomentarisa vaÅ¡ skoraÅ¡nji unos u dnevniku pod naslovom %{subject}:"
+      hi: Pozdrav, %{to_user},
+      subject: "[OpenStreetMap] %{user} prokomentarisa vaÅ¡ unos u dnevniku"
+    email_confirm: 
+      subject: "[OpenStreetMap] Potvrdite vaÅ¡u e-adresu"
+    email_confirm_html: 
+      click_the_link: Ako ste to vi, kliknite na vezu ispod da biste potvrdili izmene.
+      greeting: Pozdrav,
+      hopefully_you: Neko (verovatno vi) Å¾eleo bi da promeni e-adresu sa %{server_url} na %{new_address}.
+    email_confirm_plain: 
+      click_the_link: Ako ste to vi, kliknite na vezu ispod da biste potvrdili izmene.
+      greeting: Pozdrav,
+      hopefully_you_1: Neko (verovatno vi) Å¾eleo bi da promeni e-adresu na
+      hopefully_you_2: "%{server_url} na %{new_address}."
+    friend_notification: 
+      befriend_them: MoÅ¾ete ga/je dodati i kao prijatelja na %{befriendurl}.
+      had_added_you: "%{user} vas dodade kao prijatelja na Openstritmapu."
+      see_their_profile: MoÅ¾ete videti njegov/njen profil na %{userurl}.
+      subject: "[OpenStreetMap] %{user} vas dodade kao prijatelja"
+    gpx_notification: 
+      and_no_tags: i bez oznaka.
+      and_the_tags: "i sa sledeÄim oznakama:"
+      failure: 
+        failed_to_import: "Uvoz nije uspeo. GreÅ¡ka:"
+        more_info_1: ViÅ¡e o neuspelom GPX uvozu i kako to izbeÄi
+        more_info_2: "moÅ¾e se naÄi na:"
+        subject: "[OpenStreetMap] GPX uvoz nije uspeo"
+      greeting: Pozdrav,
+      success: 
+        loaded_successfully: uspeÅ¡no uÄitano sa %{trace_points} od moguÄih %{possible_points} taÄaka.
+        subject: "[OpenStreetMap] GPX uvoz je uspeo"
+      with_description: s opisom
+      your_gpx_file: LiÄi na vaÅ¡u GPX datoteku
+    lost_password: 
+      subject: "[OpenStreetMap] Zahtev za poniÅ¡tavanje lozinke"
+    lost_password_html: 
+      click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poniÅ¡tili lozinku.
+      greeting: Pozdrav,
+      hopefully_you: Neko (verovatno vi) zatraÅ¾io je poniÅ¡tavanje lozinke za ovaj nalog.
+    lost_password_plain: 
+      click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poniÅ¡tili lozinku.
+      greeting: Pozdrav,
+      hopefully_you_1: Neko (verovatno vi) zatraÅ¾io je poniÅ¡tavanje lozinke za
+      hopefully_you_2: nalog s ovom e-adresom.
+    message_notification: 
+      footer1: MoÅ¾ete proÄitati poruku i na %{readurl}
+      footer2: i moÅ¾ete odgovoriti na %{replyurl}
+      header: "%{from_user} vam posla poruku preko Openstritmapa pod naslovom %{subject}:"
+      hi: Pozdrav, %{to_user},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Potvrdite vaÅ¡u e-adresu"
+    signup_confirm_html: 
+      ask_questions: MoÅ¾ete postaviti bilo koje pitanje o Openstritmapu na naÅ¡im <a href="http://help.openstreetmap.org/">stranicama za pitanja i odgovore</a>.
+      click_the_link: Ako ste to vi, dobro doÅ¡li! Kliknite na vezu ispod da biste potvrdili vaÅ¡ nalog i proÄitali viÅ¡e o Openstritmapu
+      current_user: Spisak trenutnih korisnika u kategorijama, zasnovan na tome gde se oni nalaze, dostupan je na <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: ProÄitajte viÅ¡e o Openstritmapu <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na vikiju</a>, budite u toku s najnovijim vestima preko <a href="http://blog.openstreetmap.org/">bloga</a> ili <a href="http://twitter.com/openstreetmap">Tvitera</a> ili pretraÅ¾ite <a href="http://www.opengeodata.org/">OpenGeoData</a>, blog osnivaÄa Openstritmapa za istoriju projekata. MoÅ¾ete da sluÅ¡ate i <a href="http://www.opengeodata.org/?cat=13">podemisije</a>!
+      greeting: Pozdrav!
+      hopefully_you: Neko (verovatno vi) Å¾eleo bi da otvori nalog na
+      introductory_video: MoÅ¾ete pogledati %{introductory_video_link}.
+      more_videos: Postoji %{more_videos_link}.
+      more_videos_here: viÅ¡e video snimaka ovde
+      user_wiki_page: PreporuÄujemo vam da napravite korisniÄku stranicu na vikiju koja ukljuÄuje oznake kategorija koje oznaÄavaju gde se nalazite, kao na primer <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
+      video_to_openstreetmap: uvodni video snimak o Openstritmapu
+      wiki_signup: MoÅ¾ete i da <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">otvorite nalog na vikiju</a>.
+    signup_confirm_plain: 
+      ask_questions: "MoÅ¾ete postaviti bilo koje pitanje o Openstritmapu na naÅ¡im stranicama za pitanja i odgovore:"
+      blog_and_twitter: "Budite u toku s najnovijim vestima preko bloga ili Tvitera:"
+      click_the_link_1: Ako ste to vi, dobro doÅ¡li! Kliknite na vezu ispod da biste potvrdili svoj
+      click_the_link_2: korisniÄki nalog. ProÄitajte viÅ¡e o Openstritmapu.
+      current_user_1: Spisak trenutnih korisnika u kategorijama, na osnovu poloÅ¾aja u svetu
+      current_user_2: "gde Å¾ive, dostupan je na:"
+      greeting: Pozdrav!
+      hopefully_you: Neko (verovatno vi) Å¾eleo bi da otvori nalog na
+      introductory_video: "Uvodni video snimak o Openstritmapu moÅ¾ete pogledati ovde:"
+      more_videos: "Ovde se nalazi joÅ¡ viÅ¡e video snimaka:"
+      opengeodata: "OpenGeoData.org je blog Stiva Kosta, osnivaÄa Openstritmapa:"
+      the_wiki: "ProÄitajte viÅ¡e o Openstritmapu na vikiju:"
+      user_wiki_1: PreporuÄujemo vam da napravite korisniÄku stranicu koja ukljuÄuje
+      user_wiki_2: oznake kategorija koje oznaÄavaju odakle ste, kao na primer [[Category:Users_in_London]].
+      wiki_signup: "MoÅ¾ete i otvoriti nalog na naÅ¡em vikiju:"
+  oauth: 
+    oauthorize: 
+      allow_read_gpx: Äita vaÅ¡e privatne GPS tragove.
+      allow_read_prefs: Äita vaÅ¡e korisniÄke postavke.
+      allow_to: "Dozvoli programu da:"
+      allow_write_api: menja mapu.
+      allow_write_diary: pravi unose u dnevniku, komentariÅ¡e i dodaje prijatelje.
+      allow_write_gpx: otprema GPS tragove.
+      allow_write_prefs: menja vaÅ¡e korisniÄke postavke.
+      request_access: Program %{app_name} zahteva pristup vaÅ¡em nalogu, %{user}. OdluÄite se da li Å¾elite da mu ga omoguÄite. MoÅ¾ete izabrati bilo koji program.
+    revoke: 
+      flash: Opozvali ste novÄiÄ za %{application}
+  oauth_clients: 
+    create: 
+      flash: Podaci su uspeÅ¡no upisani
+    destroy: 
+      flash: Upis programa je ukinut
+    edit: 
+      submit: Uredi
+      title: Uredi program
+    form: 
+      allow_read_gpx: Äitanje privatnih GPS tragova.
+      allow_read_prefs: Äitanje korisniÄkih postavki.
+      allow_write_api: menjanje mape.
+      allow_write_diary: pravljenje unosa u dnevniku, komentarisanje i dodavanje prijatelja.
+      allow_write_gpx: otpremanje GPS tragova.
+      allow_write_prefs: menjanje korisniÄkih postavki.
+      callback_url: Povratna adresa
+      name: Ime
+      requests: "Zahtevaj sledeÄe dozvole od korisnika:"
+      required: Neophodno
+      support_url: Adresa podrÅ¡ke
+      url: Adresa glavnog programa
+    index: 
+      application: Naziv programa
+      issued_at: Izdano
+      list_tokens: "SledeÄi novÄiÄi su izdani programima na vaÅ¡e ime:"
+      my_apps: Programi
+      my_tokens: Odobreni programi
+      no_apps: Imate li program koji Å¾elite da koristite sa standardom %{oauth}? Morate upisati vaÅ¡ program pre nego Å¡to on moÅ¾e da traÅ¾i OAuth zahteve.
+      register_new: UpiÅ¡i program
+      registered_apps: "SledeÄi programi su upisani:"
+      revoke: Opozovi
+      title: OAuth detalji
+    new: 
+      submit: Otvori nalog
+      title: UpiÅ¡i novi program
+    not_found: 
+      sorry: Å½ao nam je, %{type} nije pronaÄen.
+    show: 
+      access_url: "Adresa pristupnog novÄiÄa:"
+      allow_read_gpx: Äita privatne GPS tragove.
+      allow_read_prefs: Äita korisniÄke postavke.
+      allow_write_api: menja mapu.
+      allow_write_diary: pravi unose u dnevniku, komentariÅ¡e i dodaje prijatelje.
+      allow_write_gpx: otprema GPS tragove.
+      allow_write_prefs: menja korisniÄke postavke.
+      authorize_url: "Adresa ovlaÅ¡Äenja:"
+      edit: Detalji izmene
+      key: "KljuÄ potroÅ¡aÄa:"
+      requests: "Zahtevanje sledeÄih dozvola od korisnika:"
+      secret: "Tajna potroÅ¡aÄa:"
+      support_notice: PodrÅ¾avamo HMAC-SHA1, kao i obiÄan tekst u reÅ¾imu SSL.
+      title: OAuth detalji za %{app_name}
+      url: "Adresa zahtevnog novÄiÄa:"
+    update: 
+      flash: Podaci o klijentu su uspeÅ¡no aÅ¾urirani
+  site: 
+    edit: 
+      anon_edits_link_text: Saznajte zaÅ¡to je to sluÄaj.
+      flash_player_required: Potreban vam je fleÅ¡ plejer da biste koristili ureÄivaÄ mapa. Preuzmite ga <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odavde</a>. Dostupne su i <a href="http://wiki.openstreetmap.org/wiki/Editing">neke druge moguÄnosti</a> za ureÄivanje Openstritmapa.
+      no_iframe_support: VaÅ¡ pregledaÄ ne podrÅ¾ava HTML iframes, a oni su potrebni za ovu moguÄnost.
+      not_public: Niste podesili da vaÅ¡e izmene budu javne.
+      not_public_description: Ne moÅ¾ete ureÄivati mapu sve dok to ne uradite. MoÅ¾ete podesiti da vaÅ¡e izmene budu javne s %{user_page}.
+      potlatch2_not_configured: PotlaÄ 2 nije podeÅ¡en. Pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 za viÅ¡e informacija
+      potlatch2_unsaved_changes: Niste saÄuvali izmene. Da biste to uradili, kliknite na dugme za Äuvanje.
+      potlatch_unsaved_changes: Niste saÄuvali izmene. Da biste to uradili, poniÅ¡tite tekuÄu putanju ili taÄku, ako ureÄujete naÅ¾ivo, ili kliknite na dugme za Äuvanje.
+      user_page_link: korisniÄke stranice
+    index: 
+      js_1: Koristite pregledaÄ koji ne podrÅ¾ava javaskript ili ste ga onemoguÄili.
+      js_2: Openstritmap koristi javaskript za prikazivanje mapa.
+      js_3: Probajte <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home, pregledaÄ statiÄnih ploÄica</a> ako ne moÅ¾ete da omoguÄite javaskript.
+      license: 
+        license_name: Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0
+        notice: Objavljeno pod licencom %{license_name} od %{project_name} i njenih saradnika.
+        project_name: Openstritmapa
+      permalink: Trajna veza
+      remote_failed: UreÄivanje nije uspelo. Proverite da li je JOSM ili Merkaartor uÄitan i da je moguÄnost daljinskog upravljanja omoguÄena
+      shortlink: Kratka veza
+    key: 
+      map_key: Legenda
+      map_key_tooltip: Legenda mape
+      table: 
+        entry: 
+          admin: Administrativna granica
+          allotments: BaÅ¡te
+          apron: 
+            - Aerodromski peron
+            - terminal
+          bridge: Crni okvir â most
+          bridleway: KonjiÄka staza
+          brownfield: GraÄevinsko zemljiÅ¡te
+          building: ZnaÄajna zgrada
+          byway: Sporedni put
+          cable: 
+            - Å½iÄara
+            - sediÅ¡nica
+          cemetery: Groblje
+          centre: Sportski centar
+          commercial: Poslovno podruÄje
+          common: 
+            - Poljana
+            - livada
+          construction: Putevi u izgradnji
+          cycleway: BiciklistiÄka staza
+          destination: Pristup odrediÅ¡tu
+          farm: Farma
+          footway: PeÅ¡aÄka staza
+          forest: Å uma
+          golf: Golf teren
+          heathland: PustoÅ¡
+          industrial: Industrijsko podruÄje
+          lake: 
+            - Jezero
+            - rezervoar
+          military: Vojno podruÄje
+          motorway: Auto-put
+          park: Park
+          permissive: Pristup uz dozvolu
+          pitch: Sportsko igraliÅ¡te
+          primary: Glavni put
+          private: Privatni posed
+          rail: Å½elezniÄka pruga
+          reserve: Rezervat prirode
+          resident: Stambeno podruÄje
+          retail: Maloprodajno podruÄje
+          runway: 
+            - Aerodromska pista
+            - rulne staze
+          school: 
+            - Å kola
+            - univerzitet
+          secondary: Sporedni put
+          station: Å½elezniÄka stanica
+          subway: Podzemna Å¾eleznica
+          summit: 
+            - UzviÅ¡enje
+            - vrh
+          tourist: TuristiÄka atrakcija
+          track: Makadam
+          tram: 
+            - Laka Å¾eleznica
+            - tramvaj
+          trunk: Magistralni put
+          tunnel: Isprekidan okvir â tunel
+          unclassified: Nekategorisani put
+          unsurfaced: Neasfaltirani put
+          wood: Å uma
+    search: 
+      search: Pretraga
+      search_help: "primeri: âNovi Sadâ, âVojvode Stepe, Beogradâ ili âÅ¾elezniÄka stanica, NiÅ¡â <a href='http://wiki.openstreetmap.org/wiki/Search'>viÅ¡e primeraâ¦</a>"
+      submit_text: Idi
+      where_am_i: Gde sam?
+      where_am_i_title: Ustanovite trenutnu lokaciju pomoÄu pretraÅ¾ivaÄa
+    sidebar: 
+      close: Zatvori
+      search_results: Rezultati pretrage
+  time: 
+    formats: 
+      friendly: "%e %B %Y u %H:%M"
+  trace: 
+    create: 
+      trace_uploaded: GPX datoteka je otpremljena i Äeka ubacivanje u bazu. Ovo obiÄno traje oko pola sata, nakon Äega Äete dobiti obaveÅ¡tenje o zavrÅ¡etku.
+      upload_trace: Otpremi GPS trag
+    delete: 
+      scheduled_for_deletion: Trag postavljen za brisanje
+    edit: 
+      description: "Opis:"
+      download: preuzmi
+      edit: uredi
+      filename: "Naziv datoteke:"
+      heading: UreÄivanje traga %{name}
+      map: mapa
+      owner: "Vlasnik:"
+      points: "TaÄaka:"
+      save_button: SaÄuvaj izmene
+      start_coord: "PoÄetna koordinata:"
+      tags: "Oznake:"
+      tags_help: razdvojeno zapetama
+      title: UreÄivanje traga %{name}
+      uploaded_at: "Otpremljeno:"
+      visibility: "Vidljivost:"
+      visibility_help: Å¡ta ovo znaÄi?
+    list: 
+      public_traces: Javni GPS tragovi
+      public_traces_from: Javni GPS tragovi korisnika %{user}
+      tagged_with: " oznaÄeni sa %{tags}"
+      your_traces: VaÅ¡i GPS tragovi
+    make_public: 
+      made_public: Javni trag
+    no_such_user: 
+      body: Å½ao nam je, ali ne postoji korisnik s imenom %{user}. Proverite ispravnost upisa ili veze koju ste kliknuli.
+      heading: Korisnik %{user} ne postoji
+      title: Nema takvog korisnika
+    offline: 
+      heading: GPX ostava je van mreÅ¾e
+      message: GPX ostava i otpremanje trenutno nisu dostupni.
+    offline_warning: 
+      message: Sistem za otpremanje GPX datoteka trenutno nije dostupan
+    trace: 
+      ago: pre %{time_in_words_ago}
+      by: od
+      count_points: "%{count} taÄaka"
+      edit: uredi
+      edit_map: Uredi mapu
+      identifiable: POISTOVETLJIV
+      in: u
+      map: mapa
+      more: viÅ¡e
+      pending: NA_ÄEKANJU
+      private: PRIVATNI
+      public: JAVNI
+      trace_details: Pogledaj detalje traga
+      trackable: UTVRDLJIV
+      view_map: Pogledaj mapu
+    trace_form: 
+      description: "Opis:"
+      help: PomoÄ
+      tags: "Oznake:"
+      tags_help: razdvojeno zapetama
+      upload_button: Otpremi
+      upload_gpx: "Otpremi GPX datoteku:"
+      visibility: "Vidljivost:"
+      visibility_help: Å¡ta ovo znaÄi?
+    trace_header: 
+      see_all_traces: Pogledaj sve tragove
+      see_your_traces: Pogledaj svoje tragove
+      traces_waiting: Imate %{count} tragova na Äekanju za slanje. SaÄekajte da se prvo oni zavrÅ¡e pre otpremanja novih tragova, da ne biste blokirali druge korisnike.
+      upload_trace: Otpremi trag
+    trace_optionals: 
+      tags: Oznake
+    trace_paging_nav: 
+      next: SledeÄi Â»
+      previous: "Â« Prethodni"
+      showing_page: Prikaz stranice %{page}
+    view: 
+      delete_track: ObriÅ¡i ovaj trag
+      description: "Opis:"
+      download: preuzmi
+      edit: uredi
+      edit_track: Uredi ovaj trag
+      filename: "Naziv datoteke:"
+      heading: Pregled traga %{name}
+      map: mapa
+      none: niÅ¡ta
+      owner: "Vlasnik:"
+      pending: NA_ÄEKANJU
+      points: "TaÄaka:"
+      start_coordinates: "PoÄetna koordinata:"
+      tags: "Oznake:"
+      title: Pregled traga %{name}
+      trace_not_found: Trag nije pronaÄen.
+      uploaded: "Otpremljeno:"
+      visibility: "Vidljivost:"
+    visibility: 
+      identifiable: MoÅ¾e se prepoznati (prikazano u spisku tragova kao javne, poreÄane i datirane taÄke)
+      private: Privatni (prikazuje se kao anonimne, nerasporeÄene taÄke)
+      public: Javni (prikazane u spisku tragova kao anonimne, nerasporeÄene taÄke)
+      trackable: MoÅ¾e se pratiti (prikazuje se kao anonimne, poreÄane i datirane taÄke)
+  user: 
+    account: 
+      contributor terms: 
+        agreed: Prihvatili ste nove uslove ureÄivanja.
+        agreed_with_pd: TakoÄe se slaÅ¾ete da vaÅ¡e izmene budu u javnom vlasniÅ¡tvu.
+        heading: "Uslovi ureÄivanja:"
+        link text: Å¡ta je ovo?
+        not yet agreed: Niste prihvatili nove uslove ureÄivanja.
+        review link text: Pratite ovu vezu da biste pregledali i prihvatili nove uslove ureÄivanja.
+      current email address: "Trenutna e-adresa:"
+      delete image: Ukloni trenutnu sliku
+      email never displayed publicly: (nikada se ne prikazuje javno)
+      flash update success: Podaci o korisniku su uspeÅ¡no aÅ¾urirani.
+      flash update success confirm needed: Podaci o korisniku su uspeÅ¡no aÅ¾urirani. Proverite e-poÅ¡tu da biste potvrdili svoju novu e-adresu.
+      home location: "Mesto stanovanja:"
+      image: "Slika:"
+      image size hint: (kvadratne slike od barem 100Ã100 piksela rade najbolje)
+      keep image: ZadrÅ¾i trenutnu sliku
+      latitude: "Geografska Å¡irina:"
+      longitude: "Geografska duÅ¾ina:"
+      make edits public button: Neka sve moje izmene budu javne
+      my settings: Postavke
+      new email address: "Nova e-adresa:"
+      new image: Dodaj sliku
+      no home location: Niste uneli mesto stanovanja.
+      openid: 
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: Å¡ta je ovo?
+        openid: "OpenID:"
+      preferred editor: "Å½eljeni ureÄivaÄ:"
+      preferred languages: "Å½eljeni jezici:"
+      profile description: "Opis profila:"
+      public editing: 
+        disabled: OnemoguÄeno i ne mogu se ureÄivati podaci. Sve prethodne izmene su anonimne.
+        disabled link text: zaÅ¡to ne mogu da ureÄujem?
+        enabled: OmoguÄeno. Nije anonimno i mogu se ureÄivati podaci.
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Å¡ta je ovo?
+        heading: "Javno ureÄivanje:"
+      public editing note: 
+        heading: Javno ureÄivanje
+        text: Trenutno su vaÅ¡e izmene anonimne i ljudi vam ne mogu slati poruke ili videti vaÅ¡u lokaciju. Da biste pokazali vaÅ¡e izmene i dozvolili ljudima da vas kontaktiraju, kliknite na dugme ispod. <b>Od promena API-ja 0.6, samo javni korisnici mogu ureÄivati mape</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">saznajte zaÅ¡to</a>).<ul><li>VaÅ¡a e-adresa neÄe biti otkrivena na ovaj naÄin.</li><li>Ova radnja ne moÅ¾e biti opozvana i svi novi korisnici su od sada postavljeni kao javni.</li></ul>
+      replace image: Zameni trenutnu sliku
+      return to profile: Nazad na profil
+      save changes button: SaÄuvaj izmene
+      title: Uredi nalog
+      update home location on click: AÅ¾urirati mesto stanovanja kada kliknem na mapu?
+    confirm: 
+      already active: Ovaj nalog je veÄ potvrÄen.
+      before you start: Pre nego Å¡to poÄnete s mapiranjem, popunite neke podatke o sebi u obrascu koji se nalazi ispod.
+      button: Potvrdi
+      heading: Potvrda korisniÄkog naloga
+      press confirm button: Pritisnite dugme za potvrdu da biste aktivirali nalog.
+      reconfirm: Ako je proÅ¡lo neko vreme otkako ste otvorili nalog, moÅ¾da Äete morati da <a href="%{reconfirm}">zatraÅ¾ite novu potvrdu e-poÅ¡tom</a>.
+      success: VaÅ¡ nalog je potvrÄen. Hvala vam na upisu!
+      unknown token: Izgleda da taj novÄiÄ ne postoji.
+    confirm_email: 
+      button: Potvrdi
+      failure: E-adresa s ovim novÄiÄem je veÄ potvrÄena.
+      heading: Potvrda promene e-adrese
+      press confirm button: Kliknite na dugme za potvrdu da biste potvrdili svoju novu e-adresu.
+      success: VaÅ¡a e-adresa je potvrÄena. Hvala vam na upisu!
+    confirm_resend: 
+      failure: Korisnik %{name} nije pronaÄen.
+      success: Poslali smo novu potvrdnu poruku na %{email}. Nakon Å¡to potvrdite svoj nalog, moÄi Äete da poÄnete s mapiranjem.<br /><br />Ako koristite sistem protiv nepoÅ¾eljnih poruka, dodajte webmaster@openstreetmap.org u spisak dozvoljenih adresa jer nismo u moguÄnosti da odgovorimo na bilo koji zahtev za potvrdu.
+    filter: 
+      not_an_administrator: Morate biti administrator da biste izvrÅ¡ili ovu radnju.
+    go_public: 
+      flash success: Sve vaÅ¡e izmene su sada javne. Dozvoljeno vam je ureÄivanje.
+    list: 
+      confirm: Potvrdi izabrane korisnike
+      empty: Nije pronaÄen nijedan korisnik
+      heading: Korisnici
+      hide: Sakrij izabrane korisnike
+      showing: 
+        one: Prikaz stranice %{page} (%{first_item} od %{items})
+        other: Prikaz stranica %{page} (%{first_item}-%{last_item} od %{items})
+      summary: "%{name} napravljeno od %{ip_address} dana %{date}"
+      summary_no_ip: "%{name} napravljeno %{date}"
+      title: Korisnici
+    login: 
+      account not active: Å½ao nam je, vaÅ¡ nalog joÅ¡ uvek nije aktiviran. <br />Pratite vezu u poruci za potvrdu e-poÅ¡te da biste ga aktivirali ili <a href="%{reconfirm}">zatraÅ¾ite novu poruku</a>.
+      account suspended: Å½ao nam je, vaÅ¡ nalog je privremeno ukinut zbog sumnjive aktivnosti.<br />Kontaktirajte %{webmaster}a ako Å¾elite da se Å¾alite.
+      auth failure: Ne mogu da vas prijavim s unetim podacima.
+      create account minute: Otvorite nalog. Potrebno je samo nekoliko trenutaka.
+      email or username: "E-adresa ili korisniÄko ime:"
+      heading: Prijava
+      login_button: Prijavi me
+      lost password link: Zaboravili ste lozinku?
+      new to osm: Novi ste na sajtu?
+      notice: <a href="http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License">Saznajte viÅ¡e o predstojeÄoj izmeni licence</a> (<a href="http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License">prevodi</a>) (<a href="http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming">razgovor</a>)
+      openid: "%{logo} OpenID:"
+      openid invalid: Izgleda da OpenID nije ispravan
+      openid missing provider: Ne mogu da se poveÅ¾em s OpenID dobavljaÄem
+      openid_logo_alt: Prijavite se s OpenID-jem
+      openid_providers: 
+        aol: 
+          alt: Prijavite se preko AOL-a
+          title: Prijava putem AOL-a
+        google: 
+          alt: Prijavite se preko Gugla
+          title: Prijava putem Gugla
+        myopenid: 
+          alt: Prijavite se preko myOpenID-ja
+          title: Prijava putem myOpenID-ja
+        openid: 
+          alt: Prijavite se s OpenID-jem
+          title: Prijava putem OpenID-ja
+        wordpress: 
+          alt: Prijavite se preko Vordpresa
+          title: Prijava putem Vordpresa
+        yahoo: 
+          alt: Prijavite se preko Jahua
+          title: Prijava putem Jahua
+      password: "Lozinka:"
+      register now: Otvorite nalog
+      remember: "Zapamti me:"
+      title: Prijava
+      to make changes: Da biste pravili izmene, morate imati nalog.
+      webmaster: administrator
+      with openid: "Rezervni naÄin je da koristite OpenID:"
+      with username: "VeÄ imate nalog? Prijavite se s korisniÄkim imenom i lozinkom:"
+    logout: 
+      heading: Odjava
+      logout_button: Odjavi me
+      title: Odjava
+    lost_password: 
+      email address: "E-adresa:"
+      heading: Zaboravili ste lozinku?
+      help_text: Unesite e-adresu koju ste uneli pri upisu, a mi Äemo vam poslati vezu pomoÄu koje moÅ¾ete da poniÅ¡tite lozinku.
+      new password button: PoniÅ¡ti lozinku
+      notice email cannot find: E-adresa nije pronaÄena.
+      notice email on way: Poruka za poniÅ¡tavanje lozinke je poslata.
+      title: Povratak lozinke
+    make_friend: 
+      already_a_friend: VeÄ ste prijatelj sa %{name}.
+      failed: Ne mogu da dodam %{name} kao prijatelja.
+      success: "%{name} je sada vaÅ¡ prijatelj."
+    new: 
+      confirm email address: "Potvrdite e-adresu:"
+      confirm password: "Potvrdite lozinku:"
+      contact_webmaster: Kontaktirajte <a href="mailto:webmaster@openstreetmap.org">administratora</a> za otvaranje novog naloga. ObradiÄemo zahtev Å¡to je pre moguÄe.
+      continue: Nastavi
+      display name: "Ime prikaza:"
+      display name description: Javno prikazano korisniÄko ime. Kasnije ga moÅ¾ete promeniti u postavkama.
+      email address: "E-adresa:"
+      fill_form: Kada popunite obrazac, poslaÄemo vam poruku za aktiviranje naloga.
+      flash create success message: Hvala vam na otvaranju naloga. Poslali smo vam potvrdnu poruku na %{email}. Nakon Å¡to potvrdite svoj nalog, moÄi Äete da poÄnete s mapiranjem.<br /><br />Ako koristite sistem protiv nepoÅ¾eljnih poruka, dodajte webmaster@openstreetmap.org u spisak dozvoljenih adresa jer nismo u moguÄnosti da odgovorimo na bilo koji zahtev za potvrdu.
+      heading: Otvaranje korisniÄkog naloga
+      license_agreement: Nakon Å¡to potvrdite nalog, moraÄete da prihvatite <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">uslove ureÄivanja</a>.
+      no_auto_account_create: NaÅ¾alost, trenutno nismo u moguÄnosti da otvorimo novi nalog.
+      not displayed publicly: Ne prikazuje se javno (pogledajte <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">politiku privatnosti</a>)
+      openid: "%{logo} OpenID:"
+      openid association: "<p>VaÅ¡ OpenID nije povezan s nalogom na Openstritmapu.</p>\n<ul>\n  <li>Ako joÅ¡ uvek nemate nalog, otvorite ga koristeÄi obrazac ispod.</li>\n  <li>\n    Ako imate nalog, prijavite se sa svojim korisniÄkim imenom\n    i lozinkom, pa ga onda poveÅ¾ite s OpenID-jem u postavkama.\n  </li>\n</ul>"
+      openid no password: S OpenID-jem, lozinka nije potrebna, ali neke dodatne alatke ipak zahtevaju lozinku.
+      password: "Lozinka:"
+      terms accepted: Hvala vam Å¡to prihvatate nove uslove ureÄivanja.
+      terms declined: Å½ao nam je Å¡to ste odluÄili da ne prihvatite nove uslove ureÄivanja. Pogledajte <a href="%{url}">ovu stranicu</a> za viÅ¡e informacija.
+      title: Otvaranje naloga
+      use openid: Rezervni naÄin je da koristite %{logo} OpenID
+    no_such_user: 
+      body: Ne postoji korisnik s imenom %{user}. Proverite ispravnost upisa ili veze koju ste kliknuli.
+      heading: Korisnik %{user} ne postoji
+      title: Nema takvog korisnika
+    popup: 
+      friend: Prijatelj
+      nearby mapper: ObliÅ¾nji maper
+      your location: VaÅ¡a lokacija
+    remove_friend: 
+      not_a_friend: "%{name} nije vaÅ¡ prijatelj."
+      success: "%{name} je izbaÄen iz prijatelja."
+    reset_password: 
+      confirm password: "Potvrdite lozinku:"
+      flash changed: VaÅ¡a lozinka je promenjena.
+      flash token bad: Takav novÄiÄ nije pronaÄen. Proverite adresu.
+      heading: PoniÅ¡tavanje lozinke za %{user}
+      password: "Lozinka:"
+      reset: PoniÅ¡ti lozinku
+      title: PoniÅ¡ti lozinku
+    set_home: 
+      flash success: Mesto stanovanja je uspeÅ¡no saÄuvano
+    suspended: 
+      body: "<p>\n  Å½ao nam je, vaÅ¡ nalog je privremeno ukinut\n  zbog sumnjive aktivnosti.\n</p>\n<p>\n  Ovu odluku Äe ubrzo razmotriti administrator. TakoÄe,\n  moÅ¾ete kontaktirati %{webmaster}a ako Å¾elite da se Å¾alite.\n</p>"
+      heading: Suspendovan nalog
+      title: Suspendovan nalog
+      webmaster: administrator
+    terms: 
+      agree: Prihvati
+      consider_pd: Prema gorenavedenom ugovoru, smatram da moji doprinosi pripadaju javnom vlasniÅ¡tvu
+      consider_pd_why: Å¡ta je ovo?
+      decline: Odbaci
+      guidance: "Podaci koji Äe vam pomoÄi da razumete uslove: <a href=\"%{summary}\">Äitljivi saÅ¾etak</a> i <a href=\"%{translations}\">neformalni prevodi</a>"
+      heading: Uslovi ureÄivanja
+      legale_names: 
+        france: Francuska
+        italy: Italija
+        rest_of_world: Ostatak sveta
+      legale_select: "Izaberite zemlju prebivaliÅ¡ta:"
+      read and accept: ProÄitajte ugovor ispod i pritisnite dugme za potvrdu da biste prihvatili uslove za postojeÄe i buduÄe doprinose.
+      title: Uslovi ureÄivanja
+      you need to accept or decline: Molimo vas da proÄitate ugovor pre nego Å¡to ga prihvatite.
+    view: 
+      activate_user: aktiviraj ovog korisnika
+      add as friend: dodaj kao prijatelja
+      ago: (pre %{time_in_words_ago})
+      block_history: pogledaj dobijene blokade
+      blocks by me: moja blokiranja
+      blocks on me: blokiranja na mene
+      confirm: Potvrdi
+      confirm_user: potvrdi ovog korisnika
+      create_block: blokiraj ovog korisnika
+      created from: "Napravljeno iz:"
+      deactivate_user: deaktiviraj ovog korisnika
+      delete_user: obriÅ¡i ovog korisnika
+      description: Opis
+      diary: dnevnik
+      edits: izmene
+      email address: "E-adresa:"
+      hide_user: sakrij ovog korisnika
+      if set location: Ako postavite svoju lokaciju, zgodna mapa Äe biti prikazana ispod. MoÅ¾ete je podesiti u %{settings_link}.
+      km away: udaljeno %{count}Â km
+      latest edit: "Poslednja izmena pre %{ago}:"
+      m away: udaljeno %{count}Â m
+      mapper since: "Maper od:"
+      moderator_history: pogledaj date blokade
+      my diary: moj dnevnik
+      my edits: moje izmene
+      my settings: moje postavke
+      my traces: moji tragovi
+      nearby users: "Ostali obliÅ¾nji korisnici:"
+      new diary entry: novi unos u dnevniku
+      no friends: Niste dodali nijednog prijatelja.
+      no nearby users: JoÅ¡ uvek nema obliÅ¾njih korisnika koji mapiraju.
+      oauth settings: oAuth postavke
+      remove as friend: ukloni kao prijatelja
+      role: 
+        administrator: Ovaj korisnik je administrator
+        grant: 
+          administrator: Dodeli ovlaÅ¡Äenja administratora
+          moderator: Dodeli ovlaÅ¡Äenja urednika
+        moderator: Ovaj korisnik je urednik
+        revoke: 
+          administrator: Opozovi ovlaÅ¡Äenja administratora
+          moderator: Opozovi ovlaÅ¡Äenja urednika
+      send message: poÅ¡alji poruku
+      settings_link_text: postavkama
+      spam score: "Ocena spama:"
+      status: "Stanje:"
+      traces: tragovi
+      unhide_user: otkrij ovog korisnika
+      user location: Lokacija korisnika
+      your friends: VaÅ¡i prijatelji
+  user_block: 
+    blocks_by: 
+      empty: "%{name} joÅ¡ uvek nije blokirao nikoga."
+      heading: Spisak blokada od %{name}
+      title: Blokade od %{name}
+    blocks_on: 
+      empty: "%{name} joÅ¡ nije bio blokiran/a."
+      heading: Spisak blokada za %{name}
+      title: Blokade za %{name}
+    create: 
+      flash: Blokiraj korisnika %{name}.
+      try_contacting: Kontaktirajte korisnika pre blokiranja da biste mu dali dovoljno vremena da odgovori.
+      try_waiting: Dajte korisniku dovoljno vremena da odgovori pre nego Å¡to ga blokirate.
+    edit: 
+      back: Pogledaj sve blokade
+      heading: UreÄivanje blokade za %{name}
+      needs_view: Da li korisnik mora da se prijavi da bi blokada bila uklonjena?
+      period: Koliko dugo Äe korisnik biti blokiran od API-ja, poÄev od sada.
+      reason: Razlog zaÅ¡to je %{name} blokiran/a. Budite razumni i pruÅ¾ite nam Å¡to viÅ¡e detalja. Imajte na umu da ne znaju svi korisnici Å¾argon zajednice, te im pokuÅ¡ajte objasniti jednostavnim jezikom.
+      show: Pogledaj ovu blokadu
+      submit: AÅ¾uriraj blokadu
+      title: UreÄivanje blokade za %{name}
+    filter: 
+      block_expired: Blokada je veÄ istekla i ne moÅ¾e se ureÄivati.
+      block_period: Period blokade mora biti jedna od vrednosti iz padajuÄeg spiska.
+      not_a_moderator: Morate biti urednik da biste izvrÅ¡ili ovu radnju.
+    helper: 
+      time_future: ZavrÅ¡ava se u %{time}.
+      time_past: ZavrÅ¡eno pre %{time}.
+      until_login: Aktivno sve dok se korisnik ne prijavi.
+    index: 
+      empty: Nije napravljena nijedna blokada.
+      heading: Spisak korisniÄkih blokada
+      title: KorisniÄke blokade
+    model: 
+      non_moderator_revoke: Morate biti urednik da biste ukinuli blokadu.
+      non_moderator_update: Morate biti urednik da biste postavljali ili aÅ¾urirali blokadu.
+    new: 
+      back: Pogledaj sve blokade
+      heading: Blokiranje %{name}
+      needs_view: Korisnik mora da se prijavi da bi blokada bila uklonjena
+      period: Koliko dugo Äe korisnik biti blokiran od API-ja, poÄev od sada.
+      reason: Razlog zaÅ¡to je %{name} blokiran/a. Budite razumni i pruÅ¾ite nam Å¡to viÅ¡e detalja. Imajte na umu da ne znaju svi korisnici Å¾argon zajednice, te im pokuÅ¡ajte objasniti jednostavnim jezikom.
+      submit: Napravi blokadu
+      title: Blokiranje %{name}
+      tried_contacting: Kontaktirao sam korisnika i pitao ga da prestane.
+      tried_waiting: Dao sam dovoljno vremena korisniku da odgovori.
+    not_found: 
+      back: Nazad na indeks
+      sorry: KorisniÄka blokada s IB %{id} nije pronaÄena.
+    partial: 
+      confirm: Jeste li sigurni?
+      creator_name: Tvorac
+      display_name: Blokirani korisnik
+      edit: Uredi
+      not_revoked: (nije opozvano)
+      reason: Razlozi za blokiranje
+      revoke: Opozovi
+      revoker_name: Opozvao
+      show: PrikaÅ¾i
+      status: Stanje
+    period: 
+      one: 1 sat
+      other: "%{count} sata"
+    revoke: 
+      confirm: Å½elite li da opozovete ovu blokadu?
+      flash: Ova blokada je opozvana.
+      heading: Opozivanje blokade na %{block_on} od %{block_by}
+      past: Ova blokada je zavrÅ¡ena pre %{time} i ne moÅ¾e se sada opozvati.
+      revoke: Opozovi
+      time_future: Ova blokada Äe se zavrÅ¡iti za %{time}.
+      title: Opozivanje blokade na %{block_on}
+    show: 
+      back: Pogledaj sve blokade
+      confirm: Jeste li sigurni?
+      edit: Uredi
+      heading: "%{block_on} je blokiran/a od %{block_by}"
+      needs_view: Korisnik mora da se prijavi da bi blokada bila uklonjena.
+      reason: "Razlog za blokiranje:"
+      revoke: Opozovi
+      revoker: "Opozivalac:"
+      show: PrikaÅ¾i
+      status: Stanje
+      time_future: ZavrÅ¡ava se u %{time}
+      time_past: ZavrÅ¡eno pre %{time}
+      title: "%{block_on} je blokiran/a od %{block_by}"
+    update: 
+      only_creator_can_edit: Samo urednik koji je napravio ovu blokadu moÅ¾e da je uredi.
+      success: Blokada je aÅ¾urirana.
+  user_role: 
+    filter: 
+      already_has_role: Korisnik veÄ ima ulogu %{role}.
+      doesnt_have_role: Korisnik nema ulogu %{role}.
+      not_a_role: â%{role}â nije ispravna uloga.
+      not_an_administrator: Samo administratori mogu da upravljaju ulogama korisnika, a vi to niste.
+    grant: 
+      are_you_sure: Å½elite li da dodelite ulogu â%{role}â korisniku %{name}?
+      confirm: Potvrdi
+      fail: Ne mogu da dodelim ulogu â%{role}â korisniku %{name}. Proverite da li su korisnik i uloga ispravni.
+      heading: Potvrda dodele uloge
+      title: Potvrda dodele uloge
+    revoke: 
+      are_you_sure: Å½elite li da oduzmete ulogu â%{role}â od korisnika %{name}?
+      confirm: Potvrdi
+      fail: Ne mogu da oduzmem ulogu â%{role}â od korisnika %{name}. Proverite da li su korisnik i uloga ispravni.
+      heading: Potvrda oduzimanja uloge
+      title: Potvrda oduzimanja uloge
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d203fdda5..6d175d18f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -17,6 +17,7 @@
 # Author: Sertion
 # Author: The real emj
 # Author: WikiPhoenix
+# Author: Zvenzzon
 sv: 
   activerecord: 
     attributes: 
@@ -54,6 +55,8 @@ sv:
         pass_crypt: LÃ¶senord
     models: 
       acl: TillgÃ¥ngskontrollista (ACL)
+      changeset: Ãndringsset
+      changeset_tag: Etikett till Ã¤ndringsset
       country: Land
       diary_comment: Dagbokskommentar
       diary_entry: Dagbokspost
@@ -245,6 +248,7 @@ sv:
     timeout: 
       sorry: TyvÃ¤rr tog data fÃ¶r %{type} med id %{id} fÃ¶r lÃ¥ng tid att hÃ¤mta.
       type: 
+        changeset: Ã¤ndringsset
         node: nod
         relation: relation
         way: vÃ¤g
@@ -273,10 +277,12 @@ sv:
       big_area: (stor)
       no_comment: (ingen)
       no_edits: (inga Ã¤ndringar)
+      show_area_box: visa omrÃ¥de
       still_editing: (redigerar fortfarande)
+      view_changeset_details: Visa detaljer om Ã¤ndringsset
     changeset_paging_nav: 
       next: NÃ¤sta Â»
-      previous: "Â« FÃ¶regÃ¥ende"
+      previous: Â« FÃ¶regÃ¥ende
       showing_page: Visar sida %{page}
     changesets: 
       area: Area
@@ -297,6 +303,8 @@ sv:
       title_bbox: Changesets inom %{bbox}
       title_user: Ãndringsset av %{user}
       title_user_bbox: Ãndringsset av %{user} inom %{bbox}
+    timeout: 
+      sorry: Kunde tyvÃ¤rr inte lista begÃ¤rda Ã¤ndringsset. BegÃ¤ran tog fÃ¶r lÃ¥ng tid att hÃ¤mta.
   diary_entry: 
     diary_comment: 
       comment_from: Kommentar frÃ¥n %{link_user}, %{comment_created_at}
@@ -313,10 +321,12 @@ sv:
       posted_by: Skrivet av %{link_user} den %{created} pÃ¥ %{language_link}
       reply_link: Svara pÃ¥ denna anteckning
     edit: 
+      body: "Meddelandetext:"
       language: "SprÃ¥k:"
       latitude: "Latitud:"
       location: "Plats:"
       longitude: "Longitud:"
+      marker_text: Plats fÃ¶r inlÃ¤gg
       save_button: Spara
       subject: "Ãrende:"
       title: Redigera dagboksanteckning
@@ -330,6 +340,7 @@ sv:
         title: Openstreetmap dagboksinlÃ¤gg pÃ¥ %{language_name}
       user: 
         description: Senaste dagboksinlÃ¤gg pÃ¥ OpenStreetMap frÃ¥n %{user}
+        title: OpenStreetMap dagboksinlÃ¤gg fÃ¶r anvÃ¤ndaren %{user}
     list: 
       in_language_title: DagbÃ¶cker pÃ¥ %{language}
       new: Ny dagboksanteckning
@@ -347,6 +358,7 @@ sv:
     new: 
       title: Ny dagboksanteckning
     no_such_entry: 
+      body: TyvÃ¤rr finns inget inlÃ¤gg med id %{id}. Kontrollera stavning eller sÃ¥ Ã¤r lÃ¤nken du klickade pÃ¥ felaktig.
       heading: "Ingen dagboksanteckning med id: %{id}"
       title: Ingen sÃ¥dan dagboksanteckning
     no_such_user: 
@@ -513,6 +525,7 @@ sv:
           pub: Pub
           public_building: Offentlig byggnad
           public_market: Marknadsplats
+          reception_area: Reception
           recycling: Ãtervinningsstation
           restaurant: Restaurang
           retirement_home: Ãldreboende
@@ -532,6 +545,7 @@ sv:
           university: Universitet
           vending_machine: Varumaskin
           veterinary: VeterinÃ¤r
+          village_hall: gemensamhetslokal
           waste_basket: Papperskorg
           wifi: WLAN-accesspunkt
           youth_centre: Ungdomscenter
@@ -539,11 +553,14 @@ sv:
           administrative: Administrativ grÃ¤ns
         building: 
           apartments: Flerfamiljshus
+          block: Byggblock
           bunker: Bunker
           chapel: Kapell
           church: Kyrka
           city_hall: RÃ¥dhus
+          commercial: Kommersiell byggnad
           dormitory: Studenthem
+          entrance: entrÃ©
           faculty: Fakultetsbyggnad
           farm: Ekonomibyggnad
           flats: LÃ¤genheter
@@ -554,6 +571,8 @@ sv:
           industrial: Industribyggnad
           office: Kontorsbyggnad
           public: Offentlig byggnad
+          residential: Bostadsbyggnad
+          retail: AffÃ¤rsbyggnad
           school: Skolbyggnad
           shop: AffÃ¤r
           stadium: Stadium
@@ -564,10 +583,12 @@ sv:
           university: Universitetsbyggnad
         highway: 
           bridleway: Ridstig
+          bus_guideway: SpÃ¥rbussvÃ¤g
           bus_stop: BusshÃ¥llplats
           byway: OmfartsvÃ¤g
           construction: VÃ¤g under konstruktion
           cycleway: CykelspÃ¥r
+          emergency_access_point: Utryckningsplats
           footway: GÃ¥ngvÃ¤g
           ford: VadstÃ¤lle
           gate: Grind
@@ -575,15 +596,25 @@ sv:
           minor: Mindre vÃ¤g
           motorway: MotorvÃ¤g
           motorway_junction: MotorvÃ¤gskorsning
+          motorway_link: PÃ¥fart/avfart till motorvÃ¤g
           path: Stig
           pedestrian: GÃ¥gata
           platform: Perrong
+          primary: RiksvÃ¤g (primÃ¤r vÃ¤g)
+          primary_link: PÃ¥fart till riksvÃ¤g
           raceway: TÃ¤vlingsbana
           residential: BostÃ¤der
           road: VÃ¤g
+          secondary: LÃ¤nsvÃ¤g (sekundÃ¤rvÃ¤g)
+          secondary_link: PÃ¥fart till lÃ¤nsvÃ¤g
           service: ServicevÃ¤g
+          services: Rastplats-vÃ¤g
           steps: Trappa
+          track: TraktorvÃ¤g
           trail: Vandringsled
+          trunk: Motortrafikled
+          trunk_link: PÃ¥fart till motortrafikled
+          unclassified: Oklassificerad vÃ¤g
           unsurfaced: Oasfalterad vÃ¤g
         historic: 
           archaeological_site: Arkeologisk plats
@@ -606,6 +637,7 @@ sv:
           allotments: Kolonilotter
           cemetery: Begravningsplats
           commercial: Kommersiellt omrÃ¥de
+          construction: Byggarbetsplats
           farm: BondgÃ¥rd
           farmland: Jordbruksmark
           farmyard: GÃ¥rdstun
@@ -763,6 +795,7 @@ sv:
           funeral_directors: BegravningsbyrÃ¥
           furniture: MÃ¶bler
           gallery: Galleri
+          garden_centre: TrÃ¤dgÃ¥rdshandel
           general: Landhandel
           gift: PresentaffÃ¤r
           greengrocer: GrÃ¶nsakshandlare
@@ -782,6 +815,7 @@ sv:
           newsagent: Tidningskiosk
           optician: Optiker
           organic: Ekologiska livsmedelsaffÃ¤r
+          outdoor: Friluftsbutik
           pet: DjuraffÃ¤r
           photo: FotoaffÃ¤r
           salon: Salong
@@ -818,6 +852,7 @@ sv:
         waterway: 
           boatyard: BÃ¥tvarv
           canal: Kanal
+          connector: FÃ¶rbindelsepunkt fÃ¶r farled
           dam: Damm
           derelict_canal: Nerlagd kanal
           ditch: Dike
@@ -847,6 +882,8 @@ sv:
       history_tooltip: Visa Ã¤ndringar fÃ¶r detta omrÃ¥de
       history_zoom_alert: Du mÃ¥ste zooma in fÃ¶r att kunna se karteringshistorik.
   layouts: 
+    community_blogs: Communitybloggar
+    community_blogs_title: Bloggar frÃ¥n OpenStreetMap-medlemmar
     copyright: UpphovsrÃ¤tt & licens
     documentation: Dokumentation
     documentation_title: Projektdokumentation
@@ -890,6 +927,7 @@ sv:
     osm_read_only: Det gÃ¥r bara att lÃ¤sa frÃ¥n OpenStreetMap-databasen just nu, dÃ¥ viktigt underhÃ¥ll utfÃ¶rs pÃ¥ databasen.
     sign_up: registrera
     sign_up_tooltip: Skapa ett konto fÃ¶r kartering
+    sotm2011: Kom till 2011 Ã¥rs OpenStreetMapkonferens, The State of the Map, 9:e -11:e september i Denver!
     tag_line: Den fria wiki-vÃ¤rldskartan
     user_diaries: AnvÃ¤ndardagbÃ¶cker
     user_diaries_tooltip: Visa anvÃ¤ndardagbÃ¶cker
@@ -972,6 +1010,7 @@ sv:
       delete_button: Radera
   notifier: 
     diary_comment_notification: 
+      header: "%{from_user} har lÃ¤mnat kommentar till ditt OpenStreetMap dagboksinlÃ¤gg med rubriken %{subject}:"
       hi: Hej %{to_user},
       subject: "[OpenStreetMap] %{user} kommenterade din dagboksanteckning"
     email_confirm: 
@@ -1026,6 +1065,7 @@ sv:
       more_videos_here: fler videor hÃ¤r
       video_to_openstreetmap: introduktionsvideo om OpenStreetMap
     signup_confirm_plain: 
+      ask_questions: "Du kan stÃ¤lla valfria frÃ¥gor om OpenStreetMap pÃ¥ vÃ¥r frÃ¥gesida:"
       click_the_link_1: Om detta Ã¤r du, vÃ¤lkommen! Klicka pÃ¥ lÃ¤nken nedan fÃ¶r att bekrÃ¤fta ditt
       click_the_link_2: konto och lÃ¤s vidare fÃ¶r mer information om OpenStreetMap.
       greeting: Hej dÃ¤r!
@@ -1069,6 +1109,7 @@ sv:
       support_notice: Vi stÃ¶djer HMAC-SHA1 (rekommenderas) sÃ¥vÃ¤l som oformaterad text i SSL-lÃ¤ge.
   site: 
     edit: 
+      anon_edits_link_text: Ta reda pÃ¥ varfÃ¶r det Ã¤r sÃ¥.
       flash_player_required: Du mÃ¥ste ha Flash fÃ¶r att kunna anvÃ¤nda Potatch, OpenStreetMaps flasheditor. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ladda hem Flash Player frÃ¥n Adobe.com</a>. Det finns <a href="http://wiki.openstreetmap.org/wiki/Editing">flera andra editorer</a> tillgÃ¤ngliga fÃ¶r OpenStreetMap.
       user_page_link: anvÃ¤ndarsida
     index: 
@@ -1082,6 +1123,7 @@ sv:
       shortlink: KortlÃ¤nk
     key: 
       map_key: Kartnyckel
+      map_key_tooltip: SymbolfÃ¶rklaring
       table: 
         entry: 
           admin: Administrativ grÃ¤ns
@@ -1090,6 +1132,7 @@ sv:
             - Flygplatsterminal
             - terminal
           bridge: Svarta kantar = bro
+          bridleway: Ridstig
           brownfield: FÃ¶rfallen industritomt
           building: Viktig byggnad
           cable: 
@@ -1103,6 +1146,7 @@ sv:
             - Ã¤ng
           construction: VÃ¤gar som byggs
           cycleway: CykelvÃ¤g
+          destination: FÃ¶rbjuden genomfart
           farm: BondgÃ¥rd
           footway: GÃ¥ngvÃ¤g
           forest: skog
@@ -1115,6 +1159,7 @@ sv:
           military: MilitÃ¤romrÃ¥de
           motorway: MotorvÃ¤g
           park: Park
+          permissive: Endast tilltrÃ¤de fÃ¶r behÃ¶riga
           pitch: Bollplan
           primary: RiksvÃ¤g
           private: Privat tillgÃ¥ng
@@ -1228,7 +1273,7 @@ sv:
       tags: Taggar
     trace_paging_nav: 
       next: NÃ¤sta Â»
-      previous: "Â« FÃ¶regÃ¥ende"
+      previous: Â« FÃ¶regÃ¥ende
       showing_page: Visar sida %{page}
     view: 
       delete_track: Radera detta spÃ¥r
@@ -1250,7 +1295,7 @@ sv:
       uploaded: "Uppladdad den:"
       visibility: "Synlighet:"
     visibility: 
-      identifiable: Indentifierbar (visas i GPS-spÃ¥rlistan och som identifierbara, ordnade punkter med tidsstÃ¤mpel)
+      identifiable: Identifierbar (visas i GPS-spÃ¥rlistan och som ordnade punkter med tidsstÃ¤mpel)
       private: Privat (spÃ¥ret delas anonymt och utan ordning)
       public: Publik (visas i GPS-spÃ¥rlistan och som anonyma punkter utan ordning)
       trackable: SpÃ¥rbar (delas bara som anonyma ordnade punker med tidsstÃ¤mpel)
@@ -1258,6 +1303,7 @@ sv:
     account: 
       contributor terms: 
         agreed: Du har godkÃ¤nt de nya bidragsgivarvillkoren.
+        heading: "AnvÃ¤ndarvillkor:"
         link text: vad Ã¤r detta?
         not yet agreed: Du har Ã¤nnu inte godkÃ¤nt de nya bidragsgivarvillkoren.
       current email address: "Nuvarande E-postadress:"
@@ -1279,6 +1325,7 @@ sv:
       openid: 
         link text: vad Ã¤r detta?
         openid: "OpenID:"
+      preferred editor: "Ãnskat redigeringsprogram:"
       preferred languages: "FÃ¶redraget sprÃ¥k:"
       profile description: "Profilbeskrivning:"
       public editing: 
@@ -1297,6 +1344,7 @@ sv:
       title: Redigera konto
       update home location on click: Uppdatera hemplatsen nÃ¤r jag klickar pÃ¥ kartan?
     confirm: 
+      before you start: "Vi vet att du knappt kan bÃ¤rga dig med att komma igÃ¥ng att bÃ¶rja mappa, men fÃ¶rst fÃ¥r du gÃ¤rna fylla i mer information om dig sjÃ¤lv i nedanstÃ¥ende formulÃ¤r:"
       button: BekrÃ¤fta
       heading: BekrÃ¤fta ett anvÃ¤ndarkonto.
       press confirm button: Klicka bekrÃ¤ftelseknappen nedan fÃ¶r att aktivera ditt konto.
@@ -1326,6 +1374,7 @@ sv:
       title: AnvÃ¤ndare
     login: 
       account not active: Ditt konto Ã¤r inte aktivterat.<br />VÃ¤nligen klicka pÃ¥ lÃ¤nken i e-brevet med kontobekrÃ¤ftelsen fÃ¶r att aktivera ditt konto, eller <a href="%{reconfirm}">begÃ¤r ett nytt bekrÃ¤ftelsebrev</a>.
+      account suspended: Beklagar, ditt konto har stÃ¤ngts av pÃ¥ grund av misstÃ¤nkt otillÃ¥ten aktivitet. <br />Kontakta %{webmaster} om du vill fÃ¶ra en diskussion kring detta.
       auth failure: Kunde inte logga in med de uppgifterna.
       create account minute: Skapa ett konto. Det tar bara en minut.
       email or username: "E-postadress eller anvÃ¤ndarnamn:"
@@ -1362,6 +1411,8 @@ sv:
       title: Logga in
       to make changes: FÃ¶r att gÃ¶ra Ã¤ndringar i OpenStreetMaps data mÃ¥ste du ha ett konto.
       webmaster: webmaster
+      with openid: "Du kan Ã¤ven anvÃ¤nda ditt OpenID-konto fÃ¶r att logga in:"
+      with username: "Har du redan ett OpenStreetMap konto? Logga in med ditt anvÃ¤ndarnamn och lÃ¶senord:"
     logout: 
       heading: Logga ut frÃ¥n OpenStreetMap
       logout_button: Logga ut
@@ -1396,6 +1447,7 @@ sv:
       openid association: "<p>Ditt OpenID Ã¤r Ã¤nnu inte associerad med ett OpenStreetMap konto</p>\n<ul>\n<li>Om du Ã¤r ny pÃ¥ OpenStreetMap, skapa ett nytt konto med hjÃ¤lp av formulÃ¤ret nedan.</li>\n<li>\n   Om du redan har ett konto kan du logga in till ditt konto pÃ¥ vanligt sÃ¤tt\n   med hjÃ¤lp av ditt anvÃ¤ndarnamn och lÃ¶senord, fÃ¶r att sedan associera kontot\n   med ditt OpenID i anvÃ¤ndarinstÃ¤llningarna.\n</li>\n</ul>"
       password: "LÃ¶senord:"
       terms accepted: Tack fÃ¶r att du accepterar de nya vilkoren fÃ¶r bidrag till kartan
+      terms declined: Vi beklagar att du bestÃ¤mt dig fÃ¶r att inte acceptera de nya anvÃ¤ndarvillkoren. FÃ¶r mer information, se <a href="%{url}">denna wikisida</a>.
       title: Skapa konto
     no_such_user: 
       body: Det finns ingen anvÃ¤ndare med namnet %{user}. Kontrollera stavningen eller kanske lÃ¤nken Ã¤r trasig.
@@ -1459,7 +1511,7 @@ sv:
       moderator_history: visa tilldelade blockeringar
       my diary: min dagbok
       my edits: mina redigeringar
-      my settings: Mina instÃ¤llningar
+      my settings: mina instÃ¤llningar
       my traces: mina GPS-spÃ¥r
       nearby users: Andra anvÃ¤ndare nÃ¤ra dig
       new diary entry: nytt dagboksinlÃ¤gg
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index c1f1157ec..1e8114d30 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -260,7 +260,7 @@ tl:
       view_changeset_details: Tingnan ang mga detalye ng pangkat ng pagbabago
     changeset_paging_nav: 
       next: Kasunod Â»
-      previous: "Â« Nakaraan"
+      previous: Â« Nakaraan
       showing_page: Ipinapakita ang pahinang %{page}
     changesets: 
       area: Pook
@@ -1337,7 +1337,7 @@ tl:
       tags: Mga tatak
     trace_paging_nav: 
       next: Susunod Â»
-      previous: "Â« Nakaraan"
+      previous: Â« Nakaraan
       showing_page: Ipinapakita ang pahinang %{page}
     view: 
       delete_track: Burahin ang bakas na ito
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ff96c17d5..4d916f36c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -229,7 +229,7 @@ tr:
       view_changeset_details: DeÄiÅiklik setleri ayrÄ±ntÄ±lÄ± gÃ¶rÃ¼ntÃ¼le
     changeset_paging_nav: 
       next: Sonraki Â»
-      previous: "Â« Ãnceki"
+      previous: Â« Ãnceki
       showing_page: "GÃ¶sterilen sayfa: %{page}"
     changesets: 
       area: Alan
@@ -1139,8 +1139,8 @@ tr:
     trace_optionals: 
       tags: Etiketler
     trace_paging_nav: 
-      next: "Sonraki Â»"
-      previous: "Â« Ãnceki"
+      next: Sonraki Â»
+      previous: Â« Ãnceki
       showing_page: Sayfa %{page} gÃ¶rÃ¼ntÃ¼leniyor
     view: 
       delete_track: Bu izi sil
@@ -1382,4 +1382,3 @@ tr:
       confirm: Onayla
     revoke: 
       confirm: Onayla
-
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7c03a04b4..a71d65023 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,6 +1,7 @@
 # Messages for Simplified Chinese (âªä¸­æ(ç®ä½)â¬)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Anakmalaysia
 # Author: Hydra
 # Author: Liangent
 # Author: Mmyangfl
@@ -140,10 +141,10 @@ zh-CN:
       paging: 
         all: 
           next: "%{id} Â»"
-          prev: "Â« %{id}"
+          prev: Â« %{id}
         user: 
           next: "%{id} Â»"
-          prev: "Â« %{id}"
+          prev: Â« %{id}
       user: 
         name_changeset_tooltip: æ¥ç %{user} çç¼è¾
         next_changeset_tooltip: ä¸ä¸ä¸ª %{user} çç¼è¾
@@ -275,7 +276,7 @@ zh-CN:
       view_changeset_details: æ¥çè¯¦ç»åæ´
     changeset_paging_nav: 
       next: ä¸ä¸é¡µ Â»
-      previous: "Â« ä¸ä¸é¡µ"
+      previous: Â« ä¸ä¸é¡µ
       showing_page: æ¾ç¤ºç¬¬ %{page} é¡µ
     changesets: 
       area: åºå
@@ -648,7 +649,7 @@ zh-CN:
           farmyard: åå®¶åº­é¢
           forest: æ£®æ
           grass: èå°
-          greenfield: æ£è²å°å¸¦
+          greenfield: ç»¿è²å°å¸¦
           industrial: å·¥ä¸åº
           landfill: åå¾å¡«ååº
           meadow: èç¸
@@ -1388,7 +1389,7 @@ zh-CN:
       tags: æ ç­¾
     trace_paging_nav: 
       next: ä¸ä¸é¡µ Â»
-      previous: "Â« ä¸ä¸é¡µ"
+      previous: Â« ä¸ä¸é¡µ
       showing_page: æ¾ç¤ºç¬¬ %{page} é¡µ
     view: 
       delete_track: å é¤è¿æ¡è½¨è¿¹
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d30bdc8ae..f3885813b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,6 +1,7 @@
 # Messages for Traditional Chinese (âªä¸­æ(ç¹é«)â¬)
 # Exported from translatewiki.net
 # Export driver: syck-pecl
+# Author: Anakmalaysia
 # Author: Mmyangfl
 # Author: Pesder
 # Author: Wrightbus
@@ -264,7 +265,7 @@ zh-TW:
       view_changeset_details: æª¢è¦è®æ´çµåè©³ç´°è³è¨
     changeset_paging_nav: 
       next: ä¸ä¸é  Â»
-      previous: "Â« ä¸ä¸é "
+      previous: Â« ä¸ä¸é 
       showing_page: æ­£å¨é¡¯ç¤ºç¬¬ %{page} é 
     changesets: 
       area: åå
@@ -298,7 +299,7 @@ zh-TW:
         other: "%{count} åè©è«"
       comment_link: å°éåé ç®çè©è«
       confirm: ç¢ºèª
-      edit_link: ç·¨è¼¯éåé ç®
+      edit_link: ç·¨è¼¯æ­¤é ç®
       hide_link: é±èæ­¤é ç®
       posted_by: ç± %{link_user} æ¼ %{created} ä»¥ %{language_link} å¼µè²¼
       reply_link: åè¦éåé ç®
@@ -845,7 +846,7 @@ zh-TW:
       shortlink: ç°¡ç­é£çµ
     key: 
       map_key: åä¾
-      map_key_tooltip: å¨éåç¸®æ¾ç­ç´æé¡¯ç¤ºçåä¾
+      map_key_tooltip: å°åçåä¾
       table: 
         entry: 
           admin: è¡æ¿åéç
@@ -986,7 +987,7 @@ zh-TW:
       tags: æ¨ç±¤
     trace_paging_nav: 
       next: ä¸ä¸é  Â»
-      previous: "Â« ä¸ä¸é "
+      previous: Â« ä¸ä¸é 
       showing_page: é¡¯ç¤ºé é¢ %{page}
     view: 
       delete_track: åªé¤éåè»è·¡