X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3fb931f9a86955faa39bec1fa4f2a731cbc74780..ed75d4710b0d4aec2c57f610083762d6fd63e9c9:/config/locales/he.yml

diff --git a/config/locales/he.yml b/config/locales/he.yml
index ccb059e78..35a9290ab 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3,15 +3,24 @@
 # Export driver: syck-pecl
 # Author: Amire80
 # Author: Aude
+# Author: Dekel E
 # Author: Deror avi
 # Author: Ex-Diktator
+# Author: ExampleTomer
 # Author: GilCahana
 # Author: Inkbug
 # Author: Itay naor
+# Author: Metraduk
 # Author: Nemo bis
+# Author: Orsa
 # Author: YaronSh
+# Author: Yona b
 # Author: ×ª×××¨ ×
 he: 
+  about_page: 
+    local_knowledge_title: ×××¢ ××§×××
+    next: ×××
+    partners_title: ×©××ª×¤××
   activerecord: 
     attributes: 
       diary_comment: 
@@ -20,7 +29,7 @@ he:
         language: ×©×¤×
         latitude: ×§× ×¨×××
         longitude: ×§× ×××¨×
-        title: ×××ª×¨×ª
+        title: × ××©×
         user: ××©×ª××©
       friend: 
         friend: ×××¨
@@ -29,7 +38,7 @@ he:
         body: ×××£
         recipient: × ××¢×
         sender: ×©×××
-        title: ×××ª×¨×ª
+        title: × ××©×
       trace: 
         description: ×ª××××¨
         latitude: ×§× ×¨×××
@@ -89,83 +98,38 @@ he:
       blocked: ×××©×ª× ×Ö¾API × ××¡××. × × ××××× ×¡ ××××©×§ ×××× ×××××¢ × ××¡×£.
       need_to_see_terms: ×××©×ª× ×Ö¾API ×××©×¢××ª ××× ××ª. × × ××××× ×¡ ×××ª×¨ ××× ××¦×¤××ª ××ª× ×× ××ª×¨×××. ××× ×¦××¨× ××§×× ×××ª×, ××× ×××× ×××¦×× ×××ª×.
   browse: 
+    anonymous: ××××× ×
     changeset: 
-      changeset: "×¢×¨××ª ×©×× ××××: %{id}"
+      belongs_to: ×××¦×¨
       changesetxml: XML ×©× ×¢×¨××ª ×©×× ××××
       feed: 
         title: ×¢×¨××ª ×©×× ×××× %{id}
         title_comment: ×¢×¨××ª ×©×× ×××× %{id} â %{comment}
+      node: ×¦××ª×× (%{count})
+      node_paginated: ×¦××ª×× (%{x}â%{y} ××ª×× %{count})
       osmchangexml: osmChange XML
-      title: ×¢×¨××ª ×©×× ××××
-    changeset_details: 
-      belongs_to: "×©××××ª ×:"
-      bounding_box: "×ª××× ×ª××××ª:"
-      box: ×ª×××
-      closed_at: "× ×¡××¨× ×:"
-      created_at: "× ××¦×¨ ××ª××¨××:"
-      has_nodes: 
-        one: "×××××§ ××¦×××ª ×××:"
-        other: "×××××§ ×Ö¾%{count} ×¦××ª××:"
-      has_relations: 
-        one: "×××××§ ××××¡ ×××:"
-        other: "×××××§ ×Ö¾%{count} ×××¡××:"
-      has_ways: 
-        one: "×××××§ ×××¨× ×××ª:"
-        other: "×××××§ ×Ö¾%{count} ××¨×××:"
-      no_bounding_box: ×× × ×©××¨× ×ª××× ×ª××××ª ×¢×××¨ ×¢×¨××ª ××©×× ×××× ××××ª.
-      show_area_box: ××¦××ª ×ª×××ª ××××¨
-    common_details: 
-      changeset_comment: "××¢×¨×:"
-      deleted_at: "× ×××§ ×:"
-      deleted_by: "× ×××§ ×¢×Ö¾×××:"
-      edited_at: "× ×¢×¨× ×:"
-      edited_by: "× ×¢×¨× ×¢×Ö¾×××:"
-      in_changeset: "××¢×¨××ª ××©×× ××××:"
-      version: "××¨×¡×:"
+      relation: ×××¡×× (%{count})
+      relation_paginated: ×××¡×× (%{x}â%{y} ××ª×× %{count})
+      title: "×¢×¨××ª ×©×× ××××: %{id}"
+      way: ××¨××× (%{count})
+      way_paginated: ××¨××× (%{x}â%{y} ××ª×× %{count})
+    closed: × ×¡××¨
+    closed_by_html: × ×¡××¨ <abbr title='%{title}'> ××¤× × %{time}</abbr> ×¢× ××× %{user}
+    closed_html: × ×¡××¨ <abbr title='%{title}'> ××¤× × %{time}</abbr>
     containing_relation: 
       entry: ×××¡ %{relation_name}
       entry_role: ×××¡ %{relation_name} (××ª××¨ %{relation_role})
-    map: 
-      deleted: × ×××§
-      edit: 
-        area: ×¢×¨×××ª ××××¨
-        node: ×¢×¨×××ª ×¦×××ª
-        relation: ×¢×¨×××ª ×××¡
-        way: ×¢×¨×××ª ××¨×
-      larger: 
-        area: ×¦×¤××× ××©×× ×××¤× ××××× ×××ª×¨
-        node: ×¦×¤××× ××¦×××ª ×××¤× ××××× ×××ª×¨
-        relation: ×¦×¤××× ××××¡ ×××¤× ××××× ×××ª×¨
-        way: ×¦×¤××× ×××¨× ×××¤× ××××× ×××ª×¨
-      loading: ×××¢×× ×...
-    navigation: 
-      all: 
-        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}
+    created: × ××¦×¨
+    created_by_html: × ××¦×¨ <abbr title='%{title}'> ××¤× × %{time}</abbr> ×¢× ××× %{user}
+    created_html: × ××¦×¨ <abbr title='%{title}'> ××¤× × %{time}</abbr>
+    deleted_by_html: × ×××§ <abbr title='%{title}'> ××¤× × %{time}</abbr> ×¢× ××× %{user}
+    download_xml: ×××¨××ª XML
+    edited_by_html: × ×¢×¨× <abbr title='%{title}'> ××¤× × %{time}</abbr> ×¢× ××× %{user}
+    in_changeset: ×¢×¨××ª ×©×× ××××
+    no_comment: (××× ××¢×¨××ª)
     node: 
-      download_xml: ×××¨××ª XML
-      edit: ×¢×¨×××ª ×¦×××ª
-      node: ×¦×××ª
-      node_title: "×¦×××ª: %{node_name}"
-      view_history: ×¦×¤××× ××××¡×××¨××
-    node_details: 
-      coordinates: "× ×§××××ª ×¦×××:"
-      part_of: "×××§ ××ª××:"
-    node_history: 
-      download_xml: ×××¨××ª XML
-      node_history: ×××¡×××¨×××ª ××¦×××ª
-      node_history_title: "×××¡×××¨×××ª ××¦×××ª: %{node_name}"
-      view_details: ×¦×¤××× ××¤×¨×××
+      history_title: "×××¡×××¨×××ª ××¦×××ª: %{name}"
+      title: "×¦×××ª: %{name}"
     not_found: 
       sorry: ×× × ××ª× ×¦×××, ×× ××¡×× %{type} ××¢× ××××× %{id} ×× × ××¦×.
       type: 
@@ -173,9 +137,13 @@ he:
         node: ×¦×××ª
         relation: ×××¡
         way: ××¨×
-    paging_nav: 
-      of: ××ª××
-      showing_page: ××¦××ª ××£
+    note: 
+      closed_title: ××¢×¨× ×¤×ª××¨× ××¡' %{note_name}
+      hidden_title: ××¢×¨× ×××¡×ª×¨×ª ××¡' %{note_name}
+      new_note: ××¢×¨× ×××©×
+      open_title: ××¢×¨× ×©×× × ×¤×ª×¨× ××¡' %{note_name}
+      title: ××¢×¨×
+    part_of: ×××§ ××ª××
     redacted: 
       message_html: "×× × ××ª× ×××¦×× ××ª ×××¨×¡× %{version} ×©× %{type} ×××××× ×©××× × ××ª××. ×××××¢ × ××¡×£: %{redaction_link}."
       redaction: ×××ª×× %{id}
@@ -184,63 +152,18 @@ he:
         relation: ×××¡
         way: ××¨×
     relation: 
-      download_xml: ×××¨××ª XML
-      relation: ×××¡
-      relation_title: "×××¡: %{relation_name}"
-      view_history: ×¦×¤××× ××××¡×××¨××
-    relation_details: 
-      members: "××××¨××:"
-      part_of: "×××§ ××ª××:"
-    relation_history: 
-      download_xml: ×××¨××ª XML
-      relation_history: ×××¡×××¨×××ª ××××¡
-      relation_history_title: "×××¡×××¨×××ª ××××¡: %{relation_name}"
-      view_details: ×¦×¤××× ××¤×¨×××
+      members: ×××¨××
     relation_member: 
       entry_role: "%{type} %{name} ××ª××¨ %{role}"
       type: 
         node: ×¦×××ª
         relation: ×××¡
         way: ××¨×
-    start: 
-      manually_select: ××××¨× ××× ××ª ×××××¨ ×××¨
-      view_data: ××¦×¤××× ×××××¢ ×¢×××¨ ××ª×¦××× ×× ×××××ª ×©× ×××¤×
     start_rjs: 
-      data_frame_title: × ×ª×× ××
-      data_layer_name: ×¢××× ×× ×ª×× × ××¤×
-      details: ×¤×¨×××
-      drag_a_box: × × ×××¨××¨ ××ª ××ª××× ×¢× ×××¤× ××× ×××××¨ ××××¨
-      edited_by_user_at_timestamp: × ×¢×¨× ×¢×Ö¾××× %{user} ×Ö¾%{timestamp}
-      hide_areas: ×××¡×ª×¨×ª ××××¨××
-      history_for_feature: ××××¡×××¨×× ×©× %{feature}
       load_data: ××¢×× ×ª × ×ª×× ××
-      loaded_an_area_with_num_features: "×××××¨ ×©× ××¢× ×××× %{num_features} ×ª××× ××ª. ××××¤× ××××, ×××§ ××××¤××¤× ×× ×× ××××× ×××ª×××× ×¢× ××¦×× ×©× ××× ××××ª ×©× × ×ª×× ××. ××¨××, ××¤××¤× ×× ×¢××××× ××××¤× ××××× ×××¦××ª ×¤×××ª ×Ö¾%{max_features} ×ª××× ××ª ××Ö¾××× ××ª: ×××¦××¢ ××©××××ª × ××¡×¤××ª ×¢××× ×××¨×× ×××¤××¤× ××¤×¢×× ××××¤× ×××× ×× ××××ª×§×¢. ×× ××¨×¦×× × ××× ×××ª ×××¦×× ××××¢ ××, ×××¤×©×¨××ª× ×××¦×× ×××ª× ×××××¦× ×¢× ×××¤×ª××¨ ××××."
       loading: ×××¢×× ×...
