Merge branch 'pull/3024'

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 45a1d765f36f2187befb334d50674418a6eb39c1..2336a220e18e62d550938472ee6a47be7ef29d59 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -139,6 +139,7 @@ nqo:
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
       windowslive: ߥߌ߲ߘߏߛ ߟߊ߯ߌߝ߭
+      github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
     notes:
@@ -147,6 +148,9 @@ 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} ߦߋ߫
@@ -298,11 +302,7 @@ nqo:
     new:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ
     form:
-      subject: 'ߝߐߡߊ:'
-      body: 'ߝߊ߬ߘߌ:'
-      language: 'ߞߊ߲:'
       location: 'ߘߌ߲߬ߞߌߙߊ:'
-      latitude: ߓߊߙߌ
       use_map_link: ߔߊ߬ߔߘߊ ߟߊߓߊ߯ߙߊ߫
     index:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
@@ -531,6 +531,7 @@ nqo:
           swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ
         man_made:
           bridge: ߛߍ߲
+          mine: ߘߊ߬ߡߊ߲
           telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲
           tower: ߛߊ߲ߓߏ߲
           water_tower: ߖߌߡߣߐ
@@ -550,8 +551,11 @@ nqo:
           wood: ߦߙߌ
         office:
           government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ
+          newspaper: ߝߐ߰ߓߍ߬ ߛߓߍ߬ߘߊ߮
           ngo: ߛ.ߘ.ߞ ߛߓߍߘߊ
+          religion: ߣߊߡߎ߲ ߛߓߍߘߊ
           telecommunication: ߓߌ߬ߟߊ߬ߢߐ߲߱ߡߊ ߛߓߍߘߊ
+          travel_agent: ߕߐ߰ߕߐ߰ߟߌ߬ ߗߋߘߊ
           "yes": ߛߓߍߘߊ
         place:
           country: ߖߡߊ߬ߣߊ
@@ -570,7 +574,9 @@ nqo:
           construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫
           halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
           junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ
+          station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮
           stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ
+          subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ
         shop:
           art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲
           bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲
@@ -591,6 +597,7 @@ nqo:
           erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲
           farm: ߛߣߍ߬ߞߍ߬ߝߋ߲߬ ߝߎ߲ߞߎ߲
           fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲
+          food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲
           gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲
           hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ
           hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲
@@ -671,6 +678,21 @@ nqo:
       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:
@@ -853,12 +875,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: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲
@@ -874,7 +916,12 @@ nqo:
         title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ
         credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬
     index:
+      permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ
+      shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲
       createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬
+      license:
+        copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
+          ߞߘߐ߫
     edit:
       not_public: ߌ ߡߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߛߴߊ߬ߟߎ߫ ߘߌ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ߡߊ߫
         ߘߌ߫.
@@ -972,7 +1019,17 @@ nqo:
           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: ߖߌ߬ߦߊ߬ߓߍ