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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 4f975b408c08a0d41a8b903f72c012d27edcf0b9..df596a6f98eeefd2e92f6065c59401e346371464 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -42,10 +42,6 @@ nqo:
         create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
         update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
   activerecord:
         create: ߘߏߙߊ ߘߏ߫ ߛߌ߲ߘߌ߫
         update: ߘߏߙߊ ߘߏ߫ ߟߊߦߟߍ߬
   activerecord:

-    errors:
-      messages:
-        invalid_email_address: ߊ߬ ߡߊ߫ ߓߐ߫ ߦߏ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߓߍ߲߬ߣߍ߲ ߠߋ߬
-        email_address_not_routable: ߊ߬ ߕߍ߫ ߛߙߊ߬ߕߊ߫ ߘߌ߫

     models:
       acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
       changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     models:
       acl: ߞߣߐ߬ߜߍ߲߬ ߛߙߍߘߍ ߟߊߛߐ߬ߘߐ߲߫
       changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫


@@ -372,7 +368,6 @@ nqo:
           ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changesets:
     changeset:
           ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changesets:
     changeset:

-      anonymous: ߕߐ߯ߒߕߊ߲

       no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
       view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
     index:
       no_edits: (ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬)
       view_changeset_details: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߘߐߜߍ߫
     index:


@@ -987,9 +982,6 @@ nqo:
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
         level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲
         level8: ߛߏ ߓߐߕߏ߲
         level9: ߕߏߘߊ ߓߐߕߏ߲
         level11: ߛߌ߰ߢߐ߲߰ߦߊ߬ ߦߙߐ ߓߐߕߏ߲

-      types:
-        towns: ߛߏ
-        places: ߘߌ߲߬ߞߌߙߊ

     results:
       no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬
     results:
       no_results: ߞߐߝߟߌ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       more_results: ߞߐߝߟߌ߫ ߜߘߍ ߟߎ߬


@@ -1190,7 +1182,6 @@ nqo:
         ߘߐ߫.
     changeset_comment_notification:
       hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}
         ߘߐ߫.
     changeset_comment_notification:
       hi: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ %{to_user}

-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸

       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫
       commented:
         partial_changeset_with_comment: ߡߙߌߣߊ߲ ߘߌ߫ %{changeset_comment}ߴ
         partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