diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 34bc92ac8..ca6c86485 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -278,10 +278,10 @@ QString RawSource::toString() QObject::tr("Cur+"), QObject::tr("Pwr+"), QObject::tr("ACC "), QObject::tr("Time"), }; - static const QString virtualSwitches[] = { QObject::tr("CS1"), QObject::tr("CS2"), QObject::tr("CS3"), QObject::tr("CS4"), QObject::tr("CS5"), QObject::tr("CS6"), QObject::tr("CS7"), QObject::tr("CS8"), QObject::tr("CS9"), QObject::tr("CSA"), - QObject::tr("CSB"), QObject::tr("CSC"), QObject::tr("CSD"), QObject::tr("CSE"), QObject::tr("CSF"), QObject::tr("CSG"), QObject::tr("CSH"), QObject::tr("CSI"), QObject::tr("CSJ"), QObject::tr("CSK"), - QObject::tr("CSL"), QObject::tr("CSM"), QObject::tr("CSN"), QObject::tr("CSO"), QObject::tr("CSP"), QObject::tr("CSQ"), QObject::tr("CSR"), QObject::tr("CSS"), QObject::tr("CST"), QObject::tr("CSU"), - QObject::tr("CSV"), QObject::tr("CSW") + static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"), + QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"), + QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"), + QObject::tr("LSV"), QObject::tr("LSW") }; if (index<0) { @@ -292,7 +292,7 @@ QString RawSource::toString() if (model && strlen(model->inputNames[index]) > 0) return QString(model->inputNames[index]); else - return QObject::tr("Virtual Input %1").arg(index+1); + return QObject::tr("Input %1").arg(index+1); case SOURCE_TYPE_STICK: return AnalogString(index); case SOURCE_TYPE_TRIM: @@ -352,10 +352,10 @@ QString RawSwitch::toString() SwitchUp('H'), SwitchDn('H'), }; - static const QString virtualSwitches[] = { QObject::tr("CS1"), QObject::tr("CS2"), QObject::tr("CS3"), QObject::tr("CS4"), QObject::tr("CS5"), QObject::tr("CS6"), QObject::tr("CS7"), QObject::tr("CS8"), QObject::tr("CS9"), QObject::tr("CSA"), - QObject::tr("CSB"), QObject::tr("CSC"), QObject::tr("CSD"), QObject::tr("CSE"), QObject::tr("CSF"), QObject::tr("CSG"), QObject::tr("CSH"), QObject::tr("CSI"), QObject::tr("CSJ"), QObject::tr("CSK"), - QObject::tr("CSL"), QObject::tr("CSM"), QObject::tr("CSN"), QObject::tr("CSO"), QObject::tr("CSP"), QObject::tr("CSQ"), QObject::tr("CSR"), QObject::tr("CSS"), QObject::tr("CST"), QObject::tr("CSU"), - QObject::tr("CSV"), QObject::tr("CSW") + static const QString virtualSwitches[] = { QObject::tr("LS1"), QObject::tr("LS2"), QObject::tr("LS3"), QObject::tr("LS4"), QObject::tr("LS5"), QObject::tr("LS6"), QObject::tr("LS7"), QObject::tr("LS8"), QObject::tr("LS9"), QObject::tr("LSA"), + QObject::tr("LSB"), QObject::tr("LSC"), QObject::tr("LSD"), QObject::tr("LSE"), QObject::tr("LSF"), QObject::tr("LSG"), QObject::tr("LSH"), QObject::tr("LSI"), QObject::tr("LSJ"), QObject::tr("LSK"), + QObject::tr("LSL"), QObject::tr("LSM"), QObject::tr("LSN"), QObject::tr("LSO"), QObject::tr("LSP"), QObject::tr("LSQ"), QObject::tr("LSR"), QObject::tr("LSS"), QObject::tr("LST"), QObject::tr("LSU"), + QObject::tr("LSV"), QObject::tr("LSW") }; switch(type) { diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index af73cc9cd..bbbe15fdf 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -45,7 +45,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, int col = 1; addLabel(gridLayout, tr("Switch"), col++); - addLabel(gridLayout, tr("Function"), col++); + addLabel(gridLayout, tr("Action"), col++); addLabel(gridLayout, tr("Parameters"), col++); addLabel(gridLayout, tr("Enable"), col++); diff --git a/companion/src/modeledit/customswitches.cpp b/companion/src/modeledit/customswitches.cpp index 9d6d5596c..c7c5d6ae8 100644 --- a/companion/src/modeledit/customswitches.cpp +++ b/companion/src/modeledit/customswitches.cpp @@ -14,7 +14,7 @@ CustomSwitchesPanel::CustomSwitchesPanel(QWidget * parent, ModelData & model): QGridLayout * gridLayout = new QGridLayout(this); int col = 1; - addLabel(gridLayout, tr("Function"), col++); + addLabel(gridLayout, tr("Condition"), col++); addLabel(gridLayout, tr("V1"), col++); addLabel(gridLayout, tr("V2"), col++); addLabel(gridLayout, tr("AND"), col++); diff --git a/companion/src/modeledit/expodialog.ui b/companion/src/modeledit/expodialog.ui index 67f8f92ce..17fe24f9a 100644 --- a/companion/src/modeledit/expodialog.ui +++ b/companion/src/modeledit/expodialog.ui @@ -6,8 +6,8 @@ 0 0 - 370 - 356 + 381 + 414 @@ -73,7 +73,7 @@ - Phase used by the expo. + Phase used by the input. @@ -266,8 +266,8 @@ - Switch used by the expo. -If blank then the expo is considered to be "ON" all the time. + Switch used by the input. +If blank then the input is considered to be "ON" all the time. @@ -395,7 +395,7 @@ p, li { white-space: pre-wrap; } - The curve used by the expo + The curve used by the input diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp index 1376abb68..870ab81b7 100644 --- a/companion/src/modeledit/inputs.cpp +++ b/companion/src/modeledit/inputs.cpp @@ -21,7 +21,7 @@ InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & g qbDown->setText(tr("Move Down")); qbDown->setIcon(CompanionIcon("movedown.png")); qbDown->setShortcut(QKeySequence(tr("Ctrl+Down"))); - qbClear->setText(tr("Clear Expo Settings")); + qbClear->setText(tr("Clear All Settings")); qbClear->setIcon(CompanionIcon("clear.png")); exposLayout->addWidget(ExposlistWidget,1,1,1,3); @@ -142,7 +142,7 @@ void InputsPanel::update() bool InputsPanel::gm_insertExpo(int idx) { if (idx<0 || idx>=C9X_MAX_EXPOS || model.expoData[C9X_MAX_EXPOS-1].mode > 0) { - QMessageBox::information(this, "companion", tr("Not enough available expos!")); + QMessageBox::information(this, "companion", tr("Not enough available inputs!")); return false; } @@ -222,7 +222,7 @@ void InputsPanel::exposDelete(bool ask) if(ask) ret = QMessageBox::warning(this, "companion", - tr("Delete Selected Expos?"), + tr("Delete Selected Inputs?"), QMessageBox::Yes | QMessageBox::No); @@ -460,7 +460,7 @@ void InputsPanel::exposDeleteList(QList list) void InputsPanel::clearExpos() { - if (QMessageBox::question(this, tr("Clear Expos?"), tr("Really clear all the expos?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + if (QMessageBox::question(this, tr("Clear Inputs?"), tr("Really clear all the inputs?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { model.clearInputs(); emit modified(); update(); diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 596f47590..4d0b24efa 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -99,16 +99,16 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module QString label; if (moduleIdx < 0) { - label = tr("Trainer Module"); + label = tr("Trainer Output"); ui->trainerMode->setCurrentIndex(model.trainerMode); } else { ui->label_trainerMode->hide(); ui->trainerMode->hide(); if (moduleIdx == 0) - label = tr("Internal Module"); + label = tr("Internal Radio System"); else - label = tr("External Module"); + label = tr("External Radio Module"); } ui->label_module->setText(label); diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 6a851bf10..975950d96 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -148,12 +148,7 @@ Brytare - - Function - Funktion - - - + Parameters Parametrar @@ -163,12 +158,12 @@ Slå på - - CF%1 - LB%1 + + Action + Effekt - + ON På @@ -226,12 +221,7 @@ CustomSwitchesPanel - - Function - Funktion - - - + V1 V1 @@ -256,9 +246,14 @@ Fördröjning - + + Condition + Villkor + + + - CS%1 + LS%1 LB%1 @@ -378,24 +373,12 @@ ExpoDialog - - Phase used by the expo. - Flygläge som används av expo. - - - + Switch Brytare - - Switch used by the expo. -If blank then the expo is considered to be "ON" all the time. - Brytare som används av expo. -Om fältet lämnas tomt så är expo påslaget hela tiden. - - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -445,19 +428,14 @@ p, li { white-space: pre-wrap; } Kurva - - The curve used by the expo - Kurvan som används av expo - - - + Source Källa Line name - + Linjenamn @@ -472,10 +450,17 @@ p, li { white-space: pre-wrap; } Input name - Input-namn + Filternamn - + + Switch used by the input. +If blank then the input is considered to be "ON" all the time. + Brytare som används av filret. +Om fältet lämnas tomt så är filtret aktivt hela tiden. + + + POS Positiva @@ -490,7 +475,12 @@ p, li { white-space: pre-wrap; } Vikt - + + Phase used by the input. + Flygläge som används av filtret. + + + 0 0 @@ -535,7 +525,12 @@ p, li { white-space: pre-wrap; } 8 - + + The curve used by the input + Kurva som används av filtret + + + GV GV @@ -1802,12 +1797,7 @@ FAI-funktionen kan inte slås av i sändaren. Ctrl+Down - - Clear Expo Settings - Ta bort expo-inställningar - - - + Source(%1) Källa(%1) @@ -1827,14 +1817,19 @@ FAI-funktionen kan inte slås av i sändaren. Brytare(%1) - - Not enough available expos! - För få expos är tillgängliga! + + Clear All Settings + Radera alla inställningar + + + + Not enough available inputs! + För få filter är tillgängliga! - Delete Selected Expos? - Ta bort valda Expos? + Delete Selected Inputs? + Radera valda filter? @@ -1908,13 +1903,13 @@ FAI-funktionen kan inte slås av i sändaren. - Clear Expos? - Nollställ Expos? + Clear Inputs? + Radera Filter? - Really clear all the expos? - Vill du verkligen nollställa alla Expos? + Really clear all the inputs? + Vill du verkligen ta bort alla filter? @@ -3409,20 +3404,10 @@ p, li { white-space: pre-wrap; } Inputs - Ingångar + Filter - - Custom Switches - Logiska Brytare - - - - Assignable Functions - Tillgängliga Funktioner - - - + Telemetry Telemetri @@ -3447,7 +3432,17 @@ p, li { white-space: pre-wrap; } Mixar - + + Logical Switches + Logiska Brytare + + + + Switch Assignment + BrytarEffekter + + + Curves Kurvor @@ -3715,18 +3710,18 @@ p, li { white-space: pre-wrap; } ModulePanel - Trainer Module - Traineringång + Trainer Output + TrainerUttag - Internal Module - Intern modul + Internal Radio System + Intern Radosändare - External Module - Extern Modul + External Radio Module + Extern Sändarmodul @@ -3946,7 +3941,204 @@ p, li { white-space: pre-wrap; } Batt - + + + LS1 + LB1 + + + + + LS2 + LB2 + + + + + LS3 + LB3 + + + + + LS4 + LB4 + + + + + LS5 + LB5 + + + + + LS6 + LB6 + + + + + LS7 + LB7 + + + + + LS8 + LB8 + + + + + LS9 + LB9 + + + + + LSA + LBA + + + + + LSB + LBB + + + + + LSC + LBC + + + + + LSD + LBD + + + + + LSE + LBE + + + + + LSF + LBF + + + + + LSG + LBG + + + + + LSH + LBH + + + + + LSI + LBI + + + + + LSJ + LBJ + + + + + LSK + LBK + + + + + LSL + LBL + + + + + LSM + LBM + + + + + LSN + LBN + + + + + LSO + LBO + + + + + LSP + LBP + + + + + LSQ + LBQ + + + + + LSR + LBR + + + + + LSS + LBS + + + + + LST + LBT + + + + + LSU + LBU + + + + + LSV + LBV + + + + + LSW + LBW + + + + Input %1 + Filter %1 + + + CYC%1 CYC%1 @@ -4634,7 +4826,7 @@ p, li { white-space: pre-wrap; } - + No repeat Repetera ej @@ -4882,204 +5074,7 @@ p, li { white-space: pre-wrap; } - - - CS1 - LB1 - - - - - CS2 - LB2 - - - - - CS3 - LB3 - - - - - CS4 - LB4 - - - - - CS5 - LB5 - - - - - CS6 - LB6 - - - - - CS7 - LB7 - - - - - CS8 - LB8 - - - - - CS9 - LB9 - - - - - CSA - LBA - - - - - CSB - LBB - - - - - CSC - LBC - - - - - CSD - LBD - - - - - CSE - LBE - - - - - CSF - LBF - - - - - CSG - LBG - - - - - CSH - LBH - - - - - CSI - LBI - - - - - CSJ - LBJ - - - - - CSK - LBK - - - - - CSL - LBL - - - - - CSM - LBM - - - - - CSN - LBN - - - - - CSO - LBO - - - - - CSP - LBP - - - - - CSQ - LBQ - - - - - CSR - LBR - - - - - CSS - LBS - - - - - CST - LBT - - - - - CSU - LBU - - - - - CSV - LBV - - - - - CSW - LBW - - - - Virtual Input %1 - Virituell Input %1 - - - + ONE ONE @@ -5142,7 +5137,7 @@ p, li { white-space: pre-wrap; } Input%1 - Input%1 + Filter%1 @@ -6919,12 +6914,7 @@ m2560 för v4.1-kort 9-punktskurva - - Custom Switches - Logiska Brytare - - - + Function Funktion @@ -7004,7 +6994,23 @@ m2560 för v4.1-kort Värde - + + Logical Switches + Logiska Brytare + + + + + LS + LB + + + + Switch Assignment + BrytarEffekter + + + RSSI Alarm RSSI-alarm @@ -7058,13 +7064,7 @@ m2560 för v4.1-kort INAKTIV - - - CS - LB - - - + Param Param @@ -7099,12 +7099,7 @@ m2560 för v4.1-kort GV - - Custom Functions - Specialfunktioner - - - + Repeat Upprepa @@ -8850,12 +8845,12 @@ Får skilja från språket för mjukvaran - + Enabled Aktiv - + Disabled Inaktiv @@ -8901,35 +8896,51 @@ Får skilja från språket för mjukvaran pt %1 - + + Logical Switches + Logiska Brytare + + + + + LS + LB + + + + Switch Assignments + BrytarEffekter + + + Source Källa - + - + Offset Offset - + Function Funktion - + - + Switch Brytare - + IN IN @@ -8983,20 +8994,20 @@ Får skilja från språket för mjukvaran - + Min Minimum - + - + Max Maximum - + Invert @@ -9022,18 +9033,13 @@ Får skilja från språket för mjukvaran Kurvor - - Custom Switches - Logiska Brytare - - - + Safety Switches Säkerhetsbrytare - + @@ -9041,17 +9047,7 @@ Får skilja från språket för mjukvaran Värde - - Function Switches - Brytarfunktioner - - - - CF - CF - - - + Telemetry Settings Inställningar för Telemetri @@ -9129,12 +9125,12 @@ Får skilja från språket för mjukvaran Välj PDF-fil att skriva till - + OUT UT - + A%1 A%1 @@ -9155,24 +9151,18 @@ Får skilja från språket för mjukvaran Egna inställning av telemetriskärmen - + DISABLED INAKTIV - - - CS - LB - - - + Parameter Parameter - + Gvars Gvars @@ -9192,12 +9182,12 @@ Får skilja från språket för mjukvaran GV - + Repeat Upprepa - + Flight modes Settings Inställningar för flyglägen @@ -9227,7 +9217,7 @@ Får skilja från språket för mjukvaran Flygläge - + ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*) ODF filer (*.odt);;PDF Filer(*.pdf);;HTML-Filer (*.htm *.html);;Alla Filer (*)