Merge branch 'Beta' of https://bitbucket.org/jpcgt/flatcam into extract-prefs-code-from-app-class

flatcamGUI/PreferencesUI.py

@@ -2220,9 +2220,9 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
             theme = 'white'
 
         if theme == 'white':
-            self.resource_loc = 'share'
+            self.resource_loc = 'assets/resources'
         else:
-            self.resource_loc = 'share'
+            self.resource_loc = 'assets/resources'
 
         # Create a grid layout for the Application general settings
         grid0 = QtWidgets.QGridLayout()
@@ -3500,7 +3500,7 @@ class GerberAdvOptPrefGroupUI(OptionsGroupUI):
         # Tool Type
         self.tool_type_label = QtWidgets.QLabel('<b>%s</b>' % _('Tool Type'))
         self.tool_type_label.setToolTip(
-            _("Choose what tool to use for Gerber isolation:\n"
+            _("Choose which tool to use for Gerber isolation:\n"
               "'Circular' or 'V-shape'.\n"
               "When the 'V-shape' is selected then the tool\n"
               "diameter will depend on the chosen cut depth.")