From 3c44d1594a72faf93d168d3180569563ed282eaa Mon Sep 17 00:00:00 2001 From: theadib Date: Fri, 28 Jul 2006 08:15:22 +0000 Subject: [PATCH] BUG 1519641 + many more languages --- packaging/win32/english.nsh | 12 +++++++- packaging/win32/german.nsh | 9 +++++- packaging/win32/inkscape.nsi | 55 +++++++++++++++++++++++++++++++++--- 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/packaging/win32/english.nsh b/packaging/win32/english.nsh index 08acb8a5c..da084b2f7 100644 --- a/packaging/win32/english.nsh +++ b/packaging/win32/english.nsh @@ -5,6 +5,8 @@ ; Authors: ; Adib Taraben theAdib@yahoo.com ; +; 27 july 2006 new languages en_CA, en_GB, fi, hr, mn, ne, rw, sq + !insertmacro MUI_LANGUAGE "English" ; Product name @@ -123,18 +125,24 @@ LangString lng_da $(LANG_ENGLISH) "da Danish" LangString lng_de $(LANG_ENGLISH) "de German" LangString lng_el $(LANG_ENGLISH) "el Greek" LangString lng_en $(LANG_ENGLISH) "en English" +LangString lng_en_CA $(LANG_ENGLISH) "en_CA English, as Spoken in Canada" +LangString lng_en_GB $(LANG_ENGLISH) "en_GB English, as spoken in Great Britain" LangString lng_es $(LANG_ENGLISH) "es Spanish" LangString lng_es_MX $(LANG_ENGLISH) "es_MX Mexican Spanish" -LangString lng_et $(LANG_ENGLISH) "es Estonian" +LangString lng_et $(LANG_ENGLISH) "et Estonian" +LangString lng_fi $(LANG_ENGLISH) "fi Finish" LangString lng_fr $(LANG_ENGLISH) "fr French" LangString lng_ga $(LANG_ENGLISH) "ga Irish" LangString lng_gl $(LANG_ENGLISH) "gl Gallegan" +LangString lng_hr $(LANG_ENGLISH) "hr Croatian" LangString lng_hu $(LANG_ENGLISH) "hu Hungarian" LangString lng_it $(LANG_ENGLISH) "it Italian" LangString lng_ja $(LANG_ENGLISH) "ja Japanese" LangString lng_ko $(LANG_ENGLISH) "ko Korean" LangString lng_lt $(LANG_ENGLISH) "lt Lithuanian" LangString lng_mk $(LANG_ENGLISH) "mk Macedonian" +LangString lng_mn $(LANG_ENGLISH) "mn Mongolian" +LangString lng_ne $(LANG_ENGLISH) "ne Nepali" LangString lng_nb $(LANG_ENGLISH) "nb Norwegian Bokmål" LangString lng_nl $(LANG_ENGLISH) "nl Dutch" LangString lng_nn $(LANG_ENGLISH) "nn Norwegian Nynorsk" @@ -143,8 +151,10 @@ LangString lng_pl $(LANG_ENGLISH) "po Polish" LangString lng_pt $(LANG_ENGLISH) "pt Portuguese" LangString lng_pt_BR $(LANG_ENGLISH) "pt_BR Brazilian Portuguese" LangString lng_ru $(LANG_ENGLISH) "ru Russian" +LangString lng_rw $(LANG_ENGLISH) "rw Kinyarwanda" LangString lng_sk $(LANG_ENGLISH) "sk Slovak" LangString lng_sl $(LANG_ENGLISH) "sl Slovenian" +LangString lng_sq $(LANG_ENGLISH) "sq Albanian" LangString lng_sr $(LANG_ENGLISH) "sr Serbian" LangString lng_sr@Latn $(LANG_ENGLISH) "sr@Latn Serbian in Latin script" LangString lng_sv $(LANG_ENGLISH) "sv Swedish" diff --git a/packaging/win32/german.nsh b/packaging/win32/german.nsh index 9cf964ad2..496cd921e 100644 --- a/packaging/win32/german.nsh +++ b/packaging/win32/german.nsh @@ -126,17 +126,22 @@ LangString lng_da $(LANG_GERMAN) "da D LangString lng_de $(LANG_GERMAN) "de Deutsch" LangString lng_el $(LANG_GERMAN) "el Griechisch" LangString lng_en $(LANG_GERMAN) "en Englisch" +LangString lng_en_CA $(LANG_GERMAN) "en_CA Englisch, wie in Kanada gesprochen" +LangString lng_en_GB $(LANG_GERMAN) "en_GB Englisch, wie in Großbritannien gesprochen" LangString lng_es $(LANG_GERMAN) "es Spanisch" LangString lng_es_MX $(LANG_GERMAN) "es_MX Spanisch-Mexio" -LangString lng_et $(LANG_GERMAN) "es Estonisch" +LangString lng_et $(LANG_GERMAN) "et Estonisch" +LangString lng_fi $(LANG_GERMAN) "fi Finnisch" LangString lng_fr $(LANG_GERMAN) "fr Französisch" LangString lng_ga $(LANG_GERMAN) "ga Irisch" LangString lng_gl $(LANG_GERMAN) "gl Galizisch" +LangString lng_hr $(LANG_GERMAN) "hr Kroatisch" LangString lng_hu $(LANG_GERMAN) "hu Ungarisch" LangString lng_it $(LANG_GERMAN) "it Italienisch" LangString lng_ja $(LANG_GERMAN) "ja Japanisch" LangString lng_ko $(LANG_GERMAN) "ko Koreanisch" LangString lng_lt $(LANG_GERMAN) "lt Litauisch" +LangString lng_mn $(LANG_GERMAN) "mn Mongolisch" LangString lng_mk $(LANG_GERMAN) "mk Mazedonisch" LangString lng_nb $(LANG_GERMAN) "nb Norwegisch-Bokmal" LangString lng_nl $(LANG_GERMAN) "nl Holländisch" @@ -146,8 +151,10 @@ LangString lng_pl $(LANG_GERMAN) "po Polnisch" LangString lng_pt $(LANG_GERMAN) "pt Portugiesisch" LangString lng_pt_BR $(LANG_GERMAN) "pt_BR Portugiesisch Brazilien" LangString lng_ru $(LANG_GERMAN) "ru Russisch" +LangString lng_rw $(LANG_GERMAN) "rw Kinyarwanda" LangString lng_sk $(LANG_GERMAN) "sk Slowakisch" LangString lng_sl $(LANG_GERMAN) "sl Slowenisch" +LangString lng_sq $(LANG_GERMAN) "sq Albanisch" LangString lng_sr $(LANG_GERMAN) "sr Serbisch" LangString lng_sr@Latn $(LANG_GERMAN) "sr@Latn Serbisch mit lat. Buchstaben" LangString lng_sv $(LANG_GERMAN) "sv Schwedisch" diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 2464e0b27..90a2ef67d 100644 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -425,7 +425,7 @@ FunctionEnd ;-------------------------------- ; Installer Sections - +; @todo better idea is to call the original uninstaller first Section -removeInkscape ; check for an old installation and clean that dlls and stuff ClearErrors @@ -471,6 +471,18 @@ Section -removeInkscape FindNext $0 $1 Goto FindNextLoop FindNextDone: + + ;remove the old inkscape shortcuts from the startmenu + ;just in case they are still there + SetShellVarContext current + Delete "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk" + Delete "$SMPROGRAMS\Inkscape\Inkscape.lnk" + RMDir "$SMPROGRAMS\Inkscape" + SetShellVarContext all + Delete "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk" + Delete "$SMPROGRAMS\Inkscape\Inkscape.lnk" + RMDir "$SMPROGRAMS\Inkscape" + SectionEnd Section $(lng_Core) SecCore @@ -664,6 +676,14 @@ Section $(lng_en) SecEnglish SectionIn 1 2 3 RO SectionEnd +Section $(lng_en_CA) SecEnglishCanadian + !insertmacro Language en_CA en_CA +SectionEnd + +Section $(lng_en_GB) SecEnglishBritain + !insertmacro Language en_GB en_GB +SectionEnd + Section $(lng_es) SecSpanish !insertmacro Language 'es' 'es' SectionEnd @@ -680,6 +700,10 @@ Section $(lng_fr) SecFrench !insertmacro Language 'fr' 'fr' SectionEnd +Section $(lng_fi) SecFinish + !insertmacro Language 'fi' 'fi' +SectionEnd + Section $(lng_ga) SecIrish !insertmacro Language ga ga SectionEnd @@ -689,6 +713,11 @@ Section $(lng_gl) SecGallegan SectionIn 1 2 3 SectionEnd +Section $(lng_hr) SecCroatian + !insertmacro Language hr hr + SectionIn 1 2 3 +SectionEnd + Section $(lng_hu) SecHungarian !insertmacro Language hu hu SectionIn 1 2 3 @@ -711,6 +740,10 @@ Section $(lng_lt) SecLithuanian !insertmacro Language 'lt' 'lt' SectionEnd +Section $(lng_mn) SecMongolian + !insertmacro Language mn mn +SectionEnd + Section $(lng_mk) SecMacedonian !insertmacro Language mk mk SectionEnd @@ -719,6 +752,10 @@ Section $(lng_nb) SecNorwegianBokmal !insertmacro Language nb nb SectionEnd +Section $(lng_ne) SecNepali + !insertmacro Language ne ne +SectionEnd + Section $(lng_nl) SecDutch !insertmacro Language nl nl SectionEnd @@ -747,6 +784,10 @@ Section $(lng_ru) SecRussian !insertmacro Language ru ru SectionEnd +Section $(lng_rw) SecKinyarwanda + !insertmacro Language rw rw +SectionEnd + Section $(lng_sk) SecSlovak !insertmacro Language sk sk SectionEnd @@ -755,6 +796,10 @@ Section $(lng_sl) SecSlovenian !insertmacro Language sl sl SectionEnd +Section $(lng_sq) SecAlbanian + !insertmacro Language sq sq +SectionEnd + Section $(lng_sr) SecSerbian !insertmacro Language sr sr SectionEnd @@ -815,9 +860,7 @@ Section -FinalizeInstallation ; start menu entries ClearErrors - CreateDirectory "$SMPROGRAMS\Inkscape" - CreateShortCut "$SMPROGRAMS\Inkscape\Inkscape.lnk" "$INSTDIR\inkscape.exe" - CreateShortCut "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk" "$INSTDIR\uninst.exe" + CreateShortCut "$SMPROGRAMS\Inkscape.lnk" "$INSTDIR\inkscape.exe" IfErrors 0 +2 DetailPrint "fatal: failed to write to start menu info" @@ -1153,6 +1196,8 @@ Section Uninstall DetailPrint "removing shortcuts" Delete "$DESKTOP\Inkscape.lnk" Delete "$QUICKLAUNCH\Inkscape.lnk" + Delete "$SMPROGRAMS\Inkscape.lnk" + ;just in case they are still there Delete "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk" Delete "$SMPROGRAMS\Inkscape\Inkscape.lnk" RMDir "$SMPROGRAMS\Inkscape" @@ -1165,6 +1210,8 @@ Section Uninstall DetailPrint "removing shortcuts" Delete "$DESKTOP\Inkscape.lnk" Delete "$QUICKLAUNCH\Inkscape.lnk" + Delete "$SMPROGRAMS\Inkscape.lnk" + ;just in case they are still there Delete "$SMPROGRAMS\Inkscape\Uninstall Inkscape.lnk" Delete "$SMPROGRAMS\Inkscape\Inkscape.lnk" RMDir "$SMPROGRAMS\Inkscape" -- 2.30.2