From 45c563086c68e462df111bd16ba5b6d3938c3310 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Fri, 13 Dec 2013 21:08:52 +0100 Subject: [PATCH] Changes after comments from Romolo --- companion/src/mainwindow.cpp | 6 +-- companion/src/translations/companion9x_cs.ts | 22 +++++------ companion/src/translations/companion9x_de.ts | 22 +++++------ companion/src/translations/companion9x_fr.ts | 30 +++++++-------- companion/src/translations/companion9x_he.ts | 30 +++++++-------- companion/src/translations/companion9x_it.ts | 22 +++++------ companion/src/translations/companion9x_pt.ts | 30 +++++++-------- companion/src/translations/companion9x_ru.ts | 30 +++++++-------- companion/src/translations/companion9x_sv.ts | 40 ++++++++++---------- 9 files changed, 116 insertions(+), 116 deletions(-) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 973199c2b..c2485e9c1 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -347,7 +347,7 @@ void MainWindow::reply1Accepted() int errnum=hline.mid(6).toInt(); switch(errnum) { case 1: - errormsg=tr("Firmware does not longer fit in program memory, due to selected firmware options"); + errormsg=tr("Firmware does not longer fit in the Tx, due to selected firmware options"); break; case 2: errormsg=tr("Compilation server temporary failure, try later"); @@ -387,7 +387,7 @@ void MainWindow::reply1Accepted() int errnum=hline.mid(6).toInt(); switch(errnum) { case 1: - errormsg=tr("Firmware does not fit in program memory, due to selected firmware options"); + errormsg=tr("Firmware does not fit in the Tx, due to selected firmware options"); break; case 2: errormsg=tr("Compilation server termporary failure, try later"); @@ -1076,7 +1076,7 @@ void MainWindow::burnExtenalToEEPROM() cd->exec(); if (!fileName.isEmpty()) { settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); - int ret = QMessageBox::question(this, "companion9x", tr("Load %1 to Models and Settings?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); + int ret = QMessageBox::question(this, "companion9x", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); if (ret != QMessageBox::Yes) return; if (!isValidEEPROM(fileName)) ret = QMessageBox::question(this, "companion9x", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); diff --git a/companion/src/translations/companion9x_cs.ts b/companion/src/translations/companion9x_cs.ts index 4626505b3..27fe89a3f 100644 --- a/companion/src/translations/companion9x_cs.ts +++ b/companion/src/translations/companion9x_cs.ts @@ -1599,16 +1599,6 @@ Chcete ji přesto naprogramovat? companion9x - Models and Settings Editor - %1 - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -1622,9 +1612,19 @@ Chcete ji přesto naprogramovat? Read Models and Settings From Tx + + + Firmware does not longer fit in the Tx, due to selected firmware options + + + + + Firmware does not fit in the Tx, due to selected firmware options + + - Load %1 to Models and Settings? + Write Models and settings from %1 to the Tx? diff --git a/companion/src/translations/companion9x_de.ts b/companion/src/translations/companion9x_de.ts index 31c92221a..61f03618b 100644 --- a/companion/src/translations/companion9x_de.ts +++ b/companion/src/translations/companion9x_de.ts @@ -1571,6 +1571,11 @@ Möchten Sie sie jetzt herunterladen? Display previous message again at startup ? + + + Firmware does not longer fit in the Tx, due to selected firmware options + + Compilation server temporary failure, try later @@ -1594,6 +1599,11 @@ Möchten Sie sie jetzt herunterladen? Unknown server failure, try later + + + Firmware does not fit in the Tx, due to selected firmware options + + Firmware %1 does not seem to have ever been downloaded. @@ -1756,16 +1766,6 @@ Trotzdem brennen? companion9x - Models and Settings Editor - %1 - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -1781,7 +1781,7 @@ Trotzdem brennen? - Load %1 to Models and Settings? + Write Models and settings from %1 to the Tx? diff --git a/companion/src/translations/companion9x_fr.ts b/companion/src/translations/companion9x_fr.ts index d1edc4a4f..134acd0f5 100644 --- a/companion/src/translations/companion9x_fr.ts +++ b/companion/src/translations/companion9x_fr.ts @@ -1626,6 +1626,21 @@ Burn anyway ? &Simulate &Simulation + + + Firmware does not longer fit in the Tx, due to selected firmware options + + + + + Firmware does not fit in the Tx, due to selected firmware options + + + + + Write Models and settings from %1 to the Tx? + + Ne&xt @@ -2037,16 +2052,6 @@ Voulez vous la télécharger maintenant ? A new version of companion9x is available (version %1)<br>Would you like to download it? Une nouvelle version de companion9x est disponible (r%1)<br>Voulez-vous la télécharger ? - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -2069,11 +2074,6 @@ Voulez-vous la télécharger maintenant ? Read Models and Settings From Tx - - - Load %1 to Models and Settings? - - The file %1 diff --git a/companion/src/translations/companion9x_he.ts b/companion/src/translations/companion9x_he.ts index 258d1c248..48adaf76c 100644 --- a/companion/src/translations/companion9x_he.ts +++ b/companion/src/translations/companion9x_he.ts @@ -1214,16 +1214,6 @@ Are you sure ? Would you like to launch the installer? - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -1381,6 +1371,11 @@ Do you want to download it now ? Display previous message again at startup ? + + + Firmware does not longer fit in the Tx, due to selected firmware options + + Compilation server temporary failure, try later @@ -1404,6 +1399,11 @@ Do you want to download it now ? Unknown server failure, try later + + + Firmware does not fit in the Tx, due to selected firmware options + + @@ -1477,6 +1477,11 @@ Do you want to download it now ? Impossible to identify the radio on your system, please verify the eeprom disk is connected. + + + Write Models and settings from %1 to the Tx? + + @@ -1827,11 +1832,6 @@ Do you want to download it now ? Read Models and Settings From Tx - - - Load %1 to Models and Settings? - - The file %1 diff --git a/companion/src/translations/companion9x_it.ts b/companion/src/translations/companion9x_it.ts index 22f885056..d5c05a2b7 100644 --- a/companion/src/translations/companion9x_it.ts +++ b/companion/src/translations/companion9x_it.ts @@ -1316,11 +1316,6 @@ Siete sicuri ? companion9x - Models and Settings Editor - %1 - - - Firmware does not longer fit in program memory, due to selected firmware options - - @@ -1408,11 +1403,6 @@ Volete scaricarla ora ? Compilation server requires registration, please check opentx web site Il server di compilazione richiede una registrazione, controllate il sito di opentx - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -1596,9 +1586,19 @@ Scriverlo ugualmente ? Read Models and Settings From Tx + + + Firmware does not longer fit in the Tx, due to selected firmware options + + + + + Firmware does not fit in the Tx, due to selected firmware options + + - Load %1 to Models and Settings? + Write Models and settings from %1 to the Tx? diff --git a/companion/src/translations/companion9x_pt.ts b/companion/src/translations/companion9x_pt.ts index 73556369b..16e7aba0b 100644 --- a/companion/src/translations/companion9x_pt.ts +++ b/companion/src/translations/companion9x_pt.ts @@ -1374,6 +1374,11 @@ Are you sure ? Display previous message again at startup ? + + + Firmware does not longer fit in the Tx, due to selected firmware options + + Compilation server temporary failure, try later @@ -1397,6 +1402,11 @@ Are you sure ? Unknown server failure, try later + + + Firmware does not fit in the Tx, due to selected firmware options + + @@ -1470,6 +1480,11 @@ Do you want to download it now ? Impossible to identify the radio on your system, please verify the eeprom disk is connected. + + + Write Models and settings from %1 to the Tx? + + @@ -1968,16 +1983,6 @@ Do you want to download it now ? Checking for updates - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -1998,11 +2003,6 @@ Do you want to download it now ? Read Models and Settings From Tx - - - Load %1 to Models and Settings? - - The file %1 diff --git a/companion/src/translations/companion9x_ru.ts b/companion/src/translations/companion9x_ru.ts index 8cab43198..c736d06d5 100644 --- a/companion/src/translations/companion9x_ru.ts +++ b/companion/src/translations/companion9x_ru.ts @@ -1452,6 +1452,11 @@ Are you sure ? Display previous message again at startup ? + + + Firmware does not longer fit in the Tx, due to selected firmware options + + Compilation server temporary failure, try later @@ -1475,6 +1480,11 @@ Are you sure ? Unknown server failure, try later + + + Firmware does not fit in the Tx, due to selected firmware options + + @@ -1549,6 +1559,11 @@ Do you want to download it now ? Impossible to identify the radio on your system, please verify the eeprom disk is connected. + + + Write Models and settings from %1 to the Tx? + + @@ -1972,16 +1987,6 @@ Do you want to download it now ? Checking for updates - - - Firmware does not longer fit in program memory, due to selected firmware options - - - - - Firmware does not fit in program memory, due to selected firmware options - - Do you want to write the firmware to the transmitter now ? @@ -2002,11 +2007,6 @@ Do you want to download it now ? Read Models and Settings From Tx - - - Load %1 to Models and Settings? - - The file %1 diff --git a/companion/src/translations/companion9x_sv.ts b/companion/src/translations/companion9x_sv.ts index 8160727d2..cd6955668 100644 --- a/companion/src/translations/companion9x_sv.ts +++ b/companion/src/translations/companion9x_sv.ts @@ -1267,17 +1267,7 @@ FAI-funktionen kan inte slås av i sändaren. Vill du starta installationsprogrammet? - - Firmware does not longer fit in program memory, due to selected firmware options - Firmware får inte längre plats i minnet på grund av att alltför många funktioner aktiverats - - - - Firmware does not fit in program memory, due to selected firmware options - Firmware får inte rum i minnet på grund av att för många funktioner aktiverats - - - + Do you want to write the firmware to the transmitter now ? Vill du skriva firmware till sändaren nu? @@ -1387,7 +1377,12 @@ Vill du ladda ned den nya versionen nu ? Skall föregående varning visas igen vid uppstart ? - + + Firmware does not longer fit in the Tx, due to selected firmware options + Firmware får inte rum i minnet på grund av att för många funktioner aktiverats + + + Compilation server temporary failure, try later Tillfälligt fel i byggservern. Försök igen senare @@ -1398,7 +1393,12 @@ Vill du ladda ned den nya versionen nu ? Byggservern kräver registrering. Var god kontrollera openTX webbsida - + + Firmware does not fit in the Tx, due to selected firmware options + Firmware får inte rum i minnet på grund av att för många funktioner aktiverats + + + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -1407,7 +1407,12 @@ Version %2 finns tillgänglig. Vill du ladda ned den nu ? - + + Write Models and settings from %1 to the Tx? + Skriv Modeller och Inställningar från %1 till sändaren? + + + Conversion failed Konverteringen misslyckades @@ -1987,12 +1992,7 @@ Vill du ladda ned den nu ? Läs Modeller och Inställningar från sändaren - - Load %1 to Models and Settings? - Läs från %1 till Modeller och inställningar? - - - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ?