From 971aa7ce38d909ce3a0e631f21228fc38b285711 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Tue, 10 Jun 2014 13:48:46 +0200 Subject: [PATCH] mistake, again ... --- diary-mobile_en_EN.ts | 296 +++++++++++++++++++++++----------------- diary-mobile_fr_FR.ts | 311 +++++++++++++++++++++++++++++------------- mainwindow.cpp | 6 +- 3 files changed, 388 insertions(+), 225 deletions(-) diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts index d9783a4..d2b3237 100644 --- a/diary-mobile_en_EN.ts +++ b/diary-mobile_en_EN.ts @@ -14,180 +14,153 @@ - + get file title to ask file - + box box title to show a text - + set - + Enter ID of button to edit - - &File - - - - - &Start - - - - + Ctrl+S File|Start - - &Back - - - - + Ctrl+B File|Back - - sendRAW - - - - + Ctrl+L File|Upload - - Reset RAW - Reset Ui - - - - - &Quit - - - - + Ctrl+Q File|Quit - - &Buttons + + Ctrl+D + Buttons|Add - - Ctrl+D + + A&dd Buttons|Add - + Ctrl+V Buttons|Save - - Ctrl+E - Buttons|&Edit + + Sa&v + Buttons|Sav - - &View/Hide menu + + Reset + Buttons|Reset - - New entry + Ctrl+E + Buttons|&Edit - - getButtons + + New entry - - About Qt + + ctrl+H + Help|About Qt - - ctrl+H - Help|About Qt + + Ctrl+R + Help|CreateDB - + C&reate Database + Hack|Create - - Ctrl+R - Help|CreateDB + + Download sql + Hack|download sql - + 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 - + Ctrl+T File|View menu @@ -220,13 +193,13 @@ - + value of - + Variable's name ? text to ask value's name before changing it (setint) @@ -255,224 +228,291 @@ - + variable file change title to warn about variable content change - + Error title if action("edit") has too much value - + Too much value in button's action text if action("edit") has too much value - + URL title to download a custom file from URL - + Enter the URL of the file label to download a custom file - - + + File title to write a file downloaded from URL - - + + Enter the name of the file label to write the downloaded data - + Error title of box if action("read" has too much (or too "less") value - + Bad number of value text of box if action("read") has too much (or too "less") value - - &Download + + &File + top menu - - Ctrl+W - Buttons|Downlad + + &Start + File|Start - - A&dd + + &Back + File|Back - - Sa&v + + &View/Hide menu + File|View/Hide - - Reset + + sendRAW + File|SendRAW + + + + + Reset RAW + File|resetRAW + + + + + Ctrl+E + File|Reset + + + + + &Quit + File|Quit + + + + + &Buttons + top menu - Ctrl+Z - Buttons|Reset + &Download + Buttons|Downlad - + &Edit + Buttons|Edit - + &Hack + top menu + + + + + New entry + Hack|Entry - Download sql + Action + Hack|Action - + + About Qt + Hack|About Qt + + + + + tmp URL + Title of box where ask for button file's URL + + + + + Enter URL + Label of box where ask for button file's URL + + + + + action + Title of box where ask for a custom action + + + + + Enter your action + Label of box where ask for custom action + + + + + Ctrl+W + Buttons|Downlad + + + + + Ctrl+Z + Buttons|Reset + + + + 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 - + writeFile pop-up title when file has been written - + File written : - - - tmp URL - Title of box where ask for button tmp's URL - - - - - Enter URL - Label of box where ask for button tmp's URL - - diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts index 90db3d2..796f33c 100644 --- a/diary-mobile_fr_FR.ts +++ b/diary-mobile_fr_FR.ts @@ -22,77 +22,108 @@ 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 - &File - &Fichier + &Fichier - &Start - &Départ + &Départ - + Ctrl+S File|Start Ctrl+D - &Back - &Retour + &Retour - + Ctrl+B File|Back Ctrl+R + + + &View/Hide menu + File|View/Hide + Voir/Cacher le menu + + + + sendRAW + File|SendRAW + Envoyer les données + + + + Reset RAW + File|resetRAW + Réinitialiser les donnés + + + + Ctrl+E + File|Reset + Ctrl+E + + &Quit + File|Quit + &Quitter + + + + &Buttons + top menu + Boutons + + + Ctrl+W Buttons|Downlad Ctrl+D - sendRAW - Envoyer les données + Envoyer les données - + Ctrl+L File|Upload Ctrl+L - Reset RAW Reset Ui - Réinitialiser les donnés + Réinitialiser les donnés Ctrl+Z @@ -100,27 +131,25 @@ Ctrl+Z - &Quit - &Quitter + &Quitter - + Ctrl+Q File|Quit Ctrl+Q - &Buttons - Boutons + Boutons A&dd buttons A&jouter un boutons - + Ctrl+D Buttons|Add Ctrl+D @@ -130,7 +159,7 @@ Sauvegardez les boutons - + Ctrl+V Buttons|Save Ctrl+V @@ -140,15 +169,14 @@ &Editer les boutons - + Ctrl+E Buttons|&Edit Ctrl+E - &View/Hide menu - Voir/Cacher le menu + Voir/Cacher le menu @@ -178,13 +206,13 @@ - + value of Valeur de - + Variable's name ? text to ask value's name before changing it (setint) Nom de la variable ? @@ -213,135 +241,239 @@ Choisissez une action - + variable file change title to warn about variable content change changement de valeur - + Error title if action("edit") has too much value Erreur - + Too much value in button's action text if action("edit") has too much value Trop de mots dans l'action du bouton - + URL title to download a custom file from URL Source - + Enter the URL of the file label to download a custom file Entrez l'URL des données - - + + File title to write a file downloaded from URL Fichier - - + + Enter the name of the file label to write the downloaded data Entrez le nom du fichier - + Error title of box if action("read" has too much (or too "less") value Erreur - + Bad number of value text of box if action("read") has too much (or too "less") value Mauvais "nombre" de mot + &File + top menu + &Fichier + + + + &Start + File|Start + &Départ + + + + &Back + File|Back + &Retour + + + Ctrl+T File|View menu - Ctrl+C + Ctrl+M + + + + &Download + Buttons|Downlad + &Téléchargement + + + + A&dd + Buttons|Add + Nouveau + + + + Sa&v + Buttons|Sav + Sauvegardez + + + + Reset + Buttons|Reset + Remise à zéro + + + + &Edit + Buttons|Edit + Editer + + + + &Hack + top menu + &Hack + + + + New entry + Hack|Entry + Nouvelle entrée + + + + Action + Hack|Action + Action + + + + About Qt + Hack|About Qt + A propos de Qt + + + + tmp URL + Title of box where ask for button file's URL + URL temporaire + + + + Enter URL + Label of box where ask for button file's URL + Entrez l'URL + + + + action + Title of box where ask for a custom action + action + + + + Enter your action + Label of box where ask for custom action + Entrez votre action &Help Aide - - + New entry Nouvelle entrée - getButtons - getButtons + getButtons - About Qt - A propos de Qt + A propos de Qt - + ctrl+H Help|About Qt Ctrl+A - C&reate Database - C&réer une base de donné + C&réer une base de donné - + Ctrl+R Help|CreateDB Ctrl+R - + + C&reate Database + Hack|Create + C&réer une base de donné + + + + Download sql + Hack|download sql + Télécharger un fichier sql + + + 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 @@ -351,162 +483,153 @@ 0 (non) ou 1 (oui)? - &Download - &Téléchargement + &Téléchargement - A&dd - Nouveau + Nouveau - Sa&v - Sauvegardez + Sauvegardez - Reset - Remise à zéro + Remise à zéro - + Ctrl+Z Buttons|Reset Ctrl+Z - &Edit - Editez + Editez - &Hack - Bidouille + Bidouille - Download sql - Télécharger un fichier sql + Télécharger un fichier sql - + 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 - + writeFile pop-up title when file has been written fichier - + File written : Fichier écrit : - tmp URL Title of box where ask for button tmp's URL - tmp URL + tmp URL - Enter URL Label of box where ask for button tmp's URL - Entrez l'URL + Entrez l'URL diff --git a/mainwindow.cpp b/mainwindow.cpp index 30f74c9..5feb3b9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -452,7 +452,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("menu"), QVariant(0)); conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql+")); conf->setValue(QString("userftp"), QVariant("")); - conf->setValue(QString("hostftp"), QVariant("setValue(QString("hostftp"), QVariant("")); conf->setValue(QString("passftp"), QVariant("")); conf->setValue(QString("start"), QVariant("begin")); conf->setValue(QString("restore"), QVariant("http://www.abc.de/db")); @@ -470,7 +470,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("deletebutton"), QVariant("delete from ui where id=?")); conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;")); conf->setValue(QString("volumdown"), QVariant("back")); - conf->setValue(QString("volumup"), QVariant("Montpellier")); + conf->setValue(QString("volumup"), QVariant("begin")); conf->setValue(QString("askkeyword"), QVariant(0)); conf->setValue(QString("saychange"), QVariant(0)); conf->setValue(QString("sepcmd"), QVariant("!@!")); @@ -934,5 +934,5 @@ void MainWindow::send(const QString & a){ void MainWindow::action(){ bool ok; QString cmd=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for a custom action"), trUtf8("Enter your action", "Label of box where ask for custom action"), QLineEdit::Normal, QString(""), &ok); - if(!ok)action(cmd); + if(ok)action(cmd); } -- 2.45.1