added every things to translate soft easily

diff --git a/diary-mobile.pro b/diary-mobile.pro
index f4d3cfbb4330e62543644f58f496fe22717bcb2f..e53a06b423863f7db8136edfe7a34e11088baa68 100644 (file)
--- a/diary-mobile.pro
+++ b/diary-mobile.pro
@@ -26,7 +26,7 @@ HEADERS  += mainwindow.h \
 CONFIG += mobility c++11
 MOBILITY = 
 QMAKE_CXXFLAGS += -fpermissive
-TRANSLATIONS = diary-mobile_fr.ts diary-mobile_en.ts
+TRANSLATIONS = diary-mobile_fr_FR.ts diary-mobile_en_EN.ts
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 OTHER_FILES += \

diff --git a/diary-mobile_en.ts b/diary-mobile_en_EN.ts
similarity index 66%
rename from diary-mobile_en.ts
rename to diary-mobile_en_EN.ts
index a38ffb652769836d8176e5157c0fb7db8c708dc5..1f0d0cb67cd9ba0c5ebc480e319d4240564cd0e0 100644 (file)
--- a/diary-mobile_en.ts
+++ b/diary-mobile_en_EN.ts
@@ -4,33 +4,35 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
-        <source>fichier initial</source>
+        <location filename="mainwindow.cpp" line="199"/>
+        <source>choice</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="mainwindow.cpp" line="72"/>
-        <source>Entrez l&apos;adresse du serveur où télécharger les premier boutons</source>
+        <source>first button file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
-        <source>choice</source>
+        <location filename="mainwindow.cpp" line="72"/>
+        <source>Enter the URL to download the first buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="199"/>
-        <source>Veuillez choisir une action.</source>
+        <source>Please choose an action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="210"/>
         <source>get file</source>
+        <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="214"/>
         <source>box</source>
+        <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -38,9 +40,10 @@
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="mainwindow.cpp" line="240"/>
-        <source>Entrez l&apos;ID du bouton à éditez</source>
+        <source>Enter ID of button to edit</source>
+        <oldsource>Entrez l&apos;ID du bouton à éditez</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -50,7 +53,8 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="254"/>
-        <source>&amp;Start...</source>
+        <source>&amp;Start</source>
+        <oldsource>&amp;Start...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -93,193 +97,236 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Reset Ui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Reset RAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
-        <source>&amp;Quit...</source>
+        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="411"/>
+        <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
-        <source>Ctrl+Q</source>
-        <comment>File|Quit</comment>
+        <location filename="mainwindow.cpp" line="433"/>
+        <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="265"/>
-        <source>A&amp;dd buttons</source>
+        <location filename="mainwindow.cpp" line="433"/>
+        <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="265"/>
-        <source>Ctrl+D</source>
-        <comment>Buttons|Add</comment>
+        <location filename="mainwindow.cpp" line="435"/>
+        <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="266"/>
-        <source>Sa&amp;v buttons</source>
+        <location filename="mainwindow.cpp" line="435"/>
+        <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
-        <source>Ctrl+V</source>
-        <comment>Buttons|Save</comment>
+        <location filename="mainwindow.cpp" line="437"/>
+        <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="267"/>
-        <source>&amp;Edit buttons</source>
+        <location filename="mainwindow.cpp" line="437"/>
+        <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="267"/>
-        <source>Ctrl+E</source>
-        <comment>Buttons|&amp;Edit</comment>
+        <location filename="mainwindow.cpp" line="471"/>
+        <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="269"/>
-        <source>&amp;View/Hide menu</source>
+        <location filename="mainwindow.cpp" line="471"/>
+        <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
-        <source>Ctrl+T</source>
-        <comment>Buttons|View menu</comment>
+        <location filename="mainwindow.cpp" line="492"/>
+        <source>keyword</source>
+        <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="272"/>
-        <source>Nouvelle entré</source>
+    <message>
+        <location filename="mainwindow.cpp" line="492"/>
+        <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="273"/>
-        <location filename="mainwindow.cpp" line="682"/>
-        <source>getButtons</source>
+        <location filename="mainwindow.cpp" line="494"/>
+        <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="274"/>
-        <source>About Qt</source>
+        <location filename="mainwindow.cpp" line="494"/>
+        <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="274"/>
-        <source>ctrl+H</source>
-        <comment>Help|About Qt</comment>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="275"/>
-        <source>C&amp;reate Database</source>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="275"/>
-        <source>Ctrl+R</source>
-        <comment>Help|CreateDB</comment>
+        <location filename="mainwindow.cpp" line="540"/>
+        <source>RAWsent</source>
+        <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="413"/>
-        <source>nouvelle entrée</source>
+    <message>
+        <location filename="mainwindow.cpp" line="540"/>
+        <source>sendRAW finish</source>
+        <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
-        <source>Entrez son label</source>
+        <location filename="mainwindow.cpp" line="623"/>
+        <source>Upload finish : </source>
+        <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="437"/>
-        <source>Entrez ses mots clé (no limit !)</source>
+    <message>
+        <location filename="mainwindow.cpp" line="627"/>
+        <source>uploadDB</source>
+        <comment>pop-up title when data has been sent</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="674"/>
+        <source>Uisent</source>
+        <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
-        <source>Entrez son action</source>
+        <location filename="mainwindow.cpp" line="674"/>
+        <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="473"/>
-        <source>chooseButtonDB</source>
+        <location filename="mainwindow.cpp" line="680"/>
+        <source>Enter the keyword : </source>
+        <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="473"/>
-        <location filename="mainwindow.cpp" line="682"/>
-        <source>Entrez le mots-clé : </source>
+    <message>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>Ctrl+Q</source>
+        <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>keyword</source>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>new keyword</source>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>A&amp;dd buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>label</source>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>Ctrl+D</source>
+        <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>new label</source>
+        <location filename="mainwindow.cpp" line="265"/>
+        <source>Sa&amp;v buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
-        <source>action</source>
+        <location filename="mainwindow.cpp" line="265"/>
+        <source>Ctrl+V</source>
+        <comment>Buttons|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
-        <source>new action</source>
+        <location filename="mainwindow.cpp" line="266"/>
+        <source>&amp;Edit buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <source>RAWsent</source>
+        <location filename="mainwindow.cpp" line="266"/>
+        <source>Ctrl+E</source>
+        <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <source>sendRAW finish</source>
+        <location filename="mainwindow.cpp" line="267"/>
+        <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="625"/>
-        <source>Upload finish : </source>
+        <location filename="mainwindow.cpp" line="267"/>
+        <source>Ctrl+T</source>
+        <comment>Buttons|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="676"/>
-        <source>Uisent</source>
+        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="680"/>
+        <source>getButtons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="676"/>
-        <source>savbuttons finish</source>
+        <location filename="mainwindow.cpp" line="272"/>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="272"/>
+        <source>ctrl+H</source>
+        <comment>Help|About Qt</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="273"/>
+        <source>C&amp;reate Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="273"/>
+        <source>Ctrl+R</source>
+        <comment>Help|CreateDB</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="471"/>
+        <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/diary-mobile_fr.ts b/diary-mobile_fr_FR.ts
similarity index 65%
rename from diary-mobile_fr.ts
rename to diary-mobile_fr_FR.ts
index aa670959c7e455b23915364c9d7a2a4ffdcb5a0e..8b0c57512a24ac8f45330dcabeec0ff3e1c871ab 100644 (file)
--- a/diary-mobile_fr.ts
+++ b/diary-mobile_fr_FR.ts
@@ -4,33 +4,43 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
         <source>fichier initial</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">fichier initial</translation>
     </message>
     <message utf8="true">
-        <location filename="mainwindow.cpp" line="72"/>
         <source>Entrez l&apos;adresse du serveur où télécharger les premier boutons</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Entrez l&apos;adresse du serveur où télecharger les premier boutons</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="199"/>
         <source>choice</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="72"/>
+        <source>first button file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="72"/>
+        <source>Enter the URL to download the first buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="mainwindow.cpp" line="199"/>
-        <source>Veuillez choisir une action.</source>
+        <source>Please choose an action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="210"/>
         <source>get file</source>
+        <comment>title to ask file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="214"/>
         <source>box</source>
+        <comment>box title to show a text</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -38,9 +48,10 @@
         <source>set</source>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
+    <message>
         <location filename="mainwindow.cpp" line="240"/>
-        <source>Entrez l&apos;ID du bouton à éditez</source>
+        <source>Enter ID of button to edit</source>
+        <oldsource>Entrez l&apos;ID du bouton à éditez</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -50,7 +61,8 @@
     </message>
     <message>
         <location filename="mainwindow.cpp" line="254"/>
-        <source>&amp;Start...</source>
+        <source>&amp;Start</source>
+        <oldsource>&amp;Start...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -93,193 +105,236 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Reset Ui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Reset RAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
-        <source>&amp;Quit...</source>
+        <location filename="mainwindow.cpp" line="270"/>
+        <location filename="mainwindow.cpp" line="411"/>
+        <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="261"/>
-        <source>Ctrl+Q</source>
-        <comment>File|Quit</comment>
+        <location filename="mainwindow.cpp" line="433"/>
+        <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="265"/>
-        <source>A&amp;dd buttons</source>
+        <location filename="mainwindow.cpp" line="433"/>
+        <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="265"/>
-        <source>Ctrl+D</source>
-        <comment>Buttons|Add</comment>
+        <location filename="mainwindow.cpp" line="435"/>
+        <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="266"/>
-        <source>Sa&amp;v buttons</source>
+        <location filename="mainwindow.cpp" line="435"/>
+        <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="266"/>
-        <source>Ctrl+V</source>
-        <comment>Buttons|Save</comment>
+        <location filename="mainwindow.cpp" line="437"/>
+        <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="267"/>
-        <source>&amp;Edit buttons</source>
+        <location filename="mainwindow.cpp" line="437"/>
+        <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="267"/>
-        <source>Ctrl+E</source>
-        <comment>Buttons|&amp;Edit</comment>
+        <location filename="mainwindow.cpp" line="471"/>
+        <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="269"/>
-        <source>&amp;View/Hide menu</source>
+        <location filename="mainwindow.cpp" line="471"/>
+        <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="269"/>
-        <source>Ctrl+T</source>
-        <comment>Buttons|View menu</comment>
+        <location filename="mainwindow.cpp" line="492"/>
+        <source>keyword</source>
+        <comment>Title of box where ask for button&apos;s keyword</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="272"/>
-        <source>Nouvelle entré</source>
+    <message>
+        <location filename="mainwindow.cpp" line="492"/>
+        <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="273"/>
-        <location filename="mainwindow.cpp" line="682"/>
-        <source>getButtons</source>
+        <location filename="mainwindow.cpp" line="494"/>
+        <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="274"/>
-        <source>About Qt</source>
+        <location filename="mainwindow.cpp" line="494"/>
+        <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="274"/>
-        <source>ctrl+H</source>
-        <comment>Help|About Qt</comment>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="275"/>
-        <source>C&amp;reate Database</source>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="275"/>
-        <source>Ctrl+R</source>
-        <comment>Help|CreateDB</comment>
+        <location filename="mainwindow.cpp" line="540"/>
+        <source>RAWsent</source>
+        <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="413"/>
-        <source>nouvelle entrée</source>
+    <message>
+        <location filename="mainwindow.cpp" line="540"/>
+        <source>sendRAW finish</source>
+        <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
-        <source>Entrez son label</source>
+        <location filename="mainwindow.cpp" line="623"/>
+        <source>Upload finish : </source>
+        <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="437"/>
-        <source>Entrez ses mots clé (no limit !)</source>
+    <message>
+        <location filename="mainwindow.cpp" line="627"/>
+        <source>uploadDB</source>
+        <comment>pop-up title when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="439"/>
-        <source>Entrez son action</source>
+        <location filename="mainwindow.cpp" line="674"/>
+        <source>Uisent</source>
+        <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="473"/>
-        <source>chooseButtonDB</source>
+        <location filename="mainwindow.cpp" line="674"/>
+        <source>savbuttons finish</source>
+        <comment>pop-up text when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message utf8="true">
-        <location filename="mainwindow.cpp" line="473"/>
-        <location filename="mainwindow.cpp" line="682"/>
-        <source>Entrez le mots-clé : </source>
+    <message>
+        <location filename="mainwindow.cpp" line="680"/>
+        <source>Enter the keyword : </source>
+        <comment>ask keyword to get buttons</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>keyword</source>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>Ctrl+Q</source>
+        <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>new keyword</source>
+        <location filename="mainwindow.cpp" line="260"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>label</source>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>A&amp;dd buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>new label</source>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>Ctrl+D</source>
+        <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
-        <source>action</source>
+        <location filename="mainwindow.cpp" line="265"/>
+        <source>Sa&amp;v buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="498"/>
-        <source>new action</source>
+        <location filename="mainwindow.cpp" line="265"/>
+        <source>Ctrl+V</source>
+        <comment>Buttons|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <source>RAWsent</source>
+        <location filename="mainwindow.cpp" line="266"/>
+        <source>&amp;Edit buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <source>sendRAW finish</source>
+        <location filename="mainwindow.cpp" line="266"/>
+        <source>Ctrl+E</source>
+        <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="625"/>
-        <source>Upload finish : </source>
+        <location filename="mainwindow.cpp" line="267"/>
+        <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="676"/>
-        <source>Uisent</source>
+        <location filename="mainwindow.cpp" line="267"/>
+        <source>Ctrl+T</source>
+        <comment>Buttons|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="676"/>
-        <source>savbuttons finish</source>
+        <location filename="mainwindow.cpp" line="271"/>
+        <location filename="mainwindow.cpp" line="680"/>
+        <source>getButtons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="272"/>
+        <source>About Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="272"/>
+        <source>ctrl+H</source>
+        <comment>Help|About Qt</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="273"/>
+        <source>C&amp;reate Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="273"/>
+        <source>Ctrl+R</source>
+        <comment>Help|CreateDB</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="471"/>
+        <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/main.cpp b/main.cpp
index cebe7c7e73ef3f9535cda6a7db1922591abcec4f..68af5eeb1c3fb89baba7c8f7a44d73ae986c2b62 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -30,9 +30,9 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
-    QString locale = QLocale::system().name().section('_', 0, 0);
+    QString locale = QLocale::system().name();//.section('_', 0, 0)
     QTranslator translator;
-    translator.load(QString("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    translator.load(QString("diary-mobile_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     a.installTranslator(&translator);
     MainWindow w;
     w.show();

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b715456875812b04a6f84d52708285216db79eec..c4c5602d4b818d43f2e96b42532f52467302370d 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     screen->show();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
-        QString ser=QInputDialog::getText(this, trUtf8("fichier initial"), trUtf8("Entrez l'adresse du serveur où télécharger les premier boutons"), QLineEdit::Normal, conf->value(QString("download")).toString());
+        QString ser=QInputDialog::getText(this, trUtf8("first button file"), trUtf8("Enter the URL to download the first buttons"), QLineEdit::Normal, conf->value(QString("download")).toString());
         if(ser!="")conf->setValue(QString("download"), ser);
         createDB();
         downloadUi();
@@ -196,7 +196,7 @@ void MainWindow::action(const QString &a){
     }
     else if(b[0]==QString("a/b")){
         bool ok;
-        QString e=QInputDialog::getItem(this, trUtf8("choice"), trUtf8("Veuillez choisir une action."), c.split(conf->value(QString("sepchc")).toString()), 0, 0, &ok);
+        QString e=QInputDialog::getItem(this, trUtf8("choice"), trUtf8("Please choose an action."), c.split(conf->value(QString("sepchc")).toString()), 0, 0, &ok);
         if(ok)action(e);
     }
     else if(b[0]==QString("back")){
@@ -207,11 +207,11 @@ void MainWindow::action(const QString &a){
     } 
     else if(b[0]==QString("setfile")){
         bool ok;
-        QString e=QFileDialog::getSaveFileName(this, trUtf8("get file"), conf->value(b[1]).toString());
+        QString e=QFileDialog::getSaveFileName(this, trUtf8("get file", "title to ask file"), conf->value(b[1]).toString());
         if(ok)conf->setValue(b[1], e);
     }
     else if(b[0]==QString("box")){
-        QMessageBox::information(this, trUtf8("box"), c);
+        QMessageBox::information(this, trUtf8("box", "box title to show a text"), c);
 
     }
     else if(b[0]==QString("quit")){
@@ -237,7 +237,7 @@ void MainWindow::action(const QString &a){
         QString e;
         bool ok;
         if(b.size()<=1){
-            e=QInputDialog::getText(this, QString("ID"), trUtf8("Entrez l'ID du bouton à éditez"), QLineEdit::Normal, QString(""), &ok);
+            e=QInputDialog::getText(this, QString("ID"), trUtf8("Enter ID of button to edit"), QLineEdit::Normal, QString(""), &ok);
             if(ok)editButtonDB(e);
             }
         else editButtonDB(b[1]);
@@ -251,26 +251,24 @@ void MainWindow::action(const QString &a){
 }
 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("&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("sendRAW"), this, SLOT(sendRAW()),QKeySequence(trUtf8("Ctrl+L", "File|Upload")));
-    //FileMenu->addAction(trUtf8("Rest&ore"), this, SLOT(restoreDB()),QKeySequence(trUtf8("Ctrl+O", "File|Restore")));
     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")));
+    FileMenu->addAction(trUtf8("&Quit"), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "File|Quit")));
     menuBar()->addMenu(FileMenu);
 
     EditMenu=new QMenu(QString("&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("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
     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->addAction(trUtf8("Nouvelle entré"), this, SLOT(entry()));
-    HelpMenu->addAction(trUtf8("getButtons"), this, SLOT(getButtons()), QKeySequence(""));
+    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")));
     EditMenu->addAction(trUtf8("C&reate Database"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Help|CreateDB")));
     menuBar()->addMenu(HelpMenu);
@@ -410,7 +408,7 @@ void MainWindow::entry(const QString &a){
     context.append(way.last());
     if(a=="")label=context+" : ";
     else label=context+", "+a+" : ";
-    entry=QInputDialog::getText(this, trUtf8("nouvelle entrée"), label, QLineEdit::Normal, "", &ok);
+    entry=QInputDialog::getText(this, trUtf8("New entry"), label, QLineEdit::Normal, "", &ok);
     if(ok==0)return;
     QString c;
     if(a=="")c=context+" : "+entry;
@@ -432,11 +430,11 @@ void MainWindow::addButtonDB(){
     qDebug()<<"addButtonDB()";
     bool ok=0;
     QString cur=label->text();
-    QString a, b, c=QInputDialog::getText(this, QString("label"), trUtf8("Entrez son label"),QLineEdit::Normal, QString(""), &ok);
+    QString a, b, c=QInputDialog::getText(this, trUtf8("label", "Title of box where ask for new button's label"), trUtf8("Enter his label", "his/her/?they? I've forget my school lesson"),QLineEdit::Normal, QString(""), &ok);
     if ((c=="")||(ok==0))return;
-    b=QInputDialog::getText(this, QString("keyword"), trUtf8("Entrez ses mots clé (no limit !)"), QLineEdit::Normal, cur, &ok);
+    b=QInputDialog::getText(this, trUtf8("keyword", "Title of box where ask for new button's keyword"), trUtf8("Enter they keyword (no limit !)"), QLineEdit::Normal, cur, &ok);
     if ((b=="")||(ok==0))return;
-    a=QInputDialog::getText(this, QString("action"), trUtf8("Entrez son action"), QLineEdit::Normal, c, &ok);
+    a=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for new button's action"), trUtf8("Enter his action"), QLineEdit::Normal, c, &ok);
     if ((a=="")||(ok==0))return;
     insertButton(b, c, a);
     return;
@@ -470,7 +468,7 @@ void MainWindow::getButtons(const QString &b){
 }
 void MainWindow::chooseButtonDB(){
     QString a;
-    if(conf->value(QString("askkeyword")).toBool())a=QInputDialog::getText(this, trUtf8("chooseButtonDB"), trUtf8("Entrez le mots-clé : "), QLineEdit::Normal, label->text());
+    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());
     else a=label->text();
     chooseButtonDB(a);
 }
@@ -491,11 +489,11 @@ void MainWindow::editButtonDB(const QString & a){
     QString keyword=q->value(1).toString();
     QString label=q->value(2).toString();
     QString action=q->value(3).toString();
-    const QString tmpkeyword=QInputDialog::getText(this, trUtf8("keyword"), trUtf8("new keyword"), QLineEdit::Normal, keyword, &ok);
+    const QString tmpkeyword=QInputDialog::getText(this, trUtf8("keyword", "Title of box where ask for button's keyword"), trUtf8("new keyword", "question to get new button's keyword"), QLineEdit::Normal, keyword, &ok);
     if(!ok)return;
-    const QString tmplabel=QInputDialog::getText(this, trUtf8("label"), trUtf8("new label"), QLineEdit::Normal, label, &ok);
+    const QString tmplabel=QInputDialog::getText(this, trUtf8("label", "Title of box where ask for button's label"), trUtf8("new label", "question to get new button's label"), QLineEdit::Normal, label, &ok);
     if(!ok)return;
-    const QString tmpaction=QInputDialog::getText(this, trUtf8("action"), trUtf8("new action"), QLineEdit::Normal, action, &ok);
+    const QString tmpaction=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for button's action"), trUtf8("new action", "question to get new button's action"), QLineEdit::Normal, action, &ok);
     if(!ok)return;
     if((tmpkeyword=="")||(tmplabel=="")||(tmpaction=="")){
         //exec(QList<QString>({conf->value(QString("deletebuttons")).toString(), a}));
@@ -539,7 +537,7 @@ void MainWindow::sendRAW(){
 }
 void MainWindow::RAWsent(){
     qDebug()<<"RAWsent";
-    QMessageBox::information(this, trUtf8("RAWsent"), trUtf8("sendRAW finish"));
+    QMessageBox::information(this, trUtf8("RAWsent", "message title when data has been send"), trUtf8("sendRAW finish", "message text when data has been send"));
 }
 void MainWindow::back(){
     flush();
@@ -622,11 +620,11 @@ void MainWindow::readButtons(const QByteArray &in){
 }
 void MainWindow::datasent(){
     qDebug()<<"datasent";
-    QString texte=trUtf8("Upload finish : ");
+    QString texte=trUtf8("Upload finish : ", "pop-up when data has been sent");
     texte=texte+conf->value(QString("uploadDB")).toString();
     qDebug()<<"texte : "<<texte;
 
-    QMessageBox::information(this, "uploadDB", texte);
+    QMessageBox::information(this, trUtf8("uploadDB", "pop-up title when data has been sent"), texte);
 }
 void MainWindow::resetUi(){
     exec(QList<QString>({"delete from ui;"}));
@@ -673,13 +671,13 @@ void MainWindow::savButtons(){
 }
 void MainWindow::Uisent(){
     qDebug()<<"Uisent";
-    QMessageBox::information(this, trUtf8("Uisent"), trUtf8("savbuttons finish"));
+    QMessageBox::information(this, trUtf8("Uisent", "pop-up title when buttons has been sent"), trUtf8("savbuttons finish", "pop-up text when buttons has been sent"));
 }
 void MainWindow::resetRAW(){
     exec(QList<QString>({"delete from raw;"}));
 }
 void MainWindow::getButtons(){
-    const QString a=QInputDialog::getText(this, trUtf8("getButtons"), trUtf8("Entrez le mots-clé : "));
+    const QString a=QInputDialog::getText(this, trUtf8("getButtons"), trUtf8("Enter the keyword : ", "ask keyword to get buttons"));
     getButtons(a);
 }
 void MainWindow::insertButton(const QString & keyword, const QString & label, const QString & action){