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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 01ac78d5296dba0e89c493b056aec31e5108e939..7d7e099005da80a7cc561df415127999d67b363b 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -302,7 +302,6 @@ nqo:
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     containing_relation:
         way: ߛߌߟߊ
         relation: ߕߍߓߊ߯ߦߊ
     containing_relation:

-      entry_html: ߕߍߓߊ߯ߦߊ %{relation_name}

       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫
       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫


@@ -1000,7 +999,6 @@ nqo:
       last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
       reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
     show:
       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}
       report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
       last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
       last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}


@@ -1525,7 +1523,7 @@ nqo:
       upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬
       upload_trace: ߜߋ߬ߙߋ ߘߏ߫ ߟߊߦߟߍ߬
       all_traces: ߜߋ߬ߙߋ ߟߎ߬ ߓߍ߯
       my_traces: ߒ ߝߏ߲߬ߝߏ߲ ߠߎ߬

-      traces_from: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
+      traces_from_html: ߜߍߘߐ߫ ߜߙߋ ߟߎ߬ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫

     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
     offline_warning:
     destroy:
       scheduled_for_deletion: ߜߋ߬ߙߋ ߟߐ߯ߟߊߟߌ ߖߏ߰ߛߌ߬ ߞߊ߲ߡߊ߬
     offline_warning: