diff --git a/src/Mod/Path/PathScripts/PathToolLibraryEditor.py b/src/Mod/Path/PathScripts/PathToolLibraryEditor.py index 5c61828309..9e867f4ce6 100644 --- a/src/Mod/Path/PathScripts/PathToolLibraryEditor.py +++ b/src/Mod/Path/PathScripts/PathToolLibraryEditor.py @@ -347,7 +347,7 @@ class EditorPanel(): self.loadToolTables() def renameTable(self): - ''' provides dialog for new tablename and renames teh selected tool table''' + ''' provides dialog for new tablename and renames the selected tool table''' name = self.TLM.getCurrentTableName() newName, ok = QtGui.QInputDialog.getText(None, translate("TooltableEditor","Rename Tooltable"),translate("TooltableEditor","Enter Name:"),QtGui.QLineEdit.Normal,name) if ok and newName: diff --git a/src/WindowsInstaller/include/declarations.nsh b/src/WindowsInstaller/include/declarations.nsh index b94a53f492..056e89a1cd 100644 --- a/src/WindowsInstaller/include/declarations.nsh +++ b/src/WindowsInstaller/include/declarations.nsh @@ -1,4 +1,4 @@ -/* +/* declaration.nsh Configuration and variables of FreeCAD installer @@ -14,14 +14,15 @@ Configuration and variables of FreeCAD installer !define APP_NAME "FreeCAD" !define APP_VERSION_NUMBER "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}" -# for the proposed install folder we use the scheme "FreeCAD 0.18" while we need for the registry the scheme "FreeCAD 0.18.1" -# to check if it is exactly this version (to support side by side installations) +# For the proposed install folder we use the scheme "FreeCAD 0.18" +# however for the Registry, we need the scheme "FreeCAD 0.18.x" in order +# to check if it is exactly this version (to support side-by-side installations) !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}" !define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" !define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}" -# Fixme: FC should use different prefernces folder for every release +# Fixme: FC should use different preferences folder for every release !define APP_DIR_USERDATA ${APP_NAME} #!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_INFO "${APP_NAME} - Your Own 3D Parametric Modeler"