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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index c7995cbcf274dbf294452a7154e684d6f5e80459..64a461cc39714637a0440b4b5d2ea433420acf7c 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -152,6 +152,9 @@ nqo:
     help:
       doorkeeper/application:
         redirect_uri: ߛߌ߬ߕߊ߬ߙߌ߬ ߞߋߟߋ߲߫ ߠߊߓߊ߯ߙߊ߫ URL ߡߊ߬
+      user_block:
+        needs_view: ߊ߬ ߝߐ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߡߊ߬ߞߏ ߦߋ߫ ߜߊ߲߬ߞߎ߲߬ߠߌ߲ ߠߊ߫ ߓߊ߬ߟߌ߬ߟߌ ߣߌ߲߬ ߞߏ
+          ߟߛߊߣߌ߲ߧߊ ߕߍ߫ ߓߊ߬؟
       user:
         new_email: (ߊ߬ ߞߊ߫ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫ ߡߎ߰ߡߍ߫)
   datetime:
@@ -198,18 +201,32 @@ nqo:
       title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
       my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
       current email address: ߕߋ߲߭ߕߋ߲߭ ߢߎߡߍߙߋ߲߫ ߞߏ߲ߘߏ
+      external auth: ߞߐߞߊ߲ߠߊ ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ߬ߟߌ
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
       public editing:
         heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+        enabled: ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߟߊ߫. ߊ߬ ߕߍ߫ ߘߋ߬ ߞߏ߫ ߕߐ߯ߒߕߊ߲ ߛߋ߫ ߕߐ߫ ߓߍ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫
+          ߠߊ߫.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+        disabled: ߊ߬ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫ ߊ߬ ߘߏ߲߬ ߕߍ߫ ߛߋ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+          ߛߎ߯-ߎ-ߛߎ߫ ߞߐ߲߬ߣߍ߲߫ ߦߋ߫ ߢߍ ߘߐ߫߸ ߏ߬ ߓߍ߯ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߘߌ߫.
         disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
       public editing note:
         heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
       contributor terms:
+        heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
+        agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
+        not yet agreed: ߌ ߡߊ߫ ߘߌ߬ߢߍ߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬ ߡߎߣߎ߲߬.
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
       save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
+      make edits public button: ߊ߬ ߓߍ߯ ߞߍ߫ ߒ ߠߊ߫ ߖߡߊ߬ߘߐ߬ ߡߊߦߟߍߡߊ߲ߠߌ߲ ߘߌ߫
+    update:
+      success_confirm_needed: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
+        ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߡߊߝߟߍ߫ ߦߟߌߣߐ߫ ߞߏ ߘߐ߫ ߞߵߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߟߊߛߙߋߦߊ߫.
+      success: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫.
   browse:
     created: ߛߌ߲ߘߌߣߍ߲
     closed: ߘߊߕߎ߲߯ߣߍ߲
@@ -234,7 +251,10 @@ nqo:
     changeset:
       title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
       belongs_to: ߛߓߍߦߟߊ
+      node: ߥߎߙߋ߲ߛߋ߲ %{count}
+      node_paginated: ߥߎߙߋ߲ߛߋ߲ %{x}-%{y} ߦߋ߫ %{count}
       way: ߛߌߟߊ (%{count})
+      way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count})
       relation: ߕߍߓߊ߯ߦߊ (%{count})
       relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
       comment: ߡߙߌߣߊ߲ (%{count})
@@ -242,16 +262,24 @@ nqo:
       commented_by_html: ߦߟߌߣߐ ߡߍ߲ ߝߘߊߣߍ߲߫ ߦߋ߫ %{user} ߟߊ߫ <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
+      feed:
+        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
+        title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
+    node:
+      title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
+      history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
     way:
       title_html: 'ߛߌߟߊ: %{name}'
       history_title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
+      nodes: ߥߎߙߋ߲ߛߋ߲ ߠߎ߬
     relation:
       title_html: 'ߕߍߓߊ߯ߦߊ: %{name}'
       history_title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
       members: ߛߌ߲߬ߝߏ߲ ߠߎ߬
     relation_member:
+      entry_role_html: '%{type} %{name} %{role} ߘߌ߫'
       type:
         node: ߘߐ߬ߞߌߛߍ
         way: ߛߌߟߊ
@@ -280,6 +308,7 @@ nqo:
         note: ߘߐ߬ߞߌߛߍ
     redacted:
       type:
+        node: ߥߎߙߋ߲ߛߋ߲
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     start_rjs:
@@ -630,6 +659,7 @@ nqo:
           bomb_crater: ߘߐ߬ߝߐ ߝߏߘߏ߲ ߝߏ߲ߝߊ߲
           battlefield: ߞߟߊߘߊ
           boundary_stone: ߓߐߕߏ߲ ߘߊ߲߬ߞߓߊ
+          building: ߓߏ߲߫ ߞߘߐߞߘߐ
           castle: ߖߌ߲߬ߓߏ߲
           church: ߓߊ߬ߕߏ߬ߓߏ߲
           house: ߟߎ
@@ -664,6 +694,9 @@ nqo:
           mine: ߘߊ߬ߡߊ߲
           telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
           tower: ߛߊ߲ߓߏ߲
+          wastewater_plant: ߖߌ߫ ߣߐ߯ ߛߍ߲ߛߍ߲߫ ߦߌߟߊ
+          watermill: ߖߌߡߣߐ
+          water_tap: ߖߌߓߘߎ
           water_tower: ߖߌߡߣߐ
           water_well: ߊ߬ ߞߊߢߌ߲߬
           water_works: ߖߌ߫ ߓߊ߯ߙߊ
@@ -672,10 +705,17 @@ nqo:
           "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
         military:
           airfield: ߣߊ߲߬ߕߌ߰ ߛߊ߲ߡߊߘߊ߲
+          barracks: ߘߊ߮
+          "yes": ߛߏ߬ߙߌ߬ߡߊ߬ߘߋ߲
         natural:
           forest: ߕߎ
           hill: ߞߎ߬ߙߎ
           island: ߕߌ߲
+          land: ߘߎ߱
+          marsh: ߖߌߓߛߍ
+          mud: ߓߐ߭
+          peak: ߞߎ߲߬ߕߍ
+          peninsula: ߕߌ߲ߡߎߣߎ߲
           point: ߕߏ߲ߘߋ
           sand: ߕߌ߬ߢߍ
           tree: ߦߙߌߖߎ
@@ -688,7 +728,9 @@ nqo:
           diplomatic: ߕߍߓߊ߯ߦߊ ߛߓߍߘߊ
           educational_institution: ߟߊ߬ߞߙߐ߬ߛߌ߬ߟߌ ߘߋ߬ߙߌ߬ߘߊ
           employment_agency: ߓߊ߯ߙߊ ߖߋ߬ߕߌ߰ߘߊ
+          financial: ߣߊ߲߬ߝߟߏ߬ߦߊ߬ߟߌ ߛߓߍߘߊ
           government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
+          insurance: ߟߊ߬ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߟߌ ߛߓߍߘߊ
           it: ߕߞ ߛߓߍߘߊ
           lawyer: ߟߊ߬ߝߛߊ߬ߟߌ߬ߟߊ
           logistics: ߕߞߌߦߊ ߛߓߍߘߊ
@@ -721,23 +763,37 @@ nqo:
           construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
           halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
           junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
+          preserved: ߣߍ߰ߛߌ߬ߟߊ߬ ߟߊߞߊ߲ߘߊߣߍ߲
+          proposed: ߣߍ߰ߛߌߟߊ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߰ߣߍ߲
+          spur: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
           station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
+          yard: ߣߍ߰ߛߌߟߊ ߝߍ߬ߟߊ
         shop:
+          agrarian: ߛߣߍ߬ߞߍ߬ ߖߐ߰ߙߊ߲߬ ߝߎ߲ߞߎ߲
           art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
           bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
           bakery: ߓߙߎߜߊߛߌ߫ ߦߙߐ
