Merge remote-tracking branch 'upstream/pull/3232'

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index bbdb5b878981df20b197cf3efff19ed673f841c3..4edadf16d7c6efacf40d3d9c7e1e4aa9cb7f7384 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -116,16 +116,24 @@ nqo:
         title: ߝߐߡߊ
         body: ߝߊ߬ߘߌ
         recipient: ߟߊ߬ߛߐ߬ߘߐ߲߬ߕߊ
+      redaction:
+        title: ߞߎ߲߬ߕߐ߮
+        description: ߕߐ߯ߛߓߍߟߌ
       report:
         category: ߞߎ߲߭ ߘߏ߫ ߝߴߌ ߟߊ߫ ߘߊ߲߬ߕߍ߰ߟߌ ߟߊ߫
         details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ߫ ߜߘߍ߫ ߟߎ߫ ߡߊߛߐ߫ ߞߊ߬ ߓߍ߲߬ ߝߙߋߞߋ ߡߊ߬ (ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲߫)
       user:
         email: ߢ:ߞߏ߲ߘߏ
+        email_confirmation: ߢ:ߞߏ߲ߘߏ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ
+        new_email: ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ߫ ߞߎߘߊ
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
         description: ߕߐ߯ߛߓߍߟߌ
-        languages: ߞߊ߲ ߠߎ߬
+        languages: ߞߊ߲߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
         pass_crypt: ߕߊ߬ߡߌ߲߬ߞߊ߲
         pass_crypt_confirmation: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊߛߙߋߦߊ߫
+    help:
+      user:
+        new_email: (ߊ߬ ߞߊ߫ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫ ߡߎ߰ߡߍ߫)
   datetime:
     distance_in_words_ago:
       half_a_minute: ߡߌ߬ߛߍ߲߬ ߕߟߊ߫ ߞߘߐ߫
@@ -368,6 +376,7 @@ nqo:
       has_commented_on: '%{display_name} ߟߎ߫ ߓߘߴߊ߬ߟߎ߬ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ
         ߟߎ߫ ߞߊ߲߬'
       post: ߗߋߓߏ߲
+      when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
       newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
       older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
@@ -399,11 +408,18 @@ nqo:
       prefix:
         aerialway:
           cable_car: ߘߎ߲ߞߎߟߎ߲
+          chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲
         aeroway:
+          gate: ߘߏ߲߬ߘߊ
           hangar: ߜߕߊ
+          helipad: ߛߊ߲ߡߊߘߊ߲
+          holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
+          navigationaid: ߛߊ߲ߡߊߘߊ߲ ߛߏ߯ߓߊߟߌ ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬
           parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
           runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫
           taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
+          terminal: ߟߊ߬ߓߊ߲
         amenity:
           bank: ߜߍߓߏ߲
           bar: ߡߌ߲߬ߓߏ߲
@@ -448,7 +464,10 @@ nqo:
           pharmacy: ߓߊߛߌߓߏ߲
           place_of_worship: ߟߐ߲ߠߌ߲ߦߊ ߘߌ߲߬ߞߌߙߊ
           police: ߕߐ߲ߓߟߏߡߊ
+          post_box: ߗߋߓߏ߲ ߞߏ߲߬ߘߏ
+          post_office: ߗߋߓߏ߲ ߛߓߍߘߊ
           prison: ߥߛߎߓߏ߲
+          pub: ߟߊߥߊ߲߬ߞߊ߫
           public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
           public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
           public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
@@ -504,6 +523,7 @@ nqo:
           bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
+          path: ߛߌߟߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
           raceway: ߜߛߊ߬ߞߍ߬ ߛߌߟߊ
@@ -536,7 +556,9 @@ nqo:
           garden: ߣߊߞߐ
           horse_riding: ߛߏ߬ ߓߏߙߌ
           nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+          park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
           sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
+          stadium: ߞߊߡߊ߲
           swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
         man_made:
           bridge: ߛߍ߲
@@ -544,6 +566,9 @@ nqo:
           telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
           tower: ߛߊ߲ߓߏ߲
           water_tower: ߖߌߡߣߐ
+          water_well: ߊ߬ ߞߊߢߌ߲߬
+          water_works: ߖߌ߫ ߓߊ߯ߙߊ
+          windmill: ߝߢߐ߫ ߥߎ߮
           works: ߝߊ߲ߓߏ߲
           "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
         military:
@@ -552,6 +577,7 @@ nqo:
           forest: ߕߎ
           hill: ߞߎ߬ߙߎ
           island: ߕߌ߲
+          point: ߕߏ߲ߘߋ
           sand: ߕߌ߬ߢߍ
           tree: ߦߙߌߖߎ
           valley: ߝߏ߲ߝߊ߲
@@ -559,19 +585,32 @@ nqo:
           wetland: ߦߙߐ߫ ߦߌߟߌ߲ߣߍ߲
           wood: ߦߙߌ
         office:
+          company: ߖߊ߬ߥߏ߬ߘߊ
+          diplomatic: ߕߍߓߊ߯ߦߊ ߛߓߍߘߊ
+          educational_institution: ߟߊ߬ߞߙߐ߬ߛߌ߬ߟߌ ߘߋ߬ߙߌ߬ߘߊ
+          employment_agency: ߓߊ߯ߙߊ ߖߋ߬ߕߌ߰ߘߊ
           government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
+          it: ߕߞ ߛߓߍߘߊ
+          lawyer: ߟߊ߬ߝߛߊ߬ߟߌ߬ߟߊ
+          logistics: ߕߞߌߦߊ ߛߓߍߘߊ
           newspaper: ߝߐ߰ߓߍ߬ ߛߓߍ߬ߘߊ߮
           ngo: ߛ.ߘ.ߞ ߛߓߍߘߊ
+          notary: ߛߙߋߘߐߦߟߊ
           religion: ߣߊߡߎ߲ ߛߓߍߘߊ
+          research: ߛߓߍߘߊ ߕߌߙߌ߲ߠߌ߲ߘߊ
           telecommunication: ߓߌ߬ߟߊ߬ߢߐ߲߱ߡߊ ߛߓߍߘߊ
           travel_agent: ߕߐ߰ߕߐ߰ߟߌ߬ ߗߋߘߊ
           "yes": ߛߓߍߘߊ
         place:
+          city: ߛߏ
+          city_block: ߛߏ ߜߊ߲߬ߕߎ
           country: ߖߡߊ߬ߣߊ
+          county: ߖߡߊ߬ߣߊ
           farm: ߝߏ߬ߘߏ
           house: ߟߎ
           houses: ߟߎ ߟߎ߬
           island: ߕߌ߲
+          locality: ߦߌߟߊߦߙߐ
           region: ߕߌ߲߬ߞߎߘߎ߲
           sea: ߞߐ߰ߖߌ
           state: ߞߊ߬ߝߏ
@@ -652,6 +691,7 @@ nqo:
         level6: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
+        level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
       types:
         towns: ߛߏ
         places: ߘߌ߲߬ߞߌߙߊ
@@ -666,6 +706,8 @@ nqo:
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
       user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
       issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
       reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
@@ -851,11 +893,39 @@ nqo:
       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
