updates translations and K&M UG Control button labels

artisan-roaster-scope · Nov 5, 2024 · d5c586e · d5c586e
1 parent 95821a4
commit d5c586e
Show file tree

Hide file tree

Showing 67 changed files with 25,464 additions and 25,037 deletions.
diff --git a/doc/help_dialogs/Input_files/eventbuttons.xlsx b/doc/help_dialogs/Input_files/eventbuttons.xlsx
diff --git a/doc/help_dialogs/Output_html/eventbuttons_help.html b/doc/help_dialogs/Output_html/eventbuttons_help.html
@@ -200,6 +200,10 @@
             <td>\f</td>
             <td>FILL</td>
         </tr>
+        <tr>
+            <td>\f</td>
+            <td>DISCHARGE</td>
+        </tr>
         <tr>
             <td>\R</td>
             <td>RELEASE</td>

diff --git a/src/artisanlib/main.py b/src/artisanlib/main.py
@@ -24801,32 +24801,33 @@ def substButtonLabel(self, buttonNr:int, label:str, eventtype:int, eventvalue:fl
                 ('\\1', QApplication.translate('Label','ON')),
                 ('\\2', (QApplication.translate('Label','ON') if state else QApplication.translate('Label','OFF'))),
                 ('\\3', (QApplication.translate('Label','OFF') if state else QApplication.translate('Label','ON'))),
-                ('\\s', QApplication.translate('Label','START')),
-                ('\\p', QApplication.translate('Label','STOP')),
-                ('\\S', (QApplication.translate('Label','STOP') if state else QApplication.translate('Label','START'))),
-                ('\\P', (QApplication.translate('Label','START') if state else QApplication.translate('Label','STOP'))),
-                ('\\o', QApplication.translate('Label','OPEN')),
+                ('\\a', QApplication.translate('Label','AUTO')),
+                ('\\A', (QApplication.translate('Label','MANUAL') if state else QApplication.translate('Label','AUTO'))),
+                ('\\b', QApplication.translate('Label','FLAP')),
                 ('\\c', QApplication.translate('Label','CLOSE')),
-                ('\\O', (QApplication.translate('Label','CLOSE') if state else QApplication.translate('Label','OPEN'))),
                 ('\\C', (QApplication.translate('Label','OPEN') if state else QApplication.translate('Label','CLOSE'))),
-                ('\\a', QApplication.translate('Label','AUTO')),
+                ('\\d', QApplication.translate('Label','CONTROL')),
+                ('\\D', QApplication.translate('Label','DISCHARGE')),
+                ('\\e', self.qmc.etypes[2]),
+                ('\\h', QApplication.translate('Label','HEATING')),
+                ('\\i', QApplication.translate('Label','STIRRER')),
+                ('\\f', QApplication.translate('Label','FILL')),
+                ('\\F', f'{tempvalueF}{self.qmc.mode}'),
+                ('\\l', QApplication.translate('Label','COOLING')),
                 ('\\m', QApplication.translate('Label','MANUAL')),
-                ('\\A', (QApplication.translate('Label','MANUAL') if state else QApplication.translate('Label','AUTO'))),
                 ('\\M', (QApplication.translate('Label','AUTO') if state else QApplication.translate('Label','MANUAL'))),
+                ('\\o', QApplication.translate('Label','OPEN')),
+                ('\\O', (QApplication.translate('Label','CLOSE') if state else QApplication.translate('Label','OPEN'))),
+                ('\\p', QApplication.translate('Label','STOP')),
+                ('\\P', (QApplication.translate('Label','START') if state else QApplication.translate('Label','STOP'))),
                 ('\\q', self.qmc.etypes[0]),
-                ('\\w', self.qmc.etypes[1]),
-                ('\\e', self.qmc.etypes[2]),
                 ('\\r', self.qmc.etypes[3]),
-                ('\\i', QApplication.translate('Label','STIRRER')),
-                ('\\f', QApplication.translate('Label','FILL')),
                 ('\\R', QApplication.translate('Label','RELEASE')),
-                ('\\h', QApplication.translate('Label','HEATING')),
-                ('\\l', QApplication.translate('Label','COOLING')),
-                ('\\b', QApplication.translate('Label','FLAP')),
-                ('\\d', QApplication.translate('Label','CONTROL')),
+                ('\\s', QApplication.translate('Label','START')),
+                ('\\S', (QApplication.translate('Label','STOP') if state else QApplication.translate('Label','START'))),
+                ('\\T', f'{tempvalueC}{self.qmc.mode}'),
                 ('\\V', f'{sign}{value}'),
-                ('\\F', f'{tempvalueF}{self.qmc.mode}'),
-                ('\\T', f'{tempvalueC}{self.qmc.mode}')
+                ('\\w', self.qmc.etypes[1])
                 ]:
             res = res.replace(var,subst)
         return res

diff --git a/src/help/eventbuttons_help.py b/src/help/eventbuttons_help.py
@@ -76,6 +76,7 @@ def content() -> str:
     tbl_Labels.add_row(['\\M',QApplication.translate('HelpDlg','MANUAL (translated, respecting button state)')])
     tbl_Labels.add_row(['\\i',QApplication.translate('HelpDlg','STIRRER')])
     tbl_Labels.add_row(['\\f',QApplication.translate('HelpDlg','FILL')])
+    tbl_Labels.add_row(['\\f',QApplication.translate('HelpDlg','DISCHARGE')])
     tbl_Labels.add_row(['\\R',QApplication.translate('HelpDlg','RELEASE')])
     tbl_Labels.add_row(['\\h',QApplication.translate('HelpDlg','HEATING')])
     tbl_Labels.add_row(['\\l',QApplication.translate('HelpDlg','COOLING')])

diff --git a/src/includes/Machines/Kirsch+Mausser/PLC_control.aset b/src/includes/Machines/Kirsch+Mausser/PLC_control.aset
@@ -56,7 +56,7 @@ extraeventsactions=15, 0, 15, 15, 0, 15, 15, 0, 15, 15
 extraeventsactionstrings="getDBbool(200,116,2);setDBbool(200,116,2,not(_));getDBbool(200,116,2);button(_)", , "getDBbool(200,116,3);setDBbool(200,116,3,not(_));getDBbool(200,116,3);button(_)", "getDBbool(200,116,4);setDBbool(200,116,4,not(_));getDBbool(200,116,4);button(_)", , "getDBbool(200,116,5);setDBbool(200,116,5,not(_));getDBbool(200,116,5);button(_)", "getDBbool(200,116,6);setDBbool(200,116,6,not(_));getDBbool(200,116,6);button(_)", , "getDBbool(200,116,7);setDBbool(200,116,7,not(_));getDBbool(200,116,7);button(_)", "getDBbool(200,117,0);setDBbool(200,117,0,not(_));getDBbool(200,117,0);button(_)"
 extraeventsbuttonsflags=0, 1, 1
 extraeventsdescriptions=, , , , , , , , , 
-extraeventslabels=Feeder, , Charge, Drop, , Stirrer, Cooling, , Discharge, Release
+extraeventslabels=\\f, , Charge, Drop, , \\i, \\l, , \\D, \\R
 extraeventstypes=4, 4, 4, 4, 4, 4, 4, 4, 4, 4
 extraeventsvalues=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 extraeventsvisibility=1, 0, 1, 1, 0, 1, 1, 0, 1, 1

diff --git a/src/includes/Machines/Probat/G_UG_control.aset b/src/includes/Machines/Probat/G_UG_control.aset
@@ -57,7 +57,7 @@ extraeventsactions=15, 0, 15, 15, 0, 15, 15, 0, 15, 15
 extraeventsactionstrings="getDBbool(200,116,2);setDBbool(200,116,2,not(_));getDBbool(200,116,2);button(_)", , "getDBbool(200,116,3);setDBbool(200,116,3,not(_));getDBbool(200,116,3);button(_)", "getDBbool(200,116,4);setDBbool(200,116,4,not(_));getDBbool(200,116,4);button(_)", , "getDBbool(200,116,5);setDBbool(200,116,5,not(_));getDBbool(200,116,5);button(_)", "getDBbool(200,116,6);setDBbool(200,116,6,not(_));getDBbool(200,116,6);button(_)", , "getDBbool(200,116,7);setDBbool(200,116,7,not(_));getDBbool(200,116,7);button(_)", "getDBbool(200,117,0);setDBbool(200,117,0,not(_));getDBbool(200,117,0);button(_)"
 extraeventsbuttonsflags=0, 1, 1
 extraeventsdescriptions=, , , , , , , , , 
-extraeventslabels=Feeder, , Charge, Drop, , Stirrer, Cooling, , Discharge, Release
+extraeventslabels=\\f, , Charge, Drop, , \\i, \\l, , \\D, \\R
 extraeventstypes=4, 4, 4, 4, 4, 4, 4, 4, 4, 4
 extraeventsvalues=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 extraeventsvisibility=1, 0, 1, 1, 0, 1, 1, 0, 1, 1

diff --git a/src/translations/artisan_ar.qm b/src/translations/artisan_ar.qm