-      manually_select: ××××¨×ª ××××¨ ×××¨ ××× ××ª
-      object_list: 
-        api: ×××××¨ ××××¨ ×× ××Ö¾API
-        back: ××¦××ª ×¨×©×××ª ××¤×¨××××
-        details: ×¤×¨×××
-        heading: ×¨×©×××ª ×¤×¨××××
-        history: 
-          type: 
-            node: ×¦×××ª %{id}
-            way: ××¨× %{id}
-        selected: 
-          type: 
-            node: ×¦×××ª %{id}
-            way: ××¨× %{id}
-        type: 
-          node: ×¦×××ª
-          way: ××¨×
-      private_user: ××©×ª××© ×¤×¨××
-      show_areas: ×××¦××ª ××××¨××
-      show_history: ××¦××ª ××××¡×××¨××
-      unable_to_load_size: "×× × ××ª× ×××¢××: ×ª××× ×ª××××ª ××××× %{bbox_size} ××× ××××× ××× (××××¨×× ×××××ª ×§×× × ×××©×¨ %{max_bbox_size})"
-      wait: × × ××××ª××...
-      zoom_or_select: ××ª×§×¨×××ª ×× ××××¨× ××××¨ ×××¤× ××¦×¤×××
     tag_details: 
-      tags: "×ª×××:"
+      tags: ×ª×××
       wiki_link: 
         key: ×¢××× ××ª××××¨ ×¢×××¨ ××ª× %{key}
         tag: ×¢××× ××ª××××¨ ×¢×××¨ ××ª× %{key}=%{value}
@@ -252,36 +175,22 @@ he:
         node: ×¦×××ª
         relation: ×§×©×¨
         way: ××¨×
+    version: ××¨×¡×
+    view_details: ××¦××ª ×¤×¨×××
+    view_history: ××¦××ª ××××¡×××¨××
     way: 
-      download_xml: ×××¨××ª XML
-      edit: ×¢×¨×××ª ××¨×
-      view_history: ×¦×¤××× ××××¡×××¨××
-      way: ××¨×
-      way_title: "××¨×: %{way_name}"
-    way_details: 
-      also_part_of: 
-        one: ×× ×× ×××§ ××××¨× %{related_ways}
-        other: ×× ×× ×××§ ××××¨××× %{related_ways}
-      nodes: "×¦××ª××:"
-      part_of: "×××§ ××ª××:"
-    way_history: 
-      download_xml: ×××¨××ª XML
-      view_details: ×¦×¤××× ××¤×¨×××
-      way_history: ×××¡×××¨×××ª ×××¨×
-      way_history_title: "×××¡×××¨×××ª ×××¨×: %{way_name}"
+      history_title: "×××¡×××¨×××ª ×××¨×: %{name}"
+      nodes: ×¦××ª××
+      title: "××¨×: %{name}"
   changeset: 
     changeset: 
       anonymous: ××××× ×
-      big_area: (××××)
-      no_comment: (×××)
       no_edits: (××× ×¢×¨××××ª)
-      show_area_box: ××¦××ª ×ª×××ª ××××¨
-      still_editing: (×¢×××× ××¢×¨×××)
       view_changeset_details: ××¦××ª ×¤×¨×× ×¢×¨××ª ×©×× ××××
     changeset_paging_nav: 
       next: ××× Â»
       previous: Â« ××§×××
-      showing_page: ××¦××ª ×××£ %{page}
+      showing_page: ×××£ %{page}
     changesets: 
       area: ×©××
       comment: ××¢×¨×
@@ -289,26 +198,12 @@ he:
       saved_at: "× ×©××¨× ×:"
       user: ××©×ª××©
     list: 
-      description: ×©×× ×××× ×××¨×× ××
-      description_bbox: ×¢×¨×××ª ×©×× ×××× ××ª×× %{bbox}
-      description_friend: ×¢×¨×××ª ×©×× ×××× ×©× ×××¨×× ×©×××
-      description_nearby: ×¢×¨×××ª ×©×× ×××× ×©× ××©×ª××©×× ××¡××××
-      description_user: ×¢×¨×××ª ×©×× ×××× ×©× %{user}
-      description_user_bbox: ×¢×¨×××ª ×©×× ×××× ×©× %{user} ××ª×× %{bbox}
-      empty_anon_html: ×¢×× ×× × ×¢×©× ×¢×¨××××ª
-      empty_user_html: × ×¨×× ×©×¢×× ×× ×¢×¨××ª ×××¨. ××× ×××ª×××, ×¨' <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>×××¨×× ×××ª×××××</a>.
-      heading: ×¢×¨×××ª ×©×× ××××
-      heading_bbox: ×¢×¨×××ª ×©×× ××××
-      heading_friend: ×¢×¨×××ª ×©×× ××××
-      heading_nearby: ×¢×¨×××ª ×©×× ××××
-      heading_user: ×¢×¨×××ª ×©×× ××××
-      heading_user_bbox: ×¢×¨×××ª ×©×× ××××
+      empty: ×× × ××¦×× ×¡××¨×ª ×©×× ××××
+      load_more: ××¢× ×¢××
       title: ×¢×¨×××ª ×©×× ××××
-      title_bbox: ×¢×¨×××ª ×©×× ×××× ××ª×× %{bbox}
       title_friend: ×¢×¨×××ª ×©×× ×××× ×©× ××××¨×× ×©××
       title_nearby: ×¢×¨×××ª ×©×× ×××× ×©× ××©×ª××©×× ××¡××××
       title_user: ×¢×¨×××ª ×©×× ×××× ×©× %{user}
-      title_user_bbox: ×¢×¨×××ª ×©×× ×××× ×©× %{user} ××ª×× %{bbox}
     timeout: 
       sorry: ×¡××××, ×××§× ×××ª×¨ ××× ××× ×××××¨ ×¢× ×¨×©×××ª ×¢×¨×××ª ××©×× ×××× ×©×××§×©×ª.
   diary_entry: 
@@ -328,6 +223,7 @@ he:
       comment_count: 
         one: ×ª×××× ×××ª
         other: "%{count} ×ª×××××ª"
+        zero: ××× ×ª×××××ª
       comment_link: ××¢×¨××ª ××¨×©××× ××××ª
       confirm: ××××©××¨
       edit_link: ×¢×¨×××ª ×¨×©×××
@@ -362,7 +258,7 @@ he:
       newer_entries: ×¨×©××××ª ×××©××ª ×××ª×¨
       no_entries: ××× ×¨×©××××ª ××××
       older_entries: ×¨×©××××ª ××©× ××ª ×××ª×¨
-      recent_entries: "×¨×©××××ª ×××× ×××¨×× ××ª:"
+      recent_entries: ×¨×©××××ª ×××× ×××¨×× ××ª
       title: ×××× ×× ×©× ×××©×ª××©
       title_friends: ×××× ×× ×©× ×××¨××
       title_nearby: ×××× ×× ×©× ××©×ª××©×× ××¡××××
@@ -386,6 +282,9 @@ he:
       user_title: ××××× ×©× %{user}â
   editor: 
     default: ××¨×¨×ª ×××× (××¢×ª %{name})
+    id: 
+      description: iD (×¢××¨× ××ª×× ×××¤××¤×)
+      name: iD
     potlatch: 
       description: Potlatch 1 (×¢××¨× ××ª×× ×××¤××¤×)
       name: Potlatch 1
@@ -417,17 +316,29 @@ he:
       paste_html: ××××××§ HTML ×××××¢× ×××ª×¨
       scale: ×§× × ××××
       too_large: 
-        body: ×××××¨ ×××× ×××× ×©××¤×©×¨ ×××× ××××¦× ×××ª× ××ª××¨ × ×ª×× × XML ×©× OpenStreetMap. × × ×××ª×§×¨× ×× ×××××¨ ××××¨ ×§×× ×××ª×¨.
-        heading: ×××××¨ ×××× ×××
+        body: "×××××¨ ×××× ×××× ×©××¤×©×¨ ×××× ××××¦× ×××ª× ××ª××¨ × ×ª×× × XML ×©× OpenStreetMap. × × ×××ª×§×¨× ×× ×××××¨ ××××¨ ×§×× ×××ª×¨, ×× ×××©×ª××© ×××§××¨××ª ××××× ××©××× ×××¨×××ª × ×ª×× ×× ××××××ª:"
+        geofabrik: 
+          description: ×¢××ª×§×× ××¢×××× ×× ××××¤× ×§×××¢ ×©× ×××©××ª, ×××× ××ª ××¢×¨×× × ×××¨××ª
+          title: ×××¨×××ª ×©× Geofabrik
+        metro: 
+          description: ××××××ª ×××§×××ª ××¢×¨×× ×¢××××××ª ××××××ª ×××××¨×× ××¡××××ª×
+          title: ××××××ª ×××¨×
+        other: 
+          description: ××§××¨××ª × ××¡×¤×× ×¨×©×××× ×××××§× ×©× OpenStreetMap
+          title: ××§××¨××ª ×××¨××
+        planet: 
+          description: ×¢××ª×§×× ××¢×××× ×× ××××¤× ×§×××¢ ×©× ×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap
+          title: ×¤××× × OSM
       zoom: ××¨××§ ××ª×¦×××
-    start_rjs: 
-      add_marker: ×××¡×¤×ª ×¡×× ×××¤×
-      change_marker: ×©×× ×× ×××§×× ×¡××
-      click_add_marker: ×××¦× ×¢× ×××¤× ××××¡×¤×ª ×¡××
-      drag_a_box: × × ×××¨××¨ ×××× ×¢× ×××¤× ×××××¨×ª ××××¨
-      export: ×××¦××
-      manually_select: ××××¨× ××× ××ª ×©× ××××¨ ×××¨
-      view_larger_map: ××¦×¤××× ×××¤× ××××× ×××ª×¨
+    title: ×××¦××
+  fixthemap: 
+    how_to_help: 
+      join_the_community: 
+        title: ×××¦××¨×£ ××§××××
+      title: ××× × ××ª× ××¢×××¨
+    other_concerns: 
+      title: ×××××ª ×××¨××ª
+    title: ×××× ×¢× ××¢×× / ×ª×§× ××ª ×××¤×
   geocoder: 
     description: 
       title: 
@@ -457,12 +368,26 @@ he:
       title: 
         ca_postcode: ×ª××¦×××ª ×××ª×¨ <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: ×ª××¦×××ª ×××ª×¨ <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse: ×ª××¦×××ª ×Ö¾<a href="http://www.geonames.org/">GeoNames</a>
         latlon: ×ª××¦×××ª ×<a href="http://openstreetmap.org/">××ª×¨ ××</a>
         osm_nominatim: ×ª××¦×××ª ×××ª×¨ <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+        osm_nominatim_reverse: ×ª××¦×××ª ×Ö¾<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_nominatim: 