+  confirmations:
+    confirm:
+      heading: ߌ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߡߊߝߟߍ߫߹
+      introduction_1: ߊ߲ ߓߘߊ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߌ ߡߊ߬.
+      introduction_2: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߙߋߦߊ߫ ߛߘߌ߬ߜߋ߲ ߛߐ߲߬ߞߌ߲ ߠߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߞߣߐ߫߸
+        ߏ߬ ߓߊ߯ ߞߍ߫ ߌ ߘߌ߫ ߛߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ (ߡߊߔߌ߲) ߘߊߡߌ߬ߣߊ߫ ߟߊ߫.
+      press confirm button: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߞߘߎ ߛߐ߲߬ߞߌ߲߫ ߘߎ߰ߟߊ߫ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߎߣߎ߲߫.
+      button: ߊ߬ ߟߊߛߙߋߦߊ߫
+      success: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫߸ ߌ ߣߌ߫ ߗߋ߫ ߌ ߜߊ߲߬ߞߎ߲ ߠߊ߫߹
+      already active: ߖߊ߬ߕߋ߬ߘߊ ߣߌ߲߬ ߠߊߛߙߋߦߊߣߍ߲߫ ߞߘߐ ߟߋ߬ ߦߋ߫.
+      unknown token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߏ߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
+      reconfirm_html: ߣߴߌ ߞߍ߫ ߘߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߗߋ߫ ߕߎ߲߯ߣߌ߲߫߸ <a
+        href="%{reconfirm}">ߦߊ߲߬ ߛߐ߲߬ߞߌ߲߫</a>
+    confirm_resend:
+      success_html: ߊ߲ ߓߘߊ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߦߟߌߣߐ ߗߋ߫ %{email} ߡߊ߬ ߣߴߌ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ
+        ߟߊߛߙߋߦߊ߫ ߌߞߘߐ߫ ߣߌ߲߬߸ ߌ ߘߌ߫ ߛߋ߫ ߡߊߔߌ߲ (ߔߊ߬ߔߘߊ߬ ߟߊߘߊ߲) ߘߊߡߌ߬ߣߊ߫ ߟߊ߫.<br/><be/>ߣߴߌ
+        ߞߊ߬ ߊ߲ߕߌߛߑߔߊߡ ߞߊ߲ߞߋ ߟߊߓߊ߯ߙߊ߫ ߏ߬ ߡߍ߲ ߦߋ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ ߡߊߢߌߣߌ߲ߠߌ߲ ߗߋ߫ ߟߊ߫߸ ߌ
+        ߦߋ߫ ߘߍ߲߬ߞߣߍ߬ߦߊ߫ ߡߎߣߎ߲߬ ߖߊ߰ߣߌ߲߫ ߛߙߍߘߍ߫ ߘߐߞߏߟߏ߲ %{sender} ߞߏ ߘߐ߫ ߓߊߏ߬ ߊ߲ ߠߎ߬
+        ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߡߊߢߌߣߌ߲ߠߌ߲߫ ߛߌ߫ ߖߋ߬ߓߌ߬ ߟߊ߫.
+      failure: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{name} ߡߊ߫ ߛߐ߬ߘߐ߲߫.
+    confirm_email:
+      heading: ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߡߊߝߊ߬ߟߋ߲߬ߠߌ߲ ߠߊߛߙߋߦߊ߫
+      press confirm button: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߞߘߎ ߘߌ߯ ߘߎ߰ߟߊ ߘߐ߫ ߞߵߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ߫
+        ߞߎߘߊ ߟߊߛߙߋߦߊ߫.
+      button: ߊ߬ ߟߊߛߙߋߦߊ߫
+      success: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ߫ ߞߎߘߊ ߡߊߝߊ߬ߟߋ߲߬ߠߌ߲ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫߹
+      failure: ߢ:ߞߏ߲ߘߏ ߘߏ߫ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫ ߖߐߟߐ߲ߞߐ (ߥߏߘߌߜߊߠߊ߲) ߣߌ߲߬ ߠߊ߫ ߞߘߐ߬ߡߊ߲߫.
+      unknown_token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߣߌ߲߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
   messages:
     inbox:
       title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
       my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
-      outbox: ߞߐߞߊ߲߫ ߞߏ߲ߘߏ
+      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
       messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
       from: ߞߊ߬ ߝߘߊ߫
       subject: ߝߐߡߊ
@@ -884,8 +954,8 @@ nqo:
       body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
     outbox:
       title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
-      my_inbox_html: ߒ ߠߊ߫ %{inbox_link}
-      outbox: ߗߋߟߌ߫ ߞߏ߲ߘߏ
+      my_inbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߛߐ߬ߡߐ߲߲߬ߣߍ߲
+      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
       to: ߞߊ߬ ߕߊ߯
       subject: ߝߐߡߊ
       date: ߕߎ߬ߡߊ߬ߘߊ
@@ -916,8 +986,80 @@ nqo:
       as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
+  passwords:
+    lost_password:
+      title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
+      heading: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
+      email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
+      new password button: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
+      help_text: ߢ:ߞߏ߲ߘߏ ߟߊߘߏ߲߬ ߌ ߞߊ߬ ߡߍ߲ ߠߊߓߊ߯ߙߊ߫ ߞߵߌ ߜߊ߲߬ߞߎ߲߫߸ ߊ߲ ߘߌ߫ ߛߘߌ߬ߜߋ߲ ߗߴߌ
+        ߡߵߊ߬ ߟߊ߫ ߌ ߘߴߏ߬ ߟߊߓߊ߯ߙߊ߫ ߞߵߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫.
+      notice email on way: ߤߊߞߍ߬ߕߏ߫ ߌ ߓߘߊ߫ ߓߐߣߵߊ߬ ߘߐ߫:-(ߒ߬ߞߊ߬ ߗߋߛߓߍ ߘߏ߫ ߦߴߊ߬ ߞߣߐ߫
+        ߏ߬ ߘߐ߫ ߌ ߘߌ߫ ߛߴߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫ ߖߏߣߊ߫.
+      notice email cannot find: ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߕߴߛߋ߫ ߢߌߣߌ߲߫ ߠߊ߫߸ ߤߊߞߍ߬ߕߏ߫.
+    reset_password:
+      title: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
+      heading: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߫ %{user} ߦߋ߫
+      reset: ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߦߟߍ߬ߡߊ߲߬
+      flash changed: ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߓߘߊ߫ ߓߊ߲߫ ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫.
+      flash token bad: ߌ ߞߊߣߊ߬ ߖߐߟߐ߲ߞߐ ߏ߬ ߢߌߣߌ߲߫߸ URL ߡߊߝߟߍ߫ ߕߎ߬ߡߊ߬ߘߐ߫؟
+  sessions:
+    new:
+      title: ߌ ߜߊ߲߬ߞߎ߲߫
+      heading: ߌ ߜߊ߲߬ߞߎ߲߫
+      email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
+      password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
+      openid_html: '%{logo} ߘߊߦߟߍߟߌ߫ ID:'
+      remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
+      lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
+      login_button: ߌ ߜߊ߲߬ߞߎ߲߫
+      register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
+      with username: 'ߓߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߦߴߌ ߓߟߏ߫ ߟߋ߬؟ ߒ߬ߓߊ߬ ߌ ߜߊ߲߬ߞߎ߲߬
+        ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮ ߟߴߊ߬ ߣߴߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲:'
+      new to osm: ߌ ߞߎߘߊ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬؟
+      to make changes: ߖߐ߲߬ߛߊ߫ ߞߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߐ߲ߕߊ ߟߎ߫ ߡߝߊ߬ߟߋ߲߬ߠߌ߲߸ ߝߏ߫ ߖߊ߬ߕߋ߬ߘߊ
+        ߘߏ߫ ߦߋ߫ ߞߴߌ ߓߟߏ߫.
+      create account minute: ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߛߌ߲ߘߌ߫. ߊ߬ ߦߋ߫ ߓߍ߲߬ ߠߊ߫ ߡߌ߬ߛߍ߲߬ ߞߋߟߋ߲߫ ߠߋ߬
+        ߡߊ߬.
+      no account: ߖߊ߬ߕߋ߬ߘߊ߬ ߕߴߌ ߓߟߏ߫ ߓߊ߬؟
+      account not active: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߡߊ߫ ߓߌ߬ߟߵߊ߬ ߟߊ߫ ߡߎߣߎ߲߬. <a href="%{reconfirm}">ߛߘߌ߬ߜߋ߲
+        ߡߍ߲ ߦߋ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߢ:ߞߏ߲ߘߏ ߞߣߐ߫߸ ߏ߬ ߟߊߓߊ߯ߙߊ߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ
+        ߟߊߞߎߣߎ߲߫߸ ߥߟߊ߫ %{reconfirm}</a>ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߗߋߛߓߍ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫<a/>
+      auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
+      openid_logo_alt: ߌ ߜߊ߲߬ߞߎ߲߬ ߏߔߌ߲ ID ߟߊ߫
+      auth_providers:
+        openid:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID ߘߌ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߏߔߌ߲ ID URL ߟߊ߫
+        google:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߎߜ߭ߏߟ ߏߔߌ߲ ID ߟߊ߫
+        facebook:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߝߋߛߑߓߎߞ ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߟߊ߫
+        windowslive:
+          title: ߌ ߜ߭ߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߌ߲ߘߏߥߛ ߟߊߌߝ߭ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+        github:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߜ߭ߌߕߑߤߐߓ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+        wikipedia:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߞߌߔߋߘߌߦߊ ߖߊ߬ߕߋ߬ߘߊ ߟߊ߫
+        wordpress:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߥߐߘߑߔߙߍߛ ߏߔߌ߲ ID ߟߊ߫
+        aol:
+          title: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߟߊ߫
+          alt: ߌ ߜߊ߲߬ߞߎ߲߫ ߊߏߍߟ ߏߔߌ߲ ID ߟߊ߫
+    destroy:
+      title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
+      heading: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫
+      logout_button: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
   shared:
     markdown_help:
+      title_html: ߊ߬ ߞߛߍ߬ߞߛߍ߫ <a href="https://kramdown.gettalong.org/quickref.html">ߞߙߊߡߑߘߐߥ</a>
+        ߟߊ߫
       headings: ߞߎ߲߬ߕߐ߮
       heading: ߞߎ߲߬ߕߐ߮
       subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
@@ -1033,6 +1175,7 @@ nqo:
     key:
       table:
         entry:
+          main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
           footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
@@ -1058,38 +1201,66 @@ nqo:
           bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
           bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮
           toilets: ߢߍ߲߮
-    richtext_area:
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      preview: ߊ߬ ߘߐߜߍ߫ ߡߎߣߎ߲߬
-    markdown_help:
-      title_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-        ߟߋ߬ ߟߊ߫
-      headings: ߞߎ߲߬ߕߐ߮
-      heading: ߞߎ߲߬ߕߐ߮
-      subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
-      unordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߓߊߟߌ
-      ordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߣߍ߲
-      first: ߝߛߌ߬ ߝߟߐ
-      second: ߝߛߌ߬ ߝߌߟߊߣߊ߲
-      link: ߛߘߌ߬ߜߋ߲
-      text: ߞߟߏߘߋ߲
-      image: ߖߌ߬ߦߊ߬ߓߍ
-      url: URL
     welcome:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
       whats_on_the_map:
         title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
+      questions:
+        title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
   traces:
     new:
+      upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫
+      visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: ߘߍ߬ߡߍ߲߬ߠߌ߲
       help_url: https://wiki.openstreetmap.org/ߥߞߌ/ߟߊ߬ߦߟߍ߬ߟߌ
+    create:
+      upload_trace: GPS ߜߋ߬ߙߋ ߟߊߞߎߘߦߊ߫
+    edit:
+      cancel: ߊ߬ ߘߐߛߊ߬
+      title: ߜߋ߬ߙߋ ߡߊߦߟߍ߬ߡߊ߲߬ߠߌ߲ %{name}
+      heading: ߜߋ߬ߙߋ ߡߊߦߟߍ߬ߡߊ߲߬ߠߌ߲ %{name}
+      visibility_help: ߣߌ߲߬ ߞߘߐ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+    update:
+      updated: ߜߋ߬ߙߋ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
+    trace_optionals:
+      tags: ߘߎ߲ߛߓߍ ߟߎ߬
     show:
+      title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
+      heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
+      filename: ߞߐߕߐ߮ ߕߐ߮
+      download: ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲
+      uploaded: 'ߛߊ߬ߦߌ߬ߣߍ߲߫:'
+      start_coordinates: ߘߏ߲߬ߖߟߎ߬ߡߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
+      coordinates_html: '%{latitude}; %{longitude}'
       map: ߡߊߔ
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬
       owner: 'ߊ߬ ߕߌ߱:'
       description: 'ߞߊ߲߬ߛߓߍߟߌ:'
       tags: 'ߘߎ߲ߛߓߍ ߟߎ߬:'
+      none: ߒ߬ߒ߫
+      edit_trace: ߜߋ߬ߙߋ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߬
+      delete_trace: ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫
+      trace_not_found: ߜߋ߬ߙߋ ߡߊ߫ ߛߐ߬ߘߐ߲߫߹
+      visibility: 'ߦߋߟߌ:'
+      confirm_delete: ߞߊ߬ ߜߋ߬ߙߋ ߣߌ߲߬ ߖߏ߰ߛߌ߫؟
+    trace_paging_nav:
+      showing_page: ߞߐߜߍ %{page}
+      older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
+      newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
+  oauth_clients:
+    show:
+      edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫
+      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
+  users:
+    new:
+      email address: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
+      confirm email address: 'ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫:'
+      display name: 'ߟߊ߬ߓߊ߰ߙߊ߬ ߕߐ߮:'
+      display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
+        ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
 ...