]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/nqo.yml
Refactor traces list display
[rails.git] / config / locales / nqo.yml
index f7d232fdd49555a2e0c77025c65f711d5c60e410..0bc252780d7c6d71608e755a1453ee29c7a6fac7 100644 (file)
@@ -105,6 +105,7 @@ nqo:
         name: ߞߐߕߐ߮ ߕߐ߮
         size: ߢߊ߲ߞߊ߲
         latitude: ߓߊߙߌ
+        longitude: ߘߎ߰ߕߍ߬ߟߍ߲߬ߦߊ
         public: ߝߘߏ߬ߓߊ
         description: ߕߐ߯ߛߓߍߟߌ
         gpx_file: GPX ߞߐߕߐ߮ ߟߊߦߟߍ߬
@@ -115,6 +116,9 @@ nqo:
         title: ߝߐߡߊ
         body: ߝߊ߬ߘߌ
         recipient: ߟߊ߬ߛߐ߬ߘߐ߲߬ߕߊ
+      report:
+        category: ߞߎ߲߭ ߘߏ߫ ߝߴߌ ߟߊ߫ ߘߊ߲߬ߕߍ߰ߟߌ ߟߊ߫
+        details: ߝߊߙߊ߲ߝߊ߯ߛߟߌ߫ ߜߘߍ߫ ߟߎ߫ ߡߊߛߐ߫ ߞߊ߬ ߓߍ߲߬ ߝߙߋߞߋ ߡߊ߬ (ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲߫)
       user:
         email: ߢ:ߞߏ߲ߘߏ
         display_name: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
@@ -139,6 +143,7 @@ nqo:
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
       windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
     notes:
@@ -147,11 +152,16 @@ nqo:
         opened_at_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{when} %{user} ߓߟߏ߫
         commented_at_html: ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{when}
         commented_at_by_html: ߟߊߥߟߌ߬ߣߍ߲߫ %{when} %{user} ߓߟߏ߫
+        closed_at_html: ߓߘߊ߫ ߢߊߓߐ߫ %{when}
+        closed_at_by_html: ߢߊߓߐߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫ %{user} ߓߟߏ߫
+        reopened_at_html: ߊ߬ ߟߊߞߎߣߎ߲ߣߍ߲߫ ߦߋ߫ %{when} ߟߊ߫
       rss:
         title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߦߟߌߣߐ ߟߎ߬
+        description_item: RSS ߓߊߟߏ ߦߟߌߣߐ %{id} ߦߋ߫
         opened: ߞߟߏߜߍ߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬})
         commented: ߡߙߌߣߊ߲߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬)
         closed: ߞߟߏߜߍ߫ ߘߊߕߎ߲߯ߣߍ߲ (%{place} ߘߊߝߍ߬)
+        reopened: ߦߟߌߣߐ ߟߊߞߎߣߎ߲߫ (%{place} ߘߊߝߍ߬)
       entry:
         comment: ߡߙߌߣߊ߲
         full: ߦߟߌߣߐ ߘߝߊߣߍ߲
@@ -167,8 +177,10 @@ nqo:
       %{user} ߓߟߏ߫
     closed_by_html: ߊ߬ ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
       %{user} ߓߟߏ߫
+    version: ߦߌߟߡߊ
     in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     anonymous: ߕߐ߯ߒߕߊ߲
+    no_comment: (ߡߙߌߣߊ߲߫ ߕߴߦߋ߲߬)
     part_of: ߝߊ߲߭ ߘߏ߫
     download_xml: XML ߟߊߖߌ߰ ߌ ߞߎ߲߬
     view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫
@@ -177,7 +189,14 @@ nqo:
     changeset:
       title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}'
       belongs_to: ߛߓߍߦߟߊ
+      way: ߛߌߟߊ (%{count})
+      relation: ߕߍߓߊ߯ߦߊ (%{count})
+      relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
+      comment: ߡߙߌߣߊ߲ (%{count})
+      hidden_commented_by_html: ߡߙߌߣߊ߲ ߢߢߊߘߏ߲߯ߠߌ߲ %{user} ߡߊ߬ <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: ߦߟߌߣߐ ߡߍ߲ ߝߘߊߣߍ߲߫ ߦߋ߫ %{user} ߟߊ߫ <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
+      osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
     way:
@@ -287,11 +306,7 @@ nqo:
     new:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
     form:
-      subject: 'ߝߐߡߊ:'
-      body: 'ߝߊ߬ߘߌ:'
-      language: 'ߞߊ߲:'
       location: 'ߘߌ߲߬ߞߌߙߊ:'
-      latitude: ߓߊߙߌ
       use_map_link: ߔߊ߬ߔߘߊ ߟߊߓߊ߯ߙߊ߫
     index:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
@@ -353,6 +368,7 @@ nqo:
       has_commented_on: '%{display_name} ߟߎ߫ ߓߘߴߊ߬ߟߎ߬ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ
         ߟߎ߫ ߞߊ߲߬'
       post: ߗߋߓߏ߲
+      when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
       newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
       older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
@@ -384,23 +400,34 @@ nqo:
       prefix:
         aerialway:
           cable_car: ߘߎ߲ߞߎߟߎ߲
+          chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲
         aeroway:
+          gate: ߘߏ߲߬ߘߊ
           hangar: ߜߕߊ
+          helipad: ߛߊ߲ߡߊߘߊ߲
+          holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
+          navigationaid: ߛߊ߲ߡߊߘߊ߲ ߛߏ߯ߓߊߟߌ ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬
           parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
           runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫
           taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
+          terminal: ߟߊ߬ߓߊ߲
         amenity:
           bank: ߜߍߓߏ߲
           bar: ߡߌ߲߬ߓߏ߲
           bbq: BBQ
           bicycle_repair_station: ߣߍ߰ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
           biergarten: ߢߐ߬ߘߟߐ ߣߊߞߐ
+          blood_bank: ߖߋ߬ߟߌ߬ ߟߊ߬ߡߙߊ߬ ߦߙߐ
           boat_rental: ߕߊߞߎߟߎ߲߫ ߛߎߝߙߎ߫ ߦߙߐ
+          brothel: ߛߎ߲ߞߘߎ߲ߓߊߓߏ߲
           bus_station: ߞߎߟߎ߲ߓߏ߲߫ ߟߐ߫ ߦߙߐ
           cafe: ߞߊߝߋ
           car_rental: ߞߐ߲߬ߛߏ߬ ߛߎ߬ߝߙߎ߬ ߦߙߐ
           car_wash: ߞߐ߲߬ߛߏ߬ ߞߏ߬ ߦߌߟߊ
+          casino: ߞߊߛߌߣߏ
           childcare: ߘߋ߲ߣߍ߲߫ ߠߊߡߙߊ߫ ߦߌߟߊ
+          cinema: ߖߌߦߊ߬ߝߟߍ
           clinic: ߓߎ߬ߙߋ (ߞߑߟߣߌߞ)
           clock: ߕߎ߬ߡߊ߬ߟߊ߲
           college: ߞߊ߬ߙߊ߲߬ߘߊ
@@ -417,6 +444,7 @@ nqo:
           internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ
           language_school: ߞߊ߲߫ ߞߊߙߊ߲ߕߊ
           library: ߛߓߍߘߊ
+          love_hotel: ߦߙߊ߬ߓߌ ߖߌ߬ߦߊ߬ߓߏ߲
           marketplace: ߟߐ߯ߝߍ ߘߌ߲߬ߞߌߙߊ
           mobile_money_agent: ߜߋߟߋ߲ߜߋߟߋ߲ ߥߏߘߌ ߖߋ߬ߕߌ߰ߘߊ
           money_transfer: ߥߏߘߌ߫ ߟߕߊߡߌ߲߫ ߦߙߐ
@@ -424,9 +452,13 @@ nqo:
           music_school: ߘߐ߲߬ߞߟߌ߬ ߞߊߙߊ߲ߕߊ
           nightclub: ߘߐ߲߬ߓߏ߲
           parking: ߞߐ߲߬ߛߏ߬ߜߘߋ
+          parking_space: ߟߐ߬ߟߌ߬ ߞߣߍ
           pharmacy: ߓߊߛߌߓߏ߲
+          place_of_worship: ߟߐ߲ߠߌ߲ߦߊ ߘߌ߲߬ߞߌߙߊ
           police: ߕߐ߲ߓߟߏߡߊ
           prison: ߥߛߎߓߏ߲
+          public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
+          public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
           public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
           restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
           school: ߞߊ߬ߙߊ߲߬ߕߊ
@@ -446,11 +478,16 @@ nqo:
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:
           protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲
+          "yes": ߓߐߕߏ߲
         bridge:
           suspension: ߛߍ߲߫ ߠߊߘߎ߲ߣߍ߲
           "yes": ߛߍ߲
         building:
+          church: ߓߊ߬ߕߏ߬ߓߏ߲
+          college: ߞߊ߬ߙߊ߲߬ߘߊ ߓߏ߲
+          commercial: ߖߎ߬ߟߦߊ ߓߏ߲
           construction: ߓߏ߲ ߡߍ߲ ߦߋ߫ ߟߐ߬ߟߌ ߘߊߞߘߐ߫
+          farm: ߛߣߍ߬ߘߐ߬ ߟߎ
           hangar: ߜߕߊ
           hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
@@ -467,10 +504,15 @@ nqo:
           plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ
           shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
           tailor: ߞߙߊߟߌߟߊ
+        emergency:
+          fire_water_pond: ߕߟߊߛߊ߫ ߝߌߙߏ߲
+          landing_site: ߓߙߊ߬ߒ߬ߘߐ߬ ߖߌ߰ߟߌ߬ ߞߣߍ
         highway:
+          abandoned: ߝߏ߲߬ߘߏ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲
           bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
+          path: ߛߌߟߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
           raceway: ߜߛߊ߬ߞߍ߬ ߛߌߟߊ
@@ -503,13 +545,18 @@ nqo:
           garden: ߣߊߞߐ
           horse_riding: ߛߏ߬ ߓߏߙߌ
           nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+          park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
           sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
         man_made:
           bridge: ߛߍ߲
+          mine: ߘߊ߬ߡߊ߲
           telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
           tower: ߛߊ߲ߓߏ߲
           water_tower: ߖߌߡߣߐ
+          water_well: ߊ߬ ߞߊߢߌ߲߬
+          water_works: ߖߌ߫ ߓߊ߯ߙߊ
+          windmill: ߝߢߐ߫ ߥߎ߮
           works: ߝߊ߲ߓߏ߲
           "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
         military:
@@ -518,6 +565,7 @@ nqo:
           forest: ߕߎ
           hill: ߞߎ߬ߙߎ
           island: ߕߌ߲
+          point: ߕߏ߲ߘߋ
           sand: ߕߌ߬ߢߍ
           tree: ߦߙߌߖߎ
           valley: ߝߏ߲ߝߊ߲
@@ -525,16 +573,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: ߞߊ߬ߝߏ
@@ -546,7 +610,9 @@ nqo:
           construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
           halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
           junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
+          station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
+          subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
         shop:
           art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
           bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
@@ -567,6 +633,7 @@ nqo:
           erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
           farm: ߛߣߍ߬ߞߍ߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
           fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
+          food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
           gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
           hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
           hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
@@ -585,6 +652,8 @@ nqo:
           tattoo: ߥߍ߬ߢߍ߲ ߝߎ߲ߞߎ߲
           tea: ߕߋ߫ ߝߎ߲ߞߎ߲
           tobacco: ߖߊ߲߬ߓߊ߬ ߝߎ߲ߞߎ߲
+          toys: ߡߣߊ߫ ߝߎ߲ߞߎ߲
+          travel_agency: ߕߐ߰ߕߐ߰ߟߌ߬ߟߊ ߟߎ߬
           tyres: ߞߐ߲߬ߡߘߊ߬ ߝߎ߲ߞߎ߲
           variety_store: ߢߌ߰ߡߌ߬ߢߊ߰ߡߊ߬ ߝߎ߲ߞߎ߲
           video: ߖߌ߬ߦߊ߬ߖߟߎ߬ ߝߎ߲ߞߎ߲
@@ -594,9 +663,11 @@ nqo:
           "yes": ߝߎ߲ߞߎ߲
         tourism:
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
+          motel: ߖߌ߬ߦߊ߬ߓߏ߲ (ߡߏߕߍߟ)
           museum: ߗߍߓߏ߲
           zoo: ߥߘߊߓߊ ߝߟߍ߫ ߛߏ
         waterway:
+          artificial: ߖߛߌߟߊ߫ ߟߊߘߊ߲ߣߍ߲
           river: ߓߊ
           waterfall: ߖߌ߫ ߛߎߙߎ߲ߘߎ
           "yes": ߖߛߌߟߊ
@@ -622,6 +693,7 @@ nqo:
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
       user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬
       issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
         open: ߊ߬ ߟߊߞߊ߬
@@ -631,9 +703,34 @@ nqo:
       successful_update: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߓߘߊ߫ ߓߊ߲߫ ߠߊߞߎ߲߬ߘߎ߫ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫
       provide_details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲ ߠߎ߬ ߡߊߛߐ߫ ߖߊ߰ߣߌ߲߫
     show:
+      report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
+      last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
+        ߓߟߏ߫
       resolve: ߊ߬ ߢߊߓߐ߫
       ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫
       reopen: ߊ߬ ߟߊߞߊ߬ ߕߎ߲߯
+      reports_of_this_issue: ߝߌ߬ߛߌ ߣߌ߲߬ ߠߊߞߏߝߐߟߌ
+      read_reports: ߞߏߝߐߟߌ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬
+      new_reports: ߞߏߝߐߟߌ߫ ߞߎߘߊ ߟߎ߬
+      other_issues_against_this_user: ߝߛߌ߬ ߜߘߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫ ߌߞߐ߫
+      no_other_issues: ߝߛߌ߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߴߏ߬ ߞߐ߫.
+      comments_on_this_issue: ߡߙߌߣߊ߲ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߝߌ߬ߛߌ ߣߌ߲߬ ߠߊ߫
+    resolve:
+      resolved: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߢߊߓߐ߫ ߞߊ߲ߡߊ߬
+    ignore:
+      ignored: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߡߊߓߌ߬ߟߊ߬ ߞߊ߲ߡߊ߬
+    reopen:
+      reopened: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߘߊߦߟߍ߬ ߞߊ߲ߡߊ߬
+    comments:
+      comment_from_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{user_link} ߟߊ߫ %{comment_created_at} ߘߐ߫
+    helper:
+      reportable_title:
+        diary_comment: '%{entry_title} ߡߙߌߣߊ߲ #%{comment_id}'
+        note: 'ߦߟߌߣߐ #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: ߌ ߟߊ߫ ߡߙߌߣߊ߲ ߛߌ߲ߘߟߌ ߓߘߊ߫ ߛߎߘߊ߲߫
   reports:
     new:
       categories:
@@ -643,6 +740,7 @@ nqo:
         diary_comment:
           other_label: ߘߏ߫ ߜߘߍ߫
         user:
+          vandal_label: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߕߌߢߍߟߌߟߊ ߟߋ߬ ߘߌ߫
           other_label: ߘߏ߫ ߜߘߍ߫
         note:
           spam_label: ߦߟߌߣߐ ߣߌ߲߬ ߦߋ߫ ߛߑߔߊߡ ߠߋ߬ ߘߌ߫
@@ -708,10 +806,12 @@ nqo:
       had_added_you: '%{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬.'
       befriend_them: ߌ ߝߣߊ߫ ߘߌ߫ ߛߴߊ߬ߟߎ߫ ߝߙߊ߬ ߟߊ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫ %{befriendurl} ߘߐ߫
     gpx_failure:
+      hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
       failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
     gpx_success:
+      hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ߫ ߛߎߘߊ߲ߣߍ߲'
     signup_confirm:
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬'
@@ -746,12 +846,44 @@ nqo:
           ߘߐ߱ߘߏ߲߬ ߠߊ߫ ߡߍ߲ ߠߊ߫'
         your_note: '%{commenter} ߓߘߊ߫ ߡߙߌߣߊ߲ ߘߏ߫ ߓߌ߬ߟߊ߬ ߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ %{place}
           ߞߍ߬ߙߍߝߍ߬.'
+      closed:
+        subject_own: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߴߌ ߟߊ߫ ߦߟߌߣߐ ߘߏ߫ ߢߊߓߐ߫'
+        subject_other: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߊ߫ ߦߟߌߣߐ ߘߏ߫ ߢߊߓߐ߫ ߌ ߣߴߌ ߘߐ߱ߘߏ߲߬
+          ߠߊ߫ ߡߍ߲ ߠߊ߫'
+        your_note: '%{commenter} ߓߘߊ߫ ߡߙߌߣߊ߲ ߘߏ߫ ߢߊߓߐ߫ ߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߟߊ߫ %{place}
+          ߞߍ߬ߙߍߝߍ߬.'
+        your_note_html: '%{commenter} ߓߘߊ߫ ߡߙߌߣߊ߲ ߘߏ߫ ߢߊߓߐ߫ ߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߟߊ߫
+          %{place} ߞߍ߬ߙߍߝߍ߬.'
+        commented_note: '%{commenter} ߓߘߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߢߊߓߐ߫߸ ߌ ߣߐ߬ ߦߋ߫ ߡߍ߲ ߡߓߊߟߌߡߊ߫
+          ߟߊ߫. ߦߟߌߣߐ ߦߋ߫ %{place} ߘߊߝߍ߬ ߟߋ߬.'
+        commented_note_html: '%{commenter} ߓߘߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߢߊߓߐ߫ ߌ ߣߐ߬ ߡߍ߲ ߡߓߊߟߌߡߊ߫
+          ߟߊ߫. ߦߟߌߣߐ ߦߋ߫ %{place} ߘߊߝߍ߬ ߟߋ߬.'
+      reopened:
+        subject_own: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߴߌ ߟߊ߫ ߦߟߌߣߐ ߘߏ߫ ߟߊߞߎߣߎ߲߫.'
+        subject_other: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{commenter} ߓߘߊ߫ ߦߟߌߣߐ ߘߏ߫ ߟߊߞߎߣߎ߲߫ ߌ ߣߴߌ
+          ߘߐ߱ߘߏ߲߬ ߠߊ߫ ߡߍ߲ ߠߊ߫'
+        your_note: '%{commenter} ߓߘߴߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߟߊߞߎߣߎ߲߫ %{place} ߘߊߝߍ߬.'
+        your_note_html: '%{commenter} ߓߘߴߌ ߟߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫߫ ߟߊߞߎߣߎ߲߫ %{place} ߘߊߝߍ߬.'
+        commented_note: '%{commenter} ߓߘߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߟߊߞߎߣߎ߲߫ ߌ ߣߐ߬ ߡߍ߲ ߡߓߊߟߌߡߊ߫
+          ߟߊ߫. ߊ߬ߟߋ ߦߟߌߣߐ ߦߋ߫ %{place} ߘߊߝߍ߬ ߟߋ߬.'
+        commented_note_html: '%{commenter} ߓߘߊ߫ ߡߊߔ ߦߟߌߣߐ ߘߏ߫ ߟߊߞߎߣߎ߲߫ ߌ ߣߊ߬ ߡߍ߲ ߡߓߊߟߌߡߊ߫
+          ߟߊ߫ %{place} ߞߍ߬ߙߍߝߍ߬.'
+      details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߜߘߍ߫ ߟߎ߫ ߞߊ߬ ߓߍ߲߬ ߦߟߌߣߐ ߏ߬ ߡߊ߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߛߋ߫ ߛߐ߬ߘߐ߲߬
+        ߠߊ߫ %{url} ߘߐ߫.
+      details_html: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߜߘߍ߫ ߟߎ߫ ߘߌ߫ ߛߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߦߟߌߣߐ ߏ߬ ߞߊ߲߬ %{url}
+        ߘߐ߫.
     changeset_comment_notification:
+      hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
   messages:
     inbox:
+      title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
+      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
+      outbox: ߞߐߞߊ߲߫ ߞߏ߲ߘߏ
+      messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
       from: ߞߊ߬ ߝߘߊ߫
       subject: ߝߐߡߊ
       date: ߕߎ߬ߡߊ߬ߘߊ
@@ -811,12 +943,32 @@ nqo:
       as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
+  shared:
+    markdown_help:
+      headings: ߞߎ߲߬ߕߐ߮
+      heading: ߞߎ߲߬ߕߐ߮
+      subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ
+      unordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߓߊߟߌ
+      ordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߣߍ߲
+      first: ߝߛߌ߬ ߝߟߐ
+      second: ߝߛߌ߬ ߝߌߟߊߣߊ߲
+      link: ߛߘߌ߬ߜߋ߲
+      text: ߞߟߏߘߋ߲
+      image: ߖߌ߬ߦߊ߬ߓߍ
+      url: URL
+    richtext_field:
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+      preview: ߟߊ߬ߕߎ߲߰ߠߊ
   site:
     about:
       next: ߢߍߕߊ
       copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
         ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
+      lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲
+        ߠߎ߬ ߦߋ߫ ߡߊ߬ߜߍ߲ ߞߍ߫ ߟߊ߫ ߓߟߏߡߟߊߞߏ ߘߐ߫߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ ߘߊߘߐߓߍ߲߬. \nߞߊ߬ ߓߍ߲߬ ߛߌߟߊ
+        ߟߎ߬ ߡߊ߬߸ ߜߋ߬ߙߋ ߟߎ߬ ߡߊ߬߸ ߞߊߝߋ ߟߎ߬ ߡߊ߬߸ ߣߍ߰ߛߌߟߊ ߟߐ߬ߦߙߐ ߟߎ߬ ߡߊ߬߸ ߊ߬ ߣߌ߫ ߝߋ߲߫
+        ߜߘߍ߫ ߛߌߦߊߡߊ߲߫ ߠߎ߫ ߘߎߢߊ߫ ߝߊ߲߭ ߓߍ߯ ߝߍ߬."
       local_knowledge_title: ߕߌ߲߬ߞߎߘߎ߲ ߡߊ߬ߟߐ߲߬ߠߌ߲
       community_driven_title: ߘߍ߬ߘߊ ߟߊ߬ߓߏ߬ߙߌ߬ߟߌ
       open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
@@ -832,7 +984,19 @@ nqo:
         title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
         credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
     index:
+      permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ
+      shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲
       createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬
+      license:
+        copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
+          ߞߘߐ߫
+    edit:
+      not_public: ߌ ߡߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߛߴߊ߬ߟߎ߫ ߘߌ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ߡߊ߫
+        ߘߌ߫.
+      not_public_description_html: ߌ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߡߍ߲߫ ߠߊ߫ ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲ ߘߊߞߘߐ߫ ߣߴߌ
+        ߡߴߊ߬ ߞߍ߫ ߕߋ߲߬. ߌ ߘߌ߫ ߛߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߠߊ߫ ߝߘߏ߬ߓߊ߬ߡߊ ߘߴߌ
+        ߟߊ߫ %{user_page} ߞߣߐ߫.
+      user_page_link: ߞߐߜߍ߫ ߟߊߓߊ߯ߙߕߊ
     export:
       title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
       area_to_export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ ߞߍ߫ ߦߙߐ
@@ -844,6 +1008,7 @@ nqo:
           title: ߛߎ߲߫ ߜߘߍ ߟߎ߬
           description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
             ߞߊ߲߬
+      options: ߢߣߊߕߊߟߌ
       format: ߖߙߎߡߎ߲
       image_size: ߖߌ߬ߦߊ߬ߓߍ ߢߊ߲ߞߊ߲
       zoom: ߡߛߊ߬ߡߊ߲߬ߠߌ߲
@@ -853,7 +1018,29 @@ nqo:
       title: ߝߙߋߞߋ ߘߏ߫ ߟߊߞߏߝߐ߫\ߔߊ߬ߔߘߊ ߘߐߓߍ߲߬
       how_to_help:
         title: ߘߍ߬ߡߍ߲ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߘߌ߬
+        join_the_community:
+          title: ߕߘߍ߬ ߘߍ߬ߘߊ ߘߏ߫ ߘߐ߫
     help:
+      title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߡߊߛߐ߬ߘߐ߲
+      introduction: ߛߎ߲߫ ߥߙߍߓߊߓߊ ߟߎ߬ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߏ߫ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߮ ߟߎ߬
+        ߘߐߞߊ߬ߙߊ߲߬ ߞߊ߲ߡߊ߬߸ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߣߌ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߫ ߖߋߓߌ ߟߎ߬ ߘߐ߫߸ ߊ߬ ߣߌ߫ ߘߊߘߐߖߊߥߏ
+        ߣߝߊ߬ߢߐ߲߰ߦߊ ߣߌ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߞߎ߲߬ߕߐ߮ ߟߎ߬ ߘߐ߬ߛߙߋ߬ߦߊ߬ߟߌ ߟߎ߬ ߘߐ߫.
+      welcome:
+        url: /welcome
+        title: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹
+      beginners_guide:
+        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
+        title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ
+        description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫.
+      help:
+        url: https://help.openstreetmap.org/
+        title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߟߐ߯ߓߊߟߐ
+        description: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ
+          ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬.
+      mailing_lists:
+        title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬
+      forums:
+        title: ߟߐ߯ߓߊߟߐ
       wiki:
         url: https://wiki.openstreetmap.org/
         title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
@@ -873,7 +1060,11 @@ nqo:
     key:
       table:
         entry:
+          footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ
           rail: ߣߍ߰ߛߌߟߊ
+          subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
+          cable:
+          - ߘߎ߲ߞߎߟߎ߲
           admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
           forest: ߕߎ
           wood: ߦߙߌ
@@ -882,6 +1073,7 @@ nqo:
           lake:
           - ߞߐ߰ߖߌ߬ߘߟߊ
           farm: ߝߏ߬ߘߏ
+          cemetery: ߞߊߓߙߎߟߏ
           centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
           military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
@@ -893,15 +1085,10 @@ nqo:
           bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
           bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮
           toilets: ߢߍ߲߮
-    richtext_area:
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-    markdown_help:
-      link: ߛߘߌ߬ߜߋ߲
-      text: ߞߟߏߘߋ߲
-      image: ߖߌ߬ߦߊ߬ߓߍ
-      url: URL
     welcome:
       title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
+      whats_on_the_map:
+        title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬
       start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
       add_a_note:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