+      admin_levels: 
+        level10: ×××× ××¤×¨××¨
+        level2: ×××× ××××× ×
+        level4: ×××× ××××× ×
+        level5: ×××× ×××××¨
+        level6: ×××× ×××××
+        level8: ×××× ××¢××¨
+        level9: ×××× ×××¤×¨
       prefix: 
+        aerialway: 
+          chair_lift: ××¢×××ª ×¡×§× ×××©×××
+          drag_lift: ××¢×××ª ×¡×§× ×××¨××¨×
+          station: ×ª×× ×ª ×¨×××
         aeroway: 
           aerodrome: ×× ××ª
           apron: ×¨×××ª ×× ××
@@ -556,6 +481,7 @@ he:
           shower: ××§×××ª
           social_centre: ××¨×× ×××¨×ª×
           social_club: ×××¢×××
+          social_facility: ××ª×§× ×××¨×ª×
           studio: ×¡×××××
           supermarket: ×¡××¤×¨××¨×§×
           swimming_pool: ××¨Öµ××ª ×©××××
@@ -584,6 +510,9 @@ he:
           "yes": ××©×¨
         building: 
           "yes": ×× ×××
+        emergency: 
+          fire_hydrant: ××¨× ××××× ××©
+          phone: ×××¤×× ×××¨××
         highway: 
           bridleway: ×©××× ×¢×××¨ ×¡××¡××
           bus_guideway: × ×ª×× ×ª××××¨× ×¦××××¨××ª ××× ×××ª
@@ -605,6 +534,7 @@ he:
           platform: ×¤×××¤××¨××
           primary: ××¨× ×¨××©××ª
           primary_link: ××××© ×¨××©×
+          proposed: ××××© ×××¦×¢
           raceway: ××¡××× ××¨××¦××
           residential: ××××¨××
           rest_area: ××××¨ ×× ×××
@@ -616,6 +546,7 @@ he:
           speed_camera: ××¦×××ª ××××¨××ª
           steps: ×××¨×××ª
           stile: ××¢××¨ ××¢× ×××¨
+          street_lamp: ×¤× ×¡ ×¨×××
           tertiary: ××¨× ×¦×××ª
           tertiary_link: ××¨× ×©×××©×× ××ª
           track: ××¡××× ××¨××¦××
@@ -631,6 +562,7 @@ he:
           building: ×× ×××
           castle: ×××¨×
           church: ×× ×¡×××
+          citywalls: ×××××ª ××¢××¨
           fort: ××¢××
           house: ×××ª
           icon: ×××§×× ××
@@ -640,6 +572,7 @@ he:
           monument: ×× ××¨××
           museum: ×××××××
           ruins: ××¨××¡××ª
+          tomb: ×§××¨
           tower: ××××
           wayside_cross: ×¦×× ××¦× ×××¨×
           wayside_shrine: ××§××© ××¦× ×××¨×
@@ -707,6 +640,8 @@ he:
           airfield: ×× ××ª ×¦×××
           barracks: ××××¨× ××××××
           bunker: ××× ×§×¨
+        mountain_pass: 
+          "yes": ××¢××¨ ××¨×¨×
         natural: 
           bay: ××¤×¨×¥
           beach: ×××£ ×¨××¦×
@@ -776,6 +711,7 @@ he:
           locality: ×××©××
           moor: ××××ª ××××
           municipality: ×¢××¨×××
+          neighbourhood: ×©××× ×
           postcode: ×××§××
           region: ××××¨
           sea: ××
@@ -801,8 +737,10 @@ he:
           narrow_gauge: ××¡×××ª ×¨×××ª ×¦×¨×
           platform: ×¨×¦××£ ×¨×××ª
           preserved: ×¨×××ª ××©×××¨×ª
+          proposed: ×¤×¡× ×¨×××ª ×××¦×¢××
           spur: ×©××××ª ××¡×××ª ××¨××
           station: ×ª×× ×ª ×¨×××ª
+          stop: ×ª×× ×ª ×¨×××ª
           subway: ×ª×× ×ª ×¨×××ª ×ª××ª××ª
           subway_entrance: ×× ××¡× ××ª×× ×ª ×¨×××ª ×ª××ª××ª
           switch: × ×§××××ª ××¡×××ª ××¨××
@@ -818,6 +756,7 @@ he:
           beverages: ×× ××ª ××©×§×××ª
           bicycle: ×× ××ª ××¤× ×××
           books: ×× ××ª ×¡×¤×¨××
+          boutique: ×××××§
           butcher: ×§×¦×
           car: ×× ××ª ××× ×¨××
           car_parts: ×××§× ×¨××
@@ -831,6 +770,7 @@ he:
           convenience: ×××××ª
           copyshop: ×× ××ª ×¦××××
           cosmetics: ×× ××ª ×§××¡××××§×
+          deli: ××¢×× ×××
           department_store: ××××
           discount: ×× ××ª ×××××ª
           doityourself: ×× ××ª ×¢×©×Ö¾×××ªÖ¾××¢×¦××
@@ -867,17 +807,21 @@ he:
           organic: ×× ××ª ×××× ×××¨×× ×
           outdoor: ×× ××ª ×¦××× ××× ×××ª
           pet: ×× ××ª ××××ª ××××
+          pharmacy: ×××ª ××¨×§××ª
           photo: ×× ××ª ×¦××××
           salon: ×¡×××
+          second_hand: ×× ××ª ×× ×©× ×××
           shoes: ×× ××ª × ×¢××××
           shopping_centre: ××¨×× ×§× ×××ª
           sports: ×× ××ª ×¡×¤××¨×
           stationery: ×× ××ª ××× ××ª×××
           supermarket: ×¡××¤×¨××¨×§×
+          tailor: ××××
           toys: ×× ××ª ×¦×¢×¦××¢××
           travel_agency: ×¡××× ××ª × ×¡××¢××ª
           video: ×¡×¤×¨×××ª ×××××
           wine: ×× ××ª ×××××¨ ××©×§×××ª ××××××××××
+          "yes": ×× ××ª
         tourism: 
           alpine_hut: ××§×ª× ×××¤×× ××ª
           artwork: ××¦××¨×ª ××× ××ª
@@ -900,6 +844,7 @@ he:
           viewpoint: × ×§×××ª ×ª×¦×¤××ª
           zoo: ×× ××××ª
         tunnel: 
+          culvert: ××××
           "yes": ×× ××¨×
         waterway: 
           artificial: × ×ª×× ××× ××××××ª×
@@ -923,65 +868,111 @@ he:
           water_point: × ×§×××ª ×××
           waterfall: ××¤× ×××
           weir: ×¡××¨
+  help_page: 
+    help: 
+      title: help.openstreetmap.org
+    title: ×§×××ª ×¢××¨×
+    welcome: 
+      title: ××¨×××× ××××× ×-OSM
+    wiki: 
+      title: wiki.openstreetmap.org
+      url: http://wiki.openstreetmap.org/
   html: 
     dir: rtl
   javascripts: 
+    close: ×¡×××¨×
+    edit_help: ×¢××× ××××× ××ª ×××¤× ××××ª××§× ×¢× ×××§×× ×©××¨×¦×× × ××¢×¨×× ××× ×××××¥ ×××.
+    key: 
+      title: ××¤×ª ××¤×ª×
+      tooltip: ××¤×ª ××¤×ª×
+      tooltip_disabled: ××¤×ª× ××¤× ×××× ×¨×§ ××©××× ××ª×§× ××ª
     map: 
       base: 
         cycle_map: ××¤×ª ×××¤× ×××
+        hot: ×××× ×××¨×
         standard: ×ª×§× ×
         transport_map: ××¤×ª ×ª××××¨×
+      copyright: Â© <a href='%{copyright_url}'>××ª× ××× OpenStreetMap</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>××ª×¨××</a>
+      layers: 
+        data: × ×ª×× × ×××¤×
+        header: ×©××××ª ×××¤×
+        notes: ××¢×¨××ª ×××¤×
+        overlays: ××¤×¢××ª ×©××××ª ××¤×ª×¨×× ×ª×§×××ª ×××¤×
+        title: ×©××××ª
+      locate: 
+        popup: ×××¨××§ ×©×× ××× ×§××× ××××ª ××× {distance} {unit}
+        title: ××¦××ª ××××§×× ×©××
+      zoom: 
+        in: ××ª×§×¨×××ª
+        out: ××ª×¨××§××ª
+    notes: 
+      new: 
+        add: ×××¡×¤×ª ××¢×¨×
+        intro: ××× ××©×¤×¨ ××ª ×××¤×, ×××××¢ ×©××× ×ª ×××¦× ××××¤×× ×××¨××, ×× × × ××¡×¤×§ ××× ×©×××ª×¨ ×¤××¨×× ××¢×ª ××××ª ××¡×× ××××§×× ××××××§ ××××× ×ª ×××¢×¨× ×©×× ××××.
+      show: 
+        anonymous_warning: ×××¢×¨× ××××ª ×××××ª ×ª×××××ª ×××©×ª××©×× ××××× ××× ×©×¦×¨×× ××××ª ××××¤× ×¢×¦×××.
+        comment: ×××××
+        comment_and_resolve: ××××× ×××¤×ª××¨
+        hide: ×××¡×ª××¨
+        reactivate: ××¤×¢×× ××××©
+        resolve: ××¤×ª××¨
+    share: 
+      cancel: ×××××
+      center_marker: ×××¨×× ××ª ×××¤× ××¤× ××¡××
+      custom_dimensions: ××××¨×ª ××××× ×××ª××× ×××©××ª
+      download: ×××¨××
+      embed: HTML
+      format: "×ª×¡×××¨:"
+      image: ×ª××× ×
+      image_size: ××ª××× × ×ª×¦×× ×©××× ×¨×××× ×ª××ª
+      include_marker: ××××× ×¡××
+      link: ×§××©××¨ ×× HTML
+      long_link: ×§××©××¨
+      paste_html: ××××§×ª HTML ×××××¢× ×××ª×¨
+      scale: "×§× × ××××:"
+      short_link: ×§××©××¨ ×§×¦×¨
+      short_url: ××ª×××ª ×§×¦×¨×
+      title: ×©××ª××£
+      view_larger_map: ×¦×¤××× ×××¤× ××××× ×××ª×¨
     site: 
+      createnote_disabled_tooltip: × × ×××ª×§×¨× ××× ××××¡××£ ××¢×¨× ×××¤×
+      createnote_tooltip: ×××¡×¤×ª ××¢×¨× ×××¤×
       edit_disabled_tooltip: ×××ª×§×¨× ××× ××¢×¨×× ××ª ×××¤×
       edit_tooltip: ×¢×¨×××ª ×××¤×
-      edit_zoom_alert: ××© ×××ª×§×¨× ××× ××¢×¨×× ××ª ×××¤×
-      history_disabled_tooltip: ××© ××§×¨× ××× ×××¦×× ×¢×¨××××ª ×¢×××¨ ××××¨ ××
-      history_tooltip: ××¦××ª ×¢×¨××××ª ×¢×××¨ ××××¨ ××
-      history_zoom_alert: ××© ××§×¨× ××× ×××¦×× ×¢×¨××××ª ×¢×××¨ ××××¨ ××
+      map_data_zoom_in_tooltip: ××© ××§×¨× ××ª ×××¤× ××× ××¨×××ª × ×ª×× × ××¤×
   layouts: 
+    about: ×××××ª
     community: ×§××××
     community_blogs: ×××××× ×©× ××§××××
     community_blogs_title: ×××××× ×©× ×××¨× ×§××××ª OpenStreetMap
-    copyright: ××××××ª ×××¦×¨×× ××¨××©×××
-    documentation: ×ª××¢××
-    documentation_title: ×ª××¢×× ×××××
+    copyright: ××××××ª ×××¦×¨××
+    data: × ×ª×× ××
     donate: ×ªÖ´××× ×Ö¾OpenStreetMap ×¢×Ö¾××× %{link} ××§×¨× ××©××¨×× ×××××¨×.
-    donate_link_text: ×ª×¨×××
     edit: ×¢×¨×××
     edit_with: ××¢×¨××× ×¢× %{editor}
     export: ×××¦××
-    export_tooltip: ×××¦×× × ×ª×× × ×××¤×
+    export_data: ×××¦×× × ×ª×× ××
     foundation: ×§×¨×
     foundation_title: ×§×¨× ×××¤× ×¡××¨×× ×××¤
     gps_traces: ××¡×××× GPS
     gps_traces_tooltip: × ×××× ××¡×××× GPS
     help: ×¢××¨×
-    help_centre: ××¨×× ×¢××¨×
-    help_title: ××ª×¨ ×¢××¨× ×¢×××¨ ×××××
     history: ×××¡×××¨××
-    home: ××××ª×
-    home_tooltip: ××¢××¨ ××××§×× ××××ª
-    inbox_html: ××××¨ × ×× ×¡ %{count}
-    inbox_tooltip: 
-      one: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××× ××××× ××××¢× ×××ª ×©×× × ×§×¨××
-      other: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××× ××××× %{count} ××××¢××ª ×©×× × ×§×¨××
-      zero: ×ª×××ª ×××××¨ ×× ×× ×¡ ×©××× ××× × ××××× ××××¢××ª ×©×× × ×§×¨××
-    intro_1: OpenStreetMap ××× ××¤× ×××¤×©××ª ×©× ×× ××¢×××, ×©×× ××× ×××× ××¢×¨××. ×××¦×¨×× ×××ª× ×× ×©×× ××××.
+    home: ××¢××¨ ××××§×× ××××ª
     intro_2_create_account: × × ×××¦××¨ ××©××× ××©×ª××©
-    intro_2_download: ××××¨××
-    intro_2_html: ××© ×× ×××¤×© %{download} ××ª ×× ×ª×× ×× ×%{use} ××× ×××ª×× ×%{license} ×©×× ××ª×¤×¨×¡××× ××¤××. %{create_account} ××× ××©×¤×¨ ××ª ×××¤×.
-    intro_2_license: ×¨××©××× ×¤×ª××
-    intro_2_use: ×××©×ª××©
-    intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap
+    intro_header: ××¨×××× ××××× ×-OpenStreetMap!
+    intro_text: OpenStreetMap ××× ××¤× ×©× ××¢×××, × ××¦×¨ ×¢× ××× ×× ×©×× ××××, ××××¤×©× ××©××××© ×ª××ª ×¨×©××× ×¤×ª××.
+    learn_more: ××××¢ × ××¡×£
     log_in: ×× ××¡× ×××©×××
     log_in_tooltip: ×× ××¡× ×¢× ××©××× ×§×××
     logo: 
       alt_text: ××××× ×©× OpenStreetMap
     logout: ××¦××× ××××©×××
-    logout_tooltip: × ××ª××§
     make_a_donation: 
       text: ×ª×¨×××
       title: ×ªÖ´××× ××××× OpenStreetMap ×¢×Ö¾××× ××ª× ×ª×¨××× ××¡×¤××ª
+    more: ×¢××
     osm_offline: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap ××× × ××§××× ××¢×ª ××©× ×¢×××××ª ×ª××××§× ×××××¦×¢××ª ××.
     osm_read_only: ××¡× ×× ×ª×× ×× ×©× ××ª×¨ OpenStreetMap × ×ª×× ××¢×ª ×××¦× ×§×¨××× ×××× ××©× ×¢×××××ª ×ª××××§× ×××××¦×¢××ª ××.
     partners_bytemark: ×××××××¨×§
@@ -992,24 +983,22 @@ he:
     partners_url: http://wiki.openstreetmap.org/wiki/Partners
     sign_up: ××¨×©××
     sign_up_tooltip: ××¦××¨×ª ××©××× ××¢×¨×××
-    sotm2012: ×××× ××××¢×××ª OpenStreetMap 2012 ×××¨×¦××ª ×××¨××ª, â××¦× ×××¤× ××¨×¦××ª ×××¨××ªâ, 13â14 ××××§××××¨, ××¤××¨××× ×, ×××¨×××!
+    start_mapping: ×××ª××× ×××¤××ª
     tag_line: ××¤×ª ×¢××× ×××¤×©××ª ××©×××ª ×××××§×
     user_diaries: ×××× × ××©×ª××©××
     user_diaries_tooltip: ×¦×¤××× ××××× × ×××©×ª××©
-    view: ×ª×¦×××
-    view_tooltip: ××¦×¤××× ×××¤×
-    welcome_user: ××¨×× ××××, %{user_link}
-    welcome_user_link_tooltip: ××£ ×××©×ª××© ×©××
-    wiki: ×××§×
-    wiki_title: ××ª×¨ ×××§× ×¢×××¨ ×××××
   license_page: 
     foreign: 
       english_link: ××¢××× ×××§××¨× ××× ××××ª
       text: ×××§×¨× ×©× ×××¡×¨ ×ª×××××ª ××× ×¢××× ××ª××¨×× ×× ×××× %{english_original_link}, ××© ××ª×ª ×¢×××¤××ª ××¢××× ××× ××××ª
       title: ×××××ª ×ª×¨××× ××
     legal_babble: 
+      attribution_example: 
+        alt: ××××× ××¦××¨× ×× ××× × ××ª×ª ×××××¡ ×Ö¾OpenStreetMap ×××ª×¨ ×××× ××¨× ×
+        title: ××××× ××××××¡
       contributors_at_html: "<strong>×××¡××¨××</strong>: ×××× × ×ª×× ××\n×<a href=\"http://data.wien.gv.at/\">×¢××¨×××ª ××× ×</a> ××¤× ×ª× ××\n<a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>,\n×<a href=\"http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm\">×××× ×ª ×¤××¨××¨×××¨×</a>\n×××××× ×ª ×××¨×× (××¤× <a href=\"http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/\">CC-BY AT ×¢× ×ª××§×× ××</a>)."
       contributors_ca_html: "<strong>×§× ××</strong>: ×××× × ×ª×× ××\n×Ö¾GeoBase&reg;&rlm;, GeoGratis&rlm; (&copy;&rlm; Department of Natural\nResources Canada)&rlm;, CanVec&rlm; (&copy;&rlm; Department of Natural\nResources Canada), ×Ö¾StatCan&rlm; (Geography Division,\nStatistics Canada)."
+      contributors_fi_html: "<strong>×¤×× ×× ×</strong>: ×××× ××××¢ ×××¡× × ×ª×× ×× ×××¤×××¨×¤××× ×©× ×¤×× ××× × ××××§××¨××ª ××××¢ ×××¨××, ×ª××ª\n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">×¨××©××× NLSFI</a>."
       contributors_footer_1_html: "×××××¢ × ××¡×£ ×¢× ××§××¨××ª ××× ××××¨×× ×©×©×××©×\n××©××¤××¨ OpenStreetMap, × × ××¨×××ª ××ª <a\nhref=\"http://wiki.openstreetmap.org/wiki/Contributors\">××£\n××ª××¨×××</a> ×××××§× ×©× OpenStreetMap."
       contributors_footer_2_html: "××××× ×©× × ×ª×× ×× ×Ö¾OpenStreetMap ××× × ××××¨×ª ×©××¡×¤×§ ×××§××¨×\n×©× ×× ×ª×××× ×ª××× ×Ö¾OpenStreetMap, ×××§× ×¢× ×¢×¦×× ×××¨×××ª ×××©××, ××\n××§×× ××××ª ×××©××."
       contributors_fr_html: "<strong>×¦×¨×¤×ª</strong>: ×××× × ×ª×× ×× ×©××××¢× ×××§××¨\n××× ×××ª ×××¡×× ××××××ª (Direction GÃ©nÃ©rale des ImpÃ´ts)."
@@ -1021,11 +1010,12 @@ he:
       contributors_za_html: "<strong>××¨×× ××¤×¨××§×</strong>: ×××× × ×ª×× ×× ×©××××¢×\n×Ö¾<a href=\"http://www.ngi.gov.za/\">×Ö´× ×× ××××:\n××××¢ ×××Ö¾××¨××× ×××××</a>, ××××ª ×××¦×¨×× ×××××ª××ª ×©×××¨×."
       credit_1_html: ×× × ×××¨×©×× ×××××¡ ×× â&copy; ×ª××¨×× OpenStreetMapâ.
       credit_2_html: "×××Ö¾××, ××××ª× ××××××¨ ×©×× ×ª×× ×× ×××× ×× ×××¤××£ ××¨××©××× ×××¡××\n× ×ª×× ×× ×¤×ª××××, ××× × ×¢×©× ×©××××© ×××¨××× ×××¤× ×©×× ×, ×©××××¤×× ××¤××¤××ª\n××¨××©××× CC-BY-SA. ×××¤×©×¨××ª× ××¢×©××ª ×××ª ××××¦×¢××ª ×§××©××¨ ××\n<a href=\"http://www.openstreetmap.org/copyright\">××£ ××××××ª ××××¦××¨×</a>.\n×××××¤××, ××× ××××ª× ××¢×ª ××¤×¦×ª OSM ××¦××¨×ª\n× ×ª×× ××, ×××¤×©×¨××ª× ××¦××× ××ª ××©×××ª ×××§×©×¨ ××©××¨××ª ×× ××¨××©××× ×× ××¨××©××× ××ª. ××××¦×¢× ×ª×§×©××¨×ª\n×©×× × ××ª× ×××©×ª××© ××× ××§××©××¨×× (×××©× ×××¤××¡), ×× × ×××××¦××\n×××¤× ××ª ××ª ××§××¨××× ×©×× ×× openstreetmap.org (×××× ×¢×Ö¾××× ××¨×××ª\nâOpenStreetMapâ ×××ª×××ª ××××), ×× opendatacommons.org, ×××\n×× ××ª×××, ×× creativecommons.org."
