Localisation updates from https://translatewiki.net.

[rails.git] / config / locales / nqo.yml

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 98a67db1950339bfa6f39a1c1d668b08c3403767..3175b68a736fb5e18167350f3ba61c2505e59de6 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -178,7 +178,7 @@ nqo:
       openid: ߏߔߌ߲ ID
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
-      windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      microsoft: ߡߌߞߙߏߛߐߝߕ
       github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
@@ -251,11 +251,25 @@ nqo:
         heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
         agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
         not yet agreed: ߌ ߡߊ߫ ߘߌ߬ߢߍ߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬ ߡߎߣߎ߲߬.
+        review link text: ߛߘߌ߬ߜߋ߲ ߣߌ߲߬ ߠߊߓߊ߬ߕߏ߫ ߌ ߟߊ߫ ߓߍ߲߬ߢߐ߲߰ߡߊ ߘߌ߫ ߖߊ߰ߣߌ߲߫߸، ߞߊ߬
+          ߓߟߏߡߊߜߍ߲߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߖߊ߬ߕߋߡߌ߬ߘߊ߬߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ߟߎ߬ ߟߊߡߌ߬ߣߊ߬.
+        agreed_with_pd: ߌ ߓߘߊ߫ ߓߊ߲߫ ߊ߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߞߴߌ ߦߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߖߊ߬ߕߋ߬
+          ߟߊ߫ ߞߵߊ߬ ߦߋ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ ߘߊߞߎ߲ ߘߐ߫.
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
       save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
       delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߰ߛߌ߬ߟߌ...
     go_public:
       heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+      currently_not_public: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߦߋ߫ ߕߐ߯ߒߕߊ߲ߧߊ ߟߋ߬ ߘߐ߫ ߥߊ߯ߕߌ ߣߌ߲߬
+        ߠߊ߫، ߏ߬ ߘߐ߫߸ ߡߐ߱ ߟߎ߬ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߗߋߛߓߍ߫ ߗߋ߫ ߟߴߌ ߡߊ߬ ߞߎߡߊ߫ ߕߴߌ ߘߌ߲߬ߞߌߙߊ ߟߐ߲߫
+        ߞߏ ߡߊ߬. ߖߐ߲߬ߛߊ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߣߍ߲ ߠߎ߬ ߦߌ߬ߘߊ߬ ߥߟߊ߫ ߞߊ߬ ߡߐ߱ ߟߎ߬ ߟߊߘߌ߬ߢߍ߬
+        ߌ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫ ߓߟߐߛߐ߫ ߞߍߦߙߐ ߟߊ߫، ߘߎ߰ߟߊ߬ߘߐ߬ ߞߘߎ ߛߐ߲߬ߞߌ߲߫.
+      only_public_can_edit: ߞߊ߬ߦߌ߯ API ߀.߆ ߟߊߓߊ߯ߙߊ ߘߊߡߌ߬ߣߊ߬ ߘߊ߫، ߜߍߘߐ߫ (ߖߊ߬ߡߊ ߢߊߞߘߐ߫)
+        ߓߟߏߡߊߜߍ߲ߠߊ ߟߎ߬ ߘߐߙߐ߲߫ ߠߋ߬ ߦߋ߫ ߛߋ߫ ߟߊ߫ ߔߊ߬ߔߘߊ ߞߣߐߘߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߬ ߠߊ߫.
+      find_out_why: ߊ߬ ߢߊߢߌߣߌ߲߫ ߓߊ߫ ߡߎ߲߬ߠߊ߫
+      email_not_revealed: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߕߍߣߊ߬ ߝߊߙߊ߲ߛߊ߫ ߖߊ߬ߡߊ߫ ߣߊ߬ߕߐ ߟߎ߬ ߓߟߏ߫.
+      not_reversible: ߒ߬ߓߊ߬ ߞߍߟߌ ߏ߬ ߘߏ߲߬ ߕߍߣߊ߬ ߣߊ߬ ߟߊ߫ ߓߐ߫ ߟߴߊ߬ ߡߊ߬، ߊ߬ ߘߏ߲߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫
+        ߞߎߘߊ ߟߎ߬ ߓߍ߯ ߦߋ߫ ߜߍߘߐߡߐ߮ ߟߋ߬ ߘߌ߫ ߘߊ߲ߛߎ߲ ߓߟߏ߫ ߡߎ߬ߕߎ߲߬.
       make_edits_public_button: ߊ߬ ߓߍ߯ ߞߍ߫ ߒ ߠߊ߫ ߖߡߊ߬ߘߐ߬ ߡߊߦߟߍߡߊ߲ߠߌ߲ ߘߌ߫
     update:
       success_confirm_needed: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
