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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 2336a220e18e62d550938472ee6a47be7ef29d59..fbf58b5284477720562f28e6293479422b5e5936 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -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: ߕߐ߮ ߟߊߓߊ߯ߙߊ߫
@@ -364,6 +368,7 @@ nqo:
       has_commented_on: '%{display_name} ߟߎ߫ ߓߘߴߊ߬ߟߎ߬ ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ߣߐ
         ߟߎ߫ ߞߊ߲߬'
       post: ߗߋߓߏ߲
+      when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
       comment: ߡߙߌߣߊ߲ߦߌߘߊ
       newer_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߎߘߊ ߟߎ߬
       older_comments: ߡߙߌߣߊ߲ߦߌߘߊ ߞߘߐ߬ߡߊ߲ ߠߎ߬
@@ -395,11 +400,18 @@ nqo:
       prefix:
         aerialway:
           cable_car: ߘߎ߲ߞߎߟߎ߲
+          chair_lift: ߥߎߟߊߛߌ߯ߝߋ߲
         aeroway:
+          gate: ߘߏ߲߬ߘߊ
           hangar: ߜߕߊ
+          helipad: ߛߊ߲ߡߊߘߊ߲
+          holding_position: ߛߊ߲ߡߊߘߊ߲߫ ߦߙߐ
+          navigationaid: ߛߊ߲ߡߊߘߊ߲ ߛߏ߯ߓߊߟߌ ߘߍ߬ߡߍ߲߬ߠߌ߲ ߠߎ߬
           parking_position: ߟߐ߬ߟߌ ߘߌ߲߬ߞߌߙߊ
           runway: ߓߏ߬ߙߌ߬ ߛߌߟߊ
+          taxilane: ߛߌߟߊ߫ ߡߊߡߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߞߐ߲߰ߛߏ ߛߙߊ߬ߕߊ ߦߋ߫
           taxiway: ߥߊߛߌߥߊߟߌ߫ ߛߌߟߊ
+          terminal: ߟߊ߬ߓߊ߲
         amenity:
           bank: ߜߍߓߏ߲
           bar: ߡߌ߲߬ߓߏ߲
@@ -471,7 +483,11 @@ nqo:
           suspension: ߛߍ߲߫ ߠߊߘߎ߲ߣߍ߲
           "yes": ߛߍ߲
         building:
+          church: ߓߊ߬ߕߏ߬ߓߏ߲
+          college: ߞߊ߬ߙߊ߲߬ߘߊ ߓߏ߲
+          commercial: ߖߎ߬ߟߦߊ ߓߏ߲
           construction: ߓߏ߲ ߡߍ߲ ߦߋ߫ ߟߐ߬ߟߌ ߘߊߞߘߐ߫
+          farm: ߛߣߍ߬ߘߐ߬ ߟߎ
           hangar: ߜߕߊ
           hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
@@ -489,12 +505,14 @@ nqo:
           shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ
           tailor: ߞߙߊߟߌߟߊ
         emergency:
+          fire_water_pond: ߕߟߊߛߊ߫ ߝߌߙߏ߲
           landing_site: ߓߙߊ߬ߒ߬ߘߐ߬ ߖߌ߰ߟߌ߬ ߞߣߍ
         highway:
           abandoned: ߝߏ߲߬ߘߏ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲
           bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
           living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
+          path: ߛߌߟߊ
           primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
           proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
           raceway: ߜߛߊ߬ߞߍ߬ ߛߌߟߊ
@@ -527,6 +545,7 @@ nqo:
           garden: ߣߊߞߐ
           horse_riding: ߛߏ߬ ߓߏߙߌ
           nature_reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+          park: ߖߛߊ ߥߟߊ߫ ߥߍ߬ߙߍ
           sports_centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
           swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
         man_made:
@@ -535,6 +554,9 @@ nqo:
           telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
           tower: ߛߊ߲ߓߏ߲
           water_tower: ߖߌߡߣߐ
+          water_well: ߊ߬ ߞߊߢߌ߲߬
+          water_works: ߖߌ߫ ߓߊ߯ߙߊ
+          windmill: ߝߢߐ߫ ߥߎ߮
           works: ߝߊ߲ߓߏ߲
           "yes": ߡߐ߱ ߛߌ߲ߘߟߌߣߐ
         military:
@@ -543,6 +565,7 @@ nqo:
           forest: ߕߎ
           hill: ߞߎ߬ߙߎ
           island: ߕߌ߲
+          point: ߕߏ߲ߘߋ
           sand: ߕߌ߬ߢߍ
           tree: ߦߙߌߖߎ
           valley: ߝߏ߲ߝߊ߲
@@ -550,19 +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: ߞߊ߬ߝߏ
@@ -616,6 +652,7 @@ nqo:
           tattoo: ߥߍ߬ߢߍ߲ ߝߎ߲ߞߎ߲
           tea: ߕߋ߫ ߝߎ߲ߞߎ߲
           tobacco: ߖߊ߲߬ߓߊ߬ ߝߎ߲ߞߎ߲
+          toys: ߡߣߊ߫ ߝߎ߲ߞߎ߲
           travel_agency: ߕߐ߰ߕߐ߰ߟߌ߬ߟߊ ߟߎ߬
           tyres: ߞߐ߲߬ߡߘߊ߬ ߝߎ߲ߞߎ߲
           variety_store: ߢߌ߰ߡߌ߬ߢߊ߰ߡߊ߬ ߝߎ߲ߞߎ߲
@@ -626,6 +663,7 @@ nqo:
           "yes": ߝߎ߲ߞߎ߲
         tourism:
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
+          motel: ߖߌ߬ߦߊ߬ߓߏ߲ (ߡߏߕߍߟ)
           museum: ߗߍߓߏ߲
           zoo: ߥߘߊߓߊ ߝߟߍ߫ ߛߏ
         waterway:
@@ -702,6 +740,7 @@ nqo:
         diary_comment:
           other_label: ߘߏ߫ ߜߘߍ߫
         user:
+          vandal_label: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߦߋ߫ ߕߌߢߍߟߌߟߊ ߟߋ߬ ߘߌ߫
           other_label: ߘߏ߫ ߜߘߍ߫
         note:
           spam_label: ߦߟߌߣߐ ߣߌ߲߬ ߦߋ߫ ߛߑߔߊߡ ߠߋ߬ ߘߌ߫
@@ -772,6 +811,7 @@ nqo:
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
     gpx_success:
+      hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ߫ ߛߎߘߊ߲ߣߍ߲'
     signup_confirm:
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬'
@@ -806,7 +846,35 @@ 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: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