french translation is finished

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
index 5314bfd7ab02e6f40c5077b6110bc5cdc6b2016a..d791e2584a577a2b01d757196b8493d0779125d5 100644 (file)
--- a/diary-mobile_en_EN.ts
+++ b/diary-mobile_en_EN.ts
@@ -4,330 +4,340 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
+        <location filename="mainwindow.cpp" line="66"/>
         <source>first button file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
+        <location filename="mainwindow.cpp" line="66"/>
         <source>Enter the URL to download the first buttons file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
+        <location filename="mainwindow.cpp" line="193"/>
         <source>choice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
+        <location filename="mainwindow.cpp" line="193"/>
         <source>Please choose an action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="204"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="214"/>
+        <location filename="mainwindow.cpp" line="208"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="229"/>
+        <location filename="mainwindow.cpp" line="223"/>
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="240"/>
+        <location filename="mainwindow.cpp" line="234"/>
         <source>Enter ID of button to edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="247"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="249"/>
         <source>&amp;Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="249"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>&amp;DownloadUi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>Ctrl+W</source>
         <comment>File|Downlad</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="251"/>
         <source>sendRAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="251"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="252"/>
         <source>Reset Ui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="252"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>Reset RAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="254"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="254"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>&amp;Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>A&amp;dd buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Sa&amp;v buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+V</source>
         <comment>Buttons|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>&amp;Edit buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+T</source>
         <comment>Buttons|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="274"/>
-        <location filename="mainwindow.cpp" line="415"/>
+        <location filename="mainwindow.cpp" line="262"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="404"/>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="275"/>
+        <location filename="mainwindow.cpp" line="264"/>
         <source>getButtons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="276"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="276"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>ctrl+H</source>
         <comment>Help|About Qt</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="266"/>
         <source>C&amp;reate Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="266"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="426"/>
         <source>label</source>
         <comment>Title of box where ask for new button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="426"/>
         <source>Enter his label</source>
         <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
+        <location filename="mainwindow.cpp" line="428"/>
         <source>keyword</source>
         <comment>Title of box where ask for new button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
+        <location filename="mainwindow.cpp" line="428"/>
         <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="430"/>
         <source>action</source>
         <comment>Title of box where ask for new button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="430"/>
         <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>askkeyword</source>
         <comment>Title of box where ask for keyword to getbuttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="485"/>
         <source>keyword</source>
         <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="485"/>
         <source>new keyword</source>
         <comment>question to get new button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
+        <location filename="mainwindow.cpp" line="487"/>
         <source>label</source>
         <comment>Title of box where ask for button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
+        <location filename="mainwindow.cpp" line="487"/>
         <source>new label</source>
         <comment>question to get new button&apos;s label</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="500"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <source>action</source>
         <comment>Title of box where ask for button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="500"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <source>new action</source>
         <comment>question to get new button&apos;s action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="544"/>
+        <location filename="mainwindow.cpp" line="533"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="544"/>
+        <location filename="mainwindow.cpp" line="533"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="616"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="631"/>
+        <location filename="mainwindow.cpp" line="620"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="678"/>
+        <location filename="mainwindow.cpp" line="667"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="678"/>
+        <location filename="mainwindow.cpp" line="667"/>
         <source>savbuttons finish</source>
         <comment>pop-up text when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="684"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="684"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation type="unfinished"></translation>

diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts
index 55638e6088ac729ce08e01a099ff481574147323..141dc8a37489471aad090dd664f5a59f74887052 100644 (file)
--- a/diary-mobile_fr_FR.ts
+++ b/diary-mobile_fr_FR.ts
@@ -4,54 +4,54 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
+        <location filename="mainwindow.cpp" line="66"/>
         <source>first button file</source>
         <translation>Premier fichier de bouton</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
+        <location filename="mainwindow.cpp" line="66"/>
         <source>Enter the URL to download the first buttons file</source>
         <translation>Entrez l&apos;URL pour télécharger vos boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
+        <location filename="mainwindow.cpp" line="193"/>
         <source>choice</source>
         <translation>Choix</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
+        <location filename="mainwindow.cpp" line="193"/>
         <source>Please choose an action.</source>
         <translation>choisissez une action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="210"/>
+        <location filename="mainwindow.cpp" line="204"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation>choisissez un fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="214"/>
+        <location filename="mainwindow.cpp" line="208"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation>info</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="229"/>
+        <location filename="mainwindow.cpp" line="223"/>
         <source>set</source>
         <translation>définir</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="240"/>
+        <location filename="mainwindow.cpp" line="234"/>
         <source>Enter ID of button to edit</source>
         <translation>Entrez l&apos;ID du bouton à éditer</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="247"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>&amp;Start</source>
         <translation>&amp;Départ</translation>
     </message>
@@ -61,278 +61,288 @@
         <translation type="obsolete">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="248"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
-        <translation type="unfinished">Ctrl+D</translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="249"/>
         <source>&amp;Back</source>
         <translation>&amp;Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="249"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>&amp;DownloadUi</source>
-        <translation>TéléchargementUi</translation>
+        <translation>Téléchargement des boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>Ctrl+W</source>
         <comment>File|Downlad</comment>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="251"/>
         <source>sendRAW</source>
-        <translation>envoyerRAW</translation>
+        <translation>Envoyer les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
+        <location filename="mainwindow.cpp" line="251"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="252"/>
         <source>Reset Ui</source>
-        <translation>Réinitialiser Ui</translation>
+        <translation>Réinitialiser les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="262"/>
+        <location filename="mainwindow.cpp" line="252"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>Reset RAW</source>
-        <translation>Réinitialiser RAW</translation>
+        <translation>Réinitialiser les données</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="254"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
+        <location filename="mainwindow.cpp" line="254"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>&amp;Buttons</source>
+        <translation>Boutons</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>A&amp;dd buttons</source>
-        <translation>A&amp;joutez un boutons</translation>
+        <translation>A&amp;jouter un boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="268"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Sa&amp;v buttons</source>
-        <translation>Sauvez les bouttons</translation>
+        <translation>Sauvez les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+V</source>
         <comment>Buttons|Save</comment>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>&amp;Edit buttons</source>
         <translation>&amp;Editer les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>&amp;View/Hide menu</source>
         <translation>Voir/Cacher le menu</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+T</source>
         <comment>Buttons|View menu</comment>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="274"/>
-        <location filename="mainwindow.cpp" line="415"/>
+        <location filename="mainwindow.cpp" line="262"/>
+        <source>&amp;Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="263"/>
+        <location filename="mainwindow.cpp" line="404"/>
         <source>New entry</source>
         <translation>Nouvelle entré</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="275"/>
+        <location filename="mainwindow.cpp" line="264"/>
         <source>getButtons</source>
         <translation>getButtons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="276"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>About Qt</source>
         <translation>A propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="276"/>
+        <location filename="mainwindow.cpp" line="265"/>
         <source>ctrl+H</source>
         <comment>Help|About Qt</comment>
         <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="266"/>
         <source>C&amp;reate Database</source>
         <translation>C&amp;réer une base de donné</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="277"/>
+        <location filename="mainwindow.cpp" line="266"/>
         <source>Ctrl+R</source>
         <comment>Help|CreateDB</comment>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="426"/>
         <source>label</source>
         <comment>Title of box where ask for new button&apos;s label</comment>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="426"/>
         <source>Enter his label</source>
         <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
         <translation>Entrez son étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
+        <location filename="mainwindow.cpp" line="428"/>
         <source>keyword</source>
         <comment>Title of box where ask for new button&apos;s keyword</comment>
         <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
+        <location filename="mainwindow.cpp" line="428"/>
         <source>Enter they keyword (no limit !)</source>
         <translation>Entrez les mots clé (no limit !)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="430"/>
         <source>action</source>
         <comment>Title of box where ask for new button&apos;s action</comment>
         <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="430"/>
         <source>Enter his action</source>
         <translation>Entrez son action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>askkeyword</source>
         <comment>Title of box where ask for keyword to getbuttons</comment>
         <translation>mot-clé ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>chooseButtonDB</source>
         <translation>chooseButtonDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="475"/>
+        <location filename="mainwindow.cpp" line="464"/>
         <source>Enter the keyword : </source>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="485"/>
         <source>keyword</source>
         <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="485"/>
         <source>new keyword</source>
         <comment>question to get new button&apos;s keyword</comment>
         <translation>nouveau mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
+        <location filename="mainwindow.cpp" line="487"/>
         <source>label</source>
         <comment>Title of box where ask for button&apos;s label</comment>
         <translation>étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
+        <location filename="mainwindow.cpp" line="487"/>
         <source>new label</source>
         <comment>question to get new button&apos;s label</comment>
         <translation>nouvel étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="500"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <source>action</source>
         <comment>Title of box where ask for button&apos;s action</comment>
         <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="500"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <source>new action</source>
         <comment>question to get new button&apos;s action</comment>
         <translation>nouvelle action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="544"/>
+        <location filename="mainwindow.cpp" line="533"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation>RAWsent</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="544"/>
+        <location filename="mainwindow.cpp" line="533"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation>données envoyées</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="616"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation>Upload finit : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="631"/>
+        <location filename="mainwindow.cpp" line="620"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation>uploadDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="678"/>
+        <location filename="mainwindow.cpp" line="667"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="678"/>
+        <location filename="mainwindow.cpp" line="667"/>
         <source>savbuttons finish</source>
         <comment>pop-up text when buttons has been sent</comment>
         <translation>boutons sauvegardés sur le serveur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="684"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="684"/>
+        <location filename="mainwindow.cpp" line="673"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation>getBoutons</translation>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 015b88b12a7aa93201464a53fdd6b3024eaa4f06..d324244c7ebc99382046ce6d36dd928abfc1f863 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -253,14 +253,13 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("Reset RAW"), this, SLOT(resetRAW()));
     FileMenu->addAction(trUtf8("&Quit"), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "File|Quit")));
     menuBar()->addMenu(FileMenu);
-
-    EditMenu=new QMenu(QString("&Buttons"));
+    EditMenu=new QMenu(trUtf8("&Buttons"));
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
     EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(chooseButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
     menuBar()->addMenu(EditMenu);
-    HelpMenu=new QMenu(QString("&Help"));
+    HelpMenu=new QMenu(trUtf8("&Help"));
     HelpMenu->addAction(trUtf8("New entry"), this, SLOT(entry()));
     HelpMenu->addAction(trUtf8("getButtons"), this, SLOT(getButtons()));
     HelpMenu->addAction(trUtf8("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "Help|About Qt")));
@@ -462,9 +461,10 @@ void MainWindow::getButtons(const QString &b){
 }
 void MainWindow::chooseButtonDB(){
     QString a;
-    if(conf->value(trUtf8("askkeyword", "Title of box where ask for keyword to getbuttons")).toBool())a=QInputDialog::getText(this, trUtf8("chooseButtonDB"), trUtf8("Enter the keyword : "), QLineEdit::Normal, label->text());
+    bool ok=1;
+    if(conf->value("askkeyword").toBool())a=QInputDialog::getText(this, trUtf8("chooseButtonDB"), trUtf8("Enter the keyword : "), QLineEdit::Normal, label->text(), &ok);
     else a=label->text();
-    chooseButtonDB(a);
+    if(ok)chooseButtonDB(a);
 }
 void MainWindow::chooseButtonDB(const QString & a){
     flush();