From e941472e5b7bc6b82f35a47351a7b633c9e11187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Tue, 10 Jan 2017 21:05:55 +0100
Subject: [PATCH] Fix encoding in windows installer

---
 gajim-portable.nsi | 31 ++++++++++-------
 gajim.nsi          | 83 ++++++++++++++++++++++++----------------------
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/gajim-portable.nsi b/gajim-portable.nsi
index 15ea727d6..5b3decd52 100644
--- a/gajim-portable.nsi
+++ b/gajim-portable.nsi
@@ -1,3 +1,6 @@
+; File encoding 'UTF-8 with BOM'
+
+Unicode true
 !include "MUI2.nsh"
 
 Name "Gajim"
@@ -77,21 +80,21 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim."
 
 
 ; 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 DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim."
+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 DESC_SecGajim ${LANG_RUSSIAN} "Установка основных файлов Gajim."
 
 
 ; Hebrew
-LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí"
-LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú"
-LangString NAME_Languages ${LANG_HEBREW} "ùôåú"
-LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú"
-LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà"
-LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí."
+LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים"
+LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית"
+LangString NAME_Languages ${LANG_HEBREW} "שפות"
+LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות"
+LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא"
+LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים."
 
 Section "Gajim" SecGajim
 	SectionIn RO
@@ -257,3 +260,7 @@ SectionGroupEnd
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Function .onInit
+  	!insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
diff --git a/gajim.nsi b/gajim.nsi
index 830379a0b..5d1c596f8 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -1,3 +1,6 @@
+; File encoding 'UTF-8 with BOM'
+
+Unicode true
 !include "MUI2.nsh"
 
 Name "Gajim"
@@ -66,19 +69,19 @@ LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently runni
 		Please quit Gajim and restart the uninstaller."
 
 ; 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_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 STR_Installed ${LANG_FRENCH} "Gajim est apparement d�j� install�. Lancer la d�sinstallation ?"
-LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc�.$\n\
-		Fermez-le et red�marrez le d�sinstallateur."
+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 STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?"
+LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\
+		Fermez-le et redémarrez le désinstallateur."
 
 ; German
 LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons"
@@ -89,10 +92,10 @@ LangString NAME_Themes ${LANG_GERMAN} "Designs"
 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_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."
 LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?"
-LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits l�uft.$\n\
+LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\
 		Bitte beenden Sie es und starten Sie den Installer erneut.."
 
 ; Italian
@@ -104,40 +107,41 @@ 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_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."
+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."
 LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?"
 LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\
 		Close it and restart uninstaller."
 
 ; 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_SecDesktopIcon ${LANG_RUSSIAN} "���� ��������, �� ������� ����� ����� ������ ����� Gajim."
-LangString DESC_SecAutostart ${LANG_RUSSIAN} "���� ��������, Gajim ����� ������������� ����������� ��� �������� Windows."
-LangString STR_Installed ${LANG_RUSSIAN} "������, Gajim ��� ����������. ���������������� ������������� ������?"
-LangString STR_Running ${LANG_RUSSIAN} "������, Gajim ��� �������.$\n�������� ��� � ��������� ������������� �����."
+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_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim."
+LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows."
+LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?"
+LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\n\
+		Закройте его и запустите деинсталлятор снова."
 
 ; Hebrew
-LangString NAME_Emoticons ${LANG_HEBREW} "�������"
-LangString NAME_Iconsets ${LANG_HEBREW} "����� �����"
-LangString NAME_Languages ${LANG_HEBREW} "����"
-LangString NAME_SecLanguagesOther ${LANG_HEBREW} "�����"
-LangString NAME_Themes ${LANG_HEBREW} "������ ����"
-LangString NAME_SecDesktopIcon ${LANG_HEBREW} "��� ��� ������ �����"
-LangString NAME_SecAutostart ${LANG_HEBREW} "���� �� Gajim ���� Windows �����"
-LangString DESC_SecGajim ${LANG_HEBREW} "����� ���� Gajim �������."
-LangString DESC_SecDesktopIcon ${LANG_HEBREW} "����� ������, ����� ��� ���� Gajim ���� �� ����� ������."
-LangString DESC_SecAutostart ${LANG_HEBREW} "����� ������, Gajim ����� �������� ���� Windows �����."
-LangString STR_Installed ${LANG_HEBREW} "��� �����, Gajim ��� �����. ����� ����?"
-LangString STR_Running ${LANG_HEBREW} "���� �������� Gajim ����� ���.$\n\
-        ��� �� �� Gajim ����� �� ���� ������."
+LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים"
+LangString NAME_Iconsets ${LANG_HEBREW} "מערכי צלמית"
+LangString NAME_Languages ${LANG_HEBREW} "שפות"
+LangString NAME_SecLanguagesOther ${LANG_HEBREW} "אחרות"
+LangString NAME_Themes ${LANG_HEBREW} "ערכאות נושא"
+LangString NAME_SecDesktopIcon ${LANG_HEBREW} "צור סמל בשולחן עבודה"
+LangString NAME_SecAutostart ${LANG_HEBREW} "הפעל את Gajim כאשר Windows מתחיל"
+LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריים."
+LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה."
+LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל."
+LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?"
+LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\n\
+        אנא צא מן Gajim ואתחל את מסיר ההתקנה."
 
 Section "Gajim" SecGajim
 	SectionIn RO
@@ -390,6 +394,7 @@ Function un.onInit
 	MessageBox MB_ICONSTOP|MB_OK $(STR_Running)
 	Quit
 Remove:
+	!insertmacro MUI_UNGETLANGUAGE
 FunctionEnd
 
 Function .onInit