From fb9a211d6ba4a36f92c2dad8f7df6eeacaaf741f Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 23 Oct 2011 15:12:04 +0200 Subject: [PATCH] 1.0.0-rc1 --- windows/installer.nsi | 36 ++++++++++++++------- windows/languages.nsh | 75 ------------------------------------------- 2 files changed, 25 insertions(+), 86 deletions(-) diff --git a/windows/installer.nsi b/windows/installer.nsi index d914877ca..4c9b90dd8 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -3,7 +3,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "1.0.0-b4" +!define /date PRODUCT_VERSION "1.0.0-rc1" !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" @@ -64,12 +64,13 @@ Section !$(TITLE_SecMain) SecMain File "qupzilla.exe" File "libeay32.dll" File "ssleay32.dll" - File "msvcp100.dll" - File "msvcr100.dll" + File "msvcp90.dll" + File "msvcr90.dll" File "phonon4.dll" File "QtCore4.dll" File "QtGui4.dll" File "QtNetwork4.dll" + File "QtScript4.dll" File "QtSql4.dll" File "QtWebKit4.dll" @@ -77,7 +78,6 @@ Section !$(TITLE_SecMain) SecMain File "data\default\profiles\profiles.ini" SetOutPath "$INSTDIR\data\default\profiles\default" - File "data\default\profiles\default\background.png" File "data\default\profiles\default\browsedata.db" SetOutPath "$INSTDIR\imageformats" @@ -90,7 +90,6 @@ Section !$(TITLE_SecMain) SecMain SetOutPath "$INSTDIR\sqldrivers" File "sqldrivers\qsqlite4.dll" - File "sqldrivers\qsqlodbc4.dll" SectionEnd @@ -127,22 +126,40 @@ SectionGroup $(TITLE_SecThemes) SecThemes SectionGroupEnd SectionGroup $(TITLE_SecTranslations) SecTranslations - Section $(TITLE_SecEnglish) SecEnglish + Section "English" SectionIn RO SectionEnd - Section $(TITLE_SecCzech) SecCzech + Section "Czech" SetOutPath "$INSTDIR\locale" File "locale\cs_CZ.qm" File "locale\qt_cs.qm" SectionEnd - Section $(TITLE_SecSlovak) SecSlovak + Section "Slovak" SetOutPath "$INSTDIR\locale" File "locale\sk_SK.qm" File "locale\qt_sk.qm" SectionEnd + Section "German" + SetOutPath "$INSTDIR\locale" + File "locale\de_DE.qm" + File "locale\qt_de.qm" + SectionEnd + + Section "Dutch" + SetOutPath "$INSTDIR\locale" + File "locale\nl_NL.qm" + File "locale\qt_nl.qm" + SectionEnd + + Section "Chinese" + SetOutPath "$INSTDIR\locale" + File "locale\zh_CN.qm" + File "locale\qt_zh.qm" + SectionEnd + SectionGroupEnd SectionGroup $(TITLE_SecPlugins) SecPlugins @@ -176,9 +193,6 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_SecMain) !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(DESC_SecTranslations) - !insertmacro MUI_DESCRIPTION_TEXT ${SecEnglish} $(DESC_SecEnglish) - !insertmacro MUI_DESCRIPTION_TEXT ${SecCzech} $(DESC_SecCzech) - !insertmacro MUI_DESCRIPTION_TEXT ${SecSlovak} $(DESC_SecSlovak) !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} $(DESC_SecPlugins) !insertmacro MUI_DESCRIPTION_TEXT ${SecExamplePlugin} $(DESC_SecExamplePlugin) !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} $(DESC_SecDesktop) diff --git a/windows/languages.nsh b/windows/languages.nsh index 10c3dba8a..c28e38be9 100644 --- a/windows/languages.nsh +++ b/windows/languages.nsh @@ -1,9 +1,6 @@ ;;;;English LangString TITLE_SecMain ${LANG_ENGLISH} "Main Components" LangString TITLE_SecTranslations ${LANG_ENGLISH} "Translations" -LangString TITLE_SecEnglish ${LANG_ENGLISH} "English" -LangString TITLE_SecCzech ${LANG_ENGLISH} "Czech" -LangString TITLE_SecSlovak ${LANG_ENGLISH} "Slovak" LangString TITLE_SecPlugins ${LANG_ENGLISH} "Plugins" LangString TITLE_SecExamplePlugin ${LANG_ENGLISH} "Example Plugin" LangString TITLE_SecDesktop ${LANG_ENGLISH} "Desktop Icon" @@ -15,9 +12,6 @@ LangString FILE_Html ${LANG_ENGLISH} "HTML File" ; LangString DESC_SecMain ${LANG_ENGLISH} "Main components of application." LangString DESC_SecTranslations ${LANG_ENGLISH} "Other translations available to install. Default is English." -LangString DESC_SecEnglish ${LANG_ENGLISH} "English translation" -LangString DESC_SecCzech ${LANG_ENGLISH} "Czech translation" -LangString DESC_SecSlovak ${LANG_ENGLISH} "Slovak translation" LangString DESC_SecPlugins ${LANG_ENGLISH} "Other plugins available to install." LangString DESC_SecExamplePlugin ${LANG_ENGLISH} "Useless example plugin." LangString DESC_SecDesktop ${LANG_ENGLISH} "Add launcher to desktop." @@ -27,9 +21,6 @@ LangString DESC_SecThemes ${LANG_ENGLISH} "Additional themes for QupZilla" ;;;;Czech LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty" LangString TITLE_SecTranslations ${LANG_CZECH} "Překlady" -LangString TITLE_SecEnglish ${LANG_CZECH} "Angličtina" -LangString TITLE_SecCzech ${LANG_CZECH} "Čeština" -LangString TITLE_SecSlovak ${LANG_CZECH} "Slovenština" LangString TITLE_SecPlugins ${LANG_CZECH} "Doplňky" LangString TITLE_SecExamplePlugin ${LANG_CZECH} "Ukázkový doplněk" LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše" @@ -41,9 +32,6 @@ LangString FILE_Html ${LANG_CZECH} "Soubor HTML" ; 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_SecEnglish ${LANG_CZECH} "Anglický překlad" -LangString DESC_SecCzech ${LANG_CZECH} "Český překlad" -LangString DESC_SecSlovak ${LANG_CZECH} "Slovenský překlad" 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_SecDesktop ${LANG_CZECH} "Přidat zástupce na plochu." @@ -53,9 +41,6 @@ LangString DESC_SecThemes ${LANG_CZECH} "Dodate ;;;;Slovak LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty" LangString TITLE_SecTranslations ${LANG_SLOVAK} "Preklady" -LangString TITLE_SecEnglish ${LANG_SLOVAK} "Angličtina" -LangString TITLE_SecCzech ${LANG_SLOVAK} "Čeština" -LangString TITLE_SecSlovak ${LANG_SLOVAK} "Slovenčina" LangString TITLE_SecPlugins ${LANG_SLOVAK} "Doplnky" LangString TITLE_SecExamplePlugin ${LANG_SLOVAK} "Ukázkový doplnek" LangString TITLE_SecDesktop ${LANG_SLOVAK} "Zástupca na ploche" @@ -67,9 +52,6 @@ LangString FILE_Html ${LANG_SLOVAK} "S ; 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_SecEnglish ${LANG_SLOVAK} "Anglický překlad" -LangString DESC_SecCzech ${LANG_SLOVAK} "Český preklad" -LangString DESC_SecSlovak ${LANG_SLOVAK} "Slovenský preklad" 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_SecDesktop ${LANG_SLOVAK} "Pridat zástupca na plochu." @@ -118,63 +100,6 @@ LangString DESC_SecTranslations ${LANG_SWEDISH} "Other translations available to LangString DESC_SecTranslations ${LANG_TRADCHINESE} "Other translations available to install. Default is English." LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "Other translations available to install. Default is English." -LangString TITLE_SecEnglish ${LANG_DUTCH} "English" -LangString TITLE_SecEnglish ${LANG_FRENCH} "English" -LangString TITLE_SecEnglish ${LANG_GERMAN} "English" -LangString TITLE_SecEnglish ${LANG_KOREAN} "English" -LangString TITLE_SecEnglish ${LANG_RUSSIAN} "English" -LangString TITLE_SecEnglish ${LANG_SPANISH} "English" -LangString TITLE_SecEnglish ${LANG_SWEDISH} "English" -LangString TITLE_SecEnglish ${LANG_TRADCHINESE} "English" -LangString TITLE_SecEnglish ${LANG_SIMPCHINESE} "English" -LangString DESC_SecEnglish ${LANG_DUTCH} "English translation" -LangString DESC_SecEnglish ${LANG_FRENCH} "English translation" -LangString DESC_SecEnglish ${LANG_GERMAN} "English translation" -LangString DESC_SecEnglish ${LANG_KOREAN} "English translation" -LangString DESC_SecEnglish ${LANG_RUSSIAN} "English translation" -LangString DESC_SecEnglish ${LANG_SPANISH} "English translation" -LangString DESC_SecEnglish ${LANG_SWEDISH} "English translation" -LangString DESC_SecEnglish ${LANG_TRADCHINESE} "English translation" -LangString DESC_SecEnglish ${LANG_SIMPCHINESE} "English translation" - -LangString TITLE_SecCzech ${LANG_DUTCH} "Czech" -LangString TITLE_SecCzech ${LANG_FRENCH} "Czech" -LangString TITLE_SecCzech ${LANG_GERMAN} "Czech" -LangString TITLE_SecCzech ${LANG_KOREAN} "Czech" -LangString TITLE_SecCzech ${LANG_RUSSIAN} "Czech" -LangString TITLE_SecCzech ${LANG_SPANISH} "Czech" -LangString TITLE_SecCzech ${LANG_SWEDISH} "Czech" -LangString TITLE_SecCzech ${LANG_TRADCHINESE} "Czech" -LangString TITLE_SecCzech ${LANG_SIMPCHINESE} "Czech" -LangString DESC_SecCzech ${LANG_DUTCH} "Czech translation" -LangString DESC_SecCzech ${LANG_FRENCH} "Czech translation" -LangString DESC_SecCzech ${LANG_GERMAN} "Czech translation" -LangString DESC_SecCzech ${LANG_KOREAN} "Czech translation" -LangString DESC_SecCzech ${LANG_RUSSIAN} "Czech translation" -LangString DESC_SecCzech ${LANG_SPANISH} "Czech translation" -LangString DESC_SecCzech ${LANG_SWEDISH} "Czech translation" -LangString DESC_SecCzech ${LANG_TRADCHINESE} "Czech translation" -LangString DESC_SecCzech ${LANG_SIMPCHINESE} "Czech translation" - -LangString TITLE_SecSlovak ${LANG_DUTCH} "Slovak" -LangString TITLE_SecSlovak ${LANG_FRENCH} "Slovak" -LangString TITLE_SecSlovak ${LANG_GERMAN} "Slovak" -LangString TITLE_SecSlovak ${LANG_KOREAN} "Slovak" -LangString TITLE_SecSlovak ${LANG_RUSSIAN} "Slovak" -LangString TITLE_SecSlovak ${LANG_SPANISH} "Slovak" -LangString TITLE_SecSlovak ${LANG_SWEDISH} "Slovak" -LangString TITLE_SecSlovak ${LANG_TRADCHINESE} "Slovak" -LangString TITLE_SecSlovak ${LANG_SIMPCHINESE} "Slovak" -LangString DESC_SecSlovak ${LANG_DUTCH} "Slovak translation" -LangString DESC_SecSlovak ${LANG_FRENCH} "Slovak translation" -LangString DESC_SecSlovak ${LANG_GERMAN} "Slovak translation" -LangString DESC_SecSlovak ${LANG_KOREAN} "Slovak translation" -LangString DESC_SecSlovak ${LANG_RUSSIAN} "Slovak translation" -LangString DESC_SecSlovak ${LANG_SPANISH} "Slovak translation" -LangString DESC_SecSlovak ${LANG_SWEDISH} "Slovak translation" -LangString DESC_SecSlovak ${LANG_TRADCHINESE} "Slovak translation" -LangString DESC_SecSlovak ${LANG_SIMPCHINESE} "Slovak translation" - LangString TITLE_SecPlugins ${LANG_DUTCH} "Plugins" LangString TITLE_SecPlugins ${LANG_FRENCH} "Plugins" LangString TITLE_SecPlugins ${LANG_GERMAN} "Plugins"