diff --git a/gajim.nsi b/gajim.nsi
index ce8eb5bf7f364ba5e8805df0b509af447d31254e..8a1477bcd38b3ea8e5c7f06af1b279caf5c5f846 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -59,17 +59,17 @@ LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim wil
 LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts."
 
 ; French
-LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes"
-LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes"
+LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes"
+LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothèque d'icônes"
 LangString NAME_Languages ${LANG_FRENCH} "Langues"
 LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre"
-LangString NAME_Themes ${LANG_FRENCH} "Thèmes"
-LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau"
-LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows"
+LangString NAME_Themes ${LANG_FRENCH} "Thèmes"
+LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau"
+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_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau."
-LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows."
+LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)."
+LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau."
+LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows."
 
 ; German
 LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons"
@@ -81,21 +81,21 @@ 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_GERMAN} "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!
+; Italian
 LangString NAME_Emoticons ${LANG_ITALIAN} "Emoticons"
-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_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_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."
+LangString NAME_Iconsets ${LANG_ITALIAN} "Set di icone"
+LangString NAME_Languages ${LANG_ITALIAN} "Lingue"
+LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Altre"
+LangString NAME_Themes ${LANG_ITALIAN} "Temi"
+LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop"
+LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows"
+LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim."
+LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)."
+LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop."
+LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows."
 
 ; Spanish		TODO: TRANSLATE!
 LangString NAME_Emoticons ${LANG_SPANISH} "Emoticons"
@@ -111,17 +111,17 @@ LangString DESC_SecDesktopIcon ${LANG_SPANISH} "If set, a shortcut for Gajim wil
 LangString DESC_SecAutostart ${LANG_SPANISH} "If set, Gajim will be automatically started when Windows starts."
 
 ; Russian
-LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики"
-LangString NAME_Iconsets ${LANG_RUSSIAN} "Темы иконок"
-LangString NAME_Languages ${LANG_RUSSIAN} "Языки"
-LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Другое"
-LangString NAME_Themes ${LANG_RUSSIAN} "Темы"
-LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Создать ярлык на рабочем столе"
-LangString NAME_SecAutostart ${LANG_RUSSIAN} "Запускать Gajim при загрузке Windows"
-LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim."
-LangString DESC_SecGtk ${LANG_RUSSIAN} "Устанавливка Gtk+ 2 (необходимо для работы Gajim)."
-LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim."
-LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows."
+LangString NAME_Emoticons ${LANG_RUSSIAN} "óÍÁÊÌÉËÉ"
+LangString NAME_Iconsets ${LANG_RUSSIAN} "ôÅÍÙ ÉËÏÎÏË"
+LangString NAME_Languages ${LANG_RUSSIAN} "ñÚÙËÉ"
+LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "äÒÕÇÏÅ"
+LangString NAME_Themes ${LANG_RUSSIAN} "ôÅÍÙ"
+LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "óÏÚÄÁÔØ ÑÒÌÙË ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ"
+LangString NAME_SecAutostart ${LANG_RUSSIAN} "úÁÐÕÓËÁÔØ Gajim ÐÒÉ ÚÁÇÒÕÚËÅ Windows"
+LangString DESC_SecGajim ${LANG_RUSSIAN} "õÓÔÁÎÏ×ËÁ ÏÓÎÏ×ÎÙÈ ÆÁÊÌÏ× Gajim."
+LangString DESC_SecGtk ${LANG_RUSSIAN} "õÓÔÁÎÏ×ËÁ Gtk+ 2 (ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ ÒÁÂÏÔÙ Gajim)."
+LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "åÓÌÉ ÏÔÍÅÞÅÎÏ, ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ ÂÕÄÅÔ ÓÏÚÄÁÎ ÑÒÌÙË Gajim."
+LangString DESC_SecAutostart ${LANG_RUSSIAN} "åÓÌÉ ÏÔÍÅÞÅÎÏ, Gajim ÂÕÄÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÐÕÓËÁÔØÓÑ ÐÒÉ ÚÁÇÒÕÚËÅ Windows."
 
 Section "Gajim" SecGajim
 	SectionIn RO