diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 6fc9567cd..6d415de89 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -16,6 +16,7 @@
 # Author: Sayma Jahan
 # Author: Tauhid16
 # Author: Wikisagnik
+# Author: YahyA
 # Author: আজিজ
 # Author: আফতাবুজ্জামান
 # Author: এম আবু সাঈদ
@@ -25,6 +26,8 @@ bn:
     formats:
       friendly: '%e %B %Y %H:%M-এ'
   helpers:
+    file:
+      prompt: ফাইল পছন্দ করুন
     submit:
       diary_comment:
         create: সংরক্ষণ
@@ -96,15 +99,15 @@ bn:
       trace:
         user: ব্যবহারকারী
         visible: দৃশ্যমান
-        name: নাম
+        name: ফাইলের নাম
         size: আকার
         latitude: অক্ষাংশ
         longitude: দ্রাঘিমাংশ
         public: সার্বজনীন
         description: বিবরণ
-        gpx_file: 'জিপিএক্স ফাইল আপলোড:'
-        visibility: 'দৃষ্টিযোগ্যতা:'
-        tagstring: 'ট্যাগসমূহ:'
+        gpx_file: জিপিএক্স ফাইল আপলোড করুন
+        visibility: দৃষ্টিযোগ্যতা
+        tagstring: ট্যাগসমূহ
       message:
         sender: প্রেরক
         title: শিরোনাম
@@ -1369,6 +1372,7 @@ bn:
         হওয়া পর্যন্ত অপেক্ষা করুন, যেন অন্য ব্যবহারকারীদের অনুসরণ আপলোড করার সুযোগ
         দেয়া যায়।
     edit:
+      cancel: বাতিল
       title: অনুসরণ সম্পাদনা %{name}
       heading: অনুসরণ সম্পাদনা %{name}
       visibility_help: এটার মানে কি?
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 76165f1ed..6f4570e25 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -38,6 +38,8 @@ da:
     formats:
       friendly: '%e. %B %Y kl. %H:%M'
   helpers:
+    file:
+      prompt: Vælg fil
     submit:
       diary_comment:
         create: Gem
@@ -124,7 +126,7 @@ da:
         description: Beskrivelse
         gpx_file: Upload GPX-fil
         visibility: Synlighed
-        tagstring: 'Egenskaber:'
+        tagstring: Egenskaber
       message:
         sender: Afsender
         title: Emne
@@ -1908,6 +1910,7 @@ da:
         other: Du har allerede %{count} GPS-spor i køen. Overvej at vente på disse
           før du uploader flere spor for ikke at blokere køen for andre brugere.
     edit:
+      cancel: Annuller
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
       visibility_help: hvad betyder det her?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5ca9cb59e..268151c76 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -19,6 +19,7 @@
 # Author: Daswaldhorn
 # Author: Diebuche
 # Author: Dieterdreist
+# Author: Dingens5
 # Author: Drolbr
 # Author: Ferdinand0101
 # Author: Fujnky
@@ -154,15 +155,15 @@ de:
       trace:
         user: Benutzer
         visible: Sichtbar
-        name: Name
+        name: Dateiname
         size: Größe
         latitude: Breitengrad
         longitude: Längengrad
         public: Öffentlich
         description: Beschreibung
-        gpx_file: 'GPX-Datei hochladen:'
-        visibility: 'Sichtbarkeit:'
-        tagstring: 'Tags:'
+        gpx_file: GPX-Datei hochladen
+        visibility: Sichtbarkeit
+        tagstring: Tags
       message:
         sender: Absender
         title: Betreff
@@ -387,7 +388,7 @@ de:
     query:
       title: Objektabfrage
       introduction: Klicke auf die Karte, um benachbarte Objekte zu finden.
-      nearby: Ähnliche Eigenschaften
+      nearby: Benachbarte Objekte
       enclosing: Umschließende Objekte
   changesets:
     changeset_paging_nav:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index ba9466feb..164e59cf8 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -39,6 +39,8 @@ el:
     formats:
       friendly: '%e %B %Y στις %H:%M'
   helpers:
+    file:
+      prompt: Επιλογή αρχείου
     submit:
       diary_comment:
         create: Αποθήκευση
@@ -117,15 +119,15 @@ el:
       trace:
         user: Χρήστης
         visible: Ορατό
-        name: Όνομα
+        name: Όνομα αρχείου
         size: Μέγεθος
         latitude: Γεωγραφικό πλάτος
         longitude: Γεωγραφικό μήκος
         public: Δημόσιο
         description: Περιγραφή
-        gpx_file: 'Αποστολή αρχείου GPX:'
-        visibility: 'Ορατότητα:'
-        tagstring: 'Χαρακτηριστικά:'
+        gpx_file: 'Ανέβασμα GPX αρχείου:'
+        visibility: Ορατότητα
+        tagstring: Ετικέτες
       message:
         sender: Αποστολέας
         title: Θέμα
@@ -1941,6 +1943,7 @@ el:
           να ολοκληρωθούν πριν ανεβάσετε άλλα, ώστε να μην εμποδίσετε τη σειρά αναμονής
           για άλλους χρήστες.
     edit:
+      cancel: Ακύρωση
       title: Επεξεργασία ίχνους %{name}
       heading: Επεξεργασία ίχνους %{name}
       visibility_help: τι σημαίνει αυτό;
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6d63fc488..847d78bd1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -61,6 +61,7 @@
 # Author: Rubenwap
 # Author: Ruila
 # Author: Sim6
+# Author: Sukanya121
 # Author: Tiberius1701
 # Author: Toliño
 # Author: Translationista
@@ -152,15 +153,15 @@ es:
       trace:
         user: Usuario
         visible: Visible
-        name: Nombre
+        name: nombre del archivo
         size: Tamaño
         latitude: Latitud
         longitude: Longitud
         public: Pública
         description: Descripción
         gpx_file: 'Subir archivo GPX:'
-        visibility: 'Visibilidad:'
-        tagstring: 'Etiquetas:'
+        visibility: Visibilidad
+        tagstring: Etiquetas
       message:
         sender: Remitente
         title: Asunto
@@ -1948,6 +1949,7 @@ es:
           a que estas terminen antes de subir más, para no bloquear la cola a otros
           usuarios.
     edit:
+      cancel: Cancelar
       title: Editando traza %{name}
       heading: Editando traza %{name}
       visibility_help: ¿Qué significa esto?
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 36dea9141..297dd19ba 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -121,15 +121,15 @@ fa:
       trace:
         user: کاربر
         visible: نمایان
-        name: نام
+        name: نام فایل
         size: اندازه
         latitude: عرض جغرافیایی
         longitude: طول جغرافیایی
         public: عمومی
         description: توضیح
-        gpx_file: 'بارگذاری فایل GPX:'
-        visibility: 'پدیداری:'
-        tagstring: 'برچسب‌ها:'
+        gpx_file: آپلود فایل GPX
+        visibility: پدیداری
+        tagstring: برچسب‌ها
       message:
         sender: فرستنده
         title: عنوان
@@ -439,7 +439,7 @@ fa:
     diary_entry:
       posted_by_html: ارسالی از %{link_user} در %{created} به <bdi>%{language_link}</bdi>
       comment_link: نظردادن به این روزنوشت
-      reply_link: پاسخ به این روزنوشت
+      reply_link: به نویسنده پیام بفرستید
       comment_count:
         one: '%{count} نظر'
         zero: بدون نظر
@@ -1248,14 +1248,14 @@ fa:
       hi: ‫سلام %{to_user}،‬
       header: ‫%{from_user} روی روزنوشت اوپن‌استریت‌مپ با موضوع «%{subject}» نظر داد:‬
       footer: '‫همچنین می‌توانید نظر را در اینجا بخوانید: %{readurl}؛ اینجا به آن
-        نظر دهید: %{commenturl}؛ یا اینجا پاسخ بدهید: %{replyurl} ‬'
+        نظر دهید: %{commenturl}؛ یا از اینجا به نویسنده پیام بدهید: %{replyurl} ‬'
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: ‫سلام %{to_user}،‬
       header: ‫%{from_user} از طریق اوپن‌استریت‌مپ پیامی با موضوع «%{subject}» برای
         شما فرستاده است:‬
-      footer_html: '‫همچنین می‌توانید این پیام را در اینجا بخوانید: %{readurl} و اینجا
-        به آن پاسخ دهید: %{replyurl} ‬'
+      footer_html: '‫همچنین می‌توانید این پیام را در اینجا بخوانید: %{readurl} و از
+        اینجا به نویسنده پیام بدهید: %{replyurl} ‬'
     friendship_notification:
       hi: ‫سلام %{to_user}،‬
       subject: '[OpenStreetMap] ‫%{user} شما را به‌عنوان دوست اضافه کرد‬'
@@ -1922,6 +1922,7 @@ fa:
         other: '%{count} رد در صف بارگذاری دارید. لطفاً قبل از بارگذاری موارد بیشتر
           برای تمام‌شدن موارد فعلی منتظر بمانید تا صف برای سایر کاربران بسته نشود.'
     edit:
+      cancel: لغو
       title: ویرایش رد %{name}
       heading: ویرایش رد %{name}
       visibility_help: این چیست؟
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 11dc9e5fb..227ab790c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -24,6 +24,8 @@ gl:
       friendly: '%e de %B do %Y ás %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: Escoller ficheiro
     submit:
       diary_comment:
         create: Gardar
@@ -102,15 +104,15 @@ gl:
       trace:
         user: Usuario
         visible: Visíbel
-        name: Nome
+        name: Nome do ficheiro
         size: Tamaño
         latitude: Latitude
         longitude: Lonxitude
         public: Público
         description: Descrición
-        gpx_file: 'Subir un ficheiro GPX:'
-        visibility: 'Visibilidade:'
-        tagstring: 'Etiquetas:'
+        gpx_file: Subir un ficheiro GPX
+        visibility: Visibilidade
+        tagstring: Etiquetas
       message:
         sender: Remitente
         title: Asunto
@@ -423,7 +425,7 @@ gl:
     diary_entry:
       posted_by_html: Publicado por %{link_user} no %{created} en %{language_link}
       comment_link: Comentar nesta entrada
-      reply_link: Respostar a esta entrada
+      reply_link: Enviar unha mensaxe ó autor
       comment_count:
         zero: Sen comentarios
         one: '%{count} comentario'
@@ -1234,14 +1236,15 @@ gl:
       hi: 'Ola %{to_user}:'
       header: '%{from_user} comentou na entrada de diario no OpenStreetMap co asunto
         "%{subject}":'
-      footer: Tamén pode ler o comentario en %{readurl}, comentar en %{commenturl}
-        ou respostar en %{replyurl}
+      footer: Tamén podes ler o comentario en %{readurl} e comentar en %{commenturl}
+        ou enviar unha mensaxe ó autor en %{replyurl}
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: 'Ola %{to_user}:'
       header: '%{from_user} envioulle unha mensaxe a través do OpenStreetMap co asunto
         "%{subject}":'
-      footer_html: Tamén pode ler a mensaxe en %{readurl} e pode respostar en %{replyurl}
+      footer_html: Tamén podes ler a mensaxe en %{readurl} e enviar unha mensaxe ó
+        autor en %{replyurl}
     friendship_notification:
       hi: 'Ola %{to_user}:'
       subject: '[OpenStreetMap] %{user} engadiuno coma amizade'
@@ -1421,7 +1424,7 @@ gl:
     about:
       next: Seguinte
       copyright_html: <span>&copy;</span>Contribuíntes do<br>OpenStreetMap
-      used_by_html: '%{name} fornece datos xeográficos a milleiros de sitios web,
+      used_by_html: '%{name} fornece datos xeográficos para milleiros de sitios web,
         aplicacións para móbiles e dispositivos físicos'
       lede_text: |-
         O OpenStreetMap é obra dunha comunidade de xente que achega e mantén datos
@@ -1486,9 +1489,8 @@ gl:
           <a href="https://opendatacommons.org/licenses/odbl/1.0/">texto
           legal</a> ó completo explica os teus dereitos e responsabilidades.
         intro_3_1_html: |-
-          Os datos cartográficos das teselas dos nosos mapas e a nosa documentación
-          atópanse baixo a licenza <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons recoñecemento compartir igual 2.0</a> (CC BY-SA).
+          A nosa documentación está licenciada baixo a licenza <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC BY-SA 2.0).
         credit_title_html: De que xeito acreditar o OpenStreetMap
         credit_1_html: |-
           Pedímoslle que acredite o traballo así: &ldquo;&copy; dos contribuíntes do
@@ -1503,6 +1505,12 @@ gl:
           (por exemplo, nas obras impresas), suxerimos\nque dirixa ós lectores ó openstreetmap.org
           (quizabes pondo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org
           e,\nse fose relevante, a creativecommons.org."
+        credit_3_1_html: |-
+          As teselas do mapa no &ldquo;estilo estándar&rdquo; en www.openstreetmap.org son un
+          traballo producido pola Fundación do OpenStreetMap empregando datos do OpenStreetMap
+          baixo a licenza de base de datos aberta (Open Database License). Se estás a empregar estas teselas, usa
+          a seguinte atribución:
+          &ldquo;Mapa base e datos do OpenStreetMap e OpenStreetMap Foundation&rdquo;.
         credit_4_html: |-
           Nun mapa electrónico explorábel, o crédito debe aparecer na beira do mapa.
           Por exemplo:
@@ -1913,6 +1921,7 @@ gl:
         other: Ten %{count} pistas ó agarde de ser subidas. Coide agardar a que remate
           antes de subir máis para non bloquear a quenda do resto de usuarios.
     edit:
+      cancel: Desbotar
       title: Editando a pista "%{name}"
       heading: Editando a pista "%{name}"
       visibility_help: que significa isto?
@@ -2637,6 +2646,7 @@ gl:
         cycle_map: Ciclista
         transport_map: Medios de transporte
         hot: Humanitario
+        opnvkarte: ÖPNVKarte (Medios de transporte)
       layers:
         header: Capas do mapa
         notes: Notas do mapa
@@ -2649,6 +2659,7 @@ gl:
       terms: <a href='%{terms_url}' target='_blank'>Termos da páxina web e da API</a>
       thunderforest: Teselas cortesía de <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Teselas cortesía de <a href="%{memomaps_url}">MeMoMaps</a>
       hotosm: Estilo das teselas por <a href='%{hotosm_url}' target='_blank'>Equipo
         Humanitario do OpenStreetMap</a> aloxado por <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
         Francia</a>
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index e4e18925c..2641d9ae0 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -24,6 +24,8 @@ hr:
     formats:
       friendly: '%e %B %Y u %H:%M'
   helpers:
+    file:
+      prompt: Izaberi datoteku
     submit:
       diary_comment:
         create: Spremi
@@ -92,15 +94,15 @@ hr:
       trace:
         user: Korisnik
         visible: Vidljivo
-        name: Ime
+        name: Ime datoteke
         size: Veličina
         latitude: Geografska širina (Latitude)
         longitude: Geografska dužina (Longitude)
         public: Javno
         description: Opis
         gpx_file: 'Učitaj GPX datoteku:'
-        visibility: 'Vidljivost:'
-        tagstring: 'Oznake:'
+        visibility: Vidljivost
+        tagstring: Oznake
       message:
         sender: Pošiljatelj
         title: Naslov
@@ -1390,6 +1392,7 @@ hr:
           ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje
           drugih korisnika.
     edit:
+      cancel: Otkaži
       title: Uređivanje traga %{name}
       heading: Uređivanje trase %{name}
       visibility_help: Što ovo znači?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index a95763487..b74deaa0a 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Abijeet Patro
+# Author: Akmaie Ajam
 # Author: Arief
 # Author: Arifin.wijaya
 # Author: ArlandGa
@@ -34,6 +35,8 @@ id:
     formats:
       friendly: '%e %B %Y pada %H:%M'
   helpers:
+    file:
+      prompt: Pilih berkas
     submit:
       diary_comment:
         create: Simpan
@@ -112,7 +115,7 @@ id:
       trace:
         user: Pengguna
         visible: Terlihat
-        name: Nama
+        name: Nama berkas
         size: Ukuran
         latitude: Garis Lintang
         longitude: Garis Bujur
@@ -120,7 +123,7 @@ id:
         description: Deskripsi
         gpx_file: 'Unggah File GPX:'
         visibility: Visibilitas
-        tagstring: 'Tags:'
+        tagstring: Label
       message:
         sender: Pengirim
         title: Subyek
@@ -1880,6 +1883,7 @@ id:
           pertimbangkan proses ini untuk diselesaikan sebelum mengunggah lagi, sehingga
           Anda tidak memblokir antrean untuk pengguna lain.
     edit:
+      cancel: Batalkan
       title: Mengedit jejak %{name}
       heading: Mengedit dijitasi %{name}
       visibility_help: apa artinya ini?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b03fb0135..6c78c7e46 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -53,6 +53,8 @@ ja:
       friendly: '%Y年%m月%e日 %H:%M'
       blog: '%Y年%B%e日'
   helpers:
+    file:
+      prompt: ファイルを選択
     submit:
       diary_comment:
         create: 保存
@@ -131,15 +133,15 @@ ja:
       trace:
         user: 利用者
         visible: 可視
-        name: 名前
+        name: ファイル名
         size: サイズ
         latitude: 緯度
         longitude: 経度
         public: 公開
         description: 説明
-        gpx_file: 'アップロードする GPX ファイル:'
-        visibility: '可視性:'
-        tagstring: 'タグ:'
+        gpx_file: ' GPX ファイルをアップロード'
+        visibility: 可視性
+        tagstring: タグ
       message:
         sender: 送信者
         title: 件名
@@ -1770,6 +1772,7 @@ ja:
       traces_waiting:
         other: あなたの %{count} 件のトレースがアップロード待ち中です。これらのアップロードが完了するまでお待ちください。さもなければ他のユーザーのアップロードが制限されてしまいます。
     edit:
+      cancel: キャンセル
       title: トレース %{name} の編集
       heading: トレース %{name} の編集
       visibility_help: これはどういう意味?
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 4c4d16378..49dc5c747 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -45,6 +45,8 @@ ko:
       friendly: '%Y년 %B %e일 %H:%M'
       blog: '%Y년 %B %e일'
   helpers:
+    file:
+      prompt: 파일 선택
     submit:
       diary_comment:
         create: 저장
@@ -123,15 +125,15 @@ ko:
       trace:
         user: 사용자
         visible: 보임
-        name: 이름
+        name: 파일 이름
         size: 크기
         latitude: 위도
         longitude: 경도
         public: 공개
         description: 설명
-        gpx_file: 'GPX 파일 올리기:'
-        visibility: '공개 여부:'
-        tagstring: '태그:'
+        gpx_file: GPX 파일 올리기
+        visibility: 공개 여부
+        tagstring: 태그
       message:
         sender: 보낸 사람
         title: 제목
@@ -1819,6 +1821,7 @@ ko:
         other: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지
           더 기다려주십시오.
     edit:
+      cancel: 취소
       title: '%{name} 경로 편집'
       heading: '%{name} 경로 편집'
       visibility_help: 이게 무슨 뜻입니까?
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index ad0920a03..4616e15ed 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -12,6 +12,8 @@ lb:
     formats:
       friendly: '%e %B %Y um %H:%M'
   helpers:
+    file:
+      prompt: Fichier eraussichen
     submit:
       diary_comment:
         create: Späicheren
@@ -62,15 +64,15 @@ lb:
       trace:
         user: Benotzer
         visible: Visibel
-        name: Numm
+        name: Numm vum Fichier
         size: Gréisst
         latitude: Geografesch Breet
         longitude: Geografesch Längt
         public: Ëffentlech
         description: Beschreiwung
-        gpx_file: 'GPX-Fichier eroplueden:'
-        visibility: 'Visibilitéit:'
-        tagstring: 'Markéierungen:'
+        gpx_file: GPX-Fichier eroplueden
+        visibility: Visibilitéit
+        tagstring: Markéierungen
       message:
         sender: Sender
         title: Sujet
@@ -977,6 +979,7 @@ lb:
       visibility_help: wat heescht dat?
       help: Hëllef
     edit:
+      cancel: Ofbriechen
       visibility_help: wat heescht dat?
     show:
       pending: AM SUSPENS
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 914eb791b..3926722ef 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -16,6 +16,8 @@ mk:
       friendly: '%e %B %Y г. во %H:%M ч.'
       blog: '%e %B %Y г.'
   helpers:
+    file:
+      prompt: Одберете податотека
     submit:
       diary_comment:
         create: Зачувај
@@ -94,15 +96,15 @@ mk:
       trace:
         user: Корисник
         visible: Видливо
-        name: Име
+        name: Име на податотеката
         size: Големина
         latitude: Гео. ширина
         longitude: Гео. должина
         public: Јавно
         description: Опис
-        gpx_file: 'Подгни GPX -одатотека:'
-        visibility: 'Видливост:'
-        tagstring: 'Ознаки:'
+        gpx_file: Подигни GPX-податотека
+        visibility: Видливост
+        tagstring: Ознаки
       message:
         sender: Испраќач
         title: Тема
@@ -413,7 +415,7 @@ mk:
     diary_entry:
       posted_by_html: Испратено од %{link_user} во %{created} на %{language_link}
       comment_link: Коментирај на ставкава
-      reply_link: Одговори на ставкава
+      reply_link: Испрати порака на авторот
       comment_count:
         zero: Нема коментари
         one: '%{count} коментар'
@@ -1220,14 +1222,14 @@ mk:
       hi: Здраво %{to_user},
       header: '%{from_user} коментираше на дневничката ставка на OpenStreetMap со
         наслов %{subject}:'
-      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} ве додаде како пријател'
@@ -1894,6 +1896,7 @@ mk:
           ги почекате да завршат пред да подигате други, за да не ја кочите редицата
           во која чекаат други корисници.
     edit:
+      cancel: Откажи
       title: Ја уредувате трагата %{name}
       heading: Ја уредувате трагата %{name}
       visibility_help: што значи ова?
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 413a69a2b..727b5e3ee 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -32,6 +32,8 @@ nb:
     formats:
       friendly: '%e %B %Y kl. %H:%M'
   helpers:
+    file:
+      prompt: Velg fil
     submit:
       diary_comment:
         create: Lagre
@@ -110,15 +112,15 @@ nb:
       trace:
         user: Bruker
         visible: Synlig
-        name: Navn
+        name: Filnavn
         size: Størrelse
         latitude: Breddegrad
         longitude: Lengdegrad
         public: Offentlig
         description: Beskrivelse
-        gpx_file: 'Last opp GPX-fil:'
-        visibility: 'Synlighet:'
-        tagstring: 'Egenskaper:'
+        gpx_file: Last opp GPX-fil
+        visibility: Synlighet
+        tagstring: Tagger
       message:
         sender: Avsender
         title: Emne
@@ -1889,6 +1891,7 @@ nb:
           disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer
           køa for andre brukere.
     edit:
+      cancel: Avbryt
       title: Redigerer spor %{name}
       heading: Redigerer spor %{name}
       visibility_help: hva betyr dette?
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 76e33a035..e860da59c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -62,6 +62,8 @@ nl:
     formats:
       friendly: '%e %B %Y om %H:%M'
   helpers:
+    file:
+      prompt: Bestand kiezen
     submit:
       diary_comment:
         create: Opslaan
@@ -87,7 +89,7 @@ nl:
   activerecord:
     errors:
       messages:
-        invalid_email_address: lijkt geen geldig e-mailadres te zijn.
+        invalid_email_address: lijkt geen geldig e-mailadres te zijn
         email_address_not_routable: is niet routeerbaar
     models:
       acl: Rechtenoverzicht
@@ -97,7 +99,7 @@ nl:
       diary_comment: Dagboekopmerking
       diary_entry: Dagboekbericht
       friend: Vriend
-      issue: Problemen
+      issue: Probleem
       language: Taal
       message: Bericht
       node: Node
@@ -117,7 +119,7 @@ nl:
       report: Rapport
       session: Sessie
       trace: Traject
-      tracepoint: Trackpunt
+      tracepoint: Trajectpunt
       tracetag: Trajectlabel
       user: Gebruiker
       user_preference: Gebruikersvoorkeur
@@ -1296,8 +1298,9 @@ nl:
       success:
         subject: '[OpenStreetMap] GPX-import afgerond'
         loaded_successfully:
-          one: geladen met %{trace_points} punt.
-          other: geladen met %{trace_points} van de %{possible_points} mogelijke punten.
+          one: met succes geladen is met %{trace_points} punt.
+          other: met succes geladen is met %{trace_points} van de %{possible_points}
+            mogelijke punten.
     signup_confirm:
       subject: '[OpenStreetMap] Welkom bij OpenStreetMap'
       greeting: Hallo!
@@ -1940,9 +1943,9 @@ nl:
       help_url: http://wiki.openstreetmap.org/wiki/NL:Upload
     create:
       upload_trace: Gps-traject uploaden
-      trace_uploaded: Uw track is geüpload en staat te wachten totdat hij in de database
-        wordt opgenomen. Dit gebeurt meestal binnen een half uur. U ontvangt dan een
-        e-mail.
+      trace_uploaded: Uw traject is geüpload en staat te wachten totdat hij in de
+        database wordt opgenomen. Dit gebeurt meestal binnen een half uur. U ontvangt
+        dan een e-mail.
       upload_failed: Sorry, de GPX-upload is mislukt. Een beheerder is op de hoogte
         gesteld van de fout. Probeer het opnieuw
       traces_waiting:
@@ -1976,7 +1979,7 @@ nl:
       tags: 'Labels:'
       none: Geen
       edit_trace: Dit traject bewerken
-      delete_trace: Deze track verwijderen
+      delete_trace: Dit traject verwijderen
       trace_not_found: Traject is niet gevonden!
       visibility: 'Zichtbaarheid:'
       confirm_delete: Dit traject verwijderen?
@@ -2094,7 +2097,7 @@ nl:
       allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken
       allow_write_api: kaart wijzigen
       allow_read_gpx: eigen gps-trajecten bekijken.
-      allow_write_gpx: Gps-tracks uploaden
+      allow_write_gpx: Gps-trajecten uploaden
       allow_write_notes: opmerkingen wijzigen.
     index:
       title: Mijn OAuth-gegevens
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 728eb2cfd..a4b92404a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -56,6 +56,8 @@ pt-BR:
       friendly: '%e de %B de %Y às %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: Escolher arquivo
     submit:
       diary_comment:
         create: Salvar
@@ -134,15 +136,15 @@ pt-BR:
       trace:
         user: Usuário
         visible: Visível
-        name: Nome
+        name: Nome do arquivo
         size: Tamanho
         latitude: Latitude
         longitude: Longitude
         public: Público
         description: Descrição
-        gpx_file: 'Enviar Arquivo GPX:'
-        visibility: 'Visibilidade:'
-        tagstring: 'Etiquetas:'
+        gpx_file: Enviar Arquivo GPX
+        visibility: Visibilidade
+        tagstring: Etiquetas
       message:
         sender: Remetente
         title: Assunto
@@ -705,8 +707,8 @@ pt-BR:
           track: Estrada Informal
           traffic_signals: Semáforo
           trail: Caminho
-          trunk: Via Troncal
-          trunk_link: Ligação Troncal
+          trunk: Via troncal
+          trunk_link: Ligação troncal
           turning_loop: Circuito reverso
           unclassified: Via Não Classificada
           "yes": Estrada
@@ -1944,6 +1946,7 @@ pt-BR:
           esperar que o envio destas seja concluído antes de adicionar outras, de
           forma a não bloquear a fila para outros usuários.
     edit:
+      cancel: Cancelar
       title: Editando trilha %{name}
       heading: Editando trilha %{name}
       visibility_help: o que isso significa?
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b02523006..d766a792e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -30,6 +30,8 @@ sr:
     formats:
       friendly: '%e %B %Y у %H:%M'
   helpers:
+    file:
+      prompt: Изаберите датотеку
     submit:
       diary_comment:
         create: Сачувај
@@ -112,9 +114,9 @@ sr:
         longitude: Географска дужина
         public: Јавно
         description: Опис
-        gpx_file: 'Отпреми GPX датотеку:'
-        visibility: 'Видљивост:'
-        tagstring: 'Ознаке:'
+        gpx_file: Отпреми GPX датотеку
+        visibility: Видљивост
+        tagstring: Ознаке
       message:
         sender: Пошиљалац
         title: Наслов
@@ -1766,6 +1768,7 @@ sr:
           преноса пре него што отпремите друге. Тиме нећете оптеретити сервер другим
           корисницима.'
     edit:
+      cancel: Откажи
       title: Уређивање трага %{name}
       heading: Уређивање трага %{name}
       visibility_help: шта ово значи?
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 38d9f203a..049b366dd 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -52,6 +52,8 @@ sv:
     formats:
       friendly: '%e %B %Y kl. %H:%M'
   helpers:
+    file:
+      prompt: Välj fil
     submit:
       diary_comment:
         create: Spara
@@ -130,15 +132,15 @@ sv:
       trace:
         user: Användare
         visible: Synlig
-        name: Namn
+        name: Filnamn
         size: Storlek
         latitude: Latitud
         longitude: Longitud
         public: Offentlig
         description: Beskrivning
-        gpx_file: 'Ladda upp GPX-fil:'
-        visibility: 'Synlighet:'
-        tagstring: 'Taggar:'
+        gpx_file: Ladda upp GPX-fil
+        visibility: Synlighet
+        tagstring: Taggar
       message:
         sender: Avsändare
         title: Ämne
@@ -830,7 +832,7 @@ sv:
           water_works: Vattenreningsverk
           windmill: Väderkvarn
           works: Fabrik
-          "yes": handgjord
+          "yes": Handgjord
         military:
           airfield: Militärt flygfält
           barracks: Kaserner
@@ -1927,6 +1929,7 @@ sv:
           på att dessa blir klara innan du laddar upp fler, så att du inte blockerar
           kön för andra användare.
     edit:
+      cancel: Avbryt
       title: Redigerar spår %{name}
       heading: Redigerar spår %{name}
       visibility_help: vad betyder detta?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 0015b5575..b3db9f618 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -24,6 +24,7 @@
 # Author: McAang
 # Author: Meelo
 # Author: Mirzali
+# Author: MuratTheTurkish
 # Author: Rapsar
 # Author: Ruila
 # Author: Sadrettin
@@ -50,6 +51,8 @@ tr:
     formats:
       friendly: '%e %B %Y saat %H:%M'
   helpers:
+    file:
+      prompt: Dosya seç
     submit:
       diary_comment:
         create: Kaydet
@@ -136,7 +139,7 @@ tr:
         description: Açıklama
         gpx_file: GPX Dosyası yükle
         visibility: Görünürlük
-        tagstring: 'Etiketler:'
+        tagstring: Etiketler
       message:
         sender: Gönderen
         title: Konu
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 69cbe6ef0..b963e92b2 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -5,6 +5,7 @@
 # Author: Abijeet Patro
 # Author: Dinhxuanduyet
 # Author: Ioe2015
+# Author: JohnsonLee01
 # Author: KhangND
 # Author: Leducthn
 # Author: Macofe
@@ -103,13 +104,13 @@ vi:
       trace:
         user: Người dùng
         visible: Thấy được
-        name: Tên
+        name: Tên tập tin
         size: Kích cỡ
         latitude: Vĩ độ
         longitude: Kinh độ
         public: Công khai
         description: Miêu tả
-        gpx_file: 'Tải lên Tập tin GPX:'
+        gpx_file: Tải lên Tập tin GPX
         visibility: 'Mức độ Truy cập:'
         tagstring: 'Thẻ:'
       message: