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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 8844e3a632ae5920d04f7787dd888fb6a655a4ad..f7d232fdd49555a2e0c77025c65f711d5c60e410 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -148,6 +148,7 @@ nqo:
         commented_at_html: ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{when}
         commented_at_by_html: ߟߊߥߟߌ߬ߣߍ߲߫ %{when} %{user} ߓߟߏ߫
       rss:
+        title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߦߟߌߣߐ ߟߎ߬
         opened: ߞߟߏߜߍ߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬})
         commented: ߡߙߌߣߊ߲߫ ߞߎߘߊ߫ (%{place} ߘߊߝߍ߬)
         closed: ߞߟߏߜߍ߫ ߘߊߕߎ߲߯ߣߍ߲ (%{place} ߘߊߝߍ߬)
@@ -454,6 +455,7 @@ nqo:
           hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
           house: ߟߎ
+          manufacture: ߝߊ߲ߓߏ߲
           public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
           school: ߞߊ߬ߙߊ߲߬ߕߊ
           university: ߖߊ߯ߓߘߊ ߓߏ߲
@@ -559,6 +561,7 @@ nqo:
           coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲
           computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲
           cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲
+          doityourself: ߞߵߊ߬ ߞߴߌ ߖߘߍ߬ߦߋ߫
           e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲
           electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲
           erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
@@ -599,6 +602,7 @@ nqo:
           "yes": ߖߛߌߟߊ
       admin_levels:
         level2: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
+        level3: ߕߌ߲߬ߞߎߘߎ߲ ߓߐߕߏ߲
         level4: ߞߊ߬ߝߏ ߓߐߕߏ߲
         level5: ߕߌ߲ߞߎߘߎ߲ ߓߐߕߏ߲
         level6: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
@@ -692,6 +696,7 @@ nqo:
       header: '%{from_user} ߓߘߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߝߐߡߊ
         %{subject} ߘߌ߫'
     message_notification:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{message_title}'
       hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
       header: '%{from_user} ߓߘߊ߫ ߗߋߛߓߍ ߘߏ߫ ߗߋ߫ ߌ ߡߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߛߌߟߊ ߝߍ߬ ߝߐߡߊ
         %{subject} ߘߌ߫:'
@@ -719,28 +724,13 @@ nqo:
         ߜߘߍ߫ ߟߊ߫ ߛߴߌ ߘߴߊ߬ ߘߐߝߘߊ߫.
     email_confirm:
       subject: '[[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ]] ߌ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊߛߙߋߦߊ߫'
-    email_confirm_plain:
       greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮
         ߟߊߛߙߋߦߊ߫ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫.
       click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲
         ߟߊߛߙߋߦߊ߫.
-    email_confirm_html:
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
-      hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮
-        ߡߊߝߊ߬ߟߋ߲߬ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫.
-      click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲
-        ߟߊߛߙߋߦߊ߫.
     lost_password:
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊߢߌ߬ߣߌ߲߬ߞߊ'
-    lost_password_plain:
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
-      hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
-        ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ
-        ߣߌ߲߬ ߞߊ߲߬.
-      click_the_link: ߣߴߊ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ
-        ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߝߊ߬ߟߋ߲߬.
-    lost_password_html:
       greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
         ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ
@@ -848,6 +838,8 @@ nqo:
       area_to_export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ ߞߍ߫ ߦߙߐ
       manually_select: ߦߙߐ߫ ߓߐߣߍ߲ߢߐ߲߰ߡߊ ߟߎ߬ ߓߊߕߐ߬ߡߐ߲߬ ߓߟߏߟߕߊߦߊ ߘߐ߫
       too_large:
+        planet:
+          title: ߖߊ߯ߓߊߟߌ OSM
         other:
           title: ߛߎ߲߫ ߜߘߍ ߟߎ߬
           description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ
@@ -878,4 +870,49 @@ nqo:
       where_am_i: ߣߌ߲߬ ߦߋ߫ ߡߌ߲߫؟
       where_am_i_title: ߛߋ߲߬ߠߊ߫ ߘߌ߲ߞߌߙߊ ߛߓߍ߫ ߡߍ߲ ߠߊߓߊ߯ߙߊߣߍ߲߫ ߦߋ߫ ߕߌߙߌ߲ߠߌ߲߫ ߣߌߘߐ ߓߟߏ߫
       submit_text: ߕߊ߯
+    key:
+      table:
+        entry:
+          rail: ߣߍ߰ߛߌߟߊ
+          admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ
+          forest: ߕߎ
+          wood: ߦߙߌ
+          industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲
+          commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ
+          lake:
+          - ߞߐ߰ߖߌ߬ߘߟߊ
+          farm: ߝߏ߬ߘߏ
+          centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲
+          reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲
+          military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲
+          school:
+          - ߞߊ߬ߙߊ߲߬ߕߊ
+          - ߖߊ߯ߓߘߊ
+          station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
+          construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫
+          bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲
+          bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮
+          toilets: ߢߍ߲߮
+    richtext_area:
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
+    markdown_help:
+      link: ߛߘߌ߬ߜߋ߲
+      text: ߞߟߏߘߋ߲
+      image: ߖߌ߬ߦߊ߬ߓߍ
+      url: URL
+    welcome:
+      title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹
+      start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫
+      add_a_note:
+        title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹
+  traces:
+    new:
+      help: ߘߍ߬ߡߍ߲߬ߠߌ߲
+      help_url: https://wiki.openstreetmap.org/ߥߞߌ/ߟߊ߬ߦߟߍ߬ߟߌ
+    show:
+      map: ߡߊߔ
+      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬
+      owner: 'ߊ߬ ߕߌ߱:'
+      description: 'ߞߊ߲߬ߛߓߍߟߌ:'
+      tags: 'ߘߎ߲ߛߓߍ ߟߎ߬:'
 ...