From 7568766b421464f1a7c7cce4f25ff5d0c0326500 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Sun, 1 Jun 2014 20:10:41 +0200 Subject: [PATCH] french translation is finished --- diary-mobile_en_EN.ts | 130 ++++++++++++++++++++------------------ diary-mobile_fr_FR.ts | 144 ++++++++++++++++++++++-------------------- mainwindow.cpp | 10 +-- 3 files changed, 152 insertions(+), 132 deletions(-) diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts index 5314bfd..d791e25 100644 --- a/diary-mobile_en_EN.ts +++ b/diary-mobile_en_EN.ts @@ -4,330 +4,340 @@ MainWindow - + first button file - + Enter the URL to download the first buttons file - + 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 - + &File - + &Start - + Ctrl+S File|Start - + &Back - + Ctrl+B File|Back - + &DownloadUi - + Ctrl+W File|Downlad - + sendRAW - + Ctrl+L File|Upload - + Reset Ui - + Ctrl+Z File|ResetUi - + Reset RAW - + &Quit - + Ctrl+Q File|Quit - + + &Buttons + + + + A&dd buttons - + Ctrl+D Buttons|Add - + Sa&v buttons - + Ctrl+V Buttons|Save - + &Edit buttons - + Ctrl+E Buttons|&Edit - + &View/Hide menu - + Ctrl+T Buttons|View menu - - + + &Help + + + + + New entry - + getButtons - + About Qt - + ctrl+H Help|About Qt - + C&reate Database - + Ctrl+R Help|CreateDB - + 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 - + 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 55638e6..141dc8a 100644 --- a/diary-mobile_fr_FR.ts +++ b/diary-mobile_fr_FR.ts @@ -4,54 +4,54 @@ MainWindow - + first button file Premier fichier de bouton - + Enter the URL to download the first buttons file 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 - + &File &Fichier - + &Start &Départ @@ -61,278 +61,288 @@ Ctrl+D - + Ctrl+S File|Start - Ctrl+D + Ctrl+D - + &Back &Retour - + Ctrl+B File|Back Ctrl+R - + &DownloadUi - TéléchargementUi + Téléchargement des boutons - + Ctrl+W File|Downlad Ctrl+D - + sendRAW - envoyerRAW + Envoyer les données - + Ctrl+L File|Upload Ctrl+L - + Reset Ui - Réinitialiser Ui + Réinitialiser les boutons - + Ctrl+Z File|ResetUi Ctrl+Z - + Reset RAW - Réinitialiser RAW + Réinitialiser les données - + &Quit &Quitter - + Ctrl+Q File|Quit Ctrl+Q - + + &Buttons + Boutons + + + A&dd buttons - A&joutez un boutons + A&jouter un boutons - + Ctrl+D Buttons|Add Ctrl+J - + Sa&v buttons - Sauvez les bouttons + Sauvez les boutons - + Ctrl+V Buttons|Save Ctrl+V - + &Edit buttons &Editer les boutons - + Ctrl+E Buttons|&Edit Ctrl+E - + &View/Hide menu Voir/Cacher le menu - + Ctrl+T Buttons|View menu Ctrl+C - - + + &Help + Aide + + + + New entry Nouvelle entré - + getButtons getButtons - + About Qt A propos de Qt - + ctrl+H Help|About Qt Ctrl+A - + C&reate Database C&réer une base de donné - + Ctrl+R Help|CreateDB 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é ? - + 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 015b88b..d324244 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -253,14 +253,13 @@ void MainWindow::createMenuBar(){ 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(QString("&Buttons")); + 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"))); menuBar()->addMenu(EditMenu); - HelpMenu=new QMenu(QString("&Help")); + HelpMenu=new QMenu(trUtf8("&Help")); 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"))); @@ -462,9 +461,10 @@ void MainWindow::getButtons(const QString &b){ } void MainWindow::chooseButtonDB(){ QString a; - 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()); + bool ok=1; + if(conf->value("askkeyword").toBool())a=QInputDialog::getText(this, trUtf8("chooseButtonDB"), trUtf8("Enter the keyword : "), QLineEdit::Normal, label->text(), &ok); else a=label->text(); - chooseButtonDB(a); + if(ok)chooseButtonDB(a); } void MainWindow::chooseButtonDB(const QString & a){ flush(); -- 2.45.1