--- a/Tools__InternationalLanguageTranslationEditor.st	Mon Dec 14 11:04:21 2015 +0100
+++ b/Tools__InternationalLanguageTranslationEditor.st	Mon Dec 14 15:44:10 2015 +0100
@@ -1910,13 +1910,13 @@
 !
 
 removeLanguage
-    |lang|
-
-    lang := Dialog choose:'Which language do you want to remove?' fromList:languagesList lines:10.
-    lang isNil ifTrue:[^ self ].
-    (Dialog confirm: 'Are you sure to remove the language ', lang ) ifTrue:[
-	  self languagesList remove:lang.
-	  self shownLanguages remove:lang.
+    |languagesToRemove|
+
+    languagesToRemove := Dialog chooseMultiple:'Which language(s) do you want to remove?' fromList:languagesList lines:10.
+    languagesToRemove isEmptyOrNil ifTrue:[^ self ].
+    (Dialog confirm: 'Are you sure to remove the languages: ', languagesToRemove printString) ifTrue:[
+          self languagesList removeAll:languagesToRemove.
+          self shownLanguages removeAll:languagesToRemove.
     ].
 !
 
@@ -2121,15 +2121,18 @@
     newTranslationKeys := newTranslationKeys select:[:k | (keyStringsToLanguageMappings includesKey:k) not].
     newTranslationKeys := newTranslationKeys
                                 collect:[:k |
-                                        (k endsWith:'...') ifTrue:[
+                                        (k endsWith:' ...') ifTrue:[
+                                            k copyButLast:4.
+                                        ] ifFalse:[(k endsWith:'...') ifTrue:[
                                             k copyButLast:3.
                                         ] ifFalse:[
-                                            ('.:?' includes:k last) ifTrue:[
+                                            ('\.:?=,!! ' includes:k last) ifTrue:[
                                                 k copyButLast:1.
                                             ] ifFalse:[
                                                 k
-                                        ]]].
+                                        ]]]].
     newTranslationKeys := newTranslationKeys asSet.
+    newTranslationKeys := newTranslationKeys select:[:k | (keyStringsToLanguageMappings includesKey:k) not].
 
     newTranslationKeys notEmpty ifTrue:[
         stringKeys := newTranslationKeys select:[:k | k isString].
@@ -3248,5 +3251,9 @@
 
 version
     ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
 ! !