diff --git a/_locales/en/messages.json b/_locales/en/messages.json index fe74676f..a2ec2376 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1548,55 +1548,9 @@ "controlAxisThrottle": { "message": "Throttle" }, - "controlAxisAux1": { - "message": "AUX 1" + "radioChannelShort": { + "message": "CH " }, - "controlAxisAux2": { - "message": "AUX 2" - }, - "controlAxisAux3": { - "message": "AUX 3" - }, - "controlAxisAux4": { - "message": "AUX 4" - }, - "controlAxisAux5": { - "message": "AUX 5" - }, - "controlAxisAux6": { - "message": "AUX 6" - }, - "controlAxisAux7": { - "message": "AUX 7" - }, - "controlAxisAux8": { - "message": "AUX 8" - }, - "controlAxisAux9": { - "message": "AUX 9" - }, - "controlAxisAux10": { - "message": "AUX 10" - }, - "controlAxisAux11": { - "message": "AUX 11" - }, - "controlAxisAux12": { - "message": "AUX 12" - }, - "controlAxisAux13": { - "message": "AUX 13" - }, - "controlAxisAux14": { - "message": "AUX 14" - }, - "controlAxisAux15": { - "message": "AUX 15" - }, - "controlAxisAux16": { - "message": "AUX 16" - }, - "pidTuningBasic": { "message": "Basic/Acro" }, diff --git a/tabs/failsafe.js b/tabs/failsafe.js index 3ceccb1c..992ede8b 100644 --- a/tabs/failsafe.js +++ b/tabs/failsafe.js @@ -137,7 +137,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) { fullChannels_e.append('\
\
\ - ' + chrome.i18n.getMessage("controlAxisAux" + (aux_index++)) + '\ + ' + chrome.i18n.getMessage("radioChannelShort") + (i + 1) + '\ ' + auxAssignment[aux_assignment_index++] + '\
\
\ diff --git a/tabs/receiver.js b/tabs/receiver.js index a7acb68c..1eae2f5c 100644 --- a/tabs/receiver.js +++ b/tabs/receiver.js @@ -60,7 +60,7 @@ TABS.receiver.initialize = function (callback) { if (i < bar_names.length) { name = bar_names[i]; } else { - name = chrome.i18n.getMessage("controlAxisAux" + (aux_index++)); + name = chrome.i18n.getMessage("radioChannelShort") + (i + 1); } bar_container.append('\ diff --git a/tabs/receiver_msp.js b/tabs/receiver_msp.js index 5d66f598..c6967a36 100644 --- a/tabs/receiver_msp.js +++ b/tabs/receiver_msp.js @@ -14,7 +14,7 @@ var aux1: 4, aux2: 5, aux3: 6, - aux4: 7, + aux4: 7 }, // Set reasonable initial stick positions (Mode 2) @@ -32,7 +32,7 @@ var // First the vertical axis, then the horizontal: gimbals = [ ["throttle", "yaw"], - ["pitch", "roll"], + ["pitch", "roll"] ], gimbalElems, @@ -115,7 +115,7 @@ function localizeAxisNames() { } for (var sliderIndex = 0; sliderIndex < 4; sliderIndex++) { - $(".slider-label", sliderElems.get(sliderIndex)).text(chrome.i18n.getMessage("controlAxisAux" + (sliderIndex + 1))); + $(".slider-label", sliderElems.get(sliderIndex)).text(chrome.i18n.getMessage("radioChannelShort") + (sliderIndex + 5)); } }