- trying to fix some conflicts

2019-07-29 03:34:15 +03:00 · 2019-07-29 03:34:15 +03:00 · 1002373484
parent 8e80ec156c 977b9541f8
commit 1002373484
3 changed files with 2 additions and 11222 deletions
--- a/FlatCAMTranslation.py
+++ b/FlatCAMTranslation.py
@ -94,8 +94,8 @@ def on_language_apply_click(app, restart=False):
                                  name.capitalize())
        msgbox.setWindowTitle(_("Apply Language ..."))
        msgbox.setWindowIcon(QtGui.QIcon('share/language32.png'))
-        bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole)
-        bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole)
+        bt_yes = msgbox.addButton('Yes', QtWidgets.QMessageBox.YesRole)
+        bt_no = msgbox.addButton('No', QtWidgets.QMessageBox.NoRole)

        msgbox.setDefaultButton(bt_yes)
        msgbox.exec_()
--- a/locale/ru/LC_MESSAGES/strings.mo
+++ b/locale/ru/LC_MESSAGES/strings.mo
--- a/locale/ru/LC_MESSAGES/strings.po
+++ b/locale/ru/LC_MESSAGES/strings.po