diff --git a/FlatCAMTranslation.py b/FlatCAMTranslation.py
index b1852cd0..df8f142b 100644
--- 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_()
diff --git a/locale/de/LC_MESSAGES/strings.mo b/locale/de/LC_MESSAGES/strings.mo
index e3fcc5ac..38ad6431 100644
Binary files a/locale/de/LC_MESSAGES/strings.mo and b/locale/de/LC_MESSAGES/strings.mo differ
diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po
index 87971286..3aefd312 100644
--- a/locale/de/LC_MESSAGES/strings.po
+++ b/locale/de/LC_MESSAGES/strings.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:41+0300\n"
-"PO-Revision-Date: 2019-07-20 00:53+0300\n"
+"POT-Creation-Date: 2019-07-20 01:20+0300\n"
+"PO-Revision-Date: 2019-07-20 01:21+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -73,12 +73,12 @@ msgid "Close Editor"
 msgstr "Editor schließen"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Ja"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "Nein"
 
diff --git a/locale/en/LC_MESSAGES/strings.mo b/locale/en/LC_MESSAGES/strings.mo
index 84511a37..7c338be9 100644
Binary files a/locale/en/LC_MESSAGES/strings.mo and b/locale/en/LC_MESSAGES/strings.mo differ
diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po
index f0ccc81c..8db55e52 100644
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:41+0300\n"
-"PO-Revision-Date: 2019-07-20 00:41+0300\n"
+"POT-Creation-Date: 2019-07-20 01:21+0300\n"
+"PO-Revision-Date: 2019-07-20 01:21+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -75,12 +75,12 @@ msgid "Close Editor"
 msgstr "Close Editor"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Yes"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "No"
 
diff --git a/locale/es/LC_MESSAGES/strings.mo b/locale/es/LC_MESSAGES/strings.mo
index c37fd2c5..bc4aa0a4 100644
Binary files a/locale/es/LC_MESSAGES/strings.mo and b/locale/es/LC_MESSAGES/strings.mo differ
diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po
index 7744e8c9..262549b1 100644
--- a/locale/es/LC_MESSAGES/strings.po
+++ b/locale/es/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:40+0300\n"
-"PO-Revision-Date: 2019-07-20 01:16+0300\n"
+"POT-Creation-Date: 2019-07-20 01:20+0300\n"
+"PO-Revision-Date: 2019-07-20 01:20+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
@@ -77,12 +77,12 @@ msgid "Close Editor"
 msgstr "Cerrar Editor"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Sí"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "No"
 
diff --git a/locale/pt_BR/LC_MESSAGES/strings.mo b/locale/pt_BR/LC_MESSAGES/strings.mo
index 8c814ada..24a0d7c0 100644
Binary files a/locale/pt_BR/LC_MESSAGES/strings.mo and b/locale/pt_BR/LC_MESSAGES/strings.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/strings.po b/locale/pt_BR/LC_MESSAGES/strings.po
index 6f8a45ae..961efefa 100644
--- a/locale/pt_BR/LC_MESSAGES/strings.po
+++ b/locale/pt_BR/LC_MESSAGES/strings.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:40+0300\n"
-"PO-Revision-Date: 2019-07-20 00:40+0300\n"
+"POT-Creation-Date: 2019-07-20 01:21+0300\n"
+"PO-Revision-Date: 2019-07-20 01:21+0300\n"
 "Last-Translator: Carlos Stein <carlos.stein@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -77,12 +77,12 @@ msgid "Close Editor"
 msgstr "Fechar editor"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Sim"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "Não"
 
diff --git a/locale/ro/LC_MESSAGES/strings.mo b/locale/ro/LC_MESSAGES/strings.mo
index f71b5f9d..82a856b3 100644
Binary files a/locale/ro/LC_MESSAGES/strings.mo and b/locale/ro/LC_MESSAGES/strings.mo differ
diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po
index ce5881f9..3c1c7887 100644
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:41+0300\n"
-"PO-Revision-Date: 2019-07-20 00:41+0300\n"
+"POT-Creation-Date: 2019-07-20 01:22+0300\n"
+"PO-Revision-Date: 2019-07-20 01:22+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ro\n"
@@ -78,12 +78,12 @@ msgid "Close Editor"
 msgstr "Inchide Editorul"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Da"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "Nu"
 
diff --git a/locale/ru/LC_MESSAGES/strings.mo b/locale/ru/LC_MESSAGES/strings.mo
index d28ec373..b9a8c9de 100644
Binary files a/locale/ru/LC_MESSAGES/strings.mo and b/locale/ru/LC_MESSAGES/strings.mo differ
diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po
index eb752732..8e2cc002 100644
--- a/locale/ru/LC_MESSAGES/strings.po
+++ b/locale/ru/LC_MESSAGES/strings.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:42+0300\n"
+"POT-Creation-Date: 2019-07-20 01:22+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: \n"
@@ -75,12 +75,12 @@ msgid "Close Editor"
 msgstr "Закрыть редактор"
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr "Да"
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr "Нет"
 
diff --git a/locale_template/strings.pot b/locale_template/strings.pot
index d3e4b41d..ff92421e 100644
--- a/locale_template/strings.pot
+++ b/locale_template/strings.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-20 00:42+0300\n"
+"POT-Creation-Date: 2019-07-20 01:22+0300\n"
 "PO-Revision-Date: 2019-03-25 15:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -70,12 +70,12 @@ msgid "Close Editor"
 msgstr ""
 
 #: FlatCAMApp.py:2333 FlatCAMApp.py:3425 FlatCAMApp.py:6011
-#: flatcamGUI/FlatCAMGUI.py:3760
+#: FlatCAMTranslation.py:97 flatcamGUI/FlatCAMGUI.py:3760
 msgid "Yes"
 msgstr ""
 
 #: FlatCAMApp.py:2334 FlatCAMApp.py:3426 FlatCAMApp.py:6012
-#: flatcamGUI/FlatCAMGUI.py:3761
+#: FlatCAMTranslation.py:98 flatcamGUI/FlatCAMGUI.py:3761
 msgid "No"
 msgstr ""