From: translatewiki.net <l10n-bot@translatewiki.net>
Date: Fri, 7 Aug 2020 07:47:59 +0000 (+0200)
Subject: Localisation updates from https://translatewiki.net.
X-Git-Tag: live~2509
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c560b3ac69f92c15219fb7a16d89b97eddee7a09?ds=sidebyside

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

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 0c36e52bb..81069c18e 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -97,6 +97,9 @@ af:
         longitude: Lengtegraad
         public: Publiek
         description: Beskrywing
+        gpx_file: 'Laai GPX-lêer op:'
+        visibility: 'Sigbaarheid:'
+        tagstring: 'Merkers:'
       message:
         sender: Sender
         title: Onderwerp
@@ -109,6 +112,9 @@ af:
         description: Beskrywing
         languages: Tale
         pass_crypt: Wagwoord
+    help:
+      trace:
+        tagstring: komma afgebaken
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1442,11 +1448,6 @@ af:
         title: Geen tyd om te redigeer nie? Voeg 'n opmerking by!
   traces:
     new:
-      upload_gpx: 'Laai GPX-lêer op:'
-      description: 'Beskrywing:'
-      tags: 'Merkers:'
-      tags_help: komma afgebaken
-      visibility: 'Sigbaarheid:'
       visibility_help: wat beteken dit?
       help: Hulp
     create:
@@ -1454,18 +1455,6 @@ af:
     edit:
       title: Redigeer tans spoor %{name}
       heading: Wysig spoor %{name}
-      filename: 'Lêernaam:'
-      download: laai af
-      uploaded_at: 'Opgelaai op:'
-      points: 'Punte:'
-      start_coord: 'Beginkoördinaat:'
-      map: kaart
-      edit: redigeer
-      owner: 'Eienaar:'
-      description: 'Beskrywing:'
-      tags: 'Merkers:'
-      tags_help: komma afgebaken
-      visibility: 'Sigbaarheid:'
       visibility_help: wat beteken dit?
     trace_optionals:
       tags: Merkers
diff --git a/config/locales/aln.yml b/config/locales/aln.yml
index d07123910..8bd791d47 100644
--- a/config/locales/aln.yml
+++ b/config/locales/aln.yml
@@ -90,6 +90,9 @@ aln:
         longitude: Gjatësi
         public: Publik
         description: Përshkrim
+        gpx_file: Ngarko një skedar GPX
+        visibility: Dukshmënia
+        tagstring: Etiketat
       message:
         sender: Dërguesi
         title: Titulli
@@ -102,6 +105,9 @@ aln:
         description: Përshkrimi
         languages: Gjuhët
         pass_crypt: Fjalëkalimi
+    help:
+      trace:
+        tagstring: Presje e kufizume
   browse:
     changeset:
       title: Ndryshim
@@ -960,11 +966,6 @@ aln:
       identifiable: E identifikueshme (shfaqet në listën e të dhanave, pikat i urdhëron
         me orë)
     new:
-      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?
       help: Ndihma
     create:
@@ -977,18 +978,6 @@ aln:
     edit:
       title: Duke ndryshue të dhanen %{name}
       heading: Ndrysho të dhanën %{name}
-      filename: 'Emni i fajllit:'
-      download: shkarko
-      uploaded_at: 'Të ngarkume:'
-      points: 'Pikët:'
-      start_coord: 'Fillo kordinatën:'
-      map: harta
-      edit: ndryshoje
-      owner: 'Pronari:'
-      description: 'Përshkrimi:'
-      tags: 'Etiketat:'
-      tags_help: Presje e kufizume
-      visibility: 'Dukshmënia:'
       visibility_help: Çka do me than kjo?
     trace_optionals:
       tags: Etiketat
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 378ac1c41..251bb7061 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -65,7 +65,7 @@ ar:
         update: حفظ التغييرات
       user_block:
         create: إنشاء العرقلة
-        update: حدّث العرقلة
+        update: تحديث المنع
   activerecord:
     errors:
       messages:
@@ -128,6 +128,9 @@ ar:
         longitude: خط الطول
         public: عام
         description: الوصف
+        gpx_file: 'ارفع ملف GPX:'
+        visibility: 'الرؤية:'
+        tagstring: 'الوسوم:'
       message:
         sender: المرسل
         title: الموضوع
@@ -140,6 +143,9 @@ ar:
         description: الوصف
         languages: اللغات
         pass_crypt: كلمة السر
+    help:
+      trace:
+        tagstring: محدد بفواصل
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1887,11 +1893,6 @@ ar:
       identifiable: محدد الهوية (يظهر في قائمة الآثار محدد الهوية والنقاط مرتبة زمنيًا)
     new:
       upload_trace: رفع أثر GPS
-      upload_gpx: 'ارفع ملف GPX:'
-      description: 'الوصف:'
-      tags: 'الوسوم:'
-      tags_help: محدد بفواصل
-      visibility: 'الرؤية:'
       visibility_help: ماذا يعني هذا؟
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: مساعدة
@@ -1906,18 +1907,6 @@ ar:
     edit:
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
-      filename: 'اسم الملف:'
-      download: نزّل
-      uploaded_at: 'تم الرفع في:'
-      points: 'النقاط:'
-      start_coord: 'إحداثيات البدء:'
-      map: خريطة
-      edit: تعديل
-      owner: 'المالك:'
-      description: 'الوصف:'
-      tags: 'الوسوم:'
-      tags_help: محددة بفواصل
-      visibility: 'الرؤية:'
       visibility_help: ماذا يعني هذا؟
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index e823390c6..4c497420b 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -77,6 +77,9 @@ arz:
         longitude: خط الطول
         public: عام
         description: الوصف
+        gpx_file: 'ابلود فايل GPX:'
+        visibility: الرؤية
+        tagstring: الوسوم
       message:
         sender: المرسل
         title: العنوان
@@ -89,6 +92,9 @@ arz:
         description: الوصف
         languages: اللغات
         pass_crypt: كلمه المرور
+    help:
+      trace:
+        tagstring: محدد بفواصل
   browse:
     changeset:
       title: 'حزمه التغييرات: %{id}'
@@ -789,11 +795,6 @@ arz:
       trackable: تعقبى (يظهر كمجهول الهويه ونقاط مرتبه زمنيًا)
       identifiable: محدد الهويه (يظهر فى قائمه الآثار محدد الهويه والنقاط مرتبه زمنيًا)
     new:
-      upload_gpx: 'ابلود فايل GPX:'
-      description: الوصف
-      tags: الوسوم
-      tags_help: محدد بفواصل
-      visibility: الرؤية
       visibility_help: ماذا يعنى هذا؟
       help: المساعدة
     create:
@@ -805,18 +806,6 @@ arz:
     edit:
       title: تعديل الأثر %{name}
       heading: تعديل الأثر %{name}
-      filename: 'اسم الملف:'
-      download: نزّل
-      uploaded_at: 'تم الرفع في:'
-      points: 'النقاط:'
-      start_coord: 'إحداثيات البدء:'
-      map: خريطة
-      edit: عدّل
-      owner: 'المالك:'
-      description: 'الوصف:'
-      tags: 'الوسوم:'
-      tags_help: محدد بفواصل
-      visibility: 'الرؤية:'
       visibility_help: ماذا يعنى هذا؟
     trace_optionals:
       tags: الوسوم
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 97ed1e4fa..950ab940b 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -98,6 +98,9 @@ ast:
         longitude: Llonxitú
         public: Públicu
         description: Descripción
+        gpx_file: 'Xubir un ficheru GPX:'
+        visibility: 'Visibilidá:'
+        tagstring: 'Etiquetes:'
       message:
         sender: Remitente
         title: Asuntu
@@ -110,6 +113,9 @@ ast:
         description: Descripción
         languages: Llingües
         pass_crypt: Contraseña
+    help:
+      trace:
+        tagstring: llendáu con comes
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1854,11 +1860,6 @@ ast:
         puntos axeitaos con marques d'hora)
     new:
       upload_trace: Xubir traza GPS
-      upload_gpx: 'Xubir un ficheru GPX:'
-      description: 'Descripción:'
-      tags: 'Etiquetes:'
-      tags_help: llendáu con comes
-      visibility: 'Visibilidá:'
       visibility_help: ¿qué ye esto?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Ayuda
@@ -1879,18 +1880,6 @@ ast:
     edit:
       title: Editando la traza %{name}
       heading: Editando la traza %{name}
-      filename: 'Nome del ficheru:'
-      download: descargar
-      uploaded_at: 'Xubida:'
-      points: 'Puntos:'
-      start_coord: 'Coordenada d''aniciu:'
-      map: mapa
-      edit: editar
-      owner: 'Propietariu:'
-      description: 'Descripción:'
-      tags: 'Etiquetes:'
-      tags_help: llendáu con comes
-      visibility: 'Visibilidá:'
       visibility_help: ¿qué ye esto?
     update:
       updated: Xubióse la traza
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 38c74b1de..6faab51b1 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1021,15 +1021,7 @@ az:
       url: URL
   traces:
     new:
-      description: 'Ä°zah:'
       help: Kömək
-    edit:
-      filename: 'Fayl adı:'
-      download: yüklə
-      map: xəritə
-      edit: redaktə
-      owner: 'Sahibi:'
-      description: 'Ä°zah:'
     show:
       filename: 'Fayl adı:'
       download: yüklə
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
index 64160bbd6..5b8cd7ad3 100644
--- a/config/locales/be-Tarask.yml
+++ b/config/locales/be-Tarask.yml
@@ -98,6 +98,9 @@ be-Tarask:
         longitude: Даўгата
         public: Публічны
         description: Апісаньне
+        gpx_file: 'Загрузіць GPX-файл:'
+        visibility: 'Бачнасьць:'
+        tagstring: 'Тэгі:'
       message:
         sender: Адпраўшчык
         title: Тэма
@@ -110,6 +113,9 @@ be-Tarask:
         description: Апісаньне
         languages: Мовы
         pass_crypt: Пароль
+    help:
+      trace:
+        tagstring: падзеленае коскамі
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1147,11 +1153,6 @@ be-Tarask:
       identifiable: Які можна ідэнтыфікаваць (паказаны толькі ў сьпісе трэкаў і як
         той, які можна ідэнтыфікаваць, уладкаваныя пункты з пазначэньнямі часу)
     new:
-      upload_gpx: 'Загрузіць GPX-файл:'
-      description: 'Апісаньне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленае коскамі
-      visibility: 'Бачнасьць:'
       visibility_help: што гэта азначае?
       help: Дапамога
     create:
@@ -1172,18 +1173,6 @@ be-Tarask:
     edit:
       title: Рэдагаваньне трэку %{name}
       heading: Рэдагаваньне трэку %{name}
-      filename: 'Назва файла:'
-      download: загрузіць
-      uploaded_at: 'Загружаны:'
-      points: 'Пункты:'
-      start_coord: 'Пачатковыя каардынаты:'
-      map: мапа
-      edit: рэдагаваць
-      owner: 'Уладальнік:'
-      description: 'Апісаньне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленыя коскамі
-      visibility: 'Бачнасьць:'
       visibility_help: што гэта азначае?
     trace_optionals:
       tags: Тэгі
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 01f229d17..cd02306d7 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -104,6 +104,9 @@ be:
         longitude: Даўгата
         public: Агульны
         description: Апісанне
+        gpx_file: 'Адаслаць GPX-файл:'
+        visibility: 'Бачнасць:'
+        tagstring: 'Тэгі:'
       message:
         sender: Ад
         title: Тэма
@@ -116,6 +119,9 @@ be:
         description: Апісанне
         languages: Мовы
         pass_crypt: Пароль
+    help:
+      trace:
+        tagstring: падзеленыя коскамі
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1895,11 +1901,6 @@ be:
         спарадкаванымі пунктамі і меткамі часу)
     new:
       upload_trace: Адаслаць GPS-след
-      upload_gpx: 'Адаслаць GPX-файл:'
-      description: 'Апісанне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленыя коскамі
-      visibility: 'Бачнасць:'
       visibility_help: што гэта значыць?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Даведка
@@ -1916,18 +1917,6 @@ be:
     edit:
       title: Рэдагаванне следу %{name}
       heading: Рэдагаванне следу %{name}
-      filename: 'Назва файла:'
-      download: сцягнуць
-      uploaded_at: 'Прысланы:'
-      points: 'Пунктаў:'
-      start_coord: 'Каардынаты пачатку:'
-      map: карта
-      edit: правіць
-      owner: 'Уладальнік:'
-      description: 'Апісанне:'
-      tags: 'Тэгі:'
-      tags_help: падзеленыя коскамі
-      visibility: 'Бачнасць:'
       visibility_help: што гэта значыць?
     update:
       updated: След абноўлены
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 3c8d2a066..5f1a7497e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -95,6 +95,9 @@ bg:
         longitude: Географска дължина
         public: Публичен
         description: Описание
+        gpx_file: 'Качване на GPX файл:'
+        visibility: 'Видимост:'
+        tagstring: 'Етикети:'
       message:
         sender: Подател
         title: Тема
@@ -107,6 +110,9 @@ bg:
         description: Описание
         languages: Езици
         pass_crypt: Парола
+    help:
+      trace:
+        tagstring: разделени със запетая
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1287,11 +1293,6 @@ bg:
   traces:
     new:
       upload_trace: Качване на следи от GPS
-      upload_gpx: 'Качване на GPX файл:'
-      description: 'Описание:'
-      tags: 'Етикети:'
-      tags_help: разделени със запетая
-      visibility: 'Видимост:'
       visibility_help: какво означава това?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Помощ
@@ -1306,17 +1307,6 @@ bg:
           да завършат преди да качвате нови, за да не запълните опашката, на която
           чакат още потребители.
     edit:
-      filename: 'Име на файл:'
-      download: изтегляне
-      uploaded_at: 'Качени:'
-      points: 'Точки:'
-      map: карта
-      edit: променяне
-      owner: 'Собственик:'
-      description: 'Описание:'
-      tags: 'Етикети:'
-      tags_help: разделени със запетая
-      visibility: 'Видимост:'
       visibility_help: какво означава това?
     trace_optionals:
       tags: Етикети
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index effb827d6..6fc9567cd 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -102,6 +102,9 @@ bn:
         longitude: দ্রাঘিমাংশ
         public: সার্বজনীন
         description: বিবরণ
+        gpx_file: 'জিপিএক্স ফাইল আপলোড:'
+        visibility: 'দৃষ্টিযোগ্যতা:'
+        tagstring: 'ট্যাগসমূহ:'
       message:
         sender: প্রেরক
         title: শিরোনাম
@@ -1353,10 +1356,6 @@ bn:
         title: সম্পাদনার সময় নেই? একটি টীকা যোগ করুন!
   traces:
     new:
-      upload_gpx: 'জিপিএক্স ফাইল আপলোড:'
-      description: 'বিবরণ:'
-      tags: 'ট্যাগসমূহ:'
-      visibility: 'দৃষ্টিযোগ্যতা:'
       visibility_help: এটার মানে কি?
       help: সাহায্য
     create:
@@ -1372,17 +1371,6 @@ bn:
     edit:
       title: অনুসরণ সম্পাদনা %{name}
       heading: অনুসরণ সম্পাদনা %{name}
-      filename: 'ফাইলের নাম:'
-      download: ডাউনলোড
-      uploaded_at: 'আপলোড হয়েছে:'
-      points: 'পয়েন্ট:'
-      start_coord: 'প্রারম্ভের কোঅর্ডিনেট:'
-      map: মানচিত্র
-      edit: সম্পাদনা
-      owner: 'মালিক:'
-      description: 'বিবরণ:'
-      tags: 'ট্যাগসমূহ:'
-      visibility: 'দৃষ্টিযোগ্যতা:'
       visibility_help: এটার মানে কি?
     trace_optionals:
       tags: ট্যাগসমূহ
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8aef9e50a..3dda3d047 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -102,6 +102,9 @@ br:
         longitude: Hedred
         public: Foran
         description: Deskrivadur
+        gpx_file: 'Kas ar restr GPX :'
+        visibility: 'Gwelusted :'
+        tagstring: 'Tikedennoù :'
       message:
         sender: Kaser
         title: Titl
@@ -114,6 +117,9 @@ br:
         description: Deskrivadur
         languages: Yezhoù
         pass_crypt: Ger-tremen
+    help:
+      trace:
+        tagstring: bevennet gant virgulennoù
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1896,11 +1902,6 @@ br:
         urzhiet gant an deiziadoù)
     new:
       upload_trace: Kas roudoù GPS
-      upload_gpx: 'Kas ar restr GPX :'
-      description: 'Deskrivadur :'
-      tags: 'Tikedennoù :'
-      tags_help: bevennet gant virgulennoù
-      visibility: 'Gwelusted :'
       visibility_help: Petra a dalvez ?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS
       help: Skoazell
@@ -1918,18 +1919,6 @@ br:
     edit:
       title: Oc'h aozañ ar roud %{name}
       heading: Oc'h aozañ ar roud %{name}
-      filename: 'Anv ar restr :'
-      download: pellgargañ
-      uploaded_at: 'Kaset da :'
-      points: 'Poentoù :'
-      start_coord: 'Daveennoù orin :'
-      map: kartenn
-      edit: aozañ
-      owner: 'Perc''henn :'
-      description: 'Deskrivadur :'
-      tags: 'Tikedennoù :'
-      tags_help: bevennet gant virgulennoù
-      visibility: 'Gwelusted :'
       visibility_help: Petra a dalvez an dra-mañ ?
     update:
       updated: Roudennoù hizivaet
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 5e7e972fb..4a9ce5e48 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -96,6 +96,9 @@ bs:
         longitude: Geografska dužina (Longitude)
         public: Javno
         description: Opis
+        gpx_file: Poslati GPX datoteku
+        visibility: 'Vidljivost:'
+        tagstring: 'Oznake:'
       message:
         sender: Pošiljalac
         title: Predmet
@@ -108,6 +111,9 @@ bs:
         description: Opis
         languages: Jezici
         pass_crypt: Lozinka
+    help:
+      trace:
+        tagstring: odvojeno zarezima
   editor:
     default: Zadano (currently %{name})
     potlatch:
@@ -1286,11 +1292,6 @@ bs:
       identifiable: Može se identificirati (prikazan u listi trasa kao onaj koji se
         može identificirati, uređene tačke sa vremenskom oznakom)
     new:
-      upload_gpx: Poslati GPX datoteku
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezima
-      visibility: 'Vidljivost:'
       visibility_help: Šta ovo znači?
       help: Pomoć
     create:
@@ -1307,18 +1308,6 @@ bs:
     edit:
       title: Uređivanje trase %{name}
       heading: Uređivanje trase %{name}
-      filename: 'Ime datoteke:'
-      download: preuzimanje
-      uploaded_at: 'Postavljeno:'
-      points: 'Tačaka:'
-      start_coord: 'Početna koordinata:'
-      map: karta
-      edit: urediti
-      owner: 'Vlasnik:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezima
-      visibility: 'Vidljivost:'
       visibility_help: Šta ovo znači?
     trace_optionals:
       tags: Oznake
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f52597241..5c6715d21 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -46,6 +46,8 @@ ca:
     formats:
       friendly: '%e %B %Y a les %H.%M'
   helpers:
+    file:
+      prompt: Seleccioneu un fitxer
     submit:
       diary_comment:
         create: Desa
@@ -124,12 +126,15 @@ ca:
       trace:
         user: Usuari
         visible: Visible
-        name: Nom
+        name: Nom del fitxer
         size: Mida
         latitude: Latitud
         longitude: Longitud
         public: Públic
         description: Descripció
+        gpx_file: Pujar arxiu GPX
+        visibility: Visibilitat
+        tagstring: Etiquetes
       message:
         sender: Remitent
         title: Tema
@@ -142,6 +147,9 @@ ca:
         description: Descripció
         languages: Idiomes
         pass_crypt: Contrasenya
+    help:
+      trace:
+        tagstring: separat per comes
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1894,11 +1902,6 @@ ca:
         ordenats segons marques temporals)
     new:
       upload_trace: Pujar traça GPS
-      upload_gpx: 'Pujar arxiu GPX:'
-      description: 'Descripció:'
-      tags: 'Etiquetes:'
-      tags_help: separat per comes
-      visibility: 'Visibilitat:'
       visibility_help: què significa això?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibilitat_de_traces_de
         GPS
@@ -1919,20 +1922,9 @@ ca:
           traces acabin abans de pujar-ne més, per tal de no blocar la cua per a altres
           usuaris.
     edit:
+      cancel: Cancel·lar
       title: Editant traça %{name}
       heading: Editant traça %{name}
-      filename: 'Nom del fitxer:'
-      download: baixa
-      uploaded_at: 'Pujat a:'
-      points: 'Punts:'
-      start_coord: 'Coordenades d''inici:'
-      map: mapa
-      edit: modificació
-      owner: 'Propietari/a:'
-      description: 'Descripció:'
-      tags: 'Etiquetes:'
-      tags_help: separat per comes
-      visibility: 'Visibilitat:'
       visibility_help: què vol dir això?
     update:
       updated: Traça actualitzada
diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 2b42c09e0..def4ef321 100644
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -92,6 +92,7 @@ ce:
         longitude: Дохалла
         public: Массарна
         description: Цуьнах лаьцна
+        visibility: 'Гуш хилар:'
       message:
         sender: Баийтинарг
         title: Тема
@@ -897,12 +898,7 @@ ce:
       link: Хьажорг
   traces:
     new:
-      visibility: 'Гуш хилар:'
       help: ГӀо
-    edit:
-      download: схьаэца
-      start_coord: 'Координати юьхь:'
-      visibility: 'Гуш хилар:'
     show:
       download: схьаэца
       start_coordinates: 'Координати юьхь:'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 27181800b..8733a2d5c 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -131,6 +131,9 @@ cs:
         longitude: Délka
         public: Veřejná
         description: Popis
+        gpx_file: 'Nahrát GPX soubor:'
+        visibility: 'Viditelnost:'
+        tagstring: 'Štítky:'
       message:
         sender: Odesílatel
         title: Předmět
@@ -143,6 +146,9 @@ cs:
         description: Popis
         languages: Jazyky
         pass_crypt: Heslo
+    help:
+      trace:
+        tagstring: oddělené čárkou
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1865,11 +1871,6 @@ cs:
         uspořádané body s časovou značkou)
     new:
       upload_trace: Nahrát GPS trasu
-      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
       help: Nápověda
@@ -1893,18 +1894,6 @@ cs:
     edit:
       title: Úprava stopy %{name}
       heading: Úprava stopy %{name}
-      filename: 'Název souboru:'
-      download: stáhnout
-      uploaded_at: 'Nahráno v:'
-      points: 'Body:'
-      start_coord: 'Souřadnice začátku:'
-      map: mapa
-      edit: upravit
-      owner: 'Vlastník:'
-      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
     update:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 9857e7c45..391a20f5e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -91,6 +91,9 @@ cy:
         longitude: Hydred
         public: Cyhoeddus
         description: Disgrifiad
+        gpx_file: 'Uwchlwytho Ffeil GPX:'
+        visibility: 'Gwelededd:'
+        tagstring: 'Tagiau:'
       message:
         sender: Danfonwr
         title: Pwnc
@@ -1329,24 +1332,9 @@ cy:
         title: Dim amser i olygu? Ychwanegwch nodyn!
   traces:
     new:
-      upload_gpx: 'Uwchlwytho Ffeil GPX:'
-      description: 'Disgrifiad:'
-      tags: 'Tagiau:'
-      visibility: 'Gwelededd:'
       visibility_help: beth mae hyn yn golygu?
       help: Cymorth
     edit:
-      filename: 'Enw ffeil:'
-      download: lawrlwytho
-      uploaded_at: 'Uwchlwythwyd:'
-      points: 'Pwyntiau:'
-      start_coord: 'Cyfesuryn dechrau:'
-      map: map
-      edit: golygu
-      owner: 'Perchennog:'
-      description: 'Disgrifiad:'
-      tags: 'Tagiau:'
-      visibility: 'Gwelededd:'
       visibility_help: beth mae hyn yn golygu?
     trace_optionals:
       tags: Tagiau
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e97bd79d6..76165f1ed 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -116,12 +116,15 @@ da:
       trace:
         user: Bruger
         visible: Synlig
-        name: Navn
+        name: Filnavn
         size: Størrelse
         latitude: Breddegrad
         longitude: Længdegrad
         public: Offentlig
         description: Beskrivelse
+        gpx_file: Upload GPX-fil
+        visibility: Synlighed
+        tagstring: 'Egenskaber:'
       message:
         sender: Afsender
         title: Emne
@@ -134,6 +137,9 @@ da:
         description: Beskrivelse
         languages: Sprog
         pass_crypt: Adgangskode
+    help:
+      trace:
+        tagstring: kommasepareret
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1885,11 +1891,6 @@ da:
         og beholder rækkefølgen og tidsstempler)
     new:
       upload_trace: Upload GPS-spor
-      upload_gpx: 'Upload GPX-fil:'
-      description: 'Beskrivelse:'
-      tags: 'Egenskaber:'
-      tags_help: kommasepareret
-      visibility: 'Synlighed:'
       visibility_help: hvad betyder det her?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Hjælp
@@ -1909,18 +1910,6 @@ da:
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
-      filename: 'Filnavn:'
-      download: hent
-      uploaded_at: 'Indsendt:'
-      points: 'Punkter:'
-      start_coord: 'Startkoordinat:'
-      map: kort
-      edit: redigér
-      owner: 'Ejer:'
-      description: 'Beskrivelse:'
-      tags: 'Egenskaber:'
-      tags_help: kommasepareret
-      visibility: 'Synlighed:'
       visibility_help: hvad betyder det her?
     update:
       updated: Spor opdateret
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 51c2ba9f4..5ca9cb59e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -160,6 +160,9 @@ de:
         longitude: Längengrad
         public: Öffentlich
         description: Beschreibung
+        gpx_file: 'GPX-Datei hochladen:'
+        visibility: 'Sichtbarkeit:'
+        tagstring: 'Tags:'
       message:
         sender: Absender
         title: Betreff
@@ -172,6 +175,9 @@ de:
         description: Beschreibung
         languages: Sprachen
         pass_crypt: Passwort
+    help:
+      trace:
+        tagstring: durch Komma getrennt
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1953,11 +1959,6 @@ de:
         sortierte Punktfolge mit Zeitstempel angezeigt)
     new:
       upload_trace: GPS-Track hochladen
-      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
       help: Hilfe
@@ -1977,18 +1978,6 @@ de:
     edit:
       title: Track %{name} bearbeiten
       heading: Track %{name} bearbeiten
-      filename: 'Dateiname:'
-      download: herunterladen
-      uploaded_at: 'Hochgeladen am:'
-      points: 'Punkte:'
-      start_coord: 'Startkoordinate:'
-      map: Karte
-      edit: bearbeiten
-      owner: 'Besitzer:'
-      description: 'Beschreibung:'
-      tags: 'Tags:'
-      tags_help: durch Komma getrennt
-      visibility: 'Sichtbarkeit:'
       visibility_help: Was bedeutet das?
     update:
       updated: Track aktualisiert
diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index cd6811797..23b668521 100644
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -94,6 +94,8 @@ diq:
         longitude: Derganiye
         public: Şar
         description: Şınasnayış
+        visibility: Vinayîşî
+        tagstring: 'Etiketi:'
       message:
         sender: Rıster
         title: Mewzu
@@ -867,20 +869,7 @@ diq:
       title: Xeyr amey!
   traces:
     new:
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
       help: Peşti
-    edit:
-      filename: 'Namey dosya:'
-      download: biya war
-      uploaded_at: 'Bar biyo:'
-      points: 'Dawte:'
-      map: xerite
-      edit: bıvurne
-      owner: 'Wayir:'
-      description: 'Şınasnayış:'
-      tags: 'Etiketi:'
-      visibility: Vinayîşî
     trace_optionals:
       tags: Etiketi
     show:
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index 12bc3013b..3fe9fbb9d 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -85,6 +85,9 @@ dsb:
         longitude: Dlinina
         public: Zjawny
         description: Wopisanje
+        gpx_file: 'GPX-dataju nagraś:'
+        visibility: 'Widobnosć:'
+        tagstring: 'Atributy:'
       message:
         sender: Wótpósłaŕ
         title: Tema
@@ -97,6 +100,9 @@ dsb:
         description: Wopisanje
         languages: Rěcy
         pass_crypt: Gronidło
+    help:
+      trace:
+        tagstring: pśez komu wótźělony
   editor:
     default: Standard (tuchylu %{name})
     potlatch:
@@ -1428,11 +1434,6 @@ dsb:
       identifiable: Identificěrujobny (pokazujo se w lisćinje slědow ako identificěrujobne,
         zrědowane dypki z casowymi kołkami)
     new:
-      upload_gpx: 'GPX-dataju nagraś:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: pśez komu wótźělony
-      visibility: 'Widobnosć:'
       visibility_help: Co to groni?
       help: Pomoc
     create:
@@ -1449,18 +1450,6 @@ dsb:
     edit:
       title: Wobźěłujo se slěd %{name}
       heading: Wobźěłujo se slěd %{name}
-      filename: 'Datajowe mě:'
-      download: ześěgnuś
-      uploaded_at: 'Nagraty:'
-      points: 'Dypki:'
-      start_coord: 'Startowa koordinata:'
-      map: kórta
-      edit: wobźěłaś
-      owner: 'Wobsejźaŕ:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: pśez komu wótźělony
-      visibility: 'Widobnosć:'
       visibility_help: Co to groni?
     trace_optionals:
       tags: Atributy
diff --git a/config/locales/el.yml b/config/locales/el.yml
index ed2512581..ba9466feb 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -123,6 +123,9 @@ el:
         longitude: Γεωγραφικό μήκος
         public: Δημόσιο
         description: Περιγραφή
+        gpx_file: 'Αποστολή αρχείου GPX:'
+        visibility: 'Ορατότητα:'
+        tagstring: 'Χαρακτηριστικά:'
       message:
         sender: Αποστολέας
         title: Θέμα
@@ -135,6 +138,9 @@ el:
         description: Περιγραφή
         languages: Γλώσσες
         pass_crypt: Κωδικός
+    help:
+      trace:
+        tagstring: διαχωρισμένο με κόμμα
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1916,11 +1922,6 @@ el:
         ως αναγνωρίσιμο, τα σημεία ταξινόμησης με χρονικά σήματα)
     new:
       upload_trace: Μεταφόρτωση ίχνους GPS
-      upload_gpx: 'Αποστολή αρχείου GPX:'
-      description: 'Περιγραφή:'
-      tags: 'Χαρακτηριστικά:'
-      tags_help: διαχωρισμένο με κόμμα
-      visibility: 'Ορατότητα:'
       visibility_help: τι σημαίνει αυτό;
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Βοήθεια
@@ -1942,18 +1943,6 @@ el:
     edit:
       title: Επεξεργασία ίχνους %{name}
       heading: Επεξεργασία ίχνους %{name}
-      filename: 'Όνομα αρχείου:'
-      download: λήψη
-      uploaded_at: 'Μεταφορτώθηκε:'
-      points: 'Σημεία:'
-      start_coord: 'Συντεταγμένες αρχής:'
-      map: χάρτης
-      edit: επεξεργασία
-      owner: 'Ιδιοκτήτης:'
-      description: 'Περιγραφή:'
-      tags: 'Χαρακτηριστικά:'
-      tags_help: οριοθετημένο με κόμμα
-      visibility: 'Ορατότητα:'
       visibility_help: τι σημαίνει αυτό;
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
@@ -2072,9 +2061,9 @@ el:
       title: Η αίτηση επαλήθευσης απέτυχε
       denied: Έχετε αρνηθεί την πρόσβαση της εφαρμογής %{app_name} στον λογαριασμό
         σας.
-      invalid: Το κουπόνι εξουσιοδότησης δεν είναι έγκυρο.
+      invalid: Το αδειοδοτικό επαλήθευσης δεν είναι έγκυρο.
     revoke:
-      flash: Ανακαλέσατε το κουπόνι για το %{application}.
+      flash: Ανακαλέσατε την αδειοδότηση για το %{application}.
     permissions:
       missing: Δεν έχετε επιτρέψει την πρόσβαση εφαρμογής σε αυτήν την λειτουργία
   oauth_clients:
@@ -2086,8 +2075,8 @@ el:
       title: Λεπτομέρειες OAuth για το %{app_name}
       key: 'Κωδικός Καταναλωτή :'
       secret: 'Μυστικό του Καταναλωτή:'
-      url: 'Σημείο Ζήτησης URL:'
-      access_url: 'Πρόσβαση στο Σημείο URL:'
+      url: 'URL αιτήματος αδειοδότησης:'
+      access_url: 'URL πρόσβασης αδειοδότησης:'
       authorize_url: 'Εξουσιοδοτήστε το URL:'
       support_notice: Υποστηρίζουμε τις υπογραφές HMAC-SHA1 (συνιστάται) και RSA-SHA1.
       edit: Επεξεργασία λεπτομερειών
@@ -2106,8 +2095,8 @@ el:
       title: Οι λεπτομέρειες του OAuth μου
       my_tokens: Οι Εξουσιοδοτημένες Εφαρμογές μου
       list_tokens: 'Τα ακόλουθα σημεία έχουν εκδοθεί για προγράμματα στο όνομα σας:'
-      application: Όνομα Εφαρμογής
-      issued_at: Εκδόθηκε Στις
+      application: Όνομα εφαρμογής
+      issued_at: Εκδόθηκε στις
       revoke: Ανακαλέστε!
       my_apps: Οι Εφαρμογές Πελάτη Μου
       no_apps_html: Έχετε μια εφαρμογή που θέλετε να καταχωρήσετε για χρήση μαζί μας
@@ -2119,7 +2108,7 @@ el:
     form:
       name: Όνομα
       required: Απαιτείται
-      url: URL Κύριας Εφαρμογής
+      url: URL κύριας εφαρμογής
       callback_url: URL Επανάκλησης
       support_url: URL Υποστήριξης
       requests: 'Αιτηθείτε τις ακόλουθες άδειες από τον χρήστη:'
@@ -2294,10 +2283,10 @@ el:
         τη σελίδα.
       deleted: διεγράφη
     show:
-      my diary: Το Ημερολόγιό Μου
+      my diary: Το ημερολόγιό μου
       new diary entry: νέα καταχώρηση ημερολογίου
-      my edits: Οι Επεξεργασίες Μου
-      my traces: Τα Ίχνη Μου
+      my edits: Οι επεξεργασίες μου
+      my traces: Τα ίχνη μου
       my notes: Οι Σημειώσεις Μου
       my messages: Τα Μηνύματά Μου
       my profile: Το Προφίλ Μου
@@ -2316,7 +2305,7 @@ el:
       mapper since: 'Χαρτογράφος από:'
       ct status: 'Όροι συνεισφοράς:'
       ct undecided: Αναποφάσιστος
-      ct declined: Απόρριψη
+      ct declined: Απορρίφθηκε
       latest edit: 'Τελευταία επεξεργασία (%{ago}):'
       email address: 'Διεύθυνση Ηλ. Ταχυδρομείου:'
       created from: 'Δημιουργήθηκε από:'
@@ -2324,7 +2313,7 @@ el:
       spam score: 'Σκορ Spam:'
       description: Περιγραφή
       user location: Τοποθεσία χρήστη
-      if_set_location_html: Ορίσετε την τοποθεσία του σπιτιού σας στις %{settings_link}
+      if_set_location_html: Ορίστε την τοποθεσία του σπιτιού σας από %{settings_link},
         για να δείτε κοντινούς χρήστες.
       settings_link_text: ρυθμίσεις
       my friends: Οι φίλοι μου
@@ -2332,8 +2321,8 @@ el:
       km away: '%{count}χλμ μακριά'
       m away: '%{count}μ μακριά'
       nearby users: Άλλοι κοντινοί χρήστες
-      no nearby users: Δεν υπάρχουν άλλοι χρήστες που παραδέχονται ότι χαρτογραφούν
-        κοντά σου προς το παρόν.
+      no nearby users: Δεν υπάρχουν άλλοι χρήστες που δήλωσαν ότι χαρτογραφούν κοντά
+        σας προς το παρόν.
       role:
         administrator: Αυτός ο χρήστης είναι διαχειριστής
         moderator: Αυτός ο χρήστης είναι συντονιστής
@@ -2341,7 +2330,7 @@ el:
           administrator: Χορήγηση πρόσβασης διαχειριστή
           moderator: Χορήγηση πρόσβασης συντονιστή
         revoke:
-          administrator: Ανακαλέστε πρόσβαση διαχειριστή
+          administrator: Ανακαλέστε την πρόσβαση διαχειριστή
           moderator: Ανάκληση πρόσβασης συντονιστή
       block_history: Ενεργές Φραγές
       moderator_history: Φραγές που Επιβλήθηκαν
@@ -2366,10 +2355,10 @@ el:
     account:
       title: Επεξεργασία λογαριασμού
       my settings: Οι ρυθμίσεις μου
-      current email address: 'Τωρινή Διεύθυνση Ηλεκτρονικού Ταχυδρομείου:'
-      new email address: 'Νέα Διεύθυνση ηλεκτρονικού ταχυδρομείου:'
-      email never displayed publicly: (ποτέ δεν εμφανίζεται δημόσια)
-      external auth: 'Εξωτερικός Έλεγχος Ταυτότητας:'
+      current email address: 'Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου:'
+      new email address: 'Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου:'
+      email never displayed publicly: (να μην εμφανίζεται ποτέ δημόσια)
+      external auth: 'Εξωτερική επαλήθευση ταυτότητας:'
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: τι είναι αυτό;
@@ -2383,7 +2372,7 @@ el:
           οι προηγούμενες επεξεργασίες είναι ανώνυμες.
         disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη;
       public editing note:
-        heading: 'Δημόσια επεξεργασία:'
+        heading: Δημόσια επεξεργασία
         html: Αυτήν τη στιγμή οι επεξεργασίες σας είναι ανώνυμες και δεν μπορεί κανείς
           να σας στείλει μήνυμα ή να δει την τοποθεσία σας. Για να δείξετε τι έχετε
           επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω
@@ -2397,22 +2386,22 @@ el:
         heading: 'Όροι Συνεισφοράς:'
         agreed: Έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
         not yet agreed: Δεν έχετε αποδεχτεί τους νέους Όρους Συνεισφοράς.
-        review link text: Παρακαλώ ακολουθήστε αυτό το σύνδεσμο όταν μπορείτε για
-          να διαβάσετε και να αποδεχθείτε τους νέους Όρους Συνεισφοράς.
-        agreed_with_pd: Έχετε επίσης δηλώσει ότι θεωρείτε τις επεξεργασίες σας οτι
-          είναι Public Domain.
+        review link text: Παρακαλούμε ακολουθήστε αυτό το σύνδεσμο, για την ενημέρωση
+          σας και την αποδοχή των νέων όρων συνεισφοράς.
+        agreed_with_pd: Δηλώσατε επίσης ότι αποδέχεστε ότι οι τροποποιήσεις σας ανήκουν
+          στον δημόσιο τομέα.
         link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: τι είναι αυτό;
       profile description: 'Περιγραφή Προφίλ:'
       preferred languages: 'Προτιμώμενες Γλώσσες:'
-      preferred editor: 'Προτιμώμενο Πρόγραμμα Επεξεργασίας:'
+      preferred editor: 'Προτιμώμενο πρόγραμμα επεξεργασίας:'
       image: 'Εικόνα:'
       gravatar:
         gravatar: Χρήση Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
         link text: τι είναι αυτό;
         disabled: 'Το Gravatar έχει απενεργοποιηθεί:'
-        enabled: Εμφάνισης του Gravatar σας έχει ενεργοποιηθεί.
+        enabled: Έχει ενεργοποιηθεί η εμφάνιση του Gravatar σας.
       new image: Προσθήκη εικόνας
       keep image: Διατήρηση της τρέχουσας εικόνας
       delete image: Αφαίρεση της τρέχουσας εικόνας
@@ -2424,8 +2413,8 @@ el:
       longitude: 'Γεωγραφικό μήκος:'
       update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον
         χάρτη;
-      save changes button: Αποθήκευση Αλλαγών
-      make edits public button: Κάνε όλες τις επεξεργασίες μου δημόσιες
+      save changes button: Αποθήκευση αλλαγών
+      make edits public button: Να γίνουν όλες οι επεξεργασίες μου δημόσιες
       return to profile: Επιστροφή στο προφίλ
       flash update success confirm needed: Οι πληροφορίες του χρήστη ενημερώθηκαν
         επιτυχώς. Ελέγξτε το ηλεκτρονικό ταχυδρομείο σας για μια ειδοποίηση επιβεβαίωσης
@@ -2439,9 +2428,9 @@ el:
       press confirm button: Πατήστε το κουμπί "Επιβεβαίωση" για να ενεργοποιήσετε
         το λογαριασμό σας.
       button: Επιβεβαίωση
-      success: Επιβεβαιώθηκε ο λογαριασμός σου, σε ευχαριστούμε για την εγγραφή σου!
+      success: Επιβεβαιώθηκε ο λογαριασμός σας, ευχαριστούμε για την εγγραφή σας!
       already active: Αυτός ο λογαριασμός έχει ήδη επιβεβαιωθεί.
-      unknown token: Αυτός ο κωδικός επιβεβαίωσης έχει λήξει ή δεν υπάρχει.
+      unknown token: Ο κωδικός επιβεβαίωσης έληξε ή δεν υπάρχει.
       reconfirm_html: Εάν θέλετε να σας ξαναστείλουμε το email επιβεβαίωσης <a href="%{reconfirm}">πατήστε
         εδώ</a>.
     confirm_resend:
@@ -2476,7 +2465,7 @@ el:
         %{date}'
       summary_no_ip_html: '%{name} δημιουργήθηκε στις %{date}'
       confirm: Επιβεβαίωση Επιλεγμένων Χρηστών
-      hide: Απόκρυψη Επιλεγμένων Χρηστών
+      hide: Απόκρυψη επιλεγμένων χρηστών
       empty: Δεν βρέθηκαν χρήστες που να ταιριάζουν
     suspended:
       title: Ο Λογαριασμός έχει Ανασταλεί
@@ -2507,7 +2496,7 @@ el:
         να συσχετίσετε τον λογαριασμό με το ID σας στις ρυθμίσεις χρήστη.
   user_role:
     filter:
-      not_a_role: Το αλφαριθμητικό `%{role}' δεν είναι ένας έγκυρος ρόλος.
+      not_a_role: Η στοιχειοσειρά `%{role}' δεν είναι ένας έγκυρος ρόλος.
       already_has_role: Ο χρήστης έχει ήδη ρόλο %{role}.
       doesnt_have_role: Ο χρήστης δεν έχει ρόλο %{role}.
       not_revoke_admin_current_user: Ο διαχειριστικός ρόλος δεν μπορεί να αναιρεθεί
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 67e779264..7bbaff244 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -120,6 +120,9 @@ en-GB:
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: 'Upload GPX File:'
+        visibility: 'Visibility:'
+        tagstring: 'Tags:'
       message:
         sender: Sender
         title: Subject
@@ -132,6 +135,9 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: comma delimited
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1739,11 +1745,6 @@ en-GB:
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
     new:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Help
@@ -1763,18 +1764,6 @@ en-GB:
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
-      filename: 'Filename:'
-      download: download
-      uploaded_at: 'Uploaded:'
-      points: 'Points:'
-      start_coord: 'Start coordinate:'
-      map: map
-      edit: edit
-      owner: 'Owner:'
-      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
     trace_optionals:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 4f19ae421..e2b8ef8d7 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -28,6 +28,8 @@ eo:
     formats:
       friendly: '%e %B %Y je %H:%M'
   helpers:
+    file:
+      prompt: Elektu dosieron
     submit:
       diary_comment:
         create: Konservi
@@ -106,12 +108,15 @@ eo:
       trace:
         user: Uzanto
         visible: Videbla
-        name: Nomo
+        name: Dosiernomo
         size: Grando
         latitude: Latitudo
         longitude: Longitudo
         public: Publika
         description: Priskribo
+        gpx_file: Alŝuti GPX-dosieron
+        visibility: Videbleco
+        tagstring: Etikedoj
       message:
         sender: Sendinto
         title: Temo
@@ -124,6 +129,9 @@ eo:
         description: Priskribo
         languages: Lingvoj
         pass_crypt: Pasvorto
+    help:
+      trace:
+        tagstring: disigitaj per komoj
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -415,7 +423,7 @@ eo:
     diary_entry:
       posted_by_html: Publikigita de %{link_user} je %{created} en %{language_link}
       comment_link: Komenti pri ĉi tiu afiŝo
-      reply_link: Respondi al ĉi tiu afiŝo
+      reply_link: Sendi mesaĝon al la aŭtoro
       comment_count:
         zero: Sen komentoj
         one: '%{count} komento'
@@ -1220,11 +1228,12 @@ eo:
       header: '%{from_user} komentis pri la OpenStreetMap-taglibra afiŝo kun la temo
         %{subject}:'
       footer: Vi ankaŭ povas legi la komenton ĉe %{readurl} kaj komenti ĝin ĉe %{commenturl}
-        aŭ responde ĉe %{replyurl}
+        aŭ respondi al la aŭtoro ĉe %{replyurl}
     message_notification:
       hi: Saluton %{to_user},
       header: '%{from_user} sendis al vi mesaĝon tra OpenStreetMap kun la temo %{subject}:'
-      footer_html: Vi ankaŭ povas legi la mesaĝon ĉe %{readurl} kaj respondi ĉe %{replyurl}
+      footer_html: Vi ankaŭ povas legi la mesaĝon ĉe %{readurl} kaj sendi mesaĝon
+        al la aŭtoro ĉe %{replyurl}
     friendship_notification:
       hi: Saluton %{to_user},
       subject: '[OpenStreetMap] %{user} aldonis vin kiel amikon'
@@ -1848,11 +1857,6 @@ eo:
         punktoj kun tempstampo)
     new:
       upload_trace: Alŝuti GPS-spuron
-      upload_gpx: 'Alŝuti GPX-dosieron:'
-      description: 'Priskribo:'
-      tags: 'Etikedoj:'
-      tags_help: disigitaj per komoj
-      visibility: 'Videbleco:'
       visibility_help: kion tio signifas?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Helpo
@@ -1870,20 +1874,9 @@ eo:
           estos alŝutitaj, antaŭ alŝuti aliajn, do vi ne blokos atendovicon por aliaj
           uzantoj.
     edit:
+      cancel: Nuligi
       title: Redaktado de spuro %{name}
       heading: Redaktado de spuro %{name}
-      filename: 'Dosiernomo:'
-      download: elŝuti
-      uploaded_at: 'Alŝutita je:'
-      points: 'Punktoj:'
-      start_coord: 'Komencaj koordinatoj:'
-      map: mapo
-      edit: redakti
-      owner: 'Posedanto:'
-      description: 'Priskribo:'
-      tags: 'Etikedoj:'
-      tags_help: disigitaj per komoj
-      visibility: 'Videbleco:'
       visibility_help: kion tio signifas?
     update:
       updated: Alŝutis spuron
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 482b6d29a..6d63fc488 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -158,6 +158,9 @@ es:
         longitude: Longitud
         public: Pública
         description: Descripción
+        gpx_file: 'Subir archivo GPX:'
+        visibility: 'Visibilidad:'
+        tagstring: 'Etiquetas:'
       message:
         sender: Remitente
         title: Asunto
@@ -170,6 +173,9 @@ es:
         description: Descripción
         languages: Idiomas
         pass_crypt: Contraseña
+    help:
+      trace:
+        tagstring: delimitado por comas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1923,11 +1929,6 @@ es:
         puntos ordenados con marcas de tiempo)
     new:
       upload_trace: Subir traza GPS
-      upload_gpx: 'Subir archivo GPX:'
-      description: 'Descripción:'
-      tags: 'Etiquetas:'
-      tags_help: delimitado por comas
-      visibility: 'Visibilidad:'
       visibility_help: ¿Qué significa esto?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/ES:Visibilidad_de_trazas_GPS
       help: Ayuda
@@ -1949,18 +1950,6 @@ es:
     edit:
       title: Editando traza %{name}
       heading: Editando traza %{name}
-      filename: 'Nombre de archivo:'
-      download: descargar
-      uploaded_at: 'Subido el:'
-      points: 'Puntos:'
-      start_coord: 'Coordenada Inicial:'
-      map: mapa
-      edit: editar
-      owner: 'Propietario:'
-      description: 'Descripción:'
-      tags: 'Etiquetas:'
-      tags_help: delimitado por comas
-      visibility: 'Visibilidad:'
       visibility_help: ¿Qué significa esto?
     update:
       updated: Traza actualizada
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d3d5a0070..5ee3787eb 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -92,6 +92,9 @@ et:
         longitude: Pikkus
         public: Avalik
         description: Kirjeldus
+        gpx_file: 'Laadi üles GPX-fail:'
+        visibility: 'Nähtavus:'
+        tagstring: 'Sildid:'
       message:
         sender: Saatja
         title: Teema
@@ -104,6 +107,9 @@ et:
         description: Kirjeldus
         languages: Keeled
         pass_crypt: Parool
+    help:
+      trace:
+        tagstring: komaga eraldatud
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1568,11 +1574,6 @@ et:
       identifiable: Tuvastatav (nähtav rajaloendis ja tuvastatav, järjestatud punktid
         koos ajatemplitega)
     new:
-      upload_gpx: 'Laadi üles GPX-fail:'
-      description: 'Kirjeldus:'
-      tags: 'Sildid:'
-      tags_help: komaga eraldatud
-      visibility: 'Nähtavus:'
       visibility_help: mida see tähendab?
       help: Abi
     create:
@@ -1583,18 +1584,6 @@ et:
       upload_failed: Kahjuks ei õnnestunud GPX-faili üles laadida. Sellest tõrkest
         on antud märku administraatorile. Palun proovi uuesti.
     edit:
-      filename: 'Failinimi:'
-      download: laadi alla
-      uploaded_at: 'Üles laaditud:'
-      points: 'Punktid:'
-      start_coord: 'Alguskoordinaadid:'
-      map: kaart
-      edit: redigeeri
-      owner: 'Omanik:'
-      description: 'Kirjeldus:'
-      tags: 'Sildid:'
-      tags_help: komaga eraldatud
-      visibility: 'Nähtavus:'
       visibility_help: mida see tähendab?
     update:
       updated: Rada uuendatud.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 9ef67f903..d456b27a0 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -104,6 +104,9 @@ eu:
         longitude: Longitude
         public: Publikoa
         description: Deskribapena
+        gpx_file: 'GPX fitxategi igo:'
+        visibility: 'Ikusgarritasuna:'
+        tagstring: 'Etiketak:'
       message:
         sender: Igorlea
         title: Gaia
@@ -116,6 +119,9 @@ eu:
         description: Deskribapena
         languages: Hizkuntzak
         pass_crypt: Pasahitza
+    help:
+      trace:
+        tagstring: koma mugatua
   editor:
     default: Lehenetsia (orain %{name})
     potlatch:
@@ -1804,11 +1810,6 @@ eu:
         puntuak denbora-markekin antolatuz)
     new:
       upload_trace: GPS aztarna igo
-      upload_gpx: 'GPX fitxategi igo:'
-      description: 'Deskribapena:'
-      tags: 'Etiketak:'
-      tags_help: koma mugatua
-      visibility: 'Ikusgarritasuna:'
       visibility_help: Zer esan nahi du honek?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Laguntza
@@ -1829,18 +1830,6 @@ eu:
     edit:
       title: '%{name} aztarna aldatzen'
       heading: '%{name} aztarna aldatzen'
-      filename: 'Fitxategi izena:'
-      download: jaitsi
-      uploaded_at: 'Noiz igota:'
-      points: 'Puntuak:'
-      start_coord: 'Koordenatuak hasi:'
-      map: mapa
-      edit: aldatu
-      owner: 'Jabea:'
-      description: 'Deskribapena:'
-      tags: 'Etiketak:'
-      tags_help: koma mugatua
-      visibility: Ikusgarritasuna;
       visibility_help: Zer esan nahi du honek?
     update:
       updated: Bilaketa eguneratua
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 148722424..36dea9141 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -127,6 +127,9 @@ fa:
         longitude: طول جغرافیایی
         public: عمومی
         description: توضیح
+        gpx_file: 'بارگذاری فایل GPX:'
+        visibility: 'پدیداری:'
+        tagstring: 'برچسب‌ها:'
       message:
         sender: فرستنده
         title: عنوان
@@ -139,6 +142,9 @@ fa:
         description: توضیحات
         languages: زبان‌ها
         pass_crypt: گذرواژه
+    help:
+      trace:
+        tagstring: جداشده با کاما (,)
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1899,11 +1905,6 @@ fa:
         با مهر زمان)
     new:
       upload_trace: بارگذاری رد GPS
-      upload_gpx: 'بارگذاری فایل GPX:'
-      description: 'توضیحات:'
-      tags: 'برچسب‌ها:'
-      tags_help: جداشده با کاما (,)
-      visibility: 'پدیداری:'
       visibility_help: این چیست؟
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Fa:Visibility_of_GPS_traces
       help: کمک
@@ -1923,18 +1924,6 @@ fa:
     edit:
       title: ویرایش رد %{name}
       heading: ویرایش رد %{name}
-      filename: 'نام فایل:'
-      download: بارگیری
-      uploaded_at: 'تاریخ بارگذاری:'
-      points: 'نقاط:'
-      start_coord: 'مختصات شروع:'
-      map: نقشه
-      edit: ویرایش
-      owner: 'مالک:'
-      description: 'شرح:'
-      tags: 'برچسب‌ها:'
-      tags_help: جداشده با کاما (,)
-      visibility: 'پدیداری:'
       visibility_help: این چیست؟
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Fa:Visibility_of_GPS_traces
     update:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ec5c0bfe6..47ccff67c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -48,6 +48,8 @@ fi:
       friendly: '%e. %Bta %Y klo %H.%M'
       blog: '%e. %Bta %Y'
   helpers:
+    file:
+      prompt: Valitse tiedosto
     submit:
       diary_comment:
         create: Tallenna
@@ -126,12 +128,15 @@ fi:
       trace:
         user: Käyttäjä
         visible: Näkyvissä
-        name: Nimi
+        name: Tiedostonimi
         size: Koko
         latitude: Leveyspiiri
         longitude: Pituuspiiri
         public: Julkinen
         description: Kuvaus
+        gpx_file: Tallenna GPX-tiedosto
+        visibility: Näkyvyys
+        tagstring: Ominaisuustiedot
       message:
         sender: Lähettäjä
         title: Aihe
@@ -144,6 +149,9 @@ fi:
         description: Kuvaus
         languages: Kielet
         pass_crypt: Salasana
+    help:
+      trace:
+        tagstring: pilkuilla eroteltu lista
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -437,7 +445,7 @@ fi:
     diary_entry:
       posted_by_html: Käyttäjä %{link_user} kirjoitti tämän %{created} kielellä %{language_link}
       comment_link: Kommentoi tätä kirjoitusta
-      reply_link: Vastaa tähän kirjoitukseen viestillä
+      reply_link: Lähetä viesti tekijälle
       comment_count:
         one: 1 kommentti
         zero: Ei kommentteja
@@ -1243,12 +1251,12 @@ fi:
       header: '%{from_user} kommentoi kirjoittamaasi päiväkirjamerkintää OpenStreetMapissa
         otsikolla %{subject}:'
       footer: Lue kommentti sivulla %{readurl}. Jatkokommentin voi lähettää sivulla
-        %{commenturl} tai vastausviestin sivulla %{replyurl}.
+        %{commenturl} tai lähettää viestin tekijälle sivulla %{replyurl}.
     message_notification:
       hi: Hei %{to_user}!
       header: '%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla
         %{subject}:'
-      footer_html: Lue viesti osoitteessa %{readurl} ja vastaa siihen osoitteessa
+      footer_html: Lue viesti osoitteessa %{readurl} ja lähetä viesti tekijälle osoitteessa
         %{replyurl}.
     friendship_notification:
       hi: Hei %{to_user}!
@@ -1876,11 +1884,6 @@ fi:
         järjestettynä aikaleimoineen)
     new:
       upload_trace: Tallenna GPS-jälki
-      upload_gpx: 'Tallenna GPX-tiedosto:'
-      description: 'Kuvaus:'
-      tags: 'Ominaisuustiedot:'
-      tags_help: pilkuilla eroteltu lista
-      visibility: 'Näkyvyys:'
       visibility_help: Mitä tämä tarkoittaa?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Fi:GPS-j%C3%A4lkien_julkisuus
       help: Ohje
@@ -1902,20 +1905,9 @@ fi:
           kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät
           aiemmin tietokantaan.
     edit:
+      cancel: Peruuta
       title: Muokataan jälkeä %{name}
       heading: Jäljen %{name} muokkaus
-      filename: 'Tiedostonimi:'
-      download: lataa
-      uploaded_at: 'Lähetetty:'
-      points: 'Pisteet:'
-      start_coord: 'Alun koordinaatit:'
-      map: kartta
-      edit: muokkaa
-      owner: 'Käyttäjä:'
-      description: 'Kuvaus:'
-      tags: 'Ominaisuustiedot:'
-      tags_help: pilkuilla eroteltu lista
-      visibility: 'Näkyvyys:'
       visibility_help: Mitä tämä tarkoittaa?
     update:
       updated: Jälki päivitetty
@@ -2615,6 +2607,7 @@ fi:
         cycle_map: Pyöräilykartta
         transport_map: Joukkoliikenne
         hot: Humanitaarinen
+        opnvkarte: ÖPNVKarte
       layers:
         header: Karttanäkymä
         notes: Karttailmoitukset
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index ff0308108..593d44e91 100644
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -93,6 +93,7 @@ fit:
         longitude: Pituuspiiri
         public: Julkinen
         description: Kuvvaus
+        gpx_file: 'Ylöslattaa GPX-fiili:'
       message:
         sender: Lähättäjä
         title: Aihe
@@ -911,15 +912,9 @@ fit:
   traces:
     new:
       upload_trace: Ylöslattaa GPS-jälki
-      upload_gpx: 'Ylöslattaa GPX-fiili:'
-      description: 'Kuvvaus:'
       help: Apua
     edit:
       title: Mookathaan jälkeä %{name}
-      filename: 'Fiilinimi:'
-      uploaded_at: 'Ylösladattu:'
-      edit: mookkaa
-      description: 'Kuvvaus:'
     show:
       filename: 'Fiilinimi:'
       download: lattaa
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 366be17cc..95f799335 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -77,6 +77,8 @@ fr:
     formats:
       friendly: '%e %B %Y à %-Hh%M'
   helpers:
+    file:
+      prompt: Choisir un fichier
     submit:
       diary_comment:
         create: Enregistrer
@@ -155,12 +157,15 @@ fr:
       trace:
         user: Utilisateur
         visible: Visible
-        name: Nom
+        name: Nom du fichier
         size: Taille
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: Envoyer un fichier GPX
+        visibility: Visibilité
+        tagstring: Mots-clés
       message:
         sender: Expéditeur
         title: Sujet
@@ -173,6 +178,9 @@ fr:
         description: Description
         languages: Langues
         pass_crypt: Mot de passe
+    help:
+      trace:
+        tagstring: données séparées par des virgules
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1950,11 +1958,6 @@ fr:
         points ordonnés avec les dates)
     new:
       upload_trace: Téléverser la trace GPS
-      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 ?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS
       help: Aide
@@ -1974,20 +1977,9 @@ fr:
           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.
     edit:
+      cancel: Annuler
       title: Modifier la trace %{name}
       heading: Modifier la trace %{name}
-      filename: 'Nom du fichier :'
-      download: télécharger
-      uploaded_at: 'Envoyé le :'
-      points: 'Points :'
-      start_coord: 'Coordonnées de départ :'
-      map: carte
-      edit: modifier
-      owner: 'Propriétaire :'
-      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 ?
     update:
       updated: Traces mises à jour
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index a9aa1678a..282fe9335 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -82,6 +82,9 @@ fur:
         longitude: Longjitudin
         public: Public
         description: Descrizion
+        gpx_file: 'Cjame file GPX:'
+        visibility: 'Visibilitât:'
+        tagstring: 'Etichetis:'
       message:
         sender: Mitent
         title: Sogjet
@@ -94,6 +97,9 @@ fur:
         description: Descrizion
         languages: Lenghis
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: separâts di virgulis
   editor:
     default: Predeterminât (par cumò %{name})
     potlatch:
@@ -972,11 +978,6 @@ fur:
         title: No tu âs timp par fâ i cambiaments? Zonte une note!
   traces:
     new:
-      upload_gpx: 'Cjame file GPX:'
-      description: 'Descrizion:'
-      tags: 'Etichetis:'
-      tags_help: separâts di virgulis
-      visibility: 'Visibilitât:'
       visibility_help: ce vuelial dî?
       help: Jutori
     create:
@@ -987,18 +988,6 @@ fur:
     edit:
       title: Daûr a cambiâ il percors %{name}
       heading: Daûr a cambiâ il percors %{name}
-      filename: 'Non dal file:'
-      download: discjame
-      uploaded_at: 'Cjamât ai:'
-      points: 'Ponts:'
-      start_coord: 'Coordenadis iniziâls:'
-      map: mape
-      edit: cambie
-      owner: 'Paron:'
-      description: 'Descrizion:'
-      tags: 'Etichetis:'
-      tags_help: separâts di virgulis
-      visibility: 'Visibilitât:'
       visibility_help: ce vuelial dî?
     trace_optionals:
       tags: Etichetis
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index bd26fbf29..3d6935945 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -79,6 +79,9 @@ ga:
         longitude: Domhanfhad
         public: Poiblí
         description: Cur síos
+        gpx_file: 'Comhad GPX a Uaslódáil:'
+        visibility: 'Infheictheacht:'
+        tagstring: 'Clibeanna:'
       message:
         sender: Seoltóir
         title: Ábhar
@@ -91,6 +94,9 @@ ga:
         description: Cur síos
         languages: Teangacha
         pass_crypt: Focal Faire
+    help:
+      trace:
+        tagstring: teormharcáilte le camóga
   editor:
     default: Réamhshocraithe (%{name} faoi láthair)
     potlatch:
@@ -1646,11 +1652,6 @@ ga:
       identifiable: Inaitheanta (taispeánfar é i liosta na lorg agus mar phointí inaitheanta,
         in ord, agus stampaí ama acu)
     new:
-      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?
       help: Cabhair
     create:
@@ -1658,18 +1659,6 @@ ga:
     edit:
       title: Lorg %{name} á chur in eagar
       heading: Lorg %{name} á chur in eagar
-      filename: 'Comhadainm:'
-      download: íoslódáil
-      uploaded_at: 'Uaslódáilte:'
-      points: 'Pointí:'
-      start_coord: 'Comhordanáid thosaigh:'
-      map: léarscáil
-      edit: cuir in eagar
-      owner: 'Úinéir:'
-      description: 'Cur síos:'
-      tags: 'Clibeanna:'
-      tags_help: teormharcáilte le camóga
-      visibility: 'Infheictheacht:'
       visibility_help: céard a chiallaíonn seo?
     trace_optionals:
       tags: Clibeanna
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 351405cda..377e2a41e 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -89,6 +89,9 @@ gd:
         longitude: Domhan-fhad
         public: Poblach
         description: Tuairisgeul
+        gpx_file: 'Luchdaich suas faidhle GPX:'
+        visibility: 'Faicsinneachd:'
+        tagstring: 'Tagaichean:'
       message:
         sender: Seòladair
         title: Cuspair
@@ -101,6 +104,9 @@ gd:
         description: Tuairisgeul
         languages: Cànain
         pass_crypt: Facal-faire
+    help:
+      trace:
+        tagstring: sgaradh le cromagan
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
@@ -1608,11 +1614,6 @@ gd:
       identifiable: Gabhaidh aithneachadh (nochdaidh e air liosta nan lorgaidhean
         agus 'na phuingean a ghabhas aithneachadh ris a bheil seòrsachadh is stampa-tìde)
     new:
-      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
       help: Cobhair
@@ -1629,18 +1630,6 @@ gd:
     edit:
       title: A' deasachadh lorgadh %{name}
       heading: A' deasachadh lorgadh %{name}
-      filename: 'Ainm an fhaidhle:'
-      download: luchdaich a-nuas
-      uploaded_at: 'Air a luchdadh suas:'
-      points: 'Puingean:'
-      start_coord: 'Càraid àireimh tòiseachaidh:'
-      map: mapa
-      edit: deasaich
-      owner: 'Sealbhadair:'
-      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
     trace_optionals:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d02ff1528..11dc9e5fb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -108,6 +108,9 @@ gl:
         longitude: Lonxitude
         public: Público
         description: Descrición
+        gpx_file: 'Subir un ficheiro GPX:'
+        visibility: 'Visibilidade:'
+        tagstring: 'Etiquetas:'
       message:
         sender: Remitente
         title: Asunto
@@ -120,6 +123,9 @@ gl:
         description: Descrición
         languages: Linguas
         pass_crypt: Contrasinal
+    help:
+      trace:
+        tagstring: separadas por comas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1890,11 +1896,6 @@ gl:
         puntos ordeados ca data e hora)
     new:
       upload_trace: Subir pista GPS
-      upload_gpx: 'Subir un ficheiro GPX:'
-      description: 'Descrición:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por comas
-      visibility: 'Visibilidade:'
       visibility_help: que significa isto?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Axuda
@@ -1914,18 +1915,6 @@ gl:
     edit:
       title: Editando a pista "%{name}"
       heading: Editando a pista "%{name}"
-      filename: 'Nome do ficheiro:'
-      download: baixar
-      uploaded_at: 'Subido o:'
-      points: 'Puntos:'
-      start_coord: 'Coordenada de inicio:'
-      map: mapa
-      edit: editar
-      owner: 'Dono:'
-      description: 'Descrición:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por comas
-      visibility: 'Visibilidade:'
       visibility_help: que significa isto?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 396d98108..d15da0ff7 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -120,6 +120,9 @@ he:
         longitude: קו אורך
         public: ציבורי
         description: תיאור
+        gpx_file: 'העלאת קובץ GPX:'
+        visibility: 'נִראוּת:'
+        tagstring: 'תגים:'
       message:
         sender: שולח
         title: נושא
@@ -132,6 +135,9 @@ he:
         description: תיאור
         languages: שפות
         pass_crypt: סיסמה
+    help:
+      trace:
+        tagstring: מופרד בפסיקים
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1856,11 +1862,6 @@ he:
         זמן)
     new:
       upload_trace: העלאת מסלול GPS
-      upload_gpx: 'העלאת קובץ GPX:'
-      description: 'תיאור:'
-      tags: 'תגים:'
-      tags_help: מופרד בפסיקים
-      visibility: 'נִראוּת:'
       visibility_help: מה זה אומר?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: עזרה
@@ -1877,18 +1878,6 @@ he:
     edit:
       title: עריכת מסלול %{name}
       heading: עריכת המסלול %{name}
-      filename: 'שם הקובץ:'
-      download: הורדה
-      uploaded_at: 'תאריך העלאה:'
-      points: 'נקודות:'
-      start_coord: 'נקודות ציון של תחילה:'
-      map: מפה
-      edit: עריכה
-      owner: 'בעלים:'
-      description: 'תיאור:'
-      tags: 'תגים:'
-      tags_help: מופרד בפסיקים
-      visibility: 'נִראוּת:'
       visibility_help: מה זה אומר?
     update:
       updated: המסלול עודכן
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 6ebafbc12..88c851d77 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -95,6 +95,7 @@ hi:
         longitude: देशांतर
         public: सार्वजनिक
         description: वर्णन
+        visibility: दृष्टता
       message:
         sender: प्रेषक
         title: विषय
@@ -659,11 +660,8 @@ hi:
         title: कोई प्रश्न है?
   traces:
     new:
-      visibility: दृष्टता
       visibility_help: इसका क्या मतलब है?
     edit:
-      map: नक्शा
-      visibility: दृष्टता
       visibility_help: इसका क्या मतलब है?
     show:
       tags: Tags
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4584f24b8..e4e18925c 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -98,6 +98,9 @@ hr:
         longitude: Geografska dužina (Longitude)
         public: Javno
         description: Opis
+        gpx_file: 'Učitaj GPX datoteku:'
+        visibility: 'Vidljivost:'
+        tagstring: 'Oznake:'
       message:
         sender: Pošiljatelj
         title: Naslov
@@ -110,6 +113,9 @@ hr:
         description: Opis
         languages: Jezici
         pass_crypt: Lozinka
+    help:
+      trace:
+        tagstring: odvojeno zarezom
   datetime:
     distance_in_words_ago:
       half_a_minute: prije pola minute
@@ -1369,11 +1375,6 @@ hr:
         posložene točke sa vremenskom oznakom)
     new:
       upload_trace: Pošalji GNSS trag
-      upload_gpx: 'Učitaj GPX datoteku:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezom
-      visibility: 'Vidljivost:'
       visibility_help: što ovo znači?
       help: Pomoć
     create:
@@ -1391,18 +1392,6 @@ hr:
     edit:
       title: Uređivanje traga %{name}
       heading: Uređivanje trase %{name}
-      filename: 'Ime datoteke:'
-      download: preuzmi
-      uploaded_at: 'Poslano:'
-      points: 'Točaka:'
-      start_coord: 'Početna koordinata:'
-      map: karta
-      edit: uredi
-      owner: 'Vlasnik:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: odvojeno zarezima
-      visibility: 'Vidljivost:'
       visibility_help: Što ovo znači?
     trace_optionals:
       tags: Oznake
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 506524d09..e9a8df624 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -94,6 +94,9 @@ hsb:
         longitude: Dołhostnik
         public: Zjawny
         description: Wopisanje
+        gpx_file: 'GPX-dataju nahrać:'
+        visibility: 'Widźomnosć:'
+        tagstring: 'Atributy:'
       message:
         sender: Wotpósłar
         title: Tema
@@ -106,6 +109,9 @@ hsb:
         description: Wopisanje
         languages: Rěče
         pass_crypt: Hesło
+    help:
+      trace:
+        tagstring: přez komu dźěleny
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1786,11 +1792,6 @@ hsb:
       identifiable: Identifikujomny (pokazuje so w lisćinje ćěrjow a jako identifikujomny,
         zrjadowane dypki z časowymi kołkami)
     new:
-      upload_gpx: 'GPX-dataju nahrać:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: přez komu dźěleny
-      visibility: 'Widźomnosć:'
       visibility_help: Å¡to to woznamjenja?
       help: Pomoc
     create:
@@ -1808,18 +1809,6 @@ hsb:
     edit:
       title: Ćěr %{name} wobdźěłać
       heading: Ćěr %{name} wobdźěłać
-      filename: 'Datajowe mjeno:'
-      download: sćahnyć
-      uploaded_at: 'Nahraty dnja:'
-      points: 'Dypki:'
-      start_coord: 'Startowa koordinata:'
-      map: karta
-      edit: wobdźěłać
-      owner: 'Wobsedźer:'
-      description: 'Wopisanje:'
-      tags: 'Atributy:'
-      tags_help: přez komu dźěleny
-      visibility: 'Widźomnosć:'
       visibility_help: Å¡to to woznamjenja?
     trace_optionals:
       tags: Atributy
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4d020de0d..f1e1ca756 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -118,6 +118,9 @@ hu:
         longitude: Földrajzi hosszúság
         public: Nyilvános
         description: Leírás
+        gpx_file: 'GPX fájl feltöltése:'
+        visibility: 'Láthatóság:'
+        tagstring: 'Címkék:'
       message:
         sender: Küldő
         title: Tárgy
@@ -130,6 +133,9 @@ hu:
         description: Leírás
         languages: Nyelvek
         pass_crypt: Jelszó
+    help:
+      trace:
+        tagstring: vesszővel elválasztva
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1859,11 +1865,6 @@ hu:
         rendezett pontok időbélyeggel)
     new:
       upload_trace: GPS nyomvonal feltöltése
-      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?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Segítség
@@ -1880,18 +1881,6 @@ hu:
     edit:
       title: 'Nyomvonal szerkesztése: %{name}'
       heading: 'Nyomvonal szerkesztése: %{name}'
-      filename: 'Fájlnév:'
-      download: letöltés
-      uploaded_at: 'Feltöltve:'
-      points: 'Pontok száma:'
-      start_coord: 'Kezdőkoordináta:'
-      map: térkép
-      edit: szerkesztés
-      owner: 'Tulajdonos:'
-      description: 'Leírás:'
-      tags: 'Címkék:'
-      tags_help: vesszővel elválasztva
-      visibility: 'Láthatóság:'
       visibility_help: Mit jelent ez?
     update:
       updated: Nyomvonal frissítve
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 1c76d8854..2baa36a03 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -98,6 +98,9 @@ ia:
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: 'Incargar file GPX:'
+        visibility: 'Visibilitate:'
+        tagstring: 'Etiquettas:'
       message:
         sender: Expeditor
         title: Subjecto
@@ -110,6 +113,9 @@ ia:
         description: Description
         languages: Linguas
         pass_crypt: Contrasigno
+    help:
+      trace:
+        tagstring: separate per commas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1860,11 +1866,6 @@ ia:
         punctos ordinate con datas e horas)
     new:
       upload_trace: Incargar tracia GPS
-      upload_gpx: 'Incargar file GPX:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
       visibility_help: que significa isto?
       help: Adjuta
     create:
@@ -1884,18 +1885,6 @@ ia:
     edit:
       title: Modification del tracia %{name}
       heading: Modificar le tracia %{name}
-      filename: 'Nomine de file:'
-      download: discargar
-      uploaded_at: 'Incargate le:'
-      points: 'Punctos:'
-      start_coord: 'Coordinata initial:'
-      map: carta
-      edit: modificar
-      owner: 'Proprietario:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
       visibility_help: que significa isto?
     update:
       updated: Tracia actualisate
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 51e760c09..a95763487 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -118,6 +118,9 @@ id:
         longitude: Garis Bujur
         public: Publik
         description: Deskripsi
+        gpx_file: 'Unggah File GPX:'
+        visibility: Visibilitas
+        tagstring: 'Tags:'
       message:
         sender: Pengirim
         title: Subyek
@@ -130,6 +133,9 @@ id:
         description: Keterangan
         languages: Bahasa
         pass_crypt: Kata Sandi
+    help:
+      trace:
+        tagstring: dipisahkan oleh koma
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1857,11 +1863,6 @@ id:
         diidentifikasi, mengatur poin dengan waktu pengambilan)
     new:
       upload_trace: Unggah Jejak GPS
-      upload_gpx: 'Unggah File GPX:'
-      description: Deskripsi
-      tags: 'Tags:'
-      tags_help: dipisahkan oleh koma
-      visibility: Visibilitas
       visibility_help: apa artinya ini?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Bantuan
@@ -1881,18 +1882,6 @@ id:
     edit:
       title: Mengedit jejak %{name}
       heading: Mengedit dijitasi %{name}
-      filename: 'Nama File:'
-      download: unduh
-      uploaded_at: 'Diunggah:'
-      points: 'Poin/Titik:'
-      start_coord: 'Koordinat awal:'
-      map: peta
-      edit: edit
-      owner: 'Pemilik:'
-      description: 'Deskripsi:'
-      tags: 'Tags:'
-      tags_help: dipisahkan oleh koma
-      visibility: Visibilitas
       visibility_help: apa artinya ini?
     update:
       updated: Jejak diperbarui
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 33f0b4881..ea23c0273 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -103,6 +103,9 @@ is:
         longitude: Lengdargráða
         public: Opinbert
         description: Lýsing
+        gpx_file: 'Hlaða inn GPX skrá:'
+        visibility: 'Sýnileiki:'
+        tagstring: 'Merki:'
       message:
         sender: Sendandi
         title: Fyrirsögn
@@ -115,6 +118,9 @@ is:
         description: Lýsing
         languages: Tungumál
         pass_crypt: Lykilorð
+    help:
+      trace:
+        tagstring: aðskilið með kommum
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1903,11 +1909,6 @@ is:
         punktar með tímastimpli)
     new:
       upload_trace: Senda inn GPS feril
-      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
       help: Hjálp
@@ -1927,18 +1928,6 @@ is:
     edit:
       title: Breyti ferlinum %{name}
       heading: Breyti ferlinum %{name}
-      filename: 'Skráarheiti:'
-      download: sækja
-      uploaded_at: 'Hlaðið upp:'
-      points: 'Punktar:'
-      start_coord: 'Byrjunarhnit:'
-      map: kort
-      edit: breyta
-      owner: 'Eigandi:'
-      description: 'Lýsing:'
-      tags: 'Merki:'
-      tags_help: aðskilin með kommum
-      visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7810fc978..020135c6e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -142,6 +142,9 @@ it:
         longitude: Longitudine
         public: Pubblico
         description: Descrizione
+        gpx_file: 'Carica file GPX:'
+        visibility: 'Visibilità:'
+        tagstring: 'Etichette:'
       message:
         sender: Mittente
         title: Oggetto
@@ -154,6 +157,9 @@ it:
         description: Descrizione
         languages: Lingue
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: delimitato da virgola
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1916,11 +1922,6 @@ it:
         punti ordinati con marche temporali)
     new:
       upload_trace: Carica tracciato GPS
-      upload_gpx: 'Carica file GPX:'
-      description: 'Descrizione:'
-      tags: 'Etichette:'
-      tags_help: delimitato da virgola
-      visibility: 'Visibilità:'
       visibility_help: che cosa significa questo?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/IT:Visibility_of_GPS_traces
       help: Aiuto
@@ -1944,18 +1945,6 @@ it:
     edit:
       title: Modifica al tracciato %{name}
       heading: Modifica al tracciato %{name}
-      filename: 'Nome file:'
-      download: scarica
-      uploaded_at: 'Caricato il:'
-      points: 'Punti:'
-      start_coord: 'Coordinata iniziale:'
-      map: mappa
-      edit: modifica
-      owner: 'Proprietario:'
-      description: 'Descrizione:'
-      tags: 'Etichette:'
-      tags_help: delimitato da virgola
-      visibility: 'Visibilità:'
       visibility_help: che cosa significa questo?
     update:
       updated: Traccia aggiornata
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ad3518ac2..b03fb0135 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -137,6 +137,9 @@ ja:
         longitude: 経度
         public: 公開
         description: 説明
+        gpx_file: 'アップロードする GPX ファイル:'
+        visibility: '可視性:'
+        tagstring: 'タグ:'
       message:
         sender: 送信者
         title: 件名
@@ -149,6 +152,9 @@ ja:
         description: 説明
         languages: 言語
         pass_crypt: パスワード
+    help:
+      trace:
+        tagstring: カンマ区切り
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1753,11 +1759,6 @@ ja:
       identifiable: 識別可能 (トレース一覧に識別可能な状態で表示。点は順序通りでタイムスタンプ付き)
     new:
       upload_trace: GPS位置情報をアップロード
-      upload_gpx: 'アップロードする GPX ファイル:'
-      description: '説明:'
-      tags: 'タグ:'
-      tags_help: カンマ区切り
-      visibility: '可視性:'
       visibility_help: これはどういう意味?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces
       help: ヘルプ
@@ -1771,18 +1772,6 @@ ja:
     edit:
       title: トレース %{name} の編集
       heading: トレース %{name} の編集
-      filename: 'ファイル名:'
-      download: ダウンロード
-      uploaded_at: 'アップロード日時:'
-      points: '点の個数:'
-      start_coord: '開始座標:'
-      map: 地図
-      edit: 編集
-      owner: '所有者:'
-      description: '詳細:'
-      tags: 'タグ:'
-      tags_help: カンマ区切り
-      visibility: '可視性:'
       visibility_help: これはどういう意味?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces
     update:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 7f290860d..d2ed2362b 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -83,6 +83,7 @@ ka:
         longitude: გრძედი
         public: საჯარო
         description: აღწერა
+        visibility: 'ხილვადობა:'
       message:
         sender: გამგზავნი
         title: თემა
@@ -95,6 +96,9 @@ ka:
         description: აღწერა
         languages: ენები
         pass_crypt: პაროლი
+    help:
+      trace:
+        tagstring: მძიმის შემდეგ
   editor:
     default: უპირობოდ (ამჟამად %{name})
     potlatch:
@@ -968,23 +972,9 @@ ka:
       url: URL
   traces:
     new:
-      description: 'აღწერა:'
-      tags_help: მძიმის შემდეგ
-      visibility: 'ხილვადობა:'
       visibility_help: ეს რას ნიშნავს?
       help: დახმარება
     edit:
-      filename: 'ფაილის სახელი:'
-      download: გადმოწერა
-      uploaded_at: 'ატვირთულია:'
-      points: 'წერტილი:'
-      start_coord: 'საწყისი კოორდინატი:'
-      map: რუკა
-      edit: რედაქტირება
-      owner: 'მფლობელი:'
-      description: 'აღწერა:'
-      tags_help: მძიმის შემდეგ
-      visibility: 'ხილვადობა:'
       visibility_help: ეს რას ნიშნავს?
     show:
       pending: დამუშავება
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 97cc7328d..96d9bae79 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -95,6 +95,7 @@ kab:
         longitude: Tazegrart
         public: Azayez
         description: Aglam
+        tagstring: 'Ticraḍ:'
       message:
         sender: Amazan
         title: Asentel
@@ -1100,20 +1101,9 @@ kab:
           <a href='%{help_url}'>Wali afus dagi</a>.
   traces:
     new:
-      description: 'Aglam:'
-      tags: 'Ticraḍ:'
       help: Tallelt
     edit:
       title: Ẓreg lǧeṛṛa %{name}
-      filename: 'Isem n ufaylu:'
-      download: sider
-      uploaded_at: 'Yuli:'
-      points: 'Tineqqiḍin:'
-      map: takarḍa
-      edit: ẓreg
-      owner: 'Bab:'
-      description: 'Aglam:'
-      tags: 'Ticraḍ:'
     trace_optionals:
       tags: Ticraḍ
     show:
diff --git a/config/locales/km.yml b/config/locales/km.yml
index e3ccfa0e0..91017d9b4 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -72,6 +72,8 @@ km:
         longitude: រយៈបណ្តោយ
         public: សាធារណៈ​
         description: បរិយាយ​
+        gpx_file: ផ្ទុកឡើង​ឯកសារ GPX ៖
+        tagstring: ស្លាក​៖
       message:
         sender: អ្នកផ្ញើ​
         title: ប្រធានបទ​
@@ -730,19 +732,9 @@ km:
           station: ស្ថានីយ៍ផ្លូវដែក
   traces:
     new:
-      upload_gpx: ផ្ទុកឡើង​ឯកសារ GPX ៖
-      description: បរិយាយ​៖
-      tags: ស្លាក​៖
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​?
       help: ជំនួយ​
     edit:
-      filename: ឈ្មោះឯកសារ​៖
-      download: ទាញយក
-      uploaded_at: បានផ្ទុកឡើង​នៅ​៖
-      map: ផែនទី​
-      edit: កែប្រែ​
-      description: បរិយាយ​៖
-      tags: ស្លាក​៖
       visibility_help: តើនេះមានន័យ​ដូចម្ដេច​​?
     trace_optionals:
       tags: ស្លាក​
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 0b1b31401..4c4d16378 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -129,6 +129,9 @@ ko:
         longitude: 경도
         public: 공개
         description: 설명
+        gpx_file: 'GPX 파일 올리기:'
+        visibility: '공개 여부:'
+        tagstring: '태그:'
       message:
         sender: 보낸 사람
         title: 제목
@@ -141,6 +144,9 @@ ko:
         description: 설명
         languages: 언어
         pass_crypt: 비밀번호
+    help:
+      trace:
+        tagstring: 쉼표로 구분
   datetime:
     distance_in_words_ago:
       about_x_hours: 약 %{count}시간 전
@@ -1798,11 +1804,6 @@ ko:
       identifiable: 식별 가능(궤적 목록이 식별되어 보여짐, 시간 기록순으로 정렬된 점)
     new:
       upload_trace: GPS 궤적 올리기
-      upload_gpx: 'GPX 파일 올리기:'
-      description: '설명:'
-      tags: '태그:'
-      tags_help: 쉼표로 구분
-      visibility: '공개 여부:'
       visibility_help: 이게 무슨 뜻입니까?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: 도움말
@@ -1820,18 +1821,6 @@ ko:
     edit:
       title: '%{name} 경로 편집'
       heading: '%{name} 경로 편집'
-      filename: '파일 이름:'
-      download: 다운로드
-      uploaded_at: '올린 날짜:'
-      points: '점:'
-      start_coord: '시작 좌표:'
-      map: 지도
-      edit: 편집
-      owner: '소유자:'
-      description: '설명:'
-      tags: '태그:'
-      tags_help: 쉼표로 구분
-      visibility: '공개 여부:'
       visibility_help: 이게 무슨 뜻입니까?
     update:
       updated: 추적 업데이트됨
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 37dbe6b57..1174bd97d 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -102,6 +102,9 @@ ku-Latn:
         longitude: Hêlîlar
         public: Giştî
         description: Danasîn
+        gpx_file: Dosyeyek GPXê bar bikeː
+        visibility: Kî dikare bibîneː
+        tagstring: Etîketên vêː
       message:
         sender: Şander
         title: Mijar
@@ -114,6 +117,9 @@ ku-Latn:
         description: Danasîn
         languages: Ziman
         pass_crypt: Şîfre
+    help:
+      trace:
+        tagstring: bi bêhnokê veqetandî
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1903,11 +1909,6 @@ ku-Latn:
         wek nuqteyên rêzkirî tevî mohrên demê têne nîşandan)
     new:
       upload_trace: Şopa GPSê bar bike
-      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ê?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Alîkarî
@@ -1929,18 +1930,6 @@ ku-Latn:
     edit:
       title: Şopa %{name} tê guherandin
       heading: Şopa %{name} tê guherandin
-      filename: 'Navê dosyeyê:'
-      download: daxîne
-      uploaded_at: Hate barkirinː
-      points: Hejmara nuqteyanː
-      start_coord: Koordînata destpêkêː
-      map: nexşe
-      edit: biguherîne
-      owner: 'Xweyî:'
-      description: 'Danasîn:'
-      tags: Etîketː
-      tags_help: bi bêhnokê hatiye veqetandin
-      visibility: Kî dikare bibîneː
       visibility_help: Ev tê çi maneyê?
     update:
       updated: Şop hate nûkirin
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index accd9206e..ad0920a03 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -68,6 +68,9 @@ lb:
         longitude: Geografesch Längt
         public: Ëffentlech
         description: Beschreiwung
+        gpx_file: 'GPX-Fichier eroplueden:'
+        visibility: 'Visibilitéit:'
+        tagstring: 'Markéierungen:'
       message:
         sender: Sender
         title: Sujet
@@ -79,6 +82,9 @@ lb:
         description: Beschreiwung
         languages: Sproochen
         pass_crypt: Passwuert
+    help:
+      trace:
+        tagstring: Mat Komma getrennt
   datetime:
     distance_in_words_ago:
       half_a_minute: virun enger hallwer Minutt
@@ -968,26 +974,9 @@ lb:
         title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi!
   traces:
     new:
-      upload_gpx: 'GPX-Fichier eroplueden:'
-      description: 'Beschreiwung:'
-      tags: 'Markéierungen:'
-      tags_help: Mat Komma getrennt
-      visibility: 'Visibilitéit:'
       visibility_help: wat heescht dat?
       help: Hëllef
     edit:
-      filename: 'Numm vum Fichier:'
-      download: eroflueden
-      uploaded_at: 'Eropgelueden:'
-      points: 'Punkten:'
-      start_coord: 'Ufankskoordinaten:'
-      map: Kaart
-      edit: änneren
-      owner: 'Besëtzer:'
-      description: 'Beschreiwung:'
-      tags: 'Markéierungen:'
-      tags_help: Mat Komma getrennt
-      visibility: 'Visibilitéit:'
       visibility_help: wat heescht dat?
     show:
       pending: AM SUSPENS
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7a32ccfab..901cd322c 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -107,6 +107,9 @@ lt:
         longitude: Ilguma
         public: Viešas
         description: Aprašymas
+        gpx_file: 'Įkelti GPX failą:'
+        visibility: 'Matomumas:'
+        tagstring: 'Žymos:'
       message:
         sender: Siuntėjas
         title: Antraštė
@@ -119,6 +122,9 @@ lt:
         description: Aprašymas
         languages: Kalbos
         pass_crypt: Slaptažodis
+    help:
+      trace:
+        tagstring: atskirta kableliais
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1808,11 +1814,6 @@ lt:
         taškai surikiuoti su laiko žymėmis)
     new:
       upload_trace: Įkelti GPS pėdsaką
-      upload_gpx: 'Įkelti GPX failą:'
-      description: Aprašymas
-      tags: 'Žymos:'
-      tags_help: atskirta kableliais
-      visibility: 'Matomumas:'
       visibility_help: ką tai reiškia?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Pagalba
@@ -1834,18 +1835,6 @@ lt:
     edit:
       title: Taisomas pėdsakas %{name}
       heading: Taisomas pėdsakas %{name}
-      filename: 'Failo vardas:'
-      download: atsisiųsti
-      uploaded_at: 'Įkelta:'
-      points: 'Taškai:'
-      start_coord: 'Pradžios koordinatės:'
-      map: žemėlapis
-      edit: redaguoti
-      owner: 'Savininkas:'
-      description: 'Aprašymas:'
-      tags: 'Žymos:'
-      tags_help: atskirti kableliu
-      visibility: 'Matomumas:'
       visibility_help: ką tai reiškia?
     update:
       updated: Pėdsakas įkeltas
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 0cce5551f..83ecf5610 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -105,6 +105,9 @@ lv:
         longitude: Garums
         public: Publisks
         description: Apraksts
+        gpx_file: 'Augšupielādēt GPX failu:'
+        visibility: 'Redzamība:'
+        tagstring: 'Iezīmes:'
       message:
         sender: Sūtītājs
         title: Temats
@@ -117,6 +120,9 @@ lv:
         description: Apraksts
         languages: Valodas
         pass_crypt: Parole
+    help:
+      trace:
+        tagstring: atdalīts ar komatiem
   editor:
     default: Noklusējuma (pašlaik %{name})
     potlatch:
@@ -1644,11 +1650,6 @@ lv:
       identifiable: Identificējams (rādīts trašu sarakstā un identificējams, sakārtoti
         punkti ar laika nospiedumiem)
     new:
-      upload_gpx: 'Augšupielādēt GPX failu:'
-      description: 'Apraksts:'
-      tags: 'Iezīmes:'
-      tags_help: atdalīts ar komatiem
-      visibility: 'Redzamība:'
       visibility_help: ko tas nozīmē?
       help: Palīdzība
     create:
@@ -1666,18 +1667,6 @@ lv:
     edit:
       title: Rediģē trasi %{name}
       heading: Rediģē trasi %{name}
-      filename: 'Faila nosaukums:'
-      download: lejupielādēt
-      uploaded_at: 'Augšupielādēts:'
-      points: 'Punkti:'
-      start_coord: 'Sākuma koordināte:'
-      map: karte
-      edit: labot
-      owner: 'Īpašnieks:'
-      description: 'Apraksts:'
-      tags: 'Iezīmes:'
-      tags_help: atdalīts ar komatiem
-      visibility: 'Redzamība:'
       visibility_help: ko tas nozīmē?
     trace_optionals:
       tags: Iezīmes
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 077f0e221..914eb791b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -100,6 +100,9 @@ mk:
         longitude: Гео. должина
         public: Јавно
         description: Опис
+        gpx_file: 'Подгни GPX -одатотека:'
+        visibility: 'Видливост:'
+        tagstring: 'Ознаки:'
       message:
         sender: Испраќач
         title: Тема
@@ -112,6 +115,9 @@ mk:
         description: Опис
         languages: Јазици
         pass_crypt: Лозинка
+    help:
+      trace:
+        tagstring: одделено со запирка
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1869,11 +1875,6 @@ mk:
         подредени точки со време)
     new:
       upload_trace: Подигни ГПС-трага
-      upload_gpx: 'Подгни GPX -одатотека:'
-      description: 'Опис:'
-      tags: 'Ознаки:'
-      tags_help: одделено со запирка
-      visibility: 'Видливост:'
       visibility_help: што значи ова?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk
       help: Помош
@@ -1895,18 +1896,6 @@ mk:
     edit:
       title: Ја уредувате трагата %{name}
       heading: Ја уредувате трагата %{name}
-      filename: 'Податотека:'
-      download: преземи
-      uploaded_at: 'Подигнато во:'
-      points: 'Точки:'
-      start_coord: 'Почетна координата:'
-      map: карта
-      edit: уреди
-      owner: 'Сопственик:'
-      description: 'Опис:'
-      tags: 'Ознаки:'
-      tags_help: одделено со запирка
-      visibility: 'Видливост:'
       visibility_help: што значи ова?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk
     update:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 130eb12b1..1ec9cf7b4 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -81,6 +81,8 @@ mr:
         longitude: रेखांश
         public: सार्वजनिक
         description: वर्णन
+        visibility: 'दृश्यता:'
+        tagstring: 'खूणपताका:'
       message:
         sender: प्रेषक
         title: विषय
@@ -93,6 +95,9 @@ mr:
         description: वर्णन
         languages: भाषा
         pass_crypt: परवलीचा शब्द
+    help:
+      trace:
+        tagstring: स्वल्पविरामाने परिसीमित
   editor:
     default: सामान्यतः (सध्या %{name})
     potlatch:
@@ -1150,10 +1155,6 @@ mr:
           तर एक टिप्पणी जोडणे सोपे आहे.
   traces:
     new:
-      description: 'वर्णन:'
-      tags: 'खूणपताका:'
-      tags_help: स्वल्पविरामाने परिसीमित
-      visibility: 'दृश्यता:'
       visibility_help: ह्याचा अर्थ काय?
       help: साहाय्य
     create:
@@ -1161,17 +1162,6 @@ mr:
     edit:
       title: अनुरेख %{name} संपादन
       heading: अनुरेख %{name} संपादन
-      filename: 'संचिकानाम:'
-      download: उतरवा
-      uploaded_at: 'चढविले:'
-      points: 'बिंदू:'
-      map: नकाशा
-      edit: संपादन
-      owner: 'मालक:'
-      description: 'वर्णन:'
-      tags: 'खूणपताका:'
-      tags_help: स्वल्पविरामाने परिसीमित
-      visibility: 'दृश्यता:'
       visibility_help: ह्याचा अर्थ काय?
     trace_optionals:
       tags: खूणपताका
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a9f2c332d..4996351be 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -101,6 +101,9 @@ ms:
         longitude: Garis Bujur
         public: Umum
         description: Keterangan
+        gpx_file: 'Muat Naik Fail GPX:'
+        visibility: 'Keterlihatan:'
+        tagstring: 'Tag:'
       message:
         sender: Pengirim
         title: Subjek
@@ -113,6 +116,9 @@ ms:
         description: Keterangan
         languages: Bahasa
         pass_crypt: Kata laluan
+    help:
+      trace:
+        tagstring: terbatas tanda koma
   datetime:
     distance_in_words_ago:
       about_x_hours: sekitar %{count} jam yang lalu
@@ -1644,11 +1650,6 @@ ms:
       identifiable: Boleh dikenal pasti (dipaparkan dalam senarai jejak sebagai titik
         tersusun yang boleh dikenal pasti dengan cop masa)
     new:
-      upload_gpx: 'Muat Naik Fail GPX:'
-      description: 'Keterangan:'
-      tags: 'Tag:'
-      tags_help: terbatas tanda koma
-      visibility: 'Keterlihatan:'
       visibility_help: apakah maksud ini?
       help: Bantuan
     create:
@@ -1663,18 +1664,6 @@ ms:
     edit:
       title: Menyunting jejak %{name}
       heading: Menyunting jejak %{name}
-      filename: 'Nama fail:'
-      download: muat turun
-      uploaded_at: 'Dimuat naik:'
-      points: 'Titik:'
-      start_coord: 'Koordinat mula:'
-      map: peta
-      edit: sunting
-      owner: 'Pemilik:'
-      description: 'Keterangan:'
-      tags: 'Tag:'
-      tags_help: terbatas tanda koma
-      visibility: 'Keterlihatan:'
       visibility_help: apakah maksud ini?
     trace_optionals:
       tags: Tag
diff --git a/config/locales/my.yml b/config/locales/my.yml
index fb97ebcc5..989ea8f72 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -53,6 +53,7 @@ my:
         longitude: လောင်ဂျီကျု
         public: အများကြည့်
         description: ဖော်ပြချက်
+        visibility: 'မြင်နိုင်မှု:'
       message:
         sender: ပေးပို့သူ
         title: အကြောင်းအရာ
@@ -694,20 +695,11 @@ my:
       start_mapping: မြေပုံ စတင်ရေးဆွဲရန်
   traces:
     new:
-      description: 'ဖော်ပြချက်:'
-      visibility: 'မြင်နိုင်မှု:'
       visibility_help: ဒါက ဘာကိုဆိုလိုတာပါလိမ့်
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: အ​ကူ​အ​ညီ​
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     edit:
-      filename: 'ဖိုင်အမည်:'
-      download: ဒေါင်းလုဒ်
-      map: မြေပုံ
-      edit: ပြင်ဆင်
-      owner: 'ပိုင်ဆိုင်သူ:'
-      description: 'ဖော်ပြချက်:'
-      visibility: 'မြင်နိုင်မှု:'
       visibility_help: ဒါက ဘာကိုဆိုလိုတာပါလိမ့်
     show:
       map: မြေပုံ
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 4daa5b480..413a69a2b 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -116,6 +116,9 @@ nb:
         longitude: Lengdegrad
         public: Offentlig
         description: Beskrivelse
+        gpx_file: 'Last opp GPX-fil:'
+        visibility: 'Synlighet:'
+        tagstring: 'Egenskaper:'
       message:
         sender: Avsender
         title: Emne
@@ -128,6 +131,9 @@ nb:
         description: Beskrivelse
         languages: Språk
         pass_crypt: Passord
+    help:
+      trace:
+        tagstring: kommaseparert
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -426,11 +432,13 @@ nb:
         other: '%{count} kommentarer'
       edit_link: Rediger innlegget
       hide_link: Skjul innlegget
+      unhide_link: Fjern skjuling av dette innlegget
       confirm: Bekreft
       report: Rapporter denne innføringen
     diary_comment:
       comment_from_html: Kommentar fra %{link_user} den %{comment_created_at}
       hide_link: Skjul denne kommentaren
+      unhide_link: Fjern skjuling av denne kommentaren
       confirm: Bekreft
       report: Rapporter denne kommentaren
     location:
@@ -1223,14 +1231,15 @@ nb:
       hi: Hei %{to_user},
       header: '%{from_user} har kommentert på OpenStreetMap-dagbokinnlegget med emnet
         %{subject}:'
-      footer: Du kan også lese kommentaren på %{readurl} og du kan kommentere på %{commenturl}
-        eller svare på %{replyurl}
+      footer: Du kan også lese kommentaren på %{readurl}, og du kan kommentere på
+        %{commenturl} eller sende forfatteren en melding på %{replyurl}
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hei %{to_user},
       header: '%{from_user} har sendt deg en melding gjennom OpenStreetMap med emnet
         %{subject}:'
-      footer_html: Du kan også lese meldingen på %{readurl} og du kan svare på %{replyurl}
+      footer_html: Du kan også lese meldingen på %{readurl}, eller sende forfatteren
+        en melding på %{replyurl}
     friendship_notification:
       hi: Hei %{to_user},
       subject: '[OpenStreetMap] %{user} la deg til som en venn'
@@ -1250,8 +1259,9 @@ nb:
         more_info_2: 'det kan bli funnet hos:'
       success:
         subject: '[OpenStreetMap] Vellykket import av GPX'
-        loaded_successfully: lastet med %{trace_points} av %{possible_points} mulige
-          punkter.
+        loaded_successfully:
+          one: lastet med %{trace_points} av %{possible_points} mulig punkt.
+          other: lastet med %{trace_points} av %{possible_points} mulige punkter.
     signup_confirm:
       subject: '[OpenStreetMap] Velkommen til OpenStreetMap'
       greeting: Hei der!
@@ -1320,8 +1330,8 @@ nb:
         subject_other: '[OpenStreetMap] %{commenter} har kommentert en endring du
           har vist interesse for'
         your_changeset: '%{commenter} har kommentert en av dine endringer %{time}'
-        commented_changeset: '%{commenter} har kommentert en kartendring som du holder
-          oversikten over, opprettet av %{changeset_author} den %{time}'
+        commented_changeset: '%{commenter} kommenterte %{time} en kartendring som
+          du holder oversikten over, opprettet av %{changeset_author}'
         partial_changeset_with_comment: med kommentaren '%{changeset_comment}'
         partial_changeset_without_comment: uten kommentar
       details: Flere detaljer om endringen finnes på %{url}.
@@ -1427,10 +1437,17 @@ nb:
         resultatet under samme lisens. Se <a href=''%{copyright_path}''>Opphavsrett
         og lisenssiden</a> for detaljer.'
       legal_title: Juridisk
-      legal_1_html: |-
-        Dette nettstedet og mange tilknyttede tjenester drives formelt av <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) på vegne av fellesskapet. Bruken av alle OSMF-drevne tjenester er gjenstand for vår <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">politikk for akseptabel bruk</a> og vår <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">personvernspolitikk</a>
-        <br>
-        Vennligst <a href='http://osmfoundation.org/Contact'>kontakt OSMF</a> om du har spørsmål knyttet til lisensiering, opphavsrett eller andre juridiske spørsmål.
+      legal_1_html: Dette nettstedet og mange tilknyttede tjenester drives formelt
+        av <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        på vegne av fellesskapet. Bruken av alle OSMF-drevne tjenester er gjenstand
+        for våre <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">bruksvilkår</a>,
+        vår <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">politikk
+        for akseptabel bruk</a> og vår <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">personvernspolitikk</a>
+      legal_2_html: |-
+        <a href="https://osmfoundation.org/Contact">Kontakt OSMF</a>
+        hvis du har spørsmål rundt lisenser, opphavsrett eller andre juridiske spørsmål.
+        <br />
+        OpenStreetMap, forstørrelsesglasslogoen og State of the Map er <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registrerte varemerker for OSMF</a>.
       partners_title: Partnere
     copyright:
       foreign:
@@ -1458,8 +1475,8 @@ nb:
           distribuere resultatet under samme lisens. Den
           fullstendige <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">juridiske teksten</a> beskriver rettigheter og ansvar.
         intro_3_1_html: |-
-          Kartografien i våre kartruter, samt dokumentasjonen, er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> lisensen (CC BY-SA).
+          Dokumentasjonen vår er lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: Hvordan kreditere OpenStreetMap
         credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene».
         credit_2_1_html: "Du må også gjøre det klart at dataene er tilgjengelige under
@@ -1471,6 +1488,9 @@ nb:
           foreslår vi at du\n henviser dine lesere til openstreetmap.org (kanskje
           ved å utvide\n'OpenStreetMap' til denne fulle adressen), til opendatacommons.org,
           og\n hvis relevant, til creativecommons.org."
+        credit_3_1_html: |-
+          Kartflisene i standardkartlaget på www.openstreetmap.org er et produsert verk («Produced Work») av OpenStreetMap Foundation som bruker data from OpenStreetMap lisensiert under Open Database License. Hvis du bruker disse kartflisene, vennligst bruk følgende kreditering:
+          «Grunnkart og data fra OpenStreetMap og OpenStreetMap Foundation».
         credit_4_html: For et navigerbart elektronisk kart bør krediteringen vises
           i hjørnet på kartet.
         attribution_example:
@@ -1850,11 +1870,6 @@ nb:
         punkter med tidsstempel)
     new:
       upload_trace: Last opp GPS-spor
-      upload_gpx: 'Last opp GPX-fil:'
-      description: 'Beskrivelse:'
-      tags: 'Egenskaper:'
-      tags_help: kommaseparert
-      visibility: 'Synlighet:'
       visibility_help: hva betyr dette?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Hjelp
@@ -1876,18 +1891,6 @@ nb:
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
-      filename: 'Filnavn:'
-      download: last ned
-      uploaded_at: 'Lastet opp:'
-      points: 'Punkter:'
-      start_coord: 'Startkoordinat:'
-      map: kart
-      edit: rediger
-      owner: 'Eier:'
-      description: 'Beskrivelse:'
-      tags: 'Egenskaper:'
-      tags_help: kommaseparert
-      visibility: 'Synlighet:'
       visibility_help: hva betyr dette?
     update:
       updated: Sporet ble oppdatert
@@ -2176,12 +2179,21 @@ nb:
       title: Vilkår
       heading: Vilkår
       heading_ct: Bidragsytervilkår
-      consider_pd: I tillegg til den ovennevnte avtalen anser jeg mine bidrag for
-        å være i public domain
+      read and accept with tou: Les vilkårene for bidragsytere og bruksvilkårene,
+        merk av begge avkrysningsboksene og trykk fortsett.
+      contributor_terms_explain: Denne avtalen beskriver vilkårene for dine eksisterende
+        og framtidige bidrag.
+      read_ct: Jeg har lest og samtykker i vilkårene for bidragsytere
+      tou_explain_html: Disse %{tou_link} beskriver bruken av nettstedet og annen
+        infrastruktur som tilbys av OSMF. Trykk på lenka, les og samtykk til teksten.
+      read_tou: Jeg har lest og samtykker til bruksvilkårene
+      consider_pd: I tillegg til det ovennevnte anser jeg mine bidrag for å være i
+        public domain
       consider_pd_why: hva er dette?
       consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: 'Informasjon for å hjelpe å forstå disse vilkårene: et <a href="%{summary}">menneskelig
         lesbart sammendrag</a> og noen <a href="%{translations}">uformelle oversettelser</a>'
+      continue: Fortsett
       declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Avslå
       you need to accept or decline: Les og deretter enten godta eller avslå de nye
@@ -2221,7 +2233,7 @@ nb:
       ct status: 'Bidragsyters vilkår:'
       ct undecided: Usikker
       ct declined: Avslått
-      latest edit: 'Siste redigering %{ago}:'
+      latest edit: 'Siste redigering (%{ago}):'
       email address: 'E-postadresse:'
       created from: 'Opprettet fra:'
       status: 'Status:'
@@ -2465,7 +2477,7 @@ nb:
       title: Tilbakekaller blokkering på %{block_on}
       heading_html: Tilbakekaller blokkering på %{block_on} av %{block_by}
       time_future: Denne blokkeringen ender om %{time}
-      past: Denne blokkeringen endte for %{time} siden og kan ikke tilbakekalles nå.
+      past: Denne blokkeringen endte for %{time} og kan ikke tilbakekalles nå.
       confirm: Er du sikker på at du vil tilbakekalle denne blokkeringen?
       revoke: Tilbakekall!
       flash: Denne blokkeringen har blitt tilbakekalt.
@@ -2474,7 +2486,7 @@ nb:
       until_login: Aktiv inntil brukeren logger inn.
       time_future_and_until_login: Slutter om %{time} og etter at brukeren har logget
         inn.
-      time_past: Sluttet for %{time} siden.
+      time_past: Sluttet for %{time}.
       block_duration:
         hours:
           one: 1 time
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 34f26d803..8a304025e 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -93,6 +93,9 @@ ne:
         longitude: देशान्तर
         public: सार्वजनिक
         description: वर्णन
+        gpx_file: 'जिपिएक्स फाइल उर्ध्वभरण गर्नुहाेस्:'
+        visibility: 'दृश्यक्षमता:'
+        tagstring: ट्यागहरूः
       message:
         sender: पठाउने
         title: विषय
@@ -105,6 +108,9 @@ ne:
         description: वर्णन
         languages: भाषाहरू
         pass_crypt: पासवर्ड
+    help:
+      trace:
+        tagstring: अल्पविरामले छुट्याएको
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
@@ -1057,11 +1063,6 @@ ne:
         title: नियमहरू !
   traces:
     new:
-      upload_gpx: 'जिपिएक्स फाइल उर्ध्वभरण गर्नुहाेस्:'
-      description: 'विवरण:'
-      tags: ट्यागहरूः
-      tags_help: अल्पविरामले छुट्याएको
-      visibility: 'दृश्यक्षमता:'
       visibility_help: यसको मतलाब के हो ?
       help: सहायता
     create:
@@ -1069,18 +1070,6 @@ ne:
     edit:
       title: ट्रेस सम्पादन गर्दै %{name}
       heading: ट्रेस सम्पादन गर्दै %{name}
-      filename: 'फाइलनाम:'
-      download: डाउनलोड
-      uploaded_at: 'आध्यवधिक गरिएको:'
-      points: 'बिन्दुहरु:'
-      start_coord: 'निर्देशंक सुरु गर्ने:'
-      map: नक्सा
-      edit: सम्पादन
-      owner: 'मालिक:'
-      description: विवरण
-      tags: ट्यागहरूः
-      tags_help: अल्पविरामले छुट्याएको
-      visibility: 'दृश्यक्षमता:'
       visibility_help: यसको मतलब के हो ?
     trace_optionals:
       tags: ट्यागहरू
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f0e88824a..76e33a035 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -146,6 +146,9 @@ nl:
         longitude: Lengtegraad
         public: Openbaar
         description: Beschrijving
+        gpx_file: 'GPX-bestand uploaden:'
+        visibility: 'Zichtbaarheid:'
+        tagstring: 'Labels:'
       message:
         sender: Afzender
         title: Onderwerp
@@ -158,6 +161,9 @@ nl:
         description: Beschrijving
         languages: Talen
         pass_crypt: Wachtwoord
+    help:
+      trace:
+        tagstring: kommagescheiden
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1928,11 +1934,6 @@ nl:
         geordende punten met tijdstempels)
     new:
       upload_trace: Gps-traject uploaden
-      upload_gpx: 'GPX-bestand uploaden:'
-      description: 'Beschrijving:'
-      tags: 'Labels:'
-      tags_help: kommagescheiden
-      visibility: 'Zichtbaarheid:'
       visibility_help: wat betekent dit?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces‎
       help: Hulp
@@ -1954,18 +1955,6 @@ nl:
     edit:
       title: Traject %{name} bewerken
       heading: Traject %{name} bewerken
-      filename: 'Bestandsnaam:'
-      download: downloaden
-      uploaded_at: 'Geüpload op:'
-      points: 'Punten:'
-      start_coord: 'Startcoördinaat:'
-      map: kaart
-      edit: bewerken
-      owner: 'Eigenaar:'
-      description: 'Beschrijving:'
-      tags: 'Labels:'
-      tags_help: kommagescheiden
-      visibility: 'Zichtbaarheid:'
       visibility_help: wat betekent dit?
     update:
       updated: Traject bijgewerkt
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 4d7c7a321..7ccc5eddb 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -108,6 +108,9 @@ nn:
         longitude: Lengdegrad
         public: Offentleg
         description: Skildring
+        gpx_file: 'Last opp GPX-fil:'
+        visibility: 'Synligheit:'
+        tagstring: 'Merkelappar:'
       message:
         sender: Sendar
         title: Emne
@@ -120,6 +123,9 @@ nn:
         description: Skildring
         languages: Språk
         pass_crypt: Passord
+    help:
+      trace:
+        tagstring: kommaseparert
   printable_name:
     with_version: '%{id}, v%{version}'
   editor:
@@ -1435,11 +1441,6 @@ nn:
       identifiable: Identifiserbar (vist i sporlista og som identifiserbare, sorterte
         punkt med tidsstempel)
     new:
-      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
       help: Hjelp
@@ -1455,18 +1456,6 @@ nn:
     edit:
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
-      filename: 'Filnamn:'
-      download: last ned
-      uploaded_at: 'Last opp:'
-      points: 'Punkter:'
-      start_coord: 'Startkoordinat:'
-      map: kart
-      edit: rediger
-      owner: 'Eigar:'
-      description: 'Skildring:'
-      tags: 'Markelapper:'
-      tags_help: kommaseparert
-      visibility: 'Synlegheit:'
       visibility_help: kva tyder dette?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 872796b1d..d41fe1a25 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -99,6 +99,9 @@ oc:
         longitude: Longitud
         public: Public
         description: Descripcion
+        gpx_file: 'Mandar un fichièr GPX :'
+        visibility: 'Visibilitat :'
+        tagstring: 'Balisas :'
       message:
         sender: Expeditor
         title: Subjècte
@@ -111,6 +114,9 @@ oc:
         description: Descripcion
         languages: Lengas
         pass_crypt: Senhau
+    help:
+      trace:
+        tagstring: separadas per de virgulas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1790,11 +1796,6 @@ oc:
         punts ordenats amb las datas)
     new:
       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ò ?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/OC:Visibilitat_dei_traças_GPS
       help: Ajuda
@@ -1809,18 +1810,6 @@ oc:
     edit:
       title: Modificar la traça %{name}
       heading: Modificar la traça %{name}
-      filename: 'Nom del fichièr :'
-      download: telecargar
-      uploaded_at: 'Mandat lo :'
-      points: 'Punts :'
-      start_coord: 'Coordenadas de despart :'
-      map: mapa
-      edit: modificar
-      owner: 'Proprietari :'
-      description: 'Descripcion :'
-      tags: 'Balisas :'
-      tags_help: separadas per de virgulas
-      visibility: 'Visibilitat :'
       visibility_help: qué significa aquò ?
     update:
       updated: Traça actualizada
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 212ef496a..2aebc68bf 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -93,6 +93,8 @@ pa:
         longitude: ਲੰਬਕਾਰ
         public: ਜਨਤਕ
         description: ਵੇਰਵਾ
+        visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
+        tagstring: 'ਟੈਗ:'
       message:
         sender: ਭੇਜਣ ਵਾਲਾ
         title: ਵਿਸ਼ਾ
@@ -964,22 +966,9 @@ pa:
         title: ਸੋਧਣ ਦੀ ਵਿਹਲ ਨਹੀਂ? ਕੋਈ ਨੋਟ ਜੋੜੋ!
   traces:
     new:
-      description: 'ਵੇਰਵਾ:'
-      tags: 'ਟੈਗ:'
-      visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
       visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ?
       help: ਮਦਦ
     edit:
-      filename: 'ਫ਼ਾਈਲ ਦਾ ਨਾਂ:'
-      download: ਡਾਊਨਲੋਡ
-      uploaded_at: 'ਅੱਪਲੋਡ ਹੋਇਆ:'
-      points: 'ਬਿੰਦੂ:'
-      map: ਨਕਸ਼ਾ
-      edit: ਸੋਧੋ
-      owner: 'ਮਾਲਕ:'
-      description: 'ਵੇਰਵਾ:'
-      tags: 'ਟੈਗ:'
-      visibility: 'ਦਿੱਸਣਯੋਗਤਾ:'
       visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ?
     trace_optionals:
       tags: ਟੈਗ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3636b5035..9b3e160c1 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -65,6 +65,8 @@ pl:
       friendly: '%e %B %Y o %H:%M'
       blog: '%e.%m.%Y'
   helpers:
+    file:
+      prompt: Wybierz plik
     submit:
       diary_comment:
         create: Zapisz
@@ -143,12 +145,15 @@ pl:
       trace:
         user: Użytkownik
         visible: Widoczny
-        name: Nazwa
+        name: Nazwa pliku
         size: Rozmiar
         latitude: Szerokość geograficzna
         longitude: Długość geograficzna
         public: Publiczny
         description: Opis
+        gpx_file: Prześlij plik GPX
+        visibility: Widoczność
+        tagstring: Tagi
       message:
         sender: Nadawca
         title: Temat
@@ -161,6 +166,9 @@ pl:
         description: Opis
         languages: Języki
         pass_crypt: Hasło
+    help:
+      trace:
+        tagstring: rozdzielone przecinkami
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1939,11 +1947,6 @@ pl:
         uporządkowane punkty ze znacznikami czasu)
     new:
       upload_trace: Wgraj ślad GPS
-      upload_gpx: Prześlij plik GPX
-      description: Opis
-      tags: 'Tagi:'
-      tags_help: rozdzielone przecinkami
-      visibility: Widoczność
       visibility_help: co to znaczy?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Pl:Visibility_of_GPS_traces
       help: Pomoc
@@ -1962,20 +1965,9 @@ pl:
         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.'
     edit:
+      cancel: Anuluj
       title: Edycja śladu %{name}
       heading: Edycja śladu %{name}
-      filename: 'Nazwa pliku:'
-      download: pobierz
-      uploaded_at: 'Wysłano:'
-      points: 'Liczba punktów:'
-      start_coord: 'Współrzędne początkowe:'
-      map: mapa
-      edit: edytuj
-      owner: 'Autor:'
-      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
     update:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a4ce348d8..728eb2cfd 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -140,6 +140,9 @@ pt-BR:
         longitude: Longitude
         public: Público
         description: Descrição
+        gpx_file: 'Enviar Arquivo GPX:'
+        visibility: 'Visibilidade:'
+        tagstring: 'Etiquetas:'
       message:
         sender: Remetente
         title: Assunto
@@ -152,6 +155,9 @@ pt-BR:
         description: Descrição
         languages: Idiomas
         pass_crypt: Senha
+    help:
+      trace:
+        tagstring: separados por vírgulas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1919,11 +1925,6 @@ pt-BR:
         e com informação de horário)
     new:
       upload_trace: Envie as trilhas de GPS
-      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
       help: Ajuda
@@ -1945,18 +1946,6 @@ pt-BR:
     edit:
       title: Editando trilha %{name}
       heading: Editando trilha %{name}
-      filename: 'Nome do arquivo:'
-      download: baixar
-      uploaded_at: 'Enviado em:'
-      points: 'Pontos:'
-      start_coord: 'Coordenada inicial:'
-      map: mapa
-      edit: editar
-      owner: 'Dono:'
-      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
     update:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 19d8aeac0..3da3ff88a 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -128,6 +128,9 @@ pt-PT:
         longitude: Longitude
         public: Público
         description: Descrição
+        gpx_file: 'Enviar ficheiro GPX:'
+        visibility: 'Visibilidade:'
+        tagstring: 'Etiquetas:'
       message:
         sender: Remetente
         title: Assunto
@@ -140,6 +143,9 @@ pt-PT:
         description: Descrição
         languages: Idiomas
         pass_crypt: Palavra-passe
+    help:
+      trace:
+        tagstring: separadas por vírgulas
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1892,11 +1898,6 @@ pt-PT:
         pontos ordenados com data e hora)
     new:
       upload_trace: Enviar Rota GPS
-      upload_gpx: 'Enviar ficheiro GPX:'
-      description: 'Descrição:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por vírgulas
-      visibility: 'Visibilidade:'
       visibility_help: o que significa isto?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Pt:Visibility_of_GPS_traces
       help: Ajuda
@@ -1919,18 +1920,6 @@ pt-PT:
     edit:
       title: A editar a rota %{name}
       heading: A editar a rota %{name}
-      filename: 'Nome do ficheiro:'
-      download: transferir
-      uploaded_at: 'Enviada em:'
-      points: 'Pontos:'
-      start_coord: 'Coordenada inicial:'
-      map: mapa
-      edit: editar
-      owner: 'Autor:'
-      description: 'Descrição:'
-      tags: 'Etiquetas:'
-      tags_help: separadas por vírgulas
-      visibility: 'Visibilidade:'
       visibility_help: o que significa isto?
     update:
       updated: Rota atualizada
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 4fb834f3f..853d60c50 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -107,6 +107,9 @@ ro:
         longitude: Longitudine
         public: Public
         description: Descriere
+        gpx_file: 'Încărcați fișier GPX:'
+        visibility: 'Vizibilitate:'
+        tagstring: 'Etichete:'
       message:
         sender: Expeditor
         title: Subiect
@@ -119,6 +122,9 @@ ro:
         description: Descriere
         languages: Limbi
         pass_crypt: Parolă
+    help:
+      trace:
+        tagstring: utilizează virgule
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1884,11 +1890,6 @@ ro:
         ordonate cu marcatori de timp)
     new:
       upload_trace: Încărcați Urma GPS
-      upload_gpx: 'Încărcați fișier GPX:'
-      description: 'Descriere:'
-      tags: 'Etichete:'
-      tags_help: utilizează virgule
-      visibility: 'Vizibilitate:'
       visibility_help: ce înseamnă asta?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Ajutor
@@ -1910,18 +1911,6 @@ ro:
     edit:
       title: Editarea traseului %{name}
       heading: Editarea traseului %{name}
-      filename: 'Nume fișier:'
-      download: descarcă
-      uploaded_at: 'Încărcat:'
-      points: 'Puncte:'
-      start_coord: 'Start coordonate:'
-      map: hartă
-      edit: modificare
-      owner: 'Proprietar:'
-      description: 'Descriere:'
-      tags: 'Etichete:'
-      tags_help: delimitate prin virgulă
-      visibility: 'Vizibilitate:'
       visibility_help: ce înseamnă asta?
     update:
       updated: Traseul a fost actualizat
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 3d763a7be..9afce87e8 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -175,6 +175,9 @@ ru:
         longitude: Долгота
         public: Публичный
         description: Описание
+        gpx_file: Загрузить GPX-файл
+        visibility: 'Видимость:'
+        tagstring: 'Теги:'
       message:
         sender: Отправитель
         title: Тема
@@ -187,6 +190,9 @@ ru:
         description: Описание
         languages: Языки
         pass_crypt: Пароль
+    help:
+      trace:
+        tagstring: через запятую
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -488,7 +494,7 @@ ru:
     diary_entry:
       posted_by_html: Опубликован %{link_user} %{created} на языке %{language_link}
       comment_link: Оставить комментарий
-      reply_link: Ответить
+      reply_link: Написать автору
       comment_count:
         few: '%{count} комментария'
         one: '%{count} комментарий'
@@ -1946,11 +1952,6 @@ ru:
         упорядоченные точки с отметками времени)
     new:
       upload_trace: Передать GPS-трек на сервер
-      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
       help: Справка
@@ -1972,18 +1973,6 @@ ru:
     edit:
       title: Редактирование трека %{name}
       heading: Редактирование трека %{name}
-      filename: 'Имя файла:'
-      download: скачать
-      uploaded_at: 'Передан на сервер:'
-      points: 'Точек:'
-      start_coord: 'Координаты начала:'
-      map: карта
-      edit: править
-      owner: 'Владелец:'
-      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
     update:
@@ -2725,6 +2714,7 @@ ru:
         cycle_map: Велосипедная карта
         transport_map: Карта транспорта
         hot: Гуманитарная
+        opnvkarte: ÖPNVKarte
       layers:
         header: Слои карты
         notes: Заметки
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 355951d00..8ef2b8c4a 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -85,6 +85,8 @@ sc:
         longitude: Longitùdine
         public: Pùblicu
         description: Descritzione
+        visibility: 'Visibilidade:'
+        tagstring: 'Etichetas:'
       message:
         title: Ogetu
         body: Corpus
@@ -910,24 +912,12 @@ sc:
         title: No Time To Edit? Annanghe una nota!
   traces:
     new:
-      description: 'Descritzione:'
-      tags: 'Etichetas:'
-      visibility: 'Visibilidade:'
       visibility_help: ite cheret nàrrere?
       help: Agiudu
     create:
       upload_failed: Sorry, the GPX upload failed. An administrator has been alerted
         to the error. Torra·bi a proare.
     edit:
-      filename: 'Nùmene documentu:'
-      download: iscàrriga
-      points: 'Puntos:'
-      map: mapa
-      edit: modìfica
-      owner: 'Mere:'
-      description: 'Descritzione:'
-      tags: 'Etichetas:'
-      visibility: 'Visibilidade:'
       visibility_help: ite cheret nàrrere?
     trace_optionals:
       tags: Etichetas
diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 3153ddece..2885354d9 100644
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -88,6 +88,9 @@ scn:
         longitude: Luncitùdini
         public: Pùbblicu
         description: Discrizzioni
+        gpx_file: 'Carricari lu file GPX:'
+        visibility: 'Visibbilità:'
+        tagstring: 'Etichetti:'
       message:
         sender: Mittenti
         title: Oggettu
@@ -100,6 +103,9 @@ scn:
         description: Discrizzioni
         languages: Lingui
         pass_crypt: Palora d'òrdini
+    help:
+      trace:
+        tagstring: spartuti câ vìrgula
   editor:
     default: Pridifinutu (com'a ora %{name})
     potlatch:
@@ -1582,11 +1588,6 @@ scn:
       identifiable: Idintificàbbili (ammustratu ntâ lista dî tracciati e comu idintificàbbili,
         punti ordinati e cu marchi timpurali)
     new:
-      upload_gpx: 'Carricari lu file GPX:'
-      description: 'Discrizzioni:'
-      tags: 'Etichetti:'
-      tags_help: spartuti câ vìrgula
-      visibility: 'Visibbilità:'
       visibility_help: chi voli diri?
       help: Guida
     create:
@@ -1604,18 +1605,6 @@ scn:
     edit:
       title: Canciamentu dû tracciatu %{name}
       heading: Canciamentu dû tracciatu %{name}
-      filename: 'Nomu dû file:'
-      download: scàrrica
-      uploaded_at: 'Carricatu lu:'
-      points: 'Punti:'
-      start_coord: 'Coordinata di principiu:'
-      map: mappa
-      edit: cancia
-      owner: 'Prupitariu:'
-      description: 'Discrizzioni:'
-      tags: 'Etichetti:'
-      tags_help: spartuti câ vìrgula
-      visibility: 'Visibbilità:'
       visibility_help: chi voli diri?
     trace_optionals:
       tags: Etichetti
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e8f79a2b7..793c43825 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -110,6 +110,9 @@ sk:
         longitude: Zem. dĺžka
         public: Verejné
         description: Popis
+        gpx_file: 'Nahrať GPX súbor:'
+        visibility: 'Viditeľnosť:'
+        tagstring: 'Značky:'
       message:
         sender: Odosielateľ
         title: Predmet
@@ -122,6 +125,9 @@ sk:
         description: Popis
         languages: Jazyky
         pass_crypt: Heslo
+    help:
+      trace:
+        tagstring: oddelené čiarkou
   datetime:
     distance_in_words_ago:
       half_a_minute: pred pol minútou
@@ -1496,11 +1502,6 @@ sk:
       identifiable: Identifikovateľné (zobrazené v zozname stôp, aj ako identifikovateľné,
         usporiadané body s časovou značkou)
     new:
-      upload_gpx: 'Nahrať GPX súbor:'
-      description: 'Popis:'
-      tags: 'Značky:'
-      tags_help: oddelené čiarkou
-      visibility: 'Viditeľnosť:'
       visibility_help: čo toto znamená?
       help: Pomoc
     create:
@@ -1513,18 +1514,6 @@ sk:
     edit:
       title: Úprava stopy %{name}
       heading: Úprava stopy %{name}
-      filename: 'Názov súboru:'
-      download: stiahnuť
-      uploaded_at: 'Nahrať na:'
-      points: 'Body:'
-      start_coord: 'Začiatočná súradnica:'
-      map: mapa
-      edit: upraviť
-      owner: 'Vlastník:'
-      description: 'Popis:'
-      tags: 'Tagy:'
-      tags_help: oddelené čiarkou
-      visibility: 'Viditeľnosť:'
       visibility_help: čo má toto znamenať?
     trace_optionals:
       tags: Tagy
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index e92ed4d18..bbff76f6b 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -103,6 +103,9 @@ sl:
         longitude: Zemljepisna dolžina
         public: Javnost sledi
         description: Opis
+        gpx_file: 'Naložite datoteko GPX:'
+        visibility: 'Vidljivost:'
+        tagstring: 'Oznake:'
       message:
         sender: Pošiljatelj
         title: Zadeva
@@ -115,6 +118,9 @@ sl:
         description: Opis
         languages: Jeziki
         pass_crypt: Geslo
+    help:
+      trace:
+        tagstring: uporabite vejice
   datetime:
     distance_in_words_ago:
       half_a_minute: pol minute nazaj
@@ -1552,11 +1558,6 @@ sl:
         s časom)
     new:
       upload_trace: Naloži sled GPS
-      upload_gpx: 'Naložite datoteko GPX:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: uporabite vejice
-      visibility: 'Vidljivost:'
       visibility_help: kaj to pomeni?
       help: Pomoč
     create:
@@ -1574,18 +1575,6 @@ sl:
     edit:
       title: Urejanje sledi %{name}
       heading: Urejanje sledi %{name}
-      filename: 'Ime datoteke:'
-      download: prenos
-      uploaded_at: 'Poslano na strežnik:'
-      points: 'Točk:'
-      start_coord: 'Začetna koordinata:'
-      map: zemljevid
-      edit: uredi
-      owner: 'Lastnik:'
-      description: 'Opis:'
-      tags: 'Oznake:'
-      tags_help: ločene z vejicami
-      visibility: 'Vidljivost:'
       visibility_help: kaj to pomeni?
     trace_optionals:
       tags: Oznake
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 8f7db24b5..aa14ffb02 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -93,6 +93,9 @@ sq:
         longitude: Gjatësia gjeografike
         public: Publik
         description: Përshkrimi
+        gpx_file: 'Ngarko një skedar GPX:'
+        visibility: 'Dukshmëria:'
+        tagstring: 'Etiketat:'
       message:
         sender: Dërguesi
         title: Titulli
@@ -105,6 +108,9 @@ sq:
         description: Përshkrimi
         languages: Gjuhët
         pass_crypt: Fjalëkalimi
+    help:
+      trace:
+        tagstring: ndarë me presje
   printable_name:
     with_version: '%{id}, v%{version}'
   editor:
@@ -1250,11 +1256,6 @@ sq:
         të pikave të renditura me vulë kohore)
     new:
       upload_trace: Ngarko GPS Percjellesin
-      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
       help: Ndihmë
@@ -1270,18 +1271,6 @@ sq:
     edit:
       title: Duke redaktuar gjurmën %{name}
       heading: Duke redaktuar gjurmën %{name}
-      filename: 'Emri i skedës:'
-      download: shkarko
-      uploaded_at: 'Ngarkuar:'
-      points: 'Pikë:'
-      start_coord: 'Fillo koordinatën:'
-      map: harta
-      edit: redakto
-      owner: 'Pronari:'
-      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
     trace_optionals:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 0fd5ba11b..4766c80bd 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -89,6 +89,9 @@ sr-Latn:
         longitude: Geografska dužina
         public: Javno
         description: Opis
+        gpx_file: 'Otpremi GPX datoteku:'
+        visibility: 'Vidljivost:'
+        tagstring: 'Oznake:'
       message:
         sender: Pošiljalac
         title: Naslov
@@ -101,6 +104,9 @@ sr-Latn:
         description: Opis
         languages: Jezici
         pass_crypt: Lozinka
+    help:
+      trace:
+        tagstring: razdvojeno zapetama
   printable_name:
     with_version: '%{id}, ver. %{version}'
   editor:
@@ -1115,11 +1121,6 @@ sr-Latn:
       identifiable: Može se prepoznati (prikazano u spisku tragova kao javne, poređane
         i datirane tačke)
     new:
-      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
       help: Pomoć
@@ -1134,18 +1135,6 @@ sr-Latn:
     edit:
       title: Uređivanje traga %{name}
       heading: Uređivanje traga %{name}
-      filename: 'Naziv datoteke:'
-      download: preuzmi
-      uploaded_at: 'Otpremljeno:'
-      points: 'Tačaka:'
-      start_coord: 'Početna koordinata:'
-      map: mapa
-      edit: uredi
-      owner: 'Vlasnik:'
-      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
     trace_optionals:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 45641df31..b02523006 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -112,6 +112,9 @@ sr:
         longitude: Географска дужина
         public: Јавно
         description: Опис
+        gpx_file: 'Отпреми GPX датотеку:'
+        visibility: 'Видљивост:'
+        tagstring: 'Ознаке:'
       message:
         sender: Пошиљалац
         title: Наслов
@@ -124,6 +127,9 @@ sr:
         description: Опис
         languages: Језици
         pass_crypt: Лозинка
+    help:
+      trace:
+        tagstring: раздвојено запетама
   datetime:
     distance_in_words_ago:
       half_a_minute: пре пола минута
@@ -1745,11 +1751,6 @@ sr:
         и датиране тачке)
     new:
       upload_trace: Отпреми GPS траг
-      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
       help: Помоћ
@@ -1767,18 +1768,6 @@ sr:
     edit:
       title: Уређивање трага %{name}
       heading: Уређивање трага %{name}
-      filename: 'Назив датотеке:'
-      download: преузми
-      uploaded_at: 'Отпремљено:'
-      points: 'Тачака:'
-      start_coord: 'Почетна координата:'
-      map: мапа
-      edit: уреди
-      owner: 'Власник:'
-      description: 'Опис:'
-      tags: 'Ознаке:'
-      tags_help: раздвојено запетама
-      visibility: 'Видљивост:'
       visibility_help: шта ово значи?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec
     update:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7410638a8..38d9f203a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -136,6 +136,9 @@ sv:
         longitude: Longitud
         public: Offentlig
         description: Beskrivning
+        gpx_file: 'Ladda upp GPX-fil:'
+        visibility: 'Synlighet:'
+        tagstring: 'Taggar:'
       message:
         sender: Avsändare
         title: Ämne
@@ -148,6 +151,9 @@ sv:
         description: Beskrivning
         languages: Språk
         pass_crypt: Lösenord
+    help:
+      trace:
+        tagstring: kommaseparerad
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1251,13 +1257,13 @@ sv:
       header: '%{from_user} har kommenterat dagboksinlägget på OpenStreetMap med rubriken
         %{subject}:'
       footer: Du kan också läsa kommentaren på %{readurl} och du kan kommentera på
-        %{commenturl} eller svara på %{replyurl}
+        %{commenturl} eller skicka ett meddelande till författaren på %{replyurl}
     message_notification:
       hi: Hej %{to_user},
       header: '%{from_user} har skickat ett meddelande via OpenStreetMap med ämnet
         %{subject}:'
-      footer_html: Du kan också läsa meddelandet på %{readurl} och du kan svara på
-        %{replyurl}
+      footer_html: Du kan också läsa meddelandet på %{readurl} och du kan skicka ett
+        meddelande till författaren på %{replyurl}
     friendship_notification:
       hi: Hej %{to_user},
       subject: '[OpenStreetMap] %{user} lade till dig som en vän'
@@ -1902,11 +1908,6 @@ sv:
         med tidsstämpel)
     new:
       upload_trace: Ladda upp GPS-spår
-      upload_gpx: 'Ladda upp GPX-fil:'
-      description: 'Beskrivning:'
-      tags: 'Taggar:'
-      tags_help: kommaseparerad
-      visibility: 'Synlighet:'
       visibility_help: vad betyder detta?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Sv:Visibility_of_GPS_traces
       help: Hjälp
@@ -1928,18 +1929,6 @@ sv:
     edit:
       title: Redigerar spår %{name}
       heading: Redigerar spår %{name}
-      filename: 'Filnamn:'
-      download: ladda ner
-      uploaded_at: 'Uppladdad:'
-      points: 'Punkter:'
-      start_coord: 'Startkoordinat:'
-      map: karta
-      edit: redigera
-      owner: 'Ägare:'
-      description: 'Beskrivning:'
-      tags: 'Taggar:'
-      tags_help: kommaseparerad
-      visibility: 'Synlighet:'
       visibility_help: vad betyder detta?
     update:
       updated: Spår uppdaterades
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 64c3c975d..fb35112d5 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -88,6 +88,8 @@ ta:
         longitude: குத்துயரம்
         public: பொது
         description: விளக்கம்
+        visibility: 'காணும்தூரம்:'
+        tagstring: 'குறிச்சொற்கள்:'
       message:
         sender: அனுப்புனர்
         title: பொருள்
@@ -100,6 +102,9 @@ ta:
         description: விளக்கம்
         languages: மொழிகள்
         pass_crypt: கடவுச்சொல்
+    help:
+      trace:
+        tagstring: காற்புள்ளி வரம்பில்லை
   editor:
     default: இயல்புநிலை (தற்போதைய %{name})
     potlatch:
@@ -630,24 +635,9 @@ ta:
         title: விதிமுறைகள்!
   traces:
     new:
-      description: 'விளக்கம்:'
-      tags: 'குறிச்சொற்கள்:'
-      tags_help: காற்புள்ளி வரம்பில்லை
-      visibility: 'காணும்தூரம்:'
       visibility_help: இது எதைக் குறிக்கிறது?
       help: உதவி
     edit:
-      filename: 'கோப்புப்பெயர்:'
-      download: தரவிறக்கு
-      uploaded_at: 'பதிவேற்றப்பட்டது:'
-      points: 'புள்ளிகள்:'
-      map: வரைபடம்
-      edit: தொகு
-      owner: 'உரிமையாளர்:'
-      description: 'விளக்கம்:'
-      tags: 'குறிச்சொற்கள்:'
-      tags_help: காற்புள்ளி வரம்பில்லை
-      visibility: 'காணும்தூரம்:'
       visibility_help: இது எதைக் குறிக்கிறது?
     trace_optionals:
       tags: குறிச்சொற்கள்
diff --git a/config/locales/te.yml b/config/locales/te.yml
index 5c8fa1bc8..8924f1bad 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -82,6 +82,9 @@ te:
         description: వివరణ
         languages: భాషలు
         pass_crypt: సంకేతపదం
+    help:
+      trace:
+        tagstring: కామాలతో వేరుపరచినవి
   editor:
     default: అప్రమేయం (ప్రస్తుతం %{name})
   api:
@@ -650,19 +653,9 @@ te:
         title: సరిదిద్దేంత సమయం లేదా? ఒక గమనికను చేర్చండి!
   traces:
     new:
-      description: 'వివరణ:'
-      tags_help: కామాలతో వేరుపరచినవి
       visibility_help: దీని అర్థమేమిటి?
       help: సహాయం
     edit:
-      filename: 'ఫైలుపేరు:'
-      download: దింపుకోలు
-      points: 'బిందువులు:'
-      edit: మార్చు
-      owner: 'యజమాని:'
-      description: 'వివరణ:'
-      tags_help: కామాలతో వేరుపరచిన
-      visibility: 'దృశ్యత:'
       visibility_help: దీని అర్థం ఏమిటి?
     show:
       filename: 'ఫైలుపేరు:'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b9972a265..1392413c5 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -96,6 +96,9 @@ th:
         longitude: ลองติจูด
         public: สาธารณะ
         description: คำอธิบาย
+        gpx_file: 'อัปโหลดแฟ้ม GPX:'
+        visibility: 'สถานะการแสดง:'
+        tagstring: 'ป้ายกำกับ:'
       message:
         sender: ผู้ส่ง
         title: หัวเรื่อง
@@ -108,6 +111,9 @@ th:
         description: คำอธิบาย
         languages: ภาษา
         pass_crypt: รหัสผ่าน
+    help:
+      trace:
+        tagstring: คั่นด้วยจุลภาค
   datetime:
     distance_in_words_ago:
       about_x_years: ประมาณ %{count} ปีก่อน
@@ -1579,11 +1585,6 @@ th:
       trackable: ติดตามได้ (แสดงในนามผู้ไม่ประสงค์ออกนาม แต่ละจุดมีเวลากำกับ)
       identifiable: ระบุได้ (แสดงเป็นชื่อให้ติดตามได้ แต่ละจุดมีเวลากำกับ)
     new:
-      upload_gpx: 'อัปโหลดแฟ้ม GPX:'
-      description: 'คำอธิบาย:'
-      tags: 'ป้ายกำกับ:'
-      tags_help: คั่นด้วยจุลภาค
-      visibility: 'สถานะการแสดง:'
       visibility_help: นี่หมายความว่าอะไร?
       help: วิธีใช้
     create:
@@ -1593,16 +1594,6 @@ th:
       traces_waiting: คุณมีรอยทาง %{count} ชุด ที่กำลังรออัพโหลด กรุณารอให้การอัพโหลดเหล่านี้เสร็จสิ้น
         ก่อนที่จะเพิ่มรอยทางชุดต่อไป, เพื่อไม่ให้ผู้ใช้คนอื่นๆ จะต้องรอคิวนาน
     edit:
-      filename: 'ชื่อแฟ้ม:'
-      download: ดาวน์โหลด
-      uploaded_at: 'อัปโหลดเมื่อ:'
-      points: 'จุด:'
-      start_coord: 'เริ่มจากตำแหน่ง:'
-      map: แผนที่
-      edit: แก้ไข
-      tags: 'ป้ายกำกับ:'
-      tags_help: คั่นด้วยจุลภาค
-      visibility: 'สถานะการแสดง:'
       visibility_help: นี่หมายความว่าอะไร?
     trace_optionals:
       tags: ป้ายกำกับ
diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index aa79d27b1..9cf2c0f1f 100644
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -97,6 +97,9 @@ tl:
         longitude: Longhitud
         public: Pangmadla
         description: Paglalarawan
+        gpx_file: 'Ikargang paitaas ang Talaksang GPX:'
+        visibility: 'Pagkanatatanaw:'
+        tagstring: 'Mga tatak:'
       message:
         sender: Nagpadala
         title: Paksa
@@ -109,6 +112,9 @@ tl:
         description: Paglalarawan
         languages: Mga wika
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: hindi hinangganang kuwit
   printable_name:
     with_version: '%{id}, v%{version}'
   editor:
@@ -1367,11 +1373,6 @@ tl:
         nakaayos na mga puntos na may mga tatak ng oras)
     new:
       upload_trace: I-upload ang 'GPS Trace'
-      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
       help: Saklolo
@@ -1388,18 +1389,6 @@ tl:
     edit:
       title: Binabago ang bakas na %{name}
       heading: Binabago ang %{name} ng bakas
-      filename: 'Pangalan ng talaksan:'
-      download: ikargang paibaba
-      uploaded_at: 'Naikargang paitaas:'
-      points: 'Mga tuldok:'
-      start_coord: 'Simulan ang tagpuan:'
-      map: mapa
-      edit: baguhin
-      owner: 'May-ari:'
-      description: 'Paglalarawan:'
-      tags: 'Mga tatak:'
-      tags_help: hindi hinangganan ang kuwit
-      visibility: 'Pagkanatatanaw:'
       visibility_help: ano ba ang kahulugan nito?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index d3a6f14aa..0015b5575 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -128,12 +128,15 @@ tr:
       trace:
         user: Kullanıcı
         visible: Görünür
-        name: Ad
+        name: Dosya adı
         size: Boyut
         latitude: Enlem
         longitude: Boylam
         public: Kamu
         description: Açıklama
+        gpx_file: GPX Dosyası yükle
+        visibility: Görünürlük
+        tagstring: 'Etiketler:'
       message:
         sender: Gönderen
         title: Konu
@@ -146,6 +149,9 @@ tr:
         description: Açıklama
         languages: Diller
         pass_crypt: Parola
+    help:
+      trace:
+        tagstring: virgül (,) ile ayır
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1932,11 +1938,6 @@ tr:
         ile işaretlenmiş gösterilir)
     new:
       upload_trace: GPS İzi Gönder
-      upload_gpx: 'GPX Dosyası Gönder:'
-      description: Tanıtım
-      tags: 'Etiketler:'
-      tags_help: virgül (,) ile ayır
-      visibility: 'Görünürlük:'
       visibility_help: bu ne demek?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Tr:Visibility_of_GPS_traces
       help: Yardım
@@ -1954,20 +1955,9 @@ tr:
         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.
     edit:
+      cancel: Ä°ptal
       title: '%{name} izi düzenleniyor'
       heading: '%{name} izi düzenleniyor'
-      filename: 'Dosya adı:'
-      download: indir
-      uploaded_at: 'Yüklendi:'
-      points: 'Nokta sayısı:'
-      start_coord: 'Başlangıç koordinatı:'
-      map: harita
-      edit: düzenle
-      owner: 'Sahibi:'
-      description: 'Açıklama:'
-      tags: 'Etiketler:'
-      tags_help: virgülle ayrılmış
-      visibility: Görünürlük
       visibility_help: bu ne demek?
     update:
       updated: İzleme güncellendi
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index b7d00919d..74e178168 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -68,6 +68,8 @@ tt:
         latitude: Киңлек
         longitude: Озынлык
         description: Тасвир
+        gpx_file: 'GPX файлын төяү:'
+        tagstring: 'Тамгалар:'
       message:
         sender: Җибәрүче
         title: Тема
@@ -79,6 +81,9 @@ tt:
         description: Тасвир
         languages: Телләр
         pass_crypt: Серсүз
+    help:
+      trace:
+        tagstring: өтер аша
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -689,19 +694,6 @@ tt:
       image: Сурәт
       url: URL
   traces:
-    new:
-      upload_gpx: 'GPX файлын төяү:'
-      description: 'Тасвирлама:'
-      tags: 'Тамгалар:'
-      tags_help: өтер аша
-    edit:
-      download: күчереп алу
-      uploaded_at: 'Төялде:'
-      points: 'Нокталар:'
-      owner: 'Хуҗа:'
-      description: 'Тасвирлама:'
-      tags: 'Тамгалар:'
-      tags_help: өтер аша
     trace_optionals:
       tags: Тамгалар
     show:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5b54bc6b6..bec97f4cc 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -130,6 +130,9 @@ uk:
         longitude: Довгота
         public: Публічний
         description: Опис
+        gpx_file: 'Завантажити GPX-файл:'
+        visibility: 'Видимість:'
+        tagstring: 'Мітки:'
       message:
         sender: Відправник
         title: Тема
@@ -142,6 +145,9 @@ uk:
         description: Опис
         languages: Мови
         pass_crypt: Пароль
+    help:
+      trace:
+        tagstring: через кому
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1903,11 +1909,6 @@ uk:
         впорядковані точки з часовими позначками)
     new:
       upload_trace: Надіслати GPS-трек на сервер
-      upload_gpx: 'Завантажити GPX-файл:'
-      description: 'Опис:'
-      tags: 'Мітки:'
-      tags_help: через кому
-      visibility: 'Видимість:'
       visibility_help: що це значить?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Uk:Visibility_of_GPS_traces
       help: Довідка
@@ -1931,18 +1932,6 @@ uk:
     edit:
       title: Редагування треку %{name}
       heading: Редагування треку %{name}
-      filename: 'Ім’я файлу:'
-      download: завантажити
-      uploaded_at: 'Завантажено на сервер:'
-      points: 'Кількість точок:'
-      start_coord: 'Координати початку:'
-      map: мапа
-      edit: редагувати
-      owner: 'Власник:'
-      description: 'Опис:'
-      tags: 'Теґи:'
-      tags_help: через кому
-      visibility: 'Видимість:'
       visibility_help: ще це означає?
     update:
       updated: Трек оновлено
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 071d7297c..69cbe6ef0 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -109,6 +109,9 @@ vi:
         longitude: Kinh độ
         public: Công khai
         description: Miêu tả
+        gpx_file: 'Tải lên Tập tin GPX:'
+        visibility: 'Mức độ Truy cập:'
+        tagstring: 'Thẻ:'
       message:
         sender: Người gửi
         title: Tiêu đề
@@ -121,6 +124,9 @@ vi:
         description: Miêu tả
         languages: Ngôn ngữ
         pass_crypt: Mật khẩu
+    help:
+      trace:
+        tagstring: dấu phẩy phân cách
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1851,11 +1857,6 @@ vi:
         điểm có tên và thời điểm)
     new:
       upload_trace: Tải lên Tuyến đường GPS
-      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
       help: Trợ giúp
@@ -1873,18 +1874,6 @@ vi:
     edit:
       title: Sửa đổi tuyến đường %{name}
       heading: Sửa đổi tuyến đường %{name}
-      filename: 'Tên tập tin:'
-      download: tải về
-      uploaded_at: 'Lúc tải lên:'
-      points: 'Số nốt:'
-      start_coord: 'Tọa độ đầu đường:'
-      map: bản đồ
-      edit: sửa đổi
-      owner: 'Tác giả:'
-      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
     update:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4f9963b0a..e46bd1d22 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -146,6 +146,9 @@ zh-CN:
         longitude: 经度
         public: 公开
         description: 描述
+        gpx_file: 上传 GPX 文件：
+        visibility: 可见性：
+        tagstring: 标签：
       message:
         sender: 发件人
         title: 主题
@@ -158,6 +161,9 @@ zh-CN:
         description: 描述
         languages: 语言
         pass_crypt: 密码
+    help:
+      trace:
+        tagstring: 用逗号分隔
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -1760,11 +1766,6 @@ zh-CN:
       identifiable: 可识别 (以可识别的方式显示于轨迹清单，有时间戳记顺序的点)
     new:
       upload_trace: 上传GPS轨迹
-      upload_gpx: 上传 GPX 文件：
-      description: 描述：
-      tags: 标签：
-      tags_help: 用逗号分隔
-      visibility: 可见性：
       visibility_help: 这是什么意思？
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: 帮助
@@ -1777,18 +1778,6 @@ zh-CN:
     edit:
       title: 编辑轨迹 %{name}
       heading: 编辑轨迹 %{name}
-      filename: 文件名：
-      download: 下载
-      uploaded_at: 上传于：
-      points: 点：
-      start_coord: 起始坐标：
-      map: 地图
-      edit: 编辑
-      owner: 所有者：
-      description: 描述：
-      tags: 标签：
-      tags_help: 用逗号分隔
-      visibility: 可见性：
       visibility_help: 这是什么意思？
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e9aa36ff6..7b68451fa 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -49,6 +49,8 @@ zh-TW:
       friendly: '%Y 年 %B %e 日 %H 時 %M 分'
       blog: '%Y年%B%e日'
   helpers:
+    file:
+      prompt: 選擇檔案
     submit:
       diary_comment:
         create: 儲存
@@ -127,12 +129,15 @@ zh-TW:
       trace:
         user: 使用者
         visible: 可見的
-        name: 名稱
+        name: 檔案名稱
         size: 大小
         latitude: 緯度
         longitude: 經度
         public: 公開
         description: 說明
+        gpx_file: 上傳 GPX 檔案
+        visibility: 能見度
+        tagstring: 標籤
       message:
         sender: 寄件者
         title: 標題
@@ -145,6 +150,9 @@ zh-TW:
         description: 說明
         languages: 語言
         pass_crypt: 密碼
+    help:
+      trace:
+        tagstring: 以逗點分隔
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -433,7 +441,7 @@ zh-TW:
     diary_entry:
       posted_by_html: 於 %{created} 由 %{link_user} 以%{language_link}發表
       comment_link: 對這個項目的評論
-      reply_link: 回覆這個項目
+      reply_link: 發送訊息給作者
       comment_count:
         one: 1 項評論
         zero: 沒有評論
@@ -1236,12 +1244,12 @@ zh-TW:
       subject: '[OpenStreetMap] %{user} 已評論日記項目'
       hi: '%{to_user} 您好，'
       header: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：'
-      footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 回覆
+      footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 發送訊息給作者
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: '%{to_user} 您好，'
       header: '%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息：'
-      footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 回覆
+      footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 發送訊息給作者
     friendship_notification:
       hi: 嗨 %{to_user}，
       subject: '[OpenStreetMap] %{user} 將您加入為好友'
@@ -1784,11 +1792,6 @@ zh-TW:
       identifiable: 可辨識 (以可辨認的方式顯示於軌跡清單，節點有時間戳記)
     new:
       upload_trace: 上傳 GPS 軌跡
-      upload_gpx: 上傳 GPX 檔案：
-      description: 說明：
-      tags: 標籤：
-      tags_help: 以逗點分隔
-      visibility: 能見度
       visibility_help: 這是什麼意思？
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: 說明
@@ -1799,20 +1802,9 @@ zh-TW:
       upload_failed: 很抱歉，GPX 上傳失敗。已向管理員警告此錯誤，請再重試
       traces_waiting: 您有 %{count} 個軌跡等待上傳。請先等待先前的軌跡處理完後，再來繼續上傳其他軌跡，以免影響其他使用者的排程。
     edit:
+      cancel: 取消
       title: 編輯軌跡 %{name}
       heading: 編輯軌跡 %{name}
-      filename: 檔案名稱：
-      download: 下載
-      uploaded_at: 上傳於：
-      points: 點數：
-      start_coord: 開始坐標：
-      map: 地圖
-      edit: 編輯
-      owner: 擁有者：
-      description: 描述：
-      tags: 標籤：
-      tags_help: 以逗號分隔
-      visibility: 能見度
       visibility_help: 這是什麼意思？
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update: