I've added QTranslate, my app is now multi-language

diff --git a/diary-mobile.pro b/diary-mobile.pro
index e53a06b423863f7db8136edfe7a34e11088baa68..c2de6413af7e9e247c7bae44febe0051a47b7a87 100644 (file)
--- a/diary-mobile.pro
+++ b/diary-mobile.pro
@@ -34,6 +34,8 @@ OTHER_FILES += \
     ui.sql \
     README.md \
     android/AndroidManifest.xml \
-    jean_victor_balin_book.png
+    jean_victor_balin_book.png \
+    diary-mobile_en_EN.ts \
+    diary-mobile_fr_FR.ts
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
index 1f0d0cb67cd9ba0c5ebc480e319d4240564cd0e0..5314bfd7ab02e6f40c5077b6110bc5cdc6b2016a 100644 (file)
--- a/diary-mobile_en_EN.ts
+++ b/diary-mobile_en_EN.ts
@@ -4,18 +4,18 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="199"/>
-        <source>choice</source>
+        <location filename="mainwindow.cpp" line="72"/>
+        <source>first button file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="72"/>
-        <source>first button file</source>
+        <source>Enter the URL to download the first buttons file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="72"/>
-        <source>Enter the URL to download the first buttons</source>
+        <location filename="mainwindow.cpp" line="199"/>
+        <source>choice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -43,290 +43,293 @@
     <message>
         <location filename="mainwindow.cpp" line="240"/>
         <source>Enter ID of button to edit</source>
-        <oldsource>Entrez l&apos;ID du bouton à éditez</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="253"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>&amp;Start</source>
-        <oldsource>&amp;Start...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>&amp;Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>&amp;DownloadUi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+W</source>
         <comment>File|Downlad</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="261"/>
         <source>sendRAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="261"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="262"/>
         <source>Reset Ui</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="262"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="263"/>
         <source>Reset RAW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="270"/>
-        <location filename="mainwindow.cpp" line="411"/>
-        <source>New entry</source>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
-        <source>label</source>
-        <comment>Title of box where ask for new button&apos;s label</comment>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>Ctrl+Q</source>
+        <comment>File|Quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
-        <source>Enter his label</source>
-        <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
+        <location filename="mainwindow.cpp" line="268"/>
+        <source>A&amp;dd buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
-        <source>keyword</source>
-        <comment>Title of box where ask for new button&apos;s keyword</comment>
+        <location filename="mainwindow.cpp" line="268"/>
+        <source>Ctrl+D</source>
+        <comment>Buttons|Add</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
-        <source>Enter they keyword (no limit !)</source>
+        <location filename="mainwindow.cpp" line="269"/>
+        <source>Sa&amp;v buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
-        <source>action</source>
-        <comment>Title of box where ask for new button&apos;s action</comment>
+        <location filename="mainwindow.cpp" line="269"/>
+        <source>Ctrl+V</source>
+        <comment>Buttons|Save</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
-        <source>Enter his action</source>
+        <location filename="mainwindow.cpp" line="270"/>
+        <source>&amp;Edit buttons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="471"/>
-        <source>askkeyword</source>
-        <comment>Title of box where ask for keyword to getbuttons</comment>
+        <location filename="mainwindow.cpp" line="270"/>
+        <source>Ctrl+E</source>
+        <comment>Buttons|&amp;Edit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="471"/>
-        <source>Enter the keyword : </source>
+        <location filename="mainwindow.cpp" line="271"/>
+        <source>&amp;View/Hide menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="492"/>
-        <source>keyword</source>
-        <comment>Title of box where ask for button&apos;s keyword</comment>
+        <location filename="mainwindow.cpp" line="271"/>
+        <source>Ctrl+T</source>
+        <comment>Buttons|View menu</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="492"/>
-        <source>new keyword</source>
-        <comment>question to get new button&apos;s keyword</comment>
+        <location filename="mainwindow.cpp" line="274"/>
+        <location filename="mainwindow.cpp" line="415"/>
+        <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>label</source>
-        <comment>Title of box where ask for button&apos;s label</comment>
+        <location filename="mainwindow.cpp" line="275"/>
+        <source>getButtons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
-        <source>new label</source>
-        <comment>question to get new button&apos;s label</comment>
+        <location filename="mainwindow.cpp" line="276"/>
+        <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>action</source>
-        <comment>Title of box where ask for button&apos;s action</comment>
+        <location filename="mainwindow.cpp" line="276"/>
+        <source>ctrl+H</source>
+        <comment>Help|About Qt</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
-        <source>new action</source>
-        <comment>question to get new button&apos;s action</comment>
+        <location filename="mainwindow.cpp" line="277"/>
+        <source>C&amp;reate Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="540"/>
-        <source>RAWsent</source>
-        <comment>message title when data has been send</comment>
+        <location filename="mainwindow.cpp" line="277"/>
+        <source>Ctrl+R</source>
+        <comment>Help|CreateDB</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="540"/>
-        <source>sendRAW finish</source>
-        <comment>message text when data has been send</comment>
+        <location filename="mainwindow.cpp" line="437"/>
+        <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="623"/>
-        <source>Upload finish : </source>
-        <comment>pop-up when data has been sent</comment>
+        <location filename="mainwindow.cpp" line="437"/>
+        <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="627"/>
-        <source>uploadDB</source>
-        <comment>pop-up title when data has been sent</comment>
+        <location filename="mainwindow.cpp" line="439"/>
+        <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="674"/>
-        <source>Uisent</source>
-        <comment>pop-up title when buttons has been sent</comment>
+        <location filename="mainwindow.cpp" line="439"/>
+        <source>Enter they keyword (no limit !)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
-        <source>savbuttons finish</source>
-        <comment>pop-up text when buttons has been sent</comment>
+        <location filename="mainwindow.cpp" line="441"/>
+        <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="680"/>
-        <source>Enter the keyword : </source>
-        <comment>ask keyword to get buttons</comment>
+        <location filename="mainwindow.cpp" line="441"/>
+        <source>Enter his action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="260"/>
-        <source>Ctrl+Q</source>
-        <comment>File|Quit</comment>
+        <location filename="mainwindow.cpp" line="475"/>
+        <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="260"/>
-        <source>&amp;Quit</source>
+        <location filename="mainwindow.cpp" line="475"/>
+        <source>chooseButtonDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
-        <source>A&amp;dd buttons</source>
+        <location filename="mainwindow.cpp" line="475"/>
+        <source>Enter the keyword : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="264"/>
-        <source>Ctrl+D</source>
-        <comment>Buttons|Add</comment>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="265"/>
-        <source>Sa&amp;v buttons</source>
+        <location filename="mainwindow.cpp" line="496"/>
+        <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="265"/>
-        <source>Ctrl+V</source>
-        <comment>Buttons|Save</comment>
+        <location filename="mainwindow.cpp" line="498"/>
+        <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="266"/>
-        <source>&amp;Edit buttons</source>
+        <location filename="mainwindow.cpp" line="498"/>
+        <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="266"/>
-        <source>Ctrl+E</source>
-        <comment>Buttons|&amp;Edit</comment>
+        <location filename="mainwindow.cpp" line="500"/>
+        <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="267"/>
-        <source>&amp;View/Hide menu</source>
+        <location filename="mainwindow.cpp" line="500"/>
+        <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="267"/>
-        <source>Ctrl+T</source>
-        <comment>Buttons|View menu</comment>
+        <location filename="mainwindow.cpp" line="544"/>
+        <source>RAWsent</source>
+        <comment>message title when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
-        <location filename="mainwindow.cpp" line="680"/>
-        <source>getButtons</source>
+        <location filename="mainwindow.cpp" line="544"/>
+        <source>sendRAW finish</source>
+        <comment>message text when data has been send</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
-        <source>About Qt</source>
+        <location filename="mainwindow.cpp" line="627"/>
+        <source>Upload finish : </source>
+        <comment>pop-up when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="272"/>
-        <source>ctrl+H</source>
-        <comment>Help|About Qt</comment>
+        <location filename="mainwindow.cpp" line="631"/>
+        <source>uploadDB</source>
+        <comment>pop-up title when data has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="273"/>
-        <source>C&amp;reate Database</source>
+        <location filename="mainwindow.cpp" line="678"/>
+        <source>Uisent</source>
+        <comment>pop-up title when buttons has been sent</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="273"/>
-        <source>Ctrl+R</source>
-        <comment>Help|CreateDB</comment>
+        <location filename="mainwindow.cpp" line="678"/>
+        <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="471"/>
-        <source>chooseButtonDB</source>
+        <location filename="mainwindow.cpp" line="684"/>
+        <source>Enter the keyword : </source>
+        <comment>ask keyword to get buttons</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="684"/>
+        <source>getButtons</source>
+        <comment>title to ask keyword fot getbuttons</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts
index 8b0c57512a24ac8f45330dcabeec0ff3e1c871ab..55638e6088ac729ce08e01a099ff481574147323 100644 (file)
--- a/diary-mobile_fr_FR.ts
+++ b/diary-mobile_fr_FR.ts
@@ -3,339 +3,339 @@
 <TS version="2.0" language="fr_FR">
 <context>
     <name>MainWindow</name>
