diff --git a/development/Win32/packaging/installer/ioSummary.ini b/development/Win32/packaging/installer/ioSummary.ini index 9205c9ca20..0fb6a70f2e 100644 --- a/development/Win32/packaging/installer/ioSummary.ini +++ b/development/Win32/packaging/installer/ioSummary.ini @@ -1,16 +1,9 @@ [Settings] -NumFields=2 +NumFields=1 [Field 1] Type=Label Left=5 Right=-1 Top=0 -Bottom=20 - -[Field 2] -Type=Label -Left=5 -Right=-1 -Top=21 Bottom=60 diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi index 86e8258ed9..99a26136cc 100644 --- a/development/Win32/packaging/installer/lyx_installer.nsi +++ b/development/Win32/packaging/installer/lyx_installer.nsi @@ -58,6 +58,7 @@ InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" ; Declare used functions ${StrLoc} +${StrNSISToIO} ${StrRep} ${StrTrim} ${ReadDownloadValues} @@ -165,6 +166,7 @@ Page custom SummariseDownloads SummariseDownloads_LeaveFunction !insertmacro MUI_LANGUAGE "Spanish" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Swedish" !include "lyx_languages\english.nsh" !include "lyx_languages\danish.nsh" @@ -172,6 +174,7 @@ Page custom SummariseDownloads SummariseDownloads_LeaveFunction !include "lyx_languages\french.nsh" !include "lyx_languages\german.nsh" !include "lyx_languages\spanish.nsh" +!include "lyx_languages\swedish.nsh" LicenseData "$(LyXLicenseData)" @@ -536,13 +539,10 @@ Function SummariseDownloads ${if} "$DoNotInstallLyX" == 1 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 1" "Text" "$(SummaryPleaseInstall)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 2" "Text" "" ${else} - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 1" "Text" "$(SummaryPathPrefix)" - ; This shouldn't be needed (from my understanding of the NSIS docs) - ; but without it a path "C:\tbar" appears as "C:bar". - ${StrRep} $0 '$PathPrefix' '\' '\\' - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 2" "Text" "$0" + ${StrNSISToIO} $0 '$PathPrefix' + StrCpy $0 "$(SummaryPathPrefix)\r\n\r\n$0" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSummary.ini" "Field 1" "Text" "$0" ${endif} !insertmacro MUI_HEADER_TEXT "$(SummaryTitle)" "" diff --git a/development/Win32/packaging/installer/lyx_languages/german.nsh b/development/Win32/packaging/installer/lyx_languages/german.nsh index e0ea9b4c1b..246cf56e54 100644 --- a/development/Win32/packaging/installer/lyx_languages/german.nsh +++ b/development/Win32/packaging/installer/lyx_languages/german.nsh @@ -12,10 +12,10 @@ LangString SecAllUsersTitle "${LYX_LANG}" "F LangString SecFileAssocTitle "${LYX_LANG}" "Dateizuordnungen" LangString SecDesktopTitle "${LYX_LANG}" "Desktopsymbol" -LangString SecCoreDescription "${LYX_LANG}" "Die ${PRODUCT_NAME} Datei." +LangString SecCoreDescription "${LYX_LANG}" "Das Programm ${PRODUCT_NAME}." LangString SecAllUsersDescription "${LYX_LANG}" "Für alle Nutzer oder nur für den aktuellen Nutzer installieren. (Dazu werden Administratorrechte benötigt.)" LangString SecFileAssocDescription "${LYX_LANG}" "Vernüpfung zwischen ${PRODUCT_NAME} und der .lyx Dateiendung." -LangString SecDesktopDescription "${LYX_LANG}" "Ein ${PRODUCT_NAME} Symbol auf dem Desktop." +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 RunConfigureFailed "${LYX_LANG}" "Konnte das Konfigurationsskript nicht ausführen." @@ -33,7 +33,7 @@ LangString MinSYSDownloadLabel "${LYX_LANG}" "&MinSYS herunterladen" LangString MinSYSFolderLabel "${LYX_LANG}" "&Ordner der die Datei sh.exe enthält" LangString PythonHeader "${LYX_LANG}" "Python" -LangString PythonDescription "${LYX_LANG}" "Ein Interpreter der Skriptspreche Python (www.python.org) ist notwendig damit ${PRODUCT_NAME} Skripte ausführen kann." +LangString PythonDescription "${LYX_LANG}" "Ein Interpreter der Skriptsprache Python (www.python.org) ist notwendig damit ${PRODUCT_NAME} Skripte ausführen kann." LangString EnterPythonFolder "${LYX_LANG}" "Geben sie den Pfad zur Datei python.exe an." LangString InvalidPythonFolder "${LYX_LANG}" "Kann die Datei python.exe nicht finden." LangString PythonDownloadLabel "${LYX_LANG}" "&Python herunterladen" @@ -61,7 +61,7 @@ LangString ImageMagickDownloadLabel "${LYX_LANG}" "&ImageMagic herunterladen" LangString ImageMagickFolderLabel "${LYX_LANG}" "&Ordner der die Datei convert.exe enthält" LangString GhostscriptHeader "${LYX_LANG}" "Ghostscript" -LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) wird für PDF- und PostScript-Grafikendateien benötigt." +LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) wird für PDF- und PostScript-Grafikdateien benötigt." LangString EnterGhostscriptFolder "${LYX_LANG}" "Geben sie den Pfad zur Datei gswin32c.exe an." LangString InvalidGhostscriptFolder "${LYX_LANG}" "Kann die Datei gswin32c.exe nicht finden." LangString GhostscriptDownloadLabel "${LYX_LANG}" "&Ghostscript herunterladen" diff --git a/development/Win32/packaging/installer/lyx_languages/swedish.nsh b/development/Win32/packaging/installer/lyx_languages/swedish.nsh new file mode 100644 index 0000000000..32caeec375 --- /dev/null +++ b/development/Win32/packaging/installer/lyx_languages/swedish.nsh @@ -0,0 +1,91 @@ +!ifndef _LYX_LANGUAGES_SWEDISH_NSH_ +!define _LYX_LANGUAGES_SWEDISH_NSH_ + +!ifdef LYX_LANG + !undef LYX_LANG +!endif +!define LYX_LANG ${LANG_SWEDISH} + +!define SwedishInputFolderPath "Var god mata in sökvägen till katalogen som innehåller" +!define SwedishUnableToFind "Kan inte hitta" +!define SwedishDownload "&Ladda ner" +!define SwedishFolderContaining "&Katalog innehållande" + +LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" + +LangString SecAllUsersTitle "${LYX_LANG}" "Installera för alla användare?" +LangString SecFileAssocTitle "${LYX_LANG}" "Filassociationer" +LangString SecDesktopTitle "${LYX_LANG}" "Skrivbordsikon" + +LangString SecCoreDescription "${LYX_LANG}" "${PRODUCT_NAME}-filer." +LangString SecAllUsersDescription "${LYX_LANG}" "Installera för alla användare, eller enbart för den aktuella användare. (Kräver administratörsrättigheter.)" +LangString SecFileAssocDescription "${LYX_LANG}" "Skapa en association mellan programmet och filtilläget .lyx." +LangString SecDesktopDescription "${LYX_LANG}" "En ${PRODUCT_NAME}ikon på skrivbordet." + +LangString ModifyingConfigureFailed "${LYX_LANG}" "Misslyckades med att sätta 'path_prefix' i konfigurationsskriptet" +LangString RunConfigureFailed "${LYX_LANG}" "Misslyckades med att köra konfigurationsskriptet" + +LangString FinishPageMessage "${LYX_LANG}" "Gratulerar! LyX har installerats framgångsrikt." +LangString FinishPageRun "${LYX_LANG}" "Kör LyX" + +LangString DownloadPageField2 "${LYX_LANG}" "Installera &ej" + +LangString MinSYSHeader "${LYX_LANG}" "MinSYS" +LangString MinSYSDescription "${LYX_LANG}" "MinSYS är en minimal UNIX-liknande skriptmiljö (www.mingw.org/msys.shtml) som ${PRODUCT_NAME} behöver för att använda ett flertal skript." +LangString EnterMinSYSFolder "${LYX_LANG}" "${SwedishInputFolderPath} sh.exe" +LangString InvalidMinSYSFolder "${LYX_LANG}" "${SwedishUnableToFind} sh.exe" +LangString MinSYSDownloadLabel "${LYX_LANG}" "${SwedishDownload} MinSYS" +LangString MinSYSFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} sh.exe" + +LangString PythonHeader "${LYX_LANG}" "Python" +LangString PythonDescription "${LYX_LANG}" "Skriptspråket Python (www.python.org) bör installeras, annars kan inte ${PRODUCT_NAME} använda ett flertal skript." +LangString EnterPythonFolder "${LYX_LANG}" "${SwedishInputFolderPath} Python.exe" +LangString InvalidPythonFolder "${LYX_LANG}" "${SwedishUnableToFind} Python.exe" +LangString PythonDownloadLabel "${LYX_LANG}" "${SwedishDownload} Python" +LangString PythonFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} Python.exe" + +LangString MiKTeXHeader "${LYX_LANG}" "MiKTeX" +LangString MiKTeXDescription "${LYX_LANG}" "MiKTeX (www.miktex.org) aktuell (nyligen uppdaterad) implementation av TeX för Windows." +LangString EnterMiKTeXFolder "${LYX_LANG}" "${SwedishInputFolderPath} latex.exe" +LangString InvalidMiKTeXFolder "${LYX_LANG}" "${SwedishUnableToFind} latex.exe" +LangString MiKTeXDownloadLabel "${LYX_LANG}" "${SwedishDownload} MiKTeX" +LangString MiKTeXFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} latex.exe" + +LangString PerlHeader "${LYX_LANG}" "Perl" +LangString PerlDescription "${LYX_LANG}" "Om du räknar med att använda reLyX för att konvertera LaTeX-dokument till LyX-dokument, måste du installera Perl (www.perl.com)." +LangString EnterPerlFolder "${LYX_LANG}" "${SwedishInputFolderPath} Perl.exe" +LangString InvalidPerlFolder "${LYX_LANG}" "${SwedishUnableToFind} Perl.exe" +LangString PerlDownloadLabel "${LYX_LANG}" "${SwedishDownload} Perl" +LangString PerlFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} perl.exe" + +LangString ImageMagickHeader "${LYX_LANG}" "ImageMagick" +LangString ImageMagickDescription "${LYX_LANG}" "Verktygen i paketet ImageMagick (www.imagemagick.org/script/index.php) kan användas av LyX för att konvertera mellan de flesta grafikformat." +LangString EnterImageMagickFolder "${LYX_LANG}" "${SwedishInputFolderPath} convert.exe" +LangString InvalidImageMagickFolder "${LYX_LANG}" "${SwedishUnableToFind} convert.exe" +LangString ImageMagickDownloadLabel "${LYX_LANG}" "${SwedishDownload} ImageMagick" +LangString ImageMagickFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} convert.exe" + +LangString GhostscriptHeader "${LYX_LANG}" "Ghostscript" +LangString GhostscriptDescription "${LYX_LANG}" "Ghostscript (http://www.cs.wisc.edu/~ghost/) används till att konvertera bilder till/från PostScript." +LangString EnterGhostscriptFolder "${LYX_LANG}" "${SwedishInputFolderPath} gswin32c.exe" +LangString InvalidGhostscriptFolder "${LYX_LANG}" "${SwedishUnableToFind} gswin32c.exe" +LangString GhostscriptDownloadLabel "${LYX_LANG}" "${SwedishDownload} Ghostscript" +LangString GhostscriptFolderLabel "${LYX_LANG}" "${SwedishFolderContaining} gswin32c.exe" + +LangString SummaryTitle "${LYX_LANG}" "Mjukvarusammanfattning" +LangString SummaryPleaseInstall "${LYX_LANG}" "Var god installera först dina nedladdade filer och kör sedan LyXs installationsprogram igen." +LangString SummaryPathPrefix "${LYX_LANG}" "En 'path_prefix'-sträng kommer att läggas till i filen 'lyxrc.defaults' innehållande följande:" + +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)." +LangString UnReallyRemoveLabel "${LYX_LANG}" "Är du säker på att du verkligen vill fullständigt avinstallera $(^Name) och alla dess komponenter?" +LangString UnRemoveSuccessLabel "${LYX_LANG}" "$(^Name) har framgångsrikt avinstallerats från din dator." + +!undef SwedishInputFolderPath +!undef SwedishUnableToFind +!undef SwedishDownload +!undef SwedishFolderContaining + +!undef LYX_LANG + +!endif ; _LYX_LANGUAGES_SWEDISH_NSH_