From a0e732d64b668a571db9647554888675cac349dd Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 13 Jan 2006 13:59:17 +0000 Subject: [PATCH] Installer tweaks. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10734 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/Win32/packaging/installer/lyx_installer.nsi | 4 +++- .../Win32/packaging/installer/lyx_languages/danish.nsh | 1 + .../Win32/packaging/installer/lyx_languages/dutch.nsh | 1 + .../Win32/packaging/installer/lyx_languages/english.nsh | 3 ++- .../Win32/packaging/installer/lyx_languages/french.nsh | 1 + .../Win32/packaging/installer/lyx_languages/german.nsh | 9 +++++---- .../Win32/packaging/installer/lyx_languages/italian.nsh | 4 +++- .../Win32/packaging/installer/lyx_languages/polish.nsh | 3 ++- .../Win32/packaging/installer/lyx_languages/spanish.nsh | 1 + .../Win32/packaging/installer/lyx_languages/swedish.nsh | 1 + development/Win32/packaging/installer/lyx_utils.nsh | 4 ++++ 11 files changed, 24 insertions(+), 8 deletions(-) diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi index 695b2951c8..4113d2442a 100644 --- a/development/Win32/packaging/installer/lyx_installer.nsi +++ b/development/Win32/packaging/installer/lyx_installer.nsi @@ -20,7 +20,7 @@ CRCCheck force ; Make the installer as small as possible. -SetCompressor lzma +;SetCompressor lzma ;-------------------------------- ; You should need to change only these macros... @@ -172,6 +172,7 @@ Page custom SelectMenuLanguage SelectMenuLanguage_LeaveFunction !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_RUN +!define MUI_FINISHPAGE_TEXT_LARGE !define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)" !define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)" !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct" @@ -771,6 +772,7 @@ Function SelectMenuLanguage ;tranlate NSIS's language code to the language name; macro from lyx_utils.nsh !insertmacro TranslateLangCode $LangName $Language + !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 1" "State" "$(UILanguageAvailableLanguages)" !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 2" "State" "$LangName" !insertmacro MUI_HEADER_TEXT "$(UILangageTitle)" "$(UILangageDescription)" diff --git a/development/Win32/packaging/installer/lyx_languages/danish.nsh b/development/Win32/packaging/installer/lyx_languages/danish.nsh index f68a31fcf4..c07ada9821 100644 --- a/development/Win32/packaging/installer/lyx_languages/danish.nsh +++ b/development/Win32/packaging/installer/lyx_languages/danish.nsh @@ -74,6 +74,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Jeg tilf LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Kunne ikke finde $(^Name) i registreringsdatabsen$\r$\nGenvejene på skrivebordet og i Start-menuen bliver ikke fjernet" LangString UnNotAdminLabel "${LYX_LANG}" "Beklager! Du skal have administrator-rettigheder$\r$\nfor at afinstallere$(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/dutch.nsh b/development/Win32/packaging/installer/lyx_languages/dutch.nsh index daa8c151c5..40f1e97187 100644 --- a/development/Win32/packaging/installer/lyx_languages/dutch.nsh +++ b/development/Win32/packaging/installer/lyx_languages/dutch.nsh @@ -74,6 +74,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Ik voeg een 'path_prefix' tekst aan LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "$(^Name) is niet gevonden in het Windows register$\r$\nSnelkoppelingen op het Bureaublad en in het Start Menu worden niet verwijderd." LangString UnNotAdminLabel "${LYX_LANG}" "Sorry! U heeft systeembeheer rechten nodig$\r$\nom $(^Name) te verwijderen." diff --git a/development/Win32/packaging/installer/lyx_languages/english.nsh b/development/Win32/packaging/installer/lyx_languages/english.nsh index 03cba8bd7e..b8de536858 100644 --- a/development/Win32/packaging/installer/lyx_languages/english.nsh +++ b/development/Win32/packaging/installer/lyx_languages/english.nsh @@ -18,7 +18,7 @@ LangString SecFileAssocDescription "${LYX_LANG}" "Create associations between th LangString SecDesktopDescription "${LYX_LANG}" "A ${PRODUCT_NAME} icon on the desktop." LangString ModifyingConfigureFailed "${LYX_LANG}" "Failed attempting to set 'path_prefix' in the configure script" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Failed atempting to create lyx.cmd and reLyX.cmd" +LangString CreateCmdFilesFailed "${LYX_LANG}" "Failed attempting to create lyx.cmd and reLyX.cmd" LangString RunConfigureFailed "${LYX_LANG}" "Failed attempting to execute the configure script" LangString FinishPageMessage "${LYX_LANG}" "LyX should now be installed. However, some of our users report that the configure script fails to run and, as a result, LyX fails to start, reporting a missing textclass.lst file. To fix, run the command: 'sh configure' from the LyX/Resources/lyx directory." @@ -74,6 +74,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "I shall add a 'path_prefix' string t LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Unable to find $(^Name) in the registry$\r$\nShortcuts on the desktop and in the Start Menu will not be removed." LangString UnNotAdminLabel "${LYX_LANG}" "Sorry! You must have administrator privileges$\r$\nto uninstall $(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/french.nsh b/development/Win32/packaging/installer/lyx_languages/french.nsh index 9871e79969..46987030f9 100644 --- a/development/Win32/packaging/installer/lyx_languages/french.nsh +++ b/development/Win32/packaging/installer/lyx_languages/french.nsh @@ -75,6 +75,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Durant l'installation, une cha LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "$(^Name) introuvable dans le base des registres. $\r$\nLes raccourcis sur le bureau et dans le menu de démarrage ne seront pas supprimés." LangString UnNotAdminLabel "${LYX_LANG}" "Désolé ! Vous devez avoir les droits d'administration$\r$\npour installer$(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/german.nsh b/development/Win32/packaging/installer/lyx_languages/german.nsh index 38c4a90d5c..97e0eef51f 100644 --- a/development/Win32/packaging/installer/lyx_languages/german.nsh +++ b/development/Win32/packaging/installer/lyx_languages/german.nsh @@ -18,10 +18,10 @@ LangString SecFileAssocDescription "${LYX_LANG}" "Vern LangString SecDesktopDescription "${LYX_LANG}" "Verknüpfung zu ${PRODUCT_NAME} auf dem Desktop." LangString ModifyingConfigureFailed "${LYX_LANG}" "Der 'path_prefix' (Liste mit Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden." -LangString CreateCmdFilesFailed "${LYX_LANG}" "Failed atempting to create lyx.cmd and reLyX.cmd" +LangString CreateCmdFilesFailed "${LYX_LANG}" "Konnte die Dateien lyx.cmd und reLyX.cmd nicht erstellen." LangString RunConfigureFailed "${LYX_LANG}" "Konnte das Konfigurationsskript nicht ausführen." -LangString FinishPageMessage "${LYX_LANG}" "Glückwunsch! LyX wurde erfolgreich installiert." +LangString FinishPageMessage "${LYX_LANG}" "LyX sollte nun installiert sein. Jedoch haben einige Nutzer berichtet, dass das Konfigurationsskript nicht ausgeführt werden konnte und LyX daher nicht startet. Die Fehlermeldung lautet in diesem Fall $\'reporting a missing textclass.lst file$\'. Um den Fehler zu beheben, führen Sie bitte den Befehl $\'sh configure$\' aus Windows Kommandozeile aus, wenn Sie sich im Verzeichnis $\'\Resources\lyx$\' befinden." LangString FinishPageRun "${LYX_LANG}" "LyX starten" LangString DownloadPageField2 "${LYX_LANG}" "&Nicht installieren" @@ -72,8 +72,9 @@ LangString SummaryTitle "${LYX_LANG}" "Software Zusammenfassung" LangString SummaryPleaseInstall "${LYX_LANG}" "Bitte installieren sie die heruntergeladenen Programme und starten dann ${PRODUCT_NAME}'s Installer nochmal." LangString SummaryPathPrefix "${LYX_LANG}" "Die Liste mit den Programmpfaden, der so genannte 'path_prefix' wird zur Datei 'lyxrc.defaults' hinzugefügt:" -LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" -LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILangageTitle "${LYX_LANG}" "Die Sprache von LyXs Benutzeroberfläche" +LangString UILangageDescription "${LYX_LANG}" "Wird für die Menüs, Mitteilungen, usw. verwendet" +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Kann $(^Name) nicht in der Registry finden. $\r$\n Desktopsymbole und Einträge im Startmenü können nicht entfernt werden." LangString UnNotAdminLabel "${LYX_LANG}" "Sie benötigen Administratorrechte $\r$\n um $(^Name) zu deinstallieren." diff --git a/development/Win32/packaging/installer/lyx_languages/italian.nsh b/development/Win32/packaging/installer/lyx_languages/italian.nsh index 0e2069ab78..d4f4f8258c 100644 --- a/development/Win32/packaging/installer/lyx_languages/italian.nsh +++ b/development/Win32/packaging/installer/lyx_languages/italian.nsh @@ -21,7 +21,8 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Fallito tentativo di aggiorna LangString CreateCmdFilesFailed "${LYX_LANG}" "Failed atempting to create lyx.cmd and reLyX.cmd" LangString RunConfigureFailed "${LYX_LANG}" "Fallito tentativo di eseguire lo script di configurazione" -LangString FinishPageMessage "${LYX_LANG}" "Congratulazioni! LyX è stato installato con successo." +LangString FinishPageMessage "${LYX_LANG}" "LyX è stato installato. Però, se l$\'installer non è riuscito a lanciare lo script di configurazione, non sarete in grado di usare LyX a causa della mancata generazione del file textclass.lst. In tal caso, il rimedio consiste nell'eseguire il comando 'sh configure' nella directory $\'/Resources/lyx$\'." + LangString FinishPageRun "${LYX_LANG}" "Lancia LyX" LangString DownloadPageField2 "${LYX_LANG}" "&Non installare" @@ -74,6 +75,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Verr LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Non riesco a trovare $(^Name) nel registro$\r$\nI collegamenti sul desktop e nel menu Start non saranno rimossi." LangString UnNotAdminLabel "${LYX_LANG}" "Spiacente! Occorrono privilegi da amministratore$\r$\nper disinstallare $(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/polish.nsh b/development/Win32/packaging/installer/lyx_languages/polish.nsh index 513c047976..a32983ed0e 100644 --- a/development/Win32/packaging/installer/lyx_languages/polish.nsh +++ b/development/Win32/packaging/installer/lyx_languages/polish.nsh @@ -21,7 +21,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Nieudana pr LangString CreateCmdFilesFailed "${LYX_LANG}" "Niedana próba utworzenia plików lyx.cmd i reLyX.cmd" LangString RunConfigureFailed "${LYX_LANG}" "Niedana próba wykonania skryptu konfiguracyjnego" -LangString FinishPageMessage "${LYX_LANG}" "Gratulacje! LyX zosta³ pomyœlnie zainstalowany." +LangString FinishPageMessage "${LYX_LANG}" "LyX powinien byæ ju¿ teraz zainstalowany. Jednak niektórzy u¿ytkownicy raportuj¹, ¿e skrypt konfiguracyjny nie wykonuje siê. W efekcie LyX nie uruchamia siê zg³aszaj¹c brak pliku textclass.lst. Dla naprawy instalacji LyX-a uruchom polecenie 'sh configure' w katalogu $\'/Resources/lyx$\'." LangString FinishPageRun "${LYX_LANG}" "Uruchom LyX" LangString DownloadPageField2 "${LYX_LANG}" "&Nie instaluj" @@ -74,6 +74,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Do zmiennej 'path_prefix' w pliku 'l LangString UILangageTitle "${LYX_LANG}" "Jêzyk interfejsu LyX-a" LangString UILangageDescription "${LYX_LANG}" "Który bêdzie u¿yty w menu, komunikatach itp." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Nie mo¿na znaleŸæ $(^Name) w rejestrze$\r$\nSkróty na pulpicie i w menu Start nie zostan¹ usuniête." LangString UnNotAdminLabel "${LYX_LANG}" "Musisz posiadaæ prawa administratora$\r$\ndo deinstalacji programu $(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/spanish.nsh b/development/Win32/packaging/installer/lyx_languages/spanish.nsh index bac01e1561..a7e27ab4fb 100644 --- a/development/Win32/packaging/installer/lyx_languages/spanish.nsh +++ b/development/Win32/packaging/installer/lyx_languages/spanish.nsh @@ -74,6 +74,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "Durante la instalaci LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "Imposible encontrar $(^Name) en el registro$\r$\nLos accesos rápidos del escritorio y del Menú de Inicio no serán eliminados." LangString UnNotAdminLabel "${LYX_LANG}" "Lo siento! Necesita privilegios de administrador$\r$\npara desinstalar $(^Name)." diff --git a/development/Win32/packaging/installer/lyx_languages/swedish.nsh b/development/Win32/packaging/installer/lyx_languages/swedish.nsh index 00ad3ccae7..b8dafa1808 100644 --- a/development/Win32/packaging/installer/lyx_languages/swedish.nsh +++ b/development/Win32/packaging/installer/lyx_languages/swedish.nsh @@ -79,6 +79,7 @@ LangString SummaryPathPrefix "${LYX_LANG}" "En 'path_prefix'-str LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface" LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc." +LangString UILanguageAvailableLanguages "${LYX_LANG}" " Available Languages " LangString UnNotInRegistryLabel "${LYX_LANG}" "${SwedishUnableToFind} $(^Name) i registret\r$\nGenvägar på skrivbordet och i startmeny kommer inte att tas bort." LangString UnNotAdminLabel "${LYX_LANG}" "Tyvärr! Du måste ha administratörsrättigheter för\r$\natt avinstallera $(^Name)." diff --git a/development/Win32/packaging/installer/lyx_utils.nsh b/development/Win32/packaging/installer/lyx_utils.nsh index ed1fd6e506..a983fffd16 100644 --- a/development/Win32/packaging/installer/lyx_utils.nsh +++ b/development/Win32/packaging/installer/lyx_utils.nsh @@ -72,6 +72,10 @@ StrCpy ${LangNme} "Nederlands" ${endif} + ${if} ${LangISOCode} = 1045 + StrCpy ${LangNme} "Polski" + ${endif} + ${if} ${LangISOCode} = 1053 StrCpy ${LangNme} "Svenska" ${endif}