diff --git a/CHANGELOG.md b/CHANGELOG.md index 124607d4..cacd9bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,9 @@ CHANGELOG for FlatCAM beta - in Geometry Object fixed the issue with not using the End X-Y value and also made some other updates here - in NCC and Paint Tool fixed some issues with missing keys in the tool data dictionary - In Excellon Object UI fixed the enable/disable for the Milling section according to the Tools Table row that is selected -- In Excellon Object UI fixed the miiling geometry generation -- updated th translations strings to the changes in the source code +- In Excellon Object UI fixed the milling geometry generation +- updated the translations strings to the changes in the source code +- some strings changed 20.10.2020 diff --git a/appGUI/ObjectUI.py b/appGUI/ObjectUI.py index 79dabca6..43c4cbf9 100644 --- a/appGUI/ObjectUI.py +++ b/appGUI/ObjectUI.py @@ -735,7 +735,7 @@ class ExcellonObjectUI(ObjectUI): ) self.grid6.addWidget(self.mill_hole_label, 5, 0, 1, 3) - self.tdlabel = QtWidgets.QLabel('%s:' % _('Tool Dia')) + self.tdlabel = QtWidgets.QLabel('%s:' % _('Milling Diameter')) self.tdlabel.setToolTip( _("Diameter of the cutting tool.") ) @@ -750,7 +750,7 @@ class ExcellonObjectUI(ObjectUI): self.generate_milling_button = QtWidgets.QPushButton(_('Mill Drills')) self.generate_milling_button.setToolTip( _("Create the Geometry Object\n" - "for milling DRILLS toolpaths.") + "for milling drills.") ) self.generate_milling_button.setStyleSheet(""" QPushButton @@ -770,7 +770,7 @@ class ExcellonObjectUI(ObjectUI): self.generate_milling_slots_button = QtWidgets.QPushButton(_('Mill Slots')) self.generate_milling_slots_button.setToolTip( _("Create the Geometry Object\n" - "for milling SLOTS toolpaths.") + "for milling slots.") ) self.generate_milling_slots_button.setStyleSheet(""" QPushButton diff --git a/locale/tr/LC_MESSAGES/strings.mo b/locale/tr/LC_MESSAGES/strings.mo index abd27f31..a05be0ab 100644 Binary files a/locale/tr/LC_MESSAGES/strings.mo and b/locale/tr/LC_MESSAGES/strings.mo differ diff --git a/locale/tr/LC_MESSAGES/strings.po b/locale/tr/LC_MESSAGES/strings.po index 1a3d7068..2c16d44d 100644 --- a/locale/tr/LC_MESSAGES/strings.po +++ b/locale/tr/LC_MESSAGES/strings.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-10-21 11:39+0300\n" -"PO-Revision-Date: 2020-10-21 11:39+0300\n" +"POT-Creation-Date: 2020-10-21 11:56+0300\n" +"PO-Revision-Date: 2020-10-21 11:56+0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: tr_TR\n" @@ -280,7 +280,7 @@ msgid "Tool Name" msgstr "Uç Adı" #: appDatabase.py:161 appDatabase.py:837 appEditors/AppExcEditor.py:3765 -#: appGUI/ObjectUI.py:738 appGUI/ObjectUI.py:1026 appGUI/ObjectUI.py:1594 +#: appGUI/ObjectUI.py:1026 appGUI/ObjectUI.py:1594 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:132 #: appTools/ToolCutOut.py:2058 appTools/ToolIsolation.py:3091 #: appTools/ToolNCC.py:3859 appTools/ToolNCC.py:3870 appTools/ToolPaint.py:2882 @@ -6657,6 +6657,12 @@ msgstr "" "Yukarıdaki Araçlar Tablosundan frezelenecek delikleri seçin.\n" "Seçim yapmak için # sütununu kullanın." +#: appGUI/ObjectUI.py:738 +#: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:80 +#: appTools/ToolMilling.py:1779 +msgid "Milling Diameter" +msgstr "Freze Çapı" + #: appGUI/ObjectUI.py:740 #: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:101 msgid "Diameter of the cutting tool." @@ -6667,11 +6673,15 @@ msgid "Mill Drills" msgstr "Delikleri Frezele" #: appGUI/ObjectUI.py:752 +#, fuzzy +#| msgid "" +#| "Create the Geometry Object\n" +#| "for milling SLOTS toolpaths." msgid "" "Create the Geometry Object\n" -"for milling DRILLS toolpaths." +"for milling drills." msgstr "" -"Delik frezeleme yolu için bir \n" +"Yuvaları frezelemek için\n" "Şekil nesnesi oluşturun." #: appGUI/ObjectUI.py:770 @@ -6679,9 +6689,13 @@ msgid "Mill Slots" msgstr "Yuvaları Frezele" #: appGUI/ObjectUI.py:772 +#, fuzzy +#| msgid "" +#| "Create the Geometry Object\n" +#| "for milling SLOTS toolpaths." msgid "" "Create the Geometry Object\n" -"for milling SLOTS toolpaths." +"for milling slots." msgstr "" "Yuvaları frezelemek için\n" "Şekil nesnesi oluşturun." @@ -8907,11 +8921,6 @@ msgstr "" msgid "Both" msgstr "Her İkisi" -#: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:80 -#: appTools/ToolMilling.py:1779 -msgid "Milling Diameter" -msgstr "Freze Çapı" - #: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:82 #: appTools/ToolMilling.py:1781 msgid "The diameter of the tool who will do the milling" @@ -19551,6 +19560,13 @@ msgstr "Orijin, yüklenen tüm nesneleri hizalayarak ayarlanıyor " msgid "No Geometry name in args. Provide a name and try again." msgstr "Değişkenlerde Şekil ismi yok. Lütfen bir isim girin ve tekrar deneyin." +#~ msgid "" +#~ "Create the Geometry Object\n" +#~ "for milling DRILLS toolpaths." +#~ msgstr "" +#~ "Delik frezeleme yolu için bir \n" +#~ "Şekil nesnesi oluşturun." + #~| msgid "" #~| "Merge a selection of Excellon objects into a new combo Excellon object." #~ msgid "Generate GCode out of slot holes in an Excellon object." diff --git a/locale_template/strings.pot b/locale_template/strings.pot index 69867d50..937b82ec 100644 --- a/locale_template/strings.pot +++ b/locale_template/strings.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2020-10-21 11:37+0300\n" +"POT-Creation-Date: 2020-10-21 11:55+0300\n" "PO-Revision-Date: 2019-03-25 15:08+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -259,7 +259,7 @@ msgid "Tool Name" msgstr "" #: appDatabase.py:161 appDatabase.py:837 appEditors/AppExcEditor.py:3765 -#: appGUI/ObjectUI.py:738 appGUI/ObjectUI.py:1026 appGUI/ObjectUI.py:1594 +#: appGUI/ObjectUI.py:1026 appGUI/ObjectUI.py:1594 #: appGUI/preferences/tools/ToolsPaintPrefGroupUI.py:132 appTools/ToolCutOut.py:2058 #: appTools/ToolIsolation.py:3091 appTools/ToolNCC.py:3859 appTools/ToolNCC.py:3870 #: appTools/ToolPaint.py:2882 @@ -6028,6 +6028,11 @@ msgid "" "milled. Use the # column to make the selection." msgstr "" +#: appGUI/ObjectUI.py:738 appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:80 +#: appTools/ToolMilling.py:1779 +msgid "Milling Diameter" +msgstr "" + #: appGUI/ObjectUI.py:740 appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:101 msgid "Diameter of the cutting tool." msgstr "" @@ -6039,7 +6044,7 @@ msgstr "" #: appGUI/ObjectUI.py:752 msgid "" "Create the Geometry Object\n" -"for milling DRILLS toolpaths." +"for milling drills." msgstr "" #: appGUI/ObjectUI.py:770 @@ -6049,7 +6054,7 @@ msgstr "" #: appGUI/ObjectUI.py:772 msgid "" "Create the Geometry Object\n" -"for milling SLOTS toolpaths." +"for milling slots." msgstr "" #: appGUI/ObjectUI.py:814 @@ -7873,10 +7878,6 @@ msgstr "" msgid "Both" msgstr "" -#: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:80 appTools/ToolMilling.py:1779 -msgid "Milling Diameter" -msgstr "" - #: appGUI/preferences/excellon/ExcellonOptPrefGroupUI.py:82 appTools/ToolMilling.py:1781 msgid "The diameter of the tool who will do the milling" msgstr ""