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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index d091e7506363373b9e6e1ff4fd499cfa0bd4e4d5..c68ed3cb67d5163fa2dc0615b4cb73c00d6f1aae 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -1194,11 +1194,13 @@ nqo:
       wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
         ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
         ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
       wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
         ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
         ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.

-    mark:
-      as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
-      as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫

     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫

+    read_marks:
+      create:
+        notice: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
+      destroy:
+        notice: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫

     mailboxes:
       heading:
         my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
     mailboxes:
       heading:
         my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ


@@ -1346,7 +1348,7 @@ nqo:
       license:
         copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
           ߞߘߐ߫
       license:
         copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
           ߞߘߐ߫

-    edit:
+    not_public_flash:

       not_public: ߌ ߡߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߛߴߊ߬ߟߎ߫ ߘߌ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ߡߊ߫
         ߘߌ߫.
       not_public_description_html: ߌ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߡߍ߲߫ ߠߊ߫ ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲ ߘߊߞߘߐ߫ ߣߴߌ
       not_public: ߌ ߡߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߛߴߊ߬ߟߎ߫ ߘߌ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ߡߊ߫
         ߘߌ߫.
       not_public_description_html: ߌ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߡߍ߲߫ ߠߊ߫ ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲ ߘߊߞߘߐ߫ ߣߴߌ


@@ -1354,6 +1356,7 @@ nqo:
         ߟߊ߫ %{user_page} ߞߣߐ߫.
       user_page_link: ߞߐߜߍ߫ ߟߊߓߊ߯ߙߕߊ
       anon_edits_link_text: ߊ߬ ߢߊߢߌߣߌ߲߫ ߓߊ߫ ߡߎ߲߬ ߘߐ߫ ߣߌ߲߬ ߞߍߣߍ߲߫.
         ߟߊ߫ %{user_page} ߞߣߐ߫.
       user_page_link: ߞߐߜߍ߫ ߟߊߓߊ߯ߙߕߊ
       anon_edits_link_text: ߊ߬ ߢߊߢߌߣߌ߲߫ ߓߊ߫ ߡߎ߲߬ ߘߐ߫ ߣߌ߲߬ ߞߍߣߍ߲߫.

+    edit:

       id_not_configured: ID ߡߊ߫ ߘߊߘߐߓߍ߲߬ ߡߎߣߎ߲߬
     export:
       title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ
       id_not_configured: ID ߡߊ߫ ߘߊߘߐߓߍ߲߬ ߡߎߣߎ߲߬
     export:
       title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