installer: - new Japanese translation

           - updates

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24060 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 23604545e74955d5ea933847f055f9dcb8c72aca..f9afc8a0ff65afb1a5df26e004d38938d398af19 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,7 +1,8 @@
 Version 4.02
-- LyX 1.6svn-rxxxxxx
+- LyX 1.6svn-r240xx
 
 - Japanese translation of the installer (thanks to Koji Yokata)
+- added a DLL that is needed on some Windows systems to be able to start LyX
 
 
 Version 4.01

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 2243c999f386f761b6f90802cd7ca908c8557f0d..a3582d7573ca49d3b21d058057c3a778efbfaf54 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -3,8 +3,8 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6svn-1"
-!define PRODUCT_VERSION_SHORT "16svn1"
+!define PRODUCT_VERSION "1.6svn-r240xx"
+!define PRODUCT_VERSION_SHORT "16svn2"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -19,13 +19,13 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v4.01 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.02 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-01-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-01-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-01-AltInstaller-${INSTALLER3_VERSION}.exe"
-!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-02-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-02-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-02-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert16svn.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
 !define PRODUCT_ROOT_KEY "SHCTX"
@@ -39,10 +39,10 @@ BrandingText "LyXWinInstaller v4.01 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX153"
- !define PRODUCT_VERSION_OLD "LyX 1.6svn-1"
- !define PRODUCT_VERSION_SHORT_OLD "16svn1"
+ !define PRODUCT_VERSION_OLD "LyX 1.6svn-r240xx"
+ !define PRODUCT_VERSION_SHORT_OLD "16svn2"
  !define JabRefVersion "2.3.1" # could be an older version
- !define ImageMagickVersion_Old "6.3.9" # could be an older version
+ !define ImageMagickVersion_Old "6.4.0" # could be an older version
  !define GhostscriptVersion_Old "8.61" # could be an older version
  !define MiKTeXDeliveredVersion "2.7" # could be an older version
 !endif
@@ -64,7 +64,7 @@ BrandingText "LyXWinInstaller v4.01 - ${INSTALLER_VERSION}"
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
-!define ImageMagickVersion "6.3.9"
+!define ImageMagickVersion "6.4.0"
 # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
 !define ImageMagickDir "$INSTDIR\etc\ImageMagick"
 !define GhostscriptDir "$INSTDIR\etc\Ghostscript"

diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt b/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt
index 9a49367f966f527ad9b9dbffc9eb0ece2340b445..2457b3f745cd2b69b475ab369ac97c60a3a9a633 100644 (file)
--- a/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt
+++ b/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt
@@ -2,5 +2,6 @@
 
 turkish.nsh : ISO-8859-9
 slovak.nsh, polish.nsh, romanian.nsh : Windows cp-1250
+japanese.nsh: Shift_JIS
 
 all other files are in Windows cp-1252
\ No newline at end of file

diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh
index 4ee9f8478de88f2a818f0e987695556555b0c682..63928ab6367d33c9e0a65c5369df1fab1770aa39 100644 (file)
--- a/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh
+++ b/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh
@@ -94,7 +94,7 @@ LangString AspellNone "${LYX_LANG}" '
                                     ${AspellLocation}$\r$\n\
                                     \82©\82ç\83_\83E\83\93\83\8d\81[\83h\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82·\81B$\r$\n\
                                     \8e«\8f\91\82ð\82¢\82Ü\83_\83E\83\93\83\8d\81[\83h\82µ\82Ü\82·\82©\81H'
-LangString AspellPartStart "${LYX_LANG}" "\83X\83y\83\8b\83`\83F\83b\83J\81["Aspell"\97p\82Ì""
+LangString AspellPartStart "${LYX_LANG}" '\83X\83y\83\8b\83`\83F\83b\83J\81["Aspell"\97p\82Ì"'
 LangString AspellPart1 "${LYX_LANG}" "\89p\8cê\8e«\8f\91"
 LangString AspellPart2 "${LYX_LANG}" "\8c¾\8cê\81u$LangName\81v\82Ì\8e«\8f\91"
 LangString AspellPart3 "${LYX_LANG}" "$\r$\n\
@@ -131,7 +131,7 @@ LangString UnNotInRegistryLabel "${LYX_LANG}" "
 LangString UnInstallRunning "${LYX_LANG}" "\82Ü\82¸LyX\82ð\95Â\82¶\82Ä\82­\82¾\82³\82¢\81I"
 LangString UnNotAdminLabel "${LYX_LANG}" "LyX\82ð\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82·\82é\82É\82Í\81A\8aÇ\97\9d\8eÒ\8c \8cÀ\82ð\8e\9d\82Á\82Ä\82¢\82È\82­\82Ä\82Í\82È\82è\82Ü\82¹\82ñ\81I"
 LangString UnReallyRemoveLabel "${LYX_LANG}" "\96{\93\96\82É\81ALyX\82Æ\82·\82×\82Ä\82Ì\95\8d\91®\83R\83\93\83|\81[\83l\83\93\83g\82ð\8dí\8f\9c\82µ\82Ä\82µ\82Ü\82¤\90Ï\82à\82è\82Å\82·\82©\81H"
-LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\\82Ì\83\86\81[\83U\81[\90Ý\92è'
+LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX\82Ì\83\86\81[\83U\81[\90Ý\92è'
 LangString UnGSview "${LYX_LANG}" 'Postscript\81EPDF\83r\83\85\81[\83A"GSview"\82ð\92E\91\95\82·\82é\82É\82Í\81A$\r$\n\
                                   \8e\9f\82Ì\83E\83B\83\93\83h\83E\82Å"Uninstall"\83{\83^\83\93\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢\81B'
 LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX\82Í\82¨\8eg\82¢\82Ì\83R\83\93\83s\83\85\81[\83^\81[\82©\82ç\8eæ\82è\8f\9c\82©\82ê\82Ü\82µ\82½\81B"

diff --git a/development/Win32/packaging/AltInstaller/specials/stdtoolbars.inc b/development/Win32/packaging/AltInstaller/specials/stdtoolbars.inc
index ef003cd28206636e05fb2014d5b819f8fd5e2a8d..c8c70a47d51aad8b03d5aca99fdf34b1910e91b4 100644 (file)
--- a/development/Win32/packaging/AltInstaller/specials/stdtoolbars.inc
+++ b/development/Win32/packaging/AltInstaller/specials/stdtoolbars.inc
@@ -122,6 +122,7 @@ ToolbarSet
                Item "Set bottom line" "tabular-feature toggle-line-bottom"
                Item "Set left line" "tabular-feature toggle-line-left"
                Item "Set right line" "tabular-feature toggle-line-right"
+               Item "Set border lines" "tabular-feature set-border-lines"
                Item "Set all lines" "tabular-feature set-all-lines"
                Item "Unset all lines" "tabular-feature unset-all-lines"
                Separator