diff --git a/gajim.nsi b/gajim.nsi
index 31ddbaa6884f7bb6d5b15c854d9edd7ddc35c82a..3489072c51266ea89959e69df79332edb4c65417 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -308,165 +308,165 @@ Section "English (UK)" SecLanguagesEnglishUK
 	File /r "bin\gtk\share\locale\en_GB"
 SectionEnd
 
-; Section "French" SecLanguagesFrench
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\fr"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\fr"
-; SectionEnd
-
-; Section "German" SecLanguagesGerman
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\de"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\de"
-; SectionEnd
-
-; Section "Italian" SecLanguagesItalian
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\it"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\it"
-; SectionEnd
-
-; Section "Spanish" SecLanguagesSpanish
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\es"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\es"
-; SectionEnd
-
-; Section "Russian" SecLanguagesRussian
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\ru"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\ru"
-; SectionEnd
-
-; Section $(NAME_SecLanguagesOther) SecLanguagesOther
-	; SetOutPath "$INSTDIR\po"
-	; File /r "po\be"
-	; File /r "po\be@latin"
-	; File /r "po\bg"
-	; File /r "po\br"
-	; File /r "po\cs"
-	; File /r "po\da"
-	; File /r "po\el"
-	; File /r "po\eo"
-	; File /r "po\eu"
-	; File /r "po\gl"
-	; File /r "po\hr"
-	; File /r "po\lt"
-	; File /r "po\nb"
-	; File /r "po\nl"
-	; File /r "po\no"
-	; File /r "po\pl"
-	; File /r "po\pt"
-	; File /r "po\pt_BR"
-	; File /r "po\sk"
-	; File /r "po\sr"
-	; File /r "po\sr@Latn"
-	; File /r "po\sv"
-	; File /r "po\uk"
-	; File /r "po\zh_CN"
-	; SetOutPath "$INSTDIR\bin\gtk\share\locale"
-	; File /r "bin\gtk\share\locale\af"
-	; File /r "bin\gtk\share\locale\am"
-	; File /r "bin\gtk\share\locale\ang"
-	; File /r "bin\gtk\share\locale\ar"
-	; File /r "bin\gtk\share\locale\as"
-	; File /r "bin\gtk\share\locale\az"
-	; File /r "bin\gtk\share\locale\az_IR"
-	; File /r "bin\gtk\share\locale\be"
-	; File /r "bin\gtk\share\locale\be@latin"
-	; File /r "bin\gtk\share\locale\bg"
-	; File /r "bin\gtk\share\locale\bn"
-	; File /r "bin\gtk\share\locale\bn_IN"
-	; File /r "bin\gtk\share\locale\br"
-	; File /r "bin\gtk\share\locale\bs"
-	; File /r "bin\gtk\share\locale\ca"
-	; File /r "bin\gtk\share\locale\ca@valencia"
-	; File /r "bin\gtk\share\locale\cs"
-	; File /r "bin\gtk\share\locale\cy"
-	; File /r "bin\gtk\share\locale\da"
-	; File /r "bin\gtk\share\locale\dz"
-	; File /r "bin\gtk\share\locale\el"
-	; File /r "bin\gtk\share\locale\en_CA"
-	; File /r "bin\gtk\share\locale\eo"
-	; File /r "bin\gtk\share\locale\et"
-	; File /r "bin\gtk\share\locale\eu"
-	; File /r "bin\gtk\share\locale\fa"
-	; File /r "bin\gtk\share\locale\fi"
-	; File /r "bin\gtk\share\locale\ga"
-	; File /r "bin\gtk\share\locale\gl"
-	; File /r "bin\gtk\share\locale\gu"
-	; File /r "bin\gtk\share\locale\he"
-	; File /r "bin\gtk\share\locale\hi"
-	; File /r "bin\gtk\share\locale\hr"
-	; File /r "bin\gtk\share\locale\hu"
-	; File /r "bin\gtk\share\locale\hy"
-	; File /r "bin\gtk\share\locale\ia"
-	; File /r "bin\gtk\share\locale\id"
-	; File /r "bin\gtk\share\locale\io"
-	; File /r "bin\gtk\share\locale\is"
-	; File /r "bin\gtk\share\locale\ja"
-	; File /r "bin\gtk\share\locale\ka"
-	; File /r "bin\gtk\share\locale\kn"
-	; File /r "bin\gtk\share\locale\ko"
-	; File /r "bin\gtk\share\locale\ku"
-	; File /r "bin\gtk\share\locale\li"
-	; File /r "bin\gtk\share\locale\lt"
-	; File /r "bin\gtk\share\locale\lv"
-	; File /r "bin\gtk\share\locale\mai"
-	; File /r "bin\gtk\share\locale\mg"
-	; File /r "bin\gtk\share\locale\mi"
-	; File /r "bin\gtk\share\locale\mk"
-	; File /r "bin\gtk\share\locale\ml"
-	; File /r "bin\gtk\share\locale\mn"
-	; File /r "bin\gtk\share\locale\mr"
-	; File /r "bin\gtk\share\locale\ms"
-	; File /r "bin\gtk\share\locale\nb"
-	; File /r "bin\gtk\share\locale\ne"
-	; File /r "bin\gtk\share\locale\nl"
-	; File /r "bin\gtk\share\locale\nn"
-	; File /r "bin\gtk\share\locale\nso"
-	; File /r "bin\gtk\share\locale\oc"
-	; File /r "bin\gtk\share\locale\or"
-	; File /r "bin\gtk\share\locale\pa"
-	; File /r "bin\gtk\share\locale\pl"
-	; File /r "bin\gtk\share\locale\ps"
-	; File /r "bin\gtk\share\locale\pt"
-	; File /r "bin\gtk\share\locale\pt_BR"
-	; File /r "bin\gtk\share\locale\ro"
-	; File /r "bin\gtk\share\locale\rw"
-	; File /r "bin\gtk\share\locale\si"
-	; File /r "bin\gtk\share\locale\sk"
-	; File /r "bin\gtk\share\locale\sl"
-	; File /r "bin\gtk\share\locale\sq"
-	; File /r "bin\gtk\share\locale\sr"
-	; File /r "bin\gtk\share\locale\sr@ije"
-	; File /r "bin\gtk\share\locale\sr@latin"
-	; File /r "bin\gtk\share\locale\sv"
-	; File /r "bin\gtk\share\locale\ta"
-	; File /r "bin\gtk\share\locale\te"
-	; File /r "bin\gtk\share\locale\th"
-	; File /r "bin\gtk\share\locale\tk"
-	; File /r "bin\gtk\share\locale\tl"
-	; File /r "bin\gtk\share\locale\tr"
-	; File /r "bin\gtk\share\locale\tt"
-	; File /r "bin\gtk\share\locale\ug"
-	; File /r "bin\gtk\share\locale\uk"
-	; File /r "bin\gtk\share\locale\ur"
-	; File /r "bin\gtk\share\locale\uz"
-	; File /r "bin\gtk\share\locale\uz@cyrillic"
-	; File /r "bin\gtk\share\locale\vi"
-	; File /r "bin\gtk\share\locale\wa"
-	; File /r "bin\gtk\share\locale\xh"
-	; File /r "bin\gtk\share\locale\yi"
-	; File /r "bin\gtk\share\locale\zh_CN"
-	; File /r "bin\gtk\share\locale\zh_HK"
-	; File /r "bin\gtk\share\locale\zh_TW"
-; SectionEnd
+Section "French" SecLanguagesFrench
+	SetOutPath "$INSTDIR\po"
+	File /r "po\fr"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\fr"
+SectionEnd
+
+Section "German" SecLanguagesGerman
+	SetOutPath "$INSTDIR\po"
+	File /r "po\de"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\de"
+SectionEnd
+
+Section "Italian" SecLanguagesItalian
+	SetOutPath "$INSTDIR\po"
+	File /r "po\it"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\it"
+SectionEnd
+
+Section "Spanish" SecLanguagesSpanish
+	SetOutPath "$INSTDIR\po"
+	File /r "po\es"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\es"
+SectionEnd
+
+Section "Russian" SecLanguagesRussian
+	SetOutPath "$INSTDIR\po"
+	File /r "po\ru"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\ru"
+SectionEnd
+
+Section $(NAME_SecLanguagesOther) SecLanguagesOther
+	SetOutPath "$INSTDIR\po"
+	File /r "po\be"
+	File /r "po\be@latin"
+	File /r "po\bg"
+	File /r "po\br"
+	File /r "po\cs"
+	File /r "po\da"
+	File /r "po\el"
+	File /r "po\eo"
+	File /r "po\eu"
+	File /r "po\gl"
+	File /r "po\hr"
+	File /r "po\lt"
+	File /r "po\nb"
+	File /r "po\nl"
+	File /r "po\no"
+	File /r "po\pl"
+	File /r "po\pt"
+	File /r "po\pt_BR"
+	File /r "po\sk"
+	File /r "po\sr"
+	File /r "po\sr@Latn"
+	File /r "po\sv"
+	File /r "po\uk"
+	File /r "po\zh_CN"
+	SetOutPath "$INSTDIR\bin\gtk\share\locale"
+	File /r "bin\gtk\share\locale\af"
+	File /r "bin\gtk\share\locale\am"
+	File /r "bin\gtk\share\locale\ang"
+	File /r "bin\gtk\share\locale\ar"
+	File /r "bin\gtk\share\locale\as"
+	File /r "bin\gtk\share\locale\az"
+	File /r "bin\gtk\share\locale\az_IR"
+	File /r "bin\gtk\share\locale\be"
+	File /r "bin\gtk\share\locale\be@latin"
+	File /r "bin\gtk\share\locale\bg"
+	File /r "bin\gtk\share\locale\bn"
+	File /r "bin\gtk\share\locale\bn_IN"
+	File /r "bin\gtk\share\locale\br"
+	File /r "bin\gtk\share\locale\bs"
+	File /r "bin\gtk\share\locale\ca"
+	File /r "bin\gtk\share\locale\ca@valencia"
+	File /r "bin\gtk\share\locale\cs"
+	File /r "bin\gtk\share\locale\cy"
+	File /r "bin\gtk\share\locale\da"
+	File /r "bin\gtk\share\locale\dz"
+	File /r "bin\gtk\share\locale\el"
+	File /r "bin\gtk\share\locale\en_CA"
+	File /r "bin\gtk\share\locale\eo"
+	File /r "bin\gtk\share\locale\et"
+	File /r "bin\gtk\share\locale\eu"
+	File /r "bin\gtk\share\locale\fa"
+	File /r "bin\gtk\share\locale\fi"
+	File /r "bin\gtk\share\locale\ga"
+	File /r "bin\gtk\share\locale\gl"
+	File /r "bin\gtk\share\locale\gu"
+	File /r "bin\gtk\share\locale\he"
+	File /r "bin\gtk\share\locale\hi"
+	File /r "bin\gtk\share\locale\hr"
+	File /r "bin\gtk\share\locale\hu"
+	File /r "bin\gtk\share\locale\hy"
+	File /r "bin\gtk\share\locale\ia"
+	File /r "bin\gtk\share\locale\id"
+	File /r "bin\gtk\share\locale\io"
+	File /r "bin\gtk\share\locale\is"
+	File /r "bin\gtk\share\locale\ja"
+	File /r "bin\gtk\share\locale\ka"
+	File /r "bin\gtk\share\locale\kn"
+	File /r "bin\gtk\share\locale\ko"
+	File /r "bin\gtk\share\locale\ku"
+	File /r "bin\gtk\share\locale\li"
+	File /r "bin\gtk\share\locale\lt"
+	File /r "bin\gtk\share\locale\lv"
+	File /r "bin\gtk\share\locale\mai"
+	File /r "bin\gtk\share\locale\mg"
+	File /r "bin\gtk\share\locale\mi"
+	File /r "bin\gtk\share\locale\mk"
+	File /r "bin\gtk\share\locale\ml"
+	File /r "bin\gtk\share\locale\mn"
+	File /r "bin\gtk\share\locale\mr"
+	File /r "bin\gtk\share\locale\ms"
+	File /r "bin\gtk\share\locale\nb"
+	File /r "bin\gtk\share\locale\ne"
+	File /r "bin\gtk\share\locale\nl"
+	File /r "bin\gtk\share\locale\nn"
+	File /r "bin\gtk\share\locale\nso"
+	File /r "bin\gtk\share\locale\oc"
+	File /r "bin\gtk\share\locale\or"
+	File /r "bin\gtk\share\locale\pa"
+	File /r "bin\gtk\share\locale\pl"
+	File /r "bin\gtk\share\locale\ps"
+	File /r "bin\gtk\share\locale\pt"
+	File /r "bin\gtk\share\locale\pt_BR"
+	File /r "bin\gtk\share\locale\ro"
+	File /r "bin\gtk\share\locale\rw"
+	File /r "bin\gtk\share\locale\si"
+	File /r "bin\gtk\share\locale\sk"
+	File /r "bin\gtk\share\locale\sl"
+	File /r "bin\gtk\share\locale\sq"
+	File /r "bin\gtk\share\locale\sr"
+	File /r "bin\gtk\share\locale\sr@ije"
+	File /r "bin\gtk\share\locale\sr@latin"
+	File /r "bin\gtk\share\locale\sv"
+	File /r "bin\gtk\share\locale\ta"
+	File /r "bin\gtk\share\locale\te"
+	File /r "bin\gtk\share\locale\th"
+	File /r "bin\gtk\share\locale\tk"
+	File /r "bin\gtk\share\locale\tl"
+	File /r "bin\gtk\share\locale\tr"
+	File /r "bin\gtk\share\locale\tt"
+	File /r "bin\gtk\share\locale\ug"
+	File /r "bin\gtk\share\locale\uk"
+	File /r "bin\gtk\share\locale\ur"
+	File /r "bin\gtk\share\locale\uz"
+	File /r "bin\gtk\share\locale\uz@cyrillic"
+	File /r "bin\gtk\share\locale\vi"
+	File /r "bin\gtk\share\locale\wa"
+	File /r "bin\gtk\share\locale\xh"
+	File /r "bin\gtk\share\locale\yi"
+	File /r "bin\gtk\share\locale\zh_CN"
+	File /r "bin\gtk\share\locale\zh_HK"
+	File /r "bin\gtk\share\locale\zh_TW"
+SectionEnd
 
 SectionGroupEnd
 
@@ -527,109 +527,109 @@ Section "Uninstall"
 	RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0"
 	Delete "$INSTDIR\bin\gtk\lib\charset.alias"
 	RMDir "$INSTDIR\bin\gtk\lib"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\es"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\fr"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\it"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ru"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\af"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\am"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ang"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ar"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\as"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\az"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\be"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\bg"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\bn"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\br"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\bs"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ca"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\cs"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\cy"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\da"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\dz"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\el"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\eo"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\et"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\eu"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\fa"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\fi"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ga"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\gl"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\gu"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\he"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\hi"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\hr"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\hu"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\hy"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ia"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\id"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\io"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\is"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ja"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ka"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\kn"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ko"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ku"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\li"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\lt"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\lv"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mai"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mg"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mi"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mk"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ml"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mn"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\mr"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ms"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\nb"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ne"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\nl"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\nn"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\nso"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\oc"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\or"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\pa"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\pl"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ps"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\pt"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ro"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\rw"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\si"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sk"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sl"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sq"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\sv"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ta"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\te"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\th"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\tk"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\tl"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\tr"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\tt"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ug"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\uk"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\ur"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\uz"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\vi"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\wa"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\xh"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\yi"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK"
-	; RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW"
-	; RMDir "$INSTDIR\bin\gtk\share\locale"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\es"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\fr"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\it"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ru"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\af"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\am"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ang"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ar"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\as"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\az"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\be"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\bg"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\bn"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\br"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\bs"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ca"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\cs"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\cy"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\da"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\dz"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\el"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\eo"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\et"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\eu"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\fa"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\fi"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ga"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\gl"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\gu"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\he"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\hi"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\hr"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\hu"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\hy"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ia"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\id"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\io"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\is"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ja"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ka"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\kn"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ko"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ku"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\li"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\lt"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\lv"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mai"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mg"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mi"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mk"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ml"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mn"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\mr"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ms"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\nb"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ne"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\nl"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\nn"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\nso"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\oc"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\or"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\pa"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\pl"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ps"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\pt"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ro"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\rw"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\si"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sk"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sl"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sq"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\sv"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ta"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\te"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\th"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\tk"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\tl"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\tr"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\tt"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ug"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\uk"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\ur"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\uz"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\vi"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\wa"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\xh"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\yi"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK"
+	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW"
+	RMDir "$INSTDIR\bin\gtk\share\locale"
 	RMDir /r "$INSTDIR\bin\gtk\share\themes\Clearlooks"
 	RMDir /r "$INSTDIR\bin\gtk\share\themes\Default"
 	RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy"
@@ -699,37 +699,37 @@ Section "Uninstall"
 	RMDir "$INSTDIR\data"
 	RMDir /r "$INSTDIR\icons\hicolor"
 	RMDir "$INSTDIR\icons"
-	; RMDir /r "$INSTDIR\po\be"
-	; RMDir /r "$INSTDIR\po\be@latin"
-	; RMDir /r "$INSTDIR\po\bg"
-	; RMDir /r "$INSTDIR\po\br"
-	; RMDir /r "$INSTDIR\po\cs"
-	; RMDir /r "$INSTDIR\po\da"
-	; RMDir /r "$INSTDIR\po\de"
-	; RMDir /r "$INSTDIR\po\el"
-	; RMDir /r "$INSTDIR\po\en_GB"
-	; RMDir /r "$INSTDIR\po\eo"
-	; RMDir /r "$INSTDIR\po\es"
-	; RMDir /r "$INSTDIR\po\eu"
-	; RMDir /r "$INSTDIR\po\fr"
-	; RMDir /r "$INSTDIR\po\gl"
-	; RMDir /r "$INSTDIR\po\hr"
-	; RMDir /r "$INSTDIR\po\it"
-	; RMDir /r "$INSTDIR\po\lt"
-	; RMDir /r "$INSTDIR\po\nb"
-	; RMDir /r "$INSTDIR\po\nl"
-	; RMDir /r "$INSTDIR\po\no"
-	; RMDir /r "$INSTDIR\po\pl"
-	; RMDir /r "$INSTDIR\po\pt"
-	; RMDir /r "$INSTDIR\po\pt_BR"
-	; RMDir /r "$INSTDIR\po\ru"
-	; RMDir /r "$INSTDIR\po\sk"
-	; RMDir /r "$INSTDIR\po\sr"
-	; RMDir /r "$INSTDIR\po\sr@Latn"
-	; RMDir /r "$INSTDIR\po\sv"
-	; RMDir /r "$INSTDIR\po\uk"
-	; RMDir /r "$INSTDIR\po\zh_CN"
-	; RMDir "$INSTDIR\po"
+	RMDir /r "$INSTDIR\po\be"
+	RMDir /r "$INSTDIR\po\be@latin"
+	RMDir /r "$INSTDIR\po\bg"
+	RMDir /r "$INSTDIR\po\br"
+	RMDir /r "$INSTDIR\po\cs"
+	RMDir /r "$INSTDIR\po\da"
+	RMDir /r "$INSTDIR\po\de"
+	RMDir /r "$INSTDIR\po\el"
+	RMDir /r "$INSTDIR\po\en_GB"
+	RMDir /r "$INSTDIR\po\eo"
+	RMDir /r "$INSTDIR\po\es"
+	RMDir /r "$INSTDIR\po\eu"
+	RMDir /r "$INSTDIR\po\fr"
+	RMDir /r "$INSTDIR\po\gl"
+	RMDir /r "$INSTDIR\po\hr"
+	RMDir /r "$INSTDIR\po\it"
+	RMDir /r "$INSTDIR\po\lt"
+	RMDir /r "$INSTDIR\po\nb"
+	RMDir /r "$INSTDIR\po\nl"
+	RMDir /r "$INSTDIR\po\no"
+	RMDir /r "$INSTDIR\po\pl"
+	RMDir /r "$INSTDIR\po\pt"
+	RMDir /r "$INSTDIR\po\pt_BR"
+	RMDir /r "$INSTDIR\po\ru"
+	RMDir /r "$INSTDIR\po\sk"
+	RMDir /r "$INSTDIR\po\sr"
+	RMDir /r "$INSTDIR\po\sr@Latn"
+	RMDir /r "$INSTDIR\po\sv"
+	RMDir /r "$INSTDIR\po\uk"
+	RMDir /r "$INSTDIR\po\zh_CN"
+	RMDir "$INSTDIR\po"
 	Delete "$INSTDIR\AUTHORS"
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\THANKS"
diff --git a/src/gajim.py b/src/gajim.py
index 08968a1730e0a150b3ca647727cb6e6cd2254fe2..01036ac465538d91cbb27800444b95635f741b0a 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -53,6 +53,7 @@ if os.name == 'nt':
     import ctypes
     libintl = ctypes.cdll.LoadLibrary('gtk\\bin\\intl.dll')
     libintl.bindtextdomain(APP, DIR)
+    libintl.bind_textdomain_codeset(APP, 'UTF-8')
 
 import warnings