diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6627112f..f1e410e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ CHANGELOG for FlatCAM beta
 - fixed the annotation plotting in the CNCJob object
 - created a new InputDialog widget that has the buttons and the context menu translated and replaced the old widget throughout the app
 - updated the translation strings
+- Turkish language strings updated
+- set some policy rules back the way they were for the combo boxes in Geometry Object properties
 
 4.11.2020
 
diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py
index 3be5ab69..2d45f87d 100644
--- a/appGUI/GUIElements.py
+++ b/appGUI/GUIElements.py
@@ -2103,7 +2103,7 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
 
 class FCComboBox(QtWidgets.QComboBox):
 
-    def __init__(self, parent=None, callback=None):
+    def __init__(self, parent=None, callback=None, policy=True):
         super(FCComboBox, self).__init__(parent)
         self.setFocusPolicy(QtCore.Qt.StrongFocus)
         self.view = self.view()
@@ -2113,8 +2113,9 @@ class FCComboBox(QtWidgets.QComboBox):
         self._set_last = False
         self._obj_type = None
 
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred)
-        self.setSizePolicy(sizePolicy)
+        if policy is True:
+            sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred)
+            self.setSizePolicy(sizePolicy)
 
         # the callback() will be called on customcontextmenu event and will be be passed 2 parameters:
         # pos = mouse right click click position
diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index e3cdb9f0..c7c3ee52 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -203,7 +203,7 @@ class GeometryObject(FlatCAMObj, Geometry):
             self.ui.geo_tools_table.setItem(row_idx, 1, dia_item)  # Diameter
 
             # -------------------- OFFSET   ------------------------------------- #
-            offset_item = FCComboBox()
+            offset_item = FCComboBox(policy=False)
             for item in self.offset_item_options:
                 offset_item.addItem(item)
             idx = offset_item.findText(tooluid_value['offset'])
@@ -215,7 +215,7 @@ class GeometryObject(FlatCAMObj, Geometry):
             self.ui.geo_tools_table.setCellWidget(row_idx, 2, offset_item)
 
             # -------------------- TYPE     ------------------------------------- #
-            type_item = FCComboBox()
+            type_item = FCComboBox(policy=False)
             for item in self.type_item_options:
                 type_item.addItem(item)
             idx = type_item.findText(tooluid_value['type'])
@@ -227,7 +227,7 @@ class GeometryObject(FlatCAMObj, Geometry):
             self.ui.geo_tools_table.setCellWidget(row_idx, 3, type_item)
 
             # -------------------- TOOL TYPE ------------------------------------- #
-            tool_type_item = FCComboBox()
+            tool_type_item = FCComboBox(policy=False)
             for item in self.tool_type_item_options:
                 tool_type_item.addItem(item)
             idx = tool_type_item.findText(tooluid_value['tool_type'])
diff --git a/locale/tr/LC_MESSAGES/strings.mo b/locale/tr/LC_MESSAGES/strings.mo
index c019afcd..6af5bbd6 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 ba33b017..fca98d7a 100644
--- a/locale/tr/LC_MESSAGES/strings.po
+++ b/locale/tr/LC_MESSAGES/strings.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2020-11-05 16:42+0200\n"
-"PO-Revision-Date: 2020-11-05 16:47+0200\n"
+"PO-Revision-Date: 2020-11-05 18:58+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: tr_TR\n"
@@ -1800,15 +1800,15 @@ msgstr "Seçili yuvaları deliklere dönüştürün."
 
 #: appEditors/AppExcEditor.py:3845
 msgid "Add/Delete Tool"
-msgstr "Delik Ekle/Kaldır"
+msgstr "Delik veya Yuva Ekle/Kaldır"
 
 #: appEditors/AppExcEditor.py:3847
 msgid ""
 "Add/Delete a tool to the tool list\n"
 "for this Excellon object."
 msgstr ""
-"Bu Excellon nesnesinin Araçlar Listesine\n"
-"bir delik ekleyin/silin."
+"Bu Excellon nesnesinin Araçlar Tablosuna\n"
+"bir delik veya yuva ekleyin/silin."
 
 #: appEditors/AppExcEditor.py:3861 appEditors/AppGeoEditor.py:441
 #: appGUI/ObjectUI.py:1080 appGUI/ObjectUI.py:1637
@@ -1817,7 +1817,7 @@ msgstr ""
 #: appTools/ToolCutOut.py:2077 appTools/ToolIsolation.py:3196
 #: appTools/ToolNCC.py:4079 appTools/ToolNCC.py:4090 appTools/ToolPaint.py:2900
 msgid "Tool Dia"
-msgstr "Uç kalınlığı"
+msgstr "Uç Kalınlığı"
 
 #: appEditors/AppExcEditor.py:3863 appGUI/ObjectUI.py:1082
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:57
@@ -1847,15 +1847,15 @@ msgstr ""
 
 #: appEditors/AppExcEditor.py:3887
 msgid "Delete Tool"
-msgstr "Seçili Deliği Sil"
+msgstr "Deliği Sil"
 
 #: appEditors/AppExcEditor.py:3890
 msgid ""
 "Delete a tool in the tool list\n"
 "by selecting a row in the tool table."
 msgstr ""
-"Araçlar Tablosundan bir satır \n"
-"seçerek delik listesindeki bir deliği silin."
+"Araçlar Tablosundan bir satır seçerek \n"
+"delik listesindeki bir deliği silin."
 
 #: appEditors/AppExcEditor.py:3915
 msgid "Resize Tool"
@@ -3946,7 +3946,7 @@ msgstr "Değeri Azalt"
 #: app_Main.py:4723 app_Main.py:8520 app_Main.py:8535 app_Main.py:8879
 #: app_Main.py:8891
 msgid "Ok"
-msgstr "Evet"
+msgstr "Tamam"
 
 #: appGUI/GUIElements.py:3768
 msgid ""
@@ -12803,7 +12803,7 @@ msgstr ""
 
 #: appObjects/AppObject.py:171
 msgid "New object with name:"
-msgstr "Adı olan yeni nesne:"
+msgstr "Yeni nesnenin adı:"
 
 #: appObjects/AppObject.py:184
 msgid "Converting units to "