+          beauty: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ߝߋ߲߫ ߝߎ߲ߞߎ߲
+          beverages: ߡߌ߲߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
           bicycle: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
           books: ߞߝߊ߬ ߝߎ߲ߞߎ߲
           boutique: ߝߎ߲ߞߎ߲
+          butcher: ߥߊ߬ߦߌ߬ߘߊ
           car: ߞߐ߲߬ߛߏ߬ ߝߎ߲ߞߎ߲
           car_parts: ߞߐ߲߬ߛߏ߬ ߖߐ߯ߙߊ߲
           car_repair: ߞߐ߲߬ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
+          carpet: ߘߎ߰ߓߍ߲߬ ߝߎ߲ߞߎ߲
+          chocolate: ߛߞߏߟߊ
           clothes: ߝߊ߰ߣߌ߲߬ ߝߎ߲ߞߎ߲
           coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲
           computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲
+          copyshop: ߖߌ߬ߦߊ߬ߖߊ߬ߛߏ߲߬ ߝߎ߲ߞߎ߲
           cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲
+          craft: ߓߟߏߟߊߓߊ߯ߙߟߊ ߟߎ߬ ߡߊߛߐ߫ ߝߎ߲ߞߎ߲
+          curtain: ߥߊ߲߬ߥߊ߲߬ ߝߎ߲ߞߎ߲
+          department_store: ߡߣߐ߬ߓߏ߲߬ ߓߊ
           doityourself: ߞߵߊ߬ ߞߴߌ ߖߘߍ߬ߦߋ߫
           e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲
           electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲
@@ -747,6 +803,9 @@ nqo:
           fishing: ߖߍ߯ ߡߌߘߊ߫ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
           food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
           gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
+          gift: ߣߌ߬ߟߌ߫ ߝߎ߲ߞߎ߲
+          greengrocer: ߦߙߌߘߋ߲ ߣߌ߫ ߣߊߞߘߐߝߋ߲
+          grocery: ߣߟߊߞߍߝߋ߲߫ ߝߎ߲ߞߎ߲
           hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
           hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
           health_food: ߞߍ߲ߘߍߦߊ߫ ߓߊߟߏ ߟߎ߬ ߝߎ߲ߞߎ߲
@@ -758,7 +817,11 @@ nqo:
           music: ߘߐ߲߬ߞߟߌ ߝߎ߲ߞߎ߲
           musical_instrument: ߘߐ߲߬ߞߟߌ߬ߟߊ߬ ߡߎߙߊ߲ ߠߎ߬
           nutrition_supplements: ߛߎ߬ߡߊ߲߬ ߡߊ߬ߛߐ߬ߟߊ ߟߎ߫
+          pet: ߓߌߦߊ߲ ߠߎ߬ ߟߊ߫ ߝߎ߲ߞߎ߲
+          pet_grooming: ߛߏߞߣߐ߫ ߓߌߦߊ߲ ߠߎ߬ ߘߊ߲ߘߊ߫ ߦߌߟߊ
+          photo: ߖߌ߬ߦߊ߬ߖߊߛߏ߲ ߝߎ߲ߞߎ߲
           second_hand: ߝߋ߲߫ ߡߊߞߟߏߣߍ߲߫ ߝߎ߲ߞߎ߲
+          shoes: ߛߡߊ߬ߘߊ߬ ߝߎ߲ߞߎ߲
           sports: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
           supermarket: ߘߎ߲߬ߘߎ߬ߡߊ߬ ߟߐ߯ߝߍ
           tailor: ߞߙߊߟߌߟߊ
@@ -775,6 +838,7 @@ nqo:
           wine: ߖߊ߬ߓߌ߬ߙߋ߲߬ ߘߟߐ ߝߎ߲ߞߎ߲
           "yes": ߝߎ߲ߞߎ߲
         tourism:
+          cabin: ߓߎ߭
           camp_site: ߞߎ߲ߝߊ߲ߓߐ߫ ߞߣߍ
           hostel: ߖߌ߬ߦߊ߬ߓߏ߲
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
@@ -1136,20 +1200,35 @@ nqo:
       edit_preferences: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
     edit:
       title: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
