Updated Windows installer + added Greek language. Closes #127

windows/installer.nsi

@@ -1,9 +1,9 @@
-RequestExecutionLevel admin
+RequestExecutionLevel admin
 !include "wininstall\FileAssociation.nsh"
 SetCompressor /SOLID /FINAL lzma
 
 !define PRODUCT_NAME "QupZilla"
-!define /date PRODUCT_VERSION "1.0.0"
+!define /date PRODUCT_VERSION "1.1.0"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -34,6 +34,8 @@ SetCompressor /SOLID /FINAL lzma
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Dutch"
 !insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Portuguese"
 
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "Korean"
@@ -75,19 +77,14 @@ Section !$(TITLE_SecMain) SecMain
   File "QtSql4.dll"
   File "QtWebKit4.dll"
 
-  SetOutPath "$INSTDIR\data\default\profiles"
-  File "data\default\profiles\profiles.ini"
-  
-  SetOutPath "$INSTDIR\data\default\profiles\default"
-  File "data\default\profiles\default\browsedata.db"
-
   SetOutPath "$INSTDIR\imageformats"
   File "imageformats\qico4.dll"
   File "imageformats\qsvg4.dll"
   File "imageformats\qgif4.dll"
   File "imageformats\qjpeg4.dll"
-  File "imageformats\qtiff4.dll"
   File "imageformats\qmng4.dll"
+  File "imageformats\qtiff4.dll"
+  File "imageformats\qtga4.dll"
 
   SetOutPath "$INSTDIR\sqldrivers"
   File "sqldrivers\qsqlite4.dll"
@@ -167,6 +164,42 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations
   File "locale\qt_zh.qm"
   SectionEnd
 
+  Section "Polish"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\pl_PL.qm"
+  File "locale\qt_pl.qm"
+  SectionEnd
+
+  Section "Spanish"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\es_ES.qm"
+  File "locale\qt_es.qm"
+  SectionEnd
+  
+  Section "Greek"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\el_GR.qm"
+  File "locale\qt_el.qm"
+  SectionEnd
+  
+  Section "French"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\fr_FR.qm"
+  File "locale\qt_fr.qm"
+  SectionEnd
+  
+  Section "Russian"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\ru_RU.qm"
+  File "locale\qt_ru.qm"
+  SectionEnd
+  
+  Section "Portuguese"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\pt_PT.qm"
+  File "locale\qt_pt.qm"
+  SectionEnd
+
 SectionGroupEnd
 
 SectionGroup $(TITLE_SecPlugins) SecPlugins
@@ -238,28 +271,18 @@ Function .onInit
 	Push ""
     Push ${LANG_ENGLISH}
 	Push English
-	Push ${LANG_CZECH}
-	Push Czech
-	Push ${LANG_DUTCH}
-	Push Dutch
-	Push ${LANG_FRENCH}
-	Push French
 	Push ${LANG_GERMAN}
 	Push German
-	Push ${LANG_KOREAN}
+	Push ${LANG_CZECH}
-	Push Korean
+	Push Czech
-	Push ${LANG_RUSSIAN}
-	Push Russian
-	Push ${LANG_SPANISH}
-	Push Spanish
-	Push ${LANG_SWEDISH}
-	Push Swedish
-	Push ${LANG_TRADCHINESE}
-	Push "Traditional Chinese"
-	Push ${LANG_SIMPCHINESE}
-	Push "Simplified Chinese"
 	Push ${LANG_SLOVAK}
 	Push Slovak
+	Push ${LANG_DUTCH}
+	Push Dutch
+	Push ${LANG_GREEK}
+	Push Greek
+	Push ${LANG_PORTUGUESE}
+	Push Portuguese
 	Push A ; A means auto count languages
 	       ; for the auto count to work the first empty push (Push "") must remain
 	LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

windows/languages.nsh

@@ -1,4 +1,4 @@
-;;;;English
+;;;;English
 LangString TITLE_SecMain ${LANG_ENGLISH} "Main Components"
 LangString TITLE_SecTranslations ${LANG_ENGLISH} "Translations"
 LangString TITLE_SecPlugins ${LANG_ENGLISH} "Plugins"
@@ -19,64 +19,64 @@ LangString DESC_SecExtensions ${LANG_ENGLISH} "Associate QupZilla with .htm and
 LangString DESC_SecThemes ${LANG_ENGLISH} "Additional themes for QupZilla"
 
 ;;;;Czech
-LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty"
+LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty"
-LangString TITLE_SecTranslations ${LANG_CZECH} "Pøeklady"
+LangString TITLE_SecTranslations ${LANG_CZECH} "Překlady"
-LangString TITLE_SecPlugins ${LANG_CZECH} "Doplòky"
+LangString TITLE_SecPlugins ${LANG_CZECH} "Doplňky"
-LangString TITLE_SecExamplePlugin ${LANG_CZECH} "Ukázkový doplnìk"
+LangString TITLE_SecExamplePlugin ${LANG_CZECH} "Ukázkový doplněk"
-LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše"
+LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše"
-LangString TITLE_SecExtensions ${LANG_CZECH} "Asociace souborù"
+LangString TITLE_SecExtensions ${LANG_CZECH} "Asociace souborů"
-LangString TITLE_SecThemes ${LANG_CZECH} "Témata"
+LangString TITLE_SecThemes ${LANG_CZECH} "Témata"
 
 LangString FILE_Htm ${LANG_CZECH} "Soubor HTM"
 LangString FILE_Html ${LANG_CZECH} "Soubor HTML"
 ;
-LangString DESC_SecMain ${LANG_CZECH} "Hlavní komponenty aplikace."
+LangString DESC_SecMain ${LANG_CZECH} "Hlavní komponenty aplikace."
-LangString DESC_SecTranslations ${LANG_CZECH} "Ostatní pøeklady dostupné k instalaci. Angliètina je defaultní."
+LangString DESC_SecTranslations ${LANG_CZECH} "Ostatní překlady dostupné k instalaci. Angličtina je defaultní."
-LangString DESC_SecPlugins ${LANG_CZECH} "Ostatní doplòky dostupné k instalaci."
+LangString DESC_SecPlugins ${LANG_CZECH} "Ostatní doplňky dostupné k instalaci."
-LangString DESC_SecExamplePlugin ${LANG_CZECH} "Pouze ukázkový nic nedìlající doplnìk."
+LangString DESC_SecExamplePlugin ${LANG_CZECH} "Pouze ukázkový nic nedělající doplněk."
-LangString DESC_SecDesktop ${LANG_CZECH} "Pøidat zástupce na plochu."
+LangString DESC_SecDesktop ${LANG_CZECH} "Přidat zástupce na plochu."
 LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm a .html soubory"
-LangString DESC_SecThemes ${LANG_CZECH} "Dodateèná témata pro QupZillu"
+LangString DESC_SecThemes ${LANG_CZECH} "Dodatečná témata pro QupZillu"
 
 ;;;;Slovak
-LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty"
+LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty"
 LangString TITLE_SecTranslations ${LANG_SLOVAK} "Preklady"
 LangString TITLE_SecPlugins ${LANG_SLOVAK} "Doplnky"
-LangString TITLE_SecExamplePlugin ${LANG_SLOVAK} "Ukázkový doplnek"
+LangString TITLE_SecExamplePlugin ${LANG_SLOVAK} "Ukázkový doplnek"
-LangString TITLE_SecDesktop ${LANG_SLOVAK} "Zástupca na ploche"
+LangString TITLE_SecDesktop ${LANG_SLOVAK} "Zástupca na ploche"
-LangString TITLE_SecExtensions ${LANG_SLOVAK} "Asociácia souborù"
+LangString TITLE_SecExtensions ${LANG_SLOVAK} "Asociácia souborù"
-LangString TITLE_SecThemes ${LANG_SLOVAK} "Témy"
+LangString TITLE_SecThemes ${LANG_SLOVAK} "Témy"
 
-LangString FILE_Htm ${LANG_SLOVAK} "Súbor HTM"
+LangString FILE_Htm ${LANG_SLOVAK} "Súbor HTM"
-LangString FILE_Html ${LANG_SLOVAK} "Súbor HTML"
+LangString FILE_Html ${LANG_SLOVAK} "Súbor HTML"
 ;
-LangString DESC_SecMain ${LANG_SLOVAK} "Hlavné komponenty aplikace."
+LangString DESC_SecMain ${LANG_SLOVAK} "Hlavné komponenty aplikace."
-LangString DESC_SecTranslations ${LANG_SLOVAK} "Ostatné pøeklady dostupné k in¹talácii. Angliètina je defaultná"
+LangString DESC_SecTranslations ${LANG_SLOVAK} "Ostatné preklady dostupné k inštalácii. Angličtina je defaultná"
-LangString DESC_SecPlugins ${LANG_SLOVAK} "Ostatné doplnky dustupne k in¹talácii"
+LangString DESC_SecPlugins ${LANG_SLOVAK} "Ostatné doplnky dustupne k inštalácii"
-LangString DESC_SecExamplePlugin ${LANG_SLOVAK} "Pouze ukázkovy nic nerobiací doplnek."
+LangString DESC_SecExamplePlugin ${LANG_SLOVAK} "Pouze ukázkovy nic nerobiací doplnek."
-LangString DESC_SecDesktop ${LANG_SLOVAK} "Pridat zástupca na plochu."
+LangString DESC_SecDesktop ${LANG_SLOVAK} "Pridat zástupca na plochu."
-LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovat QupZillu s .htm a .html súbory"
+LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovat QupZillu s .htm a .html súbory"
-LangString DESC_SecThemes ${LANG_SLOVAK} "Dodateèné témy pre QupZillu"
+LangString DESC_SecThemes ${LANG_SLOVAK} "Dodatečné témy pre QupZillu"
 
 ;;;;German
 LangString TITLE_SecMain ${LANG_GERMAN} "Hauptkomponenten"
-LangString TITLE_SecTranslations ${LANG_GERMAN} "Übersetzungen"
+LangString TITLE_SecTranslations ${LANG_GERMAN} "Übersetzungen"
 LangString TITLE_SecPlugins ${LANG_GERMAN} "Plugins"
 LangString TITLE_SecExamplePlugin ${LANG_GERMAN} "Beispiel-Plugin"
 LangString TITLE_SecDesktop ${LANG_GERMAN} "Desktop Symbol"
-LangString TITLE_SecExtensions ${LANG_GERMAN} "Dateiverknüpfungen"
+LangString TITLE_SecExtensions ${LANG_GERMAN} "Dateiverknüpfungen"
 LangString TITLE_SecThemes ${LANG_GERMAN} "Themen"
 
 LangString FILE_Htm ${LANG_GERMAN} "HTM Datei"
 LangString FILE_Html ${LANG_GERMAN} "HTML Datei"
 
 LangString DESC_SecMain ${LANG_GERMAN} "Hauptkomponenten der Anwendung."
-LangString DESC_SecTranslations ${LANG_GERMAN} "Weitere Übersetzungen sind verfügbar. Die Standardsprache ist Englisch."
+LangString DESC_SecTranslations ${LANG_GERMAN} "Weitere Übersetzungen sind verfügbar. Die Standardsprache ist Englisch."
-LangString DESC_SecPlugins ${LANG_GERMAN} "Weitere Plugins stehen zur Verfügung."
+LangString DESC_SecPlugins ${LANG_GERMAN} "Weitere Plugins stehen zur Verfügung."
 LangString DESC_SecExamplePlugin ${LANG_GERMAN} "Nutzloses Beispiel-Plugin."
-LangString DESC_SecDesktop ${LANG_GERMAN} "Starter zum Desktop hinzufügen."
+LangString DESC_SecDesktop ${LANG_GERMAN} "Starter zum Desktop hinzufügen."
-LangString DESC_SecExtensions ${LANG_GERMAN} "Verknüpfe QupZilla mit .htm und .html Dateien"
+LangString DESC_SecExtensions ${LANG_GERMAN} "Verknüpfe QupZilla mit .htm und .html Dateien"
-LangString DESC_SecThemes ${LANG_GERMAN} "Weitere Themen für QupZilla"
+LangString DESC_SecThemes ${LANG_GERMAN} "Weitere Themen für QupZilla"
 
 ;;;;Dutch
 LangString TITLE_SecMain ${LANG_DUTCH} "Hoofdonderdelen"
@@ -100,24 +100,44 @@ LangString DESC_SecThemes ${LANG_DUTCH} "Extra thema's voor QupZilla"
 
 ;;;;Portuguese
 LangString TITLE_SecMain ${LANG_PORTUGUESE} "Principais componentes"
-LangString TITLE_SecTranslations ${LANG_PORTUGUESE} "Traduções"
+LangString TITLE_SecTranslations ${LANG_PORTUGUESE} "Traduções"
 LangString TITLE_SecPlugins ${LANG_PORTUGUESE} "Plugins"
 LangString TITLE_SecExamplePlugin ${LANG_PORTUGUESE} "Plugin Example"
-LangString TITLE_SecDesktop ${LANG_PORTUGUESE} "Ícone no ambiente de trabalho"
+LangString TITLE_SecDesktop ${LANG_PORTUGUESE} "Ícone no ambiente de trabalho"
-LangString TITLE_SecExtensions ${LANG_PORTUGUESE} "Associação de ficheiros"
+LangString TITLE_SecExtensions ${LANG_PORTUGUESE} "Associação de ficheiros"
 LangString TITLE_SecThemes ${LANG_PORTUGUESE} "Temas"
 
 LangString FILE_Htm ${LANG_PORTUGUESE} "Ficheiro HTM"
 LangString FILE_Html ${LANG_PORTUGUESE} "Ficheiro HTML"
 ;
-LangString DESC_SecMain ${LANG_PORTUGUESE} "Principais componentes da aplicação"
+LangString DESC_SecMain ${LANG_PORTUGUESE} "Principais componentes da aplicação"
-LangString DESC_SecTranslations ${LANG_PORTUGUESE} "Outros idiomas disponíveis. O idioma padrão é inglês"
+LangString DESC_SecTranslations ${LANG_PORTUGUESE} "Outros idiomas disponíveis. O idioma padrão é inglês"
-LangString DESC_SecPlugins ${LANG_PORTUGUESE} "Outros plugins disponíveis"
+LangString DESC_SecPlugins ${LANG_PORTUGUESE} "Outros plugins disponíveis"
 LangString DESC_SecExamplePlugin ${LANG_PORTUGUESE} "Plugin de exemplo sem qualquer utilidade"
-LangString DESC_SecDesktop ${LANG_PORTUGUESE} "Adicionar ícone ao ambiente de trabalho"
+LangString DESC_SecDesktop ${LANG_PORTUGUESE} "Adicionar ícone ao ambiente de trabalho"
 LangString DESC_SecExtensions ${LANG_PORTUGUESE} "Associar QupZilla aos ficheiros .htm e .html"
 LangString DESC_SecThemes ${LANG_PORTUGUESE} "Temas extra para o QupZilla"
 
+;;;;Greek
+LangString TITLE_SecMain ${LANG_GREEK} "Κύρια στοιχεία"
+LangString TITLE_SecTranslations ${LANG_GREEK} "Μεταφράσεις"
+LangString TITLE_SecPlugins ${LANG_GREEK} "Πρόσθετα"
+LangString TITLE_SecExamplePlugin ${LANG_GREEK} "Παράδειγμα προσθέτου"
+LangString TITLE_SecDesktop ${LANG_GREEK} "Εικονίδιο επιφάνειας"
+LangString TITLE_SecExtensions ${LANG_GREEK} "Συσχετίσεις αρχείων"
+LangString TITLE_SecThemes ${LANG_GREEK} "Θέματα"
+
+LangString FILE_Htm ${LANG_GREEK} "Αρχείο HTM"
+LangString FILE_Html ${LANG_GREEK} "Αρχείο HTML"
+
+LangString DESC_SecMain ${LANG_GREEK} "Κυρια στοιχεία της εφαρμογής."
+LangString DESC_SecTranslations ${LANG_GREEK} "Άλλες μεταφράσεις διαθέσιμες προς εγκατάσταση. Η προεπιλεγμένη είναι Αγγλικά."
+LangString DESC_SecPlugins ${LANG_GREEK} "Άλλα πρόσθετα διαθέσιμα προς εγκατάσταση."
+LangString DESC_SecExamplePlugin ${LANG_GREEK} "Παράδειγμα άχρηστου πρόσθετου."
+LangString DESC_SecDesktop ${LANG_GREEK} "Προσθήκη εκκινητή στην επιφάνεια."
+LangString DESC_SecExtensions ${LANG_GREEK} "Συσχέτιση του QupZilla με αρχεία .htm και .html"
+LangString DESC_SecThemes ${LANG_GREEK} "Πρόσθετα θέματα για το QupZilla"
+
 ;;;;;;;;;
 ;;;;;;;;;
 ; Unfinished translations