README.localization, INSTALL.Win32: update description

- kbabel was replaced by Lokalize
- Poedit must not break lines
- we need a recent gettext in the dependencies -> use the dependencies package that is up to date (also updated for Imagemagick, Python etc.)
- update description how to build a Win installer
- update description how to update .po files.

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 1bf76097802de2d30be448a17679d77140a3d3e1..f26925f4f61c9debaddc975898a3481b45e6bf63 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -52,7 +52,12 @@ Compiling with Microsoft Visual C++ (MSVC)
 
        Install the latest CMake from http://www.cmake.org
 
-5      Configure
+5      Download dependencies
+
+       Download the LyX for Windows build dependencies from
+       ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2015.zip
+
+6      Configure
 
        - Open the "Developer Command Prompt for VS2015" from the
          "Visual Studio 2015\Visual Studio Tools" subfolder of the start menu.
@@ -72,23 +77,23 @@ Compiling with Microsoft Visual C++ (MSVC)
 
        - Set LYX_USE_QT to QT5 and click Configure.
 
-       - Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
-         Pre-compiled dependencies will automatically be downloaded.
-         If you installed the dependencies manually, set GNUWIN32_DIR instead
-         to the folder that contains the dependencies and click Configure.
+       - Set GNUWIN32_DIR to the folder that contains the dependencies.
+         (This alternative does currently not work:
+          Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
+          Pre-compiled dependencies will automatically be downloaded.)
 
        - Enable the LYX_INSTALL option and click Configure.
 
        - Click Generate.
 
-6      Compile
+7      Compile
 
        A Microsoft Visual C++ solution should have been generated at
        C:\LyX\lyx-23-build\lyx.sln
        Compile the INSTALL project to get a LyX installation in
        C:\LyX\lyx-23-build\LYX_INSTALLED.
 
-7      Copy dependencies
+8      Copy dependencies
 
        Copy
        - C:\LyX\lyx-23-build\msvc2015-deps\lyx-windows-deps-msvc2015\bin
@@ -111,7 +116,7 @@ Compiling with Microsoft Visual C++ (MSVC)
        Qt5WinExtrasd.dll (if compiling Debug version)
        to C:\LyX\lyx-23-build\LYX_INSTALLED\bin
 
-8      Define path prefix
+9      Define path prefix
 
        Add the following line to C:\LyX\lyx-23-build\LYX_INSTALLED\Resources\lyxrc.dist,
        so LyX will find the bundled tools such as Python, ImageMagick
@@ -122,7 +127,7 @@ Compiling with Microsoft Visual C++ (MSVC)
        You may also add the location of your LaTeX installation if it's not on the
        system PATH, and the location of JabRef.
 
-9      Start LyX
+10     Start LyX
 
        C:\LyX\lyx-23-build\LYX_INSTALLED\bin\lyx.exe
 
@@ -132,9 +137,7 @@ Creating the Installer
 
        - Get NSIS from http://nsis.sourceforge.net
        - In the LyX source directory, go to development\Win32\packaging\installer
-       - Copy the 3 dll-files from there to the DLL folder of the NSIS installation
-       - Check whether the file locations/paths in settings.nsh match your setup.
-       - Right-click on lyx.nsi and click "Compile NSIS Script".
+       - Follow the steps in the file Readme.txt
 
 
 Compiling with GCC with MinGW64 + MSYS2 Environment using autotools

diff --git a/README.localization b/README.localization
index da34ab8c95357a323fea595c0335738a9200ee1d..6b0b540b5eb0ebc309dc9d7ee51b75da3c9f96f9 100644 (file)
--- a/README.localization
+++ b/README.localization
@@ -35,10 +35,12 @@ can follow http://www.lyx.org/HowToUseGIT page.
 2) HOW DO I EDIT PO FILES?
 
 PO files can be edited with any text editor available for your system (e.g.
-Vim, NotePad etc.). Yet another option is to use a specialized editor for .po
-files. You can e.g. use the editors "poEdit" or "jEdit", Linux users can
-additionally use e.g. "kbabel". Using these editors usually makes things easier
+Vim, jEdit etc.). Yet another option is to use a specialized editor for .po
+files. You can e.g. use the editor "Poedit", Linux users can
+additionally use e.g. "Lokalize". Using these editors usually makes things easier
 as they have many tools to assist the translator.
+If you use Poedit, please uncheck in its settings the option to break lines after
+80 characters.
 
 
 3) WHAT DO I NEED TO TRANSLATE?
@@ -118,9 +120,9 @@ compile updated xx.po translation and then run LyX.
 For advanced users - if you want to remerge your files against current source:
 
 - on Linux: execute the command: make update-po
-- on Windows: either build the update-po target in MSVC
-              or run the command: msbuild po\update-po.vcxproj
-              (depending on the directory you are in)
+- on Windows: if you compile LyX in install mode, the po files are automatically
+       updated and output to the folder <compilation output folder>\po
+       Another option is to build the target "update-po" in MSVC.
 
 
 7) HOW TO CONTRIBUTE MY WORK?