Modified translations

This commit is contained in:
2021-04-25 13:17:10 +02:00
parent 3ea43e2931
commit 6be0c8d32f
8 changed files with 163 additions and 68 deletions

View File

@@ -40,6 +40,7 @@ class Ui_diag_revpiinfo(object):
font.setBold(True)
font.setWeight(75)
self.lbl_version_pyload.setFont(font)
self.lbl_version_pyload.setText("0.0.0")
self.lbl_version_pyload.setAlignment(QtCore.Qt.AlignCenter)
self.lbl_version_pyload.setObjectName("lbl_version_pyload")
self.gridLayout.addWidget(self.lbl_version_pyload, 3, 1, 1, 1)
@@ -65,6 +66,7 @@ class Ui_diag_revpiinfo(object):
font = QtGui.QFont()
font.setPointSize(14)
self.lbl_version_control.setFont(font)
self.lbl_version_control.setText("0.0.0")
self.lbl_version_control.setObjectName("lbl_version_control")
self.horizontalLayout.addWidget(self.lbl_version_control)
self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 3)
@@ -86,10 +88,8 @@ class Ui_diag_revpiinfo(object):
diag_revpiinfo.setWindowTitle(_translate("diag_revpiinfo", "Program information"))
self.lbl_head.setText(_translate("diag_revpiinfo", "RevPi Python PLC - Commander"))
self.lbl_lbl_version_pyload.setText(_translate("diag_revpiinfo", "RevPiPyLoad version on RevPi:"))
self.lbl_version_pyload.setText(_translate("diag_revpiinfo", "0.0.0"))
self.lbl_link.setText(_translate("diag_revpiinfo", "<html><head/><body><p><a href=\"https://revpimodio.org/\"><span style=\" text-decoration: underline; color:#0000ff;\">https://revpimodio.org/</span></a></p></body></html>"))
self.lbl_lbl_version_control.setText(_translate("diag_revpiinfo", "Version:"))
self.lbl_version_control.setText(_translate("diag_revpiinfo", "0.0.0"))
self.lbl_info.setText(_translate("diag_revpiinfo", "RevPiModIO, RevPiPyLoad and RevPiPyControl are community driven projects. They are all free and open source software.\n"
"All of them comes with ABSOLUTELY NO WARRANTY, to the extent permitted by\n"
"applicable law.\n"

View File

@@ -79,12 +79,15 @@ class Ui_diag_simulator(object):
self.verticalLayout_2.addWidget(self.txt_info)
self.verticalLayout.addWidget(self.gb_info)
self.btn_start_pictory = QtWidgets.QPushButton(diag_simulator)
self.btn_start_pictory.setShortcut("Ctrl+1")
self.btn_start_pictory.setObjectName("btn_start_pictory")
self.verticalLayout.addWidget(self.btn_start_pictory)
self.btn_start_empty = QtWidgets.QPushButton(diag_simulator)
self.btn_start_empty.setShortcut("Ctrl+2")
self.btn_start_empty.setObjectName("btn_start_empty")
self.verticalLayout.addWidget(self.btn_start_empty)
self.btn_start_nochange = QtWidgets.QPushButton(diag_simulator)
self.btn_start_nochange.setShortcut("Ctrl+3")
self.btn_start_nochange.setObjectName("btn_start_nochange")
self.verticalLayout.addWidget(self.btn_start_nochange)
@@ -108,21 +111,18 @@ class Ui_diag_simulator(object):
self.gb_settings.setTitle(_translate("diag_simulator", "Simulator settings"))
self.lbl_history.setText(_translate("diag_simulator", "Last used:"))
self.lbl_configrsc.setText(_translate("diag_simulator", "piCtory file:"))
self.btn_configrsc.setText(_translate("diag_simulator", "change..."))
self.btn_configrsc.setText(_translate("diag_simulator", "select..."))
self.lbl_procimg.setText(_translate("diag_simulator", "Process image:"))
self.lbl_stop.setText(_translate("diag_simulator", "Stop action:"))
self.lbl_restart.setText(_translate("diag_simulator", "Restart action:"))
self.cbx_stop_remove.setText(_translate("diag_simulator", "Remove process image"))
self.cbx_stop_remove.setText(_translate("diag_simulator", "Remove process image file"))
self.rb_restart_pictory.setText(_translate("diag_simulator", "Restore piCtory default values"))
self.rb_restart_zero.setText(_translate("diag_simulator", "Reset everything to ZERO"))
self.gb_info.setTitle(_translate("diag_simulator", "RevPiModIO integration"))
self.lbl_info.setText(_translate("diag_simulator", "You can work with this simulator if your call RevPiModIO with this additional parameters:"))
self.lbl_info.setText(_translate("diag_simulator", "You can work with this simulator if you call RevPiModIO with this additional parameters:"))
self.btn_start_pictory.setText(_translate("diag_simulator", "Start with piCtory default values"))
self.btn_start_pictory.setShortcut(_translate("diag_simulator", "Ctrl+1"))
self.btn_start_empty.setText(_translate("diag_simulator", "Start with empty process image"))
self.btn_start_empty.setShortcut(_translate("diag_simulator", "Ctrl+2"))
self.btn_start_nochange.setText(_translate("diag_simulator", "Start without changing actual process image"))
self.btn_start_nochange.setShortcut(_translate("diag_simulator", "Ctrl+3"))
if __name__ == "__main__":

View File

@@ -56,7 +56,7 @@
</font>
</property>
<property name="text">
<string>0.0.0</string>
<string notr="true">0.0.0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -108,7 +108,7 @@
</font>
</property>
<property name="text">
<string>0.0.0</string>
<string notr="true">0.0.0</string>
</property>
</widget>
</item>

View File

@@ -92,7 +92,7 @@
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="cbx_stop_remove">
<property name="text">
<string>Remove process image</string>
<string>Remove process image file</string>
</property>
</widget>
</item>
@@ -125,7 +125,7 @@
<item>
<widget class="QLabel" name="lbl_info">
<property name="text">
<string>You can work with this simulator if your call RevPiModIO with this additional parameters:</string>
<string>You can work with this simulator if you call RevPiModIO with this additional parameters:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -154,7 +154,7 @@
<string>Start with piCtory default values</string>
</property>
<property name="shortcut">
<string>Ctrl+1</string>
<string notr="true">Ctrl+1</string>
</property>
</widget>
</item>
@@ -164,7 +164,7 @@
<string>Start with empty process image</string>
</property>
<property name="shortcut">
<string>Ctrl+2</string>
<string notr="true">Ctrl+2</string>
</property>
</widget>
</item>
@@ -174,7 +174,7 @@
<string>Start without changing actual process image</string>
</property>
<property name="shortcut">
<string>Ctrl+3</string>
<string notr="true">Ctrl+3</string>
</property>
</widget>
</item>

View File

@@ -179,115 +179,93 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context>
<name>RevPiCommander</name>
<message>
<location filename="../revpicommander.py" line="198"/>
<source>Select downloaded piCtory file...</source>
<translation>Heruntergeladene piCtory Datei auswählen...</translation>
</message>
<message>
<location filename="../revpicommander.py" line="198"/>
<source>piCtory file (*.rsc);;All files (*.*)</source>
<translation>piCtory Datei (*.rsc);;Alle Dateien (*.*)</translation>
</message>
<message>
<location filename="../revpicommander.py" line="218"/>
<location filename="../revpicommander.py" line="219"/>
<source>Simulator started...</source>
<translation>Simulator gestartet...</translation>
</message>
<message>
<location filename="../revpicommander.py" line="233"/>
<location filename="../revpicommander.py" line="228"/>
<source>Can not start...</source>
<translation>Kann nicht gestartet werden...</translation>
</message>
<message>
<location filename="../revpicommander.py" line="233"/>
<source>Can not start the simulator! Maybe the piCtory file is corrupt or you can not write to the location &apos;{0}&apos;.</source>
<translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung in &apos;{0}`.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="432"/>
<location filename="../revpicommander.py" line="431"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
<location filename="../revpicommander.py" line="247"/>
<location filename="../revpicommander.py" line="244"/>
<source>This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1.</source>
<translation>Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="297"/>
<location filename="../revpicommander.py" line="294"/>
<source>XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog!</source>
<translation>XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen!</translation>
</message>
<message>
<location filename="../revpicommander.py" line="459"/>
<location filename="../revpicommander.py" line="458"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../revpicommander.py" line="277"/>
<location filename="../revpicommander.py" line="274"/>
<source>The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi!</source>
<translation>Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi!</translation>
</message>
<message>
<location filename="../revpicommander.py" line="330"/>
<location filename="../revpicommander.py" line="327"/>
<source>Question</source>
<translation>Frage</translation>
</message>
<message>
<location filename="../revpicommander.py" line="330"/>
<location filename="../revpicommander.py" line="327"/>
<source>Are you sure to reset piControl?
The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs!</source>
<translation>Soll piControl wirklich zurückgesetzt werden?
Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden!</translation>
</message>
<message>
<location filename="../revpicommander.py" line="343"/>
<location filename="../revpicommander.py" line="340"/>
<source>Success</source>
<translation>Erfolgreich</translation>
</message>
<message>
<location filename="../revpicommander.py" line="343"/>
<location filename="../revpicommander.py" line="340"/>
<source>piControl reset executed successfully</source>
<translation>piControl wurde erfolgreich zurückgesetzt</translation>
</message>
<message>
<location filename="../revpicommander.py" line="350"/>
<location filename="../revpicommander.py" line="347"/>
<source>piControl reset could not be executed successfully</source>
<translation>piControl konnte nicht zurückgesetzt werden</translation>
</message>
<message>
<location filename="../revpicommander.py" line="408"/>
<location filename="../revpicommander.py" line="405"/>
<source>Reset to piCtory defaults...</source>
<translation>Standardwerte von piCtory laden...</translation>
</message>
<message>
<location filename="../revpicommander.py" line="408"/>
<source>Do you want to reset your process image to piCtory default values?
You have to stop other RevPiModIO programs before doing that, because they could reset the outputs.</source>
<translation>Soll das virtuelle Prozessabbild auf die piCtory Standardwerte zurückgesetzt werden?
Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="432"/>
<location filename="../revpicommander.py" line="431"/>
<source>The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0.</source>
<translation>Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="444"/>
<location filename="../revpicommander.py" line="443"/>
<source>Can not load this function, because your ACL level is to low!
You need at least level 1 to read or level 3 to write.</source>
<translation>Für diese Funktion ist das Berechtigungslevel zu gering!
Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="459"/>
<location filename="../revpicommander.py" line="458"/>
<source>Can not load piCtory configuration.
Did you create a hardware configuration? Please check this in piCtory!</source>
<translation>Kann piCtory Konfiguration nicht laden.
Wurde eine Hardwarekonfiguration in piCtory erzeugt?</translation>
</message>
<message>
<location filename="../revpicommander.py" line="365"/>
<location filename="../revpicommander.py" line="362"/>
<source>Can not connect to RevPi XML-RPC Service!
This could have the following reasons: The RevPi is not online, the XML-RPC service is not running / bind to localhost or the ACL permission is not set for your IP!!!
@@ -300,7 +278,7 @@ Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML
Führe &apos;sudo revpipyload_secure_installation&apos; auf dem Revolution Pi aus um diese Funktion zu konfigurieren!</translation>
</message>
<message>
<location filename="../revpicommander.py" line="218"/>
<location filename="../revpicommander.py" line="219"/>
<source>The simulator is running!
You can work with this simulator if your call RevPiModIO with this additional parameters:
@@ -316,6 +294,28 @@ configrsc={1}
Dies kann aus der Textbox oben kopiert werden.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="228"/>
<source>Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for &apos;{0}&apos;.</source>
<translation>Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für &apos;{0}`.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="405"/>
<source>Do you want to reset your process image to {0} values?
You have to stop other RevPiModIO programs before doing that, because they could reset the outputs.</source>
<translation>Soll das virtuelle Prozessabbild auf {0} zurückgesetzt werden?
Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden.</translation>
</message>
<message>
<location filename="../revpicommander.py" line="405"/>
<source>zero</source>
<translation>null</translation>
</message>
<message>
<location filename="../revpicommander.py" line="405"/>
<source>piCtory default</source>
<translation>piCtory Standardwerte</translation>
</message>
</context>
<context>
<name>RevPiFiles</name>
@@ -559,17 +559,17 @@ Ungesicherte Änderungen gehen verloren.</translation>
<context>
<name>RevPiPlcList</name>
<message>
<location filename="../revpiplclist.py" line="29"/>
<location filename="../revpiplclist.py" line="28"/>
<source>New connection</source>
<translation>Neue Verbindung</translation>
</message>
<message>
<location filename="../revpiplclist.py" line="148"/>
<location filename="../revpiplclist.py" line="147"/>
<source>Question</source>
<translation>Frage</translation>
</message>
<message>
<location filename="../revpiplclist.py" line="148"/>
<location filename="../revpiplclist.py" line="147"/>
<source>Do you really want to quit?
Unsaved changes will be lost.</source>
<translation>Soll das Fenster wirklich geschlossen werden?
@@ -848,6 +848,19 @@ Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Pr
{0}.</translation>
</message>
</context>
<context>
<name>Simulator</name>
<message>
<location filename="../simulator.py" line="79"/>
<source>Select downloaded piCtory file...</source>
<translation>Heruntergeladene piCtory Datei auswählen...</translation>
</message>
<message>
<location filename="../simulator.py" line="79"/>
<source>piCtory file (*.rsc);;All files (*.*)</source>
<translation>piCtory Datei (*.rsc);;Alle Dateien (*.*)</translation>
</message>
</context>
<context>
<name>diag_aclmanager</name>
<message>
@@ -1314,11 +1327,6 @@ For example: revpi0000/data</source>
<source>RevPiPyLoad version on RevPi:</source>
<translation>RevPiPyLoad Version auf RevPi:</translation>
</message>
<message>
<location filename="../../include/ui_dev/revpiinfo.ui" line="111"/>
<source>0.0.0</source>
<translation></translation>
</message>
<message>
<location filename="../../include/ui_dev/revpiinfo.ui" line="69"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://revpimodio.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://revpimodio.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -1387,6 +1395,89 @@ applicable law.
<translation>Zero-conf Name</translation>
</message>
</context>
<context>
<name>diag_simulator</name>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="14"/>
<source>piControl simulator</source>
<translation>piControl Simulator</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="20"/>
<source>Simulator settings</source>
<translation>Simulatoreinstellungen</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="26"/>
<source>Last used:</source>
<translation>Zuletzt verwendet:</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="33"/>
<source>piCtory file:</source>
<translation>piCtory Datei:</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="50"/>
<source>select...</source>
<translation>auswählen...</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="57"/>
<source>Process image:</source>
<translation>Prozessabbild:</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="74"/>
<source>Stop action:</source>
<translation>Stopaktion:</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="81"/>
<source>Restart action:</source>
<translation>Neustartaktion:</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="102"/>
<source>Restore piCtory default values</source>
<translation>piCtory Standardwerte setzen</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="112"/>
<source>Reset everything to ZERO</source>
<translation>Alles auf NULL setzen</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="122"/>
<source>RevPiModIO integration</source>
<translation>RevPiModIO Integration</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="154"/>
<source>Start with piCtory default values</source>
<translation>Start mit piCtory Standardwerten</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="164"/>
<source>Start with empty process image</source>
<translation>Start mit leerem Prozessabbild</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="174"/>
<source>Start without changing actual process image</source>
<translation>Start ohne Veränderung des Prozessabbilds</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="95"/>
<source>Remove process image file</source>
<translation>Prozessabbilddatei löschen</translation>
</message>
<message>
<location filename="../../include/ui_dev/simulator.ui" line="128"/>
<source>You can work with this simulator if you call RevPiModIO with this additional parameters:</source>
<translation>Mit diesem Simulator kann gearbeitet werden, indem zum Aufruf von RevPiModIO folgende Parameter hinzugefügt werden:</translation>
</message>
</context>
<context>
<name>wid_debugcontrol</name>
<message>
@@ -1546,7 +1637,7 @@ applicable law.
<message>
<location filename="../../include/ui_dev/revpicommander.ui" line="83"/>
<source>PLC watch &amp;mode</source>
<translation>SPS &amp;Betrachter</translation>
<translation>SPS &amp;Monitor</translation>
</message>
<message>
<location filename="../../include/ui_dev/revpicommander.ui" line="103"/>
@@ -1660,8 +1751,8 @@ applicable law.
</message>
<message>
<location filename="../../include/ui_dev/revpicommander.ui" line="229"/>
<source>Start local si&amp;mulator...</source>
<translation>Lokalen Si&amp;mulator starten...</translation>
<source>RevPi si&amp;mulator...</source>
<translation>RevPi Si&amp;mulator...</translation>
</message>
</context>
<context>

View File

@@ -407,7 +407,9 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
"Do you want to reset your process image to {0} values?\n"
"You have to stop other RevPiModIO programs before doing that, "
"because they could reset the outputs."
).format("zero" if helper.settings.value("simulator/restart_zero", False, bool) else "piCtory default")
).format(
self.tr("zero") if helper.settings.value("simulator/restart_zero", False, bool)
else self.tr("piCtory default"))
) == QtWidgets.QMessageBox.Yes
if rc:
# Set piCtory default values in process image

View File

@@ -9,19 +9,21 @@ SOURCES = revpicommander/aclmanager.py \
revpicommander/revpioption.py \
revpicommander/revpiplclist.py \
revpicommander/revpiprogram.py \
revpicommander/simulator.py \
revpicommander/revpicommander.py
FORMS = include/ui_dev/aclmanager.ui \
include/ui_dev/avahisearch.ui \
include/ui_dev/debugcontrol.ui \
include/ui_dev/debugios.ui \
include/ui_dev/mqttmanager.ui \
include/ui_dev/files.ui \
include/ui_dev/mqttmanager.ui \
include/ui_dev/revpiinfo.ui \
include/ui_dev/revpilogfile.ui \
include/ui_dev/revpioption.ui \
include/ui_dev/revpiplclist.ui \
include/ui_dev/revpiprogram.ui \
include/ui_dev/simulator.ui \
include/ui_dev/revpicommander.ui
TRANSLATIONS = revpicommander/locale/revpicommander_de.ts