From 3f7a62925749f8164a8525f5bc0a7558ca7ae569 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Thu, 16 Jun 2005 16:04:23 +0000
Subject: [PATCH] Fix my attempt to pretty print the list of paths; add missing
 language strings to the italian translation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10079 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../packaging/installer/lyx_installer.nsi     | 19 ++++++++++---------
 .../installer/lyx_languages/italian.nsh       |  4 ++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/development/Win32/packaging/installer/lyx_installer.nsi b/development/Win32/packaging/installer/lyx_installer.nsi
index 86094ba03f..7e641d6b5b 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...
@@ -627,25 +627,25 @@ Function SummariseDownloads
 
   StrCpy $PathPrefix ""
   ${if} $MinSYSPath != ""
-    StrCpy $PathPrefix "$\r$\n$MinSYSPath"
+    StrCpy $PathPrefix "$PathPrefix;$MinSYSPath"
   ${endif}
   ${if} $PythonPath != ""
-    StrCpy $PathPrefix "$PathPrefix$\r$\n$PythonPath"
+    StrCpy $PathPrefix "$PathPrefix;$PythonPath"
   ${endif}
   ${if} $MiKTeXPath != ""
-    StrCpy $PathPrefix "$PathPrefix$\r$\n$MiKTeXPath"
+    StrCpy $PathPrefix "$PathPrefix;$MiKTeXPath"
   ${endif}
   ${if} $PerlPath != ""
-    StrCpy $PathPrefix "$PathPrefix$\r$\n$PerlPath"
+    StrCpy $PathPrefix "$PathPrefix;$PerlPath"
   ${endif}
   ${if} $GhostscriptPath != ""
-    StrCpy $PathPrefix "$PathPrefix$\r$\n$GhostscriptPath"
+    StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath"
   ${endif}
   ${if} $ImageMagickPath != ""
-    StrCpy $PathPrefix "$PathPrefix$\r$\n$ImageMagickPath"
+    StrCpy $PathPrefix "$PathPrefix;$ImageMagickPath"
   ${endif}
-  ; Remove the leading '\r\n'
-  ${StrLTrim} $PathPrefix "$PathPrefix"
+  ; Remove the leading ';'
+  StrCpy $PathPrefix "$PathPrefix" "" 1
 
   IntOp $DoNotInstallLyX $DownloadMinSYS + $DownloadPython
   IntOp $DoNotInstallLyX $DoNotInstallLyX + $DownloadMiKTeX
@@ -657,6 +657,7 @@ Function SummariseDownloads
     !insertmacro MUI_INSTALLOPTIONS_WRITE "io_summary.ini" "Field 1" "Text" "$(SummaryPleaseInstall)"
   ${else}
     ${StrNSISToIO} $0 '$PathPrefix'
+    ${StrRep} $0 "$0" ";" "\r\n"
     StrCpy $0 "$(SummaryPathPrefix)\r\n\r\n$0"
     !insertmacro MUI_INSTALLOPTIONS_WRITE "io_summary.ini" "Field 1" "Text" "$0"
   ${endif}
diff --git a/development/Win32/packaging/installer/lyx_languages/italian.nsh b/development/Win32/packaging/installer/lyx_languages/italian.nsh
index 6c8a3e9a7f..0e2069ab78 100644
--- a/development/Win32/packaging/installer/lyx_languages/italian.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/italian.nsh
@@ -18,6 +18,7 @@ LangString SecFileAssocDescription "${LYX_LANG}" "Crea le associazioni tra il pr
 LangString SecDesktopDescription "${LYX_LANG}" "Icona ${PRODUCT_NAME} sul desktop."
 
 LangString ModifyingConfigureFailed "${LYX_LANG}" "Fallito tentativo di aggiornare 'path_prefix' nello script di configurazione"
+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."
@@ -71,6 +72,9 @@ LangString SummaryTitle "${LYX_LANG}" "Sommario del software"
 LangString SummaryPleaseInstall "${LYX_LANG}" "Siete pregati di installare i pacchetti scaricati e quindi lanciare nuovamente l'installazione di LyX."
 LangString SummaryPathPrefix "${LYX_LANG}" "Verrā aggiunta una stringa 'path_prefix' al file 'lyxrc.defaults' contenente:"
 
+LangString UILangageTitle "${LYX_LANG}" "The language of LyX's interface"
+LangString UILangageDescription "${LYX_LANG}" "As used for menus, messages, etc."
+
 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)."
 LangString UnReallyRemoveLabel "${LYX_LANG}" "Siete sicuri di voler rimuovere completamente $(^Name) e tutti i suoi componenti?"