+      save: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߟߊߞߎߘߦߊ߫
       cancel: ߊ߬ ߘߐߛߊ߬
+    update:
+      failure: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߕߍ߫ ߛߐ߲߬ ߟߊߞߎߘߦߊ߫ ߟߊ߫.
+    update_success_flash:
+      message: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫.
   profiles:
     edit:
       title: ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
       save: ߢߊߞߙߍ ߟߊߞߎߘߦߊ߫
       cancel: ߊ߬ ߘߐߛߊ߬
       image: ߖߌ߬ߦߊ߬ߓߍ
+      gravatar:
+        gravatar: ߜ߭ߙߊߝ߭ߕߊ߫ ߟߊߓߊ߯ߙߊ߫
+        link: https://wiki.openstreetmap.org/wiki/nqo:Gravatar
+        what_is_gravatar: ߡߎ߲߬ ߦߋ߫ ߜ߭ߙߊߝ߭ߕߊ ߘߌ߫؟
+        disabled: ߜ߭ߙߊߝ߭ߕߊ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫
+        enabled: ߌ ߟߊ߫ ߜ߭ߙߊߝ߭ߕߊ߫ ߦߌ߬ߘߊ߬ߟߌ ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߟߊ߫.
       new image: ߖߌ߬ߦߊ߬ߓߍ ߘߏ߫ ߝߙߊ߬
       keep image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߠߊߡߙߊ߬
       delete image: ߖߌ߬ߦߊ߬ߓߍ ߞߘߐ߬ߡߊ߲ ߛߋ߲߬ߓߐ߫
       replace image: ߖߌ߬ߦߊ߬ߓߍ ߡߍ߲ ߦߋ߫ ߦߋ߲߬ ߕߊ߲߬߸ ߏ߬ ߣߐ߬ߘߐߓߌ߬ߟߊ߬
+      image size hint: (ߖߌ߬ߦߊ߬ߓߍ ߕߎ߲ߞߎ߲ ߠߎ߬ ߓߊ߯ ߞߍ߫ ߁߀߀×߁߀߀ ߟߋ߬ ߦߋ߫ ߓߊ߯ߙߊ߫ ߟߊ߫ ߞߏߢߊ߬)
       home location: ߌ ߓߘߊ ߘߌ߲߬ߞߌߙߊ
       no home location: ߌ ߡߴߌ ߟߊ߫ ߟߎ ߘߌ߲߬ߞߌߙߊ ߟߊߘߏ߲߬ ߝߟߐ߫
       update home location on click: ߞߊ߬ ߟߎ ߘߌ߲߬ߞߌߙߊ ߡߊߝߊ߬ߟߋ߲߫ ߣߌ߫ ߒ ߞߊ߬ ߡߊߔ ߛߐ߲߬ߞߌ߲߫؟
+    update:
+      success: ߢߊߞߙߍ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫
+      failure: ߢߊߞߙߍ ߕߍ߫ ߛߐ߲߬ ߟߏ߲ߘߐߦߊ߫ ߟߊ߫.
   sessions:
     new:
       title: ߌ ߜߊ߲߬ߞߎ߲߫
@@ -1290,6 +1369,8 @@ nqo:
         title: ߘߍ߬ߡߍ߲ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߘߌ߬
         join_the_community:
           title: ߕߘߍ߬ ߘߍ߬ߘߊ ߘߏ߫ ߘߐ߫
+      other_concerns:
+        title: ߞߣߐߜߊ߫ ߜߘߍ߫ ߟߎ߫
     help:
       title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߡߊߛߐ߬ߘߐ߲
       introduction: ߛߎ߲߫ ߥߙߍߓߊߓߊ ߟߎ߬ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߏ߫ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߮ ߟߎ߬
@@ -1333,7 +1414,10 @@ nqo:
     key:
       table:
         entry:
+          motorway: ߝߏ߲߬ߘߏ
           main_road: ߛߌߟߊ߫ ߓߊߖߎߡߊ
+          primary: ߛߌߟߊ ߓߊߖߎߟߞߊ
+          unclassified: ߛߌߟߊ߫ ߛߙߊߛߌ߰ߓߊߟߌ
           footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
           subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
@@ -1345,6 +1429,10 @@ nqo:
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
           forest: ߕߎ
           wood: ߦߙߌ
+          resident: ߡߐ߰ߘߐ߬ ߛߌߟߊ
+          common:
+          - ߘߍ߬ߒ߬ߡߊ߬ ߞߣߍ
+          retail: ߖߎ߬ߟߦߊ߬ ߞߣߍ
           industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
           commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
           lake:
@@ -1392,6 +1480,7 @@ nqo:
     show:
       title: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
       heading: ߜߋ߬ߙߋ ߦߋߟߌ %{name}
+      pending: ߡߊ߬ߞߐ߬ߣߐ߲߬ߠߌ߲ ߘߐ߫
       filename: ߞߐߕߐ߮ ߕߐ߮
       download: ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲
       uploaded: 'ߛߊ߬ߦߌ߬ߣߍ߲߫:'
@@ -1413,11 +1502,13 @@ nqo:
       older: ߜߋ߬ߙߋ ߞߘߐ߬ߡߊ߲ ߠߎ߬
       newer: ߜߋ߬ߙߋ ߞߎߘߡߊ ߟߎ߬
     trace:
+      pending: ߡߊ߬ߞߐ߬ߣߐ߲߬ߠߌ߲ ߘߐ߫
       more: ߡߊ߬ߞߊ߬ߝߏ߬ ߜߘߍ ߟߎ߬
       view_map: ߡߊߔ ߦߋ߫
       edit_map: ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲߫
       public: ߡߌ߬ߙߌ߲߬ߘߌ
       identifiable: ߡߊ߬ߟߐ߲߬ߕߊ
+      private: ߘߎ߲߬ߘߎ߬ߡߊ
       trackable: ߜߙߋ߬ߓߐ߬ߕߊ
       by: ߞߊ߬ ߝߘߊ߫
       in: ߘߐ߫
@@ -1462,6 +1553,9 @@ nqo:
         ߡߊ߬߸ ߞߏ߬ߣߌ߲߬ ߌ ߦߴߊ߬ߟߎ߬ ߦߋ߫ ߕߎ߲߫.
     settings_menu:
       account_settings: ߖߊ߬ߕߋ߬ߘߊ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߫
+      oauth1_settings: 0Auth 1 ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ
+      oauth2_applications: 0Auth 2 ߟߥߊ߬ߟߌ߬ߟߌ ߟߎ߬
+      oauth2_authorizations: 0Auth 2 ߖߡߊ߬ߙߌ߬ߦߊ߬ߟߌ
   oauth:
     authorize:
       title: ߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲ ߠߊߘߌ߬ߢߍ߬
@@ -1480,6 +1574,8 @@ nqo:
       grant_access: ߟߊ߬ߛߐ߬ߘߐ߲߬ߠߌ߲ ߠߊߡߌ߬ߘߊ߬
     authorize_success:
       title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߟߊߘߤߊ߬
+      allowed_html: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲ %{app_name} ߡߊ߬ ߛߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߐ߬ߘߐ߲
+        ߠߊ߫.
       verification: ߝߛߍ߬ߝߛߍ߬ߟߌ ߘߏߞߊ߲ ߦߋ߫ %{code} ߟߋ߬ ߘߌ߫
     authorize_failure:
       title: ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߓߘߊ߫ ߗߌߙߏ߲߫
@@ -1504,6 +1600,10 @@ nqo:
       edit: ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫
       delete: ߛߊ߲߬ߠߌ߲߬ߢߐ߲߮ ߖߏ߬ߛߌ߫
       confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
+    index:
+      title: ߒ ߠߊ߫ 0Auth ߝߊߙߊ߲ߝߊ߯ߛߌ
+      my_tokens: ߒ ߠߊ߫ ߟߥߊ߬ߟߌ߬ߟߊ߲߫ ߖߡߊ߬ߙߌ߬ߦߊ߬ߣߍ߲ ߠߎ߬
+      oauth: OAuth
     not_found:
       sorry: ߤߊߞߍ߬ߕߏ߫߸ %{type} ߕߍߣߊ߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.
     create:
@@ -1601,11 +1701,13 @@ nqo:
       my traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
       my notes: ߒ ߠߊ߫ ߦߟߌߣߐ ߟߎ߫
       my messages: ߒ ߠߊ߫ ߗߋߛߓߍ ߟߎ߬
+      my profile: ߒ ߠߊ߫ ߢߊߞߙߍ
       my settings: ߒ ߠߊ߫ ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߦߊ߬ߘߊ ߟߎ߬
       my comments: ߒ ߠߊ߫ ߡߙߌߣߊ߲ ߠߎ߬
       my_preferences: ߒ ߠߊ߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
       blocks on me: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߡߍ߲ ߦߋ߫ ߒ ߞߊ߲߬
       blocks by me: ߡߍ߲ ߠߎ߬ ߓߊ߬ߟߊ߲߬ߣߍ߲߫ ߦߋ߫ ߒߠߋ ߓߟߏ߫
+      edit_profile: ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
       send message: ߗߋߛߓߍ߫ ߗߋߣߍ߲
       diary: ߕߋ߬ߟߋ߲
       edits: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
@@ -1614,6 +1716,7 @@ nqo:
       remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
       add as friend: ߕߋߙߌ ߝߙߊ߬
       mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
+      ct status: 'ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬:'
       email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
       created from: 'ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߞߊ߬ ߝߘߊ߫:'
       description: ߞߊ߲߬ߛߓߍߟߌ
@@ -1628,6 +1731,53 @@ nqo:
       delete_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߖߏ߰ߛߌ߫
       confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
       report: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߞߏߝߐ߫
+    index:
+      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+      heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+      summary_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{ip_address} ߟߋ߬ ߡߊ߬ %{date} ߟߊ߫'
+      summary_no_ip_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{date} ߟߋ߬ ߟߊ߫'
+      confirm: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߟߊߛߙߋߦߊ߫
+      hide: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߢߡߊߘߏ߲߰
+      empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+    suspended:
+      title: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
+      heading: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
+      support: ߘߍ߬ߡߍ߲߬ߠߌ߲
     auth_failure:
       unknown_error: ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ ߓߘߊ߫ ߗߌߙߏ߲߫
+  user_blocks:
+    show:
+      created: 'ߛߌ߲ߘߌߣߍ߲:'
+      duration: 'ߘߎ߲ߡߊߟߌ:'
+      status: 'ߡߊ߬ߘߎ߮:'
+      show: ߦߌ߬ߘߊ߬ߟߌ
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
+      reason: 'ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭:'
+    block:
+      show: ߊ߬ ߦߌ߬ߘߊ߬
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+    blocks:
+      creator_name: ߛߌ߲ߘߌߟߊ߲
+      reason: ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭
+      showing_page: ߞߐߜߍ %{page}
+      next: ߟߊ߬ߕߎ߲߰ߠߊ »
+      previous: ߕߊ߬ߡߌ߲߬ߣߍ߲
+  notes:
+    index:
+      no_notes: ߦߟߌߣߐ߫ ߛߌ߫ ߕߴߦߋ߲߬
+      id: ߡߊ߬ߟߐ߲ߟߊ߲
+      creator: ߛߌ߲ߘߌߟߊ߲
+      description: ߞߊ߲߬ߛߓߍߟߌ
+      created_at: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫
+      last_changed: ߞߐ߯ߟߊ߫ ߡߊߦߟߍߡߊ߲ߠߌ߲
+  javascripts:
+    close: ߊ߬ ߘߊߕߎ߲߯
+    share:
+      title: ߊ߬ ߟߊߖߍ߲ߛߍ߲߫
+      cancel: ߊ߬ ߘߐߛߊ߬
+      image: ߖߌ߬ߦߊ߬ߓߍ
+      link: ߛߘߌ߬ߜߋ߲ ߥߟߊ߫ HTML
+      long_link: ߛߘߌ߬ߜߋ߲
+      short_link: ߛߘߌ߬ߜߋ߲߫ ߛߎߘߎ߲
 ...