--- a/ProjectBuilder.st	Mon Aug 22 11:26:34 2016 +0200
+++ b/ProjectBuilder.st	Mon Aug 22 11:27:31 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2009 by eXept Software AG
               All Rights Reserved
@@ -344,7 +342,7 @@
 !ProjectBuilder methodsFor:'building/private'!
 
 copyDLLsForLinkage
-    |targetBuildDir preRequisites dllRelativeSourcePathes dllRelativeDestPathes|
+    |targetBuildDir preRequisites dllRelativeSourcePaths dllRelativeDestPaths|
 
     targetBuildDir := buildDirectory / package module / package directory.
 
@@ -359,7 +357,7 @@
 
     preRequisites do:[:eachPackageToFileout |
         |packageId packageDef packageModule packageDirectory packageTargetDir
-         dllSource dllSourceDir libraryName dllRelativePathSource 
+         dllSource dllSourceDir libraryName dllRelativePathSource
          dllRelativePathDest objDirSource objDirDest alternativeObjDirSource|
 
         packageId := eachPackageToFileout asPackageId.
@@ -386,38 +384,38 @@
                 alternativeObjDirSource := self objDirForUsedCompiler:'vc'.
                 (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
                     objDirSource := alternativeObjDirSource.
-                    stdErr nextPutLine:(('Warning: using alternative %1 from %2 (%3 version)...' 
-                                                bindWith:libraryName 
-                                                with:alternativeObjDirSource 
+                    stdErr nextPutLine:(('Warning: using alternative %1 from %2 (%3 version)...'
+                                                bindWith:libraryName
+                                                with:alternativeObjDirSource
                                                 with:(self class suiteNameOfCompiler:'vc'))
                                             emphasizeAllWith:(#color -> Color red darkened)).
                 ] ifFalse:[
                     alternativeObjDirSource := self objDirForUsedCompiler:'bcc'.
                     (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
                         objDirSource := alternativeObjDirSource.
-                        stdErr nextPutLine:('Warning: using alternative %1 from %2 (%3 version)...' 
-                                    bindWith:libraryName 
-                                    with:alternativeObjDirSource 
+                        stdErr nextPutLine:('Warning: using alternative %1 from %2 (%3 version)...'
+                                    bindWith:libraryName
+                                    with:alternativeObjDirSource
                                     with:(self class suiteNameOfCompiler:'bcc')).
                     ]
                 ].
             ].
 
 "/            dllRelativePath := objDir,'/',(libraryName,'.dll').
-"/            (dllSourceDir / dllRelativePath) exists 
-            dllRelativeSourcePathes := Array with:(objDirSource,'\', libraryName, '.dll').
-            dllRelativeDestPathes := Array with:(objDirDest,'\', libraryName, '.dll').
+"/            (dllSourceDir / dllRelativePath) exists
+            dllRelativeSourcePaths := Array with:(objDirSource,'\', libraryName, '.dll').
+            dllRelativeDestPaths := Array with:(objDirDest,'\', libraryName, '.dll').
         ] ifFalse:[
-            dllRelativeSourcePathes := Array with:(libraryName,'.so').
-            dllRelativeDestPathes := Array with:(libraryName, '.so').
+            dllRelativeSourcePaths := Array with:(libraryName,'.so').
+            dllRelativeDestPaths := Array with:(libraryName, '.so').
             (packageModule = 'stx' and:[packageDirectory = 'libview']) ifTrue:[
-                dllRelativeSourcePathes := dllRelativeSourcePathes copyWith:('XWorkstation.so').
-                dllRelativeDestPathes := dllRelativeDestPathes copyWith:'XWorkstation.so'.
-                dllRelativeSourcePathes := dllRelativeSourcePathes copyWith:('GLXWorkstation.so').
-                dllRelativeDestPathes := dllRelativeDestPathes copyWith:'GLXWorkstation.so'.
+                dllRelativeSourcePaths := dllRelativeSourcePaths copyWith:('XWorkstation.so').
+                dllRelativeDestPaths := dllRelativeDestPaths copyWith:'XWorkstation.so'.
+                dllRelativeSourcePaths := dllRelativeSourcePaths copyWith:('GLXWorkstation.so').
+                dllRelativeDestPaths := dllRelativeDestPaths copyWith:'GLXWorkstation.so'.
             ].
         ].
-        dllRelativeSourcePathes with:dllRelativeDestPathes do:[:dllRelativeSourcePath :dllRelativeDestPath|
+        dllRelativeSourcePaths with:dllRelativeDestPaths do:[:dllRelativeSourcePath :dllRelativeDestPath|
             |source dest|
 
             source := dllSourceDir / dllRelativeSourcePath.
@@ -432,7 +430,7 @@
                 ]]) ifTrue:[
                     Transcript showCR:'updating ',dllRelativeDestPath.
                     dest directory recursiveMakeDirectory.
-                    source copyTo:dest.    
+                    source copyTo:dest.
                     self activityNotification:'    ',dest pathName
                 ] ifFalse:[
                     Transcript showCR:'already up-to-date: ',dllRelativeDestPath.