+      credit_3_html: "××©××× ××¤× ×××§××¨×× ××ª ×©××¤×©×¨ ××¢××× ××, ××××××¡ ×¦×¨×× ××××¤××¢ ××¤×× ×ª ×××¤×. ×××©×:"
       credit_title_html: ××× ××ª×ª ×××××¡ ×Ö¾OpenStreetMap
       infringement_1_html: "×× × ×××××¨×× ××ª××¨××× ×Ö¾OSM ××¢××× ×× ××××¡××£ × ×ª×× ×× ××©×× ××§××¨\n×©××××× ×××××××ª ×××¦×¨×× (×××©× ××¤××ª ×××× ×× ××¤××ª ××××¤×¡××ª) ×××\n×××©××¨ ××¤××¨×© ×××¢×× ×××××××ª."
       infringement_2_html: "×× × ×¨×× ×× ×©××××¨ ×©××××× ×××××××ª ×××¦×¨×× × ××¡×£ ××××¤× ×× ××××\n×× ××¡× ×× ×ª×× ×× ×©× OpenStreetMap ×× ×× ×××ª×¨ ×××, × × ××¤× ××ª\n×× <a href=\"http://www.osmfoundation.org/wiki/License/Takedown_procedure\">× ×××\n×××¡×¨×</a> ×©×× × ×× ××ª×× ×ª××× × ××©××¨××ª\n<a href=\"http://dmca.openstreetmap.org/\">×××£ ××ª××× ××ª ×××§××× ×©×× ×</a>."
       infringement_title_html: ××¤×¨×ª ××××××ª ×××¦×¨××
-      intro_1_html: "××ª×¨ OpenStreetMap ××× <i>× ××ª× ×× ×¤×ª××××</i>, ××××¤×¦×× ××¤× ×¨××©××× <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/\">×§×¨×××××××\n×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> (CC BY-SA)."
+      intro_1_html: "OpenStreetMap ××× <i>×××× × ×ª×× ×× ×¤×ª××××</i>, ××¤× ×¨××©××× <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a>&rlm; (ODbL)."
       intro_2_html: "××ª× ×××¤×©××× ×××¢×ª××§, ×××¤××¥, ××©××¨ ××××ª××× ××ª ×× ×ª×× ×× ×©×× ×,\n×× ×¢×× ××ª× × ××ª× ×× ×××××¡ ×Ö¾OpenStreetMap\n×××ª××¨××× ×××××. ×× ××ª× ××©× ×× ××ª ×× ×ª×× ×× ×× ××ª ×××¤××ª ×©×× × ×× ××¡×ª×××× ×¢×××× ××× ×××¦××¨ ××©×× ×××©,\n×××ª×¨ ××× ×××¤××¥ ××ª ××ª××¦×××ª ×¨×§ ××¤× ×ª× ×× ×××ª× ××¨××©×××.\n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">×××¡××\n×××©×¤××</a> ×××× ××¡×××¨ ××ª ××××××ª××× ×××ª ×ª×××× ××××¨×××ª ×©×××."
       intro_3_html: "××××¤×× ×××¨××× ×××¤× ×©×× ×, ×××ª××¢×× ×©×× × ××××©×× ×××¤××£\n××¨××©××× <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">×§×¨×××××××\n×§×××× × ×××××¡â×©××ª××£Ö¾××× 2.0</a> license (××§××¦××¨ CC-BY-SA)."
       more_1_html: "×§Ö´×¨×× ×¢×× ×¢× ×©××××© ×× ×ª×× ×× ×©×× × ××¢× ××¨××× ×××××¡ ×××× × ××¦××¨××ª × ×××¨××ª ×<a\nhref=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">××£ ×©××´×ª\n××©×¤××</a>."
@@ -1091,12 +1081,9 @@ he:
       title: ×ª×××ª ××××¨ ×××¦×
       to: ××
     read: 
-      back_to_inbox: ××××¨× ××ª×××ª ×××××¨ ×× ×× ×¡
-      back_to_outbox: ×××¨× ××ª×××ª ×××××¨ ××××¦×
+      back: ×××¨×
       date: ×ª××¨××
       from: ×××ª
-      reading_your_messages: ×§×¨×××ª ×××××¢××ª ×©××
-      reading_your_sent_messages: ××§×¨×××ª ×××××¢××ª ×©× ×©×××
       reply_button: ×××©××
       subject: × ××©×
       title: ××××¢× ×©× ×§×¨××
@@ -1107,6 +1094,37 @@ he:
       wrong_user: × ×× ×¡×ª ××©× â%{user}â, ××× ×××××¢× ×©×××§×©×ª ×××©×× ×¢××× ×× × ×©××× ××××ª× ×××©×ª××©. × × ××××× ×¡ ×××©××× ×× ××× ××× ×××©××.
     sent_message_summary: 
       delete_button: ××××§×
+  note: 
+    description: 
+      closed_at_by_html: × ×¤×ª×¨× ××¤× × %{when} ×¢×Ö¾××× %{user}
+      closed_at_html: × ×¤×ª×¨× ××¤× × %{when}
+      commented_at_by_html: ×¢×××× × ××¤× × %{when} ×¢×Ö¾××× %{user}
+      commented_at_html: ×¢×××× × ××¤× × %{when}
+      opened_at_by_html: × ××¦×¨× ××¤× × %{when} ×¢×Ö¾××× %{user}
+      opened_at_html: × ××¦×¨× ××¤× × %{when}
+      reopened_at_by_html: ×××¤×¢×× ××××© ××¤× × %{when} ×¢×Ö¾××× %{user}
+      reopened_at_html: ×××¤×¢×× ××××© ××¤× × %{when}
+    entry: 
+      comment: ×ª××××
+      full: ××¢×¨× ××××
+    mine: 
+      ago_html: ××¤× × %{when}
+      created_at: "××¦××¨×:"
+      creator: ×××¦×¨
+      description: ×ª××××¨
+      heading: ××¢×¨××ª ×©× %{user}
+      id: ××××
+      last_changed: "×©×× ×× ×××¨××:"
+      subheading: ××¢×¨××ª ××ª×××××ª ×©× %{user}
+      title: ××¢×¨××ª ××ª×××××ª ×©× %{user}
+    rss: 
+      closed: ××¢×¨× ×¡×××¨× (××× %{place})
+      commented: ×ª×××× ×××©× (××× %{place})
+      description_area: ×¨×©×××ª ××¢×¨××ª ×©×××¡×¤×, ×©××ª×§××× ×¢×××× ××¢×¨××ª ××©× ××××¨× ×××××¨ ×©×× [(%{min_lat}|%{min_lon}) â (%{max_lat}|%{max_lon})]
+      description_item: ××× ×ª rss ×¢×××¨ ×××¢×¨× %{id}
+      opened: ××¢×¨× ×××©× (××× %{place})
+      reopened: ××¢×¨× ×©×××¤×¢×× ××××© (××× %{place})
+      title: ××¢×¨××ª ×©× OpenStreetMap
   notifier: 
     diary_comment_notification: 
       footer: ××¤×©×¨ ×× ××§×¨×× ××ª ××ª×××× ×××ª×××ª %{readurl} ×××××× ×××ª×××ª %{commenturl} ×× ×××©×× ×××ª×××ª %{replyurl}
@@ -1122,8 +1140,7 @@ he:
     email_confirm_plain: 
       click_the_link: ×× ××××ª ×¢×©××ª ××ª ××, × × ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××©×¨ ××ª ××©×× ××.
       greeting: ×©×××,
-      hopefully_you_1: ×××©×× (××ª×§××× ×××××¨ ××) ×¨××¦× ××©× ××ª ××ª ××ª×××ª ×××××´× ×Ö¾
-      hopefully_you_2: "%{server_url} ×× %{new_address}."
+      hopefully_you: ×××©×× (×× ×× × ××§×××× ×©××ª ×× ××ª×) ×××§×© ××©× ××ª ××ª ××ª×××ª ××××"× ××××ª ×××ª×¨ %{server_url} ×××ª×××ª %{new_address}
     friend_notification: 
       befriend_them: ×××¤×©×¨××ª× ××¡×× × ××××¨ ×××ª×××ª %{befriendurl}.
       had_added_you: "%{user} ×××¡××£ ×××ª× ××××¨ ×Ö¾OpenStreetMap."
@@ -1152,44 +1169,36 @@ he:
     lost_password_plain: 
       click_the_link: ×× ××× ×¢×©××ª ××ª ××, ××© ×××××¥ ×¢× ××§××©××¨ ×××× ××× ×××¤×¡ ××ª ××¡×¡××.
       greeting: ×©×××,
-      hopefully_you_1: ×××©×× (×××× ××ª ×× ××ª×) ×××§×© ×××¤×¡ ××ª ××¡×¡××
-      hopefully_you_2: ×××©××× openstreetmap.org ×××©××× ×××ª×××ª ××××"× ××××ª.
+      hopefully_you: ×××©×× (×××× ××ª ×× ××ª×) ×××§×© ×©××¡×¡×× ×××©××××ª ×××©××× ×××××× ×¢× ××ª×××ª ××××"× ××××ª ×××ª×¨ openstreetmap.org.
     message_notification: 
-      footer1: ××¤×©×¨ ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl}
-      footer2: ×××¢× ××ª ×××ª×××ª %{replyurl}
+      footer_html: × ××ª× ×× ××§×¨×× ××ª ×××××¢× ×××ª×××ª %{readurl} ×××××× ××××¦×¢××ª %{replyurl}
       header: "××ª×××ª× ×Ö¾OpenStreetMap ××××¢× ××××¢× ×××ª %{from_user} ×¢× ×× ××©× %{subject}:"
       hi: ×©××× %{to_user},
+    note_comment_notification: 
+      anonymous: ××©×ª××© ××××× ×
+      closed: 
+        commented_note: ××¢×¨×ª ××¤× ×©××××ª ×¢××× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}. ×××¢×¨× × ××¦××ª ××× %{place}
+        subject_other: "[OpenStreetMap] ××¢×¨× ×©××ª×¢× ××× ×ª ×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}"
+        subject_own: "[OpenStreetMap] ×××ª ××××¢×¨××ª ×©×× × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}"
+        your_note: ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place} × ×¤×ª×¨× ×¢×Ö¾××× %{commenter}.
+      commented: 
+        commented_note: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ××¢×¨× ×¢× ××¤× ×©××××ª ×¢×××. ××¢×¨× × ××¦××ª ××× %{place}
+        subject_other: "[OpenStreetMap] ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ××¢×¨× ×©××ª×¢× ××× ×ª ××"
+        subject_own: "[OpenStreetMap] ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ×××ª ××××¢×¨××ª ×©××"
+        your_note: ××ª×§××× ×ª×××× ×××ª %{commenter} ×¢× ×××ª ×××¢×¨××ª ×××¤× ×©×× ××× %{place}
+      details: ××¤×©×¨ ×××¦×× ×¤×¨××× × ××¡×¤×× ×¢× ×××¢×¨× ×××ª×××ª %{url}
+      greeting: ×©×××,
+      reopened: 
+        commented_note: ××¢×¨× ×××¤× ×©××××ª ×¢××× ×××¤×¢×× ××××© ×¢×´× %{commenter}. ×××¢×¨× ××× ××× %{place}.
+        subject_other: "[OpenStreetMap] ××¢×¨× ×©××¢× ××× ×ª ×××ª× ×××¤×¢×× ××××© ×¢×´× %{commenter}"
+        subject_own: "[OpenStreetMap] ×××ª ×××¢×¨××ª ×©×× ×××¤×¢×× ××××© ×¢×´× %{commenter}"
+        your_note: ××¢×¨× ×©×××¡×¤×ª ××× %{place} ×××¤×¢×× ××××© ×¢×´× %{commenter}.
     signup_confirm: 