@@ -266,6 +280,12 @@ nqo:
   browse:
     created: ߛߌ߲ߘߌߣߍ߲
     closed: ߘߊߕߎ߲߯ߣߍ߲
+    created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+    closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+    created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+    closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+    deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
+    edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     version: ߦߌߟߡߊ
     in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     anonymous: ߕߐ߯ߒߕߊ߲
@@ -285,6 +305,8 @@ nqo:
       relation: ߕߍߓߊ߯ߦߊ (%{count})
       relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
       comment: ߡߙߌߣߊ߲ (%{count})
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
       feed:
@@ -292,6 +314,8 @@ nqo:
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
       history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
@@ -391,9 +415,19 @@ nqo:
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changeset_comments:
     comment:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} %{author}
+        ߓߟߏ߫
       commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+    comments:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} ߠߊ߫
+        %{author} ߓߟߏ߫
     index:
       title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+      title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+        ߘߊߘߐߖߊߥߏ
+    timeout:
+      sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+        ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   dashboards:
     contact:
       km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -444,11 +478,12 @@ nqo:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
       heading: 'ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬ id: %{id} ߘߌ߫'
     diary_entry:
-      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} %{language_link}
-        ß\9fß\8b߬ ß\9eß\8a߲߬
+      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} ߦߋ߫ %{language_link}
+        ß\9fß\8b߬ ß\98ß\90ß«
       updated_at_html: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߬ ߞߐߟߕߊ %{updated} ߘߐ߫
       comment_link: ߡߙߌߣߊ߲ ߡߍ߲ ߦߋ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊ߫
       reply_link: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
+      no_comments: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߕߴߦߋ߲߬
       edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
       hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
       unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
@@ -514,6 +549,10 @@ nqo:
       success: '%{name} ߓߘߊ߫ ߓߊ߲߫ ߓߐ߫ ߟߴߌ ߕߋߙߌߦߊ ߟߊ߫'
       not_a_friend: '%{name} ߕߴߌ ߕߋߙߌ ߝߋ߲߫ ߘߌ߫.'
   geocoder:
+    search:
+      title:
+        results_from_html: ߞߐߝߟߌ ߝߘߊߣߍ߲߫ ߦߋ߫ %{results_link} ߟߋ߬ ߟߊ߫
+        latlon: ߞߣߐߟߊ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -603,11 +642,13 @@ nqo:
           public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
           public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
           public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          recycling: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߫ ߘߊߞߎ߲ (recyclage)
           restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
           school: ߞߊ߬ߙߊ߲߬ߕߊ
           shelter: ߥߊ߬ߣߊߙߌ
           shower: ߢߍ߲߮
           social_centre: ߘߍ߬ߘߐ߬ߞߏ ߟߎ߫ ߕߊ߲ߓߊ߲
+          social_facility: ߘߍ߬ߢߐ߲߰ߦߊ߬ ߗߋߘߊ \ ߓߊ߬ߛߊ߲߬ߢߐ߲߰ߘߐ߬ ߘߊߞߎ߲
           studio: ߓߟߏߦߊߛߏ
           swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
           taxi: ߥߊߟߌߥߊߟߌ
