From 5dcd2ad70c5006d1b33838274b9a9167c81cfc90 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 26 Apr 2010 22:04:27 +0200
Subject: [PATCH] Localisation updates from translatewiki.net (2010-04-26)

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
---
 config/locales/af.yml           |  16 +-
 config/locales/ar.yml           |  16 +-
 config/locales/arz.yml          |  16 +-
 config/locales/br.yml           |  16 +-
 config/locales/ca.yml           |  14 +-
 config/locales/cs.yml           |  30 +++-
 config/locales/da.yml           |  16 +-
 config/locales/de.yml           |  16 +-
 config/locales/dsb.yml          |  87 +++++++++-
 config/locales/eo.yml           |  16 +-
 config/locales/es.yml           |  16 +-
 config/locales/fi.yml           |  16 +-
 config/locales/fr.yml           |  16 +-
 config/locales/fur.yml          |  16 +-
 config/locales/gl.yml           | 295 +++++++++++++++++++++++++++++++-
 config/locales/hr.yml           |  47 +++--
 config/locales/hsb.yml          |  16 +-
 config/locales/hu.yml           |  17 +-
 config/locales/ia.yml           |  16 +-
 config/locales/is.yml           |  16 +-
 config/locales/it.yml           |  16 +-
 config/locales/ja.yml           |  16 +-
 config/locales/mk.yml           |  16 +-
 config/locales/nl.yml           |  17 +-
 config/locales/no.yml           |  16 +-
 config/locales/pl.yml           |  23 ++-
 config/locales/pt-BR.yml        |  33 ++--
 config/locales/ru.yml           |  27 ++-
 config/locales/sk.yml           |  25 +--
 config/locales/sl.yml           |  16 +-
 config/locales/sr-EC.yml        |  16 +-
 config/locales/sv.yml           |  16 +-
 config/locales/uk.yml           |  16 +-
 config/locales/vi.yml           |  48 +++++-
 config/locales/zh-TW.yml        |  16 +-
 config/potlatch/locales/br.yml  |   2 +
 config/potlatch/locales/da.yml  |  55 ++++++
 config/potlatch/locales/dsb.yml |  13 ++
 38 files changed, 801 insertions(+), 300 deletions(-)

diff --git a/config/locales/af.yml b/config/locales/af.yml
index c49b6812c..1273aed8e 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -67,14 +67,6 @@ af:
         one: "Het die volgende node:"
         other: "Het die volgende {{count}} nodes:"
       show_area_box: Wys gebied
-    navigation: 
-      all: 
-        next_changeset_tooltip: Volgende stel wysigings
-        prev_changeset_tooltip: Vorige stel wysigings
-      user: 
-        name_changeset_tooltip: Wys wysigings deur {{user}}
-        next_changeset_tooltip: Volgende wysiging deur {{user}}
-        prev_changeset_tooltip: Vorige wysiging deur {{user}}
     common_details: 
       changeset_comment: "Opmerking:"
       edited_at: "Gewysig op:"
@@ -91,6 +83,14 @@ af:
         relation: Besigtig relasie op groter kaart
         way: Besigtig weg op groter kaart
       loading: Besig om af te laai...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Volgende stel wysigings
+        prev_changeset_tooltip: Vorige stel wysigings
+      user: 
+        name_changeset_tooltip: Wys wysigings deur {{user}}
+        next_changeset_tooltip: Volgende wysiging deur {{user}}
+        prev_changeset_tooltip: Vorige wysiging deur {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} of {{edit_link}}"
       download_xml: Laai XML af
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 6330f4ef3..e4a57a76a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -112,14 +112,6 @@ ar:
         two: "فيه الطريقين التاليين:"
       no_bounding_box: لم يتم تخزين مربع الإحاطة لحزمة التغييرات هذه.
       show_area_box: اعرض مربع المنطقة
-    navigation: 
-      all: 
-        next_changeset_tooltip: حزمة التغييرات التالية
-        prev_changeset_tooltip: حزمة التغييرات السابقة
-      user: 
-        name_changeset_tooltip: اعرض تعديلات {{user}}
-        next_changeset_tooltip: التعديل التالي بواسطة {{user}}
-        prev_changeset_tooltip: عُدّل سابقًا بواسطة {{user}}
     common_details: 
       changeset_comment: "التعليق:"
       edited_at: "عُدّل في:"
@@ -137,6 +129,14 @@ ar:
         relation: اعرض العلاقة على خريطة أكبر
         way: اعرض الطريق على خريطة أكبر
       loading: جاري التحميل...
+    navigation: 
+      all: 
+        next_changeset_tooltip: حزمة التغييرات التالية
+        prev_changeset_tooltip: حزمة التغييرات السابقة
+      user: 
+        name_changeset_tooltip: اعرض تعديلات {{user}}
+        next_changeset_tooltip: التعديل التالي بواسطة {{user}}
+        prev_changeset_tooltip: عُدّل سابقًا بواسطة {{user}}
     node: 
       download: "{{download_xml_link}}، {{view_history_link}} أو {{edit_link}}"
       download_xml: نزّل إكس إم أل
diff --git a/config/locales/arz.yml b/config/locales/arz.yml
index 102681ef8..d8139d13d 100644
--- a/config/locales/arz.yml
+++ b/config/locales/arz.yml
@@ -108,14 +108,6 @@ arz:
         two: "فيه الطريقين التاليين:"
       no_bounding_box: لم يتم تخزين مربع الإحاطه لحزمه التغييرات هذه.
       show_area_box: اعرض مربع المنطقة
-    navigation: 
-      all: 
-        next_changeset_tooltip: حزمه التغييرات التالية
-        prev_changeset_tooltip: حزمه التغييرات السابقة
-      user: 
-        name_changeset_tooltip: اعرض تعديلات {{user}}
-        next_changeset_tooltip: التعديل التالى بواسطه {{user}}
-        prev_changeset_tooltip: عُدّل سابقًا بواسطه {{user}}
     common_details: 
       changeset_comment: "التعليق:"
       edited_at: "عُدّل في:"
@@ -133,6 +125,14 @@ arz:
         relation: اعرض العلاقه على خريطه أكبر
         way: اعرض الطريق على خريطه أكبر
       loading: جارى التحميل...
+    navigation: 
+      all: 
+        next_changeset_tooltip: حزمه التغييرات التالية
+        prev_changeset_tooltip: حزمه التغييرات السابقة
+      user: 
+        name_changeset_tooltip: اعرض تعديلات {{user}}
+        next_changeset_tooltip: التعديل التالى بواسطه {{user}}
+        prev_changeset_tooltip: عُدّل سابقًا بواسطه {{user}}
     node: 
       download: "{{download_xml_link}}، {{view_history_link}} أو {{edit_link}}"
       download_xml: نزّل إكس إم أل
diff --git a/config/locales/br.yml b/config/locales/br.yml
index bb08a420a..8c6ef9411 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -105,14 +105,6 @@ br:
         other: "Zo gantañ an {{count}} hent-mañ :"
       no_bounding_box: N'eus bet stoket boest bevenniñ ebet evit ar strollad kemmoù-mañ.
       show_area_box: Diskouez boest an takad
-    navigation: 
-      all: 
-        next_changeset_tooltip: Strollad kemmoù da-heul
-        prev_changeset_tooltip: Strollad kemmoù kent
-      user: 
-        name_changeset_tooltip: Gwelet an aozadennoù gant {{user}}
-        next_changeset_tooltip: Aozadenn da-heul gant {{user}}
-        prev_changeset_tooltip: Aozadenn gent gant {{user}}
     common_details: 
       changeset_comment: "Addispleg :"
       edited_at: "Aozet d'an :"
@@ -130,6 +122,14 @@ br:
         relation: Gwelet an darempred war ur gartenn vrasoc'h
         way: Gwelet an hent war ur gartenn vrasoc'h
       loading: O kargañ...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Strollad kemmoù da-heul
+        prev_changeset_tooltip: Strollad kemmoù kent
+      user: 
+        name_changeset_tooltip: Gwelet an aozadennoù gant {{user}}
+        next_changeset_tooltip: Aozadenn da-heul gant {{user}}
+        prev_changeset_tooltip: Aozadenn gent gant {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} pe {{edit_link}}"
       download_xml: Pellgargañ XML
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e2c0d5ad2..27cfca9b1 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -96,13 +96,6 @@ ca:
         one: "Té la següent via:"
         other: "Té les següents {{count}} vies:"
       show_area_box: Mostra caixa de l'àrea
-    navigation: 
-      all: 
-        next_changeset_tooltip: Conjunt de canvis següent
-        prev_changeset_tooltip: Conjunt de canvis anterior
-      user: 
-        name_changeset_tooltip: Visualitza les edicions feter per {{user}}
-        prev_changeset_tooltip: Edició anterior per l'usuari {{user}}
     common_details: 
       changeset_comment: "Comentari:"
       edited_at: "Editat:"
@@ -120,6 +113,13 @@ ca:
         relation: Visualitza la relació en un mapa més gran
         way: Visualitza la via en un mapa més gran
       loading: S'està carregant...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Conjunt de canvis següent
+        prev_changeset_tooltip: Conjunt de canvis anterior
+      user: 
+        name_changeset_tooltip: Visualitza les edicions feter per {{user}}
+        prev_changeset_tooltip: Edició anterior per l'usuari {{user}}
     node: 
       download: "{{download_xml_link}} o {{view_history_link}}"
       download_xml: Baixa l'XML
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index d9df1d7f2..a8914900f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -86,14 +86,6 @@ cs:
         other: "Obsahuje následujících {{count}} cest:"
       no_bounding_box: K této sadě změn nebyl uložen rozsah.
       show_area_box: Zobrazit ohraničení oblasti
-    navigation: 
-      all: 
-        next_changeset_tooltip: Další sada změn
-        prev_changeset_tooltip: Předchozí sada změn
-      user: 
-        name_changeset_tooltip: Zobrazit úpravy od {{user}}
-        next_changeset_tooltip: Další úprava od {{user}}
-        prev_changeset_tooltip: Předešlá úprava od {{user}}
     common_details: 
       changeset_comment: "Komentář:"
       edited_at: "Upraveno v:"
@@ -111,6 +103,14 @@ cs:
         relation: Zobrazit relaci na větší mapě
         way: Zobrazit cestu na větší mapě
       loading: Načítá se…
+    navigation: 
+      all: 
+        next_changeset_tooltip: Další sada změn
+        prev_changeset_tooltip: Předchozí sada změn
+      user: 
+        name_changeset_tooltip: Zobrazit úpravy od {{user}}
+        next_changeset_tooltip: Další úprava od {{user}}
+        prev_changeset_tooltip: Předešlá úprava od {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} nebo {{edit_link}}"
       download_xml: Stáhnout XML
@@ -262,6 +262,8 @@ cs:
       reply_link: Odpovědět na tento zápis
     edit: 
       language: "Jazyk:"
+      latitude: "Zeměpisná šířka:"
+      longitude: "Zeměpisná délka:"
       save_button: Uložit
       subject: "Předmět:"
       use_map_link: použít mapu
@@ -339,6 +341,7 @@ cs:
       other: asi {{count}} km
       zero: méně než 1 km
     results: 
+      more_results: Další výsledky
       no_results: Nenalezeny žádné výsledky
     search: 
       title: 
@@ -370,11 +373,14 @@ cs:
           museum: Muzeum
         leisure: 
           garden: Zahrada
+          golf_course: Golfové hřiště
+          ice_rink: Kluziště
           miniature_golf: Minigolf
           nature_reserve: Přírodní rezervace
           park: Park
           pitch: Hřiště
           stadium: Stadion
+          swimming_pool: Bazén
         natural: 
           beach: Pláž
           glacier: Ledovec
@@ -531,6 +537,8 @@ cs:
       flash_player_required: Pokud chcete používat Potlatch, flashový editor OpenStreetMap, potřebujete přehrávač Flashe. Můžete si <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">stáhnout Flash Player z Adobe.com</a>. Pro editaci OpenStreetMap existuje <a href="http://wiki.openstreetmap.org/wiki/Editing">mnoho dalších možností</a>.
     index: 
       js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný.
+      js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript.
+      js_3: Pokud nemůžete JavaScript zapnout, můžete vyzkoušet <a href="http://tah.openstreetmap.org/Browse/">statický prohlížeč Tiles@Home</a>.
       license: 
         license_name: Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic
         notice: Nabízeno pod licencí {{license_name}}, vytvořeno přispěvateli {{project_name}}.
@@ -687,10 +695,12 @@ cs:
   user: 
     account: 
       current email address: "Stávající e-mailová adresa:"
+      delete image: Odstranit stávající obrázek
       email never displayed publicly: (nikde se veřejně nezobrazuje)
       home location: "Poloha domova:"
       image: "Obrázek:"
       image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100)
+      keep image: Zachovat stávající obrázek
       latitude: "Šířka:"
       longitude: "Délka:"
       make edits public button: Zvěřejnit všechny moje úpravy
@@ -706,6 +716,7 @@ cs:
         enabled: Aktivní. Není anonym, smí editovat data.
         enabled link text: co tohle je?
         heading: "Veřejné editace:"
+      replace image: Nahradit stávající obrázek
       return to profile: Zpět na profil
       save changes button: Uložit změny
       title: Upravit účet
@@ -715,6 +726,8 @@ cs:
     confirm_email: 
       button: Potvrdit
       failure: Tento kód byl už pro potvrzení e-mailové adresy použit.
+      heading: Potvrzení změny e-mailové adresy
+      press confirm button: Pro potvrzení nové e-mailové adresy klikněte na níže zobrazené tlačítko.
       success: Vaše e-mailová adresa byla potvrzena, děkujeme za registraci!
     login: 
       account not active: Je mi líto, ale váš uživatelský účet dosud nebyl aktivován.<br />Svůj účet si můžete aktivovat kliknutím na odkaz v potvrzovacím e-mailu.
@@ -729,6 +742,7 @@ cs:
       remember: "Zapamatuj si mě:"
       title: Přihlásit se
     logout: 
+      heading: Odhlášení z OpenStreetMap
       logout_button: Odhlásit se
       title: Odhlásit se
     lost_password: 
diff --git a/config/locales/da.yml b/config/locales/da.yml
index b65f15882..9e4c0578a 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -73,14 +73,6 @@ da:
         other: "Har følgende {{count}} veje:"
       no_bounding_box: Ingen grænse er lagret for dette ændringssæt.
       show_area_box: Vis kasse på et stort kort
-    navigation: 
-      all: 
-        next_changeset_tooltip: Næste ændringssæt
-        prev_changeset_tooltip: Forrige ændringssæt
-      user: 
-        name_changeset_tooltip: Vis redigeringer af {{user}}
-        next_changeset_tooltip: Næste redigering af {{user}}
-        prev_changeset_tooltip: Forrige redigering af {{user}}
     common_details: 
       changeset_comment: "Kommentar:"
       edited_at: "Redigeret:"
@@ -98,6 +90,14 @@ da:
         relation: Vis relation på større kort
         way: Vis vej på større kort
       loading: Indlæsning...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Næste ændringssæt
+        prev_changeset_tooltip: Forrige ændringssæt
+      user: 
+        name_changeset_tooltip: Vis redigeringer af {{user}}
+        next_changeset_tooltip: Næste redigering af {{user}}
+        prev_changeset_tooltip: Forrige redigering af {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Hent XML
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7e29cda2a..57520adbf 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -117,14 +117,6 @@ de:
         other: "Enthält folgende {{count}} Wege:"
       no_bounding_box: Für dieses Changeset wurde kein Bereich gespeichert.
       show_area_box: Bereichsgrenze anzeigen
-    navigation: 
-      all: 
-        next_changeset_tooltip: Nächstes Changeset
-        prev_changeset_tooltip: Vorheriges Changeset
-      user: 
-        name_changeset_tooltip: Änderungen von {{user}} anzeigen
-        next_changeset_tooltip: Nächste Änderung von {{user}}
-        prev_changeset_tooltip: Vorherige Änderung von {{user}}
     common_details: 
       changeset_comment: "Kommentar:"
       edited_at: "Bearbeitet am:"
@@ -142,6 +134,14 @@ de:
         relation: Relation auf größerer Karte
         way: Weg auf größerer Karte
       loading: Laden …
+    navigation: 
+      all: 
+        next_changeset_tooltip: Nächstes Changeset
+        prev_changeset_tooltip: Vorheriges Changeset
+      user: 
+        name_changeset_tooltip: Änderungen von {{user}} anzeigen
+        next_changeset_tooltip: Nächste Änderung von {{user}}
+        prev_changeset_tooltip: Vorherige Änderung von {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} oder {{edit_link}}"
       download_xml: XML herunterladen
diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index e76a47281..841de3fdb 100644
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -109,14 +109,6 @@ dsb:
         two: "Ma slědujucej {{count}} puśa:"
       no_bounding_box: Za toś tu sajźbu změnow njejo se žeden wobłuk składł.
       show_area_box: Wobłukowy kašćik pokazaś
-    navigation: 
-      all: 
-        next_changeset_tooltip: Pśiduca sajźba změnow
-        prev_changeset_tooltip: Pjerwjejšna sajźba změnow
-      user: 
-        name_changeset_tooltip: Změny wužywarja {{user}} pokazaś
-        next_changeset_tooltip: Pśiduca změna wót {{user}}
-        prev_changeset_tooltip: Pjerwjejšna změna wót {{user}}
     common_details: 
       changeset_comment: "Komentar:"
       edited_at: "Wobźěłany:"
@@ -134,6 +126,14 @@ dsb:
         relation: Relaciju na wětšej kórśe pokazaś
         way: Puś na wětšej kórśe pokazaś
       loading: Zacytujo se...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Pśiduca sajźba změnow
+        prev_changeset_tooltip: Pjerwjejšna sajźba změnow
+      user: 
+        name_changeset_tooltip: Změny wužywarja {{user}} pokazaś
+        next_changeset_tooltip: Pśiduca změna wót {{user}}
+        prev_changeset_tooltip: Pjerwjejšna změna wót {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} abo {{edit_link}}"
       download_xml: XML ześěgnuś
@@ -370,6 +370,7 @@ dsb:
       paste_html: HTML kopěrowaś, aby se zasajźił do websedła
       scale: Měritko
       too_large: 
+        body: Toś ten wobcerk jo pśewjeliki  za eksportěrowanje ako XML-daty OpenStreetMap. Pšosym pówětš abo wubjeŕ mjeńšy wobcerk.
         heading: Wobłuk pśewjeliki
       zoom: Skalěrowanje
     start_rjs: 
@@ -517,9 +518,16 @@ dsb:
           administrative: Zastojnstwowa granica
         building: 
           apartments: Bydleński blok
+          block: Blok twarjenjow
+          bunker: Bunker
           chapel: Kapałka
           church: Cerkwja
           city_hall: Radnica
+          commercial: Źěłarstwowe twarjenje
+          dormitory: Internat
+          entrance: Zachod do twarjenja
+          faculty: Twarjenje fakulty
+          farm: Burski dom
           flats: Bydlenja
           garage: Garaža
           hall: Hala
@@ -527,9 +535,14 @@ dsb:
           hotel: Hotel
           house: Dom
           industrial: Industrijowe twarjenje
+          office: Běrowowe twarjenje
+          public: Zjawne twarjenje
+          residential: Bydleńske twarjenje
+          retail: Twarjenje drobnego wikowanja
           school: Å ulske twarjenje
           shop: Wobchod
           stadium: Stadion
+          store: Wobchod
           terrace: Terasa
           tower: Torm
           train_station: Dwórnišćo
@@ -575,26 +588,56 @@ dsb:
           unsurfaced: Njewobtwarźona droga
         historic: 
           archaeological_site: Archeologiske wukopowanišćo
+          battlefield: Bitwišćo
+          boundary_stone: Granicny kamjeń
           building: Twarjenje
           castle: Grod
           church: Cerkwja
           house: Dom
           icon: Ikona
+          manor: Kubło
+          memorial: Wopomnišćo
+          mine: Pódkopy
           monument: Pomnik
           museum: Muzeum
           ruins: Ruiny
           tower: Torm
+          wayside_cross: Kśica drogi
+          wayside_shrine: Lodka drogi
           wreck: Wrak
         landuse: 
+          allotments: Gumnyška
+          basin: Basenk
+          brownfield: Industrijowe lědo
           cemetery: Kjarchob
+          commercial: Źěłarstwowy wobcerk
+          conservation: Pśirodošćit
           construction: Twarnišćo
           farm: Farma
+          farmland: Rola
+          farmyard: Žywnosć
           forest: Góla
+          grass: Błomje
+          greenfield: njewobtwarjona zemja
           industrial: Industrijowy wobcerk
+          landfill: Wótchytanišćo
+          meadow: Łuka
+          military: Militarny wobcerk
+          mine: Pódkopy
           mountain: Góra
+          nature_reserve: Strony šćitaneje pśirody
           park: Park
+          piste: Pista
           plaza: Naměstno
+          quarry: Skała
           railway: Zeleznica
+          recreation_ground: Wódychańske strony
+          reservoir: Gaśeński jazor
+          residential: Bydleński wobcerk
+          retail: Drobne wikowanje
+          village_green: Wejsny najs
+          vineyard: Winowe kubło
+          wetland: Mokšy teren
           wood: Lěs
         leisure: 
           beach_resort: Mórske kupjele
@@ -679,10 +722,28 @@ dsb:
           unincorporated_area: Bźezgmejnske strony
           village: Wjas
         railway: 
+          abandoned: Spušćona zeleznicowa cera
+          construction: Zeleznicowa cera se twari
+          disused: Njewužywana zeleznicowa cera
+          disused_station: Njewužywane dwórnišćo
+          funicular: Powrjozowa zeleznica
+          halt: Zeleznicowe zastanišćo
           historic_station: Historiske dwórnišćo
+          junction: Zeleznicowe kśicnišćo
+          level_crossing: Zeleznicowy pśechod
+          light_rail: Měsćańska zeleznica
+          monorail: Jadnokólejowa zeleznica
+          narrow_gauge: Wuskokólejata zeleznica
+          platform: Pśistupnišćo
+          preserved: Wuchowana zeleznica
+          spur: Kólejowy wótstawk
           station: Dwórnišćo
+          subway: Zastanišćo pódzemskeje
+          subway_entrance: Zachod k pódzemskej
+          switch: Pśestajadło
           tram: Elektriska
           tram_stop: Zastanišćo elektriskeje
+          yard: Ranžěrowańske dwórnišćo
         shop: 
           alcohol: Wobchod za spirituoze
           apparel: Woblekarnja
@@ -802,8 +863,11 @@ dsb:
         cycle_map: Kórta za kolesowarjow
         noname: ŽednoMě
     site: 
+      edit_disabled_tooltip: Za wobźěłowanje kórty  powětšyś
       edit_tooltip: Kórtu wobźěłaś
       edit_zoom_alert: Musyš powětšyś, aby wobźěłał kórtu
+      history_disabled_tooltip: Powětšyś, aby se woglědał změny za toś ten wobcerk
+      history_tooltip: Změny za toś ten wobcerk pokazaś
       history_zoom_alert: Musyš powětšyś, aby wiźeł wobźěłowańsku historiju
   layouts: 
     donate: Pódprěj OpenStreetMap pśez {{link}} do fondsa aktualizacije hardware
@@ -887,6 +951,7 @@ dsb:
       subject: Temowe nadpismo
       title: Powěsć pósłaś
     no_such_message: 
+      body: Bóžko powěźeńka z tym ID njeeksistěrujo.
       heading: Powěsć njeeksistěrujo
       title: Powěsć njeeksistěrujo
     no_such_user: 
@@ -916,6 +981,9 @@ dsb:
       title: Powěsć cytaś
       to: Komu
       unread_button: Ako njepśecytany markěrowaś
+      wrong_user: Sy ako `{{user}} pśizjawjony, ale powěsć, kótaruž sy kśěł cytaś, njejo se pósłała wót togo wužywarja abo k tomu wužywarjeju. Pšosym pśizjaw se ako korektny wužywaŕ, aby ju cytał.
+    reply: 
+      wrong_user: "Sy ako `{{user}}' pśizjawjony, ale powěsć, na kótaruž sy kśěł wótegroniś, njejo se pósłała k tomu wužywarjeju.\nPšosym pśizjaw se ako korektny wužywaŕ, aby wótegronił."
     sent_message_summary: 
       delete_button: Lašowaś
   notifier: 
@@ -936,6 +1004,7 @@ dsb:
       hopefully_you_1: Něchten (naźejucy ty) co swóju e-mailowu adresu pla
       hopefully_you_2: "{{server_url}} do {{new_address}} změniś."
     friend_notification: 
+      befriend_them: Móžoš někogo na {{befriendurl}} ako pśijaśela pśidaś.
       had_added_you: "{{user}} jo śi na OpenStreetMap ako pśijaśela pśidał."
       see_their_profile: Móžoš profil na {{userurl}} wiźeś.
       subject: "[OpenStreetMap] {{user}} jo śi ako pśijaśela pśidał."
@@ -1274,6 +1343,7 @@ dsb:
       flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane. Dostanjoš e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
       home location: "Bydlišćo:"
       image: "Wobraz:"
+      image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej)
       keep image: Aktualny wobraz wobchowaś
       latitude: "Å yrina:"
       longitude: "Dlinina:"
@@ -1325,6 +1395,7 @@ dsb:
       lost password link: Sy swójo gronidło zabył?
       password: "Gronidło:"
       please login: Pšosym pśizjaw se abo {{create_user_link}}.
+      remember: "Spomnjeś se:"
       title: Pśizjawjenje
     logout: 
       heading: Z OpenStreetMap se wótzjawiś
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index a1c9c9574..3e68fc708 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -88,14 +88,6 @@ eo:
         other: "havas tiujn {{count}} vojojn:"
       no_bounding_box: Neniu limskatolo estis registrita por tiu ŝanĝaro.
       show_area_box: Montri la skatolon de la areo
-    navigation: 
-      all: 
-        next_changeset_tooltip: Sekvanta ŝanĝaro
-        prev_changeset_tooltip: Antaŭa ŝanĝaro
-      user: 
-        name_changeset_tooltip: Vidi redaktojn el {{user}}
-        next_changeset_tooltip: Sekvanta redakto de {{user}}
-        prev_changeset_tooltip: AntaÅ­a redakto de {{user}}
     common_details: 
       changeset_comment: "Komento:"
       edited_at: "Redaktita je:"
@@ -113,6 +105,14 @@ eo:
         relation: Vidi la rilaton en pli granda mapo
         way: Vidi la vojon en pli granda mapo
       loading: Ŝarĝante...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Sekvanta ŝanĝaro
+        prev_changeset_tooltip: Antaŭa ŝanĝaro
+      user: 
+        name_changeset_tooltip: Vidi redaktojn el {{user}}
+        next_changeset_tooltip: Sekvanta redakto de {{user}}
+        prev_changeset_tooltip: AntaÅ­a redakto de {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} au {{edit_link}}"
       download_xml: Elŝuti XML
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9d64d8420..8792caef2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -106,14 +106,6 @@ es:
       has_ways: "Tiene {{count}} vías:"
       no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios
       show_area_box: Mostrar caja del Área
-    navigation: 
-      all: 
-        next_changeset_tooltip: Siguiente conjunto de cambios
-        prev_changeset_tooltip: Conjunto de cambios anterior
-      user: 
-        name_changeset_tooltip: Ver ediciones hechas por {{user}}
-        next_changeset_tooltip: Próxima edición por {{user}}
-        prev_changeset_tooltip: Ediciones previas hechas por {{user}}
     common_details: 
       changeset_comment: "Comentario:"
       edited_at: Editado en
@@ -131,6 +123,14 @@ es:
         relation: Ver la relación en un mapa más grande
         way: Ver la vía en un mapa más grande
       loading: Cargando...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Siguiente conjunto de cambios
+        prev_changeset_tooltip: Conjunto de cambios anterior
+      user: 
+        name_changeset_tooltip: Ver ediciones hechas por {{user}}
+        next_changeset_tooltip: Próxima edición por {{user}}
+        prev_changeset_tooltip: Ediciones previas hechas por {{user}}
     node: 
       download: "{{download_xml_link}} o {{view_history_link}}"
       download_xml: Descargar XML
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index eb36b2525..54351cab3 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -99,14 +99,6 @@ fi:
         other: "Sisältää seuraavat {{count}} polkua:"
       no_bounding_box: Tässä muutoskokoelmassa ei ole rajattua aluetta.
       show_area_box: Näytä rajattu alue
-    navigation: 
-      all: 
-        next_changeset_tooltip: Seuraava muutoskokoelma
-        prev_changeset_tooltip: Edellinen muutoskokoelma
-      user: 
-        name_changeset_tooltip: Näytä käyttäjän {{user}} muutokset
-        next_changeset_tooltip: Käyttäjän {{user}} seuraava muutos
-        prev_changeset_tooltip: Käyttäjän {{user}} edellinen muutos
     common_details: 
       changeset_comment: "Kommentti:"
       edited_at: "Muokattu:"
@@ -124,6 +116,14 @@ fi:
         relation: Näytä relaatio suurella kartalla
         way: Näytä polku suurella kartalla
       loading: Ladataan…
+    navigation: 
+      all: 
+        next_changeset_tooltip: Seuraava muutoskokoelma
+        prev_changeset_tooltip: Edellinen muutoskokoelma
+      user: 
+        name_changeset_tooltip: Näytä käyttäjän {{user}} muutokset
+        next_changeset_tooltip: Käyttäjän {{user}} seuraava muutos
+        prev_changeset_tooltip: Käyttäjän {{user}} edellinen muutos
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} tai {{edit_link}}"
       download_xml: Lataa XML
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index aa100b422..e4e217c8f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -109,14 +109,6 @@ fr:
       has_ways: "Concerne les {{count}} chemins suivants :"
       no_bounding_box: Aucun cadre de délimitation n'a été stocké pour ce groupe de modifications.
       show_area_box: Montrer le cadre de la zone
-    navigation: 
-      all: 
-        next_changeset_tooltip: Groupe de modifications suivant
-        prev_changeset_tooltip: Groupe de modifications précédent
-      user: 
-        name_changeset_tooltip: Voir les modifications par {{user}}
-        next_changeset_tooltip: Modifications suivantes par {{user}}
-        prev_changeset_tooltip: Modifications précédentes par {{user}}
     common_details: 
       changeset_comment: "Commentaire :"
       edited_at: "Modifié le :"
@@ -134,6 +126,14 @@ fr:
         relation: Voir la relation sur une carte plus grande
         way: Voir le chemin sur une carte plus grande
       loading: Chargement...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Groupe de modifications suivant
+        prev_changeset_tooltip: Groupe de modifications précédent
+      user: 
+        name_changeset_tooltip: Voir les modifications par {{user}}
+        next_changeset_tooltip: Modifications suivantes par {{user}}
+        prev_changeset_tooltip: Modifications précédentes par {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Télécharger XML
diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 71c0e8050..25e8eed3a 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -67,14 +67,6 @@ fur:
       has_relations: 
         one: "Al à la {{count}} relazion ca sot:"
         other: "Al à lis {{count}} relazions ca sot:"
-    navigation: 
-      all: 
-        next_changeset_tooltip: Grup di cambiaments sucessîf
-        prev_changeset_tooltip: Grup di cambiaments precedent
-      user: 
-        name_changeset_tooltip: Vîot i cambiaments di {{user}}
-        next_changeset_tooltip: Cambiament sucessîf di {{user}}
-        prev_changeset_tooltip: Cambiament precedent di {{user}}
     common_details: 
       changeset_comment: "Coment:"
       edited_at: "Cambiât ai:"
@@ -90,6 +82,14 @@ fur:
         area: Viôt la aree suntune mape plui grande
         relation: Viôt la relazion suntune mape plui grande
       loading: Daûr a cjamâ...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Grup di cambiaments sucessîf
+        prev_changeset_tooltip: Grup di cambiaments precedent
+      user: 
+        name_changeset_tooltip: Vîot i cambiaments di {{user}}
+        next_changeset_tooltip: Cambiament sucessîf di {{user}}
+        prev_changeset_tooltip: Cambiament precedent di {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discjame XML
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 8776e1977..dddcbac94 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -81,14 +81,6 @@ gl:
         other: "Ten os seguintes {{count}} camiños:"
       no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios.
       show_area_box: Amosar a caixa de zona
-    navigation: 
-      all: 
-        next_changeset_tooltip: Seguinte conxunto de cambios
-        prev_changeset_tooltip: Conxunto de cambios anterior
-      user: 
-        name_changeset_tooltip: Ver as edicións de {{user}}
-        next_changeset_tooltip: Seguinte edición de {{user}}
-        prev_changeset_tooltip: Edición anterior de {{user}}
     common_details: 
       changeset_comment: "Comentario:"
       edited_at: "Editado o:"
@@ -106,6 +98,14 @@ gl:
         relation: Ver a relación nun mapa máis grande
         way: Ver o camiño nun mapa máis grande
       loading: Cargando...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Seguinte conxunto de cambios
+        prev_changeset_tooltip: Conxunto de cambios anterior
+      user: 
+        name_changeset_tooltip: Ver as edicións de {{user}}
+        next_changeset_tooltip: Seguinte edición de {{user}}
+        prev_changeset_tooltip: Edición anterior de {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Descargar en XML
@@ -217,6 +217,18 @@ gl:
       way_history: Historial do camiño
       way_history_title: "Historial co camiño: {{way_name}}"
   changeset: 
+    changeset: 
+      anonymous: Anónimo
+      big_area: (grande)
+      no_comment: (ningún)
+      no_edits: (sen edicións)
+      show_area_box: mostrar o cadro da zona
+      still_editing: (en edición)
+      view_changeset_details: Ollar os detalles do conxunto de cambios
+    changeset_paging_nav: 
+      next: Seguinte &raquo;
+      previous: "&laquo; Anterior"
+      showing_page: Mostrando a páxina {{page}}
     changesets: 
       area: Zona
       comment: Comentario
@@ -238,6 +250,7 @@ gl:
       title_user_bbox: Conxuntos de cambios por {{user}} en {{bbox}}
   diary_entry: 
     diary_comment: 
+      comment_from: Comentario de {{link_user}} o {{comment_created_at}}
       confirm: Confirmar
       hide_link: Agochar este comentario
     diary_entry: 
@@ -248,6 +261,8 @@ gl:
       confirm: Confirmar
       edit_link: Editar esta entrada
       hide_link: Agochar esta entrada
+      posted_by: Publicado por {{link_user}} o {{created}} en {{language_link}}
+      reply_link: Responder a esta entrada
     edit: 
       body: "Corpo:"
       language: "Lingua:"
@@ -256,27 +271,37 @@ gl:
       longitude: "Lonxitude:"
       save_button: Gardar
       subject: "Asunto:"
+      use_map_link: usar o mapa
     location: 
       edit: Editar
       location: "Localización:"
       view: Ver
     view: 
+      leave_a_comment: Deixar un comentario
+      login_to_leave_a_comment: "{{login_link}} para deixar un comentario"
       save_button: Gardar
+      title: Diario de {{user}} | {{title}}
+      user_title: Diario de {{user}}
   export: 
     start: 
       add_marker: Engadir un marcador ao mapa
       area_to_export: Zona a exportar
+      embeddable_html: HTML incorporable
       export_button: Exportar
+      export_details: Os datos do OpenStreetMap están licenciados baixo a <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.gl">licenza Creative Commons recoñecemento compartir igual 2.0</a> .
       format: Formato
       format_to_export: Formato de exportación
       image_size: Tamaño da imaxe
       latitude: "Lat:"
       licence: Licenza
       longitude: "Lon:"
+      manually_select: Seleccionar manualmente outra zona
       mapnik_image: Imaxe de Mapnik
       max: máx.
       options: Opcións
       osm_xml_data: Datos XML do OpenStreetMap
+      output: Saída
+      paste_html: Pegue o código HTML para incluílo na páxina web
       scale: Escala
       too_large: 
         body: Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor.
@@ -332,12 +357,119 @@ gl:
       suffix_place: ", {{distance}} ao {{direction}} de {{placename}}"
     search_osm_nominatim: 
       prefix: 
+        amenity: 
+          airport: Aeroporto
+          arts_centre: Centro artístico
+          atm: Caixeiro automático
+          auditorium: Auditorio
+          bank: Banco
+          bar: Bar
+          bench: Banco
+          bicycle_parking: Aparcadoiro de bicicletas
+          bicycle_rental: Aluguer de bicicletas
+          brothel: Prostíbulo
+          bus_station: Estación de autobuses
+          cafe: Cafetaría
+          car_rental: Aluguer de automóbiles
+          car_sharing: Aluguer de automóbiles
+          casino: Casino
+          cinema: Cine
+          clinic: Clínica
+          club: Club
+          college: Instituto
+          community_centre: Centro comunitario
+          courthouse: Xulgado
+          crematorium: Crematorio
+          dentist: Dentista
+          dormitory: Residencia universitaria
+          drinking_water: Auga potable
+          driving_school: Escola de condución
+          emergency_phone: Teléfono de emerxencia
+          fast_food: Comida rápida
+          fire_station: Parque de bombeiros
+          fountain: Fonte
+          fuel: Combustible
+          grave_yard: Cemiterio
+          gym: Ximnasio
+          health_centre: Centro de saúde
+          hospital: Hospital
+          hotel: Hotel
+          ice_cream: Xeadaría
+          kindergarten: Xardín de infancia
+          library: Biblioteca
+          market: Mercado
+          marketplace: Praza de mercado
+          nightclub: Club nocturno
+          office: Oficina
+          park: Parque
+          parking: Aparcadoiro
+          pharmacy: Farmacia
+          place_of_worship: Lugar de culto
+          police: Policía
+          post_box: Caixa de correos
+          post_office: Oficina de correos
+          preschool: Preescolar
+          prison: Prisión
+          pub: Pub
+          public_building: Edificio público
+          public_market: Mercado público
+          recycling: Punto de reciclaxe
+          restaurant: Restaurante
+          retirement_home: Residencia de xubilados
+          sauna: Sauna
+          school: Escola
+          shelter: Abeiro
+          shop: Tenda
+          shopping: Comercio
+          social_club: Club social
+          studio: Estudio
+          supermarket: Supermercado
+          telephone: Teléfono público
+          theatre: Teatro
+          toilets: Aseos
+          townhall: Concello
+          university: Universidade
+          vending_machine: Máquina expendedora
+          veterinary: Clínica veterinaria
+          wifi: Acceso WiFi
+          youth_centre: Casa da xuventude
         highway: 
+          bridleway: Pista de cabalos
+          bus_stop: Parada de autobús
+          byway: Camiño secundario
+          construction: Autoestrada en construción
+          cycleway: Pista de bicicletas
+          distance_marker: Indicador quilométrico
           emergency_access_point: Punto de acceso de emerxencia
           footway: Carreiro
+          ford: Vao
+          gate: Porta
+          living_street: Rúa residencial
+          minor: Estrada lateral
+          motorway: Autoestrada
           motorway_junction: Cruce de autovías
+          motorway_link: Enlace de autoestrada
+          path: Camiño
+          pedestrian: Camiño peonil
+          platform: Plataforma
+          primary: Estrada primaria
           primary_link: Estrada principal
+          raceway: Circuíto
+          residential: Residencial
+          road: Estrada
+          secondary: Estrada secundaria
           secondary_link: Estrada secundaria
+          service: Estrada de servizo
+          services: Área de servizo
+          steps: Chanzos
+          stile: Escada
+          tertiary: Estrada terciaria
+          track: Pista
+          trail: Pista
+          trunk: Estrada nacional
+          trunk_link: Estrada nacional
+          unclassified: Estrada sen clasificar
+          unsurfaced: Estrada non pavimentada
         leisure: 
           beach_resort: Balneario
           common: Terreo común
@@ -370,6 +502,7 @@ gl:
           feature: Elemento
           fell: Brañal
           fjord: Fiorde
+          geyser: Géiser
           glacier: Glaciar
           hill: Outeiro
           island: Illa
@@ -380,9 +513,11 @@ gl:
           peak: Pico
           point: Punto
           reef: Arrecife
+          ridge: Crista
           river: Río
           rock: Rocha
           scree: Pedregal
+          scrub: Matogueira
           shoal: Cardume
           spring: Primavera
           strait: Estreito
@@ -416,6 +551,48 @@ gl:
           town: Cidade
           unincorporated_area: Área non incorporada
           village: Vila
+        shop: 
+          apparel: Tenda de roupa
+          art: Tenda de arte
+          bakery: Panadaría
+          bicycle: Tenda de bicicletas
+          books: Libraría
+          butcher: Carnizaría
+          car_repair: Taller mecánico
+          carpet: Tenda de alfombras
+          charity: Tenda benéfica
+          chemist: Farmacia
+          clothes: Tenda de roupa
+          computer: Tenda informática
+          department_store: Gran almacén
+          doityourself: Tenda de bricolaxe
+          estate_agent: Axencia inmobiliaria
+          fashion: Tenda de moda
+          fish: Peixaría
+          florist: Floraría
+          food: Tenda de alimentación
+          gallery: Galería
+          general: Tenda de ultramarinos
+          hairdresser: Perrucaría
+          hardware: Ferraxaría
+          hifi: Hi-Fi
+          jewelry: Xoiaría
+          mall: Centro comercial
+          market: Mercado
+          mobile_phone: Tenda de telefonía móbil
+          motorcycle: Tenda de motocicletas
+          music: Tenda de música
+          optician: Oftalmólogo
+          organic: Tenda de alimentos orgánicos
+          outdoor: Tenda de deportes ao aire libre
+          photo: Tenda de fotografía
+          shoes: Zapataría
+          shopping_centre: Centro comercial
+          sports: Tenda de deportes
+          stationery: Papelaría
+          supermarket: Supermercado
+          toys: Xoguetaría
+          travel_agency: Axencia de viaxes
         tourism: 
           alpine_hut: Cabana alpina
           artwork: Obra de arte
@@ -442,44 +619,136 @@ gl:
     export: Exportar
     export_tooltip: Exportar os datos do mapa
     history: Historial
+    inbox: caixa de entrada ({{count}})
     intro_3_partners: wiki
+    license: 
+      title: Os datos do OpenStreetMap están licenciados baixo a licenza Creative Commons recoñecemento xenérico 2.0
+    logo: 
+      alt_text: Logo do OpenStreetMap
     make_a_donation: 
       text: Facer unha doazón
     news_blog: Blogue de novas
+    shop: Tenda
     sign_up_tooltip: Crear unha conta para editar
+    user_diaries_tooltip: Ollar os diarios do usuario
     view: Ver
     view_tooltip: Ver o mapa
+    welcome_user: Benvido, {{user_link}}
+    welcome_user_link_tooltip: A súa páxina de usuario
   message: 
+    delete: 
+      deleted: Mensaxe borrada
     inbox: 
       date: Data
+      from: De
+      my_inbox: A miña caixa de entrada
+      no_messages_yet: Aínda non ten ningunha mensaxe. Por que non se pon en contacto con algunhas das {{people_mapping_nearby_link}}?
+      outbox: caixa de saída
+      people_mapping_nearby: persoas próximas a vostede
       subject: Asunto
+      title: Caixa de entrada
+      you_have: Ten {{new_count}} mensaxes novas e {{old_count}} vellas
+    mark: 
+      as_read: Mensaxe marcada como lida
+      as_unread: Mensaxe marcada como non lida
     message_summary: 
       delete_button: Borrar
       read_button: Marcar como lido
       reply_button: Responder
       unread_button: Marcar como non lido
     new: 
+      back_to_inbox: Voltar á caixa de entrada
       body: Corpo
+      limit_exceeded: Estivo enviando unha morea de mensaxes ultimamente. Agarde uns intres antes de intentar enviar máis.
+      message_sent: Mensaxe enviada
+      send_button: Enviar
+      send_message_to: Enviarlle unha nova mensaxe a {{name}}
       subject: Asunto
+      title: Enviar unha mensaxe
+    no_such_message: 
+      body: Non hai ningunha mensaxe con esa id.
+      heading: Non se atopou a mensaxe
+      title: Non se atopou a mensaxe
+    no_such_user: 
+      body: Non hai ningún usuario con ese nome.
+      heading: Non se atopou o usuario
+      title: Non se atopou o usuario
     outbox: 
       date: Data
+      inbox: caixa de entrada
+      my_inbox: A miña {{inbox_link}}
+      no_sent_messages: Aínda non enviou ningunha mensaxe. Por que non se pon en contacto con algunhas das {{people_mapping_nearby_link}}?
+      outbox: caixa de saída
+      people_mapping_nearby: persoas próximas a vostede
       subject: Asunto
+      title: Caixa de saída
+      to: Para
+      you_have_sent_messages: Enviou {{count}} mensaxes
     read: 
+      back_to_inbox: Voltar á caixa de entrada
+      back_to_outbox: Voltar á caixa de saída
       date: Data
+      from: De
+      reading_your_messages: Lendo as súas mensaxes
+      reading_your_sent_messages: Lendo as mensaxes enviadas
       reply_button: Responder
       subject: Asunto
+      title: Ler a mensaxe
+      to: Para
+      unread_button: Marcar como non lida
     sent_message_summary: 
       delete_button: Borrar
   notifier: 
+    diary_comment_notification: 
+      hi: "Ola {{to_user}}:"
     email_confirm: 
       subject: "[OpenStreetMap] Confirme o seu enderezo de correo electrónico"
+    email_confirm_html: 
+      greeting: "Ola:"
+    email_confirm_plain: 
+      greeting: "Ola:"
+    gpx_notification: 
+      greeting: "Ola:"
+    lost_password_html: 
+      greeting: "Ola:"
+    lost_password_plain: 
+      greeting: "Ola:"
+    message_notification: 
+      hi: "Ola {{to_user}}:"
+    signup_confirm_html: 
+      greeting: Boas!
+    signup_confirm_plain: 
+      greeting: Boas!
   oauth_clients: 
     edit: 
       submit: Editar
       title: Editar a súa aplicación
+    form: 
+      name: Nome
+      required: Obrigatorio
     index: 
       application: Nome da aplicación
       register_new: Rexistrar a súa aplicación
+      revoke: Revogar!
+    new: 
+      submit: Rexistrar
+      title: Rexistrar unha nova aplicación
+  site: 
+    edit: 
+      user_page_link: páxina de usuario
+    index: 
+      license: 
+        license_name: Creative Commons recoñecemento compartir igual 2.0
+        notice: Baixo a licenza {{license_name}} polo {{project_name}} e os seus colaboradores.
+        project_name: proxecto OpenStreetMap
+      permalink: Ligazón permanente
+      shortlink: Atallo
+    search: 
+      submit_text: Ir
+      where_am_i: Onde estou?
+    sidebar: 
+      close: Pechar
+      search_results: Resultados da procura
   time: 
     formats: 
       friendly: "%e %B %Y ás %H:%M"
@@ -558,6 +827,7 @@ gl:
       my settings: Os meus axustes
       new email address: "Novo enderezo de correo electrónico:"
       new image: Engadir unha imaxe
+      no home location: Non inseriu o seu lugar de orixe.
       preferred languages: "Linguas preferidas:"
       profile description: "Descrición do perfil:"
       public editing: 
@@ -640,12 +910,15 @@ gl:
       add as friend: engadir como amigo
       ago: (hai {{time_in_words_ago}})
       block_history: ver os bloqueos recibidos
+      blocks by me: bloqueos efectuados
+      blocks on me: os meus bloqueos
       confirm: Confirmar
       create_block: bloquear este usuario
       created from: "Creado a partir de:"
       deactivate_user: desactivar este usuario
       delete_user: borrar este usuario
       description: Descrición
+      diary: diario
       edits: edicións
       email address: "Enderezo de correo electrónico:"
       hide_user: agochar este usuario
@@ -653,8 +926,11 @@ gl:
       km away: a {{count}}km de distancia
       m away: a {{count}}m de distancia
       moderator_history: ver os bloqueos dados
+      my diary: o meu diario
       my edits: as miñas edicións
       my settings: os meus axustes
+      nearby users: Outros usuarios próximos
+      new diary entry: nova entrada no diario
       no friends: Aínda non engadiu ningún amigo.
       oauth settings: axustes OAuth
       remove as friend: eliminar como amigo
@@ -672,6 +948,9 @@ gl:
       unhide_user: descubrir este usuario
       user location: Localización do usuario
       your friends: Os seus amigos
+  user_block: 
+    revoke: 
+      revoke: Revogar!
   user_role: 
     filter: 
       already_has_role: O usuario xa ten o rol {{role}}.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 980e431cd..150d64894 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -108,14 +108,6 @@ hr:
         other: "Sadrži slijedećih {{count}} puteva:"
       no_bounding_box: Granični okvir nije pohranjen za ovaj set promjena.
       show_area_box: Prikaži granični okvir
-    navigation: 
-      all: 
-        next_changeset_tooltip: Slijedeći changeset
-        prev_changeset_tooltip: Prethodni changeset
-      user: 
-        name_changeset_tooltip: "Prikaži promjene korisnika:  {{user}}"
-        next_changeset_tooltip: Slijedeća promjena od {{user}}
-        prev_changeset_tooltip: Prethodno uredio {{user}}
     common_details: 
       changeset_comment: "Komentar:"
       edited_at: "Uređeno:"
@@ -133,6 +125,14 @@ hr:
         relation: Prikaži relaciju na većoj karti
         way: Prikaži put na većoj karti
       loading: Učitavanje...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Slijedeći changeset
+        prev_changeset_tooltip: Prethodni changeset
+      user: 
+        name_changeset_tooltip: "Prikaži promjene korisnika:  {{user}}"
+        next_changeset_tooltip: Slijedeća promjena od {{user}}
+        prev_changeset_tooltip: Prethodno uredio {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ili {{edit_link}}"
       download_xml: Preuzimanje XML
@@ -321,6 +321,10 @@ hr:
       recent_entries: "Nedavni zapisi u dnevnik:"
       title: Dnevnici korisnika
       user_title: "{{user}}ov dnevnik"
+    location: 
+      edit: Uredi
+      location: "Lokacija:"
+      view: Prikaži
     new: 
       title: Novi zapis u dnevnik
     no_such_entry: 
@@ -336,7 +340,7 @@ hr:
       login: Prijava
       login_to_leave_a_comment: "{{login_link}} da bi ostavili komentar"
       save_button: Spremi
-      title: Korisnički dnevnici | {{user}}
+      title: Blog korisnika {{user}} | {{title}}
       user_title: "{{user}}ov dnevnik"
   export: 
     start: 
@@ -360,6 +364,8 @@ hr:
       output: Izlaz
       paste_html: Zalijepi HTML za ubacivanje na webstranicu
       scale: Mjerilo
+      too_large: 
+        heading: Područje je preveliko
       zoom: Zoom
     start_rjs: 
       add_marker: Dodaj makrker na kartu
@@ -860,7 +866,7 @@ hr:
     export: Izvoz
     export_tooltip: Izvoz podataka karte
     gps_traces: GPS trase
-    gps_traces_tooltip: Upravljanje GPS trasama
+    gps_traces_tooltip: Upravljaj GPS trasama
     help_wiki: Pomoć &amp; Wiki
     help_wiki_tooltip: Pomoć &amp; Wiki-site za projekt
     help_wiki_url: http://wiki.openstreetmap.org/wiki/Hr:Main_Page?uselang=hr
@@ -874,7 +880,7 @@ hr:
       zero: Nema nepročitanih poruka
     intro_1: OpenStreetMap je slobodna, promjenjiva karta cijelog svijeta. Napravili su je ljudi slični tebi.
     intro_2: OpenStreetMap omogućava pregledavanje, uređivanje i korištenje geografskih podataka u suradničkom načinu od bilo gdje sa Zemlje.
-    intro_3: Smještaj OpenStreetMapa je ljubazno podržan od {{ucl}} i {{bytemark}}.
+    intro_3: Smještaj OpenStreetMapa je ljubazno podržan od {{ucl}} i {{bytemark}}. Ostali podržavatelji projekta su navedeni u {{partners}}.
     license: 
       title: OpenStreetMap podaci su objavljeni pod licencom Creative Commons Attribution-Share Alike 2.0 Generic License
     log_in: prijava
@@ -899,7 +905,7 @@ hr:
     user_diaries: Dnevnik
     user_diaries_tooltip: Prikaži korisničke dnevnike
     view: Karta
-    view_tooltip: Prikaži kartu
+    view_tooltip: Pogledaj na karti
     welcome_user: Dobrodošli, {{user_link}}
     welcome_user_link_tooltip: Tvoja korisnička stranica
   message: 
@@ -932,9 +938,12 @@ hr:
       send_message_to: Pošalji novu poruku za {{name}}
       subject: Tema
       title: Pošalji poruku
+    no_such_message: 
+      heading: Nema takve poruke
+      title: Nema takve poruke
     no_such_user: 
-      body: Žao mi je ali ne postoji korisnik ili poruka s tim imenom ili id.
-      heading: Nema takvog korisnika ili poruke
+      body: Nažalost ne postoji korisnik s tim imenom.
+      heading: Nema takvog korisnika
       title: Nema takvog korisnika ili poruke
     outbox: 
       date: Datum
@@ -980,7 +989,7 @@ hr:
       hopefully_you_2: "{{server_url}} na {{new_address}}."
     friend_notification: 
       had_added_you: "{{user}} te je dodao kao prijatelja na OpenStreetMap-u."
-      see_their_profile: Možeš vidjeti njihov profil na {{userurl}} i dodati ih kao prijatelje ako želiš.
+      see_their_profile: Možeš vidjeti njihov profil na {{userurl}}.
       subject: "[OpenStreetMap] {{user}} te je dodao kao prijatelja"
     gpx_notification: 
       and_no_tags: i bez oznaka
@@ -1207,6 +1216,9 @@ hr:
     sidebar: 
       close: Zatvori
       search_results: Rezultazi traženja
+  time: 
+    formats: 
+      friendly: "%e %B %Y u %H:%M"
   trace: 
     create: 
       trace_uploaded: Vaša GPS datoteka je spremljena na server i čeka ubacivanje u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti obavijest o završetku.
@@ -1360,6 +1372,8 @@ hr:
       password: "Lozinka:"
       please login: Molimo prijavite se ili {{create_user_link}}.
       title: Prijava
+    logout: 
+      heading: Odjava iz OpenStreetMap
     lost_password: 
       email address: "Email adresa:"
       heading: Zaboravljena lozinka?
@@ -1434,10 +1448,11 @@ hr:
       my edits: moje promjene
       my settings: moje postavke
       my traces: moje trase
-      nearby users: "Okolni korisnici:"
+      nearby users: Drugi korisnici u blizini
       new diary entry: novi unos u dnevnik
       no friends: Nisi dodao niti jednog prijatelja.
       no nearby users: Nema okolnih korisnika koji mapiraju.
+      oauth settings: oauth postavke
       remove as friend: ukloni kao prijatelja
       role: 
         administrator: Ovaj korisnik je administrator
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index f92277f39..79b6d1b1c 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -109,14 +109,6 @@ hsb:
         two: "Ma slědowacej {{count}} pućej:"
       no_bounding_box: Za tutu sadźbu změnow njeje so wuběranski wobłuk składował.
       show_area_box: Wobłukowy kašćik pokazać
-    navigation: 
-      all: 
-        next_changeset_tooltip: Přichodna sadźba změnow
-        prev_changeset_tooltip: Předchadna sadźba změnow
-      user: 
-        name_changeset_tooltip: Změny wot wužiwarja {{user}} pokazać
-        next_changeset_tooltip: Přichodna změna wot wužiwarja {{user}}
-        prev_changeset_tooltip: Předchadna změna wot wužiwarja {{user}}
     common_details: 
       changeset_comment: "Komentar:"
       edited_at: "Wobdźěłany:"
@@ -134,6 +126,14 @@ hsb:
         relation: Relaciju na wjetšej karće pokazać
         way: Puć na wjetšej karće pokazać
       loading: Začituje so...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Přichodna sadźba změnow
+        prev_changeset_tooltip: Předchadna sadźba změnow
+      user: 
+        name_changeset_tooltip: Změny wot wužiwarja {{user}} pokazać
+        next_changeset_tooltip: Přichodna změna wot wužiwarja {{user}}
+        prev_changeset_tooltip: Předchadna změna wot wužiwarja {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} abo {{edit_link}}"
       download_xml: XML sćahnyć
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index b36d16d4d..58abeb8bd 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -106,14 +106,6 @@ hu:
         other: "A következő {{count}} vonalat tartalmazza:"
       no_bounding_box: Nincs eltárolva határoló ehhez a módosításcsomaghoz.
       show_area_box: Területhatároló megtekintése
-    navigation: 
-      all: 
-        next_changeset_tooltip: Következő módosításcsomag
-        prev_changeset_tooltip: Előző módosításcsomag
-      user: 
-        name_changeset_tooltip: "{{user}} szerkesztéseinek megtekintése"
-        next_changeset_tooltip: "{{user}} következő szerkesztése"
-        prev_changeset_tooltip: "{{user}} előző szerkesztése"
     common_details: 
       changeset_comment: "Megjegyzés:"
       edited_at: "Szerkesztve:"
@@ -131,6 +123,14 @@ hu:
         relation: Kapcsolat megtekintése nagyobb térképen
         way: Vonal megtekintése nagyobb térképen
       loading: Betöltés…
+    navigation: 
+      all: 
+        next_changeset_tooltip: Következő módosításcsomag
+        prev_changeset_tooltip: Előző módosításcsomag
+      user: 
+        name_changeset_tooltip: "{{user}} szerkesztéseinek megtekintése"
+        next_changeset_tooltip: "{{user}} következő szerkesztése"
+        prev_changeset_tooltip: "{{user}} előző szerkesztése"
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} vagy {{edit_link}}"
       download_xml: XML letöltése
@@ -865,6 +865,7 @@ hu:
       history_tooltip: Szerkesztések megtekintése ezen a területen
       history_zoom_alert: Közelítened kell a szerkesztési előzmények megtekintéséhez
   layouts: 
+    copyright: Szerzői jog és licenc
     donate: Támogasd az OpenStreetMapot a Hardverfrissítési Alapba történő {{link}}sal.
     donate_link_text: adományozás
     edit: Szerkesztés
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 566633d0d..d43538917 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -103,14 +103,6 @@ ia:
         other: "Ha le sequente {{count}} vias:"
       no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes.
       show_area_box: Monstrar quadro del area
-    navigation: 
-      all: 
-        next_changeset_tooltip: Gruppo de modificationes sequente
-        prev_changeset_tooltip: Gruppo de modificationes precedente
-      user: 
-        name_changeset_tooltip: Vider modifications per {{user}}
-        next_changeset_tooltip: Modification sequente per {{user}}
-        prev_changeset_tooltip: Modification precedente per {{user}}
     common_details: 
       changeset_comment: "Commento:"
       edited_at: "Modificate le:"
@@ -128,6 +120,14 @@ ia:
         relation: Vider le relation in un carta plus grande
         way: Vider le via in un carta plus grande
       loading: Cargamento...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Gruppo de modificationes sequente
+        prev_changeset_tooltip: Gruppo de modificationes precedente
+      user: 
+        name_changeset_tooltip: Vider modifications per {{user}}
+        next_changeset_tooltip: Modification sequente per {{user}}
+        prev_changeset_tooltip: Modification precedente per {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discargar XML
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 048143e3b..32d81b0f5 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -103,14 +103,6 @@ is:
         other: "Inniheldur {{count}} vegi:"
       no_bounding_box: Engin svæðismörk voru vistuð ásamt þessu breytingarsetti.
       show_area_box: Sýna svæðismörk á aðalkorti
-    navigation: 
-      all: 
-        next_changeset_tooltip: Næsta breytingarsett
-        prev_changeset_tooltip: Fyrra breytingarsett
-      user: 
-        name_changeset_tooltip: Skoða breytingarsett eftir {{user}}
-        next_changeset_tooltip: Næsta breytingarsett eftir {{user}}
-        prev_changeset_tooltip: Fyrri breytingarsett eftir {{user}}
     common_details: 
       changeset_comment: "Athugasemd:"
       edited_at: "Breytt:"
@@ -128,6 +120,14 @@ is:
         relation: Skoða þessi vensl á stærra korti
         way: Skoða þennan veg á stærra korti
       loading: Hleð...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Næsta breytingarsett
+        prev_changeset_tooltip: Fyrra breytingarsett
+      user: 
+        name_changeset_tooltip: Skoða breytingarsett eftir {{user}}
+        next_changeset_tooltip: Næsta breytingarsett eftir {{user}}
+        prev_changeset_tooltip: Fyrri breytingarsett eftir {{user}}
     node: 
       download: "{{download_xml_link}} eða {{view_history_link}} eða {{edit_link}}"
       download_xml: Sækja hnútinn á XML sniði
diff --git a/config/locales/it.yml b/config/locales/it.yml
index b691cac76..78b238fb5 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -94,14 +94,6 @@ it:
       has_ways: "Possiede i seguenti {{count}} percorsi:"
       no_bounding_box: Per questo gruppo di modifiche non è stato memorizzato alcun riquadro di selezione.
       show_area_box: Mostra il riquadro dell'area
-    navigation: 
-      all: 
-        next_changeset_tooltip: Gruppo di modifiche successivo
-        prev_changeset_tooltip: Gruppo di modifiche precedente
-      user: 
-        name_changeset_tooltip: Visualizza le modifiche di {{user}}
-        next_changeset_tooltip: Modifica successiva di {{user}}
-        prev_changeset_tooltip: Modifica precedente di {{user}}
     common_details: 
       changeset_comment: "Commento:"
       edited_at: "Modificato il:"
@@ -119,6 +111,14 @@ it:
         relation: Visualizza la relation in una mappa più grande
         way: Visualizza la way in una mappa più grande
       loading: Caricamento in corso...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Gruppo di modifiche successivo
+        prev_changeset_tooltip: Gruppo di modifiche precedente
+      user: 
+        name_changeset_tooltip: Visualizza le modifiche di {{user}}
+        next_changeset_tooltip: Modifica successiva di {{user}}
+        prev_changeset_tooltip: Modifica precedente di {{user}}
     node: 
       download: "{{download_xml_link}} oppure {{view_history_link}}"
       download_xml: Scarica XML
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6f2a4bd5a..3c06bcfa2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -95,14 +95,6 @@ ja:
       has_ways: "次の {{count}} ウェイを持ちます:"
       no_bounding_box: この変更セットを格納する境界囲みは存在しません。
       show_area_box: 領域範囲表示
-    navigation: 
-      all: 
-        next_changeset_tooltip: 次の変更セット
-        prev_changeset_tooltip: 一つ前の変更セット
-      user: 
-        name_changeset_tooltip: "{{user}}による編集を表示"
-        next_changeset_tooltip: 次の編集（{{user}}による）
-        prev_changeset_tooltip: 前の編集（{{user}}による）
     common_details: 
       changeset_comment: "コメント:"
       edited_at: "編集日:"
@@ -120,6 +112,14 @@ ja:
         relation: このリレーションを大きいマップで見る
         way: このウェイを大きいマップで見る
       loading: 読み込み中…
+    navigation: 
+      all: 
+        next_changeset_tooltip: 次の変更セット
+        prev_changeset_tooltip: 一つ前の変更セット
+      user: 
+        name_changeset_tooltip: "{{user}}による編集を表示"
+        next_changeset_tooltip: 次の編集（{{user}}による）
+        prev_changeset_tooltip: 前の編集（{{user}}による）
     node: 
       download: "{{download_xml_link}}、{{view_history_link}}、または、{{edit_link}}"
       download_xml: XMLをダウンロード
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index a63e1489e..296501a3b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -103,14 +103,6 @@ mk:
         other: "Ги има следниве {{count}} патишта:"
       no_bounding_box: Нема зачувано рамка за овие измени.
       show_area_box: Прикажи рамка
-    navigation: 
-      all: 
-        next_changeset_tooltip: "Следни измени:"
-        prev_changeset_tooltip: "Претходни измени:"
-      user: 
-        name_changeset_tooltip: Погледај уредувања на {{user}}
-        next_changeset_tooltip: Следно уредување на {{user}}
-        prev_changeset_tooltip: Претходно уредување на {{user}}
     common_details: 
       changeset_comment: "Коментар:"
       edited_at: "Уредено во:"
@@ -128,6 +120,14 @@ mk:
         relation: Погледај ја релацијата на поголема карта
         way: Погледај го патот на поголема карта
       loading: Се вчитува...
+    navigation: 
+      all: 
+        next_changeset_tooltip: "Следни измени:"
+        prev_changeset_tooltip: "Претходни измени:"
+      user: 
+        name_changeset_tooltip: Погледај уредувања на {{user}}
+        next_changeset_tooltip: Следно уредување на {{user}}
+        prev_changeset_tooltip: Претходно уредување на {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преземи XML
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7d8d69cf5..7e2a27458 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -106,14 +106,6 @@ nl:
       has_ways: "Bevat de volgende {{count}} ways:"
       no_bounding_box: Er is geen selectiekader opgeslagen voor deze set wijzigingen.
       show_area_box: Gebied weergeven
-    navigation: 
-      all: 
-        next_changeset_tooltip: Volgende set wijzigingen
-        prev_changeset_tooltip: Vorige set wijzigingen
-      user: 
-        name_changeset_tooltip: Bewerkingen van {{user}} bekijken
-        next_changeset_tooltip: Volgende beweking door {{user}}
-        prev_changeset_tooltip: Vorige bewerking door {{user}}
     common_details: 
       changeset_comment: "Opmerking:"
       edited_at: "Bewerkt op:"
@@ -131,6 +123,14 @@ nl:
         relation: Relatie op grotere kaart bekijken
         way: Weg op grotere kaart bekijken
       loading: Bezig met laden...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Volgende set wijzigingen
+        prev_changeset_tooltip: Vorige set wijzigingen
+      user: 
+        name_changeset_tooltip: Bewerkingen van {{user}} bekijken
+        next_changeset_tooltip: Volgende beweking door {{user}}
+        prev_changeset_tooltip: Vorige bewerking door {{user}}
     node: 
       download: "{{download_xml_link}} of {{view_history_link}}"
       download_xml: XML downloaden
@@ -863,6 +863,7 @@ nl:
       history_tooltip: Bewerkingen voor dit gebied bekijken
       history_zoom_alert: U moet inzoomen om de kaart te bewerkingsgeschiedenis te bekijken
   layouts: 
+    copyright: Auteursrechten &amp; licentie
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken
diff --git a/config/locales/no.yml b/config/locales/no.yml
index c20c6df16..56057d65f 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -107,14 +107,6 @@
         other: "Har følgende {{count}} veier:"
       no_bounding_box: Ingen bounding box er lagret for dette endringssettet.
       show_area_box: Vis boks for område
-    navigation: 
-      all: 
-        next_changeset_tooltip: Neste endringssett
-        prev_changeset_tooltip: Forrige endringssett
-      user: 
-        name_changeset_tooltip: Vis redigeringer av {{user}}
-        next_changeset_tooltip: Neste redigering av {{user}}
-        prev_changeset_tooltip: Forrige redigering av {{user}}
     common_details: 
       changeset_comment: "Kommentar:"
       edited_at: "Redigert:"
@@ -132,6 +124,14 @@
         relation: Vis relasjon på større kart
         way: Vis vei på større kart
       loading: Laster ...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Neste endringssett
+        prev_changeset_tooltip: Forrige endringssett
+      user: 
+        name_changeset_tooltip: Vis redigeringer av {{user}}
+        next_changeset_tooltip: Neste redigering av {{user}}
+        prev_changeset_tooltip: Forrige redigering av {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Last ned XML
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 758bd5baf..499133193 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -110,14 +110,6 @@ pl:
         other: "Zawiera następujących {{count}} dróg:"
       no_bounding_box: Ten zestaw zmian został zapisany bez obszaru edycji.
       show_area_box: Pokaż obszar prostokątu
-    navigation: 
-      all: 
-        next_changeset_tooltip: Następny zestaw zmian
-        prev_changeset_tooltip: Poprzedni zestaw zmian
-      user: 
-        name_changeset_tooltip: Zobacz edycje wykonane przez użytkownika {{user}}
-        next_changeset_tooltip: Następna edycja wykonana przez użytkownika {{user}}
-        prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika {{user}}
     common_details: 
       changeset_comment: "Komentarz:"
       edited_at: "Edytowano:"
@@ -135,6 +127,14 @@ pl:
         relation: Zobacz relację na większej mapie
         way: Pokaż drogę na większej mapie
       loading: Wczytywanie...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Następny zestaw zmian
+        prev_changeset_tooltip: Poprzedni zestaw zmian
+      user: 
+        name_changeset_tooltip: Zobacz edycje wykonane przez użytkownika {{user}}
+        next_changeset_tooltip: Następna edycja wykonana przez użytkownika {{user}}
+        prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika {{user}}
     node: 
       download: "{{download_xml_link}} lub {{view_history_link}}"
       download_xml: Ściągnij XML
@@ -1323,6 +1323,10 @@ pl:
       password: "Hasło:"
       please login: Zaloguj się lub {{create_user_link}}.
       title: Logowanie
+    logout: 
+      heading: Wyloguj z OpenStreetMap
+      logout_button: Wyloguj
+      title: Wyloguj
     lost_password: 
       email address: "Adres e-mail:"
       heading: Zapomniałeś hasła?
@@ -1356,6 +1360,7 @@ pl:
       heading: Użytkownik{{user}} nie istnieje
       title: Nie znaleziono użytkownika
     popup: 
+      friend: Znajomy
       nearby mapper: Mapowicz z okolicy
       your location: Twoje położenie
     remove_friend: 
@@ -1400,7 +1405,7 @@ pl:
       nearby users: Najbliżsi użytkownicy
       new diary entry: nowy wpis w dzienniku
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.
-      no nearby users: Nikt nie przyznał się jeszcze do mapowania w tej okolicy.
+      no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania w tej okolicy.
       oauth settings: ustawienia oauth
       remove as friend: usuń ze znajomych
       role: 
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 11813940e..17e4fb3e3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -107,21 +107,6 @@ pt-BR:
         other: "Tem os seguintes {{count}} caminhos:"
       no_bounding_box: Nenhum limite de área foi armazenado para estas alterações.
       show_area_box: Área de exibição
-    navigation: 
-      all: 
-        next_changeset_tooltip: Próximo conjunto de alterações
-        prev_changeset_tooltip: Conjunto de alterações anterior
-      paging: 
-        all: 
-          next: "{{id}} &raquo;"
-          prev: "&laquo; {{id}}"
-        user: 
-          next: "{{id}} &raquo;"
-          prev: "&laquo; {{id}}"
-      user: 
-        name_changeset_tooltip: Ver edições de {{user}}
-        next_changeset_tooltip: Editado posteriormente por {{user}}
-        prev_changeset_tooltip: Editado anteriormente por {{user}}
     common_details: 
       changeset_comment: "Comentário:"
       edited_at: "Editado em:"
@@ -139,6 +124,21 @@ pt-BR:
         relation: Ver relação em um mapa maior
         way: Ver caminho em um mapa maior
       loading: Carregando...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Próximo conjunto de alterações
+        prev_changeset_tooltip: Conjunto de alterações anterior
+      paging: 
+        all: 
+          next: "{{id}} &raquo;"
+          prev: "&laquo; {{id}}"
+        user: 
+          next: "{{id}} &raquo;"
+          prev: "&laquo; {{id}}"
+      user: 
+        name_changeset_tooltip: Ver edições de {{user}}
+        next_changeset_tooltip: Editado posteriormente por {{user}}
+        prev_changeset_tooltip: Editado anteriormente por {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Baixar XML
@@ -881,6 +881,7 @@ pt-BR:
       history_tooltip: Veja as edições desta área
       history_zoom_alert: Você deve aumentar o zoom para ver o histórico de edição
   layouts: 
+    copyright: Direitos Autorais &amp; Licença
     donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
     donate_link_text: doando
     edit: Editar
@@ -1263,7 +1264,7 @@ pt-BR:
       search_results: Resultados da Busca
   time: 
     formats: 
-      friendly: "%e %B %E às %H:%M"
+      friendly: "%e de %B de %Y às %H:%M"
   trace: 
     create: 
       trace_uploaded: Seu arquivo GPX foi enviado e está aguardando para ser inserido no banco de dados. Isso normalmente leva meia hora, e um e-mail será enviado para você quando ocorrer.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8b3e60d8f..1926ca6f5 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -109,14 +109,6 @@ ru:
       has_ways: "Содержит {{count}} линий:"
       no_bounding_box: Для этого пакета правок границы не установлены.
       show_area_box: Показать выделенную область
-    navigation: 
-      all: 
-        next_changeset_tooltip: Следующий пакет правок
-        prev_changeset_tooltip: Предыдущий пакет правок
-      user: 
-        name_changeset_tooltip: Просмотр правок {{user}}
-        next_changeset_tooltip: Следующая правка {{user}}
-        prev_changeset_tooltip: Предыдущая правка {{user}}
     common_details: 
       changeset_comment: "Комментарий:"
       edited_at: "Изменено:"
@@ -134,6 +126,20 @@ ru:
         relation: Просмотр отношения на более крупной карте
         way: Просмотр линии на более крупной карте
       loading: Загрузка...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Следующий пакет правок
+        next_node_tooltip: Следующая точка
+        next_relation_tooltip: Следующее отношение
+        next_way_tooltip: Следующая линия
+        prev_changeset_tooltip: Предыдущий пакет правок
+        prev_node_tooltip: Предыдущая точка
+        prev_relation_tooltip: Предыдущее отношение
+        prev_way_tooltip: Предыдущая линия
+      user: 
+        name_changeset_tooltip: Просмотр правок {{user}}
+        next_changeset_tooltip: Следующая правка {{user}}
+        prev_changeset_tooltip: Предыдущая правка {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Скачать XML
@@ -218,6 +224,10 @@ ru:
       zoom_or_select: Увеличьте или выберите область для просмотра
     tag_details: 
       tags: "Теги:"
+      wiki_link: 
+        key: Страница вики, описывающая тег {{key}}
+        tag: Страница вики, описывающая тег {{key}}={{value}}
+      wikipedia_link: Статья {{page}} в Википедии
     timeout: 
       sorry: Извините, данные для {{type}} с id {{id}} слишком длинные для извлечения.
       type: 
@@ -870,6 +880,7 @@ ru:
       history_tooltip: Просмотр правок в этой области
       history_zoom_alert: Необходимо увеличить масштаб карты, чтобы увидеть историю правок
   layouts: 
+    copyright: Авторские права и лицензии
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 396429840..7420694f9 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -89,8 +89,8 @@ sk:
       closed_at: "Zatvorené o:"
       created_at: "Vytvorené o:"
       has_nodes: 
-        one: "Obsahuje nasledujúci {{count}} uzol:"
-        other: "Obsahuje nasledujúce {{count}} uzly:"
+        one: "Obsahuje nasledujúci {{count}} body:"
+        other: "Obsahuje nasledujúce {{count}} body:"
       has_relations: 
         one: "Obsahuje nasledujúcu {{count}} reláciu:"
         other: "Obsahuje nasledujúce {{count}} relácie:"
@@ -99,14 +99,6 @@ sk:
         other: "Obsahuje nasledujúce {{count}} cesty:"
       no_bounding_box: Pre tento počet zmien nie je uložený žiadny rozsah.
       show_area_box: Zobraziť Rám Oblasti
-    navigation: 
-      all: 
-        next_changeset_tooltip: Nasledujúci súbor zmien
-        prev_changeset_tooltip: Predchádzajúci súbor zmien
-      user: 
-        name_changeset_tooltip: Zobraziť úpravy od {{user}}
-        next_changeset_tooltip: Ďalšia úprava od {{user}}
-        prev_changeset_tooltip: Predošlá úprava od {{user}}
     common_details: 
       changeset_comment: "Komentár:"
       edited_at: "Upravené o:"
@@ -124,6 +116,14 @@ sk:
         relation: Zobraziť reláciu na väčšej mape
         way: Zobraziť cestu na väčšej mape
       loading: Nahrávanie...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Nasledujúci súbor zmien
+        prev_changeset_tooltip: Predchádzajúci súbor zmien
+      user: 
+        name_changeset_tooltip: Zobraziť úpravy od {{user}}
+        next_changeset_tooltip: Ďalšia úprava od {{user}}
+        prev_changeset_tooltip: Predošlá úprava od {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} alebo {{edit_link}}"
       download_xml: Stiahnuť XML
@@ -192,7 +192,7 @@ sk:
         heading: Zoznam objektov
         history: 
           type: 
-            node: Uzol [[id]]
+            node: Bod [[id]]
             way: Cesta [[id]]
         selected: 
           type: 
@@ -1322,7 +1322,7 @@ sk:
       email address: "E-mailová Adresa:"
       heading: Zabudli Ste Heslo?
       help_text: Vložte emailovú adresu, ktorú ste použili pri prihlásení, pošleme vám odkaz na to aby ste mohli resetovať vaše heslo.
-      new password button: Resetnúť heslo
+      new password button: Resetovať heslo
       notice email cannot find: Nemôžem nájsť emailovú adresu, prepáčte.
       notice email on way: Prepáčte stratili ste to :-( ale na ceste je mail, tak to čoskoro budete môcť resetovať.
       title: Stratené heslo
@@ -1466,6 +1466,7 @@ sk:
       sorry: Prepáčte, blok užívateľa s ID {{id}} nemohol byť nájdený.
     partial: 
       confirm: Ste si istí?
+      creator_name: Tvorca
       display_name: Blokovaný užívateľ
       edit: Upraviť
       not_revoked: (nezrušený)
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index d55693d5a..803460b03 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -81,14 +81,6 @@ sl:
         other: "Vsebuje naslednjih {{count}} poti:"
       no_bounding_box: Ta paket nima določenega pravokotnega področja.
       show_area_box: Prikaži pravokotno področje
-    navigation: 
-      all: 
-        next_changeset_tooltip: Naslednji paket sprememb
-        prev_changeset_tooltip: Prejšnji paket sprememb
-      user: 
-        name_changeset_tooltip: Prikaz prispevkov uporabnika {{user}}
-        next_changeset_tooltip: Naslednji prispevek uporabnika {{user}}
-        prev_changeset_tooltip: Prejšnji prispevek uporabnika {{user}}
     common_details: 
       edited_at: "Urejeno ob:"
       edited_by: "Uredil:"
@@ -105,6 +97,14 @@ sl:
         relation: Prikaz relacije na večjem zemljevidu
         way: Prikaz poti na večjem zemljevidu
       loading: Nalaganje ...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Naslednji paket sprememb
+        prev_changeset_tooltip: Prejšnji paket sprememb
+      user: 
+        name_changeset_tooltip: Prikaz prispevkov uporabnika {{user}}
+        next_changeset_tooltip: Naslednji prispevek uporabnika {{user}}
+        prev_changeset_tooltip: Prejšnji prispevek uporabnika {{user}}
     node: 
       download: "{{download_xml_link}} ali {{view_history_link}}"
       download_xml: prenesi XML
diff --git a/config/locales/sr-EC.yml b/config/locales/sr-EC.yml
index a6c21a9dc..595cce4af 100644
--- a/config/locales/sr-EC.yml
+++ b/config/locales/sr-EC.yml
@@ -101,14 +101,6 @@ sr-EC:
         few: "Има следеће {{count}} путање:"
         one: "Има следећу путању:"
         other: "Има следећих {{count}} путања:"
-    navigation: 
-      all: 
-        next_changeset_tooltip: Следећи скуп измена
-        prev_changeset_tooltip: Претходни скуп измена
-      user: 
-        name_changeset_tooltip: Види измене корисника {{user}}
-        next_changeset_tooltip: Следећа измена корисника {{user}}
-        prev_changeset_tooltip: Претходна измена корисника {{user}}
     common_details: 
       changeset_comment: "Напомена:"
       edited_at: "Измењено:"
@@ -126,6 +118,14 @@ sr-EC:
         relation: Погледај однос на већој мапи
         way: Погледај путању на већој мапи
       loading: Учитавање
+    navigation: 
+      all: 
+        next_changeset_tooltip: Следећи скуп измена
+        prev_changeset_tooltip: Претходни скуп измена
+      user: 
+        name_changeset_tooltip: Види измене корисника {{user}}
+        next_changeset_tooltip: Следећа измена корисника {{user}}
+        prev_changeset_tooltip: Претходна измена корисника {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 85b4f43af..3631f214f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -100,14 +100,6 @@ sv:
         other: "Innehåller följande {{count}} sträckor:"
       no_bounding_box: Inga yttre gränser (bounding box) lagrades för detta changeset.
       show_area_box: Visa boxarea
-    navigation: 
-      all: 
-        next_changeset_tooltip: Nästa ändringsset
-        prev_changeset_tooltip: Föregående ändringsset
-      user: 
-        name_changeset_tooltip: Se redigeringar av {{user}}
-        next_changeset_tooltip: Nästa redigering av {{user}}
-        prev_changeset_tooltip: Föregående redigering av {{user}}
     common_details: 
       changeset_comment: "Kommentar:"
       edited_at: "Redigerad:"
@@ -125,6 +117,14 @@ sv:
         relation: Se relationen på en större karta
         way: Se sträckan på en större karta
       loading: Läser in...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Nästa ändringsset
+        prev_changeset_tooltip: Föregående ändringsset
+      user: 
+        name_changeset_tooltip: Se redigeringar av {{user}}
+        next_changeset_tooltip: Nästa redigering av {{user}}
+        prev_changeset_tooltip: Föregående redigering av {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Laddda hem XML
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 999c94131..d405fb0d1 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -109,14 +109,6 @@ uk:
         other: "містить {{count}} ліній:"
       no_bounding_box: Для цього набору змін межі не встановлено.
       show_area_box: Показати виділену ділянку
-    navigation: 
-      all: 
-        next_changeset_tooltip: Наступний набір змін
-        prev_changeset_tooltip: Попередній набір змін
-      user: 
-        name_changeset_tooltip: Переглянути правки {{user}}
-        next_changeset_tooltip: Наступні зміни {{user}}
-        prev_changeset_tooltip: Попередні зміни {{user}}
     common_details: 
       changeset_comment: "Коментар:"
       edited_at: "Змінено:"
@@ -134,6 +126,14 @@ uk:
         relation: Перегляд зв’язку на більшій мапі
         way: Перегляд лінії на більшій мапі
       loading: Завантаження…
+    navigation: 
+      all: 
+        next_changeset_tooltip: Наступний набір змін
+        prev_changeset_tooltip: Попередній набір змін
+      user: 
+        name_changeset_tooltip: Переглянути правки {{user}}
+        next_changeset_tooltip: Наступні зміни {{user}}
+        prev_changeset_tooltip: Попередні зміни {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} або {{edit_link}}"
       download_xml: Завантажити XML
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index b517c034a..bc6809c90 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -103,14 +103,6 @@ vi:
         other: "Có {{count}} lối sau:"
       no_bounding_box: Không lưu hộp bao của bộ thay đổi này.
       show_area_box: Hiện Hộp vùng
-    navigation: 
-      all: 
-        next_changeset_tooltip: Bộ thay đổi sau
-        prev_changeset_tooltip: Bộ thay đổi trước
-      user: 
-        name_changeset_tooltip: Xem các đóng góp của {{user}}
-        next_changeset_tooltip: Đóng góp sau của {{user}}
-        prev_changeset_tooltip: Đóng góp trước của {{user}}
     common_details: 
       changeset_comment: "Miêu tả:"
       edited_at: "Lúc Sửa đổi:"
@@ -128,6 +120,14 @@ vi:
         relation: Xem quan hệ trên bản đồ rộng hơn
         way: Xem lối trên bản đồ rộng hơn
       loading: Đang tải...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Bộ thay đổi sau
+        prev_changeset_tooltip: Bộ thay đổi trước
+      user: 
+        name_changeset_tooltip: Xem các đóng góp của {{user}}
+        next_changeset_tooltip: Đóng góp sau của {{user}}
+        prev_changeset_tooltip: Đóng góp trước của {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}}, hoặc {{edit_link}}"
       download_xml: Tải xuống XML
@@ -428,6 +428,7 @@ vi:
           car_wash: Tiệm Rửa Xe
           casino: Sòng bạc
           cinema: Rạp phim
+          club: Câu lạc bộ
           college: Trường Cao đẳng
           community_centre: Trung tâm Cộng đồng
           courthouse: Tòa
@@ -476,7 +477,9 @@ vi:
           telephone: Điện thoại Công cộng
           theatre: Nhà hát
           toilets: Vệ sinh
+          townhall: Thị sảnh
           university: Trường Đại học
+          vending_machine: Máy Bán hàng
           waste_basket: Thùng rác
           wifi: Điểm Truy cập Không dây
           youth_centre: Trung tâm Thanh niên
@@ -490,8 +493,12 @@ vi:
           dormitory: Ký túc xá
           entrance: Cửa vào
           garage: Ga ra
+          hospital: Tòa nhà Bệnh viện
           hotel: Khách sạn
           house: Nhà ở
+          industrial: Tòa nhà Công nghiệp
+          office: Tòa nhà Văn phòng
+          residential: Nhà ở
           school: Nhà trường
           shop: Tiệm
           stadium: Sân vận động
@@ -499,16 +506,20 @@ vi:
           tower: Tháp
           train_station: Nhà ga
           university: Tòa nhà Đại học
+          "yes": Tòa nhà
         highway: 
           bridleway: Đường Cưỡi ngựa
           bus_stop: Chỗ Đậu Xe buýt
           construction: Đường Đang Xây
           cycleway: Đường Xe đạp
+          distance_marker: Cây số
           footway: Đường bộ
           gate: Cổng
+          living_street: Đường Hàng xóm
           minor: Đường Nhỏ
           motorway: Đường Cao tốc
           motorway_junction: Ngã tư Đường Cao tốc
+          motorway_link: Đường Cao tốc
           path: Lối
           pedestrian: Đường bộ Lớn
           primary: Đường Chính
@@ -519,10 +530,14 @@ vi:
           secondary: Đường Lớn
           secondary_link: Đường Lớn
           service: Đường phụ
+          services: Dịch vụ Dọc đường Cao tốc
           steps: Cầu thang
+          tertiary: Đường Lớn
+          track: Đường mòn
           trail: Đường mòn
           trunk: Xa lộ
           trunk_link: Xa lộ
+          unclassified: Đường Không Phân loại
           unsurfaced: Đường Không Lát
         historic: 
           archaeological_site: Khu vực Khảo cổ
@@ -612,6 +627,7 @@ vi:
           valley: Thung lũng
           volcano: Núi lửa
           water: Nước
+          wetlands: Đầm lầy
           wood: Rừng
         place: 
           airport: Sân bay
@@ -656,6 +672,7 @@ vi:
           computer: Tiệm Máy tính
           confectionery: Tiệm Kẹo
           convenience: Tiệm Tập hóa
+          cosmetics: Tiệm Mỹ phẩm
           drugstore: Nhà thuốc
           fashion: Tiệm Thời trang
           fish: Tiệm Cá
@@ -673,6 +690,7 @@ vi:
           music: Tiệm Nhạc
           newsagent: Tiệm Báo
           optician: Tiệm Kính mắt
+          organic: Tiệm Thực phẩm Hữu cơ
           photo: Tiệm Rửa Hình
           salon: Tiệm Làm tóc
           shoes: Tiệm Giày
@@ -683,15 +701,23 @@ vi:
           travel_agency: Văn phòng Du lịch
           video: Tiệm Phim
         tourism: 
+          alpine_hut: Túp lều Trên Núi
           artwork: Tác phẩm Nghệ thuật
           attraction: Nơi Du lịch
           bed_and_breakfast: Nhà trọ
           cabin: Túp lều
           camp_site: Nơi Cắm trại
+          chalet: Nhà ván
+          hostel: Nhà trọ
           hotel: Khách sạn
           information: Thông tin
+          lean_to: Nhà chái
+          motel: Khách sạn Dọc đường
           museum: Bảo tàng
+          picnic_site: Bàn ăn Ngoài trời
+          theme_park: Công viên Giải trí
           valley: Thung lũng
+          viewpoint: Thắng cảnh
           zoo: Vườn thú
         waterway: 
           canal: Kênh
@@ -718,6 +744,7 @@ vi:
       history_tooltip: Xem danh sách sửa đổi trong khu vực này
       history_zoom_alert: Hãy phóng to hơn để xem lịch sử sửa đổi
   layouts: 
+    copyright: Bản quyền &amp; Giấy phép
     donate: Hỗ trợ OpenStreetMap bằng cách {{link}} cho Quỹ Nâng cấp Phần cứng.
     donate_link_text: quyên góp
     edit: Sửa đổi
@@ -831,6 +858,9 @@ vi:
       title: Đọc thư
       to: Tới
       unread_button: Đánh dấu là chưa đọc
+      wrong_user: Bạn đã đăng nhập dùng tài khoản “{{user}}” nhưng vừa yêu cầu đọc một thư không được gửi từ hay đến bạn. Xin hãy đăng nhập với nhận diện chính xác để đọc nó.
+    reply: 
+      wrong_user: Bạn đã đăng nhập dùng tài khoản “{{user}}” nhưng vừa yêu cầu trả lời một thư không được gửi đến bạn. Xin hãy đăng nhập với nhận diện chính xác để trả lời.
     sent_message_summary: 
       delete_button: Xóa
   notifier: 
@@ -1131,6 +1161,7 @@ vi:
       count_points: "{{count}} nốt"
       edit: sửa đổi
       edit_map: Sửa đổi Bản đồ
+      identifiable: NHẬN RA ĐƯỢC
       in: trong
       map: bản đồ
       more: thêm
@@ -1138,6 +1169,7 @@ vi:
       private: RIÊNG
       public: CÔNG KHAI
       trace_details: Xem Chi tiết Tuyến đường
+      trackable: THEO DÕI ĐƯỢC
       view_map: Xem Bản đồ
     trace_form: 
       description: Miêu tả
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 47764f0cf..b7de8ed0d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -93,14 +93,6 @@ zh-TW:
         other: 有下列 {{count}} 個路徑：
       no_bounding_box: 這個變更組合沒有儲存綁定方塊。
       show_area_box: 顯示區域方塊
-    navigation: 
-      all: 
-        next_changeset_tooltip: 下一個變更組合
-        prev_changeset_tooltip: 上一個變更組合
-      user: 
-        name_changeset_tooltip: 檢視由 {{user}} 進行的編輯
-        next_changeset_tooltip: 下一個 {{user}} 的編輯
-        prev_changeset_tooltip: 上一個 {{user}} 的編輯
     common_details: 
       edited_at: 編輯於：
       edited_by: 編輯者：
@@ -117,6 +109,14 @@ zh-TW:
         relation: 在較大的地圖檢視關係
         way: 在較大的地圖檢視路徑
       loading: 正在載入...
+    navigation: 
+      all: 
+        next_changeset_tooltip: 下一個變更組合
+        prev_changeset_tooltip: 上一個變更組合
+      user: 
+        name_changeset_tooltip: 檢視由 {{user}} 進行的編輯
+        next_changeset_tooltip: 下一個 {{user}} 的編輯
+        prev_changeset_tooltip: 上一個 {{user}} 的編輯
     node: 
       download: "{{download_xml_link}} 或 {{view_history_link}}"
       download_xml: 下載 XML
diff --git a/config/potlatch/locales/br.yml b/config/potlatch/locales/br.yml
index ca06092cc..afd056b54 100644
--- a/config/potlatch/locales/br.yml
+++ b/config/potlatch/locales/br.yml
@@ -132,6 +132,7 @@ br:
   option_layer_ooc_7th: "Istor UK : 7vet"
   option_layer_ooc_npe: Istor UK NPE
   option_layer_ooc_scotland: "R-U istorel : Skos"
+  option_layer_os_streetview: "R-U : OS StreetView"
   option_layer_streets_haiti: "Haiti: anvioù ar straedoù"
   option_layer_tip: Dibab an drekleur da ziskwel
   option_limitways: Kas ur c'hemenn pa vez karget kalz a roadennoù pounner
@@ -195,6 +196,7 @@ br:
   tags_backtolist: Distreiñ d'ar roll
   tags_descriptions: Deskrivadurioù '$1'
   tags_findatag: Kavout un tikedenn
+  tags_findtag: Kavout un tikedenn
   tags_matching: Tikedennoù brudet hag a glot gant '$1'
   tags_typesearchterm: "Lakait ar ger da glask :"
   tip_addrelation: Ouzhpennañ d'un darempred
diff --git a/config/potlatch/locales/da.yml b/config/potlatch/locales/da.yml
index 1fa4426b1..528c4efac 100644
--- a/config/potlatch/locales/da.yml
+++ b/config/potlatch/locales/da.yml
@@ -8,6 +8,7 @@ da:
   a_way: $1 en vej
   action_addpoint: tilføjer et punkt til enden af en vej
   action_cancelchanges: afbryder ændringer af
+  action_changeway: ændringer til en vej
   action_createparallel: skaber parallelle veje
   action_createpoi: lave et POI (interessant punkt)
   action_deletepoint: sletter et punkt
@@ -24,32 +25,47 @@ da:
   action_waytags: sætter tags på en vej
   advanced: Avanceret
   advanced_close: Luk Changeset
+  advanced_history: Vej historie
+  advanced_inspector: Inspector
   advanced_maximise: Maksimer vinduet
   advanced_minimise: Minimer vindue
   advanced_parallel: Parallel vej
+  advanced_tooltip: Avanceret redigerings aktioner
   advanced_undelete: Genopret
+  advice_bendy: For krum til at rette ud (SHIFT at tvinge)
+  advice_conflict: Server konflikt - det kan være nødvendigt, at prøve at gemme igen
   advice_deletingpoi: Sletning af POI (Z for at fortryde)
   advice_deletingway: Sletter vej (Z for at fortryde)
+  advice_microblogged: Opdateret din $1 status
+  advice_nocommonpoint: Vejene deler ikke et fælles punkt
+  advice_revertingpoi: Vende tilbage til sidst gemte POI (Z for at fortryde)
   advice_revertingway: Vender tilbage til sidst gemte vej (Z for at fortryde)
+  advice_tagconflict: Tags matcher ikke - venligst kontrollere (Z for at fortryde)
   advice_toolong: For lang for låse op - venligst opdel i kortere veje
   advice_uploadempty: Intet at uploade
+  advice_uploadfail: Upload stoppet
   advice_uploadsuccess: Alle data uploadet succesfuldt
   advice_waydragged: Way flyttet (Z for at fortryde)
   cancel: Afbryd
   closechangeset: Lukker Changeset
+  conflict_download: Download deres version
   conflict_overwrite: Overskriv deres version
   conflict_poichanged: Siden du begyndte at redigere, har en anden ændret punkt $ 1 $ 2.
   conflict_relchanged: Siden du begyndte at redigere, har en anden ændret relation $1 $2.
+  conflict_visitpoi: Klik på 'OK' for at vise punkt.
   conflict_visitway: Klik på 'Ok' for at vise vejen.
   conflict_waychanged: Siden du begyndte at redigere, har en anden ændret vej $1 $2.
   createrelation: Lav en ny relation
   custom: "Custom:"
   delete: Slet
   deleting: sletter
+  drag_pois: Træk og slip punkter af interesse (POI)
   editinglive: Live redigering
   editingoffline: Redigering offline
   emailauthor: \n\nVenligst send en e-mail (på engelsk) til richard\@systemeD.net med en fejlrapport, og forklar hvad du gjorde da det skete.
+  error_anonymous: Du kan ikke kontakte en anonym Mapper.
   error_connectionfailed: Beklager - forbindelsen til OpenStreetMap-serveren fejlede, eventuelle nye ændringer er ikke blevet gemt. \n\nVil du prøve igen?
+  error_microblog_long: "Posting til $1 fejlede: \nHTTP-kode: $2 \nFejlmeddelelse: $3 \n$1 fejl: $ 4"
   error_nopoi: Fandt ikke POI-et, så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?)
   error_nosharedpoint: Vejene $1 og $2 deler ikke noget punkt længere, så det er ikke muligt at fortryde delingen.
   error_noway: Fandt ikke vejen $1 så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?)
@@ -57,49 +73,70 @@ da:
   existingrelation: Føj til en eksisterende relation
   findrelation: Find en relation som indeholder
   gpxpleasewait: Vent venligst mens GPX sporet behandles.
+  heading_drawing: Tegning
   heading_introduction: Indledning
+  heading_pois: Kom godt i gang
+  heading_quickref: Hurtig reference
   heading_surveying: Undersøge
+  heading_tagging: Tagging
+  heading_troubleshooting: Fejlfinding
   help: Hjælp
   hint_drawmode: klik for at tilføje punkt\ndobbeltklik eller enter\nfor at afslutte linie
+  hint_latlon: "breddegrad (lat) $1 \nlængdegrad (lon) $2"
   hint_loading: henter veje
   hint_overendpoint: over endepunkt\nklik for at forbinde\nshift+klik for at slå sammen til en
   hint_overpoint: over punkt\nklik for at forbinde
   hint_pointselected: punkt valgt\n(shift+klik punktet for at\nstarte en ny linie)
   hint_saving: gemmer data
+  hint_saving_loading: loader/gemmer data
   inspector: Inspektor
   inspector_duplicate: Duplikat af
   inspector_in_ways: I veje
+  inspector_latlon: "Breddegrad (Lat) $1 \nLængdegrad (Lon) $2"
   inspector_locked: LÃ¥st
+  inspector_node_count: ($1 gange)
   inspector_not_in_any_ways: Ikke på nogen veje (POI)
   inspector_unsaved: Ikke gemt
   inspector_uploading: (Uploading)
+  inspector_way_connects_to: Forbinder til $1 veje
   inspector_way_connects_to_principal: Forbinder til $1 $2 og $3 andre $4
+  inspector_way_nodes: $1 knudepunkter
   inspector_way_nodes_closed: $1 noder (lukkede)
+  loading: Loading ...
   login_pwd: "Password:"
   login_retry: Dit login blev ikke genkendt. Prøv venligst igen.
   login_title: Kunne ikke logge ind
   login_uid: "Brugernavn:"
   mail: Post
+  more: Mere
   newchangeset: "Prøv venligst igen: Potlatch vil starte et nyt changeset.."
   "no": Nej
   nobackground: Ingen baggrund
   norelations: Ingen relationer i området på skærmen
+  offset_broadcanal: Bred kanal træksti
   offset_choose: Vælg offset (m)
   offset_dual: Dobbelt vej (D2)
+  offset_motorway: Motorvej (D3)
+  offset_narrowcanal: Smal kanalen træksti
   ok: Ok
   openchangeset: Åbner Changeset
   option_custompointers: Brug pen- og håndvisere
+  option_external: "Ekstern launch:"
   option_fadebackground: Fjern baggrund
   option_layer_cycle_map: OSM - cykel kort
   option_layer_maplint: OSM - Maplint (fejl)
   option_layer_nearmap: "Australien: NearMap"
   option_layer_ooc_25k: "UK historisk: 1:25 k"
+  option_layer_ooc_7th: "UK historisk: 7."
+  option_layer_ooc_npe: "UK historisk: NPE"
+  option_layer_ooc_scotland: "UK historisk: Skotland"
   option_layer_os_streetview: "UK: OS StreetView"
   option_layer_streets_haiti: "Haiti: gadenavne"
   option_layer_tip: Vælg baggrunden til visning
   option_limitways: Advar ved loading af masser af data
   option_microblog_id: "Microblog navn:"
   option_microblog_pwd: "Microblog password:"
+  option_noname: Fremhæv unavngivene veje
   option_photo: "Foto KML:"
   option_thinareas: Brug tyndere linjer for områder
   option_thinlines: Brug tynde linier uanset skalering
@@ -108,8 +145,10 @@ da:
   point: Punkt
   preset_icon_airport: Lufthavn
   preset_icon_bar: Bar
+  preset_icon_bus_stop: Busstoppested
   preset_icon_cafe: Café
   preset_icon_cinema: Biograf
+  preset_icon_convenience: Dagligvare butik
   preset_icon_disaster: Haiti bygning
   preset_icon_fast_food: Fast food
   preset_icon_ferry_terminal: Færge
@@ -118,34 +157,46 @@ da:
   preset_icon_hotel: Hotel
   preset_icon_museum: Museum
   preset_icon_parking: Parkering
+  preset_icon_pharmacy: Apotek
   preset_icon_place_of_worship: Sted for tilbedelse
   preset_icon_police: Politistation
   preset_icon_post_box: Postkasse
+  preset_icon_pub: Pub
   preset_icon_recycling: Genbrug
+  preset_icon_restaurant: Restaurant
   preset_icon_school: Skole
   preset_icon_station: Togstation
+  preset_icon_supermarket: Supermarked
   preset_icon_taxi: Taxaholdeplads
   preset_icon_telephone: Telefon
+  preset_icon_theatre: Teater
   preset_tip: Vælg fra menuen af preset tags, der beskriver $1
   prompt_addtorelation: Tilføj $1 til en relation
   prompt_changesetcomment: "Indtast en beskrivelse af dine ændringer:"
+  prompt_closechangeset: Luk Changeset $1
   prompt_createparallel: Opret parallel vej
   prompt_editlive: Edit live
+  prompt_editsave: Rediger med gem
   prompt_helpavailable: Ny bruger? Kig nederst til venstre for at få hjælp.
   prompt_launch: Start ekstern URL
+  prompt_live: I live-mode, vil hver punkt du ændre, straks blive gemt i OpenStreetMap databasen - anbefales ikke til begyndere. Er du sikker?
   prompt_manyways: Dette område er meget detaljerede, og vil tage lang tid at hente. Foretrækker du at zoome ind?
+  prompt_microblog: Post til $1 ($2 venstre)
   prompt_revertversion: "Ret tilbage til tidligere lagret version:"
   prompt_savechanges: Gem ændringer
   prompt_taggedpoints: Nogle af punktene på denne vej har tags eller er i en relation. Vil du virkelig slette?
   prompt_track: Overfør dine GPS-spor til (låste) veje for redigering.
+  prompt_unlock: Klik for at låse op
   prompt_welcome: Velkommen til OpenStreetMap!
   retry: Prøv igen
   revert: Fortryd
   save: Gem
   tags_backtolist: Tilbage til listen
   tags_descriptions: Beskrivelser af '$ 1'
+  tags_findatag: Find et tag
   tags_findtag: Find tag
   tags_matching: Populære tags matchende '$1'
+  tags_typesearchterm: "Skriv et ord til at lede efter:"
   tip_addrelation: Føj til en relation
   tip_addtag: Tilføj et tag
   tip_alert: Der opstod en fejl, klik for detaljer
@@ -164,9 +215,13 @@ da:
   tip_tidy: Nydeliggøre vejpunkter (T)
   tip_undo: Fortryd $1 (Z)
   uploading: Overfører ...
+  uploading_deleting_pois: Sletning af POI'er
   uploading_deleting_ways: Sletter veje
   uploading_poi: Uploading POI $1
+  uploading_poi_name: Uploader POI $1, $2
+  uploading_relation: Uploader relation $1
   uploading_relation_name: Uploading relation $1, $2
+  uploading_way: Uploader vej $1
   uploading_way_name: Uploading vej$ 1, $ 2
   warning: Advarsel!
   way: Vej
diff --git a/config/potlatch/locales/dsb.yml b/config/potlatch/locales/dsb.yml
index 2d8073a03..b28a472c9 100644
--- a/config/potlatch/locales/dsb.yml
+++ b/config/potlatch/locales/dsb.yml
@@ -32,6 +32,7 @@ dsb:
   advanced_tooltip: Rozšyrjone wobźěłowańske akcije
   advanced_undelete: Wótnowiś
   advice_bendy: Pśekśiwy za zrownanje (UMSCH za wunuźenje)
+  advice_conflict: Serwerowy konflikt - móžno, až musyš znowego wopytaś składowaś
   advice_deletingpoi: Lašujo se dypk zajma (Z za anulěrowanje)
   advice_deletingway: Lašujo se puś (Z za anulěrowanje)
   advice_microblogged: Twój status $1 jo se zaktualizěrował
@@ -88,6 +89,7 @@ dsb:
   hint_saving: składuju se daty
   hint_saving_loading: zacytuju se/składuju se daty
   inspector: Inspektor
+  inspector_duplicate: Duplikat wót
   inspector_in_ways: Na puśach
   inspector_latlon: "Å yrina $1\nDlinina $2"
   inspector_locked: Zastajony
@@ -99,6 +101,7 @@ dsb:
   inspector_way_connects_to_principal: Zwězuje z {{PLURAL|one=objektom|two=$1 objektoma|few=$1 objektami|other=$1 objektami}} $2 a {{PLURAL|one=hynakšym objektom|two=$3 hynakšyma objektoma|few=$3 hynakšymi objektami|other=$3 hynakšymi objektami}} $4
   inspector_way_nodes: $1 sukow
   inspector_way_nodes_closed: $1 sukow (zacynjonych)
+  loading: Zacytujo se...
   login_pwd: "Gronidło:"
   login_retry: Twójo pśizjawjenje njejo se spóznało. Pšosym wopytaj hyšći raz.
   login_title: Pśizjawjenje njejo móžno było
@@ -125,6 +128,9 @@ dsb:
   option_layer_ooc_25k: "Wjelika Britaniska historiski: 1:25k"
   option_layer_ooc_7th: "Wjelika Britaniska historiski: 7th"
   option_layer_ooc_npe: "Wjelika Britaniska historiski: NPE"
+  option_layer_ooc_scotland: "Zjadnośone kralojstwo historiske: Šotiska"
+  option_layer_os_streetview: "Zjadnośone kralojstwo: OS StreetView"
+  option_layer_streets_haiti: "Haiti: drozne mjenja"
   option_layer_tip: Slězynu wubraś
   option_limitways: Warnowaś, gaž wjele datow se zacytujo
   option_microblog_id: "Mě mikrobloga:"
@@ -142,6 +148,7 @@ dsb:
   preset_icon_cafe: Kafejownja
   preset_icon_cinema: Kino
   preset_icon_convenience: Minimark
+  preset_icon_disaster: Haiti twarjenje
   preset_icon_fast_food: Pójědankarnja
   preset_icon_ferry_terminal: Prama
   preset_icon_fire_station: Wognjarnja
@@ -183,6 +190,12 @@ dsb:
   retry: Znowego wopytaś
   revert: Pśewobrośiś
   save: Składowaś
+  tags_backtolist: Slědk k lisćinje
+  tags_descriptions: Wopisanja wót '$1'
+  tags_findatag: Atribut namakaś
+  tags_findtag: Atribut namakaś
+  tags_matching: Woblubowane atributy, kótarež '$1' wótpowěduju
+  tags_typesearchterm: "Zapódaj pytański wuraz:"
   tip_addrelation: Relaciji pśidaś
   tip_addtag: Nowy atribut pśidaś
   tip_alert: Zmólka jo nastała - klikni za drobnostki
-- 
2.43.2