Merge pull request #3156 from softins/accelerator-keys

Fix accelerator key conflicts

Author: pljones

src/translation/translation_de_DE.qm

@@ -593,7 +593,7 @@
         <location filename="../chatdlg.cpp" line="64"/>
         <location filename="../chatdlg.cpp" line="69"/>
         <source>&amp;Close</source>
-        <translation>&amp;Schließen</translation>
+        <translation>S&amp;chließen</translation>
     </message>
     <message>
         <location filename="../chatdlg.cpp" line="145"/>
@@ -627,7 +627,7 @@
     </message>
     <message>
         <source>&amp;Close</source>
-        <translation type="vanished">&amp;Schließen</translation>
+        <translation type="vanished">S&amp;chließen</translation>
     </message>
 </context>
 <context>

src/translation/translation_de_DE.ts

@@ -746,7 +746,7 @@
     <message>
         <location filename="../clientdlg.cpp" line="311"/>
         <source>&amp;View</source>
-        <translation>&amp;Affichage</translation>
+        <translation>Afficha&amp;ge</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="286"/>

src/translation/translation_fr_FR.qm

@@ -148,7 +148,7 @@
     <message>
         <location filename="../aboutdlgbase.ui" line="120"/>
         <source>&amp;Libraries</source>
-        <translation>&amp;Bibliotek</translation>
+        <translation>Bib&amp;liotek</translation>
     </message>
     <message>
         <location filename="../aboutdlgbase.ui" line="134"/>
@@ -158,7 +158,7 @@
     <message>
         <location filename="../aboutdlgbase.ui" line="148"/>
         <source>&amp;Translation</source>
-        <translation>&amp;Oversettelse</translation>
+        <translation>Over&amp;settelse</translation>
     </message>
     <message>
         <location filename="../aboutdlgbase.ui" line="198"/>
@@ -503,7 +503,7 @@
     <message>
         <location filename="../chatdlg.cpp" line="60"/>
         <source>Cl&amp;ear Chat History</source>
-        <translation>T&amp;øm sludringshistorikk</translation>
+        <translation>&amp;Tøm sludringshistorikk</translation>
     </message>
     <message>
         <location filename="../chatdlg.cpp" line="64"/>
@@ -736,17 +736,17 @@
     <message>
         <location filename="../clientdlg.cpp" line="286"/>
         <source>&amp;Connection Setup...</source>
-        <translation>&amp;Tilkoblingsoppsett …</translation>
+        <translation>&amp;Tilkoblingsoppsett...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="290"/>
         <source>&amp;Load Mixer Channels Setup...</source>
-        <translation type="unfinished">&amp;Last inn kanalmikserinnstillingene …</translation>
+        <translation type="unfinished">Last &amp;inn kanalmikserinnstillingene...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="292"/>
         <source>&amp;Save Mixer Channels Setup...</source>
-        <translation type="unfinished">&amp;Lagre kanalmikserinnstillingene …</translation>
+        <translation type="unfinished">&amp;Lagre kanalmikserinnstillingene...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="296"/>
@@ -786,7 +786,7 @@
     <message>
         <location filename="../clientdlg.cpp" line="320"/>
         <source>N&amp;o User Sorting</source>
-        <translation>&amp;Ingen brukersortering</translation>
+        <translation>Ingen brukers&amp;ortering</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="323"/>
@@ -811,32 +811,32 @@
     <message>
         <location filename="../clientdlg.cpp" line="376"/>
         <source>C&amp;hat...</source>
-        <translation type="unfinished">&amp;Sludring …</translation>
+        <translation type="unfinished">&amp;Sludring...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="381"/>
         <source>&amp;Analyzer Console...</source>
-        <translation type="unfinished">&amp;Analysatorkonsoll …</translation>
+        <translation type="unfinished">&amp;Analysatorkonsoll...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="387"/>
         <source>Sett&amp;ings</source>
-        <translation type="unfinished">&amp;Innstillinger</translation>
+        <translation type="unfinished">I&amp;nnstillinger</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="389"/>
         <source>My &amp;Profile...</source>
-        <translation type="unfinished">Min &amp;profil …</translation>
+        <translation type="unfinished">Min &amp;profil...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="391"/>
         <source>Audio/Network &amp;Settings...</source>
-        <translation type="unfinished">Lyd/&amp;nettverksinnstillinger …</translation>
+        <translation type="unfinished">Lyd/&amp;nettverksinnstillinger...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="393"/>
         <source>A&amp;dvanced Settings...</source>
-        <translation type="unfinished">A&amp;vanserte innstillinger …</translation>
+        <translation type="unfinished">A&amp;vanserte innstillinger...</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="729"/>
@@ -958,7 +958,7 @@ We muted your channel and activated &apos;Mute Myself&apos;. Please solve the fe
     <message>
         <location filename="../clientdlgbase.ui" line="498"/>
         <source>&amp;Mute Myself</source>
-        <translation>&amp;Forstum deg selv</translation>
+        <translation>Forstu&amp;m deg selv</translation>
     </message>
     <message>
         <location filename="../clientdlgbase.ui" line="505"/>
@@ -2293,12 +2293,12 @@ We muted your channel and activated &apos;Mute Myself&apos;. Please solve the fe
         <location filename="../util.cpp" line="803"/>
         <location filename="../util.cpp" line="808"/>
         <source>Getting &amp;Started...</source>
-        <translation>&amp;Begynn …</translation>
+        <translation>&amp;Begynn...</translation>
     </message>
     <message>
         <location filename="../util.cpp" line="804"/>
         <source>Software &amp;Manual...</source>
-        <translation>&amp;Programvaremanual</translation>
+        <translation>&amp;Programvaremanual...</translation>
     </message>
     <message>
         <location filename="../util.cpp" line="811"/>
@@ -2308,12 +2308,12 @@ We muted your channel and activated &apos;Mute Myself&apos;. Please solve the fe
     <message>
         <location filename="../util.cpp" line="813"/>
         <source>&amp;About Jamulus...</source>
-        <translation type="unfinished">&amp;Om Jamulus …</translation>
+        <translation type="unfinished">&amp;Om Jamulus...</translation>
     </message>
     <message>
         <location filename="../util.cpp" line="815"/>
         <source>About &amp;Qt...</source>
-        <translation type="unfinished">Om &amp;Qt …</translation>
+        <translation type="unfinished">Om &amp;Qt...</translation>
     </message>
     <message>
         <location filename="../util.h" line="435"/>

src/translation/translation_fr_FR.ts

@@ -864,7 +864,7 @@
     <message>
         <location filename="../clientdlg.cpp" line="387"/>
         <source>Sett&amp;ings</source>
-        <translation>Na&amp;stavenia</translation>
+        <translation>&amp;Nastavenia</translation>
     </message>
     <message>
         <location filename="../clientdlg.cpp" line="729"/>

src/translation/translation_nb_NO.qm

@@ -534,7 +534,7 @@
         <location filename="../chatdlg.cpp" line="64"/>
         <location filename="../chatdlg.cpp" line="69"/>
         <source>&amp;Close</source>
-        <translation>&amp;Stäng</translation>
+        <translation>S&amp;täng</translation>
     </message>
     <message>
         <location filename="../chatdlg.cpp" line="145"/>
@@ -568,7 +568,7 @@
     </message>
     <message>
         <source>&amp;Close</source>
-        <translation type="obsolete">&amp;Stäng</translation>
+        <translation type="obsolete">S&amp;täng</translation>
     </message>
 </context>
 <context>