diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index b5f1e17bd..8ec853eaa 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -1,4 +1,4 @@ -PROJECT( companion9x ) +PROJECT( companion ) SET( C9X_VERSION_MAJOR "1" ) SET( C9X_VERSION_MINOR "51" ) @@ -111,7 +111,7 @@ add_custom_command( add_subdirectory(modeledit) -SET( companion9x_SRCS +SET( companion_SRCS eeprominterface.cpp hexinterface.cpp flashinterface.cpp @@ -164,7 +164,7 @@ SET( companion9x_SRCS qcustomplot.cpp ) -SET( companion9x_MOC_HDRS +SET( companion_MOC_HDRS avroutputdialog.h preferencesdialog.h burnconfigdialog.h @@ -194,7 +194,7 @@ SET( companion9x_MOC_HDRS helpers.h ) -SET( companion9x_UIS +SET( companion_UIS mdichild.ui avroutputdialog.ui comparedialog.ui @@ -215,25 +215,25 @@ SET( companion9x_UIS ) IF ( SDL_FOUND ) - SET( companion9x_SRCS - ${companion9x_SRCS} + SET( companion_SRCS + ${companion_SRCS} joystick.cpp joystickdialog.cpp ) - SET( companion9x_MOC_HDRS - ${companion9x_MOC_HDRS} + SET( companion_MOC_HDRS + ${companion_MOC_HDRS} joystick.h joystickdialog.h ) - SET( companion9x_UIS - ${companion9x_UIS} + SET( companion_UIS + ${companion_UIS} joystickdialog.ui ) ENDIF( ) -SET( companion9x_RCS +SET( companion_RCS companion9x.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) @@ -276,7 +276,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${ SET( PATCH_FLAGS "--binary" ) IF( WIN32 ) - SET( companion9x_SRCS ${companion9x_SRCS} icon.rc ) + SET( companion_SRCS ${companion_SRCS} icon.rc ) IF ( NOT MSVC ) SET(CMAKE_EXE_LINKER_FLAGS -mwindows) ENDIF( ) @@ -288,28 +288,33 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) SET( LANGUAGES he pt ru de fr it sv cs ) FOREACH( language ${LANGUAGES} ) - SET( companion9x_TS ${companion9x_TS} translations/companion9x_${language}.ts ) + SET( companion_TS ${companion_TS} translations/companion_${language}.ts ) ENDFOREACH( language ) -QT4_WRAP_UI( companion9x_SRCS ${companion9x_UIS} ) -QT4_WRAP_CPP( companion9x_SRCS ${companion9x_MOC_HDRS} ) -QT4_ADD_TRANSLATION( companion9x_QM ${companion9x_TS} ) -QT4_ADD_RESOURCES( companion9x_SRCS ${companion9x_RCS} ) +QT4_WRAP_UI( companion_SRCS ${companion_UIS} ) +QT4_WRAP_CPP( companion_SRCS ${companion_MOC_HDRS} ) +QT4_ADD_TRANSLATION( companion_QM ${companion_TS} ) +QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} ) ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" ) IF( APPLE ) - ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion9x_SRCS} ${companion9x_QM} ) + ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} ) ELSE( ) - ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion9x_SRCS} ${companion9x_QM} ) + ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} ) ENDIF( ) TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ) IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) - INSTALL( FILES companion9x.desktop DESTINATION share/applications ) - INSTALL( FILES companion9x.png DESTINATION share/icons ) + INSTALL( FILES companion.desktop DESTINATION share/applications ) + INSTALL( FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps ) + INSTALL( FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps ) + INSTALL( FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps ) + INSTALL( FILES images/linuxicons/256x256/companion.png DESTINATION /usr/share/icons/hicolor/256x256/apps ) + INSTALL( FILES images/linuxicons/512x512/companion.png DESTINATION /usr/share/icons/hicolor/512x512/apps ) + INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps ) INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ ) # Linux specific code SET(OperatingSystem "Linux") @@ -319,13 +324,13 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") IF( WIN32 ) IF( MSVC ) - SET( NSI_IN_FILE companion9x-vs.nsi.in ) + SET( NSI_IN_FILE companion-vs.nsi.in ) ELSE( ) - SET( NSI_IN_FILE companion9x-msys.nsi.in ) + SET( NSI_IN_FILE companion-msys.nsi.in ) ENDIF( ) SET( SYSDIR "$ENV{windir}/system32" ) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY) FIND_PROGRAM(NSIS_EXE makensis.exe PATHS "C:/Program Files/NSIS" @@ -333,14 +338,14 @@ IF( WIN32 ) "C:/Programs/NSIS" ) - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion9xInstall.exe - COMMAND "${NSIS_EXE}" ARGS companion9x.nsi - DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion9x.nsi + ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe + COMMAND "${NSIS_EXE}" ARGS companion.nsi + DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion.nsi COMMENT "Windows NSIS Installer") ADD_CUSTOM_TARGET( installer - DEPENDS ${PROJECT_BINARY_DIR}/companion9xInstall.exe - SOURCES ${PROJECT_BINARY_DIR}/companion9x.nsi) + DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe + SOURCES ${PROJECT_BINARY_DIR}/companion.nsi) ENDIF( ) IF( APPLE ) @@ -352,36 +357,36 @@ IF( APPLE ) ENDIF() ADD_CUSTOM_TARGET( addframeworks ALL - COMMAND mkdir -p companion9x.app/Contents/Frameworks - COMMAND mkdir -p companion9x.app/Contents/Resources - COMMAND mkdir -p companion9x.app/Contents/translations - COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion9x.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files - COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/lib* companion9x.app/Contents/Frameworks - #COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/libcrypto.1.0.0.dylib companion9x.app/Contents/Frameworks - COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../macbuild/qt_menu.nib companion9x.app/Contents/Resources/ - COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion9x.app/Contents/translations - COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app + COMMAND mkdir -p companion.app/Contents/Frameworks + COMMAND mkdir -p companion.app/Contents/Resources + COMMAND mkdir -p companion.app/Contents/translations + COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files + COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks + #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks + COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/ + COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations + COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app WORKING_DIRECTORY ${WORK_DIR} DEPENDS ${PROJECT_NAME} ) ADD_CUSTOM_TARGET( makedmg - COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app -dmg -no-plugins + COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins WORKING_DIRECTORY ${WORK_DIR} DEPENDS addframeworks ) ENDIF( ) ADD_CUSTOM_TARGET( stamp - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion9x.stamp + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp DEPENDS ${CMAKE_BINARY_DIR}/version.h ) ADD_CUSTOM_TARGET( translations WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion9x_TS} ) + COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} ) -SET(CPACK_PACKAGE_NAME "COMPANION9X") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "EEPROM Editor for the openTx open source firmware") +SET(CPACK_PACKAGE_NAME "COMPANION") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware") string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE) find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems") if(DPKG_PROGRAM) diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp index a125d8e99..8680d39a7 100644 --- a/companion/src/avroutputdialog.cpp +++ b/companion/src/avroutputdialog.cpp @@ -58,7 +58,7 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg, QFile exec; winTitle=wTitle; if (!(exec.exists(prog))) { - QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("executable not found")); + QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("executable not found")); closeOpt = AVR_DIALOG_FORCE_CLOSE; QTimer::singleShot(0, this, SLOT(forceClose())); } else { @@ -315,10 +315,10 @@ void avrOutputDialog::errorWizard() } } if (fwexist==false) { - QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr)); + QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr)); } else { FirmwareInfo *firmware = GetCurrentFirmware(); - QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name)); + QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name)); } } } @@ -416,24 +416,24 @@ void avrOutputDialog::doFinished(int code=0) if (hasErrors || code) { if (!cmdLine.isEmpty()) { if (getProgrammer()!="AVRDUDE") { - QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("did not finish correctly")); + QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly")); } else { - int res = QMessageBox::question(this, "companion9x",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No); + int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No); if (res != QMessageBox::No) { errorWizard(); } } } else { - QMessageBox::critical(this, "companion9x", tr("Copy did not finish correctly")); + QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly")); } // reject(); } else { if (!cmdLine.isEmpty()) { ui->progressBar->setValue(100); - QMessageBox::information(this, "companion9x", getProgrammer() + " " + tr("finished correctly")); + QMessageBox::information(this, "Companion", getProgrammer() + " " + tr("finished correctly")); accept(); } else { - QMessageBox::information(this, "companion9x", tr("Copy finished correctly")); + QMessageBox::information(this, "Companion", tr("Copy finished correctly")); accept(); } } diff --git a/companion/src/burnconfigdialog.cpp b/companion/src/burnconfigdialog.cpp index 71887d4da..f4440b05f 100644 --- a/companion/src/burnconfigdialog.cpp +++ b/companion/src/burnconfigdialog.cpp @@ -325,7 +325,7 @@ void burnConfigDialog::restFuses(bool eeProtect) QMessageBox::StandardButton ret = QMessageBox::No; - ret = QMessageBox::warning(this, tr("companion9x"), + ret = QMessageBox::warning(this, tr("Companion"), tr("WARNING!
This will reset the fuses of %1 to the factory settings.
Writing fuses can mess up your radio.
Do this only if you are sure they are wrong!
Are you sure you want to continue?").arg(avrMCU), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) @@ -394,7 +394,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked) } else { ui->label_av3->show(); ui->avrdude_mcu->show(); - QMessageBox::warning(this, tr("companion9x"), + QMessageBox::warning(this, tr("Companion"), tr("WARNING!
Normally CPU type is automatically selected according to the chosen firmware.
If you change the CPU type the resulting eeprom could be inconsistent."), QMessageBox::Ok); } diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp index 54b37d7a2..c601b23cf 100644 --- a/companion/src/burndialog.cpp +++ b/companion/src/burndialog.cpp @@ -292,7 +292,7 @@ bool burnDialog::checkeEprom(QString fileName) uint8_t eeprom[EESIZE_RLC_MAX]; int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX); if (!eeprom_size) { - int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); + int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); if (res == QMessageBox::No) { return false; } @@ -302,7 +302,7 @@ bool burnDialog::checkeEprom(QString fileName) } file.close(); if (!LoadEeprom(radioData, eeprom, eeprom_size)) { - int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); + int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); if (res == QMessageBox::No) { return false; } @@ -325,7 +325,7 @@ bool burnDialog::checkeEprom(QString fileName) return false; } if (!LoadEeprom(radioData, eeprom, eeprom_size)) { - int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); + int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No); if (res == QMessageBox::No) { return false; } diff --git a/companion/src/burndialog.ui b/companion/src/burndialog.ui index d9c51ec35..7c739d0a1 100644 --- a/companion/src/burndialog.ui +++ b/companion/src/burndialog.ui @@ -273,7 +273,7 @@ - Allows companion9x to write to older version of the firmware + Allows Companion to write to older version of the firmware Check Firmware compatibility diff --git a/companion/src/companion.desktop b/companion/src/companion.desktop new file mode 100644 index 000000000..df19a4a80 --- /dev/null +++ b/companion/src/companion.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Companion +GenericName=Transmitter Companion App +Comment=The Ultimate Transmitter Companion +Icon=companion +Exec='companion' +Terminal=false +StartupNotify=false +Categories=Application diff --git a/companion/src/companion9x.desktop b/companion/src/companion9x.desktop deleted file mode 100644 index e50e1551a..000000000 --- a/companion/src/companion9x.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=companion9x -GenericName=COMPANION9X -Comment=9x EeProm Editor -Icon=/usr/share/icons/companion9x.png -Exec='companion9x' -Terminal=false -StartupNotify=false -Categories=Application \ No newline at end of file diff --git a/companion/src/companion9x.png b/companion/src/companion9x.png deleted file mode 100644 index 90a961731..000000000 Binary files a/companion/src/companion9x.png and /dev/null differ diff --git a/companion/src/companion9x.qrc b/companion/src/companion9x.qrc index 8a8409172..6cd5e7faa 100644 --- a/companion/src/companion9x.qrc +++ b/companion/src/companion9x.qrc @@ -48,7 +48,7 @@ images/screenshot.png images/splash.png images/splasht.png - images/companion9x-title.png + images/companion-title.png images/read_eeprom.png images/write_eeprom.png images/write_flash.png diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index d60a682db..02eb30041 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -26,7 +26,8 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu ui->textBrowser->insertPlainText(file2.readAll()); } ui->textBrowser->insertPlainText("\n\n\n"); - ui->textBrowser->insertPlainText(tr("Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which\ncompanion9x was forked out.")); + ui->textBrowser->insertPlainText(tr( +"Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and the fantastic eePe program \nwhich was the staring point for OpenTX Companion.")); ui->textBrowser->insertPlainText("\n\n"); ui->textBrowser->insertPlainText(tr("Thank you all !!!")); ui->textBrowser->setReadOnly(true); @@ -42,7 +43,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu } ui->textBrowser->setReadOnly(true); ui->textBrowser->verticalScrollBar()->setValue(0); - this->setWindowTitle(tr("Companion9x Release Notes")); + this->setWindowTitle(tr("Companion Release Notes")); } break; case 2:{ diff --git a/companion/src/downloaddialog.cpp b/companion/src/downloaddialog.cpp index 83da451bd..bfd425619 100644 --- a/companion/src/downloaddialog.cpp +++ b/companion/src/downloaddialog.cpp @@ -21,7 +21,7 @@ downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt) : file = new QFile(tgt); if (!file->open(QIODevice::WriteOnly)) { - QMessageBox::critical(this, "companion9x", + QMessageBox::critical(this, "Companion", tr("Unable to save the file %1: %2.") .arg(tgt).arg(file->errorString())); QTimer::singleShot(0, this, SLOT(fileError())); @@ -51,7 +51,7 @@ void downloadDialog::httpFinished() if (reply->error()) { file->remove(); - QMessageBox::information(this, tr("companion9x"), + QMessageBox::information(this, tr("Companion"), tr("Download failed: %1.") .arg(reply->errorString())); ok = false; diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp index 59cb25ca3..0758f5e22 100644 --- a/companion/src/generaledit.cpp +++ b/companion/src/generaledit.cpp @@ -1026,7 +1026,7 @@ void GeneralEdit::on_blinvert_cb_stateChanged(int ) void GeneralEdit::on_faimode_CB_stateChanged(int ) { if (ui->faimode_CB->isChecked()) { - int ret = QMessageBox::question(this, "companion9x", + int ret = QMessageBox::question(this, "Companion", tr("If you enable FAI, you loose the vario, the play functions, the telemetry screen.\nThis function cannot be disabled by the radio.\nAre you sure ?") , QMessageBox::Yes | QMessageBox::No); if (ret==QMessageBox::Yes) { @@ -1327,7 +1327,7 @@ void GeneralEdit::on_calstore_PB_clicked() } else { QString calib=settings.value("StickPotCalib","").toString(); if (!(calib.isEmpty())) { - int ret = QMessageBox::question(this, "companion9x", + int ret = QMessageBox::question(this, "Companion", tr("Do you want to store calibration in %1 profile
overwriting existing calibration?").arg(name) , QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::No) { @@ -1360,7 +1360,7 @@ void GeneralEdit::on_calstore_PB_clicked() settings.setValue("countryCode",QString("%1%2%3").arg((uint8_t)g_eeGeneral.countryCode, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.imperial, 2, 16, QChar('0')).arg(g_eeGeneral.ttsLanguage)); settings.endGroup(); settings.endGroup(); - QMessageBox::information(this, "companion9x", tr("Calibration and HW parameters saved.")); + QMessageBox::information(this, "Companion", tr("Calibration and HW parameters saved.")); } } diff --git a/companion/src/icon.ico b/companion/src/icon.ico index 2453af4ff..bb088b1ae 100644 Binary files a/companion/src/icon.ico and b/companion/src/icon.ico differ diff --git a/companion/src/icon.png b/companion/src/icon.png index 90a961731..6ceee4f23 100644 Binary files a/companion/src/icon.png and b/companion/src/icon.png differ diff --git a/companion/src/icon.svg b/companion/src/icon.svg deleted file mode 100644 index c36f00f53..000000000 --- a/companion/src/icon.svg +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/companion/src/images/9CX.png b/companion/src/images/9CX.png deleted file mode 100644 index 3c1b8e453..000000000 Binary files a/companion/src/images/9CX.png and /dev/null differ diff --git a/companion/src/images/9xdb-bl.png b/companion/src/images/9xdb-bl.png index 654e2d5ae..ba1dfbd4c 100644 Binary files a/companion/src/images/9xdb-bl.png and b/companion/src/images/9xdb-bl.png differ diff --git a/companion/src/images/9xdb-gr.png b/companion/src/images/9xdb-gr.png index e474dc0dd..89778a54f 100644 Binary files a/companion/src/images/9xdb-gr.png and b/companion/src/images/9xdb-gr.png differ diff --git a/companion/src/images/9xdb-or.png b/companion/src/images/9xdb-or.png index 20bc45640..c61b410ab 100644 Binary files a/companion/src/images/9xdb-or.png and b/companion/src/images/9xdb-or.png differ diff --git a/companion/src/images/9xdb-rd.png b/companion/src/images/9xdb-rd.png index ace3657d4..2d18d84af 100644 Binary files a/companion/src/images/9xdb-rd.png and b/companion/src/images/9xdb-rd.png differ diff --git a/companion/src/images/9xdb-yl.png b/companion/src/images/9xdb-yl.png index e1e9f1e6a..158f1e94e 100644 Binary files a/companion/src/images/9xdb-yl.png and b/companion/src/images/9xdb-yl.png differ diff --git a/companion/src/images/9xdb.png b/companion/src/images/9xdb.png index 602bc9955..e6198c2a7 100644 Binary files a/companion/src/images/9xdb.png and b/companion/src/images/9xdb.png differ diff --git a/companion/src/images/companion-title.png b/companion/src/images/companion-title.png new file mode 100644 index 000000000..cbaa0d13b Binary files /dev/null and b/companion/src/images/companion-title.png differ diff --git a/companion/src/images/companion9x-title.png b/companion/src/images/companion9x-title.png deleted file mode 100644 index 358bc8826..000000000 Binary files a/companion/src/images/companion9x-title.png and /dev/null differ diff --git a/companion/src/images/customize.png b/companion/src/images/customize.png index 96259b922..078d0af75 100644 Binary files a/companion/src/images/customize.png and b/companion/src/images/customize.png differ diff --git a/companion/src/images/iconmac.icns b/companion/src/images/iconmac.icns index 3c26785d6..0e20c9fe3 100644 Binary files a/companion/src/images/iconmac.icns and b/companion/src/images/iconmac.icns differ diff --git a/companion/src/images/linuxicons/128x128/companion.png b/companion/src/images/linuxicons/128x128/companion.png new file mode 100644 index 000000000..6f1616ca2 Binary files /dev/null and b/companion/src/images/linuxicons/128x128/companion.png differ diff --git a/companion/src/images/linuxicons/256x256/companion.png b/companion/src/images/linuxicons/256x256/companion.png new file mode 100644 index 000000000..684517666 Binary files /dev/null and b/companion/src/images/linuxicons/256x256/companion.png differ diff --git a/companion/src/images/linuxicons/32x32/companion.png b/companion/src/images/linuxicons/32x32/companion.png new file mode 100644 index 000000000..df79707a5 Binary files /dev/null and b/companion/src/images/linuxicons/32x32/companion.png differ diff --git a/companion/src/images/linuxicons/48x48/companion.png b/companion/src/images/linuxicons/48x48/companion.png new file mode 100644 index 000000000..99357930d Binary files /dev/null and b/companion/src/images/linuxicons/48x48/companion.png differ diff --git a/companion/src/images/linuxicons/512x512/companion.png b/companion/src/images/linuxicons/512x512/companion.png new file mode 100644 index 000000000..7e9078b2e Binary files /dev/null and b/companion/src/images/linuxicons/512x512/companion.png differ diff --git a/companion/src/images/linuxicons/scalable/companion.svg b/companion/src/images/linuxicons/scalable/companion.svg new file mode 100644 index 000000000..40a99a3b0 --- /dev/null +++ b/companion/src/images/linuxicons/scalable/companion.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + COMPANION + + + + + + O + + + + + P + + + + + E + + + + + N + + + + + + + + + \ No newline at end of file diff --git a/companion/src/images/originals/9CX.xcf b/companion/src/images/originals/9CX.xcf new file mode 100644 index 000000000..167a1ad10 Binary files /dev/null and b/companion/src/images/originals/9CX.xcf differ diff --git a/companion/src/images/originals/9xdb-bl.xcf b/companion/src/images/originals/9xdb-bl.xcf new file mode 100644 index 000000000..8b09f5c82 Binary files /dev/null and b/companion/src/images/originals/9xdb-bl.xcf differ diff --git a/companion/src/images/originals/9xdb-gr.xcf b/companion/src/images/originals/9xdb-gr.xcf new file mode 100644 index 000000000..416ea3f50 Binary files /dev/null and b/companion/src/images/originals/9xdb-gr.xcf differ diff --git a/companion/src/images/originals/9xdb-or.xcf b/companion/src/images/originals/9xdb-or.xcf new file mode 100644 index 000000000..0bbe3113b Binary files /dev/null and b/companion/src/images/originals/9xdb-or.xcf differ diff --git a/companion/src/images/originals/9xdb-rd.xcf b/companion/src/images/originals/9xdb-rd.xcf new file mode 100644 index 000000000..b1a389465 Binary files /dev/null and b/companion/src/images/originals/9xdb-rd.xcf differ diff --git a/companion/src/images/originals/9xdb-yl.xcf b/companion/src/images/originals/9xdb-yl.xcf new file mode 100644 index 000000000..6fc4e7883 Binary files /dev/null and b/companion/src/images/originals/9xdb-yl.xcf differ diff --git a/companion/src/images/originals/9xdb.xcf b/companion/src/images/originals/9xdb.xcf new file mode 100644 index 000000000..d0ed54593 Binary files /dev/null and b/companion/src/images/originals/9xdb.xcf differ diff --git a/companion/src/images/originals/companion9x-title.xcf b/companion/src/images/originals/companion9x-title.xcf new file mode 100644 index 000000000..808d8f4bc Binary files /dev/null and b/companion/src/images/originals/companion9x-title.xcf differ diff --git a/companion/src/images/originals/customize.xcf b/companion/src/images/originals/customize.xcf new file mode 100644 index 000000000..d5ef01df8 Binary files /dev/null and b/companion/src/images/originals/customize.xcf differ diff --git a/companion/src/images/originals/splash.xcf b/companion/src/images/originals/splash.xcf new file mode 100644 index 000000000..4130570dd Binary files /dev/null and b/companion/src/images/originals/splash.xcf differ diff --git a/companion/src/images/originals/splasht.xcf b/companion/src/images/originals/splasht.xcf new file mode 100644 index 000000000..66466d2cc Binary files /dev/null and b/companion/src/images/originals/splasht.xcf differ diff --git a/companion/src/images/originals/vector-logo.odg b/companion/src/images/originals/vector-logo.odg new file mode 100644 index 000000000..a4c4278c8 Binary files /dev/null and b/companion/src/images/originals/vector-logo.odg differ diff --git a/companion/src/images/originals/vector-logo.svg b/companion/src/images/originals/vector-logo.svg new file mode 100644 index 000000000..40a99a3b0 --- /dev/null +++ b/companion/src/images/originals/vector-logo.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + COMPANION + + + + + + O + + + + + P + + + + + E + + + + + N + + + + + + + + + \ No newline at end of file diff --git a/companion/src/images/originals/windows-icon.xcf b/companion/src/images/originals/windows-icon.xcf new file mode 100644 index 000000000..7cf9bcf71 Binary files /dev/null and b/companion/src/images/originals/windows-icon.xcf differ diff --git a/companion/src/images/splash-2012.png b/companion/src/images/splash-2012.png deleted file mode 100644 index f5afdbafa..000000000 Binary files a/companion/src/images/splash-2012.png and /dev/null differ diff --git a/companion/src/images/splash-2013.png b/companion/src/images/splash-2013.png deleted file mode 100644 index 0afa87174..000000000 Binary files a/companion/src/images/splash-2013.png and /dev/null differ diff --git a/companion/src/images/splash-ambroise.png b/companion/src/images/splash-ambroise.png deleted file mode 100644 index e7df433b5..000000000 Binary files a/companion/src/images/splash-ambroise.png and /dev/null differ diff --git a/companion/src/images/splash-hb.png b/companion/src/images/splash-hb.png deleted file mode 100644 index aadacc645..000000000 Binary files a/companion/src/images/splash-hb.png and /dev/null differ diff --git a/companion/src/images/splash-old.png b/companion/src/images/splash-old.png deleted file mode 100644 index 44a0bab1c..000000000 Binary files a/companion/src/images/splash-old.png and /dev/null differ diff --git a/companion/src/images/splash.png b/companion/src/images/splash.png index 601c590d9..8c55b1551 100644 Binary files a/companion/src/images/splash.png and b/companion/src/images/splash.png differ diff --git a/companion/src/images/splasht.png b/companion/src/images/splasht.png index 96f1eb7ce..25cdc0871 100644 Binary files a/companion/src/images/splasht.png and b/companion/src/images/splasht.png differ diff --git a/companion/src/logsdialog.cpp b/companion/src/logsdialog.cpp index 4334da516..e1b415ce9 100644 --- a/companion/src/logsdialog.cpp +++ b/companion/src/logsdialog.cpp @@ -687,7 +687,7 @@ bool logsDialog::cvsFileParse() file.close(); if (errors>1) { - QMessageBox::warning(this, "companion9x", tr("The selected logfile contains %1 invalid lines out of %2 total lines").arg(errors).arg(lines)); + QMessageBox::warning(this, "Companion", tr("The selected logfile contains %1 invalid lines out of %2 total lines").arg(errors).arg(lines)); } plotLock=true; int n=csvlog.count(); diff --git a/companion/src/logsdialog.ui b/companion/src/logsdialog.ui index deee92d6b..4d0c91939 100644 --- a/companion/src/logsdialog.ui +++ b/companion/src/logsdialog.ui @@ -11,7 +11,7 @@ - Companion9x log viewer + Companion Log Viewer diff --git a/companion/src/main.cpp b/companion/src/main.cpp index ed5cc25b0..06ae8167f 100644 --- a/companion/src/main.cpp +++ b/companion/src/main.cpp @@ -77,10 +77,10 @@ class MyProxyStyle : public QProxyStyle int main(int argc, char *argv[]) { Q_INIT_RESOURCE(companion9x); - QApplication * app = new QApplication(argc, argv); - app->setApplicationName("Companion9x"); + QApplication app(argc, argv); + app.setApplicationName("OpenTX Companion"); #ifdef __APPLE__ - app->setStyle(new MyProxyStyle); + app.setStyle(new MyProxyStyle); #endif QString dir; if(argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang"; @@ -89,26 +89,26 @@ int main(int argc, char *argv[]) QString locale = settings.value("locale",QLocale::system().name()).toString(); bool showSplash = settings.value("show_splash", true).toBool(); - QTranslator companion9xTranslator; - companion9xTranslator.load(":/companion9x_" + locale); + QTranslator companionTranslator; + companionTranslator.load(":/companion_" + locale); QTranslator qtTranslator; qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); // qDebug() << locale; // qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - app->installTranslator(&companion9xTranslator); - app->installTranslator(&qtTranslator); + app.installTranslator(&companionTranslator); + app.installTranslator(&qtTranslator); QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString(); firmware_id.replace("open9x", "opentx"); firmware_id.replace("x9da", "taranis"); - QPixmap * pixmap; + QPixmap pixmap; if (firmware_id.contains("taranis")) - pixmap = new QPixmap(":/images/splasht.png"); + pixmap = QPixmap(":/images/splasht.png"); else - pixmap = new QPixmap(":/images/splash.png"); - QSplashScreen *splash = new QSplashScreen(*pixmap); + pixmap = QPixmap(":/images/splash.png"); + QSplashScreen *splash = new QSplashScreen(pixmap); RegisterFirmwares(); @@ -116,15 +116,15 @@ int main(int argc, char *argv[]) current_firmware_variant = GetFirmwareVariant(firmware_id); // qDebug() << current_firmware_variant; - MainWindow * mainWin = new MainWindow(); + MainWindow mainWin; if (showSplash) { splash->show(); QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close())); - QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show())); + QTimer::singleShot(1000*SPLASH_TIME, &mainWin, SLOT(show())); } else { - mainWin->show(); + mainWin.show(); } - return app->exec(); + return app.exec(); } diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index fc9c58b93..5b0d0bd64 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -103,9 +103,9 @@ downloadDialog_forWait(NULL) readSettings(); FirmwareInfo *firmware = GetCurrentFirmware(); if (ActiveProfile) { - setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); } else { - setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name)); } setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); @@ -172,11 +172,11 @@ void MainWindow::displayWarnings() if (warnId0) { - QMessageBox::warning(this, "companion9x", WARNING); - res = QMessageBox::question(this, "companion9x",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No); + QMessageBox::warning(this, "Companion", WARNING); + res = QMessageBox::question(this, "Companion",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No); } else { - QMessageBox::about(this, "companion9x", WARNING); - res = QMessageBox::question(this, "companion9x",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No); + QMessageBox::about(this, "Companion", WARNING); + res = QMessageBox::question(this, "Companion",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No); } if (res == QMessageBox::No) { settings.setValue("warningId", WARNING_ID); @@ -249,7 +249,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply) QString version = qba.mid(i+14, 4); if (version.isNull()) { - QMessageBox::warning(this, "companion9x", tr("Unable to check for updates.")); + QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); return; } double vnum=version.toDouble(); @@ -263,7 +263,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply) if (c9xver< vnum) { #if defined WIN32 || !defined __GNUC__ // || defined __APPLE__ // OSX should only notify of updates since no update packages are available. showcheckForUpdatesResult = false; // update is available - do not show dialog - int ret = QMessageBox::question(this, "companion9x", tr("A new version of companion9x is available (version %1)
" + int ret = QMessageBox::question(this, "Companion", tr("A new version of Companion is available (version %1)
" "Would you like to download it?").arg(version) , QMessageBox::Yes | QMessageBox::No); @@ -284,21 +284,21 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply) } } #else - QMessageBox::warning(this, tr("New release available"), tr("A new release of companion is available please check the repository")); + QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available please check the repository")); #endif } else { if (showcheckForUpdatesResult && check1done && check2done) - QMessageBox::information(this, "companion9x", tr("No updates available at this time.")); + QMessageBox::information(this, "Companion", tr("No updates available at this time.")); } } else { if(check1done && check2done) - QMessageBox::warning(this, "companion9x", tr("Unable to check for updates.")); + QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); } } void MainWindow::updateDownloaded() { - int ret = QMessageBox::question(this, "companion9x", tr("Would you like to launch the installer?") , + int ret = QMessageBox::question(this, "Companion", tr("Would you like to launch the installer?") , QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { if(QDesktopServices::openUrl(QUrl::fromLocalFile(installer_fileName))) @@ -362,7 +362,7 @@ void MainWindow::reply1Accepted() errormsg=tr("Compilation server too busy, try later"); break; case 4: - errormsg=tr("Compilation server requires registration, please check opentx web site"); + errormsg=tr("Compilation server requires registration, please check OpenTX web site"); break; default: errormsg=tr("Unknown server failure, try later"); @@ -402,7 +402,7 @@ void MainWindow::reply1Accepted() errormsg=tr("Compilation server too busy, try later"); break; case 4: - errormsg=tr("Compilation server requires registration, please check opentx web site"); + errormsg=tr("Compilation server requires registration, please check OpenTX web site"); break; default: errormsg=tr("Unknown server failure, try later"); @@ -433,7 +433,7 @@ void MainWindow::reply1Accepted() } settings.setValue(downloadedFW, currentFWrev); if (autoflash) { - int ret = QMessageBox::question(this, "companion9x", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No); + int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { burnToFlash(downloadedFWFilename); } @@ -470,7 +470,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) QString newrev=qba.mid(k).replace('"', "").trimmed(); if(!cres) { - QMessageBox::warning(this, "companion9x", tr("Unable to check for updates.")); + QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); int server = settings.value("fwserver",0).toInt(); server++; settings.setValue("fwserver",server); @@ -490,6 +490,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) showcheckForUpdatesResult = false; // update is available - do not show dialog QString rn = GetFirmware(fwToUpdate)->rnurl; QAbstractButton *rnButton; + msgBox.setWindowTitle("Companion"); msgBox.setInformativeText(tr("Firmware %1 does not seem to have ever been downloaded.\nVersion %2 is available.\nDo you want to download it now ?").arg(fwToUpdate).arg(NewFwRev)); QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole); msgBox.addButton(trUtf8("No"), QMessageBox::NoRole); @@ -502,7 +503,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) if( msgBox.clickedButton() == rnButton ) { contributorsDialog *cd = new contributorsDialog(this,2,rn); cd->exec(); - int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev), + int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev), QMessageBox::Yes | QMessageBox::No); if (ret2 == QMessageBox::Yes) { download = true; @@ -518,7 +519,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) showcheckForUpdatesResult = false; // update is available - do not show dialog QString rn = GetFirmware(fwToUpdate)->rnurl; QAbstractButton *rnButton; - msgBox.setText("companion9x"); + msgBox.setText("Companion"); msgBox.setInformativeText(tr("A new version of %1 firmware is available (current %2 - newer %3).\nDo you want to download it now ?").arg(fwToUpdate).arg(OldFwRev).arg(NewFwRev)); QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole); msgBox.addButton(trUtf8("No"), QMessageBox::NoRole); @@ -532,7 +533,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) warning=0; contributorsDialog *cd = new contributorsDialog(this,2,rn); cd->exec(); - int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev), + int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev), QMessageBox::Yes | QMessageBox::No); if (ret2 == QMessageBox::Yes) { download = true; @@ -546,10 +547,10 @@ void MainWindow::reply1Finished(QNetworkReply * reply) } } else { if(showcheckForUpdatesResult && check1done && check2done) - QMessageBox::information(this, "companion9x", tr("No updates available at this time.")); + QMessageBox::information(this, "Companion", tr("No updates available at this time.")); } if (ignore) { - int res = QMessageBox::question(this, "companion9x",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No); + int res = QMessageBox::question(this, "Companion",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No); if (res==QMessageBox::Yes) { settings.beginGroup("FwRevisions"); settings.setValue(fwToUpdate, NewFwRev); @@ -559,7 +560,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply) if (warning>0) { QString rn = GetFirmware(fwToUpdate)->rnurl; if (!rn.isEmpty()) { - int ret2 = QMessageBox::warning(this, "companion9x", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No); + int ret2 = QMessageBox::warning(this, "Companion", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No); if (ret2 == QMessageBox::Yes) { contributorsDialog *cd = new contributorsDialog(this,2,rn); cd->exec(); @@ -592,11 +593,11 @@ void MainWindow::reply1Finished(QNetworkReply * reply) } } } else { - QMessageBox::warning(this, "companion9x", tr("Unable to check for updates.")); + QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); } } else { if(check1done && check2done) { - QMessageBox::warning(this, "companion9x", tr("Unable to check for updates.")); + QMessageBox::warning(this, "Companion", tr("Unable to check for updates.")); int server = settings.value("fwserver",0).toInt(); server++; settings.setValue("fwserver",server); @@ -718,13 +719,13 @@ void MainWindow::loadProfile() settings.setValue("profileId", profnum); current_firmware_variant = GetFirmwareVariant(firmware_id); FirmwareInfo *firmware = GetCurrentFirmware(); - setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name)); // settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); foreach (QMdiSubWindow *window, mdiArea->subWindowList()) { MdiChild *mdiChild = qobject_cast(window->widget()); mdiChild->eepromInterfaceChanged(); } - setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); } } @@ -735,7 +736,7 @@ void MainWindow::unloadProfile() QSettings settings("companion9x", "companion9x"); settings.setValue("ActiveProfile",0); FirmwareInfo *firmware = GetCurrentFirmware(); - setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name)); } void MainWindow::preferences() @@ -744,9 +745,9 @@ void MainWindow::preferences() pd->exec(); FirmwareInfo *firmware = GetCurrentFirmware(); if (ActiveProfile) { - setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName)); } else { - setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name)); + setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name)); } foreach (QMdiSubWindow *window, mdiArea->subWindowList()) { @@ -1082,10 +1083,10 @@ void MainWindow::burnExtenalToEEPROM() cd->exec(); if (!fileName.isEmpty()) { settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath()); - int ret = QMessageBox::question(this, "companion9x", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No); + int ret = QMessageBox::question(this, "Companion", 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); + ret = QMessageBox::question(this, "Companion", 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); if (ret != QMessageBox::Yes) return; bool backupEnable = settings.value("backupEnable", true).toBool(); QString backupPath = settings.value("backupPath", "").toString(); @@ -1489,15 +1490,16 @@ void MainWindow::logFile() void MainWindow::about() { - QString aboutStr = "

"; - aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini © 2011- 2013
"); - aboutStr.append(QString("http://code.google.com/p/companion9x/
")+tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("

")); - aboutStr.append(tr("The companion9x project was originally forked from eePe")+QString(" http://code.google.com/p/eepe

")); + QString aboutStr = "

"; + aboutStr.append("OpenTX Home Page: http://open-tx.org

"); + aboutStr.append(tr("The Companion project was originally forked from eePe")+QString(" http://code.google.com/p/eepe

")); aboutStr.append(tr("If you've found this program useful, please support by")); aboutStr.append(" "); - aboutStr.append(tr("donating") + "
"); + aboutStr.append(tr("donating") + "

"); + aboutStr.append(tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("

")); + aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini © 2011- 2014
"); - QMessageBox::about(this, tr("About companion9x"),aboutStr); + QMessageBox::about(this, tr("About Companion"),aboutStr); } void MainWindow::updateMenus() @@ -1624,15 +1626,15 @@ void MainWindow::createActions() connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences())); checkForUpdatesAct = new QAction(QIcon(":/images/update.png"), tr("&Check for updates..."), this); - checkForUpdatesAct->setStatusTip(tr("Check for new version of companion9x/er9x")); + checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion")); connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates())); contributorsAct = new QAction(QIcon(":/images/contributors.png"), tr("Contributors &List..."), this); - contributorsAct->setStatusTip(tr("Show companion9x contributors list")); + contributorsAct->setStatusTip(tr("Show Companion contributors list")); connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors())); changelogAct = new QAction(QIcon(":/images/changelog.png"), tr("ChangeLog..."), this); - changelogAct->setStatusTip(tr("Show companion9x changelog")); + changelogAct->setStatusTip(tr("Show Companion changelog")); connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog())); fwchangelogAct = new QAction(QIcon(":/images/changelog.png"), tr("Firmware ChangeLog..."), this); diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index f7461d149..3145cecff 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -182,12 +182,12 @@ void MdiChild::OpenEditWindow(bool wizard=false) QSettings settings("companion9x", "companion9x"); bool wizardEnable=settings.value("wizardEnable", true).toBool(); if (wizardEnable) { - ret = QMessageBox::question(this, tr("companion9x"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No); + ret = QMessageBox::question(this, tr("Companion"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { wizard=true; } else { qSleep(500); - ret = QMessageBox::question(this, tr("companion9x"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No); + ret = QMessageBox::question(this, tr("Companion"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::No) { settings.setValue("wizardEnable", false); } @@ -470,7 +470,7 @@ bool MdiChild::maybeSave() { if (fileChanged) { QMessageBox::StandardButton ret; - ret = QMessageBox::warning(this, tr("companion9x"), + ret = QMessageBox::warning(this, tr("Companion"), tr("%1 has been modified.\n" "Do you want to save your changes?").arg(userFriendlyCurrentFile()), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp index 756e3ffaf..4f3b3eb02 100644 --- a/companion/src/modelslist.cpp +++ b/companion/src/modelslist.cpp @@ -226,7 +226,7 @@ void ModelsListWidget::dropEvent(QDropEvent *event) if (row < 0) return; - // QMessageBox::warning(this, tr("companion9x"),tr("Index :%1").arg(row)); + // QMessageBox::warning(this, tr("Companion"),tr("Index :%1").arg(row)); const QMimeData *mimeData = event->mimeData(); if(mimeData->hasFormat("application/x-companion9x")) { @@ -360,9 +360,9 @@ void ModelsListWidget::deleteSelected(bool ask=true) } if (isModel==true) { if (radioData->generalSettings.currModel != selModel) { - ret = QMessageBox::warning(this, "companion9x", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No); + ret = QMessageBox::warning(this, "Companion", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No); } else { - ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok); + ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok); } } } @@ -373,9 +373,9 @@ void ModelsListWidget::deleteSelected(bool ask=true) ((MdiChild *)parent())->setModified(); } else if (index.row()>0) { if (ask) { - ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok); + ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok); } else { - ret = QMessageBox::warning(this, "companion9x", tr("Cannot cut default model."), QMessageBox::Ok); + ret = QMessageBox::warning(this, "Companion", tr("Cannot cut default model."), QMessageBox::Ok); } } } @@ -445,7 +445,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index) i++; gData++; if(c=='G') { //General settings - ret = QMessageBox::question(this, "companion9x", tr("Do you want to overwrite TX general settings?"), + ret = QMessageBox::question(this, "Companion", tr("Do you want to overwrite TX general settings?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { radioData->generalSettings = *((GeneralSettings *)gData); @@ -456,7 +456,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index) } else { //model data if (!radioData->models[id-1].isempty()) { - ret = QMessageBox::question(this, "companion9x", tr("You are pasting on an not empty model, are you sure?"), + ret = QMessageBox::question(this, "Companion", tr("You are pasting on an not empty model, are you sure?"), QMessageBox::Yes | QMessageBox::No); if (ret == QMessageBox::Yes) { radioData->models[id-1] = *((ModelData *)gData); @@ -519,7 +519,7 @@ void ModelsListWidget::duplicate() i++; } if (i==GetEepromInterface()->getMaxModels()) { - QMessageBox::warning(this, "companion9x", tr("No free slot available, cannot duplicate"), QMessageBox::Ok); + QMessageBox::warning(this, "Companion", tr("No free slot available, cannot duplicate"), QMessageBox::Ok); } } } diff --git a/companion/src/preferencesdialog.cpp b/companion/src/preferencesdialog.cpp index 6afa8ee9a..1d98d55ac 100644 --- a/companion/src/preferencesdialog.cpp +++ b/companion/src/preferencesdialog.cpp @@ -239,11 +239,11 @@ void preferencesDialog::firmwareChanged() } else { if (ui->fw_dnld->isEnabled()) { - ui->FwInfo->setText(tr("The selected firmware has never been downloaded by companion9x.")); + ui->FwInfo->setText(tr("The selected firmware has never been downloaded by Companion.")); ui->checkFWUpdates->hide(); } else { - ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by companion9x.")); + ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by Companion.")); ui->checkFWUpdates->hide(); } } @@ -506,10 +506,10 @@ void preferencesDialog::populateLocale() if (!strl.count()) return; QDir directory = QDir(":/"); - QStringList files = directory.entryList(QStringList("companion9x_*.qm"), QDir::Files | QDir::NoSymLinks); + QStringList files = directory.entryList(QStringList("companion_*.qm"), QDir::Files | QDir::NoSymLinks); foreach(QString file, files) { - QLocale loc(file.mid(12, 2)); + QLocale loc(file.mid(10, 2)); ui->locale_QB->addItem(QLocale::languageToString(loc.language()), loc.name()); } } @@ -660,7 +660,7 @@ void preferencesDialog::on_ProfSave_PB_clicked() QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value()); QString name=ui->ProfName_LE->text(); if (name.isEmpty()) { - int ret = QMessageBox::question(this, "companion9x", + int ret = QMessageBox::question(this, "Companion", tr("Profile name is empty, profile slot %1 will be deleted.
Are you sure ?").arg(ui->ProfSlot_SB->value()) , QMessageBox::Yes | QMessageBox::No); if (ret==QMessageBox::Yes) { @@ -719,7 +719,7 @@ void preferencesDialog::on_import_PB_clicked() QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value()); QString name=ui->ProfName_LE->text(); if (!name.isEmpty()) { - int ret = QMessageBox::question(this, "companion9x", + int ret = QMessageBox::question(this, "Companion", tr("Profile slot is not empty, profile slot %1 will we overwritten.
Are you sure ?").arg(ui->ProfSlot_SB->value()) , QMessageBox::Yes | QMessageBox::No); if (ret==QMessageBox::No) { diff --git a/companion/src/simulatordialog.cpp b/companion/src/simulatordialog.cpp index b55a4db82..0e3d2a688 100644 --- a/companion/src/simulatordialog.cpp +++ b/companion/src/simulatordialog.cpp @@ -227,7 +227,7 @@ void simulatorDialog::onTimerEvent() { static unsigned int lcd_counter = 0; if (!simulator->timer10ms()) { - QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError())); + QMessageBox::critical(this, "Companion", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError())); timer->stop(); return; } diff --git a/companion/src/simulatordialog.ui b/companion/src/simulatordialog.ui index 2c9b67de3..004da67c6 100644 --- a/companion/src/simulatordialog.ui +++ b/companion/src/simulatordialog.ui @@ -23,7 +23,7 @@ - Companion9x Simulator + Companion Simulator @@ -1092,6 +1092,7 @@ QPushButton:checked { + @@ -1810,6 +1811,7 @@ QPushButton:checked { QFrame::Raised + 2 @@ -2294,6 +2296,7 @@ border-radius: 4px; + 0 diff --git a/companion/src/translations.qrc.in b/companion/src/translations.qrc.in index d01dd945f..434cbd225 100644 --- a/companion/src/translations.qrc.in +++ b/companion/src/translations.qrc.in @@ -1,12 +1,12 @@ - companion9x_fr.qm - companion9x_de.qm - companion9x_he.qm - companion9x_it.qm - companion9x_pt.qm - companion9x_ru.qm - companion9x_sv.qm - companion9x_cs.qm + companion_fr.qm + companion_de.qm + companion_he.qm + companion_it.qm + companion_pt.qm + companion_ru.qm + companion_sv.qm + companion_cs.qm diff --git a/companion/src/translations/companion9x_cs.ts b/companion/src/translations/companion_cs.ts similarity index 94% rename from companion/src/translations/companion9x_cs.ts rename to companion/src/translations/companion_cs.ts index c6bef50cc..d656507aa 100644 --- a/companion/src/translations/companion9x_cs.ts +++ b/companion/src/translations/companion_cs.ts @@ -1239,9 +1239,9 @@ Opravdu to takto chcete ? - - - + + + File loaded Soubor byl načten @@ -1259,22 +1259,21 @@ Opravdu to takto chcete ? - - + + Unable to check for updates. Nelze ověřit aktualizace. - A new version of companion9x is available (version %1)<br>Would you like to download it? - Je dostupná nová verze companion9x (verze %1)<br>Chcete ji stáhnout nyní? + Je dostupná nová verze companion9x (verze %1)<br>Chcete ji stáhnout nyní? - - + + Save As Uložit jako @@ -1289,13 +1288,12 @@ Opravdu to takto chcete ? Je dostupné nové vydání - A new release of companion is available please check the repository - Je dostupné nové vydání companion9x, prosím zkontrolujte repozitář + Je dostupné nové vydání companion9x, prosím zkontrolujte repozitář - + No updates available at this time. žádné aktualizace nejsou nyní dostupné. @@ -1309,24 +1307,24 @@ Opravdu to takto chcete ? - - - - - - - - - + + + + + + + + + Error Chyba - - - + + + Error opening file %1: %2. Chyba při otevírání souboru %1: @@ -1366,10 +1364,8 @@ Opravdu to takto chcete ? Server companion je zaneprázdněn, zkuste to později - - Compilation server requires registration, please check opentx web site - Kompilační server vyžaduje registraci. Více najdete na webu opentx. + Kompilační server vyžaduje registraci. Více najdete na webu opentx. @@ -1382,7 +1378,7 @@ Opravdu to takto chcete ? Chcete nyní zapsat firmware do rádia ? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -1391,31 +1387,31 @@ Verze %2 je dostupná. Chcete ho nyní stáhnout ? - - + + Yes Ano - - + + No Ne - - + + Release Notes Poznámky k vydání - - + + Do you want to download release %1 now ? Chcete nyní stáhnout vydání %1 ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Nová verze firmware %1 je dostupná. @@ -1423,57 +1419,57 @@ Do you want to download it now ? Chcete ji stáhnout nyní ? - + Ignore this version (r%1)? Ignorovat tuto verzi (r%1)? - + Release notes contain very important informations. Do you want to see them now ? Poznámky k vydání mohou obsahovat důležité informace. Chcete si je přečíst nyní ? - + Open Otevřít - - + + File saved Soubor byl uložen - + Firmware updates Aktualizace firmwaru - + Current firmware does not provide release notes informations. K tomuto firmwaru nejsou poznámky k vydání. - + Cannot write file %1: %2. Nelze zapsat soubor %1: %2. - - - - - + + + + + Taranis radio not found Radio Taranis nenalezeno - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Nebylo možné identifikovat rádio ve vašem systému, zkontrolujte zda je eeprom disk připojen. @@ -1494,16 +1490,16 @@ nebyl rozpoznán jako platná EEPROM Chcete ji přesto naprogramovat? - - - + + + Backup is impossible Není možné zálohovat - - - + + + The backup dir set in preferences does not exist Složka pro zálohování zvolená v předvolbách neexistuje @@ -1516,8 +1512,8 @@ Chcete ji přesto naprogramovat? Nelze ověřit kompatibilitu EEprom! Mám přesto pokračovat? - - + + Warning Varování @@ -1538,7 +1534,7 @@ Chcete ji přesto naprogramovat? Zapsat do paměti FLASH rádia - + Conversion failed Porovnání selhalo @@ -1551,7 +1547,7 @@ Chcete ji přesto naprogramovat? Zapsat EEPROM do rádia - + Restore failed Zápis selhal @@ -1568,7 +1564,7 @@ Chcete ji přesto naprogramovat? Nemohu naprogramovat rádio, původní EEPROM najdete zde: %1 - + Backup failed Zálohování selhalo @@ -1585,19 +1581,12 @@ Chcete ji přesto naprogramovat? Načíst paměť FLASH z rádia do souboru - - - companion9x - Models and Settings Editor - %1 - profile %2 - companion9x - Editor nastavení rádia a modelů - %1 - profile %2 + companion9x - Editor nastavení rádia a modelů - %1 - profile %2 - - - - companion9x - Models and Settings Editor - %1 - companion9x - Editor nastavení rádia a modelů - %1 + companion9x - Editor nastavení rádia a modelů - %1 @@ -1605,10 +1594,10 @@ Chcete ji přesto naprogramovat? Chcete zapsat firmware do rádia nyní ? - - - - + + + + Read Models and Settings From Tx Načíst modely a nastavení z rádia @@ -1617,18 +1606,49 @@ Chcete ji přesto naprogramovat? Firmware does not longer fit in the Tx, due to selected firmware options Firmware s těmito vybranými součástmi, se již nevejde do rádia + + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + + + + + Compilation server requires registration, please check OpenTX web site + + Firmware does not fit in the Tx, due to selected firmware options Firmware s těmito vybranými součástmi, se již nevejde do rádia - + Write Models and settings from %1 to the Tx? Zapsat modely a nastavení z %1 do rádia? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -1637,386 +1657,406 @@ neobsahuje platná data modelů a nastavení Chcete ho přesto zapsat ? - - - - - - + + + + + + Backup Models and Settings From Tx Zálohovat modely a nastavení z rádia - + Cannot check Models and Settings compatibility! Continue anyway? Nelze ověřit kompatibilitu dat modelů a nastavení! Chcete přesto pokračovat? - + The transmitter firmware belongs to another product family, check file and preferences! Firmware patří do jiné produktové rodiny, zkontrolujte nastavení předvoleb! - + The transmitter firmware is outdated, please upgrade! Firmware rádia je zastaralý, aktualizujte ho prosím! - + Write Models and Settings To Tx Zapsat modely a nastavení do rádia - - + + Write Firmware To Tx Zapsat firmware do rádia - + Cannot convert Models and Settings for use with this firmware, original data will be used Nemohu konvertovat modely a nastavení pro použití s tímto firmwarem, budou použita původní data - + Restore Models and Settings To Tx Obnovit modely a nastavení do rádia - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Nelze obnovit modely a nastavení do rádia. Soubor s modely a nastavením najdete v: %1 - + Firmware write failed Zápis firmware selhal - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Nelze zapsat firmware do rádio. Data modelů a nastavení najdete v: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Nemohu zálohovat stávající modely a nastavení z rádia. Zápis firmware byl přerušen - + Save transmitter Models and Settings to File Uložit modely a nastavení do souboru - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Nebylo možné identifikovat rádio ve vašem systému, zkontrolujte zda je eeprom disk připojen. - + Read Tx Firmware to File Načíst firmware z rádia a uložit do souboru - + Copyright - + Version %1 (revision %2), %3 Verze %1 (revize %2), %3 - The companion9x project was originally forked from eePe - Projekt companion9x vznikl oddělením z eePe + Projekt companion9x vznikl oddělením z eePe - + If you've found this program useful, please support by Pokud vám byl tento program užitečný, podpořte jej - + donating darem - About companion9x - O aplikaci Companion9x + O aplikaci Companion9x - - - + + + &%1 %2 - + %1 %2 - + &New &Nový - + Create a new file Vytvořit nový soubor - + &Open... &Otevřít... - + Open an existing file Otevřít existující soubor - + &loadBackup... &Načíst zálohu... - + Load backup from file Načíst zálohu ze souboru - + &Save &Uložit - + Save the document to disk Uložit dokument na disk - + Save &As... Uložit j&ako... - + Save the document under a new name Uložit dokument s novým jménem - + Lo&gs Lo&gy - + Ctrl+G - + Open log file Otevřít soubor s logy - + &Preferences... &Předvolby... - + Edit general preferences Nastavení obecných předvoleb - + &Check for updates... &Zkontrolovat aktualizace... - Check for new version of companion9x/er9x - Zkontolovat dostupnost nové verze companion9x/er9x + Zkontolovat dostupnost nové verze companion9x/er9x - + Contributors &List... &Seznam přispěvatelů... - Show companion9x contributors list - Zobrazit seznam přispěvatelů companion9x + Zobrazit seznam přispěvatelů companion9x - + ChangeLog... Změny... - Show companion9x changelog - Zobrazit změny ve verzích companion9x + Zobrazit změny ve verzích companion9x - + + The Companion project was originally forked from eePe + + + + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + + + + Firmware ChangeLog... Změny firmware... - + Show firmware changelog Zobrazit změny ve firmware - + Compare... Porovnat... - + Compare models Porovnat modely - + Customize your &TX... &Přizpůsobení loga... - + Customize the splash screen of your TX Přizpůsobení úvodního logo vašeho rádia - + E&xit U&končit - + Exit the application Ukončit aplikaci companion9x - + Cu&t &Vyjmout - + Cut the current selection's contents to the clipboard Vyjmout aktuální výběr a uložit do schránky - + &Copy &Kopírovat - + Copy the current selection's contents to the clipboard Kopírovat aktuální výběr do schránky - + &Paste &Vložit - + Paste the clipboard's contents into the current selection Vložit obsah schránky na aktuální pozici - + &Write Models and Settings To Tx &Zapsat modely a nastavení do rádia - + Write Models and Settings to transmitter Zapsat modely a nastavení do rádia - + &Read Models and Settings From Tx &Načíst modely a nastavení z rádia - + Read Models and Settings from transmitter Načíst modely a nastavení z rádia - + Write Firmware Zapsat firmware - + Write firmware to transmitter Zapsat firmware do rádia - + Write Models and Settings from file to Tx Zapsat modely a nastavení ze souboru do rádia - + Write Models and Settings from file to transmitter Zapsat modely a nastavení ze souboru do rádia - + Save transmitter Models and Settings to file Uložit modely a nastavení z rádia do souboru - + Save the Models and Settings from the transmitter to a file Uložit modely a nastavení z rádia do souboru - + Read Firmware Načíst firmware - + Read firmware from transmitter Načíst firmware z rádia - + Configure software for reading from and writing to the transmitter Nastavení softwaru pro čtení a zápis do rádia - + &Read/Write Čtení/&Zápis - + Write Zápis - - + + Invalid Models and Settings File %1 Neplatný soubor modelů a nastavení %1 - + Invalid binary Models and Settings File %1 Neplatný binární soubor modelů a nastavení %1 @@ -2025,7 +2065,7 @@ Chcete ho přesto zapsat ? &Zapsat do EEPROM rádia - + Ctrl+Alt+W @@ -2038,7 +2078,7 @@ Chcete ho přesto zapsat ? &Načíst EEPROM z rádia - + Ctrl+Alt+R @@ -2079,7 +2119,7 @@ Chcete ho přesto zapsat ? Načíst paměť FLASH z rádia - + &Configure... &Konfigurace... @@ -2088,154 +2128,154 @@ Chcete ho přesto zapsat ? Konfigurace programátoru - + &List programmers &Seznam programátorů - + List available programmers Seznam použitelných programátorů - + &Fuses... Pojistky &mikrokontroléru... - + Show fuses dialog Zobrazit dialog nastavení pojistek mikrokontroléru - + &Simulate &Simulátor - + Alt+S - + Simulate selected model. Simulovat vybraný model. - + &Print &Tisk - + Ctrl+P - + Print current model. Vytisknout aktuální model. - + Cl&ose &Zavřít - + Close the active window Zavřít aktivní okno - + Close &All Zavřít &Vše - + Close all the windows Zavřít všechna okna - + &Tile D&laždice - + Tile the windows Uspořádat okna jako dlaždice - + &Cascade &Kaskáda - + Cascade the windows Uspořádat okna do kaskády - + Ne&xt &Další - + Move the focus to the next window Aktivovat následující okno - + Pre&vious &Předchozí - + Move the focus to the previous window Aktivovat předchozí okno - + &About &O aplikaci - + Show the application's About box O aplikaci companion9x - + Switch layout direction Přepnout styl panelu - + Switch layout Left/Right Přepnout styl rozložení panelu vlevo/vpravo - - + + Recent Files Nedávné soubory - - + + Firmware Profiles Profily firmwaru - + &File &Soubor - + &Edit &Úpravy @@ -2244,22 +2284,22 @@ Chcete ho přesto zapsat ? &Programátor - + &Window &Okno - + &Help &Nápověda - + File Soubor - + Edit Úpravy @@ -2268,17 +2308,17 @@ Chcete ho přesto zapsat ? Programátor - + Help Nápověda - + Ready Připraven - + Unable to find file %1! Nemohu nalézt soubor %1! @@ -2287,7 +2327,7 @@ Chcete ho přesto zapsat ? Neplatný soubor EEPROM %1 - + Error reading file %1: %2. Chyba při otevírání souboru %1: @@ -2396,15 +2436,15 @@ Chcete ho přesto zapsat ? - - - companion9x - + Do you want to use model wizard? + Chcete použít průvodce nastavením modelu? - Do you want to use model wizard? - Chcete použít průvodce nastavením modelu? + + + Companion + @@ -7772,18 +7812,26 @@ Formát ukládání obrázku loga v nastavení předvoleb se změnil. Zkontrolujte si nastavení loga v předvolbách. - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. We are really sensible to that! The openTX/C9X Team. - Děkujeme všem za příspěvky, dobré nápady a přátelské emaily k chystenému modelu financování openTX/C9x. + Děkujeme všem za příspěvky, dobré nápady a přátelské emaily k chystenému modelu financování openTX/C9x. Vážíme si toho a nasloucháme! Tým OpenTX/C9X. + + + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. + +We are really appreciative for that! + +The OpenTX/Companion Team. + + avrOutputDialog @@ -8146,8 +8194,8 @@ m2560 pro V4 desky - companion9x - + Companion + @@ -8251,6 +8299,11 @@ m2560 pro V4 desky Browse for file Procházet ... + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -8262,9 +8315,8 @@ m2560 pro V4 desky Logo nastavené v předvolbách - Allows companion9x to write to older version of the firmware - Povolí zápis do starší verze firmware + Povolí zápis do starší verze firmware @@ -9147,29 +9199,39 @@ m2560 pro V4 desky Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. + + + + + Companion Release Notes + + + + Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which companion9x was forked out. - Speciální poděkování patří Rafalu Tomczakovi (RadioClone), + Speciální poděkování patří Rafalu Tomczakovi (RadioClone), Thomasi Husteterovi (th9x) a také Erazovi Ravivovi(er9x) a jeho fantastickému eePe, na jehož základech companion9x vznikl. - + Thank you all !!! Děkujeme vám všem !!! - + Contributors Přispěvatelé - Companion9x Release Notes - Poznámky k vydání Companion9x + Poznámky k vydání Companion9x - + OpenTX Release Notes Poznámky k vydání OpenTX @@ -9324,8 +9386,8 @@ Obsahuje firmware podporu loga? - companion9x - + Companion + @@ -9668,9 +9730,13 @@ Tlačítkem Zrušit přerušíte kalibraci logsDialog - Companion9x log viewer - Companion9x - zobrazení logu + Companion9x - zobrazení logu + + + + Companion Log Viewer + @@ -9683,47 +9749,59 @@ Tlačítkem Zrušit přerušíte kalibraci Otevřít - + Zoom - + X - + Y - + Fly sessions Lety - + Telemetry logs Logy telemetrie - + Time Čas - + + Error + Chyba + + + + Cannot write file %1: +%2. + Nelze zapsat soubor %1: +%2. + + + Select your log file Vyberte soubor s logy - + Available fields Dostupná pole - + The selected logfile contains %1 invalid lines out of %2 total lines Zvolený soubor logu obsahuje %1neplatných řádků z celkových %2 @@ -10181,84 +10259,84 @@ Tlačítkem Zrušit přerušíte kalibraci Předvolby - + Check for selected Fw updates Aktualizace vybraného firmware - + Ask use of wizard for new models Zeptat se na použití průvodce pro nový model - + Invert Pixels Invertovat - - + + ... - + Remember switches in simulator Pamatovat si přepínače v simulátoru - + Enable Povolit - + Calibrate Kalibrovat - - - - + + + + Open Folder Vybrat složku - + FwInfo - + Check for updates Zkontrolovat aktualizace - + Open Image Načíst obrázek - + Language Jazyk - - + + Download Stáhnout - + Set language of voice. May be different from firmware language Vyberte jazykovou verzi hlasu tts(voice). Může být jiná než verze firmwaru - + Voice Hlas tts @@ -10309,63 +10387,63 @@ Může být jiná než verze firmwaru - + Ask for flashing after Download Po stažení firmwaru se zeptat, zda ho hned zapsat do rádia - + Export Profile Exportovat profil - + Import Profile Importovat profil - + Profile Name Název profilu - + Automatically add version number to the filename after download Přidat číslo verze do názvu souboru staženého firmwaru - + Save Profile Uložit profil - + Simu BackLight BackLight Color Barva podsvětlení Simu - + Blue Modrá - + Green Zelená - + Red Červená - + Orange Oranžová - + Yellow Žlutá @@ -10374,22 +10452,22 @@ Může být jiná než verze firmwaru Kontrolovat aktualizace vybraného firmwaru - + Check for updates on startup Aktualizace při spuštění - + Language (requires restart) Jazyk companion (vyžaduje restart) - + Custom TX splash screen Vlastní úvodní logo - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -10399,27 +10477,27 @@ Toto je použito šablonami k určení který kanál patří ke kterému výstupu. - + Firmware - + Default Stick Mode Výchozí mód vysílačky - + Default Channel Order Výchozí pořadí kanálů - + Show Splash Screen Zobrazit úvodní logo - + Personal splash library Vlastní knihovna s logy @@ -10428,7 +10506,7 @@ který kanál patří ke kterému výstupu. Pamatovat polohu přepínačů - + Mode selection: Mode 1: @@ -10469,57 +10547,57 @@ Mode 4: - + Mode 1 (RUD ELE THR AIL) Mode 1 (Směr.Výšk.Plyn.Křid) - + Mode 2 (RUD THR ELE AIL) Mode 2 (Směr.Plyn.Výšk.Křid) - + Mode 3 (AIL ELE THR RUD) Mode 3 (Křid.Výšk.Plyn.Směr) - + Mode 4 (AIL THR ELE RUD) Mode 4 (Křid.Plyn.Výšk.Směr) - + Joystick - + Include companion splashes Zahrnout i výchozí loga - + Only user defined splashes Jen vlastní loga - + Splash library behaviour Chování knihovny s logy - + Automatic Backup Folder Složka pro automatické zálohy - + SD Structure path Cesta k obsahu SD karty - + Processor ID ID procesoru @@ -10529,7 +10607,17 @@ Mode 4: Počet položek nedávné historie - + + Find Executable + + + + + Google Earth Executable + + + + Profile slot Slot profilu @@ -10538,7 +10626,7 @@ Mode 4: Složka pro zálohy EEprom - + auto backup before write zálohovat před zápisem @@ -10547,53 +10635,66 @@ Mode 4: Složka zvukových dat - + Simulator capture folder Složka pro snímky obrazovky Simu - + Use clipboard only Kopírovat pouze do schránky - + Last downloaded release: %1 Naposledy stažené vydání: %1 - The selected firmware has never been downloaded by companion9x. - Zvolený firmware ještě nebyl stažen pomocí companion9x. + Zvolený firmware ještě nebyl stažen pomocí companion9x. - The selected firmware cannot be downloaded by companion9x. - Companion9x nemůže stáhnout zvolený firmware. + Companion9x nemůže stáhnout zvolený firmware. - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Image stored in settings Logo nastavené v předvolbách - - + + No joysticks found Joystick nenalezen - + Select your Models and Settings backup folder Zvolte složku pro automatické zálohy modelů a nastavení - + + Select Google Earth executable + + + + Select the folder replicating your SD structure Vyberte složku která představuje obsah SD karty rádia - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? Název profilu je prázdný, slot %1 bude smazán.<br>Jste si jist ? @@ -10660,7 +10761,7 @@ zatim ve zkušební verzi Podpora DSM2 modulů s použitím PPM místo sériového protokolu - + Select your library folder Support for SD memory card Vyberte složkus s logy @@ -10739,7 +10840,7 @@ nutno zastavět hlasový modul Bez uživatelsky definovatelných křivek - + Select your snapshot folder Vyberte složku pro snímky obrazovky simulátoru @@ -10748,14 +10849,14 @@ nutno zastavět hlasový modul Vyber složku pro zálohování eeprom - - + + Error Chyba - - + + Cannot load %1. Nemohu načíst %1. @@ -10768,27 +10869,27 @@ nutno zastavět hlasový modul Název profilu je prázdný, slot %1 bude odstraněn.<br>Souhlasíte ? - + Export profile As Exportovat profil jako - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? Slot profilu není prázdný, slot %1 bude přepsán.<br>Jste si jist ? - + Open Profile to import Zvolte profil k importu - + Open Image to load Otevřít soubor - + Images (%1) obrázky (%1) @@ -11397,9 +11498,13 @@ nutno zastavět hlasový modul simulatorDialog - Companion9x Simulator - Companion9x Simulátor + Companion9x Simulátor + + + + Companion Simulator + @@ -11514,157 +11619,157 @@ nutno zastavět hlasový modul 9x Simulátor - + Outputs Výstupy - + CS1 VS1 - + CS2 VS2 - + CS3 VS3 - + CS4 VS4 - + CS5 VS5 - + CS6 VS6 - + CS7 VS7 - + CS8 VS8 - + CS9 VS9 - + CSA VSA - + CSB VSB - + CSC VSC - + CSD VSD - + CSE VSE - + CSF VSF - + CSG VSG - + CSH VSH - + CSI VSI - + CSJ VSJ - + CSL VSL - + CSM VSM - + CSN VSN - + CSO VSO - + CSP VSP - + CSQ VSQ - + CSR VSR - + CSS VSS - + CST VST - + CSU VSU - + CSV VSV @@ -11750,7 +11855,7 @@ nutno zastavět hlasový modul VSJ - + CSK SWK VSK @@ -11800,108 +11905,108 @@ nutno zastavět hlasový modul VSV - + CSW SWW VSW - + CH1 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 - + CH9 - + CH2 - + CH10 - + CH3 - + CH11 - + CH4 - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 @@ -11983,9 +12088,8 @@ nutno zastavět hlasový modul xsimulatorDialog - Companion9x Simulator - Companion9x Simulátor + Companion9x Simulátor @@ -12223,6 +12327,11 @@ nutno zastavět hlasový modul Taranis Simulator Taranis Simulátor + + + Companion Simulator + + @@ -12230,16 +12339,16 @@ nutno zastavět hlasový modul - - - - - - - - - - + + + + + + + + + + -100.1 @@ -12274,207 +12383,207 @@ nutno zastavět hlasový modul - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 - + CSK VSK - + CSC VSC - + CSD VSD - + CS7 VS7 - + CSL VSL - + CSB VSB - + CS1 VS1 - + CSH VSH - + CSG VSG - + CSE VSE - + CSF VSF - + CS8 VS8 - + CS9 VS9 - + CSA VSA - + CSM VSM - + CSJ VSJ - + CSI VSI - + CS4 VS4 - + CS5 VS5 - + CS2 VS2 - + CS3 VS3 - + CS6 VS6 - + CSN VSN - + CSO VSO - + CSP VSP - + CSQ VSQ - + CSR VSR - + CSS VSS - + CST VST - + CSU VSU - + CSV VSV - + CSW VSW diff --git a/companion/src/translations/companion9x_de.ts b/companion/src/translations/companion_de.ts similarity index 95% rename from companion/src/translations/companion9x_de.ts rename to companion/src/translations/companion_de.ts index 23280e633..fd62aa4cd 100644 --- a/companion/src/translations/companion9x_de.ts +++ b/companion/src/translations/companion_de.ts @@ -1304,9 +1304,9 @@ Are you sure ? - - - + + + File loaded Datei geladen @@ -1322,8 +1322,8 @@ Are you sure ? - - + + Save As Speichern unter @@ -1333,7 +1333,7 @@ Are you sure ? - + No updates available at this time. Kein Update vorhanden. @@ -1341,8 +1341,8 @@ Are you sure ? - - + + Unable to check for updates. Kann nicht auf Updates überprüfen. @@ -1365,14 +1365,20 @@ Are you sure ? Möchtest Du das Installationsprogramm starten ? - + + + Compilation server requires registration, please check OpenTX web site + + + + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Eine neue Version der %1-Firmware ist verfügbar (aktuell %2 - neueste %3).. Möchten Sie sie jetzt herunterladen? - + Open Öffnen @@ -1381,8 +1387,8 @@ Möchten Sie sie jetzt herunterladen? EEPROM Dateien (*.bin *.hex);;BIN Dateien (*.bin);;HEX Dateien (*.hex) - - + + File saved Datei gespeichert @@ -1423,7 +1429,7 @@ Möchten Sie sie jetzt herunterladen? Lese Flash und speichere in Datei - + Copyright Copyright @@ -1433,7 +1439,7 @@ Möchten Sie sie jetzt herunterladen? Wenn Du dieses Programm und/oder die Firmware nützlich findest dann unterstütze uns durch - + donating spenden @@ -1442,69 +1448,69 @@ Möchten Sie sie jetzt herunterladen? Über eePe - - - + + + &%1 %2 &%1 %2 - + %1 %2 %1 %2 - + &New &Neu - + Create a new file Neue Datei erstellen - + &Open... Datei ö&ffnen... - + Open an existing file Öffne eine bestehende Datei - + &Save Datei &speichern - + Save the document to disk Speichere das Dokument auf Festplatte - + Save &As... Speichern &unter... - + Save the document under a new name Speichere das Dokument unter einem neuen Namen - + &Preferences... &Einstellungen... - + Edit general preferences Bearbeite generelle Einstellungen - + &Check for updates... &Überprüfe auf Updates... @@ -1518,44 +1524,38 @@ Möchten Sie sie jetzt herunterladen? - A new version of companion9x is available (version %1)<br>Would you like to download it? Wether in french, which form of address do you prefer? - Eine neue Version von companion9x ist verfügbar (version %1)<br>Möchten Sie sie herunterladen? + Eine neue Version von companion9x ist verfügbar (version %1)<br>Möchten Sie sie herunterladen? New release available - - - A new release of companion is available please check the repository - - - - - - - - - - - + + + + + + + + + Error Fehler - - - + + + Error opening file %1: %2. Fehler beim Öffnen der Datei %1: @@ -1571,6 +1571,31 @@ Möchten Sie sie jetzt herunterladen? Display previous message again at startup ? + + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + Firmware does not longer fit in the Tx, due to selected firmware options @@ -1587,12 +1612,6 @@ Möchten Sie sie jetzt herunterladen? Compilation server too busy, try later - - - - Compilation server requires registration, please check opentx web site - - @@ -1605,7 +1624,7 @@ Möchten Sie sie jetzt herunterladen? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -1614,65 +1633,65 @@ Version %2 ist verfügbar. Möchten Sie sie jetzt herunterladen? - - + + Yes Ja - - + + No Nein - - + + Release Notes - - + + Do you want to download release %1 now ? - + Release notes contain very important informations. Do you want to see them now ? - + Firmware updates - + Current firmware does not provide release notes informations. - + Cannot write file %1: %2. Kann Datei %1: %2 nicht schreiben. - - - - - + + + + + Taranis radio not found - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. @@ -1685,16 +1704,16 @@ wurde nicht als gültige EEPROM Datei erkannt. Trotzdem brennen? - - - + + + Backup is impossible - - - + + + The backup dir set in preferences does not exist @@ -1703,8 +1722,8 @@ Trotzdem brennen? Sicherung EEPROM von Tx - - + + Warning Warnung @@ -1713,7 +1732,7 @@ Trotzdem brennen? Brenne Flash in den Tx - + Conversion failed Umwandlung gescheitert @@ -1726,7 +1745,7 @@ Trotzdem brennen? EEPROM in Tx zurückspeichern - + Restore failed Zurückspeicherung gescheitert @@ -1743,7 +1762,7 @@ Trotzdem brennen? Flashen des Tx nicht möglich, ursprüngliche EEProm Dateil ist verfügbar unter: %1 - + Backup failed Sicherung fehlgeschlagen @@ -1751,340 +1770,341 @@ Trotzdem brennen? Cannot backup existing EEProm from TX, Flash process aborted Sicherung des bestehenden EEEPROMs vom Tx gescheitert, Flash Prozess abgebrochen - - - - - companion9x - Models and Settings Editor - %1 - profile %2 - - - - - - - - companion9x - Models and Settings Editor - %1 - - Do you want to write the firmware to the transmitter now ? - - - - + + + + Read Models and Settings From Tx - + Write Models and settings from %1 to the Tx? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? - - - - - - + + + + + + Backup Models and Settings From Tx - + Cannot check Models and Settings compatibility! Continue anyway? - + The transmitter firmware belongs to another product family, check file and preferences! - + The transmitter firmware is outdated, please upgrade! - + Write Models and Settings To Tx - - + + Write Firmware To Tx - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore Models and Settings To Tx - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 - + Firmware write failed - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted - + Save transmitter Models and Settings to File - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. - + Read Tx Firmware to File - + Version %1 (revision %2), %3 Version %1 (Revision %2), %3 - The companion9x project was originally forked from eePe - Das 'companion9x' Projekt ist ursprünglich aus eePe entstanden. + Das 'companion9x' Projekt ist ursprünglich aus eePe entstanden. - + If you've found this program useful, please support by Wenn Sie diese Programm hilfreich finden, bitte unterstützen Sie - About companion9x - Über companion9x + Über companion9x - + &loadBackup... - + Load backup from file - + Lo&gs - + Ctrl+G - + Open log file - Check for new version of companion9x/er9x - Überprüfe auf neue Version von companion9x/er9x + Überprüfe auf neue Version von companion9x/er9x - + Contributors &List... &Mitwirkende... - Show companion9x contributors list - Zeige die Liste der Mitwirkenden von 'companion9x' + Zeige die Liste der Mitwirkenden von 'companion9x' - + ChangeLog... - - Show companion9x changelog + + The Companion project was originally forked from eePe - - Firmware ChangeLog... + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + Firmware ChangeLog... + + + + Show firmware changelog - + Compare... - + Compare models - + Customize your &TX... Passe Deinen &TX an... - + Customize the splash screen of your TX Persönliche Anpassung des Tx Startbildschirmes - + E&xit Be&enden - + Exit the application Beendet die Anwendung - + Cu&t &Ausschneiden - + Cut the current selection's contents to the clipboard Scheidet die momentane Auwahl aus und kopiert den Inhalt in den Zwischenspeicher - + &Copy &Kopieren - + Copy the current selection's contents to the clipboard Kopiert die momentane Auswahl in den Zwischenspeicher - + &Paste &Einfügen - + Paste the clipboard's contents into the current selection Fügt den Inhalt des Zwischenspeichers in die momentane Auswahl ein - + &Write Models and Settings To Tx - + Write Models and Settings to transmitter - + &Read Models and Settings From Tx - + Read Models and Settings from transmitter - + Write Firmware - + Write firmware to transmitter - + Write Models and Settings from file to Tx - + Write Models and Settings from file to transmitter - + Save transmitter Models and Settings to file - + Save the Models and Settings from the transmitter to a file - + Read Firmware - + Read firmware from transmitter - + Configure software for reading from and writing to the transmitter - - + + Invalid Models and Settings File %1 - + Invalid binary Models and Settings File %1 @@ -2093,7 +2113,7 @@ Write anyway ? &Schreibe EEPROM in den Sender - + Ctrl+Alt+W Ctrl+Alt+W @@ -2106,7 +2126,7 @@ Write anyway ? &Lese EEPROM vom Sender - + Ctrl+Alt+R Ctrl+Alt+R @@ -2147,7 +2167,7 @@ Write anyway ? Lese Flash Speicher und schreibe in den Sender - + &Configure... &Einstellungen... @@ -2156,143 +2176,143 @@ Write anyway ? Einstellungen Brennsoftware - + &List programmers &Programmiergeräte - + List available programmers Programmiergeräte - + &Fuses... &Fuses... - + Show fuses dialog Zeige Fuses Einstellungen - + &Simulate &Simulation - + Alt+S Alt+S - + Simulate selected model. Simuliert das ausgewählte Modell. - + &Print &Drucken - + Ctrl+P Ctrl+P - + Print current model. Drucke momentane Modelleinstellungen. - + Cl&ose &Schliessen - + Close the active window Schliesst das aktuelle Fenster - + Close &All Schliesse &Alles - + Close all the windows Schliesst alle Fenster - + &Tile &Anordnen - + Tile the windows Nebeneinander Ordnen von Fenstern - + &Cascade &Kaskadieren - + Cascade the windows Kaskadiere die Fenster - + Ne&xt Nä&chstes - + Move the focus to the next window Nächstes Fenster aufrufen - + Pre&vious Vor&hergehendes - + Move the focus to the previous window Vorhergehendes Fenster aufrufen - + &About &Über - + Show the application's About box Zeige das Infofenster - - + + Recent Files Letzte Dateien - + &Read/Write - + Write - + Unable to find file %1! Kann die Datei %1 nicht finden ! @@ -2301,7 +2321,7 @@ Write anyway ? Ungültige EEPROM Datei %1 - + Error reading file %1: %2. Fehler beim Lesen der Datei %1: @@ -2320,23 +2340,23 @@ Write anyway ? Zeige die er9x/eePe Mitwirkende - + Switch layout Left/Right Schalte Layout um Rechts/Links - - + + Firmware Profiles - + &File &Datei - + Switch layout direction Schalte Programmlayout um @@ -2350,7 +2370,7 @@ Write anyway ? Überprüfe auf Updates - + Ignore this version (r%1)? Diese Version ignorieren (%1)? @@ -2359,7 +2379,7 @@ Write anyway ? Eine neue Version von eePe ist vorhanden /r%1)<br>Möchtest Du diese herunterladen ? - + &Edit &Bearbeiten @@ -2368,22 +2388,22 @@ Write anyway ? B&rennen - + &Window &Fenster - + &Help &Hilfe - + File Datei - + Edit Bearbeiten @@ -2392,12 +2412,12 @@ Write anyway ? Brennen - + Help Hilfe - + Ready Fertig @@ -2562,6 +2582,13 @@ Möchtest Du die Änderungen speichern ? Do you want to use model wizard? + + + + + Companion + + Ask this question again ? @@ -2646,11 +2673,8 @@ Möchtest Du die Änderungen speichern ? - - - companion9x - companion9x + companion9x @@ -8253,11 +8277,11 @@ Right - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. -We are really sensible to that! +We are really appreciative for that! -The openTX/C9X Team. +The OpenTX/Companion Team. @@ -8640,8 +8664,12 @@ Bitte nutze dies nur wenn Du weißt was Du machst. Es gibt keine Plausibilitäts + Companion + + + companion9x - companion9x + companion9x @@ -8768,6 +8796,11 @@ m2560 fürRadios mit v4.1 Boards Substitute image in firmware Ersetze Bild in Firmware + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -8800,11 +8833,6 @@ m2560 fürRadios mit v4.1 Boards Browse for file - - - Allows companion9x to write to older version of the firmware - - Check Firmware compatibility @@ -9671,29 +9699,35 @@ m2560 fürRadios mit v4.1 Boards Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. + + + + + Companion Release Notes + + + + Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which companion9x was forked out. - Ehre gebührt Rafal Tomczak (RadioClone) und natürlich Thomas + Ehre gebührt Rafal Tomczak (RadioClone) und natürlich Thomas Husterer (th9x) und auch Erez Raviv (er9x) und sein fantastisches eePe, worauf companion9x basiert. - + Thank you all !!! Besten Dank an alle! - + Contributors Mitwirkende - - Companion9x Release Notes - - - - + OpenTX Release Notes @@ -9858,8 +9892,12 @@ p, li { white-space: pre-wrap; } + Companion + + + companion9x - companion9x + companion9x eePe @@ -10279,7 +10317,7 @@ Wähle "abbrechen", um die Kalibration abzubrechen logsDialog - Companion9x log viewer + Companion Log Viewer @@ -10293,47 +10331,59 @@ Wähle "abbrechen", um die Kalibration abzubrechen - + Zoom - + X - + Y - + Fly sessions - + Telemetry logs - + Time - + + Error + Fehler + + + + Cannot write file %1: +%2. + Kann Datei %1: +%2 nicht schreiben. + + + Select your log file - + Available fields - + The selected logfile contains %1 invalid lines out of %2 total lines @@ -10791,7 +10841,7 @@ Wähle "abbrechen", um die Kalibration abzubrechen Einstellungen - + Language (requires restart) Sprache (Benötigt Neustart) @@ -10804,7 +10854,7 @@ Wähle "abbrechen", um die Kalibration abzubrechen eePe - + Show Splash Screen Startbild anzeigen @@ -10830,18 +10880,18 @@ Wähle "abbrechen", um die Kalibration abzubrechen Anzahl zuletzt geöffnete Dateien - - + + Download Download - + Default Channel Order Standardeinstellung Kanalzuordnung - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -10850,12 +10900,12 @@ This is used by the templated to determine which channel goes to what number out Hier wird die Zuordnung der Kanäle zum Ausgang festgelegt. - + Default Stick Mode Standard Knüppelmodus - + Mode selection: Mode 1: @@ -10900,117 +10950,117 @@ Mode 4: Prüfe ausgewählte Fw Updates - + Mode 1 (RUD ELE THR AIL) Mode 1 (RUD ELE THR AIL) - + Mode 2 (RUD THR ELE AIL) Mode 2 (RUD THR ELE AIL) - + Mode 3 (AIL ELE THR RUD) Mode 3 (AIL ELE THR RUD) - + Mode 4 (AIL THR ELE RUD) Mode 4 (AIL THR ELE RUD) - + Automatic Backup Folder - + Automatically add version number to the filename after download - + Voice - + Set language of voice. May be different from firmware language - + Firmware Firmware - + Check for updates on startup Überprüfe auf Aktualisierung beim Start - - + + ... ... - + Splash library behaviour Verhalten Startbild Bibliothek - + Include companion splashes 'companion' Startbilder einschliessen - + Only user defined splashes Nur Benutzer Startbilder - + Custom TX splash screen Benutzer Startbild - + Personal splash library Benutzer Startbild Bibliothek - + Joystick Joystick - - - - + + + + Open Folder Verzeichnis öffnen - + SD Structure path - + Processor ID - + Simulator capture folder - + Use clipboard only @@ -11061,113 +11111,123 @@ May be different from firmware language CheckBox - + Check for updates Prüfe für Updates - + Language - + Profile Name - + Export Profile - + Save Profile - + Import Profile - + Simu BackLight - + Check for selected Fw updates - + Ask use of wizard for new models - + Remember switches in simulator - + Blue Blu blau - + Green grün - + Red rot - + Orange orange - + Yellow gelb - + Profile slot - + auto backup before write - + + Find Executable + + + + + Google Earth Executable + + + + Ask for flashing after Download - + Enable aktivieren - + Calibrate kalibrieren - + Open Image Bild öffnen - + Invert Pixels Pixel invertieren @@ -11176,63 +11236,66 @@ May be different from firmware language HG Beleuchtung - + FwInfo FwInfo - + Last downloaded release: %1 Letzte geladene Version: %1 - The selected firmware has never been downloaded by companion9x. - Die gewählte Firmware wurde noch nie von companion9x geladen. + Die gewählte Firmware wurde noch nie von companion9x geladen. - The selected firmware cannot be downloaded by companion9x. - Die gewählte Firmware kann von companio9x nicht geladen werden. + Die gewählte Firmware kann von companio9x nicht geladen werden. - + Image stored in settings Gewähltes Bild in Einstellungen - - + + No joysticks found kein Joystick gefunden - + Select your Models and Settings backup folder - + + Select Google Earth executable + + + + Select the folder replicating your SD structure - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - + Export profile As - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - + Open Profile to import @@ -11241,34 +11304,44 @@ May be different from firmware language Bitte Bibliothek Verzeichnis wählen - + Open Image to load Bilddatei öffnen - + Images (%1) Bilder (%1) - - + + Error Fehler - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your library folder - + Select your snapshot folder - - + + Cannot load %1. Kann %1 nicht laden. @@ -12026,10 +12099,9 @@ May be different from firmware language simulatorDialog - Companion9x Simulator ER9x Simulator - Companion9x Simulator + Companion9x Simulator @@ -12165,7 +12237,7 @@ May be different from firmware language 9x Simulator - + Outputs Ausgaben @@ -12205,264 +12277,269 @@ May be different from firmware language SW12 - + CSK SWK - + CS1 - + + Companion Simulator + + + + CS2 - + CS3 - + CS4 - + CS5 - + CS6 - + CS7 - + CS8 - + CS9 - + CSA - + CSB - + CSC - + CSD - + CSE - + CSF - + CSG - + CSH - + CSI - + CSJ - + CSL - + CSM - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW SWW - + CH1 CH1 - + CH9 CH9 - + CH2 CH2 - + CH10 CH10 - + CH3 CH3 - + CH11 CH11 - + CH4 CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 -100.1 @@ -12544,9 +12621,8 @@ May be different from firmware language xsimulatorDialog - Companion9x Simulator - Companion9x Simulator + Companion9x Simulator @@ -12655,7 +12731,7 @@ May be different from firmware language Ausgaben - + CSK SWK @@ -12723,6 +12799,11 @@ May be different from firmware language S2 + + + Companion Simulator + + @@ -12753,16 +12834,16 @@ May be different from firmware language - - - - - - - - - - + + + + + + + + + + -100.1 -100.1 @@ -12797,202 +12878,202 @@ May be different from firmware language CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - + CSC - + CSD - + CS7 - + CSL - + CSB - + CS1 - + CSH - + CSG - + CSE - + CSF - + CS8 - + CS9 - + CSA - + CSM - + CSJ - + CSI - + CS4 - + CS5 - + CS2 - + CS3 - + CS6 - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW SWW diff --git a/companion/src/translations/companion9x_fr.ts b/companion/src/translations/companion_fr.ts similarity index 94% rename from companion/src/translations/companion9x_fr.ts rename to companion/src/translations/companion_fr.ts index 46f1297e4..d62d3e8c8 100644 --- a/companion/src/translations/companion9x_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -1202,7 +1202,7 @@ Are you sure ? MainWindow - + &New &Nouveau @@ -1211,17 +1211,17 @@ Are you sure ? Flasher - + Cu&t C&ouper - + Edit Edition - + File Fichier @@ -1240,33 +1240,32 @@ Are you sure ? Nouvelle version disponible - A new release of companion is available please check the repository - Une nouvelle version de companion9x est disponible, veuillez vérifier dans l'espace de téléchargement + Une nouvelle version de companion9x est disponible, veuillez vérifier dans l'espace de téléchargement - - - - - - - - - + + + + + + + + + Error Erreur - - - + + + Error opening file %1: %2. Erreur à l'ouverture du fichier %1: @@ -1306,10 +1305,8 @@ Are you sure ? Serveur de compilation trop occupé - - Compilation server requires registration, please check opentx web site - Le serveur de compilation nécessite d'être enregistré, veuillez vous référer au site web d'openTx + Le serveur de compilation nécessite d'être enregistré, veuillez vous référer au site web d'openTx @@ -1322,70 +1319,70 @@ Are you sure ? Voulez-vous flasher ce firmware maintenant ? - - + + Yes Oui - - + + No Non - - + + Release Notes Release Notes - - + + Do you want to download release %1 now ? Voulez-vous télécharger la release %1 ? - + Release notes contain very important informations. Do you want to see them now ? Les notes de version contiennent des informations très importantes. Voulez-vous les voir maintenant? - + Open Ouvrir - + Firmware updates Mises à jour de firmware - + Current firmware does not provide release notes informations. Le firmware actuel ne contient pas de notes de version. - + Cannot write file %1: %2. Ecriture fichier %1 impossible: %2. - - - - - + + + + + Taranis radio not found Radio Taranis non détectée - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Impossible de trouver la radio, vérifiez qu'elle est bien sous tension et connectée. @@ -1396,16 +1393,16 @@ Burn anyway ? Le fichier %1 n'est pas reconnu comme une EEPROM valide. Confirmer le transfert ? - - - + + + Backup is impossible Sauvegarde impossible - - - + + + The backup dir set in preferences does not exist Le dossier de sauvegarde configuré dans les préférences n'existe pas @@ -1418,8 +1415,8 @@ Burn anyway ? Impossible de vérifier la compatibilité de l'EEPROM! Continuer quand même? - - + + Warning Avertissement @@ -1440,7 +1437,7 @@ Burn anyway ? Flasher l'émetteur - + Conversion failed La conversion a échoué @@ -1453,7 +1450,7 @@ Burn anyway ? Restaurer l'EEPROM vers l'émetteur - + Restore failed Erreur lors de la restauration @@ -1470,7 +1467,7 @@ Burn anyway ? Impossible de flasher l'émetteur, l'EEPROM d'origine se trouve dans : %1 - + Backup failed Erreur lors de la sauvegarde @@ -1479,87 +1476,86 @@ Burn anyway ? Impossible de sauvegarder l'EEPROM. Flashage annulé - + %1 %2 - + &loadBackup... c&harger sauvegarde... - + Load backup from file Charger une sauvegarde à partir du fichier - + Lo&gs - + Ctrl+G - + Open log file Ouvrir fichier de log - + ChangeLog... Historique des changements... - Show companion9x changelog - Historique des changements de companion9x + Historique des changements de companion9x - + Firmware ChangeLog... Historique des changements du firmware... - + Show firmware changelog Montrer l'historique des changements du firmware - + Compare... Comparer... - + Compare models Comparer les modèles - + Configure software for reading from and writing to the transmitter Configure le programme pour communiquer correctement avec la radio - + Show fuses dialog Afficher les réglages des fusibles - + &Read/Write &Lire/Ecrire - + Write Ecrire - + Unable to find file %1! Fichier %1 introuvable! @@ -1568,7 +1564,7 @@ Burn anyway ? Fichier EEPROM %1 invalide - + Error reading file %1: %2. Fichier %1 corrompu: @@ -1587,78 +1583,119 @@ Burn anyway ? Fl&asher - + &Copy &Copier - + &Edit Éditio&n - + &File &Fichier - + &Help &Aide - + &Save &Enregistrer - + &Tile &Mosaïque - + E&xit &Quitter - + Alt+S - + &Simulate &Simulation + + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + Firmware does not longer fit in the Tx, due to selected firmware options Le firmware sélectionné est trop gros pour la mémoire de la radio, veuillez sélectionner moins d'options + + + + Compilation server requires registration, please check OpenTX web site + + Firmware does not fit in the Tx, due to selected firmware options Le firmware sélectionné est trop gros pour la mémoire de la radio, veuillez sélectionner moins d'options - + Write Models and settings from %1 to the Tx? Ecrire les réglages et modèles de %1 dans la radio? - + + Show Companion contributors list + + + + + Show Companion changelog + + + + Ne&xt Sui&vante - - + + Firmware Profiles Profils de firmware - + Ready Prêt @@ -1667,39 +1704,39 @@ Burn anyway ? Enregistrer la mémoire Flash sous - + Show the application's About box Afficher la fenêtre "A propos" de l'application - - - + + + &%1 %2 - + &About &À Propos - + &Paste Co&ller - + &Print Im&primer - + Save &As... Enregistrer &Sous... - + Cascade the windows Disposer les fenêtres en cascade @@ -1708,32 +1745,32 @@ Burn anyway ? Lire la mémoire Flash - + Paste the clipboard's contents into the current selection Coller le contenu du presse-papier à l'emplacement sélectionné - + Open an existing file Ouvrir un fichier existant - + &Configure... &Configurer la communication... - + Cl&ose &Fermer - + Ctrl+P - + Print current model. Imprimer les données du modèle sélectionné. @@ -1742,7 +1779,7 @@ Burn anyway ? Charger l'EEPROM de l'émetteur - + Close all the windows Fermer toutes les fenêtres @@ -1751,56 +1788,56 @@ Burn anyway ? Écrire dans la mémoire Flash de l'émetteur - + donating don - + &Open... &Ouvrir... - + Create a new file Créer un nouveau fichier - + Close the active window Fermer la fenêtre active - - - + + + File loaded Fichier chargé - - + + File saved Fichier sauvegardé - + Switch layout direction Inverser l'interface - + Move the focus to the previous window Activer la fenêtre précedente - + Pre&vious P&récédente - + Exit the application Quitter l'application @@ -1809,32 +1846,32 @@ Burn anyway ? Écrire la mémoire Flash - + List available programmers Lister les programmateurs supportés - + Save the document to disk Enregistrer sur le disque - + Close &All Fermer To&ut - + &Cascade &Cascade - + Simulate selected model. Simuler le modèle sélectionné - + Tile the windows Disposer les fenêtres en mosaïque @@ -1843,47 +1880,46 @@ Burn anyway ? Lire la mémoire Flash de l'émetteur - + Save the document under a new name Enregistrer sous un nom différent - + &Window Fe&nêtre - + Edit general preferences Définir les préférences générales - + &Preferences... &Préférences... - About companion9x - À propos de companion9x + À propos de companion9x - + &Fuses... &Fusibles... - + Copy the current selection's contents to the clipboard Copier la sélection dans le presse-papier - + Move the focus to the next window Activer la fenêtre suivante - + &List programmers &Programmateurs supportés @@ -1892,17 +1928,17 @@ Burn anyway ? Transférer l'EEPROM vers l'émetteur - + Cut the current selection's contents to the clipboard Couper la sélection et la copier dans le presse-papier - + Ctrl+Alt+R - + Ctrl+Alt+W @@ -1923,22 +1959,21 @@ Burn anyway ? Enregistrer l'EEPROM de l'émetteur dans un fichier - + Version %1 (revision %2), %3 Version %1 (révision %2), %3 - The companion9x project was originally forked from eePe - Le projet companion9x a été créé à partir de eePe + Le projet companion9x a été créé à partir de eePe - + Customize your &TX... &Personnaliser votre émetteur... - + Customize the splash screen of your TX Personnaliser l'écran de démarrage de votre émetteur @@ -1962,8 +1997,8 @@ Burn anyway ? - - + + Save As Enregistrer Sous @@ -1974,7 +2009,7 @@ Burn anyway ? - + No updates available at this time. Aucune mise à jour disponible. @@ -1982,8 +2017,8 @@ Burn anyway ? - - + + Unable to check for updates. Impossible de rechercher des mises à jour. @@ -1993,7 +2028,7 @@ Burn anyway ? Voulez-vous lancer l'installation ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Une nouvelle version du firmware %1 est disponible (courante %2 - nouvelle %3). @@ -2004,32 +2039,31 @@ Voulez vous la télécharger maintenant ? Transférer %1 dans la mémoire EEPROM de l'émetteur ? - + &Check for updates... Re&chercher des mises à jour... - Check for new version of companion9x/er9x - Vérifier l'existence d'une nouvelle version de companion9x et du firmware sélectionné + Vérifier l'existence d'une nouvelle version de companion9x et du firmware sélectionné - + Copyright Copyright - + Switch layout Left/Right Inverser l'interface gauche/droite - + Ignore this version (r%1)? Ignorer cette version (r%1)? - + Help Aide @@ -2039,24 +2073,16 @@ Voulez vous la télécharger maintenant ? Recherche de mises à jour - - - companion9x - Models and Settings Editor - %1 - profile %2 - companion9x - Editeur de réglages et modèles - %1 - profil %2 + companion9x - Editeur de réglages et modèles - %1 - profil %2 - - - - companion9x - Models and Settings Editor - %1 - companion9x - Editeur de réglages et modèles - %1 + companion9x - Editeur de réglages et modèles - %1 - 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 ? + Une nouvelle version de companion9x est disponible (r%1)<br>Voulez-vous la télécharger ? @@ -2064,7 +2090,7 @@ Voulez vous la télécharger maintenant ? Voulez-vous vraiment flasher le firmware de la radio? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -2073,15 +2099,15 @@ La version %2 est disponible. Voulez-vous la télécharger maintenant ? - - - - + + + + Read Models and Settings From Tx Lire les réglages et modèles depuis la radio - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -2090,158 +2116,172 @@ n'a pas été reconnu comme un fichier de réglage et modèles valide. Ecrire quand même? - - - - - - + + + + + + Backup Models and Settings From Tx Sauvegarder les réglages et modèles depuis la radio - + Cannot check Models and Settings compatibility! Continue anyway? Impossible de vérifier la compatibilité des réglages et modèles. Continuer quand même? - + The transmitter firmware belongs to another product family, check file and preferences! Le firmware sélectionné est destiné à un différent type de radio, veuillez vérifier le fichier et les préférences! - + The transmitter firmware is outdated, please upgrade! Le firmware de la radio est obsolète, veuillez mettre à jour! - + Write Models and Settings To Tx Ecrire les réglages et modèles dans la radio - - + + Write Firmware To Tx Flasher le firmware de la radio - + Cannot convert Models and Settings for use with this firmware, original data will be used Impossible de convertir les réglages et modèles pour ce firmware, les données originales vont être utilisées - + Restore Models and Settings To Tx Restaurer une sauvegarde de réglages et modèles - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Impossible de restaurerles réglages et modèles. Une copie du fichier est placée ici: %1 - + Firmware write failed L'écriture du firmware a échoué. - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Impossible de flasher le firmware. Une copie du fichier de réglages et modèles est placée ici: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Impossible de sauvegarder les réglages et modèles de la radio. Le flashage est abandonné. - + Save transmitter Models and Settings to File Sauvegarder les réglages et modèles depuis la radio dans un fichier - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Impossible de trouver la radio, veuillez vérifier que la radio est sous tension sur la page d'accueil et connectée. - + Read Tx Firmware to File Sauvegarder le firmware de la radio dans un fichier + The Companion project was originally forked from eePe + + + + If you've found this program useful, please support by Si vous trouvez ce programme utile, merci d'apporter votre soutien en effectuant un - + + About Companion + + + + + Check for new version of Companion + + + + Contributors &List... &Liste des contributeurs... - Show companion9x contributors list - Lister les contributeurs de companion9x + Lister les contributeurs de companion9x - + &Write Models and Settings To Tx &Transférer les réglages et modèles à la radio - + Write Models and Settings to transmitter Transférer les réglages et modèles à la radio - + &Read Models and Settings From Tx &Lire les réglages et modèles depuis la radio - + Read Models and Settings from transmitter Lire les réglages et modèles depuis la radio - + Write Firmware Flasher le firmware - + Write firmware to transmitter Flasher le firmware de la radio - + Write Models and Settings from file to Tx Restaurer les réglages et modèles depuis un fichier - + Write Models and Settings from file to transmitter Restaurer les réglages et modèles depuis un fichier - + Save transmitter Models and Settings to file Sauvegarder les réglages et modèles dans un fichier - + Save the Models and Settings from the transmitter to a file Sauvegarder les réglages et modèles dans un fichier - + Read Firmware Lire le firmware de la radio - + Read firmware from transmitter Lire le firmware de la radio @@ -2254,32 +2294,25 @@ Ecrire quand même? Configure le programme pour communiquer correctement avec la radio - - + + Recent Files Derniers documents utilisés - - + + Invalid Models and Settings File %1 Fichier de réglages et modèles invalide: %1 - + Invalid binary Models and Settings File %1 Fichier binaire de réglages et modèles invalide: %1 MdiChild - - - - - companion9x - - @@ -2373,6 +2406,13 @@ Ecrire quand même? Do you want to use model wizard? Voulez-vous utiliser l'assistant de configuration de modèle ? + + + + + Companion + + Ask this question again ? @@ -7355,18 +7395,26 @@ Check your settings again. Attention, le format de l'écran d'accueil personnalisé dans les préférences a changé. Veuillez le sélectionner à nouveau le cas échéant. - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. We are really sensible to that! The openTX/C9X Team. - Merci pour vos donations, messages, bonnes idées, propositions constructives pour le nouveau système de financement d'openTx. + Merci pour vos donations, messages, bonnes idées, propositions constructives pour le nouveau système de financement d'openTx. Nous en sommes très reconnaissants! L'équipe d'openTx/C9X + + + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. + +We are really appreciative for that! + +The OpenTX/Companion Team. + + avrOutputDialog @@ -7631,6 +7679,12 @@ Consulter la documentation du programmateur utilisé et celle d'AVRDUDE pou Select Location Choisir l'emplacement + + + + Companion + + <b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue? @@ -7731,10 +7785,8 @@ m2560 for v4.1 boards Port série de SAM-BA - - companion9x - companion9x + companion9x @@ -7784,6 +7836,11 @@ m2560 for v4.1 boards Browse for file Parcourir... + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -7831,9 +7888,8 @@ m2560 for v4.1 boards Variante - Allows companion9x to write to older version of the firmware - Permet à companion9x de programmer des anciennes versions de firmware + Permet à companion9x de programmer des anciennes versions de firmware @@ -8607,28 +8663,38 @@ m2560 for v4.1 boards Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. + + + + + Companion Release Notes + + + + Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which companion9x was forked out. - Un merci tout particulier à Rafal Tomczak (RadioClone) et Thomas Husterer (th9x) bien sûr. + Un merci tout particulier à Rafal Tomczak (RadioClone) et Thomas Husterer (th9x) bien sûr. Egalement à Erez Raviv (er9x) et son fantastique programme eePe d'où est parti companion9x. - + Thank you all !!! Merci à tous !!! - + Contributors Contributeurs - Companion9x Release Notes - Notes de version de companion9x + Notes de version de companion9x - + OpenTX Release Notes Notes de version d'openTx @@ -8778,8 +8844,12 @@ p, li { white-space: pre-wrap; } + Companion + + + companion9x - companion9x + companion9x @@ -9132,9 +9202,13 @@ Press cancel to abort joystick calibration logsDialog - Companion9x log viewer - Visualiseur de log + Visualiseur de log + + + + Companion Log Viewer + @@ -9147,47 +9221,59 @@ Press cancel to abort joystick calibration Ouvrir fichier de log - + Zoom - + X - + Y - + Fly sessions Sessions de vol - + Telemetry logs Enregistrements de télémesure - + Time Heure - + + Error + Erreur + + + + Cannot write file %1: +%2. + Ecriture fichier %1 impossible: +%2. + + + Select your log file Sélectionnez votre fichier log - + Available fields Champs disponibles - + The selected logfile contains %1 invalid lines out of %2 total lines Le fichier de log sélectionné contient %1 lignes invalides sur %2 @@ -9642,17 +9728,17 @@ Press cancel to abort joystick calibration preferencesDialog - + Mode 2 (RUD THR ELE AIL) Mode 2 (DIR GAZ PROF AIL) - + Mode 4 (AIL THR ELE RUD) Mode 4 (AIL GAZ PROF DIR) - + Mode selection: Mode 1: @@ -9693,88 +9779,88 @@ Manche Droit: Profondeur, Direction - + Mode 3 (AIL ELE THR RUD) Mode 3 (AIL PROF GAZ DIR) - + Firmware - - + + ... - + Enable Actif - + Calibrate Calibrer - - - - + + + + Open Folder Ouvrir le répertoire - + Set language of voice. May be different from firmware language Langue des voix. Peut être différente de la langue du firmware - + Export Profile Exporter le profil - + Import Profile Importer le profil - + Custom TX splash screen Personnaliser l'écran d'accueil - + Automatic Backup Folder Dossier de sauvegardes automatiques - + Automatically add version number to the filename after download Ajouter le numéro de version au nom de fichier après téléchargement - + SD Structure path Chemin de la structure de la carte SD - + Processor ID ID du processeur - + Simulator capture folder Dossier de sauvegarde des captures d'écran - + Use clipboard only Utiliser le presse-papiers @@ -9825,12 +9911,12 @@ Peut être différente de la langue du firmware - + Check for updates Vérifier les mises à jour - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -9838,138 +9924,148 @@ This is used by the templated to determine which channel goes to what number out Indique l'affectation voie / numéro de canal par défaut utilisée lors de la création d'un modèle. - + Language Langue - + Voice Voix - + Profile Name Nom du profil - + Save Profile Sauvegarder profil - + Simu BackLight Rétroéclairage simu - + Check for selected Fw updates Vérifier les mises à jour de firmwares au démarrage - + Ask use of wizard for new models Utiliser l'assistant de configuration de modèle - + Remember switches in simulator Mémoriser les inters pour le simulateur - + Blue Blu Bleu - + Green Vert - + Red Rouge - + Orange Orange - + Yellow Jaune - + Personal splash library Bibliothèque de splashs personnalisés - + Profile slot Numéro de profil + + + Find Executable + + + + + Google Earth Executable + + eEprom backup folder Dossier de sauvegarde de l'EEPROM - + auto backup before write Sauvegarde automatique avant programmation - + Ask for flashing after Download Demander pour flasher après téléchargement - + Splash library behaviour Utilisation de la bibliothèque de Splashes - + Include companion splashes Inclure les écrans d'accueil de companion9x - + Only user defined splashes Seulement vos écrans d'accueil - + Joystick Joystick - + Open Image Charger une image - + Invert Pixels Inverser les couleurs - + FwInfo - + Language (requires restart) Version française par Pascal Dugué / Octobre 2010. Langue (nécessite un redémarrage de companion9x) - + Default Channel Order Ordre des voies par défaut @@ -9979,22 +10075,22 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Préférences - + Default Stick Mode Mode par défaut - + Mode 1 (RUD ELE THR AIL) Mode 1 (DIR PROF GAZ AIL) - + Check for updates on startup Vérifier les mises à jour au démarrage - + Show Splash Screen Afficher l'écran d'accueil au démarrage @@ -10004,90 +10100,103 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Taille de l'historique des derniers documents utilisés - - + + Download Télécharger - + Last downloaded release: %1 Dernière version téléchargée : %1 - The selected firmware has never been downloaded by companion9x. - Le firmware sélectionné n'a jamais été téléchargé par companion9x. + Le firmware sélectionné n'a jamais été téléchargé par companion9x. - The selected firmware cannot be downloaded by companion9x. - Le firmware sélectionné ne peut pas être téléchargé par companion9x. + Le firmware sélectionné ne peut pas être téléchargé par companion9x. - + Image stored in settings Image enregistrée dans les paramètres - - + + No joysticks found Aucun joystick - + Select your Models and Settings backup folder Sélectionner le dossier dans lequel une sauvegarde des réglages et modèles sera placée automatiquement lors de chaque opération - + + Select Google Earth executable + + + + Select the folder replicating your SD structure Sélectionner un dossier contenant une copie des dossiers de la carte SD - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? Le nom du profil est vide, le profil %1 va être effacé.<br>Etes-vous sûr? - + Export profile As Exporter le profil sous - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? L'emplacement %1 n'est pas vide, il va être écrasé. Continuer? - + Open Profile to import Ouvrir le profil à importer - + Open Image to load Ouvre l'image à charger - + Images (%1) Images (%1) - - + + Error Erreur - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your library folder Sélectionner le dossier de bibliothèque - + Select your snapshot folder Sélectionner le dossier où stocker les captures d'écran @@ -10096,8 +10205,8 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Sélectionner le dossier de sauvegarde d'EEPROM - - + + Cannot load %1. Impossible de charger %1. @@ -10625,59 +10734,59 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de - + CSK SWK IPK - + CSW SWW IPW - + CH1 - + CH2 - + CH3 - + CH4 - + CH5 - + CH6 - + CH7 - + CH8 - + CH9 @@ -10742,187 +10851,192 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de BIP - + + Companion Simulator + + + + CS1 IP1 - + CS2 IP2 - + CS3 IP3 - + CS4 IP4 - + CS5 IP5 - + CS6 IP6 - + CS7 IP7 - + CS8 IP8 - + CS9 IP9 - + CSA IPA - + CSB IPB - + CSC IPC - + CSD IPD - + CSE IPE - + CSF IPF - + CSG IPG - + CSH IPH - + CSI IPI - + CSJ IPJ - + CSL IPL - + CSM IPM - + CSN IPN - + CSO IPO - + CSP IPQ - + CSQ IPR - + CSR IPS - + CSS IPS - + CST IPT - + CSU IPU - + CSV IPV - + CH10 - + CH11 - + CH12 - + CH13 - + CH14 - + CH15 - + CH16 @@ -10939,22 +11053,22 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Verrou Y - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 @@ -10984,9 +11098,8 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de - Companion9x Simulator - Simulateur companion9x + Simulateur companion9x @@ -10994,7 +11107,7 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Simulateur 9x - + Outputs Sorties @@ -11068,9 +11181,8 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de xsimulatorDialog - Companion9x Simulator - Simulateur companion9x + Simulateur companion9x @@ -11191,7 +11303,7 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de Sorties - + CSK SWK IPK @@ -11201,6 +11313,11 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de CH1 VOIE1 + + + Companion Simulator + + Taranis Simulator @@ -11213,16 +11330,16 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de - - - - - - - - - - + + + + + + + + + + -100.1 @@ -11257,202 +11374,202 @@ Indique l'affectation voie / numéro de canal par défaut utilisée lors de VOIE4 - + CH12 VOIE12 - + CH5 VOIE5 - + CH13 VOIE13 - + CH6 VOIE6 - + CH14 VOIE14 - + CH7 VOIE7 - + CH15 VOIE15 - + CH8 VOIE8 - + CH16 VOIE16 - + CSC IPC - + CSD IPD - + CS7 IP7 - + CSL IPL - + CSB IPB - + CS1 IP1 - + CSH IPH - + CSG IPG - + CSE IPE - + CSF IPF - + CS8 IP8 - + CS9 IP9 - + CSA IPA - + CSM IPM - + CSJ IPJ - + CSI IPI - + CS4 IP4 - + CS5 IP5 - + CS2 IP2 - + CS3 IP3 - + CS6 IP6 - + CSN IPN - + CSO IPO - + CSP IPQ - + CSQ IPR - + CSR IPS - + CSS IPS - + CST IPT - + CSU IPU - + CSV IPV - + CSW SWW IPW diff --git a/companion/src/translations/companion9x_he.ts b/companion/src/translations/companion_he.ts similarity index 94% rename from companion/src/translations/companion9x_he.ts rename to companion/src/translations/companion_he.ts index c8d66f2f5..ddfaa4e3d 100644 --- a/companion/src/translations/companion9x_he.ts +++ b/companion/src/translations/companion_he.ts @@ -1149,29 +1149,24 @@ Are you sure ? MainWindow - - - + + + File loaded - - - A new version of companion9x is available (version %1)<br>Would you like to download it? - - - - + + Save As - + No updates available at this time. @@ -1179,26 +1174,11 @@ Are you sure ? - - + + Unable to check for updates. - - - - - companion9x - Models and Settings Editor - %1 - profile %2 - - - - - - - - companion9x - Models and Settings Editor - %1 - - Checking for updates @@ -1220,102 +1200,102 @@ Are you sure ? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? - + Open - - + + File saved - + Copyright - + donating - - - + + + &%1 %2 - + %1 %2 - + &New - + Create a new file - + &Open... - + Open an existing file - + &Save - + Save the document to disk - + Save &As... - + Save the document under a new name - + &Preferences... - + Edit general preferences - + &Check for updates... - + If you've found this program useful, please support by @@ -1329,34 +1309,29 @@ Do you want to download it now ? New release available - - - A new release of companion is available please check the repository - - - - - - - - - - - + + + + + + + + + Error - - - + + + Error opening file %1: %2. @@ -1387,12 +1362,6 @@ Do you want to download it now ? Compilation server too busy, try later - - - - Compilation server requires registration, please check opentx web site - - @@ -1405,640 +1374,671 @@ Do you want to download it now ? - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? - + Ignore this version (r%1)? - + Release notes contain very important informations. Do you want to see them now ? - + Firmware updates - + Current firmware does not provide release notes informations. - + Cannot write file %1: %2. - - - - - + + + + + Taranis radio not found - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. - + Write Models and settings from %1 to the Tx? - - - + + + Backup is impossible - - - + + + The backup dir set in preferences does not exist - - + + Warning - + Conversion failed - + Restore failed - + Backup failed - + Version %1 (revision %2), %3 - - The companion9x project was originally forked from eePe - - - - - About companion9x - - - - + &loadBackup... - + Load backup from file - + Lo&gs - + Ctrl+G - + Open log file - - Check for new version of companion9x/er9x - - - - + Contributors &List... - - Show companion9x contributors list - - - - + ChangeLog... - - Show companion9x changelog - - - - + Firmware ChangeLog... - + Show firmware changelog - + Compare... - + Compare models - + Customize your &TX... - + Customize the splash screen of your TX - + E&xit - + Exit the application - + Cu&t - + Cut the current selection's contents to the clipboard - + &Copy - + Copy the current selection's contents to the clipboard - + &Paste - + Paste the clipboard's contents into the current selection - + Ctrl+Alt+W - + Ctrl+Alt+R - + &Configure... - + Configure software for reading from and writing to the transmitter - + &List programmers - + List available programmers - + &Fuses... - + Show fuses dialog - + &Simulate - + Alt+S - + Simulate selected model. - + &Print - + Ctrl+P - + Print current model. - + Cl&ose - + Close the active window - + Close &All - + Close all the windows - + &Tile - + Tile the windows - + &Cascade - + Cascade the windows - + Ne&xt - + Move the focus to the next window - + Pre&vious - + Move the focus to the previous window - + &About - + Show the application's About box - - + + Recent Files - + &Read/Write - + Write - + Unable to find file %1! - + Error reading file %1: %2. - + Switch layout Left/Right - + &File - + Switch layout direction - - - - + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + + + + + Compilation server requires registration, please check OpenTX web site + + + + + + + Read Models and Settings From Tx - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? - - - - - - + + + + + + Backup Models and Settings From Tx - + Cannot check Models and Settings compatibility! Continue anyway? - + The transmitter firmware belongs to another product family, check file and preferences! - + The transmitter firmware is outdated, please upgrade! - + Write Models and Settings To Tx - - + + Write Firmware To Tx - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore Models and Settings To Tx - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 - + Firmware write failed - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted - + Save transmitter Models and Settings to File - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. - + Read Tx Firmware to File - + + The Companion project was originally forked from eePe + + + + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + + + + &Write Models and Settings To Tx - + Write Models and Settings to transmitter - + &Read Models and Settings From Tx - + Read Models and Settings from transmitter - + Write Firmware - + Write firmware to transmitter - + Write Models and Settings from file to Tx - + Write Models and Settings from file to transmitter - + Save transmitter Models and Settings to file - + Save the Models and Settings from the transmitter to a file - + Read Firmware - + Read firmware from transmitter - - + + Firmware Profiles - + &Edit - - + + Invalid Models and Settings File %1 - + Invalid binary Models and Settings File %1 - + &Window - + &Help - + File - + Edit - + Help - + Ready @@ -2130,14 +2130,14 @@ Write anyway ? - - - companion9x + Do you want to use model wizard? - Do you want to use model wizard? + + + Companion @@ -7026,18 +7026,6 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi th9x doesn't support curve with %1 point as curve%2 - - - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. - -We are really sensible to that! - -The openTX/C9X Team. - Warning! -Telemetry channel order has been changed, please check function switches and telemetry settings! -Expos settings have been changed, please verify before flight! - - @@ -7073,6 +7061,15 @@ Expos settings have been changed, please verify before flight! OpenTX doesn't allow this number of channels + + + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. + +We are really appreciative for that! + +The OpenTX/Companion Team. + + avrOutputDialog @@ -7395,7 +7392,7 @@ Please only use this if you know what you are doing. There are no error checks - companion9x + Companion @@ -7466,6 +7463,11 @@ m2560 for v4.1 boards Browse for file + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -7512,11 +7514,6 @@ m2560 for v4.1 boards Variant - - - Allows companion9x to write to older version of the firmware - - Check Firmware compatibility @@ -8243,27 +8240,27 @@ m2560 for v4.1 boards Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) -of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which -companion9x was forked out. +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. - + + Companion Release Notes + + + + Thank you all !!! - + Contributors - - Companion9x Release Notes - - - - + OpenTX Release Notes @@ -8413,7 +8410,7 @@ p, li { white-space: pre-wrap; } - companion9x + Companion @@ -8740,7 +8737,7 @@ Press cancel to abort joystick calibration logsDialog - Companion9x log viewer + Companion Log Viewer @@ -8754,47 +8751,58 @@ Press cancel to abort joystick calibration - + Zoom - + X - + Y - + Fly sessions - + Telemetry logs - + Time - + + Error + + + + + Cannot write file %1: +%2. + + + + Select your log file - + Available fields - + The selected logfile contains %1 invalid lines out of %2 total lines @@ -9252,27 +9260,27 @@ Press cancel to abort joystick calibration - + Language (requires restart) - + SD Structure path - + Processor ID - + Simulator capture folder - + Use clipboard only @@ -9282,40 +9290,40 @@ Press cancel to abort joystick calibration - - + + Download - + Default Channel Order - + Default Stick Mode - + Channel order This is used by the templated to determine which channel goes to what number output. - + FwInfo - + Show Splash Screen - + Mode selection: Mode 1: @@ -9338,97 +9346,107 @@ Mode 4: - + Mode 1 (RUD ELE THR AIL) - + Mode 2 (RUD THR ELE AIL) - + Mode 3 (AIL ELE THR RUD) - + Mode 4 (AIL THR ELE RUD) - + Automatic Backup Folder - + Automatically add version number to the filename after download - + Voice - + Set language of voice. May be different from firmware language - + Firmware - + + Find Executable + + + + + Google Earth Executable + + + + Check for updates on startup - - + + ... - + Splash library behaviour - + Include companion splashes - + Only user defined splashes - + Custom TX splash screen - + Personal splash library - + Joystick - - - - + + + + Open Folder @@ -9479,201 +9497,206 @@ May be different from firmware language - + Check for updates - + Language - + Profile Name - + Export Profile - + Save Profile - + Import Profile - + Blue Blu - + Simu BackLight - + Check for selected Fw updates - + Ask use of wizard for new models - + Remember switches in simulator - + Green - + Red - + Orange - + Yellow - + Profile slot - + auto backup before write - + Ask for flashing after Download - + Enable - + Calibrate - + Open Image - + Invert Pixels - + Last downloaded release: %1 - - The selected firmware has never been downloaded by companion9x. - - - - - The selected firmware cannot be downloaded by companion9x. - - - - + Image stored in settings - - + + No joysticks found - + Select your Models and Settings backup folder - + + Select Google Earth executable + + + + Select the folder replicating your SD structure - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - + Export profile As - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - + Open Profile to import - + Open Image to load - + Images (%1) - - + + Error - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your library folder - + Select your snapshot folder - - + + Cannot load %1. @@ -10174,12 +10197,6 @@ May be different from firmware language simulatorDialog - - - Companion9x Simulator - ER9x Simulator - - P1 @@ -10285,6 +10302,11 @@ May be different from firmware language Right Double Click to Reset + + + Companion Simulator + + @@ -10298,267 +10320,267 @@ May be different from firmware language - + Outputs - + CS1 - + CS2 - + CS3 - + CS4 - + CS5 - + CS6 - + CS7 - + CS8 - + CS9 - + CSA - + CSB - + CSC - + CSD - + CSE - + CSF - + CSG - + CSH - + CSI - + CSJ - + CSK - + CSL - + CSM - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW - + CH1 - + CH9 - + CH2 - + CH10 - + CH3 - + CH11 - + CH4 - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 @@ -10635,11 +10657,6 @@ May be different from firmware language xsimulatorDialog - - - Companion9x Simulator - - @@ -10758,6 +10775,11 @@ May be different from firmware language LS + + + Companion Simulator + + Taranis Simulator @@ -10775,16 +10797,16 @@ May be different from firmware language - - - - - - - - - - + + + + + + + + + + -100.1 @@ -10819,207 +10841,207 @@ May be different from firmware language - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 - + CSK - + CSC - + CSD - + CS7 - + CSL - + CSB - + CS1 - + CSH - + CSG - + CSE - + CSF - + CS8 - + CS9 - + CSA - + CSM - + CSJ - + CSI - + CS4 - + CS5 - + CS2 - + CS3 - + CS6 - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW diff --git a/companion/src/translations/companion9x_it.ts b/companion/src/translations/companion_it.ts similarity index 94% rename from companion/src/translations/companion9x_it.ts rename to companion/src/translations/companion_it.ts index 952477a89..d880d890b 100644 --- a/companion/src/translations/companion9x_it.ts +++ b/companion/src/translations/companion_it.ts @@ -1210,9 +1210,9 @@ Siete sicuri ? MainWindow - - - + + + File loaded Documento caricato @@ -1230,22 +1230,21 @@ Siete sicuri ? - - + + Unable to check for updates. Impossibile controllare gli aggiornamenti. - A new version of companion9x is available (version %1)<br>Would you like to download it? - Una nuova versione di companion9x è disponibile (versione %1)<br>Desiderate scaricarla ? + Una nuova versione di companion9x è disponibile (versione %1)<br>Desiderate scaricarla ? - - + + Save As Salva come @@ -1260,13 +1259,12 @@ Siete sicuri ? Nuova versione disponibile - A new release of companion is available please check the repository - Una nuova versione di companion9x è stata rilasciata, controllate il repository SVN + Una nuova versione di companion9x è stata rilasciata, controllate il repository SVN - + No updates available at this time. Nessun aggiornamento disponibile. @@ -1278,9 +1276,9 @@ Siete sicuri ? - - - + + + Error opening file %1: %2. Errore durante l'apertura del file %1: @@ -1302,19 +1300,12 @@ Siete sicuri ? Il server di compilazione è occupato, provate più tardi - - - companion9x - Models and Settings Editor - %1 - profile %2 - Companion9x - EEPROM Editor - %1- profilo %2 + Companion9x - EEPROM Editor - %1- profilo %2 - - - - companion9x - Models and Settings Editor - %1 - Companion9x - EEPROM Editor - %1 + Companion9x - EEPROM Editor - %1 Firmware does not longer fit in program memory, due to selected firmware options @@ -1331,7 +1322,7 @@ Siete sicuri ? Volete scrivere il nuovo firmware sulla radio ora ? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? @@ -1340,25 +1331,25 @@ E' disponibile la versione %2. Volete scaricarla adesso ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? Una nuova versione del firmware %1 è disponibile (attuale %2 - nuova %3). Volete scaricarla ora ? - + Ignore this version (r%1)? Ignorare questa versione (r%1) ? - + Open Apri - - + + File saved Documento salvato @@ -1367,15 +1358,15 @@ Volete scaricarla ora ? - - - - - - - - - + + + + + + + + + Error Errore @@ -1402,10 +1393,8 @@ Volete scaricarla ora ? Guasto temporaneo del server di compilazione, riprovate più tardi - - Compilation server requires registration, please check opentx web site - Il server di compilazione richiede una registrazione, controllate il sito di opentx + Il server di compilazione richiede una registrazione, controllate il sito di opentx Firmware does not fit in program memory, due to selected firmware options @@ -1417,65 +1406,65 @@ Volete scaricarla ora ? Volete scrivere il nuovo firmware sulla radio ora ? - - + + Yes Si - - + + No No - - + + Release Notes Note di aggiornamento - - + + Do you want to download release %1 now ? Volete scaricare la versione %1 adesso ? - + Release notes contain very important informations. Do you want to see them now ? Le note di rilascio includono informazioni molto importanti. Volete vederle ora ? - + Firmware updates Aggiornamenti firmware - + Current firmware does not provide release notes informations. Il firmware selezionato non fornisce note di aggiornamento. - + Cannot write file %1: %2. Non posso scrivere il file %1: %2. - - - - - + + + + + Taranis radio not found Radio taranis non trovata - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. Impossibile identificare la radio sul vostro sistema, verificate che il disco della eeprom sia connesso. @@ -1496,16 +1485,16 @@ non è stato riconosciuto come una EEProm valida Scriverlo ugualmente ? - - - + + + Backup is impossible Impossibile effettuare il Backup - - - + + + The backup dir set in preferences does not exist La directory per i backup impostata in preferenze non esiste @@ -1518,8 +1507,8 @@ Scriverlo ugualmente ? Non posso controllare la compatibilità delle impostazioni! Continuare ugualmente ? - - + + Warning Avviso @@ -1540,7 +1529,7 @@ Scriverlo ugualmente ? Scrivi il fimware sulla radio - + Conversion failed Conversione fallita @@ -1553,7 +1542,7 @@ Scriverlo ugualmente ? Ripristina memoria sulla Radio - + Restore failed Ripristino fallito @@ -1570,7 +1559,7 @@ Scriverlo ugualmente ? Non posso aggiornare il firmware, la memoria dei settaggi originale può essere trovata in %1 - + Backup failed Salvataggio fallito @@ -1587,10 +1576,10 @@ Scriverlo ugualmente ? Scrivi il firmware in un documento - - - - + + + + Read Models and Settings From Tx Leggi le impostazioni dalla radio @@ -1609,12 +1598,12 @@ Scriverlo ugualmente ? Il firmware richiesto è troppo grande per la radio a causa delle opzioni selezionate - + Write Models and settings from %1 to the Tx? Scrivere le impostazioni sulla radio da %1? - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? @@ -1623,365 +1612,360 @@ non è stato riconosciuto come un file di impostazioni valido. Scriverlo ugualmente ? - - - - - - + + + + + + Backup Models and Settings From Tx Salva impostazioni della radio - + Cannot check Models and Settings compatibility! Continue anyway? Non posso controllare la compatibilità delle impostazioni! Continuare ugualmente ? - + The transmitter firmware belongs to another product family, check file and preferences! Il firmware nella radio è di una famiglia differente\n rispetto a quello delle impostazioni che si stanno scrivendo.\n Controllare il documento e le preferenze! - + The transmitter firmware is outdated, please upgrade! Il firmware della radio è obsoleto, pianificate un aggiornamento! - + Write Models and Settings To Tx Scrivi le impostazioni nella radio - - + + Write Firmware To Tx Scrivi il fimware sulla radio - + Cannot convert Models and Settings for use with this firmware, original data will be used Non posso convertire le impostazioni per questo firmware, verranno usate le impostazioni originali - + Restore Models and Settings To Tx Ripristina le impostazioni sulla Radio - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 Non posso ripristinare le impostazioni sulla radio, il file originale può essere trovato in %1 - + Firmware write failed Scrittura del firmware fallita - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 Non posso aggiornare il firmware, le impostazioni originali possono essere trovate nel file %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted Non riesco a salvare le impostazioni della radio, l'aggiornamento firmware viene annullato - + Save transmitter Models and Settings to File Salva le impostazioni dalla radio e scrivile in un documento - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. Impossibile identificare la radio sul vostro sistema, verificate che il disco della eeprom sia connesso. - + Read Tx Firmware to File Scrivi il firmware in un documento - + Copyright Copyright - + Version %1 (revision %2), %3 Versione %1 (revisione %2), %3 - The companion9x project was originally forked from eePe - Il progetto companion9x è stato inizialmente derivato da eePe + Il progetto companion9x è stato inizialmente derivato da eePe - + If you've found this program useful, please support by Se trovate questo programma utile, supportatelo mediante una - + donating donazione - About companion9x - Informazioni su companion9x + Informazioni su companion9x - - - + + + &%1 %2 - + %1 %2 - + &New &Nuovo - + Create a new file Crea un nuovo documento - + &Open... &Apri... - + Open an existing file Apri un documente esistente - + &loadBackup... carica&Backup... - + Load backup from file Carica backup da file - + &Save &Salva - + Save the document to disk Salva il documento su disco - + Save &As... S&alva come... - + Save the document under a new name Salva il documento con un nuovo nome - + Lo&gs Lo&gs - + Ctrl+G - + Open log file Apri file di log - + &Preferences... &Preferenze... - + Edit general preferences Modifica preferenze - + &Check for updates... &Controlla aggiornamenti... - Check for new version of companion9x/er9x - Controlla per nuove versioni di companion9x + Controlla per nuove versioni di companion9x - + Contributors &List... E&lenco collaboratori... - Show companion9x contributors list - Mostra l'elenco di quelli che hanno contribuito a companion9x + Mostra l'elenco di quelli che hanno contribuito a companion9x - + ChangeLog... Cambiamenti... - Show companion9x changelog - Mostra l'elenco dei cambiamenti in Companion9x + Mostra l'elenco dei cambiamenti in Companion9x - + Firmware ChangeLog... Cambiamenti del firmware... - + Show firmware changelog Mostra l'elenco dei cambiamenti del firmware - + Compare... Confronta... - + Compare models Confronta due modelli - + Customize your &TX... Personalizza il &TX... - + Customize the splash screen of your TX Personalizza la schermata di avvio della radio - + E&xit Es&ci - + Exit the application Esci dall'applicazione - + Cu&t Ta&glia - + Cut the current selection's contents to the clipboard Taglia la selezione negli appunti - + &Copy &Copia - + Copy the current selection's contents to the clipboard Copia la selezione negli appunti - + &Paste &Incolla - + Paste the clipboard's contents into the current selection Incolla gli appunti nella selezione corrente - + &Write Models and Settings To Tx Scri&vi le impostazioni nella radio - + Write Models and Settings to transmitter Scrivi le impostazioni nella radio - + &Read Models and Settings From Tx &Leggi le impostazioni dalla radio - + Read Models and Settings from transmitter Leggi le impostazioni dalla radio - + Write Firmware Scrivi il fimware - + Write firmware to transmitter Scrivi il firmware nella radio - + Write Models and Settings from file to Tx Scrivi le impostazioni nella radio da un documento - + Write Models and Settings from file to transmitter Scrivi le impostazioni nella radio da un documento - + Save transmitter Models and Settings to file Salva le impostazioni dalla radio e scrivile in un documento - + Save the Models and Settings from the transmitter to a file Leggi le impostazioni dalla radio e scrivile in un file - + Read Firmware Leggi firmware - + Read firmware from transmitter Leggi il firmware dalla radio - + Configure software for reading from and writing to the transmitter Configura il software per la lettura/scrittura del microprocessore @@ -1994,23 +1978,23 @@ Scriverlo ugualmente ? Configura il programmatore del microprocessore - + &Read/Write &Leggi/Scrivi - + Write Scrivi - - + + Invalid Models and Settings File %1 File impostazioni non valido %1 - + Invalid binary Models and Settings File %1 File binario delle impostazioni non valido %1 @@ -2019,7 +2003,7 @@ Scriverlo ugualmente ? &Scrivi la memoria nella radio - + Ctrl+Alt+W Ctrl+Alt+W @@ -2032,7 +2016,7 @@ Scriverlo ugualmente ? &Leggi la memoria dalla radio - + Ctrl+Alt+R Ctrl+Alt+R @@ -2073,7 +2057,7 @@ Scriverlo ugualmente ? Leggi il firmware dalla radio - + &Configure... &Configura... @@ -2082,154 +2066,210 @@ Scriverlo ugualmente ? Configura il programmatore del microprocessore - + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + + + + + Compilation server requires registration, please check OpenTX web site + + + + + The Companion project was originally forked from eePe + + + + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + + + + &List programmers E&lenco programmatori - + List available programmers Lista dei programmatori supportati - + &Fuses... &Fuses... - + Show fuses dialog Mostra finestra di dialogo Fuses - + &Simulate Si&mula - + Alt+S - + Simulate selected model. Simula modello selezionato. - + &Print Stam&pa - + Ctrl+P - + Print current model. Stampa modello corrente. - + Cl&ose C&hiudi - + Close the active window Chiudi finestra corrente - + Close &All Chiudi &Tutto - + Close all the windows Chiudi dutte le finestre - + &Tile Aff&ianca - + Tile the windows Affianca fineste - + &Cascade &Disponi - + Cascade the windows Disponi finestre a cascata - + Ne&xt Successi&va - + Move the focus to the next window Sposta il fuoco sulla finestra seguente - + Pre&vious P&recedente - + Move the focus to the previous window Sposta il fuoco sulla finestra precedente - + &About &Informazioni su - + Show the application's About box Mostra la finestra Informazioni Su - + Switch layout direction Cambia orientamento - + Switch layout Left/Right Cambia orientazione Sinistra/Destra - - + + Recent Files Documenti Recenti - - + + Firmware Profiles Profili personalizzati - + &File &Documento - + &Edit &Modifica @@ -2238,22 +2278,22 @@ Scriverlo ugualmente ? &Programma - + &Window &Finestra - + &Help &Aiuto - + File Documento - + Edit Modifica @@ -2262,17 +2302,17 @@ Scriverlo ugualmente ? Scrivi - + Help Aiuto - + Ready Pronto - + Unable to find file %1! Impossibile trovare il file %1! @@ -2281,7 +2321,7 @@ Scriverlo ugualmente ? File impostazioni non valido %1 - + Error reading file %1: %2. Error durante la lettura del file %1: @@ -2304,6 +2344,13 @@ Scriverlo ugualmente ? Do you want to use model wizard? Utilizzare l'assistente di configurazione dei modelli ? + + + + + Companion + + Ask this question again ? @@ -2466,11 +2513,8 @@ Scriverlo ugualmente ? File di backup binario non valido %1 - - - companion9x - companion9x + companion9x @@ -7380,11 +7424,11 @@ la eeprom è 4096 bytes ma solo 2048 vengono utilizzati - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. -We are really sensible to that! +We are really appreciative for that! -The openTX/C9X Team. +The OpenTX/Companion Team. @@ -7731,8 +7775,12 @@ utilizzatelo solo se sapete cosa state facendo. Non viene fatto alcun controllo + Companion + + + companion9x - companion9x + companion9x @@ -7808,6 +7856,11 @@ m2560 per le schede v4.1 Browse for file Apri file + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -7855,9 +7908,8 @@ m2560 per le schede v4.1 Variante - Allows companion9x to write to older version of the firmware - Abilita companion a scrivere in versioni precedenti o diverse del firmware + Abilita companion a scrivere in versioni precedenti o diverse del firmware @@ -8625,29 +8677,39 @@ m2560 per le schede v4.1 Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. + + + + + Companion Release Notes + + + + Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which companion9x was forked out. - Sentiti ringraziamenti a Rafal Tomczak (RadioClone) e Thomas Husterer (th9x). + Sentiti ringraziamenti a Rafal Tomczak (RadioClone) e Thomas Husterer (th9x). Anche a Erez Raviv (er9x) e al fantastico eePe dal quale è stato derivato companion9x. - + Thank you all !!! Grazie a tutti !!! - + Contributors Amici e Programmatori - Companion9x Release Notes - informazioni su aggiornamenti Companion9x + informazioni su aggiornamenti Companion9x - + OpenTX Release Notes informazioni su aggiornamenti OpenTX @@ -8796,8 +8858,12 @@ p, li { white-space: pre-wrap; } + Companion + + + companion9x - companion9x + companion9x @@ -9165,9 +9231,13 @@ Premere annulla per cancellare l'operazione logsDialog - Companion9x log viewer - Visualizzatore di file di log di Companion9x + Visualizzatore di file di log di Companion9x + + + + Companion Log Viewer + @@ -9180,47 +9250,59 @@ Premere annulla per cancellare l'operazione Apri file di log - + Zoom Ingrandimento - + X - + Y - + Fly sessions Sessioni di volo - + Telemetry logs Log telemetrici - + Time Tempo - + + Error + Errore + + + + Cannot write file %1: +%2. + Non posso scrivere il file %1: +%2. + + + Select your log file Selezionare il file di log - + Available fields Campi disponibili - + The selected logfile contains %1 invalid lines out of %2 total lines Il file di log selezionato contiene %1 righe errate su un totale di %2 righe @@ -9678,27 +9760,27 @@ Premere annulla per cancellare l'operazione Preferenze - + Language (requires restart) Lingua (richiede il riavvio) - + Firmware Firmware - + Check for updates on startup Controllo aggiornamenti all'avvio - + FwInfo - + Show Splash Screen Mostra schermata iniziale @@ -9708,18 +9790,18 @@ Premere annulla per cancellare l'operazione File recenti - - + + Download Scarica - + Default Channel Order Ordine canali predefinito - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -9728,12 +9810,12 @@ This is used by the templated to determine which channel goes to what number out Utilizzato dai Modelli per stabilire quale uscita viene assegnata ai canali. - + Default Stick Mode Modalità Stick - + Mode selection: Mode 1: @@ -9774,63 +9856,63 @@ Mode 4: - - + + ... - + Enable Abilita - + Calibrate Calibrazione - - - - + + + + Open Folder Apri Cartella - + Automatic Backup Folder Cartella per backup - + Set language of voice. May be different from firmware language Impostazione del linguaggio della voce. Può essere differente dalla lingua del firmware - + Voice Voce - + Ask for flashing after Download Scrivere dopo aggiornamento - + Export Profile Esporta Profilo - + Import Profile Importa Profilo - + Custom TX splash screen Schermo personalizzato @@ -9839,32 +9921,32 @@ Può essere differente dalla lingua del firmware Cartella per backup - + auto backup before write Esegui backup prima di ogni scrittura - + Automatically add version number to the filename after download Aggiungi automaticamente il numero di versione al nome del file dopo il download - + SD Structure path Cartella Struttura Scheda SD - + Processor ID ID del processore - + Simulator capture folder Cartella per cattura schermate - + Use clipboard only Usa solo gli appunti @@ -9915,173 +9997,196 @@ Può essere differente dalla lingua del firmware CheckBox - + Check for updates Verifica aggiornamenti - + Check for selected Fw updates Controlla aggiornamenti Fw - + Ask use of wizard for new models Chiedi l'utilizzo dell'assistente per i nuovi modelli - + Remember switches in simulator Ricorda la posizione degli switches nel simulatore - + Mode 1 (RUD ELE THR AIL) Modo 1 (DIR ELE MOT ALE) - + Mode 2 (RUD THR ELE AIL) Modo 2 (DIR MOTO ELE ALE) - + Mode 3 (AIL ELE THR RUD) Modo 3 (ALE ELE MOT DIR) - + Mode 4 (AIL THR ELE RUD) Modo 4 (ALE MOT ELE DIR) - + Profile slot Profilo personalizzato - + + Find Executable + + + + + Google Earth Executable + + + + Profile Name Descrizione - + Save Profile Salva Profilo - + Blue Blu - + Language Lingua - + Green Verde - + Red Rosso - + Orange Arancione - + Yellow Giallo - + Personal splash library Libreria sfondi personale - + Splash library behaviour Caratteristiche libreria sfondi - + Include companion splashes Includi sfondi predefiniti - + Only user defined splashes Solamente sfondi utente - + Joystick Joystick - + Open Image Apri immagine - + Invert Pixels Negativo - + Simu BackLight Colore Retroilluminazione - + Last downloaded release: %1 Ultima versione scaricata: %1 - The selected firmware has never been downloaded by companion9x. - Il firmware selezionato non è mai stato scaricato da companion9x. + Il firmware selezionato non è mai stato scaricato da companion9x. - The selected firmware cannot be downloaded by companion9x. - Il firmware selezionato non può essere scaricato da companion9x. + Il firmware selezionato non può essere scaricato da companion9x. - + Image stored in settings Immagine predefinita - - + + No joysticks found Nessun joystick trovato - + Select your Models and Settings backup folder Selezionare la cartella per i backup - + + Select Google Earth executable + + + + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? La descrizione del profilo è vuota. Il profilo %1 sarà cancellato.<br>Siete sicuri ? - + Select your library folder Selezionare la cartella degli sfondi - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your snapshot folder Selezionare la cartella per le schermate del simulatore @@ -10090,44 +10195,44 @@ Può essere differente dalla lingua del firmware Selezionare la cartella per i backup - + Select the folder replicating your SD structure Selezionare la cartella contenente la struttura della scheda SD - + Export profile As Esporta il profilo come - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? La descrizione del profilo è vuota. Il profilo %1 sarà sovrascritto.<br>Siete sicuri ? - + Open Profile to import Apri il profile da importare - + Open Image to load Apri l'immagine da caricare - + Images (%1) Immagini (%1) - - + + Error Errore - - + + Cannot load %1. Non posso caricare %1. @@ -10633,9 +10738,8 @@ Può essere differente dalla lingua del firmware simulatorDialog - Companion9x Simulator - companion9x + companion9x @@ -10657,6 +10761,11 @@ Può essere differente dalla lingua del firmware THR THR + + + Companion Simulator + + @@ -10750,157 +10859,157 @@ Può essere differente dalla lingua del firmware Simulatore 9x - + Outputs Uscite - + CS1 CS1 - + CS2 CS2 - + CS3 CS3 - + CS4 CS4 - + CS5 CS5 - + CS6 CS6 - + CS7 CS7 - + CS8 CS8 - + CS9 CS9 - + CSA CSA - + CSB CSB - + CSC CSC - + CSD CSD - + CSE CSE - + CSF CSF - + CSG CSG - + CSH CSH - + CSI CSI - + CSJ CSJ - + CSL CSL - + CSM CSM - + CSN CSN - + CSO CSO - + CSP CSP - + CSQ CSQ - + CSR CSR - + CSS CSS - + CST CST - + CSU CSU - + CSV CSV @@ -10910,114 +11019,114 @@ Può essere differente dalla lingua del firmware SUONO - + CSK SWK CSK - + CSW SWW CSW - + CH1 CH1 - + CH9 CH9 - + CH2 CH2 - + CH10 CH10 - + CH3 CH3 - + CH11 CH11 - + CH4 CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 -100.1 @@ -11095,9 +11204,8 @@ Può essere differente dalla lingua del firmware xsimulatorDialog - Companion9x Simulator - companion9x + companion9x @@ -11223,13 +11331,13 @@ Può essere differente dalla lingua del firmware Uscite - + CSK SWK CSK - + CSW SWW CSW @@ -11239,6 +11347,11 @@ Può essere differente dalla lingua del firmware CH1 CH1 + + + Companion Simulator + + @@ -11246,16 +11359,16 @@ Può essere differente dalla lingua del firmware - - - - - - - - - - + + + + + + + + + + -100.1 -100.1 @@ -11290,197 +11403,197 @@ Può essere differente dalla lingua del firmware CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - + CSC CSC - + CSD CSD - + CS7 CS7 - + CSL CSL - + CSB CSB - + CS1 CS1 - + CSH CSH - + CSG CSG - + CSE CSE - + CSF CSF - + CS8 CS8 - + CS9 CS9 - + CSA CSA - + CSM CSM - + CSJ CSJ - + CSI CSI - + CS4 CS4 - + CS5 CS5 - + CS2 CS2 - + CS3 CS3 - + CS6 CS6 - + CSN CSN - + CSO CSO - + CSP CSP - + CSQ CSQ - + CSR CSR - + CSS CSS - + CST CST - + CSU CSU - + CSV CSV diff --git a/companion/src/translations/companion9x_pt.ts b/companion/src/translations/companion_pt.ts similarity index 94% rename from companion/src/translations/companion9x_pt.ts rename to companion/src/translations/companion_pt.ts index de3d9bf28..97da176bb 100644 --- a/companion/src/translations/companion9x_pt.ts +++ b/companion/src/translations/companion_pt.ts @@ -1233,9 +1233,9 @@ Are you sure ? - - - + + + File loaded Ficheiro carregado @@ -1247,8 +1247,8 @@ Are you sure ? - - + + Save As Gravar Como @@ -1258,7 +1258,7 @@ Are you sure ? - + No updates available at this time. @@ -1266,8 +1266,8 @@ Are you sure ? - - + + Unable to check for updates. @@ -1286,13 +1286,13 @@ Are you sure ? Ficheiros EEPROM (*.bin *.hex);;BIN files (*.bin);;HEX files (*.hex) - + Open Abrir - - + + File saved Ficheiro gravado @@ -1313,15 +1313,10 @@ Are you sure ? Ficheiros HEX (*.hex);;BIN files (*.bin);;FLASH files (*.bin *.hex) - + Copyright - - - A new version of companion9x is available (version %1)<br>Would you like to download it? - - Display previous warning again at startup ? @@ -1332,34 +1327,29 @@ Are you sure ? New release available - - - A new release of companion is available please check the repository - - - - - - - - - - - + + + + + + + + + Error Erro - - - + + + Error opening file %1: %2. @@ -1374,6 +1364,21 @@ Are you sure ? Display previous message again at startup ? + + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + Firmware does not longer fit in the Tx, due to selected firmware options @@ -1390,12 +1395,6 @@ Are you sure ? Compilation server too busy, try later - - - - Compilation server requires registration, please check opentx web site - - @@ -1408,343 +1407,322 @@ Are you sure ? - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? - + Ignore this version (r%1)? - + Release notes contain very important informations. Do you want to see them now ? - + Firmware updates - + Current firmware does not provide release notes informations. - + Cannot write file %1: %2. - - - - - + + + + + Taranis radio not found - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. - + Write Models and settings from %1 to the Tx? - - - + + + Backup is impossible - - - + + + The backup dir set in preferences does not exist - - + + Warning Aviso - + Conversion failed - + Restore failed - + Backup failed - + Version %1 (revision %2), %3 - - The companion9x project was originally forked from eePe - - - - + If you've found this program useful, please support by - + donating doar - About companion9x - Sobre o companion9x + Sobre o companion9x - - - + + + &%1 %2 &%1 %2 - + %1 %2 %1 %2 - + &New &Novo - + Create a new file Criar um novo ficheiro - + &Open... &Abrir... - + Open an existing file Abrir um ficheiro existente - + &loadBackup... - + Load backup from file - + &Save &Gravar - + Save the document to disk Gravar o documento no disco - + Save &As... Gravar &Como... - + Save the document under a new name Gravar o documento com um novo nome - + Lo&gs - + Ctrl+G - + Open log file - + &Preferences... &Preferências - + Edit general preferences Editar preferências gerais - + &Check for updates... - - Check for new version of companion9x/er9x - - - - + Contributors &List... - - Show companion9x contributors list - - - - + ChangeLog... - - Show companion9x changelog - - - - + Firmware ChangeLog... - + Show firmware changelog - + Compare... - + Compare models - + Customize your &TX... - + Customize the splash screen of your TX - + E&xit &Sair - + Exit the application Sair da aplicação - + Cu&t Cor&tar - + Cut the current selection's contents to the clipboard Cortar a selecção corrente para a zona de transferência - + &Copy &Copiar - + Copy the current selection's contents to the clipboard Copiar a selecção corrente para a zona de transferência - + &Paste Co&lar - + Paste the clipboard's contents into the current selection Colar o conteúdo na zona de transferência para a selecção corrente - + Configure software for reading from and writing to the transmitter - - + + Invalid Models and Settings File %1 - + Invalid binary Models and Settings File %1 @@ -1753,7 +1731,7 @@ Do you want to download it now ? &Gravar EEPROM no Rádio - + Ctrl+Alt+W Ctrl+Alt+W @@ -1766,7 +1744,7 @@ Do you want to download it now ? &Ler EEPROM do Rádio - + Ctrl+Alt+R Ctrl-Alt-R @@ -1791,7 +1769,7 @@ Do you want to download it now ? Ler memória Flash do Rádio - + &Configure... &Configurar... @@ -1800,148 +1778,148 @@ Do you want to download it now ? Configurar aplicação de gravação do Rádio - + &List programmers &Listar programadores - + List available programmers Lista os programadores disponíveis - + &Fuses... - + Show fuses dialog - + &Simulate &Simular - + Alt+S Alt+S - + Simulate selected model. Simular o modelo seleccionado - + &Print &Imprimir - + Ctrl+P Ctrl+P - + Print current model. Imprimir o modelo corrente - + Cl&ose &Fechar - + Close the active window Fechar a janela activa - + Close &All Fechar &Todas - + Close all the windows Fechar todas as janelas - + &Tile &Mosaico - + Tile the windows Apresentar as janelas abertas em mosaico - + &Cascade &Cascata - + Cascade the windows Apresentar as janelas abertas em cascata - + Ne&xt &Próxima - + Move the focus to the next window Selecciona janela seguinte - + Pre&vious &Anterior - + Move the focus to the previous window Selecciona janela anterior - + &About A&cerca - + Show the application's About box Sobre a aplicação - - + + Recent Files - + &Read/Write - + Write - + Unable to find file %1! Impossível encontrar o ficheiro %1! - + Error reading file %1: %2. @@ -1955,236 +1933,262 @@ Do you want to download it now ? Lista de contribuidores do er9x/companion9x - + Switch layout Left/Right - + &File &Ficheiro - + Switch layout direction Mudar apresentação dos menus - - - - - companion9x - Models and Settings Editor - %1 - profile %2 - - - - - - - - companion9x - Models and Settings Editor - %1 - - Checking for updates + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + + + + + Compilation server requires registration, please check OpenTX web site + + Do you want to write the firmware to the transmitter now ? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? - - - - + + + + Read Models and Settings From Tx - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? - - - - - - + + + + + + Backup Models and Settings From Tx - + Cannot check Models and Settings compatibility! Continue anyway? - + The transmitter firmware belongs to another product family, check file and preferences! - + The transmitter firmware is outdated, please upgrade! - + Write Models and Settings To Tx - - + + Write Firmware To Tx - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore Models and Settings To Tx - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 - + Firmware write failed - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted - + Save transmitter Models and Settings to File - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. - + Read Tx Firmware to File - + + The Companion project was originally forked from eePe + + + + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + + + + &Write Models and Settings To Tx - + Write Models and Settings to transmitter - + &Read Models and Settings From Tx - + Read Models and Settings from transmitter - + Write Firmware - + Write firmware to transmitter - + Write Models and Settings from file to Tx - + Write Models and Settings from file to transmitter - + Save transmitter Models and Settings to file - + Save the Models and Settings from the transmitter to a file - + Read Firmware - + Read firmware from transmitter - - + + Firmware Profiles - + &Edit &Editar - + &Window &Janela - + &Help &Ajuda - + File Ficheiro - + Edit Editar @@ -2193,12 +2197,12 @@ Write anyway ? Gravar - + Help - + Ready Pronto @@ -2210,11 +2214,8 @@ Write anyway ? Parâmetros Gerais - - - companion9x - companion9x + companion9x Delete Selected Models? @@ -2298,6 +2299,13 @@ Write anyway ? Do you want to use model wizard? + + + + + Companion + + Ask this question again ? @@ -7625,11 +7633,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. -We are really sensible to that! +We are really appreciative for that! -The openTX/C9X Team. +The OpenTX/Companion Team. @@ -7996,8 +8004,12 @@ Please only use this if you know what you are doing. There are no error checks + Companion + + + companion9x - companion9x + companion9x @@ -8067,6 +8079,11 @@ m2560 for v4.1 boards Browse for file + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -8113,11 +8130,6 @@ m2560 for v4.1 boards Variant - - - Allows companion9x to write to older version of the firmware - - Check Firmware compatibility @@ -8900,27 +8912,27 @@ m2560 for v4.1 boards Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) -of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which -companion9x was forked out. +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. - + + Companion Release Notes + + + + Thank you all !!! - + Contributors - - Companion9x Release Notes - - - - + OpenTX Release Notes @@ -9077,8 +9089,12 @@ p, li { white-space: pre-wrap; } + Companion + + + companion9x - companion9x + companion9x @@ -9408,7 +9424,7 @@ Press cancel to abort joystick calibration logsDialog - Companion9x log viewer + Companion Log Viewer @@ -9422,47 +9438,58 @@ Press cancel to abort joystick calibration - + Zoom - + X - + Y - + Fly sessions - + Telemetry logs - + Time - + + Error + Erro + + + + Cannot write file %1: +%2. + + + + Select your log file - + Available fields - + The selected logfile contains %1 invalid lines out of %2 total lines @@ -9920,7 +9947,7 @@ Press cancel to abort joystick calibration Preferências - + Language (requires restart) Língua (necessita uma reinicialização) @@ -9930,23 +9957,23 @@ Press cancel to abort joystick calibration - - + + Download - + Default Channel Order Ordem dos Canais por Defeito - + Default Stick Mode Modo do Rádio por Defeito - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -9957,12 +9984,12 @@ This is used by the templated to determine which channel goes to what number out companion9x - + Show Splash Screen - + Mode selection: Mode 1: @@ -9985,117 +10012,127 @@ Mode 4: - + Mode 1 (RUD ELE THR AIL) Modo 1 (RUD ELE THR AIL) - + Mode 2 (RUD THR ELE AIL) Modo 2 (RUD THR ELE AIL) - + Mode 3 (AIL ELE THR RUD) Modo 3 (AIL ELE THR RUD) - + Mode 4 (AIL THR ELE RUD) Modo 4 (AIL THR ELE RUD) - + Automatic Backup Folder - + Automatically add version number to the filename after download - + Voice - + Set language of voice. May be different from firmware language - + Firmware - + + Find Executable + + + + + Google Earth Executable + + + + Check for updates on startup - - + + ... - + Splash library behaviour - + Include companion splashes - + Only user defined splashes - + Custom TX splash screen - + Personal splash library - + Joystick - - - - + + + + Open Folder - + SD Structure path - + Processor ID - + Simulator capture folder - + Use clipboard only @@ -10146,206 +10183,211 @@ May be different from firmware language - + Check for updates - + Language - + Profile Name - + Export Profile - + Save Profile - + Import Profile - + Simu BackLight - + Check for selected Fw updates - + Ask use of wizard for new models - + Remember switches in simulator - + Blue Blu - + Green - + Red - + Orange - + Yellow - + Profile slot - + auto backup before write - + Ask for flashing after Download - + Enable - + Calibrate - + Open Image - + Invert Pixels - + FwInfo - + Last downloaded release: %1 - - The selected firmware has never been downloaded by companion9x. - - - - - The selected firmware cannot be downloaded by companion9x. - - - - + Image stored in settings - - + + No joysticks found - + Select your snapshot folder - + Select your Models and Settings backup folder - + + Select Google Earth executable + + + + Select the folder replicating your SD structure - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - + Export profile As - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - + Open Profile to import - + Open Image to load - + Images (%1) - - + + Error Erro - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your library folder - - + + Cannot load %1. @@ -11027,10 +11069,9 @@ May be different from firmware language simulatorDialog - Companion9x Simulator ER9x Simulator - Simulador ER9x + Simulador ER9x @@ -11166,7 +11207,7 @@ May be different from firmware language - + Outputs @@ -11206,264 +11247,269 @@ May be different from firmware language SW12 - + CSK SWK - + CS1 - + + Companion Simulator + + + + CS2 - + CS3 - + CS4 - + CS5 - + CS6 - + CS7 - + CS8 - + CS9 - + CSA - + CSB - + CSC - + CSD - + CSE - + CSF - + CSG - + CSH - + CSI - + CSJ - + CSL - + CSM - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW SWW - + CH1 CH1 - + CH9 CH9 - + CH2 CH2 - + CH10 CH10 - + CH3 CH3 - + CH11 CH11 - + CH4 CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 -100.1 @@ -11545,9 +11591,8 @@ May be different from firmware language xsimulatorDialog - Companion9x Simulator - Simulador ER9x + Simulador ER9x @@ -11718,6 +11763,11 @@ May be different from firmware language S2 + + + Companion Simulator + + @@ -11748,16 +11798,16 @@ May be different from firmware language - - - - - - - - - - + + + + + + + + + + -100.1 -100.1 @@ -11792,207 +11842,207 @@ May be different from firmware language CH4 - + CH12 CH12 - + CH5 CH5 - + CH13 CH13 - + CH6 CH6 - + CH14 CH14 - + CH7 CH7 - + CH15 CH15 - + CH8 CH8 - + CH16 CH16 - + CSK - + CSC - + CSD - + CS7 - + CSL - + CSB - + CS1 - + CSH - + CSG - + CSE - + CSF - + CS8 - + CS9 - + CSA - + CSM - + CSJ - + CSI - + CS4 - + CS5 - + CS2 - + CS3 - + CS6 - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW diff --git a/companion/src/translations/companion9x_ru.ts b/companion/src/translations/companion_ru.ts similarity index 94% rename from companion/src/translations/companion9x_ru.ts rename to companion/src/translations/companion_ru.ts index c6fb8c1ef..92c12ee9b 100644 --- a/companion/src/translations/companion9x_ru.ts +++ b/companion/src/translations/companion_ru.ts @@ -1225,29 +1225,24 @@ Are you sure ? MainWindow - - - + + + File loaded Файл загружен - - - A new version of companion9x is available (version %1)<br>Would you like to download it? - - - - + + Save As Сохранить как... - + No updates available at this time. @@ -1255,8 +1250,8 @@ Are you sure ? - - + + Unable to check for updates. @@ -1275,13 +1270,13 @@ Are you sure ? файлы EEPROM (*.bin *.hex);;файлы BIN (*.bin);;файлы HEX (*.hex) - + Open Открыть - - + + File saved Файл записан @@ -1310,7 +1305,7 @@ Are you sure ? Считать прошивку в файл - + Copyright @@ -1320,7 +1315,7 @@ Are you sure ? Если эта программа и/или прошивка оказалась полезной, вы можете - + donating поддержать ее @@ -1329,74 +1324,74 @@ Are you sure ? О eePe - - - + + + &%1 %2 - + %1 %2 - + &New Новый - + Create a new file Создать новый файл - + &Open... Открыть - + Open an existing file Открыть файл - + &Save Сохранить - + Save the document to disk Записать на диск - + Save &As... Сохранить как... - + Save the document under a new name Записать с другим именем - + &Preferences... Настройки - + Edit general preferences Редактировать основные настройки - + &Check for updates... - + If you've found this program useful, please support by @@ -1410,34 +1405,29 @@ Are you sure ? New release available - - - A new release of companion is available please check the repository - - - - - - - - - - - + + + + + + + + + Error Ошибка - - - + + + Error opening file %1: %2. @@ -1452,6 +1442,21 @@ Are you sure ? Display previous message again at startup ? + + + + + Companion - Models and Settings Editor - %1 - profile %2 + + + + + + + + Companion - Models and Settings Editor - %1 + + Firmware does not longer fit in the Tx, due to selected firmware options @@ -1468,12 +1473,6 @@ Are you sure ? Compilation server too busy, try later - - - - Compilation server requires registration, please check opentx web site - - @@ -1486,256 +1485,231 @@ Are you sure ? - - + + Yes - - + + No - - + + Release Notes - - + + Do you want to download release %1 now ? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? - + Ignore this version (r%1)? - + Release notes contain very important informations. Do you want to see them now ? - + Firmware updates - + Current firmware does not provide release notes informations. - + Cannot write file %1: %2. Не удается записать файл %1: %2. - - - - - + + + + + Taranis radio not found - - - - + + + + Impossible to identify the radio on your system, please verify the eeprom disk is connected. - + Write Models and settings from %1 to the Tx? - - - + + + Backup is impossible - - - + + + The backup dir set in preferences does not exist - - + + Warning Звук - + Conversion failed - + Restore failed - + Backup failed - + Version %1 (revision %2), %3 - - The companion9x project was originally forked from eePe - - - - - About companion9x - - - - + &loadBackup... - + Load backup from file - + Lo&gs - + Ctrl+G - + Open log file - - Check for new version of companion9x/er9x - - - - + Contributors &List... - - Show companion9x contributors list - - - - + ChangeLog... - - Show companion9x changelog - - - - + Firmware ChangeLog... - + Show firmware changelog - + Compare... - + Compare models - + Customize your &TX... - + Customize the splash screen of your TX - + E&xit Выход - + Exit the application Выйти из программы - + Cu&t Вырезать - + Cut the current selection's contents to the clipboard Вырезать выделение в буфер обмена - + &Copy Копировать - + Copy the current selection's contents to the clipboard Копировать выделение в буфер обмена - + &Paste Вставить - + Paste the clipboard's contents into the current selection Вставить выделение из буфера обмена - + Configure software for reading from and writing to the transmitter @@ -1744,7 +1718,7 @@ Do you want to download it now ? Записать EEPROM в TX - + Ctrl+Alt+W @@ -1757,7 +1731,7 @@ Do you want to download it now ? Считать EEPROM из TX - + Ctrl+Alt+R @@ -1798,7 +1772,7 @@ Do you want to download it now ? Считать прошивку из передатчика - + &Configure... Настройка @@ -1807,148 +1781,148 @@ Do you want to download it now ? Настроить программатор - + &List programmers Список программаторов - + List available programmers Показать список программаторов - + &Fuses... Фьюзы - + Show fuses dialog Показать диалог установки фьюзов - + &Simulate Симуляция - + Alt+S - + Simulate selected model. Запустить симуляцию - + &Print Печать - + Ctrl+P - + Print current model. Распечатать текущую модель - + Cl&ose Закрыть - + Close the active window Закрыть активное окно - + Close &All Закрыть все - + Close all the windows Закрыть все окна - + &Tile Мозаика - + Tile the windows Расположить окна мозаикой - + &Cascade Каскад - + Cascade the windows Разместить окна каскадом - + Ne&xt Следующее - + Move the focus to the next window Переместить фокус на следующее окно - + Pre&vious Предыдущее - + Move the focus to the previous window Переместить фокус на предыдущее окно - + &About О программе - + Show the application's About box Показать окно "О программе" - - + + Recent Files - + &Read/Write - + Write - + Unable to find file %1! Невозможно найти файл %1! - + Error reading file %1: %2. Ошибка при считывании файла %1: @@ -1959,227 +1933,253 @@ Do you want to download it now ? Авторы - + Switch layout Left/Right - + &File Файл - + Switch layout direction Зеркало - - - - - companion9x - Models and Settings Editor - %1 - profile %2 - - - - - - - - companion9x - Models and Settings Editor - %1 - - Checking for updates + + + A new version of Companion is available (version %1)<br>Would you like to download it? + + + + + A new release of Companion is available please check the repository + + + + + + Compilation server requires registration, please check OpenTX web site + + Do you want to write the firmware to the transmitter now ? - + Firmware %1 does not seem to have ever been downloaded. Version %2 is available. Do you want to download it now ? - - - - + + + + Read Models and Settings From Tx - + The file %1 has not been recognized as a valid Models and Settings file Write anyway ? - - - - - - + + + + + + Backup Models and Settings From Tx - + Cannot check Models and Settings compatibility! Continue anyway? - + The transmitter firmware belongs to another product family, check file and preferences! - + The transmitter firmware is outdated, please upgrade! - + Write Models and Settings To Tx - - + + Write Firmware To Tx - + Cannot convert Models and Settings for use with this firmware, original data will be used - + Restore Models and Settings To Tx - + Could not restore Models and Settings to TX. The models and settings data file can be found at: %1 - + Firmware write failed - + Could not write firmware to to transmitter. The models and settings data file can be found at: %1 - + Cannot backup existing Models and Settings from TX. Firmware write process aborted - + Save transmitter Models and Settings to File - + Impossible to identify the radio on your system, please verify that the eeprom disk is connected. - + Read Tx Firmware to File - + + The Companion project was originally forked from eePe + + + + + About Companion + + + + + Check for new version of Companion + + + + + Show Companion contributors list + + + + + Show Companion changelog + + + + &Write Models and Settings To Tx - + Write Models and Settings to transmitter - + &Read Models and Settings From Tx - + Read Models and Settings from transmitter - + Write Firmware - + Write firmware to transmitter - + Write Models and Settings from file to Tx - + Write Models and Settings from file to transmitter - + Save transmitter Models and Settings to file - + Save the Models and Settings from the transmitter to a file - + Read Firmware - + Read firmware from transmitter - - + + Firmware Profiles - + &Edit Правка - - + + Invalid Models and Settings File %1 - + Invalid binary Models and Settings File %1 @@ -2188,22 +2188,22 @@ Write anyway ? Запись - + &Window Окна - + &Help Помощь - + File Файл - + Edit Правка @@ -2212,12 +2212,12 @@ Write anyway ? Запись - + Help - + Ready Готово @@ -2321,6 +2321,13 @@ Write anyway ? Do you want to use model wizard? + + + + + Companion + + Ask this question again ? @@ -2422,13 +2429,6 @@ Write anyway ? Invalid binary backup File %1 - - - - - companion9x - - %1 has been modified. @@ -7506,11 +7506,11 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. -We are really sensible to that! +We are really appreciative for that! -The openTX/C9X Team. +The OpenTX/Companion Team. @@ -7840,7 +7840,7 @@ Please only use this if you know what you are doing. There are no error checks - companion9x + Companion @@ -7915,6 +7915,11 @@ m2560 for v4.1 boards Browse for file + + + Allows Companion to write to older version of the firmware + + Backup and restore Models and Settings @@ -7961,11 +7966,6 @@ m2560 for v4.1 boards Variant - - - Allows companion9x to write to older version of the firmware - - Check Firmware compatibility @@ -8743,27 +8743,27 @@ m2560 for v4.1 boards Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) -of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which -companion9x was forked out. +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. - + + Companion Release Notes + + + + Thank you all !!! - + Contributors - - Companion9x Release Notes - - - - + OpenTX Release Notes @@ -8920,7 +8920,7 @@ p, li { white-space: pre-wrap; } - companion9x + Companion @@ -9247,7 +9247,7 @@ Press cancel to abort joystick calibration logsDialog - Companion9x log viewer + Companion Log Viewer @@ -9261,47 +9261,59 @@ Press cancel to abort joystick calibration - + Zoom - + X - + Y - + Fly sessions - + Telemetry logs - + Time - + + Error + Ошибка + + + + Cannot write file %1: +%2. + Не удается записать файл %1: +%2. + + + Select your log file - + Available fields - + The selected logfile contains %1 invalid lines out of %2 total lines @@ -9759,7 +9771,7 @@ Press cancel to abort joystick calibration Настройки - + Language (requires restart) Язык (треб. перезапуск) @@ -9769,23 +9781,23 @@ Press cancel to abort joystick calibration - - + + Download - + Default Channel Order Порядок следов. каналов - + Default Stick Mode Режим стиков - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -9794,17 +9806,17 @@ This is used by the templated to determine which channel goes to what number out Шаблон для определения порядка следования каналов. - + FwInfo - + Show Splash Screen - + Mode selection: Mode 1: @@ -9827,117 +9839,127 @@ Mode 4: - + Mode 1 (RUD ELE THR AIL) - + Mode 2 (RUD THR ELE AIL) - + Mode 3 (AIL ELE THR RUD) - + Mode 4 (AIL THR ELE RUD) - + Automatic Backup Folder - + Automatically add version number to the filename after download - + Voice - + Set language of voice. May be different from firmware language - + Firmware - + + Find Executable + + + + + Google Earth Executable + + + + Check for updates on startup Проверять обновления - - + + ... - + Splash library behaviour - + Include companion splashes - + Only user defined splashes - + Custom TX splash screen - + Personal splash library - + Joystick - - - - + + + + Open Folder - + SD Structure path - + Processor ID - + Simulator capture folder - + Use clipboard only @@ -9988,201 +10010,206 @@ May be different from firmware language - + Check for updates - + Language - + Profile Name - + Export Profile - + Save Profile - + Import Profile - + Simu BackLight - + Check for selected Fw updates - + Ask use of wizard for new models - + Remember switches in simulator - + Blue Blu - + Green - + Red - + Orange - + Yellow - + Profile slot - + auto backup before write - + Ask for flashing after Download - + Enable - + Calibrate - + Open Image - + Invert Pixels - + Last downloaded release: %1 - - The selected firmware has never been downloaded by companion9x. - - - - - The selected firmware cannot be downloaded by companion9x. - - - - + Image stored in settings - - + + No joysticks found - + Select your snapshot folder - + Select your Models and Settings backup folder - + + Select Google Earth executable + + + + Select the folder replicating your SD structure - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? - + Export profile As - + Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ? - + Open Profile to import - + Open Image to load - + Images (%1) - - + + Error Ошибка - + + The selected firmware has never been downloaded by Companion. + + + + + The selected firmware cannot be downloaded by Companion. + + + + Select your library folder - - + + Cannot load %1. @@ -10756,10 +10783,9 @@ May be different from firmware language simulatorDialog - Companion9x Simulator ER9x Simulator - ER9x Симулятор + ER9x Симулятор @@ -10879,269 +10905,274 @@ May be different from firmware language - + Outputs - + CSK SWK - + CS1 - + + Companion Simulator + + + + CS2 - + CS3 - + CS4 - + CS5 - + CS6 - + CS7 - + CS8 - + CS9 - + CSA - + CSB - + CSC - + CSD - + CSE - + CSF - + CSG - + CSH - + CSI - + CSJ - + CSL - + CSM - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW SWW - + CH1 - + CH9 - + CH2 - + CH10 - + CH3 - + CH11 - + CH4 - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -100.1 @@ -11219,9 +11250,8 @@ May be different from firmware language xsimulatorDialog - Companion9x Simulator - ER9x Симулятор + ER9x Симулятор @@ -11328,6 +11358,11 @@ May be different from firmware language S2 + + + Companion Simulator + + @@ -11358,16 +11393,16 @@ May be different from firmware language - - - - - - - - - - + + + + + + + + + + -100.1 @@ -11402,207 +11437,207 @@ May be different from firmware language - + CH12 - + CH5 - + CH13 - + CH6 - + CH14 - + CH7 - + CH15 - + CH8 - + CH16 - + CSK - + CSC - + CSD - + CS7 - + CSL - + CSB - + CS1 - + CSH - + CSG - + CSE - + CSF - + CS8 - + CS9 - + CSA - + CSM - + CSJ - + CSI - + CS4 - + CS5 - + CS2 - + CS3 - + CS6 - + CSN - + CSO - + CSP - + CSQ - + CSR - + CSS - + CST - + CSU - + CSV - + CSW diff --git a/companion/src/translations/companion9x_sv.ts b/companion/src/translations/companion_sv.ts similarity index 98% rename from companion/src/translations/companion9x_sv.ts rename to companion/src/translations/companion_sv.ts index c37c3550a..dad124c89 100644 --- a/companion/src/translations/companion9x_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -1211,53 +1211,38 @@ FAI-funktionen kan inte slås av i sändaren. MainWindow - + File loaded Filen har laddats - + - + Save As Spara Som - - + + No updates available at this time. Inga updateringar finns tillgängliga. - + - + Unable to check for updates. Det gick inte att söka efter uppdateringar. - - - - companion9x - Models and Settings Editor - %1 - profile %2 - companion9x - Editor för Modeller och Inställningar - %1 - profile %2 - - - - - - - companion9x - Models and Settings Editor - %1 - companion9x - Editor för Modeller och Inställningar - %1 - - - + Executable (*.exe) Program (*.exe) @@ -1272,7 +1257,7 @@ FAI-funktionen kan inte slås av i sändaren. Vill du skriva firmware till sändaren nu? - + A new version of %1 firmware is available (current %2 - newer %3). Do you want to download it now ? En ny version finns tillgänglig av %1 fimware (Din version %2 - Ny version %3). @@ -1367,12 +1352,7 @@ Vill du ladda ned den nya versionen nu ? &Sök efter uppdateringar... - - A new version of companion9x is available (version %1)<br>Would you like to download it? - An ny version av companion9x finns tillgänglig (version %1)<br>Vill du ladda ned den? - - - + Display previous message again at startup ? Skall föregående varning visas igen vid uppstart ? @@ -1387,18 +1367,12 @@ Vill du ladda ned den nya versionen nu ? Tillfälligt fel i byggservern. Försök igen senare - - - Compilation server requires registration, please check opentx web site - 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 ? @@ -1432,32 +1406,12 @@ Vill du ladda ned den nu ? Version %1 (revision %2), %3 - - The companion9x project was originally forked from eePe - Ursprungligen grenades companion9x av från eePe - - - + If you've found this program useful, please support by Om du tycker att programet är användbart så kan du stödja utvecklingen genom att - - About companion9x - Om companion9x - - - - Check for new version of companion9x/er9x - Sök efter ny version av companion9x/er9x - - - - Show companion9x contributors list - Visa vilka som bidragit till companion9x - - - + Customize your &TX... Sändari&nställningar... @@ -1668,17 +1622,37 @@ Vill du ladda ned den nu ? Byt layout-riktning - + + + + Companion - Models and Settings Editor - %1 - profile %2 + Companion - Editor för Modeller och Inställningar - %1 - profile %2 + + + + + + + Companion - Models and Settings Editor - %1 + Companion - Editor för Modeller och Inställningar - %1 + + + Checking for updates Letar efter uppdateringar - + Ignore this version (r%1)? Ladda inte ned versionen (r%1)? - + + Show Companion changelog + Visa en lista med förändringar av Companion + + + &Write Models and Settings To Tx &Skriv Modeller och Inställningar till sändaren @@ -1737,14 +1711,6 @@ Vill du ladda ned den nu ? Read firmware from transmitter Läs firmware från sändaren - - &Configure Communication... - &Kommunikationsinställningar... - - - Configure software for communication with the transmitter - Inställningar för mjukvaran som kommunicerar med sändaren - &Edit @@ -1786,7 +1752,7 @@ Vill du ladda ned den nu ? &Bidragsgivare... - + Display previous warning again at startup ? SKall föregående varning visas igen vid uppstart ? @@ -1795,7 +1761,7 @@ Vill du ladda ned den nu ? - + @@ -1815,19 +1781,14 @@ Vill du ladda ned den nu ? %2. - + New release available En ny version finns tillgänglig - - - A new release of companion is available please check the repository - En ny version av companion finns tillgänglig. Kontrollera källkods-repository - - + Error opening file %1: @@ -1836,7 +1797,7 @@ Vill du ladda ned den nu ? %2. - + Compilation server termporary failure, try later Tillfälligt fel i byggservern. Försök igen senare @@ -1853,7 +1814,7 @@ Vill du ladda ned den nu ? Okänt server-fel. Försök igen senare - + Compare... Jämför... @@ -1959,7 +1920,23 @@ Vill du ladda ned den nu ? Ja - + + A new version of Companion is available (version %1)<br>Would you like to download it? + An ny version av Companion finns tillgänglig (version %1)<br>Vill du ladda ned den? + + + + A new release of Companion is available please check the repository + En ny version av Companion finns tillgänglig. Kontrollera källkods-repository + + + + + Compilation server requires registration, please check OpenTX web site + Byggservern kräver registrering. Var god kontrollera OpenTX webbsida + + + No Nej @@ -2090,17 +2067,32 @@ Starta skrivningen i alla fall ? Läs Sändarens Firmware till Fil - + + The Companion project was originally forked from eePe + Ursprungligen grenades Companion av från eePe + + + + About Companion + Om Companion + + + + Check for new version of Companion + Sök efter ny version av Companion + + + + Show Companion contributors list + Visa vilka som bidragit till Companion + + + ChangeLog... Förändringar... - - Show companion9x changelog - Visa en lista med förändringar av companion9x - - - + Firmware ChangeLog... Firmware-förändringar... @@ -2218,14 +2210,7 @@ Starta skrivningen i alla fall ? Ogiltig binär modelldatafil %1 - - - - companion9x - companion9x - - - + %1 has been modified. Do you want to save your changes? %1 har förändrats. @@ -2242,7 +2227,14 @@ Vill du spara förändringarna? Säkerhetskopierin kan ej utföras - + + + + Companion + Companion + + + The backup dir set in preferences does not exist Katalog för säkerhetskopiering saknas i inställningarna @@ -7167,16 +7159,16 @@ eeprom-storleken är 4096, men enbart den första hälften används - Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model. + Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model. -We are really sensible to that! +We are really appreciative for that! -The openTX/C9X Team. - Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av openTX/companion9x +The OpenTX/Companion Team. + Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av OpenTX/Companion -Vi uppkskattar ert stöd! +Vi uppskattar ert stöd! -Gruppen bakum openTX/companion9X. +Gruppen bakom OpenTX/Companion. @@ -7450,12 +7442,6 @@ OBS. Fyll enbart i detta fällt om du är säker på vad du gör. Ingen kontroll Select Location Välj sökväg - - - - companion9x - companion9x - @@ -7473,7 +7459,7 @@ m2560 for v4.1 boards m2560 för v4.1-kort - + <b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue? <b><u>VARNING!</u></b><br>Detta åerställer säkringarna för %1 till deras ursprungliga värden.<br>Att ändra dessa värden kan skapa allvarliga problem med din sändare.<br>Ändra säkringarna bara om du är helt säker på att de har fel värde!<br>Är du säker på att du vill fortsätta? @@ -7550,6 +7536,12 @@ m2560 för v4.1-kort AVRDUDE Configuration Inställningar för AVRDUDE + + + + Companion + Companion + burnDialog @@ -7569,7 +7561,12 @@ m2560 för v4.1-kort Subversion - + + Allows Companion to write to older version of the firmware + Tillåter Companon att skriva till äldre firmware-versioner + + + Load Image Ladda Bild @@ -7748,12 +7745,7 @@ m2560 för v4.1-kort Välj fil - - Allows companion9x to write to older version of the firmware - Tillåter companon9x att skriva till äldre firmware-versioner - - - + Backup and restore Models and Settings Säkerhetskopiera Modeller och Inställningar @@ -8375,14 +8367,19 @@ m2560 för v4.1-kort Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) -of course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which -companion9x was forked out. - All heder åt Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis. -Dessutom till Erez Raviv (er9x) och dess fantastiska eePe, från vilken -companion9x grenades av. +of course. Also to Erez Raviv (er9x) and the fantastic eePe program +which was the staring point for OpenTX Companion. + All heder åt Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis. +Dessutom till Erez Raviv (er9x) och hans fantastiska eePe, från vilken +OpenTX Companion grenades av. - + + Companion Release Notes + Companion Release Notes + + + Thank you all !!! Tack till er alla !!! @@ -8392,12 +8389,7 @@ companion9x grenades av. Bidragande - - Companion9x Release Notes - Companion9x Release Notes - - - + OpenTX Release Notes OpenTX Release Notes @@ -8550,8 +8542,8 @@ p, li { white-space: pre-wrap; } - companion9x - companion9x + Companion + Companion @@ -8931,8 +8923,8 @@ Tryck på Avbryt för att avburyta kalibreringen logsDialog - Companion9x log viewer - Companion9x loggläsare + Companion Log Viewer + Companion Logg-läsare @@ -8945,7 +8937,7 @@ Tryck på Avbryt för att avburyta kalibreringen Öppna Loggfil - + Zoom Zoom @@ -8960,7 +8952,7 @@ Tryck på Avbryt för att avburyta kalibreringen Y - + Telemetry logs Telemetriloggar @@ -8970,7 +8962,19 @@ Tryck på Avbryt för att avburyta kalibreringen Tid - + + Error + Fel + + + + Cannot write file %1: +%2. + Filen %1 kunde inte skrivas: +%2. + + + Select your log file Välj loggfil @@ -8980,7 +8984,7 @@ Tryck på Avbryt för att avburyta kalibreringen Tillgängliga fält - + The selected logfile contains %1 invalid lines out of %2 total lines Denn aktuella filen innehåller %1 felaktiga rader. Totalt innehåller filen %2 rader @@ -9443,22 +9447,22 @@ Tryck på Avbryt för att avburyta kalibreringen Inställningar - + Language (requires restart) Språk (kräver omstart) - + Show Splash Screen Visa Startbild - + Recent History Size Loggstorlek - + Download Nedladdning @@ -9469,7 +9473,7 @@ Tryck på Avbryt för att avburyta kalibreringen Kanalordning - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -9478,7 +9482,7 @@ This is used by the templated to determine which channel goes to what number out Detta används av mallen för att koppla kanal till output-nummer. - + Default Stick Mode Spaktilldelning @@ -9554,7 +9558,17 @@ Mode 4: Firmware - + + Find Executable + Sök Program + + + + Google Earth Executable + Sökväg till Google Earth + + + Check for updates on startup Sök efter uppdateringar vid start @@ -9565,30 +9579,30 @@ Mode 4: ... - + Splash library behaviour Beteende för bildbibliotek - + Personal splash library Personligt bildbibliotek - + Joystick Joystick - - + + + - Open Folder Öppna katalog - + @@ -9634,12 +9648,12 @@ Mode 4: Kryssruta - + Check for updates Sök efter uppdateringar - + Blue Blu Blå @@ -9665,7 +9679,7 @@ Mode 4: Gul - + Enable Slå på @@ -9675,7 +9689,7 @@ Mode 4: Kalibrera - + Open Image Öppna bild @@ -9685,38 +9699,33 @@ Mode 4: Invertera bild - + FwInfo Firmware-info - + Last downloaded release: %1 Senast nedladdade release: %1 - - The selected firmware has never been downloaded by companion9x. - Firmware-filen har aldrig laddats ned av companion9x. - - - - The selected firmware cannot be downloaded by companion9x. - Firmware-filen kan inte laddas ned av companion9x. - - - - + + No joysticks found Ingen joystick hittades - + Select your Models and Settings backup folder Välj folder för automatisk säkerhetskopiering - + + Select Google Earth executable + Sökväg till Google Earth + + + Open Image to load Öppna bild för laddning @@ -9726,24 +9735,34 @@ Mode 4: Bilder (%1) - - + + Error Fel - - + + The selected firmware has never been downloaded by Companion. + Firmware-filen har aldrig laddats ned av Companion. + + + + The selected firmware cannot be downloaded by Companion. + Firmware-filen kan inte laddas ned av Companion. + + + + Cannot load %1. %1 kunde inte laddas. - + Image stored in settings Bilden lagras i inställningar - + Include companion splashes Användarens bilder och companion-bilder @@ -9753,7 +9772,7 @@ Mode 4: Enbart användarens bilder - + Custom TX splash screen Egen uppstartsbild @@ -9763,12 +9782,12 @@ Mode 4: Fråga om skrivning efter Nedladdning - + Language Språk - + Profile Name Profilnamn @@ -9778,7 +9797,7 @@ Mode 4: Spara Profil - + Profile slot Profilplats @@ -9793,7 +9812,7 @@ Mode 4: Välj bibliotekskatalog - + Export Profile Exportera Profil @@ -9803,7 +9822,7 @@ Mode 4: Importera Profil - + Automatically add version number to the filename after download Lägg automatiskt till ett versionsnummer till filnamnet @@ -9820,7 +9839,7 @@ May be different from firmware language Får skilja från språket för mjukvaran - + Export profile As Exportera profil som @@ -9835,12 +9854,12 @@ Får skilja från språket för mjukvaran Öppna profil för import - + Simu BackLight Simulatorbelysning - + Processor ID Processortyp @@ -9850,22 +9869,22 @@ Får skilja från språket för mjukvaran Katalog för simulator-data - + Use clipboard only Använd bara clipboard - + Select your snapshot folder Välj katalog för snapshots - + Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ? Profilnamn saknas, profilplats %1 kommer att raderas.<br> Är du säker? - + Check for selected Fw updates Sök efter updatering av vald FW @@ -9880,7 +9899,7 @@ Får skilja från språket för mjukvaran Minns brytare i simulator - + SD Structure path Sökväg till SD-struktur @@ -10387,13 +10406,7 @@ Får skilja från språket för mjukvaran simulatorDialog - - Companion9x Simulator - ER9x Simulator - Companion 9x Simulator - - - + P1 P1 @@ -10498,17 +10511,22 @@ Får skilja från språket för mjukvaran Höger dubbelklick nollställer - + + Companion Simulator + Companion Simulator + + + 9x Simulator Simulator för 9x - + Outputs Utgångar - + CH1 KN1 @@ -10639,7 +10657,7 @@ Får skilja från språket för mjukvaran Simulerar - + 0 % @@ -10651,7 +10669,7 @@ Får skilja från språket för mjukvaran - Fligmod: %1(%2) - + CS1 LB1 @@ -10741,7 +10759,7 @@ Får skilja från språket för mjukvaran LBI - + CSJ LBJ @@ -10848,12 +10866,7 @@ Får skilja från språket för mjukvaran xsimulatorDialog - - Companion9x Simulator - Companion 9x-Simulator - - - + SE SE @@ -10923,7 +10936,12 @@ Får skilja från språket för mjukvaran SG - + + Companion Simulator + Companion Simulator + + + SD SD @@ -10951,7 +10969,7 @@ Får skilja från språket för mjukvaran - + @@ -10965,7 +10983,7 @@ Får skilja från språket för mjukvaran -100.1 - + CH9 KN9 @@ -10995,7 +11013,7 @@ Får skilja från språket för mjukvaran KN4 - + CH12 KN12 @@ -11071,7 +11089,7 @@ Får skilja från språket för mjukvaran Simulerar - + SF @@ -11112,7 +11130,7 @@ Får skilja från språket för mjukvaran - Fligmod: %1(%2) - + CSK LBK diff --git a/companion/src/warnings.h b/companion/src/warnings.h index 2f18a736d..c8fb4753e 100644 --- a/companion/src/warnings.h +++ b/companion/src/warnings.h @@ -2,7 +2,7 @@ #define WARNINGS_H #define WARNING_LEVEL 0 #define WARNING_ID 6 -#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.\n\nWe are really sensible to that!\n\nThe openTX/C9X Team.") +#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.\n\nWe are really appreciative for that!\n\nThe OpenTX/Companion Team.") #endif /* WARNINGS_H */ diff --git a/companion/src/xsimulatordialog.cpp b/companion/src/xsimulatordialog.cpp index cb06a169c..d2200e9bf 100644 --- a/companion/src/xsimulatordialog.cpp +++ b/companion/src/xsimulatordialog.cpp @@ -196,7 +196,7 @@ void xsimulatorDialog::onTimerEvent() static unsigned int lcd_counter = 0; if (!simulator->timer10ms()) { - QMessageBox::critical(this, "companion9x", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError())); + QMessageBox::critical(this, "companion", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError())); timer->stop(); return; } diff --git a/companion/src/xsimulatordialog.ui b/companion/src/xsimulatordialog.ui index d2bc64bfe..2ddd8f310 100644 --- a/companion/src/xsimulatordialog.ui +++ b/companion/src/xsimulatordialog.ui @@ -23,7 +23,7 @@ - Companion9x Simulator + Companion Simulator @@ -2053,6 +2053,7 @@ border-radius: 4px; 16777215 18 + QSlider::sub-page:horizontal:disabled { diff --git a/companion/targets/windows/companion9x-msys.nsi.in b/companion/targets/windows/companion-msys.nsi.in similarity index 80% rename from companion/targets/windows/companion9x-msys.nsi.in rename to companion/targets/windows/companion-msys.nsi.in index ed7bf33fb..3b38bb303 100644 --- a/companion/targets/windows/companion9x-msys.nsi.in +++ b/companion/targets/windows/companion-msys.nsi.in @@ -1,186 +1,186 @@ -;NSIS Modern User Interface -;Start Menu Folder Selection Example Script -;Written by Joost Verburg - -;-------------------------------- -;Include Modern UI - - !include "MUI2.nsh" - !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh" - -;-------------------------------- -;General - - ;Name and file - Name "companion9x" - OutFile "companion9xInstall_v@C9X_VERSION@.exe" - - ;Default installation folder - InstallDir "$PROGRAMFILES\companion9x" - - ;Get installation folder from registry if available - InstallDirRegKey HKCU "Software\companion9x" "" - - ;Compressor options - SetCompressor /FINAL /SOLID lzma - SetCompressorDictSize 64 - - ;Request application privileges for Windows Vista - RequestExecutionLevel admin - -;-------------------------------- -;Variables - - Var StartMenuFolder - -;-------------------------------- -;Interface Settings - - !define MUI_ABORTWARNING - -;-------------------------------- -;Pages - - !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" - !insertmacro MUI_PAGE_COMPONENTS - !insertmacro MUI_PAGE_DIRECTORY - - ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - - !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder - - !insertmacro MUI_PAGE_INSTFILES - - # These indented statements modify settings for MUI_PAGE_FINISH - !define MUI_FINISHPAGE_NOAUTOCLOSE - !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_CHECKED - !define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x" - !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" - # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED - # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt - !insertmacro MUI_PAGE_FINISH - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" - !insertmacro MUI_LANGUAGE "French" - -;-------------------------------- -;Installer Sections - -Section "companion9x" SecDummy - - SetOutPath "$INSTDIR" - - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" - File "companion9x.exe" - File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll" - File "C:\MinGW\bin\libgcc_s_dw2-1.dll" - File "C:\MinGW\bin\mingwm10.dll" - File "C:\MinGW\bin\libstdc++-6.dll" - File "@QT_BINARY_DIR@\QtCore4.dll" - File "@QT_BINARY_DIR@\QtGui4.dll" - File "@QT_BINARY_DIR@\QtXml4.dll" - File "@QT_BINARY_DIR@\QtNetwork4.dll" - File "@QT_BINARY_DIR@\Phonon4.dll" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe" - - CreateDirectory "$INSTDIR\lang" - SetOutPath "$INSTDIR\lang" - File "*.qm" - - SetOutPath "$INSTDIR" - ;Store installation folder - WriteRegStr HKCU "Software\companion9x" "" $INSTDIR - - ;Associate with extentions ,bin and .hex - ${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File" - - - ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - - ;Create shortcuts - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_END - -SectionEnd - -;-------------------------------- -;Descriptions - - ;Language strings - LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor." - LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM" - - ;Assign language strings to sections - !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy) - !insertmacro MUI_FUNCTION_DESCRIPTION_END - -;-------------------------------- -;Uninstaller Section - -Section "Uninstall" - - ;ADD YOUR OWN FILES HERE... - - Delete "$INSTDIR\license.txt" - Delete "$INSTDIR\companion9x.exe" - Delete "$INSTDIR\libxerces-c-3-1.dll" - Delete "$INSTDIR\libgcc_s_dw2-1.dll" - Delete "$INSTDIR\mingwm10.dll" - Delete "$INSTDIR\libstdc++-6.dll" - Delete "$INSTDIR\QtCore4.dll" - Delete "$INSTDIR\QtGui4.dll" - Delete "$INSTDIR\QtNetwork4.dll" - Delete "$INSTDIR\Phonon4.dll" - Delete "$INSTDIR\QtXml4.dll" - Delete "$INSTDIR\avrdude.exe" - Delete "$INSTDIR\avrdude.conf" - Delete "$INSTDIR\libusb0.dll" - Delete "$INSTDIR\dfu-util.exe" - Delete "$INSTDIR\Uninstall.exe" - - Delete "$INSTDIR\lang\*.*" - - RMDir "$INSTDIR\lang" - RMDir "$INSTDIR" - - ${unregisterExtension} ".bin" "BIN File" - ${unregisterExtension} ".hex" "HEX File" - ${unregisterExtension} ".eepm" "EEPE File" - ${unregisterExtension} ".companion9x" "EEPM File" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - - Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - DeleteRegKey /ifempty HKCU "Software\companion9x" - -SectionEnd - -Function LaunchLink - ExecShell "" "$INSTDIR\companion9x.exe" -FunctionEnd +;NSIS Modern User Interface +;Start Menu Folder Selection Example Script +;Written by Joost Verburg + +;-------------------------------- +;Include Modern UI + + !include "MUI2.nsh" + !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh" + +;-------------------------------- +;General + + ;Name and file + Name "openTx companion" + OutFile "companionInstall_v@C9X_VERSION@.exe" + + ;Default installation folder + InstallDir "$PROGRAMFILES\openTx companion" + + ;Get installation folder from registry if available + InstallDirRegKey HKCU "Software\companion9x" "" + + ;Compressor options + SetCompressor /FINAL /SOLID lzma + SetCompressorDictSize 64 + + ;Request application privileges for Windows Vista + RequestExecutionLevel admin + +;-------------------------------- +;Variables + + Var StartMenuFolder + +;-------------------------------- +;Interface Settings + + !define MUI_ABORTWARNING + +;-------------------------------- +;Pages + + !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + + ;Start Menu Folder Page Configuration + !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" + !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" + !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + + !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder + + !insertmacro MUI_PAGE_INSTFILES + + # These indented statements modify settings for MUI_PAGE_FINISH + !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_CHECKED + !define MUI_FINISHPAGE_RUN_TEXT "Launch companion" + !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" + # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED + # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt + !insertmacro MUI_PAGE_FINISH + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "French" + +;-------------------------------- +;Installer Sections + +Section "openTx companion" SecDummy + + SetOutPath "$INSTDIR" + + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" + File "companion.exe" + File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll" + File "C:\MinGW\bin\libgcc_s_dw2-1.dll" + File "C:\MinGW\bin\mingwm10.dll" + File "C:\MinGW\bin\libstdc++-6.dll" + File "@QT_BINARY_DIR@\QtCore4.dll" + File "@QT_BINARY_DIR@\QtGui4.dll" + File "@QT_BINARY_DIR@\QtXml4.dll" + File "@QT_BINARY_DIR@\QtNetwork4.dll" + File "@QT_BINARY_DIR@\Phonon4.dll" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe" + + CreateDirectory "$INSTDIR\lang" + SetOutPath "$INSTDIR\lang" + File "*.qm" + + SetOutPath "$INSTDIR" + ;Store installation folder + WriteRegStr HKCU "Software\companion9x" "" $INSTDIR + + ;Associate with extentions ,bin and .hex + ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File" + ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File" + ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File" + ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File" + + + ;Create uninstaller + WriteUninstaller "$INSTDIR\Uninstall.exe" + + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + + ;Create shortcuts + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + + !insertmacro MUI_STARTMENU_WRITE_END + +SectionEnd + +;-------------------------------- +;Descriptions + + ;Language strings + LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx" + LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de rglages et modles pour openTx" + + ;Assign language strings to sections + !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy) + !insertmacro MUI_FUNCTION_DESCRIPTION_END + +;-------------------------------- +;Uninstaller Section + +Section "Uninstall" + + ;ADD YOUR OWN FILES HERE... + + Delete "$INSTDIR\license.txt" + Delete "$INSTDIR\companion.exe" + Delete "$INSTDIR\libxerces-c-3-1.dll" + Delete "$INSTDIR\libgcc_s_dw2-1.dll" + Delete "$INSTDIR\mingwm10.dll" + Delete "$INSTDIR\libstdc++-6.dll" + Delete "$INSTDIR\QtCore4.dll" + Delete "$INSTDIR\QtGui4.dll" + Delete "$INSTDIR\QtNetwork4.dll" + Delete "$INSTDIR\Phonon4.dll" + Delete "$INSTDIR\QtXml4.dll" + Delete "$INSTDIR\avrdude.exe" + Delete "$INSTDIR\avrdude.conf" + Delete "$INSTDIR\libusb0.dll" + Delete "$INSTDIR\dfu-util.exe" + Delete "$INSTDIR\Uninstall.exe" + + Delete "$INSTDIR\lang\*.*" + + RMDir "$INSTDIR\lang" + RMDir "$INSTDIR" + + ${unregisterExtension} ".bin" "BIN File" + ${unregisterExtension} ".hex" "HEX File" + ${unregisterExtension} ".eepm" "EEPE File" + ${unregisterExtension} ".companion" "EEPM File" + + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + + Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk" + Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + + DeleteRegKey /ifempty HKCU "Software\companion9x" + +SectionEnd + +Function LaunchLink + ExecShell "" "$INSTDIR\companion.exe" +FunctionEnd diff --git a/companion/targets/windows/companion9x-vs.nsi.in b/companion/targets/windows/companion-vs.nsi.in similarity index 82% rename from companion/targets/windows/companion9x-vs.nsi.in rename to companion/targets/windows/companion-vs.nsi.in index 3e5950ada..340abc782 100644 --- a/companion/targets/windows/companion9x-vs.nsi.in +++ b/companion/targets/windows/companion-vs.nsi.in @@ -1,214 +1,214 @@ -;NSIS Modern User Interface -;Start Menu Folder Selection Example Script -;Written by Joost Verburg - -;-------------------------------- -;Include Modern UI - - !include "MUI2.nsh" - !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh" - -;-------------------------------- -;General - - ;Name and file - Name "companion9x" - OutFile "companion9xInstall_v@C9X_VERSION@.exe" - - ;Default installation folder - InstallDir "$PROGRAMFILES\companion9x" - - ;Get installation folder from registry if available - InstallDirRegKey HKCU "Software\companion9x" "" - - ;Compressor options - SetCompressor /FINAL /SOLID lzma - SetCompressorDictSize 64 - - ;Request application privileges for Windows Vista - RequestExecutionLevel admin - -;-------------------------------- -;Variables - - Var StartMenuFolder - -;-------------------------------- -;Interface Settings - - !define MUI_ABORTWARNING - -;-------------------------------- -;File Exists Macro - -; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation -!macro !defineifexist _VAR_NAME _FILE_NAME - !tempfile _TEMPFILE - !ifdef NSIS_WIN32_MAKENSIS - ; Windows - cmd.exe - !system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"' - !else - ; Posix - sh - !system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi' - !endif - !include '${_TEMPFILE}' - !delfile '${_TEMPFILE}' - !undef _TEMPFILE -!macroend -!define !defineifexist "!insertmacro !defineifexist" - -;-------------------------------- -;Pages - - !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" - !insertmacro MUI_PAGE_COMPONENTS - !insertmacro MUI_PAGE_DIRECTORY - - ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - - !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder - - !insertmacro MUI_PAGE_INSTFILES - - # These indented statements modify settings for MUI_PAGE_FINISH - !define MUI_FINISHPAGE_NOAUTOCLOSE - !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_CHECKED - !define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x" - !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" - # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED - # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt - !insertmacro MUI_PAGE_FINISH - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" - !insertmacro MUI_LANGUAGE "French" - -;-------------------------------- -;Installer Sections - -Section "companion9x" SecDummy - - SetOutPath "$INSTDIR" - - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" - File "Release\companion9x.exe" - ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" - !ifdef PTHREAD_WINDIR - File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" - !else - File "@SYSDIR@\system32\pthreadVC2.dll" - !endif - File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll" - File "C:\Programs\SDL\lib\SDL.dll" - File "@SYSDIR@\msvcp100.dll" - File "@SYSDIR@\msvcr100.dll" - File "@QT_BINARY_DIR@\QtCore4.dll" - File "@QT_BINARY_DIR@\QtGui4.dll" - File "@QT_BINARY_DIR@\QtNetwork4.dll" - File "@QT_BINARY_DIR@\Phonon4.dll" - File "@QT_BINARY_DIR@\QtXml4.dll" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe" - File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll" - - CreateDirectory "$INSTDIR\lang" - SetOutPath "$INSTDIR\lang" - File "*.qm" - - SetOutPath "$INSTDIR" - ;Store installation folder - WriteRegStr HKCU "Software\companion9x" "" $INSTDIR - - ;Associate with extentions ,bin and .hex - ${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File" - ${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File" - - - ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - - ;Create shortcuts - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_END - -SectionEnd - -;-------------------------------- -;Descriptions - - ;Language strings - LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor." - LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM" - - ;Assign language strings to sections - !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy) - !insertmacro MUI_FUNCTION_DESCRIPTION_END - -;-------------------------------- -;Uninstaller Section - -Section "Uninstall" - - ;ADD YOUR OWN FILES HERE... - - Delete "$INSTDIR\license.txt" - Delete "$INSTDIR\companion9x.exe" - Delete "$INSTDIR\pthreadVC2.dll" - Delete "$INSTDIR\xerces-c_3_1.dll" - Delete "$INSTDIR\SDL.dll" - Delete "$INSTDIR\msvcp100.dll" - Delete "$INSTDIR\msvcr100.dll" - Delete "$INSTDIR\QtCore4.dll" - Delete "$INSTDIR\QtGui4.dll" - Delete "$INSTDIR\QtXml4.dll" - Delete "$INSTDIR\QtNetwork4.dll" - Delete "$INSTDIR\Phonon4.dll" - Delete "$INSTDIR\avrdude.exe" - Delete "$INSTDIR\avrdude.conf" - Delete "$INSTDIR\libusb0.dll" - Delete "$INSTDIR\dfu-util.exe" - Delete "$INSTDIR\libusb-1.0.dll" - Delete "$INSTDIR\Uninstall.exe" - - Delete "$INSTDIR\lang\*.*" - - RMDir "$INSTDIR\lang" - RMDir "$INSTDIR" - - ${unregisterExtension} ".bin" "BIN File" - ${unregisterExtension} ".hex" "HEX File" - ${unregisterExtension} ".eepm" "EEPE File" - ${unregisterExtension} ".companion9x" "EEPM File" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - - Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - DeleteRegKey /ifempty HKCU "Software\companion9x" - -SectionEnd - -Function LaunchLink - ExecShell "" "$INSTDIR\companion9x.exe" -FunctionEnd +;NSIS Modern User Interface +;Start Menu Folder Selection Example Script +;Written by Joost Verburg + +;-------------------------------- +;Include Modern UI + + !include "MUI2.nsh" + !include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh" + +;-------------------------------- +;General + + ;Name and file + Name "openTx companion" + OutFile "companionInstall_v@C9X_VERSION@.exe" + + ;Default installation folder + InstallDir "$PROGRAMFILES\openTx companion" + + ;Get installation folder from registry if available + InstallDirRegKey HKCU "Software\companion9x" "" + + ;Compressor options + SetCompressor /FINAL /SOLID lzma + SetCompressorDictSize 64 + + ;Request application privileges for Windows Vista + RequestExecutionLevel admin + +;-------------------------------- +;Variables + + Var StartMenuFolder + +;-------------------------------- +;Interface Settings + + !define MUI_ABORTWARNING + +;-------------------------------- +;File Exists Macro + +; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation +!macro !defineifexist _VAR_NAME _FILE_NAME + !tempfile _TEMPFILE + !ifdef NSIS_WIN32_MAKENSIS + ; Windows - cmd.exe + !system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"' + !else + ; Posix - sh + !system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi' + !endif + !include '${_TEMPFILE}' + !delfile '${_TEMPFILE}' + !undef _TEMPFILE +!macroend +!define !defineifexist "!insertmacro !defineifexist" + +;-------------------------------- +;Pages + + !insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + + ;Start Menu Folder Page Configuration + !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" + !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x" + !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + + !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder + + !insertmacro MUI_PAGE_INSTFILES + + # These indented statements modify settings for MUI_PAGE_FINISH + !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_CHECKED + !define MUI_FINISHPAGE_RUN_TEXT "Launch companion" + !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" + # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED + # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt + !insertmacro MUI_PAGE_FINISH + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "French" + +;-------------------------------- +;Installer Sections + +Section "openTx companion" SecDummy + + SetOutPath "$INSTDIR" + + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt" + File "Release\companion.exe" + ${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" + !ifdef PTHREAD_WINDIR + File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll" + !else + File "@SYSDIR@\system32\pthreadVC2.dll" + !endif + File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll" + File "C:\Programs\SDL\lib\SDL.dll" + File "@SYSDIR@\msvcp100.dll" + File "@SYSDIR@\msvcr100.dll" + File "@QT_BINARY_DIR@\QtCore4.dll" + File "@QT_BINARY_DIR@\QtGui4.dll" + File "@QT_BINARY_DIR@\QtNetwork4.dll" + File "@QT_BINARY_DIR@\Phonon4.dll" + File "@QT_BINARY_DIR@\QtXml4.dll" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe" + File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll" + + CreateDirectory "$INSTDIR\lang" + SetOutPath "$INSTDIR\lang" + File "*.qm" + + SetOutPath "$INSTDIR" + ;Store installation folder + WriteRegStr HKCU "Software\companion9x" "" $INSTDIR + + ;Associate with extentions ,bin and .hex + ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File" + ${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File" + ${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File" + ${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File" + + + ;Create uninstaller + WriteUninstaller "$INSTDIR\Uninstall.exe" + + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + + ;Create shortcuts + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + + !insertmacro MUI_STARTMENU_WRITE_END + +SectionEnd + +;-------------------------------- +;Descriptions + + ;Language strings + LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx" + LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de rglages et modles pour openTx" + + ;Assign language strings to sections + !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy) + !insertmacro MUI_FUNCTION_DESCRIPTION_END + +;-------------------------------- +;Uninstaller Section + +Section "Uninstall" + + ;ADD YOUR OWN FILES HERE... + + Delete "$INSTDIR\license.txt" + Delete "$INSTDIR\companion.exe" + Delete "$INSTDIR\pthreadVC2.dll" + Delete "$INSTDIR\xerces-c_3_1.dll" + Delete "$INSTDIR\SDL.dll" + Delete "$INSTDIR\msvcp100.dll" + Delete "$INSTDIR\msvcr100.dll" + Delete "$INSTDIR\QtCore4.dll" + Delete "$INSTDIR\QtGui4.dll" + Delete "$INSTDIR\QtXml4.dll" + Delete "$INSTDIR\QtNetwork4.dll" + Delete "$INSTDIR\Phonon4.dll" + Delete "$INSTDIR\avrdude.exe" + Delete "$INSTDIR\avrdude.conf" + Delete "$INSTDIR\libusb0.dll" + Delete "$INSTDIR\dfu-util.exe" + Delete "$INSTDIR\libusb-1.0.dll" + Delete "$INSTDIR\Uninstall.exe" + + Delete "$INSTDIR\lang\*.*" + + RMDir "$INSTDIR\lang" + RMDir "$INSTDIR" + + ${unregisterExtension} ".bin" "BIN File" + ${unregisterExtension} ".hex" "HEX File" + ${unregisterExtension} ".eepm" "EEPE File" + ${unregisterExtension} ".companion" "EEPM File" + + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + + Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk" + Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + + DeleteRegKey /ifempty HKCU "Software\companion9x" + +SectionEnd + +Function LaunchLink + ExecShell "" "$INSTDIR\companion.exe" +FunctionEnd