From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Mon, 14 May 2018 06:24:58 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~3631
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f38824856d6eb3b51bc7c340deff487f5d49516d

Localisation updates from https://translatewiki.net.
---

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 6b4ddbce6..01dc07aba 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1141,6 +1141,14 @@ af:
   trace:
     create:
       upload_trace: Laai GPS-spore op
+      upload_gpx: 'Laai GPX-lêer op:'
+      description: 'Beskrywing:'
+      tags: 'Merkers:'
+      tags_help: komma afgebaken
+      visibility: 'Sigbaarheid:'
+      visibility_help: wat beteken dit?
+      upload_button: Laai op
+      help: Hulp
     edit:
       title: Redigeer tans spoor %{name}
       heading: Wysig spoor %{name}
@@ -1158,18 +1166,6 @@ af:
       save_button: Stoor Wysigings
       visibility: 'Sigbaarheid:'
       visibility_help: wat beteken dit?
-    trace_form:
-      upload_gpx: 'Laai GPX-lêer op:'
-      description: 'Beskrywing:'
-      tags: 'Merkers:'
-      tags_help: komma afgebaken
-      visibility: 'Sigbaarheid:'
-      visibility_help: wat beteken dit?
-      upload_button: Laai op
-      help: Hulp
-    trace_header:
-      upload_trace: Laai 'n GPS-spoor op
-      see_all_traces: Wys alle spore
     trace_optionals:
       tags: Merkers
     view:
@@ -1212,6 +1208,8 @@ af:
       public_traces: Openbare GPS-spore
       public_traces_from: Openbare GPS-spore van %{user}
       tagged_with: gemerk met %{tags}
+      upload_trace: Laai 'n GPS-spoor op
+      see_all_traces: Wys alle spore
     delete:
       scheduled_for_deletion: Spoor is vir verwydering geoormerk
     make_public:
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index 511efcb34..772e4bf51 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -936,6 +936,17 @@ aln:
       upload_trace: Ngarkoj tdhanat e GPS-it
       trace_uploaded: E dhana jote GPX asht ngarkue edhe osht ka pret futjen en databazë.
         Kjo zakonisht ndodhë mrena gjysë ore, dhe ni email vjen te ti en fund të përfundimit
+      traces_waiting: Ju keni %{count} të dhëna duke pritur për tu ngrarkuar.Ju lutem
+        pritni deri sa të përfundoj ngarkimi përpara se me ngarku tjetër gjë, pra
+        që mos me blloku rradhën për përdoruesit e tjerë.
+      upload_gpx: Ngarko një skedar GPX
+      description: Përshkrimi
+      tags: Etiketat
+      tags_help: Presje e kufizume
+      visibility: Dukshmënia
+      visibility_help: çka do me than kjo?
+      upload_button: Ngarko
+      help: Ndihma
     edit:
       title: Duke ndryshue të dhanen %{name}
       heading: Ndrysho të dhanën %{name}
@@ -953,20 +964,6 @@ aln:
       save_button: Ruaj Ndryshimet
       visibility: 'Dukshmënia:'
       visibility_help: Çka do me than kjo?
-    trace_form:
-      upload_gpx: Ngarko një skedar GPX
-      description: Përshkrimi
-      tags: Etiketat
-      tags_help: Presje e kufizume
-      visibility: Dukshmënia
-      visibility_help: çka do me than kjo?
-      upload_button: Ngarko
-      help: Ndihma
-    trace_header:
-      see_all_traces: Kshyri kejt të dhanat
-      traces_waiting: Ju keni %{count} të dhëna duke pritur për tu ngrarkuar.Ju lutem
-        pritni deri sa të përfundoj ngarkimi përpara se me ngarku tjetër gjë, pra
-        që mos me blloku rradhën për përdoruesit e tjerë.
     trace_optionals:
       tags: Etiketat
     view:
@@ -1010,6 +1007,7 @@ aln:
       public_traces: Të dhanat publike të GPS-it
       public_traces_from: Të dhana publike të GPS-it pej %{user}
       tagged_with: ' e etikume me %{tags}'
+      see_all_traces: Kshyri kejt të dhanat
     delete:
       scheduled_for_deletion: Gjurma u parapa për fshirje
     make_public:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3ec1888f1..9bb6855a8 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1404,6 +1404,16 @@ ar:
       upload_trace: ارفع أثر جي بي إس
       trace_uploaded: لقد تم تحميل ملفك الجي بي إكس ويتنظر الإدراج في قاعدة البيانات.
         وهذا يحدث عادًة خلال نصف ساعة، وسيتم إرسال رسالة إلكترونية لك عند الانتهاء.
+      traces_waiting: لديك %{count} أثر في انتظار التحميل. يرجى مراعاة الانتظار قبل
+        تحميل أكثر من ذلك، بحيث تتجنب إعاقة طابور التحميل لباقي المستخدمين.
+      upload_gpx: 'ارفع ملف GPX:'
+      description: 'الوصف:'
+      tags: 'الوسوم:'
+      tags_help: محدد بفواصل
+      visibility: 'الرؤية:'
+      visibility_help: ماذا يعني هذا؟
+      upload_button: رفع
+      help: مساعدة
     edit:
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
@@ -1421,20 +1431,6 @@ ar:
       save_button: احفظ التغييرات
       visibility: 'الرؤية:'
       visibility_help: ماذا يعني هذا؟
-    trace_form:
-      upload_gpx: 'ارفع ملف GPX:'
-      description: 'الوصف:'
-      tags: 'الوسوم:'
-      tags_help: محدد بفواصل
-      visibility: 'الرؤية:'
-      visibility_help: ماذا يعني هذا؟
-      upload_button: رفع
-      help: مساعدة
-    trace_header:
-      upload_trace: حمل أثر
-      see_all_traces: شاهد كل الآثار
-      traces_waiting: لديك %{count} أثر في انتظار التحميل. يرجى مراعاة الانتظار قبل
-        تحميل أكثر من ذلك، بحيث تتجنب إعاقة طابور التحميل لباقي المستخدمين.
     trace_optionals:
       tags: الوسوم
     view:
@@ -1481,6 +1477,8 @@ ar:
       public_traces_from: آثار جي بي إس عمومية من %{user}
       description: تصفح أحدث مسارات GPS المرفوعة
       tagged_with: بالوسم %{tags}
+      upload_trace: حمل أثر
+      see_all_traces: شاهد كل الآثار
     delete:
       scheduled_for_deletion: تم جدولة الأثر للحذف
     make_public:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 3914a2158..cd0817e87 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -768,6 +768,16 @@ arz:
       upload_trace: ارفع أثر جى بى إس
       trace_uploaded: لقد تم تحميل ملفك الجى بى إكس ويتنظر الإدراج فى قاعده البيانات.
         وهذا يحدث عادًه خلال نصف ساعه، وسيتم إرسال رساله إلكترونيه لك عند الانتهاء.
+      traces_waiting: لديك %{count} أثر فى انتظار التحميل. يرجى مراعاه الانتظار قبل
+        تحميل أكثر من ذلك، بحيث تتجنب إعاقه طابور التحميل لباقى المستخدمين.
+      upload_gpx: ارفع ملف جى بى إكس
+      description: الوصف
+      tags: الوسوم
+      tags_help: محدد بفواصل
+      visibility: الرؤية
+      visibility_help: ماذا يعنى هذا؟
+      upload_button: ارفع
+      help: المساعدة
     edit:
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
@@ -785,19 +795,6 @@ arz:
       save_button: احفظ التغييرات
       visibility: 'الرؤية:'
       visibility_help: ماذا يعنى هذا؟
-    trace_form:
-      upload_gpx: ارفع ملف جى بى إكس
-      description: الوصف
-      tags: الوسوم
-      tags_help: محدد بفواصل
-      visibility: الرؤية
-      visibility_help: ماذا يعنى هذا؟
-      upload_button: ارفع
-      help: المساعدة
-    trace_header:
-      see_all_traces: شاهد كل الآثار
-      traces_waiting: لديك %{count} أثر فى انتظار التحميل. يرجى مراعاه الانتظار قبل
-        تحميل أكثر من ذلك، بحيث تتجنب إعاقه طابور التحميل لباقى المستخدمين.
     trace_optionals:
       tags: الوسوم
     view:
@@ -837,6 +834,7 @@ arz:
       public_traces: آثار جى بى إس عمومية
       public_traces_from: آثار جى بى إس عموميه من %{user}
       tagged_with: ' موسوم مع %{tags}'
+      see_all_traces: شاهد كل الآثار
     delete:
       scheduled_for_deletion: تم جدوله الأثر للحذف
     make_public:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index fe883353f..1897aef6e 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1608,6 +1608,19 @@ ast:
       trace_uploaded: El to ficheru GPX se xubió y ta esperando p'amestase a la base
         de datos. De vezu, esto tendría d'asoceder en media hora, y se t'unviará un
         corréu al completase.
+      traces_waiting: '{PLURAL|one=Tien %{count} traza esperando pa xubir. Considere
+        esperar a qu''esta termine enantes de xubir más, col envís de nun bloquiar
+        la cola pa otros usuarios.|Tien %{count} traces esperando pa xubir. Considere
+        esperar a qu''estes terminen enantes de xubir más, col envís de nun bloquiar
+        la cola pa otros usuarios.}}'
+      upload_gpx: 'Xubir un ficheru GPX:'
+      description: 'Descripción:'
+      tags: 'Etiquetes:'
+      tags_help: llendáu con comes
+      visibility: 'Visibilidá:'
+      visibility_help: ¿qué ye esto?
+      upload_button: Xubir
+      help: Ayuda
     edit:
       title: Editando la traza %{name}
       heading: Editando la traza %{name}
@@ -1625,24 +1638,6 @@ ast:
       save_button: Guardar cambeos
       visibility: 'Visibilidá:'
       visibility_help: ¿qué ye esto?
-    trace_form:
-      upload_gpx: 'Xubir un ficheru GPX:'
-      description: 'Descripción:'
-      tags: 'Etiquetes:'
-      tags_help: llendáu con comes
-      visibility: 'Visibilidá:'
-      visibility_help: ¿qué ye esto?
-      upload_button: Xubir
-      help: Ayuda
-    trace_header:
-      upload_trace: Xubir una traza
-      see_all_traces: Ver toles traces
-      see_my_traces: Ver les mios traces
-      traces_waiting: '{PLURAL|one=Tien %{count} traza esperando pa xubir. Considere
-        esperar a qu''esta termine enantes de xubir más, col envís de nun bloquiar
-        la cola pa otros usuarios.|Tien %{count} traces esperando pa xubir. Considere
-        esperar a qu''estes terminen enantes de xubir más, col envís de nun bloquiar
-        la cola pa otros usuarios.}}'
     trace_optionals:
       tags: Etiquetes
     view:
@@ -1694,6 +1689,9 @@ ast:
       empty_html: Entá nun hai nada equí. <a href='%{upload_link}'>Carga una nueva
         traza</a> o depriende más tocante a cómo trazar col GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         de la wiki</a>.
+      upload_trace: Xubir una traza
+      see_all_traces: Ver toles traces
+      see_my_traces: Ver les mios traces
     delete:
       scheduled_for_deletion: Traza marcada pa desaniciar
     make_public:
diff --git a/config/locales/az.yml b/config/locales/az.yml
index cb5355cfd..926c9803e 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -931,6 +931,9 @@ az:
       alt: Alternativ mətn
       url: URL
   trace:
+    create:
+      description: 'Ä°zah:'
+      help: Kömək
     edit:
       filename: 'Fayl adı:'
       download: yüklə
@@ -939,9 +942,6 @@ az:
       owner: 'Sahibi:'
       description: 'Ä°zah:'
       save_button: Dəyişiklikləri yadda saxla
-    trace_form:
-      description: 'Ä°zah:'
-      help: Kömək
     view:
       filename: 'Fayl adı:'
       download: yüklə
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index b5aa02a06..809a5f41c 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -1039,6 +1039,24 @@ be-Tarask:
       trace_uploaded: Ваш GPX-файл быў загружаны і чакае ўстаўкі ў базу зьвестак.
         Звычайна гэта адбываецца на працягу паўгадзіны, і Вам будзе дасланы электронны
         ліст з абвяшчэньнем пра завяршэньне.
+      traces_waiting:
+        one: Вы маеце %{count} трэк, які чакае загрузкі. Калі ласка, пачакайце сканчэньня
+          перадачы гэтага трэку перад тым, як загружаць іншыя, гэта дазволіць не блякаваць
+          чаргу для іншых удзельнікаў.
+        few: Вы маеце %{count} трэкі, якія чакаюць загрузкі. Калі ласка, пачакайце
+          сканчэньня перадачы гэтых трэкаў перад тым, як загружаць іншыя, гэта дазволіць
+          не блякаваць чаргу для іншых удзельнікаў.
+        other: Вы маеце %{count} трэкаў, якія чакаюць загрузкі. Калі ласка, пачакайце
+          сканчэньня перадачы гэтых трэкаў перад тым, як загружаць іншыя, гэта дазволіць
+          не блякаваць чаргу для іншых удзельнікаў.
+      upload_gpx: 'Загрузіць GPX-файл:'
+      description: 'Апісаньне:'
+      tags: 'Тэгі:'
+      tags_help: падзеленае коскамі
+      visibility: 'Бачнасьць:'
+      visibility_help: што гэта азначае?
+      upload_button: Загрузіць
+      help: Дапамога
     edit:
       title: Рэдагаваньне трэку %{name}
       heading: Рэдагаваньне трэку %{name}
@@ -1056,28 +1074,6 @@ be-Tarask:
       save_button: Захаваць зьмены
       visibility: 'Бачнасьць:'
       visibility_help: што гэта азначае?
-    trace_form:
-      upload_gpx: 'Загрузіць GPX-файл:'
-      description: 'Апісаньне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленае коскамі
-      visibility: 'Бачнасьць:'
-      visibility_help: што гэта азначае?
-      upload_button: Загрузіць
-      help: Дапамога
-    trace_header:
-      upload_trace: Загрузіць трэк
-      see_all_traces: Паказаць усе трэкі
-      traces_waiting:
-        one: Вы маеце %{count} трэк, які чакае загрузкі. Калі ласка, пачакайце сканчэньня
-          перадачы гэтага трэку перад тым, як загружаць іншыя, гэта дазволіць не блякаваць
-          чаргу для іншых удзельнікаў.
-        few: Вы маеце %{count} трэкі, якія чакаюць загрузкі. Калі ласка, пачакайце
-          сканчэньня перадачы гэтых трэкаў перад тым, як загружаць іншыя, гэта дазволіць
-          не блякаваць чаргу для іншых удзельнікаў.
-        other: Вы маеце %{count} трэкаў, якія чакаюць загрузкі. Калі ласка, пачакайце
-          сканчэньня перадачы гэтых трэкаў перад тым, як загружаць іншыя, гэта дазволіць
-          не блякаваць чаргу для іншых удзельнікаў.
     trace_optionals:
       tags: Тэгі
     view:
@@ -1121,6 +1117,8 @@ be-Tarask:
       public_traces: Публічныя GPS-трэкі
       public_traces_from: Публічныя GPS-трэкі ўдзельніка %{user}
       tagged_with: ' пазначаныя %{tags}'
+      upload_trace: Загрузіць трэк
+      see_all_traces: Паказаць усе трэкі
     delete:
       scheduled_for_deletion: Трэк заплянаваны на выдаленьне
     make_public:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index a1f06ff3e..4c899450a 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1548,6 +1548,17 @@ be:
       trace_uploaded: Ваш GPX-файл быў адасланы і чакае ўстаўкі ў базу дадзеных. Гэта
         звычайна робіцца не больш за паўгадзіны. Вы атрымаеце працврджанне аб заканчэнні
         працэсу па электроннай пошце
+      traces_waiting: У вас %{count} след у чарзе. Калі ласка, пачакайце, пакуль яны
+        будуць апрацаваныя, каб не блакірваць чаргу для астатніх карстальнікаў.
+      upload_gpx: 'Адаслаць GPX-файл:'
+      description: 'Апісанне:'
+      tags: 'Тэгі:'
+      tags_help: падзеленыя коскамі
+      visibility: 'Бачнасць:'
+      visibility_help: што гэта значыць?
+      upload_button: Зацягнуць
+      help: Даведка
+      help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
     edit:
       title: Рэдагаванне следу %{name}
       heading: Рэдагаванне следу %{name}
@@ -1565,21 +1576,6 @@ be:
       save_button: Запісаць змены
       visibility: 'Бачнасць:'
       visibility_help: што гэта значыць?
-    trace_form:
-      upload_gpx: 'Адаслаць GPX-файл:'
-      description: 'Апісанне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленыя коскамі
-      visibility: 'Бачнасць:'
-      visibility_help: што гэта значыць?
-      upload_button: Зацягнуць
-      help: Даведка
-      help_url: http://wiki.openstreetmap.org/wiki/RU:Upload
-    trace_header:
-      upload_trace: Адаслаць GPS-след
-      see_all_traces: Паглядзець усе сляды
-      traces_waiting: У вас %{count} след у чарзе. Калі ласка, пачакайце, пакуль яны
-        будуць апрацаваныя, каб не блакірваць чаргу для астатніх карстальнікаў.
     trace_optionals:
       tags: Тэгі
     view:
@@ -1629,6 +1625,8 @@ be:
       empty_html: Пакуль тут нічога няма. <a href='%{upload_link}'>Загрузіце новы
         след</a> або пачытайце пра GPS-сляды на <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вікі-старонцы</
         a>.
+      upload_trace: Адаслаць GPS-след
+      see_all_traces: Паглядзець усе сляды
     delete:
       scheduled_for_deletion: След запланаваны на выдаленне
     make_public:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ce7e8c039..f0b04fc70 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -984,6 +984,14 @@ bg:
       add_a_note:
         title: Нямате време за редактиране? Добавете бележка!
   trace:
+    create:
+      upload_gpx: 'Качване на GPX файл:'
+      description: 'Описание:'
+      tags: 'Етикети:'
+      visibility: 'Видимост:'
+      visibility_help: какво означава това?
+      upload_button: Качване
+      help: Помощ
     edit:
       filename: 'Име на файл:'
       download: изтегляне
@@ -997,17 +1005,6 @@ bg:
       tags_help: разделени със запетая
       save_button: Съхраняване на промените
       visibility: 'Видимост:'
-    trace_form:
-      upload_gpx: 'Качване на GPX файл:'
-      description: 'Описание:'
-      tags: 'Етикети:'
-      visibility: 'Видимост:'
-      visibility_help: какво означава това?
-      upload_button: Качване
-      help: Помощ
-    trace_header:
-      upload_trace: Качете GPS-следа
-      see_all_traces: Вижте всички следи
     trace_optionals:
       tags: Етикети
     view:
@@ -1017,6 +1014,7 @@ bg:
       map: карта
       edit: редактиране
       owner: 'Собственик:'
+      description: 'Описание:'
       tags: 'Етикети:'
       edit_track: Редактиране на тази следа
       trace_not_found: Следата не е открита!
@@ -1039,6 +1037,8 @@ bg:
     list:
       public_traces: Публични GPS-следи
       public_traces_from: Публични GPS-следи от потребител %{user}
+      upload_trace: Качете GPS-следа
+      see_all_traces: Вижте всички следи
     description:
       description_without_count: GPX-файл от %{user}
   oauth:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index e706b370e..b60258b1b 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -343,10 +343,10 @@ bn:
   geocoder:
     search:
       title:
-        latlon: <a href="http://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফল
-        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> থেকে ফলাফল
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
-          নমিনাতিম</a> থেকে ফলাফল
+        latlon: <a href="https://openstreetmap.org/">অভ্যন্তরীণ</a> থেকে ফলাফলগুলি
+        ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a> থেকে ফলাফলগুলি
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
+          নমিনাতিম</a> থেকে ফলাফলগুলি
         geonames: <a href="http://www.geonames.org/">জিওনেমস</a> থেকে ফলাফল
         osm_nominatim_reverse: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
           Nominatim</a> থেকে ফলাফল
@@ -505,6 +505,7 @@ bn:
           service: পার্শ্ব সড়ক
           speed_camera: গতিমাপক ক্যামেরা
           steps: ধাপ
+          stop: থাকার চিহ্ন
           street_lamp: রাস্তার বাতি
           tertiary: প্রশাখা সড়ক
           tertiary_link: প্রশাখা সড়ক
@@ -583,7 +584,9 @@ bn:
           water_park: বারি উদ্যান
           "yes": অবসর
         man_made:
+          bridge: সেতু
           lighthouse: বাতিঘর
+          mine: খনি
           pipeline: পাইপলাইন
           tower: টাওয়ার
           works: কারখানা
@@ -723,7 +726,9 @@ bn:
           hardware: যন্ত্রাংশের দোকান
           hifi: হাই-ফাই
           jewelry: গহনার দোকান
+          kitchen: রান্নাঘরের দোকান
           laundry: ধোপার দোকান
+          lottery: লটারি
           mall: মল
           market: বাজার
           mobile_phone: মোবাইল ফোনের দোকান
@@ -783,7 +788,7 @@ bn:
         level10: উপনগরের সীমানা
     description:
       title:
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">ওপেনস্ট্রীটম্যাপ
           Nominatim</a> থেকে অবস্থান
         geonames: <a href="http://www.geonames.org/">জিওনেম্স</a> থেকে অবস্থান
       types:
@@ -852,6 +857,7 @@ bn:
       and_the_tags: 'এবং নিম্নলিখিত ট্যাগ:'
     signup_confirm:
       subject: '[OpenStreetMap] ওপেনস্ট্রীটম্যাপে স্বাগতম'
+      greeting: এই যে আপনি!
       created: কেউ একজন (আশা করছি আপনি) এইমাত্র %{site_url}-এ একটি অ্যাকাউন্ট তৈরি
         করেছেন।
     email_confirm:
@@ -886,6 +892,12 @@ bn:
       title: ইনবক্স
       my_inbox: আমার ইনবক্স
       outbox: আউটবক্স
+      new_messages:
+        one: '%{count}টি নতুন বার্তা'
+        other: '%{count}টি নতুন বার্তা'
+      old_messages:
+        one: '%{count}টি পুরনো বার্তা'
+        other: '%{count}টি পুরনো বার্তা'
       subject: বিষয়
       date: তারিখ
       people_mapping_nearby: কাছাকাছি অবদানকারী
@@ -958,6 +970,7 @@ bn:
           ওপেনস্ট্রীটম্যাপ<sup><a href="#trademarks">&reg;</a></sup> একটি <i>মুক্ত উপাত্ত</i> যা <a
           href="http://osmfoundation.org/">ওপেনস্ট্রীটম্যাপ ফাউন্ডেশন কর্তৃক</a> (OSMF) <a
           href="http://opendatacommons.org/licenses/odbl/">মুক্ত উপাত্ত কমন্স মুক্ত তথ্যভিত লাইসেন্সের</a> (ODbL) আওতায় লাইসেন্সকৃত।
+        credit_title_html: ওপেনস্ট্রীটম্যাপকে কীভাবে কৃতিত্ব দিবেন
         attribution_example:
           title: আরোপণ উদাহরণ
         more_title_html: আরও খুঁজা হচ্ছে
@@ -1027,6 +1040,7 @@ bn:
       beginners_guide:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: আরম্ভকারী সহায়িকা
+        description: নতুনদের জন্য সম্প্রদায় পরিচালিত নির্দেশিকা।
       help:
         url: https://help.openstreetmap.org/
         title: help.openstreetmap.org
@@ -1075,9 +1089,12 @@ bn:
             1: টার্মিনাল
           admin: প্রশাসনিক সীমানা
           forest: অরণ্য
+          wood: বন
           golf: গল্ফ মাঠ
           park: উদ্যান
           resident: আবাসিক এলাকা
+          common:
+          - সাধারণ
           industrial: শিল্পাঞ্চল
           commercial: বাণিজ্যিক এলাকা
           lake:
@@ -1121,6 +1138,16 @@ bn:
       trace_uploaded: আপনার জিপিএক্স ফাইলটি আপলোড হয়েছে এবং ডাটাবেইজ এ অন্তর্ভুক্তির
         জন্য অপেক্ষা করছে। সাধারণত, এটি আধা ঘন্টার মধ্যেই সম্পন্ন হয় এবং সমাপ্ত হতেই
         আপনার কাছে একটি ই-মেইল পৌছে যাবে।
+      traces_waiting: আপনার %{count}টি অনুসরণ আপলোড হতে বাকি আছে। দয়া করে এগুলো আপলোড
+        হওয়া পর্যন্ত অপেক্ষা করুন, যেন অন্য ব্যবহারকারীদের অনুসরণ আপলোড করার সুযোগ
+        দেয়া যায়।
+      upload_gpx: 'জিপিএক্স ফাইল আপলোড:'
+      description: 'বিবরণ:'
+      tags: 'ট্যাগসমূহ:'
+      visibility: 'দৃষ্টিযোগ্যতা:'
+      visibility_help: এটার মানে কি?
+      upload_button: আপলোড
+      help: সাহায্য
     edit:
       title: অনুসরণ সম্পাদনা %{name}
       heading: অনুসরণ সম্পাদনা %{name}
@@ -1137,20 +1164,6 @@ bn:
       save_button: পরিবর্তন সংরক্ষণ
       visibility: 'দৃষ্টিযোগ্যতা:'
       visibility_help: এটার মানে কি?
-    trace_form:
-      upload_gpx: 'জিপিএক্স ফাইল আপলোড:'
-      description: 'বিবরণ:'
-      tags: 'ট্যাগসমূহ:'
-      visibility: 'দৃষ্টিযোগ্যতা:'
-      visibility_help: এটার মানে কি?
-      upload_button: আপলোড
-      help: সাহায্য
-    trace_header:
-      upload_trace: অনুসরণ আপলোড
-      see_all_traces: সব অনুসরণগুলো দেখুন
-      traces_waiting: আপনার %{count}টি অনুসরণ আপলোড হতে বাকি আছে। দয়া করে এগুলো আপলোড
-        হওয়া পর্যন্ত অপেক্ষা করুন, যেন অন্য ব্যবহারকারীদের অনুসরণ আপলোড করার সুযোগ
-        দেয়া যায়।
     trace_optionals:
       tags: ট্যাগসমূহ
     view:
@@ -1188,6 +1201,9 @@ bn:
       trackable: অনুসরণযোগ্য
       by: দ্বারা
       map: মানচিত্র
+    list:
+      upload_trace: অনুসরণ আপলোড
+      see_all_traces: সব অনুসরণগুলো দেখুন
     offline_warning:
       message: জিপিএক্স ফাইল আপলোড বর্তমানে সম্ভব নয়
     offline:
@@ -1363,7 +1379,7 @@ bn:
       directions: দিক
       distance: দূরত্ব
       errors:
-        no_place: দুঃখিত - এই স্থানটি খুঁজে পাওয়া যায়নি।
+        no_place: দুঃখিত - '%{place}' খুঁজে পাওয়া যায়নি।
       instructions:
         continue_without_exit: '%{name}-এ যেতে থাকুন'
         slight_right_without_exit: '%{name}-এ সামান্য ডান দিকে সরান'
@@ -1372,7 +1388,7 @@ bn:
         slight_left_without_exit: '%{name}-এ সামান্য বামে'
         via_point_without_exit: (বিন্দুর মাধ্যমে)
         follow_without_exit: '%{name} অনুসরণ করুন'
-        start_without_exit: '%{name}-এর শেষে শুরু'
+        start_without_exit: '%{name}-এ শুরু'
         destination_without_exit: গন্তব্যে পৌঁছানো
         against_oneway_without_exit: '%{name}-এ একমুখীর বিরুদ্ধে যান'
         end_oneway_without_exit: '%{name}-এর একমুখী শেষ'
diff --git a/config/locales/br.yml b/config/locales/br.yml
index d101a90e0..a89eb053b 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1629,6 +1629,17 @@ br:
       trace_uploaded: Kaset eo bet ho restr GPX hag emañ en gortoz a vezañ ensoc'het
         en diaz roadennoù. C'hoarvezout a ra dindan un hanter-eurvezh peurvuiañ, ha
         kaset e vo ur postel deoc'h pa vo echu.
+      traces_waiting: Bez' hoc'h eus %{count} roud a c'hortoz bezañ kaset. Gwell e
+        vefe gortoz a-raok kas re all, evit chom hep stankañ al lostennad evit an
+        implijerien all.
+      upload_gpx: 'Kas ar restr GPX :'
+      description: 'Deskrivadur :'
+      tags: 'Tikedennoù :'
+      tags_help: bevennet gant virgulennoù
+      visibility: 'Gwelusted :'
+      visibility_help: Petra a dalvez ?
+      upload_button: Enporzhiañ
+      help: Skoazell
     edit:
       title: Oc'h aozañ ar roud %{name}
       heading: Oc'h aozañ ar roud %{name}
@@ -1646,21 +1657,6 @@ br:
       save_button: Enrollañ ar c'hemmoù
       visibility: 'Gwelusted :'
       visibility_help: Petra a dalvez an dra-mañ ?
-    trace_form:
-      upload_gpx: 'Kas ar restr GPX :'
-      description: 'Deskrivadur :'
-      tags: 'Tikedennoù :'
-      tags_help: bevennet gant virgulennoù
-      visibility: 'Gwelusted :'
-      visibility_help: Petra a dalvez ?
-      upload_button: Enporzhiañ
-      help: Skoazell
-    trace_header:
-      upload_trace: Kas ur roud
-      see_all_traces: Gwelet an holl roudoù
-      traces_waiting: Bez' hoc'h eus %{count} roud a c'hortoz bezañ kaset. Gwell e
-        vefe gortoz a-raok kas re all, evit chom hep stankañ al lostennad evit an
-        implijerien all.
     trace_optionals:
       tags: Tikedennoù
     view:
@@ -1710,6 +1706,8 @@ br:
       empty_html: N'eus netra da welet amañ. <a href='%{upload_link}'>Pellgargit ur
         roudenn nevez</a> evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh
         ar <abajenn wiki>href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i</a>.
+      upload_trace: Kas ur roud
+      see_all_traces: Gwelet an holl roudoù
     delete:
       scheduled_for_deletion: Roudenn da vezañ dilamet
     make_public:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 549f55dc3..db6740150 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1259,6 +1259,20 @@ bs:
       trace_uploaded: Vaša GPS datoteka je spremljena na server i čeka ubacivanje
         u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti
         obavijest o završetku.
+      traces_waiting:
+        one: Imate %{count} trasu koja čeka za slanje. Uzmite ovo u obzir i pričekajte
+          da se završi prije nego pošaljete novu trasu, da ne biste blokirali druge
+          korisnike.
+        other: Imate %{count} trase/a na čekanju za slanje. Uzmite ovo u obzir i pričekajte
+          da se završe prije slanja novih trasa, da ne blokirate ostale korisnike.
+      upload_gpx: Poslati GPX datoteku
+      description: 'Opis:'
+      tags: 'Oznake:'
+      tags_help: odvojeno zarezima
+      visibility: 'Vidljivost:'
+      visibility_help: Šta ovo znači?
+      upload_button: Postaviti
+      help: Pomoć
     edit:
       title: Uređivanje trase %{name}
       heading: Uređivanje trase %{name}
@@ -1276,24 +1290,6 @@ bs:
       save_button: Sačuvati promjene
       visibility: 'Vidljivost:'
       visibility_help: Šta ovo znači?
-    trace_form:
-      upload_gpx: Poslati GPX datoteku
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezima
-      visibility: 'Vidljivost:'
-      visibility_help: Šta ovo znači?
-      upload_button: Postaviti
-      help: Pomoć
-    trace_header:
-      upload_trace: Poslati GPS trasu
-      see_all_traces: Pogledati sve trase
-      traces_waiting:
-        one: Imate %{count} trasu koja čeka za slanje. Uzmite ovo u obzir i pričekajte
-          da se završi prije nego pošaljete novu trasu, da ne biste blokirali druge
-          korisnike.
-        other: Imate %{count} trase/a na čekanju za slanje. Uzmite ovo u obzir i pričekajte
-          da se završe prije slanja novih trasa, da ne blokirate ostale korisnike.
     trace_optionals:
       tags: Oznake
     view:
@@ -1343,6 +1339,8 @@ bs:
       empty_html: JNoš uvijek nema ništa ovdje. <a href='%{upload_link}'>Postavite
         novu trasu</a> ili naučite više o GPS trasiranju na <a href='http://wiki.openstreetmap.org/wiki/Bs:Beginners'_guide'>wiki
         stranici</a>.
+      upload_trace: Poslati GPS trasu
+      see_all_traces: Pogledati sve trase
     delete:
       scheduled_for_deletion: Trasa raspoređena za brisanje
     make_public:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 51fc1721e..8262350fb 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1587,6 +1587,21 @@ ca:
       trace_uploaded: El fitxer GPX s'ha pujat i està pendent d'inserció a la base
         de dades. Això passarà en general dins d'una mitja hora, i se us enviarà un
         correu electrònic en finalitzar.
+      traces_waiting:
+        one: Teniu %{count} traça esperant en cua per a pujar. Considereu esperar
+          a que aquesta traça acabi abans de pujar-ne més, així no blocareu la cua
+          per a altres usuaris.
+        other: Teniu %{count} traces esperant en cua per a pujar. Considereu esperar
+          a que aquestes traces acabin abans de pujar-ne més, així no blocareu la
+          cua per a altres usuaris.
+      upload_gpx: 'Carregui l''arxiu GPX:'
+      description: 'Descripció:'
+      tags: 'Etiquetes:'
+      tags_help: separat per comes
+      visibility: 'Visibilitat:'
+      visibility_help: què significa això?
+      upload_button: Puja
+      help: Ajuda
     edit:
       title: Editant traça %{name}
       heading: Editant traça %{name}
@@ -1604,25 +1619,6 @@ ca:
       save_button: Desa els canvis
       visibility: 'Visibilitat:'
       visibility_help: Què vol dir això?
-    trace_form:
-      upload_gpx: 'Carregui l''arxiu GPX:'
-      description: 'Descripció:'
-      tags: 'Etiquetes:'
-      tags_help: separat per comes
-      visibility: 'Visibilitat:'
-      visibility_help: què significa això?
-      upload_button: Puja
-      help: Ajuda
-    trace_header:
-      upload_trace: Puja una traça
-      see_all_traces: Mostra totes les traces
-      traces_waiting:
-        one: Teniu %{count} traça esperant en cua per a pujar. Considereu esperar
-          a que aquesta traça acabi abans de pujar-ne més, així no blocareu la cua
-          per a altres usuaris.
-        other: Teniu %{count} traces esperant en cua per a pujar. Considereu esperar
-          a que aquestes traces acabin abans de pujar-ne més, així no blocareu la
-          cua per a altres usuaris.
     trace_optionals:
       tags: Etiquetes
     view:
@@ -1672,6 +1668,8 @@ ca:
       empty_html: Aquí encara no hi ha res. <a href='%{upload_link}'>Pujeu un nou
         track</a> o apreneu més sobre els tracks GPS a la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàgina
         wiki</a>.
+      upload_trace: Puja una traça
+      see_all_traces: Mostra totes les traces
     delete:
       scheduled_for_deletion: Track programat per a ser suprimit
     make_public:
@@ -2431,6 +2429,17 @@ ca:
         roundabout_with_exit: A la rotonda, agafar la sortida %{exit} a %{name}
         unnamed: sense nom
         courtesy: Direccions cortesia de %{link}
+        exit_counts:
+          first: 1a
+          second: 2a
+          third: 3a
+          fourth: 4a
+          fifth: 5a
+          sixth: 6a
+          seventh: 7a
+          eighth: 8a
+          ninth: 9a
+          tenth: 10a
       time: Temps
     query:
       node: Node
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9038ac40e..63d728c89 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1625,6 +1625,26 @@ cs:
       upload_trace: Nahrát GPS stopu
       trace_uploaded: Váš GPX soubor byl uložen a čeká na zařazení do databáze. Obvykle
         to netrvá víc jak půl hodiny. Až bude zařazen, budete informováni emailem.
+      traces_waiting:
+        few: Na zpracování čekají %{count} vaše stopy. Zvažte, zda by nebylo před
+          nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali
+          frontu dalším uživatelům.
+        one: Na zpracování čeká %{count} vaše stopa. Zvažte, zda by nebylo před nahráním
+          dalších lepší počkat, dokud nebude zpracována, abyste neblokovali frontu
+          dalším uživatelům.
+        other: Na zpracování čeká %{count} vašich stop. Zvažte, zda by nebylo před
+          nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali
+          frontu dalším uživatelům.
+      upload_gpx: 'Nahrát GPX soubor:'
+      description: 'Popis:'
+      tags: 'Štítky:'
+      tags_help: oddělené čárkou
+      visibility: 'Viditelnost:'
+      visibility_help: co tohle znamená?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs
+      upload_button: Nahrát
+      help: Nápověda
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=cs
     edit:
       title: Úprava stopy %{name}
       heading: Úprava stopy %{name}
@@ -1643,31 +1663,6 @@ cs:
       visibility: 'Viditelnost:'
       visibility_help: co tohle znamená?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs
-    trace_form:
-      upload_gpx: 'Nahrát GPX soubor:'
-      description: 'Popis:'
-      tags: 'Štítky:'
-      tags_help: oddělené čárkou
-      visibility: 'Viditelnost:'
-      visibility_help: co tohle znamená?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs
-      upload_button: Nahrát
-      help: Nápověda
-      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=cs
-    trace_header:
-      upload_trace: Nahrát stopu
-      see_all_traces: Zobrazit všechny stopy
-      see_my_traces: Zobrazit mé stopy
-      traces_waiting:
-        few: Na zpracování čekají %{count} vaše stopy. Zvažte, zda by nebylo před
-          nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali
-          frontu dalším uživatelům.
-        one: Na zpracování čeká %{count} vaše stopa. Zvažte, zda by nebylo před nahráním
-          dalších lepší počkat, dokud nebude zpracována, abyste neblokovali frontu
-          dalším uživatelům.
-        other: Na zpracování čeká %{count} vašich stop. Zvažte, zda by nebylo před
-          nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali
-          frontu dalším uživatelům.
     trace_optionals:
       tags: Štítky
     view:
@@ -1718,6 +1713,9 @@ cs:
       tagged_with: se štítky %{tags}
       empty_html: Nic tu ještě není. <a href='%{upload_link}'>Nahrajte novou stopu</a>
         nebo si něco o GPS stopách přečtěte na <a href='https://wiki.openstreetmap.org/wiki/Cs:Beginners_Guide_1.2?uselang=cs'>wiki</a>.
+      upload_trace: Nahrát stopu
+      see_all_traces: Zobrazit všechny stopy
+      see_my_traces: Zobrazit mé stopy
     delete:
       scheduled_for_deletion: Stopa označena ke smazání
     make_public:
@@ -2506,16 +2504,16 @@ cs:
         unnamed: nepojmenovaná cesta
         courtesy: Trasa díky %{link}
         exit_counts:
-          first: '1.'
-          second: '2.'
-          third: '3.'
-          fourth: '4.'
-          fifth: '5.'
-          sixth: '6.'
-          seventh: '7.'
-          eighth: '8.'
-          ninth: '9.'
-          tenth: '10.'
+          first: 1.
+          second: 2.
+          third: 3.
+          fourth: 4.
+          fifth: 5.
+          sixth: 6.
+          seventh: 7.
+          eighth: 8.
+          ninth: 9.
+          tenth: 10.
       time: Čas
     query:
       node: Uzel
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index bcaf53750..3bfdcbced 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1226,6 +1226,14 @@ cy:
       add_a_note:
         title: Dim amser i olygu? Ychwanegwch nodyn!
   trace:
+    create:
+      upload_gpx: 'Uwchlwytho Ffeil GPX:'
+      description: 'Disgrifiad:'
+      tags: 'Tagiau:'
+      visibility: 'Gwelededd:'
+      visibility_help: beth mae hyn yn golygu?
+      upload_button: Uwchlwytho
+      help: Cymorth
     edit:
       filename: 'Enw ffeil:'
       download: lawrlwytho
@@ -1240,14 +1248,6 @@ cy:
       save_button: Cadw Newidiadau
       visibility: 'Gwelededd:'
       visibility_help: beth mae hyn yn golygu?
-    trace_form:
-      upload_gpx: 'Uwchlwytho Ffeil GPX:'
-      description: 'Disgrifiad:'
-      tags: 'Tagiau:'
-      visibility: 'Gwelededd:'
-      visibility_help: beth mae hyn yn golygu?
-      upload_button: Uwchlwytho
-      help: Cymorth
     trace_optionals:
       tags: Tagiau
     view:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index aea1c561b..abd78e92d 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1648,6 +1648,19 @@ da:
       trace_uploaded: Din GPX-fil er uploadet og afventer lagring i databasen. Det
         sker normalt inden for en halv time, og en e-mail bliver tilsendt dig når
         det er gjort.
+      traces_waiting:
+        one: Du har allerede et GPS-spor i køen. Overvej at vente på dette før du
+          uploader flere spor for ikke at blokere køen for andre brugere.
+        other: Du har allerede %{count} GPS-spor i køen. Overvej at vente på disse
+          før du uploader flere spor for ikke at blokere køen for andre brugere.
+      upload_gpx: 'Upload GPX-fil:'
+      description: 'Beskrivelse:'
+      tags: 'Egenskaber:'
+      tags_help: kommasepareret
+      visibility: 'Synlighed:'
+      visibility_help: hvad betyder det her?
+      upload_button: Upload
+      help: Hjælp
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
@@ -1665,24 +1678,6 @@ da:
       save_button: Gem ændringer
       visibility: 'Synlighed:'
       visibility_help: hvad betyder det her?
-    trace_form:
-      upload_gpx: 'Upload GPX-fil:'
-      description: 'Beskrivelse:'
-      tags: 'Egenskaber:'
-      tags_help: kommasepareret
-      visibility: 'Synlighed:'
-      visibility_help: hvad betyder det her?
-      upload_button: Upload
-      help: Hjælp
-    trace_header:
-      upload_trace: Upload et spor
-      see_all_traces: Vis alle spor
-      see_my_traces: Se mine spor
-      traces_waiting:
-        one: Du har allerede et GPS-spor i køen. Overvej at vente på dette før du
-          uploader flere spor for ikke at blokere køen for andre brugere.
-        other: Du har allerede %{count} GPS-spor i køen. Overvej at vente på disse
-          før du uploader flere spor for ikke at blokere køen for andre brugere.
     trace_optionals:
       tags: Egenskaber
     view:
@@ -1733,6 +1728,9 @@ da:
       tagged_with: ' med egenskaberne %{tags}'
       empty_html: Der er ingenting her endnu. <a href='%{upload_link}'>Overfør et
         nyt spor</a> eller lær mere om GPS-sporing på <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikisiden</a>.
+      upload_trace: Upload et spor
+      see_all_traces: Vis alle spor
+      see_my_traces: Se mine spor
     delete:
       scheduled_for_deletion: Spor planlagt til at blive slettet
     make_public:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4c3eed459..8a8b4ca9b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1703,6 +1703,21 @@ de:
       trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme
         in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde,
         anschließend wird dir eine Bestätigungs-E-Mail zugesandt.
+      traces_waiting:
+        one: Du hast momentan %{count} Track in der Warteschlange. Bitte warte, bis
+          er fertig ist, um die Verarbeitung nicht für andere Nutzer zu blockieren.
+        other: Du hast momentan %{count} Tracks in der Warteschlange. Bitte warte,
+          bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren.
+      upload_gpx: 'GPX-Datei hochladen:'
+      description: 'Beschreibung:'
+      tags: 'Tags:'
+      tags_help: durch Komma getrennt
+      visibility: 'Sichtbarkeit:'
+      visibility_help: Was bedeutet das?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/DE:Visibility_of_GPS_traces
+      upload_button: Hochladen
+      help: Hilfe
+      help_url: http://wiki.openstreetmap.org/wiki/DE:Upload
     edit:
       title: Track %{name} bearbeiten
       heading: Track %{name} bearbeiten
@@ -1720,25 +1735,6 @@ de:
       save_button: Speichern
       visibility: 'Sichtbarkeit:'
       visibility_help: Was bedeutet das?
-    trace_form:
-      upload_gpx: 'GPX-Datei hochladen:'
-      description: 'Beschreibung:'
-      tags: 'Tags:'
-      tags_help: durch Komma getrennt
-      visibility: 'Sichtbarkeit:'
-      visibility_help: Was bedeutet das?
-      upload_button: Hochladen
-      help: Hilfe
-      help_url: http://wiki.openstreetmap.org/wiki/DE:Upload
-    trace_header:
-      upload_trace: Lade einen Track hoch
-      see_all_traces: Alle Tracks ansehen
-      see_my_traces: Meine Tracks ansehen
-      traces_waiting:
-        one: Du hast momentan %{count} Track in der Warteschlange. Bitte warte, bis
-          er fertig ist, um die Verarbeitung nicht für andere Nutzer zu blockieren.
-        other: Du hast momentan %{count} Tracks in der Warteschlange. Bitte warte,
-          bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren.
     trace_optionals:
       tags: Tags
     view:
@@ -1790,6 +1786,9 @@ de:
       empty_html: Noch keine GPS-Tracks vorhanden. <a href='%{upload_link}'>Lade einen
         neuen Track hoch</a> oder informiere dich auf folgender <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wikiseite</a>
         über das Aufzeichnen von GPS-Tracks.
+      upload_trace: Lade einen Track hoch
+      see_all_traces: Alle Tracks ansehen
+      see_my_traces: Meine Tracks ansehen
     delete:
       scheduled_for_deletion: Für die Löschung vorgesehener Track
     make_public:
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index 63d02781d..5b4b296f6 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -798,6 +798,11 @@ diq:
     welcome:
       title: Xeyr amey!
   trace:
+    create:
+      tags: 'Etiketi:'
+      visibility: Vinayîşî
+      upload_button: Bar ke
+      help: Peşti
     edit:
       filename: 'Namey dosya:'
       download: ron
@@ -809,11 +814,6 @@ diq:
       description: 'Şınasiyen:'
       tags: 'Etiketi:'
       visibility: Vinayîşî
-    trace_form:
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
-      upload_button: Bar ke
-      help: Peşti
     trace_optionals:
       tags: Etiketan
     view:
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 0fc05540b..10cff7a17 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -1379,6 +1379,21 @@ dsb:
       upload_trace: GPS-slěd nagraś
       trace_uploaded: Twója GPX-dataja jo se nagrała a caka na zasajźenje do datoweje
         banki. To stawa se zwětšego za poł góźiny a dostanjoš e-mail za wobkšuśenje.
+      traces_waiting:
+        one: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu
+          nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za
+          drugich wužywarjow.
+        other: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu
+          nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za
+          drugich wužywarjow.
+      upload_gpx: 'GPX-dataju nagraś:'
+      description: 'Wopisanje:'
+      tags: 'Atributy:'
+      tags_help: pśez komu wótźělony
+      visibility: 'Widobnosć:'
+      visibility_help: Co to groni?
+      upload_button: Nagraś
+      help: Pomoc
     edit:
       title: Wobźěłujo se slěd %{name}
       heading: Wobźěłujo se slěd %{name}
@@ -1396,25 +1411,6 @@ dsb:
       save_button: Změny składowaś
       visibility: 'Widobnosć:'
       visibility_help: Co to groni?
-    trace_form:
-      upload_gpx: 'GPX-dataju nagraś:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: pśez komu wótźělony
-      visibility: 'Widobnosć:'
-      visibility_help: Co to groni?
-      upload_button: Nagraś
-      help: Pomoc
-    trace_header:
-      upload_trace: Slěd nagraś
-      see_all_traces: Wšykne slědy pokazaś
-      traces_waiting:
-        one: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu
-          nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za
-          drugich wužywarjow.
-        other: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu
-          nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za
-          drugich wužywarjow.
     trace_optionals:
       tags: Atributy
     view:
@@ -1464,6 +1460,8 @@ dsb:
       empty_html: How njejo nic. <a href='%{upload_link}'>Nagraj nowy slěd</a> abo
         wukni wěcej wó GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowem
         boku</a>.
+      upload_trace: Slěd nagraś
+      see_all_traces: Wšykne slědy pokazaś
     delete:
       scheduled_for_deletion: Za wulašowanje pśedwiźona cera
     make_public:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7c3b2ba01..dad61d461 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1678,6 +1678,21 @@ el:
       trace_uploaded: Το GPX αρχείο σας έχει μεταμορφωθεί και αναμένει την εισαγωγή
         στη βάση δεδομένων. Συνήθως αυτό θα συμβεί μέσα σε μισή ώρα, και μετά την
         ολοκλήρωση θα σας αποσταλεί ένα email.
+      traces_waiting:
+        one: Έχετε %{count} ίχνος σε αναμονή για ανέβασμα. Παρακαλούμε περιμένετε
+          να ολοκληρωθεί πριν ανεβάσετε άλλα, ώστε να μην εμποδίσετε τη σειρά αναμονής
+          για άλλους χρήστες.
+        other: Έχετε %{count} ίχνη σε αναμονή για ανέβασμα. Παρακαλούμε περιμένετε
+          να ολοκληρωθούν πριν ανεβάσετε άλλα, ώστε να μην εμποδίσετε τη σειρά αναμονής
+          για άλλους χρήστες.
+      upload_gpx: 'Αποστολή Αρχείου GPX:'
+      description: 'Περιγραφή:'
+      tags: 'Χαρακτηριστικά:'
+      tags_help: διαχωρισμένο με κόμματα
+      visibility: 'Ορατότητα:'
+      visibility_help: τι σημαίνει αυτό;
+      upload_button: Αποστολή
+      help: Βοήθεια
     edit:
       title: Επεξεργασία ίχνους %{name}
       heading: Επεξεργασία ίχνους %{name}
@@ -1696,26 +1711,6 @@ el:
       visibility: 'Ορατότητα:'
       visibility_help: τι σημαίνει αυτό;
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Αποστολή Αρχείου GPX:'
-      description: 'Περιγραφή:'
-      tags: 'Χαρακτηριστικά:'
-      tags_help: διαχωρισμένο με κόμματα
-      visibility: 'Ορατότητα:'
-      visibility_help: τι σημαίνει αυτό;
-      upload_button: Αποστολή
-      help: Βοήθεια
-    trace_header:
-      upload_trace: Αποστολή ίχνους
-      see_all_traces: Δείτε όλα τα ίχνη
-      see_my_traces: Δες τα ίχνη μου
-      traces_waiting:
-        one: Έχετε %{count} ίχνος σε αναμονή για ανέβασμα. Παρακαλούμε περιμένετε
-          να ολοκληρωθεί πριν ανεβάσετε άλλα, ώστε να μην εμποδίσετε τη σειρά αναμονής
-          για άλλους χρήστες.
-        other: Έχετε %{count} ίχνη σε αναμονή για ανέβασμα. Παρακαλούμε περιμένετε
-          να ολοκληρωθούν πριν ανεβάσετε άλλα, ώστε να μην εμποδίσετε τη σειρά αναμονής
-          για άλλους χρήστες.
     trace_optionals:
       tags: Χαρακτηριστικά
     view:
@@ -1767,6 +1762,9 @@ el:
       empty_html: Τίποτα ακόμα εδώ. <a href='%{upload_link}'>Ανεβάστε ένα νέο ίχνος</a>
         ή μάθετε περισσότερα για την καταγραφή ιχνών με GPS στη <a href='https://wiki.openstreetmap.org/wiki/El:Beginners_Guide_1.2'>σελίδα
         wiki</a>.
+      upload_trace: Αποστολή ίχνους
+      see_all_traces: Δείτε όλα τα ίχνη
+      see_my_traces: Δες τα ίχνη μου
     delete:
       scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή
     make_public:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index edc480d2f..e0d622b08 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1564,6 +1564,23 @@ en-GB:
       trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
         to the database. This will usually happen within half an hour, and an email
         will be sent to you on completion.
+      traces_waiting:
+        one: You have %{count} trace waiting for upload. Please consider waiting for
+          these to finish before uploading any more, so as not to block the queue
+          for other users.
+        other: You have %{count} traces waiting for upload. Please consider waiting
+          for these to finish before uploading any more, so as not to block the queue
+          for other users.
+      upload_gpx: 'Upload GPX File:'
+      description: 'Description:'
+      tags: 'Tags:'
+      tags_help: comma delimited
+      visibility: 'Visibility:'
+      visibility_help: what does this mean?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Upload
+      help: Help
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
@@ -1582,27 +1599,6 @@ en-GB:
       visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
-      visibility_help: what does this mean?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Upload
-      help: Help
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Upload a trace
-      see_all_traces: See all traces
-      traces_waiting:
-        one: You have %{count} trace waiting for upload. Please consider waiting for
-          these to finish before uploading any more, so as not to block the queue
-          for other users.
-        other: You have %{count} traces waiting for upload. Please consider waiting
-          for these to finish before uploading any more, so as not to block the queue
-          for other users.
     trace_optionals:
       tags: Tags
     view:
@@ -1652,6 +1648,8 @@ en-GB:
       empty_html: Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a>
         or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
+      upload_trace: Upload a trace
+      see_all_traces: See all traces
     delete:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index cd563ff8d..f0514196d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1600,6 +1600,20 @@ eo:
       upload_trace: Alŝuti GPS-spuron
       trace_uploaded: Via GPX-dosiero estas alŝutita kaj atendas enkonduko en la datumbazon.
         Tio probable okazos ĝis duonhoro, kaj retletero estos sendita al vi je finaĵo.
