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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index df596a6f98eeefd2e92f6065c59401e346371464..7d7e099005da80a7cc561df415127999d67b363b 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -302,7 +302,6 @@ nqo:
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     containing_relation:
-      entry_html: ߕߍߓߊ߯ߦߊ %{relation_name}
       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫
@@ -356,9 +355,6 @@ nqo:
         comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
           %{author} ߓߟߏ߫
         commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
-      comments:
-        comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
-          ߠߊ߫ %{author} ߓߟߏ߫
       show:
         title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
         title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
@@ -486,8 +482,6 @@ nqo:
       report: ߡߙߌߣߊ߲ ߣߌ߲߬ ߠߊߞߏߝߐ߫
     location:
       location: 'ߘߌ߲߬ߞߌߙߊ:'
-      view: ߦߌ߬ߘߊ߬ߟߌ
-      edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
     feed:
       user:
         title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ %{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
@@ -994,7 +988,6 @@ nqo:
       not_updated: ߊ߬ ߡߊ߫ ߟߏ߲ߘߐߦߊ߫
       search: ߢߌߣߌ߲ߠߌ߲
       search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫
-      link_to_reports: ߞߏߝߐߟߌ߫ ߟߎ߬ ߘߐߜߍ߫
       states:
         ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫
         open: ߊ߬ ߟߊߞߊ߬
@@ -1006,7 +999,6 @@ nqo:
       last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
       reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
     show:
-      title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
       report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
       last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
       last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
@@ -1316,14 +1308,12 @@ nqo:
       failure: ߢߊߞߙߍ ߕߍ߫ ߛߐ߲߬ ߟߏ߲ߘߐߦߊ߫ ߟߊ߫.
   sessions:
     new:
-      title: ߌ ߜߊ߲߬ߞߎ߲߫
       tab_title: ߌ ߜߊ߲߬ߞߎ߲߫
       email or username: 'ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮:'
       password: 'ߕߊ߬ߡߌ߲߬ߞߊ߲:'
       remember: ߒ ߖߊ߲߭ߓߌ߬ߟߊ߬
       lost password link: ߌ ߓߘߊ߫ ߢߌ߬ߣߊ߬ ߌ ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߠߊ߫؟
       login_button: ߌ ߜߊ߲߬ߞߎ߲߫
-      register now: ߌ ߕߐ߮ ߛߓߍ߫ ߡߎ߬ߕߎ߲߫
       auth failure: ߤߊߞߍ߬ߕߏ߫߸ ߌ ߕߴߛߋ߫ ߌ ߜߊ߲߬ߞߎ߲߬ ߠߊ߫ ߝߊߙߊ߲ߝߊ߯ߛߌ ߏ߬ ߟߐ߬ߟߊ߫.
     destroy:
       title: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲ ߓߐ߫
@@ -1434,7 +1424,6 @@ nqo:
       title: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߬ ߛߌ߫؟
     sidebar:
       search_results: ߞߐߝߟߌ ߟߎ߬ ߢߌߣߌ߲߫
-      close: ߊ߬ ߘߊߕߎ߲߯
     search:
       search: ߢߌߣߌ߲ߣߌ߲
       get_directions_title: ߞߎ߲߬ߕߋߟߋ߲ ߢߌߣߌ߲߫ ߘߊߞߎ߲߫ ߝߌ߬ߟߊ߬ ߟߎ߫ ߕߍ߫
@@ -1534,7 +1523,7 @@ nqo:
       upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
-      traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
+      traces_from_html: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
     offline_warning:
@@ -1648,7 +1637,6 @@ nqo:
       consider_pd: ߛߊ߲ߝߍߟߊ ߏ߬ ߡߊߞߊ߬ߝߏ߬ߟߌ ߘߐ߫ ߌ ߞߐ߫߸ ߒ ߧߋ߫ ߒ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߖߊ߬ߕߋ߬ ߟߴߊ߬
         ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
       consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       continue: ߊ߬ ߘߊߓߊ߲߫
       legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
       legale_names:
@@ -1722,9 +1710,7 @@ nqo:
       created: 'ߛߌ߲ߘߌߣߍ߲:'
       duration: 'ߘߎ߲ߡߊߟߌ:'
       status: 'ߡߊ߬ߘߎ߮:'
-      show: ߦߌ߬ߘߊ߬ߟߌ
       edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫
-      confirm: ߌ ߟߊߣߴߏ߬ ߟߊ߫؟
       reason: 'ߓߊ߬ߟߊ߲߬ߠߌ߲ ߞߎ߲߭:'
     block:
       show: ߊ߬ ߦߌ߬ߘߊ߬