From: Matt Amos <zerebubuth@gmail.com>
Date: Fri, 2 Oct 2009 15:36:46 +0000 (+0000)
Subject: Merging 17905:17944 from trunk.
X-Git-Tag: live~7205^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/17f05fdb13cab3fc2f430c54ec7ad6557c53eeeb?hp=3429f016c2245bd538aaf277136bbf65e448b3a5

Merging 17905:17944 from trunk.
---

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 59b7c304b..386fd8b26 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -117,12 +117,20 @@
       <%= yield :optionals %>
 
       <center>
-        <div class="button" style="width: 115px">
-          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="<%= t 'layouts.alt_donation' %>" title="<%= t 'layouts.alt_donation' %>" /></a>
+        <div class="donate">
+          <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
         </div>
 
         <div id="cclogo" class="button" style="width: 88px">
-          <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+          <%= link_to(
+                  image_tag("cc_button.png",
+                      :alt => t('layouts.license.alt'),
+                      :border => 0,
+                      :width => 88,
+                      :height => 31,
+                      :title => t('layouts.license.title')),
+                  "http://creativecommons.org/licenses/by-sa/2.0/",
+                  { :rel => "license" }) %>
         </div>
       </center>
     </div>
diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb
index f1f9ddea7..afd1d2fc5 100644
--- a/app/views/message/outbox.html.erb
+++ b/app/views/message/outbox.html.erb
@@ -1,6 +1,6 @@
 <h2><%= t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), url_for(:controller => "user", :action => "inbox", :id => @user.display_name)) %>/<%= t'message.outbox.outbox' %></h2>
 
-<p><%= t'message.outbox.you_have_sent_messages', :sent_count => @user.sent_messages.size %>
+<p><%= t'message.outbox.you_have_sent_messages', :count => @user.sent_messages.size %>
 
 <% if @user.sent_messages.size > 0 %>
   <div id="messages">
diff --git a/config/locales/af.yml b/config/locales/af.yml
index a99f7870b..b3dbc85ca 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -269,7 +269,8 @@ af:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    alt_donation: Skenk 'n donasie
+    make_a_donation:
+      text: Skenk 'n donasie
     donate_link_text: skenk
     edit: Wysig
     edit_tooltip: Wysig kaarte
@@ -335,7 +336,7 @@ af:
       outbox: Posvak UIT
       subject: Onderwerp
       to: Aan
-      you_have_sent_messages: U het {{sent_count}} gestuurde boodskappe
+      you_have_sent_messages: U het {{count}} gestuurde boodskappe
     read: 
       date: Datum
       from: Van
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 3fa534932..522fd9832 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -276,7 +276,8 @@ be:
     results: 
       no_results: Нічога не знойдзена
   layouts: 
-    alt_donation: Зрабіць ахвяраванне
+    make_a_donation:
+      text: Зрабіць ахвяраванне
     donate: Падтрымайце OpenStreetMap {{link}} у фонд абнаўлення тэхнікі.
     donate_link_text: ахвяраваннем
     edit: Змяніць
@@ -367,7 +368,7 @@ be:
       subject: Тэма
       title: Зыходныя
       to: Каму
-      you_have_sent_messages: У вас {{sent_count}} дасланых паведамленняў
+      you_have_sent_messages: У вас {{count}} дасланых паведамленняў
     read: 
       back_to_inbox: Вярнуцца да ўваходных
       back_to_outbox: Вярнуцца да зыходных
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9eeb1c447..2fd0cafba 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -379,7 +379,8 @@ br:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
       suffix_place: " {{distance}} {{direction}} diouzh {{placename}}"
   layouts: 
-    alt_donation: Ober un donezon
+    make_a_donation:
+      text: Ober un donezon
     donate: Skoazellit OpenStreetMap dre {{link}} d'an Hardware Upgrade Fund.
     donate_link_text: oc'h ober un donezon
     edit: Aozañ
@@ -471,7 +472,7 @@ br:
       subject: Danvez
       title: Boest kas
       to: Da
-      you_have_sent_messages: Kaset hoc'h eus {{sent_count}} kemennadenn
+      you_have_sent_messages: Kaset hoc'h eus {{count}} kemennadenn
     read: 
       back_to_inbox: Distreiñ d'ar voest resev
       back_to_outbox: Distreiñ d'ar voest kas
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 51c5841ea..751fc95fd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -348,7 +348,8 @@ de:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    alt_donation: Spenden
+    make_a_donation:
+      text: Spenden
     donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
     donate_link_text: Spende
     edit: Bearbeiten
@@ -439,7 +440,7 @@ de:
       subject: Betreff
       title: Gesendet
       to: An
-      you_have_sent_messages: Du hast {{sent_count}} Nachrichten versendet
+      you_have_sent_messages: Du hast {{count}} Nachrichten versendet
     read: 
       back_to_inbox: Zurück zum Posteingang
       back_to_outbox: Zurück zu Gesendete Nachrichten
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 31fb00201..e0902df81 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -456,7 +456,12 @@ en:
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
-    alt_donation: Make a Donation
+    license:
+      alt: CC by-sa 2.0
+      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+    make_a_donation:
+      title: Support OpenStreetMap with a monetary donation
+      text: Make a Donation
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -581,7 +586,7 @@ en:
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      you_have_sent_messages: "You have {{count}} sent messages"
       to: "To"
       subject: "Subject"
       date: "Date"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5389dde3b..5f6ff0408 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -371,7 +371,8 @@ es:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Hacer una donación
+    make_a_donation:
+      text: Hacer una donación
     donate: Apoye a OpenStreetMap {{link}} al Fondo de Actualización de Hardware.
     donate_link_text: donando
     edit: Editar
@@ -464,7 +465,7 @@ es:
       subject: Asunto
       title: Salida
       to: A
-      you_have_sent_messages: Tienes {{sent_count}} mensajes enviados
+      you_have_sent_messages: Tienes {{count}} mensajes enviados
     read: 
       back_to_inbox: Regresar a la bandeja de entrada
       back_to_outbox: Regresar a la bandeja de salida
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 072003c8b..ae40862a0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -304,7 +304,8 @@ fi:
     results: 
       no_results: Mitään ei löytynyt
   layouts: 
-    alt_donation: Tee lahjoitus
+    make_a_donation:
+      text: Tee lahjoitus
     donate_link_text: lahjoittaminen
     edit: Muokkaa
     edit_tooltip: Muokkaa karttoja
@@ -383,7 +384,7 @@ fi:
       subject: Otsikko
       title: Lähetetyt
       to: Vastaanottaja
-      you_have_sent_messages: Sinulla on {{sent_count}} lähetettyä viestiä
+      you_have_sent_messages: Sinulla on {{count}} lähetettyä viestiä
     read: 
       back_to_inbox: Takaisin saapuneisiin
       back_to_outbox: Takaisin lähetettyihin
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6afbd5745..e6d7a5948 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -354,7 +354,8 @@ fr:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Faire un don
+    make_a_donation:
+      text: Faire un don
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Éditer
@@ -444,7 +445,7 @@ fr:
       subject: Objet
       title: Boîte d'envoi
       to: À
-      you_have_sent_messages: Vous avez envoyé {{sent_count}} messages
+      you_have_sent_messages: Vous avez envoyé {{count}} messages
     read: 
       back_to_inbox: Revenir à la boîte de réception
       back_to_outbox: Revenir à la boîte d'envoi
diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 76acf5523..da038f17c 100644
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -105,7 +105,8 @@ gcf:
     no_such_user: 
       body: Woy, Pa ti ni pon itilizatè non ay sé {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
   layouts: 
-    alt_donation: Ba OpenStreetMap On Fòs
+    make_a_donation:
+      text: Ba OpenStreetMap On Fòs
     donate: Ba OpenStreetMap on Fòs, {{link}} Pou fè matériel la vansé.
     donate_link_text: Bay Chabon
     edit: Modifié
diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index bd7706a6d..cdfe83d38 100644
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -378,7 +378,8 @@ hsb:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wot {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} z {{placename}}"
   layouts: 
-    alt_donation: Darić
+    make_a_donation:
+      text: Darić
     donate: Podpěraj OpenStreetMap přez {{link}} k fondsej aktualizacije hardwary.
     donate_link_text: Darjenje
     edit: Wobdźěłać
@@ -468,7 +469,7 @@ hsb:
       subject: Temowe nadpismo
       title: Pósłany
       to: Komu
-      you_have_sent_messages: Sy {{sent_count}} pósłanych powěsćow
+      you_have_sent_messages: Sy {{count}} pósłanych powěsćow
     read: 
       back_to_inbox: Wróćo k póstowemu kašćikej
       back_to_outbox: Wróćo k pósłanym powěsćam
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 316d7e712..153f4d10b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -380,7 +380,8 @@ hu:
       suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
       suffix_suburb: "{{suffix}} ({{parentname}})"
   layouts: 
-    alt_donation: Adományozz
+    make_a_donation:
+      text: Adományozz
     donate: Támogasd az OpenStreetMapot a Hardverfrissítési Alapba történő {{link}}sal.
     donate_link_text: adományozás
     edit: Szerkesztés
@@ -474,7 +475,7 @@ hu:
       subject: Tárgy
       title: Elküldött üzenetek
       to: Címzett
-      you_have_sent_messages: "{{sent_count}} elküldött üzeneted van"
+      you_have_sent_messages: "{{count}} elküldött üzeneted van"
     read: 
       back_to_inbox: Vissza a beérkezett üzenetekhez
       back_to_outbox: Vissza az elküldött üzenetekhez
diff --git a/config/locales/is.yml b/config/locales/is.yml
index a0503fbcb..885fe2f3a 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -381,7 +381,8 @@ is:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
   layouts: 
-    alt_donation: Fjárframlagssíða
+    make_a_donation:
+      text: Fjárframlagssíða
     donate: Hjálpaðu OpenStreetMap verkefninu með {{link}} í vélbúnaðarsjóðinn.
     donate_link_text: fjárframlagi
     edit: Breyta
@@ -475,7 +476,7 @@ is:
       subject: Titill
       title: Úthólf
       to: Til
-      you_have_sent_messages: Þú hefur sent {{sent_count}} skeyti
+      you_have_sent_messages: Þú hefur sent {{count}} skeyti
     read: 
       back_to_inbox: Aftur í innhólf
       back_to_outbox: Aftur í úthólf
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c4da29183..c377c9851 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -262,7 +262,8 @@ it:
         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    alt_donation: Fai una donazione
+    make_a_donation:
+      text: Fai una donazione
     donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
     donate_link_text: donando
     edit: Modifica
@@ -330,7 +331,7 @@ it:
       subject: Oggetto
       title: In uscita
       to: A
-      you_have_sent_messages: Hai {{sent_count}} messaggi inviati
+      you_have_sent_messages: Hai {{count}} messaggi inviati
     read: 
       back_to_inbox: Ritorna ai messaggi in arrivo
       back_to_outbox: Ritorna ai messaggi in uscita
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c71985884..04533bd73 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -323,7 +323,8 @@ ja:
         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>からの結果
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>からの結果
   layouts: 
-    alt_donation: 寄付
+    make_a_donation:
+      text: 寄付
     donate_link_text: 寄付
     edit: 編集
     edit_tooltip: 地図を編集する
@@ -411,7 +412,7 @@ ja:
       subject: タイトル
       title: 送信箱
       to: 宛先
-      you_have_sent_messages: "{{sent_count}}この送信済みメッセージがあります"
+      you_have_sent_messages: "{{count}}この送信済みメッセージがあります"
     read: 
       back_to_inbox: 受信箱に戻る
       back_to_outbox: 送信箱に戻る
diff --git a/config/locales/km.yml b/config/locales/km.yml
index d6754bb19..9176fdbc8 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -223,7 +223,8 @@ km:
         uk_postcode: លទ្ធផលពី <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: លទ្ធផលពី <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    alt_donation: ជួយ​ឧបត្ថម្ភ​
+    make_a_donation:
+      text: ជួយ​ឧបត្ថម្ភ​
     edit: កែប្រែ​
     edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5284a7c6d..8312c77df 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -239,7 +239,8 @@ ko:
       manually_select: 다른 지역 선택
       view_larger_map: 큰 지도 보기
   layouts: 
-    alt_donation: 기부하기
+    make_a_donation:
+      text: 기부하기
     donate_link_text: 기부
     edit: 편집
     edit_tooltip: 지도 편집
@@ -309,7 +310,7 @@ ko:
       people_mapping_nearby: 근처를 지도 입력한 사람들
       subject: 제목
       title: 보낸 쪽지함
-      you_have_sent_messages: "{{sent_count}} 개의 쪽지를 보냈습니다."
+      you_have_sent_messages: "{{count}} 개의 쪽지를 보냈습니다."
   notifier: 
     diary_comment_notification: 
       banner1: "*                         이 email에 답장하지 마세요.                          *"
diff --git a/config/locales/nds.yml b/config/locales/nds.yml
index 35fd00787..358b5fd70 100644
--- a/config/locales/nds.yml
+++ b/config/locales/nds.yml
@@ -214,7 +214,8 @@ nds:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
   layouts: 
-    alt_donation: Spenn wat
+    make_a_donation:
+      text: Spenn wat
     donate_link_text: Spennen
     edit: Ännern
     export_tooltip: Koortendaten exporteren
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c4d917b04..a3c200b88 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -364,7 +364,8 @@ nl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
   layouts: 
-    alt_donation: Doneren
+    make_a_donation:
+      text: Doneren
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken
@@ -454,7 +455,7 @@ nl:
       subject: Onderwerp
       title: Postvak UIT
       to: Aan
-      you_have_sent_messages: U hebt {{sent_count}} verzonden berichten
+      you_have_sent_messages: U hebt {{count}} verzonden berichten
     read: 
       back_to_inbox: Terug naar Postvak IN
       back_to_outbox: Terug naar Postvak UIT
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4922301fd..e10969176 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -348,7 +348,8 @@
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} av {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} av {{placename}}"
   layouts: 
-    alt_donation: Doner
+    make_a_donation:
+      text: Doner
     donate_link_text: donering
     edit: Rediger
     edit_tooltip: Rediger kart
@@ -433,7 +434,7 @@
       subject: Emne
       title: Utboks
       to: Til
-      you_have_sent_messages: Du har sendt {{sent_count}} meldinger
+      you_have_sent_messages: Du har sendt {{count}} meldinger
     read: 
       back_to_inbox: Tilbake til innboks
       back_to_outbox: Tilbake til utboks
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1bc5fde0b..487ab9f58 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -260,7 +260,8 @@ pl:
         uk_postcode: Wyniki z <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Wyniki z <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    alt_donation: Zrób Donację
+    make_a_donation:
+      text: Zrób Donację
     donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu.
     donate_link_text: dokonując darowizny
     edit: Edycja
@@ -337,7 +338,7 @@ pl:
       subject: Temat
       title: Wiadomości wysłane
       to: Do
-      you_have_sent_messages: Wysłaleś/aś {{sent_count}} wiadomości
+      you_have_sent_messages: Wysłaleś/aś {{count}} wiadomości
     read: 
       back_to_inbox: Powrót do wysłanych
       date: Nadano
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index caa7288b1..949c6d81e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -368,7 +368,8 @@ pt-BR:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
   layouts: 
-    alt_donation: Faça uma doação
+    make_a_donation:
+      text: Faça uma doação
     donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: {{link}}."
     donate_link_text: doando
     edit: Editar
@@ -458,7 +459,7 @@ pt-BR:
       subject: Assunto
       title: Caixa de Saída
       to: Para
-      you_have_sent_messages: Você tem {{sent_count}} mensagens enviadas
+      you_have_sent_messages: Você tem {{count}} mensagens enviadas
     read: 
       back_to_inbox: Voltar para a caixa de entrada
       back_to_outbox: Voltar para a caixa de saída
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 970fbcf74..e7b1129d6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -377,7 +377,8 @@ ru:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} {{placename}}"
   layouts: 
-    alt_donation: Сделать пожертвование
+    make_a_donation:
+      text: Сделать пожертвование
     donate: Поддержите OpenStreetMap {{link}} в Фонд обновления оборудования.
     donate_link_text: пожертвованиями
     edit: Правка
@@ -471,7 +472,7 @@ ru:
       subject: Тема
       title: Исходящие
       to: Кому
-      you_have_sent_messages: Вы отправили {{sent_count}} сообщений
+      you_have_sent_messages: Вы отправили {{count}} сообщений
     read: 
       back_to_inbox: Назад ко входящим
       back_to_outbox: Назад к исходящим
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 55d91567c..c523f5a8a 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -358,7 +358,8 @@ sl:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
   layouts: 
-    alt_donation: Prispevajte finančna sredstva
+    make_a_donation:
+      text: Prispevajte finančna sredstva
     donate: Podprite OpenStreetMap z {{link}} v fond za nadgradnjo strojne opreme.
     donate_link_text: donacijo
     edit: Uredi
@@ -452,7 +453,7 @@ sl:
       subject: Zadeva
       title: Poslana pošta
       to: Za
-      you_have_sent_messages: Poslali ste {{sent_count}} sporočil
+      you_have_sent_messages: Poslali ste {{count}} sporočil
     read: 
       back_to_inbox: Nazaj na prejeto pošto
       back_to_outbox: Nazaj na poslano pošto
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fe75853a5..62dbf5b47 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -379,7 +379,8 @@ vi:
       suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})"
       suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}"
   layouts: 
-    alt_donation: Quyên góp
+    make_a_donation:
+      text: Quyên gó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
@@ -474,7 +475,7 @@ vi:
       subject: Tiêu đề
       title: Hộp thư đã gửi
       to: Tới
-      you_have_sent_messages: Bạn đã gửi {{sent_count}} thư
+      you_have_sent_messages: Bạn đã gửi {{count}} thư
     read: 
       back_to_inbox: Trở về hộp thư đến
       back_to_outbox: Trở về hộp thư đã gửi
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index acde3d2ed..80373e768 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -49,7 +49,8 @@ yo:
     view: 
       login: wole
   layouts: 
-    alt_donation: Da wo si openstreetmap.org
+    make_a_donation:
+      text: Da wo si openstreetmap.org
     donate_link_text: idawo
     home: ile
     home_tooltip: Lo si ile
@@ -65,7 +66,7 @@ yo:
     welcome_user: Kabo, {{user_link}}
   message: 
     outbox: 
-      you_have_sent_messages: O ni {{sent_count}} sent messages
+      you_have_sent_messages: O ni {{count}} sent messages
     read: 
       back_to_inbox: Pada si inbox
       back_to_outbox: Pad si outbox
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d8ef42f59..57cdbae07 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -257,7 +257,8 @@ zh-CN:
         uk_postcode: 结果 从 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: 结果 从 <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
-    alt_donation: 捐款
+    make_a_donation:
+      text: 捐款
     donate: 通过下面的link到Hardware Upgrade Fund来支持。
     donate_link_text: 捐款
     edit: 编辑
@@ -332,7 +333,7 @@ zh-CN:
       people_mapping_nearby: 在您附近的人
       subject: 主体
       to: 给
-      you_have_sent_messages: 您有{{sent_count}} 已发送邮件
+      you_have_sent_messages: 您有{{count}} 已发送邮件
     read: 
       back_to_inbox: 返回收件箱
       back_to_outbox: 返回发件箱
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f7b24fdd6..409ec49ee 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -370,7 +370,8 @@ zh-TW:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ／ {{parentname}})"
       suffix_place: ", {{direction}} {{distance}} ／ {{placename}}"
   layouts: 
-    alt_donation: 進行捐款
+    make_a_donation:
+      text: 進行捐款
     donate: 以 {{link}} 給硬體升級基金來支援 OpenStreetMap。
     donate_link_text: 捐獻
     edit: 編輯
@@ -459,7 +460,7 @@ zh-TW:
       subject: 主旨
       title: 寄件匣
       to: 收件者
-      you_have_sent_messages: 您有 {{sent_count}} 個寄送的訊息
+      you_have_sent_messages: 您有 {{count}} 個寄送的訊息
     read: 
       back_to_inbox: 回到收件匣
       back_to_outbox: 回到寄件匣
diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index d35b1ff97..3d560056e 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -19,13 +19,13 @@ en:
   action_splitway: splitting a way
   action_waytags: setting tags on a way
   advanced: Advanced
-  advanced_tooltip: Advanced editing actions
   advanced_close: Close changeset
   advanced_history: Way history
   advanced_inspector: Inspector
   advanced_maximise: Maximise window
   advanced_minimise: Minimise window
   advanced_parallel: Parallel way
+  advanced_tooltip: Advanced editing actions
   advanced_undelete: Undelete
   advice_bendy: Too bendy to straighten (SHIFT to force)
   advice_deletingpoi: Deleting POI (Z to undo)
@@ -73,7 +73,7 @@ en:
   heading_tagging: Tagging
   heading_troubleshooting: Troubleshooting
   help: Help
-  help_html: "<!--\n\n========================================================================================================================\nPage 1: Introduction\n\n--><headline>Welcome to Potlatch</headline>\n<largeText>Potlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n</largeText>\n\n<column/><headline>Useful stuff to know</headline>\n<bodyText>Don't copy from other maps! \n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, <i>immediately</i>. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap</a> or <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nRemember it's <i>both</i> a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n</bodyText>\n\n<column/><headline>Find out more</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch manual</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Mailing lists</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">Online chat (live help)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">Web forum</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Community wiki</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Potlatch source-code</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nPage 2: getting started\n\n--><page/><headline>Getting started</headline>\n<bodyText>Now that you have Potlatch open, click 'Edit with save' to get started.\n\t\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.</bodytext>\n\n<column/><headline>Drag and drop</headline>\n<bodyText>To make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\t\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\n</bodyText><column/><headline>Moving around</headline>\n<bodyText>To move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">mapping parties</a>.</bodyText>\n\n<headline>Next steps</headline>\n<bodyText>Happy with all of that? Great. Click 'Surveying' above to find out how to become a <i>real</i> mapper!</bodyText>\n\n<!--\n========================================================================================================================\nPage 3: Surveying\n\n--><page/><headline>Surveying with a GPS</headline>\n<bodyText>The idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\n\t\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">GPS Reviews</a> on our wiki.</bodyText>\n<column/><headline>Uploading your track</headline>\n<bodyText>Now, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.</bodyText>\n<headline>Using your track</headline>\n<bodyText>Find your uploaded track in the 'GPS Traces' listing, and click 'edit' <i>right next to it</i>. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\n<img src=\"gps\">You can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold SHIFT to show just your tracks.</bodyText>\n<column/><headline>Using satellite photos</headline>\n<bodyText>If you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\n<img src='prefs'>If you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.</bodytext>\n\n<!--\n========================================================================================================================\nPage 4: Drawing\n\n--><page/><headline>Drawing ways</headline>\n<bodyText>To draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\n</bodyText><column/><headline>Making junctions</headline>\n<bodyText>It's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\t\nPotlatch takes care of this as long as you are careful to click <i>exactly</i> on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.</bodyText>\n<headline>Moving and deleting</headline>\n<bodyText>This works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)</bodyText>\n<column/><headline>More advanced drawing</headline>\n<bodyText><img src=\"scissors\">If two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by Shift-clicking, but don't merge two roads of different names or types.)\n\t\n<img src=\"tidy\">Roundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)</bodyText>\n<headline>Points of interest</headline>\n<bodyText>The first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\n<!--\n========================================================================================================================\nPage 4: Tagging\n\n--><page/><headline>What type of road is it?</headline>\n<bodyText>Once you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add <i>highway | trunk</i> to say it's a major road; <i>highway | residential</i> for a road on a housing estate; or <i>highway | footway</i> for a footpath. If bikes were banned, you could then add <i>bicycle | no</i>. Then to record its name, add <i>name | Market Street</i>.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.</bodytext>\n<column/><headline>Using preset tags</headline>\n<bodyText>To get you started, Potlatch has ready-made presets containing the most popular tags.\n\n<img src=\"preset_road\">Select a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.</bodyText>\n<headline>One-way roads</headline>\n<bodyText>You might want to add a tag like <i>oneway | yes</i> - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.</bodyText>\n<column/><headline>Choosing your own tags</headline>\n<bodyText>Of course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, and there is a long list of popular tags on our wiki called <a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Map Features</a>. But these are <i>only suggestions, not rules</i>. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.</bodyText>\n<headline>Relations</headline>\n<bodyText>Sometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Find out more</a> on the wiki.</bodyText>\n\n<!--\n========================================================================================================================\nPage 6: Troubleshooting\n\n--><page/><headline>Undoing mistakes</headline>\n<bodyText><img src=\"undo\">This is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the padlock (by the ID); and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\n</bodyText><column/><headline>FAQs</headline>\n<bodyText><b>How do I see my waypoints?</b>\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> and <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Working faster</headline>\n<bodyText>The further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Check the wiki</a> for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the padlock (bottom left) to unlock when ready to save.</bodytext>\n\n<!--\n========================================================================================================================\nPage 7: Quick reference\n\n--><page/><headline>What to click</headline>\n<bodyText><b>Drag the map</b> to move around.\n<b>Double-click</b> to create a new POI.\n<b>Single-click</b> to start a new way.\n<b>Hold and drag a way or POI</b> to move it.</bodyText>\n<headline>When drawing a way</headline>\n<bodyText><b>Double-click</b> or <b>press Enter</b> to finish drawing.\n<b>Click</b> another way to make a junction.\n<b>Shift-click the end of another way</b> to merge.</bodyText>\n<headline>When a way is selected</headline>\n<bodyText><b>Click a point</b> to select it.\n<b>Shift-click in the way</b> to insert a new point.\n<b>Shift-click a point</b> to start a new way from there.\n<b>Shift-click another way</b> to merge.</bodyText>\n</bodyText>\n<column/><headline>Keyboard shortcuts</headline>\n<bodyText><textformat tabstops='[25]'>B\tAdd <u>b</u>ackground source tag\nC\tClose <u>c</u>hangeset\nG\tShow <u>G</u>PS tracks\nH\tShow <u>h</u>istory\nI\tShow <u>i</u>nspector\nJ\t<u>J</u>oin point to crossing ways\nK\tLoc<u>k</u>/unlock current selection\nL\tShow current <u>l</u>atitude/longitude\nM\t<u>M</u>aximise editing window\nP\tCreate <u>p</u>arallel way\nR\t<u>R</u>epeat tags\nS\t<u>S</u>ave (unless editing live)\nT\t<u>T</u>idy into straight line/circle\nU\t<u>U</u>ndelete (show deleted ways)\nX\tCut way in two\nZ\tUndo\n-\tRemove point from this way only\n+\tAdd new tag\n/\tSelect another way sharing this point\n</textformat><textformat tabstops='[50]'>Delete\tDelete point\n (+Shift)\tDelete entire way\nReturn\tFinish drawing line\nSpace\tHold and drag background\nEsc\tAbort this edit; reload from server\n0\tRemove all tags\n1-9\tSelect preset tags\n (+Shift)\tSelect memorised tags\n (+S/Ctrl)\tMemorise tags\n§ or `\tCycle between tag groups\n</textformat>\n</bodyText>\n"
+  help_html: "<!--\n\n========================================================================================================================\nPage 1: Introduction\n\n--><headline>Welcome to Potlatch</headline>\n<largeText>Potlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n</largeText>\n\n<column/><headline>Useful stuff to know</headline>\n<bodyText>Don't copy from other maps! \n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, <i>immediately</i>. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap</a> or <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nRemember it's <i>both</i> a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n</bodyText>\n\n<column/><headline>Find out more</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch manual</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Mailing lists</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">Online chat (live help)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">Web forum</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Community wiki</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Potlatch source-code</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nPage 2: getting started\n\n--><page/><headline>Getting started</headline>\n<bodyText>Now that you have Potlatch open, click 'Edit with save' to get started.\n\t\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.</bodytext>\n\n<column/><headline>Drag and drop</headline>\n<bodyText>To make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\t\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\n</bodyText><column/><headline>Moving around</headline>\n<bodyText>To move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">mapping parties</a>.</bodyText>\n\n<headline>Next steps</headline>\n<bodyText>Happy with all of that? Great. Click 'Surveying' above to find out how to become a <i>real</i> mapper!</bodyText>\n\n<!--\n========================================================================================================================\nPage 3: Surveying\n\n--><page/><headline>Surveying with a GPS</headline>\n<bodyText>The idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\n\t\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">GPS Reviews</a> on our wiki.</bodyText>\n<column/><headline>Uploading your track</headline>\n<bodyText>Now, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.</bodyText>\n<headline>Using your track</headline>\n<bodyText>Find your uploaded track in the 'GPS Traces' listing, and click 'edit' <i>right next to it</i>. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\n<img src=\"gps\">You can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold SHIFT to show just your tracks.</bodyText>\n<column/><headline>Using satellite photos</headline>\n<bodyText>If you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\n<img src='prefs'>If you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.</bodytext>\n\n<!--\n========================================================================================================================\nPage 4: Drawing\n\n--><page/><headline>Drawing ways</headline>\n<bodyText>To draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\n</bodyText><column/><headline>Making junctions</headline>\n<bodyText>It's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\t\nPotlatch takes care of this as long as you are careful to click <i>exactly</i> on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.</bodyText>\n<headline>Moving and deleting</headline>\n<bodyText>This works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)</bodyText>\n<column/><headline>More advanced drawing</headline>\n<bodyText><img src=\"scissors\">If two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by Shift-clicking, but don't merge two roads of different names or types.)\n\t\n<img src=\"tidy\">Roundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)</bodyText>\n<headline>Points of interest</headline>\n<bodyText>The first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\n<!--\n========================================================================================================================\nPage 4: Tagging\n\n--><page/><headline>What type of road is it?</headline>\n<bodyText>Once you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add <i>highway | trunk</i> to say it's a major road; <i>highway | residential</i> for a road on a housing estate; or <i>highway | footway</i> for a footpath. If bikes were banned, you could then add <i>bicycle | no</i>. Then to record its name, add <i>name | Market Street</i>.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.</bodytext>\n<column/><headline>Using preset tags</headline>\n<bodyText>To get you started, Potlatch has ready-made presets containing the most popular tags.\n\n<img src=\"preset_road\">Select a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.</bodyText>\n<headline>One-way roads</headline>\n<bodyText>You might want to add a tag like <i>oneway | yes</i> - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.</bodyText>\n<column/><headline>Choosing your own tags</headline>\n<bodyText>Of course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, and there is a long list of popular tags on our wiki called <a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Map Features</a>. But these are <i>only suggestions, not rules</i>. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.</bodyText>\n<headline>Relations</headline>\n<bodyText>Sometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Find out more</a> on the wiki.</bodyText>\n\n<!--\n========================================================================================================================\nPage 6: Troubleshooting\n\n--><page/><headline>Undoing mistakes</headline>\n<bodyText><img src=\"undo\">This is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the padlock (by the ID); and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\n</bodyText><column/><headline>FAQs</headline>\n<bodyText><b>How do I see my waypoints?</b>\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> and <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Working faster</headline>\n<bodyText>The further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Check the wiki</a> for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the padlock (bottom left) to unlock when ready to save.</bodytext>\n\n<!--\n========================================================================================================================\nPage 7: Quick reference\n\n--><page/><headline>What to click</headline>\n<bodyText><b>Drag the map</b> to move around.\n<b>Double-click</b> to create a new POI.\n<b>Single-click</b> to start a new way.\n<b>Hold and drag a way or POI</b> to move it.</bodyText>\n<headline>When drawing a way</headline>\n<bodyText><b>Double-click</b> or <b>press Enter</b> to finish drawing.\n<b>Click</b> another way to make a junction.\n<b>Shift-click the end of another way</b> to merge.</bodyText>\n<headline>When a way is selected</headline>\n<bodyText><b>Click a point</b> to select it.\n<b>Shift-click in the way</b> to insert a new point.\n<b>Shift-click a point</b> to start a new way from there.\n<b>Shift-click another way</b> to merge.</bodyText>\n</bodyText>\n<column/><headline>Keyboard shortcuts</headline>\n<bodyText><textformat tabstops='[25]'>B\tAdd <u>b</u>ackground source tag\nC\tClose <u>c</u>hangeset\nG\tShow <u>G</u>PS tracks\nH\tShow <u>h</u>istory\nI\tShow <u>i</u>nspector\nJ\t<u>J</u>oin point to crossing ways\nK\tLoc<u>k</u>/unlock current selection\nL\tShow current <u>l</u>atitude/longitude\nM\t<u>M</u>aximise editing window\nP\tCreate <u>p</u>arallel way\nR\t<u>R</u>epeat tags\nS\t<u>S</u>ave (unless editing live)\nT\t<u>T</u>idy into straight line/circle\nU\t<u>U</u>ndelete (show deleted ways)\nX\tCut way in two\nZ\tUndo\n-\tRemove point from this way only\n+\tAdd new tag\n/\tSelect another way sharing this point\n</textformat><textformat tabstops='[50]'>Delete\tDelete point\n (+Shift)\tDelete entire way\nReturn\tFinish drawing line\nSpace\tHold and drag background\nEsc\tAbort this edit; reload from server\n0\tRemove all tags\n1-9\tSelect preset tags\n (+Shift)\tSelect memorised tags\n (+S/Ctrl)\tMemorise tags\n§ or `\tCycle between tag groups\n</textformat>\n</bodyText>"
   hint_drawmode: click to add point\ndouble-click/Return\nto end line
   hint_loading: loading data
   hint_overendpoint: over endpoint ($1)\nclick to join\nshift-click to merge
diff --git a/config/potlatch/locales/es.yml b/config/potlatch/locales/es.yml
index 2699c151e..9caddb991 100644
--- a/config/potlatch/locales/es.yml
+++ b/config/potlatch/locales/es.yml
@@ -24,6 +24,7 @@ es:
   advanced: Avanzado
   advanced_close: Cerrar conjunto de cambios
   advanced_history: Histórico de la vía
+  advanced_inspector: Inspector
   advanced_maximise: Maximizar ventana
   advanced_minimise: Minimizar ventana
   advanced_parallel: Vía paralela
diff --git a/config/potlatch/locales/fr.yml b/config/potlatch/locales/fr.yml
index 2c98fac5f..f5a9de7e4 100644
--- a/config/potlatch/locales/fr.yml
+++ b/config/potlatch/locales/fr.yml
@@ -2,11 +2,14 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Damouns
+# Author: IAlex
+# Author: Jean-Frédéric
 fr: 
   a_poi: $1 un POI
   a_way: $1 un chemin
   action_addpoint: Ajout d'un point à la fin d'un chemin
   action_cancelchanges: Annulation de la modification
+  action_createparallel: créer des routes parallèles
   action_createpoi: Créer un POI (point d'intérêt)
   action_deletepoint: Suppression d'un point
   action_insertnode: Ajouter un point sur un chemin
@@ -20,7 +23,10 @@ fr:
   action_revertway: rétablir un chemin
   action_splitway: Scinder un chemin
   action_waytags: Paramétrer un chemin
+  advanced: Avancé
   advanced_close: Fermer le groupe de modifications
+  advanced_history: Historique du chemin
+  advanced_inspector: Inspecteur
   advanced_maximise: Maximiser la fenêtre
   advanced_minimise: Réduire la fenêtre
   advanced_parallel: Chemin parallèle
@@ -31,12 +37,16 @@ fr:
   advice_revertingway: Retour au dernier chemin sauvegardé (Z pour annuler)
   advice_tagconflict: Les tags ne correspondent pas - Veuillez vérifier
   advice_toolong: Trop long pour débloquer la situation - Scindez le chemin en chemins plus courts
+  advice_uploadempty: Rien à importer
   advice_uploadsuccess: Toutes les données ont été correctement chargées
   advice_waydragged: Chemin déplacé (Z pour annuler)
   cancel: Annuler
   closechangeset: Fermeture du groupe de modifications
+  conflict_download: Télécharger sa version
+  conflict_overwrite: Écraser sa version
   conflict_poichanged: Après le début de votre modification, quelqu'un a modifié le point $1$2.
   conflict_relchanged: Après le début de votre modification, quelqu'un a modifié la relation $1$2.
+  conflict_visitpoi: Cliquez sur « Ok » pour montrer le point.
   conflict_visitway: Cliquer sur 'OK' pour voir le chemin.
   createrelation: Créer une nouvelle relation
   custom: "Personnalisé :"
@@ -54,7 +64,11 @@ fr:
   existingrelation: Ajouter à une relation existante
   findrelation: Trouver une relation contenant
   gpxpleasewait: Veuillez patientez pendant le traitement de la trace GPX
+  heading_drawing: Dessiner
+  heading_introduction: Introduction
+  heading_pois: Comment débuter
   heading_surveying: Relever
+  heading_tagging: Balisage
   heading_troubleshooting: Dépannage
   help: Aide
   hint_drawmode: Clic pour ajouter un point\nDouble-clic/Entrée pour terminer le chemin
@@ -63,26 +77,31 @@ fr:
   hint_overpoint: Point du dessus\nClick pour joindre
   hint_pointselected: Point sélectionné\n(Shift-clic sur le point pour\ncommencer une nouvelle ligne)
   hint_saving: sauvegarde des données
+  hint_saving_loading: Charger/sauvegarder les données
   login_pwd: "Mot de passe :"
   login_retry: Votre nom d'utilisateur du site n'a pas été reconnu. Merci de réessayer.
   login_title: Connexion impossible
   login_uid: "Nom d'utilisateur :"
+  more: Plus
   newchangeset: "\nMerci de réessayer : Potlatch commencera un nouveau groupe de modifications."
   nobackground: Pas d'arrière-plan
   norelations: Aucune relation dans l'espace courant
   offset_broadcanal: Chemin de halage de canal large
   offset_choose: Entrer le décalage (m)
+  offset_motorway: Autoroute (D3)
   offset_narrowcanal: Chemin de halage de canal étroit
   ok: OK
   openchangeset: Ouverture d'un changeset
   option_custompointers: Remplacer la souris par le Crayon et la Main
   option_external: "Lancement externe :"
   option_fadebackground: Arrière-plan éclairci
+  option_noname: Mettre en évidence les toutes non nommées
   option_photo: "Photo KML :"
   option_thinareas: Utiliser des lignes plus fines pour les surfaces
   option_thinlines: Utiliser un trait fin à toutes les échelles
   option_tiger: Voir les données TIGER non modifiées
   option_warnings: Montrer les avertissements flottants
+  point: Point
   prompt_addtorelation: Ajouter $1 à la relation
   prompt_changesetcomment: "Entrez une description de vos modifications :"
   prompt_createparallel: Créer un chemin parallèle
diff --git a/config/potlatch/locales/hsb.yml b/config/potlatch/locales/hsb.yml
index bbc8421e7..e908fcecf 100644
--- a/config/potlatch/locales/hsb.yml
+++ b/config/potlatch/locales/hsb.yml
@@ -21,6 +21,7 @@ hsb:
   advice_uploadfail: Nahraće zastajene
   advice_uploadsuccess: Wšě daty wuspěšnje nahrate
   cancel: Přetorhnyć
+  closechangeset: Sadźbu změnow začinić
   conflict_download: Wersiju sćahnyć
   conflict_overwrite: Wersiju přepisać
   conflict_poichanged: Wot toho, zo sy wobdźěłanje započał, je něchtó druhi dypk $1$2 změnił.
@@ -42,6 +43,7 @@ hsb:
   heading_pois: Prěnje kroki
   heading_quickref: Spěšna referenca
   help: Pomoc
+  hint_saving: daty składować
   login_pwd: "Hesło:"
   login_retry: Twoje wužiwarske mjeno njebu spoźnane. Prošu spytaj hišće raz.
   login_title: Přizjewjenje njemóžno
@@ -58,6 +60,7 @@ hsb:
   option_photo: "Fotowy KML:"
   option_thinareas: Ćeńše linije za wobłuki wužiwać
   option_thinlines: Ćeńke linija na wšěch skalach wužiwać
+  option_tiger: Njezměnjeny TIGER wuzběhnyć
   option_warnings: Běžace warnowanja pokazać
   point: Dypk
   prompt_addtorelation: $1 relaciji přidać
diff --git a/config/potlatch/locales/hu.yml b/config/potlatch/locales/hu.yml
index 443729f76..9594764a3 100644
--- a/config/potlatch/locales/hu.yml
+++ b/config/potlatch/locales/hu.yml
@@ -1,6 +1,7 @@
 # Messages for Hungarian (Magyar)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: City-busz
 hu: 
   a_poi: POI $1
   a_way: vonal $1
@@ -21,18 +22,21 @@ hu:
   action_revertway: vonal visszaállítása
   action_splitway: vonal kettévágása
   action_waytags: vonal címkéinek módosítása
+  advanced: Haladó
   advanced_close: Módosításcsomag lezárása
   advanced_history: Vonal története
   advanced_inspector: Felügyelő
   advanced_maximise: Ablak maximalizálása
   advanced_minimise: Ablak minimalizálása
   advanced_parallel: Párhuzamos vonal
+  advanced_tooltip: Haladó szerkesztési műveletek
   advanced_undelete: Törlés visszavonása
+  advice_bendy: Túl görbe a kiegyenesítéshez (SHIFT a kényszerítéshez)
   advice_deletingpoi: POI törlése (Z a visszavonáshoz)
   advice_deletingway: Vonal törlése (Z a visszavonáshoz)
   advice_nocommonpoint: A vonalaknak nincs közös pontjuk
   advice_revertingpoi: Visszaállítás a legutóbb mentett POI-ra (Z a viszavonáshoz)
-  advice_revertingway: Visszaállítás a legutóbb mentett vonalra (Z a viszavonáshoz)
+  advice_revertingway: Visszaállítás a legutóbb mentett vonalra (Z a visszavonáshoz)
   advice_tagconflict: A címkék nem egyeznek - ellenőrizd (Z a visszavonáshoz)
   advice_toolong: Túl hosszú a feloldáshoz - vágd rövidebb szakaszokra
   advice_uploadempty: Nincs mit feltölteni
@@ -80,6 +84,11 @@ hu:
   hint_pointselected: pont kijelölve\n(shift+kattintás a pontra\núj vonal kezdéséhez)
   hint_saving: adatok mentése
   hint_saving_loading: adatok betöltése/mentése
+  login_pwd: "Jelszó:"
+  login_retry: A webhelyre való bejelentkezésed nem ismerhető fel. Kérlek, próbáld újra.
+  login_title: Nem lehet bejelentkezni
+  login_uid: "Felhasználónév:"
+  more: Több
   newchangeset: "\nKérlek, próbáld újra: a Potlatch egy új módosításcsomagot fog kezdeni."
   nobackground: Nincs háttérkép
   norelations: Nincs kapcsolat a jelenlegi területen
@@ -102,6 +111,7 @@ hu:
   point: Pont
   prompt_addtorelation: $1 hozzáadása kapcsolathoz
   prompt_changesetcomment: "Adj leírást a módosításaidhoz:"
+  prompt_closechangeset: $1 módosításcsomag bezárása
   prompt_createparallel: Párhuzamos vonal készítése
   prompt_editlive: Szerk. élőben
   prompt_editsave: Szerk. mentéssel
diff --git a/config/potlatch/locales/is.yml b/config/potlatch/locales/is.yml
index 68061a663..7810fe4af 100644
--- a/config/potlatch/locales/is.yml
+++ b/config/potlatch/locales/is.yml
@@ -3,30 +3,68 @@
 # Export driver: syck
 # Author: Ævar Arnfjörð Bjarmason
 is: 
+  a_poi: $1 hnút
   a_way: $1 veg
-  advanced_maximise: Fylla skjá
+  action_cancelchanges: tek aftur breytingar á
+  action_createpoi: að bæta við hnút
+  action_insertnode: að bæta við hnút við veg
+  action_movepoi: að færa hnút
+  advanced: Stillingar
+  advanced_close: Loka breytingarsetti
+  advanced_maximise: Stækka ritilinn
+  advanced_minimise: Minnka ritilinn
+  advice_uploadempty: Breyttu einhverju fyrst
+  advice_uploadfail: Ekki tókst að hlaða upp
+  advice_uploadsuccess: Breytingum var hlaðið upp
+  advice_waydragged: Vegur færður (Z til að taka aftur)
   cancel: Hætta við
+  closechangeset: Loka breytingarsetti
+  conflict_poichanged: Einhver hefur breytt hnúti $1$2 síðan þú byrjaðir að breyta.
+  conflict_relchanged: Einhver hefur breytt venslum $1$2 síðan þú byrjaðir að breyta.
+  conflict_waychanged: Einhver hefur breytt vegi $1$2 síðan þú byrjaðir að breyta.
+  createrelation: Búa til ný vensl
+  custom: "Annar:"
   delete: Eyða
+  drag_pois: Dragðu hnúta úr listanum til að bæta þeim á kortið
   editinglive: Breyti beint
   editingoffline: Breyti með vistun
+  existingrelation: Bæta við í vensl sem eru þegar til
+  findrelation: Finna vensl sem innihalda
   help: Hjálp
   hint_drawmode: smelltu til að bæta við punkt\ntvísmelltu/ýttu á Enter\ntil að klára línu
+  hint_loading: næ í gögn
+  hint_pointselected: hnútur valinn\n(ýttu á shift og músahnappinn\ntil að teikna nýjan veg)
+  nobackground: Enginn bakgrunnur
+  norelations: Engin vensl á þessu svæði
+  ok: ok
+  openchangeset: Opna breytingarsett
+  option_custompointers: Nota penna og hönd sem tákn fyrir músina
+  option_noname: Sýna ónefnda vegi
+  option_photo: "Mynda KML:"
   option_thinareas: Nota litlar línur fyrir svæði
   option_thinlines: Nota litlar línur fyrir allt
   option_tiger: Sýna óbreytt TIGER gögn
+  option_warnings: Sýna fljótandi viðvaranir
   point: Hnútur
+  prompt_addtorelation: Bæta $1 í vensl
   prompt_changesetcomment: "Sláðu inn lýsingu breytingunum:"
   prompt_editlive: Breyta beint
   prompt_editsave: Breyta með vistun
   prompt_helpavailable: Nýr notandi? Skoðaðu hjálpina neðst til vinstri.
+  prompt_revertversion: "Breyta til fyrri útgáfu:"
   prompt_savechanges: Vista breytingar
   prompt_welcome: Velkomin(n) á OpenStreetMap!
   save: Vista
+  tip_addrelation: Bæta í vensl
+  tip_addtag: Bæta við nýjum eigindum
   tip_anticlockwise: Rangsælis vegur - smelltu til að breyta átt hans
   tip_clockwise: Réttsælis vegur - smelltu til að breyta átt hans
   tip_direction: Átt vegar - smelltu til að breyta henni
-  tip_gps: Sýna GPS fer (G)
+  tip_gps: Sýna GPS ferla (G)
   tip_options: Breyta stillingum, t.d. breyta bakgrunni kortsins
   tip_photo: Hlaða inn myndum
+  tip_repeattag: Nota sömu eigindi og síðasti vegur sem var valinn (R)
   tip_splitway: Skipta veg á völdum hnút (X)
+  tip_undo: Taka aftur $1 (Z)
+  uploading: Hleð upp breytingum...
   way: Vegur
diff --git a/config/potlatch/locales/ja.yml b/config/potlatch/locales/ja.yml
index 6ab0ee778..51328a67f 100644
--- a/config/potlatch/locales/ja.yml
+++ b/config/potlatch/locales/ja.yml
@@ -1,9 +1,10 @@
 # Messages for Japanese (日本語)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Fryed-peach
 ja: 
-  a_poi: POIを $1
-  a_way: wayを $1
+  a_poi: POIを$1
+  a_way: 道を$1
   action_addpoint: wayの終端にnodeを追加
   action_cancelchanges: 変更を中止
   action_createpoi: POIを作成
diff --git a/config/potlatch/locales/nl.yml b/config/potlatch/locales/nl.yml
index 2ef9a8a28..88492f704 100644
--- a/config/potlatch/locales/nl.yml
+++ b/config/potlatch/locales/nl.yml
@@ -4,10 +4,11 @@
 # Author: Siebrand
 nl: 
   a_poi: $1 een POI
-  a_way: $1 een weg
+  a_way: Weg $1
   action_addpoint: Node toevoegen aan eind van de weg
   action_cancelchanges: veranderingen ongedaan maken naar
   action_changeway: wijzigingen aan een weg
+  action_createparallel: Parallelle wegen aanmaken
   action_createpoi: Maak een POI (nuttige plaats)
   action_deletepoint: Verwijder een punt
   action_insertnode: Punt aan weg toevoegen
@@ -24,14 +25,17 @@ nl:
   advanced: Uitgebreid
   advanced_close: Wijzigingenset sluiten
   advanced_history: Weggeschiedenis
+  advanced_inspector: Detailvenster
   advanced_maximise: Venster maximaliseren
   advanced_minimise: Venster minimaliseren
   advanced_parallel: Parallelle weg
   advanced_tooltip: Gevorderde bewerkingen
   advanced_undelete: Verwijdering ongedaan maken
   advice_bendy: Er zijn te veel bochten om recht te maken (SHIFT om toch uit te voeren)
+  advice_deletingpoi: POI verwijderen (Z om ongedaan te maken)
   advice_deletingway: Weg verwijderen (Z om ongedaan te maken)
   advice_nocommonpoint: De wegen hebben geen gemeenschappelijk punt
+  advice_revertingpoi: Naar laatst opgeslagen POI aan het terugplaatsen (Z om ongedaan te maken)
   advice_revertingway: Teruggaan naar de laatst opgeslagen weg (Z om ongedaan te maken)
   advice_tagconflict: De labels komen niet overeen. Controleer uw invoer (Z om ongedaan te maken)
   advice_toolong: Te lang om te unlocken - splits de weg in kortere stukken
@@ -43,11 +47,11 @@ nl:
   closechangeset: Wijzigingenset aan het sluiten
   conflict_download: Bestaande versie downloaden
   conflict_overwrite: Bestaande versie overschrijven
-  conflict_poichanged: Sinds u begonnen bent met bewerken, heeft iemand anders het punt $1$2 gewijzigd.
-  conflict_relchanged: Sinds u begonnen bent met bewerken, heeft iemand anders de relatie $1$2 gewijzigd.
+  conflict_poichanged: In de tussentijd heeft iemand anders het punt $1$2 gewijzigd.
+  conflict_relchanged: Intussen heeft iemand anders de relatie $1$2 gewijzigd.
   conflict_visitpoi: Klik 'OK' om het punt weer te geven.
   conflict_visitway: Klik 'OK' om de weg weer te geven.
-  conflict_waychanged: Sinds u begonnen bent met bewerken, heeft iemand anders de weg $1$2 gewijzigd.
+  conflict_waychanged: Intussen heeft iemand anders de weg $1$2 gewijzigd.
   createrelation: Nieuwe relatie maken
   custom: "Aangepast:"
   delete: Verwijderen
@@ -55,27 +59,29 @@ nl:
   drag_pois: Sleep POI's naar de kaart en zet ze neer
   editinglive: Live bewerken
   editingoffline: Offline bewerken
-  emailauthor: \n\nStuur altublieft een e-mail naar richard\@systemeD.net met een probleemrapport waarin u beschrijft wat u aan het doen was.
+  emailauthor: \n\nStuur alstublieft een e-mail naar richard\@systemeD.net waarin u beschrijft wat u aan het doen was.
   error_anonymous: U kunt geen contact opnemen met een anonieme mapper.
   error_connectionfailed: Sorry. De verbinding met de server is verbroken. Recente veranderingen zijn misschien niet opgeslagen.\n\nOpnieuw proberen?
-  error_nopoi: POI niet gevonden (hebt u de kaart weggeschoven?), kan dus niet ongedaan maken.
+  error_nopoi: POI niet gevonden (hebt u de kaart weggeschoven?). Ongedaan maken is niet mogelijk.
   error_nosharedpoint: De wegen $1 en $2 hebben geen gemeenschappelijk punt meer. De splitsing kan niet ongedaan gemaakt worden.
-  error_noway: De weg $1 kan niet gevonden worden (hebt u de kaart weggeschoven?). Ongedaan maken is niet mogelijk.
+  error_noway: De weg $1 kan niet gevonden worden (kaart weggeschoven?). Ongedaan maken is niet mogelijk.
   error_readfailed: De server van OpenStreetMap gaf geen antwoord op het verzoek gegevens te leveren.\n\nWilt u het nog een keer proberen?
   existingrelation: Toevoegen aan bestaande relatie
   findrelation: Relatie zoeken met
   gpxpleasewait: Even geduld alstublieft. De GPX-trace wordt verwerkt.
   heading_drawing: Tekenen
   heading_introduction: Inleiding
+  heading_pois: Beginnen
   heading_quickref: Snelle hints
+  heading_surveying: Veldwerk
   heading_tagging: Labelen
   heading_troubleshooting: Problemen oplossen
   help: Help
-  hint_drawmode: Klik om een nieuw punt toe te voegen\ndubbelklik/enter\n om de lijn te stoppen
+  hint_drawmode: Klik voor toevoegen nieuw punt\ndubbelklik/enter om\n de lijn te beëindigen
   hint_loading: Wegen laden
   hint_overendpoint: Eindpunt van een weg ($1)\nKlik om dit punt toe te voegen\nSHIFT+klik om beide wegen samen te voegen
   hint_overpoint: Over punt ($1)\nKlik om dit punt toe te voegen
-  hint_pointselected: Het punt is geselecteerd\n(SHIFT+klik op het punt om een nieuwe lijn te\nbeginnen)
+  hint_pointselected: Het punt is geselecteerd\n(SHIFT+klik op het punt om\neen nieuwe lijn te beginnen)
   hint_saving: gegevens opslaan
   hint_saving_loading: gegevens laden en opslaan
   login_pwd: "Wachtwoord:"
@@ -87,25 +93,30 @@ nl:
   nobackground: Geen achtergrond
   norelations: Geen relaties in huidig gebied
   offset_broadcanal: Breed kanaalsleeppad
+  offset_choose: Compensatie kiezen (m)
   offset_dual: Dubbelbaans weg (D2)
   offset_motorway: Autosnelweg (D3)
+  offset_narrowcanal: Sleeppad bij smal kanaal
   ok: OK
-  openchangeset: Changeset wordt geopend...
+  openchangeset: Wijzigingenset wordt geopend
   option_custompointers: Pen- en handcursors gebruiken
+  option_external: "Externe achtergrond:"
   option_fadebackground: Achtergrond lichter maken
   option_noname: Onbenoemde wegen uitlichten
   option_photo: "KML bij foto:"
   option_thinareas: Dunnere lijnen gebruiken voor gebieden
   option_thinlines: Altijd dunne lijnen gebruiken
+  option_tiger: Ongewijzigde TIGER-gegevens uitlichten
   option_warnings: Floating warnings weergeven
   point: Punt
   prompt_addtorelation: Voeg $1 toe aan een relatie
-  prompt_changesetcomment: "Typ hier een beschrijving van je wijzigingen:"
+  prompt_changesetcomment: "Geef hier een beschrijving van uw wijzigingen:"
   prompt_closechangeset: Wijzigingenset $1 sluiten
   prompt_createparallel: Parallelle weg aanmaken
   prompt_editlive: Direct bewerken
   prompt_editsave: Bewerken en opslaan
   prompt_helpavailable: Nieuwe gebruiker? Kijk linksonder voor hulp.
+  prompt_launch: Externe URL als achtergrond
   prompt_revertversion: "Teruggaan naar een oudere versie:"
   prompt_savechanges: Wijzigingen opslaan
   prompt_taggedpoints: Sommige punten op deze weg hebben labels. Echt verwijderen?
@@ -125,7 +136,7 @@ nl:
   tip_photo: Afbeeldingen laden
   tip_presettype: Kies welke typen voorkeuren in het menu worden weergegeven.
   tip_repeattag: Labels van de vorige geselecteerde weg herhalen (R)
-  tip_revertversion: Kies naar welke versie moet worden teruggegaan
+  tip_revertversion: Kies naar welke versie terug te gaan
   tip_selectrelation: Toevoegen aan gekozen route
   tip_splitway: Weg op het geselecteerde punt splitsen (X)
   tip_tidy: Punten in weg opschonen (T)
diff --git a/config/potlatch/locales/no.yml b/config/potlatch/locales/no.yml
index 7ce84fb53..68afa44bb 100644
--- a/config/potlatch/locales/no.yml
+++ b/config/potlatch/locales/no.yml
@@ -1,6 +1,7 @@
 # Messages for Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Laaknor
 "no": 
   a_poi: $1 et POI
   a_way: $1 en linje
@@ -21,11 +22,14 @@
   advice_nocommonpoint: Linjene deler ikke et felles punkt
   advice_tagconflict: Ulike merker, vennligst sjekk (Z for å angre)
   advice_toolong: For lang til å låse opp, linjen må deles i flere biter
+  advice_uploadsuccess: All data ble lastet opp
   advice_waydragged: Linje flyttet (Z for å angre)
   cancel: Avbryt
+  conflict_visitway: Klikk 'Ok' for å vise veien.
   createrelation: Lag en ny relasjon
   delete: Slett
   deleting: sletter
+  editinglive: Redigerer live
   emailauthor: \n\nVennligst send en epost (på engelsk) til richard\@systemeD.net med en feilrapport, og forklar hva du gjorde når det skjedde.
   error_connectionfailed: "Beklager - forbindelsen til OpenStreetMap-tjeneren feilet, eventuelle nye endringer har ikke blitt lagret.\n\nVil du prøve på nytt?"
   error_nopoi: Fant ikke POI-et, så det er ikke mulig å angre. (Kanskje den ikke er på skjermen lenger?)
@@ -40,17 +44,25 @@
   hint_overendpoint: over endepunkt\ntrykk for å koble sammen\nshift+trykk for å slå sammen
   hint_overpoint: over punkt\ntrykk for å koble sammen
   hint_pointselected: punkt valgt\n(shift+trykk punktet for å\nstarte en ny linje)
+  login_pwd: "Passord:"
+  login_title: Kunne ikke logge inn
   norelations: Ingen relasjoner i området på skjermen
+  ok: Ok
   option_custompointers: Bruk penn- og håndpekere
   option_fadebackground: Fjern bakgrunn
+  option_photo: "Bilde KML:"
   option_thinlines: Bruk tynne linjer uansett forstørrelse
   option_warnings: Vis flytende advarsler
   point: Punkt
   prompt_addtorelation: Legg $1 til en relasjon
+  prompt_changesetcomment: "Legg inn en beskrivelse av dine endringer:"
+  prompt_createparallel: Lag parallell vei
   prompt_revertversion: "Tilbakestill til tidligere lagret versjon:"
   prompt_taggedpoints: Noen av punktene på denne linjen har merker. Vil du virkelig slette?
   prompt_track: Overfør dine GPS-sporinger til (låste) linjer for redigering.
   prompt_welcome: Velkommen til OpenStreetMap!
+  retry: Prøv igjen
+  save: Lagre
   tip_addrelation: Legg til i en relasjon
   tip_addtag: Legg til merke
   tip_alert: Det oppstod en feil, trykk for detaljer
@@ -60,6 +72,7 @@
   tip_gps: Vis GPS sporlogger (G)
   tip_noundo: Ingenting å angre
   tip_options: Sett valg (velg kartbakgrunn)
+  tip_photo: Last bilder
   tip_presettype: Velg hva slags forhåndsinstillinger som blir vist i menyen
   tip_repeattag: Gjenta merker fra sist valgte linje (R)
   tip_revertversion: Velg versjonen det skal tilbakestilles til
diff --git a/config/potlatch/locales/pt-BR.yml b/config/potlatch/locales/pt-BR.yml
index a57eedb9d..6ad7a708e 100644
--- a/config/potlatch/locales/pt-BR.yml
+++ b/config/potlatch/locales/pt-BR.yml
@@ -1,11 +1,13 @@
 # Messages for Brazilian Portuguese (Português do Brasil)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: BraulioBezerra
 pt-BR: 
   a_poi: $1 um ponto de interesse (POI)
   a_way: $1 um caminho
   action_addpoint: Adicionando um nó ao fim do caminho
   action_cancelchanges: Cancelando as mudanças de
+  action_createparallel: criando caminhos paralelos
   action_createpoi: Criando um ponto de interesse (POI)
   action_deletepoint: Apagando um ponto
   action_insertnode: Adicionando um nó em um caminho
@@ -18,11 +20,29 @@ pt-BR:
   action_reverseway: Invertendo um caminho
   action_splitway: Dividindo um caminho
   action_waytags: Ajustando tags (rótulos) em um caminho
+  advanced: Avançado
+  advanced_close: Fechar conjunto de mudanças
+  advanced_history: Histórico do caminho
+  advanced_maximise: Maximizar janela
+  advanced_minimise: Minimizar janela
+  advanced_parallel: Caminho paralelo
+  advanced_tooltip: Ações avançadas de edição
+  advice_deletingpoi: Apagando Ponto de Interesse (Z para desfazer)
+  advice_deletingway: Excluindo caminho (Z para desfazer)
   advice_nocommonpoint: As vias não compartilham um ponto em comum
+  advice_revertingpoi: Revertendo ao último Ponto de Interesse salvo (Z para desfazer)
+  advice_revertingway: Revertendo para o último caminho salvo (Z para desfazer)
   advice_tagconflict: Tags não combinam - por favor verifique (para voltar pressione Z)
   advice_toolong: Muito longo para destravar - por favor divida em vias menores
+  advice_uploadempty: Nada a ser enviado
+  advice_uploadfail: Envio parou
+  advice_uploadsuccess: Todos os dados foram enviados com sucesso
   advice_waydragged: Via arrastada (para voltar pressione Z)
   cancel: Cancelar
+  closechangeset: Fechando conjunto de mudanças
+  conflict_poichanged: Desde que você começou a editar, outra pessoa mudou o ponto $1$2.
+  conflict_visitpoi: Clique 'Ok' para mostrar o ponto.
+  conflict_visitway: Clique em "Ok" para mostrar o caminho.
   createrelation: Criar uma nova relação
   delete: Apagar
   deleting: Apagando
@@ -30,6 +50,7 @@ pt-BR:
   editinglive: Editando ao vivo
   editingoffline: Editando offline
   emailauthor: \n\nFavor enviar um e-mail a richard\@systemeD.net com um relatório de erro, informando o que você estava fazendo na hora.
+  error_anonymous: Você não pode contactar um mapeador anônimo.
   error_connectionfailed: Sinto muito - a conexão ao servidor do OpenStreetMap falhou. Algumas alterações recentes não foram salvas.\n\nVocê gostaria de tentar novamente?
   error_nopoi: O ponto de interesse (POI) não foi encontrado (talvez você tenha mudado a sua posição?), por isso não posso desfazer.
   error_nosharedpoint: Caminhos $1 e $2 não compartilham mais um mesmo ponto, então a divisão não pode ser desfeita.
@@ -37,21 +58,34 @@ pt-BR:
   existingrelation: Adicionar a uma relação existente
   findrelation: Encontrar uma relação contendo
   gpxpleasewait: Favor aguardar enquanto a trilha GPX é processada.
+  heading_introduction: Introdução
+  heading_pois: Começando
+  heading_quickref: Referência rápida
   help: Ajuda
   hint_drawmode: Clique para adicionar um ponto\nDuplo clique/Enter\npara finalizar a linha
   hint_loading: Carregando caminhos
   hint_overendpoint: Sobre o ponto final\nclique para ligar\nclique pressionando o shift para mesclar
   hint_overpoint: Sobre o ponto\nclique para conectar
   hint_pointselected: Ponto selecionado\n(clique no ponto pressionando o shift para\niniciar uma nova linha)
+  hint_saving: salvando dados
+  hint_saving_loading: carregando/salvando dados
+  login_pwd: "Senha:"
+  login_uid: "Nome de usuário:"
+  more: Mais
+  newchangeset: "Por favor tente de novo: Potlatch iniciará um novo conjunto de mudanças."
   norelations: Nenhuma relação na área atual
+  ok: Ok
   openchangeset: Abrindo changeset
   option_custompointers: Utilize os apontadores caneta e mão
   option_fadebackground: Esmaecer o plano de fundo
+  option_noname: Realçar estradas sem nome
+  option_photo: "KML da foto:"
   option_thinlines: Utilize linhas finas em todas as escalas
   option_warnings: Mostrar avisos flutuantes
   point: Ponto
   prompt_addtorelation: Adicionar $1 a uma relação
   prompt_changesetcomment: "Entre com uma descrição das suas mudanças:"
+  prompt_createparallel: Criar caminho paralelo
   prompt_editlive: Editar ao vivo
   prompt_editsave: Editar e salvar
   prompt_helpavailable: Novato? Veja a ajuda no canto inferior esquerdo.
@@ -61,6 +95,7 @@ pt-BR:
   prompt_taggedpoints: Alguns dos pontos nesse caminho possuem tags (rótulos). Deseja realmente apagá-los?
   prompt_track: Converta a sua trilha GPS para caminhos (trancados) a serem editados.
   prompt_welcome: Bem-vindo ao OpenStreetMap!
+  retry: Tentar novamente
   save: Salvar
   tip_addrelation: Adicionar a uma relação
   tip_addtag: Adicionar um novo tag (rótulo)
@@ -71,10 +106,12 @@ pt-BR:
   tip_gps: Mostrar trilhas do GPS
   tip_noundo: Nada para desfazer
   tip_options: Configurar opções (escolha o plano de fundo do mapa)
+  tip_photo: Carregar fotos
   tip_presettype: Escolha quais tipos predefinidos são oferecidos neste menu.
   tip_repeattag: Repetir tags (rótulos) do caminho previamente selecionado (R)
   tip_revertversion: Escolha a versão para reverter
   tip_selectrelation: Adicionar à rota escolhida
   tip_splitway: Dividir caminho no ponto selecionado
   tip_undo: Desfazer $1 (Z)
+  uploading: Enviando...
   way: Caminho
diff --git a/config/potlatch/locales/ru.yml b/config/potlatch/locales/ru.yml
index 0e50ffeda..32c7fc343 100644
--- a/config/potlatch/locales/ru.yml
+++ b/config/potlatch/locales/ru.yml
@@ -1,6 +1,7 @@
 # Messages for Russian (Русский)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Calibrator
 # Author: Александр Сигачёв
 ru: 
   a_poi: $1 точки интереса (POI)
@@ -22,8 +23,8 @@ ru:
   action_revertway: отмена линии
   action_splitway: разделение линии
   action_waytags: установка меток на линию
-  advanced: Дополнительно
-  advanced_close: Закрыть набор изменений
+  advanced: Меню
+  advanced_close: Закрыть пакет изменений
   advanced_history: История линии
   advanced_inspector: Инспектор
   advanced_maximise: Развернуть окно
@@ -44,7 +45,7 @@ ru:
   advice_uploadsuccess: Все данные успешно загружены
   advice_waydragged: Линия передвинута (Z для отмены)
   cancel: Отмена
-  closechangeset: Закрытие набора изменений
+  closechangeset: Закрытие пакета изменений
   conflict_download: Загрузить чужую версию
   conflict_overwrite: Записать поверх чужой версии
   conflict_poichanged: После того, как вы начали редактирование, кто-то изменил точку $1$2.
@@ -89,7 +90,7 @@ ru:
   login_title: Не удаётся войти
   login_uid: "Имя пользователя:"
   more: Ещё
-  newchangeset: \nПожалуйста, повторите попытку. Potlatch начнёт новый набор изменений.
+  newchangeset: \nПожалуйста, повторите попытку. Potlatch начнёт новый пакет изменений.
   nobackground: Без подложки
   norelations: Нет отношений в текущей области
   offset_broadcanal: Широкая набережная канала
@@ -98,7 +99,7 @@ ru:
   offset_motorway: Автомагистраль (D3)
   offset_narrowcanal: Набережная узкого канала
   ok: OK
-  openchangeset: Открытие набора изменений
+  openchangeset: Открытие пакета изменений
   option_custompointers: Использовать курсоры пера и руки
   option_external: "Внешний запуск:"
   option_fadebackground: Светлый фон
@@ -111,7 +112,7 @@ ru:
   point: Точка
   prompt_addtorelation: Добавить $1 в отношение
   prompt_changesetcomment: "Опишите ваши изменения:"
-  prompt_closechangeset: Закрытие набора изменений $1
+  prompt_closechangeset: Закрытие пакета изменений $1
   prompt_createparallel: Создание параллельной линии
   prompt_editlive: Правка вживую
   prompt_editsave: Правка с сохранением
diff --git a/config/potlatch/locales/vi.yml b/config/potlatch/locales/vi.yml
index 30e74bf86..a4b5cb34f 100644
--- a/config/potlatch/locales/vi.yml
+++ b/config/potlatch/locales/vi.yml
@@ -1,11 +1,14 @@
 # Messages for Vietnamese (Tiếng Việt)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Minh Nguyen
 vi: 
   a_poi: $1 địa điểm
   a_way: $1 lối
   action_addpoint: đang thêm nốt vào cuối lối
   action_cancelchanges: đang hủy bỏ các thay đổi
+  action_changeway: thay đổi lối
+  action_createparallel: đang tạo lối song song
   action_createpoi: đang tạo địa điểm
   action_deletepoint: đang xóa điểm
   action_insertnode: đang gắn nốt vào lối
@@ -16,43 +19,100 @@ vi:
   action_pointtags: đang gắn thẻ vào điểm
   action_poitags: đang gắn thẻ vào địa điểm
   action_reverseway: đang đảo ngược lối
+  action_revertway: đang lùi lối
   action_splitway: đang chia cắt lối
   action_waytags: đang gắn thẻ vào lối
+  advanced: Nâng cao
+  advanced_close: Đóng bộ thay đổi
+  advanced_history: Lịch sử lối
+  advanced_inspector: Bộ kiểm tra
+  advanced_maximise: Phóng to cửa sổ
+  advanced_minimise: Thu nhỏ cửa sổ
+  advanced_parallel: Lối song song
+  advanced_tooltip: Tác vụ sửa đổi nâng cao
+  advanced_undelete: Phục hồi
+  advice_bendy: Quá quanh co để thẳng ra (SHIFT để ép)
+  advice_deletingpoi: Đang xóa địa điểm (Z để hủy bỏ)
+  advice_deletingway: Đang xóa lối (Z để hủy bỏ)
   advice_nocommonpoint: Các lối không cắt ngang nhau tại điểm nào
+  advice_revertingpoi: Đang lùi địa điểm về phiên bản trước (Z để hủy bỏ)
+  advice_revertingway: Đang lùi lối về phiên bản trước (Z để hủy bỏ)
   advice_tagconflict: Các thẻ không hợp - xin kiểm tra lại
   advice_toolong: Dài quá không thể mở khóa - xin chia cắt nó thành các lối ngắn hơn
+  advice_uploadempty: Không có gì để tải lên
+  advice_uploadfail: Việc tải lên bị thất bại
+  advice_uploadsuccess: Tất cả dữ liệu được tải lên thành công
   advice_waydragged: Đã kéo lối (Z để lùi lại)
   cancel: Hủy bỏ
+  closechangeset: Đang đóng bộ thay đổi
+  conflict_download: Tải xuống phiên bản của họ
+  conflict_overwrite: Ghi đè phiên bản của họ
+  conflict_poichanged: Người khác đã thay đổi nốt $1$2 sau khi bạn bắt đầu sửa.
+  conflict_relchanged: Người khác đã thay đổi quan hệ $1$2 sau khi bạn bắt đầu sửa.
+  conflict_visitpoi: Bấm “OK” để hiện địa điểm.
+  conflict_visitway: Bấm “OK” để hiện lối.
+  conflict_waychanged: Người khác đã thay đổi lối $1$2 sau khi bạn bắt đầu sửa.
   createrelation: Tạo quan hệ mới
+  custom: "Khác:"
   delete: Xóa
   deleting: đang xóa
   drag_pois: Kéo và thả các địa điểm ưa thích
   editinglive: Đang áp dụng ngay
   editingoffline: Đang ngoại tuyến
   emailauthor: \n\nXin gửi thư điện tử cho richard\@systemeD.net báo cáo lỗi và giải thích bạn làm gì lúc khi gặp lỗi.
+  error_anonymous: Không thể liên lạc với người vẽ vô danh.
   error_connectionfailed: "Rất tiếc - không thể kết nối với máy chủ OpenStreetMap. Những thay đổi gần đây có thể chưa được lưu.\n\nBạn có muốn thử lại không?"
   error_nopoi: Không tìm thấy địa điểm (có lẽ bạn đã kéo ra khỏi vùng?) nên không thể lùi lại.
   error_nosharedpoint: Các lối $1 và $2 không còn cắt ngang nhau tại điểm nào, nên không thể lùi lại việc chia cắt lối.
   error_noway: Không tìm thấy $1 (có lẽ bạn đã kéo ra khỏi vùng?) nên không thể lùi lại.
+  error_readfailed: Rất tiếc, máy chủ OpenStreetMap không phản ứng lời yêu cầu dữ liệu.\n\nBa.n có muốn thử lại không?
   existingrelation: Xếp vào quan hệ đã tồn tại
   findrelation: Tìm kiếm quan hệ chứa
   gpxpleasewait: Xin chờ, đang xử lý tuyến đường GPX.
+  heading_drawing: Vẽ
+  heading_introduction: Giới thiệu
+  heading_pois: Bắt đầu
+  heading_quickref: Tham khảo nhanh
+  heading_surveying: Tham hiếm
+  heading_tagging: Gắn thẻ
+  heading_troubleshooting: Trục trặc
   help: Trợ giúp
   hint_drawmode: nhấn chuột để thêm điểm\nnhấn đúp/Enter\nđể kết thúc lối
   hint_loading: đang tải các lối
   hint_overendpoint: đang trên điểm kết thúc\nnhấn chuột để nối\nshift-nhấn chuột để hợp nhất
   hint_overpoint: đang trên điểm\nnhấn chuột để nối"
   hint_pointselected: đã chọn điểm\n(shift-nhấn chuột để\nbắt đầu lối mới)
+  hint_saving: đang lưu dữ liệu
+  hint_saving_loading: đang tải/lưu dữ liệu
+  login_pwd: "Mật khẩu:"
+  login_retry: Không nhận ra tài khoản đăng ký của bạn. Vui lòng thử lần nữa.
+  login_title: Không thể đăng nhập
+  login_uid: "Tên đăng ký:"
+  more: Thêm
+  newchangeset: Vui lòng thử lần nữa. Potlatch sẽ mở bộ thay đổi mới.
+  nobackground: Không có nền
   norelations: Không có quan hệ trong vùng này
+  offset_broadcanal: Lối kéo của kênh rộng
+  offset_choose: Chọn bề ngang (m)
+  offset_dual: Vách ngăn đôi (D2)
+  offset_motorway: Đường cao tốc (D3)
+  offset_narrowcanal: Lối kéo của kênh hẹp
   ok: OK
   openchangeset: Đang mở bộ thay đổi
   option_custompointers: Hiện con trỏ bút và tay
+  option_external: "Khởi động bên ngoài:"
   option_fadebackground: Nhạt màu nền
+  option_noname: Tô sáng đường sá không tên
+  option_photo: "KML hình chụp:"
+  option_thinareas: Vẽ đường khung hẹp cho khu vực
   option_thinlines: Hiện đường hẹp ở các tỷ lệ
+  option_tiger: Tô sáng dữ liệu TIGER chưa sửa
   option_warnings: Nổi các cảnh báo
   point: Điểm
   prompt_addtorelation: Xếp $1 vào quan hệ
   prompt_changesetcomment: "Miêu tả các thay đổi:"
+  prompt_closechangeset: Đóng bộ thay đổi $1
+  prompt_createparallel: Tạo lối song song
   prompt_editlive: Áp dụng Ngay
   prompt_editsave: LÆ°u Sau
   prompt_helpavailable: Mới tới đây? Có trợ giúp dưới đây ở bên trái.
@@ -62,6 +122,7 @@ vi:
   prompt_taggedpoints: Một số điểm trên lối này đã được gắn thẻ. Bạn có chắc muốn xóa nó?
   prompt_track: Chuyển đổi tuyến đường GPS thành các lối (khóa) để sửa đổi.
   prompt_welcome: Hoan nghênh bạn đã đến OpenStreetMap!
+  retry: Thử lại
   save: LÆ°u
   tip_addrelation: Xếp vào quan hệ
   tip_addtag: Thêm thẻ mới
@@ -72,10 +133,13 @@ vi:
   tip_gps: Hiện các tuyến đường GPS (G)
   tip_noundo: Không có gì để lùi
   tip_options: Tùy chỉnh (chọn nền bản đồ)
+  tip_photo: Tải hình ảnh
   tip_presettype: Chọn các loại thẻ được định trước trong trình đơn.
   tip_repeattag: Chép các thẻ từ lối được chọn trước (R)
   tip_revertversion: Chọn phiên bản để lùi lại
   tip_selectrelation: Thêm vào tuyến đường đã chọn
   tip_splitway: Chia cắt lối tại điểm đã chọn (X)
+  tip_tidy: Thẳng/tròn ra các nốt trong lối (T)
   tip_undo: Lùi $1 (Z)
+  uploading: Đang tải lên…
   way: Lối
diff --git a/public/images/cc_button.png b/public/images/cc_button.png
index c6d26414b..f0a944e0b 100644
Binary files a/public/images/cc_button.png and b/public/images/cc_button.png differ
diff --git a/public/images/donate.png b/public/images/donate.png
deleted file mode 100644
index 9cd9a7c9f..000000000
Binary files a/public/images/donate.png and /dev/null differ
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 8df0d041a..d93281b93 100644
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ
diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index c44d54bce..b243928e7 100644
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -123,6 +123,17 @@ body {
   font-size: 14px;
 }
 
+.donate {
+  width: 150px;
+  margin: 10px;
+  padding: 10px;
+  border: 1px solid #ccc;
+  background: #cbeea7;
+  line-height: 1.2em;
+  text-align: center;
+  font-size: 14px;
+}
+
 .left_menu {
   width: 150px;
   min-width: 150px;