+      traces_waiting:
+        one: Vi havas %{count} spuron atendanta alŝutado. Bonvolu atendi ĝis ĝi estos
+          alŝutita, antaŭ alŝuti aliajn, do vi ne blokos atendovicon por aliaj uzantoj.
+        other: Vi havas %{count} spurojn atendantaj alŝutado. Bonvolu atendi ĝis ili
+          estos alŝutitaj, antaŭ alŝuti aliajn, do vi ne blokos atendovicon por aliaj
+          uzantoj.
+      upload_gpx: 'Alŝuti GPX-dosieron:'
+      description: 'Priskribo:'
+      tags: 'Etikedoj:'
+      tags_help: disigitaj per komoj
+      visibility: 'Videbleco:'
+      visibility_help: kion tio signifas?
+      upload_button: Alŝuti
+      help: Helpo
     edit:
       title: Redaktado de spuro %{name}
       heading: Redaktado de spuro %{name}
@@ -1617,25 +1631,6 @@ eo:
       save_button: Konservi ŝanĝojn
       visibility: 'Videbleco:'
       visibility_help: kion tio signifas?
-    trace_form:
-      upload_gpx: 'Alŝuti GPX-dosieron:'
-      description: 'Priskribo:'
-      tags: 'Etikedoj:'
-      tags_help: disigitaj per komoj
-      visibility: 'Videbleco:'
-      visibility_help: kion tio signifas?
-      upload_button: Alŝuti
-      help: Helpo
-    trace_header:
-      upload_trace: Alŝuti spuron
-      see_all_traces: Vidi ĉiujn spurojn
-      see_my_traces: Montri miajn spurojn
-      traces_waiting:
-        one: Vi havas %{count} spuron atendanta alŝutado. Bonvolu atendi ĝis ĝi estos
-          alŝutita, antaŭ alŝuti aliajn, do vi ne blokos atendovicon por aliaj uzantoj.
-        other: Vi havas %{count} spurojn atendantaj alŝutado. Bonvolu atendi ĝis ili
-          estos alŝutitaj, antaŭ alŝuti aliajn, do vi ne blokos atendovicon por aliaj
-          uzantoj.
     trace_optionals:
       tags: Etikedoj
     view:
@@ -1686,6 +1681,9 @@ eo:
       tagged_with: etikedita kun %{tags}
       empty_html: Ankoraŭ nenio estas tie ĉi. <a href='%{upload_link}'>Alŝutu novan
         spuron</a> aŭ sciigu pli pri GPS-spurado ĉe la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki-paĝo</a>.
+      upload_trace: Alŝuti spuron
+      see_all_traces: Vidi ĉiujn spurojn
+      see_my_traces: Montri miajn spurojn
     delete:
       scheduled_for_deletion: Spuro forviŝota
     make_public:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 281852e3d..70e2c5d6e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -34,6 +34,7 @@
 # Author: Nemo bis
 # Author: Nunte
 # Author: Ovruni
+# Author: Pantareje
 # Author: PerroVerd
 # Author: Peter17
 # Author: Remux
@@ -395,6 +396,7 @@ es:
           drag_lift: Telearrastre
           gondola: Telecabina
           platter: Telesquí
+          pylon: Pilón
           station: Estación de remonte
         aeroway:
           aerodrome: Aeródromo
@@ -550,6 +552,7 @@ es:
           motorway: Autovía
           motorway_junction: Cruce de autovías
           motorway_link: Enlace de autovía
+          passing_place: Lugar de paso
           path: Camino
           pedestrian: Vía peatonal
           platform: Plataforma
@@ -1654,6 +1657,21 @@ es:
       trace_uploaded: Tu archivo GPX ha sido subido y está pendiente de inserción
         en la base de datos. Esto normalmente ocurre en la próxima media hora, y se
         te enviará un correo electrónico al terminar.
+      traces_waiting:
+        one: Tienes %{count} traza esperando por subir. Por favor, considera esperar
+          a que esta termine antes de subir más, para no bloquear la cola a otros
+          usuarios.
+        other: Tienes %{count} trazas esperando por subir. Por favor, considera esperar
+          a que estas terminen antes de subir más, para no bloquear la cola a otros
+          usuarios.
+      upload_gpx: 'Subir archivo GPX:'
+      description: 'Descripción:'
+      tags: 'Etiquetas:'
+      tags_help: delimitado por comas
+      visibility: 'Visibilidad:'
+      visibility_help: ¿Qué significa esto?
+      upload_button: Subir
+      help: Ayuda
     edit:
       title: Editando traza %{name}
       heading: Editando traza %{name}
@@ -1671,26 +1689,6 @@ es:
       save_button: Guardar cambios
       visibility: 'Visibilidad:'
       visibility_help: ¿Qué significa esto?
-    trace_form:
-      upload_gpx: 'Subir archivo GPX:'
-      description: 'Descripción:'
-      tags: 'Etiquetas:'
-      tags_help: delimitado por comas
-      visibility: 'Visibilidad:'
-      visibility_help: ¿Qué significa esto?
-      upload_button: Subir
-      help: Ayuda
-    trace_header:
-      upload_trace: Subir una traza
-      see_all_traces: Ver todas las trazas
-      see_my_traces: Ver mis rastros
-      traces_waiting:
-        one: Tienes %{count} traza esperando por subir. Por favor, considera esperar
-          a que esta termine antes de subir más, para no bloquear la cola a otros
-          usuarios.
-        other: Tienes %{count} trazas esperando por subir. Por favor, considera esperar
-          a que estas terminen antes de subir más, para no bloquear la cola a otros
-          usuarios.
     trace_optionals:
       tags: Etiquetas
     view:
@@ -1742,6 +1740,9 @@ es:
       empty_html: Todavía no hay nada aquí. <a href='%{upload_link}'>Sube una nueva
         traza</a> o aprende más sobre trazas GPS en la <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>página
         wiki</a>.
+      upload_trace: Subir una traza
+      see_all_traces: Ver todas las trazas
+      see_my_traces: Ver mis rastros
     delete:
       scheduled_for_deletion: Traza programada para eliminación
     make_public:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index b4ff26386..98f674630 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1433,6 +1433,14 @@ et:
       trace_uploaded: Sinu GPX-fail on üles laaditud ja ootab andmebaasi sisestamist.
         See võtab aega tavaliselt pool tundi kuni tund. Peale lõpetamist saadetakse
         sulle meil.
+      upload_gpx: 'Laadi üles GPX-fail:'
+      description: 'Kirjeldus:'
+      tags: 'Sildid:'
+      tags_help: komaga eraldatud
+      visibility: 'Nähtavus:'
+      visibility_help: mida see tähendab?
+      upload_button: Laadi üles
+      help: Abi
     edit:
       filename: 'Failinimi:'
       download: laadi alla
@@ -1448,19 +1456,6 @@ et:
       save_button: Salvesta muudatused
       visibility: 'Nähtavus:'
       visibility_help: mida see tähendab?
-    trace_form:
-      upload_gpx: 'Laadi üles GPX-fail:'
-      description: 'Kirjeldus:'
-      tags: 'Sildid:'
-      tags_help: komaga eraldatud
-      visibility: 'Nähtavus:'
-      visibility_help: mida see tähendab?
-      upload_button: Laadi üles
-      help: Abi
-    trace_header:
-      upload_trace: Lisa GPS-rada
-      see_all_traces: Vaata kõiki GPS-radasid
-      see_my_traces: Vaata minu radu
     trace_optionals:
       tags: Sildid
     view:
@@ -1510,6 +1505,9 @@ et:
       tagged_with: ', millel on silt %{tags}'
       empty_html: Siin pole veel midagi. <a href='%{upload_link}'>Laadi üles uus rada</a>
         või uuri GPS-radade kohta <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>vikileheküljelt</a>.
+      upload_trace: Lisa GPS-rada
+      see_all_traces: Vaata kõiki GPS-radasid
+      see_my_traces: Vaata minu radu
   application:
     require_cookies:
       cookies_needed: Paistab, et sul on küpsised keelatud. Enne jätkamist luba palun
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index d44bfe3ab..840771a8f 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1547,6 +1547,21 @@ eu:
       upload_trace: GPS Aztarna igo
       trace_uploaded: Zure GPX fitxategia kargatu da eta datu basean sartzeko zain
         dago. Ordu erdi barru egongo da eta posta elektronikoz bidaliko zaizu amaitzean.
+      traces_waiting:
+        one: '%{count} aztarna daukazu kargatzeko zain. Kontutan hartu gehiago igotzeko
+          agindua ez ematea zain zauden bitartean, beste erabiltzaile batzuei ilarak
+          ez blokeatzeko.'
+        other: '%{count} aztarnak dauzkazu kargatzeko zain. Kontutan hartu gehiago
+          igotzeko agindua ez ematea zain zauden bitartean, beste erabiltzaile batzuei
+          ilarak ez blokeatzeko.'
+      upload_gpx: 'GPX fitxategi igo:'
+      description: 'Deskribapena:'
+      tags: 'Etiketak:'
+      tags_help: koma mugatua
+      visibility: 'Ikusgarritasuna:'
+      visibility_help: Zer esan nahi du honek?
+      upload_button: Igo
+      help: Laguntza
     edit:
       title: '%{name} aztarna aldatzen'
       heading: '%{name} aztarna aldatzen'
@@ -1564,25 +1579,6 @@ eu:
       save_button: Aldaketak gorde
       visibility: Ikusgarritasuna;
       visibility_help: Zer esan nahi du honek?
-    trace_form:
-      upload_gpx: 'GPX fitxategi igo:'
-      description: 'Deskribapena:'
-      tags: 'Etiketak:'
-      tags_help: koma mugatua
-      visibility: 'Ikusgarritasuna:'
-      visibility_help: Zer esan nahi du honek?
-      upload_button: Igo
-      help: Laguntza
-    trace_header:
-      upload_trace: Aztarna bat igo
-      see_all_traces: Aztarna guztiak ikusi
-      traces_waiting:
-        one: '%{count} aztarna daukazu kargatzeko zain. Kontutan hartu gehiago igotzeko
-          agindua ez ematea zain zauden bitartean, beste erabiltzaile batzuei ilarak
-          ez blokeatzeko.'
-        other: '%{count} aztarnak dauzkazu kargatzeko zain. Kontutan hartu gehiago
-          igotzeko agindua ez ematea zain zauden bitartean, beste erabiltzaile batzuei
-          ilarak ez blokeatzeko.'
     trace_optionals:
       tags: Etiketak
     view:
@@ -1632,6 +1628,8 @@ eu:
       empty_html: Ez dago ezer hemen oraindik. <a href='%{upload_link}'> Kargatu arrasto
         berria </a> edo GPS birziklatzeari buruz gehiago jakin nahi baduzu <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>
         wiki orrira jo </a>.
+      upload_trace: Aztarna bat igo
+      see_all_traces: Aztarna guztiak ikusi
     delete:
       scheduled_for_deletion: Ezabatzear dauden aztarnak
     make_public:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 8cb9e45c7..c40353686 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -14,6 +14,7 @@
 # Author: Grille chompa
 # Author: Hooshmand.hasannia
 # Author: Huji
+# Author: Iriman
 # Author: Jafari
 # Author: Leyth
 # Author: Mcuteangel
@@ -47,33 +48,33 @@ fa:
       friend: دوست
       language: زبان
       message: پیام
-      node: نقطه
-      node_tag: برچسب نقطه
+      node: گره
+      node_tag: برچسب گره
       notifier: اطلاع رسان
-      old_node: نقطه قدیمی
-      old_node_tag: برچسپ نقطه فبلی
-      old_relation: رابطهٔ قبلی
-      old_relation_member: عضو رابطهٔ قدیمی
-      old_relation_tag: برچسپ رابطهٔ قدیمی
+      old_node: گره قدیمی
+      old_node_tag: برچسپ قدیمی گره
+      old_relation: رابطهٔ قدیمی
+      old_relation_member: عضو قدیمی رابطه
+      old_relation_tag: برچسپ قدیمی رابطه
       old_way: راه قدیمی
-      old_way_node: گرهٔ راه قدیمی
-      old_way_tag: برچسپ راه قدیمی
-      relation: ارتباط
+      old_way_node: گره قدیمی راه
+      old_way_tag: برچسپ قدیمی راه
+      relation: رابطه
       relation_member: عضو رابطه
       relation_tag: برچسپ رابطه
       session: جلسه
       trace: پیگیری
-      tracepoint: نقطه پیگیری
+      tracepoint: نقطهٔ پیگیری
       tracetag: برچسب پیگیری
       user: کاربر
       user_preference: ترجیحات کاربر
-      user_token: نشانه کاربر
+      user_token: رمزینهٔ کاربر
       way: راه
       way_node: گره راه
       way_tag: برچسب راه
     attributes:
       diary_comment:
-        body: بدن
+        body: بدنه
       diary_entry:
         user: کاربر
         title: عنوان
@@ -85,7 +86,7 @@ fa:
         friend: دوست
       trace:
         user: کاربر
-        visible: قابل دیدن
+        visible: نمایان
         name: نام
         size: اندازه
         latitude: عرض جغرافیایی
@@ -103,7 +104,7 @@ fa:
         display_name: نام نمایشی
         description: توضیحات
         languages: زبان‌ها
-        pass_crypt: رمز عبور
+        pass_crypt: گذرواژه
   editor:
     default: پیش‌فرض (در حال حاضر %{name})
     potlatch:
@@ -116,17 +117,19 @@ fa:
       name: Potlatch 2
       description: Potlatch 2 (ویرایشگر در مرورگر)
     remote:
-      name: کنترل از راه دور
-      description: کنترل از راه دور (JOSM یا Merkaartor)
+      name: کنترل از دور
+      description: کنترل از دور (JOSM یا Merkaartor)
   browse:
-    created: ایجاد شده
-    closed: بسته‌شده
-    created_html: ایجاد شده <abbr title='%{title}'>%{time} قبل</abbr>
-    closed_html: بسته شده <abbr title='%{title}'>%{time} قبل</abbr>
-    created_by_html: ساخته شده <abbr title='%{title}'>%{time} قبل</abbr> توسط %{user}
-    deleted_by_html: حذف شده در <abbr title='%{title}'>%{time} قبل </abbr> توسط %{user}
-    edited_by_html: ویرایش شده در <abbr title='%{title}'>%{time} قبل</abbr> توسط %{user}
-    closed_by_html: بسته شده در <abbr title='%{title}'>%{time} قبل</abbr> توسط %{user}
+    created: 'تاریخ ایجاد:'
+    closed: 'تاریخ بستن:'
+    created_html: <abbr title='%{title}'>%{time} پیش</abbr> ایجاد شد
+    closed_html: <abbr title='%{title}'>%{time} پیش</abbr> بسته شد
+    created_by_html: <abbr title='%{title}'>%{time} پیش</abbr> %{user} آن را ایجاد
+      کرد
+    deleted_by_html: <abbr title='%{title}'>%{time} پیش</abbr> %{user} آن را حذف کرد
+    edited_by_html: <abbr title='%{title}'>%{time} پیش</abbr> %{user} آن را ویرایش
+      کرد
+    closed_by_html: <abbr title='%{title}'>%{time} پیش</abbr> %{user} آن را بست
     version: نسخه
     in_changeset: تغییرات انجام شده
     anonymous: ناشناس
@@ -134,21 +137,21 @@ fa:
     part_of: بخشی از
     download_xml: دانلود XML
     view_history: نمایش تاریخچه
-    view_details: مشاهده جزئیات
+    view_details: نمایش جزئیات
     location: 'مکان:'
     changeset:
       title: 'تغییرات انجام شده: %{id}'
       belongs_to: پدیدآور
-      node: گره ها (%{count})
-      node_paginated: گره ها (%{x}-%{y} از %{count})
+      node: گره‌ها (%{count})
+      node_paginated: گره‌ها (%{x}-%{y} از %{count})
       way: راه ها (%{count})
-      way_paginated: راه ها (%{x}-%{y} از %{count})
+      way_paginated: راه‌ها (%{x}-%{y} از %{count})
       relation: روابط (%{count})
       relation_paginated: روابط (%{x}-%{y} از %{count})
       comment: نظرها (%{count})
       hidden_commented_by: نظر مخفی از %{user}، <abbr title='%{exact_time}'>%{when}
         پیش</abbr>
-      commented_by: نظر از %{user} <abbr title='%{exact_time}'>%{when} قبل</abbr>
+      commented_by: نظر از %{user} <abbr title='%{exact_time}'>%{when} پیش</abbr>
       changesetxml: تغییرات انجام شده XML
       osmchangexml: osmChange XML
       feed:
@@ -156,54 +159,55 @@ fa:
         title_comment: تغییرات انجام شده %{id} - %{comment}
       join_discussion: وارد شوید تا به بحث بپیوندید
       discussion: بحث
+      still_open: بستهٔ تغییرات هنوز باز است - امکان بحث پس از بستن آن باز می‌شود.
     node:
       title: 'گره: %{name}'
-      history_title: 'تاریخچه گره: %{name}'
+      history_title: 'تاریخچهٔ گره: %{name}'
     way:
       title: 'راه: %{name}'
-      history_title: 'تاریخچه راه: %{name}'
-      nodes: گره ها
+      history_title: 'تاریخچهٔ راه: %{name}'
+      nodes: گره‌ها
       also_part_of:
         one: بخشی از راه %{related_ways}
-        other: ' بخشی از راه های %{related_ways}'
+        other: ' بخشی از راه‌های %{related_ways}'
     relation:
       title: 'رابطه: %{name}'
-      history_title: 'تاریخچه رابطه: %{name}'
+      history_title: 'تاریخچهٔ رابطه: %{name}'
       members: اعضا
     relation_member:
-      entry_role: '%{type} %{name} بعنوان %{role}'
+      entry_role: '%{type} %{name} با نقش %{role}'
       type:
         node: گره
         way: راه
-        relation: ارتباط
+        relation: رابطه
     containing_relation:
-      entry: ارتباط %{relation_name}
-      entry_role: رابطه %{relation_name} (به عنوان %{relation_role})
+      entry: رابطهٔ %{relation_name}
+      entry_role: رابطهٔ %{relation_name} (با نقش %{relation_role})
     not_found:
-      sorry: 'پوزش، %{type} #%{id} یافت نمیشود.'
+      sorry: 'پوزش، %{type} #%{id} یافت نمی‌شود.'
       type:
         node: گره
         way: راه
-        relation: ارتباط
+        relation: رابطه
         changeset: تغییر انجام شده
         note: یادداشت
     timeout:
-      sorry: با عرض پوزش ، داده ها برای %{type} با شناسه %{id} ، برای بازیابی زمان
-        خیلی زیادی می برد.
+      sorry: با عرض پوزش، بازیابی داده‌های %{type} با شناسهٔ %{id}، زمان خیلی زیادی
+        می‌برد.
       type:
         node: گره
         way: راه
-        relation: ارتباط
+        relation: رابطه
         changeset: تغییر انجام شده
         note: یادداشت
     redacted:
-      redaction: ویرایش %{id}
-      message_html: نسخه ی %{version} از این %{type} نمایش داده نمی شود تا وقتی تحریر
-        نشود. برای جزئیات %{redaction_link} را ببینید.
+      redaction: بازویرایی %{id}
+      message_html: نسخهٔ %{version} از این %{type} نمایش داده نمی‌شود زیرا بازویرایی(redact)
+        شده است. برای جزئیات %{redaction_link} را ببینید.
       type:
         node: گره
         way: راه
-        relation: ارتباط
+        relation: رابطه
     start_rjs:
       feature_warning: در حال بارگذاری %{num_features} ویژگی، که ممکن است مرورگرتان
         را کند یا بدون واکنش سازد. مطمئنید می‌خواهید این داده‌ها نمایش داده شوند؟
@@ -216,7 +220,7 @@ fa:
         tag: توضیحات صفحه ویکی برای برچسب %{key}=%{value} برچسب
       wikidata_link: آیتم %{page} در ویکی‌داده
       wikipedia_link: صفحه مقاله %{page} در ویکی‌پدیا
-      telephone_link: ' تماس %{phone_number}'
+      telephone_link: ' تماس با %{phone_number}'
     note:
       title: 'یادداشت: %{id}'
       new_note: یادداشت تازه
@@ -234,11 +238,11 @@ fa:
         قبل</abbr>
       reopened_by: دوباره فعال شده توسط %{user} <abbr title='%{exact_time}'>%{when}
         قبل</abbr>
-      reopened_by_anonymous: دوباره فعال شده توسط ناشناس <abbr title='%{exact_time}'>%{when}
-        قبل</abbr>
+      reopened_by_anonymous: <abbr title='%{exact_time}'>%{when} پیش</abbr> ناشناس
+        دوباره  فعالش کرد
       hidden_by: مخفی شد توسط %{user} <abbr title='%{exact_time}'>%{when} قبل</abbr>
     query:
-      title: کوئری ویژگی‌ها
+      title: پرس‌وجو برای ویژگی‌ها
       introduction: روی نقشه کلیک کنید تا ویژگی‌های نزدیک را پیدا کنید
       nearby: ویژگی‌های نزدیک
       enclosing: ویژگی‌های نزدیک
@@ -260,14 +264,14 @@ fa:
     list:
       title: تغییرات انجام شده
       title_user: تغییرات انجام شده توسط %{user}
-      title_friend: تغییرات انجام شده توسط دوستانتان
+      title_friend: تغییرات انجام شده توسط دوستان من
       title_nearby: تغییرات انجام شده توسط کاربران نزدیک
       empty: هیچ تغییراتی یافت نشد.
       empty_area: تغییراتی در این ناحیه یافت نشد.
-      empty_user: تغییراتی توسط این کاربر انجام نشده.
-      no_more: تغییرات انجام شده ی بیشتری یافت نشد.
+      empty_user: این کاربر تغییراتی انجام نداده.
+      no_more: تغییرات بیشتری یافت نشد.
       no_more_area: در این ناحیه تغییرات بیشتری انجام نشده.
-      no_more_user: تغییرات بیشتری توسط این کاربر انجام نشده.
+      no_more_user: این کاربر تغییرات دیگری انجام نداده.
       load_more: بارگیری بیشتر
     timeout:
       sorry: پوزش، فهرست تغییرات انجام شده ی درخواستی شما برای بازیابی بیش از حد زمان
@@ -1564,6 +1568,19 @@ fa:
       trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده
         است. این کار معمولاً نیم ساعت طول می‌کشد و در صورت تکمیل، ایمیلی به شما فرستاده
         خواهد شد.
+      traces_waiting:
+        one: شما %{count} مسیر منتظر بارگذاری دارید. لطفاً برای تمام شدن منتظر بمانید
+          قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود.
+        other: شما %{count} پیگیری منتظر بارگذاری دارید. لطفاً برای تمام‌شدن منتظر
+          بمانید قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود.
+      upload_gpx: 'بارگذاری پرونده ی GPX:'
+      description: 'توضیحات:'
+      tags: 'برچسب‌ها:'
+      tags_help: جداشده توسط ویرگول
+      visibility: 'پدیداری:'
+      visibility_help: این به چه معناست؟
+      upload_button: بارگذاری
+      help: کمک
     edit:
       title: ویرایش مسیر %{name}
       heading: ویرایش مسیر %{name}
@@ -1581,23 +1598,6 @@ fa:
       save_button: ذخیرهٔ تغییرات
       visibility: 'پدیداری:'
       visibility_help: به چه معنی است؟
-    trace_form:
-      upload_gpx: 'بارگذاری پرونده ی GPX:'
-      description: 'توضیحات:'
-      tags: 'برچسب‌ها:'
-      tags_help: جداشده توسط ویرگول
-      visibility: 'پدیداری:'
-      visibility_help: این به چه معناست؟
-      upload_button: بارگذاری
-      help: کمک
-    trace_header:
-      upload_trace: بارگذاری یک مسیر
-      see_all_traces: دیدن همه مسیرها
-      traces_waiting:
-        one: شما %{count} مسیر منتظر بارگذاری دارید. لطفاً برای تمام شدن منتظر بمانید
-          قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود.
-        other: شما %{count} پیگیری منتظر بارگذاری دارید. لطفاً برای تمام‌شدن منتظر
-          بمانید قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود.
     trace_optionals:
       tags: برچسب‌ها
     view:
@@ -1647,6 +1647,8 @@ fa:
       empty_html: هنوز چیزی اینجا نیست. <a href='%{upload_link}'> بارگذاری پیگیری
         تازه</a> یا درباره ی پیگیری کردن GPS بیشتر بخوانید در <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>صفحه
         ی ویکی</a>.
+      upload_trace: بارگذاری یک مسیر
+      see_all_traces: دیدن همه مسیرها
     delete:
       scheduled_for_deletion: پی‌گیری برای حذف برنامه ریزی شده
     make_public:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a7efd4452..e90678c52 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1636,6 +1636,23 @@ fi:
       trace_uploaded: GPX-tiedosto on tallennettu palvelimelle ja on jonossa tietokantaan
         syötettäväksi. Yleensä tämä kestää noin puoli tuntia. Saat vielä sähköposti-ilmoituksen
         asiasta.
+      traces_waiting:
+        one: Sinulla on %{count} jälki käsittelyjonossa odottamassa tallennusta tietokantaan.
+          Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät
+          lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin
+          tietokantaan.
+        other: Sinulla on %{count} jälkeä käsittelyjonossa odottamassa tallennusta
+          tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen
+          kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät
+          aiemmin tietokantaan.
+      upload_gpx: 'Tallenna GPX-tiedosto:'
+      description: 'Kuvaus:'
+      tags: 'Tagit:'
+      tags_help: pilkuilla erotettu lista
+      visibility: 'Näkyvyys:'
+      visibility_help: mitä tämä tarkoittaa?
+      upload_button: Tallenna
+      help: Ohje
     edit:
       title: Muokataan jälkeä %{name}
       heading: Jäljen %{name} muokkaus
@@ -1653,28 +1670,6 @@ fi:
       save_button: Tallenna muutokset
       visibility: 'Näkyvyys:'
       visibility_help: mitä tämä tarkoittaa?
-    trace_form:
-      upload_gpx: 'Tallenna GPX-tiedosto:'
-      description: 'Kuvaus:'
-      tags: 'Tagit:'
-      tags_help: pilkuilla erotettu lista
-      visibility: 'Näkyvyys:'
-      visibility_help: mitä tämä tarkoittaa?
-      upload_button: Tallenna
-      help: Ohje
-    trace_header:
-      upload_trace: Lisää GPS-jälki
-      see_all_traces: Näytä kaikki jäljet
-      see_my_traces: Katsele jälkiäni
-      traces_waiting:
-        one: Sinulla on %{count} jälki käsittelyjonossa odottamassa tallennusta tietokantaan.
-          Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät
-          lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin
-          tietokantaan.
-        other: Sinulla on %{count} jälkeä käsittelyjonossa odottamassa tallennusta
-          tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen
-          kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät
-          aiemmin tietokantaan.
     trace_optionals:
       tags: Tagit
     view:
@@ -1727,6 +1722,9 @@ fi:
       tagged_with: ', joilla on tagi %{tags}'
       empty_html: Sivu on tyhjä. <a href='%{upload_link}'>Lähetä uusi GPS-jälki</a>
         tai lue lisätietoja GPS-jälkien keräämisestä <a href='https://wiki.openstreetmap.org/wiki/Fi:Beginners_Guide_1.2'>wikisivulta</a>.
+      upload_trace: Lisää GPS-jälki
+      see_all_traces: Näytä kaikki jäljet
+      see_my_traces: Katsele jälkiäni
     delete:
       scheduled_for_deletion: Jälki on poistojonossa.
     make_public:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 195107df0..7abf4f0f4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1697,6 +1697,21 @@ fr:
       trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration
         dans la base de données. Ceci prend en général moins d’une demi-heure et un
         courriel vous sera envoyé lorsque ce sera terminé.
+      traces_waiting:
+        one: Vous avez %{count} trace en attente de chargement. Il serait peut-être
+          préférable d’attendre qu’elle soit terminée avant d’en charger d’autres,
+          afin de ne pas bloquer la file d’attente pour les autres utilisateurs.
+        other: Vous avez %{count} traces en attente de chargement. Il serait peut-être
+          préférable d’attendre qu’elles soient terminées avant d’en charger d’autres,
+          afin de ne pas bloquer la file d’attente pour les autres utilisateurs.
+      upload_gpx: 'Envoyer un fichier GPX :'
+      description: 'Description :'
+      tags: 'Mots-clés :'
+      tags_help: données séparées par des virgules
+      visibility: 'Visibilité :'
+      visibility_help: qu’est-ce que cela veut dire ?
+      upload_button: Envoyer
+      help: Aide
     edit:
       title: Modifier la trace %{name}
       heading: Modifier la trace %{name}
@@ -1714,26 +1729,6 @@ fr:
       save_button: Enregistrer les modifications
       visibility: 'Visibilité :'
       visibility_help: qu’est-ce que cela veut dire ?
-    trace_form:
-      upload_gpx: 'Envoyer un fichier GPX :'
-      description: 'Description :'
-      tags: 'Mots-clés :'
-      tags_help: données séparées par des virgules
-      visibility: 'Visibilité :'
-      visibility_help: qu’est-ce que cela veut dire ?
-      upload_button: Envoyer
-      help: Aide
-    trace_header:
-      upload_trace: Envoyer une trace
-      see_all_traces: Voir toutes les traces
-      see_my_traces: Voir mes traces
-      traces_waiting:
-        one: Vous avez %{count} trace en attente de chargement. Il serait peut-être
-          préférable d’attendre qu’elle soit terminée avant d’en charger d’autres,
-          afin de ne pas bloquer la file d’attente pour les autres utilisateurs.
-        other: Vous avez %{count} traces en attente de chargement. Il serait peut-être
-          préférable d’attendre qu’elles soient terminées avant d’en charger d’autres,
-          afin de ne pas bloquer la file d’attente pour les autres utilisateurs.
     trace_optionals:
       tags: Mots-clés
     view:
@@ -1786,6 +1781,9 @@ fr:
         nouvelle trace</a> ou pour en savoir plus sur le traçage GPS, consultez la
         <a href='https://wiki.openstreetmap.org/wiki/FR:Beginners_Guide_1.2'>page
         wiki</a>.
+      upload_trace: Envoyer une trace
+      see_all_traces: Voir toutes les traces
+      see_my_traces: Voir mes traces
     delete:
       scheduled_for_deletion: Piste prévue pour la suppression
     make_public:
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 70710b569..a30c645d8 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -928,6 +928,14 @@ fur:
       trace_uploaded: Il to file GPX al è stât cjamât e al è cumò daûr a spietâ di
         jessi zontât ae base di dâts. Chest al sucêt in gjenar jentri di une ore;
         ti mandarìn un messaç cuant che il lavôr al sarà stât completât.
+      upload_gpx: 'Cjame file GPX:'
+      description: 'Descrizion:'
+      tags: 'Etichetis:'
+      tags_help: separâts di virgulis
+      visibility: 'Visibilitât:'
+      visibility_help: ce vuelial dî?
+      upload_button: Cjame
+      help: Jutori
     edit:
       title: Daûr a cambiâ il percors %{name}
       heading: Daûr a cambiâ il percors %{name}
@@ -945,18 +953,6 @@ fur:
       save_button: Salve cambiaments
       visibility: 'Visibilitât:'
       visibility_help: ce vuelial dî?
-    trace_form:
-      upload_gpx: 'Cjame file GPX:'
-      description: 'Descrizion:'
-      tags: 'Etichetis:'
-      tags_help: separâts di virgulis
-      visibility: 'Visibilitât:'
-      visibility_help: ce vuelial dî?
-      upload_button: Cjame
-      help: Jutori
-    trace_header:
-      upload_trace: Cjame un percors
-      see_all_traces: Cjale ducj i percors
     trace_optionals:
       tags: Etichetis
     view:
@@ -1002,6 +998,8 @@ fur:
       public_traces_from: Percors GPS publics di %{user}
       description: Viôt i percors GPS cjamâts sù tai ultins timps
       tagged_with: ' etichetât cun %{tags}'
+      upload_trace: Cjame un percors
+      see_all_traces: Cjale ducj i percors
     georss:
       title: Percors GPS di OpenStreetMap
     description:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 0d4333e30..c2ea309e4 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -523,6 +523,10 @@ fy:
     welcome:
       title: Wolkom!
   trace:
+    create:
+      description: 'Beskriuwing:'
+      visibility: 'Sichtberheid:'
+      help: Help
     edit:
       filename: 'Triemnamme:'
       map: kaart
@@ -530,10 +534,6 @@ fy:
       owner: 'Eigner:'
       description: 'Beskriuwing:'
       visibility: 'Sichtberheid:'
-    trace_form:
-      description: 'Beskriuwing:'
-      visibility: 'Sichtberheid:'
-      help: Help
     view:
       filename: 'Triemnamme:'
       map: kaart
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 153dab764..5df23e5cd 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1552,6 +1552,14 @@ ga:
         in ord, agus stampaí ama acu)
     create:
       upload_trace: Lorg GPS a Uaslódáil
+      upload_gpx: 'Comhad GPX a Uaslódáil:'
+      description: 'Cur síos:'
+      tags: 'Clibeanna:'
+      tags_help: teormharcáilte le camóga
+      visibility: 'Infheictheacht:'
+      visibility_help: céard a chiallaíonn seo?
+      upload_button: Uaslódáil
+      help: Cabhair
     edit:
       title: Lorg %{name} á chur in eagar
       heading: Lorg %{name} á chur in eagar
@@ -1569,18 +1577,6 @@ ga:
       save_button: Sábháil na hAthruithe
       visibility: 'Infheictheacht:'
       visibility_help: céard a chiallaíonn seo?
-    trace_form:
-      upload_gpx: 'Comhad GPX a Uaslódáil:'
-      description: 'Cur síos:'
-      tags: 'Clibeanna:'
-      tags_help: teormharcáilte le camóga
-      visibility: 'Infheictheacht:'
-      visibility_help: céard a chiallaíonn seo?
-      upload_button: Uaslódáil
-      help: Cabhair
-    trace_header:
-      upload_trace: Lorg a uaslódáil
-      see_all_traces: Féach gach lorg
     trace_optionals:
       tags: Clibeanna
     view:
@@ -1631,6 +1627,8 @@ ga:
       empty_html: Níl aon rud anseo fós. <a href='%{upload_link}'>Uaslódáil lorg nua</a>
         nó is féidir tuilleadh a fhoghlaim faoi rianú GPS ar an <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>leathanach
         vicí</a>.
+      upload_trace: Lorg a uaslódáil
+      see_all_traces: Féach gach lorg
     delete:
       scheduled_for_deletion: Lorg sceidealta le scriosadh
     make_public:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index e6b6e515f..e29e90997 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1562,6 +1562,20 @@ gd:
       trace_uploaded: Chaidh am faidhle GPX agad a luchdadh suas agus tha e a' feitheamh
         gus an dèid a chur ris an stòr-dàta. Tachraidh seo am broinn leth-uair a thìde
         mar as trice agus gheibh thu post-d nuair a bhios e coileanta.
+      traces_waiting:
+        other: Tha %{count} lorgadh a' feitheamh air luchdadh suas. Am fuirich thu
+          ort gus am bi seo coileanta mus luchdaich thu suas fear sam bith eile? Mar
+          sin, gheibheadh càch cothrom air a' chiutha.
+      upload_gpx: 'Luchdaich suas faidhle GPX:'
+      description: 'Tuairisgeul:'
+      tags: 'Tagaichean:'
+      tags_help: sgaradh le cromagan
+      visibility: 'Faicsinneachd:'
+      visibility_help: Dè as ciall dha seo?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Luchdaich suas
+      help: Cobhair
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: A' deasachadh lorgadh %{name}
       heading: A' deasachadh lorgadh %{name}
@@ -1580,24 +1594,6 @@ gd:
       visibility: 'Faicsinneachd:'
       visibility_help: Dè as ciall dha seo?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Luchdaich suas faidhle GPX:'
-      description: 'Tuairisgeul:'
-      tags: 'Tagaichean:'
-      tags_help: sgaradh le cromagan
-      visibility: 'Faicsinneachd:'
-      visibility_help: Dè as ciall dha seo?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Luchdaich suas
-      help: Cobhair
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Luchdaich suas lorgadh
-      see_all_traces: Seall a h-uile lorgadh
-      traces_waiting:
-        other: Tha %{count} lorgadh a' feitheamh air luchdadh suas. Am fuirich thu
-          ort gus am bi seo coileanta mus luchdaich thu suas fear sam bith eile? Mar
-          sin, gheibheadh càch cothrom air a' chiutha.
     trace_optionals:
       tags: Tagaichean
     view:
@@ -1648,6 +1644,8 @@ gd:
       empty_html: Chan eil dad an-seo fhathast. <a href='%{upload_link}'>Luchdaich
         suas lorgadh ùr</a> no faigh barrachd fiosrachaidh mu lorgadh GPS air an <a
         href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>uicidh</a>.
+      upload_trace: Luchdaich suas lorgadh
+      see_all_traces: Seall a h-uile lorgadh
     delete:
       scheduled_for_deletion: Chaidh an lorgadh seo a chur air an sgeideil gus a sguabadh
         às
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 32c5fcf78..975a69ebc 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1644,6 +1644,19 @@ gl:
       trace_uploaded: O seu ficheiro GPX foi cargado e está pendente de inserción
         na base de datos. Isto adoita ocorrer nun período de tempo de media hora.
         Recibirá un correo electrónico cando remate.
+      traces_waiting:
+        one: Ten %{count} pista á espera de ser cargada. Considere agardar a que remate
+          antes de cargar máis para non bloquear a cola do resto de usuarios.
+        other: Ten %{count} pistas á espera de ser cargadas. Considere agardar a que
+          remate antes de cargar máis para non bloquear a cola do resto de usuarios.
+      upload_gpx: 'Cargar un ficheiro GPX:'
+      description: 'Descrición:'
+      tags: 'Etiquetas:'
+      tags_help: separadas por comas
+      visibility: 'Visibilidade:'
+      visibility_help: que significa isto?
+      upload_button: Subir
+      help: Axuda
     edit:
       title: Editando a pista "%{name}"
       heading: Editando a pista "%{name}"
@@ -1661,24 +1674,6 @@ gl:
       save_button: Gardar os cambios
       visibility: 'Visibilidade:'
       visibility_help: que significa isto?
-    trace_form:
-      upload_gpx: 'Cargar un ficheiro GPX:'
-      description: 'Descrición:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por comas
-      visibility: 'Visibilidade:'
-      visibility_help: que significa isto?
-      upload_button: Subir
-      help: Axuda
-    trace_header:
-      upload_trace: Cargar unha pista
-      see_all_traces: Ollar todas as pistas
-      see_my_traces: Ollar as miñas pistas
-      traces_waiting:
-        one: Ten %{count} pista á espera de ser cargada. Considere agardar a que remate
-          antes de cargar máis para non bloquear a cola do resto de usuarios.
-        other: Ten %{count} pistas á espera de ser cargadas. Considere agardar a que
-          remate antes de cargar máis para non bloquear a cola do resto de usuarios.
     trace_optionals:
       tags: Etiquetas
     view:
@@ -1730,6 +1725,9 @@ gl:
       empty_html: Aínda non hai nada por aquí. <a href='%{upload_link}'>Cargue unha
         nova pista</a> ou obteña máis información sobre as pistas GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         do wiki</a>.
+      upload_trace: Cargar unha pista
+      see_all_traces: Ollar todas as pistas
+      see_my_traces: Ollar as miñas pistas
     delete:
       scheduled_for_deletion: Pista á espera da súa eliminación
     make_public:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index c81a5d211..ca1f2c736 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1546,6 +1546,17 @@ he:
       upload_trace: העלאת מסלול GPS
       trace_uploaded: קובץ ה־GPX שלך הועלה ומחכה להכנסה אל מסד הנתונים. זה בדרך כלל
         יקרה בתוך חצי שעה ויישלח לך מכתב עם השלמת הפעולה.
+      traces_waiting:
+        other: יש לך מסלול שמחכה להעלאה. נא לשקול לחכות עד סיום העלאתו לפני העלאת
+          מסלולים נוספים, כדי לא לחסום את התור למשתמשים אחרים.
+      upload_gpx: 'העלאת קובץ GPX:'
+      description: 'תיאור:'
+      tags: 'תגים:'
+      tags_help: מופרד בפסיקים
+      visibility: 'נִראוּת:'
+      visibility_help: מה זה אומר?
+      upload_button: העלאה
+      help: עזרה
     edit:
       title: עריכת מסלול %{name}
       heading: עריכת המסלול %{name}
@@ -1563,21 +1574,6 @@ he:
       save_button: שמירת שינויים
       visibility: 'נִראוּת:'
       visibility_help: מה זה אומר?
-    trace_form:
-      upload_gpx: 'העלאת קובץ GPX:'
-      description: 'תיאור:'
-      tags: 'תגים:'
-      tags_help: מופרד בפסיקים
-      visibility: 'נִראוּת:'
-      visibility_help: מה זה אומר?
-      upload_button: העלאה
-      help: עזרה
-    trace_header:
-      upload_trace: העלאת מסלול
-      see_all_traces: הצגת כל המסלולים
-      traces_waiting:
-        other: יש לך מסלול שמחכה להעלאה. נא לשקול לחכות עד סיום העלאתו לפני העלאת
-          מסלולים נוספים, כדי לא לחסום את התור למשתמשים אחרים.
     trace_optionals:
       tags: תגים
     view:
@@ -1627,6 +1623,8 @@ he:
       empty_html: אין פה עדיין שום דבר. אפשר <a href='%{upload_link}'>להעלות מידע
         חדש</a> או ללמוד עוד על מעקב מסלולים ב־GPS ב<a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>דף
         הוויקי</a>.
+      upload_trace: העלאת מסלול
+      see_all_traces: הצגת כל המסלולים
     delete:
       scheduled_for_deletion: מסלול מיועד למחיקה
     make_public:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 85378d3c7..c817b067d 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1320,6 +1320,21 @@ hr:
       trace_uploaded: Vaša GPX datoteka je spremljena na server i čeka ubacivanje
         u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti
         obavijest o završetku.
+      traces_waiting:
+        one: Imaš %{count} trag na čekanju za učitavanje. Molim pričekaj da se ti
+          tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje
+          tragova drugih korisnika.
+        other: Imaš %{count} tragova na čekanju za učitavanje. Molim pričekaj da se
+          ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje
+          drugih korisnika.
+      upload_gpx: 'Učitaj GPX datoteku:'
+      description: 'Opis:'
+      tags: 'Oznake:'
+      tags_help: odvojeno zarezom
+      visibility: 'Vidljivost:'
+      visibility_help: što ovo znači?
+      upload_button: Pošalji
+      help: Pomoć
     edit:
       title: Uređivanje traga %{name}
       heading: Uređivanje trase %{name}
@@ -1337,25 +1352,6 @@ hr:
       save_button: 'Snimi promjene:'
       visibility: 'Vidljivost:'
       visibility_help: Što ovo znači?
-    trace_form:
-      upload_gpx: 'Učitaj GPX datoteku:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezom
-      visibility: 'Vidljivost:'
-      visibility_help: što ovo znači?
-      upload_button: Pošalji
-      help: Pomoć
-    trace_header:
-      upload_trace: Postavi GNSS trag
-      see_all_traces: Prikaži sve trase
-      traces_waiting:
-        one: Imaš %{count} trag na čekanju za učitavanje. Molim pričekaj da se ti
-          tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje
-          tragova drugih korisnika.
-        other: Imaš %{count} tragova na čekanju za učitavanje. Molim pričekaj da se
-          ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje
-          drugih korisnika.
     trace_optionals:
       tags: Oznake
     view:
@@ -1405,6 +1401,8 @@ hr:
       empty_html: Ovdje zasad nema ničega. <a href='%{upload_link}'>Učitaj novi trag</a>
         ili nauči više o GNSS tragovima na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         stranici</a>.
+      upload_trace: Postavi GNSS trag
+      see_all_traces: Prikaži sve trase
     delete:
       scheduled_for_deletion: Trase raspoređene za brisanje
     make_public:
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index f0a034cf1..faab75d45 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -1516,6 +1516,21 @@ hsb:
       trace_uploaded: Twoja GPX-dataja je so nahrała a čaka na zasunjenje do datoweje
         banki. To so zwjetša za poł hodźiny stawa a po dokónčenju budźe so ći e-mejl
         słać.
+      traces_waiting:
+        one: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu
+          nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich
+          wužiwarjow blokował.
+        other: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu
+          nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich
+          wužiwarjow blokował.
+      upload_gpx: 'GPX-dataju nahrać:'
+      description: 'Wopisanje:'
+      tags: 'Atributy:'
+      tags_help: přez komu dźěleny
+      visibility: 'Widźomnosć:'
+      visibility_help: Å¡to to woznamjenja?
+      upload_button: Nahrać
+      help: Pomoc
     edit:
       title: Ćěr %{name} wobdźěłać
       heading: Ćěr %{name} wobdźěłać
@@ -1533,25 +1548,6 @@ hsb:
       save_button: Změny składować
       visibility: 'Widźomnosć:'
       visibility_help: Å¡to to woznamjenja?
-    trace_form:
-      upload_gpx: 'GPX-dataju nahrać:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: přez komu dźěleny
-      visibility: 'Widźomnosć:'
-      visibility_help: Å¡to to woznamjenja?
-      upload_button: Nahrać
-      help: Pomoc
-    trace_header:
-      upload_trace: Ćěr nahrać
-      see_all_traces: Wšě ćěrje pokazać
-      traces_waiting:
-        one: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu
-          nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich
-          wužiwarjow blokował.
-        other: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu
-          nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich
-          wužiwarjow blokował.
     trace_optionals:
       tags: Atributy
     view:
@@ -1601,6 +1597,8 @@ hsb:
       empty_html: Ničo tu njeje. <a href='%{upload_link}'>Nahraj nowu ćěr</a> abo
         wukń wjace wo GPS-slědowanju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikijowej
         stronje</a>.
+      upload_trace: Ćěr nahrać
+      see_all_traces: Wšě ćěrje pokazać
     delete:
       scheduled_for_deletion: Čara předwidźana za zničenje
     make_public:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7c9b2a0f0..90eea7580 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -905,7 +905,7 @@ hu:
           viewpoint: Kilátó
           zoo: Állatkert
         tunnel:
-          building_passage: Épület átjáró
+          building_passage: Épület alatti átjáró
           culvert: Áteresz
           "yes": Alagút
         waterway:
@@ -1630,6 +1630,17 @@ hu:
       trace_uploaded: A GPX fájl feltöltése megtörtént, és várakozik az adatbázisba
         való beillesztésre. Ez általában fél órán belül megtörténik, és fogsz kapni
         egy e-mailt, amint elkészült.
+      traces_waiting: '%{count} nyomvonalad várakozik feltöltésre. Kérlek fontold
+        meg, hogy megvárod, amíg ezek befejeződnek mielőtt feltöltesz továbbiakat,
+        hogy így ne tartsd fel a többi felhasználót a sorban.'
+      upload_gpx: 'GPX fájl feltöltése:'
+      description: 'Leírás:'
+      tags: 'Címkék:'
+      tags_help: vesszővel elválasztva
+      visibility: 'Láthatóság:'
+      visibility_help: Mit jelent ez?
+      upload_button: Feltöltés
+      help: Segítség
     edit:
       title: 'Nyomvonal szerkesztése: %{name}'
       heading: 'Nyomvonal szerkesztése: %{name}'
@@ -1647,21 +1658,6 @@ hu:
       save_button: Módosítások mentése
       visibility: 'Láthatóság:'
       visibility_help: Mit jelent ez?
-    trace_form:
-      upload_gpx: 'GPX fájl feltöltése:'
-      description: 'Leírás:'
-      tags: 'Címkék:'
-      tags_help: vesszővel elválasztva
-      visibility: 'Láthatóság:'
-      visibility_help: Mit jelent ez?
-      upload_button: Feltöltés
-      help: Segítség
-    trace_header:
-      upload_trace: Nyomvonal feltöltése
-      see_all_traces: Összes nyomvonal megtekintése
-      traces_waiting: '%{count} nyomvonalad várakozik feltöltésre. Kérlek fontold
-        meg, hogy megvárod, amíg ezek befejeződnek mielőtt feltöltesz továbbiakat,
-        hogy így ne tartsd fel a többi felhasználót a sorban.'
     trace_optionals:
       tags: Címkék
     view:
@@ -1711,6 +1707,8 @@ hu:
       empty_html: Még nincs mit megjeleníteni. <a href='%{upload_link}'>Tölts fel
         új nyomvonalat</a>, vagy olvass bővebben a GPS nyomvonalrögzítésről a <a href='https://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.2'>wiki
         lapon</a>.
+      upload_trace: Nyomvonal feltöltése
+      see_all_traces: Összes nyomvonal megtekintése
     delete:
       scheduled_for_deletion: A nyomvonal törlésre kijelölve
     make_public:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index d81fe75a5..814209a86 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1547,6 +1547,21 @@ ia:
       trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base
         de datos. Isto prende generalmente minus de un medie hora, e un e-mail te
         essera inviate al completion.
+      traces_waiting:
+        one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender
+          le completion de iste ante de incargar alteres, pro non blocar le cauda
+          pro altere usatores.
+        other: Tu ha %{count} tracias attendente incargamento. Per favor considera
+          attender le completion de istes ante de incargar alteres, pro non blocar
+          le cauda pro altere usatores.
+      upload_gpx: 'Incargar file GPX:'
+      description: 'Description:'
+      tags: 'Etiquettas:'
+      tags_help: separate per commas
+      visibility: 'Visibilitate:'
+      visibility_help: que significa isto?
+      upload_button: Incargar
+      help: Adjuta
     edit:
       title: Modification del tracia %{name}
       heading: Modificar le tracia %{name}
@@ -1564,25 +1579,6 @@ ia:
       save_button: Salveguardar modificationes
       visibility: 'Visibilitate:'
       visibility_help: que significa isto?
-    trace_form:
-      upload_gpx: 'Incargar file GPX:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
-      visibility_help: que significa isto?
-      upload_button: Incargar
-      help: Adjuta
-    trace_header:
-      upload_trace: Incargar un tracia
-      see_all_traces: Vider tote le tracias
-      traces_waiting:
-        one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender
-          le completion de iste ante de incargar alteres, pro non blocar le cauda
-          pro altere usatores.
-        other: Tu ha %{count} tracias attendente incargamento. Per favor considera
-          attender le completion de istes ante de incargar alteres, pro non blocar
-          le cauda pro altere usatores.
     trace_optionals:
       tags: Etiquettas
     view:
@@ -1632,6 +1628,8 @@ ia:
       empty_html: Ancora nihil a vider hic. <a href='%{upload_link}'>Incarga un nove
         tracia</a> o lege plus sur le traciamento GPS in le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina
         wiki</a>.
+      upload_trace: Incargar un tracia
+      see_all_traces: Vider tote le tracias
     delete:
       scheduled_for_deletion: Tracia programmate pro deletion
     make_public:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 858ae7748..3dae491e4 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -18,6 +18,7 @@
 # Author: Kenrick95
 # Author: Macofe
 # Author: Rachmat04
+# Author: Reksa Tresna
 # Author: Relly Komaruzaman
 # Author: Rizkiahmadz
 # Author: Vasanthi
@@ -258,7 +259,7 @@ id:
     list:
       title: Set perubahan
       title_user: Set perubahan oleh %{user}
-      title_friend: Set perubahan oleh teman Anda
+      title_friend: Set perubahan oleh teman saya
       title_nearby: Set perubahan oleh pengguna terdekat
       empty: Tidak ada set perubahan yang ditemukan.
       empty_area: Tidak ada set perubahan di daerah ini.
@@ -288,7 +289,7 @@ id:
       user_title: Catatan harian %{user}
       in_language_title: Entri catatan harian dalam %{language}
       new: Entri baru catatan harian
-      new_title: Buat entri baru dalam catatan harian Anda
+      new_title: Buat entri baru dalam catatan harian saya
       no_entries: Tidak ada entri catatan harian
       recent_entries: 'Entri buku harian terbaru:'
       older_entries: Entri Lama
@@ -357,9 +358,9 @@ id:
   geocoder:
     search:
       title:
-        latlon: Hasil dari <a href="http://openstreetmap.org/">Internal</a>
-        ca_postcode: Hasil dari <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon: Hasil dari <a href="https://openstreetmap.org/">Internal</a>
+        ca_postcode: Hasil dari <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Hasil dari <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Hasil dari <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim_reverse: Hasil dari <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
@@ -375,8 +376,10 @@ id:
           station: Stasiun Aerialway
         aeroway:
           aerodrome: Lapangan Terbang
+          airstrip: Landasan
           apron: Landasan Pesawat
           gate: Gerbang
+          hangar: Hanggar
           helipad: Helipad
           runway: Landasan pacu
           taxiway: Landas hubung
@@ -436,6 +439,7 @@ id:
           office: Kantor
           parking: Parkir
           parking_entrance: Pintu Masuk Parkiran
+          parking_space: Tempat Parkir
           pharmacy: Apotek
           place_of_worship: Tempat Ibadah
           police: Polisi
@@ -496,20 +500,25 @@ id:
           "yes": Toko Kerajinan
         emergency:
           ambulance_station: Pos Ambulans
+          assembly_point: Titik Kumpul
           defibrillator: Alat Pacu Jantung
           landing_site: Pintu Masuk Darurat
           phone: Telepon Darurat
+          water_tank: Tangki Air Darurat
+          "yes": Darurat
         highway:
           abandoned: Jalan Bebas Hambatan Usang
           bridleway: Jalan Tanah
           bus_guideway: Jalur Bus Terpandu
           bus_stop: Halte Bus
           construction: Jalan raya sedang dalam perbaikan
+          corridor: Koridor
           cycleway: Jalur Sepeda
           elevator: Elevator
           emergency_access_point: Titik Akses Darurat
           footway: Jalan setapak
           ford: Arungan
+          give_way: Rambu Lalu Lintas
           living_street: Jalan Permukiman
           milestone: Patok Batu Batas Wilayah
           motorway: Jalan Tol
@@ -531,6 +540,7 @@ id:
           services: Pelayanan Jalan Tol
           speed_camera: Kamera Pendeteksi Kecepatan
           steps: Langkah-langkah
+          stop: Rambu Berhenti
           street_lamp: Lampu Jalan
           tertiary: Jalan Tersier
           tertiary_link: Jalan Tersier
@@ -539,6 +549,7 @@ id:
           trail: Jejak
           trunk: Jalan Nasional
           trunk_link: Jalan Nasional
+          turning_loop: Petak Balon
           unclassified: Jalan Tidak Terklasifikasi
           "yes": Jalan
         historic:
@@ -558,6 +569,7 @@ id:
           manor: Tanah Bangsawan
           memorial: Memorial
           mine: Tambang
+          mine_shaft: Lubang Bukaan Tambang
           monument: Monumen
           roman_road: Jalan Romawi
           ruins: Reruntuhan
@@ -567,6 +579,7 @@ id:
           wayside_cross: Pinggir persimpangan
           wayside_shrine: Kuil pinggir jalan
           wreck: Rongsokan
+          "yes": Situs Bersejarah
         junction:
           "yes": Persimpangan
         landuse:
@@ -630,15 +643,33 @@ id:
           water_park: Taman Air
           "yes": Plesir
         man_made:
+          beacon: Sinyal Pandu
+          beehive: Sarang Lebah
+          breakwater: Pemecah Gelombang
+          bridge: Jembatan
+          bunker_silo: Bungker
+          chimney: Cerobong Asap
+          embankment: Tanggul
+          flagpole: Tiang Bendera
+          kiln: Tanur
           lighthouse: Mercusuar
+          mine: Tambang
+          mineshaft: Lubang Bukaan Tambang
+          pier: Dermaga
           pipeline: Jalur Pipa
+          silo: Silo
           tower: Menara
+          watermill: Kincir Air
+          water_tower: Menara Air
+          water_well: Sumur
+          windmill: Kincir Angin
           works: Pabrik
           "yes": Buatan Manusia
         military:
           airfield: Lapangan Udara Militer
           barracks: Barak
           bunker: Bunker
+          "yes": Militer
         mountain_pass:
           "yes": Perlintasan Pegunungan
         natural:
@@ -684,11 +715,14 @@ id:
           accountant: Akuntan
           administrative: Tata Usaha
           architect: Arsitek
+          association: Perhimpunan
           company: Perusahaan
+          educational_institution: Institusi Pendidikan
           employment_agency: Badan Tenaga Kerja
           estate_agent: Agen Pengurus Pertanahan
           government: Kantor Pemerintah
           insurance: Kantor Asuransi
+          it: Kantor TI
           lawyer: Pengacara
           ngo: Kantor LSM
           telecommunication: Kantor Telekomunikasi
@@ -712,6 +746,7 @@ id:
           postcode: Kode Pos
           region: Wilayah
           sea: Laut
+          square: Anggana
           state: Negara Bagian
           subdivision: Cabang
           suburb: Pinggiran kota
@@ -750,6 +785,7 @@ id:
           beauty: Toko Kecantikan
           beverages: Toko Minuman
           bicycle: Toko Sepeda
+          bookmaker: Juru Taruh
           books: Toko Buku
           boutique: Butik
           butcher: Toko Daging
@@ -788,11 +824,14 @@ id:
           hairdresser: Penata Rambut
           hardware: Toko Perangkat Keras
           hifi: Hi-Fi
+          houseware: Toko Peralatan Rumah Tangga
           jewelry: Toko Perhiasan
           kiosk: Kios/Warung
           laundry: Penatu
+          lottery: Lotere
           mall: Mal
           market: Pasar
+          massage: Pijat
           mobile_phone: Toko Handphone
           motorcycle: Toko Sepeda Motor
           music: Toko Musik
@@ -800,17 +839,23 @@ id:
           optician: Optik
           organic: Toko Makanan Organik
           outdoor: Toko Barang-Barang Outdoor
+          paint: Toko Cat
+          pawnbroker: Rumah Gadai
           pet: Toko Hewan
           pharmacy: Apotek
           photo: Studio Foto
+          seafood: Boga Bahari
           second_hand: Toko loak
           shoes: Toko Sepatu
           sports: Toko Olahraga
           stationery: Toko Alat Tulis
           supermarket: Supermarket
           tailor: Penjahit
+          ticket: Toko Tiket
+          tobacco: Toko Tembakau
           toys: Toko Mainan
           travel_agency: Agen Perjalanan
+          tyres: Toko Ban
           video: Toko Video
           wine: Lisensi Toko Minuman Beralkohol
           "yes": Toko
@@ -1045,6 +1090,8 @@ id:
         partial_changeset_with_comment: dengan komentar '%{changeset_comment}'
         partial_changeset_without_comment: tanpa komentar
       details: Rincian lebuh lanjut soal perubahan ini dapat dilihat di %{url}.
+      unsubscribe: Untuk berhenti berlangganan pembaruan perubahan set ini, kunjungi
+        %{url} dan kli "Berhenti berlangganan".
   message:
     inbox:
       title: Kotak Masuk
@@ -1290,14 +1337,14 @@ id:
       user_page_link: halaman pengguna
       anon_edits_link_text: Cari tahu mengapa hal ini terjadi.
       flash_player_required: Anda membutuhkan Flash player untuk menggunakan Potlatch,
-        editor OpenStreetMap berbasis Flash. Anda dapat <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">men-download
-        Flash Player dari Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Beberapa
-        opsi lain</a> juga tersedia untuk mengedit OpenStreetMap.
+        penyunting OpenStreetMap berbasis Flash. Anda dapat <a href="https://get.adobe.com/flashplayer/">download
+        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Beberapa
+        pilihan lain</a> juga tersedia untuk menyunting OpenStreetMap.
       potlatch_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk
         menyimpan di Potlatch, Anda harus membatalkan pilihan garis atau titik saat
         ini, jika mengedit dalam modus live, atau klik Simpan jika Anda memiliki tombol
         simpan.)
-      potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat https://wiki.openstreetmap.org/wiki/The_Rails_Port
       potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk
         menyimpannya dengan Potlatch 2, Anda dapat klik simpan.)
       id_not_configured: iD belum dikonfigurasikan
@@ -1389,18 +1436,22 @@ id:
         description: Ajukan pertanyaan atau mencari jawaban di situs tanya-jawab OSM
           ini.
       mailing_lists:
+        url: https://lists.openstreetmap.org/
         title: Daftar Alamat
         description: Bertanya atau berdiskusi hal-hal menarik dalam daftar alamat
           menurut berbagai topik dan daerah.
       forums:
+        url: https://forum.openstreetmap.org/
         title: Forum
         description: Pertanyaan dan diskusi bagi mereka yang lebih menyukai antarmuka
           bergaya papan pengumuman.
       irc:
+        url: https://irc.openstreetmap.org/
         title: IRC
         description: Obrolan interaktif dalam berbagai bahasa mengenai bermacam-macam
           topik.
       switch2osm:
+        url: https://switch2osm.org/
         title: switch2osm
         description: Bantuan untuk perusahaan dan organisasi yang beralih ke peta
           dan layanan lain berbasis OpenStreetMap.
@@ -1417,7 +1468,7 @@ id:
       get_directions_title: Dapatkan petunjuk arah antara dua tempat
       from: Dari
       to: Ke
-      where_am_i: Di mana saya?
+      where_am_i: Di mana ini?
       where_am_i_title: Deskripsikan lokasi Anda saat ini menggunakan mesin pencari
       submit_text: Lanjut
     key:
@@ -1494,7 +1545,7 @@ id:
       edit: Edit
       preview: Tinjauan
     markdown_help:
-      title_html: Diurai dengan <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Diurai dengan <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
       headings: Judul
       heading: Judul
       subheading: Subjudul
@@ -1571,6 +1622,21 @@ id:
       trace_uploaded: File GPX Anda telah diunggah dan menunggu penyisipan dalam database.
         Ini biasanya membutuhkan waktu setengah jam, dan sebuah email akan dikirim
         kepada Anda saat selesai.
+      traces_waiting:
+        one: Anda memiliki %{count} jejak GPS yang menunggu untuk diunggah. Harap
+          pertimbangkan proses ini untuk diselesaikan sebelum mengunggah lagi, sehingga
+          Anda tidak memblokir antrean untuk pengguna lain.
+        other: Anda memiliki %{count} jejak GPS yang menunggu untuk diunggah. Harap
+          pertimbangkan proses ini untuk diselesaikan sebelum mengunggah lagi, sehingga
+          Anda tidak memblokir antrean untuk pengguna lain.
+      upload_gpx: 'Unggah File GPX:'
+      description: Deskripsi
+      tags: 'Tags:'
+      tags_help: dipisahkan oleh koma
+      visibility: Visibilitas
+      visibility_help: apa artinya ini?
+      upload_button: Upload
+      help: Bantuan
     edit:
       title: Mengedit jejak %{name}
       heading: Mengedit dijitasi %{name}
@@ -1588,25 +1654,6 @@ id:
       save_button: Simpan Perubahan
       visibility: Visibilitas
       visibility_help: apa artinya ini?
-    trace_form:
-      upload_gpx: 'Unggah File GPX:'
-      description: Deskripsi
-      tags: 'Tags:'
-      tags_help: dipisahkan oleh koma
-      visibility: Visibilitas
-      visibility_help: apa artinya ini?
-      upload_button: Upload
-      help: Bantuan
-    trace_header:
-      upload_trace: Unggah jejak GPS
-      see_all_traces: Lihat semua jejak
-      traces_waiting:
-        one: Anda memiliki %{count} jejak GPS yang menunggu untuk diunggah. Harap
-          pertimbangkan proses ini untuk diselesaikan sebelum mengunggah lagi, sehingga
-          Anda tidak memblokir antrean untuk pengguna lain.
-        other: Anda memiliki %{count} jejak GPS yang menunggu untuk diunggah. Harap
-          pertimbangkan proses ini untuk diselesaikan sebelum mengunggah lagi, sehingga
-          Anda tidak memblokir antrean untuk pengguna lain.
     trace_optionals:
       tags: 'Tags:'
     view:
@@ -1650,12 +1697,16 @@ id:
       map: peta
     list:
       public_traces: Jejak GPS Umum
+      my_traces: Trek GPS saya
       public_traces_from: Jejak GPS Umum dari %{user}
-      description: Telusuri hasil upload trek GPS terbaru
+      description: Ramban unggahan jejak GPS terbaru.
       tagged_with: di tag dengan %{tags}
       empty_html: Belum ada apa pun di sini. <a href='%{upload_link}'>Unggah jejak
         GPS baru</a> atau belajar lebih banyak tentang pencatatan jejak GPS pada <a
-        href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman wiki</a>.
+        href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman wiki</a>.
+      upload_trace: Unggah jejak GPS
+      see_all_traces: Lihat semua jejak
+      see_my_traces: Lihat semua jejak saya
     delete:
       scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus
     make_public:
@@ -1863,15 +1914,14 @@ id:
           <p>Tidak seperti peta lainnya, OpenStreetMap benar-benar dibuat oleh orang-orang seperti Anda
            dan gratis bagi siapa saja untuk memperbaiki, memutakhirkan, mengunduh, dan menggunakan.</p>
           <p>Mendaftar untuk mulai memberikan kontribusi. Kami akan mengirimkan surel konfirmasi akun Anda.</p>
-      license_agreement: Ketika Anda mengkonfirmasi akun Anda, Anda harus setuju dengan
-        <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">persyaratan
+      license_agreement: Ketika Anda mengonfirmasi akun Anda, Anda harus setuju dengan
+        <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">persyaratan
         kontributor</a>.
       email address: 'Alamat Email:'
       confirm email address: 'Konfirmasi Alamat Email:'
-      not displayed publicly: Alamat Anda tidak dipajangkan secara umum, lihat <a
-        href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
-        policy including section on email addresses">kebijakan privasi</a> kami untuk
-        informasi lebih lanjut
+      not displayed publicly: Alamat Anda tidak dipajang secara umum, lihat <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"
+        title="OSMF privacy policy including section on email addresses">kebijakan
+        privasi</a> kami untuk informasi lebih lanjut
       display name: 'Tampilan Nama:'
       display name description: Username Anda yang ditampilkan pada publik. Anda dapat
         mengubahnya dalam pengaturan.
@@ -1949,6 +1999,7 @@ id:
       if set location: Menyetel lokasi rumah %{settings_link} untuk melihat pengguna
         terdekat
       settings_link_text: pengaturan
+      my friends: Teman saya
       no friends: Anda belum menambahkan teman.
       km away: sejauh %{count}km
       m away: sejauh %{count} meter
@@ -1991,7 +2042,7 @@ id:
       email never displayed publicly: (jangan pernah ditampilkan ke publik)
       external auth: 'Autentikasi Eksternal:'
       openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: Apa ini?
       public editing:
         heading: 'Mengedit secara publik:'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index e0151d839..21ed8253f 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1667,6 +1667,21 @@ is:
       trace_uploaded: Búið er að hlaða upp GPS ferlinum og bíður hann núna eftir því
         að vera settur inn í gagnagrunninn, sem gerist yfirleitt innan stundar. Póstur
         verður sendur á netfangið þitt þegar því er lokið.
+      traces_waiting:
+        one: Þú ert með %{count} feril í bið. Íhugaðu að bíða með að senda inn fleiri
+          ferla til að aðrir notendur komist að.
+        other: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri
+          ferla til að aðrir notendur komist að.
+      upload_gpx: 'Hlaða inn GPX skrá:'
+      description: 'Lýsing:'
+      tags: 'Merki:'
+      tags_help: aðskilið með kommum
+      visibility: 'Sýnileiki:'
+      visibility_help: hvað þýðir þetta
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Senda
+      help: Hjálp
+      help_url: https://wiki.openstreetmap.org/index.php?title=Upload&uselang=is
     edit:
       title: Breyti ferlinum %{name}
       heading: Breyti ferlinum %{name}
@@ -1685,26 +1700,6 @@ is:
       visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Hlaða inn GPX skrá:'
-      description: 'Lýsing:'
-      tags: 'Merki:'
-      tags_help: aðskilið með kommum
-      visibility: 'Sýnileiki:'
-      visibility_help: hvað þýðir þetta
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Senda
-      help: Hjálp
-      help_url: https://wiki.openstreetmap.org/index.php?title=Upload&uselang=is
-    trace_header:
-      upload_trace: Senda inn feril
-      see_all_traces: Sjá alla ferla
-      see_my_traces: Skoða ferlana mína
-      traces_waiting:
-        one: Þú ert með %{count} feril í bið. Íhugaðu að bíða með að senda inn fleiri
-          ferla til að aðrir notendur komist að.
-        other: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri
-          ferla til að aðrir notendur komist að.
     trace_optionals:
       tags: Merki
     view:
@@ -1755,6 +1750,9 @@ is:
       tagged_with: ' með merkið %{tags}'
       empty_html: Ekkert hér ennþá. <a href='%{upload_link}'>Sendu inn nýjan feril</a>
         eða lærðu meira um GPS-ferlun á <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki-síðunni</a>.
+      upload_trace: Senda inn feril
+      see_all_traces: Sjá alla ferla
+      see_my_traces: Skoða ferlana mína
     delete:
       scheduled_for_deletion: Þessum feril verður eitt
     make_public:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7da015575..46fa42093 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1666,6 +1666,21 @@ it:
         nel database. Questo generalmente accade entro mezz'ora, con il successivo
         invio al tuo indirizzo di una email di conferma relativo al completamento
         dell'operazione.
+      traces_waiting:
+        one: C'è %{count} tracciato in attesa di caricamento. Si consiglia di aspettare
+          il C'è %{count} tracciato completamento prima di caricarne altri, altrimenti
+          si blocca la lista di attesa per altri utenti.
+        other: Ci sono %{count} tracciati in attesa di caricamento. Si consiglia di
+          aspettare il Ci sono %{count} tracciati completamento prima di caricarne
+          altri, altrimenti si blocca la lista di attesa per altri utenti.
+      upload_gpx: 'Carica file GPX:'
+      description: 'Descrizione:'
+      tags: 'Etichette:'
+      tags_help: delimitato da virgola
+      visibility: 'Visibilità:'
+      visibility_help: che cosa significa questo?
+      upload_button: Carica
+      help: Aiuto
     edit:
       title: Modifica al tracciato %{name}
       heading: Modifica al tracciato %{name}
@@ -1683,26 +1698,6 @@ it:
       save_button: Salva modifiche
       visibility: 'Visibilità:'
       visibility_help: che cosa significa questo?
-    trace_form:
-      upload_gpx: 'Carica file GPX:'
-      description: 'Descrizione:'
-      tags: 'Etichette:'
-      tags_help: delimitato da virgola
-      visibility: 'Visibilità:'
-      visibility_help: che cosa significa questo?
-      upload_button: Carica
-      help: Aiuto
-    trace_header:
-      upload_trace: Carica un tracciato
-      see_all_traces: Vedi tutti i tracciati
-      see_my_traces: Vedi i miei tracciati
-      traces_waiting:
-        one: C'è %{count} tracciato in attesa di caricamento. Si consiglia di aspettare
-          il C'è %{count} tracciato completamento prima di caricarne altri, altrimenti
-          si blocca la lista di attesa per altri utenti.
-        other: Ci sono %{count} tracciati in attesa di caricamento. Si consiglia di
-          aspettare il Ci sono %{count} tracciati completamento prima di caricarne
-          altri, altrimenti si blocca la lista di attesa per altri utenti.
     trace_optionals:
       tags: Etichette
     view:
@@ -1754,6 +1749,9 @@ it:
       empty_html: Ancora niente qui. <a href='%{upload_link}'>Carica una nuova traccia</a>
         o leggi ulteriori informazioni sul tracciamento GPS nella <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina
         wiki</a>.
+      upload_trace: Carica un tracciato
+      see_all_traces: Vedi tutti i tracciati
+      see_my_traces: Vedi i miei tracciati
     delete:
       scheduled_for_deletion: Tracciato in attesa di essere eliminato
     make_public:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ea12c8e8e..b6c763617 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1436,6 +1436,19 @@ ja:
     create:
       upload_trace: GPSトレースのアップロード
       trace_uploaded: GPX ファイルをアップロードしました。データベースへの登録に多少時間がかかります。通常この作業は 30 分以内に完了し、それをお知らせするメールをお送りします。
+      traces_waiting:
+        one: You は%{count} 件のトレースがアップロード待ちです。これらが完了するまで、アップロードはお控えください。さもなければ他のユーザーのアップロードが制限されてしまいます。
+        other: You have %{count}件のトレースがアップロード待ちです。これらが完了するまでアップロードはお控えください。さもなければ他のユーザーのアップロードが制限されてしまいます。
+      upload_gpx: 'アップロードする GPX ファイル:'
+      description: '説明:'
+      tags: 'タグ:'
+      tags_help: カンマ区切り
+      visibility: '可視性:'
+      visibility_help: これはどういう意味?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces
+      upload_button: アップロード
+      help: ヘルプ
+      help_url: http://wiki.openstreetmap.org/wiki/JA:Upload?uselang=ja
     edit:
       title: トレース %{name} の編集
       heading: トレース %{name} の編集
@@ -1454,23 +1467,6 @@ ja:
       visibility: '可視性:'
       visibility_help: これはどういう意味?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'アップロードする GPX ファイル:'
-      description: '説明:'
-      tags: 'タグ:'
-      tags_help: カンマ区切り
-      visibility: '可視性:'
-      visibility_help: これはどういう意味?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces
-      upload_button: アップロード
-      help: ヘルプ
-      help_url: http://wiki.openstreetmap.org/wiki/JA:Upload?uselang=ja
-    trace_header:
-      upload_trace: トレースをアップロード
-      see_all_traces: すべてのトレースを見る
-      traces_waiting:
-        one: You は%{count} 件のトレースがアップロード待ちです。これらが完了するまで、アップロードはお控えください。さもなければ他のユーザーのアップロードが制限されてしまいます。
-        other: You have %{count}件のトレースがアップロード待ちです。これらが完了するまでアップロードはお控えください。さもなければ他のユーザーのアップロードが制限されてしまいます。
     trace_optionals:
       tags: タグ
     view:
@@ -1519,6 +1515,8 @@ ja:
       tagged_with: (タグ %{tags} が付いているもの)
       empty_html: ここにはまだ何もありません。<a href='%{upload_link}'>新しくトレースをアップロード</a>するか、<a
         href='https://wiki.openstreetmap.org/wiki/JA:Beginners_Guide_1.2?uselang=ja'>ウィキページ</a>でGPSトレースの詳細情報をお読みください。
+      upload_trace: トレースをアップロード
+      see_all_traces: すべてのトレースを見る
     delete:
       scheduled_for_deletion: トレースの削除準備を行いました
     make_public:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 05f7db35d..050a9721a 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -936,6 +936,13 @@ ka:
       alt: ალტერნატიული ტექსტი
       url: URL
   trace:
+    create:
+      description: 'აღწერა:'
+      tags_help: მძიმის შემდეგ
+      visibility: 'ხილვადობა:'
+      visibility_help: ეს რას ნიშნავს?
+      upload_button: ატვირთვა
+      help: დახმარება
     edit:
       filename: 'ფაილის სახელი:'
       download: გადმოწერა
@@ -950,13 +957,6 @@ ka:
       save_button: ცვლილებების შენახვა
       visibility: 'ხილვადობა:'
       visibility_help: ეს რას ნიშნავს?
-    trace_form:
-      description: 'აღწერა:'
-      tags_help: მძიმის შემდეგ
-      visibility: 'ხილვადობა:'
-      visibility_help: ეს რას ნიშნავს?
-      upload_button: ატვირთვა
-      help: დახმარება
     view:
       pending: დამუშავება
       filename: 'ფაილის სახელი:'
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index f676964f8..8bca469e5 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -974,6 +974,11 @@ kab:
           OpenStreetMap tsumur ddeqs n tiɣbula ara t-issineḍ ad tesxedmeḍ deg usenfaṛ, akken ad testeqsiḍ neɣ ad t-muddeḍ tiririt, udiɣ ad tmeslayeḍ neɣ ad teɣreḍ tasemlit ɣef isental n tira n tkarḍiwin d iseqdacen nniḍen.
           <a href='%{help_url}'>Wali afus dagi</a>.
   trace:
+    create:
+      description: 'Aglam:'
+      tags: 'Ticraḍ:'
+      upload_button: Sali
+      help: Tallelt
     edit:
       title: Ẓreg lǧeṛṛa %{name}
       filename: 'Isem n ufaylu:'
@@ -985,14 +990,6 @@ kab:
       owner: 'Bab:'
       description: 'Aglam:'
       tags: 'Ticraḍ:'
-    trace_form:
-      description: 'Aglam:'
-      tags: 'Ticraḍ:'
-      upload_button: Sali
-      help: Tallelt
-    trace_header:
-      upload_trace: Azen lǧerra
-      see_all_traces: Wali akk lǧerrat
     trace_optionals:
       tags: Ticraḍ
     view:
@@ -1035,6 +1032,8 @@ kab:
       empty_html: Ulac acu yella dagi. <a href='%{upload_link}'>Sali lǧeṛṛa tamaynut</a>
         neɣ issin ugar ɣef lǧerra GPR, Wali <a href='http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide_1.2'>asebter
         awiki</a>.
+      upload_trace: Azen lǧerra
+      see_all_traces: Wali akk lǧerrat
     delete:
       scheduled_for_deletion: Tafuɣalt yettwaheggan i tukksa
     make_public:
diff --git a/config/locales/km.yml b/config/locales/km.yml
index 452daa276..47b21dbde 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -659,6 +659,13 @@ km:
           - សាកលវិទ្យាល័យ​
           station: ស្ថានីយ៍ផ្លូវដែក
   trace:
+    create:
+      upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖
+      description: បរិយាយ​៖
+      tags: ស្លាក​៖
+      visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
+      upload_button: ផ្ទុកឡើង​
+      help: ជំនួយ​
     edit:
       filename: ឈ្មោះឯកសារ​៖
       download: ទាញយក
@@ -669,13 +676,6 @@ km:
       tags: ស្លាក​៖
       save_button: រក្សាទុក​បន្លាស់ប្តូរនានា​
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​​?
-    trace_form:
-      upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖
-      description: បរិយាយ​៖
-      tags: ស្លាក​៖
-      visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
-      upload_button: ផ្ទុកឡើង​
-      help: ជំនួយ​
     trace_optionals:
       tags: ស្លាក​
     view:
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index e2e884c14..5b495652d 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -626,6 +626,9 @@ kn:
       add_a_note:
         title: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಸಮಯವಿಲ್ಲವೇ? ಟಿಪ್ಪಣಿಯನ್ನು ಸೇರಿಸಿರಿ!
   trace:
+    create:
+      upload_button: ಅಪ್ಲೋಡ್
+      help: ಸಹಾಯ
     edit:
       filename: 'ಕಡತದ ಹೆಸರು:'
       download: ಡೌನ್‍ಲೋಡ್
@@ -633,9 +636,6 @@ kn:
       map: ನಕ್ಷೆ
       edit: ಸಂಪಾದಿಸಿ
       description: 'ವಿವರ:'
-    trace_form:
-      upload_button: ಅಪ್ಲೋಡ್
-      help: ಸಹಾಯ
   user:
     login:
       title: ಲಾಗ್ ಇನ್
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5abdd86c1..7d7f176b2 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1534,6 +1534,17 @@ ko:
       upload_trace: GPS 궤적 올리기
       trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며
         완료되면 이메일을 보낼 것입니다.
+      traces_waiting:
+        one: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 더
+          기다려주십시오.
+      upload_gpx: 'GPX 파일 올리기:'
+      description: '설명:'
+      tags: '태그:'
+      tags_help: 쉼표로 구분
+      visibility: '공개 여부:'
+      visibility_help: 이게 무슨 뜻입니까?
+      upload_button: 올리기
+      help: 도움말
     edit:
       title: '%{name} 경로 편집'
       heading: '%{name} 경로 편집'
@@ -1551,22 +1562,6 @@ ko:
       save_button: 바뀜 저장
       visibility: '공개 여부:'
       visibility_help: 이게 무슨 뜻입니까?
-    trace_form:
-      upload_gpx: 'GPX 파일 올리기:'
-      description: '설명:'
-      tags: '태그:'
-      tags_help: 쉼표로 구분
-      visibility: '공개 여부:'
-      visibility_help: 이게 무슨 뜻입니까?
-      upload_button: 올리기
-      help: 도움말
-    trace_header:
-      upload_trace: 궤적 올리기
-      see_all_traces: 모든 궤적 보기
-      see_my_traces: 내 추적 보기
-      traces_waiting:
-        one: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 더
-          기다려주십시오.
     trace_optionals:
       tags: 태그
     view:
@@ -1618,6 +1613,9 @@ ko:
       empty_html: 여기에는 아직 아무것도 없습니다. <a href='%{upload_link}'>새 궤적 올리기</a>를 사용하거나
         <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서
         GPS 궤적에 대해 더 알아보세요.
+      upload_trace: 궤적 올리기
+      see_all_traces: 모든 궤적 보기
+      see_my_traces: 내 추적 보기
     delete:
       scheduled_for_deletion: 삭제 계획중인 궤적
     make_public:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 6f49aaf74..de9f254d7 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -1644,6 +1644,21 @@ ku-Latn:
       trace_uploaded: Dosyeya te ya GPXê hate barkirin û ji bo ku li databasê were
         zêdekirin li bendê ye. Ev kar pirrî caran di nîv saetê de temam dibe û gava
         ku temam be wê ji te re e-peyamek were şandin.
+      traces_waiting:
+        one: '%{count} şopê te yê ku li hêviya barkirinê disekine heye. Ji bo ku ji
+          bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan bar nekir,
+          li bendê bimîne ku yên berî van temam bibin.'
+        other: '%{count} şopên te yên ku li hêviya barkirinê disekinin hene. Ji bo
+          ku ji bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan
+          bar nekir, li bendê bimînin ku yên berî van temam bibin.'
+      upload_gpx: Dosyeyek GPXê bar bikeː
+      description: 'Danasîn:'
+      tags: Etîketên vêː
+      tags_help: bi bêhnokê hatiye veqetandin
+      visibility: Kî dikare bibîneː
+      visibility_help: Ev tê çi wateyê?
+      upload_button: Bar bike
+      help: Alîkarî
     edit:
       title: Şopa %{name} tê guherandin
       heading: Şopa %{name} tê guherandin
@@ -1661,26 +1676,6 @@ ku-Latn:
       save_button: Guherandinan qeyd bike
       visibility: Kî dikare bibîneː
       visibility_help: Ev tê çi maneyê?
-    trace_form:
-      upload_gpx: Dosyeyek GPXê bar bikeː
-      description: 'Danasîn:'
-      tags: Etîketên vêː
-      tags_help: bi bêhnokê hatiye veqetandin
-      visibility: Kî dikare bibîneː
-      visibility_help: Ev tê çi wateyê?
-      upload_button: Bar bike
-      help: Alîkarî
-    trace_header:
-      upload_trace: Şopek GPSê bar bike
-      see_all_traces: Hemû şopan bibîne
-      see_my_traces: Şopên min bibîne
-      traces_waiting:
-        one: '%{count} şopê te yê ku li hêviya barkirinê disekine heye. Ji bo ku ji
-          bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan bar nekir,
-          li bendê bimîne ku yên berî van temam bibin.'
-        other: '%{count} şopên te yên ku li hêviya barkirinê disekinin hene. Ji bo
-          ku ji bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan
-          bar nekir, li bendê bimînin ku yên berî van temam bibin.'
     trace_optionals:
       tags: Etîketên vê
     view:
@@ -1732,6 +1727,9 @@ ku-Latn:
       empty_html: Li vir hêj tişt tine ye. <a href='%{upload_link}'>Şopek nû bar bike</a>
         an jî ji ser <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>rûpela
         wîkiyê</a> derbarê şopên GPSê de zêdetir tiştan hîn bibe.
+      upload_trace: Şopek GPSê bar bike
+      see_all_traces: Hemû şopan bibîne
+      see_my_traces: Şopên min bibîne
     delete:
       scheduled_for_deletion: Şop ji bo jêbirinê hate plankirin
     make_public:
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index dde528cbe..cb4be9854 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -885,6 +885,15 @@ lb:
       add_a_note:
         title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi!
   trace:
+    create:
+      upload_gpx: 'GPX-Fichier eroplueden:'
+      description: 'Beschreiwung:'
+      tags: 'Markéierungen:'
+      tags_help: Mat Komma getrennt
+      visibility: 'Visibilitéit:'
+      visibility_help: wat heescht dat?
+      upload_button: Eroplueden
+      help: Hëllef
     edit:
       filename: 'Numm vum Fichier:'
       download: eroflueden
@@ -900,15 +909,6 @@ lb:
       save_button: Ännerunge späicheren
       visibility: 'Visibilitéit:'
       visibility_help: wat heescht dat?
-    trace_form:
-      upload_gpx: 'GPX-Fichier eroplueden:'
-      description: 'Beschreiwung:'
-      tags: 'Markéierungen:'
-      tags_help: Mat Komma getrennt
-      visibility: 'Visibilitéit:'
-      visibility_help: wat heescht dat?
-      upload_button: Eroplueden
-      help: Hëllef
     view:
       pending: AM SUSPENS
       filename: 'Numm vum Fichier:'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 102612028..10ee7c86d 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1569,6 +1569,21 @@ lt:
       trace_uploaded: Jūsų GPX pėdsakas įkrautas ir laukia įterpimo į duomenų bazę.
         Paprastai tai įvyks pusvalandžio bėgyje, o tada jums bus išsiųstas patvirtinimo
         laiškas.
+      traces_waiting:
+        one: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo
+          galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie
+          taip pat nori įkelti savo darbus.
+        other: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo
+          galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie
+          taip pat nori įkelti savo darbus.
+      upload_gpx: 'Įkelti GPX failą:'
+      description: Aprašymas
+      tags: 'Žymos:'
+      tags_help: atskirta kableliais
+      visibility: 'Matomumas:'
+      visibility_help: ką tai reiškia?
+      upload_button: Įkelti
+      help: Pagalba
     edit:
       title: Taisomas pėdsakas %{name}
       heading: Taisomas pėdsakas %{name}
@@ -1586,25 +1601,6 @@ lt:
       save_button: IÅ¡saugoti pakeitimus
       visibility: 'Matomumas:'
       visibility_help: ką tai reiškia?
-    trace_form:
-      upload_gpx: 'Įkelti GPX failą:'
-      description: Aprašymas
-      tags: 'Žymos:'
-      tags_help: atskirta kableliais
-      visibility: 'Matomumas:'
-      visibility_help: ką tai reiškia?
-      upload_button: Įkelti
-      help: Pagalba
-    trace_header:
-      upload_trace: Įkelti pėdsaką
-      see_all_traces: Rodyti visus pėdsakus
-      traces_waiting:
-        one: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo
-          galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie
-          taip pat nori įkelti savo darbus.
-        other: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo
-          galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie
-          taip pat nori įkelti savo darbus.
     trace_optionals:
       tags: Žymos
     view:
@@ -1654,6 +1650,8 @@ lt:
       empty_html: Nieko dar nėra. <a href='%{upload_link}'>Įkelkite naują pėdsaką</a>
         arba sužinokite daugiau apie GPS pėdsakų žymėjimą <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>šiame
         Dokumentacijos puslapyje</a>.
+      upload_trace: Įkelti pėdsaką
+      see_all_traces: Rodyti visus pėdsakus
     delete:
       scheduled_for_deletion: Trasa, numatyta ištrinimui
     make_public:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index a02ddb035..d4355a2e4 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1545,6 +1545,21 @@ lv:
       trace_uploaded: Jūsu GPX fails ir augšupielādēts un gaida iekļaušanu datubāzē.
         Tas parasti notiek apmēram pusstundas laikā. Jums tiks nosūtīts e-pasts, kad
         šis uzdevums būs pabeigts.
+      traces_waiting:
+        one: Tev ir %{count} trase, kura gaida augšupielādi. Lūdzu apsver iespēju
+          uzgaidīt, kamēr šī beidz augšupielādēties pirms augšupielādē vēl kādu, lai
+          nenobloķētu rindu pārējiem lietotājiem.
+        other: Tev ir %{count} trases, kuras gaida augšupielādi. Lūdzu apsver iespēju
+          uzgaidīt līdz augšupielādējas šīs trases, pirms augšupielādē vēl, lai nenobloķētu
+          rindu citiem lietotājiem.
+      upload_gpx: 'Augšupielādēt GPX failu:'
+      description: 'Apraksts:'
+      tags: 'Birkas:'
+      tags_help: atdalīts ar komatiem
+      visibility: 'Redzamība:'
+      visibility_help: ko tas nozīmē?
+      upload_button: Augšupielādēt
+      help: Palīdzība
     edit:
       title: Rediģē trasi %{name}
       heading: Rediģē trasi %{name}
@@ -1562,25 +1577,6 @@ lv:
       save_button: Saglabāt izmaiņas
       visibility: 'Redzamība:'
       visibility_help: ko tas nozīmē?
-    trace_form:
-      upload_gpx: 'Augšupielādēt GPX failu:'
-      description: 'Apraksts:'
-      tags: 'Birkas:'
-      tags_help: atdalīts ar komatiem
-      visibility: 'Redzamība:'
-      visibility_help: ko tas nozīmē?
-      upload_button: Augšupielādēt
-      help: Palīdzība
-    trace_header:
-      upload_trace: Augšupielādēt trasi
-      see_all_traces: Skatīt visas trases
-      traces_waiting:
-        one: Tev ir %{count} trase, kura gaida augšupielādi. Lūdzu apsver iespēju
-          uzgaidīt, kamēr šī beidz augšupielādēties pirms augšupielādē vēl kādu, lai
-          nenobloķētu rindu pārējiem lietotājiem.
-        other: Tev ir %{count} trases, kuras gaida augšupielādi. Lūdzu apsver iespēju
-          uzgaidīt līdz augšupielādējas šīs trases, pirms augšupielādē vēl, lai nenobloķētu
-          rindu citiem lietotājiem.
     trace_optionals:
       tags: Birkas
     view:
@@ -1630,6 +1626,8 @@ lv:
       empty_html: Pašlaik šeit nekā nav. <a href='%{upload_link}'>Augšupielādē jaunu
         trasi</a> vai uzzini vairāk par GPS trasēm iekš <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         lapas</a>.
+      upload_trace: Augšupielādēt trasi
+      see_all_traces: Skatīt visas trases
     delete:
       scheduled_for_deletion: Trase atzīmēta dzēšanai
     make_public:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index e9c2a7b8e..7add4b534 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1626,6 +1626,23 @@ mk:
       trace_uploaded: Вашата GPX податотека е подигната и чека да биде вметната во
         базата на податоци. Ова обично се врши во рок од половина час, и откога ќе
         заврши, ќе ви биде испратена порака по е-пошта.
+      traces_waiting:
+        one: Имате %{count} трага што чека на подигање. Би ве посоветувале да ја почекате
+          да заврши пред да подигате други, за да не ја кочите редицата во која чекаат
+          други корисници.
+        other: Имате %{count} траги што чекаат на подигање. Би ве посоветувале да
+          ги почекате да завршат пред да подигате други, за да не ја кочите редицата
+          во која чекаат други корисници.
+      upload_gpx: 'Подгни GPX -одатотека:'
+      description: 'Опис:'
+      tags: 'Ознаки:'
+      tags_help: одделено со запирка
+      visibility: 'Видливост:'
+      visibility_help: што значи ова?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk
+      upload_button: Подигни
+      help: Помош
+      help_url: https://wiki.openstreetmap.org/wiki/Upload?uselang=mk
     edit:
       title: Ја уредувате трагата %{name}
       heading: Ја уредувате трагата %{name}
@@ -1644,28 +1661,6 @@ mk:
       visibility: 'Видливост:'
       visibility_help: што значи ова?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk
-    trace_form:
-      upload_gpx: 'Подгни GPX -одатотека:'
-      description: 'Опис:'
-      tags: 'Ознаки:'
-      tags_help: одделено со запирка
-      visibility: 'Видливост:'
-      visibility_help: што значи ова?
-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk
-      upload_button: Подигни
-      help: Помош
-      help_url: https://wiki.openstreetmap.org/wiki/Upload?uselang=mk
-    trace_header:
-      upload_trace: Подигни трага
-      see_all_traces: Погледајте ги сите траги
-      see_my_traces: Мои траги
-      traces_waiting:
-        one: Имате %{count} трага што чека на подигање. Би ве посоветувале да ја почекате
-          да заврши пред да подигате други, за да не ја кочите редицата во која чекаат
-          други корисници.
-        other: Имате %{count} траги што чекаат на подигање. Би ве посоветувале да
-          ги почекате да завршат пред да подигате други, за да не ја кочите редицата
-          во која чекаат други корисници.
     trace_optionals:
       tags: Ознаки
     view:
@@ -1717,6 +1712,9 @@ mk:
       empty_html: Тука сè уште нема ништо. <a href='%{upload_link}'>Подигнете нова
         трага</a> или дознајте повеќе за ГПС-трагите на <a href='https://wiki.openstreetmap.org/wiki/Mk:Beginners_Guide_1.2'>нивната
         викстраница</a>.
+      upload_trace: Подигни трага
+      see_all_traces: Погледајте ги сите траги
+      see_my_traces: Мои траги
     delete:
       scheduled_for_deletion: Трагата е закажана за бришење
     make_public:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index d7f837c2c..45aadf5c3 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -1140,6 +1140,13 @@ mr:
   trace:
     create:
       upload_trace: GPS अनुरेख चढवा
+      description: 'वर्णन:'
+      tags: 'खूणपताका:'
+      tags_help: स्वल्पविरामाने परिसीमित
+      visibility: 'दृश्यता:'
+      visibility_help: ह्याचा अर्थ काय?
+      upload_button: चढवा
+      help: साहाय्य
     edit:
       title: अनुरेख %{name} संपादन
       heading: अनुरेख %{name} संपादन
@@ -1156,17 +1163,6 @@ mr:
       save_button: जतन करा
       visibility: 'दृश्यता:'
       visibility_help: ह्याचा अर्थ काय?
-    trace_form:
-      description: 'वर्णन:'
-      tags: 'खूणपताका:'
-      tags_help: स्वल्पविरामाने परिसीमित
-      visibility: 'दृश्यता:'
-      visibility_help: ह्याचा अर्थ काय?
-      upload_button: चढवा
-      help: साहाय्य
-    trace_header:
-      upload_trace: अनुरेख चढवा
-      see_all_traces: सर्व अनुरेख पहा
     trace_optionals:
       tags: खूणपताका
     view:
@@ -1205,6 +1201,9 @@ mr:
       by: तर्फे
       in: आत
       map: नकाशा
+    list:
+      upload_trace: अनुरेख चढवा
+      see_all_traces: सर्व अनुरेख पहा
   oauth_clients:
     new:
       title: नवीन अनुप्रयोगाची नोंदणी करा
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 5007cab7c..c16975925 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1470,6 +1470,18 @@ ms:
       trace_uploaded: Fail GPX anda telah dimuat naik dan menunggu untuk dimasukkan
         dalam pangkalan data. Lazimnya, ini akan berlaku dalam masa setengah jam,
         kemudian e-mel akan dihantar kepada anda setelah siap.
+      traces_waiting:
+        other: Anda mempunyai %{count} jejak yang sedang menunggu untuk dimuat naik.
+          Ada baiknya anda menunggu hingga yang ini selesai sebelum memuat naik lagi
+          supaya tidak menyesakkan baris gilir untuk pengguna-pengguna lain.
+      upload_gpx: 'Muat Naik Fail GPX:'
+      description: 'Keterangan:'
+      tags: 'Tag:'
+      tags_help: terbatas tanda koma
+      visibility: 'Keterlihatan:'
+      visibility_help: apakah maksud ini?
+      upload_button: Muat naik
+      help: Bantuan
     edit:
       title: Menyunting jejak %{name}
       heading: Menyunting jejak %{name}
@@ -1487,22 +1499,6 @@ ms:
       save_button: Simpan Perubahan
       visibility: 'Keterlihatan:'
       visibility_help: apakah maksud ini?
-    trace_form:
-      upload_gpx: 'Muat Naik Fail GPX:'
-      description: 'Keterangan:'
-      tags: 'Tag:'
-      tags_help: terbatas tanda koma
-      visibility: 'Keterlihatan:'
-      visibility_help: apakah maksud ini?
-      upload_button: Muat naik
-      help: Bantuan
-    trace_header:
-      upload_trace: Muat naik jejak
-      see_all_traces: Lihat semua jejak
-      traces_waiting:
-        other: Anda mempunyai %{count} jejak yang sedang menunggu untuk dimuat naik.
-          Ada baiknya anda menunggu hingga yang ini selesai sebelum memuat naik lagi
-          supaya tidak menyesakkan baris gilir untuk pengguna-pengguna lain.
     trace_optionals:
       tags: Tag
     view:
@@ -1552,6 +1548,8 @@ ms:
       empty_html: Belum ada apa-apa lagi di sini. <a href='%{upload_link}'>Muat naik
         jejak baru</a> atau ketahui lebih lanjut tentang penjejakan GPS di <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>halaman
         wiki</a> ini.
+      upload_trace: Muat naik jejak
+      see_all_traces: Lihat semua jejak
     delete:
       scheduled_for_deletion: Jejak dijadualkan untuk penghapusan
     make_public:
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 74e959511..25c50443d 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -1542,6 +1542,21 @@ nb:
       trace_uploaded: Din GPX-fil er lastet opp og venter på å bli satt inn i databasen.
         Dette skjer vanligvis innen en halvtime og en e-post blir sendt til deg når
         det er gjort.
+      traces_waiting:
+        one: Du har %{count} spor som venter på opplasting. Du bør vurdere å la dette
+          bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for
+          andre brukere.
+        other: Du har %{count} spor som venter på opplasting. Du bør vurdere å la
+          disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer
+          køa for andre brukere.
+      upload_gpx: 'Last opp GPX-fil:'
+      description: 'Beskrivelse:'
+      tags: 'Merkelapper:'
+      tags_help: kommaseparert
+      visibility: 'Synlighet:'
+      visibility_help: hva betyr dette?
+      upload_button: Last opp
+      help: Hjelp
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
@@ -1559,25 +1574,6 @@ nb:
       save_button: Lagre endringer
       visibility: 'Synlighet:'
       visibility_help: hva betyr dette?
-    trace_form:
-      upload_gpx: 'Last opp GPX-fil:'
-      description: 'Beskrivelse:'
-      tags: 'Merkelapper:'
-      tags_help: kommaseparert
-      visibility: 'Synlighet:'
-      visibility_help: hva betyr dette?
-      upload_button: Last opp
-      help: Hjelp
-    trace_header:
-      upload_trace: Last opp et GPS-spor
-      see_all_traces: Se alle spor
-      traces_waiting:
-        one: Du har %{count} spor som venter på opplasting. Du bør vurdere å la dette
-          bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for
-          andre brukere.
-        other: Du har %{count} spor som venter på opplasting. Du bør vurdere å la
-          disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer
-          køa for andre brukere.
     trace_optionals:
       tags: Merkelapper
     view:
@@ -1627,6 +1623,8 @@ nb:
       tagged_with: merket med %{tags}
       empty_html: Ingenting her ennå. <a href='%{upload_link}'>Last opp et nytt spor</a>
         eller lær å lage GPS-spor på <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki-siden</a>.
+      upload_trace: Last opp et GPS-spor
+      see_all_traces: Se alle spor
     delete:
       scheduled_for_deletion: Spor planlagt slettet
     make_public:
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 3dce199a8..e5f3f5de3 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -508,6 +508,12 @@ nds:
           private: Privat Togang
           construction: Straat, an de noch boot warrt
   trace:
+    create:
+      upload_gpx: GPX-Datei hoochladen
+      description: Beschrieven
+      visibility: Sichtborkeit
+      upload_button: Hoochladen
+      help: Hülp
     edit:
       filename: 'Dateinaam:'
       download: dalladen
@@ -521,12 +527,6 @@ nds:
       save_button: Ännern spiekern
       visibility: 'Sichtborkeit:'
       visibility_help: wat bedüüdt dat?
-    trace_form:
-      upload_gpx: GPX-Datei hoochladen
-      description: Beschrieven
-      visibility: Sichtborkeit
-      upload_button: Hoochladen
-      help: Hülp
     view:
       filename: 'Dateinaam:'
       download: dalladen
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 1f6f310cf..038970e6c 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -974,6 +974,14 @@ ne:
   trace:
     create:
       upload_trace: GPS Trace अपलोड गर्ने
+      upload_gpx: 'GPX फाइल अपलोड गर्ने:'
+      description: 'विवरण:'
+      tags: ट्यागहरूः
+      tags_help: अल्पविरामले छुट्याएको
+      visibility: 'दृश्यक्षमता:'
+      visibility_help: यसको मतलाब के हो ?
+      upload_button: अपलोड गर्ने
+      help: सहायता
     edit:
       title: ट्रेस सम्पादन गर्दै %{name}
       heading: ट्रेस सम्पादन गर्दै %{name}
@@ -991,17 +999,6 @@ ne:
       save_button: परिवर्तनहरू संग्रह गर्ने
       visibility: 'दृश्यक्षमता:'
       visibility_help: यसको मतलब के हो ?
-    trace_form:
-      upload_gpx: 'GPX फाइल अपलोड गर्ने:'
-      description: 'विवरण:'
-      tags: ट्यागहरूः
-      tags_help: अल्पविरामले छुट्याएको
-      visibility: 'दृश्यक्षमता:'
-      visibility_help: यसको मतलाब के हो ?
-      upload_button: अपलोड गर्ने
-      help: सहायता
-    trace_header:
-      see_all_traces: सबै ट्रेसहरु हेर्ने
     trace_optionals:
       tags: ट्यागहरू
     view:
@@ -1043,6 +1040,7 @@ ne:
       public_traces: सारवजनिक GPS ट्रेसहरु
       public_traces_from: '%{user}बाट सार्वकनिक GPS ट्रेसहरु'
       tagged_with: ' %{tags}हरूद्वारा ट्याग गरिएको'
+      see_all_traces: सबै ट्रेसहरु हेर्ने
     delete:
       scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस
     make_public:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d145dbde6..5ccac35cc 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1654,6 +1654,22 @@ nl:
       trace_uploaded: Uw track is geüpload en staat te wachten totdat hij in de database
         wordt opgenomen. Dit gebeurt meestal binnen een half uur. U ontvangt dan een
         e-mail.
+      traces_waiting:
+        one: U hebt al een trace die wacht om geüpload te worden. Overweeg om te wachten
+          totdat die verwerkt is, om te voorkomen dat de wachtrij voor andere gebruikers
+          geblokkeerd wordt.
+        other: U hebt al %{count} traces die wachten om geüpload te worden. Overweeg
+          om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij
+          voor andere gebruikers geblokkeerd wordt.
+      upload_gpx: 'GPX-bestand uploaden:'
+      description: 'Beschrijving:'
+      tags: 'Labels:'
+      tags_help: kommagescheiden
+      visibility: 'Zichtbaarheid:'
+      visibility_help: wat betekent dit?
+      upload_button: Uploaden
+      help: Hulp
+      help_url: http://wiki.openstreetmap.org/wiki/NL:Upload
     edit:
       title: Trace %{name} aan het bewerken
       heading: Trace %{name} aan het bewerken
@@ -1671,26 +1687,6 @@ nl:
       save_button: Wijzigingen opslaan
       visibility: 'Zichtbaarheid:'
       visibility_help: wat betekent dit?
-    trace_form:
-      upload_gpx: 'GPX-bestand uploaden:'
-      description: 'Beschrijving:'
-      tags: 'Labels:'
-      tags_help: kommagescheiden
-      visibility: 'Zichtbaarheid:'
-      visibility_help: wat betekent dit?
-      upload_button: Uploaden
-      help: Hulp
-      help_url: http://wiki.openstreetmap.org/wiki/NL:Upload
-    trace_header:
-      upload_trace: Trace uploaden
-      see_all_traces: Alle traces bekijken
-      traces_waiting:
-        one: U hebt al een trace die wacht om geüpload te worden. Overweeg om te wachten
-          totdat die verwerkt is, om te voorkomen dat de wachtrij voor andere gebruikers
-          geblokkeerd wordt.
-        other: U hebt al %{count} traces die wachten om geüpload te worden. Overweeg
-          om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij
-          voor andere gebruikers geblokkeerd wordt.
     trace_optionals:
       tags: Labels
     view:
@@ -1739,6 +1735,8 @@ nl:
       tagged_with: ' gelabeld met %{tags}'
       empty_html: Hier is nog niets te zien. <a href='%{upload_link}'>Upload een nieuwe
         trace</a> of kom meer te weten over GPS tracen op de <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikipagina</a>.
+      upload_trace: Trace uploaden
+      see_all_traces: Alle traces bekijken
     delete:
       scheduled_for_deletion: Trace staat op de lijst voor verwijdering
     make_public:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index a970ef89d..6679809cb 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1379,6 +1379,19 @@ nn:
       trace_uploaded: GPX-fila di er lasta opp og ventar på å bli sett inn i databasen.
         Dette skjer vanlegvis innan ein halvtime og ein e-post vert sendt til deg
         når det er gjort.
+      traces_waiting: Du har %{count} spor som ventar på opplasting. Du bør vurdere
+        å la desse verte ferdig før du lastar opp fleire spor slik at du ikkje blokkerer
+        køen for andre brukarar.
+      upload_gpx: 'Last opp GPX-fil:'
+      description: 'Skildring:'
+      tags: 'Merkelappar:'
+      tags_help: kommaseparert
+      visibility: 'Synligheit:'
+      visibility_help: kva tyder dette?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Last opp
+      help: Hjelp
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
@@ -1397,23 +1410,6 @@ nn:
       visibility: 'Synlegheit:'
       visibility_help: kva tyder dette?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Last opp GPX-fil:'
-      description: 'Skildring:'
-      tags: 'Merkelappar:'
-      tags_help: kommaseparert
-      visibility: 'Synligheit:'
-      visibility_help: kva tyder dette?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Last opp
-      help: Hjelp
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Last opp eit GPS-spor
-      see_all_traces: Sjå alle spor
-      traces_waiting: Du har %{count} spor som ventar på opplasting. Du bør vurdere
-        å la desse verte ferdig før du lastar opp fleire spor slik at du ikkje blokkerer
-        køen for andre brukarar.
     trace_optionals:
       tags: Merkelappar
     view:
@@ -1463,6 +1459,8 @@ nn:
       empty_html: Ingenting her endå. <a href='%{upload_link}'>Last opp eit nytt spor</a>
         eller lær å lage GPS spor på <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         sida</a>.
+      upload_trace: Last opp eit GPS-spor
+      see_all_traces: Sjå alle spor
     delete:
       scheduled_for_deletion: Spor planlagt sletta
     make_public:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index a660ed95b..325d7d9b6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1512,6 +1512,14 @@ oc:
         punts ordenats amb las datas)
     create:
       upload_trace: Mandar la traça GPS
+      upload_gpx: 'Mandar un fichièr GPX :'
+      description: 'Descripcion :'
+      tags: 'Balisas :'
+      tags_help: separadas per de virgulas
+      visibility: 'Visibilitat :'
+      visibility_help: qué significa aquò ?
+      upload_button: Mandar
+      help: Ajuda
     edit:
       title: Modificar la traça %{name}
       heading: Modificar la traça %{name}
@@ -1529,19 +1537,6 @@ oc:
       save_button: Enregistrar las modificacions
       visibility: 'Visibilitat :'
       visibility_help: qué significa aquò ?
-    trace_form:
-      upload_gpx: 'Mandar un fichièr GPX :'
-      description: 'Descripcion :'
-      tags: 'Balisas :'
-      tags_help: separadas per de virgulas
-      visibility: 'Visibilitat :'
-      visibility_help: qué significa aquò ?
-      upload_button: Mandar
-      help: Ajuda
-    trace_header:
-      upload_trace: Mandar una traça
-      see_all_traces: Veire totas las traças
-      see_my_traces: véder las mias traças
     trace_optionals:
       tags: Balisas
     view:
@@ -1592,6 +1587,9 @@ oc:
       empty_html: Pas res a veire per aquí. <a href='%{upload_link}'>Telecargar una
         traça novèla</a> o per ne saber mai sul traçatge GPS, consultatz la <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina
         wiki</a>.
+      upload_trace: Mandar una traça
+      see_all_traces: Veire totas las traças
+      see_my_traces: véder las mias traças
     delete:
       scheduled_for_deletion: Pista prevista per la supression
     make_public:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 871a41d51..9555b4083 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -917,6 +917,13 @@ pa:
       add_a_note:
         title: ਸੋਧਣ ਦੀ ਵਿਹਲ ਨਹੀਂ? ਕੋਈ ਨੋਟ ਜੋੜੋ!
   trace:
+    create:
+      description: 'ਵੇਰਵਾ:'
+      tags: 'ਟੈਗ:'
+      visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
+      visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ?
+      upload_button: ਚੜ੍ਹਾਉ
+      help: ਮਦਦ
     edit:
       filename: 'ਫ਼ਾਈਲ ਦਾ ਨਾਂ:'
       download: ਡਾਊਨਲੋਡ
@@ -930,16 +937,6 @@ pa:
       save_button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ
       visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
       visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ?
-    trace_form:
-      description: 'ਵੇਰਵਾ:'
-      tags: 'ਟੈਗ:'
-      visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
-      visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ?
-      upload_button: ਚੜ੍ਹਾਉ
-      help: ਮਦਦ
-    trace_header:
-      upload_trace: ਕੋਈ ਖੁਰਾ-ਖੋਜ ਚੜ੍ਹਾਉ
-      see_all_traces: ਸਾਰੇ ਖੁਰਾ-ਖੋਜ ਵੇਖੋ
     trace_optionals:
       tags: ਟੈਗ
     view:
@@ -982,6 +979,8 @@ pa:
       map: ਨਕਸ਼ਾ
     list:
       tagged_with: '%{tags} ਨਾਲ਼ ਨਿਸ਼ਾਨਦੇਹ'
+      upload_trace: ਕੋਈ ਖੁਰਾ-ਖੋਜ ਚੜ੍ਹਾਉ
+      see_all_traces: ਸਾਰੇ ਖੁਰਾ-ਖੋਜ ਵੇਖੋ
   oauth:
     authorize:
       allow_write_notes: ਟਿੱਪਣੀਆੰ ਸੋਧੋ।
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f3523b241..e5b326d13 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1656,6 +1656,23 @@ pl:
       upload_trace: Wyślij ślad GPS
       trace_uploaded: Plik GPX został wysłany i czeka na dodanie do bazy danych. Powinno
         to nastąpić w ciągu 30 minut, a informacja o tym fakcie zostanie wysłana wiadomością.
+      traces_waiting:
+        one: '%{count} ślad oczekuje na wysłanie. Proszę zaczekać na zakończenie jego
+          wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
+        few: '%{count} ślady oczekują na wysłanie. Proszę zaczekać na zakończenie
+          ich wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
+        other: '%{count} śladów oczekuje na wysłanie. Proszę zaczekać na zakończenie
+          ich wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
+      upload_gpx: Prześlij plik GPX
+      description: Opis
+      tags: 'Tagi:'
+      tags_help: rozdzielone przecinkami
+      visibility: Widoczność
+      visibility_help: co to znaczy?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Pl:Visibility_of_GPS_traces
+      upload_button: Wyślij
+      help: Pomoc
+      help_url: http://wiki.openstreetmap.org/wiki/Pl:Upload
     edit:
       title: Edycja śladu %{name}
       heading: Edycja śladu %{name}
@@ -1674,28 +1691,6 @@ pl:
       visibility: 'Widoczność:'
       visibility_help: co to znaczy?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Pl:Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: Prześlij plik GPX
-      description: Opis
-      tags: 'Tagi:'
-      tags_help: rozdzielone przecinkami
-      visibility: Widoczność
-      visibility_help: co to znaczy?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Pl:Visibility_of_GPS_traces
-      upload_button: Wyślij
-      help: Pomoc
-      help_url: http://wiki.openstreetmap.org/wiki/Pl:Upload
-    trace_header:
-      upload_trace: Wyślij ślad
-      see_all_traces: Wyświetl wszystkie ślady
-      see_my_traces: Zobacz moje ślady
-      traces_waiting:
-        one: '%{count} ślad oczekuje na wysłanie. Proszę zaczekać na zakończenie jego
-          wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
-        few: '%{count} ślady oczekują na wysłanie. Proszę zaczekać na zakończenie
-          ich wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
-        other: '%{count} śladów oczekuje na wysłanie. Proszę zaczekać na zakończenie
-          ich wysyłania przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom.'
     trace_optionals:
       tags: Tagi
     view:
@@ -1747,6 +1742,9 @@ pl:
       empty_html: Nic tu jeszcze nie ma. <a href='%{upload_link}'>Prześlij nowy ślad</a>
         lub dowiedz się więcej o śledzeniu GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>stronie
         wiki</a>.
+      upload_trace: Wyślij ślad
+      see_all_traces: Wyświetl wszystkie ślady
+      see_my_traces: Zobacz moje ślady
     delete:
       scheduled_for_deletion: Ślad oczekuje na usunięcie
     make_public:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a0da1be6f..90a574266 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1670,6 +1670,21 @@ pt-BR:
       trace_uploaded: Seu arquivo GPX foi recebido e aguarda para ser inserido no
         banco de dados. Isso normalmente leva meia hora, e um e-mail será enviado
         para você quando ocorrer.
+      traces_waiting: '{{PLURAL|one=Você tem %{count} trilha esperando para enviar.
+        Por favor considere esperar que ela termine antes de enviar, para não bloquear
+        a fila para outros usuários.|Você tem %{count} trilhas esperando para enviar.
+        Por favor considere esperar que elas terminem antes de enviar, para não bloquear
+        a fila para outros usuários.'
+      upload_gpx: 'Enviar Arquivo GPX:'
+      description: 'Descrição:'
+      tags: 'Etiquetas:'
+      tags_help: separados por vírgulas
+      visibility: 'Visibilidade:'
+      visibility_help: o que isso significa?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br
+      upload_button: Enviar
+      help: Ajuda
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=pt-br
     edit:
       title: Editando trilha %{name}
       heading: Editando trilha %{name}
@@ -1688,26 +1703,6 @@ pt-BR:
       visibility: 'Visibilidade:'
       visibility_help: o que isso significa?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br
-    trace_form:
-      upload_gpx: 'Enviar Arquivo GPX:'
-      description: 'Descrição:'
-      tags: 'Etiquetas:'
-      tags_help: separados por vírgulas
-      visibility: 'Visibilidade:'
-      visibility_help: o que isso significa?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br
-      upload_button: Enviar
-      help: Ajuda
-      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=pt-br
-    trace_header:
-      upload_trace: Enviar uma trilha
-      see_all_traces: Ver todas as trilhas
-      see_my_traces: Ver meus trilhos
-      traces_waiting: '{{PLURAL|one=Você tem %{count} trilha esperando para enviar.
-        Por favor considere esperar que ela termine antes de enviar, para não bloquear
-        a fila para outros usuários.|Você tem %{count} trilhas esperando para enviar.
-        Por favor considere esperar que elas terminem antes de enviar, para não bloquear
-        a fila para outros usuários.'
     trace_optionals:
       tags: Etiquetas
     view:
@@ -1759,6 +1754,9 @@ pt-BR:
       empty_html: Ainda não enviou nenhum trilho GPS. <a href='%{upload_link}'>Envie
         um novo trilho GPS</a> ou saiba mais sobre trilhos GPS na <a href='https://wiki.openstreetmap.org/wiki/Pt:Beginners_Guide_1.2'>página
         wiki</a>.
+      upload_trace: Enviar uma trilha
+      see_all_traces: Ver todas as trilhas
+      see_my_traces: Ver meus trilhos
     delete:
       scheduled_for_deletion: Trilha marcada para ser apagada
     make_public:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 14ad5e4df..c939c13e4 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1646,6 +1646,23 @@ pt-PT:
       trace_uploaded: O seu ficheiro GPX (GPS) foi enviado e está a aguardar a inclusão
         na base de dados. Normalmente este processo dura cerca de uma hora. Quando
         for incluído na base de dados será enviado um email a informá-lo.
+      traces_waiting:
+        one: Tem %{count} trilho GPS na fila para ser colocado na base de dados do
+          OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco
+          para terminar a inclusão do trilho enviado, de modo a não bloquear a fila
+          para outros utilizadores.
+        other: Tem %{count} trilhos GPS na fila para serem colocados na base de dados
+          do OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco
+          para terminar a inclusão dos trilhos enviados, de modo a não bloquear a
+          fila para outros utilizadores.
+      upload_gpx: 'Enviar Ficheiro GPX:'
+      description: 'Descrição:'
+      tags: 'Etiquetas:'
+      tags_help: separadas por vírgulas
+      visibility: 'Visibilidade:'
+      visibility_help: o que significa isto?
+      upload_button: Enviar
+      help: Ajuda
     edit:
       title: A editar o trilho %{name}
       heading: A editar o trilho %{name}
@@ -1663,28 +1680,6 @@ pt-PT:
       save_button: Gravar Alterações
       visibility: 'Visibilidade:'
       visibility_help: o que significa isto?
-    trace_form:
-      upload_gpx: 'Enviar Ficheiro GPX:'
-      description: 'Descrição:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por vírgulas
-      visibility: 'Visibilidade:'
-      visibility_help: o que significa isto?
-      upload_button: Enviar
-      help: Ajuda
-    trace_header:
-      upload_trace: Enviar trilho GPS
-      see_all_traces: Ver todos os trilhos
-      see_my_traces: Ver meus trilhos
-      traces_waiting:
-        one: Tem %{count} trilho GPS na fila para ser colocado na base de dados do
-          OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco
-          para terminar a inclusão do trilho enviado, de modo a não bloquear a fila
-          para outros utilizadores.
-        other: Tem %{count} trilhos GPS na fila para serem colocados na base de dados
-          do OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco
-          para terminar a inclusão dos trilhos enviados, de modo a não bloquear a
-          fila para outros utilizadores.
     trace_optionals:
       tags: Etiquetas
     view:
@@ -1736,6 +1731,9 @@ pt-PT:
       empty_html: Ainda não enviou nenhum trilho GPS. <a href='%{upload_link}'>Envie
         um novo trilho GPS</a> ou saiba mais sobre trilhos GPS na <a href='https://wiki.openstreetmap.org/wiki/Pt:Beginners_Guide_1.2'>página
         wiki</a>.
+      upload_trace: Enviar trilho GPS
+      see_all_traces: Ver todos os trilhos
+      see_my_traces: Ver meus trilhos
     delete:
       scheduled_for_deletion: Trilho programado para eliminação
     make_public:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b85b70360..b98d25151 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -935,16 +935,16 @@ ro:
       add_a_note:
         title: <h3>Nu aveți timp pentru editare? Adaugați o notă!<h3>
   trace:
-    edit:
-      visibility: 'Vizibilitate:'
-      visibility_help: ce înseamnă asta?
-    trace_form:
+    create:
       upload_gpx: 'Încărcați fișier GPX:'
       description: 'Descriere:'
       tags: 'Etichete:'
       tags_help: use commas
       visibility: 'Vizibilitate:'
       visibility_help: ce înseamnă asta?
+    edit:
+      visibility: 'Vizibilitate:'
+      visibility_help: ce înseamnă asta?
     view:
       filename: 'Nume fișier:'
       uploaded: 'Încărcate:'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2f0d72767..5cabfae02 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1687,6 +1687,23 @@ ru:
       trace_uploaded: Ваш файл GPX был передан на сервер и сейчас вносится в базу
         данных. Обычно это занимает от минуты до получаса. По завершении вам будет
         прислано уведомление на электронную почту.
+      traces_waiting:
+        one: '%{count} ваш трек ожидает передачи на сервер. Пожалуйста, дождитесь
+          окончания передачи этого трека, перед тем как начать передавать на сервер
+          другие. Это позволит не блокировать сервер для других пользователей.'
+        other: '%{count} ваших треков ожидают передачи на сервер. Пожалуйста, дождитесь
+          окончания передачи этих треков, перед тем как начать передавать на сервер
+          другие. Это позволит не блокировать сервер для других пользователей.'
+      upload_gpx: Загрузить GPX-файл
+      description: 'Описание:'
+      tags: 'Теги:'
+      tags_help: через запятую
+      visibility: 'Видимость:'
+      visibility_help: Что это значит?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
+      upload_button: Передать на сервер
+      help: Справка
+      help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
     edit:
       title: Редактирование трека %{name}
       heading: Редактирование трека %{name}
@@ -1705,28 +1722,6 @@ ru:
       visibility: 'Видимость:'
       visibility_help: Что это значит?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
-    trace_form:
-      upload_gpx: Загрузить GPX-файл
-      description: 'Описание:'
-      tags: 'Теги:'
-      tags_help: через запятую
-      visibility: 'Видимость:'
-      visibility_help: Что это значит?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
-      upload_button: Передать на сервер
-      help: Справка
-      help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru
-    trace_header:
-      upload_trace: Загрузить треки
-      see_all_traces: Показать все треки
-      see_my_traces: Показать мои треки
-      traces_waiting:
-        one: '%{count} ваш трек ожидает передачи на сервер. Пожалуйста, дождитесь
-          окончания передачи этого трека, перед тем как начать передавать на сервер
-          другие. Это позволит не блокировать сервер для других пользователей.'
-        other: '%{count} ваших треков ожидают передачи на сервер. Пожалуйста, дождитесь
-          окончания передачи этих треков, перед тем как начать передавать на сервер
-          другие. Это позволит не блокировать сервер для других пользователей.'
     trace_optionals:
       tags: 'Теги:'
     view:
@@ -1777,6 +1772,9 @@ ru:
       tagged_with: 'с тегами: %{tags}'
       empty_html: Пока здесь ничего нет. <a href='%{upload_link}'>Загрузите новый
         трек</a> или почитайте про GPS-треки на <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вики-странице</a>.
+      upload_trace: Загрузить треки
+      see_all_traces: Показать все треки
+      see_my_traces: Показать мои треки
     delete:
       scheduled_for_deletion: Запланировано к удалению
     make_public:
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index cfa123dde..afa05eb35 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -1538,6 +1538,21 @@ scn:
       trace_uploaded: Lu tò file GPX fu carricatu e ora sta aspittannu d'èssiri misu
         ntâ basi di dati. Sta cosa di sòlitu veni fatta intra na menz'ura, e na vota
         chi lu sirvizzu veni spicciatu ti veni mannatu nu missaggiu di posta elittrònica.
+      traces_waiting:
+        one: Già hai %{count} tracciatu chi si sta carricannu. Pi favuri cunzìddira
+          si poi aspittari chi finisci chiddu avanti di carricàrinni àutri, accussì
+          nun blocchi la fila pi l'àutri utenti.
+        other: Già hai %{count} tracciati chi si stannu carricannu. Pi favuri cunzìddira
+          si poi aspittari chi finìscinu chiddi avanti di carricàrinni àutri, accussì
+          nun blocchi la fila pi l'àutri utenti.
+      upload_gpx: 'Carricari lu file GPX:'
+      description: 'Discrizzioni:'
+      tags: 'Etichetti:'
+      tags_help: spartuti câ vìrgula
+      visibility: 'Visibbilità:'
+      visibility_help: chi voli diri?
+      upload_button: Càrrica
+      help: Guida
     edit:
       title: Canciamentu dû tracciatu %{name}
       heading: Canciamentu dû tracciatu %{name}
@@ -1555,25 +1570,6 @@ scn:
       save_button: Sarva li canciamenti
       visibility: 'Visibbilità:'
       visibility_help: chi voli diri?
-    trace_form:
-      upload_gpx: 'Carricari lu file GPX:'
-      description: 'Discrizzioni:'
-      tags: 'Etichetti:'
-      tags_help: spartuti câ vìrgula
-      visibility: 'Visibbilità:'
-      visibility_help: chi voli diri?
-      upload_button: Càrrica
-      help: Guida
-    trace_header:
-      upload_trace: Càrrica nu tracciatu
-      see_all_traces: Talìa tutti li tracciati
-      traces_waiting:
-        one: Già hai %{count} tracciatu chi si sta carricannu. Pi favuri cunzìddira
-          si poi aspittari chi finisci chiddu avanti di carricàrinni àutri, accussì
-          nun blocchi la fila pi l'àutri utenti.
-        other: Già hai %{count} tracciati chi si stannu carricannu. Pi favuri cunzìddira
-          si poi aspittari chi finìscinu chiddi avanti di carricàrinni àutri, accussì
-          nun blocchi la fila pi l'àutri utenti.
     trace_optionals:
       tags: Etichetti
     view:
@@ -1623,6 +1619,8 @@ scn:
       empty_html: Ancora nun nn'havi nuddu. <a href='%{upload_link}'>Càrrica nu tracciatu
         novu</a>, o puru nfòrmati cchiossai a prupòsitu dî tracciati GPS nta sta <a
         href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàggina dâ wiki</a>.
+      upload_trace: Càrrica nu tracciatu
+      see_all_traces: Talìa tutti li tracciati
     delete:
       scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
     make_public:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f2b3ef527..e910324e2 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1356,6 +1356,17 @@ sk:
       upload_trace: Nahrať GPS stopu
       trace_uploaded: Váš GPX súbor bol uložený a čaká na zaradenie do databázy. Obvykle
         to netrvá viac než polhodinu. Po jeho zaradení dostanete potvrdzujúci e-mail.
+      traces_waiting: Máte %{count} stopy čakajúce na nahratie. Prosím zvážte toto
+        čakanie, dokedy neukončíte nahrávanie niečoho iného, pokiaľ  nie je blok v
+        rade pre iných užívateľov.
+      upload_gpx: 'Nahrať GPX súbor:'
+      description: 'Popis:'
+      tags: 'Značky:'
+      tags_help: oddelené čiarkou
+      visibility: 'Viditeľnosť:'
+      visibility_help: čo toto znamená?
+      upload_button: Nahrať
+      help: Pomoc
     edit:
       title: Úprava stopy %{name}
       heading: Úprava stopy %{name}
@@ -1373,21 +1384,6 @@ sk:
       save_button: Uložiť zmeny
       visibility: 'Viditeľnosť:'
       visibility_help: čo má toto znamenať?
-    trace_form:
-      upload_gpx: 'Nahrať GPX súbor:'
-      description: 'Popis:'
-      tags: 'Značky:'
-      tags_help: oddelené čiarkou
-      visibility: 'Viditeľnosť:'
-      visibility_help: čo toto znamená?
-      upload_button: Nahrať
-      help: Pomoc
-    trace_header:
-      upload_trace: Nahrať stopu
-      see_all_traces: Zobraziť všetky stopy
-      traces_waiting: Máte %{count} stopy čakajúce na nahratie. Prosím zvážte toto
-        čakanie, dokedy neukončíte nahrávanie niečoho iného, pokiaľ  nie je blok v
-        rade pre iných užívateľov.
     trace_optionals:
       tags: Tagy
     view:
@@ -1436,6 +1432,8 @@ sk:
       tagged_with: označený s %{tags}
       empty_html: Nič tu zatiaľ nie je. <a href='%{upload_link}'>Nahrajte novú stopu</a>,
         alebo si niečo o GPS stopách prečítajte na <a href='http://wiki.openstreetmap.org/wiki/Sk:Beginners_Guide_1.2'>wiki</a>.
+      upload_trace: Nahrať stopu
+      see_all_traces: Zobraziť všetky stopy
     delete:
       scheduled_for_deletion: Stopa plánovaná na vymazanie
     make_public:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3327ca4df..552d004ce 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1442,6 +1442,21 @@ sl:
       trace_uploaded: Vaša datoteka s sledjo GPS v datoteki GPX je bila poslana na
         strežnik in čaka na uvoz v zbirko podatkov. To se ponavadi zgodi v roku pol
         ure. O uvozu boste obveščeni po elektronski pošti.
+      traces_waiting:
+        one: V vrsti za obdelavo imate %{count} sled. Prosimo, počakajte, da se obdelajo
+          pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo tudi drugi
+          uporabniki.
+        other: V vrsti za obdelavo imate %{count} sledi. Prosimo, počakajte, da se
+          obdelajo pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo
+          tudi drugi uporabniki.
+      upload_gpx: 'Naložite datoteko GPX:'
+      description: 'Opis:'
+      tags: 'Oznake:'
+      tags_help: uporabite vejice
+      visibility: 'Vidljivost:'
+      visibility_help: kaj to pomeni?
+      upload_button: Pošlji
+      help: Pomoč
     edit:
       title: Urejanje sledi %{name}
       heading: Urejanje sledi %{name}
@@ -1459,25 +1474,6 @@ sl:
       save_button: Shrani spremembe
       visibility: 'Vidljivost:'
       visibility_help: kaj to pomeni?
-    trace_form:
-      upload_gpx: 'Naložite datoteko GPX:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: uporabite vejice
-      visibility: 'Vidljivost:'
-      visibility_help: kaj to pomeni?
-      upload_button: Pošlji
-      help: Pomoč
-    trace_header:
-      upload_trace: Naloži sled GPS
-      see_all_traces: Seznam vseh sledi
-      traces_waiting:
-        one: V vrsti za obdelavo imate %{count} sled. Prosimo, počakajte, da se obdelajo
-          pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo tudi drugi
-          uporabniki.
-        other: V vrsti za obdelavo imate %{count} sledi. Prosimo, počakajte, da se
-          obdelajo pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo
-          tudi drugi uporabniki.
     trace_optionals:
       tags: Oznake
     view:
@@ -1527,6 +1523,8 @@ sl:
       empty_html: Prazno. <a href='%{upload_link}'>Naložite novo sled</a> oziroma
         izvedete več o GPS sledeh na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         strani</a>.
+      upload_trace: Naloži sled GPS
+      see_all_traces: Seznam vseh sledi
     delete:
       scheduled_for_deletion: Sled bo izbrisana
     make_public:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index fd5d326f7..19ac000a0 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1175,6 +1175,19 @@ sq:
       trace_uploaded: Skeda e juaj GPX është ngarkuar dhe është në pritje për futje
         në bazën e të dhënave. Kjo zakonisht ndodhë brenda një gjysmë ore dhe pas
         përfundimit do të ju dërgohet një email.
+      traces_waiting: Ju keni %{count}  të dhëna  duke pritur për tu  ngrarkuar.Ju
+        lutem pritni deri sa të përfundoj ngarkimi përpara se me ngarku tjetër gjë,
+        pra që mos me blloku rradhën për përdoruesit e tjerë.
+      upload_gpx: 'Ngarko një skedar GPX:'
+      description: 'Përshkrimi:'
+      tags: 'Etiketat:'
+      tags_help: ndarë me presje
+      visibility: 'Dukshmëria:'
+      visibility_help: çfarë do të thotë kjo?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Ngarko
+      help: Ndihmë
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Duke redaktuar gjurmën %{name}
       heading: Duke redaktuar gjurmën %{name}
@@ -1193,23 +1206,6 @@ sq:
       visibility: 'Dukshmëria:'
       visibility_help: çfarë do të thotë kjo?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Ngarko një skedar GPX:'
-      description: 'Përshkrimi:'
-      tags: 'Etiketat:'
-      tags_help: ndarë me presje
-      visibility: 'Dukshmëria:'
-      visibility_help: çfarë do të thotë kjo?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Ngarko
-      help: Ndihmë
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Ngarko një gjurmë
-      see_all_traces: Shih të gjitha gjurmët
-      traces_waiting: Ju keni %{count}  të dhëna  duke pritur për tu  ngrarkuar.Ju
-        lutem pritni deri sa të përfundoj ngarkimi përpara se me ngarku tjetër gjë,
-        pra që mos me blloku rradhën për përdoruesit e tjerë.
     trace_optionals:
       tags: Etiketat
     view:
@@ -1254,6 +1250,8 @@ sq:
       public_traces_from: Gjurmët publike të GPS nga %{user}
       description: Shfletoni ngarkimet e fundit gjurmëve të GPS
       tagged_with: etiketuar me %{tags}
+      upload_trace: Ngarko një gjurmë
+      see_all_traces: Shih të gjitha gjurmët
     delete:
       scheduled_for_deletion: Gjurmë e planifikuar për fshirje
     make_public:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index ad44d5885..94dcf6e5d 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1087,6 +1087,19 @@ sr-Latn:
       upload_trace: Otpremi GPS trag
       trace_uploaded: GPX datoteka je otpremljena i čeka ubacivanje u bazu. Ovo obično
         traje oko pola sata, nakon čega ćete dobiti obaveštenje o završetku.
+      traces_waiting: Imate %{count} tragova na čekanju za slanje. Sačekajte da se
+        prvo oni završe pre otpremanja novih tragova, da ne biste blokirali druge
+        korisnike.
+      upload_gpx: 'Otpremi GPX datoteku:'
+      description: 'Opis:'
+      tags: 'Oznake:'
+      tags_help: razdvojeno zapetama
+      visibility: 'Vidljivost:'
+      visibility_help: šta ovo znači?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
+      upload_button: Otpremi
+      help: Pomoć
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec
     edit:
       title: Uređivanje traga %{name}
       heading: Uređivanje traga %{name}
@@ -1105,23 +1118,6 @@ sr-Latn:
       visibility: 'Vidljivost:'
       visibility_help: šta ovo znači?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
-    trace_form:
-      upload_gpx: 'Otpremi GPX datoteku:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: razdvojeno zapetama
-      visibility: 'Vidljivost:'
-      visibility_help: šta ovo znači?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
-      upload_button: Otpremi
-      help: Pomoć
-      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec
-    trace_header:
-      upload_trace: Otpremi trag
-      see_all_traces: Pogledaj sve tragove
-      traces_waiting: Imate %{count} tragova na čekanju za slanje. Sačekajte da se
-        prvo oni završe pre otpremanja novih tragova, da ne biste blokirali druge
-        korisnike.
     trace_optionals:
       tags: Oznake
     view:
@@ -1170,6 +1166,8 @@ sr-Latn:
       empty_html: Ovde još nema ništa. <a href='%{upload_link}'>Otpremite novi trag</a>
         ili saznajte više o GPS traganju na <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>viki
         stranici</a>.
+      upload_trace: Otpremi trag
+      see_all_traces: Pogledaj sve tragove
     delete:
       scheduled_for_deletion: Trag postavljen za brisanje
     make_public:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index dfe6ebc3d..8fccb4d0b 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1588,6 +1588,22 @@ sr:
       upload_trace: Отпремање ГПС трага
       trace_uploaded: GPX датотека је отпремљена и чека убацивање у базу. Ово обично
         траје око пола сата, након чега ћете добити обавештење о завршетку.
+      traces_waiting:
+        one: '%{count} траг чека на отпремање. Молимо вас да сачекате окончање преноса
+          пре него што отпремите друге. Тиме нећете оптеретити сервер другим корисницима.'
+        other: '%{count} трага чекају на отпремање. Молимо вас да сачекате окончање
+          преноса пре него што отпремите друге. Тиме нећете оптеретити сервер другим
+          корисницима.'
+      upload_gpx: 'Отпреми GPX датотеку:'
+      description: 'Опис:'
+      tags: 'Ознаке:'
+      tags_help: раздвојено запетама
+      visibility: 'Видљивост:'
+      visibility_help: шта ово значи?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
+      upload_button: Отпреми
+      help: Помоћ
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec
     edit:
       title: Уређивање трага %{name}
       heading: Уређивање трага %{name}
@@ -1606,26 +1622,6 @@ sr:
       visibility: 'Видљивост:'
       visibility_help: шта ово значи?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
-    trace_form:
-      upload_gpx: 'Отпреми GPX датотеку:'
-      description: 'Опис:'
-      tags: 'Ознаке:'
-      tags_help: раздвојено запетама
-      visibility: 'Видљивост:'
-      visibility_help: шта ово значи?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
-      upload_button: Отпреми
-      help: Помоћ
-      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=sr-ec
-    trace_header:
-      upload_trace: Отпреми траг
-      see_all_traces: Погледај све трагове
-      traces_waiting:
-        one: '%{count} траг чека на отпремање. Молимо вас да сачекате окончање преноса
-          пре него што отпремите друге. Тиме нећете оптеретити сервер другим корисницима.'
-        other: '%{count} трага чекају на отпремање. Молимо вас да сачекате окончање
-          преноса пре него што отпремите друге. Тиме нећете оптеретити сервер другим
-          корисницима.'
     trace_optionals:
       tags: Ознаке
     view:
@@ -1675,6 +1671,8 @@ sr:
       empty_html: Овде још увек нема ништа. <a href='%{upload_link}'>Отпремите нови
         траг</a> или сазнајте више о GPS траговима на <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>вики
         страници</a>.
+      upload_trace: Отпреми траг
+      see_all_traces: Погледај све трагове
     delete:
       scheduled_for_deletion: Траг постављен за брисање
     make_public:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 070722662..b94005b97 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1666,6 +1666,21 @@ sv:
       trace_uploaded: Din GPX-fil har laddats upp och väntar på att lagras i databasen.
         Detta sker vanligtvis inom en halvtimme. När den är klar skickas en e-post
         till dig.
+      traces_waiting:
+        one: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna på
+          att detta blir klart innan du laddar upp fler, så att du inte blockerar
+          kön för andra användare.
+        other: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna
+          på att dessa blir klara innan du laddar upp fler, så att du inte blockerar
+          kön för andra användare.
+      upload_gpx: 'Ladda upp GPX-fil:'
+      description: 'Beskrivning:'
+      tags: 'Taggar:'
+      tags_help: kommaseparerad
+      visibility: 'Synlighet:'
+      visibility_help: vad betyder detta?
+      upload_button: Uppladdning
+      help: Hjälp
     edit:
       title: Redigerar spår %{name}
       heading: Redigerar spår %{name}
@@ -1683,26 +1698,6 @@ sv:
       save_button: Spara ändringar
       visibility: 'Synlighet:'
       visibility_help: vad betyder detta?
-    trace_form:
-      upload_gpx: 'Ladda upp GPX-fil:'
-      description: 'Beskrivning:'
-      tags: 'Taggar:'
-      tags_help: kommaseparerad
-      visibility: 'Synlighet:'
-      visibility_help: vad betyder detta?
-      upload_button: Uppladdning
-      help: Hjälp
-    trace_header:
-      upload_trace: Ladda upp GPS-spår
-      see_all_traces: Se alla GPS-spår
-      see_my_traces: Se mina spår
-      traces_waiting:
-        one: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna på
-          att detta blir klart innan du laddar upp fler, så att du inte blockerar
-          kön för andra användare.
-        other: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna
-          på att dessa blir klara innan du laddar upp fler, så att du inte blockerar
-          kön för andra användare.
     trace_optionals:
       tags: Taggar
     view:
@@ -1753,6 +1748,9 @@ sv:
       tagged_with: ' taggad med %{tags}'
       empty_html: Ingenting här ännu. <a href='%{upload_link}'>Ladda upp ett nytt
         GPS-spår</a> eller lär dig om GPS-spår på <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wikin</a>.
+      upload_trace: Ladda upp GPS-spår
+      see_all_traces: Se alla GPS-spår
+      see_my_traces: Se mina spår
     delete:
       scheduled_for_deletion: GPS-spår schemalagt för radering
     make_public:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index b3c7a7a26..b9d245b65 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -597,6 +597,14 @@ ta:
       rules:
         title: விதிமுறைகள்!
   trace:
+    create:
+      description: 'விளக்கம்:'
+      tags: 'குறிச்சொற்கள்:'
+      tags_help: காற்புள்ளி வரம்பில்லை
+      visibility: 'காணும்தூரம்:'
+      visibility_help: இது எதைக் குறிக்கிறது?
+      upload_button: பதிவேற்று
+      help: உதவி
     edit:
       filename: 'கோப்புப்பெயர்:'
       download: தரவிறக்கு
@@ -611,17 +619,6 @@ ta:
       save_button: மாற்றங்களை சேமி
       visibility: 'காணும்தூரம்:'
       visibility_help: இது எதைக் குறிக்கிறது?
-    trace_form:
-      description: 'விளக்கம்:'
-      tags: 'குறிச்சொற்கள்:'
-      tags_help: காற்புள்ளி வரம்பில்லை
-      visibility: 'காணும்தூரம்:'
-      visibility_help: இது எதைக் குறிக்கிறது?
-      upload_button: பதிவேற்று
-      help: உதவி
-    trace_header:
-      upload_trace: சுவடை பதிவேற்றவும்
-      see_all_traces: அனைத்து சுவடுகளையும் காண்
     trace_optionals:
       tags: குறிச்சொற்கள்
     view:
@@ -650,6 +647,9 @@ ta:
       by: மூலம்
       in: உள்
       map: வரைபடம்
+    list:
+      upload_trace: சுவடை பதிவேற்றவும்
+      see_all_traces: அனைத்து சுவடுகளையும் காண்
   oauth_clients:
     new:
       submit: பதிவுசெய்
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 0a0871395..597d87097 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -619,6 +619,12 @@ te:
       add_a_note:
         title: సరిదిద్దేంత సమయం లేదా? ఒక గమనికను చేర్చండి!
   trace:
+    create:
+      description: 'వివరణ:'
+      tags_help: కామాలతో వేరుపరచినవి
+      visibility_help: దీని అర్థమేమిటి?
+      upload_button: ఎక్కించు
+      help: సహాయం
     edit:
       filename: 'ఫైలుపేరు:'
       download: దింపుకోలు
@@ -630,12 +636,6 @@ te:
       save_button: మార్పులను భద్రపరచు
       visibility: 'దృశ్యత:'
       visibility_help: దీని అర్థం ఏమిటి?
-    trace_form:
-      description: 'వివరణ:'
-      tags_help: కామాలతో వేరుపరచినవి
-      visibility_help: దీని అర్థమేమిటి?
-      upload_button: ఎక్కించు
-      help: సహాయం
     view:
       filename: 'ఫైలుపేరు:'
       download: దింపుకోలు
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 920bfa5bd..256dfb208 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1492,6 +1492,14 @@ th:
       upload_trace: อัปโหลดรอยทาง GPS
       trace_uploaded: แฟ้มข้อมูล GPX ของท่านอัปโหลดเข้าระบบแล้ว กำลังรอบรรจุเข้าฐานข้อมูล
         ซึ่งจะใช้เวลาประมาณครึ่งชั่วโมง เมื่อกระบวนการเรียบร้อยแล้วจะมีอีเมลแจ้งท่านให้ทราบ
+      upload_gpx: 'อัปโหลดแฟ้ม GPX:'
+      description: 'คำอธิบาย:'
+      tags: 'ป้ายกำกับ:'
+      tags_help: คั่นด้วยจุลภาค
+      visibility: 'สถานะการแสดง:'
+      visibility_help: นี่หมายความว่าอะไร?
+      upload_button: อัปโหลด
+      help: วิธีใช้
     edit:
       filename: 'ชื่อแฟ้ม:'
       download: ดาวน์โหลด
@@ -1505,18 +1513,6 @@ th:
       save_button: บันทึกการเปลี่ยนแปลง
       visibility: 'สถานะการแสดง:'
       visibility_help: นี่หมายความว่าอะไร?
-    trace_form:
-      upload_gpx: 'อัปโหลดแฟ้ม GPX:'
-      description: 'คำอธิบาย:'
-      tags: 'ป้ายกำกับ:'
-      tags_help: คั่นด้วยจุลภาค
-      visibility: 'สถานะการแสดง:'
-      visibility_help: นี่หมายความว่าอะไร?
-      upload_button: อัปโหลด
-      help: วิธีใช้
-    trace_header:
-      upload_trace: อัปโหลดรอยทาง
-      see_all_traces: แสดงรอยทางทั้งหมด
     trace_optionals:
       tags: ป้ายกำกับ
     view:
@@ -1563,6 +1559,8 @@ th:
       public_traces_from: รอยทางจีพีเอสสาธารณะโดยผู้ใช้ %{user}
       description: ค้นหาการอัปโหลดรอยทางจีพีเอสล่าสุด
       tagged_with: ระบุด้วยป้าย %{tags}
+      upload_trace: อัปโหลดรอยทาง
+      see_all_traces: แสดงรอยทางทั้งหมด
     offline_warning:
       message: ระบบอัปโหลดแฟ้มข้อมูล GPX ไม่พร้อมใช้งานในขณะนี้
     offline:
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 072148d34..ff4f4fa5b 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -1328,6 +1328,20 @@ tl:
       trace_uploaded: Naikarga nang papaitaas ang talaksang GPS at naghihintay ng
         pagsisingit sa kalipunan ng dato.  Karaniwang mangyayari ito sa loob ng kalahating
         oras, at ipapadala sa iyo ang isang e-liham kapag nabuo na.
+      traces_waiting: Mayroon kang %{count} ng mga bakas na naghihintay ng papaitaas
+        na pagkakarga.  Mangyaring isaalang-alang ang paghihintay na matapos ang mga
+        ito bago magkarga ng iba pa, upang hindi mahadlangan ang pila para sa iba
+        pang mga tagagamit.
+      upload_gpx: 'Ikargang paitaas ang Talaksang GPX:'
+      description: 'Paglalarawan:'
+      tags: 'Mga tatak:'
+      tags_help: hindi hinangganang kuwit
+      visibility: 'Pagkanatatanaw:'
+      visibility_help: ano ang kahulugan nito?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Ikargang paitaas
+      help: Saklolo
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: Binabago ang bakas na %{name}
       heading: Binabago ang %{name} ng bakas
@@ -1346,24 +1360,6 @@ tl:
       visibility: 'Pagkanatatanaw:'
       visibility_help: ano ba ang kahulugan nito?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Ikargang paitaas ang Talaksang GPX:'
-      description: 'Paglalarawan:'
-      tags: 'Mga tatak:'
-      tags_help: hindi hinangganang kuwit
-      visibility: 'Pagkanatatanaw:'
-      visibility_help: ano ang kahulugan nito?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Ikargang paitaas
-      help: Saklolo
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Magkargang paitaas ng isang bakas
-      see_all_traces: Tingnan ang lahat ng mga pagbabakas
-      traces_waiting: Mayroon kang %{count} ng mga bakas na naghihintay ng papaitaas
-        na pagkakarga.  Mangyaring isaalang-alang ang paghihintay na matapos ang mga
-        ito bago magkarga ng iba pa, upang hindi mahadlangan ang pila para sa iba
-        pang mga tagagamit.
     trace_optionals:
       tags: Mga tatak
     view:
@@ -1413,6 +1409,8 @@ tl:
         isang bagong bakas</a> o umalam ng mas marami pa hinggil sa pagbabakas ng
         GPS doon sa <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pahina
         ng wiki</a>.
+      upload_trace: Magkargang paitaas ng isang bakas
+      see_all_traces: Tingnan ang lahat ng mga pagbabakas
     delete:
       scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal
     make_public:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index d84106153..fc5ba3495 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1615,6 +1615,19 @@ tr:
       trace_uploaded: GPX dosya yüklendi ve veritabanına eklemek için bekliyor. Bu
         işlem genellikle yarım saat içinde gerçekleşir ve tamamlandığında sana bir
         e-posta gönderiliyor.
+      traces_waiting:
+        one: Yüklemeyi bekleyen %{count} iz var. Diğer kullanıcıların kuyruklarını
+          engellememek için lütfen bunları yüklemeden önce öncekilerin bitmesini bekleyin.
+        other: Yüklemeyi bekleyen %{count} iz var. Diğer kullanıcıların kuyruklarını
+          engellememek için lütfen bunları yüklemeden önce öncekilerin bitmesini bekleyin.
+      upload_gpx: 'GPX Dosyası Gönder:'
+      description: Tanıtım
+      tags: 'Etiketler:'
+      tags_help: virgül (,) ile ayrılmış
+      visibility: 'Görünürlük:'
+      visibility_help: Bu ne demek?
+      upload_button: Gönder
+      help: Yardım
     edit:
       title: '%{name} izi düzenleniyor'
       heading: '%{name} izi düzenleniyor'
@@ -1632,23 +1645,6 @@ tr:
       save_button: Değişiklikleri Kaydet
       visibility: Görünürlük
       visibility_help: Bu ne demek?
-    trace_form:
-      upload_gpx: 'GPX Dosyası Gönder:'
-      description: Tanıtım
-      tags: 'Etiketler:'
-      tags_help: virgül (,) ile ayrılmış
-      visibility: 'Görünürlük:'
-      visibility_help: Bu ne demek?
-      upload_button: Gönder
-      help: Yardım
-    trace_header:
-      upload_trace: GPS izi gönder
-      see_all_traces: Tüm izleri görüntüle
-      traces_waiting:
-        one: Yüklemeyi bekleyen %{count} iz var. Diğer kullanıcıların kuyruklarını
-          engellememek için lütfen bunları yüklemeden önce öncekilerin bitmesini bekleyin.
-        other: Yüklemeyi bekleyen %{count} iz var. Diğer kullanıcıların kuyruklarını
-          engellememek için lütfen bunları yüklemeden önce öncekilerin bitmesini bekleyin.
     trace_optionals:
       tags: Etiketler
     view:
@@ -1698,6 +1694,8 @@ tr:
       empty_html: Burada henüz bir şey yok. <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wiki
         sayfasında</a> <a href='%{upload_link}'>yeni bir iz yükle</a> veya GPS iz
         hakkında daha fazla bilgi edinin
+      upload_trace: GPS izi gönder
+      see_all_traces: Tüm izleri görüntüle
     delete:
       scheduled_for_deletion: İz, silme işlemi için ayarlandı
     make_public:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d7c0a39c0..16e609548 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1562,6 +1562,24 @@ uk:
       upload_trace: Надіслати GPS-трек на сервер
       trace_uploaded: Ваш GPX-файл завантажився і чекає додання у базу даних. Зазвичай,
         це триватиме півгодини, після чого вам буде надіслано листа.
+      traces_waiting: '{{PLURAL|one=%{count} ваш трек очікує завантаження на сервер.
+        Будь ласка, дочекайтесь завершення завантаження перед завантаженням на сервер
+        інших треків, що дозволить іншим користувачам також надіслати свої треки.|few=%{count}
+        ваших треки очікують завантаження на сервер. Будь ласка, дочекайтесь завершення
+        їх завантаження перед завантаженням на сервер інших треків, що дозволить іншим
+        користувачам також надіслати свої треки.|%{count} ваших треків очікують завантаження
+        на сервер. Будь ласка, дочекайтесь завершення їх завантаження перед завантаженням
+        на сервер інших треків, що дозволить іншим користувачам також надіслати свої
+        треки.'
+      upload_gpx: 'Завантажити GPX-файл:'
+      description: 'Опис:'
+      tags: 'Мітки:'
+      tags_help: через кому
+      visibility: 'Видимість:'
+      visibility_help: що це значить?
+      upload_button: Завантажити на сервер
+      help: Довідка
+      help_url: http://wiki.openstreetmap.org/wiki/Uk:Upload
     edit:
       title: Редагування треку %{name}
       heading: Редагування треку %{name}
@@ -1579,28 +1597,6 @@ uk:
       save_button: Зберегти зміни
       visibility: 'Видимість:'
       visibility_help: ще це означає?
-    trace_form:
-      upload_gpx: 'Завантажити GPX-файл:'
-      description: 'Опис:'
-      tags: 'Мітки:'
-      tags_help: через кому
-      visibility: 'Видимість:'
-      visibility_help: що це значить?
-      upload_button: Завантажити на сервер
-      help: Довідка
-      help_url: http://wiki.openstreetmap.org/wiki/Uk:Upload
-    trace_header:
-      upload_trace: Надіслати GPS-трек на сервер
-      see_all_traces: Показати всі треки
-      traces_waiting: '{{PLURAL|one=%{count} ваш трек очікує завантаження на сервер.
-        Будь ласка, дочекайтесь завершення завантаження перед завантаженням на сервер
-        інших треків, що дозволить іншим користувачам також надіслати свої треки.|few=%{count}
-        ваших треки очікують завантаження на сервер. Будь ласка, дочекайтесь завершення
-        їх завантаження перед завантаженням на сервер інших треків, що дозволить іншим
-        користувачам також надіслати свої треки.|%{count} ваших треків очікують завантаження
-        на сервер. Будь ласка, дочекайтесь завершення їх завантаження перед завантаженням
-        на сервер інших треків, що дозволить іншим користувачам також надіслати свої
-        треки.'
     trace_optionals:
       tags: 'Теґи:'
     view:
@@ -1650,6 +1646,8 @@ uk:
       empty_html: Досі нічого не має. <a href='%{upload_link}'>Завантажте нові треки</a>
         або дізнайтесь більше про створення GPS-треків на <a href='http://wiki.openstreetmap.org/wiki/Uk:Beginners_Guide_1.2'>сторінці
         вікі</a>.
+      upload_trace: Надіслати GPS-трек на сервер
+      see_all_traces: Показати всі треки
     delete:
       scheduled_for_deletion: Заплановано для вилучення
     make_public:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0f4e50006..38ecbb519 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1524,6 +1524,19 @@ vi:
       trace_uploaded: Tập tin GPX của bạn đã được tải lên và đang chờ được chèn vào
         cơ sở dữ liệu. Thường chỉ cần chờ đợi trong vòng nửa tiếng, và bạn sẽ nhận
         thư điện tử lúc khi nó xong.
+      traces_waiting: Bạn có %{count} tuyến đường đang chờ được tải lên. Xin hãy chờ
+        đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng
+        đợi kịp.
+      upload_gpx: 'Tải lên Tập tin GPX:'
+      description: 'Miêu tả:'
+      tags: 'Thẻ:'
+      tags_help: dấu phẩy phân cách
+      visibility: 'Mức độ Truy cập:'
+      visibility_help: điều này có nghĩa là gì?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi
+      upload_button: Tải lên
+      help: Trợ giúp
+      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=vi
     edit:
       title: Sửa đổi tuyến đường %{name}
       heading: Sửa đổi tuyến đường %{name}
@@ -1542,24 +1555,6 @@ vi:
       visibility: 'Mức độ truy cập:'
       visibility_help: điều này có nghĩa là gì?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi
-    trace_form:
-      upload_gpx: 'Tải lên Tập tin GPX:'
-      description: 'Miêu tả:'
-      tags: 'Thẻ:'
-      tags_help: dấu phẩy phân cách
-      visibility: 'Mức độ Truy cập:'
-      visibility_help: điều này có nghĩa là gì?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi
-      upload_button: Tải lên
-      help: Trợ giúp
-      help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=vi
-    trace_header:
-      upload_trace: Tải lên tuyến đường
-      see_all_traces: Xem tất cả các tuyến đường
-      see_my_traces: Xem các tuyến đường của tôi
-      traces_waiting: Bạn có %{count} tuyến đường đang chờ được tải lên. Xin hãy chờ
-        đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng
-        đợi kịp.
     trace_optionals:
       tags: Thẻ
     view:
@@ -1610,6 +1605,9 @@ vi:
       empty_html: Chưa có gì ở đây. <a href="%{upload_link}">Tải lên tuyến đường mới</a>
         hoặc tìm hiểu thêm về tuyến đường GPS tại <a href="https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2">trang
         wiki</a>.
+      upload_trace: Tải lên tuyến đường
+      see_all_traces: Xem tất cả các tuyến đường
+      see_my_traces: Xem các tuyến đường của tôi
     delete:
       scheduled_for_deletion: Tuyến đường chờ được xóa
     make_public:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index caa010104..62848793b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1502,6 +1502,17 @@ zh-CN:
     create:
       upload_trace: 上传 GPS 轨迹
       trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。
+      traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。
+      upload_gpx: 上传 GPX 文件：
+      description: 说明：
+      tags: 标签：
+      tags_help: 用逗号分隔
+      visibility: 可见性：
+      visibility_help: 这是什么意思？
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: 上传
+      help: 帮助
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: 编辑轨迹 %{name}
       heading: 编辑轨迹 %{name}
@@ -1520,22 +1531,6 @@ zh-CN:
       visibility: 可见性：
       visibility_help: 这是什么意思？
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 上传 GPX 文件：
-      description: 说明：
-      tags: 标签：
-      tags_help: 用逗号分隔
-      visibility: 可见性：
-      visibility_help: 这是什么意思？
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: 上传
-      help: 帮助
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: 上传轨迹
-      see_all_traces: 查看所有轨迹
-      see_my_traces: 查看我的轨迹
-      traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。
     trace_optionals:
       tags: 标签
     view:
@@ -1586,6 +1581,9 @@ zh-CN:
       tagged_with: 以 %{tags} 标记
       empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners_Guide_1.2'>wiki页面</a>上了解
         GPS 轨迹。
+      upload_trace: 上传轨迹
+      see_all_traces: 查看所有轨迹
+      see_my_traces: 查看我的轨迹
     delete:
       scheduled_for_deletion: 计划删除的轨迹
     make_public:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b02b5d575..8b04e34be 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1523,6 +1523,17 @@ zh-TW:
     create:
       upload_trace: 上傳 GPS 軌跡
       trace_uploaded: 您的 GPX 檔案已經上傳並且在等候進入資料庫中。這通常不會超過半小時，完成時會以電子郵件通知您。
+      traces_waiting: 您有 %{count} 個軌跡等待上傳。請先等待先前的軌跡處理完後，再來繼續上傳其他軌跡，以免影響其他使用者的排程。
+      upload_gpx: 上傳 GPX 檔案：
+      description: 說明：
+      tags: 標籤：
+      tags_help: 以逗點分隔
+      visibility: 可見性：
+      visibility_help: 這是什麼意思？
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: 上傳
+      help: 說明
+      help_url: https://wiki.openstreetmap.org/wiki/Upload
     edit:
       title: 編輯軌跡 %{name}
       heading: 編輯軌跡 %{name}
@@ -1540,20 +1551,6 @@ zh-TW:
       save_button: 儲存變更
       visibility: 可見性：
       visibility_help: 這是什麼意思？
-    trace_form:
-      upload_gpx: 上傳 GPX 檔案：
-      description: 說明：
-      tags: 標籤：
-      tags_help: 以逗點分隔
-      visibility: 可見性：
-      visibility_help: 這是什麼意思？
-      upload_button: 上傳
-      help: 說明
-    trace_header:
-      upload_trace: 上傳軌跡
-      see_all_traces: 查看所有的軌跡
-      see_my_traces: 查看我的軌跡
-      traces_waiting: 您有 %{count} 個軌跡等待上傳。請先等待先前的軌跡處理完後，再來繼續上傳其他軌跡，以免影響其他使用者的排程。
     trace_optionals:
       tags: 標籤
     view:
@@ -1604,6 +1601,9 @@ zh-TW:
       tagged_with: 有如下標籤：%{tags}
       empty_html: 還沒有軌跡。<a href='%{upload_link}'>上傳新的軌跡</a>或在 <a href='https://wiki.openstreetmap.org/wiki/Zh-hant:Beginners_Guide_1.2'>wiki
         頁面</a>上瞭解更多有關 GPS 軌跡的資訊。
+      upload_trace: 上傳軌跡
+      see_all_traces: 查看所有的軌跡
+      see_my_traces: 查看我的軌跡
     delete:
       scheduled_for_deletion: 軌跡已被排程刪除
     make_public: