[Git][gajim/gajim][gajim_0.16] 2 commits: Fix encoding in windows installer - Commits

10 Jan 2017

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim
Commits:
39aa0d91 by Philipp Hörist at 2017-01-10T20:55:31+01:00
Fix encoding in windows installer
- - - - -
4fb4074c by Philipp Hörist at 2017-01-10T20:57:46+01:00
Merge branch &#39;installer&#39; into &#39;gajim_0.16&#39;
Fix encoding in windows installer
See merge request !28
- - - - -
2 changed files:
- gajim-portable.nsi
- gajim.nsi
Changes:
=====================================
gajim-portable.nsi
=====================================

--- 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"
@@ -81,23 +84,23 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire
; 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 DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû 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."
+LangString DESC_SecGtk ${LANG_RUSSIAN} "Установка Gtk 2 (необходимо для работы 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 DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú 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 עיקריים."
+LangString DESC_SecGtk ${LANG_HEBREW} "מתקין Gtk+ 2 (נחוצה להרצת Gajim)."
Section "Gajim" SecGajim
    SectionIn RO
@@ -413,3 +416,7 @@ SectionGroupEnd
    !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim)
    !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} $(DESC_SecGtk)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
\ No newline at end of file
=====================================
gajim.nsi
=====================================
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -1,3 +1,6 @@
+; File encoding 'UTF-8 with BOM'
+
+Unicode true
 !include "MUI2.nsh"
Name "Gajim"
@@ -67,20 +70,20 @@ 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} "Emoticnes"
-LangString NAME_Iconsets ${LANG_FRENCH} "Bibliothque d'icnes"
+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} "Thmes"
-LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Crer une icne sur le bureau"
-LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au dmarrage 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 (ncessaire  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 dmarrage de Windows."
-LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dj install. Lancer la dsinstallation ?"
-LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc.$\n\
-		Fermez-le et redmarrez le dsinstallateur."
+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 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"
@@ -92,10 +95,10 @@ 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} "Installiert Gtk+ 2 (notwendig um Gajim zu benutzen)."
-LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon fr 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 ist bereits installiert. Soll es deinstalliert werden?"
-LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits luft.$\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
@@ -108,42 +111,44 @@ 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."
+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_SecGtk ${LANG_RUSSIAN} " Gtk+ 2 (   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_SecGtk ${LANG_RUSSIAN} "Установка Gtk 2 (необходимо для работы 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_SecGtk ${LANG_HEBREW} " Gtk+ 2 (  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_SecGtk ${LANG_HEBREW} "מתקין Gtk+ 2 (נחוצה להרצת 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
@@ -585,6 +590,7 @@ Function un.onInit
    MessageBox MB_ICONSTOP|MB_OK $(STR_Running)
    Quit
 Remove:
+	!insertmacro MUI_UNGETLANGUAGE
 FunctionEnd
Function .onInit
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bae08ea1c957a2207e02ff049b257e97d6...

    