-    <message>
-        <source>fichier initial</source>
-        <translation type="obsolete">fichier initial</translation>
-    </message>
-    <message utf8="true">
-        <source>Entrez l&apos;adresse du serveur où télécharger les premier boutons</source>
-        <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>
+        <translation>Premier fichier de bouton</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="72"/>
-        <source>Enter the URL to download the first buttons</source>
-        <translation type="unfinished"></translation>
+        <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"/>
+        <source>choice</source>
+        <translation>Choix</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="199"/>
         <source>Please choose an action.</source>
-        <translation type="unfinished"></translation>
+        <translation>choisissez une action</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="210"/>
         <source>get file</source>
         <comment>title to ask file</comment>
-        <translation type="unfinished"></translation>
+        <translation>choisissez un fichier</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="214"/>
         <source>box</source>
         <comment>box title to show a text</comment>
-        <translation type="unfinished"></translation>
+        <translation>info</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="229"/>
         <source>set</source>
-        <translation type="unfinished"></translation>
+        <translation>définir</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="240"/>
         <source>Enter ID of button to edit</source>
-        <oldsource>Entrez l&apos;ID du bouton à éditez</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>Entrez l&apos;ID du bouton à éditer</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="253"/>
+        <location filename="mainwindow.cpp" line="257"/>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>&amp;Start</source>
-        <oldsource>&amp;Start...</oldsource>
-        <translation type="unfinished"></translation>
+        <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="254"/>
+        <location filename="mainwindow.cpp" line="258"/>
         <source>Ctrl+S</source>
         <comment>File|Start</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>&amp;Back</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="255"/>
+        <location filename="mainwindow.cpp" line="259"/>
         <source>Ctrl+B</source>
         <comment>File|Back</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>&amp;DownloadUi</source>
-        <translation type="unfinished"></translation>
+        <translation>TéléchargementUi</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="256"/>
+        <location filename="mainwindow.cpp" line="260"/>
         <source>Ctrl+W</source>
         <comment>File|Downlad</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="261"/>
         <source>sendRAW</source>
-        <translation type="unfinished"></translation>
+        <translation>envoyerRAW</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="257"/>
+        <location filename="mainwindow.cpp" line="261"/>
         <source>Ctrl+L</source>
         <comment>File|Upload</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="262"/>
         <source>Reset Ui</source>
-        <translation type="unfinished"></translation>
+        <translation>Réinitialiser Ui</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="258"/>
+        <location filename="mainwindow.cpp" line="262"/>
         <source>Ctrl+Z</source>
         <comment>File|ResetUi</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="259"/>
+        <location filename="mainwindow.cpp" line="263"/>
         <source>Reset RAW</source>
-        <translation type="unfinished"></translation>
+        <translation>Réinitialiser RAW</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="264"/>
+        <source>Ctrl+Q</source>
+        <comment>File|Quit</comment>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="268"/>
+        <source>A&amp;dd buttons</source>
+        <translation>A&amp;joutez un boutons</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="268"/>
+        <source>Ctrl+D</source>
+        <comment>Buttons|Add</comment>
+        <translation>Ctrl+J</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="269"/>
+        <source>Sa&amp;v buttons</source>
+        <translation>Sauvez les bouttons</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="269"/>
+        <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="411"/>
+        <source>&amp;Edit buttons</source>
+        <translation>&amp;Editer les boutons</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="270"/>
+        <source>Ctrl+E</source>
+        <comment>Buttons|&amp;Edit</comment>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="271"/>
+        <source>&amp;View/Hide menu</source>
+        <translation>Voir/Cacher le menu</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="271"/>
+        <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"/>
         <source>New entry</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouvelle entré</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
+        <location filename="mainwindow.cpp" line="275"/>
+        <source>getButtons</source>
+        <translation>getButtons</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="276"/>
+        <source>About Qt</source>
+        <translation>A propos de Qt</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="276"/>
+        <source>ctrl+H</source>
+        <comment>Help|About Qt</comment>
+        <translation>Ctrl+A</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="277"/>
+        <source>C&amp;reate Database</source>
+        <translation>C&amp;réer une base de donné</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="277"/>
+        <source>Ctrl+R</source>
+        <comment>Help|CreateDB</comment>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="437"/>
         <source>label</source>
         <comment>Title of box where ask for new button&apos;s label</comment>
-        <translation type="unfinished"></translation>
+        <translation>Etiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="433"/>
+        <location filename="mainwindow.cpp" line="437"/>
         <source>Enter his label</source>
         <comment>his/her/?they? I&apos;ve forget my school lesson</comment>
-        <translation type="unfinished"></translation>
+        <translation>Entrez son étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
+        <location filename="mainwindow.cpp" line="439"/>
         <source>keyword</source>
         <comment>Title of box where ask for new button&apos;s keyword</comment>
-        <translation type="unfinished"></translation>
+        <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="435"/>
+        <location filename="mainwindow.cpp" line="439"/>
         <source>Enter they keyword (no limit !)</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez les mots clé (no limit !)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="441"/>
         <source>action</source>
         <comment>Title of box where ask for new button&apos;s action</comment>
-        <translation type="unfinished"></translation>
+        <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="441"/>
         <source>Enter his action</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez son action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="471"/>
+        <location filename="mainwindow.cpp" line="475"/>
         <source>askkeyword</source>
         <comment>Title of box where ask for keyword to getbuttons</comment>
-        <translation type="unfinished"></translation>
+        <translation>mot-clé ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="471"/>
+        <location filename="mainwindow.cpp" line="475"/>
+        <source>chooseButtonDB</source>
+        <translation>chooseButtonDB</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="475"/>
         <source>Enter the keyword : </source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="492"/>
+        <location filename="mainwindow.cpp" line="496"/>
         <source>keyword</source>
         <comment>Title of box where ask for button&apos;s keyword</comment>
-        <translation type="unfinished"></translation>
+        <translation>mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="492"/>
+        <location filename="mainwindow.cpp" line="496"/>
         <source>new keyword</source>
         <comment>question to get new button&apos;s keyword</comment>
-        <translation type="unfinished"></translation>
+        <translation>nouveau mot-clé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
+        <location filename="mainwindow.cpp" line="498"/>
         <source>label</source>
         <comment>Title of box where ask for button&apos;s label</comment>
-        <translation type="unfinished"></translation>
+        <translation>étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="494"/>
+        <location filename="mainwindow.cpp" line="498"/>
         <source>new label</source>
         <comment>question to get new button&apos;s label</comment>
-        <translation type="unfinished"></translation>
+        <translation>nouvel étiquette</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="500"/>
         <source>action</source>
         <comment>Title of box where ask for button&apos;s action</comment>
-        <translation type="unfinished"></translation>
+        <translation>action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="496"/>
+        <location filename="mainwindow.cpp" line="500"/>
         <source>new action</source>
         <comment>question to get new button&apos;s action</comment>
-        <translation type="unfinished"></translation>
+        <translation>nouvelle action</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="540"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>RAWsent</source>
         <comment>message title when data has been send</comment>
-        <translation type="unfinished"></translation>
+        <translation>RAWsent</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="540"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>sendRAW finish</source>
         <comment>message text when data has been send</comment>
-        <translation type="unfinished"></translation>
+        <translation>données envoyées</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="623"/>
+        <location filename="mainwindow.cpp" line="627"/>
         <source>Upload finish : </source>
         <comment>pop-up when data has been sent</comment>
-        <translation type="unfinished"></translation>
+        <translation>Upload finit : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="631"/>
         <source>uploadDB</source>
         <comment>pop-up title when data has been sent</comment>
-        <translation type="unfinished"></translation>
+        <translation>uploadDB</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="678"/>
         <source>Uisent</source>
         <comment>pop-up title when buttons has been sent</comment>
-        <translation type="unfinished"></translation>
+        <translation>Envoyé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="674"/>
+        <location filename="mainwindow.cpp" line="678"/>
         <source>savbuttons finish</source>
         <comment>pop-up text when buttons has been sent</comment>
-        <translation type="unfinished"></translation>
+        <translation>boutons sauvegardés sur le serveur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="684"/>
         <source>Enter the keyword : </source>
         <comment>ask keyword to get buttons</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <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="260"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="264"/>
-        <source>A&amp;dd buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="265"/>
-        <source>Sa&amp;v buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="266"/>
-        <source>&amp;Edit buttons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <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="267"/>
-        <source>&amp;View/Hide menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="267"/>
-        <source>Ctrl+T</source>
-        <comment>Buttons|View menu</comment>
-        <translation type="unfinished"></translation>
+        <translation>Entrez le mot-clé : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="271"/>
-        <location filename="mainwindow.cpp" line="680"/>
+        <location filename="mainwindow.cpp" line="684"/>
         <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>
+        <comment>title to ask keyword fot getbuttons</comment>
+        <translation>getBoutons</translation>
     </message>
 </context>
 </TS>

diff --git a/main.cpp b/main.cpp
index 68af5eeb1c3fb89baba7c8f7a44d73ae986c2b62..71d04de6b80372f0558d2b61aa1609881e044404 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -31,8 +31,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)
+    qDebug()<<"local="<<locale;
     QTranslator translator;
-    translator.load(QString("diary-mobile_") + 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 c4c5602d4b818d43f2e96b42532f52467302370d..015b88b12a7aa93201464a53fdd6b3024eaa4f06 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -45,20 +45,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     if(conf->allKeys().size()==0){
         qDebug()<<"first";
         firstrun();
+        download(QString("http://www.nothing2do.eu/diary-mobile_")+ QLocale::system().name()+ QString(".qm"));
+        connect(m, SIGNAL(downloaded()), SLOT(writeTr()));
         conf->setValue(QString("first"), 1);
     };
     screen=new QWidget(this);
     screen->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-    /*scroll=new QScrollArea(screen);
-    scroll->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-    scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll->setWidgetResizable(0);*/
     grid=new QGridLayout(screen);
-    //scroll->show();
     grid->setSizeConstraint(QLayout::SetMinAndMaxSize);
-    /*ks=new QsKineticScroller(scroll);
-    ks->enableKineticScrollFor(scroll);*/
     signalmap=new QSignalMapper(this);
     connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
     connect(this, SIGNAL(datafilled()), this, SLOT(start()));
@@ -69,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     screen->show();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
-        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());
+        QString ser=QInputDialog::getText(this, trUtf8("first button file"), trUtf8("Enter the URL to download the first buttons file"), QLineEdit::Normal, conf->value(QString("download")).toString());
         if(ser!="")conf->setValue(QString("download"), ser);
         createDB();
         downloadUi();
@@ -677,7 +671,7 @@ void MainWindow::resetRAW(){
     exec(QList<QString>({"delete from raw;"}));
 }
 void MainWindow::getButtons(){
-    const QString a=QInputDialog::getText(this, trUtf8("getButtons"), trUtf8("Enter the keyword : ", "ask keyword to get buttons"));
+    const QString a=QInputDialog::getText(this, trUtf8("getButtons", "title to ask keyword fot getbuttons"), trUtf8("Enter the keyword : ", "ask keyword to get buttons"));
     getButtons(a);
 }
 void MainWindow::insertButton(const QString & keyword, const QString & label, const QString & action){
@@ -720,3 +714,11 @@ void MainWindow::removeButton(const QString & keyword, const QString & label, co
         exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), key, label, action, id}));
     }
 }
+void MainWindow::writeTr(){
+    QString a="diary-mobile_" + QLocale::system().name();
+    qDebug()<<"a="<<a;
+    QFile file(a);
+    file.open(QIODevice::WriteOnly);
+    file.write(m->downloadedData());
+
+}

diff --git a/mainwindow.h b/mainwindow.h
index 66eabc82021c2ff978eca373858776dc470d92a8..84536b24b2db22092b9aab8d5ca53ac40d882e29 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -154,6 +154,7 @@ private slots:
     void getButtons();
     void downloadUi();
     void writeUi();
+    void writeTr();
     void sendRAW();
     void RAWsent();
     void Uisent();