[LyX features/2.3.3] 2.3.3
The annotated tag, 2.3.3, has been created. at 2273343b4c83d96ac20094edb6343f9dd3999355 (tag) tagging a96bf1ae89d622d6991b7a2ae0e6645d71df2e56 (commit) replaces 2.3.1 tagged by Richard Kimberly Heck on Tue Jun 18 17:53:33 2019 -0400 - Log - This is LyX 2.3.3. -BEGIN PGP SIGNATURE- iQEcBAABAgAGBQJdCV1lAAoJEN56RPrH+zgtbsEH/3wZCVkm/HvsfTb1qVHyjXyJ LDZ3xUCGv5y+gyqPOJcZZvxLM5GUqTjeA+8JTdIsKE4P9taVhn19ktG3wg+wvw+N czdC5CQde/xzjlBFgYcUYDnBzZ2P1bkrYI9Q64ADD/LRJbDNuri+kVdfHtIY0xT6 W66LfIM+KIE2cYbxROiHeGDXjSYiRdWg1umUVEMR3xw1OpDyZ86zKqlXVBXo7Ueg egrXAIZqAAu+Q+uTCSEXERGMfPVM/NEkEBfQJTHIRGdgXNkVVAWQDOD1nf25IFsk rNT1Pa5yePMZJ0kms0HVaZjPDJZge03AAaceB7/kyOJTooE6fqHlm5VD/xuMP/0= =gmip -END PGP SIGNATURE- Daniel Ramoeller (1): Fix for #11294: Wrong description for Change bars module Enrico Forestieri (25): Fix bug #11203 Update it.po Fix bug #11210 Update it.po Fix bug #11180 Fix bug #9348 Fix bug #11332 Update it.po Fix bug #11367 Fix bug #11398 Amend bd21aa9 Fix reloading of local layout file (bug #11120) Fix display of single-char macro names Fix bug #9622 Fix bug 11346 Update it.po Amend [324b8287/lyxgit] Update it.po Replace environment variables in PATH prefix Remove PYTHONPATH from the environment on Windows Update it.po Fix bug #11484 Fix bug #4269 Fix bug #4269 and avoid crash with gzipped file Fix bug #11490 Guillaume MM (1): Fix segfault after deleting monitor Guillaume Munch (1): Make tab movement visible (#10733) Jean-Marc Lasgouttes (42): Fixes to input method handling Draw top/bottom rules heavier for booktab Fix disappearing blue language underline. Use a unicode character for menu separator on screen needauth is not needed for Sweave>LyX Do not remove character at start of paragraph when cutting Improve DEPM Forgot this Handle branches with space in their name Paint underline for insets too. Avoid space before completion in mathed Ignore horizontal wheel scrolling in workarea Avoid crash with cursor down in math When ignoring an update, request one for later Amend 4ecbff00: it is too early for skipping the updateMacros call Avoid extra space in tooltips Show cursor correctly when loading file Remove old workaround that is not needed anymore Fix selection of unmarked RtL text Set buffer correctly when changing math space type. Make sure inset buffer is correctly set in math grid Update boost to 1.68. Fix undo after breaking a nested paragraph Fix embarrassing typo Make DEPM respect current cursor position. Add override statements to please clang Remove premature (and bad) optimization Fix vertical offset of fonts like MinionPro Avoid crash when using inset-select-all in tabular Fix drawing of labels in insets forgot this Allow toggling (no)limits only after mathop symbol Fix display of gather in lefteqn mode Allow to type a space in front of another one Fix algorithm for finding localized files Fix Visual C++ warning Fix DEPM at end of paragraph Fix position of cursor when DEPM is used in change tracking mode Improve DEPM when change tracking is on Update screen as needed when preferences are changed Place the depth bar correctly in full screen mode Cache the value of GuiFontMetrics::lbearing(). Juergen Spitzmueller (112): Redesign character dialog Improve Springer layout descriptions Do not start from a non-relevant parent in Buffer cloning. Disambiguate dialog buttons Capitalization fixes Use footnotehyper rather than footnote if hyperref is used Support input of non-ASCII characters in hyperlinks Consider EuropeanNumberTerminator property when determining text direction tex2lyx: extend titling support Wrap rotated cells with linebreaks in varwidth Disallow paragraph customization in some single-par charstyle insets Implement tri-state in GuiSetBorder Proper logos with RTL Par alignment in floats must be swapped for all RTL langs, not only Hebrew Consider required modules when checking for layout definitions in modules We do not natively support multirow yet tex2lyx: Add support for multirow de.po tex2lyx: Fix import of Arabic polyglossia environment tex2lyx: fix import of unknown commands'/environments' options Allow to change multiple columns' width at once Covington now provides subexamples itself Fix text direction issue for InsetInfo in RTL context Amend 79cf3f5ec10 Support key symbols via menukeys package Fix shortcuts
[LyX/master] Win installer: fix registry issue
commit 273d257f2a07dc1ef7942889649f47a97373f2a1
Author: Uwe Stöhr
Date: Sun Oct 20 23:26:08 2019 +0200
Win installer: fix registry issue
- when installing LyX 2.x.z over a previous 2.x.y installation a registry
key was not deleted
- also fix some hardcoded occurrences of "lyx"
---
.../packaging/installer/include/declarations.nsh |9 +
.../Win32/packaging/installer/setup/configure.nsh |4 +++-
.../Win32/packaging/installer/setup/install.nsh|2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index 2e96869..84ebabd 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -37,6 +37,7 @@ Configuration of LyX installer
# Names and version
!define APP_NAME "LyX"
+!define APP_NAME_SMALL "lyx"
!define APP_VERSION_NUMBER
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
# for the proposed install folder we use the scheme "LyX 2.2" while we need
for the registry the scheme "LyX 2.1.4"
# to check if it is exactly this version (to support side by side
installations)
@@ -57,7 +58,7 @@ Configuration of LyX installer
!define APP_SETUPTYPE "Standard"
!endif
-!define BIN_LYX "LyX.exe"
+!define BIN_LYX "${APP_NAME}.exe"
!define APP_RUN "bin\${BIN_LYX}"
!define APP_REGKEY "Software\${APP_NAME}${APP_SERIES_KEY}" # like "LyX220"
@@ -66,8 +67,8 @@ Configuration of LyX installer
!define APP_REGNAME_DOC "${APP_NAME}.Document"
-!define APP_EXT ".lyx"
-!define APP_MIME_TYPE "application/lyx"
+!define APP_EXT ".${APP_NAME_SMALL}"
+!define APP_MIME_TYPE "application/${APP_NAME_SMALL}"
!define APP_UNINST_KEY
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
@@ -81,7 +82,7 @@ Configuration of LyX installer
!define SETUP_EXE ${ExeFile}
!endif
-!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
+!define SETUP_ICON "${FILES_ICONS}\${APP_NAME_SMALL}.ico"
!define SETUP_HEADERIMAGE "graphics\header.bmp"
!define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 97bc945..5daf6d6 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -46,7 +46,7 @@ Section -InstallData
WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString"
'"$INSTDIR\${SETUP_UNINSTALLER}"'
WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
- WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.exe"
+ WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon"
"$INSTDIR\bin\${APP_NAME_SMALL}.exe"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout"
"https://www.lyx.org/AboutLyX;
WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
@@ -58,8 +58,10 @@ Section -InstallData
# if we install over an older existing version, remove the old uninstaller
information
${if} $OldVersionNumber < ${APP_SERIES_KEY}
DeleteRegKey SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber"
+ DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber"
# also delete in the case of an emergency release
DeleteRegKey SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber1"
+ DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber1"
${endif}
SectionEnd
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index 53196e3..8aeef94 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -18,7 +18,7 @@ Section -ProgramFiles SecProgramFiles
# be installed directly to C:\programs - the uninstaller will then delete
the whole
# C:\programs directory
StrCpy $String $INSTDIR
- StrCpy $Search "LyX"
+ StrCpy $Search "${APP_NAME}"
Call StrPoint # function from LyXUtils.nsh
${if} $Pointer == "-1"
StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] INSTALL.Win32: complete overhaul
commit a4dde678eb1dca7bc5f2f2bebe477a24567713fd Author: Uwe Stöhr Date: Sun Oct 20 23:08:07 2019 +0200 INSTALL.Win32: complete overhaul - based on MSVC 2017 --- INSTALL.Win32 | 112 +++- 1 files changed, 54 insertions(+), 58 deletions(-) diff --git a/INSTALL.Win32 b/INSTALL.Win32 index f26925f..893470d 100644 --- a/INSTALL.Win32 +++ b/INSTALL.Win32 @@ -1,7 +1,7 @@ -Compiling LyX 2.3 for Win32 and creating Windows installer +Compiling LyX 2.4 for Win32 and creating Windows installer == -It's recommended to compile LyX using Microsoft Visual C++ 2015 and CMake. +It's recommended to compile LyX using Microsoft Visual C++ 2017 and CMake. Compiling with Microsoft Visual C++ (MSVC) @@ -15,38 +15,28 @@ Compiling with Microsoft Visual C++ (MSVC) - The following instructions assume the LyX source code is in C:\LyX\lyx-23 + The following instructions assume the LyX source code is in C:\LyX\lyx-24 You can also use another directory if you prefer. -1 Install MSVC 2015 - - If you don't have Visual C++ 2015 installed, get the free Community edition - from https://www.visualstudio.com/. Make sure that the following two - features are selected for installation: - - "Visual C++" from "Programming languages" (only the first option - "Common Tools for Visual C++ 2015" is needed) - - "Tools and Windows SDKs" from "Windows 8.1 and Windows Phone 8.0/8.1 Tools" - The latter one requires Windows 8.1. If you use an older windows version - please install the "Windows Software Development Kit (SDK) für Windows 8.1" - from https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk. - This version requires at least Windows 7. - If the build complains later that it cannot find the file - C:\Microsoft.Cpp.Default.props then the SDK is not installed properly. +1 Install MSVC 2017 + + If you don't have Visual C++ 2017 installed, get the free Community edition + from https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community=15 2 Install Qt - Download the latest Qt for Open Source C++ development on Windows (VS2015) + Download the latest Qt for Open Source C++ development on Windows (VS2017) from https://qt.io/download-open-source/ - Qt 5.6.x is recommended, but 5.7.x or later versions should work as well. + Qt 5.12.x is recommended, but 5.9.x or later versions should work as well. If you want to build LyX as 32bit application, you need Qt x86. If you want to build LyX as 64bit application, you need Qt x64. Make sure that the bin subfolder of the Qt installation (e.g. - C:\Qt\Qt5.6.1\5.6\msvc2015\bin) is listed in the PATH environment variable. 3 Install Python - Install the latest Python 2.x or 3.x version from + Install the latest Python 3.x version from https://www.python.org/downloads/ + Assure that you use the installer option "Add Python 3.x to PATH" 4 Install CMake @@ -55,32 +45,30 @@ Compiling with Microsoft Visual C++ (MSVC) 5 Download dependencies Download the LyX for Windows build dependencies from - ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2015.zip + ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2017.zip + and extract it e.g. to + C:\LyX\lyx-24\lyx-windows-deps-msvc2017 6 Configure - - Open the "Developer Command Prompt for VS2015" from the - "Visual Studio 2015\Visual Studio Tools" subfolder of the start menu. - Run the CMake GUI from the command window that was opened. - Alternatively, you can create a .bat file that first contains the line - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - and then calls the CMake GUI and use this .bat file to start CMake. - This is for building a 32bit LyX, if you want to build a 64bit LyX replace - 'x86' by 'amd64'. - The MSVC 2015 command prompt or vcvarsall.bat set some environment - variables that are needed for CMake to find the compiler. - - - Set the source code path to C:\LyX\lyx-23 - Set the build path to C:\LyX\lyx-23-build - Click Configure and set the generator to "Visual Studio 14 2015" to - build a 32bit LyX or "Visual Studio 14 2015 Win64" to build a 64bit LyX. + - Open the CMake GUI + + - Set the source code path to C:\LyX\lyx-24 + Set the build path to C:\LyX\lyx-24-build + Click Configure and set the generat
[LyX/master] INSTALL.Win32: add missing info
commit 866c1bef3eec4dcfe57ec09105ac1bcfbc179eef Author: Uwe Stöhr Date: Sun Oct 20 23:24:01 2019 +0200 INSTALL.Win32: add missing info --- INSTALL.Win32 |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL.Win32 b/INSTALL.Win32 index 893470d..66c8551 100644 --- a/INSTALL.Win32 +++ b/INSTALL.Win32 @@ -111,6 +111,7 @@ Compiling with Microsoft Visual C++ (MSVC) iconengines imageformats platforms + styles to C:\LyX\lyx-24-build\LYX_INSTALLED\bin 9 Start LyX -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] build5-2017.bat: add new script to compile using MSVC 2017
commit d995ea684f1080b7e448ba73883a33417460f134 Author: Uwe Stöhr Date: Sun Oct 20 23:11:17 2019 +0200 build5-2017.bat: add new script to compile using MSVC 2017 --- development/cmake/build5-2017-installer.bat | 41 +++ development/cmake/build5-2017.bat | 101 +++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/development/cmake/build5-2017-installer.bat b/development/cmake/build5-2017-installer.bat new file mode 100644 index 000..fa2d4a0 --- /dev/null +++ b/development/cmake/build5-2017-installer.bat @@ -0,0 +1,41 @@ +REM Run this script via double click. + +REM Create a link and add cmd.exe /k in the preferences in front of the mingw.bat call to prevent closing the cmd window. + +::echo off + +REM Install Qt from qt.io +set PATH=C:\Qt\Qt5.12.5\5.12.5\msvc2017\bin;%PATH% + +set LYX_SOURCE=%~DP0..\.. +set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2017 + +echo LyX source: %LYX_SOURCE% +echo LyX build : %LYX_BUILD% + + +REM first remove an existing compilation to assure a clean version +mkdir %LYX_BUILD% +del /s/q %LYX_BUILD%\* +rmdir /s/q %LYX_BUILD%\LYX_INSTALLED + +REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip +REM Extract on the same level as LyX sources +set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2017 + +REM MSVC 2017 tools +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 + +cd %LYX_BUILD% +cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF + +nmake doc +nmake translations +nmake +nmake install + +goto :eof +:eof + +REM go back to the dir where the script was called from +cd /D %CALLED_FROM% diff --git a/development/cmake/build5-2017.bat b/development/cmake/build5-2017.bat new file mode 100644 index 000..6fe84aa --- /dev/null +++ b/development/cmake/build5-2017.bat @@ -0,0 +1,101 @@ +echo off + +echo - +echo - +echo Usage build.bat devel/install +echo devel - Builds Visual Studio project files for development on LyX +echo install - Builds Visual Studio project files with all enabled for installation +echo +echo - +echo - +echo Call this script from a build directory or set variables (or edit this file) +echo LYX_SOURCE +echo LXY_BUILD +echo +echo Be sure you've set qmake in PATH. +echo - +echo GNUWin32 will be downloaded if you don't set the variable GNUWIN32_DIR +echo - +echo - +echo - + +if [%1]==[] ( + echo ERROR: no options. +echo Exiting now. + goto :eof +) + +REM Uncomment the following line if you want to compile in parallel. +REM This uses N cl.exe processes, where N is the number of cores. +set CL=/MP + +REM Save path +set CALLED_FROM=%CD% + +REM Edit pathes here or set the environment variables on your system. +set CMAKE_PATH="C:\Program Files\CMake\bin" +set QT_PATH="C:\Qt\Qt5.12.5\5.12.5\msvc2017" +set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2017" +set LYX_SOURCE="D:\LyXGit\Master" +set LYX_BUILD="D:\LyXGit\Master\compile-2017" + +if [%LYX_SOURCE%]==[] ( + set LYX_SOURCE=%~DP0\..\.. +) +echo LyX source: %LYX_SOURCE% + +if [%LYX_BUILD%]==[] ( + set LYX_BUILD=%CD% +) +echo LyX build : %LYX_BUILD% + +if [%GNUWIN32_DIR%]==[] ( + echo GNUWIN32_DIR not set. + echo Downloading win32 deps. + set DEPENDENCIES_DOWNLOAD="-DLYX_DEPENDENCIES_DOWNLOAD=1" +) else set PATH=%GNUWIN32_DIR%\bin;%PATH% +echo GNUWIN32_DIR : %GNUWIN32_DIR% + +if [%QT_PATH%]==[] ( + echo QT_PATH not set. +) else set PATH=%QT_PATH%;%PATH% +echo QT_PATH : %QT_PATH% + +if [%CMAKE_PATH%]==[] ( + echo CMAKE_PATH not set. +) else set PATH=%CMAKE_PATH%;%PATH% +echo CMAKE_PATH : %CMAKE_PATH% + +if not exist %LYX_BUILD% ( + echo creating "%LYX_BUILD%" + mkdir "%LYX_BUILD%" + if not exist %LYX_BUILD% ( + echo Exiting script. + goto :eof + ) +) + +cd "%LYX_BUILD%" + +REM start with a new cmake run +::del %LYX_BUILD%\CMakeCache.txt + +if "%1%" == "devel" ( + REM Build solution to develop LyX + REM you can add the option "-GNinja" for a faster compilation + cmake %LYX_SOURCE% -G"Visual Studio 15 2017" -DCMAKE_PREFIX_PATH=%QT_PATH% -DLYX_USE_QT=QT5 -DLYX_ENABLE_EXPORT_TESTS=0 -DLYX_MERGE_FILES=0 -DLYX_NLS=1 -DLYX_INSTALL=0 -DLYX_RELEASE=0 -DLYX_CONSOLE=ON -DLYX_3RDPARTY_BUILD=1 %DEPENDENCIES_DOWNLOAD% + msbuild src\LyX.vcxproj /p:Configuration=Debug + msbuild src\tex2
[LyX/2.3.x] Win installer: fix registry issue
commit 54acc050f6f90a4c290dc2ef9334c9872764089a
Author: Uwe Stöhr
Date: Sun Oct 20 23:06:21 2019 +0200
Win installer: fix registry issue
- when installing LyX 2.3.x over a previous 2.3.x installation a registry
key was not deleted
- also fix some hardcoded occurrences of "lyx"
---
.../packaging/installer/include/declarations.nsh |7 ---
.../Win32/packaging/installer/setup/configure.nsh |4 +++-
.../Win32/packaging/installer/setup/install.nsh|2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index 2e96869..34e6b7e 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -37,6 +37,7 @@ Configuration of LyX installer
# Names and version
!define APP_NAME "LyX"
+!define APP_NAME_SMALL "lyx"
!define APP_VERSION_NUMBER
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
# for the proposed install folder we use the scheme "LyX 2.2" while we need
for the registry the scheme "LyX 2.1.4"
# to check if it is exactly this version (to support side by side
installations)
@@ -66,8 +67,8 @@ Configuration of LyX installer
!define APP_REGNAME_DOC "${APP_NAME}.Document"
-!define APP_EXT ".lyx"
-!define APP_MIME_TYPE "application/lyx"
+!define APP_EXT ".${APP_NAME_SMALL}"
+!define APP_MIME_TYPE "application/${APP_NAME_SMALL}"
!define APP_UNINST_KEY
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SETUP_UNINSTALLER_KEY}"
@@ -81,7 +82,7 @@ Configuration of LyX installer
!define SETUP_EXE ${ExeFile}
!endif
-!define SETUP_ICON "${FILES_ICONS}\lyx.ico"
+!define SETUP_ICON "${FILES_ICONS}\${APP_NAME_SMALL}.ico"
!define SETUP_HEADERIMAGE "graphics\header.bmp"
!define SETUP_WIZARDIMAGE "graphics\wizard.bmp"
!define SETUP_UNINSTALLER "Uninstall-${APP_NAME}.exe"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 31a92e2..31a1825 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -46,7 +46,7 @@ Section -InstallData
WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString"
'"$INSTDIR\${SETUP_UNINSTALLER}"'
WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
- WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.exe"
+ WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon"
"$INSTDIR\bin\${APP_NAME_SMALL}.exe"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout"
"https://www.lyx.org/AboutLyX;
WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
@@ -58,8 +58,10 @@ Section -InstallData
# if we install over an older existing version, remove the old uninstaller
information
${if} $OldVersionNumber < ${APP_SERIES_KEY}
DeleteRegKey SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber"
+ DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber"
# also delete in the case of an emergency release
DeleteRegKey SHCTX
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber1"
+ DeleteRegKey SHCTX "SOFTWARE\${APP_NAME}$OldVersionNumber1"
${endif}
SectionEnd
diff --git a/development/Win32/packaging/installer/setup/install.nsh
b/development/Win32/packaging/installer/setup/install.nsh
index 53196e3..8aeef94 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -18,7 +18,7 @@ Section -ProgramFiles SecProgramFiles
# be installed directly to C:\programs - the uninstaller will then delete
the whole
# C:\programs directory
StrCpy $String $INSTDIR
- StrCpy $Search "LyX"
+ StrCpy $Search "${APP_NAME}"
Call StrPoint # function from LyXUtils.nsh
${if} $Pointer == "-1"
StrCpy $INSTDIR "$INSTDIR\${APP_DIR}"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ar.po: fix wrong translations
commit d55865b19a9506f9aa7187d0b46d3f9d520f1cfb
Author: Uwe Stöhr
Date: Sun Oct 20 21:41:56 2019 +0200
ar.po: fix wrong translations
- found by the compiler
- 2.3.x branch is not affected
---
po/ar.gmo | Bin 384721 -> 447069 bytes
po/ar.po | 10 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/po/ar.gmo b/po/ar.gmo
index 8d76041..0d58425 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 600f2d8..fa546a3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7033,7 +7033,7 @@ msgstr "ملحق القسم الفرعي"
#: lib/layouts/aastex62.layout:249
msgid "\\Alph{appendix}\\arabic{subappendix}."
-msgstr "\\Alph{appendix}\arabic{subappendix}."
+msgstr "\\Alph{appendix}\\arabic{subappendix}."
#: lib/layouts/aastex62.layout:260 lib/layouts/copernicus.layout:269
msgid "Subsubsection Appendix"
@@ -7041,7 +7041,7 @@ msgstr "ملحق قسم تحت فرعي"
#: lib/layouts/aastex62.layout:264
msgid "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}."
-msgstr "\\Alph{appendix}\arabic{subappendix}.\arabic{subsubappendix}."
+msgstr "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}."
#: lib/layouts/achemso.layout:3 lib/examples/Articles:0
msgid "American Chemical Society (ACS)"
@@ -9794,7 +9794,7 @@ msgstr "\\Alph{appendix}\arabic{subappendix}"
#: lib/layouts/copernicus.layout:273
msgid "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}"
-msgstr "\\Alph{appendix}\arabic{subappendix}.\arabic{subsubappendix}"
+msgstr "\\Alph{appendix}\\arabic{subappendix}.\\arabic{subsubappendix}"
#: lib/layouts/copernicus.layout:296
msgid "CodeAvailability"
@@ -10558,7 +10558,7 @@ msgstr "معيار \\arabic{theorem}"
#: lib/layouts/elsart.layout:361
msgid "Algorithm \\arabic{theorem}"
-msgstr "لوغرتم \arabic{theorem}"
+msgstr "لوغرتم \\arabic{theorem}"
#: lib/layouts/elsart.layout:368
msgid "Definition \\arabic{theorem}"
@@ -10570,7 +10570,7 @@ msgstr "حدس \\arabic{theorem}"
#: lib/layouts/elsart.layout:389
msgid "Example \\arabic{theorem}"
-msgstr "مثال \arabic{theorem}"
+msgstr "مثال \\arabic{theorem}"
#: lib/layouts/elsart.layout:396
msgid "Problem \\arabic{theorem}"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] development/Makefile.am: fix compilation error
commit cbaf5e70f878287874e7abf5127a8824ce50c659 Author: Uwe Stöhr Date: Sun Oct 20 21:20:55 2019 +0200 development/Makefile.am: fix compilation error see also my message on the list --- development/Makefile.am |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/development/Makefile.am b/development/Makefile.am index f5b218d..5f2cb83 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -128,6 +128,7 @@ checkurls/CheckURL.pm \ checkurls/search_url.pl \ cmake/ConfigureChecks.cmake \ cmake/Install.cmake \ +cmake/lyx.ico \ cmake/LyxPackaging.cmake \ cmake/LyX_description.txt \ cmake/LyX_license.txt \ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] colored-boxes.lyx: add section about references
commit 0baa24df71b72ec804a13fc836c4874ed6472e99
Author: Uwe Stöhr
Date: Sun Jul 21 01:31:46 2019 +0200
colored-boxes.lyx: add section about references
is a user request
---
lib/examples/colored-boxes.lyx | 112
status.23x |2 +
2 files changed, 114 insertions(+), 0 deletions(-)
diff --git a/lib/examples/colored-boxes.lyx b/lib/examples/colored-boxes.lyx
index 2ed3665..114517e 100644
--- a/lib/examples/colored-boxes.lyx
+++ b/lib/examples/colored-boxes.lyx
@@ -128,6 +128,15 @@ Uwe Stöhr
\end_layout
\begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
With the module
\emph on
Fancy
@@ -1787,6 +1796,102 @@ beamer
\end_layout
\begin_layout Subsection
+References
+\end_layout
+
+\begin_layout Standard
+You cannot use \SpecialChar LyX
+'s label/reference mechanisms for fancy colored boxes.
+ Numbered boxes can be referenced by adding
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+, label={name}
+\end_layout
+
+\begin_layout Standard
+to the the
+\family sans
+Color Box Options
+\family default
+ inset, whereby
+\series bold
+name
+\series default
+ is the label name used to reference the box.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex Custom Color Box 2
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Mass–energy equivalence, label={Einstein}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Formula
+\[
+E=mc^{2}.
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+To reference the box, insert the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+ref{name}
+\end_layout
+
+\begin_layout Standard
+as \SpecialChar TeX
+ code to the text where the reference should appear.
+\end_layout
+
+\begin_layout Standard
+This is the reference to Example
+\begin_inset space \space{}
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+ref{Einstein}
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
Skins
\end_layout
@@ -1821,6 +1926,13 @@ literal "true"
Only the most important skins are listed in the following.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsubsection
Enhanced
\begin_inset CommandInset label
diff --git a/status.23x b/status.23x
index ede30ab..9e9cce9 100644
--- a/status.23x
+++ b/status.23x
@@ -35,6 +35,8 @@ What's new
* DOCUMENTATION AND LOCALIZATION
+- New section about references in the example file colored-boxes.lyx.
+
- The Dutch user interface localization has been revived, and the Dutch docs
revised.
[LyX/master] Fancy_Colored_Boxes.lyx: add section about references
commit ebf42d9b104e0d6aff5b562a0823b1dab7f900a6
Author: Uwe Stöhr
Date: Sun Jul 21 01:27:43 2019 +0200
Fancy_Colored_Boxes.lyx: add section about references
is a user request
---
lib/examples/Modules/Fancy_Colored_Boxes.lyx | 112 ++
1 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/lib/examples/Modules/Fancy_Colored_Boxes.lyx
b/lib/examples/Modules/Fancy_Colored_Boxes.lyx
index bbf4415..3d442d6 100644
--- a/lib/examples/Modules/Fancy_Colored_Boxes.lyx
+++ b/lib/examples/Modules/Fancy_Colored_Boxes.lyx
@@ -128,6 +128,15 @@ Uwe Stöhr
\end_layout
\begin_layout Standard
+\begin_inset CommandInset toc
+LatexCommand tableofcontents
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
With the module
\emph on
Fancy
@@ -1787,6 +1796,102 @@ beamer
\end_layout
\begin_layout Subsection
+References
+\end_layout
+
+\begin_layout Standard
+You cannot use \SpecialChar LyX
+'s label/reference mechanisms for fancy colored boxes.
+ Numbered boxes can be referenced by adding
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+, label={name}
+\end_layout
+
+\begin_layout Standard
+to the the
+\family sans
+Color Box Options
+\family default
+ inset, whereby
+\series bold
+name
+\series default
+ is the label name used to reference the box.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex Custom Color Box 2
+status open
+
+\begin_layout Plain Layout
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Mass–energy equivalence, label={Einstein}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Formula
+\[
+E=mc^{2}.
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+To reference the box, insert the command
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+ref{name}
+\end_layout
+
+\begin_layout Standard
+as \SpecialChar TeX
+ code to the text where the reference should appear.
+\end_layout
+
+\begin_layout Standard
+This is the reference to Example
+\begin_inset space \space{}
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+ref{Einstein}
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
Skins
\end_layout
@@ -1821,6 +1926,13 @@ literal "true"
Only the most important skins are listed in the following.
\end_layout
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsubsection
Enhanced
\begin_inset CommandInset label
[LyX/master] Win installer: fix bug on init
commit fc98efa7f3e23be35090f324b32976e9e170860f
Author: Uwe Stöhr
Date: Tue Mar 26 02:37:19 2019 +0100
Win installer: fix bug on init
- also remove unused code
---
.../Win32/packaging/installer/include/init.nsh |7 +--
.../packaging/installer/include/variables.nsh |2 --
development/Win32/packaging/installer/settings.nsh | 10 +-
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 59370d4..4276a07 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -610,11 +610,6 @@ Function .onInit
Abort
${endif}
- # read the user and computer name
- ReadRegStr $ComputerName HKLM
"System\CurrentControlSet\Control\ComputerName\ActiveComputerName"
"ComputerName"
- System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
- StrCpy $UserName $0
-
!insertmacro MULTIUSER_INIT
# check if this LyX version is already installed
@@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over
an existing one
# because he won't have a chance to deny this
- StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+ StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from
LyXUtils.nsh
${if} $5 == "False"
diff --git a/development/Win32/packaging/installer/include/variables.nsh
b/development/Win32/packaging/installer/include/variables.nsh
index bb6982c..57f507c 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -14,7 +14,6 @@ Var APPDATemp
Var AppPre
var AppSubfolder
Var AppSuff
-Var ComputerName
Var CreateDesktopIcon
Var CreateFileAssociations
Var DictCode
@@ -49,6 +48,5 @@ Var ThesCode
Var ThesCodes
Var UpdateFNDBReturn
Var UserList
-Var UserName
Var LangName
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 175b664..56bccaf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,19 +11,19 @@ These typically need to be modified for each LyX release
!define APP_VERSION_MAJOR 2
!define APP_VERSION_MINOR 3
-!define APP_VERSION_REVISION 1
+!define APP_VERSION_REVISION 2
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
-!define COPYRIGHT_YEAR 2018
+!define COPYRIGHT_YEAR 2019
#
# Installer file name
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
!ifndef ExeFile
!define ExeFile
"${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/;
-!define ImageMagickVersion "7.0.7"
+!define ImageMagickVersion "7.0.8"
[LyX/2.3.x] Win installer: fix bug on init
commit e5c7084a9ca83263f1d2148499a276ea394e6081
Author: Uwe Stöhr
Date: Tue Mar 26 02:34:54 2019 +0100
Win installer: fix bug on init
- also remove unused code and some updates
---
.../Win32/packaging/installer/include/init.nsh |7 +--
.../packaging/installer/include/variables.nsh |2 --
development/Win32/packaging/installer/settings.nsh |6 +++---
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 59370d4..4276a07 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -610,11 +610,6 @@ Function .onInit
Abort
${endif}
- # read the user and computer name
- ReadRegStr $ComputerName HKLM
"System\CurrentControlSet\Control\ComputerName\ActiveComputerName"
"ComputerName"
- System::Call "advapi32::GetUserName(t .r0, *i ${NSIS_MAX_STRLEN} r1) i.r2"
- StrCpy $UserName $0
-
!insertmacro MULTIUSER_INIT
# check if this LyX version is already installed
@@ -632,7 +627,7 @@ Function .onInit
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he realy wants to install a new LyX over
an existing one
# because he won't have a chance to deny this
- StrCpy $4 $0 -10 # remove '\bin\lyx,0'
+ StrCpy $4 $0 -12 # remove '\bin\lyx.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from
LyXUtils.nsh
${if} $5 == "False"
diff --git a/development/Win32/packaging/installer/include/variables.nsh
b/development/Win32/packaging/installer/include/variables.nsh
index bb6982c..57f507c 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -14,7 +14,6 @@ Var APPDATemp
Var AppPre
var AppSubfolder
Var AppSuff
-Var ComputerName
Var CreateDesktopIcon
Var CreateFileAssociations
Var DictCode
@@ -49,6 +48,5 @@ Var ThesCode
Var ThesCodes
Var UpdateFNDBReturn
Var UserList
-Var UserName
Var LangName
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 9f7d554..56bccaf 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -18,12 +18,12 @@ These typically need to be modified for each LyX release
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
-!define COPYRIGHT_YEAR 2018
+!define COPYRIGHT_YEAR 2019
#
# Installer file name
-# Typical names for the release are "LyX-211-Installer-1.exe" etc.
+# Typical names for the release are "LyX-232-Installer-1.exe" etc.
!ifndef ExeFile
!define ExeFile
"${APP_NAME}-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -46,4 +46,4 @@ These typically need to be modified for each LyX release
!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/;
-!define ImageMagickVersion "7.0.7"
+!define ImageMagickVersion "7.0.8"
[LyX/2.3.x] installer: re-sync with master
commit a96bf1ae89d622d6991b7a2ae0e6645d71df2e56 Author: Uwe Stöhr Date: Fri Mar 22 01:19:48 2019 +0100 installer: re-sync with master backport all recent fixes from master --- .../packaging/installer/DictionaryMirrors.txt | 24 + .../installer/HunspellDictionaryNames.txt |2 + development/Win32/packaging/installer/Packages.txt |2 +- development/Win32/packaging/installer/Readme.txt |6 +- .../Win32/packaging/installer/include/LaTeX.nsh| 19 --- .../Win32/packaging/installer/include/LyXUtils.nsh |6 -- .../packaging/installer/include/dictionaries.nsh | 50 ++- .../Win32/packaging/installer/include/init.nsh | 24 +++-- .../Win32/packaging/installer/lang/arabic.nsh |4 +- .../Win32/packaging/installer/lang/basque.nsh |4 +- .../Win32/packaging/installer/lang/catalan.nsh |4 +- .../Win32/packaging/installer/lang/czech.nsh |4 +- .../Win32/packaging/installer/lang/danish.nsh |4 +- .../Win32/packaging/installer/lang/dutch.nsh |4 +- .../Win32/packaging/installer/lang/english.nsh |8 ++- .../Win32/packaging/installer/lang/french.nsh |4 +- .../Win32/packaging/installer/lang/galician.nsh|4 +- .../Win32/packaging/installer/lang/german.nsh |4 +- .../Win32/packaging/installer/lang/hungarian.nsh |4 +- .../Win32/packaging/installer/lang/indonesian.nsh |4 +- .../Win32/packaging/installer/lang/italian.nsh |4 +- .../Win32/packaging/installer/lang/japanese.nsh|4 +- .../Win32/packaging/installer/lang/norwegian.nsh |4 +- .../Win32/packaging/installer/lang/polish.nsh |4 +- .../Win32/packaging/installer/lang/portuguese.nsh |4 +- .../packaging/installer/lang/portugueseBR.nsh |4 +- .../Win32/packaging/installer/lang/romanian.nsh|4 +- .../Win32/packaging/installer/lang/russian.nsh |4 +- .../Win32/packaging/installer/lang/slovak.nsh |4 +- .../Win32/packaging/installer/lang/spanish.nsh |4 +- .../Win32/packaging/installer/lang/swedish.nsh |4 +- .../Win32/packaging/installer/lang/turkish.nsh |4 +- .../Win32/packaging/installer/lang/ukrainian.nsh |4 +- .../Win32/packaging/installer/setup/configure.nsh |2 +- .../Win32/packaging/installer/setup/install.nsh|2 + 35 files changed, 165 insertions(+), 76 deletions(-) diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt b/development/Win32/packaging/installer/DictionaryMirrors.txt new file mode 100644 index 000..95ab8e8 --- /dev/null +++ b/development/Win32/packaging/installer/DictionaryMirrors.txt @@ -0,0 +1,24 @@ +astuteinternet +ayera +cfhcable +cytranet +datapacket +excellmedia +freefr +iweb +jaist +kent +liquidtelecom +managedway +nchc +netcologne +netix +newcontinuum +phoenixnap +pilotfiber +razaoinfo +superb-dca2 +svwh +ufpr +versaweb +vorboss diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt index 817adc9..625718d 100644 --- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt +++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt @@ -82,6 +82,8 @@ is_IS.aff is_IS.dic it_IT.aff it_IT.dic +ka_GE.aff +ka_GE.dic kk_KZ.aff kk_KZ.dic ko_KR.aff diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 3ba3f1e..91020a2 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -100,6 +100,7 @@ lettrine listings lithuanian genmisc +georgian mathtools mhchem mongolian-babel @@ -240,7 +241,6 @@ ucs extsizes frletter g-brief -eurofont jsclasses platex fancyvrb diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt index 247fbbf..f288a2d 100644 --- a/development/Win32/packaging/installer/Readme.txt +++ b/development/Win32/packaging/installer/Readme.txt @@ -2,12 +2,12 @@ 1. extract the source zip-file to e.g. the path "C:\LyX-Installer" 2. open the file settings.nsh with a text editor - and adapt there the following paths to the one on your PC, e.g.: + and adapt there the following paths to the ones on your PC, e.g.: !define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX" !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015" !define FILES_QT "C:\LyX-Installer\LyXPackage\LyX" -3. install the latest version 3.x of NSIS (http://nsis.sourceforge.net/Download) -4. install the NSIS Large Strings build (http://nsis.sourceforge.net/Special_Builds) +3. install the latest version 3.x of NSIS (https://nsis.sourceforge.io/Download) +4. install the NSIS Large Strings build (https://nsis.sourceforge.io/Special_Builds) (extract the extension Z
[LyX/master] installer: fix a display issue
commit 3aaa6078fd6a16dbb2f023c182468fa44fc4f2ec
Author: Uwe Stöhr
Date: Fri Mar 22 01:18:04 2019 +0100
installer: fix a display issue
a path in the uninstaller was not visible because of missing line breaks
---
.../Win32/packaging/installer/lang/arabic.nsh |4 +++-
.../Win32/packaging/installer/lang/basque.nsh |4 +++-
.../Win32/packaging/installer/lang/catalan.nsh |4 +++-
.../Win32/packaging/installer/lang/czech.nsh |4 +++-
.../Win32/packaging/installer/lang/danish.nsh |4 +++-
.../Win32/packaging/installer/lang/dutch.nsh |4 +++-
.../Win32/packaging/installer/lang/english.nsh |8 +---
.../Win32/packaging/installer/lang/french.nsh |4 +++-
.../Win32/packaging/installer/lang/galician.nsh|4 +++-
.../Win32/packaging/installer/lang/german.nsh |4 +++-
.../Win32/packaging/installer/lang/hungarian.nsh |4 +++-
.../Win32/packaging/installer/lang/indonesian.nsh |4 +++-
.../Win32/packaging/installer/lang/italian.nsh |4 +++-
.../Win32/packaging/installer/lang/japanese.nsh|4 +++-
.../Win32/packaging/installer/lang/norwegian.nsh |4 +++-
.../Win32/packaging/installer/lang/polish.nsh |4 +++-
.../Win32/packaging/installer/lang/portuguese.nsh |4 +++-
.../packaging/installer/lang/portugueseBR.nsh |4 +++-
.../Win32/packaging/installer/lang/romanian.nsh|4 +++-
.../Win32/packaging/installer/lang/russian.nsh |4 +++-
.../Win32/packaging/installer/lang/slovak.nsh |4 +++-
.../Win32/packaging/installer/lang/spanish.nsh |4 +++-
.../Win32/packaging/installer/lang/swedish.nsh |4 +++-
.../Win32/packaging/installer/lang/turkish.nsh |4 +++-
.../Win32/packaging/installer/lang/ukrainian.nsh |4 +++-
25 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/development/Win32/packaging/installer/lang/arabic.nsh
b/development/Win32/packaging/installer/lang/arabic.nsh
index 19a2bb9..d4c4e3e 100644
--- a/development/Win32/packaging/installer/lang/arabic.nsh
+++ b/development/Win32/packaging/installer/lang/arabic.nsh
@@ -110,6 +110,8 @@ ${LangFileString} UnLyXPreferencesTitle 'تفضيلات مستخدم ليك'
${LangFileString} SecUnMiKTeXDescription "إزالة توزيعة لتيك MiKTeX."
#${LangFileString} SecUnJabRefDescription "إزالة مدير ثبت المراجع JabRef."
${LangFileString} SecUnPreferencesDescription 'حذف LyX$\'s ضبط$\r$\n\
- (مجلد
$\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+ (مجلد
$\"$AppPre\username\$\r$\n\
+ $AppSuff\$\r$\n\
+ ${APP_DIR_USERDATA}$\")$\r$\n\
لك او لكل المستخدمين (إذا كنت
المدير).'
${LangFileString} SecUnProgramFilesDescription "إزالة ليك مع كل مكوناته."
diff --git a/development/Win32/packaging/installer/lang/basque.nsh
b/development/Win32/packaging/installer/lang/basque.nsh
index 32c53b7..db6fe5c 100644
--- a/development/Win32/packaging/installer/lang/basque.nsh
+++ b/development/Win32/packaging/installer/lang/basque.nsh
@@ -112,7 +112,9 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX-eko
erabiltzailearen hobespenak'
${LangFileString} SecUnMiKTeXDescription "LaTeX-en MiKTeX banaketa
desinstalatzen du."
#${LangFileString} SecUnJabRefDescription "Bibliografiaren JabRef kudeatzailea
desinstalatzen du."
${LangFileString} SecUnPreferencesDescription 'LyX-en konfigurazioa ezabatzen
du$\r$\n\
-
($\"$AppPre\erabiltzailea\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\
+
($\"$AppPre\erabiltzailea\$\r$\n\
+ $AppSuff\$\r$\n\
+ \${APP_DIR_USERDATA}$\"$\r$\n\
zuretzako edo erabiltzaile
guztientzako (administratzailea bazara).'
${LangFileString} SecUnProgramFilesDescription "Desinstalatu LyX eta bere
osagai guztiak."
diff --git a/development/Win32/packaging/installer/lang/catalan.nsh
b/development/Win32/packaging/installer/lang/catalan.nsh
index 3f2efb4..a7449a5 100644
--- a/development/Win32/packaging/installer/lang/catalan.nsh
+++ b/development/Win32/packaging/installer/lang/catalan.nsh
@@ -105,7 +105,9 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferències
d$\'usuari del LyX'
${LangFileString} SecUnMiKTeXDescription "Desintal·la la distribució de LaTeX
MiKTeX."
#${LangFileString} SecUnJabRefDescription "Desinstal·la el gestor de
bibliografia JabRef."
${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de
configuració del LyX$\r$\n\
-
[LyX/master] installer: remove unsupported TeX distributions
commit aca0abc7b035d2c6f59d503b00205dc014938e1e
Author: Uwe Stöhr
Date: Fri Mar 22 01:06:56 2019 +0100
installer: remove unsupported TeX distributions
MiKTeX 2.8 and TeXLive 2014 are since a while not supported
---
.../Win32/packaging/installer/include/LaTeX.nsh| 19 ---
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index d7e527b..a94f269 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -54,10 +54,6 @@ Function LaTeXActions
IntOp $0 $0 + 1
Goto loop32
done32:
- ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
- ${endif}
${if} $String == "2.9"
StrCpy $MiKTeXVersion "2.9"
StrCpy $LaTeXName "MiKTeX 2.9"
@@ -78,10 +74,6 @@ Function LaTeXActions
IntOp $0 $0 + 1
Goto loop64
done64:
- ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
- ${endif}
${if} $String == "2.9"
StrCpy $MiKTeXVersion "2.9"
StrCpy $LaTeXName "MiKTeX 2.9"
@@ -110,10 +102,6 @@ Function LaTeXActions
IntOp $0 $0 + 1
Goto loopB
doneB:
- ${if} $String == "2.8"
-StrCpy $MiKTeXVersion "2.8"
-StrCpy $LaTeXName "MiKTeX 2.8"
- ${endif}
${if} $String == "2.9"
StrCpy $MiKTeXVersion "2.9"
StrCpy $LaTeXName "MiKTeX 2.9"
@@ -176,19 +164,12 @@ Function LaTeXActions
${endif}
# finally set the name
${if} $PathLaTeX != ""
- ${andif} $LaTeXName != "MiKTeX 2.8"
${andif} $LaTeXName != "MiKTeX 2.9"
StrCpy $LaTeXInstalled "TeXLive"
ReadRegStr $String HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015"
"DisplayVersion"
${if} $String == ""
ReadRegStr $String HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2015"
"DisplayVersion"
${endif}
- ${if} $String == ""
-ReadRegStr $String HKLM
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014"
"DisplayVersion"
- ${endif}
- ${if} $String == ""
-ReadRegStr $String HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXLive2014"
"DisplayVersion"
- ${endif}
${if} $String != ""
StrCpy $LaTeXName "TeXLive $String"
${else}
[LyX/master] installer/setup/configure.nsh: revert an unwanted commit part
commit 84863eb1b03de97b8445f6cfa633e361a4d7f769
Author: Uwe Stöhr
Date: Thu Mar 21 02:45:21 2019 +0100
installer/setup/configure.nsh: revert an unwanted commit part
---
.../Win32/packaging/installer/setup/configure.nsh | 24
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 7fc6a32..97bc945 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -233,30 +233,6 @@ Var ConfigureReturn
Section -ConfigureScript
- SetOutPath "$INSTDIR\Resources"
-
- # ask to update MiKTeX
- ${if} $LaTeXInstalled == "MiKTeX"
- Call UpdateMiKTeX # function from latex.nsh
- # install all necessary packages at once because this is much faster then
to install the packages one by one
- DetailPrint $(TEXT_CONFIGURE_LYX)
- ${if} $MultiUser.Privileges != "Admin"
- ${andif} $MultiUser.Privileges != "Power"
-# call the non-admin version
-# at first we need to synchronize the package database
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
- ${else}
-${if} $MiKTeXUser != "HKCU" # call the admin version
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
-${else}
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
-${endif}
- ${endif}
- ${endif}
-
DetailPrint $(TEXT_CONFIGURE_LYX)
nsExec::ExecToLog '"$INSTDIR\Python\python.exe"
"$INSTDIR\Resources\configure.py"'
# $ConfigureReturn is "0" if successful, otherwise "1"
[LyX/master] installer: fix icon issue
commit 0ddc4d4dd1534d4f785659ebd3bbde938527ebcc
Author: Uwe Stöhr
Date: Thu Mar 21 02:41:57 2019 +0100
installer: fix icon issue
LyX did not show up in the Windows Control panel with its icon
---
.../Win32/packaging/installer/setup/configure.nsh | 27 ++-
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 80960a6..7fc6a32 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -46,7 +46,7 @@ Section -InstallData
WriteRegStr SHCTX ${APP_UNINST_KEY} "UninstallString"
'"$INSTDIR\${SETUP_UNINSTALLER}"'
WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayVersion" "${APP_VERSION}"
- WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx,0"
+ WriteRegStr SHCTX ${APP_UNINST_KEY} "DisplayIcon" "$INSTDIR\bin\lyx.exe"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLUpdateInfo" "${APP_WEBPAGE}"
WriteRegStr SHCTX ${APP_UNINST_KEY} "URLInfoAbout"
"https://www.lyx.org/AboutLyX;
WriteRegStr SHCTX ${APP_UNINST_KEY} "Publisher" "${APP_NAME} Team"
@@ -233,11 +233,34 @@ Var ConfigureReturn
Section -ConfigureScript
+ SetOutPath "$INSTDIR\Resources"
+
+ # ask to update MiKTeX
+ ${if} $LaTeXInstalled == "MiKTeX"
+ Call UpdateMiKTeX # function from latex.nsh
+ # install all necessary packages at once because this is much faster then
to install the packages one by one
+ DetailPrint $(TEXT_CONFIGURE_LYX)
+ ${if} $MultiUser.Privileges != "Admin"
+ ${andif} $MultiUser.Privileges != "Power"
+# call the non-admin version
+# at first we need to synchronize the package database
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
+ ${else}
+${if} $MiKTeXUser != "HKCU" # call the admin version
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
+${else}
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
+${endif}
+ ${endif}
+ ${endif}
+
DetailPrint $(TEXT_CONFIGURE_LYX)
nsExec::ExecToLog '"$INSTDIR\Python\python.exe"
"$INSTDIR\Resources\configure.py"'
# $ConfigureReturn is "0" if successful, otherwise "1"
Pop $ConfigureReturn # Return value
- # Should we do something with that?
SectionEnd
[LyX/master] installer: update some links
commit ef64a3b74121e2ea1ac150f98e934aabb3d0fbb9 Author: Uwe Stöhr Date: Thu Mar 21 02:40:44 2019 +0100 installer: update some links also update header info --- development/Win32/packaging/installer/Readme.txt |6 +++--- .../Win32/packaging/installer/include/LyXUtils.nsh |6 -- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt index 247fbbf..f288a2d 100644 --- a/development/Win32/packaging/installer/Readme.txt +++ b/development/Win32/packaging/installer/Readme.txt @@ -2,12 +2,12 @@ 1. extract the source zip-file to e.g. the path "C:\LyX-Installer" 2. open the file settings.nsh with a text editor - and adapt there the following paths to the one on your PC, e.g.: + and adapt there the following paths to the ones on your PC, e.g.: !define FILES_LYX "C:\LyX-Installer\LyXPackage\LyX" !define FILES_DEPS "C:\LyX-Installer\LyX2.2x\lyx-windows-deps-msvc2015" !define FILES_QT "C:\LyX-Installer\LyXPackage\LyX" -3. install the latest version 3.x of NSIS (http://nsis.sourceforge.net/Download) -4. install the NSIS Large Strings build (http://nsis.sourceforge.net/Special_Builds) +3. install the latest version 3.x of NSIS (https://nsis.sourceforge.io/Download) +4. install the NSIS Large Strings build (https://nsis.sourceforge.io/Special_Builds) (extract the extension ZIP file in your NSIS installation folder and this way overwrite some files) 5. open the file FindProcDLL Unicode bin.zip (that is part of this bundle), extract from it the file FindProc.dll to the folder \Plugins\x86-unicode of diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh index ee3a471..eda1599 100644 --- a/development/Win32/packaging/installer/include/LyXUtils.nsh +++ b/development/Win32/packaging/installer/include/LyXUtils.nsh @@ -22,12 +22,6 @@ #StrPoint #UnAppPreSuff # -# - CheckAppPathPreferences (replaces the old install folder name with the new one in the preferences files) -# (used by Update installer), uses: -#ReplaceLineContent -# -# - IsUserAdmin (checks if user is admin) -# # - FileCheck (checks if a given file exists) # #--
[LyX/master] convertDefault.py: remove ancient restriction
commit 01c5d528fe81ae7e4e3fd9e553238cb866c89da4 Author: Uwe Stöhr Date: Thu Mar 21 02:35:51 2019 +0100 convertDefault.py: remove ancient restriction there is no longer the need to restrict the image depth (on Windows since years the 16 bit depth version of ImageMagick is bundled) --- lib/scripts/convertDefault.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py index 0c9b6a6..418b553 100644 --- a/lib/scripts/convertDefault.py +++ b/lib/scripts/convertDefault.py @@ -62,7 +62,7 @@ else: # IM >= 5.5.8 separates options for source and target files # See http://www.imagemagick.org/Usage/basics/#why if im or gm: -sopts = "-depth 8" +sopts = "" topts = "" elif sys.platform == 'darwin': command = 'lyxconvert'
[LyX/master] Win installer: remove no longer available package
commit 4162ed151ce6bc27bd522d413b524f426f2af485 Author: Uwe Stöhr Date: Mon Feb 11 00:41:22 2019 +0100 Win installer: remove no longer available package --- development/Win32/packaging/installer/Packages.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt index 6859c1e..91020a2 100644 --- a/development/Win32/packaging/installer/Packages.txt +++ b/development/Win32/packaging/installer/Packages.txt @@ -241,7 +241,6 @@ ucs extsizes frletter g-brief -eurofont jsclasses platex fancyvrb
[LyX/master] Win installer: updates and fixes
commit 028cf852dc5b2d71bfcbefada4252d4759da6ee4
Author: Uwe Stöhr
Date: Mon Feb 11 00:17:42 2019 +0100
Win installer: updates and fixes
- enable support for Georgian
- update file sizes
- re-introduce the dictionary download because it is necessary to step
through several mirrors if necessary. This function was once added because as
it is now, only one mirror is used, if it is dead the user won't get the
dictionary
- update the mirror list
---
.../packaging/installer/DictionaryMirrors.txt |6 ++-
.../installer/HunspellDictionaryNames.txt |2 +
development/Win32/packaging/installer/Packages.txt |1 +
.../packaging/installer/include/dictionaries.nsh | 50 ++-
.../Win32/packaging/installer/include/init.nsh | 24 +++--
5 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 99a4590..95ab8e8 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -2,21 +2,23 @@ astuteinternet
ayera
cfhcable
cytranet
+datapacket
excellmedia
freefr
iweb
jaist
kent
liquidtelecom
+managedway
nchc
netcologne
netix
-netcologne
newcontinuum
phoenixnap
+pilotfiber
razaoinfo
superb-dca2
-superb-sea2
+svwh
ufpr
versaweb
vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index 817adc9..625718d 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -82,6 +82,8 @@ is_IS.aff
is_IS.dic
it_IT.aff
it_IT.dic
+ka_GE.aff
+ka_GE.dic
kk_KZ.aff
kk_KZ.dic
ko_KR.aff
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 3ba3f1e..6859c1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -100,6 +100,7 @@ lettrine
listings
lithuanian
genmisc
+georgian
mathtools
mhchem
mongolian-babel
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index d540f53..4bec27e 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -28,8 +28,8 @@ Function FindDictionaries
# read out the possible spell-checker filenames from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${for} $5 1 72
- # the file has 144 lines, but we only need to check for one of the 2
dictionary files per language
+ ${for} $5 1 73
+ # the file has 146 lines, but we only need to check for one of the 2
dictionary files per language
# therefore check only for every second line
FileRead $R5 $String # skip the .aff file
FileRead $R5 $String # $String is now the .dic filename
@@ -66,20 +66,32 @@ Function DownloadHunspellDictionaries
# read out the locations from the file
FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r
- ${For} $5 1 144 # the file has 144 lines
+ ${For} $5 1 146 # the file has 146 lines
FileRead $R5 $String # $String is now the dictionary name
StrCpy $R3 $String -6 # $R3 is now the dictionary language code
${if} $DictCode == $R3
StrCpy $String $String -2 # delete the linebreak characters at the end
- # Download hunspell dictionaries
- Push $R0
- inetc::get /RECEIVETIMEOUT=5000
"https://sourceforge.net/projects/lyxwininstaller/files/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
- Pop $R0
+ # Download hunspell dictionaries,
+ # if first download repository is not available try the other ones listed
in "DictionaryMirrors.txt"
+ FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
+
+ ${For} $4 1 24 # there are 24 mirrors in the file
+FileRead $R4 $Search # $Search is now the mirror
+StrCpy $Search $Search -2 # delete the linebreak characters at the end
+Push $R0
+inetc::get /TIMEOUT=5000
"https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
+Pop $R0
+${if} $R0 == "OK"
+ ${ExitFor}
+${endif}
+ ${Next}
+
+ FileClose $R4
# if download failed
${if} $R0 != "OK"
-MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed): $R0"
+MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)"
Goto abortinstall
${endif}
${endif} # end if $DictCode == $R3
@@ -107,13 +119,25 @@ Function DownloadThesaurusDictionaries
${if} $ThesCode == $R3
StrCpy $String $Str
[LyX/2.3.x] status.23x: mention the new biblatex support in tex2lyx
commit 150fb89e22742dcf1f61500b498bc9e7e2a7702c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue Mar 6 13:52:42 2018 +0100
status.23x: mention the new biblatex support in tex2lyx
---
status.23x |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/status.23x b/status.23x
index 3698b06..7d0cb28 100644
--- a/status.23x
+++ b/status.23x
@@ -21,6 +21,10 @@ What's new
* TEX2LYX IMPROVEMENTS
+- support for most commands provided by the biblatex package
+
+- support biblatex's qualified citation lists:
+ \cites(pre)(post)[pre1][post1]{key1}[pre2][post2]{key2}...
* USER INTERFACE
[LyX/2.3.x] status.23x: correct sorting
commit e9470e7d64117171a48c2cc3426c63856667c6d0 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Mar 6 22:34:21 2018 +0100 status.23x: correct sorting tex2lyx biblatex support is an improvement not a bugfix. At least in the past we sorted new tex2lyx features this way. --- status.23x |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/status.23x b/status.23x index ed12ee8..b13eaf5 100644 --- a/status.23x +++ b/status.23x @@ -21,6 +21,7 @@ What's new * TEX2LYX IMPROVEMENTS +- Add support for biblatex. * USER INTERFACE @@ -105,8 +106,6 @@ What's new - Consider options passed via \PassOptionsToPackage. -- Add support for biblatex. - - Add support for alignment pseudo-environments as used inside floats (bug 7857).
[LyX/master] Arabic UserGuide.lyx: update from Hatim
commit e8678bc6060fd88c74bac15eda22118f96264c6f Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Mar 20 03:32:13 2018 +0100 Arabic UserGuide.lyx: update from Hatim lib/doc/ar/UserGuide.lyx | 3845 -- 1 files changed, 1004 insertions(+), 2841 deletions(-)
[LyX/master] Win installer: fix a typo
commit 23ba5e8389a0b3a012cc4cdefc3493191385def1
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Mar 11 14:37:48 2018 +0100
Win installer: fix a typo
---
.../packaging/installer/include/EnvVarUpdate.nsh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
index 12de15f..e67472c 100644
--- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
+++ b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh
@@ -261,7 +261,7 @@ Function ${UN}EnvVarUpdate
${If} $6 == 1
DetailPrint "appended to $1"
${Else}
-#DetailPrint "Target was appended to $1"
+DetailPrint "Target was appended to $1"
${EndIf}
${Else}; If Prepend (and EnvVar is not
empty),
StrCpy $0 $4;$0 ; prepend PathString
[LyX/2.2.x] Win installer: prepare 2.2.4 release
commit 4c7f46020acfd93049d4a2db2e9932108f0debc7
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Mar 11 14:36:40 2018 +0100
Win installer: prepare 2.2.4 release
---
.../Win32/packaging/installer/ChangeLog.txt|2 +-
.../Win32/packaging/installer/include/LaTeX.nsh| 86 +--
.../Win32/packaging/installer/include/filelist.nsh |3 +-
3 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 6c52438..821559c 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -4,7 +4,7 @@
- fix installation of Arabic spell checker
- LyX will work under Windows Vista but is no longer supported
- updated to MiKTeX 2.9 build 6615
-- updated to ImageMagick 7.0.7-22
+- updated to ImageMagick 7.0.7-25
- updated to Qt 5.9.4
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index ecb82b4..c06d866 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -1,4 +1,4 @@
-/*
+/*
LaTeX.nsh
Handling of LaTeX distributions
@@ -388,21 +388,89 @@ FunctionEnd
Function UpdateMiKTeX
# asks to update MiKTeX
- MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" /SD IDNO IDYES
UpdateNow IDNO UpdateLater
- UpdateNow:
- # the update wizard is started by the miktex-update.exe
+ # only for the 2.2.4 installer: force a silent update of MiKTeX then restore
+ # MiKTeX's inernal links
+ # The reason is that MikTeX uses a new package handling system LyX must use
+ # Due to a bug in the old MikTeX package handling the update to the new
package
+ # handling might fail and users cannot use LaTeX at all afterwards - they
then
+ # would have no other choice than to reinstall MiKTeX
+ # This case is fixed by forcing the restoration of the internal links
+ # There is another issue: the MiKTeX update program needs to be replaced by
+ # the new MiKTeX console. This is a 3-step process.
+ #MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES
UpdateNow IDNO UpdateLater
+ #UpdateNow:
+ # graphical update:
+ #MessageBox MB_OK|MB_ICONINFORMATION 'To assure that LyX can create PDF
files the MiKTeX update program must be run two times.$\r$\n\
+ # Please click in the MiKTeX update program only on the "Next" button.$\r$\n\
+ # If "Next" is disabled, click on "Cancel" or "Finish".'
+ #${if} $MultiUser.Privileges != "Admin"
+ #${andif} $MultiUser.Privileges != "Power"
+ # # call the non-admin version
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
+ #${else}
+ # ${if} $MiKTeXUser != "HKCU" # call the admin version
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update_admin.exe"'
+ # ${else}
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
+ # ${endif}
+ #${endif}
+ # silent update:
+ MessageBox MB_OK|MB_ICONINFORMATION "MiKTeX must be updated to assure that
LyX can create PDF files.$\r$\n\
+ This update can take several minutes, depending on your Internet
speed.$\r$\n\
+ Please do not close the LyX installer until it is finished!" /SD IDOK
${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
-ExecWait '"$PathLaTeX\internal\miktex-update.exe"'
+ # the order of the different commands is important!
+ ${if} $Is64bit == "true"
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--install=miktex-console-bin-x64-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--uninstall=miktex-mpm-bin-x64-2.9"'
+ ${else}
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
+ ${endif}
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
+ ${else}
+ ${if} $MiKTeXUser != "HKCU" # call the admin version
+# the order of the different commands is important!
+${if} $Is64bit == "true"
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--update=miktex-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--install=miktex-console-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.e
[LyX/master] Win installer: respect also 64bit MiKTeX
commit 9f9450cacdbbfa06f6234d733d01b7e563858b88
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Mar 11 02:59:08 2018 +0100
Win installer: respect also 64bit MiKTeX
---
.../Win32/packaging/installer/ChangeLog.txt|2 +-
.../Win32/packaging/installer/include/LaTeX.nsh| 35
development/Win32/packaging/installer/settings.nsh |2 +-
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index d42a6cb..d0ef0de 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,4 @@
-Changelog for LyX-230-4:
+Changelog for LyX-230-5:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
- updated to MiKTeX 2.9 build 6615
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index ab6775f..a9e29f8 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -422,19 +422,40 @@ Function UpdateMiKTeX
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
# the order of the different commands is important!
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
+ ${if} $Is64bit == "true"
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--install=miktex-console-bin-x64-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--uninstall=miktex-mpm-bin-x64-2.9"'
+ ${else}
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
+ ${endif}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
# the order of the different commands is important!
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--update=miktex-bin-2.9"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--install=miktex-console-bin-2.9"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--uninstall=miktex-mpm-bin-2.9"'
+${if} $Is64bit == "true"
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--update=miktex-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--install=miktex-console-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--uninstall=miktex-mpm-bin-x64-2.9"'
+${else}
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--update=miktex-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--install=miktex-console-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--uninstall=miktex-mpm-bin-2.9"'
+${endif}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
${else}
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
+${if} $Is64bit == "true"
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--install=miktex-console-bin-x64-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--uninstall=miktex-mpm-bin-x64-2.9"'
+${else}
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe"
"--install=miktex-console-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
+${endif}
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${endif}
${endif}
# restore possibly broken internal MiKTeX links after the update
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 87fb2a0..933d2ab 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 5 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
[LyX/master] add support for the PT fonts
commit d3c51876a902e5d41f79a559ffb2516674e55c1a
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Mar 10 19:59:48 2018 +0100
add support for the PT fonts
- fileformat change
- I also started https://wiki.lyx.org/LyX/NewInLyX24 for new features
---
development/FORMAT |7 ++-
lib/chkconfig.ltx |1 +
lib/latexfonts | 30
lib/lyx2lyx/lyx_2_4.py | 49 ++--
src/tex2lyx/Preamble.cpp | 36 --
src/tex2lyx/test/CJK.lyx.lyx |4 +-
src/tex2lyx/test/CJKutf8.lyx.lyx |4 +-
src/tex2lyx/test/DummyDocument.lyx.lyx |4 +-
src/tex2lyx/test/Dummy~Document.lyx.lyx|4 +-
src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |4 +-
src/tex2lyx/test/algo2e.lyx.lyx|4 +-
.../test/box-color-size-space-align.lyx.lyx|4 +-
src/tex2lyx/test/test-insets-basic.lyx.lyx |4 +-
src/tex2lyx/test/test-insets.lyx.lyx |4 +-
src/tex2lyx/test/test-memoir.lyx.lyx |4 +-
src/tex2lyx/test/test-minted.lyx.lyx |4 +-
src/tex2lyx/test/test-modules.lyx.lyx |4 +-
src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|4 +-
src/tex2lyx/test/test-scr.lyx.lyx |4 +-
src/tex2lyx/test/test-structure.lyx.lyx|4 +-
src/tex2lyx/test/test.lyx.lyx |4 +-
src/tex2lyx/test/verbatim.lyx.lyx |4 +-
src/version.h |4 +-
23 files changed, 149 insertions(+), 46 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 5058ee2..a57d3ed 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,8 +7,13 @@ changes happened in particular if possible. A good example
would be
---
-2018-02-23 Jürgen Spitzmüller <j.spitzmuel...@gmx.de>
+2018-03-10 Uwe Stöhr <uwesto...@web.de>
+ * Format incremented to 546: support for ParaType fonts.
+ - \usepackage{PTSerif} > \font_roman "PTSerif-TLF"
+ - \usepackage[scaled=x.xx]{PTSans} > \font_sans "PTSans-TLF""
+ - \usepackage[scaled=x.xx]{PTMono} > \font_typewriter "PTMono-TLF"
+2018-02-23 Jürgen Spitzmüller <j.spitzmuel...@gmx.de>
* format incremented to 545: Add "literal" param to inset include
This is used by the lstinput caption.
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index ef37440..0aa948c 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -464,6 +464,7 @@
\TestPackage{newtxmath}
\TestPackage[binhex.tex]{binhex} % required by newtxmath
\TestPackage{noto}
+\TestPackage{paratype}
\TestFont[psyr]{symbol}
\TestPackage{tgadventor}
\TestPackage{tgbonum}
diff --git a/lib/latexfonts b/lib/latexfonts
index a0a93ee..307b10e 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -356,6 +356,20 @@ AltFont pplj
SwitchDefault1
EndFont
+Font PTSerif-TLF
+ GuiName "ParaType Serif"
+ Family rm
+ Requiresparatype
+ Package PTSerif
+ CompleteFontparatype
+EndFont
+
+AltFont paratype
+ GuiName "ParaType Serif"
+ Family rm
+ Package paratype
+EndFont
+
Font times
GuiName "Times Roman"
Family rm
@@ -582,6 +596,14 @@ Font NotoSans-TLF
Requires noto
EndFont
+Font PTSans-TLF
+ GuiName "ParaType Sans"
+ Family sf
+ ScaleOption scaled=$$val
+ Requiresparatype
+ Package PTSans
+EndFont
+
Font tgadventor
GuiName "TeX Gyre Adventor"
Family sf
@@ -670,6 +692,14 @@ Font NotoMono-TLF
Requires noto
EndFont
+Font PTMono-TLF
+ GuiName "ParaType Mono"
+ Family tt
+ ScaleOption scaled=$$val
+ Requiresparatype
+ Package PTMono
+EndFont
+
Font tgcursor
GuiName "TeX Gyre Cursor"
Family tt
diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 21e0a08..536bf10 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -24,7 +24,7 @@ import sys, os
# Uncomment only what you need to import, please.
-from parser_tools import (find_end_of_inset, find_token)
+from parser_tools import (find_end_of_inset, find_token, get_value)
#del_token, del_value, del_complete_lines,
#find_complete_lines, find_end_of, find_end_of_layout,
#find_re, find_substring, find_token_backwards,
@@ -32,8 +32,8 @@ from parser_tools import (find_end_o
[LyX/master] Arabic UserGuide.lyx
commit 7b3a04b07f8be04d6c645a3c8ca0603da3dfc782 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Mar 9 05:53:39 2018 +0100 Arabic UserGuide.lyx - new file - it is just a start and put into git to assure that we keep a compilable version - Hatim will bit by bit translate it - can be removed if it should not be ready before the next major release lib/doc/Makefile.am |3 +- lib/doc/ar/UserGuide.lyx |54924 ++ 2 files changed, 54926 insertions(+), 1 deletions(-)
[LyX/master] ar.po: some updates from Hatim
commit 4ff212acec222584f9edea5422830317de3114ef Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Mar 9 05:48:56 2018 +0100 ar.po: some updates from Hatim po/ar.po | 1599 +- 1 files changed, 739 insertions(+), 860 deletions(-)
[LyX/2.3.x] ar.po: some updates from Hatim
commit df3065124d6f89e677f56053cd48e4f7240e1d3a Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Mar 9 05:48:31 2018 +0100 ar.po: some updates from Hatim po/ar.po | 1599 +- 1 files changed, 739 insertions(+), 860 deletions(-)
[LyX/master] tex2lyx: parse \xymatrix
commit 1174279967c4ee369d9de1438f18b7e5c748b127
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Fri Mar 9 04:53:33 2018 +0100
tex2lyx: parse \xymatrix
LyX's \xymatrix support relies on math therefore put it into math and parse
its content
fixes bug #10638
---
lib/syntax.default |1 -
src/tex2lyx/text.cpp | 13 +
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lib/syntax.default b/lib/syntax.default
index d9596b6..550b6f1 100644
--- a/lib/syntax.default
+++ b/lib/syntax.default
@@ -705,7 +705,6 @@ $$
\vspace{}
\vspace*{}
\whiledo{}{}
-\xymatrix{} % this is basically an array => the contents would be parsed badly
(bug 8396)
% LaTeX environments.
% They have always one extra "argument":
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 8198b82..2633f74 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3267,6 +3267,19 @@ void parse_text(Parser & p, ostream & os, unsigned
flags, bool outer,
continue;
}
+ if (t.cs() == "xymatrix") {
+ // we must open a new math because LyX's xy support is
in math
+ context.check_layout(os);
+ begin_inset(os, "Formula ");
+ os << '$';
+ os << "\\" << t.cs() << '{';
+ parse_math(p, os, FLAG_ITEM, MATH_MODE);
+ os << '}' << '$';
+ end_inset(os);
+ preamble.registerAutomaticallyLoadedPackage("xy");
+ continue;
+ }
+
if (t.cs() == "includegraphics") {
bool const clip = p.next_token().asInput() == "*";
if (clip)
[LyX/master] Win installer: adapt update process to work with recent MiKTeX
commit 848462a139aedfcdd3b02efa1e456a583d474145
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Thu Mar 8 22:35:38 2018 +0100
Win installer: adapt update process to work with recent MiKTeX
- finally the installer should result in a fully functional LyX, no matter
when users installed MiKTeX or updated it the last time (or never)
---
.../Win32/packaging/installer/ChangeLog.txt|4 ++--
.../Win32/packaging/installer/include/LaTeX.nsh| 10 ++
development/Win32/packaging/installer/settings.nsh |2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 31f4735..d42a6cb 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,8 @@
-Changelog for LyX-230-1:
+Changelog for LyX-230-4:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
- updated to MiKTeX 2.9 build 6615
-- updated to ImageMagick 7.0.7-24
+- updated to ImageMagick 7.0.7-25
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 399ef18..ab6775f 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -395,6 +395,8 @@ Function UpdateMiKTeX
# handling might fail and users cannot use LaTeX at all afterwards - they
then
# would have no other choice than to reinstall MiKTeX
# This case is fixed by forcing the restoration of the internal links
+ # There is another issue: the MiKTeX update program needs to be replaced by
+ # the new MiKTeX console. This is a 3-step process.
#MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES
UpdateNow IDNO UpdateLater
#UpdateNow:
# graphical update:
@@ -419,9 +421,17 @@ Function UpdateMiKTeX
${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
+ # the order of the different commands is important!
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update=miktex-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--install=miktex-console-bin-2.9"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--uninstall=miktex-mpm-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
+# the order of the different commands is important!
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--update=miktex-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--install=miktex-console-bin-2.9"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin"
"--uninstall=miktex-mpm-bin-2.9"'
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 7d25cb7..87fb2a0 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -14,7 +14,7 @@ These typically need to be modified for each LyX release
!define APP_VERSION_REVISION 0
!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX
otherwise ""
!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX
otherwise ""
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each
version
+!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each
version
!define APP_VERSION
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}"
# Version to display
[LyX/2.3.2-staging] status.23x: correct sorting
commit e9470e7d64117171a48c2cc3426c63856667c6d0 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Mar 6 22:34:21 2018 +0100 status.23x: correct sorting tex2lyx biblatex support is an improvement not a bugfix. At least in the past we sorted new tex2lyx features this way. --- status.23x |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/status.23x b/status.23x index ed12ee8..b13eaf5 100644 --- a/status.23x +++ b/status.23x @@ -21,6 +21,7 @@ What's new * TEX2LYX IMPROVEMENTS +- Add support for biblatex. * USER INTERFACE @@ -105,8 +106,6 @@ What's new - Consider options passed via \PassOptionsToPackage. -- Add support for biblatex. - - Add support for alignment pseudo-environments as used inside floats (bug 7857).
[LyX/2.3.2-staging] status.23x: mention the new biblatex support in tex2lyx
commit 150fb89e22742dcf1f61500b498bc9e7e2a7702c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Tue Mar 6 13:52:42 2018 +0100
status.23x: mention the new biblatex support in tex2lyx
---
status.23x |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/status.23x b/status.23x
index 3698b06..7d0cb28 100644
--- a/status.23x
+++ b/status.23x
@@ -21,6 +21,10 @@ What's new
* TEX2LYX IMPROVEMENTS
+- support for most commands provided by the biblatex package
+
+- support biblatex's qualified citation lists:
+ \cites(pre)(post)[pre1][post1]{key1}[pre2][post2]{key2}...
* USER INTERFACE
[LyX/master] Arabic doc files: corrections by Hatim
commit 6fde01e70ed70755ed0da9699da47fccf98abb11 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Mar 5 22:34:10 2018 +0100 Arabic doc files: corrections by Hatim lib/doc/ar/Shortcuts.lyx | 10 +- lib/doc/ar/Tutorial.lyx | 356 +++--- 2 files changed, 181 insertions(+), 185 deletions(-)
[LyX/2.3.x] Arabic doc files: corrections by Hatim
commit ee51a8675809aade1886c766cbd67c3c1daadd5f Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Mar 5 22:33:56 2018 +0100 Arabic doc files: corrections by Hatim lib/doc/ar/Shortcuts.lyx | 10 +- lib/doc/ar/Tutorial.lyx | 356 +++--- 2 files changed, 181 insertions(+), 185 deletions(-)
[LyX/master] ru.po: updates by Yuriy
commit 6fa7a4ce70d19d455e0c354a2871941a45ae3305 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Mar 5 20:42:28 2018 +0100 ru.po: updates by Yuriy --- po/ru.po | 109 +++-- 1 files changed, 55 insertions(+), 54 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3e0ee0e..79b2168 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-27 18:29+0200\n" +"PO-Revision-Date: 2018-03-05 15:11+0200\n" "Last-Translator: Yuriy Skalko <yuriy.ska...@gmail.com>\n" "Language-Team: Russian <lyx-d...@lists.lyx.org>\n" "Language: ru\n" @@ -1684,11 +1684,11 @@ msgstr "&Низ страницы" #: src/frontends/qt4/ui/FloatPlacementUi.ui:100 msgid " columns" -msgstr "&Охватывать все столбцы" +msgstr "&Занимать все столбцы" #: src/frontends/qt4/ui/FloatPlacementUi.ui:107 msgid " sideways" -msgstr "Пов&ернуть в сторону" +msgstr "Пов&ернуть набок" #: src/frontends/qt4/ui/FontUi.ui:14 msgid "FontUi" @@ -5407,27 +5407,27 @@ msgstr "Единицы измерения ширины" #: src/frontends/qt4/ui/WrapUi.ui:68 msgid "number of needed lines" -msgstr "нужное количество строк" +msgstr "Количество строк" #: src/frontends/qt4/ui/WrapUi.ui:75 msgid "use number of lines" -msgstr "использовать количество строк" +msgstr "Использовать заданное количество строк" #: src/frontends/qt4/ui/WrapUi.ui:78 msgid " span:" -msgstr "&Междустрочный интервал:" +msgstr "&Строки:" #: src/frontends/qt4/ui/WrapUi.ui:199 msgid "Outer (default)" -msgstr "Наружный (по умолчанию)" +msgstr "Наружное (по умолчанию)" #: src/frontends/qt4/ui/WrapUi.ui:204 msgid "Inner" -msgstr "Внутренний" +msgstr "Внутреннее" #: src/frontends/qt4/ui/WrapUi.ui:222 msgid "use overhang" -msgstr "с выступом" +msgstr "Использовать выступ" #: src/frontends/qt4/ui/WrapUi.ui:225 msgid "Over:" @@ -5435,7 +5435,7 @@ msgstr "Выступ:" #: src/frontends/qt4/ui/WrapUi.ui:246 msgid "Overhang value" -msgstr "Выступ" +msgstr "Значение выступа" #: src/frontends/qt4/ui/WrapUi.ui:273 msgid "Unit of overhang value" @@ -5443,7 +5443,7 @@ msgstr "Единицы измерения выступа" #: src/frontends/qt4/ui/WrapUi.ui:280 msgid "Check this to allow flexible placement" -msgstr "Отметьте для разрешения гибкого расположения" +msgstr "Отметьте для плавающего размещения объекта" #: src/frontends/qt4/ui/WrapUi.ui:283 msgid "Allow " @@ -17757,7 +17757,7 @@ msgstr "Ограничители...|г" #: lib/ui/stdcontext.inc:38 lib/ui/stdmenus.inc:472 msgid "Matrix...|x" -msgstr "Матрица|М" +msgstr "Матрица...|М" #: lib/ui/stdcontext.inc:39 lib/ui/stdmenus.inc:473 msgid "Macro|o" @@ -17971,15 +17971,15 @@ msgstr "Простая рамка, разрывы строк|р" #: lib/ui/stdcontext.inc:183 lib/ui/stdmenus.inc:504 msgid "Oval, Thin|a" -msgstr "Овальная, тонкая|а" +msgstr "Тонкая овальная рамка|о" #: lib/ui/stdcontext.inc:184 lib/ui/stdmenus.inc:505 msgid "Oval, Thick|v" -msgstr "Овальная, толстая|я" +msgstr "Толстая овальная рамка|в" #: lib/ui/stdcontext.inc:185 lib/ui/stdmenus.inc:506 msgid "Drop Shadow|w" -msgstr "Отбрасывать тень|т" +msgstr "Рамка с тенью|т" #: lib/ui/stdcontext.inc:186 lib/ui/stdmenus.inc:507 msgid "Shaded Background|B" @@ -18024,7 +18024,7 @@ msgstr "Вертикальный фантом" #: lib/ui/stdcontext.inc:234 lib/ui/stdmenus.inc:432 msgid "Interword Space|w" -msgstr "Пробел между слов|б" +msgstr "Пробел между словами|б" #: lib/ui/stdcontext.inc:235 msgid "Protected Space|o" @@ -18040,30 +18040,30 @@ msgstr "Тонкий пробел|Т" #: lib/ui/stdcontext.inc:238 lib/ui/stdcontext.inc:263 msgid "Negative Thin Space|N" -msgstr "Отрицательный промежуток|О" +msgstr "Отрицательный тонкий пробел|О" #: lib/ui/stdcontext.inc:239 lib/ui/stdcontext.inc:266 msgid "Half Quad Space (Enskip)|k" -msgstr "Полуквадрат (Enskip)|л" +msgstr "Полуквадрат (enskip)|л" # Неразрывный пробел в пол квадрата? #: lib/ui/stdcontext.inc:240 msgid "Protected Half Quad Space (Enspace)|E" -msgstr "Узкий неразрывный пробел (Enspace)|У" +msgstr "Защищённый полуквадрат (ens
[LyX/2.3.x] ru.po: updates by Yuriy
commit 276f1c90a0e9c3197c6b9bf529de1e757334d7d6 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Mar 5 20:42:18 2018 +0100 ru.po: updates by Yuriy --- po/ru.po | 109 +++-- 1 files changed, 55 insertions(+), 54 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3e0ee0e..79b2168 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-27 18:29+0200\n" +"PO-Revision-Date: 2018-03-05 15:11+0200\n" "Last-Translator: Yuriy Skalko <yuriy.ska...@gmail.com>\n" "Language-Team: Russian <lyx-d...@lists.lyx.org>\n" "Language: ru\n" @@ -1684,11 +1684,11 @@ msgstr "&Низ страницы" #: src/frontends/qt4/ui/FloatPlacementUi.ui:100 msgid " columns" -msgstr "&Охватывать все столбцы" +msgstr "&Занимать все столбцы" #: src/frontends/qt4/ui/FloatPlacementUi.ui:107 msgid " sideways" -msgstr "Пов&ернуть в сторону" +msgstr "Пов&ернуть набок" #: src/frontends/qt4/ui/FontUi.ui:14 msgid "FontUi" @@ -5407,27 +5407,27 @@ msgstr "Единицы измерения ширины" #: src/frontends/qt4/ui/WrapUi.ui:68 msgid "number of needed lines" -msgstr "нужное количество строк" +msgstr "Количество строк" #: src/frontends/qt4/ui/WrapUi.ui:75 msgid "use number of lines" -msgstr "использовать количество строк" +msgstr "Использовать заданное количество строк" #: src/frontends/qt4/ui/WrapUi.ui:78 msgid " span:" -msgstr "&Междустрочный интервал:" +msgstr "&Строки:" #: src/frontends/qt4/ui/WrapUi.ui:199 msgid "Outer (default)" -msgstr "Наружный (по умолчанию)" +msgstr "Наружное (по умолчанию)" #: src/frontends/qt4/ui/WrapUi.ui:204 msgid "Inner" -msgstr "Внутренний" +msgstr "Внутреннее" #: src/frontends/qt4/ui/WrapUi.ui:222 msgid "use overhang" -msgstr "с выступом" +msgstr "Использовать выступ" #: src/frontends/qt4/ui/WrapUi.ui:225 msgid "Over:" @@ -5435,7 +5435,7 @@ msgstr "Выступ:" #: src/frontends/qt4/ui/WrapUi.ui:246 msgid "Overhang value" -msgstr "Выступ" +msgstr "Значение выступа" #: src/frontends/qt4/ui/WrapUi.ui:273 msgid "Unit of overhang value" @@ -5443,7 +5443,7 @@ msgstr "Единицы измерения выступа" #: src/frontends/qt4/ui/WrapUi.ui:280 msgid "Check this to allow flexible placement" -msgstr "Отметьте для разрешения гибкого расположения" +msgstr "Отметьте для плавающего размещения объекта" #: src/frontends/qt4/ui/WrapUi.ui:283 msgid "Allow " @@ -17757,7 +17757,7 @@ msgstr "Ограничители...|г" #: lib/ui/stdcontext.inc:38 lib/ui/stdmenus.inc:472 msgid "Matrix...|x" -msgstr "Матрица|М" +msgstr "Матрица...|М" #: lib/ui/stdcontext.inc:39 lib/ui/stdmenus.inc:473 msgid "Macro|o" @@ -17971,15 +17971,15 @@ msgstr "Простая рамка, разрывы строк|р" #: lib/ui/stdcontext.inc:183 lib/ui/stdmenus.inc:504 msgid "Oval, Thin|a" -msgstr "Овальная, тонкая|а" +msgstr "Тонкая овальная рамка|о" #: lib/ui/stdcontext.inc:184 lib/ui/stdmenus.inc:505 msgid "Oval, Thick|v" -msgstr "Овальная, толстая|я" +msgstr "Толстая овальная рамка|в" #: lib/ui/stdcontext.inc:185 lib/ui/stdmenus.inc:506 msgid "Drop Shadow|w" -msgstr "Отбрасывать тень|т" +msgstr "Рамка с тенью|т" #: lib/ui/stdcontext.inc:186 lib/ui/stdmenus.inc:507 msgid "Shaded Background|B" @@ -18024,7 +18024,7 @@ msgstr "Вертикальный фантом" #: lib/ui/stdcontext.inc:234 lib/ui/stdmenus.inc:432 msgid "Interword Space|w" -msgstr "Пробел между слов|б" +msgstr "Пробел между словами|б" #: lib/ui/stdcontext.inc:235 msgid "Protected Space|o" @@ -18040,30 +18040,30 @@ msgstr "Тонкий пробел|Т" #: lib/ui/stdcontext.inc:238 lib/ui/stdcontext.inc:263 msgid "Negative Thin Space|N" -msgstr "Отрицательный промежуток|О" +msgstr "Отрицательный тонкий пробел|О" #: lib/ui/stdcontext.inc:239 lib/ui/stdcontext.inc:266 msgid "Half Quad Space (Enskip)|k" -msgstr "Полуквадрат (Enskip)|л" +msgstr "Полуквадрат (enskip)|л" # Неразрывный пробел в пол квадрата? #: lib/ui/stdcontext.inc:240 msgid "Protected Half Quad Space (Enspace)|E" -msgstr "Узкий неразрывный пробел (Enspace)|У" +msgstr "Защищённый полуквадрат (ens
[LyX/master] tex2lyx/text.cpp: fix a typo
commit a30972a39c10647ffcb7eab5382f250331db7a8b
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Mon Mar 5 17:37:50 2018 +0100
tex2lyx/text.cpp: fix a typo
---
src/tex2lyx/text.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 3276595..cda081b 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2526,7 +2526,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags,
bool outer,
bool have_cycled = false;
while (p.good()) {
- // Leave hear only after at least one cycle
+ // Leave here only after at least one cycle
if (have_cycled && flags & FLAG_LEAVE) {
flags &= ~FLAG_LEAVE;
break;
[LyX/master] Win installer: workaround for the MiKTeX update bug
commit 426ecc52a45c217802c4547dcadc03da5372a8a3
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Mar 4 21:40:16 2018 +0100
Win installer: workaround for the MiKTeX update bug
---
.../Win32/packaging/installer/ChangeLog.txt|2 +
.../Win32/packaging/installer/include/LaTeX.nsh| 53 +---
development/Win32/packaging/installer/settings.nsh |3 +-
3 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 61cd73d..31f4735 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -2,6 +2,7 @@
- installs LyX 2.3.0
- fix installation of Arabic spell checker
- updated to MiKTeX 2.9 build 6615
+- updated to ImageMagick 7.0.7-24
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
@@ -11,6 +12,7 @@ Changelog for LyX-230-RC2:
- installs LyX 2.3.0 RC2
- updated to Qt 5.9.4
- updated to ImageMagick 7.0.7-22
+- updated to NSIS 3.0.3
Changelog for LyX-230-RC1:
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 63de0e1..399ef18 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -388,21 +388,58 @@ FunctionEnd
Function UpdateMiKTeX
# asks to update MiKTeX
- MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" /SD IDNO IDYES
UpdateNow IDNO UpdateLater
- UpdateNow:
- # the update wizard is started by the miktex-update.exe
+ # only for the 2.3.0 installer: force a silent update of MiKTeX then restore
+ # MiKTeX's inernal links
+ # The reason is that MikTeX uses a new package handling system LyX must use
+ # Due to a bug in the old MikTeX package handling the update to the new
package
+ # handling might fail and users cannot use LaTeX at all afterwards - they
then
+ # would have no other choice than to reinstall MiKTeX
+ # This case is fixed by forcing the restoration of the internal links
+ #MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" #/SD IDNO IDYES
UpdateNow IDNO UpdateLater
+ #UpdateNow:
+ # graphical update:
+ #MessageBox MB_OK|MB_ICONINFORMATION 'To assure that LyX can create PDF
files the MiKTeX update program must be run two times.$\r$\n\
+ # Please click in the MiKTeX update program only on the "Next" button.$\r$\n\
+ # If "Next" is disabled, click on "Cancel" or "Finish".'
+ #${if} $MultiUser.Privileges != "Admin"
+ #${andif} $MultiUser.Privileges != "Power"
+ # # call the non-admin version
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
+ #${else}
+ # ${if} $MiKTeXUser != "HKCU" # call the admin version
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update_admin.exe"'
+ # ${else}
+ # nsExec::ExecToLog '"$PathLaTeX\internal\miktex-update.exe"'
+ # ${endif}
+ #${endif}
+ # silent update:
+ MessageBox MB_OK|MB_ICONINFORMATION "MiKTeX must be updated to assure that
LyX can create PDF files.$\r$\n\
+ This update can take several minutes, depending on your Internet
speed.$\r$\n\
+ Please do not close the LyX installer until it is finished!" /SD IDOK
${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
-ExecWait '"$PathLaTeX\internal\miktex-update.exe"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
-ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--update"'
${else}
- ExecWait '"$PathLaTeX\internal\miktex-update.exe"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--update"'
${endif}
${endif}
- UpdateLater:
+ # restore possibly broken internal MiKTeX links after the update
+ # suggested by the MikTeX maintainer:
https://github.com/MiKTeX/miktex/issues/82
+ ${if} $MultiUser.Privileges != "Admin"
+ ${andif} $MultiUser.Privileges != "Power"
+ # call the non-admin version
+ nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--mklinks" "--force"'
+ ${else}
+ ${if} $MiKTeXUser != "HKCU" # call the admin version
+nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--admin" "--mklinks"
"--force"'
+ ${else}
+ nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" "--mklinks" "--force"'
+ ${endif}
+ ${endif}
+ #UpdateLater:
FunctionEnd
-
dif
[LyX/2.3.x] ar.po: update from Hatim
commit 5e038342236ccec58e3f61b4b80da68ce1dbbbec Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Mar 4 21:26:01 2018 +0100 ar.po: update from Hatim po/ar.po | 2265 +++--- 1 files changed, 996 insertions(+), 1269 deletions(-)
[LyX/master] ar.po: update from Hatim
commit 16e18f16c353914f29b1274674d4b787ba4aa9fe Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Mar 4 21:25:36 2018 +0100 ar.po: update from Hatim po/ar.po | 2265 +++--- 1 files changed, 996 insertions(+), 1269 deletions(-)
[LyX/2.3.1-staging] status.23x: mention the updated po files in 2.3.x branch
commit 7a474a8e8bb765127057a705a7568c6e025a35a4 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Mar 3 12:46:04 2018 +0100 status.23x: mention the updated po files in 2.3.x branch - also sync an entry with status.22x --- status.23x |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/status.23x b/status.23x index 18ed4fa..84020ef 100644 --- a/status.23x +++ b/status.23x @@ -15,6 +15,8 @@ What's new * DOCUMENT INPUT/OUTPUT +- Updated Arabic, Russian and Slovakian user interface localization. + * TEX2LYX IMPROVEMENTS @@ -65,7 +67,7 @@ What's new * INTERNALS -- Properly quote python interpreter when scanning TeX files. +- Fix bug that TeX files were not detected when reconfiguring LyX (bug 11053). * DOCUMENTATION AND LOCALIZATION
[LyX/2.2.x] status.22x: fix a typo
commit ecc9fde511140fbb463cc24649e130841610068d Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Mar 3 12:23:16 2018 +0100 status.22x: fix a typo --- status.22x |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/status.22x b/status.22x index a860bd3..bfb1930 100644 --- a/status.22x +++ b/status.22x @@ -75,7 +75,7 @@ What's new - Fix issue with language nesting when using Asian languages (bug 10778). -- Fix bug that TeX files were not detected when reconfigurng LyX (bug 11053). +- Fix bug that TeX files were not detected when reconfiguring LyX (bug 11053). * LYX2LYX
[LyX/2.2.x] configure.py: add quotes around path to python
commit 3ed0dc700eee3261491d7aabd0768a1c10134abf
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Mar 3 12:19:28 2018 +0100
configure.py: add quotes around path to python
fixes bug #11053
---
lib/configure.py |3 ++-
status.22x |2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 955eba0..de88d65 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1530,7 +1530,8 @@ def rescanTeXFiles():
interpreter = sys.executable
if interpreter == '':
interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"' + os.path.join(srcdir,
'scripts', 'TeXFiles.py') + '"')
+tfp = cmdOutput('"%s" -tt "%s"' % (interpreter,\
+os.path.join(srcdir, 'scripts', 'TeXFiles.py')))
logger.info(tfp)
logger.info("\tdone")
diff --git a/status.22x b/status.22x
index d69a4f4..a860bd3 100644
--- a/status.22x
+++ b/status.22x
@@ -75,6 +75,8 @@ What's new
- Fix issue with language nesting when using Asian languages (bug 10778).
+- Fix bug that TeX files were not detected when reconfigurng LyX (bug 11053).
+
* LYX2LYX
[LyX/master] configure.py: fix bug #11053
commit 64d1751f2f25668e1b7ed3e6607e22c8e6533ff7
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Fri Mar 2 20:14:58 2018 +0100
configure.py: fix bug #11053
- add quotes around the path to the python executable
---
lib/configure.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 2e81d22..888cf99 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1777,7 +1777,7 @@ def rescanTeXFiles():
interpreter = sys.executable
if interpreter == '':
interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"'
+tfp = cmdOutput('"' + interpreter + '"' + " -tt " + '"'
+ os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
logger.info(tfp)
logger.info("\tdone")
[LyX/2.3.x] configure.py: fix bug #11053
commit 151ee98e3b886bc95fc072c7401270658f0bff6e
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Fri Mar 2 20:12:41 2018 +0100
configure.py: fix bug #11053
- add quotes around the path to the python executable
---
lib/configure.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 23ec3c8..54c7503 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1772,7 +1772,7 @@ def rescanTeXFiles():
interpreter = sys.executable
if interpreter == '':
interpreter = "python"
-tfp = cmdOutput(interpreter + " -tt " + '"'
+tfp = cmdOutput('"' + interpreter + '"' + " -tt " + '"'
+ os.path.join(srcdir, 'scripts', 'TeXFiles.py') + '"')
logger.info(tfp)
logger.info("\tdone")
[LyX/master] ru.po: updates from Yuriy
commit 588e9248a0f1fd126179ab6ee8c29721be5752b4 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Thu Mar 1 19:33:18 2018 +0100 ru.po: updates from Yuriy --- po/ru.po | 52 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/po/ru.po b/po/ru.po index 487952e..3e0ee0e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-21 17:02+0200\n" +"PO-Revision-Date: 2018-02-27 18:29+0200\n" "Last-Translator: Yuriy Skalko <yuriy.ska...@gmail.com>\n" "Language-Team: Russian <lyx-d...@lists.lyx.org>\n" "Language: ru\n" @@ -18184,11 +18184,11 @@ msgstr "Двойной чистый лист|Д" #: lib/ui/stdcontext.inc:317 lib/ui/stdmenus.inc:442 msgid "Ragged Line Break|R" -msgstr "Неровный разрыв строки|с" +msgstr "Разрыв строки|с" #: lib/ui/stdcontext.inc:318 lib/ui/stdmenus.inc:443 msgid "Justified Line Break|J" -msgstr "Равномерный разрыв строки|з" +msgstr "Разрыв строки с выравниванием|з" #: lib/ui/stdcontext.inc:325 msgid "Plain Separator|P" @@ -18611,7 +18611,7 @@ msgstr "Помощь|щ" #: lib/ui/stdmenus.inc:45 msgid "New|N" -msgstr "Новый|й" +msgstr "Создать|з" #: lib/ui/stdmenus.inc:46 msgid "New from Template...|m" @@ -18623,7 +18623,7 @@ msgstr "Открыть...|О" #: lib/ui/stdmenus.inc:48 msgid "Open Recent|t" -msgstr "Открыть недавний|д" +msgstr "Недавние документы|д" #: lib/ui/stdmenus.inc:50 msgid "Close|C" @@ -19156,7 +19156,7 @@ msgstr "Математика|а" #: lib/ui/stdmenus.inc:371 msgid "Special Character|p" -msgstr "Специальные символы|ц" +msgstr "Специальный символ|ц" #: lib/ui/stdmenus.inc:372 msgid "Formatting|o" @@ -19340,7 +19340,7 @@ msgstr "Разрыв лигатуры|л" #: lib/ui/stdmenus.inc:441 msgid "Optional Line Break|B" -msgstr "Разрыв строки|Р" +msgstr "Возможный разрыв строки|р" #: lib/ui/stdmenus.inc:454 msgid "Display Formula|D" @@ -19404,7 +19404,7 @@ msgstr "Добавить новую ветку..." #: lib/ui/stdmenus.inc:538 msgid "Change Tracking|C" -msgstr "Начать/Остановить слежение" +msgstr "Отслеживание изменений" #: lib/ui/stdmenus.inc:539 msgid "Build Program|B" @@ -19480,23 +19480,23 @@ msgstr "Перейти к метке|м" #: lib/ui/stdmenus.inc:578 msgid "Save Bookmark 1|S" -msgstr "Заложить закладку 1|З" +msgstr "Сохранить закладку 1|з" #: lib/ui/stdmenus.inc:579 msgid "Save Bookmark 2" -msgstr "Заложить закладку 2" +msgstr "Сохранить закладку 2" #: lib/ui/stdmenus.inc:580 msgid "Save Bookmark 3" -msgstr "Заложить закладку 3" +msgstr "Сохранить закладку 3" #: lib/ui/stdmenus.inc:581 msgid "Save Bookmark 4" -msgstr "Заложить закладку 4" +msgstr "Сохранить закладку 4" #: lib/ui/stdmenus.inc:582 msgid "Save Bookmark 5" -msgstr "Заложить закладку 4" +msgstr "Сохранить закладку 5" #: lib/ui/stdmenus.inc:583 msgid "Clear Bookmarks|C" @@ -19504,7 +19504,7 @@ msgstr "Очистить закладки|О" #: lib/ui/stdmenus.inc:585 msgid "Navigate Back|B" -msgstr "Обратная прокрутка|б" +msgstr "Вернуться назад|н" #: lib/ui/stdmenus.inc:594 msgid "Spellchecker...|S" @@ -28646,8 +28646,8 @@ msgid "" "LyX is Copyright (C) 1995 by Matthias Ettrich,\n" "1995--%1$s LyX Team" msgstr "" -"Авторское право на LyX (C) 1995 Matthias Ettrich,\n" -"1995--%1$s Группа разработки LyX" +"LyX -- Copyright (C) 1995 Matthias Ettrich,\n" +"1995--%1$s команда разработки LyX" #: src/frontends/qt4/GuiAbout.cpp:191 msgid "" @@ -28656,10 +28656,11 @@ msgid "" "Software Foundation; either version 2 of the License, or (at your option) " "any later version." msgstr "" -"Эта программа - свободная; вы можете распространять её и/или изменять\n" -"в соответствии с условиями GNU General Public License, опубликованной\n" -"Free Software Foundation; в Лицензии версии 2, или (по вашему усмотрению)\n" -"любой более поздней версии." +"Эта программа является свободным программным обеспечением; вы можете " +"распространять и/или модифицировать её согласно условиям GNU General Public " +"License, опубликованной Фондом свободного программног
[LyX/master] ar.po: update from Hatim
commit ffbd4e977acbb430ab88c5c765c2ffd1e7f7b36a Author: Uwe Stöhr <uwesto...@lyx.org> Date: Thu Mar 1 19:33:32 2018 +0100 ar.po: update from Hatim po/ar.po | 3514 ++ 1 files changed, 1938 insertions(+), 1576 deletions(-)
[LyX/2.3.x] ru.po: updates from Yuriy
commit a54ab3ff335a3db27ae1c54253c15a67e855b1fc Author: Uwe Stöhr <uwesto...@lyx.org> Date: Thu Mar 1 19:32:55 2018 +0100 ru.po: updates from Yuriy po/ru.po | 1241 -- 1 files changed, 632 insertions(+), 609 deletions(-)
[LyX/2.3.x] ar.po: update from Hatim
commit 68421b02d5c22ebc25a488b5debfb449bdc7bf0d Author: Uwe Stöhr <uwesto...@lyx.org> Date: Thu Mar 1 19:19:42 2018 +0100 ar.po: update from Hatim --- po/ar.gmo | Bin 394488 -> 397715 bytes po/ar.po | 133 2 files changed, 62 insertions(+), 71 deletions(-) diff --git a/po/ar.gmo b/po/ar.gmo index 693ac0f..cceb329 100644 Binary files a/po/ar.gmo and b/po/ar.gmo differ diff --git a/po/ar.po b/po/ar.po index f0fa6f6..49d3209 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.3.0\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2018-02-24 19:14-0500\n" -"PO-Revision-Date: 2018-02-19 16:27+0300\n" +"POT-Creation-Date: 2018-03-01 19:07+0100\n" +"PO-Revision-Date: 2018-02-26 17:53+0300\n" "Last-Translator: Hatim Alahmady <dr.ha...@hotmail.com>\n" "Language-Team: Hatim Alahmady <dr.ha...@hotmail.com>\n" "Language: ar\n" @@ -7343,11 +7343,11 @@ msgstr "رسم بياني" #: lib/layouts/achemso.layout:190 lib/layouts/achemso.layout:202 msgid "Chart" -msgstr "رسم بياني" +msgstr "جدول بياني" #: lib/layouts/achemso.layout:196 msgid "List of Charts" -msgstr "قائمة الرسوم البيانية" +msgstr "قائمة الجداول البيانية" #: lib/layouts/achemso.layout:210 msgid "Graphs[[mathematical]]" @@ -7355,11 +7355,11 @@ msgstr "رسم[[mathematical]]" #: lib/layouts/achemso.layout:216 lib/layouts/achemso.layout:228 msgid "Graph[[mathematical]]" -msgstr "شكل بياني" +msgstr "رسم بياني" #: lib/layouts/achemso.layout:222 msgid "List of Graphs[[mathematical]]" -msgstr "قائمة الأشكال البيانية" +msgstr "قائمة الرسوم البيانية" #: lib/layouts/achemso.layout:256 msgid "SupplementalInfo" @@ -7531,9 +7531,8 @@ msgid "State" msgstr "المحافظة" #: lib/layouts/acmart.layout:278 lib/layouts/acmart.layout:280 -#, fuzzy msgid "Postal Code" -msgstr "تعليق البريد" +msgstr "الرمز البريدي" #: lib/layouts/acmart.layout:286 msgid "TitleNote" @@ -7701,14 +7700,12 @@ msgid "Computing Classification Scheme: " msgstr "كود التصنيف" #: lib/layouts/acmart.layout:444 -#, fuzzy msgid "Set Copyright" msgstr "تعيين حقوق النشر" #: lib/layouts/acmart.layout:446 -#, fuzzy msgid "Set Copyright: " -msgstr "تعيين حقوق النشر" +msgstr "تعيين حقوق النشر:" #: lib/layouts/acmart.layout:450 msgid "Copyright Year" @@ -9332,15 +9329,15 @@ msgstr "على الشرائح فقط" #: lib/layouts/beamer.layout:867 msgid "Block" -msgstr "" +msgstr "الكتلة" #: lib/layouts/beamer.layout:868 msgid "Blocks" -msgstr "" +msgstr "الكتل" #: lib/layouts/beamer.layout:877 msgid "Block:" -msgstr "" +msgstr "الكتلة:" #: lib/layouts/beamer.layout:888 msgid "Action Specification|S" @@ -9348,11 +9345,11 @@ msgstr "تخصيص تأثير|S" #: lib/layouts/beamer.layout:895 msgid "Block Title" -msgstr "" +msgstr "عنوان الكتلة" #: lib/layouts/beamer.layout:896 msgid "Enter the block title here" -msgstr "" +msgstr "كتابة عنوان الكتلة هنا" #: lib/layouts/beamer.layout:911 msgid "ExampleBlock" @@ -9601,7 +9598,7 @@ msgstr "Beamerposter" #: lib/layouts/bicaption.module:2 msgid "Multilingual Captions" -msgstr "" +msgstr "تعليق متعدد اللغات" #: lib/layouts/bicaption.module:6 msgid "" @@ -11065,14 +11062,12 @@ msgid "Text (right side)" msgstr "نص (جهة اليمين)" #: lib/layouts/europasscv.layout:290 -#, fuzzy msgid "BlueItem" -msgstr "بند مزدوج" +msgstr "بند ازرق" #: lib/layouts/europasscv.layout:293 -#, fuzzy msgid "Blue item:" -msgstr "بند مزدوج:" +msgstr "بند ازرق:" #: lib/layouts/europasscv.layout:296 msgid "BlueItemInset" @@ -12536,14 +12531,12 @@ msgid "Vita:" msgstr "" #: lib/layouts/iucr.layout:206 -#, fuzzy msgid "PDB reference" -msgstr "تفضيلات" +msgstr "مرجع PDB" #: lib/layouts/iucr.layout:209 -#, fuzzy msgid "PDB reference:" -msgstr "تفضيلات" +msgstr "مرجع PDB :" #: lib/layouts/iucr.layout:212 msgid "Optional name" @@ -13017,7 +13010,7 @@ msgstr "مؤلف جدول المحتويات:" #: lib/layouts/llncs.layout:310 msgid "Case #." -msgstr "" +msgstr "الحالة #." #: lib/layouts/llncs.layout:320 lib/layouts/svmon
[LyX/master] ar.po: correct year
commit 2889f7df05f4bd5481cd83f3ff63b23e6c681001 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Feb 23 22:37:13 2018 +0100 ar.po: correct year --- po/ar.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ar.po b/po/ar.po index c45b3d0..f9d9a84 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # Arabic translation of LyX # Copyright (C) 2008--2013 LyX Developers # This file is distributed under the same license as the PACKAGE package. -# Hatim Alahmady <dr.ha...@hotmail.com>, 2008 - 2017. +# Hatim Alahmady <dr.ha...@hotmail.com>, 2008 - 2018. msgid "" msgstr "" "Project-Id-Version: LyX 2.3.0\n"
[LyX/2.3.x] ar.po: correct year
commit b5dc4856f79f56e7908c2d54e79e68252b642200 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Feb 23 22:37:02 2018 +0100 ar.po: correct year --- po/ar.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ar.po b/po/ar.po index c45b3d0..f9d9a84 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # Arabic translation of LyX # Copyright (C) 2008--2013 LyX Developers # This file is distributed under the same license as the PACKAGE package. -# Hatim Alahmady <dr.ha...@hotmail.com>, 2008 - 2017. +# Hatim Alahmady <dr.ha...@hotmail.com>, 2008 - 2018. msgid "" msgstr "" "Project-Id-Version: LyX 2.3.0\n"
[LyX/2.2.x] status.22x: mention Arabic
commit a57b0bf3e5f4ccddc32cc6a6f93766a422b41975 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Feb 23 22:35:13 2018 +0100 status.22x: mention Arabic --- status.22x |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/status.22x b/status.22x index a91ad6b..f8aa4b0 100644 --- a/status.22x +++ b/status.22x @@ -31,7 +31,7 @@ What's new * DOCUMENTATION AND LOCALIZATION -- Updated Japanese user interface localization. +- Updated Arabic and Japanese user interface localization. * BUILD/INSTALLATION
[LyX/2.2.x] ar.po: backport translations from Hatim
commit be87f081c8fb31bddc744d9831378e64b50b0ba0 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Fri Feb 23 22:34:21 2018 +0100 ar.po: backport translations from Hatim po/ar.gmo | Bin 378449 -> 386101 bytes po/ar.po | 1341 + 2 files changed, 1005 insertions(+), 336 deletions(-)
[LyX/master] Arabic Shortcuts.lyx: fixes by Hatim
commit 713970001abac541f51da7037fbc290148b25d1a
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Thu Feb 22 15:35:50 2018 +0100
Arabic Shortcuts.lyx: fixes by Hatim
---
lib/doc/ar/Shortcuts.lyx | 88 +++--
1 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx
index c8c78bb..512dc9a 100644
--- a/lib/doc/ar/Shortcuts.lyx
+++ b/lib/doc/ar/Shortcuts.lyx
@@ -434,9 +434,12 @@ arg "buffer-write"
\begin_inset Text
\begin_layout Plain Layout
+\begin_inset Info
+type "shortcut"
+arg "buffer-next"
+\end_inset
+
-\lang english
-Ctrl+Tab
\end_layout
\end_inset
@@ -3803,7 +3806,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
times
@@ -3835,10 +3837,10 @@ times
\begin_layout Standard
عند كتابة المسائل الرياضية والفيزيائية نستخدم كثيرا الأس للأساس عشرة
-\begin_inset Formula $\times10^{}$
+\begin_inset Formula $\times10^{3}$
\end_inset
- ويمكن عمل اختصار لها بحيث ندرجها بنقرة زر.
+ ويمكن عمل اختصار له بحيث ندرجه بنقرة زر.
\end_layout
\begin_layout Standard
@@ -3861,7 +3863,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
times 10^
@@ -3873,16 +3874,74 @@ times 10^
\end_layout
\begin_layout Standard
-ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+(لاحظ الرمز بعد
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\strikeout off
+\xout off
+\uuline off
+\uwave off
+\noun off
+\color none
+
+\family default
+\series default
+\shape default
+\size default
+\emph default
+\numeric on
+\bar default
+\strikeout default
+\xout default
+\uuline default
+\uwave default
+\noun default
+\color inherit
+10
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\numeric off
+\bar no
+\strikeout off
+\xout off
+\uuline off
+\uwave off
+\noun off
+\color none
+
+\family default
+\series default
+\shape default
+\size default
+\emph default
+\bar default
+\strikeout default
+\xout default
+\uuline default
+\uwave default
+\noun default
+\color inherit
+هو إشارة الأس
+\begin_inset Formula $SHIFT+6$
+\end_inset
+
+ ) ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
\begin_inset Formula $Alt+6$
\end_inset
- ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+ ثم زر موافق، الآن إذا اردنا ادراج الأس للأساس عشرة في أي معادلة نضغط الزرين
\begin_inset Formula $Alt+6$
\end_inset
- ونختصر الكثير من الوقت.
+ .
\end_layout
\begin_layout Paragraph*
@@ -3924,7 +3983,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
tag*
@@ -3940,12 +3998,18 @@ tag*
\begin_inset Formula $Alt+t$
\end_inset
- ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+ ثم زر موافق، الآن إذا اردنا ادراج مربع اسم معادلة في أي معادلة نضغط الزرين
\begin_inset Formula $Alt+t$
\end_inset
- ونختصر الكثير من الوقت.
+ ، وهذا الاختصار لن يعمل إلا إذا كانت المعادلة من نوع معادلة مرقمة،
+\family sans
+إدراج\SpecialChar menuseparator
+رياضيات\SpecialChar menuseparator
+
+\family default
+معادلة مرقمة .
\end_layout
\end_body
[LyX/2.3.x] Arabic Shortcuts.lyx: fixes by Hatim
commit 1aa4f965c56afcd36f7196d0347549a909e6f8a8
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Thu Feb 22 15:35:22 2018 +0100
Arabic Shortcuts.lyx: fixes by Hatim
---
lib/doc/ar/Shortcuts.lyx | 88 +++--
1 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx
index c8c78bb..512dc9a 100644
--- a/lib/doc/ar/Shortcuts.lyx
+++ b/lib/doc/ar/Shortcuts.lyx
@@ -434,9 +434,12 @@ arg "buffer-write"
\begin_inset Text
\begin_layout Plain Layout
+\begin_inset Info
+type "shortcut"
+arg "buffer-next"
+\end_inset
+
-\lang english
-Ctrl+Tab
\end_layout
\end_inset
@@ -3803,7 +3806,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
times
@@ -3835,10 +3837,10 @@ times
\begin_layout Standard
عند كتابة المسائل الرياضية والفيزيائية نستخدم كثيرا الأس للأساس عشرة
-\begin_inset Formula $\times10^{}$
+\begin_inset Formula $\times10^{3}$
\end_inset
- ويمكن عمل اختصار لها بحيث ندرجها بنقرة زر.
+ ويمكن عمل اختصار له بحيث ندرجه بنقرة زر.
\end_layout
\begin_layout Standard
@@ -3861,7 +3863,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
times 10^
@@ -3873,16 +3874,74 @@ times 10^
\end_layout
\begin_layout Standard
-ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+(لاحظ الرمز بعد
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\bar no
+\strikeout off
+\xout off
+\uuline off
+\uwave off
+\noun off
+\color none
+
+\family default
+\series default
+\shape default
+\size default
+\emph default
+\numeric on
+\bar default
+\strikeout default
+\xout default
+\uuline default
+\uwave default
+\noun default
+\color inherit
+10
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\numeric off
+\bar no
+\strikeout off
+\xout off
+\uuline off
+\uwave off
+\noun off
+\color none
+
+\family default
+\series default
+\shape default
+\size default
+\emph default
+\bar default
+\strikeout default
+\xout default
+\uuline default
+\uwave default
+\noun default
+\color inherit
+هو إشارة الأس
+\begin_inset Formula $SHIFT+6$
+\end_inset
+
+ ) ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
\begin_inset Formula $Alt+6$
\end_inset
- ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+ ثم زر موافق، الآن إذا اردنا ادراج الأس للأساس عشرة في أي معادلة نضغط الزرين
\begin_inset Formula $Alt+6$
\end_inset
- ونختصر الكثير من الوقت.
+ .
\end_layout
\begin_layout Paragraph*
@@ -3924,7 +3983,6 @@ status open
\begin_layout Plain Layout
-\lang english
math-insert
\backslash
tag*
@@ -3940,12 +3998,18 @@ tag*
\begin_inset Formula $Alt+t$
\end_inset
- ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+ ثم زر موافق، الآن إذا اردنا ادراج مربع اسم معادلة في أي معادلة نضغط الزرين
\begin_inset Formula $Alt+t$
\end_inset
- ونختصر الكثير من الوقت.
+ ، وهذا الاختصار لن يعمل إلا إذا كانت المعادلة من نوع معادلة مرقمة،
+\family sans
+إدراج\SpecialChar menuseparator
+رياضيات\SpecialChar menuseparator
+
+\family default
+معادلة مرقمة .
\end_layout
\end_body
[LyX/master] ru.po: corrections by Yuriy
commit 931e42a6a2e29a3010ecf31025a5e5a392eff3ec Author: Uwe Stöhr <uwesto...@lyx.org> Date: Wed Feb 21 19:58:11 2018 +0100 ru.po: corrections by Yuriy --- po/ru.po | 172 ++--- 1 files changed, 85 insertions(+), 87 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6e2564c..487952e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-19 03:53+0200\n" +"PO-Revision-Date: 2018-02-21 17:02+0200\n" "Last-Translator: Yuriy Skalko <yuriy.ska...@gmail.com>\n" "Language-Team: Russian <lyx-d...@lists.lyx.org>\n" "Language: ru\n" @@ -1776,13 +1776,13 @@ msgstr "Выбрать гарнитуру для формул" #: src/frontends/qt4/ui/FontUi.ui:253 msgid "C:" -msgstr "C:" +msgstr "КК&Я:" #: src/frontends/qt4/ui/FontUi.ui:263 msgid "Input the font to be used for Chinese, Japanese or Korean (CJK) script" msgstr "" -"Введите шрифт, который будет использоваться для китайского, японского или " -"корейского (CJK) языка" +"Введите шрифт, который будет использоваться для китайского, корейского или " +"японского (ККЯ) языка" #: src/frontends/qt4/ui/FontUi.ui:270 msgid "Use a real small caps shape, if the font provides one" @@ -2098,7 +2098,7 @@ msgstr "Поставьте этот флажок для ввода параме #: src/frontends/qt4/ui/ListingsSettingsUi.ui:82 #: src/frontends/qt4/ui/ListingsUi.ui:510 msgid " validation" -msgstr "Обойти проверку" +msgstr "Пропускать проверку" #: src/frontends/qt4/ui/IncludeUi.ui:86 msgid "C:" @@ -2784,14 +2784,13 @@ msgstr "Скобки матрицы" msgid "All packages:" msgstr "Все пакеты:" -# ? #: src/frontends/qt4/ui/MathsUi.ui:27 msgid "Load A" msgstr "Автоматически" #: src/frontends/qt4/ui/MathsUi.ui:34 msgid "Load Alwa" -msgstr "Загружать всегда" +msgstr "Всегда загружать" #: src/frontends/qt4/ui/MathsUi.ui:41 msgid "Do Load" @@ -16891,7 +16890,7 @@ msgstr "Амхарский" #: lib/languages:158 msgid "Greek (ancient)" -msgstr "Греческий (политонический)" +msgstr "Греческий (древний)" #: lib/languages:175 msgid "Arabic (ArabTeX)" @@ -17092,7 +17091,7 @@ msgstr "Японский" #: lib/languages:730 msgid "Japanese (CJK)" -msgstr "Японский (CJK)" +msgstr "Японский (ККЯ)" #: lib/languages:739 src/frontends/qt4/GuiSymbols.cpp:72 msgid "Kannada" @@ -17152,11 +17151,11 @@ msgstr "Английский (Новая Зеландия)" #: lib/languages:886 msgid "Norwegian (Bokmaal)" -msgstr "Норвежский (Bokmaal)" +msgstr "Норвежский (Букмол)" #: lib/languages:896 msgid "Norwegian (Nynorsk)" -msgstr "Норвежский (Nynorsk)" +msgstr "Норвежский (Нюнорск)" #: lib/languages:907 msgid "Occitan" @@ -17669,7 +17668,7 @@ msgstr "Китайский (традиционный) (Big5)" #: lib/encodings:187 msgid "Japanese (CJK) (SJIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (ККЯ) (SJIS)" #: lib/encodings:194 msgid "Chinese (simplified) (EUC-CN)" @@ -17681,7 +17680,7 @@ msgstr "Китайский (упрощённый) (GBK)" #: lib/encodings:202 msgid "Japanese (CJK) (JIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (ККЯ) (JIS)" #: lib/encodings:206 msgid "Korean (EUC-KR)" @@ -17689,7 +17688,7 @@ msgstr "Корейский (EUC-KR)" #: lib/encodings:210 msgid "Unicode (CJK) (utf8)" -msgstr "Юникод (CJK) (utf8)" +msgstr "Юникод (ККЯ) (utf8)" #: lib/encodings:214 msgid "Chinese (traditional) (EUC-TW)" @@ -17697,23 +17696,23 @@ msgstr "Китайский (традиционный) (EUC-TW)" #: lib/encodings:218 msgid "Japanese (CJK) (EUC-JP)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (ККЯ) (EUC-JP)" #: lib/encodings:225 msgid "Japanese (pLaTeX) (EUC-JP)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (pLaTeX) (EUC-JP)" #: lib/encodings:227 msgid "Japanese (pLaTeX) (JIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (pLaTeX) (JIS)" #: lib/encodings:229 msgid "Japanese (pLaTeX) (SJIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (pLaTeX) (SJIS)" #: lib/encodings:231 msgid "Japanese (pLaTeX) (UTF8)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (pLa
[LyX/2.3.x] Arabic Shortcuts.lyx: translation update from Hatim
commit 7ddb5fb3e52a69f7c2ec6576ba30756c6e774c52
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Feb 21 19:18:40 2018 +0100
Arabic Shortcuts.lyx: translation update from Hatim
---
lib/doc/ar/Shortcuts.lyx | 213 --
1 files changed, 207 insertions(+), 6 deletions(-)
diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx
index 229409c..c8c78bb 100644
--- a/lib/doc/ar/Shortcuts.lyx
+++ b/lib/doc/ar/Shortcuts.lyx
@@ -97,7 +97,7 @@ arg "bind_file"
\family default
.
- تستطيع تعديل الاختصارات من قائمة الادوات
+ تستطيع تعديل الاختصارات من قائمة الأدوات
\family sans
\SpecialChar menuseparator
تفضيلات\SpecialChar menuseparator
@@ -115,9 +115,7 @@ status open
\end_inset
-
-\lang english
-Buffer
+أساسيات
\end_layout
\begin_layout Standard
@@ -648,7 +646,7 @@ arg "cut"
\begin_inset Text
\begin_layout Plain Layout
-الة كاتبة
+آلة كاتبة
\end_layout
\end_inset
@@ -1199,7 +1197,7 @@ arg "bookmark-goto 0"
\end_layout
\begin_layout Subsection*
-الرموز الاغريقية
+الرموز الإغريقية
\end_layout
\begin_layout Standard
@@ -3747,5 +3745,208 @@ arg "math-delim | |"
\end_layout
+\begin_layout Section*
+إضافة اختصار
+\end_layout
+
+\begin_layout Standard
+يسمح ليك بإضافة أي عدد من الإختصارات بطريقة سهلة عن طريق الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ثم نكتب الدالة ونختار الرمز.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+1
+\end_layout
+
+\begin_layout Standard
+عند كتابة المعادلات والمسائل الرياضية نستخدم كثيرا إشارة الضرب
+\begin_inset Formula $\times$
+\end_inset
+
+ ولإدراجها نذهب لشريط الرياضيات في الأسفل ثم
+\begin_inset Quotes cld
+\end_inset
+
+رموز العلمليات الرياضية
+\begin_inset Quotes crd
+\end_inset
+
+ ونختارها، لكن باستخدام الاختصارات نختصر كل هذه الخطوات في خطوة واحدة.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align left
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+times
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+8$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+8$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+2
+\end_layout
+
+\begin_layout Standard
+عند كتابة المسائل الرياضية والفيزيائية نستخدم كثيرا الأس للأساس عشرة
+\begin_inset Formula $\times10^{}$
+\end_inset
+
+ ويمكن عمل اختصار لها بحيث ندرجها بنقرة زر.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+times 10^
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+6$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+6$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+3
+\end_layout
+
+\begin_layout Standard
+عند كتابة المعادلات والمسائل الرياضية والفيزيائية نحتاج لكتابة اسم المعادلة
+ أو رمز لها أو كلمة مثل
+\begin_inset Quotes cld
+\end_inset
+
+نعوض في
+\begin_inset Quotes crd
+\end_inset
+
+ على يمين أو يسار المعادلة.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+tag*
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+t$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+t$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
\end_body
\end_document
[LyX/master] Arabic Shortcuts.lyx: translation update from Hatim
commit 652ca5f578c1b4854a12833da50ea31e37ac552e
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Feb 21 19:58:25 2018 +0100
Arabic Shortcuts.lyx: translation update from Hatim
---
lib/doc/ar/Shortcuts.lyx | 213 --
1 files changed, 207 insertions(+), 6 deletions(-)
diff --git a/lib/doc/ar/Shortcuts.lyx b/lib/doc/ar/Shortcuts.lyx
index 229409c..c8c78bb 100644
--- a/lib/doc/ar/Shortcuts.lyx
+++ b/lib/doc/ar/Shortcuts.lyx
@@ -97,7 +97,7 @@ arg "bind_file"
\family default
.
- تستطيع تعديل الاختصارات من قائمة الادوات
+ تستطيع تعديل الاختصارات من قائمة الأدوات
\family sans
\SpecialChar menuseparator
تفضيلات\SpecialChar menuseparator
@@ -115,9 +115,7 @@ status open
\end_inset
-
-\lang english
-Buffer
+أساسيات
\end_layout
\begin_layout Standard
@@ -648,7 +646,7 @@ arg "cut"
\begin_inset Text
\begin_layout Plain Layout
-الة كاتبة
+آلة كاتبة
\end_layout
\end_inset
@@ -1199,7 +1197,7 @@ arg "bookmark-goto 0"
\end_layout
\begin_layout Subsection*
-الرموز الاغريقية
+الرموز الإغريقية
\end_layout
\begin_layout Standard
@@ -3747,5 +3745,208 @@ arg "math-delim | |"
\end_layout
+\begin_layout Section*
+إضافة اختصار
+\end_layout
+
+\begin_layout Standard
+يسمح ليك بإضافة أي عدد من الإختصارات بطريقة سهلة عن طريق الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ثم نكتب الدالة ونختار الرمز.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+1
+\end_layout
+
+\begin_layout Standard
+عند كتابة المعادلات والمسائل الرياضية نستخدم كثيرا إشارة الضرب
+\begin_inset Formula $\times$
+\end_inset
+
+ ولإدراجها نذهب لشريط الرياضيات في الأسفل ثم
+\begin_inset Quotes cld
+\end_inset
+
+رموز العلمليات الرياضية
+\begin_inset Quotes crd
+\end_inset
+
+ ونختارها، لكن باستخدام الاختصارات نختصر كل هذه الخطوات في خطوة واحدة.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align left
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+times
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+8$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+8$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+2
+\end_layout
+
+\begin_layout Standard
+عند كتابة المسائل الرياضية والفيزيائية نستخدم كثيرا الأس للأساس عشرة
+\begin_inset Formula $\times10^{}$
+\end_inset
+
+ ويمكن عمل اختصار لها بحيث ندرجها بنقرة زر.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+times 10^
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+6$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+6$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
+\begin_layout Paragraph*
+مثال
+\numeric on
+3
+\end_layout
+
+\begin_layout Standard
+عند كتابة المعادلات والمسائل الرياضية والفيزيائية نحتاج لكتابة اسم المعادلة
+ أو رمز لها أو كلمة مثل
+\begin_inset Quotes cld
+\end_inset
+
+نعوض في
+\begin_inset Quotes crd
+\end_inset
+
+ على يمين أو يسار المعادلة.
+\end_layout
+
+\begin_layout Standard
+نذهب إلى الأدوات
+\family sans
+\SpecialChar menuseparator
+تفضيلات\SpecialChar menuseparator
+تحرير\SpecialChar menuseparator
+اختصارات\SpecialChar menuseparator
+جديد ، ونكتب في حقل الدالة
+\end_layout
+
+\begin_layout Standard
+
+\family sans
+\lang english
+\begin_inset listings
+inline false
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+math-insert
+\backslash
+tag*
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+ثم ننقر على زر الاختصار الفارغ، ثم نضغط الزرين
+\begin_inset Formula $Alt+t$
+\end_inset
+
+ ثم زر موافق، الآن إذا اردنا ادراج إشارة الضرب في أي معادلة نضغط الزرين
+
+\begin_inset Formula $Alt+t$
+\end_inset
+
+ ونختصر الكثير من الوقت.
+\end_layout
+
\end_body
\end_document
[LyX/2.3.x] ru.po: corrections by Yuriy
commit 11cd38d24a6fd265a13894f09b848df70a6db206 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Wed Feb 21 19:19:01 2018 +0100 ru.po: corrections by Yuriy --- po/ru.po | 172 ++--- 1 files changed, 85 insertions(+), 87 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6e2564c..487952e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-28 21:42-0500\n" -"PO-Revision-Date: 2018-02-19 03:53+0200\n" +"PO-Revision-Date: 2018-02-21 17:02+0200\n" "Last-Translator: Yuriy Skalko <yuriy.ska...@gmail.com>\n" "Language-Team: Russian <lyx-d...@lists.lyx.org>\n" "Language: ru\n" @@ -1776,13 +1776,13 @@ msgstr "Выбрать гарнитуру для формул" #: src/frontends/qt4/ui/FontUi.ui:253 msgid "C:" -msgstr "C:" +msgstr "КК&Я:" #: src/frontends/qt4/ui/FontUi.ui:263 msgid "Input the font to be used for Chinese, Japanese or Korean (CJK) script" msgstr "" -"Введите шрифт, который будет использоваться для китайского, японского или " -"корейского (CJK) языка" +"Введите шрифт, который будет использоваться для китайского, корейского или " +"японского (ККЯ) языка" #: src/frontends/qt4/ui/FontUi.ui:270 msgid "Use a real small caps shape, if the font provides one" @@ -2098,7 +2098,7 @@ msgstr "Поставьте этот флажок для ввода параме #: src/frontends/qt4/ui/ListingsSettingsUi.ui:82 #: src/frontends/qt4/ui/ListingsUi.ui:510 msgid " validation" -msgstr "Обойти проверку" +msgstr "Пропускать проверку" #: src/frontends/qt4/ui/IncludeUi.ui:86 msgid "C:" @@ -2784,14 +2784,13 @@ msgstr "Скобки матрицы" msgid "All packages:" msgstr "Все пакеты:" -# ? #: src/frontends/qt4/ui/MathsUi.ui:27 msgid "Load A" msgstr "Автоматически" #: src/frontends/qt4/ui/MathsUi.ui:34 msgid "Load Alwa" -msgstr "Загружать всегда" +msgstr "Всегда загружать" #: src/frontends/qt4/ui/MathsUi.ui:41 msgid "Do Load" @@ -16891,7 +16890,7 @@ msgstr "Амхарский" #: lib/languages:158 msgid "Greek (ancient)" -msgstr "Греческий (политонический)" +msgstr "Греческий (древний)" #: lib/languages:175 msgid "Arabic (ArabTeX)" @@ -17092,7 +17091,7 @@ msgstr "Японский" #: lib/languages:730 msgid "Japanese (CJK)" -msgstr "Японский (CJK)" +msgstr "Японский (ККЯ)" #: lib/languages:739 src/frontends/qt4/GuiSymbols.cpp:72 msgid "Kannada" @@ -17152,11 +17151,11 @@ msgstr "Английский (Новая Зеландия)" #: lib/languages:886 msgid "Norwegian (Bokmaal)" -msgstr "Норвежский (Bokmaal)" +msgstr "Норвежский (Букмол)" #: lib/languages:896 msgid "Norwegian (Nynorsk)" -msgstr "Норвежский (Nynorsk)" +msgstr "Норвежский (Нюнорск)" #: lib/languages:907 msgid "Occitan" @@ -17669,7 +17668,7 @@ msgstr "Китайский (традиционный) (Big5)" #: lib/encodings:187 msgid "Japanese (CJK) (SJIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (ККЯ) (SJIS)" #: lib/encodings:194 msgid "Chinese (simplified) (EUC-CN)" @@ -17681,7 +17680,7 @@ msgstr "Китайский (упрощённый) (GBK)" #: lib/encodings:202 msgid "Japanese (CJK) (JIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (ККЯ) (JIS)" #: lib/encodings:206 msgid "Korean (EUC-KR)" @@ -17689,7 +17688,7 @@ msgstr "Корейский (EUC-KR)" #: lib/encodings:210 msgid "Unicode (CJK) (utf8)" -msgstr "Юникод (CJK) (utf8)" +msgstr "Юникод (ККЯ) (utf8)" #: lib/encodings:214 msgid "Chinese (traditional) (EUC-TW)" @@ -17697,23 +17696,23 @@ msgstr "Китайский (традиционный) (EUC-TW)" #: lib/encodings:218 msgid "Japanese (CJK) (EUC-JP)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (ККЯ) (EUC-JP)" #: lib/encodings:225 msgid "Japanese (pLaTeX) (EUC-JP)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (pLaTeX) (EUC-JP)" #: lib/encodings:227 msgid "Japanese (pLaTeX) (JIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (pLaTeX) (JIS)" #: lib/encodings:229 msgid "Japanese (pLaTeX) (SJIS)" -msgstr "Японский (CJK) (JIS)" +msgstr "Японский (pLaTeX) (SJIS)" #: lib/encodings:231 msgid "Japanese (pLaTeX) (UTF8)" -msgstr "Японский (CJK) (EUC-JP)" +msgstr "Японский (pLa
[LyX/master] port the recent fixes and update of layouttranslations to master
commit b04e6eae3bd51f25ad88ef63e80f03905cece08d Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:42:36 2018 +0100 port the recent fixes and update of layouttranslations to master README.localization | 15 +- lib/layouttranslations| 14 +- lib/layouttranslations.review |4 +- po/ar.po | 1563 +++-- 4 files changed, 744 insertions(+), 852 deletions(-)
[LyX/2.3.x] README.localization: document how to update layouttranslations under Win
commit ff2e969fb966c9c94931fd100f7880b041f406af Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:41:59 2018 +0100 README.localization: document how to update layouttranslations under Win --- README.localization | 15 +-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.localization b/README.localization index a10c0d1..8aa9649 100644 --- a/README.localization +++ b/README.localization @@ -180,8 +180,19 @@ typical places in .po files, where to fix the translation, can be seen on the following commit: https://www.lyx.org/trac/changeset/38169. If you need to manually regenerate the layouttranslations file from .po files -run `make ../lib/layouttranslations' in the po directory. The Python polib -library is needed for building the output file. +- Under Linux: execute the command + `make ../lib/layouttranslations' + in the po directory. The Python polib library is needed for building the output + file. +- Under Windows: + 1. install the Python extensions "polib". To do this, + 1.1 open a commen line prompt in the folder where you find the file "pip.exe" + withing the python installation folder. + 1.2 execute the command + pip install polib + 2. close the command prompt and open the file "lyx.sln" with MSVC. You find +file in the compilation result folder you set for LyX + 3. right click in MSVC on the target "layouttranslations1" and choose "Rebuild" Optionally - to quickly check whether some new translatable strings appeared for your language you can always check ../lib/layouttranslations.review.
[LyX/2.3.x] layouttranslations.review: update revision state
commit 2b5a98ccb45744950066efb081e1d3e9b510dce8 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:33:58 2018 +0100 layouttranslations.review: update revision state --- lib/layouttranslations.review |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review index 39474b7..7dda8c0 100644 --- a/lib/layouttranslations.review +++ b/lib/layouttranslations.review @@ -30,9 +30,9 @@ sr (30.11.2017, LyX 2.3.0 release ) Additionally to the top ones, these languages should be reviewed for the following strings "List of Listings" -ar bg ca da el es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW +bg ca da es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW "Nomenclature[[output]]" -> The string that is output to PDF for the nomenclature list "see equation[[nomencl]]" "page[[nomencl]]" -ar bg ca da el fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW +bg ca da fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW
[LyX/master] move README.Documentation to attic
commit 9457c60d5236a4cc6eafe12c5f2146012566bab9 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:31:00 2018 +0100 move README.Documentation to attic It is outdated since many years now and we have the relevant info in the Development.lyx file --- lib/doc/Makefile.am|2 - lib/doc/README.Documentation | 44 lib/doc/attic/README.Documentation | 44 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index e18228c..5a5e36c 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = README.Documentation - docdir = $(pkgdatadir)/doc dist_doc_DATA = \ Additional.lyx \ diff --git a/lib/doc/README.Documentation b/lib/doc/README.Documentation deleted file mode 100644 index 18982ee..000 --- a/lib/doc/README.Documentation +++ /dev/null @@ -1,44 +0,0 @@ -README.Documentation - -by John Weiss [3/2000] jpwe...@idsi.net - - - -Introduction - -The purpose of this file is *used* *to* *be* to provide a style -sheet and helpful hints to those wishing to help with the -LyX Documentation Project. There's now a separate style-sheet for -that. - -If you're actually looking for documentation, check out the "Help" -menu. Start by reading the Introduction. - - -Why a separate documentation project? Can't the developers do it? - -In a word, no. They're too busy adding features and squishing -bugs. - -Also, g++ is far more forgiving of style changes than a human -brain. As long as the code is correct, g++ will happilly compile -it, and compile it the same way from machine to machine. Human -brains are far less forgiving and far more individualized. So, -the documentation needs to all be in a uniform style, in addition -to being grammatically correct and easily readable. That's a -pretty big undertaking - which is why I volunteered to -administrate the docs back in 1997. Since then, I've passed the -duty of maintaining the docs on to others. - - -Helping Out - -If you'd like to contribute to the LyX Documentation Project, -start by reading the file Intro.lyx. It contains a description of -the style of the documentation from a reader's perspective. After -that, read the LyX Documentation Style Sheet (DocStyle.lyx) and -commit it to memory! - - -John Weiss -March, 2000 diff --git a/lib/doc/attic/README.Documentation b/lib/doc/attic/README.Documentation new file mode 100644 index 000..18982ee --- /dev/null +++ b/lib/doc/attic/README.Documentation @@ -0,0 +1,44 @@ +README.Documentation + +by John Weiss [3/2000] jpwe...@idsi.net + + + +Introduction + +The purpose of this file is *used* *to* *be* to provide a style +sheet and helpful hints to those wishing to help with the +LyX Documentation Project. There's now a separate style-sheet for +that. + +If you're actually looking for documentation, check out the "Help" +menu. Start by reading the Introduction. + + +Why a separate documentation project? Can't the developers do it? + +In a word, no. They're too busy adding features and squishing +bugs. + +Also, g++ is far more forgiving of style changes than a human +brain. As long as the code is correct, g++ will happilly compile +it, and compile it the same way from machine to machine. Human +brains are far less forgiving and far more individualized. So, +the documentation needs to all be in a uniform style, in addition +to being grammatically correct and easily readable. That's a +pretty big undertaking - which is why I volunteered to +administrate the docs back in 1997. Since then, I've passed the +duty of maintaining the docs on to others. + + +Helping Out + +If you'd like to contribute to the LyX Documentation Project, +start by reading the file Intro.lyx. It contains a description of +the style of the documentation from a reader's perspective. After +that, read the LyX Documentation Style Sheet (DocStyle.lyx) and +commit it to memory! + + +John Weiss +March, 2000
[LyX/2.3.x] ar.po: correct some terms from layouttranslations
commit f30fa1a48d6708f01e7fb9c42a42626f167e2fb8 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:30:28 2018 +0100 ar.po: correct some terms from layouttranslations Hatim sent me today both, the ar.po and the layouttranslations. I noticed now that he did not update/translate the terms from layouttranslations in ar.po po/ar.po | 1563 +- 1 files changed, 722 insertions(+), 841 deletions(-)
[LyX/2.3.x] layouttranslations: update file
commit 7547dd546cf104808d48dfaf0a852cf4afcb3aec Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:27:26 2018 +0100 layouttranslations: update file and hopefully fix the encoding issue --- lib/layouttranslations | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index a90170b..7b8c431 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -1,4 +1,4 @@ -# This file has been automatically generated by po/lyx_pot.py. +# This file has been automatically generated by po/lyx_pot.py. # PLEASE MODIFY ONLY THE LAGUAGES HAVING NO .po FILE! If you want to regenerate # this file from the translations, run `make ../lib/layouttranslations' in po. # Python polib library is needed for building the output file. @@ -301,12 +301,12 @@ Translation el "List of Algorithms" "Λίστα Αλγορίθμων" "List of Charts" "Λίστα Γραφικών Παραστάσεων" "List of Graphs[[mathematical]]" "Λίστα Γραφημάτων" - "List of Listings" "Λίστα Περιγραφών" + "List of Listings" "Λίστα Καταλογοποιήσεων" "List of Schemes" "Λίστα Σχεδίων" "List of Tableaux" "Λίστα Ταμπλό" "Listing" "Καταλογοποίηση" - "Listings[[List of Listings]]" "Λίστες" - "Nomenclature[[output]]" "Nomenclature" + "Listings[[List of Listings]]" "Καταλογοποιήσεις" + "Nomenclature[[output]]" "Επιστημονική Ορολογία" "Notation" "Σημειογραφία" "Note" "Σημείωση" "Problem" "Πρόβλημα" @@ -320,8 +320,8 @@ Translation el "Summary" "Σύνοψη" "Tableau" "Ταμπλό" "Theorem" "Θεώρημα" - "page[[nomencl]]" "page" - "see equation[[nomencl]]" "see equation" + "page[[nomencl]]" "σελίδα" + "see equation[[nomencl]]" "δείτε εξίσωση" End Translation en @@ -1539,7 +1539,7 @@ Translation uk "Scheme" "Схема" "Solution" "Розв'язування" "Summary" "Резюме" - "Tableau" "Таблиця" + "Tableau" "Табло" "Theorem" "Теорема" "page[[nomencl]]" "стор." "see equation[[nomencl]]" "див."
[LyX/2.3.x] move README.Documentation to attic
commit 1c159d5885478ac527002725036157d49d29158b Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 20:12:22 2018 +0100 move README.Documentation to attic It is outdated since many years now and we have the relevant info in the Development.lyx file --- lib/doc/Makefile.am|2 - lib/doc/README.Documentation | 44 lib/doc/attic/README.Documentation | 44 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index e18228c..5a5e36c 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = README.Documentation - docdir = $(pkgdatadir)/doc dist_doc_DATA = \ Additional.lyx \ diff --git a/lib/doc/README.Documentation b/lib/doc/README.Documentation deleted file mode 100644 index 18982ee..000 --- a/lib/doc/README.Documentation +++ /dev/null @@ -1,44 +0,0 @@ -README.Documentation - -by John Weiss [3/2000] jpwe...@idsi.net - - - -Introduction - -The purpose of this file is *used* *to* *be* to provide a style -sheet and helpful hints to those wishing to help with the -LyX Documentation Project. There's now a separate style-sheet for -that. - -If you're actually looking for documentation, check out the "Help" -menu. Start by reading the Introduction. - - -Why a separate documentation project? Can't the developers do it? - -In a word, no. They're too busy adding features and squishing -bugs. - -Also, g++ is far more forgiving of style changes than a human -brain. As long as the code is correct, g++ will happilly compile -it, and compile it the same way from machine to machine. Human -brains are far less forgiving and far more individualized. So, -the documentation needs to all be in a uniform style, in addition -to being grammatically correct and easily readable. That's a -pretty big undertaking - which is why I volunteered to -administrate the docs back in 1997. Since then, I've passed the -duty of maintaining the docs on to others. - - -Helping Out - -If you'd like to contribute to the LyX Documentation Project, -start by reading the file Intro.lyx. It contains a description of -the style of the documentation from a reader's perspective. After -that, read the LyX Documentation Style Sheet (DocStyle.lyx) and -commit it to memory! - - -John Weiss -March, 2000 diff --git a/lib/doc/attic/README.Documentation b/lib/doc/attic/README.Documentation new file mode 100644 index 000..18982ee --- /dev/null +++ b/lib/doc/attic/README.Documentation @@ -0,0 +1,44 @@ +README.Documentation + +by John Weiss [3/2000] jpwe...@idsi.net + + + +Introduction + +The purpose of this file is *used* *to* *be* to provide a style +sheet and helpful hints to those wishing to help with the +LyX Documentation Project. There's now a separate style-sheet for +that. + +If you're actually looking for documentation, check out the "Help" +menu. Start by reading the Introduction. + + +Why a separate documentation project? Can't the developers do it? + +In a word, no. They're too busy adding features and squishing +bugs. + +Also, g++ is far more forgiving of style changes than a human +brain. As long as the code is correct, g++ will happilly compile +it, and compile it the same way from machine to machine. Human +brains are far less forgiving and far more individualized. So, +the documentation needs to all be in a uniform style, in addition +to being grammatically correct and easily readable. That's a +pretty big undertaking - which is why I volunteered to +administrate the docs back in 1997. Since then, I've passed the +duty of maintaining the docs on to others. + + +Helping Out + +If you'd like to contribute to the LyX Documentation Project, +start by reading the file Intro.lyx. It contains a description of +the style of the documentation from a reader's perspective. After +that, read the LyX Documentation Style Sheet (DocStyle.lyx) and +commit it to memory! + + +John Weiss +March, 2000
[LyX/master] ar.po and layouttranslations: updates from Hatim
commit 973b4447baa192cfc015024db0eb143c06dd23da Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 18:06:06 2018 +0100 ar.po and layouttranslations: updates from Hatim lib/layouttranslations | 14 +- po/ar.po | 2286 +--- 2 files changed, 1013 insertions(+), 1287 deletions(-)
[LyX/2.3.x] ar.po and layouttranslations: updates from hatim
commit 19b840ae23a888300f9a5c03971351b546cce93d Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Feb 20 18:01:52 2018 +0100 ar.po and layouttranslations: updates from hatim lib/layouttranslations | 14 +- po/ar.po | 2286 +--- 2 files changed, 1013 insertions(+), 1287 deletions(-)
[LyX/master] splash.lyx and ru.po: updates from Yuriy
commit b854df1b4707a7f757120026ba6e82e7aa232bef Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 19 23:32:20 2018 +0100 splash.lyx and ru.po: updates from Yuriy lib/examples/ru/splash.lyx | 10 +- po/ru.po | 999 --- 2 files changed, 100 insertions(+), 909 deletions(-)
[LyX/2.3.x] splash.lyx and ru.po: updates from Yuriy
commit a4c50591959b2cf3839858dc51bf1b182da2944e Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 19 23:31:19 2018 +0100 splash.lyx and ru.po: updates from Yuriy lib/examples/ru/splash.lyx | 10 +- po/ru.po | 999 --- 2 files changed, 100 insertions(+), 909 deletions(-)
[LyX/master] el.po: translations from Odysseas
commit 305e34292eb7a2ed6419550b4fb34c06590eff44 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 19 23:24:14 2018 +0100 el.po: translations from Odysseas --- po/el.po | 37 - 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/po/el.po b/po/el.po index 1c0a86d..ecd29cb 100644 --- a/po/el.po +++ b/po/el.po @@ -7,13 +7,14 @@ msgstr "" "Project-Id-Version: LyX 2.3.0\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-01-25 17:46+0100\n" -"PO-Revision-Date: 2018-01-25 17:35+0100\n" +"PO-Revision-Date: 2018-02-19 22:07+0200\n" "Last-Translator: Οδυσσέας Δαγκλής <o...@freemail.gr>\n" "Language-Team: LyX team <lyx-d...@lists.lyx.org>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.4\n" #: src/frontends/qt4/ui/AboutUi.ui:33 msgid "Version" @@ -75,6 +76,8 @@ msgid "" "Pass content of the `Label' field literally to LaTeX. Check this if you want " "to enter LaTeX code." msgstr "" +"Άμεση μεταφορά περιεχομένου του πεδίου 'Ετικέτα-Label' στο LaTeX. Τσεκάρετε " +"για να μπείτε στον κώδικα LaTeX." #: src/frontends/qt4/ui/BibitemUi.ui:88 src/frontends/qt4/ui/CitationUi.ui:368 #: src/frontends/qt4/ui/HyperlinkUi.ui:80 src/frontends/qt4/ui/NomenclUi.ui:72 @@ -404,7 +407,7 @@ msgstr "Εντά&ξει" #: src/frontends/qt4/ui/BoxUi.ui:23 msgid "Type and Size" -msgstr "" +msgstr "Τύπος και Μέγεθος" #: src/frontends/qt4/ui/BoxUi.ui:32 src/frontends/qt4/ui/WrapUi.ui:103 msgid "Width value" @@ -980,7 +983,7 @@ msgstr "&Φίλτρο:" #: src/frontends/qt4/ui/CitationUi.ui:48 msgid "Select the fields on which the filter applies" -msgstr "" +msgstr "Επιλέξτε τα πεδία εφαρμογής του φίλτρου" #: src/frontends/qt4/ui/CitationUi.ui:61 src/frontends/qt4/GuiCitation.cpp:420 msgid "All fields" @@ -988,7 +991,7 @@ msgstr "Όλα τα πεδία" #: src/frontends/qt4/ui/CitationUi.ui:75 msgid "Select the entry types on which the filter applies" -msgstr "" +msgstr "Επιλέξτε τους τύπους εισαγωγής επί των οποίων εφαρμόζεται το φίλτρο" #: src/frontends/qt4/ui/CitationUi.ui:85 src/frontends/qt4/GuiCitation.cpp:435 msgid "All entry types" @@ -996,7 +999,7 @@ msgstr "Όλοι οι τύποι καταχώρησης" #: src/frontends/qt4/ui/CitationUi.ui:93 msgid "Click for more filter options" -msgstr "" +msgstr "Κάντε κλικ για περισσότερες επιλογές φίλτρου" #: src/frontends/qt4/ui/CitationUi.ui:96 msgid "O" @@ -15296,7 +15299,7 @@ msgstr "Καταχωρήσεις Ευρετηρίου" #: lib/layouts/stdinsets.inc:16 msgid "Listings" -msgstr "" +msgstr "Καταλογοποιήσεις" #: lib/layouts/stdinsets.inc:19 src/insets/InsetMarginal.cpp:36 msgid "margin" @@ -15317,16 +15320,16 @@ msgstr "" #: lib/layouts/stdinsets.inc:287 lib/layouts/stdinsets.inc:293 msgid "Listings[[List of Listings]]" -msgstr "Λίστες[[Λίστα Λιστών]]" +msgstr "Καταλογοποιήσεις[[Λίστα Καταλογοποιήσεων]]" #: lib/layouts/stdinsets.inc:310 lib/layouts/stdinsets.inc:316 #: src/insets/InsetTOC.cpp:77 msgid "List of Listings" -msgstr "Λίστα Περιγραφών" +msgstr "Λίστα Καταλογοποιήσεων" #: lib/layouts/stdinsets.inc:344 src/frontends/qt4/GuiDocument.cpp:1505 msgid "Listings[[inset]]" -msgstr "Λίστες[[ένθεμα]]" +msgstr "Καταλογοποιήσεις[[ένθεμα]]" #: lib/layouts/stdinsets.inc:407 msgid "Idx" @@ -15346,16 +15349,15 @@ msgstr "Προεπισκόπηση" #: lib/layouts/stdinsets.inc:703 lib/layouts/stdinsets.inc:711 msgid "see equation[[nomencl]]" -msgstr "" +msgstr "δείτε εξίσωση[[nomencl]]" #: lib/layouts/stdinsets.inc:704 lib/layouts/stdinsets.inc:712 msgid "page[[nomencl]]" -msgstr "" +msgstr "σελίδα[[nomencl]]" #: lib/layouts/stdinsets.inc:705 lib/layouts/stdinsets.inc:713 -#, fuzzy msgid "Nomenclature[[output]]" -msgstr "Επιστημονική Ορολογία" +msgstr "Επιστημονική Ορολογία[[output]]" #: lib/layouts/stdlayouts.inc:99 msgid "Verbatim*" @@ -18610,7 +18612,7 @@ msgstr "Ρυθμίσεις Πληροφοριών...|ρ" #: lib/ui/stdmenus.inc:149 msgid "Listings Settings...|g" -msgstr "Ρυθμίσεις λίστας...|λ" +msgstr "Ρυθμίσεις Καταλογοποίησης...|λ" #: lib/ui/stdmenus.inc:153 msgid "Table Settings...|a" @@ -19146,7 +19148,7 @@ msgstr "Πίνακας Περιεχομένων|Π" #: lib/
[LyX/master] layouttranslations and uk.po: corrections from Yuri
commit 2eb8016e78efadf0d0b689323c89dd2a932dc449 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 19 23:16:06 2018 +0100 layouttranslations and uk.po: corrections from Yuri lib/layouttranslations | 26 +- po/uk.po | 1405 2 files changed, 719 insertions(+), 712 deletions(-)
[LyX/2.3.x] layouttranslations and uk.po: corrections from Yuri
commit 9ca8dae41d60708635d1d90e11652d19648f6f62 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 19 23:07:01 2018 +0100 layouttranslations and uk.po: corrections from Yuri --- lib/layouttranslations | 26 po/uk.po | 49 +++ 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index f96320f..48b015f 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -1,4 +1,4 @@ -# This file has been automatically generated by po/lyx_pot.py. +# This file has been automatically generated by po/lyx_pot.py. # PLEASE MODIFY ONLY THE LAGUAGES HAVING NO .po FILE! If you want to regenerate # this file from the translations, run `make ../lib/layouttranslations' in po. # Python polib library is needed for building the output file. @@ -1519,30 +1519,30 @@ Translation uk "Fact" "Факт" "Graph[[mathematical]]" "Графік" "Lemma" "Лема" - "List of Algorithms" "Алгоритм" + "List of Algorithms" "Список алгоритмів" "List of Charts" "Список діаграм" "List of Graphs[[mathematical]]" "Список графіків" "List of Listings" "Список текстів програм" "List of Schemes" "Список схем" - "List of Tableaux" "Список табло" + "List of Tableaux" "Список таблиць" "Listing" "Текст програми" "Listings[[List of Listings]]" "Тексти програм" "Nomenclature[[output]]" "Позначення" "Notation" "Позначення" - "Note" "Примітка" - "Problem" "Проблема" - "Proof" "На коректуру" + "Note" "Зауваження" + "Problem" "Задача" + "Proof" "Доведення" "Property" "Властивість" "Proposition" "Твердження" "Question" "Питання" - "Remark" "Помітка" - "Scheme" "Scheme" - "Solution" "Розчин" - "Summary" "Зведення" - "Tableau" "Табло" + "Remark" "Примітка" + "Scheme" "Схема" + "Solution" "Розв'язування" + "Summary" "Резюме" + "Tableau" "Таблиця" "Theorem" "Теорема" - "page[[nomencl]]" "sстор." - "see equation[[nomencl]]" "sдив." + "page[[nomencl]]" "стор." + "see equation[[nomencl]]" "див." End Translation zh_CN diff --git a/po/uk.po b/po/uk.po index 7628f88..4f5e97d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-02-04 15:17+0100\n" -"PO-Revision-Date: 2018-01-15 10:40+0200\n" +"PO-Revision-Date: 2018-02-19 20:11+0200\n" "Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n" "Language-Team: Ukrainian <translat...@linux.org.ua>\n" "Language: uk\n" @@ -16,8 +16,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 2.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<" +"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/frontends/qt4/ui/AboutUi.ui:33 msgid "Version" @@ -6335,7 +6335,7 @@ msgstr "Позначення" #: lib/layouts/theorems-without-preamble.inc:234 lib/layouts/theorems.inc:207 #: lib/layouts/theorems.inc:216 lib/layouts/theorems.inc:219 msgid "Problem" -msgstr "Проблема" +msgstr "Задача" #: lib/layouts/AEA.layout:267 lib/layouts/acmart.layout:594 #: lib/layouts/elsart.layout:344 lib/layouts/foils.layout:264 @@ -6381,7 +6381,7 @@ msgstr "Твердження" #: lib/layouts/theorems-without-preamble.inc:331 lib/layouts/theorems.inc:258 #: lib/layouts/theorems.inc:276 lib/layouts/theorems.inc:279 msgid "Remark" -msgstr "Помітка" +msgstr "Примітка" #: lib/layouts/AEA.layout:276 lib/layouts/ijm
[LyX/master] fr.po: sync with the 2.3.x branch
commit 93f24811333ec81a926ef5c4ca8dd910cf01a156 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Feb 18 23:45:05 2018 +0100 fr.po: sync with the 2.3.x branch After the release the po files will be out of sync but they should be in sync until the release to keep consistent translations. po/fr.po | 3601 -- 1 files changed, 1833 insertions(+), 1768 deletions(-)
[LyX/master] French UserGuide.lyx: fix a typo
commit 599e41e23762342c2de21346676956138afde63e
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 23:42:03 2018 +0100
French UserGuide.lyx: fix a typo
---
lib/doc/fr/UserGuide.lyx |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 5d01044..772 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -165,7 +165,7 @@ logicalmkup
\begin_body
\begin_layout Title
-ibGuide de l'utilisateur de \SpecialChar LyX
+Guide de l'utilisateur de \SpecialChar LyX
\end_layout
@@ -9030,14 +9030,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
-
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
The following 2 lines are empty:
\end_layout
@@ -9050,7 +9048,6 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
-
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -9083,7 +9080,6 @@ Verbatim
\end_layout
\begin_layout Verbatim*
-
This is Verbatim*.
\end_layout
[LyX/2.3.x] French UserGuide.lyx: fix a typo
commit 2f3695eafd2343e52c3ea2297a7734939acf9699
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 23:40:56 2018 +0100
French UserGuide.lyx: fix a typo
---
lib/doc/fr/UserGuide.lyx |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 5d01044..772 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -165,7 +165,7 @@ logicalmkup
\begin_body
\begin_layout Title
-ibGuide de l'utilisateur de \SpecialChar LyX
+Guide de l'utilisateur de \SpecialChar LyX
\end_layout
@@ -9030,14 +9030,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
-
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
The following 2 lines are empty:
\end_layout
@@ -9050,7 +9048,6 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
-
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -9083,7 +9080,6 @@ Verbatim
\end_layout
\begin_layout Verbatim*
-
This is Verbatim*.
\end_layout
[LyX/master] Makefile.am: forgot this in the previous commit
commit 7fe5f1f9eaaf91187f2db29927fe586dcc024a9f Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Feb 18 15:52:30 2018 +0100 Makefile.am: forgot this in the previous commit --- development/Makefile.am |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/development/Makefile.am b/development/Makefile.am index 0639005..8f15904 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -91,7 +91,6 @@ Win32/packaging/installer/ChangeLog.txt \ Win32/packaging/installer/DictionaryMirrors.txt \ Win32/packaging/installer/HunspellDictionaryNames.txt \ Win32/packaging/installer/license.rtf \ -Win32/packaging/installer/lyx.nsi \ Win32/packaging/installer/lyx-bundle.nsi \ Win32/packaging/installer/lyx-standard.nsi \ Win32/packaging/installer/Packages.txt \
[LyX/2.3.x] Win installer: convert all files to Unicode
commit 48aae9bcb587dc6fd87da22511489a6eb3e143aa Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Feb 18 15:52:57 2018 +0100 Win installer: convert all files to Unicode - at the moment some files were in Unicode, some in CP1252 which can make unnecessary troubles - remove an obsolete file - update InstallerStructure.odg --- development/Makefile.am|1 - .../Win32/packaging/installer/gui/LaTeXFolder.nsh |2 +- .../Win32/packaging/installer/gui/external.nsh |2 +- .../packaging/installer/include/EnvVarUpdate.nsh |2 +- .../Win32/packaging/installer/include/LaTeX.nsh|2 +- .../Win32/packaging/installer/include/LyXUtils.nsh |2 +- .../packaging/installer/include/declarations.nsh |2 +- .../packaging/installer/include/detection.nsh |2 +- .../packaging/installer/include/dictionaries.nsh |2 +- .../Win32/packaging/installer/include/filelist.nsh |2 +- .../Win32/packaging/installer/include/gui.nsh |2 +- .../Win32/packaging/installer/include/nsis.nsh |2 +- .../packaging/installer/include/variables.nsh |2 +- .../installer/information/InstallerStructure.odg | Bin 17038 -> 18284 bytes .../installer/information/InstallerStructure.pdf | Bin 27492 -> 37336 bytes development/Win32/packaging/installer/lyx.nsi | 55 development/Win32/packaging/installer/settings.nsh |2 +- .../Win32/packaging/installer/setup/configure.nsh |2 +- .../Win32/packaging/installer/setup/install.nsh|2 +- .../Win32/packaging/installer/setup/uninstall.nsh |2 +- 20 files changed, 16 insertions(+), 72 deletions(-) diff --git a/development/Makefile.am b/development/Makefile.am index 0a1b3df..ec5a94f 100644 --- a/development/Makefile.am +++ b/development/Makefile.am @@ -91,7 +91,6 @@ Win32/packaging/installer/ChangeLog.txt \ Win32/packaging/installer/DictionaryMirrors.txt \ Win32/packaging/installer/HunspellDictionaryNames.txt \ Win32/packaging/installer/license.rtf \ -Win32/packaging/installer/lyx.nsi \ Win32/packaging/installer/lyx-bundle.nsi \ Win32/packaging/installer/lyx-standard.nsi \ Win32/packaging/installer/Packages.txt \ diff --git a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh index 0ab0e8c..2041727 100644 --- a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh +++ b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh @@ -1,4 +1,4 @@ -Function LatexFolder +Function LatexFolder !insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini" # generate the installer page diff --git a/development/Win32/packaging/installer/gui/external.nsh b/development/Win32/packaging/installer/gui/external.nsh index 003a582..b2aa949 100644 --- a/development/Win32/packaging/installer/gui/external.nsh +++ b/development/Win32/packaging/installer/gui/external.nsh @@ -1,4 +1,4 @@ -/* +/* external.nsh diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh index 974bc67..12de15f 100644 --- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh +++ b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh @@ -1,4 +1,4 @@ -/** +/** * EnvVarUpdate.nsh *: Environmental Variables: append, prepend, and remove entries * diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index ecb82b4..63de0e1 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -1,4 +1,4 @@ -/* +/* LaTeX.nsh Handling of LaTeX distributions diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh index c513b3b..ee3a471 100644 --- a/development/Win32/packaging/installer/include/LyXUtils.nsh +++ b/development/Win32/packaging/installer/include/LyXUtils.nsh @@ -1,4 +1,4 @@ -# This script contains the following functions: +# This script contains the following functions: # # - LaTeXCheck (check installed LaTeX-system), #(only used by Small and Complete installer), uses: diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 82d428c..d3ae07f 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -1,4 +1,4 @@ -/* +/* declaration.nsh diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 5fd7011..493f03f 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/in
[LyX/master] Win installer: convert all files to Unicode
commit 4c21ca318f072f63be1ba81a3a4325bf4bfe8506 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Feb 18 15:45:08 2018 +0100 Win installer: convert all files to Unicode - at the moment some files were in Unicode, some in CP1252 which can make unnecessary troubles - remove an obsolete file - update InstallerStructure.odg --- .../Win32/packaging/installer/gui/LaTeXFolder.nsh |2 +- .../Win32/packaging/installer/gui/external.nsh |2 +- .../packaging/installer/include/EnvVarUpdate.nsh |2 +- .../Win32/packaging/installer/include/LaTeX.nsh|2 +- .../Win32/packaging/installer/include/LyXUtils.nsh |2 +- .../packaging/installer/include/declarations.nsh |2 +- .../packaging/installer/include/detection.nsh |2 +- .../packaging/installer/include/dictionaries.nsh |2 +- .../Win32/packaging/installer/include/filelist.nsh |2 +- .../Win32/packaging/installer/include/gui.nsh |2 +- .../Win32/packaging/installer/include/nsis.nsh |2 +- .../packaging/installer/include/variables.nsh |2 +- .../installer/information/InstallerStructure.odg | Bin 17038 -> 18284 bytes .../installer/information/InstallerStructure.pdf | Bin 27492 -> 37336 bytes development/Win32/packaging/installer/lyx.nsi | 55 development/Win32/packaging/installer/settings.nsh |2 +- .../Win32/packaging/installer/setup/configure.nsh |2 +- .../Win32/packaging/installer/setup/install.nsh|2 +- .../Win32/packaging/installer/setup/uninstall.nsh |2 +- 19 files changed, 16 insertions(+), 71 deletions(-) diff --git a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh index 0ab0e8c..2041727 100644 --- a/development/Win32/packaging/installer/gui/LaTeXFolder.nsh +++ b/development/Win32/packaging/installer/gui/LaTeXFolder.nsh @@ -1,4 +1,4 @@ -Function LatexFolder +Function LatexFolder !insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini" # generate the installer page diff --git a/development/Win32/packaging/installer/gui/external.nsh b/development/Win32/packaging/installer/gui/external.nsh index 003a582..b2aa949 100644 --- a/development/Win32/packaging/installer/gui/external.nsh +++ b/development/Win32/packaging/installer/gui/external.nsh @@ -1,4 +1,4 @@ -/* +/* external.nsh diff --git a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh index 974bc67..12de15f 100644 --- a/development/Win32/packaging/installer/include/EnvVarUpdate.nsh +++ b/development/Win32/packaging/installer/include/EnvVarUpdate.nsh @@ -1,4 +1,4 @@ -/** +/** * EnvVarUpdate.nsh *: Environmental Variables: append, prepend, and remove entries * diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index ecb82b4..63de0e1 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -1,4 +1,4 @@ -/* +/* LaTeX.nsh Handling of LaTeX distributions diff --git a/development/Win32/packaging/installer/include/LyXUtils.nsh b/development/Win32/packaging/installer/include/LyXUtils.nsh index c513b3b..ee3a471 100644 --- a/development/Win32/packaging/installer/include/LyXUtils.nsh +++ b/development/Win32/packaging/installer/include/LyXUtils.nsh @@ -1,4 +1,4 @@ -# This script contains the following functions: +# This script contains the following functions: # # - LaTeXCheck (check installed LaTeX-system), #(only used by Small and Complete installer), uses: diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 82d428c..d3ae07f 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -1,4 +1,4 @@ -/* +/* declaration.nsh diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 5fd7011..493f03f 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -1,4 +1,4 @@ -/* +/* detection.nsh diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh index 415b19c..0247177 100644 --- a/development/Win32/packaging/installer/include/dictionaries.nsh +++ b/development/Win32/packaging/installer/include/dictionaries.nsh @@ -1,4 +1,4 @@ -/* +/* dictionaries.nsh Handling of hunspell / MyThes dictionaries diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.n
[LyX/2.2.x] Win installer: forgot to update path to Qt
commit e14bd0be8ee055e302e32f73ca7a559cb2e976c7
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 14:49:42 2018 +0100
Win installer: forgot to update path to Qt
---
development/Win32/packaging/installer/settings.nsh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 96e3aeb..3092193 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -38,7 +38,7 @@ These typically need to be modified for each LyX release
!define FILES_LYX "D:\LyXPackage2.2\LyX"
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
-!define FILES_QT "C:\Qt\Qt5.6.3\5.6.3\msvc2015"
+!define FILES_QT "C:\Qt\Qt5.9.4\5.9.4\msvc2015"
!define ClassFileDir "${FILES_LYX}\Resources\tex"
!define DVIPostFileDir "${FILES_DEPS}\tex"
[LyX/2.3.x] Win installer: backport recent changes for LyX 2.3.0
commit ae76c030d38aedd95690d1569903e3eb6122945f
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 06:16:22 2018 +0100
Win installer: backport recent changes for LyX 2.3.0
---
.../Win32/packaging/installer/ChangeLog.txt| 13 ++-
.../packaging/installer/DictionaryMirrors.txt | 41 ---
.../installer/HunspellDictionaryNames.txt |4 +-
development/Win32/packaging/installer/Packages.txt |6 +++
.../installer/ThesaurusDictionaryNames.txt |2 +
.../packaging/installer/include/dictionaries.nsh | 14 +++---
.../Win32/packaging/installer/include/init.nsh | 24 +---
development/Win32/packaging/installer/settings.nsh |4 +-
.../Win32/packaging/installer/setup/configure.nsh |6 +-
9 files changed, 69 insertions(+), 45 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 0a276cf..61cd73d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,5 +1,16 @@
-Changelog for LyX-230-RC2:
+Changelog for LyX-230-1:
+- installs LyX 2.3.0
+- fix installation of Arabic spell checker
+- updated to MiKTeX 2.9 build 6615
+- new thesaurus for Arabic
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for Arabic, Breton and Ukrainian
+
+
+Changelog for LyX-230-RC2:
- installs LyX 2.3.0 RC2
+- updated to Qt 5.9.4
+- updated to ImageMagick 7.0.7-22
Changelog for LyX-230-RC1:
diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 434ea15..99a4590 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -1,29 +1,22 @@
-dfn
+astuteinternet
+ayera
+cfhcable
+cytranet
+excellmedia
freefr
-cznic
-garr
-optimate
-kaz
-kent
-heanet
-hivelocity
-ignum
-internode
iweb
jaist
-netcologne
-switch
+kent
+liquidtelecom
nchc
-ncu
-skylink
-tcpdiag
-tenet
-ufpr
-waia
-colocrossing
-citylan
-aarnet
+netcologne
+netix
+netcologne
+newcontinuum
+phoenixnap
+razaoinfo
superb-dca2
-superb-dca3
-softlayer-ams
-softlayer-dal
+superb-sea2
+ufpr
+versaweb
+vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index ff7b103..817adc9 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -1,7 +1,7 @@
af_ZA.aff
af_ZA.dic
-ar_DZ.aff
-ar_DZ.dic
+ar_SA.aff
+ar_SA.dic
be_BY.aff
be_BY.dic
bg_BG.aff
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 6d19dfa..27e248f 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -1,3 +1,5 @@
+th_ar_SA_v2.dat
+th_ar_SA_v2.idx
th_bg_BG_v2.dat
th_bg_BG_v2.idx
th_ca_ES_v2.dat
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index 8119a06..415b19c 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -43,8 +43,8 @@ Function FindDictionaries
# read out the possible thesaurus filenames from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${for} $5 1 27
- # the file has 54 lines, but we only need to check for one of the 2
thesaurus files per language
+ ${for} $5 1 28
+ # the file has 56 lines, but we only need to check for one of the 2
thesaurus files per language
# therefore check only for every second line
FileRead $R5 $String # $String is now the dictionary name
FileRead $R5 $String
[LyX/2.2.x] Win installer: MiKTeX has a new maintenance program
commit 7879fadfc07430a6c5fcd7f7b6d5a4f28759d39c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 06:13:16 2018 +0100
Win installer: MiKTeX has a new maintenance program
- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2 hours every day
---
.../Win32/packaging/installer/ChangeLog.txt|6 ++
development/Win32/packaging/installer/Packages.txt |6 ++
development/Win32/packaging/installer/settings.nsh |4 ++--
.../Win32/packaging/installer/setup/configure.nsh |6 +++---
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 096b2dc..6c52438 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -2,9 +2,15 @@
- installs LyX 2.2.4
- new Russian translation of the installer messages
- fix installation of Arabic spell checker
+- LyX will work under Windows Vista but is no longer supported
+- updated to MiKTeX 2.9 build 6615
+- updated to ImageMagick 7.0.7-22
+- updated to Qt 5.9.4
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
+ (To benefit from them you must uninstall an already installed LyX 2.2.x and
+ then use this installer.)
Changelog for LyX-223-2:
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index 4c07025..96e3aeb 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,12 +45,12 @@ These typically need to be modified for each LyX release
#
# MiKTeX and JabRef
-!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/;
+!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/;
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 7a4aa7a..f96b033 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -247,14 +247,14 @@ Section -ConfigureScript
# call the non-admin version
# at first we need to synchronize the package database
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
${endif}
[LyX/master] Win installer: MiKTeX has a new maintenance program
commit 3419fa6a9e0ff3542c8118a34eab67593bd8d895
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Feb 18 06:11:11 2018 +0100
Win installer: MiKTeX has a new maintenance program
- therefore the command line parameters changed
- all babel packages must be required
- use another default mirror that is hopefully not down 2hours every day
---
.../Win32/packaging/installer/ChangeLog.txt|1 +
development/Win32/packaging/installer/Packages.txt |6 ++
development/Win32/packaging/installer/settings.nsh |4 ++--
.../Win32/packaging/installer/setup/configure.nsh |6 +++---
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 4bf75a8..61cd73d 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,7 @@
Changelog for LyX-230-1:
- installs LyX 2.3.0
- fix installation of Arabic spell checker
+- updated to MiKTeX 2.9 build 6615
- new thesaurus for Arabic
- updated thesaurus for Ukrainian
- updated spell checker dictionaries for Arabic, Breton and Ukrainian
diff --git a/development/Win32/packaging/installer/Packages.txt
b/development/Win32/packaging/installer/Packages.txt
index 552a2d8..3ba3f1e 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,6 +3,7 @@ l3packages
l3experimental
ctablestack
babel-albanian
+babel-azerbaijani
babel-basque
babel-belarusian
babel-bosnian
@@ -13,12 +14,15 @@ babel-croatian
babel-czech
babel-danish
babel-dutch
+babel-english
babel-esperanto
babel-estonian
babel-finnish
+babel-french
babel-friulan
babel-galician
babel-georgian
+babel-german
babel-greek
babel-hebrew
babel-hungarian
@@ -32,6 +36,7 @@ babel-kurmanji
babel-latin
babel-latvian
babel-macedonian
+babel-malay
babel-norsk
babel-piedmontese
babel-polish
@@ -46,6 +51,7 @@ babel-serbianc
babel-slovak
babel-slovenian
babel-sorbian
+babel-spanish
babel-swedish
babel-thai
babel-turkish
diff --git a/development/Win32/packaging/installer/settings.nsh
b/development/Win32/packaging/installer/settings.nsh
index ff8029f..0d94fc7 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -45,13 +45,13 @@ These typically need to be modified for each LyX release
#
# MiKTeX and JabRef
-!define MiKTeXRepo
"ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/;
+!define MiKTeXRepo
"ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/;
!define MiKTeXDeliveredVersion "2.9"
!define ImageMagickVersion "7.0.7"
# definitions for the Complete installer
!if ${SETUPTYPE} == BUNDLE
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6520.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6615.exe"
!endif
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 8058507..3de31b3 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -245,14 +245,14 @@ Section -ConfigureScript
# call the non-admin version
# at first we need to synchronize the package database
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
-nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${else}
nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--update-db"'
- nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--install-some=$INSTDIR\Resources\Packages.txt"'
+ nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose"
"--require=@$INSTDIR\Resources\Packages.txt"'
${endif}
${endif}
${endif}
[LyX/master] port recent Basque translation updates
commit 7df53d50f21cc4b97d2dea3d2ac31fd354767e7e Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Feb 18 02:24:22 2018 +0100 port recent Basque translation updates --- lib/layouttranslations| 10 +- lib/layouttranslations.review |5 +- po/eu.po | 184 ++--- 3 files changed, 123 insertions(+), 76 deletions(-) diff --git a/lib/layouttranslations b/lib/layouttranslations index f350f23..f96320f 100644 --- a/lib/layouttranslations +++ b/lib/layouttranslations @@ -436,11 +436,11 @@ Translation eu "List of Algorithms" "Algoritmoen zerrenda" "List of Charts" "Diagramen zerrenda" "List of Graphs[[mathematical]]" "Grafikoen zerrenda" - "List of Listings" "Zerrenden zerrenda" + "List of Listings" "Zerrendatuen zerrenda" "List of Schemes" "Eskemen zerrenda" "List of Tableaux" "Taulen zerrenda" - "Listing" "Zerrenda" - "Listings[[List of Listings]]" "Zerrendak" + "Listing" "Zerrendatua" + "Listings[[List of Listings]]" "Zerrendatuak" "Nomenclature[[output]]" "Nomenklatura" "Notation" "Notazioa" "Note" "Oharra" @@ -455,8 +455,8 @@ Translation eu "Summary" "Laburpena" "Tableau" "Taula" "Theorem" "Teorema" - "page[[nomencl]]" "page" - "see equation[[nomencl]]" "see equation" + "page[[nomencl]]" "orrialdea" + "see equation[[nomencl]]" "ikus ekuazioa" End Translation fi diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review index 7a9d149..39474b7 100644 --- a/lib/layouttranslations.review +++ b/lib/layouttranslations.review @@ -21,7 +21,6 @@ Additionally to the top ones, these languages should be reviewed for the followi "Listing" "Listings" -eu hu id ro @@ -31,9 +30,9 @@ sr (30.11.2017, LyX 2.3.0 release ) Additionally to the top ones, these languages should be reviewed for the following strings "List of Listings" -ar bg ca da el eu es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW +ar bg ca da el es fi gl he hu ia id ko nb nl nn pl ro sl sr sv tr uk zh_CN zh_TW "Nomenclature[[output]]" -> The string that is output to PDF for the nomenclature list "see equation[[nomencl]]" "page[[nomencl]]" -ar bg ca da el eu fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW +ar bg ca da el fi gl he hu ia id ja ko nb nl nn pl ro sl sr sv tr zh_CN zh_TW diff --git a/po/eu.po b/po/eu.po index b858bc1..6a358e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: lyx_2.0.0_eu\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2018-02-12 16:39+0100\n" -"PO-Revision-Date: 2018-02-12 20:50+0100\n" +"PO-Revision-Date: 2018-02-17 18:34+0100\n" "Last-Translator: Inaki Larranaga Murgoitio <doo...@zundan.com>\n" "Language-Team: Basque <librez...@librezale.eus>\n" "Language: eu\n" @@ -627,9 +627,10 @@ msgstr "Hautatu adarra" msgid "Inverted" msgstr "Alderantzikatuta" +# adarra #: src/frontends/qt4/ui/BranchesUi.ui:25 msgid ":[[branch]]" -msgstr ":[[adarra]]" +msgstr ":" #: src/frontends/qt4/ui/BranchesUi.ui:35 msgid "" @@ -2084,9 +2085,12 @@ msgstr "Estekatu fitxategia" msgid "Fi" msgstr "" +# 'listing' pakete baten izena da, progamazioko iturburua nabarmentzeko eginbidea eskaintzen du. LyX-eko agerpenetan 'zerrendatua' gisa euskaratu da. +# +# https://en.wikibooks.org/wiki/LaTeX/Source_Code_Listings #: src/frontends/qt4/ui/IncludeUi.ui:36 msgid "Listing Parameters" -msgstr "Zerrendaren parametroak" +msgstr "Zerrendatuaren parametroak" #: src/frontends/qt4/ui/IncludeUi.ui:66 #: src/frontends/qt4/ui/ListingsSettingsUi.ui:79 @@ -2148,10 +2152,11 @@ msgstr "Sarrera" msgid "Verbatim" msgstr "Hitzez hitz" +# erabili 'zerrendatua' termino 'listing' terminoaren itzulen gisa #: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1305 #: src/insets/InsetInclude.cpp:1311 msgid "Program Listing" -msgstr "Programaren zerrenda" +msgstr "Iturburuaren zerrendatua" #: src/frontends/qt4/ui/IncludeUi.ui:342 msgid "Edit the file" @@ -2197,9 +2202,10 @@ msgstr "Aktibatu hainbat indize be
[LyX/master] Win installer: fix installation of Arabic dictionaries.nsh
commit ac1d6af008af9eea16496abd01914badb38e3b04
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Feb 17 06:05:13 2018 +0100
Win installer: fix installation of Arabic dictionaries.nsh
- correct name of Arabic spell checker (fixes bug #11036)
- add Arabic thesaurus
- update sourceforge's mirror list
- update some dictionaries
---
.../Win32/packaging/installer/ChangeLog.txt| 12 +-
.../packaging/installer/DictionaryMirrors.txt | 41 ---
.../installer/HunspellDictionaryNames.txt |4 +-
.../installer/ThesaurusDictionaryNames.txt |2 +
.../packaging/installer/include/dictionaries.nsh | 14 +++---
.../Win32/packaging/installer/include/init.nsh | 24 +---
6 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 0a276cf..4bf75a8 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,5 +1,15 @@
-Changelog for LyX-230-RC2:
+Changelog for LyX-230-1:
+- installs LyX 2.3.0
+- fix installation of Arabic spell checker
+- new thesaurus for Arabic
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for Arabic, Breton and Ukrainian
+
+
+Changelog for LyX-230-RC2:
- installs LyX 2.3.0 RC2
+- updated to Qt 5.9.4
+- updated to ImageMagick 7.0.7-22
Changelog for LyX-230-RC1:
diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 434ea15..99a4590 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -1,29 +1,22 @@
-dfn
+astuteinternet
+ayera
+cfhcable
+cytranet
+excellmedia
freefr
-cznic
-garr
-optimate
-kaz
-kent
-heanet
-hivelocity
-ignum
-internode
iweb
jaist
-netcologne
-switch
+kent
+liquidtelecom
nchc
-ncu
-skylink
-tcpdiag
-tenet
-ufpr
-waia
-colocrossing
-citylan
-aarnet
+netcologne
+netix
+netcologne
+newcontinuum
+phoenixnap
+razaoinfo
superb-dca2
-superb-dca3
-softlayer-ams
-softlayer-dal
+superb-sea2
+ufpr
+versaweb
+vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index ff7b103..817adc9 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -1,7 +1,7 @@
af_ZA.aff
af_ZA.dic
-ar_DZ.aff
-ar_DZ.dic
+ar_SA.aff
+ar_SA.dic
be_BY.aff
be_BY.dic
bg_BG.aff
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 6d19dfa..27e248f 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -1,3 +1,5 @@
+th_ar_SA_v2.dat
+th_ar_SA_v2.idx
th_bg_BG_v2.dat
th_bg_BG_v2.idx
th_ca_ES_v2.dat
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index 8119a06..415b19c 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -43,8 +43,8 @@ Function FindDictionaries
# read out the possible thesaurus filenames from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${for} $5 1 27
- # the file has 54 lines, but we only need to check for one of the 2
thesaurus files per language
+ ${for} $5 1 28
+ # the file has 56 lines, but we only need to check for one of the 2
thesaurus files per language
# therefore check only for every second line
FileRead $R5 $String # $String is now the dictionary name
FileRead $R5 $String # $String is now the dictionary name
@@ -77,11 +77,11 @@ Function DownloadHunspellDictionaries
# if first download repository is not available try the other ones listed
in "DictionaryMirrors.txt"
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
- ${For} $4 1 29 # there are 29 mirrors in the file
+ ${For} $4 1 22 # there are 22 mirrors in the file
FileRead $R4 $Search # $Search is now the mirror
StrCpy $Search $Search -2 # delete the linebreak characters at the end
Push $R0
-inetc::get /TIMEOUT=5000
"http://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
+inetc::get /TIMEOUT=5000
"https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
Pop $R0
${if} $R0 == "OK"
${ExitFor}
@@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
[LyX/2.2.x] Win installer: fix installation of Arabic dictionaries.nsh
commit 21586c196aef9c75e70a84c448841ba617c2e1ea
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat Feb 17 06:02:38 2018 +0100
Win installer: fix installation of Arabic dictionaries.nsh
- correct name of Arabic spell checker (fixes bug #11036)
- add Arabic thesaurus
- update sourceforge's mirror list
- update some dictionaries
---
.../Win32/packaging/installer/ChangeLog.txt|4 ++
.../packaging/installer/DictionaryMirrors.txt | 41 ---
.../installer/HunspellDictionaryNames.txt |4 +-
.../installer/ThesaurusDictionaryNames.txt |2 +
.../packaging/installer/include/dictionaries.nsh | 14 +++---
.../Win32/packaging/installer/include/init.nsh | 27 ++---
6 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/development/Win32/packaging/installer/ChangeLog.txt
b/development/Win32/packaging/installer/ChangeLog.txt
index 5a23905..096b2dc 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,10 @@
Changelog for LyX-224-1:
- installs LyX 2.2.4
- new Russian translation of the installer messages
+- fix installation of Arabic spell checker
+- new thesaurus for Arabic
+- updated thesaurus for Ukrainian
+- updated spell checker dictionaries for Arabic, Breton and Ukrainian
Changelog for LyX-223-2:
diff --git a/development/Win32/packaging/installer/DictionaryMirrors.txt
b/development/Win32/packaging/installer/DictionaryMirrors.txt
index 434ea15..99a4590 100644
--- a/development/Win32/packaging/installer/DictionaryMirrors.txt
+++ b/development/Win32/packaging/installer/DictionaryMirrors.txt
@@ -1,29 +1,22 @@
-dfn
+astuteinternet
+ayera
+cfhcable
+cytranet
+excellmedia
freefr
-cznic
-garr
-optimate
-kaz
-kent
-heanet
-hivelocity
-ignum
-internode
iweb
jaist
-netcologne
-switch
+kent
+liquidtelecom
nchc
-ncu
-skylink
-tcpdiag
-tenet
-ufpr
-waia
-colocrossing
-citylan
-aarnet
+netcologne
+netix
+netcologne
+newcontinuum
+phoenixnap
+razaoinfo
superb-dca2
-superb-dca3
-softlayer-ams
-softlayer-dal
+superb-sea2
+ufpr
+versaweb
+vorboss
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index ff7b103..817adc9 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -1,7 +1,7 @@
af_ZA.aff
af_ZA.dic
-ar_DZ.aff
-ar_DZ.dic
+ar_SA.aff
+ar_SA.dic
be_BY.aff
be_BY.dic
bg_BG.aff
diff --git a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
index 6d19dfa..27e248f 100644
--- a/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
+++ b/development/Win32/packaging/installer/ThesaurusDictionaryNames.txt
@@ -1,3 +1,5 @@
+th_ar_SA_v2.dat
+th_ar_SA_v2.idx
th_bg_BG_v2.dat
th_bg_BG_v2.idx
th_ca_ES_v2.dat
diff --git a/development/Win32/packaging/installer/include/dictionaries.nsh
b/development/Win32/packaging/installer/include/dictionaries.nsh
index 8119a06..415b19c 100644
--- a/development/Win32/packaging/installer/include/dictionaries.nsh
+++ b/development/Win32/packaging/installer/include/dictionaries.nsh
@@ -43,8 +43,8 @@ Function FindDictionaries
# read out the possible thesaurus filenames from the file
FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r
- ${for} $5 1 27
- # the file has 54 lines, but we only need to check for one of the 2
thesaurus files per language
+ ${for} $5 1 28
+ # the file has 56 lines, but we only need to check for one of the 2
thesaurus files per language
# therefore check only for every second line
FileRead $R5 $String # $String is now the dictionary name
FileRead $R5 $String # $String is now the dictionary name
@@ -77,11 +77,11 @@ Function DownloadHunspellDictionaries
# if first download repository is not available try the other ones listed
in "DictionaryMirrors.txt"
FileOpen $R4 "$INSTDIR\Resources\DictionaryMirrors.txt" r
- ${For} $4 1 29 # there are 29 mirrors in the file
+ ${For} $4 1 22 # there are 22 mirrors in the file
FileRead $R4 $Search # $Search is now the mirror
StrCpy $Search $Search -2 # delete the linebreak characters at the end
Push $R0
-inetc::get /TIMEOUT=5000
"http://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
+inetc::get /TIMEOUT=5000
"https://$Search.dl.sourceforge.net/project/lyxwininstaller/hunspell/$String;
"$INSTDIR\Resources\dicts\$String" /END
Pop $R0
${if} $R0 == "OK"
${ExitFor}
@@ -112,7 +112,7 @@ Function DownloadThesaurusDictionaries
# read out the locations from the file
FileOpen $R5 "$INSTDIR\Resources\Thesauru
[LyX/2.3.x] RELEASE-NOTES: correct sorting
commit 8be744b8277f38f6b71ff5e1c10daebc65e22e5b Author: Uwe Stöhr <uwesto...@lyx.org> Date: Wed Feb 14 14:51:57 2018 +0100 RELEASE-NOTES: correct sorting --- lib/RELEASE-NOTES |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 15cecb3..59325c3 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -25,7 +25,7 @@ It was of dubious value and led to rendering issues. * The following UI translations were dropped, because the lack of translation - maintenance: Danish, Dutch, Galician, Catalan, Romanian, Serbian. + maintenance: Danish, Dutch, Catalan, Galician, Romanian, Serbian. !!Documents compilation process and images conversion
[LyX/master] UserGuide.lyx: document the removal of the pixmap cache for all languages
commit 1fb1b0a3f8429a12ce63b6daada1ac4ec4119889
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Feb 14 14:51:22 2018 +0100
UserGuide.lyx: document the removal of the pixmap cache for all languages
---
lib/doc/UserGuide.lyx| 18 --
lib/doc/de/UserGuide.lyx | 18 --
lib/doc/es/UserGuide.lyx | 21 -
lib/doc/fr/UserGuide.lyx | 18 --
lib/doc/ja/UserGuide.lyx | 14 --
5 files changed, 0 insertions(+), 89 deletions(-)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 06cfd1f..fb8cac9 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -46198,24 +46198,6 @@ reference "subsec:Document-Font"
.
\end_layout
-\begin_layout Standard
-With the option
-\family sans
-Use pixmap cache to speed up font rendering
-\family default
- enabled, \SpecialChar LyX
- needs to redraw the screen less often.
- This results in better performance, especially on slow systems.
- On the other hand, the characters might look more fuzzy on screen.
- So whether you enable this or not depends on whether you prefer speed over
- aesthetics.
- Note that the Pixmap Cache is only available and useful under Mac
-\begin_inset space ~
-\end_inset
-
-OS and Windows.
-\end_layout
-
\begin_layout Subsection
Colors
\begin_inset Index idx
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 6acaf68..76ff3cd 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -45175,24 +45175,6 @@ reference "subsec:Dokumentschrift-und-Schriftgröße"
erläutert.
\end_layout
-\begin_layout Standard
-Mit der aktivierten Option
-\family sans
-Pixmap-Zwischenspeicher benutzen, um die Darstellung von Zeichen zu
beschleunige
-n
-\family default
- muss \SpecialChar LyX
- seltener die Bildschirmanzeige erneuern.
- Dies führt zu einer besseren Performanz, besonders auf langsameren Rechnern.
- Allerdings könnten die Zeichen verpixelt aussehen.
- Ob es sich lohnt diese Option zu aktivieren, müssen Sie also ausprobieren.
- Man beachte, dass der Pixmap Cache nur unter Mac
-\begin_inset space ~
-\end_inset
-
-OS und Windows verfügbar und nützlich ist.
-\end_layout
-
\begin_layout Subsection
Farben
\begin_inset Index idx
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 90ff4d5..8a4d9bc 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8579,14 +8579,12 @@ Literal
\end_layout
\begin_layout Verbatim
-
Esto es entorno Literal.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
Las dos líneas siguientes están vacías:
\end_layout
@@ -8599,7 +8597,6 @@ Las dos líneas siguientes están vacías:
\end_layout
\begin_layout Verbatim
-
Casi todo está permitido en entorno Literal:"%&$§#~'`
\backslash
}][{|
@@ -8624,7 +8621,6 @@ con la diferencia de que los espacios aparecen en la
salida como el carácter
\end_layout
\begin_layout Verbatim*
-
Esto es entorno Literal*.
\end_layout
@@ -46707,23 +46703,6 @@ reference "subsec:Tipografía-del-documento"
.
\end_layout
-\begin_layout Standard
-Con la opción
-\family sans
-Usar Pixmap Cache para acelerar el rendimiento
-\family default
- marcada, \SpecialChar LyX
- necesita refrescar la pantalla con menor frecuencia.
- Esto conlleva un mejor rendimiento, especialmente en sistemas lentos.
- Por otra parte, los caracteres podrían mostrarse más borrosos.
- Así que activar o no esta opción depende de si prefieres velocidad o estética.
- Esta opción solo está disponible en Mac
-\begin_inset space ~
-\end_inset
-
-OS o Windows.
-\end_layout
-
\begin_layout Subsection
Colores
\begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 3d89d6c..04286f3 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -48069,24 +48069,6 @@ reference "subsec:Document-Polices"
.
\end_layout
-\begin_layout Standard
-Avec l'option
-\family sans
-Utiliser le cache pixmap pour accélérer le rendu des polices
-\family default
-, \SpecialChar LyX
- a besoin de re-dessiner l'écran moins souvent.
- Cela donne de meilleures performances, surtout sur des systèmes lents.
- D'un autre côté, les caractères peuvent paraître un peu flous à l'écran.
- Vous allez donc activer ou non cette option selon que vous préférez la
- vitesse ou l'esthétique.
- Notez que le cache pixmap n'est disponible et utile que sous Mac
-\begin_inset space ~
-\end_inset
-
-OS et Windows.
-\end_layout
-
\begin_layout Subsection
Couleurs
\begin_inset Index idx
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index c55785a..9510ef0 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -38906,20 +38906,6 @@ reference "subsec:文書フォント"
節に詳細があります．
\end_layout
-\begin_layout Standard
-
-\family sans
-フォントレンダリングの速度を向上させるためにPixmapキャッシュを使う
-\family default
-オプションを有効にすると，\SpecialChar LyX
-が画面を再描画する必要が減ります．
[LyX/2.3.x] UserGuide.lyx: document the removal of the pixmap cache for all languages
commit 14e80adffc6106464663d1171f0328a0e2b1278f
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed Feb 14 14:50:08 2018 +0100
UserGuide.lyx: document the removal of the pixmap cache for all languages
---
lib/doc/de/UserGuide.lyx | 18 --
lib/doc/es/UserGuide.lyx | 21 -
lib/doc/fr/UserGuide.lyx | 18 --
lib/doc/ja/UserGuide.lyx | 14 --
4 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 6acaf68..76ff3cd 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -45175,24 +45175,6 @@ reference "subsec:Dokumentschrift-und-Schriftgröße"
erläutert.
\end_layout
-\begin_layout Standard
-Mit der aktivierten Option
-\family sans
-Pixmap-Zwischenspeicher benutzen, um die Darstellung von Zeichen zu
beschleunige
-n
-\family default
- muss \SpecialChar LyX
- seltener die Bildschirmanzeige erneuern.
- Dies führt zu einer besseren Performanz, besonders auf langsameren Rechnern.
- Allerdings könnten die Zeichen verpixelt aussehen.
- Ob es sich lohnt diese Option zu aktivieren, müssen Sie also ausprobieren.
- Man beachte, dass der Pixmap Cache nur unter Mac
-\begin_inset space ~
-\end_inset
-
-OS und Windows verfügbar und nützlich ist.
-\end_layout
-
\begin_layout Subsection
Farben
\begin_inset Index idx
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 90ff4d5..8a4d9bc 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8579,14 +8579,12 @@ Literal
\end_layout
\begin_layout Verbatim
-
Esto es entorno Literal.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
Las dos líneas siguientes están vacías:
\end_layout
@@ -8599,7 +8597,6 @@ Las dos líneas siguientes están vacías:
\end_layout
\begin_layout Verbatim
-
Casi todo está permitido en entorno Literal:"%&$§#~'`
\backslash
}][{|
@@ -8624,7 +8621,6 @@ con la diferencia de que los espacios aparecen en la
salida como el carácter
\end_layout
\begin_layout Verbatim*
-
Esto es entorno Literal*.
\end_layout
@@ -46707,23 +46703,6 @@ reference "subsec:Tipografía-del-documento"
.
\end_layout
-\begin_layout Standard
-Con la opción
-\family sans
-Usar Pixmap Cache para acelerar el rendimiento
-\family default
- marcada, \SpecialChar LyX
- necesita refrescar la pantalla con menor frecuencia.
- Esto conlleva un mejor rendimiento, especialmente en sistemas lentos.
- Por otra parte, los caracteres podrían mostrarse más borrosos.
- Así que activar o no esta opción depende de si prefieres velocidad o estética.
- Esta opción solo está disponible en Mac
-\begin_inset space ~
-\end_inset
-
-OS o Windows.
-\end_layout
-
\begin_layout Subsection
Colores
\begin_inset Index idx
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 3d89d6c..04286f3 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -48069,24 +48069,6 @@ reference "subsec:Document-Polices"
.
\end_layout
-\begin_layout Standard
-Avec l'option
-\family sans
-Utiliser le cache pixmap pour accélérer le rendu des polices
-\family default
-, \SpecialChar LyX
- a besoin de re-dessiner l'écran moins souvent.
- Cela donne de meilleures performances, surtout sur des systèmes lents.
- D'un autre côté, les caractères peuvent paraître un peu flous à l'écran.
- Vous allez donc activer ou non cette option selon que vous préférez la
- vitesse ou l'esthétique.
- Notez que le cache pixmap n'est disponible et utile que sous Mac
-\begin_inset space ~
-\end_inset
-
-OS et Windows.
-\end_layout
-
\begin_layout Subsection
Couleurs
\begin_inset Index idx
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index c55785a..9510ef0 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -38906,20 +38906,6 @@ reference "subsec:文書フォント"
節に詳細があります．
\end_layout
-\begin_layout Standard
-
-\family sans
-フォントレンダリングの速度を向上させるためにPixmapキャッシュを使う
-\family default
-オプションを有効にすると，\SpecialChar LyX
-が画面を再描画する必要が減ります．これによって，特に遅いシステムでは，パフォーマンスが向上します．一方，画面上の文字は少し毛羽立って見
-えるかもしれません．したがって，これを有効にするか否かは，スピードをお求めになるか美しさをお求めになるかに依存します．Pixmapキャッシュは，Mac
-\begin_inset space ~
-\end_inset
-
-OSとWindowsでのみ使うことができ，また意味があることにご注意ください．
-\end_layout
-
\begin_layout Subsection
色
\begin_inset Index idx
[LyX/2.3.x] RELEASE-NOTES: Greek is not dropped
commit 181b24e7dc7de8a4bbfa43717679507d5604cfa8 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Wed Feb 14 14:48:22 2018 +0100 RELEASE-NOTES: Greek is not dropped --- lib/RELEASE-NOTES |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index f519712..15cecb3 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -25,7 +25,7 @@ It was of dubious value and led to rendering issues. * The following UI translations were dropped, because the lack of translation - maintenance: Danish, Greek, Serbian, Galician, Catalan, Romanian, Dutch. + maintenance: Danish, Dutch, Galician, Catalan, Romanian, Serbian. !!Documents compilation process and images conversion
[LyX/2.3.x] ru.po: some corrections by Yuriy
commit 90060459bed5808fd3cff69a59fbfe0060f7bbfe Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 12 19:04:08 2018 +0100 ru.po: some corrections by Yuriy po/ru.po | 404 +++-- 1 files changed, 205 insertions(+), 199 deletions(-)
[LyX/master] ru.po: some corrections by Yuriy
commit 4defe4c9c715e7839d386f7769551301b56ff296 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 12 19:05:07 2018 +0100 ru.po: some corrections by Yuriy po/ru.po | 404 +++-- 1 files changed, 205 insertions(+), 199 deletions(-)
[LyX/2.3.x] Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x
commit d1ac023b505e4d0acfb92ba785f57d7ccd72f097 Merge: 9006045 db1c123 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Feb 12 19:04:25 2018 +0100 Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x lib/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
[LyX/master] Customization.lyx: distribute all tracked changes
commit 5c1a121d1d59f03e8756293ae77827218bdc9938
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Mon Feb 12 18:53:12 2018 +0100
Customization.lyx: distribute all tracked changes
---
lib/doc/Customization.lyx| 57 ++
lib/doc/es/Customization.lyx | 52 ++---
lib/doc/fr/Customization.lyx | 56 +++-
lib/doc/ja/Customization.lyx | 44 ---
4 files changed, 126 insertions(+), 83 deletions(-)
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0156672..40b32b4 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
\papercolumns 1
\papersides 2
\paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@@ -22951,11 +22950,7 @@ The second sort of special definition might look like
this:
\end_layout
\begin_layout LyX-Code
-
-\change_inserted -712698321 1517060160
-B
-\change_unchanged
-_pptext pp.
+B_pptext pp.
\end_layout
\begin_layout Standard
@@ -22966,29 +22961,19 @@ This defines a translatable piece of text, which
allows relevant parts of
status collapsed
\begin_layout Plain Layout
-%
-\change_inserted -712698321 1517060167
-B
-\change_unchanged
-_pptext%
+%B_pptext%
\end_layout
\end_inset
.
-
-\change_inserted -712698321 1517060791
-Note that there are two different translation paths: All definitions starting
+ Note that there are two different translation paths: All definitions starting
with
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1517060380
B_
-\change_unchanged
-
\end_layout
\end_inset
@@ -23002,19 +22987,11 @@ B_
\end_layout
\begin_layout LyX-Code
-
-\change_inserted -712698321 1517060574
_addtobib Add to bibliography only.
-\change_unchanged
-
\end_layout
\begin_layout Standard
-Several of these
-\change_inserted -712698321 1517060688
-translatable strings
-\change_unchanged
-are predefined in
+Several of these translatable strings are predefined in
\begin_inset Flex Code
status collapsed
@@ -23040,17 +23017,7 @@ status collapsed
\end_layout
\begin_layout Standard
-So here then is an example that use
-\change_inserted -712698321 1517061156
-s
-\change_unchanged
-
-\change_deleted -712698321 1517061147
-all
-\change_inserted -712698321 1517061148
-several of
-\change_unchanged
- these features:
+So here then is an example that uses several of these features:
\begin_inset VSpace defskip
\end_inset
@@ -23061,11 +23028,7 @@ several of
\noindent
\family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %
-\change_inserted -712698321 1517060173
-B
-\change_unchanged
-_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
\end_layout
\begin_layout Standard
@@ -23089,11 +23052,7 @@ author
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1517060231
-B
-\change_unchanged
-_edtext
+B_edtext
\end_layout
\end_inset
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index de49e8a..4904591 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -23076,60 +23076,80 @@ El segundo tipo especial de definición sería como:
\end_layout
\begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
\end_layout
\begin_layout Standard
Esto define un trozo de texto traducible, que permite traducir partes
relevantes
- de la bibliografía
-\lang english
- or citation
-\lang spanish
-.
+ de la bibliografía o de la cita.
Puede incluirse en una definición tratándolo como una clave:
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-%_pptext%
+%B_pptext%
\end_layout
\end_inset
.
- Varios de estos están predefinidos en
+
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
\end_layout
\end_inset
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
\lang english
- and the diverse
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+Varios de estos cadenas de caracteres traducible están predefinidos en
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
-\lang english
+
[LyX/2.3.x] Customization.lyx: distribute all tracked changes
commit 08fd1a8131ce1541f31d34626de616f328a48e3f
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Mon Feb 12 18:51:48 2018 +0100
Customization.lyx: distribute all tracked changes
---
lib/doc/Customization.lyx| 57 ++
lib/doc/es/Customization.lyx | 52 ++---
lib/doc/fr/Customization.lyx | 56 +++-
lib/doc/ja/Customization.lyx | 44 ---
4 files changed, 126 insertions(+), 83 deletions(-)
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 0156672..40b32b4 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -124,12 +124,11 @@ logicalmkup
\papercolumns 1
\papersides 2
\paperpagestyle headings
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
-\author -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@@ -22951,11 +22950,7 @@ The second sort of special definition might look like
this:
\end_layout
\begin_layout LyX-Code
-
-\change_inserted -712698321 1517060160
-B
-\change_unchanged
-_pptext pp.
+B_pptext pp.
\end_layout
\begin_layout Standard
@@ -22966,29 +22961,19 @@ This defines a translatable piece of text, which
allows relevant parts of
status collapsed
\begin_layout Plain Layout
-%
-\change_inserted -712698321 1517060167
-B
-\change_unchanged
-_pptext%
+%B_pptext%
\end_layout
\end_inset
.
-
-\change_inserted -712698321 1517060791
-Note that there are two different translation paths: All definitions starting
+ Note that there are two different translation paths: All definitions starting
with
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1517060380
B_
-\change_unchanged
-
\end_layout
\end_inset
@@ -23002,19 +22987,11 @@ B_
\end_layout
\begin_layout LyX-Code
-
-\change_inserted -712698321 1517060574
_addtobib Add to bibliography only.
-\change_unchanged
-
\end_layout
\begin_layout Standard
-Several of these
-\change_inserted -712698321 1517060688
-translatable strings
-\change_unchanged
-are predefined in
+Several of these translatable strings are predefined in
\begin_inset Flex Code
status collapsed
@@ -23040,17 +23017,7 @@ status collapsed
\end_layout
\begin_layout Standard
-So here then is an example that use
-\change_inserted -712698321 1517061156
-s
-\change_unchanged
-
-\change_deleted -712698321 1517061147
-all
-\change_inserted -712698321 1517061148
-several of
-\change_unchanged
- these features:
+So here then is an example that uses several of these features:
\begin_inset VSpace defskip
\end_inset
@@ -23061,11 +23028,7 @@ several of
\noindent
\family sans
-!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %
-\change_inserted -712698321 1517060173
-B
-\change_unchanged
-_edtext%, ]]}]]}
+!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %B_edtext%, ]]}]]}
\end_layout
\begin_layout Standard
@@ -23089,11 +23052,7 @@ author
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1517060231
-B
-\change_unchanged
-_edtext
+B_edtext
\end_layout
\end_inset
diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx
index de49e8a..4904591 100644
--- a/lib/doc/es/Customization.lyx
+++ b/lib/doc/es/Customization.lyx
@@ -23076,60 +23076,80 @@ El segundo tipo especial de definición sería como:
\end_layout
\begin_layout LyX-Code
-_pptext pp.
+B_pptext pp.
\end_layout
\begin_layout Standard
Esto define un trozo de texto traducible, que permite traducir partes
relevantes
- de la bibliografía
-\lang english
- or citation
-\lang spanish
-.
+ de la bibliografía o de la cita.
Puede incluirse en una definición tratándolo como una clave:
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-%_pptext%
+%B_pptext%
\end_layout
\end_inset
.
- Varios de estos están predefinidos en
+
+\lang english
+Note that there are two different translation paths: All definitions starting
+ with
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-stdciteformats.inc
+
+\lang english
+B_
\end_layout
\end_inset
+, such as in the example above, will be translated to the currently active
+ buffer language (so the translation will match the generated document).
+ All definitions starting with underscore only will be translated to the
+ GUI language.
+ This is the proper translation for strings that only occur in the dialogs
+ or on buttons, such as this one:
+\end_layout
+
+\begin_layout LyX-Code
\lang english
- and the diverse
+_addtobib Add to bibliography only.
+\end_layout
+
+\begin_layout Standard
+Varios de estos cadenas de caracteres traducible están predefinidos en
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
+stdciteformats.inc
+\end_layout
-\lang english
+
[LyX/master] ru.po: is now 100% translated
commit 338dc16d767da7b3e6c19f71c5f03e44de5656a7 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Feb 10 19:34:42 2018 +0100 ru.po: is now 100% translated big respect to Yuriy! po/ru.po | 954 +- 1 files changed, 503 insertions(+), 451 deletions(-)
[LyX/2.3.x] ru.po: is now 100% translated
commit 037be1556d558eb11fef4d1fd399f003fb82deb9 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sat Feb 10 19:34:29 2018 +0100 ru.po: is now 100% translated big respect to Yuriy! po/ru.po | 954 +- 1 files changed, 503 insertions(+), 451 deletions(-)
