update translation

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
index d791e2584a577a2b01d757196b8493d0779125d5..0e1549b683513b225edb94fb3e5a43df6b26262d 100644 (file)
--- a/diary-mobile_en_EN.ts
+++ b/diary-mobile_en_EN.ts
@@ -14,34 +14,34 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="190"/>
         <source>choice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="190"/>
         <source>Please choose an action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="204"/>
+        <location filename="mainwindow.cpp" line="201"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="208"/>
+        <location filename="mainwindow.cpp" line="205"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="223"/>
+        <location filename="mainwindow.cpp" line="220"/>
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="234"/>
+        <location filename="mainwindow.cpp" line="231"/>
         <source>Enter ID of button to edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72,17 +72,6 @@
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.cpp" line="250"/>
-        <source>&amp;DownloadUi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="251"/>
         <source>sendRAW</source>
@@ -96,52 +85,32 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="252"/>
-        <source>Reset Ui</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="253"/>
         <source>Reset RAW</source>
+        <oldsource>Reset Ui</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="255"/>
         <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="257"/>
         <source>Ctrl+D</source>
         <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="mainwindow.cpp" line="258"/>
-        <source>Sa&amp;v buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+V</source>
@@ -149,27 +118,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
-        <source>&amp;Edit buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <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="262"/>
         <source>&amp;Help</source>
@@ -177,7 +135,7 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="263"/>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="405"/>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
@@ -209,135 +167,172 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="426"/>
+        <location filename="mainwindow.cpp" line="427"/>
         <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="426"/>
+        <location filename="mainwindow.cpp" line="427"/>
         <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="428"/>
+        <location filename="mainwindow.cpp" line="429"/>
         <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="428"/>
+        <location filename="mainwindow.cpp" line="429"/>
         <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="430"/>
+        <location filename="mainwindow.cpp" line="431"/>
         <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="430"/>
+        <location filename="mainwindow.cpp" line="431"/>
         <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
-        <source>askkeyword</source>
-        <comment>Title of box where ask for keyword to getbuttons</comment>
+        <location filename="mainwindow.cpp" line="250"/>
+        <source>Ctrl+T</source>
+        <comment>File|View menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>&amp;Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>Ctrl+W</source>
+        <comment>Buttons|Downlad</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="257"/>
+        <source>A&amp;dd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="258"/>
+        <source>Sa&amp;v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="259"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="259"/>
+        <source>Ctrl+Z</source>
+        <comment>Buttons|Reset</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="485"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <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="485"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <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="487"/>
+        <location filename="mainwindow.cpp" line="491"/>
         <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="487"/>
+        <location filename="mainwindow.cpp" line="491"/>
         <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="489"/>
+        <location filename="mainwindow.cpp" line="493"/>
         <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="489"/>
+        <location filename="mainwindow.cpp" line="493"/>
         <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="533"/>
+        <location filename="mainwindow.cpp" line="537"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="533"/>
+        <location filename="mainwindow.cpp" line="537"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="616"/>
+        <location filename="mainwindow.cpp" line="620"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="624"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="671"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="671"/>
         <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="673"/>
+        <location filename="mainwindow.cpp" line="677"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="673"/>
+        <location filename="mainwindow.cpp" line="677"/>
         <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 141dc8a37489471aad090dd664f5a59f74887052..31df93d653d31d06a880902d24c25f2d33fa48bf 100644 (file)
--- a/diary-mobile_fr_FR.ts
+++ b/diary-mobile_fr_FR.ts
@@ -14,34 +14,34 @@
         <translation>Entrez l&apos;URL pour télécharger vos boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="190"/>
         <source>choice</source>
         <translation>Choix</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="190"/>
         <source>Please choose an action.</source>
         <translation>choisissez une action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="204"/>
+        <location filename="mainwindow.cpp" line="201"/>
         <source>get file</source>
         <comment>title to ask file</comment>
         <translation>choisissez un fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="208"/>
+        <location filename="mainwindow.cpp" line="205"/>
         <source>box</source>
         <comment>box title to show a text</comment>
         <translation>info</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="223"/>
+        <location filename="mainwindow.cpp" line="220"/>
         <source>set</source>
         <translation>définir</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="234"/>
+        <location filename="mainwindow.cpp" line="231"/>
         <source>Enter ID of button to edit</source>
         <translation>Entrez l&apos;ID du bouton à éditer</translation>
     </message>