-      subject: "[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] × × ×××©×¨ ××ª×××ª ××××´×"
-    signup_confirm_html: 
-      ask_questions: ×××¤×©×¨××ª× ××©××× ×©××××ª ×¢× ××ª×¨ OpenStreetMap ×<a href="http://help.openstreetmap.org/">××ª×¨ ××©××××ª ××ª×©××××ª ×©×× ×</a>.
-      click_the_link: ×× ××× ×××××¨ ××, ××¨×× ××××! × × ×××××¥ ×¢× ××§××©××¨ ××× ××× ××××ª ××ª ×××©××× ×××§×¨×× ××××¢ × ××¡×£ ×¢× OpenStreetMap
-      current_user: ×¨×©×××ª ××©×ª××©×× × ×××××× ××§××××¨×××ª, ×××ª××× ××××§××× ××¢×××, ×××× × ×××£ <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: "××§×¨××× × ××¡×¤×ª ×¢× OpenStreetMap <a href=\"http://wiki.openstreetmap.org/wiki/Beginners%27_Guide\">×××ª×¨ ×××××§×</a>, ×××ª×¢××× ××××©××ª ××××¨×× ××ª ×<a href=\"http://blog.openstreetmap.org/\">×××× OpenStreetMap</a> ×× ×<a href=\"http://twitter.com/openstreetmap\">××××××¨</a>, ×× ××§×¨××× ××××× ×©× ××××¡× OpenStreetMap ×¡××× ×§××¡×: <a href=\"http://www.opengeodata.org/\">OpenGeoData blog</a> ×××××¢ ×¢× ××××¡×××¨×× ×©× ×××××, ×××© ×× ×× <a href=\"http://www.opengeodata.org/?cat=13\">×§×××¦× ×§××<a/>!"
-      greeting: ×©×××!
-      hopefully_you: ×××©×× (××ª×§××× ×©×××××¨ ××) ×××§×© ×××¦××¨ ××©××× ××©×ª××© ×
-      introductory_video: × ××ª× ××¦×¤××ª ××¡×¨×× ×××× ×-%{introductory_video_link}.
-      more_videos: ×¦×¤××× ××¡×¨××× ×× × ××¡×¤×× ×××ª×××ª %{more_videos_link}.
-      more_videos_here: ×¡×¨××× ×× × ××¡×¤×× ××¦×××× ×××
-      user_wiki_page: ×××××¥ ×××¦××¨ ××£ ××©×ª××© ×××××§×, ×©××××× ×§××××¨×××ª ×©××¡×¤×¨××ª ×× ×××§××× ×××× such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a> (××©×ª××©×× ×××× ×××).
-      video_to_openstreetmap: ×¡×¨××× ×××× ×××ª×¨ OpenStreetMap
-      wiki_signup: ×××¤×©×¨××ª× <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">××××¨×©× ×××ª×¨ ×××××§× ×©× OpenStreetMap</a>.
-    signup_confirm_plain: 
-      ask_questions: "×××¤×©×¨××ª× ××©××× ×©××××ª ×¢× OpenStreetMap ×××£ ××©××××ª ××ª×©××××ª ×©×× ×:"
-      blog_and_twitter: "× ××ª× ×××ª×¢××× ××××©××ª ××××¨×× ××ª ××¨× ××××× ×× ××©××× ×××××××¨ ×©× OpenStreetMap:"
-      click_the_link_1: ×× ××× ×××××¨ ××, ××¨×× ××××! × × ×××××¥ ×¢× ××§××©××¨ ××× ××× ××××ª ××ª
-      click_the_link_2: ×××©××× ×××§×¨×× ××××¢ × ××¡×£ ×¢× ××ª×¨ OpenStreetMap.
-      current_user_1: ×¨×©×××ª ×§××××¨×××ª ××©×ª××©××, ×××××¡×¡×ª ×¢× ×××§×××× ××¨××× ××¢×××
-      current_user_2: "××¦××× ×××:"
-      greeting: ×©×××!
-      hopefully_you: ×××©×× (××ª×§××× ×©×××××¨ ××) ×××§×© ×××¦××¨ ××©××× ×
-      introductory_video: "×××¤×©×¨××ª× ××¦×¤××ª ××¡×¨××× ×××¨×× ×××ª×¨ OpenStreetMap ×××:"
-      more_videos: "×¡×¨××× × ×××¨×× × ××¡×¤×× ××¦×××× ×××:"
-      opengeodata: "××ª×¨ OpenGeoData.org ××× ××××× ×©× ××××¡× OpenStreetMap ×¡××× ×§××¡×, ×××© ×× ×× ×¤×××§××¡××× (××§××××ª ×§××):"
-      the_wiki: "× ××ª× ××§×¨×× ×¢× OpenStreetMap ×××¤× ×××§×:"
-      user_wiki_1: ×× × ×××××¦×× ×××¦××¨ ××£ ××©×ª××©, ×©×××××
-      user_wiki_2: "×§××××¨×××ª ×××¡×× ××ª ××ª ××§××××, ×××× ×§××××¨×××ª â××©×ª××©×× ×××× ×××â: [[Category:Users_in_London]]."
-      wiki_signup: "×××¤×©×¨××ª× ××××¨×©× ×××××§× OpenStreetMap ×××ª×××ª:"
+      confirm: "××¤× × ×©×× ×× × ×××©××××, ×× ×× × ×¦×¨×××× ××××× ×©×××§×©× ××××¢× ×××, ×× ×× ××××ª ×¢×©××ª ××ª ××, ×¦×¨×× ×××××¥ ××× ××× ××××ª ××ª ×××©××× ×©××:"
+      created: ×××©×× (××ª×§××× ××ª ×× ××ª×) ××¦×¨ ××©××× ×××ª×¨ %{site_url}.
+      greeting: ××××!
+      subject: "[×××¤× ×¡××¨×× ×××¤ OpenStreetMap] ××¨×× ×××× ××××¤× ×¡××¨×× ×××¤"
+      welcome: ×××¨× ××××ª ×××©××× ×©××, × ×¡×¤×§ ×× ××××¢ × ××¡×£ ×©××¢×××¨ ×× ×××ª×××.
   oauth: 
     oauthorize: 
       allow_read_gpx: ××§×¨×× ××ª ××¡×××× ×Ö¾GPS ××¤×¨×××× ×©××.
@@ -1198,8 +1207,15 @@ he:
       allow_write_api: ××©× ××ª ××ª ×××¤×.
       allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××× ×××¢×¨××ª ×××××¡××£ ×××¨××.
       allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
+      allow_write_notes: ××©× ××ª ××¢×¨××ª
       allow_write_prefs: ××©× ××ª ××ª ××¢××¤××ª ×××©×ª××© ×©××.
       request_access: ××××©×× %{app_name} ×××¨×© ×××©× ×××©××× ×, %{user}. × × ×××××§ ××× ××ª××× ×× ×©××××©×× ××§×× ××ª ×××××××ª ××××. ××¤×©×¨ ×××××¨ ×× ×× ×××××¨ ××ª ×× ×× ×©××ª××× ××.
+    oauthorize_failure: 
+      invalid: ×××¡×××× ××××©××¨ ××× × ×ª×§×£.
+      title: ××§×©×ª ×××©××¨ × ××©××
+    oauthorize_success: 
+      title: ××§×©×ª ×××©××¨ ×××©×¨×
+      verification: ×§×× ××××××ª ××× %{code}.
     revoke: 
       flash: ×©×××ª ××ª ×××¡×××× ×××××©×× %{application}.
   oauth_clients: 
@@ -1216,6 +1232,7 @@ he:
       allow_write_api: ××©× ××ª ××ª ×××¤×.
       allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××× ×××¢×¨××ª ×××××¡××£ ×××¨××.
       allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
+      allow_write_notes: ××©× ××ª ××¢×¨××ª
       allow_write_prefs: ××©× ××ª ×××¢××¤××ª ×©× ×××©×ª××©.
       callback_url: ××ª×××ª ×§×¨××× (callback)
       name: ×©×
@@ -1246,6 +1263,7 @@ he:
       allow_write_api: ××©× ××ª ××ª ×××¤×.
       allow_write_diary: ×××¦××¨ ×¨×©××××ª ×××× ×××¢×¨××ª ×××××¡××£ ×××¨××.
       allow_write_gpx: ×××¢×××ª ××¡×××× GPS.
+      allow_write_notes: ××©× ××ª ××¢×¨××ª
       allow_write_prefs: ××©× ××ª ××ª ×××¢××¤××ª ×©×××.
       authorize_url: "××ª×××ª ×××©××¨:"
       confirm: ××××ª?
@@ -1254,7 +1272,7 @@ he:
       key: "××¤×ª× ×¦×¨××:"
       requests: "×××§×© ××ª ×××¨×©×××ª ×××××ª ××××©×ª××©:"
       secret: "×¡×× ×¦×¨××:"
-      support_notice: ×× ×× × ×ª××××× ×Ö¾HMAC-SHA1 (×××××¥) ××× ×××§×¡× ×¤×©×× ×××¦× SSL.
+      support_notice: ×× ×× × ×ª××××× ×××ª××××ª ×Ö¾HMAC-SHA1 (×××××¥) ××× ×Ö¾RSA-SHA1.
       title: ×¤×¨×× OAuth ×¢×××¨ %{app_name}
       url: "××ª×××ª ××¡×××× ××§×©×:"
     update: 
@@ -1294,6 +1312,7 @@ he:
     edit: 
       anon_edits_link_text: ××× ××××¢ ×× ××.
       flash_player_required: ××© ×¦××¨× ×× ×× ×¤×××© ××× ×××©×ª××© ×Ö¾Potlatch, ×¢×¨×× ××¤×××© ×©× OpenStreetMap. ××¤×©×¨ <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">××××¨×× × ×× ×¤×××© ×××ª×¨ Adobe.com</a>. ××© <a href="http://wiki.openstreetmap.org/wiki/Editing">××¤×©×¨××××ª × ××¡×¤××ª</a> ××¢×¨×××ª OpenStreetMap.
+      id_not_configured: ×× ××ª××¦×¢× ××××¨××ª ×©× iD
       no_iframe_support: ×××¤××¤× ×©×× ××× × ×ª××× ××××× ××× ××¡×× iframe ×©× HTML, ×××× ×××× ××× ×¢×××¨ ×ª××× × ××.
       not_public: ×× ××××¨×ª ××ª ×¢×¨××××ª×× ××¦××××¨×××ª.
       not_public_description: ×× ×ª××× ××××©×× ××¢×¨×× ××ª ×××¤× ×××¨× ×ª×¢×©× ×××ª. ×××¤×©×¨××ª× ××××××¨ ××ª ×¢×¨××××ª×× ××¦××××¨×××ª ××¨× %{user_page} ×©××.
@@ -1302,6 +1321,7 @@ he:
       potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)
       user_page_link: ××£ ×××©×ª××©
     index: 
+      createnote: ×××¡×¤×ª ××¢×¨×
       js_1: ×××¤××¤× ×©×× ××ª× ××©×ª××© ××× × ×ª××× ×Ö¾JavaScript, ×× ×©××©××ª×ª ××ª ××©××××© ×Ö¾JavaScript.
       js_2: ××ª×¨ OpenStreetMap ××©×ª××© ×Ö¾JavaScript ×××¤× ××××××§×.
       license: 
@@ -1310,8 +1330,6 @@ he:
       remote_failed: ××¢×¨××× × ××©×× â × × ××××× ×× JOSM ×× Merkaartor × ××¢× × ××©××¤×©×¨××ª ××©×××× ××§×××¨ ×××¤×¢××ª
       shortlink: ×§××©××¨ ××§××¦×¨
     key: 
-      map_key: ××¤×ª×
-      map_key_tooltip: ××¤×ª× ××¤×
       table: 
         entry: 
           admin: ×××× ×©×× ×©××¤××
@@ -1397,7 +1415,6 @@ he:
       preview: ×ª×¦××× ××§××××
     search: 
       search: ××××¤××©
-      search_help: "×××©×: â× ×ª× ××â, â×¨××× ×¨×× ×××©××¨×¨×ª, ××¨××©×××â, â90880â, ×× '×¡× ××¤× ××××¨ ×××××¨ ×©×¤×¨×¢×' <a href='http://wiki.openstreetmap.org/wiki/Search'>×××××××ª × ××¡×¤××ª...</a>"
       submit_text: ××¢××¨
       where_am_i: ×××¤× ×× ×?
       where_am_i_title: × × ××ª××¨ ××ª ×××§××× ×× ×××× ××××¦×¢××ª ×× ××¢ ××××¤××©
@@ -1413,6 +1430,11 @@ he:
       upload_trace: ××¢×××ª ××¡××× GPS
     delete: 
       scheduled_for_deletion: ××¡××× ××××¢× ×××××§×
+    description: 
+      description_with_count: 
+        one: ×§×××¥ GPS ×¢× × ×§××× ×××ª ×××ª %{user}
+        other: ×§×××¥ GPS ×¢× %{count} × ×§××××ª ×××ª %{user}
+      description_without_count: ×§×××¥ GPS ×××ª %{user}
     edit: 
       description: "×ª××××¨:"
       download: ×××¨××
@@ -1430,7 +1452,10 @@ he:
       uploaded_at: "×ª××¨×× ××¢×××:"
       visibility: "× Ö´×¨××Ö¼×ª:"
       visibility_help: ×× ×× ××××¨?
+    georss: 
+      title: ××¡×××× GPS ×©× OpenStreetMap
     list: 
+      description: ×¢××× ×××¢××××ª ×××¨×× ××ª ×©× × ×ª××× GPS
       empty_html: ××× ×¤× ×¢×××× ×©×× ×××¨. ××¤×©×¨ <a href='%{upload_link}'>×××¢×××ª ××××¢ ×××©</a> ×× ××××× ×¢×× ×¢× ××¢×§× ××¡××××× ×Ö¾GPS ×<a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>××£ ×××××§×</a>.
       public_traces: ××¡×××× GPS ×¦××××¨×××
       public_traces_from: ××¡×××× GPS ×¦××××¨××× ×××ª %{user}
@@ -1471,14 +1496,15 @@ he:
     trace_header: 
       see_all_traces: ××¦××ª ×× ×××¡×××××
       see_your_traces: ××¦××ª ×××¡××××× ×©××
-      traces_waiting: ××© ×× %{count} ××¡××××× ×©××××× ×××¢×××. × × ××©×§×× ×××××ª ×¢× ×¡××× ××¢×××ª× ××¤× × ××¢×××ª × ××¡×¤××, ××× ×× ×××¡×× ××ª ××ª××¨ ×××©×ª××©×× ×××¨××.
+      traces_waiting: 
+        other: ××© ×× ××¡××× ×©×××× ×××¢×××. × × ××©×§×× ×××××ª ×¢× ×¡××× ××¢×××ª× ××¤× × ××¢×××ª ××¡××××× × ××¡×¤××, ××× ×× ×××¡×× ××ª ××ª××¨ ×××©×ª××©×× ×××¨××.
       upload_trace: ××¢×××ª ××¡×××
     trace_optionals: 
       tags: ×ª×××
     trace_paging_nav: 
       newer: ××¡××××× ×××©×× ×××ª×¨
       older: ××¡××××× ××©× ×× ×××ª×¨
-      showing_page: ××¦××ª ×××£ %{page}
+      showing_page: ×××£ %{page}
     view: 
       delete_track: ××××§×ª ×××¡××× ×××
       description: "×ª××××¨:"
@@ -1517,6 +1543,10 @@ he:
       email never displayed publicly: (××¢××× ×× ×××¦××ª ××¤××××)
       flash update success: ×¤×¨×× ×××©×ª××©/×ª ×¢×××× × ×××¦×××.
       flash update success confirm needed: ××××¢ ×××©×ª××©/×ª ×¢×××× ×××¦×××. × × ×××§× ××ª ×ª×××ª ××××"× ×¢× ×× ×ª ×××©×¨×¨ ××ª ××××"× ××××©.
+      gravatar: 
+        gravatar: ×××©×ª××© ×Ö¾Gravatar
+        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        link text: ×× ××?
       home location: "×××§×× ×¨××©×:"
       image: "×ª××× ×:"
       image size hint: (×ª××× × ××¨×××¢×ª ××××× 100x100 ××¤×××ª ×¢××××ª ××× ×××)
@@ -1552,13 +1582,13 @@ he:
       update home location on click: ×¢×××× ××××§×× ××¨××©× ×©×× ××¢×ª ××××¦× ×¢× ×××¤×?
     confirm: 
       already active: ×××©××× ××× ×××¨ ×××©×¨.
-      before you start: ×× ×× × ××××¢×× ×©××× ×× ×× ×××ª××× ×××¨ ×××¤××ª, ××× ×××× ××¤×©×¨ ×××§×© ××× ××¤× ×Ö¾×× ×××× ××ª ××××¤×¡ ××××?
       button: ×××©××¨
       heading: ×××××ª ××©××× ××©×ª××©
+      introduction_1: ×©××× × ×× ×××ª× ×××××ª.
+      introduction_2: × × ××××ª ××ª ×××©××× ×©×× ××××¦×¢××ª ××××¦× ×¢× ×§××©××¨ ××××"×, ××××¨× ×× ×ª××× ×× ××¤×©×¨××ª ×××ª××× ×××¤××ª.
       press confirm button: × × ×××××¥ ×¢× ××¤×ª××¨ ××××©××¨ ××× ×××¤×¢×× ××ª ××©××× ×.
-      reconfirm: ×× ×¢××¨ ××× ×¨× ××× ×©× ×¨×©××ª, ×××× ×¦×¨×× <a href="%{reconfirm}">××©××× ××¢×¦×× ×××ª× ×××©××¨ ×××©</a>.
-      success: ××©××× × ×××©×¨, ×ª××× ×©× ×¨×©××ª!
-      unknown token: × ×¨×× ×©×××¡×××× ××× ××× × ×§×××.
+      reconfirm_html: ×× ××¨×¦×× × ××§×× ×©×× ×××ª× ×××××ª, <a href="%{reconfirm}">× × ×××××¥ ×××</a>.
+      unknown token: × ×¨×× ×©×§×× ××××©××¨ ××× ×¤× ×× ×©××× × ×§×××.
     confirm_email: 
       button: ×××©××¨
       failure: ××ª×××ª ×××××´× ×©×× ×××¨ ×××©×¨× ×××¡×××× ×××.
@@ -1578,8 +1608,8 @@ he:
       heading: ××©×ª××©××
       hide: ××¡×ª×¨×ª ××©×ª××©×× × ×××¨××
       showing: 
-        one: ×××¦× ××£ %{page} (%{first_item} ××ª×× %{items})
-        other: ×××¦× ××£ %{page} (%{first_item}â%{last_item} ××ª×× %{items})
+        one: ××£ %{page} (%{first_item} ××ª×× %{items})
+        other: ××£ %{page} (%{first_item}â%{last_item} ××ª×× %{items})
       summary: "%{name} × ××¦×¨ ×××ª×××ª %{ip_address} ×Ö¾%{date}"
       summary_no_ip: "%{name} × ××¦×¨ ×Ö¾%{date}"
       title: ××©×ª××©××
@@ -1592,7 +1622,7 @@ he:
       heading: ×× ××¡×
       login_button: ×× ××¡×
       lost password link: ×××××ª ××ª ××¡×¡×× ×©××?
-      new to osm: ×××© ×Ö¾OpenStreetMap?
+      new to osm: ×××¢×ª ×¢××©×× ×Ö¾OpenStreetMap?
       no account: ××× ×× ××©×××?
       openid: "%{logo} OpenID:"
       openid invalid: ×¡××××, ×Ö¾OpenID ×©×× × ×¨×× ××§×××§×
@@ -1619,7 +1649,7 @@ he:
           title: ×× ××¡× ×¢× ××©××× ××××
       password: "×¡×¡××:"
       register now: ××××¨×©× ×¢××©××
-      remember: "×××××¨ ×××ª×:"
+      remember: ×××××¨ ×××ª×
       title: ×× ××¡×
       to make changes: ××× ××©× ××ª ××ª × ×ª×× × OpenStreetMap, ×¦×¨×× ×©×××× ×× ××©×××.
       with openid: "×××××¤×× ××¤×©×¨ ×××©×ª××© ×Ö¾OpenID ××× ××××× ×¡:"
@@ -1641,18 +1671,18 @@ he:
       button: ××××¡××£ ××××¨
       failed: ×¡××××, ×××¡×¤×ª %{name} ××××¨ × ××©××.
       heading: ××××¡××£ ××ª %{user} ××ª××¨ ×××¨?
-      success: "%{name} ×××¨ ×©×× ×¢××©××."
+      success: "%{name} ×××¨ ×©×× ×¢××©××!"
     new: 
+      about: 
+        header: ×××¤×©××ª ×× ××ª× ×ª ××¢×¨×××
+        html: "<p>×××××× ×××¤××ª ×××¨××ª, OpenStreetMap × ××¦×¨×ª ×××× ×¢×Ö¾××× ×× ×©×× ××××,\n××××× ×××¤×©××× ××ª×§×, ××¢××× ×××××¨×× ×××ª× ××××©×ª××© ××.</p>\n<p>××× ×××ª××× ××ª×¨×× ××© ××××¨×©×. ×× × × ×©×× ××××¨ ×××§××¨×× × ××× ××××ª ××ª ××©××× ×.</p>"
       confirm email address: "×××××ª ××ª×××ª ××××´×:"
       confirm password: "×××××ª ×¡×¡××:"
       contact_webmaster: × × ×××¦××¨ ×§×©×¨ ×¢× <a href="mailto:webmaster@openstreetmap.org">×× ×× ×××ª×¨</a> ××× ×©×××××¦×¨ ××©×××, ××× ×× × × ×©×ª×× ×××¤× ×××§×©× ××× ×©×××ª×¨ ×××¨.
-      continue: ××××©××
+      continue: ××¨×©××
       display name: "×©× ××ª×¦×××:"
       display name description: ×©× ×××©×ª××© ×©××, ×©×××¦× ××¤××××. ××¤×©×¨ ××©× ××ª ××ª ×× ×××¢×¤××ª ×©××.
       email address: "××ª×××ª ××××´×:"
-      fill_form: × × ×××× ××ª ××××¤×¡ ××× ×× ×©×× ×× ×××ª× ××××¨ ××× ×××¤×¢×× ××ª ××©××× ×.
-      flash create success message: ×ª××× ×¢× ××¨××©××. ×©××× × ×××ª× ×××©××¨ ×××ª×× %{email} ×××©× ×§×× ××× ××ª ××××©××¨, ××¤×©×¨ ×××× ×××ª××× ×××¤××ª.<br /><br />×× × ×¢×©× ×××©××× ×××××´× ×©×× ×©××××© ×××¢×¨××ª ×©××××× × ××××¢××ª, × × ××××¡××£ ××ª webmaster@openstreetmap.org ××¨×©××× ×××× ×, ×× ××× × × ×××××× ×××©×× ×××§×©××ª ×××©××¨.
-      heading: ××¦××¨×ª ××©××× ××©×ª××©
       license_agreement: ×¢× ×××©××¨ ×××©××× ××© ××§×× ××ª <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">×ª× ×× ××ª×¨×××</a>.
       no_auto_account_create: ×××¨×× ××¦×¢×¨, ××¢×ª ××× × × ×××××× ×××¦××¨ ×× ××©××× ××××¤× ×××××××.
       not displayed publicly: ×× ×××¦× ××¤×××× (×¨×³ <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">××××× ×××ª ×¤×¨××××ª</a>)
@@ -1662,7 +1692,7 @@ he:
       password: "×¡×¡××:"
       terms accepted: ×ª××× ×¢× ×§×××ª ×ª× ×× ××ª×¨××× ××××©××!
       terms declined: ×× ×× × ××¦××¢×¨×× ×©×××××ª ×× ××§×× ××ª ×ª× ×× ××ª×¨××× ××××©××. ×××××¢ × ××¡×£ ×¨×³ <a href="%{url}">××£ ×××××§× ×××</a>.
-      title: ××¦××¨×ª ××©×××
+      title: ××¨×©××
       use openid: ×××××¤××, ××¤×©×¨ ×××©×ª××© ×Ö¾%{logo} OpenID ××× ××××× ×¡
     no_such_user: 
       body: ×¡××××, ××× ××©××× ××©× %{user}. ×××× ×××××ª ×× × ××× ××××× ×××¦×ª ×¢× ×§××©××¨ ×©×××.
@@ -1729,10 +1759,10 @@ he:
       diary: ××××
       edits: ×¢×¨××××ª
       email address: "××ª×××ª ×××\"×:"
-      friends_changesets: ×¢××× ××× ×¢×¨×××ª ××©×× ×××× ×©× ×××¨××
-      friends_diaries: ×¢××× ××× ×¨×©××××ª ××××× ×©× ×××¨××
+      friends_changesets: ×¢×¨×××ª ×©×× ×××× ×©× ×××¨××
+      friends_diaries: ×¨×©××××ª ×××× ×©× ×××¨××
       hide_user: ×××¡×ª×¨×ª ××©×ª××© ××
-      if set location: ×× ××××¨×ª ××ª ×××§×××, ××¤× ××¤× ××¢×× ×××¨×× ×××¤××¢× ×¤×. ××¤×©×¨ ××××××¨ ××ª ×××§××× ××¨××©× ×××£ %{settings_link}.
+      if set location: ××××¨× ×©× ×××§×× ××××ª ×©×× ×××£ %{settings_link} ×ª××¤×©×¨ ×× ××¨×××ª ××©×ª××©×× ××¡××××ª×.
       km away: ×××¨××§ %{count} ×§×´×
       latest edit: "×¢×¨××× ×××¨×× × %{ago}:"
       m away: ×××¨××§ %{count} ××³
@@ -1741,14 +1771,18 @@ he:
       my comments: ×××¢×¨××ª ×©××
       my diary: ××××× ×©××
       my edits: ××¢×¨××××ª ×©××
+      my messages: ×××××¢××ª ×©××
+      my notes: ××¢×¨××ª ×××¤× ×©××
+      my profile: ××¤×¨××¤×× ×©××
       my settings: ×××××¨××ª ×©××
       my traces: ×××¡××××× ×©××
       nearby users: ×¢×× ××©×ª××©×× ××¡××××
-      nearby_changesets: ×¢××× ××× ×¢×¨×××ª ××©×× ×××× ×©× ××©×ª××©×× ××¡××××
-      nearby_diaries: ×¢××× ××× ×¨×©××××ª ××××× ×©× ××©×ª××©×× ××¡××××
+      nearby_changesets: ×¢×¨×××ª ××©×× ×××× ×©× ××©×ª××©×× ××¡××××
+      nearby_diaries: ×¨×©××××ª ×××× ×©× ××©×ª××©×× ××¡××××
       new diary entry: ×¨×©××× ×××©× ×××××
       no friends: ×¢×××× ×× ×××¡×¤×ª ×××¨×× ×××.
       no nearby users: ××× ×¢×××× ×¢×× ××©×ª××©×× ×©××××× ×©×× ×××¤× ××¡××××.
+      notes: ××¢×¨××ª ××¤×
       oauth settings: ××××¨××ª oauth
       remove as friend: ××¡×¨× ××¨×©×××ª ×××¨××
       role: 
@@ -1829,7 +1863,7 @@ he:
       revoke: ××××!
       revoker_name: ××××× ×¢×Ö¾×××
       show: ××¦××
-      showing_page: ××¦××ª ×××£ %{page}
+      showing_page: ×××£ %{page}
       status: ××¦×
     period: 
       one: ×©×¢× ×××ª
@@ -1877,3 +1911,25 @@ he:
       fail: ×©××××ª ××ª×¤×§×× â%{role}â ××××©×ª××© â%{name}â × ××©××. × × ×××××§ ×©×××©×ª××© ×××ª×¤×§×× ×ª×§×× ××.
       heading: ×××©××¨ ×©××××ª ×ª×¤×§××
       title: ×××©××¨ ×©××××ª ×ª×¤×§××
+  welcome_page: 
+    add_a_note: 
+      paragraph_1_html: ×× ×¨×§ ×¨×¦××ª ××ª×§× ××©×× ×§×× ×××× ×× ××× ××××¨×©× ×××××× ××× ××¢×¨××, ×§× ××××¡××£ ××¢×¨×.
+      paragraph_2_html: "×¦×¨×× ×¤×©×× ××××ª ×× <a href='%{map_url}'>×××¤×</a> ××××××¥ ×¢× ×¡×× ×××¢×¨×: <span class='icon note'></span>. ×× ×××¡××£ ×××¤× ×¡××, ×©××¤×©×¨ ×××¨××¨. ×××¨× ×××¡×¤×ª ×××¢×¨× ××© ×××××¥ ×¢× ×©×××¨× ××××¤×× ×××¨×× ××××§× ××ª ××."
+      title: ××× ×× ××× ××¢×¨××? ××¤×©×¨ ××××¡××£ ××¢×¨×!
+    basic_terms: 
+      editor_html: <strong>×¢××¨×</strong> ××× ×ª×× × ×× ××ª×¨ ××¢×¨×××ª ×××¤×.
+      node_html: <strong>×¦×××ª</strong> × ×× × ×§××× ×¢× ××¤×, ×××× ××¡×¢×× ×××ª ×× ×¢×¥ ×××.
+      paragraph_1_html: ××××× OpenStreetMap ××© ×¢×× ××©××. ×× × ××¡×¤×¨ ×××××ª ××¤×ª× ×©×××× ×©××××©×××ª.
+      tag_html: <strong>×ª×</strong> ××× ×¤××¡×ª ××××¢ ×¢× ×¦×××ª ×× ×¢× × ×ª×× ××× ×©× ×©× ××¡×¢×× ×× ×××××ª ××××¨××ª ×××¨×.
+      title: ××× ××× ××¡××¡××× ××××¤××
+      way_html: <strong>× ×ª××</strong> ××× ×§× ×× ××××¨ ××× ××¨×, ××¨×, ××× ×× ××× ×.
+    introduction_html: ××¨×× ×××× ×Ö¾OpenStreetMap, ××¤× ×××¤×©××ª ×©× ××¢×××, ×©××¤×©×¨ ××¢×¨××. ×¢××©×× ×©× ×¨×©××ª, ×××× ×××× ×××¤×©×¨ ×××ª××× ××¦×××¨ ××¤××ª. ×× × ×××¨×× ×§×¦×ª ×©×××ª× ×× ××ª ××××¨×× ×××©×××× ×©×××× ×× ×××¢×ª.
+    questions: 
+      paragraph_1_html: "×-OpenStreetMap ××¡×¤×¨ ××§××¨××ª ×××××× ×¢× ××¤×¨×××§×, ××©××× ×××¢× ××ª ×¢× ×©××××ª, ×××× × ××©××ª××£ ×¤×¢××× ××ª××¢×× × ××©×× ××××¤××. \n\n<a href='%{help_url}'>××§×× ×¢××¨×</a>."
+      title: ××© ×©××××ª?
+    start_mapping: ×××ª××× ×××¤××ª
+    title: ××¨×× ××××!
+    whats_on_the_map: 
+      off_html: ×× ×©××× ×¤× ×× ××××¢ ××¢×ª× × ××× ×××¨××××, ××§××××ª ×××¡×××¨××× ×× ×××¤××ª×××× ×× ×ª×× ×× ×××§××¨××ª ×©××××××× ×××××××ª ×××¦×¨××. ×× × ×××¨×©×× ××× ×× ××××¡××£  ××××¢ ×××¤××ª ××§××× ××ª ×× ××××¤×¡××ª ××× ×× ××© ×× ×××©××¨ ××××× ×××.
+      on_html: OpenStreetMap ××× ××§×× ××××¤×× ×××¨×× ×××ª××× ×× ×××××× â ××× ×××× ×××××× × ××× ××, ××¨××× ××¤×¨××× ×××¨×× ×¢× ××§××××ª. ××¤×©×¨ ×××¤××ª ×× ×××¨ ×××¢××× ×××××ª× ×©××¢× ××× ×××ª×.
+      title: ×× ×¢× ×××¤×