From f6d50d77e18016f47c15d57723e1595ca1de0a7a Mon Sep 17 00:00:00 2001
From: Asizon <43983086+Asizon@users.noreply.github.com>
Date: Tue, 21 Dec 2021 09:38:01 +0100
Subject: [PATCH] fix_duplicated_i18n

minor fix

fix
---
 locales/en/messages.json | 40 +++++-----------------------------------
 src/tabs/pid_tuning.html | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/locales/en/messages.json b/locales/en/messages.json
index 4b4e5e1c..34ba1797 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -3881,9 +3881,6 @@
     "pidTuningGyroLowpassType": {
         "message": "Gyro Lowpass 1 Filter Type"
     },    
-    "pidTuningGyroLowpassFrequency": {
-        "message": "Cutoff Frequency [Hz]"
-    },
     "pidTuningGyroLowpass": {
         "message": "Gyro Lowpass 1"
     },
@@ -3902,10 +3899,10 @@
     "pidTuningGyroLowpassDyn": {
         "message": "Gyro Lowpass Dynamic Filter"
     },
-    "pidTuningGyroLowpassDynMinFrequency": {
+    "pidTuningMinCutoffFrequency": {
         "message": "Min Cutoff Frequency [Hz]"
     },
-    "pidTuningGyroLowpassDynMaxFrequency": {
+    "pidTuningMaxCutoffFrequency": {
         "message": "Max Cutoff Frequency [Hz]"
     },
     "pidTuningGyroLowpassDynType": {
@@ -3914,9 +3911,6 @@
     "pidTuningGyroLowpass2": {
         "message": "Gyro Lowpass 2"
     },
-    "pidTuningGyroLowpass2Frequency": {
-        "message": "Cutoff Frequency [Hz]"
-    },
     "pidTuningGyroLowpassFilterHelp": {
         "message": "Gyro lowpass filters attenuate higher frequency noise to keep it out of the PID loop. There are two independently configurable gyro filters; by default both are active.<br /><br />The first D lowpass can be static (fixed cutoff) or dynamic; the second D lowpass is always static. When a lowpass is in dynamic mode, filter will be stronger at low throttle, and the cutoff will go higher (less filtering) as throttle increases.<br /><br />Without RPM filtering, both PT1 filters should be enabled at default (or stronger) cutoffs, with lowpass 1 in dynamic mode.<br /><br />With RPM filtering, the gyro filter slider can often be moved some way to the right. On clean quads it can go all the way right, or alternatively a single static gyro lowpass filter at 500hz may be sufficient.<br /><br />A quad will have less propwash with the least gyro filter delay (sliders to the right, higher cutoff values).<br /><br />Always check for motor heat when shifting to less gyro filtering (sliders to the right). With minimal gyro filtering, it is essential to have enough D filtering! Take care!" 
     },
@@ -3932,16 +3926,10 @@
     "pidTuningGyroNotchFilter2": {
         "message": "Gyro Notch Filter 2"
     },
-    "pidTuningGyroNotch1Frequency": {
+    "pidTuningCenterFrequency": {
         "message": "Center Frequency [Hz]"
     },
-    "pidTuningGyroNotch2Frequency": {
-        "message": "Center Frequency [Hz]"
-    },
-    "pidTuningGyroNotch1Cutoff": {
-        "message": "Cutoff Frequency [Hz]"
-    },
-    "pidTuningGyroNotch2Cutoff": {
+    "pidTuningCutoffFrequency": {
         "message": "Cutoff Frequency [Hz]"
     },
     "pidTuningNotchFilterHelp": {
@@ -4040,10 +4028,7 @@
     "pidTuningDTermLowpassType": {
         "message": "Filter Type"
     },
-    "pidTuningDTermLowpassFrequency": {
-        "message": "Static Cutoff Frequency [Hz]"
-    },
-    "pidTuningDTermLowpass2Frequency": {
+    "pidTuningStaticCutoffFrequency": {
         "message": "Static Cutoff Frequency [Hz]"
     },
     "pidTuningDTermLowpass2Type": {
@@ -4052,12 +4037,6 @@
     "pidTuningDTermLowpassDyn": {
         "message": "D Term Lowpass Dynamic Filter"
     },
-    "pidTuningDTermLowpassDynMinFrequency": {
-        "message": "Min Cutoff Frequency [Hz]"
-    },
-    "pidTuningDTermLowpassDynMaxFrequency": {
-        "message": "Max Cutoff Frequency [Hz]"
-    },
     "pidTuningDTermLowpassDynExpo": {
         "message": "Dynamic Curve Expo"
     },
@@ -4067,18 +4046,9 @@
     "pidTuningDTermNotchFiltersGroup": {
         "message": "D Term Notch Filter"
     },
-    "pidTuningDTermNotchFrequency": {
-        "message": "Center Frequency [Hz]"
-    },
-    "pidTuningDTermNotchCutoff": {
-        "message": "Cutoff Frequency [Hz]"
-    },
     "pidTuningYawLowpassFiltersGroup": {
         "message": "Yaw Lowpass Filter"
     },
-    "pidTuningYawLowpassFrequency": {
-        "message": "Cutoff Frequency [Hz]"
-    },
     "pidTuningVbatPidCompensation": {
         "message": "Vbat PID Compensation"
     },
diff --git a/src/tabs/pid_tuning.html b/src/tabs/pid_tuning.html
index 32a1baa6..8e91698f 100644
--- a/src/tabs/pid_tuning.html
+++ b/src/tabs/pid_tuning.html
@@ -1281,7 +1281,7 @@
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroLowpassFrequency" step="1" min="1" max="255"/>
                                         <label>
-                                            <span i18n="pidTuningGyroLowpassFrequency"></span>
+                                            <span i18n="pidTuningCutoffFrequency"></span>
                                         </label>
                                     </span>
                                     <span class="suboption">
@@ -1327,14 +1327,14 @@
                                     <span class="suboption dynamic">
                                         <input type="number" name="gyroLowpassDynMinFrequency" step="1" min="1" max="1000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroLowpassDynMinFrequency"></span>
+                                            <span i18n="pidTuningMinCutoffFrequency"></span>
                                         </label>
                                     </span>
 
                                     <span class="suboption dynamic">
                                         <input type="number" name="gyroLowpassDynMaxFrequency" step="1" min="1" max="1000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroLowpassDynMaxFrequency"></span>
+                                            <span i18n="pidTuningMaxCutoffFrequency"></span>
                                         </label>
                                     </span>
 
@@ -1361,7 +1361,7 @@
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroLowpass2Frequency" step="1" min="1" max="16000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroLowpass2Frequency"></span>
+                                            <span i18n="pidTuningCutoffFrequency"></span>
                                         </label>
                                     </span>
 
@@ -1394,14 +1394,14 @@
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroNotch1Frequency" step="1" min="1" max="16000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroNotch1Frequency"></span>
+                                            <span i18n="pidTuningCenterFrequency"></span>
                                         </label>
                                     </span>
 
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroNotch1Cutoff" step="1" min="0" max="16000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroNotch1Cutoff"></span>
+                                            <span i18n="pidTuningCutoffFrequency"></span>
                                         </label>
                                     </span>
                                 </td>
@@ -1416,14 +1416,14 @@
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroNotch2Frequency" step="1" min="1" max="16000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroNotch2Frequency"></span>
+                                            <span i18n="pidTuningCenterFrequency"></span>
                                         </label>
                                     </span>
 
                                     <span class="suboption">
                                         <input type="number" class="nonProfile" name="gyroNotch2Cutoff" step="1" min="0" max="16000"/>
                                         <label>
-                                            <span i18n="pidTuningGyroNotch2Cutoff"></span>
+                                            <span i18n="pidTuningCutoffFrequency"></span>
                                         </label>
                                     </span>
 
@@ -1556,14 +1556,14 @@
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpassDynMinFrequency"></span>
+                                            <span i18n="pidTuningMinCutoffFrequency"></span>
                                         </label>
                                     </span>
 
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpassDynMaxFrequency"></span>
+                                            <span i18n="pidTuningMaxCutoffFrequency"></span>
                                         </label>
                                     </span>
 
@@ -1590,7 +1590,7 @@
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="dtermLowpassFrequency" step="1" min="1" max="16000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpassFrequency"></span>
+                                            <span i18n="pidTuningStaticCutoffFrequency"></span>
                                         </label>
 									</span>
                                     <span class="suboption">
@@ -1637,14 +1637,14 @@
                                     <span class="suboption dynamic">
                                         <span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpassDynMinFrequency"></span>
+                                            <span i18n="pidTuningMinCutoffFrequency"></span>
                                         </label>
                                     </span>
  
                                     <span class="suboption dynamic">
                                         <span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpassDynMaxFrequency"></span>
+                                            <span i18n="pidTuningMaxCutoffFrequency"></span>
                                         </label>
                                         </span>
                     
@@ -1678,7 +1678,7 @@
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="dtermLowpass2Frequency" step="1" min="1" max="16000"/></span>
                                         <label>
-                                            <span i18n="pidTuningDTermLowpass2Frequency"></span>
+                                            <span i18n="pidTuningStaticCutoffFrequency"></span>
                                         </label>
                                     </span>
 
@@ -1710,12 +1710,12 @@
 
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="dTermNotchFrequency" step="1" min="1" max="16000"/></span>
-                                        <label><span i18n="pidTuningDTermNotchFrequency"></span></label>
+                                        <label><span i18n="pidTuningCenterFrequency"></span></label>
                                     </span>
 
                                     <span class="suboption">
                                         <input type="number" name="dTermNotchCutoff" step="1" min="0" max="16000"/>
-                                        <label><span i18n="pidTuningDTermNotchCutoff"></span></label>
+                                        <label><span i18n="pidTuningCutoffFrequency"></span></label>
                                     </span>
                                 </td>
                             </tr>
@@ -1735,7 +1735,7 @@
                                     <span class="suboption">
                                         <span class="inputValue"><input type="number" name="yawLowpassFrequency" step="1" min="1" max="500"/></span>
                                         <label>
-                                            <span i18n="pidTuningYawLowpassFrequency"></span>
+                                            <span i18n="pidTuningCutoffFrequency"></span>
                                         </label>
                                     </span>
                                 </td>