@@ -55,11 +55,6 @@
         <source>&amp;Start</source>
         <translation>&amp;Départ</translation>
     </message>
-    <message>
-        <source>Ctrl+S</source>
-        <comment>Fichier|Départ</comment>
-        <translation type="obsolete">Ctrl+D</translation>
-    </message>
     <message>
         <location filename="mainwindow.cpp" line="248"/>
         <source>Ctrl+S</source>
@@ -78,14 +73,8 @@
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="250"/>
-        <source>&amp;DownloadUi</source>
-        <translation>Téléchargement des boutons</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="250"/>
         <source>Ctrl+W</source>
-        <comment>File|Downlad</comment>
+        <comment>Buttons|Downlad</comment>
         <translation>Ctrl+D</translation>
     </message>
     <message>
@@ -101,38 +90,32 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="252"/>
-        <source>Reset Ui</source>
-        <translation>Réinitialiser les boutons</translation>
+        <source>Reset RAW</source>
+        <oldsource>Reset Ui</oldsource>
+        <translation type="unfinished">Réinitialiser les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="252"/>
         <source>Ctrl+Z</source>
-        <comment>File|ResetUi</comment>
+        <comment>Buttons|ResetUi</comment>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="253"/>
-        <source>Reset RAW</source>
-        <translation>Réinitialiser les données</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="254"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>Ctrl+Q</source>
         <comment>File|Quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="255"/>
         <source>&amp;Buttons</source>
         <translation>Boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
         <source>A&amp;dd buttons</source>
         <translation>A&amp;jouter un boutons</translation>
     </message>
@@ -143,9 +126,8 @@
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
         <source>Sa&amp;v buttons</source>
-        <translation>Sauvez les boutons</translation>
+        <translation type="obsolete">Sauvegardez les boutons</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="258"/>
@@ -154,25 +136,23 @@
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
         <source>&amp;Edit buttons</source>
-        <translation>&amp;Editer les boutons</translation>
+        <translation type="obsolete">&amp;Editer les boutons</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+E</source>
         <comment>Buttons|&amp;Edit</comment>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="250"/>
         <source>&amp;View/Hide menu</source>
         <translation>Voir/Cacher le menu</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+T</source>
-        <comment>Buttons|View menu</comment>
+        <comment>File|View menu</comment>
         <translation>Ctrl+C</translation>
     </message>
     <message>
@@ -182,7 +162,7 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="263"/>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="405"/>
         <source>New entry</source>
         <translation>Nouvelle entré</translation>
     </message>
@@ -214,135 +194,177 @@
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="426"/>
+        <location filename="mainwindow.cpp" line="427"/>
         <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="426"/>
+        <location filename="mainwindow.cpp" line="427"/>
         <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="428"/>
+        <location filename="mainwindow.cpp" line="429"/>
         <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="428"/>
+        <location filename="mainwindow.cpp" line="429"/>
         <source>Enter they keyword (no limit !)</source>
         <translation>Entrez les mots clé (no limit !)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="430"/>
+        <location filename="mainwindow.cpp" line="431"/>
         <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="430"/>
+        <location filename="mainwindow.cpp" line="431"/>
         <source>Enter his action</source>
         <translation>Entrez son action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
         <source>askkeyword</source>
         <comment>Title of box where ask for keyword to getbuttons</comment>
-        <translation>mot-clé ?</translation>
+        <translation type="obsolete">mot-clé ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
+        <location filename="mainwindow.cpp" line="250"/>
+        <source>Ctrl+T</source>
+        <comment>File|View menu</comment>
+        <translation type="unfinished">Ctrl+C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>&amp;Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="256"/>
+        <source>Ctrl+W</source>
+        <comment>Buttons|Downlad</comment>
+        <translation type="unfinished">Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="257"/>
+        <source>A&amp;dd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="258"/>
+        <source>Sa&amp;v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="259"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="259"/>
+        <source>Ctrl+Z</source>
+        <comment>Buttons|Reset</comment>
+        <translation type="unfinished">Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>chooseButtonDB</source>
         <translation>chooseButtonDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="464"/>
+        <location filename="mainwindow.cpp" line="468"/>
         <source>Enter the keyword : </source>
         <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="485"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <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="485"/>
+        <location filename="mainwindow.cpp" line="489"/>
         <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="487"/>
+        <location filename="mainwindow.cpp" line="491"/>
         <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="487"/>
+        <location filename="mainwindow.cpp" line="491"/>
         <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="489"/>
+        <location filename="mainwindow.cpp" line="493"/>
         <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="489"/>
+        <location filename="mainwindow.cpp" line="493"/>
         <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="533"/>
+        <location filename="mainwindow.cpp" line="537"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
         <translation>RAWsent</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="533"/>
+        <location filename="mainwindow.cpp" line="537"/>
         <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="616"/>
+        <location filename="mainwindow.cpp" line="620"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
         <translation>Upload finit : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="624"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
         <translation>uploadDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="671"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
         <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="671"/>
         <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="673"/>
+        <location filename="mainwindow.cpp" line="677"/>
         <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="673"/>
+        <location filename="mainwindow.cpp" line="677"/>
         <source>getButtons</source>
         <comment>title to ask keyword fot getbuttons</comment>
         <translation>getBoutons</translation>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 503191e0cd38a48585c6d07385dbcb520c6633e6..f0fb0d4e57c5781a58288b73b852487dfac9e540 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -240,24 +240,24 @@ void MainWindow::action(const QString &a){
     }
     else {
         getButtons(a);
-        getButtons(conf->value(QString("always")).toString());
+
     }
 }
 void MainWindow::createMenuBar(){
     FileMenu=new QMenu(trUtf8("&File"), this);
     FileMenu->addAction(trUtf8("&Start"), this, SLOT(start()),QKeySequence(trUtf8("Ctrl+S", "File|Start")));
     FileMenu->addAction(trUtf8("&Back"), this, SLOT(back()),QKeySequence(trUtf8("Ctrl+B", "File|Back")));
-    FileMenu->addAction(trUtf8("&DownloadUi"), this, SLOT(downloadUi()),QKeySequence(trUtf8("Ctrl+W", "File|Downlad")));
+    FileMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "File|View menu")));
     FileMenu->addAction(trUtf8("sendRAW"), this, SLOT(sendRAW()),QKeySequence(trUtf8("Ctrl+L", "File|Upload")));
-    FileMenu->addAction(trUtf8("Reset Ui"), this, SLOT(resetUi()), QKeySequence(trUtf8("Ctrl+Z", "File|ResetUi")));
     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(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")));
+    EditMenu->addAction(trUtf8("&Download"), this, SLOT(downloadUi()),QKeySequence(trUtf8("Ctrl+W", "Buttons|Downlad")));
+    EditMenu->addAction(trUtf8("A&dd"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
+    EditMenu->addAction(trUtf8("Sa&v"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
+    FileMenu->addAction(trUtf8("Reset"), this, SLOT(resetUi()), QKeySequence(trUtf8("Ctrl+Z", "Buttons|Reset")));
+    EditMenu->addAction(trUtf8("&Edit"), this, SLOT(chooseButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(trUtf8("&Help"));
     HelpMenu->addAction(trUtf8("New entry"), this, SLOT(entry()));
@@ -438,11 +438,12 @@ void MainWindow::getButtons(const QString &b){
     if((b[0]!='-')&&(b[0]!='+'))way.append(a);
     else a.remove(0, 1);
     qDebug()<<"getButtons("<<a<<") way.size()"<<way.size();
-    if((b[0]!='*')&&(b[0]!='+'))flush();
-    else if(b[0]=='*')a.remove(0, 1);
+    if(b[0]!='+')flush();
+
 
     if(updatelocker.tryLock(60000))updatelocker.unlock();
     else{qDebug()<<"updatelocker is locked more than 1mn";}
+
     QString c="%"+a+"%";
     QList<QString> tmp({conf->value(QString("getbuttons")).toString(), c});
     label->setText(a);
@@ -717,10 +718,10 @@ void MainWindow::removeButton(const QString & keyword, const QString & label, co
     }
 }
 void MainWindow::writeTr(){
-    QString a="diary-mobile_" + QLocale::system().name();
+    QString a="diary-mobile_" + QLocale::system().name()+".qm";
     qDebug()<<"a="<<a;
     QFile file(a);
     file.open(QIODevice::WriteOnly);
     file.write(m->downloadedData());
-
+    file.close();
 }