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

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

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 3fc44972ffc5f44716c6276c2ef8ebb120841883..8844e3a632ae5920d04f7787dd888fb6a655a4ad 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -702,20 +702,12 @@ nqo:
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫'
       had_added_you: '%{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬.'
       befriend_them: ߌ ߝߣߊ߫ ߘߌ߫ ߛߴߊ߬ߟߎ߫ ߝߙߊ߬ ߟߊ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫ %{befriendurl} ߘߐ߫
-    gpx_notification:
-      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
-      your_gpx_file: ߊ߬ ߞߍߣߍ߲߫ ߦߴߌ ߟߊ߫ GPX ߞߐߕߐ߮
-      with_description: ߞߊ߲߬ߛߓߍ߬ߟߌ ߘߌ߫
-      and_the_tags: 'ߊ߬ ߣߌ߫ ߕߊߜ߭ ߣߌ߲߬ ߠߎ߫:'
-      and_no_tags: 'ߊ߬ ߣߌ߫ ߕߊߜ߭ ߕߴߦߋ߲߬:'
-      failure:
-        subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
-        failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
-        more_info_1: GPX ߟߊߛߣߍߟߌ ߗߌߙߏ߲ߠߌ߲ ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߜߘߍ߫ ߟߎ߫ ߣߴߊ߬ߟߎ߬ ߡߊߕߊ߲߬ߞߊ߬ ߢߊ
-        more_info_2: 'ߏ߬ ߘߐ߫ ߊ߬ ߘߌ߫ ߛߋ߫ ߟߊߛߐ߬ߘߐ߲߬ ߠߊ߫ ߦߊ߲߬:'
-        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
-      success:
-        subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ߫ ߛߎߘߊ߲ߣߍ߲'
+    gpx_failure:
+      failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫'
+    gpx_success:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ߫ ߛߎߘߊ߲ߣߍ߲'
     signup_confirm:
       subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬'
       greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ ߦߋ߲߬߹