diff --git a/gajim.nsi b/gajim.nsi
index 76f83b540cb276ba7f77cf13bf6e031902ac8be8..f7c68240d1f74050edf7b00a28f0ab4d6bb43cbc 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -64,11 +64,11 @@ LangString NAME_Iconsets ${LANG_FRENCH} "Biblioth
 LangString NAME_Languages ${LANG_FRENCH} "Langues"
 LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre"
 LangString NAME_Themes ${LANG_FRENCH} "Thèmes"
-LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop"
+LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Create icon on desktop"
 LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows"
 LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim."
 LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)."
-LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop."
+LangString DESC_SecDesktopIcon ${LANG_FRENCH} "If set, a shortcut for Gajim will be created on the desktop."
 LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows."
 
 ; German
@@ -77,11 +77,11 @@ LangString NAME_Iconsets ${LANG_GERMAN} "Symbolsets"
 LangString NAME_Languages ${LANG_GERMAN} "Sprachen"
 LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige"
 LangString NAME_Themes ${LANG_GERMAN} "Designs"
-LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Desktop-Icon erstellen"
+LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen"
 LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten"
 LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim."
 LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)."
-LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt."
+LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt."
 LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird."
 
 ; Italian		TODO: TRANSLATE!
@@ -90,11 +90,11 @@ LangString NAME_Iconsets ${LANG_ITALIAN} "Iconsets"
 LangString NAME_Languages ${LANG_ITALIAN} "Languages"
 LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Other"
 LangString NAME_Themes ${LANG_ITALIAN} "Themes"
-LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop"
+LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Create icon on desktop"
 LangString NAME_SecAutostart ${LANG_ITALIAN} "Start Gajim when Windows starts"
 LangString DESC_SecGajim ${LANG_ITALIAN} "Installs the main Gajim files."
 LangString DESC_SecGtk ${LANG_ITALIAN} "Installs Gtk+ 2 (necessary to run Gajim)."
-LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop."
+LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "If set, a shortcut for Gajim will be created on the desktop."
 LangString DESC_SecAutostart ${LANG_ITALIAN} "If set, Gajim will be automatically started when Windows starts."
 
 ; Spanish		TODO: TRANSLATE!
@@ -103,11 +103,11 @@ LangString NAME_Iconsets ${LANG_SPANISH} "Iconsets"
 LangString NAME_Languages ${LANG_SPANISH} "Languages"
 LangString NAME_SecLanguagesOther ${LANG_SPANISH} "Other"
 LangString NAME_Themes ${LANG_THEMES} "Themes"
-LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop"
+LangString NAME_SecDesktopIcon ${LANG_SPANISH} "Create icon on desktop"
 LangString NAME_SecAutostart ${LANG_SPANISH} "Start Gajim when Windows starts"
 LangString DESC_SecGajim ${LANG_SPANISH} "Installs the main Gajim files."
 LangString DESC_SecGtk ${LANG_SPANISH} "Installs Gtk+ 2 (necessary to run Gajim)."
-LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop."
+LangString DESC_SecDesktopIcon ${LANG_SPANISH} "If set, a shortcut for Gajim will be created on the desktop."
 LangString DESC_SecAutostart ${LANG_SPANISH} "If set, Gajim will be automatically started when Windows starts."
 
 ; Russian		TODO: TRANSLATE!
@@ -116,11 +116,11 @@ LangString NAME_Iconsets ${LANG_RUSSIAN} "Iconsets"
 LangString NAME_Languages ${LANG_RUSSIAN} "Languages"
 LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Other"
 LangString NAME_Themes ${LANG_RUSSIAN} "Themes"
-LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop"
+LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Create icon on desktop"
 LangString NAME_SecAutostart ${LANG_RUSSIAN} "Start Gajim when Windows starts"
 LangString DESC_SecGajim ${LANG_RUSSIAN} "Installs the main Gajim files."
 LangString DESC_SecGtk ${LANG_RUSSIAN} "Installs Gtk+ 2 (necessary to run Gajim)."
-LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop."
+LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "If set, a shortcut for Gajim will be created on the desktop."
 LangString DESC_SecAutostart ${LANG_RUSSIAN} "If set, Gajim will be automatically started when Windows starts."
 
 Section "Gajim" SecGajim