@@ -616,12 +657,14 @@ nqo:
           toilets: ߢߍ߲߮
           townhall: ߛߏߕߌ߯ߘߊ
           university: ߖߊ߯ߓߘߊ
+          vehicle_inspection: ߓߏ߬ߙߌ߬ߝߋ߲߬ ߝߛߍ߬ߝߛߍ߫ ߦߌߟߊ
           vending_machine: ߝߋ߰ߙߋ߬ߞߍ߬ ߕߙߏߞߏ
           veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
           village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
           waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
           waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
           waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
+          watering_place: ߖߌߡߊ߫ ߦߙߐ
           water_point: ߖߌ߫ ߡߊ߫ ߦߙߐ
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:
@@ -978,9 +1021,9 @@ nqo:
         resolved: ߊ߬ ߓߘߊ߫ ߢߊߓߐ߫
     show:
       title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
-      report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
-      last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
+      report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
         ߓߟߏ߫
       resolve: ߊ߬ ߢߊߓߐ߫
       ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
@@ -1192,15 +1235,15 @@ nqo:
   messages:
     inbox:
       title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
-      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
-      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
       messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
-      from: ߞߊ߬ ߝߘߊ߫
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
       no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
         ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
       people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
+    messages_table:
+      from: ߞߊ߬ ߝߘߊ߫
+      to: ߞߊ߬ ߕߊ߯
+      subject: ߝߐߡߊ
+      date: ߕߎ߬ߡߊ߬ߘߊ
     message_summary:
       unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
       read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
@@ -1220,11 +1263,6 @@ nqo:
       body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
     outbox:
       title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
-      my_inbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߛߐ߬ߡߐ߲߲߬ߣߍ߲
-      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
-      to: ߞߊ߬ ߕߊ߯
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
       no_sent_messages_html: ߗߋߛߓߍ߫ ߗߋߣߍ߲߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߓߌ߬ߟߊ߬ߒ߬ߡߊ߬ߟߌ
         ߘߐ߫ %{people_mapping_nearby_link}؟
       people_mapping_nearby: ߡߐ߱ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬ ߌ ߕߙߐߝߍ߬
@@ -1243,28 +1281,33 @@ nqo:
         ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
     sent_message_summary:
       destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    heading:
+      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
+      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
     mark:
       as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
       as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
   passwords:
-    lost_password:
+    new:
       title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
       heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
         ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
+    create:
       notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
         ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
       notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
-    reset_password:
+    edit:
       title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
       heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
       reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
-      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
       flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
+    update:
+      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
   preferences:
     show:
       title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
@@ -1326,7 +1369,7 @@ nqo:
         facebook:
           title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
-        windowslive:
+        microsoft:
           title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
           alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
         github:
@@ -1477,30 +1520,25 @@ nqo:
           footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
-          cable:
-          - ߘߎ߲ߞߎߟߎ߲
-          runway:
-          - ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
-          - ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
+          cable_car: ߘߎ߲ߞߎߟߎ߲
+          runway_only: ߛߊ߲ߡߊߘߊ߲ ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxiway: ߥߊߟߌߥߊߟߌ ߫ ߛߌߟߊ
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
-          forest: ߕߎ
+          forest_only: ߕߎ
           wood: ߦߙߌ
+          common_only: ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
           resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
-          common:
-          - ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
           retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
-          lake:
-          - ߞߐ߰ߖߌ߬ߘߟߊ
+          lake_only: ߞߐ߰ߖߌ߬ߘߟߊ
           farm: ߝߏ߬ߘߏ
           cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
-          school:
-          - ߞߊ߬ߙߊ߲߬ߕߊ
-          - ߖߊ߯ߓߘߊ
+          school_only: ߞߊ߬ߙߊ߲߬ߕߊ
+          university: ߖߊ߯ߓߘߊ
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
           bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
@@ -1551,7 +1589,6 @@ nqo:
       visibility: 'ߦߋߟߌ:'
       confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
     trace_paging_nav:
-      showing_page: ߞߐߜߍ %{page}
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace: