From: Norbert Moutarde Date: Wed, 4 Jun 2014 13:51:08 +0000 (+0200) Subject: update translation X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=33980f2294b4fe9e3eda939549d2049c50e8f880;p=diary-mobile.git update translation --- diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts index d791e25..0e1549b 100644 --- a/diary-mobile_en_EN.ts +++ b/diary-mobile_en_EN.ts @@ -14,34 +14,34 @@ - + choice - + Please choose an action. - + get file title to ask file - + box box title to show a text - + set - + Enter ID of button to edit @@ -72,17 +72,6 @@ File|Back - - - &DownloadUi - - - - - Ctrl+W - File|Downlad - - sendRAW @@ -96,52 +85,32 @@ - Reset Ui - - - - - Ctrl+Z - File|ResetUi - - - - Reset RAW + Reset Ui - + &Quit - + Ctrl+Q File|Quit - + &Buttons - - - A&dd buttons - - Ctrl+D Buttons|Add - - - Sa&v buttons - - Ctrl+V @@ -149,27 +118,16 @@ - - &Edit buttons - - - - + Ctrl+E Buttons|&Edit - + &View/Hide menu - - - Ctrl+T - Buttons|View menu - - &Help @@ -177,7 +135,7 @@ - + New entry @@ -209,135 +167,172 @@ - + label Title of box where ask for new button's label - + Enter his label his/her/?they? I've forget my school lesson - + keyword Title of box where ask for new button's keyword - + Enter they keyword (no limit !) - + action Title of box where ask for new button's action - + Enter his action - - askkeyword - Title of box where ask for keyword to getbuttons + + Ctrl+T + File|View menu + + + + + &Download + + + + + Ctrl+W + Buttons|Downlad + + + + + A&dd + + + + + Sa&v + + + + + Reset + + + + + Ctrl+Z + Buttons|Reset - + + &Edit + + + + chooseButtonDB - + Enter the keyword : - + keyword Title of box where ask for button's keyword - + new keyword question to get new button's keyword - + label Title of box where ask for button's label - + new label question to get new button's label - + action Title of box where ask for button's action - + new action question to get new button's action - + RAWsent message title when data has been send - + sendRAW finish message text when data has been send - + Upload finish : pop-up when data has been sent - + uploadDB pop-up title when data has been sent - + Uisent pop-up title when buttons has been sent - + savbuttons finish pop-up text when buttons has been sent - + Enter the keyword : ask keyword to get buttons - + getButtons title to ask keyword fot getbuttons diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts index 141dc8a..31df93d 100644 --- a/diary-mobile_fr_FR.ts +++ b/diary-mobile_fr_FR.ts @@ -14,34 +14,34 @@ Entrez l'URL pour télécharger vos boutons - + choice Choix - + Please choose an action. choisissez une action - + get file title to ask file choisissez un fichier - + box box title to show a text info - + set définir - + Enter ID of button to edit Entrez l'ID du bouton à éditer @@ -55,11 +55,6 @@ &Start &Départ - - Ctrl+S - Fichier|Départ - Ctrl+D - Ctrl+S @@ -78,14 +73,8 @@ Ctrl+R - - &DownloadUi - Téléchargement des boutons - - - Ctrl+W - File|Downlad + Buttons|Downlad Ctrl+D @@ -101,38 +90,32 @@ - Reset Ui - Réinitialiser les boutons + Reset RAW + Reset Ui + Réinitialiser les boutons - Ctrl+Z - File|ResetUi + Buttons|ResetUi Ctrl+Z - Reset RAW - Réinitialiser les données - - - &Quit &Quitter - + Ctrl+Q File|Quit Ctrl+Q - + &Buttons Boutons - A&dd buttons A&jouter un boutons @@ -143,9 +126,8 @@ Ctrl+J - Sa&v buttons - Sauvez les boutons + Sauvegardez les boutons @@ -154,25 +136,23 @@ Ctrl+V - &Edit buttons - &Editer les boutons + &Editer les boutons - + Ctrl+E Buttons|&Edit Ctrl+E - + &View/Hide menu Voir/Cacher le menu - Ctrl+T - Buttons|View menu + File|View menu Ctrl+C @@ -182,7 +162,7 @@ - + New entry Nouvelle entré @@ -214,135 +194,177 @@ Ctrl+R - + label Title of box where ask for new button's label Etiquette - + Enter his label his/her/?they? I've forget my school lesson Entrez son étiquette - + keyword Title of box where ask for new button's keyword mot-clé - + Enter they keyword (no limit !) Entrez les mots clé (no limit !) - + action Title of box where ask for new button's action action - + Enter his action Entrez son action - askkeyword Title of box where ask for keyword to getbuttons - mot-clé ? + mot-clé ? - + + Ctrl+T + File|View menu + Ctrl+C + + + + &Download + + + + + Ctrl+W + Buttons|Downlad + Ctrl+D + + + + A&dd + + + + + Sa&v + + + + + Reset + + + + + Ctrl+Z + Buttons|Reset + Ctrl+Z + + + + &Edit + + + + chooseButtonDB chooseButtonDB - + Enter the keyword : Entrez le mot-clé : - + keyword Title of box where ask for button's keyword mot-clé - + new keyword question to get new button's keyword nouveau mot-clé - + label Title of box where ask for button's label étiquette - + new label question to get new button's label nouvel étiquette - + action Title of box where ask for button's action action - + new action question to get new button's action nouvelle action - + RAWsent message title when data has been send RAWsent - + sendRAW finish message text when data has been send données envoyées - + Upload finish : pop-up when data has been sent Upload finit : - + uploadDB pop-up title when data has been sent uploadDB - + Uisent pop-up title when buttons has been sent Envoyé - + savbuttons finish pop-up text when buttons has been sent boutons sauvegardés sur le serveur - + Enter the keyword : ask keyword to get buttons Entrez le mot-clé : - + getButtons title to ask keyword fot getbuttons getBoutons diff --git a/mainwindow.cpp b/mainwindow.cpp index 503191e..f0fb0d4 100644 --- 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("< 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="<downloadedData()); - + file.close(); }