piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes after comments from Romolo

Browse Source
This commit is contained in:
Kjell Kernen
2013-12-13 21:08:52 +01:00
parent f648c53443
commit 45c563086c
9 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/mainwindow.cpp
+3 -3
View File
@@ -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);
companion/src/translations/companion9x_cs.ts
+11 -11
View File
@@ -1599,16 +1599,6 @@ Chcete ji přesto naprogramovat?</translation>
<source>companion9x - Models and Settings Editor - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -1622,9 +1612,19 @@ Chcete ji přesto naprogramovat?</translation>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
companion/src/translations/companion9x_de.ts
+11 -11
View File
@@ -1571,6 +1571,11 @@ Möchten Sie sie jetzt herunterladen?</translation>
<source>Display previous message again at startup ?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="353"/>
<source>Compilation server temporary failure, try later</source>
@@ -1594,6 +1599,11 @@ Möchten Sie sie jetzt herunterladen?</translation>
<source>Unknown server failure, try later</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="487"/>
<source>Firmware %1 does not seem to have ever been downloaded.
@@ -1756,16 +1766,6 @@ Trotzdem brennen?</translation>
<source>companion9x - Models and Settings Editor - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -1781,7 +1781,7 @@ Trotzdem brennen?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
companion/src/translations/companion9x_fr.ts
+15 -15
View File
@@ -1626,6 +1626,21 @@ Burn anyway ?</source>
<source>&amp;Simulate</source>
<translation>&amp;Simulation</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1746"/>
<source>Ne&amp;xt</source>
@@ -2037,16 +2052,6 @@ Voulez vous la télécharger maintenant ?</translation>
<source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
<translation>Une nouvelle version de companion9x est disponible (r%1)&lt;br&gt;Voulez-vous la télécharger ?</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -2069,11 +2074,6 @@ Voulez-vous la télécharger maintenant ?</translation>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1082"/>
<source>The file %1
companion/src/translations/companion9x_he.ts
+15 -15
View File
@@ -1214,16 +1214,6 @@ Are you sure ?</source>
<source>Would you like to launch the installer?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -1381,6 +1371,11 @@ Do you want to download it now ?</source>
<source>Display previous message again at startup ?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="353"/>
<source>Compilation server temporary failure, try later</source>
@@ -1404,6 +1399,11 @@ Do you want to download it now ?</source>
<source>Unknown server failure, try later</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="488"/>
<location filename="../mainwindow.cpp" line="517"/>
@@ -1477,6 +1477,11 @@ Do you want to download it now ?</source>
<source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1089"/>
<location filename="../mainwindow.cpp" line="1344"/>
@@ -1827,11 +1832,6 @@ Do you want to download it now ?</source>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1082"/>
<source>The file %1
companion/src/translations/companion9x_it.ts
+11 -11
View File
@@ -1316,11 +1316,6 @@ Siete sicuri ?</translation>
<source>companion9x - Models and Settings Editor - %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="362"/>
<location filename="../mainwindow.cpp" line="402"/>
@@ -1408,11 +1403,6 @@ Volete scaricarla ora ?</translation>
<source>Compilation server requires registration, please check opentx web site</source>
<translation>Il server di compilazione richiede una registrazione, controllate il sito di opentx</translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -1596,9 +1586,19 @@ Scriverlo ugualmente ?</translation>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
companion/src/translations/companion9x_pt.ts
+15 -15
View File
@@ -1374,6 +1374,11 @@ Are you sure ?</source>
<source>Display previous message again at startup ?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="353"/>
<source>Compilation server temporary failure, try later</source>
@@ -1397,6 +1402,11 @@ Are you sure ?</source>
<source>Unknown server failure, try later</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="488"/>
<location filename="../mainwindow.cpp" line="517"/>
@@ -1470,6 +1480,11 @@ Do you want to download it now ?</source>
<source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1089"/>
<location filename="../mainwindow.cpp" line="1344"/>
@@ -1968,16 +1983,6 @@ Do you want to download it now ?</source>
<source>Checking for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -1998,11 +2003,6 @@ Do you want to download it now ?</source>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1082"/>
<source>The file %1
companion/src/translations/companion9x_ru.ts
+15 -15
View File
@@ -1452,6 +1452,11 @@ Are you sure ?</source>
<source>Display previous message again at startup ?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="353"/>
<source>Compilation server temporary failure, try later</source>
@@ -1475,6 +1480,11 @@ Are you sure ?</source>
<source>Unknown server failure, try later</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="488"/>
<location filename="../mainwindow.cpp" line="517"/>
@@ -1549,6 +1559,11 @@ Do you want to download it now ?</source>
<source>Impossible to identify the radio on your system, please verify the eeprom disk is connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Write Models and settings from %1 to the Tx?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1089"/>
<location filename="../mainwindow.cpp" line="1344"/>
@@ -1972,16 +1987,6 @@ Do you want to download it now ?</source>
<source>Checking for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="350"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="390"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="430"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
@@ -2002,11 +2007,6 @@ Do you want to download it now ?</source>
<source>Read Models and Settings From Tx</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1079"/>
<source>Load %1 to Models and Settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.cpp" line="1082"/>
<source>The file %1
companion/src/translations/companion9x_sv.ts
+20 -20
View File
@@ -1267,17 +1267,7 @@ FAI-funktionen kan inte slås av i sändaren.
<translation>Vill du starta installationsprogrammet?</translation>
</message>
<message>
<location line="+55"/>
<source>Firmware does not longer fit in program memory, due to selected firmware options</source>
<translation>Firmware får inte längre plats i minnet på grund av att alltför många funktioner aktiverats</translation>
</message>
<message>
<location line="+40"/>
<source>Firmware does not fit in program memory, due to selected firmware options</source>
<translation>Firmware får inte rum i minnet på grund av att för många funktioner aktiverats</translation>
</message>
<message>
<location line="+40"/>
<location line="+135"/>
<source>Do you want to write the firmware to the transmitter now ?</source>
<translation>Vill du skriva firmware till sändaren nu?</translation>
</message>
@@ -1387,7 +1377,12 @@ Vill du ladda ned den nya versionen nu ?</translation>
<translation>Skall föregående varning visas igen vid uppstart ?</translation>
</message>
<message>
<location line="+180"/>
<location line="+177"/>
<source>Firmware does not longer fit in the Tx, due to selected firmware options</source>
<translation>Firmware får inte rum i minnet på grund av att för många funktioner aktiverats</translation>
</message>
<message>
<location line="+3"/>
<source>Compilation server temporary failure, try later</source>
<translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
</message>
@@ -1398,7 +1393,12 @@ Vill du ladda ned den nya versionen nu ?</translation>
<translation>Byggservern kräver registrering. Var god kontrollera openTX webbsida</translation>
</message>
<message>
<location line="+88"/>
<location line="-9"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation>Firmware får inte rum i minnet på grund av att för många funktioner aktiverats</translation>
</message>
<message>
<location line="+97"/>
<source>Firmware %1 does not seem to have ever been downloaded.
Version %2 is available.
Do you want to download it now ?</source>
@@ -1407,7 +1407,12 @@ Version %2 finns tillgänglig.
Vill du ladda ned den nu ?</translation>
</message>
<message>
<location line="+882"/>
<location line="+592"/>
<source>Write Models and settings from %1 to the Tx?</source>
<translation>Skriv Modeller och Inställningar från %1 till sändaren?</translation>
</message>
<message>
<location line="+290"/>
<source>Conversion failed</source>
<translation>Konverteringen misslyckades</translation>
</message>
@@ -1987,12 +1992,7 @@ Vill du ladda ned den nu ?</translation>
<translation>Läs Modeller och Inställningar från sändaren</translation>
</message>
<message>
<location line="-355"/>
<source>Load %1 to Models and Settings?</source>
<translation>Läs från %1 till Modeller och inställningar?</translation>
</message>
<message>
<location line="+3"/>
<location line="-352"/>
<source>The file %1
has not been recognized as a valid Models and Settings file
Write anyway ?</source>