From 2ff8456c11f389f5e7ce29ee0ba3183a6576a167 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 10 Sep 2012 23:52:27 +0000
Subject: [PATCH] Bugfix: Correct doubled-up &amp;amp; in translations and
 remove extra spaces after ampersand in translations (this fixes hotkeys)

Partial of upstream 4ee706243c670bf308123792d026d7dab6b5ae69.
---
 src/qt/locale/bitcoin_es_CL.ts |  2 +-
 src/qt/locale/bitcoin_fa.ts    | 12 ++++++------
 src/qt/locale/bitcoin_lt.ts    |  2 +-
 src/qt/locale/bitcoin_pt_BR.ts |  6 +++---
 src/qt/locale/bitcoin_sv.ts    | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts
index be702c5e667..20f6369d794 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -881,7 +881,7 @@ Dirección: %4</translation>
     <message>
         <location filename="../forms/messagepage.ui" line="120"/>
         <source>&amp;Sign Message</source>
-        <translation>&amp; Firmar Mensaje</translation>
+        <translation>&amp;Firmar Mensaje</translation>
     </message>
     <message>
         <location filename="../forms/messagepage.ui" line="131"/>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 9adc50686ee..f6253df9f56 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -380,7 +380,7 @@ Are you sure you wish to encrypt your wallet?</source>
     <message>
         <location filename="../bitcoingui.cpp" line="193"/>
         <source>&amp;Transactions</source>
-        <translation>&amp;amp;معاملات</translation>
+        <translation>&amp;معاملات</translation>
     </message>
     <message>
         <location filename="../bitcoingui.cpp" line="534"/>
@@ -477,7 +477,7 @@ Are you sure you wish to encrypt your wallet?</source>
     <message>
         <location filename="../bitcoingui.cpp" line="250"/>
         <source>Open &amp;Bitcoin</source>
-        <translation>باز کردن &amp;amp;بیتکویین </translation>
+        <translation>باز کردن &amp;بیتکویین </translation>
     </message>
     <message>
         <location filename="../bitcoingui.cpp" line="251"/>
@@ -789,7 +789,7 @@ Address: %4
     <message>
         <location filename="../optionsdialog.cpp" line="223"/>
         <source>Pay transaction &amp;fee</source>
-        <translation>دستمزد&amp;amp;پر داخت معامله</translation>
+        <translation>دستمزد&amp;پر داخت معامله</translation>
     </message>
     <message>
         <location filename="../optionsdialog.cpp" line="217"/>
@@ -1136,12 +1136,12 @@ Address: %4
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="29"/>
         <source>A&amp;mount:</source>
-        <translation>A&amp;amp;مبلغ :</translation>
+        <translation>A&amp;مبلغ :</translation>
     </message>
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="42"/>
         <source>Pay &amp;To:</source>
-        <translation>به&amp;amp;پر داخت :</translation>
+        <translation>به&amp;پر داخت :</translation>
     </message>
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="66"/>
@@ -1152,7 +1152,7 @@ Address: %4
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="75"/>
         <source>&amp;Label:</source>
-        <translation>&amp; بر چسب </translation>
+        <translation>&amp;بر چسب </translation>
     </message>
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="93"/>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index 8afe58e9013..1ceedd4f935 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -749,7 +749,7 @@ Adresas: %4</translation>
     <message>
         <location filename="../optionsdialog.cpp" line="180"/>
         <source>Map port using &amp;UPnP</source>
-        <translation>Prievado struktūra  naudojant &amp; UPnP</translation>
+        <translation>Prievado struktūra  naudojant &amp;UPnP</translation>
     </message>
     <message>
         <location filename="../optionsdialog.cpp" line="181"/>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 6f30fc2580f..542819990e8 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -56,7 +56,7 @@ This product includes software developed by the OpenSSL Project for use in the O
     <message>
         <location filename="../forms/addressbookpage.ui" line="60"/>
         <source>&amp;New Address...</source>
-        <translation>&amp;amp; Novo endereço ...</translation>
+        <translation>&amp;Novo endereço ...</translation>
     </message>
     <message>
         <location filename="../forms/addressbookpage.ui" line="71"/>
@@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O
     <message>
         <location filename="../forms/addressbookpage.ui" line="74"/>
         <source>&amp;Copy to Clipboard</source>
-        <translation>&amp;amp; Copie para a área de transferência do sistema</translation>
+        <translation>&amp;Copie para a área de transferência do sistema</translation>
     </message>
     <message>
         <location filename="../forms/addressbookpage.ui" line="96"/>
@@ -819,7 +819,7 @@ Endereço: %4</translation>
     <message>
         <location filename="../forms/messagepage.ui" line="134"/>
         <source>&amp;Copy to Clipboard</source>
-        <translation>&amp;amp; Copie para a área de transferência do sistema</translation>
+        <translation>&amp;Copie para a área de transferência do sistema</translation>
     </message>
     <message>
         <location filename="../forms/messagepage.ui" line="120"/>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 71d001d479b..efa59e2a195 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -346,7 +346,7 @@ Are you sure you wish to encrypt your wallet?</source>
     <message>
         <location filename="../bitcoingui.cpp" line="250"/>
         <source>Open &amp;Bitcoin</source>
-        <translation>Öppna &amp;amp;Bitcoin</translation>
+        <translation>Öppna &amp;Bitcoin</translation>
     </message>
     <message>
         <location filename="../bitcoingui.cpp" line="251"/>
@@ -584,7 +584,7 @@ Adress: %4
     <message>
         <location filename="../bitcoingui.cpp" line="254"/>
         <source>&amp;Encrypt Wallet</source>
-        <translation>&amp;amp;Kryptera plånbok</translation>
+        <translation>&amp;Kryptera plånbok</translation>
     </message>
     <message>
         <location filename="../bitcoingui.cpp" line="73"/>
@@ -604,7 +604,7 @@ Adress: %4
     <message>
         <location filename="../bitcoingui.cpp" line="259"/>
         <source>&amp;Change Passphrase</source>
-        <translation>&amp;amp;Byt lösenfras</translation>
+        <translation>&amp;Byt lösenfras</translation>
     </message>
     <message>
         <location filename="../bitcoingui.cpp" line="257"/>
@@ -866,7 +866,7 @@ Adress: %4
     <message>
         <location filename="../forms/messagepage.ui" line="134"/>
         <source>&amp;Copy to Clipboard</source>
-        <translation>&amp;amp; Kopiera till Urklipp</translation>
+        <translation>&amp;Kopiera till Urklipp</translation>
     </message>
     <message>
         <location filename="../messagepage.cpp" line="74"/>
@@ -1145,7 +1145,7 @@ Adress: %4
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="42"/>
         <source>Pay &amp;To:</source>
-        <translation>Betala &amp; Till:</translation>
+        <translation>Betala &amp;Till:</translation>
     </message>
     <message>
         <location filename="../forms/sendcoinsentry.ui" line="66"/>