Merge remote-tracking branch 'upstream/pull/2934' into master

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 031e8a8cecb06d5de755f551be5c9aba9bf3541e..73fc97aca045688f11214102ec67694fc2c3598d 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -153,12 +153,19 @@ nqo:
         closed: ߞߟߏߜߍ߫ ߘߊߕߎ߲߯ߣߍ߲ (%{place} ߘߊߝߍ߬)
       entry:
         comment: ߡߙߌߣߊ߲
+        full: ߦߟߌߣߐ ߘߝߊߣߍ߲
   browse:
     created: ߛߌ߲ߘߌߣߍ߲
     closed: ߘߊߕߎ߲߯ߣߍ߲
     created_html: ߛߌ߲ߘߌߣߍ߲ <abbr title='%{title}'></abbr>%{time}
     closed_html: ߘߊߕߎ߲߯ߣߍ߲ <abbr title='%{title}'></abbr>%{time}
     created_by_html: ߛߌ߲ߘߌߣߍ߲ <abbr title='%{title}'></abbr>%{time}%{user}
+    deleted_by_html: ߊ߬ ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
+      %{user} ߓߟߏ߫
+    edited_by_html: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬ߣߍ߲߫ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
+      %{user} ߓߟߏ߫
+    closed_by_html: ߊ߬ ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ <abbr title='%{title}'>%{title}%{time}</abbr>
+      %{user} ߓߟߏ߫
     in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     anonymous: ߕߐ߯ߒߕߊ߲
     part_of: ߝߊ߲߭ ߘߏ߫
@@ -228,9 +235,9 @@ nqo:
       open_title: ߦߟߌߣߐ߫ ߢߊߓߐߓߊߟߌ %{note_name}
       closed_title: ߦߟߌߣߐ߫ ߢߊߓߐߣߍ߲ %{note_name}
       hidden_title: ߦߟߌߣߐ߫ ߢߡߊߘߏ߲߰ߣߍ߲ %{note_name}
-      opened_by: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
+      opened_by_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{user}<abbr title='%{exact_time}'>%{exact_time}%{when}</abbr>
         ߟߋ߬ ߓߟߏ߫
-      opened_by_anonymous: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: ߊ߬ ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߟߊ߫ ߓߟߏ߫ <abbr title='%{exact_time}'>%{when}</abbr>
       report: ߞߟߏߜߍ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     query:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
@@ -434,6 +441,7 @@ nqo:
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
           house: ߟߎ
           public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          school: ߞߊ߬ߙߊ߲߬ߕߊ
           university: ߖߊ߯ߓߘߊ ߓߏ߲
         craft:
           electrician: ߢߎߡߍߦߟߊ
@@ -446,6 +454,11 @@ nqo:
         highway:
           bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ
           construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫
+          living_street: ߛߏߞߣߐ߫ ߛߌߟߊ
+          primary_link: ߛߌߟߊ ߞߎ߲߬ߝߟߐ
+          proposed: ߛߌߟߊ߫ ߟߊߞߏߝߐߣߍ߲
+          raceway: ߜߛߊ߬ߞߍ߬ ߛߌߟߊ
+          residential: ߡߐ߰ߘߐ߬ ߛߌߟߊ
           road: ߛߌߟߊ
           secondary: ߛߌߟߊ߫ ߝߌߟߊߣߊ߲
           secondary_link: ߛߌߟߊ߫ ߝߌߟߊߣߊ߲
@@ -574,7 +587,6 @@ nqo:
         level6: ߖߡߊ߬ߣߊ ߓߐߕߏ߲
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
-    description:
       types:
         towns: ߛߏ
         places: ߘߌ߲߬ߞߌߙߊ
@@ -647,6 +659,38 @@ nqo:
       hi: ߌ ߣߌ߫ ߗߋ߫ %{to_user}.
       header: '%{from_user} ߓߘߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߝߐߡߊ
         %{subject} ߘߌ߫'
+    signup_confirm:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬'
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ ߦߋ߲߬߹
+      created: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߛߌ߰ߣߍ߲߫ ߦߴߌ ߘߐ߫) ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߛߌ߲ߘߌ߫ %{site_url} ߞߊ߲߬.
+      confirm: 'ߦߋ߬ߣߴߊ߲ ߞߍ߫ ߕߐ߫ ߞߏ߫ ߜߘߍ ߛߎ߯-ߎ-ߛߎ߯ ߞߍ߫ ߟߊ߫߸ ߒ߬ ߧߴߊ߬ ߝߍ߬ ߌ ߦߴߊ߬ ߟߊߛߙߋߦߊ߫
+        ߞߏ߫ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߣߌ߲߬ ߝߘߊߣߍ߲߫ ߦߴߌߟߋ ߟߋ߬ ߟߊ߫߸ ߏ߬ ߘߐ߫ ߣߴߏ߬ ߞߍ߫ ߘߊ߫ ߘߎ߰ߟߊ߬ߘߐ߫
+        ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߙߋߦߊ߫:'
+      welcome: ߣߴߌ ߓߊ߲߫ ߘߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߙߋߦߊ߫ ߟߊ߫߸ ߊ߲ ߘߴߌ ߡߊߛߐ߫ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߡߊ߬ߞߊ߬ߝߏ߬ߟߌ߫
+        ߜߘߍ߫ ߟߊ߫ ߛߴߌ ߘߴߊ߬ ߘߐߝߘߊ߫.
+    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: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
@@ -721,4 +765,7 @@ nqo:
       copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
         ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
+    copyright:
+      foreign:
+        title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
 ...