From 08375b191cec93ee84cff7b142fbf7879e86a377 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Wed, 24 Oct 2012 20:21:09 +0200 Subject: [PATCH 01/93] update TODO --- src/tex2lyx/TODO.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 2bdc1d94aa..ee927a3b36 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -76,6 +76,8 @@ Format LaTeX feature LyX feature 443 unicode-math.sty InsetMath* 444 biolinum-type1.sty, libertine.sty, \font_osf, \font_sans libertine-legacy.sty +445 URW Classico LaTeX font \font_sans uop + \renewcommand{\sffamily}{uop} General From 02b1c4aa5151675c6bebb9f87b1ef9cbe6dd6827 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Wed, 24 Oct 2012 22:11:05 +0200 Subject: [PATCH 02/93] Fix test targets for some build trees The old targets only worked if the build tree was below the source tree. --- src/tex2lyx/Makefile.am | 2 +- src/tex2lyx/tex2lyx.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 94e6c4d6b7..b0be0afd96 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -36,7 +36,7 @@ TEST_FILES = \ TESTS = test/runtests.py updatetests: tex2lyx - $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx ../../../lib/scripts "$(srcdir)/test" + $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test" LINKED_FILES = \ ../Author.cpp \ diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 1abdecb2c9..7561774633 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -997,6 +997,16 @@ int main(int argc, char * argv[]) return EXIT_SUCCESS; } else { masterFilePathLyX = onlyPath(outfilename); + if (copy_files) { + FileName const path(masterFilePathLyX); + if (!path.isDirectory()) { + if (!path.createPath()) { + cerr << "Warning: Could not create directory for file `" + << masterFilePathLyX << "´." << endl; + return EXIT_FAILURE; + } + } + } if (roundtrip) { if (tex2tex(infilename, FileName(outfilename), default_encoding)) return EXIT_SUCCESS; From 54d1cb18805bff585a84a814da925907059484df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 24 Oct 2012 03:04:06 +0200 Subject: [PATCH 03/93] support/Messages.cpp: add space to not be taken as user defined literal In C++11 you are not allowed to have non-literal specifiers right after a string literal. --- src/support/Messages.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp index ca5c110913..fdcaf6645c 100644 --- a/src/support/Messages.cpp +++ b/src/support/Messages.cpp @@ -119,7 +119,7 @@ bool Messages::available(string const & c) // this loops at most twice while (true) { string const filen = locale_dir + "/" + code - + "/LC_MESSAGES/"PACKAGE".mo"; + + "/LC_MESSAGES/" PACKAGE ".mo"; if (FileName(filen).isReadableFile()) return true; if (contains(code, '_')) From 393ade85ec0b61617f254ea6184389db446bc027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 24 Oct 2012 03:05:14 +0200 Subject: [PATCH 04/93] config/lyxinclude.m4: add support for --enable-cxx11 Using --enable-cxx11 turns on C++11 mode in gcc. --- config/lyxinclude.m4 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index e532c54d87..2e529ea221 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -232,6 +232,10 @@ AC_ARG_ENABLE(pch, enable_pch=no;) lyx_pch_comp=no +AC_ARG_ENABLE(cxx11, + AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),, + enable_cxx11=no;) + AC_ARG_ENABLE(assertions, AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], @@ -306,6 +310,18 @@ if test x$GXX = xyes; then ;; esac fi + if test x$enable_cxx11 = xyes ; then + case $gxx_version in + 4.3*|4.4*|4.5*|4.6*) + lyx_flags="$lyx_flags c++11-mode" + CXXFLAGS="-std=gnu++0x $CXXFLAGS" + ;; + 4.7*|4.8*) + lyx_flags="$lyx_flags c++11-mode" + CXXFLAGS="-std=gnu++11 $CXXFLAGS" + ;; + esac + fi fi test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) From 7c6ae4d7401639ac0dd2eb83b0c1b7c61b0b8c13 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 25 Oct 2012 07:47:42 +0200 Subject: [PATCH 05/93] Update tex2lyx test files --- src/tex2lyx/test/CJK.lyx.lyx | 2 +- src/tex2lyx/test/DummyDocument.lyx | 2 +- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 2 +- src/tex2lyx/test/box-color-size-space-align.lyx.lyx | 2 +- src/tex2lyx/test/test-insets.lyx.lyx | 2 +- src/tex2lyx/test/test-structure.lyx.lyx | 2 +- src/tex2lyx/test/test.lyx.lyx | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 7d29cc858c..4e1218b63f 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx index 9215e6f8e6..0528118929 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 731ab9897b..31a66b8ec0 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index f1412b5ca3..aae23d1a44 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index 2a4dcd2f87..d766ec2ba6 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx index 2bc1882474..757a8404ab 100644 --- a/src/tex2lyx/test/test-structure.lyx.lyx +++ b/src/tex2lyx/test/test-structure.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx index 81b5ee0b48..8555585a58 100644 --- a/src/tex2lyx/test/test.lyx.lyx +++ b/src/tex2lyx/test/test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 444 +\lyxformat 445 \begin_document \begin_header \textclass article From d1ca207e946c90c200353cd848f973f4ee659792 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 25 Oct 2012 10:45:28 +0200 Subject: [PATCH 06/93] Cmake build: Next try to create Resources.qrc on the fly. This time using a cmake-script instead of trying to rebuild the cache --- .../modules/LyXCreateImagesResource.cmake | 56 +++++++++++++++++++ src/frontends/qt4/CMakeLists.txt | 15 ++++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 development/cmake/modules/LyXCreateImagesResource.cmake diff --git a/development/cmake/modules/LyXCreateImagesResource.cmake b/development/cmake/modules/LyXCreateImagesResource.cmake new file mode 100644 index 0000000000..3ab94142cc --- /dev/null +++ b/development/cmake/modules/LyXCreateImagesResource.cmake @@ -0,0 +1,56 @@ +# Copyright (c) 2006-2011 Peter Kümmel, +# 2012, Kornel Benko, +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# To call this script, one has to proved following parameters +# IMAGES_DIR # root for the directory-tree for .png and .git image files +# RESOURCE_NAME # full path of the resulting resource-file +# MAPPED_DIR # Path-prefix to be removed from the file names +# -P ${TOP_SRC_DIR}/development/cmake/modules/LyXCreateImagesResource.cmake + +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + +file(GLOB_RECURSE images_png ${IMAGES_DIR}/*.png) +file(GLOB_RECURSE images_gif ${IMAGES_DIR}/*.gif) + +set(images ${images_png} ${images_gif}) +set(resource_name ${RESOURCE_NAME}) + +#lyx_qt_resources_file(${resource_name} "${MAPPED_DIR}" frontend_qt4_images) + +message(STATUS "Generating ${resource_name}") + +file(WRITE ${resource_name} "\n") +file(APPEND ${resource_name} "\n") + +foreach (_current_FILE ${images}) + get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE) + string(REGEX REPLACE "${MAPPED_DIR}" "" _file_name ${_abs_FILE}) + file(APPEND ${resource_name} " ${_abs_FILE}\n") +endforeach (_current_FILE) + +file(APPEND ${resource_name} "\n") +file(APPEND ${resource_name} "\n") + diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index c71873be86..bf6cff70ce 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -26,7 +26,20 @@ file(GLOB_RECURSE frontend_qt4_images_png ${TOP_SRC_DIR}/lib/images/*.png) file(GLOB_RECURSE frontend_qt4_images_gif ${TOP_SRC_DIR}/lib/images/*.gif) set(resource_name ${CMAKE_CURRENT_BINARY_DIR}/Resources.qrc) set(frontend_qt4_images ${frontend_qt4_images_png} ${frontend_qt4_images_gif}) -lyx_qt_resources_file(${resource_name} "${TOP_SRC_DIR}/lib/" frontend_qt4_images) + +#lyx_qt_resources_file(${resource_name} "${TOP_SRC_DIR}/lib/" frontend_qt4_images) + +add_custom_command( + OUTPUT ${resource_name} + COMMAND ${CMAKE_COMMAND} + -DIMAGES_DIR=${TOP_SRC_DIR}/lib/images + -DRESOURCE_NAME=${resource_name} + -DMAPPED_DIR=${TOP_SRC_DIR}/lib/ + -P ${TOP_SRC_DIR}/development/cmake/modules/LyXCreateImagesResource.cmake + ) + +add_custom_target(Resources.qrc DEPENDS ${resource_name}) + qt4_add_resources(resource_files ${resource_name}) From 1b65a03c13639d477105214770bcd701ab308d84 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 25 Oct 2012 11:19:09 +0200 Subject: [PATCH 07/93] Cmake build: cleanup --- .../modules/LyXCreateImagesResource.cmake | 7 ++-- development/cmake/modules/LyXMacros.cmake | 35 ------------------- src/frontends/qt4/CMakeLists.txt | 8 ----- 3 files changed, 2 insertions(+), 48 deletions(-) diff --git a/development/cmake/modules/LyXCreateImagesResource.cmake b/development/cmake/modules/LyXCreateImagesResource.cmake index 3ab94142cc..42a7f06d2c 100644 --- a/development/cmake/modules/LyXCreateImagesResource.cmake +++ b/development/cmake/modules/LyXCreateImagesResource.cmake @@ -24,11 +24,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# To call this script, one has to proved following parameters +# To call this script, one has to provide following parameters # IMAGES_DIR # root for the directory-tree for .png and .git image files # RESOURCE_NAME # full path of the resulting resource-file -# MAPPED_DIR # Path-prefix to be removed from the file names -# -P ${TOP_SRC_DIR}/development/cmake/modules/LyXCreateImagesResource.cmake +# MAPPED_DIR # Path-prefix to be removed from the file name entries set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) @@ -38,8 +37,6 @@ file(GLOB_RECURSE images_gif ${IMAGES_DIR}/*.gif) set(images ${images_png} ${images_gif}) set(resource_name ${RESOURCE_NAME}) -#lyx_qt_resources_file(${resource_name} "${MAPPED_DIR}" frontend_qt4_images) - message(STATUS "Generating ${resource_name}") file(WRITE ${resource_name} "\n") diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 816112eb54..266a76f03c 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -204,41 +204,6 @@ macro(lyx_const_touched_files _allinone_name _list) endforeach (_current_FILE) endmacro(lyx_const_touched_files) - -macro(lyx_qt_resources_file _qrc_name _to_dir _list) - if (NOT EXISTS ${_qrc_name}) - set(_rebuild_file 1) - else() - FILE(READ ${_qrc_name} _file_content) - if (NOT _file_content) - set(_rebuild_file 1) - endif() - endif() - - if (_rebuild_file) - message(STATUS "Generating ${_qrc_name}") - file(WRITE ${_qrc_name} "\n") - file(APPEND ${_qrc_name} "\n") - - foreach (_current_FILE ${${_list}}) - get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE) - string(REGEX REPLACE "${_to_dir}" "" _file_name ${_abs_FILE}) - file(APPEND ${_qrc_name} " ${_abs_FILE}\n") - endforeach (_current_FILE) - - file(APPEND ${_qrc_name} "\n") - file(APPEND ${_qrc_name} "\n") - endif() - if(NOT WIN32) - add_custom_command( - OUTPUT ${_qrc_name} - COMMAND ${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target rebuild_cache - ) - endif() - -endmacro(lyx_qt_resources_file) - - macro(LYX_OPTION_INIT) set(LYX_OPTIONS) endmacro() diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index bf6cff70ce..44ddaad2c9 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -22,12 +22,7 @@ lyx_automoc(${frontends_qt4_sources}) lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI}) -file(GLOB_RECURSE frontend_qt4_images_png ${TOP_SRC_DIR}/lib/images/*.png) -file(GLOB_RECURSE frontend_qt4_images_gif ${TOP_SRC_DIR}/lib/images/*.gif) set(resource_name ${CMAKE_CURRENT_BINARY_DIR}/Resources.qrc) -set(frontend_qt4_images ${frontend_qt4_images_png} ${frontend_qt4_images_gif}) - -#lyx_qt_resources_file(${resource_name} "${TOP_SRC_DIR}/lib/" frontend_qt4_images) add_custom_command( OUTPUT ${resource_name} @@ -38,11 +33,8 @@ add_custom_command( -P ${TOP_SRC_DIR}/development/cmake/modules/LyXCreateImagesResource.cmake ) -add_custom_target(Resources.qrc DEPENDS ${resource_name}) - qt4_add_resources(resource_files ${resource_name}) - add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND) include_directories( From dd2189656b2659a490c5336bb17525b6b5f83f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 21 Oct 2012 21:04:05 +0200 Subject: [PATCH 08/93] More idiomatic way of checking if a shared_ptr has an associated managed object --- src/KeyMap.cpp | 17 ++++++++--------- src/frontends/qt4/LayoutBox.cpp | 4 ++-- src/graphics/GraphicsCacheItem.cpp | 2 +- src/graphics/GraphicsLoader.cpp | 22 +++++++++++----------- src/support/ForkedCalls.cpp | 2 +- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp index ffd55c4970..50833c923a 100644 --- a/src/KeyMap.cpp +++ b/src/KeyMap.cpp @@ -115,13 +115,12 @@ void KeyMap::bind(KeySequence * seq, FuncRequest const & func, unsigned int r) LYXERR(Debug::KBMAP, "Warning: New binding for '" << to_utf8(seq->print(KeySequence::Portable)) << "' is overriding old binding..."); - if (it->prefixes.get()) { + if (it->prefixes) it->prefixes.reset(); - } it->func = func; it->func.setOrigin(FuncRequest::KEYBOARD); return; - } else if (!it->prefixes.get()) { + } else if (!it->prefixes) { lyxerr << "Error: New binding for '" << to_utf8(seq->print(KeySequence::Portable)) << "' is overriding old binding..." @@ -168,10 +167,10 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r) if (r + 1 == seq->length()) { if (it->func == func) { remove = it; - if (it->prefixes.get()) + if (it->prefixes) it->prefixes.reset(); } - } else if (it->prefixes.get()) { + } else if (it->prefixes) { it->prefixes->unbind(seq, func, r + 1); if (it->prefixes->empty()) remove = it; @@ -201,7 +200,7 @@ FuncRequest KeyMap::getBinding(KeySequence const & seq, unsigned int r) && mod2 == it->mod.second) { if (r + 1 == seq.length()) return it->func; - else if (it->prefixes.get()) + else if (it->prefixes) return it->prefixes->getBinding(seq, r + 1); } } @@ -441,7 +440,7 @@ FuncRequest const & KeyMap::lookup(KeySymbol const &key, if (cit->code == key && cit->mod.first == check) { // match found - if (cit->prefixes.get()) { + if (cit->prefixes) { // this is a prefix key - set new map seq->curmap = cit->prefixes.get(); static FuncRequest prefix(LFUN_COMMAND_PREFIX); @@ -507,7 +506,7 @@ KeyMap::Bindings KeyMap::findBindings(FuncRequest const & func, Table::const_iterator end = table.end(); for (Table::const_iterator cit = table.begin(); cit != end; ++cit) { - if (cit->prefixes.get()) { + if (cit->prefixes) { KeySequence seq = prefix; seq.addkey(cit->code, cit->mod.first); Bindings res2 = cit->prefixes->findBindings(func, seq); @@ -555,7 +554,7 @@ void KeyMap::listBindings(BindingList & list, Table::const_iterator it_end = table.end(); for (; it != it_end; ++it) { // a LFUN_COMMAND_PREFIX - if (it->prefixes.get()) { + if (it->prefixes) { KeySequence seq = prefix; seq.addkey(it->code, it->mod.first); it->prefixes->listBindings(list, seq, tag); diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp index aa22e60eac..e11a63dde7 100644 --- a/src/frontends/qt4/LayoutBox.cpp +++ b/src/frontends/qt4/LayoutBox.cpp @@ -536,7 +536,7 @@ void LayoutBox::set(docstring const & layout) { d->resetFilter(); - if (!d->text_class_.get()) + if (!d->text_class_) return; if (!d->text_class_->hasLayout(layout)) @@ -691,7 +691,7 @@ void LayoutBox::selected(int index) d->model_->itemFromIndex(mindex)->text()); d->owner_.setFocus(); - if (!d->text_class_.get()) { + if (!d->text_class_) { updateContents(false); d->resetFilter(); return; diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp index fafa78bdcb..8183fea61e 100644 --- a/src/graphics/GraphicsCacheItem.cpp +++ b/src/graphics/GraphicsCacheItem.cpp @@ -235,7 +235,7 @@ void CacheItem::Impl::reset() file_to_load_.erase(); to_.erase(); - if (image_.get()) + if (image_) image_.reset(); status_ = WaitingToLoad; diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp index 36f2839446..f635e0b321 100644 --- a/src/graphics/GraphicsLoader.cpp +++ b/src/graphics/GraphicsLoader.cpp @@ -273,7 +273,7 @@ void Loader::reset(Params const & params) const void Loader::startLoading() const { - if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get()) + if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_) return; pimpl_->startLoading(); } @@ -287,7 +287,7 @@ void Loader::reload() const void Loader::startMonitoring() const { - if (!pimpl_->cached_item_.get()) + if (!pimpl_->cached_item_) return; pimpl_->cached_item_->startMonitoring(); @@ -296,7 +296,7 @@ void Loader::startMonitoring() const bool Loader::monitoring() const { - if (!pimpl_->cached_item_.get()) + if (!pimpl_->cached_item_) return false; return pimpl_->cached_item_->monitoring(); @@ -305,7 +305,7 @@ bool Loader::monitoring() const unsigned long Loader::checksum() const { - if (!pimpl_->cached_item_.get()) + if (!pimpl_->cached_item_) return 0; return pimpl_->cached_item_->checksum(); @@ -315,7 +315,7 @@ unsigned long Loader::checksum() const FileName const & Loader::filename() const { static FileName const empty; - return pimpl_->cached_item_.get() ? + return pimpl_->cached_item_ ? pimpl_->cached_item_->filename() : empty; } @@ -352,7 +352,7 @@ Loader::Impl::~Impl() void Loader::Impl::resetFile(FileName const & file) { - FileName const old_file = cached_item_.get() ? + FileName const old_file = cached_item_ ? cached_item_->filename() : FileName(); if (file == old_file) @@ -375,10 +375,10 @@ void Loader::Impl::resetFile(FileName const & file) } } - status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad; + status_ = cached_item_ ? cached_item_->status() : WaitingToLoad; image_.reset(); - if (cached_item_.get() || file.empty()) + if (cached_item_ || file.empty()) return; Cache & gc = Cache::get(); @@ -402,14 +402,14 @@ void Loader::Impl::resetParams(Params const & params) return; params_ = params; - status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad; + status_ = cached_item_ ? cached_item_->status() : WaitingToLoad; image_.reset(); } void Loader::Impl::statusChanged() { - status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad; + status_ = cached_item_ ? cached_item_->status() : WaitingToLoad; createPixmap(); signal_(); } @@ -420,7 +420,7 @@ void Loader::Impl::createPixmap() if (!params_.display || status_ != Loaded) return; - if (!cached_item_.get()) { + if (!cached_item_) { LYXERR(Debug::GRAPHICS, "pixmap not cached yet"); return; } diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp index 1c5e663723..0378b05bf1 100644 --- a/src/support/ForkedCalls.cpp +++ b/src/support/ForkedCalls.cpp @@ -113,7 +113,7 @@ bool ForkedProcess::IAmAChild = false; void ForkedProcess::emitSignal() { - if (signal_.get()) { + if (signal_) { signal_->operator()(pid_, retval_); } } From 1094128fe1ef92d1f59abd8d5a66fb07134756be Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 26 Oct 2012 11:48:21 +0200 Subject: [PATCH 09/93] French Linguistics manual update (by Jean-Pierre) --- lib/examples/fr/linguistics.lyx | 248 +++++++++++++++++++++++++++++++- 1 file changed, 241 insertions(+), 7 deletions(-) diff --git a/lib/examples/fr/linguistics.lyx b/lib/examples/fr/linguistics.lyx index da5259574b..9f33f7e804 100644 --- a/lib/examples/fr/linguistics.lyx +++ b/lib/examples/fr/linguistics.lyx @@ -88,7 +88,7 @@ status collapsed \begin_layout Plain Layout Traduction française Jean-Pierre Chrétien, , - novembre 2009 + novembre 2009, mise à jour octobre 2012 \end_layout \end_inset @@ -510,8 +510,25 @@ glt Do you have matches? \end_layout +\begin_layout Subsection* +Écueils des gloses LyX +\end_layout + \begin_layout Standard -Noter que les changements de police ne sont pas autorisés dans les gloses. +L'implantation de la fonctionnalité +\begin_inset Quotes fld +\end_inset + +gloses +\begin_inset Quotes frd +\end_inset + + dans LyX est élémentaire, et de ce fait présente quelques écueils, qui + pourront disparaître dans les publications ultérieures. +\end_layout + +\begin_layout Enumerate +Les changements de police ne sont pas autorisés dans les gloses. De ce fait, le menu \family sans Style de texte @@ -562,6 +579,226 @@ ngerman Ce paramétrage sera supprimé dans le résultat imprimé. \end_layout +\begin_layout Enumerate +Du fait que le texte des gloses est transmis tel quel à LaTeX, LyX ne modifie + pas leur encodage. + Ceci signifie que si vous utilisez dans les gloses des caractères inconnus + de l'encodage en cours, une erreur se produira. + Voici les solutions possibles pour résoudre ce problème: +\end_layout + +\begin_deeper +\begin_layout Itemize +soit vous saisissez le texte en dehors de la glose, ouvez +\family sans +Visionner\SpecialChar \menuseparator +Afficher le code LaTeX +\family default + et copiez le code LaTeX dans la glose; +\end_layout + +\begin_layout Itemize +soit vous marquez la totalité de la glose (bornes comprises) et vous positionnez + la langue appropriée via +\family sans +Éditer\SpecialChar \menuseparator +Langue\SpecialChar \menuseparator +Autre langues +\family default +\SpecialChar \ldots{} +; +\end_layout + +\begin_layout Itemize +soit vous positionnez l'encodage du document à +\emph on +Unicode (utf8) +\emph default + via +\family sans +Document\SpecialChar \menuseparator +Paramètres\SpecialChar \ldots{} +\SpecialChar \menuseparator +Langue; +\end_layout + +\begin_layout Itemize +soit vous cochez +\emph on +Utiliser des polices non-TeX fonts (via XeTeX/LuaTeX) +\emph default + dans +\family sans +Document\SpecialChar \menuseparator +Paramètres\SpecialChar \ldots{} +\SpecialChar \menuseparator +Polices +\family default +. +\end_layout + +\end_deeper +\begin_layout Enumerate +Des sauts de page peuvent apparaître dans des gloses, ce qui est bien entendu + regrettable. + Une solution consiste à inclure les gloses dans des boîtes (via +\family sans +Insérer\SpecialChar \menuseparator +Boîte\SpecialChar \menuseparator +Sans cadre +\family default +). + Si vous voulez rendre ceci automatique pour toutes les gloses, vous pouvez + copier le code suivant dans le préambule via +\family sans +Document\SpecialChar \menuseparator +Paramètres\SpecialChar \ldots{} +\SpecialChar \menuseparator +Préambule +\family default +: +\end_layout + +\begin_deeper +\begin_layout LyX-Code + +\lang english +\begin_inset listings +lstparams "basicstyle={\footnotesize},language={[LaTeX]TeX}" +inline false +status open + +\begin_layout Plain Layout + +% Éviter les sauts de page dans les gloses de deux lignes +\end_layout + +\begin_layout Plain Layout + + +\backslash +AtBeginDocument{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +@ifundefined{linggloss}{}{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +renewenvironment{linggloss}[1]{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +begin{minipage}{.7 +\backslash +textwidth} +\end_layout + +\begin_layout Plain Layout + + +\backslash +gll #1}{ +\backslash +glend +\backslash +end{minipage}}} +\end_layout + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout LyX-Code + +\lang english +\begin_inset listings +lstparams "basicstyle={\footnotesize},language={[LaTeX]TeX}" +inline false +status open + +\begin_layout Plain Layout + +% Éviter les sauts de page dans les gloses de trois lignes +\end_layout + +\begin_layout Plain Layout + + +\backslash +AtBeginDocument{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +@ifundefined{lingglosss}{}{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +renewenvironment{linggloss}[1]{% +\end_layout + +\begin_layout Plain Layout + + +\backslash +begin{minipage}{.7 +\backslash +textwidth} +\end_layout + +\begin_layout Plain Layout + + +\backslash +glll #1}{ +\backslash +glend +\backslash +end{minipage}}} +\end_layout + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +Il vous faudra peut-être adapter la largeur de la minipage ( +\family typewriter +.7 +\backslash +textwidth +\family default + dans l'exemple) pour l'adapter à votre propre largeur de page. +\end_layout + +\end_deeper \begin_layout Section Tableaux résultant de la théorie de l'optimalité (TO) \end_layout @@ -1149,12 +1386,9 @@ tipa ]). Si \emph on -preview-lat -\family sans +preview-latex \emph default -e -\family default -x est installé et si l'aperçu sur le vif est actif, vous obtiendrez un aperçu + est installé et si l'aperçu sur le vif est actif, vous obtiendrez un aperçu satisfaisant dès que vous quitterez la fenêtre. \end_layout From 78a7743166f539861cdd0465d98a4c5d3f40ac5c Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Fri, 26 Oct 2012 22:23:16 +0200 Subject: [PATCH 10/93] Import theorems correctly (bugs #5702, #5776) Actually tex2lyx can handle modules since some time (#5702), but not theorems (#5776). Now the following issues are fixed: - Modules that depend on other modules can be loaded, since the dependencies are loaded first - Default moduls of the text class are loaded correctly - \newtheorem is recognized as a command that defines new environments and treated similar to \newenvironment --- src/LayoutModuleList.cpp | 49 ++++---- src/LayoutModuleList.h | 5 +- src/tex2lyx/Makefile.am | 1 + src/tex2lyx/Preamble.cpp | 16 +++ src/tex2lyx/test/CMakeLists.txt | 2 +- src/tex2lyx/test/runtests.py | 4 +- src/tex2lyx/test/test-modules.lyx.lyx | 156 ++++++++++++++++++++++++++ src/tex2lyx/test/test-modules.tex | 43 +++++++ src/tex2lyx/tex2lyx.cpp | 105 +++++++++++++++-- src/tex2lyx/tex2lyx.h | 4 + 10 files changed, 355 insertions(+), 30 deletions(-) create mode 100644 src/tex2lyx/test/test-modules.lyx.lyx create mode 100644 src/tex2lyx/test/test-modules.tex diff --git a/src/LayoutModuleList.cpp b/src/LayoutModuleList.cpp index a6507212a8..d532b2d142 100644 --- a/src/LayoutModuleList.cpp +++ b/src/LayoutModuleList.cpp @@ -67,10 +67,8 @@ bool LayoutModuleList::moduleCanBeAdded(string const & modName, if (!lm) return true; - // Is this module explicitly excluded by the document class? - const_iterator const exclmodstart = lay->excludedModules().begin(); - const_iterator const exclmodend = lay->excludedModules().end(); - if (find(exclmodstart, exclmodend, modName) != exclmodend) + // Does this module conflict with the document class or any loaded modules? + if (moduleConflicts(modName, lay)) return false; // Is this module already provided by the document class? @@ -79,26 +77,13 @@ bool LayoutModuleList::moduleCanBeAdded(string const & modName, if (find(provmodstart, provmodend, modName) != provmodend) return false; - // Check for conflicts with used modules - // first the provided modules... - const_iterator provmodit = provmodstart; - for (; provmodit != provmodend; ++provmodit) { - if (!LyXModule::areCompatible(modName, *provmodit)) - return false; - } - // and then the selected modules - const_iterator mit = begin(); - const_iterator const men = end(); - for (; mit != men; ++mit) - if (!LyXModule::areCompatible(modName, *mit)) - return false; - // Check whether some required module is available vector const reqs = lm->getRequiredModules(); if (reqs.empty()) return true; - mit = begin(); // reset + const_iterator mit = begin(); + const_iterator const men = end(); vector::const_iterator rit = reqs.begin(); vector::const_iterator ren = reqs.end(); bool foundone = false; @@ -114,6 +99,32 @@ bool LayoutModuleList::moduleCanBeAdded(string const & modName, } +bool LayoutModuleList::moduleConflicts(string const & modName, + LayoutFile const * const lay) const +{ + // Is this module explicitly excluded by the document class? + const_iterator const exclmodstart = lay->excludedModules().begin(); + const_iterator const exclmodend = lay->excludedModules().end(); + if (find(exclmodstart, exclmodend, modName) != exclmodend) + return true; + // Check for conflicts with used modules + // first the provided modules... + const_iterator provmodit = lay->providedModules().begin(); + const_iterator const provmodend = lay->providedModules().end(); + for (; provmodit != provmodend; ++provmodit) { + if (!LyXModule::areCompatible(modName, *provmodit)) + return true; + } + // and then the selected modules + const_iterator mit = begin(); + const_iterator const men = end(); + for (; mit != men; ++mit) + if (!LyXModule::areCompatible(modName, *mit)) + return true; + return false; +} + + void LayoutModuleList::addDefaultModules(LayoutFile const * const lay, std::list removedModules) { diff --git a/src/LayoutModuleList.h b/src/LayoutModuleList.h index 245b6a7e69..f5741dede1 100644 --- a/src/LayoutModuleList.h +++ b/src/LayoutModuleList.h @@ -57,7 +57,10 @@ public: std::list const & list() const { return lml_; } /// Checks to make sure module's requriements are satisfied, that it does /// not conflict with already-present modules, isn't already loaded, etc. - bool moduleCanBeAdded(std::string const & modName, + bool moduleCanBeAdded(std::string const & modName, + LayoutFile const * const lay) const; + /// Like !moduleCanBeAdded(), but does not check requirements + bool moduleConflicts(std::string const & modName, LayoutFile const * const lay) const; /// If the user changes the base class for a given document, then the /// associated module list has to be updated. This just calls diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index b0be0afd96..1c296a725f 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -28,6 +28,7 @@ TEST_FILES = \ test/foo.png \ test/test-insets.tex \ test/test.ltx \ + test/test-modules.tex \ test/test-structure.tex \ test/XeTeX-polyglossia.tex \ test/xfigtest.fig \ diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 430708c0fc..a567426a68 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -1428,6 +1428,22 @@ void Preamble::parse(Parser & p, string const & forceclass, } + else if (t.cs() == "newtheorem") { + string const name = p.getArg('{', '}'); + string const opt1 = p.getFullOpt(); + string const opt2 = p.getFullOpt(); + string const body = p.verbatim_item(); + string const opt3 = p.getFullOpt(); + + add_known_theorem(name, opt1, !opt2.empty(), + from_utf8("\\newtheorem{" + name + '}' + + opt1 + opt2 + '{' + body + '}' + opt3)); + + if (!in_lyx_preamble) + h_preamble << "\\newtheorem{" << name << '}' + << opt1 << opt2 << '{' << '}' << opt3; + } + else if (t.cs() == "def") { string name = p.get_token().cs(); // In fact, name may be more than the name: diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt index 365d953f69..5e1cd31cf3 100644 --- a/src/tex2lyx/test/CMakeLists.txt +++ b/src/tex2lyx/test/CMakeLists.txt @@ -9,7 +9,7 @@ project(test) set(_test_depend "test.ltx") set(_test_output) -foreach(_arg test-structure test-insets box-color-size-space-align CJK XeTeX-polyglossia) +foreach(_arg test-structure test-insets test-modules box-color-size-space-align CJK XeTeX-polyglossia) list(APPEND _test_depend "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex") list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.tex") list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.lyx") diff --git a/src/tex2lyx/test/runtests.py b/src/tex2lyx/test/runtests.py index 094f5d6c0a..13d62f67ab 100755 --- a/src/tex2lyx/test/runtests.py +++ b/src/tex2lyx/test/runtests.py @@ -46,8 +46,8 @@ def main(argv): outputdir = os.path.join(os.path.dirname(tex2lyx), "test") files = ['test.ltx', 'test-structure.tex', 'test-insets.tex', \ - 'box-color-size-space-align.tex', 'CJK.tex', \ - 'XeTeX-polyglossia.tex'] + 'test-modules.tex', 'box-color-size-space-align.tex', \ + 'CJK.tex', 'XeTeX-polyglossia.tex'] errors = [] overwrite = (outputdir == inputdir) diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx new file mode 100644 index 0000000000..89297fd6dd --- /dev/null +++ b/src/tex2lyx/test/test-modules.lyx.lyx @@ -0,0 +1,156 @@ +#LyX file created by tex2lyx 2.1.0dev +\lyxformat 445 +\begin_document +\begin_header +\textclass amsart +\begin_preamble +\usepackage{babel} + +\end_preamble +\use_default_options false +\begin_modules +theorems-ams +\end_modules +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding latin9 +\fontencoding T1 +\font_roman default +\font_sans default +\font_typewriter default +\font_math auto +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf false +\font_sf_scale 100 +\font_tt_scale 100 +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 0 +\use_package esint 1 +\use_package mathdots 0 +\use_package mathtools 0 +\use_package mhchem 0 +\use_package undertilde 0 +\cite_engine basic +\cite_engine_type numerical +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 0 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\quotes_language english +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard + +This is a dummy file +\end_layout + +\begin_layout Standard + +It has a theorem, a lemma and a proof. +\end_layout + +\begin_layout Standard + +The theorem is recognized is a style provided by the module theorems-ams, since the preamble code matches. +\end_layout + +\begin_layout Standard + +The lemma is not recognized as a command provided by a module, since the preamble code is from an older version of +\begin_inset ERT +status collapsed + +\begin_layout Standard + +LyX +\end_layout + +\end_inset + +, and modules are only loaded if the preamble code matches (otherwise you could easily get completely different output for some often used names like +\backslash +theorem. +\end_layout + +\begin_layout Standard + +The proof is recognized as a builtin style provided by the text class. +\end_layout + +\begin_layout Standard + + +\begin_inset ERT +status collapsed + +\begin_layout Standard + + +\backslash +begin{lem} +\end_layout + +\end_inset + + this is a lemma +\begin_inset ERT +status collapsed + +\begin_layout Standard + + +\backslash +end{lem} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Theorem + +this is the theorem +\end_layout + +\begin_layout Proof + +this is the proof +\end_layout + +\end_body +\end_document diff --git a/src/tex2lyx/test/test-modules.tex b/src/tex2lyx/test/test-modules.tex new file mode 100644 index 0000000000..b27ada9053 --- /dev/null +++ b/src/tex2lyx/test/test-modules.tex @@ -0,0 +1,43 @@ +%% LyX 1.6.1 created this file. For more info, see http://www.lyx.org/. +%% Do not edit unless you really know what you are doing. +\documentclass[oneside,english]{amsart} +\usepackage[T1]{fontenc} +\usepackage[latin9]{inputenc} +\usepackage{amsthm} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Textclass specific LaTeX commands. +\numberwithin{equation}{section} %% Comment out for sequentially-numbered +\numberwithin{figure}{section} %% Comment out for sequentially-numbered +\providecommand{\theoremname}{Theorem} +\theoremstyle{plain} +\theoremstyle{plain} +\newtheorem{thm}{\protect\theoremname} + \theoremstyle{plain} + \newtheorem{lem}[thm]{Lemma} + +\usepackage{babel} + +\begin{document} +This is a dummy file + +It has a theorem, a lemma and a proof. + +The theorem is recognized is a style provided by the module theorems-ams, +since the preamble code matches. + +The lemma is not recognized as a command provided by a module, since the +preamble code is from an older version of LyX, and modules are only loaded +if the preamble code matches (otherwise you could easily get completely +different output for some often used names like \textbackslash theorem. + +The proof is recognized as a builtin style provided by the text class. + +\begin{lem} +this is a lemma\end{lem} +\begin{thm} +this is the theorem\end{thm} +\begin{proof} +this is the proof +\end{proof} + +\end{document} diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 7561774633..0e6afd9f51 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -36,6 +36,7 @@ #include "support/Systemcall.h" #include +#include #include #include #include @@ -150,6 +151,7 @@ CommandMap known_environments; CommandMap known_math_environments; FullCommandMap possible_textclass_commands; FullEnvironmentMap possible_textclass_environments; +FullCommandMap possible_textclass_theorems; int const LYX_FORMAT = LYX_FORMAT_TEX2LYX; /// used modules @@ -206,6 +208,17 @@ void add_known_environment(string const & environment, string const & o1, } +void add_known_theorem(string const & theorem, string const & o1, + bool o2, docstring const & definition) +{ + vector arguments; + convertArgs(o1, o2, arguments); + if (!definition.empty()) + possible_textclass_theorems[theorem] = + FullCommand(arguments, definition); +} + + Layout const * findLayoutWithoutModule(TextClass const & textclass, string const & name, bool command) { @@ -239,6 +252,69 @@ namespace { typedef map ModuleMap; ModuleMap modules; + + +bool addModule(string const module, LayoutFile const & baseClass, LayoutModuleList & m, vector & visited) +{ + // avoid endless loop for circular dependency + vector::const_iterator const vb = visited.begin(); + vector::const_iterator const ve = visited.end(); + if (find(vb, ve, module) != ve) { + cerr << "Circular dependency detected for module " << module << '\n'; + return false; + } + LyXModule const * const lm = theModuleList[module]; + if (!lm) { + cerr << "Could not find module " << module << " in module list.\n"; + return false; + } + bool foundone = false; + LayoutModuleList::const_iterator const exclmodstart = baseClass.excludedModules().begin(); + LayoutModuleList::const_iterator const exclmodend = baseClass.excludedModules().end(); + LayoutModuleList::const_iterator const provmodstart = baseClass.providedModules().begin(); + LayoutModuleList::const_iterator const provmodend = baseClass.providedModules().end(); + vector const reqs = lm->getRequiredModules(); + if (reqs.empty()) + foundone = true; + else { + LayoutModuleList::const_iterator mit = m.begin(); + LayoutModuleList::const_iterator men = m.end(); + vector::const_iterator rit = reqs.begin(); + vector::const_iterator ren = reqs.end(); + for (; rit != ren; ++rit) { + if (find(mit, men, *rit) != men) { + foundone = true; + break; + } + if (find(provmodstart, provmodend, *rit) != provmodend) { + foundone = true; + break; + } + } + if (!foundone) { + visited.push_back(module); + for (rit = reqs.begin(); rit != ren; ++rit) { + if (find(exclmodstart, exclmodend, *rit) == exclmodend) { + if (addModule(*rit, baseClass, m, visited)) { + foundone = true; + break; + } + } + } + visited.pop_back(); + } + } + if (!foundone) { + cerr << "Could not add required modules for " << module << ".\n"; + return false; + } + if (!m.moduleCanBeAdded(module, &baseClass)) + return false; + m.push_back(module); + return true; +} + + void initModules() { // Create list of dummy document classes if not already done. @@ -253,10 +329,9 @@ void initModules() for (; it != end; ++it) { string const module = it->getID(); LayoutModuleList m; - // FIXME this excludes all modules that depend on another one - if (!m.moduleCanBeAdded(module, &baseClass)) + vector v; + if (!addModule(module, baseClass, m, v)) continue; - m.push_back(module); modules[module] = getDocumentClass(baseClass, m); } init = false; @@ -292,12 +367,17 @@ bool checkModule(string const & name, bool command) static set failed[2]; // Only add the module if the command was actually defined in the LyX preamble + bool theorem = false; if (command) { if (possible_textclass_commands.find('\\' + name) == possible_textclass_commands.end()) return false; } else { - if (possible_textclass_environments.find(name) == possible_textclass_environments.end()) - return false; + if (possible_textclass_environments.find(name) == possible_textclass_environments.end()) { + if (possible_textclass_theorems.find(name) != possible_textclass_theorems.end()) + theorem = true; + else + return false; + } } if (failed[command].find(name) != failed[command].end()) return false; @@ -315,7 +395,7 @@ bool checkModule(string const & name, bool command) ModuleMap::iterator const end = modules.end(); for (ModuleMap::iterator it = modules.begin(); it != end; ++it) { string const module = it->first; - if (!used_modules.moduleCanBeAdded(module, &baseClass)) + if (used_modules.moduleConflicts(module, &baseClass)) continue; if (findLayoutWithoutModule(textclass, name, command)) continue; @@ -338,6 +418,11 @@ bool checkModule(string const & name, bool command) possible_textclass_commands['\\' + name]; if (preamble.find(cmd.def) != docstring::npos) add = true; + } else if (theorem) { + FullCommand const & thm = + possible_textclass_theorems[name]; + if (preamble.find(thm.def) != docstring::npos) + add = true; } else { FullEnvironment const & env = possible_textclass_environments[name]; @@ -756,6 +841,12 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) //p.dump(); preamble.parse(p, documentclass, textclass); + list removed_modules; + LayoutFile const & baseClass = LayoutFileList::get()[textclass.name()]; + if (!used_modules.adaptToBaseClass(&baseClass, removed_modules)) { + cerr << "Could not load default modules for text class." << endl; + return false; + } // Load preloaded modules. // This needs to be done after the preamble is parsed, since the text @@ -795,7 +886,7 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding) preamble.addModule(*it); } if (!preamble.writeLyXHeader(os, !active_environments.empty())) { - cerr << "Could write LyX file header." << endl; + cerr << "Could not write LyX file header." << endl; return false; } diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h index 37585fddf4..e3da48b478 100644 --- a/src/tex2lyx/tex2lyx.h +++ b/src/tex2lyx/tex2lyx.h @@ -106,6 +106,8 @@ void add_known_command(std::string const & command, std::string const & o1, extern void add_known_environment(std::string const & environment, std::string const & o1, bool o2, docstring const & beg, docstring const & end); +extern void add_known_theorem(std::string const & theorem, + std::string const & o1, bool o2, docstring const & definition); extern Layout const * findLayoutWithoutModule(TextClass const & textclass, std::string const & name, bool command); extern InsetLayout const * findInsetLayoutWithoutModule( @@ -164,6 +166,8 @@ extern CommandMap known_math_environments; extern FullCommandMap possible_textclass_commands; /// Environments that might be defined by the document class or modules extern FullEnvironmentMap possible_textclass_environments; +/// Theorems that might be defined by the document class or modules +extern FullCommandMap possible_textclass_theorems; /// extern bool noweb_mode; /// Did we recognize any pdflatex-only construct? From b6a626d8d982037d6434bcd5ce2575a1cede3f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 21 Oct 2012 20:11:35 +0200 Subject: [PATCH 11/93] Buffer.cpp: drop unused --- src/Buffer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 8b052ad597..ebc5d3ae30 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -113,7 +113,6 @@ #include #include #include -#include #include using namespace std; From 62394258dacddc8d71a52adcecad0d7e8166db66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 21 Oct 2012 20:17:26 +0200 Subject: [PATCH 12/93] WS cleanup, remove extraeneous spaces --- src/BufferParams.h | 2 +- src/CutAndPaste.cpp | 2 +- src/LyX.h | 3 +-- src/graphics/GraphicsLoader.cpp | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/BufferParams.h b/src/BufferParams.h index 306e5bc3d2..98f79a57fb 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -134,7 +134,7 @@ public: DocumentClass const & documentClass() const; /// \return A pointer to the DocumentClass currently in use: the BaseClass /// as modified by modules. - DocumentClassConstPtr documentClassPtr() const; + DocumentClassConstPtr documentClassPtr() const; /// This bypasses the baseClass and sets the textClass directly. /// Should be called with care and would be better not being here, /// but it seems to be needed by CutAndPaste::putClipboard(). diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 4b95b9be50..9a336a194a 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -631,7 +631,7 @@ bool multipleCellsSelected(Cursor const & cur) } -void switchBetweenClasses(DocumentClassConstPtr oldone, +void switchBetweenClasses(DocumentClassConstPtr oldone, DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist) { errorlist.clear(); diff --git a/src/LyX.h b/src/LyX.h index af43edc2d0..70b8b7e8c6 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -144,7 +144,7 @@ private: friend Messages const & getGuiMessages(); friend KeyMap & theTopLevelKeymap(); friend Movers & theMovers(); - friend Mover const & getMover(std::string const & fmt); + friend Mover const & getMover(std::string const & fmt); friend void setMover(std::string const & fmt, std::string const & command); friend Movers & theSystemMovers(); friend frontend::Application * theApp(); @@ -180,4 +180,3 @@ void dispatch(FuncRequest const & action, DispatchResult & dr); } // namespace lyx #endif // LYX_H - diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp index f635e0b321..5ed19c60ea 100644 --- a/src/graphics/GraphicsLoader.cpp +++ b/src/graphics/GraphicsLoader.cpp @@ -96,11 +96,10 @@ void LoaderQueue::loadNext() if (ptr->status() == WaitingToLoad) ptr->startLoading(); } - if (!cache_queue_.empty()) { + if (!cache_queue_.empty()) startLoader(); - } else { + else stopLoader(); - } } From 43f6b1672b5ef442b4e9b7e4f7ea76dc14ac4fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 21 Oct 2012 21:14:16 +0200 Subject: [PATCH 13/93] Use empty() to check empty and non-empty'ness not size() Also add FormatList::empty(). --- src/BiblioInfo.cpp | 8 ++--- src/Cursor.cpp | 4 +-- src/Format.h | 2 ++ src/KeySequence.cpp | 3 +- src/Paragraph.cpp | 4 +-- src/client/client.cpp | 10 +++--- src/frontends/qt4/GuiPrefs.cpp | 4 +-- src/frontends/qt4/GuiToolbar.cpp | 2 +- src/frontends/qt4/Menus.cpp | 12 +++---- src/graphics/GraphicsLoader.cpp | 2 +- src/lyxfind.cpp | 4 +-- src/mathed/CommandInset.cpp | 2 +- src/mathed/InsetMathBox.cpp | 4 +-- src/mathed/InsetMathExInt.cpp | 6 ++-- src/mathed/InsetMathGrid.cpp | 4 +-- src/mathed/InsetMathHull.cpp | 4 +-- src/mathed/InsetMathScript.cpp | 62 ++++++++++++++++---------------- src/mathed/InsetMathXArrow.cpp | 2 +- src/mathed/InsetMathXYArrow.cpp | 4 +-- src/mathed/MathAutoCorrect.cpp | 2 +- src/mathed/MathData.cpp | 4 +-- src/mathed/MathExtern.cpp | 12 +++---- src/mathed/MathMacro.cpp | 5 ++- src/mathed/MathMacroTemplate.cpp | 13 ++++--- src/mathed/MathParser.cpp | 22 ++++++------ src/rowpainter.cpp | 4 +-- src/support/docstring.cpp | 2 +- src/support/weighted_btree.h | 4 +-- src/tex2lyx/text.cpp | 2 +- 29 files changed, 106 insertions(+), 107 deletions(-) diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index bc46e17448..93094f8bfa 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -66,7 +66,7 @@ docstring familyName(docstring const & name) vector::const_iterator it = pieces.begin(); vector::const_iterator en = pieces.end(); for (; it != en; ++it) { - if ((*it).size() == 0) + if ((*it).empty()) continue; char_type const c = (*it)[0]; if (isLower(c)) @@ -99,7 +99,7 @@ docstring convertLaTeXCommands(docstring const & str) bool scanning_cmd = false; bool scanning_math = false; bool escaped = false; // used to catch \$, etc. - while (val.size()) { + while (!val.empty()) { char_type const ch = val[0]; // if we're scanning math, we output everything until we @@ -323,7 +323,7 @@ namespace { fmt = fmt.substr(2); // we'll remove characters from the front of fmt as we // deal with them - while (fmt.size()) { + while (!fmt.empty()) { if (fmt[0] == ']' && fmt.size() > 1 && fmt[1] == ']') { // that's the end fmt = fmt.substr(2); @@ -415,7 +415,7 @@ docstring BibTeXInfo::expandFormat(string const & format, string fmt = format; // we'll remove characters from the front of fmt as we // deal with them - while (fmt.size()) { + while (!fmt.empty()) { if (counter++ > max_passes) { LYXERR0("Recursion limit reached while parsing `" << format << "'."); diff --git a/src/Cursor.cpp b/src/Cursor.cpp index b0f7b7074e..e38ca5ec13 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -588,7 +588,7 @@ void Cursor::checkNewWordPosition() clearNewWordPosition(); else { FontSpan nw = locateWord(WHOLE_WORD); - if (nw.size()) { + if (!nw.empty()) { FontSpan ow = new_word_.locateWord(WHOLE_WORD); if (nw.intersect(ow).empty()) clearNewWordPosition(); @@ -1637,7 +1637,7 @@ bool Cursor::macroModeClose() // we have to resolve the macro here manually and check its arity // to put the selection behind it if arity > 0. MacroData const * data = buffer()->getMacro(atomAsMacro->name()); - if (selection.size() > 0 && data && data->numargs() - data->optionals() > 0) { + if (!selection.empty() && data && data->numargs() - data->optionals() > 0) { macroArg = true; atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 1); } else diff --git a/src/Format.h b/src/Format.h index 9d91ae1442..b96120bc71 100644 --- a/src/Format.h +++ b/src/Format.h @@ -201,6 +201,8 @@ public: /// const_iterator end() const { return formatlist.end(); } /// + bool empty() const { return formatlist.empty(); } + /// FormatList::size_type size() const { return formatlist.size(); } private: /// diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp index a0f2f5bda2..3bee9caadb 100644 --- a/src/KeySequence.cpp +++ b/src/KeySequence.cpp @@ -125,8 +125,7 @@ size_t KeySequence::parse(string const & s) } } - // empty sequence? - if (sequence.size() == 0) + if (sequence.empty()) return 0; // everything is fine diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index e80ddc1de3..5a68047850 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -3733,7 +3733,7 @@ SpellChecker::Result Paragraph::spellCheck(pos_type & from, pos_type & to, wl = WordLangTuple(word, lang); - if (!word.size()) + if (word.empty()) return result; if (needsSpellCheck() || check_learned) { @@ -3830,7 +3830,7 @@ void Paragraph::Private::markMisspelledWords( void Paragraph::spellCheck() const { SpellChecker * speller = theSpellChecker(); - if (!speller || !size() ||!needsSpellCheck()) + if (!speller || empty() ||!needsSpellCheck()) return; pos_type start; pos_type endpos; diff --git a/src/client/client.cpp b/src/client/client.cpp index 105c1e9c01..19e38fae51 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -462,7 +462,7 @@ docstring clientName = int n(vector const & arg) { - if (arg.size() < 1) { + if (arg.empty()) { cerr << "lyxclient: The option -n requires 1 argument." << endl; return -1; @@ -477,7 +477,7 @@ docstring singleCommand; int c(vector const & arg) { - if (arg.size() < 1) { + if (arg.empty()) { cerr << "lyxclient: The option -c requires 1 argument." << endl; return -1; @@ -507,7 +507,7 @@ docstring serverAddress; int a(vector const & arg) { - if (arg.size() < 1) { + if (arg.empty()) { cerr << "lyxclient: The option -a requires 1 argument." << endl; return -1; @@ -522,7 +522,7 @@ int a(vector const & arg) int t(vector const & arg) { - if (arg.size() < 1) { + if (arg.empty()) { cerr << "lyxclient: The option -t requires 1 argument." << endl; return -1; @@ -537,7 +537,7 @@ string serverPid; // Init to empty string int p(vector const & arg) { - if (arg.size() < 1) { + if (arg.empty()) { cerr << "lyxclient: The option -p requires 1 argument." << endl; return -1; diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index a65af05d76..902d2dd9cd 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -1678,7 +1678,7 @@ void PrefConverters::changeConverter() void PrefConverters::updateButtons() { - if (form_->formats().size() == 0) + if (form_->formats().empty()) return; Format const & from = form_->formats().get(converterFromCO->currentIndex()); Format const & to = form_->formats().get(converterToCO->currentIndex()); @@ -1975,7 +1975,7 @@ void PrefFileformats::updateView() void PrefFileformats::on_formatsCB_currentIndexChanged(int i) { - if (form_->formats().size() == 0) + if (form_->formats().empty()) return; int const nr = formatsCB->itemData(i).toInt(); Format const f = form_->formats().get(nr); diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index ec80a0b430..a6f4505ce0 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -99,7 +99,7 @@ Action * GuiToolbar::addItem(ToolbarItem const & item) // Get the keys bound to this action, but keep only the // first one later KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(item.func_); - if (bindings.size()) + if (!bindings.empty()) text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]"; Action * act = new Action(&owner_, getIcon(item.func_, false), diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 674afaf09a..279ccaea3c 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -241,7 +241,7 @@ public: // Get the keys bound to this action, but keep only the // first one later KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_); - if (bindings.size()) + if (!bindings.empty()) return toqstr(bindings.begin()->print(KeySequence::ForGui)); LYXERR(Debug::KBMAP, "No binding for " @@ -1301,7 +1301,7 @@ void MenuDefinition::expandToc(Buffer const * buf) if (cit == end) LYXERR(Debug::GUI, "No table of contents."); else { - if (cit->second.size() > 0 ) + if (!cit->second.empty()) expandToc2(cit->second, 0, cit->second.size(), 0); else add(MenuItem(MenuItem::Info, qt_(""))); @@ -1574,7 +1574,7 @@ static QString label(MenuItem const & mi) void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) { LYXERR(Debug::GUI, "populating menu " << menu.name()); - if (menu.size() == 0) { + if (menu.empty()) { LYXERR(Debug::GUI, "\tERROR: empty menu " << menu.name()); return; } @@ -1759,7 +1759,7 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) {LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole} }; const size_t num_entries = sizeof(entries) / sizeof(entries[0]); - const bool first_call = mac_special_menu_.size() == 0; + const bool first_call = mac_special_menu_.empty(); // the special menu for Menus. Fill it up only once. if (first_call) { @@ -2050,7 +2050,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial) LYXERR(Debug::GUI, "populating menu bar" << d->menubar_.name()); - if (d->menubar_.size() == 0) { + if (d->menubar_.empty()) { LYXERR(Debug::GUI, "\tERROR: empty menu bar" << d->menubar_.name()); return; @@ -2115,7 +2115,7 @@ void Menus::updateMenu(Menu * qmenu) MenuDefinition cat_menu = d->getMenu(toqstr(menu_name)); //FIXME: 50 is a wild guess. We should take into account here //the expansion of menu items, disabled optional items etc. - bool const in_sub_menu = fromLyxMenu.size() > 0 + bool const in_sub_menu = !fromLyxMenu.empty() && fromLyxMenu.size() + cat_menu.size() > 50 ; if (in_sub_menu) fromLyxMenu.catSub(menu_name); diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp index 5ed19c60ea..9f873baf3d 100644 --- a/src/graphics/GraphicsLoader.cpp +++ b/src/graphics/GraphicsLoader.cpp @@ -89,7 +89,7 @@ void LoaderQueue::loadNext() LYXERR(Debug::GRAPHICS, "LoaderQueue: " << cache_queue_.size() << " items in the queue"); int counter = s_numimages_; - while (cache_queue_.size() && counter--) { + while (!cache_queue_.empty() && counter--) { Cache::ItemPtr ptr = cache_queue_.front(); cache_set_.erase(ptr); cache_queue_.pop_front(); diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 33dbd8a9d4..74b045c4bb 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -968,10 +968,10 @@ string MatchStringAdv::normalize(docstring const & s, bool hack_braces) const else t = lyx::to_utf8(s); // Remove \n at begin - while (t.size() > 0 && t[0] == '\n') + while (!t.empty() && t[0] == '\n') t = t.substr(1); // Remove \n at end - while (t.size() > 0 && t[t.size() - 1] == '\n') + while (!t.empty() && t[t.size() - 1] == '\n') t = t.substr(0, t.size() - 1); size_t pos; // Replace all other \n with spaces diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp index e09604e241..0cf041c23e 100644 --- a/src/mathed/CommandInset.cpp +++ b/src/mathed/CommandInset.cpp @@ -67,7 +67,7 @@ void CommandInset::write(WriteStream & os) const ModeSpecifier specifier(os, currentMode(), lockedMode(), asciiOnly()); MathEnsurer ensurer(os, needs_math_mode_); os << '\\' << name_; - if (cell(1).size()) + if (!cell(1).empty()) os << '[' << cell(1) << ']'; os << '{' << cell(0) << '}'; } diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp index 60983bca80..8b3cb2b427 100644 --- a/src/mathed/InsetMathBox.cpp +++ b/src/mathed/InsetMathBox.cpp @@ -282,9 +282,9 @@ void InsetMathMakebox::write(WriteStream & os) const { ModeSpecifier specifier(os, TEXT_MODE); os << (framebox_ ? "\\framebox" : "\\makebox"); - if (cell(0).size() || !os.latex()) { + if (!cell(0).empty() || !os.latex()) { os << '[' << cell(0) << ']'; - if (cell(1).size() || !os.latex()) + if (!cell(1).empty() || !os.latex()) os << '[' << cell(1) << ']'; } os << '{' << cell(2) << '}'; diff --git a/src/mathed/InsetMathExInt.cpp b/src/mathed/InsetMathExInt.cpp index ac5409f469..64f49cd996 100644 --- a/src/mathed/InsetMathExInt.cpp +++ b/src/mathed/InsetMathExInt.cpp @@ -76,7 +76,7 @@ void InsetMathExInt::draw(PainterInfo &, int, int) const void InsetMathExInt::maple(MapleStream & os) const { os << symbol_ << '('; - if (cell(0).size()) + if (!cell(0).empty()) os << cell(0); else os << '1'; @@ -94,7 +94,7 @@ void InsetMathExInt::maxima(MaximaStream & os) const else os << symbol_ << '('; - if (cell(0).size()) + if (!cell(0).empty()) os << cell(0) << ','; else os << '1' << ','; @@ -113,7 +113,7 @@ void InsetMathExInt::mathematica(MathematicaStream & os) const else os << symbol_ << '['; - if (cell(0).size()) + if (!cell(0).empty()) os << cell(0) << ','; else os << '1' << ','; diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp index ac8cd491ac..e74d549c48 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -674,7 +674,7 @@ docstring InsetMathGrid::eolString(row_type row, bool fragile, // make sure an upcoming '[' does not break anything if (row + 1 < nrows()) { MathData const & c = cell(index(row + 1, 0)); - if (c.size() && c.front()->getChar() == '[') + if (!c.empty() && c.front()->getChar() == '[') //eol += "[0pt]"; eol += "{}"; } @@ -905,7 +905,7 @@ bool InsetMathGrid::idxDelete(idx_type & idx) // try to delete entire sequence of ncols() empty cells if possible for (idx_type i = idx; i < idx + ncols(); ++i) - if (cell(i).size()) + if (!cell(i).empty()) return false; // move cells if necessary diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index 1f135f54c2..6598bd913d 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -1039,7 +1039,7 @@ void InsetMathHull::splitTo3Cols() InsetMathGrid::addCol(2); for (row_type row = 0; row < nrows(); ++row) { idx_type const i = 3 * row + 1; - if (cell(i).size()) { + if (!cell(i).empty()) { cell(i + 1) = MathData(buffer_, cell(i).begin() + 1, cell(i).end()); cell(i).erase(1, cell(i).size()); } @@ -1309,7 +1309,7 @@ void InsetMathHull::doExtern(Cursor & cur, FuncRequest & func) MathData ar; if (cur.inMathed() && cur.selection()) { asArray(grabAndEraseSelection(cur), ar); - } else if (pos == cur.cell().size()) { + } else if (!pos == cur.cell().empty()) { ar = cur.cell(); lyxerr << "use whole cell: " << ar << endl; } else { diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp index 9dae426bea..ba2be2f729 100644 --- a/src/mathed/InsetMathScript.cpp +++ b/src/mathed/InsetMathScript.cpp @@ -177,7 +177,7 @@ int InsetMathScript::dy01(BufferView const & bv, int asc, int des, int what) con { int dasc = 0; int slevel = 0; - bool isCharBox = nuc().size() ? isAlphaSymbol(nuc().back()) : false; + bool isCharBox = !nuc().empty() ? isAlphaSymbol(nuc().back()) : false; if (hasDown()) { Dimension const & dimdown = down().dimension(bv); dasc = dimdown.ascent(); @@ -271,25 +271,25 @@ int InsetMathScript::dxx(BufferView const & bv) const int InsetMathScript::nwid(BufferView const & bv) const { - return nuc().size() ? nuc().dimension(bv).width() : 2; + return !nuc().empty() ? nuc().dimension(bv).width() : 2; } int InsetMathScript::nasc(BufferView const & bv) const { - return nuc().size() ? nuc().dimension(bv).ascent() : 5; + return !nuc().empty() ? nuc().dimension(bv).ascent() : 5; } int InsetMathScript::ndes(BufferView const & bv) const { - return nuc().size() ? nuc().dimension(bv).descent() : 0; + return !nuc().empty() ? nuc().dimension(bv).descent() : 0; } int InsetMathScript::nker(BufferView const * bv) const { - if (nuc().size()) { + if (!nuc().empty()) { int kerning = nuc().kerning(bv); return kerning > 0 ? kerning : 0; } @@ -351,7 +351,7 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const void InsetMathScript::draw(PainterInfo & pi, int x, int y) const { BufferView & bv = *pi.base.bv; - if (nuc().size()) + if (!nuc().empty()) nuc().draw(pi, x + dxx(bv), y); else { nuc().setXY(bv, x + dxx(bv), y); @@ -380,7 +380,7 @@ void InsetMathScript::metricsT(TextMetricsInfo const & mi, Dimension & dim) cons void InsetMathScript::drawT(TextPainter & pain, int x, int y) const { // FIXME: BROKEN - if (nuc().size()) + if (!nuc().empty()) nuc().drawT(pain, x + 1, y); if (hasUp()) up().drawT(pain, x + 1, y - 1 /*dy1()*/); @@ -399,7 +399,7 @@ bool InsetMathScript::hasLimits() const return false; // we can only display limits if the nucleus wants some - if (!nuc().size()) + if (nuc().empty()) return false; if (!nuc().back()->isScriptable()) return false; @@ -530,7 +530,7 @@ void InsetMathScript::write(WriteStream & os) const { MathEnsurer ensurer(os); - if (nuc().size()) { + if (!nuc().empty()) { os << nuc(); //if (nuc().back()->takesLimits()) { if (limits_ == -1) @@ -545,13 +545,13 @@ void InsetMathScript::write(WriteStream & os) const os << "{}"; } - if (hasDown() /*&& down().size()*/) + if (hasDown() /*&& !down().empty()*/) os << "_{" << down() << '}'; - if (hasUp() /*&& up().size()*/) { + if (hasUp() /*&& !up().empty()*/) { // insert space if up() is empty or an empty brace inset // (see bug 8305) - if (os.latex() && (up().size() == 0 || + if (os.latex() && (up().empty() || (up().size() == 1 && up().back()->asBraceInset() && up().back()->asBraceInset()->cell(0).empty()))) os << "^ {}"; @@ -566,8 +566,8 @@ void InsetMathScript::write(WriteStream & os) const void InsetMathScript::normalize(NormalStream & os) const { - bool d = hasDown() && down().size(); - bool u = hasUp() && up().size(); + bool d = hasDown() && !down().empty(); + bool u = hasUp() && !up().empty(); if (u && d) os << "[subsup "; @@ -576,7 +576,7 @@ void InsetMathScript::normalize(NormalStream & os) const else if (d) os << "[sub "; - if (nuc().size()) + if (!nuc().empty()) os << nuc() << ' '; else os << "[par]"; @@ -592,21 +592,21 @@ void InsetMathScript::normalize(NormalStream & os) const void InsetMathScript::maple(MapleStream & os) const { - if (nuc().size()) + if (!nuc().empty()) os << nuc(); - if (hasDown() && down().size()) + if (hasDown() && !down().empty()) os << '[' << down() << ']'; - if (hasUp() && up().size()) + if (hasUp() && !up().empty()) os << "^(" << up() << ')'; } void InsetMathScript::mathematica(MathematicaStream & os) const { - bool d = hasDown() && down().size(); - bool u = hasUp() && up().size(); + bool d = hasDown() && !down().empty(); + bool u = hasUp() && !up().empty(); - if (nuc().size()) { + if (!nuc().empty()) { if (d) os << "Subscript[" << nuc(); else @@ -616,7 +616,7 @@ void InsetMathScript::mathematica(MathematicaStream & os) const if (u) os << "^(" << up() << ')'; - if (nuc().size()) { + if (!nuc().empty()) { if (d) os << ',' << down() << ']'; } @@ -629,8 +629,8 @@ void InsetMathScript::mathematica(MathematicaStream & os) const // need to know if we're in a display formula. void InsetMathScript::mathmlize(MathStream & os) const { - bool d = hasDown() && down().size(); - bool u = hasUp() && up().size(); + bool d = hasDown() && !down().empty(); + bool u = hasUp() && !up().empty(); if (u && d) os << MTag("msubsup"); @@ -639,7 +639,7 @@ void InsetMathScript::mathmlize(MathStream & os) const else if (d) os << MTag("msub"); - if (nuc().size()) + if (!nuc().empty()) os << MTag("mrow") << nuc() << ETag("mrow"); else os << ""; @@ -657,10 +657,10 @@ void InsetMathScript::mathmlize(MathStream & os) const void InsetMathScript::htmlize(HtmlStream & os) const { - bool d = hasDown() && down().size(); - bool u = hasUp() && up().size(); + bool d = hasDown() && !down().empty(); + bool u = hasUp() && !up().empty(); - if (nuc().size()) + if (!nuc().empty()) os << nuc(); if (u && d) @@ -677,11 +677,11 @@ void InsetMathScript::htmlize(HtmlStream & os) const void InsetMathScript::octave(OctaveStream & os) const { - if (nuc().size()) + if (!nuc().empty()) os << nuc(); - if (hasDown() && down().size()) + if (hasDown() && !down().empty()) os << '[' << down() << ']'; - if (hasUp() && up().size()) + if (hasUp() && !up().empty()) os << "^(" << up() << ')'; } diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp index 44799bac2f..eef5b4388c 100644 --- a/src/mathed/InsetMathXArrow.cpp +++ b/src/mathed/InsetMathXArrow.cpp @@ -64,7 +64,7 @@ void InsetMathXArrow::write(WriteStream & os) const { MathEnsurer ensurer(os); os << '\\' << name_; - if (cell(1).size()) + if (!cell(1).empty()) os << '[' << cell(1) << ']'; os << '{' << cell(0) << '}'; } diff --git a/src/mathed/InsetMathXYArrow.cpp b/src/mathed/InsetMathXYArrow.cpp index 69227564ee..0cb525c15a 100644 --- a/src/mathed/InsetMathXYArrow.cpp +++ b/src/mathed/InsetMathXYArrow.cpp @@ -142,9 +142,9 @@ void InsetMathXYArrow::write(WriteStream & os) const { MathEnsurer ensurer(os); os << "\\ar"; - if (cell(0).size()) + if (!cell(0).empty()) os << '[' << cell(0) << ']'; - if (cell(1).size()) + if (!cell(1).empty()) os << (up_ ? '^' : '_') << '{' << cell(1) << '}'; os << " "; } diff --git a/src/mathed/MathAutoCorrect.cpp b/src/mathed/MathAutoCorrect.cpp index fcc9f7705a..e49959a16d 100644 --- a/src/mathed/MathAutoCorrect.cpp +++ b/src/mathed/MathAutoCorrect.cpp @@ -149,7 +149,7 @@ void initAutoCorrect() string line; ifstream is(file.toFilesystemEncoding().c_str()); while (getline(is, line)) { - if (line.size() == 0 || line[0] == '#') { + if (line.empty() || line[0] == '#') { //LYXERR(Debug::MATHED, "ignoring line '" << line << '\''); continue; } diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index 12fb6c1907..2992c41f1d 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -339,13 +339,13 @@ void MathData::draw(PainterInfo & pi, int x, int y) const docstring s1 = completion.substr(0, uniqueTo); docstring s2 = completion.substr(uniqueTo); - if (s1.size() > 0) { + if (!s1.empty()) { f.setColor(Color_inlinecompletion); pi.pain.text(x, y, s1, f); x += mathed_string_width(f, s1); } - if (s2.size() > 0) { + if (!s2.empty()) { f.setColor(Color_nonunique_inlinecompletion); pi.pain.text(x, y, s2, f); x += mathed_string_width(f, s2); diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp index 8d1df06f77..d3bf738753 100644 --- a/src/mathed/MathExtern.cpp +++ b/src/mathed/MathExtern.cpp @@ -352,7 +352,7 @@ void splitScripts(MathData & ar) continue; // we must have a nucleus if we only have a superscript - if (!script->hasDown() && script->nuc().size() == 0) + if (!script->hasDown() && script->nuc().empty()) continue; if (script->nuc().size() == 1) { @@ -619,7 +619,7 @@ bool testIntegral(MathAtom const & at) return testIntSymbol(at) || ( at->asScriptInset() - && at->asScriptInset()->nuc().size() + && !at->asScriptInset()->nuc().empty() && testIntSymbol(at->asScriptInset()->nuc().back()) ); } @@ -719,7 +719,7 @@ bool testSum(MathAtom const & at) return testSumSymbol(at) || ( at->asScriptInset() - && at->asScriptInset()->nuc().size() + && !at->asScriptInset()->nuc().empty() && testSumSymbol(at->asScriptInset()->nuc().back()) ); } @@ -800,7 +800,7 @@ bool testDiffItem(MathAtom const & at) bool testDiffArray(MathData const & ar) { - return ar.size() && testDiffItem(ar.front()); + return !ar.empty() && testDiffItem(ar.front()); } @@ -1419,7 +1419,7 @@ void mathmlize(MathData const & dat, MathStream & os) { MathData ar = dat; extractStructure(ar, MATHML); - if (ar.size() == 0) + if (ar.empty()) os << ""; else if (ar.size() == 1) os << ar.front(); @@ -1436,7 +1436,7 @@ void htmlize(MathData const & dat, HtmlStream & os) { MathData ar = dat; extractStructure(ar, HTML); - if (ar.size() == 0) + if (ar.empty()) return; if (ar.size() == 1) { os << ar.front(); diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp index cd9b757a51..1786e81c29 100644 --- a/src/mathed/MathMacro.cpp +++ b/src/mathed/MathMacro.cpp @@ -465,7 +465,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const void MathMacro::drawSelection(PainterInfo & pi, int x, int y) const { // We may have 0 arguments, but InsetMathNest requires at least one. - if (cells_.size() > 0) + if (!cells_.empty()) InsetMathNest::drawSelection(pi, x, y); } @@ -507,8 +507,7 @@ bool MathMacro::validName() const { docstring n = name(); - // empty name? - if (n.size() == 0) + if (n.empty()) return false; // converting back and force doesn't swallow anything? diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp index 2d36e4d223..8220aa68a6 100644 --- a/src/mathed/MathMacroTemplate.cpp +++ b/src/mathed/MathMacroTemplate.cpp @@ -994,7 +994,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) commitEditChanges(cur, cur); cur.recordUndoFullDocument(); size_t pos = numargs_; - if (arg.size() != 0) + if (!arg.empty()) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus insertParameter(cur, cur, pos); } @@ -1006,7 +1006,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd) commitEditChanges(cur, cur); cur.recordUndoFullDocument(); size_t pos = numargs_ - 1; - if (arg.size() != 0) + if (!arg.empty()) pos = (size_t)convert(arg) - 1; // it is checked for >=0 in getStatus removeParameter(cur, cur, pos); } @@ -1080,7 +1080,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, switch (cmd.action()) { case LFUN_MATH_MACRO_ADD_PARAM: { int num = numargs_ + 1; - if (arg.size() != 0) + if (!arg.empty()) num = convert(arg); bool on = (num >= optionals_ && numargs_ < 9 && num <= numargs_ + 1); @@ -1095,7 +1095,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd, case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM: case LFUN_MATH_MACRO_REMOVE_PARAM: { int num = numargs_; - if (arg.size() != 0) + if (!arg.empty()) num = convert(arg); flag.setEnabled(num >= 1 && num <= numargs_); break; @@ -1266,8 +1266,7 @@ bool MathMacroTemplate::validName() const { docstring n = name(); - // empty name? - if (n.size() == 0) + if (n.empty()) return false; // converting back and force doesn't swallow anything? @@ -1316,7 +1315,7 @@ bool MathMacroTemplate::fixNameAndCheckIfValid() } // now it should be valid if anything in the name survived - return data.size() > 0; + return !data.empty(); } diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp index 9752320095..1982af3c86 100644 --- a/src/mathed/MathParser.cpp +++ b/src/mathed/MathParser.cpp @@ -334,9 +334,9 @@ public: /// char_type character() const { return char_; } /// - docstring asString() const { return cs_.size() ? cs_ : docstring(1, char_); } + docstring asString() const { return !cs_.empty() ? cs_ : docstring(1, char_); } /// - docstring asInput() const { return cs_.size() ? '\\' + cs_ : docstring(1, char_); } + docstring asInput() const { return !cs_.empty() ? '\\' + cs_ : docstring(1, char_); } private: /// @@ -350,7 +350,7 @@ private: ostream & operator<<(ostream & os, Token const & t) { - if (t.cs().size()) { + if (!t.cs().empty()) { docstring const & cs = t.cs(); // FIXME: For some strange reason, the stream operator instanciate // a new Token before outputting the contents of t.cs(). @@ -951,7 +951,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, bool up = (t.cat() == catSuper); // we need no new script inset if the last thing was a scriptinset, // which has that script already not the same script already - if (!cell->size()) + if (cell->empty()) cell->push_back(MathAtom(new InsetMathScript(buf, up))); else if (cell->back()->asScriptInset() && !cell->back()->asScriptInset()->has(up)) @@ -1029,7 +1029,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, // else if (t.cs() == "lyxlock") { - if (cell->size()) + if (!cell->empty()) cell->back().nucleus()->lock(true); } @@ -1377,7 +1377,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, else if (t.cs() == "sqrt") { MathData ar; parse(ar, FLAG_OPTION, mode); - if (ar.size()) { + if (!ar.empty()) { cell->push_back(MathAtom(new InsetMathRoot(buf))); cell->back().nucleus()->cell(0) = ar; parse(cell->back().nucleus()->cell(1), FLAG_ITEM, mode); @@ -1399,7 +1399,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, // Allowed formats \unit[val]{unit} MathData ar; parse(ar, FLAG_OPTION, mode); - if (ar.size()) { + if (!ar.empty()) { cell->push_back(MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNIT))); cell->back().nucleus()->cell(0) = ar; parse(cell->back().nucleus()->cell(1), FLAG_ITEM, mode); @@ -1413,7 +1413,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, // Here allowed formats are \unitfrac[val]{num}{denom} MathData ar; parse(ar, FLAG_OPTION, mode); - if (ar.size()) { + if (!ar.empty()) { cell->push_back(MathAtom(new InsetMathFrac(buf, InsetMathFrac::UNITFRAC, 3))); cell->back().nucleus()->cell(2) = ar; } else { @@ -1845,10 +1845,10 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, rem.clear(); } else cmd.clear(); - } while (cmd.size()); + } while (!cmd.empty()); } - else if (t.cs().size()) { + else if (!t.cs().empty()) { bool const no_mhchem = (t.cs() == "ce" || t.cs() == "cf") && buf && buf->params().use_package("mhchem") == @@ -1979,7 +1979,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags, // this fails on \bigg[...\bigg] //MathData opt; //parse(opt, FLAG_OPTION, InsetMath::VERBATIM_MODE); - //if (opt.size()) { + //if (!opt.empty()) { // start = 1; // at.nucleus()->cell(0) = opt; //} diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp index 7c7fd3ef41..0a902b7ef2 100644 --- a/src/rowpainter.cpp +++ b/src/rowpainter.cpp @@ -1111,13 +1111,13 @@ void RowPainter::paintInlineCompletion(Font const & font) swap(c1, c2); } - if (s1.size() > 0) { + if (!s1.empty()) { f.setColor(c1); pi_.pain.text(int(x_), yo_, s1, f); x_ += theFontMetrics(font).width(s1); } - if (s2.size() > 0) { + if (!s2.empty()) { f.setColor(c2); pi_.pain.text(int(x_), yo_, s2, f); x_ += theFontMetrics(font).width(s2); diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index d19c2e39be..c937ba3721 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -133,7 +133,7 @@ string const to_local8bit(docstring const & s) if (s.empty()) return string(); QByteArray const local = toqstr(s).toLocal8Bit(); - if (local.size() == 0) + if (local.isEmpty()) throw to_local8bit_failure(); return string(local.begin(), local.end()); } diff --git a/src/support/weighted_btree.h b/src/support/weighted_btree.h index 10f4793ff3..0b833740d0 100644 --- a/src/support/weighted_btree.h +++ b/src/support/weighted_btree.h @@ -1769,7 +1769,7 @@ public: clear(); key_less = other.key_comp(); - if (other.size() != 0) + if (!other.empty()) { stats.leaves = stats.innernodes = 0; root = copy_recursive(other.root); @@ -1788,7 +1788,7 @@ public: stats( other.stats ), key_less( other.key_comp() ) { - if (size() > 0) + if (!empty()) { stats.leaves = stats.innernodes = 0; root = copy_recursive(other.root); diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index e397c32fd7..01626f3a50 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -4384,7 +4384,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, /* string s = t.asInput(); string z = p.verbatim_item(); - while (p.good() && z != " " && z.size()) { + while (p.good() && z != " " && !z.empty()) { //cerr << "read: " << z << endl; s += z; z = p.verbatim_item(); From d52c9fda348a9fb830f5dfa7815787587e3e5877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 26 Oct 2012 02:42:27 +0200 Subject: [PATCH 14/93] Use new T not new T() --- src/Buffer.cpp | 4 ++-- src/LyX.cpp | 8 ++++---- src/WordList.cpp | 2 +- src/frontends/qt4/GuiApplication.cpp | 4 ++-- src/frontends/qt4/GuiClipboard.cpp | 2 +- src/frontends/qt4/GuiProgressView.cpp | 2 +- src/frontends/qt4/GuiView.cpp | 2 +- src/frontends/qt4/GuiViewSource.cpp | 2 +- src/frontends/qt4/PanelStack.cpp | 2 +- src/insets/InsetListingsParams.cpp | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index ebc5d3ae30..a045deadc9 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -493,7 +493,7 @@ Buffer::~Buffer() Buffer * Buffer::cloneFromMaster() const { BufferMap bufmap; - cloned_buffers.push_back(new CloneList()); + cloned_buffers.push_back(new CloneList); CloneList * clones = cloned_buffers.back(); masterBuffer()->cloneWithChildren(bufmap, clones); @@ -549,7 +549,7 @@ void Buffer::cloneWithChildren(BufferMap & bufmap, CloneList * clones) const Buffer * Buffer::cloneBufferOnly() const { - cloned_buffers.push_back(new CloneList()); + cloned_buffers.push_back(new CloneList); CloneList * clones = cloned_buffers.back(); Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this); clones->insert(buffer_clone); diff --git a/src/LyX.cpp b/src/LyX.cpp index 722f04067a..2962207241 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -1424,7 +1424,7 @@ void setSpellChecker() if (lyxrc.spellchecker == "native") { #if defined(USE_MACOSX_PACKAGING) if (!singleton_->pimpl_->apple_spell_checker_) - singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker(); + singleton_->pimpl_->apple_spell_checker_ = new AppleSpellChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->apple_spell_checker_; #else singleton_->pimpl_->spell_checker_ = 0; @@ -1432,7 +1432,7 @@ void setSpellChecker() } else if (lyxrc.spellchecker == "aspell") { #if defined(USE_ASPELL) if (!singleton_->pimpl_->aspell_checker_) - singleton_->pimpl_->aspell_checker_ = new AspellChecker(); + singleton_->pimpl_->aspell_checker_ = new AspellChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->aspell_checker_; #else singleton_->pimpl_->spell_checker_ = 0; @@ -1440,7 +1440,7 @@ void setSpellChecker() } else if (lyxrc.spellchecker == "enchant") { #if defined(USE_ENCHANT) if (!singleton_->pimpl_->enchant_checker_) - singleton_->pimpl_->enchant_checker_ = new EnchantChecker(); + singleton_->pimpl_->enchant_checker_ = new EnchantChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->enchant_checker_; #else singleton_->pimpl_->spell_checker_ = 0; @@ -1448,7 +1448,7 @@ void setSpellChecker() } else if (lyxrc.spellchecker == "hunspell") { #if defined(USE_HUNSPELL) if (!singleton_->pimpl_->hunspell_checker_) - singleton_->pimpl_->hunspell_checker_ = new HunspellChecker(); + singleton_->pimpl_->hunspell_checker_ = new HunspellChecker; singleton_->pimpl_->spell_checker_ = singleton_->pimpl_->hunspell_checker_; #else singleton_->pimpl_->spell_checker_ = 0; diff --git a/src/WordList.cpp b/src/WordList.cpp index 191dc33b83..5dcbc14234 100644 --- a/src/WordList.cpp +++ b/src/WordList.cpp @@ -37,7 +37,7 @@ WordList * theWordList(Language const & lang) if (it != theGlobalWordList.end()) return it->second; else - theGlobalWordList[lang] = new WordList(); + theGlobalWordList[lang] = new WordList; return theGlobalWordList[lang]; } diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 78066242c7..60473c9ff7 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -737,7 +737,7 @@ struct GuiApplication::Private { #ifdef Q_WS_WIN /// WMF Mime handler for Windows clipboard. - wmf_mime_ = new QWindowsMimeMetafile(); + wmf_mime_ = new QWindowsMimeMetafile; #endif initKeySequences(&theTopLevelKeymap()); } @@ -2145,7 +2145,7 @@ void GuiApplication::execBatchCommands() // Create the global default menubar which is shown for the dialogs // and if no GuiView is visible. // This must be done after the session was recovered to know the "last files". - d->global_menubar_ = new GlobalMenuBar(); + d->global_menubar_ = new GlobalMenuBar; d->menus_.fillMenuBar(d->global_menubar_, 0, true); #endif diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index d8f6d5f96c..438feac97b 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -66,7 +66,7 @@ static QMimeData const * read_clipboard() qApp->clipboard()->mimeData(QClipboard::Clipboard); if (!source) { LYXERR0("0 bytes (no QMimeData)"); - return new QMimeData(); + return new QMimeData; } // It appears that doing IO between getting a mimeData object // and using it can cause a crash (maybe Qt used IO diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp index 2665e46f21..fb52ba8bb7 100644 --- a/src/frontends/qt4/GuiProgressView.cpp +++ b/src/frontends/qt4/GuiProgressView.cpp @@ -52,7 +52,7 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area, : DockView(parent, "progress", qt_("Progress/Debug Messages"), area, flags) { eol_last_ = true; - widget_ = new ProgressViewWidget(); + widget_ = new ProgressViewWidget; widget_->setMinimumHeight(150); widget_->debugMessagesTW->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding); diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index b29a4f8fbb..4b39cecd05 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -238,7 +238,7 @@ struct GuiView::GuiViewPrivate // TODO cleanup, remove the singleton, handle multiple Windows? progress_ = ProgressInterface::instance(); if (!dynamic_cast(progress_)) { - progress_ = new GuiProgress(); // TODO who deletes it + progress_ = new GuiProgress; // TODO who deletes it ProgressInterface::setInstance(progress_); } QObject::connect( diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp index 1fc259ba0a..95cefd8ede 100644 --- a/src/frontends/qt4/GuiViewSource.cpp +++ b/src/frontends/qt4/GuiViewSource.cpp @@ -231,7 +231,7 @@ GuiViewSource::GuiViewSource(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags) : DockView(parent, "view-source", qt_("LaTeX Source"), area, flags) { - widget_ = new ViewSourceWidget(); + widget_ = new ViewSourceWidget; setWidget(widget_); } diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp index 68fb07e73c..aeb389d5df 100644 --- a/src/frontends/qt4/PanelStack.cpp +++ b/src/frontends/qt4/PanelStack.cpp @@ -86,7 +86,7 @@ PanelStack::PanelStack(QWidget * parent) // Create the output layout, horizontal plus a VBox on the left with the search // box and the tree - QVBoxLayout * left_layout = new QVBoxLayout(); + QVBoxLayout * left_layout = new QVBoxLayout; left_layout->addWidget(search_, 0); left_layout->addWidget(list_, 1); diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp index d055fd01dd..fa488c07d8 100644 --- a/src/insets/InsetListingsParams.cpp +++ b/src/insets/InsetListingsParams.cpp @@ -757,7 +757,7 @@ void InsetListingsParams::addParam(string const & key, // check onoff flag // onoff parameter with value false if (!par_validator) - par_validator = new ParValidator(); + par_validator = new ParValidator; if (par_validator->onoff(key) && (value == "false" || value == "{false}")) params_[keyname] = string(); // if the parameter is surrounded with {}, good @@ -884,7 +884,7 @@ docstring InsetListingsParams::validate() const { docstring msg; if (!par_validator) - par_validator = new ParValidator(); + par_validator = new ParValidator; for (map::const_iterator it = params_.begin(); it != params_.end(); ++it) { msg = par_validator->validate(it->first, it->second); From bc51243587e198e8d64b2bf686516d197bdccf0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 26 Oct 2012 10:56:53 +0200 Subject: [PATCH 15/93] insets/InsetLine.cpp: use std::abs Use std::abs in stead of std::max(v, -v). --- src/insets/InsetLine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index 86a7e5cd05..f72fe646ab 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -118,7 +118,7 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const // set a minimal width int const minw = (dim.wid < 0) ? 24 : 4; - dim.wid = max(minw, max(dim.wid, -dim.wid)); + dim.wid = max(minw, abs(dim.wid)); Length height = Length(to_ascii(getParam("height"))); height_ = height.inPixels(max_width, fm.width(char_type('M'))); From 76a5f726a7175d652b23f5926156724e2d5b010d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 28 Oct 2012 09:20:23 +0100 Subject: [PATCH 16/93] InsetLine.cpp: add This fixes a problem introduced in bc51243587e198e8d64b2bf686516d197bdccf0d --- src/insets/InsetLine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp index f72fe646ab..353a24ef95 100644 --- a/src/insets/InsetLine.cpp +++ b/src/insets/InsetLine.cpp @@ -35,6 +35,8 @@ #include "support/gettext.h" #include "support/lstrings.h" +#include + using namespace std; namespace lyx { From 6b2232a29c682d8e62d1d2b963bb1a70bee4330b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sat, 27 Oct 2012 15:45:27 +0200 Subject: [PATCH 17/93] src/*.cpp: reformatting to increase consistency --- src/AppleSpellChecker.cpp | 6 +- src/AspellChecker.cpp | 32 ++-- src/Author.cpp | 13 +- src/BiblioInfo.cpp | 237 ++++++++++++++-------------- src/Bidi.cpp | 1 + src/BranchList.cpp | 5 +- src/Buffer.cpp | 16 +- src/BufferList.cpp | 2 + src/BufferParams.cpp | 5 +- src/BufferView.cpp | 1 + src/Changes.cpp | 2 + src/Chktex.cpp | 3 +- src/CmdDef.cpp | 2 +- src/Color.cpp | 1 + src/Compare.cpp | 28 +++- src/ConverterCache.cpp | 6 +- src/CoordCache.cpp | 1 + src/Counters.cpp | 2 +- src/Cursor.cpp | 314 ++++++++++++++++++++++---------------- src/CutAndPaste.cpp | 1 + src/DepTable.cpp | 6 +- src/DocIterator.cpp | 1 + src/EnchantChecker.cpp | 12 +- src/Encoding.cpp | 3 +- src/FontInfo.cpp | 200 ++++++++++++------------ src/Format.cpp | 15 +- src/FuncStatus.cpp | 3 +- src/HSpace.cpp | 1 + src/HunspellChecker.cpp | 34 ++--- src/IndicesList.cpp | 8 +- src/LaTeXFeatures.cpp | 2 + src/Layout.cpp | 19 ++- src/LayoutFile.cpp | 11 +- src/LyX.cpp | 10 +- src/ModuleList.cpp | 10 +- src/Paragraph.cpp | 32 ++-- src/ParagraphMetrics.cpp | 3 +- src/PersonalWordList.cpp | 1 + src/Server.cpp | 8 +- src/ServerSocket.cpp | 1 - src/Session.cpp | 1 - src/Text.cpp | 1 + src/TextClass.cpp | 92 +++++------ src/Thesaurus.cpp | 9 +- src/VCBackend.cpp | 1 + src/VSpace.cpp | 1 + src/WordList.cpp | 3 +- src/factory.cpp | 15 +- src/lengthcommon.cpp | 2 + src/lyxfind.cpp | 25 ++- src/output_docbook.cpp | 49 +++--- src/output_latex.cpp | 6 +- src/output_plaintext.cpp | 1 + src/output_xhtml.cpp | 17 ++- src/rowpainter.cpp | 2 + 55 files changed, 725 insertions(+), 558 deletions(-) diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp index cb80a60bd1..189ada71cf 100644 --- a/src/AppleSpellChecker.cpp +++ b/src/AppleSpellChecker.cpp @@ -55,9 +55,9 @@ AppleSpellChecker::Private::~Private() } -AppleSpellChecker::AppleSpellChecker(): d(new Private) -{ -} +AppleSpellChecker::AppleSpellChecker() + : d(new Private) +{} AppleSpellChecker::~AppleSpellChecker() diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp index a03dc65759..5829612270 100644 --- a/src/AspellChecker.cpp +++ b/src/AspellChecker.cpp @@ -53,7 +53,8 @@ typedef map LangPersonalWordList; struct AspellChecker::Private { - Private() {} + Private() + {} ~Private(); @@ -91,27 +92,38 @@ struct AspellChecker::Private /// the location below system/user directory /// there the rws files lookup will happen - const string dictDirectory(void) { return "dicts"; } + const string dictDirectory(void) + { + return "dicts"; + } /// there the dat+cmap files lookup will happen - const string dataDirectory(void) { return "data"; } + const string dataDirectory(void) + { + return "data"; + } /// os package directory constants /// macports on Mac OS X or /// aspell rpms on Linux - const string osPackageBase(void) { + const string osPackageBase(void) + { #ifdef USE_MACOSX_PACKAGING return "/opt/local"; #else return "/usr"; #endif } - const string osPackageDictDirectory(void) { + const string osPackageDictDirectory(void) + { #ifdef USE_MACOSX_PACKAGING return "/share/aspell"; #else return "/lib/aspell-0.60"; #endif } - const string osPackageDataDirectory(void) { return "/lib/aspell-0.60"; } + const string osPackageDataDirectory(void) + { + return "/lib/aspell-0.60"; + } }; @@ -404,9 +416,9 @@ bool AspellChecker::Private::learned(WordLangTuple const & word) } -AspellChecker::AspellChecker(): d(new Private) -{ -} +AspellChecker::AspellChecker() + : d(new Private) +{} AspellChecker::~AspellChecker() @@ -483,12 +495,14 @@ void AspellChecker::suggest(WordLangTuple const & wl, delete_aspell_string_enumeration(els); } + void AspellChecker::remove(WordLangTuple const & word) { d->remove(word); advanceChangeNumber(); } + bool AspellChecker::hasDictionary(Language const * lang) const { bool have = false; diff --git a/src/Author.cpp b/src/Author.cpp index 12f7137a5f..f4658e6126 100644 --- a/src/Author.cpp +++ b/src/Author.cpp @@ -57,6 +57,7 @@ ostream & operator<<(ostream & os, Author const & a) return os; } + istream & operator>>(istream & is, Author & a) { string s; @@ -69,15 +70,15 @@ istream & operator>>(istream & is, Author & a) } -bool author_smaller(Author const & lhs, Author const & rhs) { +bool author_smaller(Author const & lhs, Author const & rhs) +{ return lhs.bufferId() < rhs.bufferId(); } AuthorList::AuthorList() : last_id_(0) -{ -} +{} int AuthorList::record(Author const & a) @@ -133,12 +134,14 @@ AuthorList::Authors::const_iterator AuthorList::end() const } -void AuthorList::sort() { +void AuthorList::sort() +{ std::sort(authors_.begin(), authors_.end(), author_smaller); } -ostream & operator<<(ostream & os, AuthorList const & a) { +ostream & operator<<(ostream & os, AuthorList const & a) +{ // Copy the authorlist, because we don't want to sort the original AuthorList sorted = a; sorted.sort(); diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp index 93094f8bfa..7142f7b7e7 100644 --- a/src/BiblioInfo.cpp +++ b/src/BiblioInfo.cpp @@ -89,6 +89,7 @@ docstring familyName(docstring const & name) return retval; } + // converts a string containing LaTeX commands into unicode // for display. docstring convertLaTeXCommands(docstring const & str) @@ -288,115 +289,117 @@ docstring const BibTeXInfo::getXRef() const namespace { - string parseOptions(string const & format, string & optkey, - string & ifpart, string & elsepart); - // Calls parseOptions to deal with an embedded option, such as: - // {%number%[[, no.~%number%]]} - // which must appear at the start of format. ifelsepart gets the - // whole of the option, and we return what's left after the option. - // we return format if there is an error. - string parseEmbeddedOption(string const & format, string & ifelsepart) - { - LASSERT(format[0] == '{' && format[1] == '%', return format); - string optkey; - string ifpart; - string elsepart; - string const rest = parseOptions(format, optkey, ifpart, elsepart); - if (format == rest) { // parse error - LYXERR0("ERROR! Couldn't parse `" << format <<"'."); - return format; - } - LASSERT(rest.size() <= format.size(), /* */); - ifelsepart = format.substr(0, format.size() - rest.size()); - return rest; +string parseOptions(string const & format, string & optkey, + string & ifpart, string & elsepart); + +// Calls parseOptions to deal with an embedded option, such as: +// {%number%[[, no.~%number%]]} +// which must appear at the start of format. ifelsepart gets the +// whole of the option, and we return what's left after the option. +// we return format if there is an error. +string parseEmbeddedOption(string const & format, string & ifelsepart) +{ + LASSERT(format[0] == '{' && format[1] == '%', return format); + string optkey; + string ifpart; + string elsepart; + string const rest = parseOptions(format, optkey, ifpart, elsepart); + if (format == rest) { // parse error + LYXERR0("ERROR! Couldn't parse `" << format <<"'."); + return format; } + LASSERT(rest.size() <= format.size(), /* */); + ifelsepart = format.substr(0, format.size() - rest.size()); + return rest; +} - // Gets a "clause" from a format string, where the clause is - // delimited by '[[' and ']]'. Returns what is left after the - // clause is removed, and returns format if there is an error. - string getClause(string const & format, string & clause) - { - string fmt = format; - // remove '[[' - fmt = fmt.substr(2); - // we'll remove characters from the front of fmt as we - // deal with them - while (!fmt.empty()) { - if (fmt[0] == ']' && fmt.size() > 1 && fmt[1] == ']') { - // that's the end - fmt = fmt.substr(2); - break; +// Gets a "clause" from a format string, where the clause is +// delimited by '[[' and ']]'. Returns what is left after the +// clause is removed, and returns format if there is an error. +string getClause(string const & format, string & clause) +{ + string fmt = format; + // remove '[[' + fmt = fmt.substr(2); + // we'll remove characters from the front of fmt as we + // deal with them + while (!fmt.empty()) { + if (fmt[0] == ']' && fmt.size() > 1 && fmt[1] == ']') { + // that's the end + fmt = fmt.substr(2); + break; + } + // check for an embedded option + if (fmt[0] == '{' && fmt.size() > 1 && fmt[1] == '%') { + string part; + string const rest = parseEmbeddedOption(fmt, part); + if (fmt == rest) { + LYXERR0("ERROR! Couldn't parse embedded option in `" << format <<"'."); + return format; } - // check for an embedded option - if (fmt[0] == '{' && fmt.size() > 1 && fmt[1] == '%') { - string part; - string const rest = parseEmbeddedOption(fmt, part); - if (fmt == rest) { - LYXERR0("ERROR! Couldn't parse embedded option in `" << format <<"'."); - return format; - } - clause += part; - fmt = rest; - } else { // it's just a normal character + clause += part; + fmt = rest; + } else { // it's just a normal character clause += fmt[0]; fmt = fmt.substr(1); - } } - return fmt; + } + return fmt; +} + + +// parse an options string, which must appear at the start of the +// format parameter. puts the parsed bits in optkey, ifpart, and +// elsepart and returns what's left after the option is removed. +// if there's an error, it returns format itself. +string parseOptions(string const & format, string & optkey, + string & ifpart, string & elsepart) +{ + LASSERT(format[0] == '{' && format[1] == '%', return format); + // strip '{%' + string fmt = format.substr(2); + size_t pos = fmt.find('%'); // end of key + if (pos == string::npos) { + LYXERR0("Error parsing `" << format <<"'. Can't find end of key."); + return format; + } + optkey = fmt.substr(0,pos); + fmt = fmt.substr(pos + 1); + // [[format]] should be next + if (fmt[0] != '[' || fmt[1] != '[') { + LYXERR0("Error parsing `" << format <<"'. Can't find '[[' after key."); + return format; } + string curfmt = fmt; + fmt = getClause(curfmt, ifpart); + if (fmt == curfmt) { + LYXERR0("Error parsing `" << format <<"'. Couldn't get if clause."); + return format; + } - // parse an options string, which must appear at the start of the - // format parameter. puts the parsed bits in optkey, ifpart, and - // elsepart and returns what's left after the option is removed. - // if there's an error, it returns format itself. - string parseOptions(string const & format, string & optkey, - string & ifpart, string & elsepart) - { - LASSERT(format[0] == '{' && format[1] == '%', return format); - // strip '{%' - string fmt = format.substr(2); - size_t pos = fmt.find('%'); // end of key - if (pos == string::npos) { - LYXERR0("Error parsing `" << format <<"'. Can't find end of key."); - return format; - } - optkey = fmt.substr(0,pos); - fmt = fmt.substr(pos + 1); - // [[format]] should be next - if (fmt[0] != '[' || fmt[1] != '[') { - LYXERR0("Error parsing `" << format <<"'. Can't find '[[' after key."); - return format; - } - - string curfmt = fmt; - fmt = getClause(curfmt, ifpart); - if (fmt == curfmt) { - LYXERR0("Error parsing `" << format <<"'. Couldn't get if clause."); - return format; - } - - if (fmt[0] == '}') // we're done, no else clause - return fmt.substr(1); - - // else part should follow - if (fmt[0] != '[' || fmt[1] != '[') { - LYXERR0("Error parsing `" << format <<"'. Can't find else clause."); - return format; - } - - curfmt = fmt; - fmt = getClause(curfmt, elsepart); - // we should be done - if (fmt == curfmt || fmt[0] != '}') { - LYXERR0("Error parsing `" << format <<"'. Can't find end of option."); - return format; - } + if (fmt[0] == '}') // we're done, no else clause return fmt.substr(1); + + // else part should follow + if (fmt[0] != '[' || fmt[1] != '[') { + LYXERR0("Error parsing `" << format <<"'. Can't find else clause."); + return format; + } + + curfmt = fmt; + fmt = getClause(curfmt, elsepart); + // we should be done + if (fmt == curfmt || fmt[0] != '}') { + LYXERR0("Error parsing `" << format <<"'. Can't find end of option."); + return format; + } + return fmt.substr(1); } + } // anon namespace @@ -650,14 +653,16 @@ docstring BibTeXInfo::getValueForKey(string const & key, ////////////////////////////////////////////////////////////////////// namespace { + // A functor for use with sort, leading to case insensitive sorting - class compareNoCase: public binary_function - { - public: - bool operator()(docstring const & s1, docstring const & s2) const { - return compare_no_case(s1, s2) < 0; - } - }; +class compareNoCase: public binary_function +{ +public: + bool operator()(docstring const & s1, docstring const & s2) const { + return compare_no_case(s1, s2) < 0; + } +}; + } // namespace anon @@ -827,19 +832,21 @@ void BiblioInfo::mergeBiblioInfo(BiblioInfo const & info) namespace { - // used in xhtml to sort a list of BibTeXInfo objects - bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs) - { - docstring const lauth = lhs->getAbbreviatedAuthor(); - docstring const rauth = rhs->getAbbreviatedAuthor(); - docstring const lyear = lhs->getYear(); - docstring const ryear = rhs->getYear(); - docstring const ltitl = lhs->operator[]("title"); - docstring const rtitl = rhs->operator[]("title"); - return (lauth < rauth) - || (lauth == rauth && lyear < ryear) - || (lauth == rauth && lyear == ryear && ltitl < rtitl); - } + +// used in xhtml to sort a list of BibTeXInfo objects +bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs) +{ + docstring const lauth = lhs->getAbbreviatedAuthor(); + docstring const rauth = rhs->getAbbreviatedAuthor(); + docstring const lyear = lhs->getYear(); + docstring const ryear = rhs->getYear(); + docstring const ltitl = lhs->operator[]("title"); + docstring const rtitl = rhs->operator[]("title"); + return (lauth < rauth) + || (lauth == rauth && lyear < ryear) + || (lauth == rauth && lyear == ryear && ltitl < rtitl); +} + } diff --git a/src/Bidi.cpp b/src/Bidi.cpp index b9d1222931..a85f3eaddd 100644 --- a/src/Bidi.cpp +++ b/src/Bidi.cpp @@ -46,6 +46,7 @@ bool Bidi::inRange(pos_type pos) const return start_ == -1 || (start_ <= pos && pos <= end_); } + bool Bidi::same_direction() const { return same_direction_; diff --git a/src/BranchList.cpp b/src/BranchList.cpp index 7cb23ef5b4..4624f19f4d 100644 --- a/src/BranchList.cpp +++ b/src/BranchList.cpp @@ -30,7 +30,9 @@ namespace { class BranchNamesEqual : public std::unary_function { public: - BranchNamesEqual(docstring const & name) : name_(name) {} + BranchNamesEqual(docstring const & name) + : name_(name) + {} bool operator()(Branch const & branch) const { @@ -39,6 +41,7 @@ public: private: docstring name_; }; + } diff --git a/src/Buffer.cpp b/src/Buffer.cpp index a045deadc9..c5de4c8169 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -282,7 +282,8 @@ public: /// This is here to force the test to be done whenever parent_buffer /// is accessed. - Buffer const * parent() const { + Buffer const * parent() const + { // ignore_parent temporarily "orphans" a buffer // (e.g. if a child is compiled standalone) if (ignore_parent) @@ -299,7 +300,8 @@ public: } /// - void setParent(Buffer const * pb) { + void setParent(Buffer const * pb) + { if (parent_buffer == pb) // nothing to do return; @@ -324,10 +326,14 @@ public: /// \p from initial position /// \p to points to the end position void updateStatistics(DocIterator & from, DocIterator & to, - bool skipNoOutput = true); + bool skipNoOutput = true); /// statistics accessor functions - int wordCount() const { return word_count_; } - int charCount(bool with_blanks) const { + int wordCount() const + { + return word_count_; + } + int charCount(bool with_blanks) const + { return char_count_ + (with_blanks ? blank_count_ : 0); } diff --git a/src/BufferList.cpp b/src/BufferList.cpp index f756384bf4..2348ac6103 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -265,11 +265,13 @@ bool BufferList::exists(FileName const & fname) const namespace { + struct equivalent_to : public binary_function { bool operator()(FileName const & x, FileName const & y) const { return equivalent(x, y); } }; + } diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index e3dcb87986..403a2cbbe1 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -2127,9 +2127,12 @@ bool BufferParams::isExportable(string const & format) const namespace { -bool formatSorter(Format const * lhs, Format const * rhs) { + +bool formatSorter(Format const * lhs, Format const * rhs) +{ return _(lhs->prettyname()) < _(rhs->prettyname()); } + } diff --git a/src/BufferView.cpp b/src/BufferView.cpp index bb5ed50387..31c95cf764 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -105,6 +105,7 @@ T * getInsetByCode(Cursor const & cur, InsetCode code) return 0; } + /// Note that comparing contents can only be used for InsetCommand bool findNextInset(DocIterator & dit, vector const & codes, docstring const & contents) diff --git a/src/Changes.cpp b/src/Changes.cpp index ea7c5c998e..766b698a3a 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -340,6 +340,7 @@ void Changes::merge() namespace { + docstring getLaTeXMarkup(docstring const & macro, docstring const & author, docstring const & chgTime, OutputParams const & runparams) @@ -379,6 +380,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author, return ods.str(); } + } //namespace anon diff --git a/src/Chktex.cpp b/src/Chktex.cpp index 8ca70d80be..02271e308c 100644 --- a/src/Chktex.cpp +++ b/src/Chktex.cpp @@ -31,8 +31,7 @@ namespace lyx { Chktex::Chktex(string const & chktex, string const & f, string const & p) : cmd(chktex), file(f), path(p) -{ -} +{} int Chktex::run(TeXErrors &terr) diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp index 1a9f42f480..779ac8270a 100644 --- a/src/CmdDef.cpp +++ b/src/CmdDef.cpp @@ -152,7 +152,7 @@ void CmdDef::release(string const & name) CmdDef::newCmdDefResult CmdDef::newCmdDef(string const & name, - string const & def) + string const & def) { string const name2 = trim(name); diff --git a/src/Color.cpp b/src/Color.cpp index 290c50a0b2..609c742e73 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -85,6 +85,7 @@ RGBColor rgbFromHexName(string const & x11hexname) return c; } + string const outputLaTeXColor(RGBColor const & color) { // this routine returns a LaTeX readable color string in the form diff --git a/src/Compare.cpp b/src/Compare.cpp index cd54e43bb4..5831f22111 100644 --- a/src/Compare.cpp +++ b/src/Compare.cpp @@ -97,13 +97,15 @@ size_t DocRange::length() const class DocPair { public: - DocPair() {} + DocPair() + {} DocPair(DocIterator o_, DocIterator n_) : o(o_), n(n_) {} - bool operator!=(DocPair const & rhs) { + bool operator!=(DocPair const & rhs) + { // this might not be intuitive but correct for our purpose return o != rhs.o && n != rhs.n; } @@ -146,10 +148,16 @@ public: {} /// Returns the from pair - DocPair from() const { return DocPair(o.from, n.from); } + DocPair from() const + { + return DocPair(o.from, n.from); + } /// Returns the to pair - DocPair to() const { return DocPair(o.to, n.to); } + DocPair to() const + { + return DocPair(o.to, n.to); + } DocRange o; DocRange n; @@ -181,7 +189,8 @@ static DocRangePair stepIntoInset(DocPair const & inset_location) template class compl_vector { public: - compl_vector() {} + compl_vector() + {} void reset(T const & def) { @@ -223,7 +232,8 @@ public: {} /// - ~Impl() {} + ~Impl() + {} // Algorithm to find the shortest edit string. This algorithm // only needs a linear amount of memory (linear with the sum @@ -235,7 +245,8 @@ public: bool abort_; /// - QString status() { + QString status() + { QString status; status += toqstr("recursion level:") + " " + QString::number(recursion_level_) + " " + toqstr("differences:") + " " + QString::number(D_); @@ -444,7 +455,8 @@ static bool equal(Inset const * i_o, Inset const * i_n) } -static bool equal(DocIterator & o, DocIterator & n) { +static bool equal(DocIterator & o, DocIterator & n) +{ // Explicitly check for this, so we won't call // Paragraph::getChar for the last pos. bool const o_lastpos = o.pos() == o.lastpos(); diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp index 76721835e6..61df9d062d 100644 --- a/src/ConverterCache.cpp +++ b/src/ConverterCache.cpp @@ -54,7 +54,8 @@ static FileName cache_dir; class CacheItem { public: - CacheItem() {} + CacheItem() + {} CacheItem(FileName const & orig_from, string const & to_format, time_t t, unsigned long c) : timestamp(t), checksum(c) @@ -67,7 +68,8 @@ public: << ' ' << to_format << ' ' << cache_name << ' ' << long(timestamp) << ' ' << checksum << '.'); } - ~CacheItem() {} + ~CacheItem() + {} FileName cache_name; time_t timestamp; unsigned long checksum; diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp index 4c9e880092..6926dab322 100644 --- a/src/CoordCache.cpp +++ b/src/CoordCache.cpp @@ -32,6 +32,7 @@ Point::Point(int x, int y) LASSERT(y < 1000000, /**/); } + // just a helper to be able to set a breakpoint void lyxbreaker(void const * data, const char * hint, int size) { diff --git a/src/Counters.cpp b/src/Counters.cpp index 1349c3dcbe..21331e8e18 100644 --- a/src/Counters.cpp +++ b/src/Counters.cpp @@ -109,6 +109,7 @@ bool Counter::read(Lexer & lex) return getout; } + void Counter::set(int v) { value_ = v; @@ -363,7 +364,6 @@ char hebrewCounter(int const n) } - // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html // and for a list of roman numerals up to and including 3999, see // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost diff --git a/src/Cursor.cpp b/src/Cursor.cpp index e38ca5ec13..8afbdf3cb4 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -214,9 +214,10 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up) for ( ; it != et; it.forwardPos()) { // avoid invalid nesting when selecting if (bv.cursorStatus(it) == CUR_INSIDE - && (!cur.selection() || positionable(it, cur.realAnchor()))) { - // If this function is ever used again, check whether this - // is the same as "bv.getPos(it, false)" with boundary = false. + && (!cur.selection() || positionable(it, cur.realAnchor()))) { + // If this function is ever used again, check + // whether this is the same as "bv.getPos(it, + // false)" with boundary = false. Point p = bv.getPos(it); int xo = p.x_; int yo = p.y_; @@ -638,8 +639,9 @@ bool Cursor::posVisRight(bool skip_inset) new_cur.boundary(false); if (!skip_inset && text()->checkAndActivateInsetVisual(new_cur, right_pos >= pos(), false)) { - // we actually move the cursor at the end of this function, for now - // we just keep track of the new position in new_cur... + // we actually move the cursor at the end of this + // function, for now we just keep track of the new + // position in new_cur... LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos()); } @@ -652,8 +654,9 @@ bool Cursor::posVisRight(bool skip_inset) return false; } - // we actually move the cursor at the end of this function, for now - // just keep track of the new position in new_cur... + // we actually move the cursor at the end of this + // function, for now just keep track of the new + // position in new_cur... LYXERR(Debug::RTL, "right edge, moving: " << int(new_cur.pit()) << "," << int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0)); @@ -661,28 +664,33 @@ bool Cursor::posVisRight(bool skip_inset) // normal movement to the right else { new_cur = *this; - // Recall, if the cursor is at position 'x', that means *before* - // the character at position 'x'. In RTL, "before" means "to the - // right of", in LTR, "to the left of". So currently our situation - // is this: the position to our right is 'right_pos' (i.e., we're - // currently to the left of 'right_pos'). In order to move to the - // right, it depends whether or not the character at 'right_pos' is RTL. + // Recall, if the cursor is at position 'x', that + // means *before* the character at position 'x'. In + // RTL, "before" means "to the right of", in LTR, "to + // the left of". So currently our situation is this: + // the position to our right is 'right_pos' (i.e., + // we're currently to the left of 'right_pos'). In + // order to move to the right, it depends whether or + // not the character at 'right_pos' is RTL. new_pos_is_RTL = paragraph().getFontSettings( buffer()->params(), right_pos).isVisibleRightToLeft(); - // If the character at 'right_pos' *is* LTR, then in order to move to - // the right of it, we need to be *after* 'right_pos', i.e., move to - // position 'right_pos' + 1. + // If the character at 'right_pos' *is* LTR, then in + // order to move to the right of it, we need to be + // *after* 'right_pos', i.e., move to position + // 'right_pos' + 1. if (!new_pos_is_RTL) { new_cur.pos() = right_pos + 1; // set the boundary to true in two situations: if ( - // 1. if new_pos is now lastpos, and we're in an RTL paragraph - // (this means that we're moving right to the end of an LTR chunk + // 1. if new_pos is now lastpos, and we're in + // an RTL paragraph (this means that we're + // moving right to the end of an LTR chunk // which is at the end of an RTL paragraph); (new_cur.pos() == lastpos() && paragraph().isRTL(buffer()->params())) - // 2. if the position *after* right_pos is RTL (we want to be - // *after* right_pos, not before right_pos + 1!) + // 2. if the position *after* right_pos is RTL + // (we want to be *after* right_pos, not + // before right_pos + 1!) || paragraph().getFontSettings(buffer()->params(), new_cur.pos()).isVisibleRightToLeft() ) @@ -690,9 +698,9 @@ bool Cursor::posVisRight(bool skip_inset) else // set the boundary to false new_cur.boundary(false); } - // Otherwise (if the character at position 'right_pos' is RTL), then - // moving to the right of it is as easy as setting the new position - // to 'right_pos'. + // Otherwise (if the character at position 'right_pos' + // is RTL), then moving to the right of it is as easy + // as setting the new position to 'right_pos'. else { new_cur.pos() = right_pos; new_cur.boundary(false); @@ -731,8 +739,9 @@ bool Cursor::posVisLeft(bool skip_inset) new_cur.boundary(false); if (!skip_inset && text()->checkAndActivateInsetVisual(new_cur, left_pos >= pos(), true)) { - // we actually move the cursor at the end of this function, for now - // we just keep track of the new position in new_cur... + // we actually move the cursor at the end of this + // function, for now we just keep track of the new + // position in new_cur... LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos()); } @@ -745,8 +754,9 @@ bool Cursor::posVisLeft(bool skip_inset) return false; } - // we actually move the cursor at the end of this function, for now - // just keep track of the new position in new_cur... + // we actually move the cursor at the end of this + // function, for now just keep track of the new + // position in new_cur... LYXERR(Debug::RTL, "left edge, moving: " << int(new_cur.pit()) << "," << int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0)); @@ -754,28 +764,33 @@ bool Cursor::posVisLeft(bool skip_inset) // normal movement to the left else { new_cur = *this; - // Recall, if the cursor is at position 'x', that means *before* - // the character at position 'x'. In RTL, "before" means "to the - // right of", in LTR, "to the left of". So currently our situation - // is this: the position to our left is 'left_pos' (i.e., we're - // currently to the right of 'left_pos'). In order to move to the - // left, it depends whether or not the character at 'left_pos' is RTL. + // Recall, if the cursor is at position 'x', that + // means *before* the character at position 'x'. In + // RTL, "before" means "to the right of", in LTR, "to + // the left of". So currently our situation is this: + // the position to our left is 'left_pos' (i.e., we're + // currently to the right of 'left_pos'). In order to + // move to the left, it depends whether or not the + // character at 'left_pos' is RTL. new_pos_is_RTL = paragraph().getFontSettings( buffer()->params(), left_pos).isVisibleRightToLeft(); - // If the character at 'left_pos' *is* RTL, then in order to move to - // the left of it, we need to be *after* 'left_pos', i.e., move to - // position 'left_pos' + 1. + // If the character at 'left_pos' *is* RTL, then in + // order to move to the left of it, we need to be + // *after* 'left_pos', i.e., move to position + // 'left_pos' + 1. if (new_pos_is_RTL) { new_cur.pos() = left_pos + 1; // set the boundary to true in two situations: if ( - // 1. if new_pos is now lastpos and we're in an LTR paragraph - // (this means that we're moving left to the end of an RTL chunk + // 1. if new_pos is now lastpos and we're in + // an LTR paragraph (this means that we're + // moving left to the end of an RTL chunk // which is at the end of an LTR paragraph); (new_cur.pos() == lastpos() && !paragraph().isRTL(buffer()->params())) - // 2. if the position *after* left_pos is not RTL (we want to be - // *after* left_pos, not before left_pos + 1!) + // 2. if the position *after* left_pos is not + // RTL (we want to be *after* left_pos, not + // before left_pos + 1!) || !paragraph().getFontSettings(buffer()->params(), new_cur.pos()).isVisibleRightToLeft() ) @@ -783,9 +798,9 @@ bool Cursor::posVisLeft(bool skip_inset) else // set the boundary to false new_cur.boundary(false); } - // Otherwise (if the character at position 'left_pos' is LTR), then - // moving to the left of it is as easy as setting the new position - // to 'left_pos'. + // Otherwise (if the character at position 'left_pos' + // is LTR), then moving to the left of it is as easy + // as setting the new position to 'left_pos'. else { new_cur.pos() = left_pos; new_cur.boundary(false); @@ -818,14 +833,16 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) LYXERR(Debug::RTL, "bidi: " << row.pos() << "--" << row.endpos()); - // The cursor is painted *before* the character at pos(), or, if 'boundary' - // is true, *after* the character at (pos() - 1). So we already have one - // known position around the cursor: + // The cursor is painted *before* the character at pos(), or, + // if 'boundary' is true, *after* the character at (pos() - + // 1). So we already have one known position around the + // cursor: pos_type const known_pos = boundary() && pos() > 0 ? pos() - 1 : pos(); - // edge case: if we're at the end of the paragraph, things are a little - // different (because lastpos is a position which does not really "exist" - // --- there's no character there yet). + // edge case: if we're at the end of the paragraph, things are + // a little different (because lastpos is a position which + // does not really "exist" --- there's no character there + // yet). if (known_pos == lastpos()) { if (par.isRTL(buf.params())) { left_pos = -1; @@ -838,28 +855,31 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) return; } - // Whether 'known_pos' is to the left or to the right of the cursor depends - // on whether it is an RTL or LTR character... + // Whether 'known_pos' is to the left or to the right of the + // cursor depends on whether it is an RTL or LTR character... bool const cur_is_RTL = par.getFontSettings(buf.params(), known_pos).isVisibleRightToLeft(); // ... in the following manner: - // For an RTL character, "before" means "to the right" and "after" means - // "to the left"; and for LTR, it's the reverse. So, 'known_pos' is to the - // right of the cursor if (RTL && boundary) or (!RTL && !boundary): + // For an RTL character, "before" + // means "to the right" and "after" means "to the left"; and + // for LTR, it's the reverse. So, 'known_pos' is to the right + // of the cursor if (RTL && boundary) or (!RTL && !boundary): bool const known_pos_on_right = cur_is_RTL == boundary(); - // So we now know one of the positions surrounding the cursor. Let's - // determine the other one: + // So we now know one of the positions surrounding the cursor. + // Let's determine the other one: if (known_pos_on_right) { right_pos = known_pos; // *visual* position of 'left_pos': pos_type v_left_pos = bidi.log2vis(right_pos) - 1; - // If the position we just identified as 'left_pos' is a "skipped - // separator" (a separator which is at the logical end of a row, - // except for the last row in a paragraph; such separators are not - // painted, so they "are not really there"; note that in bidi text, - // such a separator could appear visually in the middle of a row), - // set 'left_pos' to the *next* position to the left. + // If the position we just identified as 'left_pos' is + // a "skipped separator" (a separator which is at the + // logical end of a row, except for the last row in a + // paragraph; such separators are not painted, so they + // "are not really there"; note that in bidi text, + // such a separator could appear visually in the + // middle of a row), set 'left_pos' to the *next* + // position to the left. if (bidi.inRange(v_left_pos) && bidi.vis2log(v_left_pos) + 1 == row.endpos() && row.endpos() < lastpos() @@ -871,8 +891,9 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) left_pos = -1; else left_pos = bidi.vis2log(v_left_pos); - // If the position we identified as 'right_pos' is a "skipped - // separator", set 'right_pos' to the *next* position to the right. + // If the position we identified as 'right_pos' is a + // "skipped separator", set 'right_pos' to the *next* + // position to the right. if (right_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(right_pos)) { pos_type const v_right_pos = bidi.log2vis(right_pos) + 1; @@ -886,8 +907,9 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) left_pos = known_pos; // *visual* position of 'right_pos' pos_type v_right_pos = bidi.log2vis(left_pos) + 1; - // If the position we just identified as 'right_pos' is a "skipped - // separator", set 'right_pos' to the *next* position to the right. + // If the position we just identified as 'right_pos' + // is a "skipped separator", set 'right_pos' to the + // *next* position to the right. if (bidi.inRange(v_right_pos) && bidi.vis2log(v_right_pos) + 1 == row.endpos() && row.endpos() < lastpos() @@ -899,8 +921,9 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) right_pos = -1; else right_pos = bidi.vis2log(v_right_pos); - // If the position we identified as 'left_pos' is a "skipped - // separator", set 'left_pos' to the *next* position to the left. + // If the position we identified as 'left_pos' is a + // "skipped separator", set 'left_pos' to the *next* + // position to the left. if (left_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(left_pos)) { pos_type const v_left_pos = bidi.log2vis(left_pos) - 1; @@ -921,16 +944,16 @@ bool Cursor::posVisToNewRow(bool movingLeft) Row const & row = textRow(); bool par_is_LTR = !par.isRTL(buf.params()); - // Inside a table, determining whether to move to the next or previous row - // should be done based on the table's direction. + // Inside a table, determining whether to move to the next or + // previous row should be done based on the table's direction. int s = depth() - 1; if (s >= 1 && (*this)[s].inset().asInsetTabular()) { par_is_LTR = !(*this)[s].inset().asInsetTabular()->isRightToLeft(*this); LYXERR(Debug::RTL, "Inside table! par_is_LTR=" << (par_is_LTR ? 1 : 0)); } - // if moving left in an LTR paragraph or moving right in an RTL one, - // move to previous row + // if moving left in an LTR paragraph or moving right in an + // RTL one, move to previous row if (par_is_LTR == movingLeft) { if (row.pos() == 0) { // we're at first row in paragraph if (pit() == 0) // no previous paragraph! don't move @@ -944,8 +967,8 @@ bool Cursor::posVisToNewRow(bool movingLeft) boundary(false); } } - // if moving left in an RTL paragraph or moving right in an LTR one, - // move to next row + // if moving left in an RTL paragraph or moving right in an + // LTR one, move to next row else { if (row.endpos() == lastpos()) { // we're at last row in paragraph if (pit() == lastpit()) // last paragraph! don't move @@ -987,30 +1010,43 @@ void Cursor::posVisToRowExtremity(bool left) else { pos() = bidi.vis2log(row.pos()); - // Moving to the leftmost position in the row, the cursor should - // normally be placed to the *left* of the leftmost position. - // A very common exception, though, is if the leftmost character - // also happens to be the separator at the (logical) end of the row - // --- in this case, the separator is positioned beyond the left - // margin, and we don't want to move the cursor there (moving to - // the left of the separator is equivalent to moving to the next - // line). So, in this case we actually want to place the cursor - // to the *right* of the leftmost position (the separator). - // Another exception is if we're moving to the logically last - // position in the row, which is *not* a separator: this means - // that the entire row has no separators (if there were any, the - // row would have been broken there); and therefore in this case - // we also move to the *right* of the last position (this indicates - // to the user that there is no space after this position, and is - // consistent with the behavior in the middle of a row --- moving - // right or left moves to the next/previous character; if we were - // to move to the *left* of this position, that would simulate - // a separator which is not really there!). - // Finally, there is an exception to the previous exception: if - // this non-separator-but-last-position-in-row is an inset, then - // we *do* want to stay to the left of it anyway: this is the + // Moving to the leftmost position in the row, + // the cursor should normally be placed to the + // *left* of the leftmost position. A very + // common exception, though, is if the + // leftmost character also happens to be the + // separator at the (logical) end of the row + // --- in this case, the separator is + // positioned beyond the left margin, and we + // don't want to move the cursor there (moving + // to the left of the separator is equivalent + // to moving to the next line). So, in this + // case we actually want to place the cursor + // to the *right* of the leftmost position + // (the separator). Another exception is if + // we're moving to the logically last position + // in the row, which is *not* a separator: + // this means that the entire row has no + // separators (if there were any, the row + // would have been broken there); and + // therefore in this case we also move to the + // *right* of the last position (this + // indicates to the user that there is no + // space after this position, and is + // consistent with the behavior in the middle + // of a row --- moving right or left moves to + // the next/previous character; if we were to + // move to the *left* of this position, that + // would simulate a separator which is not + // really there!). Finally, there is an + // exception to the previous exception: if + // this non-separator-but-last-position-in-row + // is an inset, then we *do* want to stay to + // the left of it anyway: this is the // "boundary" which we simulate at insets. - // Another exception is when row.endpos() is 0. + + // Another exception is when row.endpos() is + // 0. // do we want to be to the right of pos? // as explained above, if at last pos in row, stay to the right @@ -1036,30 +1072,41 @@ void Cursor::posVisToRowExtremity(bool left) else { pos() = row.endpos() > 0 ? bidi.vis2log(row.endpos() - 1) : 0; - // Moving to the rightmost position in the row, the cursor should - // normally be placed to the *right* of the rightmost position. - // A very common exception, though, is if the rightmost character - // also happens to be the separator at the (logical) end of the row - // --- in this case, the separator is positioned beyond the right - // margin, and we don't want to move the cursor there (moving to - // the right of the separator is equivalent to moving to the next - // line). So, in this case we actually want to place the cursor - // to the *left* of the rightmost position (the separator). - // Another exception is if we're moving to the logically last - // position in the row, which is *not* a separator: this means - // that the entire row has no separators (if there were any, the - // row would have been broken there); and therefore in this case - // we also move to the *left* of the last position (this indicates - // to the user that there is no space after this position, and is - // consistent with the behavior in the middle of a row --- moving - // right or left moves to the next/previous character; if we were - // to move to the *right* of this position, that would simulate - // a separator which is not really there!). - // Finally, there is an exception to the previous exception: if - // this non-separator-but-last-position-in-row is an inset, then - // we *do* want to stay to the right of it anyway: this is the - // "boundary" which we simulate at insets. - // Another exception is when row.endpos() is 0. + // Moving to the rightmost position in the + // row, the cursor should normally be placed + // to the *right* of the rightmost position. A + // very common exception, though, is if the + // rightmost character also happens to be the + // separator at the (logical) end of the row + // --- in this case, the separator is + // positioned beyond the right margin, and we + // don't want to move the cursor there (moving + // to the right of the separator is equivalent + // to moving to the next line). So, in this + // case we actually want to place the cursor + // to the *left* of the rightmost position + // (the separator). Another exception is if + // we're moving to the logically last position + // in the row, which is *not* a separator: + // this means that the entire row has no + // separators (if there were any, the row + // would have been broken there); and + // therefore in this case we also move to the + // *left* of the last position (this indicates + // to the user that there is no space after + // this position, and is consistent with the + // behavior in the middle of a row --- moving + // right or left moves to the next/previous + // character; if we were to move to the + // *right* of this position, that would + // simulate a separator which is not really + // there!). Finally, there is an exception to + // the previous exception: if this + // non-separator-but-last-position-in-row is + // an inset, then we *do* want to stay to the + // right of it anyway: this is the "boundary" + // which we simulate at insets. Another + // exception is when row.endpos() is 0. // do we want to be to the left of pos? // as explained above, if at last pos in row, stay to the left, @@ -1915,6 +1962,7 @@ bool Cursor::atFirstOrLastRow(bool up) return false; } + bool Cursor::upDownInText(bool up, bool & updateNeeded) { LASSERT(text(), /**/); @@ -1932,14 +1980,16 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) setTargetX(xo); else if (xo - textTargetOffset() != x_target() && depth() == beforeDispatchCursor_.depth()) { - // In text mode inside the line (not left or right) possibly set a new target_x, - // but only if we are somewhere else than the previous target-offset. + // In text mode inside the line (not left or right) + // possibly set a new target_x, but only if we are + // somewhere else than the previous target-offset. - // We want to keep the x-target on subsequent up/down movements - // that cross beyond the end of short lines. Thus a special - // handling when the cursor is at the end of line: Use the new - // x-target only if the old one was before the end of line - // or the old one was after the beginning of the line + // We want to keep the x-target on subsequent up/down + // movements that cross beyond the end of short lines. + // Thus a special handling when the cursor is at the + // end of line: Use the new x-target only if the old + // one was before the end of line or the old one was + // after the beginning of the line bool inRTL = isWithinRtlParagraph(*this); bool left; bool right; @@ -2128,6 +2178,7 @@ void Cursor::errorMessage(docstring const & msg) const namespace { + docstring parbreak(Cursor const * cur) { odocstringstream os; @@ -2138,6 +2189,7 @@ docstring parbreak(Cursor const * cur) os << '\n'; return os.str(); } + } @@ -2267,9 +2319,9 @@ void Cursor::noScreenUpdate() const Font Cursor::getFont() const { - // The logic here should more or less match to the Cursor::setCurrentFont - // logic, i.e. the cursor height should give a hint what will happen - // if a character is entered. + // The logic here should more or less match to the + // Cursor::setCurrentFont logic, i.e. the cursor height should + // give a hint what will happen if a character is entered. // HACK. far from being perfect... diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 9a336a194a..6534475885 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -848,6 +848,7 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) putClipboard(theCuts[0].first, theCuts[0].second, plaintext); } + namespace { void copySelectionToStack(Cursor const & cur, CutStack & cutstack) diff --git a/src/DepTable.cpp b/src/DepTable.cpp index fdbbd46a06..835130717f 100644 --- a/src/DepTable.cpp +++ b/src/DepTable.cpp @@ -108,7 +108,8 @@ bool DepTable::sumchange() const DepList::const_iterator cit = deplist.begin(); DepList::const_iterator end = deplist.end(); for (; cit != end; ++cit) { - if (cit->second.changed()) return true; + if (cit->second.changed()) + return true; } return false; } @@ -144,9 +145,8 @@ bool DepTable::ext_exist(string const & ext) const DepList::const_iterator cit = deplist.begin(); DepList::const_iterator end = deplist.end(); for (; cit != end; ++cit) { - if (suffixIs(cit->first.absFileName(), ext)) { + if (suffixIs(cit->first.absFileName(), ext)) return true; - } } return false; } diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 420c782c37..35b23a98b7 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -42,6 +42,7 @@ DocIterator::DocIterator() : boundary_(false), inset_(0), buffer_(0) {} + // We could be able to get rid of this if only every BufferView were // associated to a buffer on construction. DocIterator::DocIterator(Buffer * buf) diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp index 61127108a4..77c9e309ed 100644 --- a/src/EnchantChecker.cpp +++ b/src/EnchantChecker.cpp @@ -40,7 +40,8 @@ typedef map Spellers; struct EnchantChecker::Private { - Private() {} + Private() + {} ~Private(); @@ -60,9 +61,8 @@ EnchantChecker::Private::~Private() Spellers::iterator it = spellers_.begin(); Spellers::iterator end = spellers_.end(); - for (; it != end; ++it) { + for (; it != end; ++it) delete it->second.speller; - } } @@ -97,9 +97,9 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang) } -EnchantChecker::EnchantChecker(): d(new Private) -{ -} +EnchantChecker::EnchantChecker() + : d(new Private) +{} EnchantChecker::~EnchantChecker() diff --git a/src/Encoding.cpp b/src/Encoding.cpp index 3325301a7c..298fc6a0ae 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -852,8 +852,7 @@ Encoding const * Encodings::fromLaTeXName(string const & n) const Encodings::Encodings() -{ -} +{} void Encodings::read(FileName const & encfile, FileName const & symbolsfile) diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp index 27b6a51ba3..d7494707d2 100644 --- a/src/FontInfo.cpp +++ b/src/FontInfo.cpp @@ -101,6 +101,7 @@ FontInfo::FontInfo() *this = sane_font; } + /// Decreases font size_ by one FontInfo & FontInfo::decSize() { @@ -346,115 +347,116 @@ Color FontInfo::realColor() const namespace { - void appendSep(string & s1, string const & s2) { - if (s2.empty()) - return; - s1 += s1.empty() ? "" : "\n"; - s1 += s2; +void appendSep(string & s1, string const & s2) +{ + if (s2.empty()) + return; + s1 += s1.empty() ? "" : "\n"; + s1 += s2; +} + + +string makeCSSTag(string const & key, string const & val) +{ + return key + ": " + val + ";"; +} + + +string getFamilyCSS(FontFamily const & f) +{ + switch (f) { + case ROMAN_FAMILY: + return "serif"; + case SANS_FAMILY: + return "sans-serif"; + case TYPEWRITER_FAMILY: + return "monospace"; + case SYMBOL_FAMILY: + case CMR_FAMILY: + case CMSY_FAMILY: + case CMM_FAMILY: + case CMEX_FAMILY: + case MSA_FAMILY: + case MSB_FAMILY: + case EUFRAK_FAMILY: + case RSFS_FAMILY: + case WASY_FAMILY: + case ESINT_FAMILY: + case INHERIT_FAMILY: + case IGNORE_FAMILY: + break; } + return ""; +} - string makeCSSTag(string const & key, string const & val) - { - return key + ": " + val + ";"; +string getSeriesCSS(FontSeries const & s) +{ + switch (s) { + case MEDIUM_SERIES: + return "normal"; + case BOLD_SERIES: + return "bold"; + case INHERIT_SERIES: + case IGNORE_SERIES: + break; } + return ""; +} - string getFamilyCSS(FontFamily const & f) - { - switch (f) { - case ROMAN_FAMILY: - return "serif"; - case SANS_FAMILY: - return "sans-serif"; - case TYPEWRITER_FAMILY: - return "monospace"; - case SYMBOL_FAMILY: - case CMR_FAMILY: - case CMSY_FAMILY: - case CMM_FAMILY: - case CMEX_FAMILY: - case MSA_FAMILY: - case MSB_FAMILY: - case EUFRAK_FAMILY: - case RSFS_FAMILY: - case WASY_FAMILY: - case ESINT_FAMILY: - case INHERIT_FAMILY: - case IGNORE_FAMILY: - break; - } - return ""; +string getShapeCSS(FontShape const & s) +{ + string fs = "normal"; + string fv = "normal"; + switch (s) { + case UP_SHAPE: break; + case ITALIC_SHAPE: fs = "italic"; break; + case SLANTED_SHAPE: fs = "oblique"; break; + case SMALLCAPS_SHAPE: fv = "small-caps"; break; + case IGNORE_SHAPE: + case INHERIT_SHAPE: + fs = ""; fv = ""; break; } + string retval; + if (!fs.empty()) + appendSep(retval, makeCSSTag("font-style", fs)); + if (!fv.empty()) + appendSep(retval, makeCSSTag("font-variant", fv)); + return retval; +} - string getSeriesCSS(FontSeries const & s) - { - switch (s) { - case MEDIUM_SERIES: - return "normal"; - case BOLD_SERIES: - return "bold"; - case INHERIT_SERIES: - case IGNORE_SERIES: - break; - } - return ""; - } - - - string getShapeCSS(FontShape const & s) - { - string fs = "normal"; - string fv = "normal"; - switch (s) { - case UP_SHAPE: break; - case ITALIC_SHAPE: fs = "italic"; break; - case SLANTED_SHAPE: fs = "oblique"; break; - case SMALLCAPS_SHAPE: fv = "small-caps"; break; - case IGNORE_SHAPE: - case INHERIT_SHAPE: - fs = ""; fv = ""; break; - } - string retval; - if (!fs.empty()) - appendSep(retval, makeCSSTag("font-style", fs)); - if (!fv.empty()) - appendSep(retval, makeCSSTag("font-variant", fv)); - return retval; - } - - - string getSizeCSS(FontSize const & s) - { - switch (s) { - case FONT_SIZE_TINY: - return "xx-small"; - case FONT_SIZE_SCRIPT: - return "x-small"; - case FONT_SIZE_FOOTNOTE: - case FONT_SIZE_SMALL: - return "small"; - case FONT_SIZE_NORMAL: - return "medium"; - case FONT_SIZE_LARGE: - return "large"; - case FONT_SIZE_LARGER: - case FONT_SIZE_LARGEST: - return "x-large"; - case FONT_SIZE_HUGE: - case FONT_SIZE_HUGER: - return "xx-large"; - case FONT_SIZE_INCREASE: - return "larger"; - case FONT_SIZE_DECREASE: - return "smaller"; - case FONT_SIZE_IGNORE: - case FONT_SIZE_INHERIT: - break; - } - return ""; +string getSizeCSS(FontSize const & s) +{ + switch (s) { + case FONT_SIZE_TINY: + return "xx-small"; + case FONT_SIZE_SCRIPT: + return "x-small"; + case FONT_SIZE_FOOTNOTE: + case FONT_SIZE_SMALL: + return "small"; + case FONT_SIZE_NORMAL: + return "medium"; + case FONT_SIZE_LARGE: + return "large"; + case FONT_SIZE_LARGER: + case FONT_SIZE_LARGEST: + return "x-large"; + case FONT_SIZE_HUGE: + case FONT_SIZE_HUGER: + return "xx-large"; + case FONT_SIZE_INCREASE: + return "larger"; + case FONT_SIZE_DECREASE: + return "smaller"; + case FONT_SIZE_IGNORE: + case FONT_SIZE_INHERIT: + break; } + return ""; +} } // namespace anonymous diff --git a/src/Format.cpp b/src/Format.cpp index 71699d64ad..7e634b48be 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -59,7 +59,8 @@ string const token_socket_format("$$a"); class FormatNamesEqual : public unary_function { public: FormatNamesEqual(string const & name) - : name_(name) {} + : name_(name) + {} bool operator()(Format const & f) const { return f.name() == name_; @@ -72,7 +73,8 @@ private: class FormatExtensionsEqual : public unary_function { public: FormatExtensionsEqual(string const & extension) - : extension_(extension) {} + : extension_(extension) + {} bool operator()(Format const & f) const { return f.hasExtension(extension_); @@ -85,7 +87,8 @@ private: class FormatMimeEqual : public unary_function { public: FormatMimeEqual(string const & mime) - : mime_(mime) {} + : mime_(mime) + {} bool operator()(Format const & f) const { // The test for empty mime strings is needed since we allow @@ -100,7 +103,8 @@ private: class FormatPrettyNameEqual : public unary_function { public: FormatPrettyNameEqual(string const & prettyname) - : prettyname_(prettyname) {} + : prettyname_(prettyname) + {} bool operator()(Format const & f) const { return f.prettyname() == prettyname_; @@ -763,8 +767,10 @@ string const Formats::extensions(string const & name) const namespace { + typedef Translator FlavorTranslator; + FlavorTranslator initFlavorTranslator() { FlavorTranslator f(OutputParams::LATEX, "latex"); @@ -784,6 +790,7 @@ FlavorTranslator const & flavorTranslator() static FlavorTranslator translator = initFlavorTranslator(); return translator; } + } diff --git a/src/FuncStatus.cpp b/src/FuncStatus.cpp index 576376a4ee..9b936869ac 100644 --- a/src/FuncStatus.cpp +++ b/src/FuncStatus.cpp @@ -17,8 +17,7 @@ namespace lyx { FuncStatus::FuncStatus() : v_(OK) -{ -} +{} void FuncStatus::clear() diff --git a/src/HSpace.cpp b/src/HSpace.cpp index 5a2b16695f..b29b4d50fc 100644 --- a/src/HSpace.cpp +++ b/src/HSpace.cpp @@ -142,6 +142,7 @@ string HSpace::asHTMLLength() const return result; } + int HSpace::inPixels(BufferView const & bv) const { switch (kind_) { diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp index a2d2c95e05..31b629671e 100644 --- a/src/HunspellChecker.cpp +++ b/src/HunspellChecker.cpp @@ -56,7 +56,7 @@ struct HunspellChecker::Private ~Private(); void cleanCache(); - void setUserPath(std::string path); + void setUserPath(std::string const & path); const string dictPath(int selector); bool haveLanguageFiles(string const & hpath); bool haveDictionary(Language const * lang, string & hpath); @@ -107,7 +107,7 @@ HunspellChecker::Private::~Private() } -void HunspellChecker::Private::setUserPath(std::string path) +void HunspellChecker::Private::setUserPath(std::string const & path) { if (user_path_ != lyxrc.hunspelldir_path) { cleanCache(); @@ -167,9 +167,8 @@ const string HunspellChecker::Private::dictPath(int selector) bool HunspellChecker::Private::haveDictionary(Language const * lang, string & hpath) { - if (hpath.empty()) { + if (hpath.empty()) return false; - } LYXERR(Debug::FILES, "check hunspell path: " << hpath << " for language " << (lang ? lang->lang() : "NULL" )); @@ -183,9 +182,8 @@ bool HunspellChecker::Private::haveDictionary(Language const * lang, string & hp } // another try with code, '_' replaced by '-' h_path = addName(hpath, subst(lang->code(), '_', '-')); - if (!haveLanguageFiles(h_path)) { + if (!haveLanguageFiles(h_path)) return false; - } LYXERR(Debug::FILES, " found " << h_path); hpath = h_path; return true; @@ -197,7 +195,7 @@ bool HunspellChecker::Private::haveDictionary(Language const * lang) bool result = false; setUserPath(lyxrc.hunspelldir_path); - for ( int p = 0; !result && p < maxLookupSelector(); p++ ) { + for (int p = 0; !result && p < maxLookupSelector(); ++p) { string lpath = dictPath(p); result = haveDictionary(lang, lpath); } @@ -213,9 +211,8 @@ Hunspell * HunspellChecker::Private::speller(Language const * lang) { setUserPath(lyxrc.hunspelldir_path); Spellers::iterator it = spellers_.find(lang->lang()); - if (it != spellers_.end()) { + if (it != spellers_.end()) return it->second; - } return addSpeller(lang); } @@ -239,11 +236,11 @@ Hunspell * HunspellChecker::Private::addSpeller(Language const * lang,string & p Hunspell * HunspellChecker::Private::addSpeller(Language const * lang) { Hunspell * h = 0; - for ( int p = 0; p < maxLookupSelector() && 0 == h; p++ ) { + for (int p = 0; p < maxLookupSelector() && 0 == h; ++p) { string lpath = dictPath(p); h = addSpeller(lang, lpath); } - if (0 != h) { + if (h) { string const encoding = h->get_dic_encoding(); PersonalWordList * pd = new PersonalWordList(lang->lang()); pd->load(); @@ -265,9 +262,8 @@ int HunspellChecker::Private::numDictionaries() const Spellers::const_iterator it = spellers_.begin(); Spellers::const_iterator et = spellers_.end(); - for (; it != et; ++it) { + for (; it != et; ++it) result += it->second != 0; - } return result; } @@ -276,9 +272,9 @@ bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl) const { IgnoreList::const_iterator it = ignored_.begin(); for (; it != ignored_.end(); ++it) { - if ((*it).lang()->code() != wl.lang()->code()) + if (it->lang()->code() != wl.lang()->code()) continue; - if ((*it).word() == wl.word()) + if (it->word() == wl.word()) return true; } return false; @@ -324,9 +320,9 @@ bool HunspellChecker::Private::learned(WordLangTuple const & wl) } -HunspellChecker::HunspellChecker(): d(new Private) -{ -} +HunspellChecker::HunspellChecker() + : d(new Private) +{} HunspellChecker::~HunspellChecker() @@ -436,7 +432,7 @@ bool HunspellChecker::hasDictionary(Language const * lang) const { if (!lang) return false; - return (d->haveDictionary(lang)); + return d->haveDictionary(lang); } diff --git a/src/IndicesList.cpp b/src/IndicesList.cpp index 9f22373f3a..26881549a1 100644 --- a/src/IndicesList.cpp +++ b/src/IndicesList.cpp @@ -30,7 +30,9 @@ namespace { class IndexNamesEqual : public std::unary_function { public: - IndexNamesEqual(docstring const & name) : name_(name) {} + IndexNamesEqual(docstring const & name) + : name_(name) + {} bool operator()(Index const & index) const { @@ -44,7 +46,9 @@ private: class IndexHasShortcut : public std::unary_function { public: - IndexHasShortcut(docstring const & shortcut) : shortc_(shortcut) {} + IndexHasShortcut(docstring const & shortcut) + : shortc_(shortcut) + {} bool operator()(Index const & index) const { diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 94cdb637d0..bbc76d1852 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -501,6 +501,7 @@ bool LaTeXFeatures::isProvided(string const & name) const nomath); } + bool LaTeXFeatures::mustProvide(string const & name) const { return isRequired(name) && !isProvided(name); @@ -1280,6 +1281,7 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const namespace { + docstring const getFloatI18nPreamble(docstring const & type, docstring const & name, Language const * lang, Encoding const & enc, bool const polyglossia) diff --git a/src/Layout.cpp b/src/Layout.cpp index 48726d0702..97594b706e 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -911,7 +911,8 @@ string const & Layout::htmllabelattr() const } -docstring Layout::htmlstyle() const { +docstring Layout::htmlstyle() const +{ if (!htmlstyle_.empty() && !htmlforcecss_) return htmlstyle_; if (htmldefaultstyle_.empty()) @@ -951,15 +952,19 @@ string Layout::defaultCSSClass() const namespace { - string makeMarginValue(char const * side, double d) { - ostringstream os; - os << "margin-" << side << ": " << d << "ex;\n"; - return os.str(); - } + +string makeMarginValue(char const * side, double d) +{ + ostringstream os; + os << "margin-" << side << ": " << d << "ex;\n"; + return os.str(); +} + } -void Layout::makeDefaultCSS() const { +void Layout::makeDefaultCSS() const +{ // this never needs to be redone, since reloading layouts will // wipe out what we did before. if (!htmldefaultstyle_.empty()) diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp index 4337956170..5f2f0d3db8 100644 --- a/src/LayoutFile.cpp +++ b/src/LayoutFile.cpp @@ -182,7 +182,8 @@ std::vector LayoutFileList::classList() const } -void LayoutFileList::reset(LayoutFileIndex const & classname) { +void LayoutFileList::reset(LayoutFileIndex const & classname) +{ LASSERT(haveClass(classname), /**/); LayoutFile * tc = classmap_[classname]; LayoutFile * tmpl = @@ -216,6 +217,7 @@ string layoutpost = } + LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass) { FileName const tempLayout = FileName::tempName("basic_layout"); @@ -257,8 +259,8 @@ LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass) } -LayoutFileIndex - LayoutFileList::addLocalLayout(string const & textclass, string const & path) +LayoutFileIndex LayoutFileList::addLocalLayout( + string const & textclass, string const & path) { // FIXME There is a bug here: 4593 // @@ -321,7 +323,8 @@ LayoutFileIndex return textclass; } } - // If .layout is not in local directory, or an invalid layout is found, return null + // If .layout is not in local directory, or an invalid layout + // is found, return null return string(); } diff --git a/src/LyX.cpp b/src/LyX.cpp index 2962207241..8c9fdbcb02 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -138,11 +138,10 @@ void reconfigureUserLyXDir() } // namespace anon /// The main application class private implementation. -struct LyX::Impl -{ - Impl() : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) - { - } +struct LyX::Impl { + Impl() + : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0) + {} ~Impl() { @@ -205,6 +204,7 @@ struct LyX::Impl SpellChecker * hunspell_checker_; }; + /// frontend::Application * theApp() { diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index f5d5dd54b4..6b693b16e6 100644 --- a/src/ModuleList.cpp +++ b/src/ModuleList.cpp @@ -46,7 +46,8 @@ LyXModule::LyXModule(string const & n, string const & i, } -vector LyXModule::prerequisites() const { +vector LyXModule::prerequisites() const +{ #ifdef TEX2LYX return vector(); #else @@ -57,7 +58,8 @@ vector LyXModule::prerequisites() const { } -bool LyXModule::isAvailable() const { +bool LyXModule::isAvailable() const +{ #ifdef TEX2LYX return true; #else @@ -115,8 +117,7 @@ bool LyXModule::areCompatible(string const & mod1, string const & mod2) // used when sorting the module list. -class ModuleSorter -{ +class ModuleSorter { public: int operator()(LyXModule const & lm1, LyXModule const & lm2) const { @@ -265,6 +266,7 @@ LyXModule const * ModuleList::operator[](string const & str) const return 0; } + LyXModule * ModuleList::operator[](string const & str) { LyXModuleList::iterator it = modlist_.begin(); diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 5a68047850..223d2eb53e 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -69,8 +69,10 @@ using namespace lyx::support; namespace lyx { namespace { + /// Inset identifier (above 0x10ffff, for ucs-4) char_type const META_INSET = 0x200001; + } @@ -129,7 +131,8 @@ private: class SpellCheckerState { public: - SpellCheckerState() { + SpellCheckerState() + { needs_refresh_ = true; current_change_number_ = 0; } @@ -209,20 +212,24 @@ public: return empty_; } - bool needsRefresh() const { + bool needsRefresh() const + { return needs_refresh_; } - SpellChecker::ChangeNumber currentChangeNumber() const { + SpellChecker::ChangeNumber currentChangeNumber() const + { return current_change_number_; } - void refreshRange(pos_type & first, pos_type & last) const { + void refreshRange(pos_type & first, pos_type & last) const + { first = refresh_.first; last = refresh_.last; } - void needsRefresh(pos_type pos) { + void needsRefresh(pos_type pos) + { if (needs_refresh_ && pos != -1) { if (pos < refresh_.first) refresh_.first = pos; @@ -237,13 +244,13 @@ public: needs_refresh_ = pos != -1; } - void needsCompleteRefresh(SpellChecker::ChangeNumber change_number) { + void needsCompleteRefresh(SpellChecker::ChangeNumber change_number) + { needs_refresh_ = true; refresh_.first = 0; refresh_.last = -1; current_change_number_ = change_number; } - private: typedef vector Ranges; typedef Ranges::const_iterator RangesIterator; @@ -384,9 +391,10 @@ public: Language * getSpellLanguage(pos_type const from) const; Language * locateSpellRange(pos_type & from, pos_type & to, - SkipPositions & skips) const; + SkipPositions & skips) const; - bool hasSpellerChange() const { + bool hasSpellerChange() const + { SpellChecker::ChangeNumber speller_change_number = 0; if (theSpellChecker()) speller_change_number = theSpellChecker()->changeNumber(); @@ -405,14 +413,16 @@ public: speller_state_.setRange(fp, state); } - void requestSpellCheck(pos_type pos) { + void requestSpellCheck(pos_type pos) + { if (pos == -1) speller_state_.needsCompleteRefresh(speller_state_.currentChangeNumber()); else speller_state_.needsRefresh(pos); } - void readySpellCheck() { + void readySpellCheck() + { speller_state_.needsRefresh(-1); } diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp index 85e57683df..e6541fdb0b 100644 --- a/src/ParagraphMetrics.cpp +++ b/src/ParagraphMetrics.cpp @@ -257,9 +257,8 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const } // expand at the beginning of a row only if it is the first row of a paragraph - if (pos == row.pos()) { + if (pos == row.pos()) return pos == 0; - } // do not expand in some labels if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody()) diff --git a/src/PersonalWordList.cpp b/src/PersonalWordList.cpp index 75dcda6aa7..665eb331b5 100644 --- a/src/PersonalWordList.cpp +++ b/src/PersonalWordList.cpp @@ -92,6 +92,7 @@ void PersonalWordList::save() LYXERR(Debug::FILES, "count of saved items: " << words_.size()); } + bool PersonalWordList::equalwords(docstring const & w1, docstring const & w2) const { return w1 == w2; diff --git a/src/Server.cpp b/src/Server.cpp index 1e673e6f87..1de758a5f4 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -695,6 +695,7 @@ string const LyXComm::pipeName(DWORD index) const LyXComm::LyXComm(string const &, Server *, ClientCallbackfct) {} + void LyXComm::openConnection() {} @@ -716,6 +717,7 @@ void LyXComm::endPipe(int & fd, string const & filename, bool write) void LyXComm::emergencyCleanup() {} + void LyXComm::read_ready() {} @@ -726,7 +728,6 @@ void LyXComm::send(string const & msg) #else // defined (HAVE_MKFIFO) - LyXComm::LyXComm(string const & pip, Server * cli, ClientCallbackfct ccb) : pipename_(pip), client_(cli), clientcb_(ccb) { @@ -915,7 +916,6 @@ void LyXComm::read_ready() int status; // the single = is intended here. while ((status = ::read(infd_, charbuf, charbuf_size - 1))) { - if (status > 0) { charbuf[status] = '\0'; // turn it into a c string read_buffer_ += rtrim(charbuf, "\r"); @@ -966,7 +966,8 @@ void LyXComm::send(string const & msg) LYXERR(Debug::LYXSERVER, "LyXComm: Sending '" << msg << '\''); - if (pipename_.empty()) return; + if (pipename_.empty()) + return; if (!ready_) { LYXERR0("LyXComm: Pipes are closed. Could not send " << msg); @@ -1068,7 +1069,6 @@ Server::~Server() int compare(char const * a, char const * b, unsigned int len) { - using namespace std; return strncmp(a, b, len); } diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp index 4c34212cb5..3d73a67ed6 100644 --- a/src/ServerSocket.cpp +++ b/src/ServerSocket.cpp @@ -41,7 +41,6 @@ using namespace std; using namespace lyx::support; - namespace lyx { // Address is the unix address for the socket. diff --git a/src/Session.cpp b/src/Session.cpp index aff0628fbf..6cdf1f7248 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -40,7 +40,6 @@ string const sec_lastcommands = "[last commands]"; namespace lyx { - LastFilesSection::LastFilesSection(unsigned int num) : default_num_last_files(4), absolute_max_last_files(100) diff --git a/src/Text.cpp b/src/Text.cpp index c61e9e1bb1..390b69d714 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -1812,6 +1812,7 @@ bool Text::read(Lexer & lex, return res; } + // Returns the current font and depth as a message. docstring Text::currentState(Cursor const & cur) const { diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 93eae96b9c..55b90c6cfe 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -222,50 +222,50 @@ enum TextClassTags { namespace { - LexerKeyword textClassTags[] = { - { "addtohtmlpreamble", TC_ADDTOHTMLPREAMBLE }, - { "addtohtmlstyles", TC_ADDTOHTMLSTYLES }, - { "addtopreamble", TC_ADDTOPREAMBLE }, - { "citeengine", TC_CITEENGINE }, - { "citeenginetype", TC_CITEENGINETYPE }, - { "citeformat", TC_CITEFORMAT }, - { "classoptions", TC_CLASSOPTIONS }, - { "columns", TC_COLUMNS }, - { "counter", TC_COUNTER }, - { "defaultbiblio", TC_DEFAULTBIBLIO }, - { "defaultfont", TC_DEFAULTFONT }, - { "defaultmodule", TC_DEFAULTMODULE }, - { "defaultstyle", TC_DEFAULTSTYLE }, - { "excludesmodule", TC_EXCLUDESMODULE }, - { "float", TC_FLOAT }, - { "format", TC_FORMAT }, - { "fullauthorlist", TC_FULLAUTHORLIST }, - { "htmlpreamble", TC_HTMLPREAMBLE }, - { "htmlstyles", TC_HTMLSTYLES }, - { "htmltocsection", TC_HTMLTOCSECTION }, - { "ifcounter", TC_IFCOUNTER }, - { "ifstyle", TC_IFSTYLE }, - { "input", TC_INPUT }, - { "insetlayout", TC_INSETLAYOUT }, - { "leftmargin", TC_LEFTMARGIN }, - { "nocounter", TC_NOCOUNTER }, - { "nofloat", TC_NOFLOAT }, - { "nostyle", TC_NOSTYLE }, - { "outputformat", TC_OUTPUTFORMAT }, - { "outputtype", TC_OUTPUTTYPE }, - { "pagestyle", TC_PAGESTYLE }, - { "preamble", TC_PREAMBLE }, - { "provides", TC_PROVIDES }, - { "providesmodule", TC_PROVIDESMODULE }, - { "requires", TC_REQUIRES }, - { "rightmargin", TC_RIGHTMARGIN }, - { "secnumdepth", TC_SECNUMDEPTH }, - { "sides", TC_SIDES }, - { "style", TC_STYLE }, - { "titlelatexname", TC_TITLELATEXNAME }, - { "titlelatextype", TC_TITLELATEXTYPE }, - { "tocdepth", TC_TOCDEPTH } - }; +LexerKeyword textClassTags[] = { + { "addtohtmlpreamble", TC_ADDTOHTMLPREAMBLE }, + { "addtohtmlstyles", TC_ADDTOHTMLSTYLES }, + { "addtopreamble", TC_ADDTOPREAMBLE }, + { "citeengine", TC_CITEENGINE }, + { "citeenginetype", TC_CITEENGINETYPE }, + { "citeformat", TC_CITEFORMAT }, + { "classoptions", TC_CLASSOPTIONS }, + { "columns", TC_COLUMNS }, + { "counter", TC_COUNTER }, + { "defaultbiblio", TC_DEFAULTBIBLIO }, + { "defaultfont", TC_DEFAULTFONT }, + { "defaultmodule", TC_DEFAULTMODULE }, + { "defaultstyle", TC_DEFAULTSTYLE }, + { "excludesmodule", TC_EXCLUDESMODULE }, + { "float", TC_FLOAT }, + { "format", TC_FORMAT }, + { "fullauthorlist", TC_FULLAUTHORLIST }, + { "htmlpreamble", TC_HTMLPREAMBLE }, + { "htmlstyles", TC_HTMLSTYLES }, + { "htmltocsection", TC_HTMLTOCSECTION }, + { "ifcounter", TC_IFCOUNTER }, + { "ifstyle", TC_IFSTYLE }, + { "input", TC_INPUT }, + { "insetlayout", TC_INSETLAYOUT }, + { "leftmargin", TC_LEFTMARGIN }, + { "nocounter", TC_NOCOUNTER }, + { "nofloat", TC_NOFLOAT }, + { "nostyle", TC_NOSTYLE }, + { "outputformat", TC_OUTPUTFORMAT }, + { "outputtype", TC_OUTPUTTYPE }, + { "pagestyle", TC_PAGESTYLE }, + { "preamble", TC_PREAMBLE }, + { "provides", TC_PROVIDES }, + { "providesmodule", TC_PROVIDESMODULE }, + { "requires", TC_REQUIRES }, + { "rightmargin", TC_RIGHTMARGIN }, + { "secnumdepth", TC_SECNUMDEPTH }, + { "sides", TC_SIDES }, + { "style", TC_STYLE }, + { "titlelatexname", TC_TITLELATEXNAME }, + { "titlelatextype", TC_TITLELATEXTYPE }, + { "tocdepth", TC_TOCDEPTH } +}; } //namespace anon @@ -1237,6 +1237,7 @@ string const & TextClass::prerequisites(string const & sep) const return prerequisites_; } + bool TextClass::hasLayout(docstring const & n) const { docstring const name = n.empty() ? defaultLayoutName() : n; @@ -1531,9 +1532,8 @@ Layout const & DocumentClass::getTOCLayout() const Layout const & DocumentClass::htmlTOCLayout() const { - if (html_toc_section_.empty()) { + if (html_toc_section_.empty()) html_toc_section_ = getTOCLayout().name(); - } return operator[](html_toc_section_); } diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp index f8e8448979..b4655ac27f 100644 --- a/src/Thesaurus.cpp +++ b/src/Thesaurus.cpp @@ -128,9 +128,8 @@ pair Thesaurus::Private::getThesaurus(string const & path, docstr break; } } - if (idx.empty()) { + if (idx.empty()) return make_pair(string(), string()); - } for (support::FileNameList::const_iterator it = data_files.begin(); it != data_files.end(); ++it) { if (contains(it->onlyFileName(), basename)) { data = it->absFileName(); @@ -150,9 +149,8 @@ pair Thesaurus::Private::getThesaurus(docstring const & lang) if (thesaurusAvailable(lang)) return make_pair(string(), string()); - if (!thes_path.empty()) { + if (!thes_path.empty()) result = getThesaurus(thes_path, lang); - } if (result.first.empty() || result.second.empty()) { string const sys_path = external_path(addName(lyx::support::package().system_support().absFileName(),dataDirectory())) ; result = getThesaurus(sys_path, lang); @@ -271,7 +269,8 @@ Thesaurus::Meanings Thesaurus::lookup(WordLangTuple const & wl) } -Thesaurus::Thesaurus() : d(new Thesaurus::Private) +Thesaurus::Thesaurus() + : d(new Thesaurus::Private) { } diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 719c3c2a1f..bd468d86a7 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -98,6 +98,7 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const return true; } + bool VCS::checkparentdirs(FileName const & file, std::string const & pathname) { FileName dirname = file.onlyPath(); diff --git a/src/VSpace.cpp b/src/VSpace.cpp index 72315072d6..944d016ce3 100644 --- a/src/VSpace.cpp +++ b/src/VSpace.cpp @@ -200,6 +200,7 @@ string VSpace::asHTMLLength() const return result; } + int VSpace::inPixels(BufferView const & bv) const { // Height of a normal line in pixels (zoom factor considered) diff --git a/src/WordList.cpp b/src/WordList.cpp index 5dcbc14234..96b7c35ea7 100644 --- a/src/WordList.cpp +++ b/src/WordList.cpp @@ -42,7 +42,8 @@ WordList * theWordList(Language const & lang) } -void WordList::cleanupWordLists() { +void WordList::cleanupWordLists() +{ map::const_iterator it = theGlobalWordList.begin(); for (; it != theGlobalWordList.end(); ++it) delete it->second; diff --git a/src/factory.cpp b/src/factory.cpp index 858e53f138..e25a263049 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -564,12 +564,15 @@ Inset * readInset(Lexer & lex, Buffer * buf) } inset->setBuffer(*buf); } else { - // FIXME This branch should be made to use inset codes as the preceding - // branch does. Unfortunately, that will take some doing. It requires - // converting the representation of the insets in LyX files so that they - // use the inset names listed in Inset.cpp. Then, as above, the inset names - // can be translated to inset codes using insetCode(). And the insets' - // write() routines should use insetName() rather than hardcoding it. + // FIXME This branch should be made to use inset codes + // as the preceding branch does. Unfortunately, that + // will take some doing. It requires converting the + // representation of the insets in LyX files so that + // they use the inset names listed in Inset.cpp. Then, + // as above, the inset names can be translated to + // inset codes using insetCode(). And the insets' + // write() routines should use insetName() rather than + // hardcoding it. if (tmptok == "Quotes") { inset.reset(new InsetQuotes(buf)); } else if (tmptok == "External") { diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp index a226a7e2e7..217c22b604 100644 --- a/src/lengthcommon.cpp +++ b/src/lengthcommon.cpp @@ -47,6 +47,7 @@ char const * const unit_name_gui[] = { N_("Column Width %"), N_("Page Width %"), N_("Line Width %"), N_("Text Height %"), N_("Page Height %"), "" }; + Length::UNIT unitFromString(string const & data) { int i = 0; @@ -208,6 +209,7 @@ LaTeXLength table[] = { } // namespace anon + const char * stringFromUnit(int unit) { if (unit < 0 || unit > num_units) diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 74b045c4bb..73700cb4fc 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -623,6 +623,7 @@ string escape_for_regex(string s, bool match_latex) return s; } + /// Wrapper for lyx::regex_replace with simpler interface bool regex_replace(string const & s, string & t, string const & searchstr, string const & replacestr) @@ -637,6 +638,7 @@ bool regex_replace(string const & s, string & t, string const & searchstr, return rv; } + /** Checks if supplied string segment is well-formed from the standpoint of matching open-closed braces. ** ** Verify that closed braces exactly match open braces. This avoids that, for example, @@ -678,6 +680,7 @@ bool braces_match(string::const_iterator const & beg, return true; } + /** The class performing a match between a position in the document and the FindAdvOptions. **/ class MatchStringAdv { @@ -762,7 +765,8 @@ static docstring buffer_to_latex(Buffer & buffer) } -static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt) { +static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions const & opt) +{ docstring str; if (!opt.ignoreformat) { str = buffer_to_latex(buffer); @@ -787,7 +791,8 @@ static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions co /// Return separation pos between the leading material and the rest -static size_t identifyLeading(string const & s) { +static size_t identifyLeading(string const & s) +{ string t = s; // @TODO Support \item[text] while (regex_replace(t, t, "^\\\\(emph|textbf|subsubsection|subsection|section|subparagraph|paragraph|part)\\*?\\{", "") @@ -801,7 +806,8 @@ static size_t identifyLeading(string const & s) { // Remove trailing closure of math, macros and environments, so to catch parts of them. -static int identifyClosing(string & t) { +static int identifyClosing(string & t) +{ int open_braces = 0; do { LYXERR(Debug::FIND, "identifyClosing(): t now is '" << t << "'"); @@ -1211,7 +1217,8 @@ int findMostBackwards(DocIterator & cur, MatchStringAdv const & match) /// Finds backwards -int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) { +int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match) +{ if (! cur) return 0; // Backup of original position @@ -1290,7 +1297,8 @@ namespace { /** Check if 'len' letters following cursor are all non-lowercase */ -static bool allNonLowercase(DocIterator const & cur, int len) { +static bool allNonLowercase(DocIterator const & cur, int len) +{ pos_type end_pos = cur.pos() + len; for (pos_type pos = cur.pos(); pos != end_pos; ++pos) if (isLowerCase(cur.paragraph().getChar(pos))) @@ -1300,7 +1308,8 @@ static bool allNonLowercase(DocIterator const & cur, int len) { /** Check if first letter is upper case and second one is lower case */ -static bool firstUppercase(DocIterator const & cur) { +static bool firstUppercase(DocIterator const & cur) +{ char_type ch1, ch2; if (cur.pos() >= cur.lastpos() - 1) { LYXERR(Debug::FIND, "No upper-case at cur: " << cur); @@ -1321,13 +1330,15 @@ static bool firstUppercase(DocIterator const & cur) { ** ** \fixme What to do with possible further paragraphs in replace buffer ? **/ -static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) { +static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase others_case) +{ ParagraphList::iterator pit = buffer.paragraphs().begin(); pos_type right = pos_type(1); pit->changeCase(buffer.params(), pos_type(0), right, first_case); right = pit->size() + 1; pit->changeCase(buffer.params(), right, right, others_case); } + } // anon namespace /// diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp index 432b2e7109..f8a36d3e43 100644 --- a/src/output_docbook.cpp +++ b/src/output_docbook.cpp @@ -42,7 +42,7 @@ namespace { ParagraphList::const_iterator searchParagraph( ParagraphList::const_iterator p, - ParagraphList::const_iterator const & pend) + ParagraphList::const_iterator const & pend) { for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p) ; @@ -52,8 +52,8 @@ ParagraphList::const_iterator searchParagraph( ParagraphList::const_iterator searchCommand( - ParagraphList::const_iterator p, - ParagraphList::const_iterator const & pend) + ParagraphList::const_iterator p, + ParagraphList::const_iterator const & pend) { Layout const & bstyle = p->layout(); @@ -68,8 +68,8 @@ ParagraphList::const_iterator searchCommand( ParagraphList::const_iterator searchEnvironment( - ParagraphList::const_iterator p, - ParagraphList::const_iterator const & pend) + ParagraphList::const_iterator p, + ParagraphList::const_iterator const & pend) { Layout const & bstyle = p->layout(); size_t const depth = p->params().depth(); @@ -95,12 +95,13 @@ ParagraphList::const_iterator searchEnvironment( } -ParagraphList::const_iterator makeParagraph(Buffer const & buf, - odocstream & os, - OutputParams const & runparams, - Text const & text, - ParagraphList::const_iterator const & pbegin, - ParagraphList::const_iterator const & pend) +ParagraphList::const_iterator makeParagraph( + Buffer const & buf, + odocstream & os, + OutputParams const & runparams, + Text const & text, + ParagraphList::const_iterator const & pbegin, + ParagraphList::const_iterator const & pend) { ParagraphList const & paragraphs = text.paragraphs(); for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) { @@ -123,12 +124,13 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf, } -ParagraphList::const_iterator makeEnvironment(Buffer const & buf, - odocstream & os, - OutputParams const & runparams, - Text const & text, - ParagraphList::const_iterator const & pbegin, - ParagraphList::const_iterator const & pend) +ParagraphList::const_iterator makeEnvironment( + Buffer const & buf, + odocstream & os, + OutputParams const & runparams, + Text const & text, + ParagraphList::const_iterator const & pbegin, + ParagraphList::const_iterator const & pend) { ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator par = pbegin; @@ -244,12 +246,13 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf, } -ParagraphList::const_iterator makeCommand(Buffer const & buf, - odocstream & os, - OutputParams const & runparams, - Text const & text, - ParagraphList::const_iterator const & pbegin, - ParagraphList::const_iterator const & pend) +ParagraphList::const_iterator makeCommand( + Buffer const & buf, + odocstream & os, + OutputParams const & runparams, + Text const & text, + ParagraphList::const_iterator const & pbegin, + ParagraphList::const_iterator const & pend) { ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator par = pbegin; diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 92913afb4e..585ef8a3ec 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -45,9 +45,9 @@ namespace lyx { namespace { enum OpenEncoding { - none, - inputenc, - CJK + none, + inputenc, + CJK }; static int open_encoding_ = none; diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp index d58c44a796..f0a383df4c 100644 --- a/src/output_plaintext.cpp +++ b/src/output_plaintext.cpp @@ -71,6 +71,7 @@ static pair addDepth(int depth, int ldepth) return make_pair(d, docstring(d, ' ')); } + void writePlaintextParagraph(Buffer const & buf, Paragraph const & par, odocstream & os, diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index 336f5a88db..50ba0f4b0b 100644 --- a/src/output_xhtml.cpp +++ b/src/output_xhtml.cpp @@ -71,7 +71,8 @@ docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e) // escape what needs escaping -docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e) { +docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e) +{ odocstringstream d; docstring::const_iterator it = str.begin(); docstring::const_iterator en = str.end(); @@ -109,7 +110,8 @@ string escapeChar(char c, XHTMLStream::EscapeSettings e) // escape what needs escaping -string htmlize(string const & str, XHTMLStream::EscapeSettings e) { +string htmlize(string const & str, XHTMLStream::EscapeSettings e) +{ ostringstream d; string::const_iterator it = str.begin(); string::const_iterator en = str.end(); @@ -915,10 +917,10 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, void makeCommand(Buffer const & buf, - XHTMLStream & xs, - OutputParams const & runparams, - Text const & text, - ParagraphList::const_iterator const & pbegin) + XHTMLStream & xs, + OutputParams const & runparams, + Text const & text, + ParagraphList::const_iterator const & pbegin) { Layout const & style = pbegin->layout(); if (!style.counter.empty()) @@ -1020,7 +1022,8 @@ void xhtmlParagraphs(Text const & text, } -string alignmentToCSS(LyXAlignment align) { +string alignmentToCSS(LyXAlignment align) +{ switch (align) { case LYX_ALIGN_BLOCK: // we are NOT going to use text-align: justify!! diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp index 0a902b7ef2..5810fd66e5 100644 --- a/src/rowpainter.cpp +++ b/src/rowpainter.cpp @@ -54,6 +54,7 @@ namespace lyx { using frontend::Painter; using frontend::FontMetrics; + RowPainter::RowPainter(PainterInfo & pi, Text const & text, pit_type pit, Row const & row, Bidi & bidi, int x, int y) : pi_(pi), text_(text), @@ -693,6 +694,7 @@ void RowPainter::paintTopLevelLabel() pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font); } + /** Check if the current paragraph is the last paragraph in a proof environment */ static int getEndLabel(pit_type p, Text const & text) From 3d3f87f36a91686e82fcc8ae12b9448bcc27217a Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 29 Oct 2012 20:42:01 +0100 Subject: [PATCH 18/93] Fix bug 8396: Wrong import of \xymatrix --- lib/syntax.default | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/syntax.default b/lib/syntax.default index 62c4eea4d2..f18ea74b79 100644 --- a/lib/syntax.default +++ b/lib/syntax.default @@ -695,6 +695,7 @@ $$ \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": From d526c05df9bd8f776a42622a6ccf1fa90a3f6575 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Mon, 29 Oct 2012 21:49:49 -0400 Subject: [PATCH 19/93] Add knitr manual to Help > Specific Manuals --- lib/ui/stdmenus.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 9cb6768acf..be2f68a5ae 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -590,6 +590,7 @@ Menuset Menu "examples" Item "Braille Manual|B" "help-open Braille" Item "Feynman-diagram Manual|F" "help-open FeynmanDiagrams" + Item "Knitr Manual|K" "help-open knitr" Item "LilyPond Manual|M" "help-open lilypond" Item "Linguistics Manual|L" "help-open linguistics" Item "Multilingual Captions Manual|C" "help-open MultilingualCaptions" From 24eae3d84143f019359ff5f244bfd034e67953a9 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Mon, 29 Oct 2012 22:10:22 -0400 Subject: [PATCH 20/93] Remove repetitious "Manual" from specific manuals --- lib/ui/stdmenus.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index be2f68a5ae..1bc9fbdee9 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -588,15 +588,15 @@ Menuset End Menu "examples" - Item "Braille Manual|B" "help-open Braille" - Item "Feynman-diagram Manual|F" "help-open FeynmanDiagrams" - Item "Knitr Manual|K" "help-open knitr" - Item "LilyPond Manual|M" "help-open lilypond" - Item "Linguistics Manual|L" "help-open linguistics" - Item "Multilingual Captions Manual|C" "help-open MultilingualCaptions" - Item "Risk and Safety Statements Manual|R" "help-open R-S-statements" - Item "Sweave Manual|S" "help-open sweave" - Item "XY-pic Manual|X" "help-open xypic" + Item "Braille|B" "help-open Braille" + Item "Feynman-diagram|F" "help-open FeynmanDiagrams" + Item "Knitr|K" "help-open knitr" + Item "LilyPond|P" "help-open lilypond" + Item "Linguistics|L" "help-open linguistics" + Item "Multilingual Captions|C" "help-open MultilingualCaptions" + Item "Risk and Safety Statements|R" "help-open R-S-statements" + Item "Sweave|S" "help-open sweave" + Item "XY-pic|X" "help-open xypic" End From 78492b276da9f2406d0e8bec3741b1b0a920cfbe Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Wed, 31 Oct 2012 10:33:02 +0100 Subject: [PATCH 21/93] Cmake build: Use message(FATAL_ERROR ...) to indicate failed call to a cmake-script (like "exit -1;" in sh) --- .../modules/LyXCreateImagesResource.cmake | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/development/cmake/modules/LyXCreateImagesResource.cmake b/development/cmake/modules/LyXCreateImagesResource.cmake index 42a7f06d2c..f360d1c4a4 100644 --- a/development/cmake/modules/LyXCreateImagesResource.cmake +++ b/development/cmake/modules/LyXCreateImagesResource.cmake @@ -31,23 +31,43 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) +if(NOT RESOURCE_NAME) + message(FATAL_ERROR "RESOURCE_NAME not given") +endif() + +message(STATUS "Generating ${RESOURCE_NAME}") + +if(NOT IS_DIRECTORY ${IMAGES_DIR}) + message(FATAL_ERROR "Directory ${IMAGES_DIR} does not exist") +endif() + +if(NOT EXISTS ${MAPPED_DIR}) + message(FATAL_ERROR "Directory ${MAPPED_DIR} does not exist") +endif() + file(GLOB_RECURSE images_png ${IMAGES_DIR}/*.png) file(GLOB_RECURSE images_gif ${IMAGES_DIR}/*.gif) set(images ${images_png} ${images_gif}) -set(resource_name ${RESOURCE_NAME}) -message(STATUS "Generating ${resource_name}") +file(REMOVE ${RESOURCE_NAME}) + if(EXISTS ${RESOURCE_NAME}) + message(FATAL_ERROR "Cannot remove file ${RESOURCE_NAME}") + endif() +endif() -file(WRITE ${resource_name} "\n") -file(APPEND ${resource_name} "\n") +file(WRITE ${RESOURCE_NAME} "\n") +file(APPEND ${RESOURCE_NAME} "\n") foreach (_current_FILE ${images}) get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE) string(REGEX REPLACE "${MAPPED_DIR}" "" _file_name ${_abs_FILE}) - file(APPEND ${resource_name} " ${_abs_FILE}\n") + file(APPEND ${RESOURCE_NAME} " ${_abs_FILE}\n") endforeach (_current_FILE) -file(APPEND ${resource_name} "\n") -file(APPEND ${resource_name} "\n") +file(APPEND ${RESOURCE_NAME} "\n") +file(APPEND ${RESOURCE_NAME} "\n") +if(NOT EXISTS ${RESOURCE_NAME}) + message(FATAL_ERROR "File ${RESOURCE_NAME} could not be created") +endif() From 122d21184f13327b5b71b07c5bfb94f8ac0ba600 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Wed, 31 Oct 2012 06:07:20 -0400 Subject: [PATCH 22/93] Remove C Compiler information from -version output --- configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.ac b/configure.ac index f9c35bf26c..83f4c99da2 100644 --- a/configure.ac +++ b/configure.ac @@ -237,9 +237,6 @@ real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` VERSION_INFO="Configuration\n\ Host type: ${host}\n\ Special build flags: ${lyx_flags}\n\ - C Compiler: ${CC} ${CC_VERSION}\n\ - C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ - C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ From 854b168d17bfbee76faa06ff3394b647b2b25f9c Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 1 Nov 2012 13:00:19 +0100 Subject: [PATCH 23/93] Cmake build: Correct dependencies for version-info also at build-time (not only at configure time) --- CMakeLists.txt | 13 ++--- development/cmake/lyx_date.h.cmake | 2 +- development/cmake/modules/LyXGetVersion.cmake | 54 +++++++++++++++++++ src/CMakeLists.txt | 1 + src/tex2lyx/CMakeLists.txt | 2 + 5 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 development/cmake/modules/LyXGetVersion.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b5fab40cb..e86b7d8bff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,12 +275,6 @@ if (LYX_LOCALVERSIONING) MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)") set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git") endif() - # Override the value from configure.ac, if possible - EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "log" "-1" "--format=%ci" - WORKING_DIRECTORY "${TOP_SRC_DIR}" - OUTPUT_VARIABLE LYX_DATEtmp OUTPUT_STRIP_TRAILING_WHITESPACE) - - string(REGEX MATCH "([0-9]+-[0-9]+-[0-9]+)" LYX_DATE ${LYX_DATEtmp}) else() set(LYX_REVISION_VERSION git) #TODO use date endif() @@ -294,6 +288,9 @@ else() set(PROGRAM_SUFFIX "") endif() +add_custom_target(lyx_version ALL + COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DLYX_CMAKE_DIR=${LYX_CMAKE_DIR} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/modules/LyXGetVersion.cmake + ) if(APPLE) set(osx_bundle_program_name ${PACKAGE_BASE}${PROGRAM_SUFFIX}) @@ -548,6 +545,8 @@ if(WIN32) endif() endif() +# Compute qt4-version from ${QTVERSION} + message(STATUS "") foreach(_v PACKAGE PACKAGE_VERSION PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER @@ -690,9 +689,7 @@ else() endif() configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h) -configure_file(${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.h) -# Compute qt4-version from ${QTVERSION} if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*") MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}") endif() diff --git a/development/cmake/lyx_date.h.cmake b/development/cmake/lyx_date.h.cmake index ddbffea54e..11ac129dcf 100644 --- a/development/cmake/lyx_date.h.cmake +++ b/development/cmake/lyx_date.h.cmake @@ -1,5 +1,5 @@ /* - * \file config.h + * \file lyx_date.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/development/cmake/modules/LyXGetVersion.cmake b/development/cmake/modules/LyXGetVersion.cmake new file mode 100644 index 0000000000..1f6cde7005 --- /dev/null +++ b/development/cmake/modules/LyXGetVersion.cmake @@ -0,0 +1,54 @@ +# Copyright (c) 2012, Kornel Benko, +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# To call this script, one has to provide following parameters +# TOP_SRC_DIR +# LYX_CMAKE_DIR +# TOP_BINARY_DIR +# LYX_DATE: to be used if not under git control + + +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + +FIND_PROGRAM(LYX_GITVERSION git) +if(LYX_GITVERSION) + # Override the value from configure.ac, if possible + EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "log" "-1" "--format=%h %ci" + WORKING_DIRECTORY "${TOP_SRC_DIR}" + OUTPUT_VARIABLE LYX_DATEtmp OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(LYX_DATEtmp MATCHES "^([0-9a-f]+) ([0-9]+-[0-9]+-[0-9]+)") + set(LYX_GITHASH ${CMAKE_MATCH_1}) + set(LYX_DATE ${CMAKE_MATCH_2}) + message(STATUS "Git-hash = ${LYX_GITHASH}") + endif() +endif() + +configure_file(${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.tmp) +EXECUTE_PROCESS( + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TOP_BINARY_DIR}/lyx_date.tmp ${TOP_BINARY_DIR}/lyx_date.h + COMMAND ${CMAKE_COMMAND} -E remove ${TOP_BINARY_DIR}/lyx_date.tmp +) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b5a9a29fa6..dd93a0ae70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -116,6 +116,7 @@ add_executable(${_lyx} ${OSX_BUNDLE_FILES} ) +add_dependencies(${_lyx} lyx_version) lyx_add_gcc_pch(${_lyx}) diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index 496cbdd053..2053e30390 100644 --- a/src/tex2lyx/CMakeLists.txt +++ b/src/tex2lyx/CMakeLists.txt @@ -53,6 +53,8 @@ target_link_libraries(${_tex2lyx} ${intl_link} ${ICONV_LIBRARY}) +add_dependencies(${_tex2lyx} lyx_version) + if(WIN32) target_link_libraries(${_tex2lyx} shlwapi ole32 psapi) endif() From 15001b0354112e6ffaa0b76643bd19fb52dbcd2b Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 1 Nov 2012 18:06:26 +0100 Subject: [PATCH 24/93] * INSTALL few leftovers in trunk as well. --- INSTALL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 999fcf9db4..6a9feb2e5c 100644 --- a/INSTALL +++ b/INSTALL @@ -40,7 +40,7 @@ If you have checked this out from Git, you need to have: * autoconf >= 2.59c * gettext >= 0.16.1 Then type "./autogen.sh" to build the needed configuration -files and proceed as stated below. +files and proceed as stated above/below. You will also probably need GNU m4 (perhaps installed as gm4). @@ -115,7 +115,7 @@ flags: The default are as follows in terms of version number release: stable release (1.x.y) prerelease: version number contains alpha, beta, rc or pre. - development: version number contains svn. + development: version number contains dev. o --with-extra-lib=DIRECTORY that specifies the path where LyX will find extra libraries (qt4) it needs. Defaults to NONE @@ -139,7 +139,7 @@ flags: You can use this feature to install more than one version of LyX on the same system. You can optionally specify a "version" of your own, by doing something like : - ./configure --with-version-suffix=-latestsvn + ./configure --with-version-suffix=-latestdev Note that the standard configure options --program-prefix, --program-suffix and the others will not affect the shared LyX From 6be1988472f0d63df63c36bfd14e4545f24751f1 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 1 Nov 2012 21:34:37 +0100 Subject: [PATCH 25/93] * sk.po --- po/sk.po | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/po/sk.po b/po/sk.po index 319b6dcdef..42040b68ca 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-10-22 10:58+0200\n" +"POT-Creation-Date: 2012-10-31 08:57+0100\n" "PO-Revision-Date: 2012-10-19 09:05+0200\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" @@ -14405,37 +14405,41 @@ msgstr "Špecifické manuály|Š" msgid "About LyX|X" msgstr "O programe LyX|X" -#: lib/ui/stdmenus.inc:590 -msgid "Braille Manual|B" -msgstr "Braille: Manuál" - #: lib/ui/stdmenus.inc:591 -msgid "Feynman-diagram Manual|F" -msgstr "Feynman-diagram Manuál" +msgid "Braille|B" +msgstr "Braille|B" #: lib/ui/stdmenus.inc:592 -msgid "LilyPond Manual|M" -msgstr "LilyPond príručka" +msgid "Feynman-diagram|F" +msgstr "Feynman-diagram|F" #: lib/ui/stdmenus.inc:593 -msgid "Linguistics Manual|L" -msgstr "Lingvistika: Manuál" +msgid "Knitr|K" +msgstr "Knitr|K" #: lib/ui/stdmenus.inc:594 -msgid "Multilingual Captions Manual|C" -msgstr "Viac-jazykové Popisy: Manuál" +msgid "LilyPond|P" +msgstr "LilyPond|P" + +#: lib/ui/stdmenus.inc:595 +msgid "Linguistics|L" +msgstr "Lingvistika|L" #: lib/ui/stdmenus.inc:596 -msgid "Risk and Safety Statements Manual|R" -msgstr "Rizikové a Poistné Uzávierky Príručka" +msgid "Multilingual Captions|C" +msgstr "Viac-jazykové popisy|J" #: lib/ui/stdmenus.inc:597 -msgid "Sweave Manual|S" -msgstr "Sweave Manuál|S" +msgid "Risk and Safety Statements|R" +msgstr "Rizikové a Poistné Uzávierky|R" -#: lib/ui/stdmenus.inc:597 -msgid "XY-pic Manual|X" -msgstr "XY-pic: Manuál" +#: lib/configure.py:534 +msgid "Sweave|S" +msgstr "Sweave|S" + +#: lib/ui/stdmenus.inc:599 +msgid "XY-pic|X" +msgstr "XY-pic|X" #: lib/ui/stdtoolbars.inc:71 msgid "New document" @@ -18231,10 +18235,6 @@ msgstr "NoWeb" msgid "NoWeb|N" msgstr "NoWeb" -#: lib/configure.py:534 -msgid "Sweave|S" -msgstr "Sweave|S" - #: lib/configure.py:535 msgid "R/S code" msgstr "R/S kód" @@ -26212,6 +26212,24 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" +#~ msgid "Braille Manual|B" +#~ msgstr "Braille: Manuál" + +#~ msgid "LilyPond Manual|M" +#~ msgstr "LilyPond príručka" + +#~ msgid "Linguistics Manual|L" +#~ msgstr "Lingvistika: Manuál" + +#~ msgid "Multilingual Captions Manual|C" +#~ msgstr "Viac-jazykové Popisy: Manuál" + +#~ msgid "Risk and Safety Statements Manual|R" +#~ msgstr "Rizikové a Poistné Uzávierky Príručka" + +#~ msgid "Sweave Manual|S" +#~ msgstr "Sweave Manuál|S" + #~ msgid "View Outline|u" #~ msgstr "Zobraziť prehľad" From 7ede020a0284fe143bb10e18381f24429f4fe00a Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 2 Nov 2012 13:25:04 +0100 Subject: [PATCH 26/93] Cmake build: 1.) Cleanup the use of path-variables 2.) New directory for cmake-scripts which can be called at build-time --- .../cmake/{modules => scripts}/LyXCreateImagesResource.cmake | 0 development/cmake/{modules => scripts}/LyXGetVersion.cmake | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename development/cmake/{modules => scripts}/LyXCreateImagesResource.cmake (100%) rename development/cmake/{modules => scripts}/LyXGetVersion.cmake (100%) diff --git a/development/cmake/modules/LyXCreateImagesResource.cmake b/development/cmake/scripts/LyXCreateImagesResource.cmake similarity index 100% rename from development/cmake/modules/LyXCreateImagesResource.cmake rename to development/cmake/scripts/LyXCreateImagesResource.cmake diff --git a/development/cmake/modules/LyXGetVersion.cmake b/development/cmake/scripts/LyXGetVersion.cmake similarity index 100% rename from development/cmake/modules/LyXGetVersion.cmake rename to development/cmake/scripts/LyXGetVersion.cmake From d91d6e3343a534d24fbc078c395b1f675d731d42 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 2 Nov 2012 13:33:22 +0100 Subject: [PATCH 27/93] Cmake build: Cleanup the use of path-variables --- CMakeLists.txt | 19 +++++++++++-------- development/cmake/LyxPackaging.cmake | 8 ++++---- development/cmake/doc/CMakeLists.txt | 4 ++-- development/cmake/scripts/LyXGetVersion.cmake | 4 ++-- po/CMakeLists.txt | 6 +++--- src/CMakeLists.txt | 13 +++++++------ src/frontends/qt4/CMakeLists.txt | 2 +- src/tex2lyx/CMakeLists.txt | 2 +- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e86b7d8bff..ee59ff77a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,17 +6,20 @@ cmake_minimum_required(VERSION 2.6.4) - set(LYX_PROJECT LyX) enable_testing() -set(LYX_CMAKE_DIR "development/cmake") -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/${LYX_CMAKE_DIR}/modules") - get_filename_component(lyx_dir_readme ${CMAKE_SOURCE_DIR}/README ABSOLUTE) get_filename_component(TOP_SRC_DIR ${lyx_dir_readme} PATH) +set(LYX_CMAKE_DIR "development/cmake") +set(TOP_CMAKE_PATH "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}") +set(TOP_MODULE_PATH "${TOP_CMAKE_PATH}/modules") +set(TOP_SCRIPT_PATH "${TOP_CMAKE_PATH}/scripts") + +set(CMAKE_MODULE_PATH "${TOP_MODULE_PATH}") + set(CMAKE_PROJECT_NAME ${LYX_PROJECT}) message(STATUS) @@ -289,7 +292,7 @@ else() endif() add_custom_target(lyx_version ALL - COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DLYX_CMAKE_DIR=${LYX_CMAKE_DIR} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/modules/LyXGetVersion.cmake + COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_CMAKE_PATH=${TOP_CMAKE_PATH} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SCRIPT_PATH}/LyXGetVersion.cmake ) if(APPLE) @@ -565,8 +568,8 @@ if(LYX_PCH) # PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260 # Not sure if it works for all non-msvc compilers include(PCHSupport_26) - configure_file(${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/pcheaders.h ${TOP_BINARY_DIR}/pcheaders.h) - configure_file(${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/config.cpp.cmake ${TOP_BINARY_DIR}/config_pch.cpp) + configure_file(${TOP_CMAKE_PATH}/pcheaders.h ${TOP_BINARY_DIR}/pcheaders.h) + configure_file(${TOP_CMAKE_PATH}/config.cpp.cmake ${TOP_BINARY_DIR}/config_pch.cpp) add_definitions(-DLYX_ENABLE_PCH) if(MSVC) @@ -736,6 +739,6 @@ if(LYX_NLS) message(STATUS) endif() -include("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyxPackaging.cmake") +include("${TOP_CMAKE_PATH}/LyxPackaging.cmake") message(STATUS) diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake index 43545e2bdd..4f9091bb3d 100644 --- a/development/cmake/LyxPackaging.cmake +++ b/development/cmake/LyxPackaging.cmake @@ -27,7 +27,7 @@ endif() set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}") set(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}") -FILE(STRINGS "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY) +FILE(STRINGS "${TOP_CMAKE_PATH}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY) set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}") @@ -35,7 +35,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}") # # needed by rpm set(CPACK_SET_DESTDIR "ON") -FILE(READ "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE) +FILE(READ "${TOP_CMAKE_PATH}/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE) set(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing") set(CPACK_RPM_PACKAGE_VENDOR "The LyX team") # @@ -51,8 +51,8 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) # # for the next ones, cpack insists on data with values in some file -set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_description.txt") -set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_license.txt") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_CMAKE_PATH}/LyX_description.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${TOP_CMAKE_PATH}/LyX_license.txt") # Use the revision number saved in ${LYX_PACKAGE_RELEASE} # as the release in rpm-package-build. diff --git a/development/cmake/doc/CMakeLists.txt b/development/cmake/doc/CMakeLists.txt index 95e8c89c0c..d3895ddf74 100644 --- a/development/cmake/doc/CMakeLists.txt +++ b/development/cmake/doc/CMakeLists.txt @@ -27,8 +27,8 @@ foreach(_rel_doc ${_rel_lyx_docs}) SET_SOURCE_FILES_PROPERTIES(${_created_doc} GENERATED) add_custom_command( OUTPUT "${_created_doc}" - COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_SRC_DIR}/development/cmake/doc/ReplaceValues.py" "LYX_USERDIR_VER=${LYX_USERDIR_VER}" "LYX_DIR_VER=${LYX_DIR_VER}" "${TOP_SRC_DIR}/lib/doc/${_rel_doc}" > "${_created_doc}" - DEPENDS "${TOP_SRC_DIR}/lib/doc/${_rel_doc}" "${TOP_SRC_DIR}/development/cmake/doc/ReplaceValues.py" + COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_CMAKE_PATH}/doc/ReplaceValues.py" "LYX_USERDIR_VER=${LYX_USERDIR_VER}" "LYX_DIR_VER=${LYX_DIR_VER}" "${TOP_SRC_DIR}/lib/doc/${_rel_doc}" > "${_created_doc}" + DEPENDS "${TOP_SRC_DIR}/lib/doc/${_rel_doc}" "${TOP_CMAKE_PATH}/doc/ReplaceValues.py" ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_rel_doc}" DESTINATION "${LYX_DATA_SUBDIR}doc/${_rel_dir_part}") LIST(APPEND _docs "${_created_doc}") diff --git a/development/cmake/scripts/LyXGetVersion.cmake b/development/cmake/scripts/LyXGetVersion.cmake index 1f6cde7005..d2f5a4b2ce 100644 --- a/development/cmake/scripts/LyXGetVersion.cmake +++ b/development/cmake/scripts/LyXGetVersion.cmake @@ -25,7 +25,7 @@ # # To call this script, one has to provide following parameters # TOP_SRC_DIR -# LYX_CMAKE_DIR +# TOP_CMAKE_PATH # TOP_BINARY_DIR # LYX_DATE: to be used if not under git control @@ -46,7 +46,7 @@ if(LYX_GITVERSION) endif() endif() -configure_file(${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.tmp) +configure_file(${TOP_CMAKE_PATH}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.tmp) EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${TOP_BINARY_DIR}/lyx_date.tmp ${TOP_BINARY_DIR}/lyx_date.h COMMAND ${CMAKE_COMMAND} -E remove ${TOP_BINARY_DIR}/lyx_date.tmp diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index cc386ce9ff..9dd941eae6 100755 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -88,9 +88,9 @@ add_gettext_python(layouttranslations lib/layouts *.layout *.inc *.module) ADD_CUSTOM_COMMAND( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" COMMAND ${LYX_PYTHON_EXECUTABLE} - ARGS "${TOP_SRC_DIR}/development/cmake/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" + ARGS "${TOP_CMAKE_PATH}/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" COMMAND ${LYX_PYTHON_EXECUTABLE} - ARGS "${TOP_SRC_DIR}/development/cmake/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" + ARGS "${TOP_CMAKE_PATH}/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" DEPENDS ${_py_sources} ) @@ -170,7 +170,7 @@ foreach(_pofile ${LYX_BASE_PO_FILES}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied COMMAND ${LYX_PYTHON_EXECUTABLE} - ARGS "${TOP_SRC_DIR}/development/cmake/po/unix2dos.py" "${CMAKE_CURRENT_BINARY_DIR}/${_pofile}" + ARGS "${TOP_CMAKE_PATH}/po/unix2dos.py" "${CMAKE_CURRENT_BINARY_DIR}/${_pofile}" COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile} COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dd93a0ae70..dd9a3609ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,16 +88,17 @@ if (LYX_VLD) endif() if(WIN32) - set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc) + set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc) message(STATUS "Using icon defined in resource file: ${FILE_RC}") endif() lyx_find_info_files(LyXInfoFiles ${TOP_SRC_DIR}/*) -lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.txt) -lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.cmake) -lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.h) -lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.msvc) -lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/modules/*) +lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.txt) +lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.cmake) +lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.h) +lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.msvc) +lyx_find_info_files(LyXCMakeFiles ${TOP_MODULE_PATH}/*) +lyx_find_info_files(LyXCMakeFiles ${TOP_SCRIPT_PATH}/*) lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*) if (APPLE AND LYX_BUNDLE) diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index 44ddaad2c9..dfa969e33d 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -30,7 +30,7 @@ add_custom_command( -DIMAGES_DIR=${TOP_SRC_DIR}/lib/images -DRESOURCE_NAME=${resource_name} -DMAPPED_DIR=${TOP_SRC_DIR}/lib/ - -P ${TOP_SRC_DIR}/development/cmake/modules/LyXCreateImagesResource.cmake + -P ${TOP_SCRIPT_PATH}/LyXCreateImagesResource.cmake ) qt4_add_resources(resource_files ${resource_name}) diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index 2053e30390..8da2bba15d 100644 --- a/src/tex2lyx/CMakeLists.txt +++ b/src/tex2lyx/CMakeLists.txt @@ -33,7 +33,7 @@ include_directories(BEFORE add_definitions(-DTEX2LYX) if(WIN32) - set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc) + set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc) message(STATUS "Using icon defined in resource file: ${FILE_RC}") endif() From f47215c5e7422b52dae43096f8d737b253efa7da Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 3 Nov 2012 19:08:37 +0100 Subject: [PATCH 28/93] * doxy --- src/LyXAction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 49bd65a6ed..7f87d1f79d 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3588,7 +3588,7 @@ void LyXAction::init() /*! * \var lyx::FuncCode lyx::LFUN_LABEL_INSERT_AS_REF - * \li Action: Inserts the label as a cross-reference at the position of the cursor. + * \li Action: Inserts the label (in ToC pane) as a cross-reference at the position of the cursor. * \li Syntax: label-insert-as-reference * \li Origin: vfr, 7 Apr 2009 * \endvar From a31253d64fe9dec736ba912bcf8030b4264ac755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 3 Nov 2012 23:44:35 +0100 Subject: [PATCH 29/93] fr.po porting from branch to help the French translators to update the file for the upcoming LyX 2.1 release --- po/fr.po | 12185 ++++++++++++++++++++++++++--------------------------- 1 file changed, 6088 insertions(+), 6097 deletions(-) diff --git a/po/fr.po b/po/fr.po index 866ac1d0ec..8f9d2adceb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -269,12 +269,14 @@ # de messages ambigus dans les menus a la suite de # la mise a jour des annexes du Guide de l'utilisateur # ------------------------------------------------------------------ +# 4 juin 2012 : mise a jour pour 2.0.4 +# ------------------------------------------------------------------ msgid "" msgstr "" "Project-Id-Version: LyX 1.6.0\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-03-12 11:29+0100\n" -"PO-Revision-Date: 2012-02-15 09:14+0100\n" +"POT-Creation-Date: 2012-10-10 10:26-0400\n" +"PO-Revision-Date: 2012-10-31 17:24+0100\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -295,35 +297,45 @@ msgstr "La version va là" msgid "Credits" msgstr "Crédits" -#: src/frontends/qt4/ui/AboutUi.ui:80 lib/layouts/apa.layout:199 +#: src/frontends/qt4/ui/AboutUi.ui:80 +#: lib/layouts/apa.layout:192 #: lib/layouts/agu_stdtitle.inc:81 msgid "Copyright" msgstr "Copyright" -#: src/frontends/qt4/ui/AboutUi.ui:131 src/frontends/qt4/ui/CompareUi.ui:163 +#: src/frontends/qt4/ui/AboutUi.ui:131 +#: src/frontends/qt4/ui/CompareUi.ui:163 #: src/frontends/qt4/ui/DelimiterUi.ui:286 #: src/frontends/qt4/ui/ErrorListUi.ui:60 #: src/frontends/qt4/ui/ExternalUi.ui:608 #: src/frontends/qt4/ui/IncludeUi.ui:250 -#: src/frontends/qt4/ui/InsetParamsUi.ui:138 src/frontends/qt4/ui/LogUi.ui:87 -#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/frontends/qt4/ui/PrefsUi.ui:90 -#: src/frontends/qt4/ui/RefUi.ui:343 src/frontends/qt4/ui/SearchUi.ui:203 -#: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66 +#: src/frontends/qt4/ui/InsetParamsUi.ui:138 +#: src/frontends/qt4/ui/LogUi.ui:87 +#: src/frontends/qt4/ui/ParagraphUi.ui:260 +#: src/frontends/qt4/ui/PrefsUi.ui:90 +#: src/frontends/qt4/ui/RefUi.ui:343 +#: src/frontends/qt4/ui/SearchUi.ui:203 +#: src/frontends/qt4/ui/ShowFileUi.ui:55 +#: src/frontends/qt4/ui/SymbolsUi.ui:66 #: src/frontends/qt4/ui/TexinfoUi.ui:58 -#: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173 +#: src/frontends/qt4/ui/ThesaurusUi.ui:138 +#: src/frontends/qt4/ui/WrapUi.ui:173 #: src/frontends/qt4/GuiParagraph.cpp:161 msgid "&Close" msgstr "&Fermer" -#: src/frontends/qt4/ui/BibitemUi.ui:31 src/frontends/qt4/ui/BibitemUi.ui:64 +#: src/frontends/qt4/ui/BibitemUi.ui:31 +#: src/frontends/qt4/ui/BibitemUi.ui:64 msgid "The bibliography key" msgstr "La clé bibliographique" -#: src/frontends/qt4/ui/BibitemUi.ui:44 src/frontends/qt4/ui/BibitemUi.ui:51 +#: src/frontends/qt4/ui/BibitemUi.ui:44 +#: src/frontends/qt4/ui/BibitemUi.ui:51 msgid "The label as it appears in the document" msgstr "Le nom de l'étiquette tel qu'elle apparaîtra dans le document" -#: src/frontends/qt4/ui/BibitemUi.ui:54 src/frontends/qt4/ui/LabelUi.ui:36 +#: src/frontends/qt4/ui/BibitemUi.ui:54 +#: src/frontends/qt4/ui/LabelUi.ui:36 #: src/frontends/qt4/ui/RefUi.ui:190 msgid "&Label:" msgstr "É&tiquette :" @@ -345,12 +357,8 @@ msgid "&Default (numerical)" msgstr "Im&plicite (numéroté)" #: src/frontends/qt4/ui/BiblioUi.ui:38 -msgid "" -"Use the natbib styles for natural sciences and arts. Set additional " -"parameters in document class options." -msgstr "" -"Utilise les styles natbib pour les sciences naturelles et les arts. Fixer " -"les paramètres additionnels dans les options de classe du document." +msgid "Use the natbib styles for natural sciences and arts. Set additional parameters in document class options." +msgstr "Utilise les styles natbib pour les sciences naturelles et les arts. Fixer les paramètres additionnels dans les options de classe du document." #: src/frontends/qt4/ui/BiblioUi.ui:41 msgid "&Natbib" @@ -369,78 +377,68 @@ msgid "&Jurabib" msgstr "&Jurabib" #: src/frontends/qt4/ui/BiblioUi.ui:110 -#, fuzzy -msgid "Bibliography Style" -msgstr "Entrée bibliographique" - -#: src/frontends/qt4/ui/BiblioUi.ui:121 -#, fuzzy -msgid "Default st&yle:" -msgstr "Im&primante implicite :" - -#: src/frontends/qt4/ui/BiblioUi.ui:131 -#, fuzzy -msgid "Define the default BibTeX style" -msgstr "Choisir un style BibTeX" - -#: src/frontends/qt4/ui/BiblioUi.ui:140 msgid "Select this if you want to split your bibliography into sections" msgstr "Sélectionner pour diviser votre bibliographie en sections" -#: src/frontends/qt4/ui/BiblioUi.ui:143 +#: src/frontends/qt4/ui/BiblioUi.ui:113 msgid "S&ectioned bibliography" msgstr "Bibliographie en §ions" -#: src/frontends/qt4/ui/BiblioUi.ui:153 -msgid "" -"Here you can define an alternative program to or specific options of BibTeX." -msgstr "" -"Vous pouvez définir ici un autre programme que BibTeX, ou des options " -"spécifiques à BibTeX." +#: src/frontends/qt4/ui/BiblioUi.ui:120 +msgid "Here you can define an alternative program to or specific options of BibTeX." +msgstr "Vous pouvez définir ici un autre programme que BibTeX, ou des options spécifiques à BibTeX." -#: src/frontends/qt4/ui/BiblioUi.ui:156 src/frontends/qt4/ui/PrefLatexUi.ui:73 +#: src/frontends/qt4/ui/BiblioUi.ui:123 +#: src/frontends/qt4/ui/PrefLatexUi.ui:127 msgid "Bibliography generation" msgstr "Construction de la bibliographie" -#: src/frontends/qt4/ui/BiblioUi.ui:167 src/frontends/qt4/ui/IndicesUi.ui:33 -#: src/frontends/qt4/ui/PrefLatexUi.ui:85 +#: src/frontends/qt4/ui/BiblioUi.ui:134 +#: src/frontends/qt4/ui/IndicesUi.ui:33 +#: src/frontends/qt4/ui/PrefLatexUi.ui:139 msgid "&Processor:" msgstr "&Processeur :" -#: src/frontends/qt4/ui/BiblioUi.ui:177 src/frontends/qt4/ui/IndicesUi.ui:43 +#: src/frontends/qt4/ui/BiblioUi.ui:144 +#: src/frontends/qt4/ui/IndicesUi.ui:43 msgid "Select a processor" msgstr "Choisir un processeur" -#: src/frontends/qt4/ui/BiblioUi.ui:201 src/frontends/qt4/ui/IndicesUi.ui:54 -#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/GuiPrefs.cpp:776 +#: src/frontends/qt4/ui/BiblioUi.ui:168 +#: src/frontends/qt4/ui/IndicesUi.ui:54 +#: src/frontends/qt4/ui/PrefLatexUi.ui:152 +#: src/frontends/qt4/GuiPrefs.cpp:774 #: src/frontends/qt4/GuiPrefs.cpp:869 msgid "&Options:" msgstr "O&ptions :" -#: src/frontends/qt4/ui/BiblioUi.ui:211 -msgid "" -"Define options such as --min-crossrefs (see the documentation of BibTeX)" -msgstr "" -"Définir des options telles que --min-crossrefs (voir la documentation de " -"BibTeX)" +#: src/frontends/qt4/ui/BiblioUi.ui:178 +msgid "Define options such as --min-crossrefs (see the documentation of BibTeX)" +msgstr "Définir des options telles que --min-crossrefs (voir la documentation de BibTeX)" #: src/frontends/qt4/ui/BibtexAddUi.ui:21 msgid "LyX: Add BibTeX Database" msgstr "LyX : Ajouter une base de données BibTeX" -#: src/frontends/qt4/ui/BibtexAddUi.ui:36 src/frontends/qt4/ui/BibtexUi.ui:47 +#: src/frontends/qt4/ui/BibtexAddUi.ui:36 +#: src/frontends/qt4/ui/BibtexUi.ui:47 msgid "Scan for new databases and styles" msgstr "Rechercher de nouvelles bases de données et de nouveaux styles" -#: src/frontends/qt4/ui/BibtexAddUi.ui:39 src/frontends/qt4/ui/BibtexUi.ui:50 +#: src/frontends/qt4/ui/BibtexAddUi.ui:39 +#: src/frontends/qt4/ui/BibtexUi.ui:50 #: src/frontends/qt4/ui/TexinfoUi.ui:94 msgid "&Rescan" msgstr "&Rafraîchir" -#: src/frontends/qt4/ui/BibtexAddUi.ui:46 src/frontends/qt4/ui/BibtexUi.ui:97 -#: src/frontends/qt4/ui/CompareUi.ui:50 src/frontends/qt4/ui/ExternalUi.ui:70 -#: src/frontends/qt4/ui/GraphicsUi.ui:58 src/frontends/qt4/ui/IncludeUi.ui:335 -#: src/frontends/qt4/ui/LaTeXUi.ui:160 src/frontends/qt4/ui/PrefInputUi.ui:110 +#: src/frontends/qt4/ui/BibtexAddUi.ui:46 +#: src/frontends/qt4/ui/BibtexUi.ui:97 +#: src/frontends/qt4/ui/CompareUi.ui:50 +#: src/frontends/qt4/ui/ExternalUi.ui:70 +#: src/frontends/qt4/ui/GraphicsUi.ui:58 +#: src/frontends/qt4/ui/IncludeUi.ui:335 +#: src/frontends/qt4/ui/LaTeXUi.ui:160 +#: src/frontends/qt4/ui/PrefInputUi.ui:110 #: src/frontends/qt4/ui/PrintUi.ui:313 msgid "&Browse..." msgstr "&Parcourir..." @@ -451,16 +449,20 @@ msgstr "Saisir le nom de la base de données BibTeX" #: src/frontends/qt4/ui/BibtexAddUi.ui:114 #: src/frontends/qt4/ui/BranchesUi.ui:113 -#: src/frontends/qt4/ui/CitationUi.ui:75 src/frontends/qt4/ui/IndicesUi.ui:134 -#: src/CutAndPaste.cpp:351 +#: src/frontends/qt4/ui/CitationUi.ui:75 +#: src/frontends/qt4/ui/IndicesUi.ui:134 +#: src/CutAndPaste.cpp:349 msgid "&Add" msgstr "A&jouter" #: src/frontends/qt4/ui/BibtexAddUi.ui:127 -#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91 -#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65 -#: src/buffer_funcs.cpp:110 src/frontends/qt4/ButtonController.cpp:239 -#: src/frontends/qt4/GuiApplication.cpp:1501 +#: src/frontends/qt4/ui/BibtexUi.ui:213 +#: src/frontends/qt4/ui/ChangesUi.ui:91 +#: src/frontends/qt4/ui/SendtoUi.ui:92 +#: src/frontends/qt4/ui/ShortcutUi.ui:65 +#: src/buffer_funcs.cpp:110 +#: src/frontends/qt4/ButtonController.cpp:239 +#: src/frontends/qt4/GuiApplication.cpp:1479 #: src/frontends/qt4/GuiCompare.cpp:192 msgid "Cancel" msgstr "Annuler" @@ -473,11 +475,13 @@ msgstr "Le style BibTeX" msgid "St&yle" msgstr "&Style" -#: src/frontends/qt4/ui/BibtexUi.ui:94 src/frontends/qt4/ui/BibtexUi.ui:107 +#: src/frontends/qt4/ui/BibtexUi.ui:94 +#: src/frontends/qt4/ui/BibtexUi.ui:107 msgid "Choose a style file" msgstr "Choisir un fichier de style" -#: src/frontends/qt4/ui/BibtexUi.ui:131 src/frontends/qt4/ui/BibtexUi.ui:144 +#: src/frontends/qt4/ui/BibtexUi.ui:131 +#: src/frontends/qt4/ui/BibtexUi.ui:144 msgid "This bibliography section contains..." msgstr "Cette section de bibliographie contient..." @@ -485,16 +489,19 @@ msgstr "Cette section de bibliographie contient..." msgid "&Content:" msgstr "&Contenu :" -#: src/frontends/qt4/ui/BibtexUi.ui:148 src/insets/InsetBibtex.cpp:217 +#: src/frontends/qt4/ui/BibtexUi.ui:148 +#: src/insets/InsetBibtex.cpp:212 msgid "all cited references" msgstr "toutes les références citées" -#: src/frontends/qt4/ui/BibtexUi.ui:153 src/frontends/qt4/GuiBibtex.cpp:328 -#: src/insets/InsetBibtex.cpp:215 +#: src/frontends/qt4/ui/BibtexUi.ui:153 +#: src/frontends/qt4/GuiBibtex.cpp:328 +#: src/insets/InsetBibtex.cpp:210 msgid "all uncited references" msgstr "toutes les références non citées" -#: src/frontends/qt4/ui/BibtexUi.ui:158 src/insets/InsetBibtex.cpp:213 +#: src/frontends/qt4/ui/BibtexUi.ui:158 +#: src/insets/InsetBibtex.cpp:208 msgid "all references" msgstr "toutes les références" @@ -510,17 +517,22 @@ msgstr "Ajouter la bibliographie à la &TdM" #: src/frontends/qt4/ui/CharacterUi.ui:357 #: src/frontends/qt4/ui/CitationUi.ui:197 #: src/frontends/qt4/ui/CompareHistoryUi.ui:183 -#: src/frontends/qt4/ui/CompareUi.ui:153 src/frontends/qt4/ui/DocumentUi.ui:67 +#: src/frontends/qt4/ui/CompareUi.ui:153 +#: src/frontends/qt4/ui/DocumentUi.ui:67 #: src/frontends/qt4/ui/ExternalUi.ui:588 #: src/frontends/qt4/ui/GraphicsUi.ui:721 -#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:41 +#: src/frontends/qt4/ui/IncludeUi.ui:237 +#: src/frontends/qt4/ui/IndexUi.ui:41 #: src/frontends/qt4/ui/InsetParamsUi.ui:118 #: src/frontends/qt4/ui/ListingsUi.ui:539 -#: src/frontends/qt4/ui/MathMatrixUi.ui:307 src/frontends/qt4/ui/NoteUi.ui:38 +#: src/frontends/qt4/ui/MathMatrixUi.ui:307 +#: src/frontends/qt4/ui/NoteUi.ui:38 #: src/frontends/qt4/ui/ParagraphUi.ui:240 #: src/frontends/qt4/ui/PhantomUi.ui:38 -#: src/frontends/qt4/ui/PrintindexUi.ui:38 src/frontends/qt4/ui/RefUi.ui:317 -#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52 +#: src/frontends/qt4/ui/PrintindexUi.ui:38 +#: src/frontends/qt4/ui/RefUi.ui:317 +#: src/frontends/qt4/ui/SendtoUi.ui:72 +#: src/frontends/qt4/ui/ShortcutUi.ui:52 #: src/frontends/qt4/ui/SymbolsUi.ui:49 #: src/frontends/qt4/ui/TabularCreateUi.ui:65 #: src/frontends/qt4/ui/ToggleWarningUi.ui:90 @@ -532,7 +544,8 @@ msgstr "&OK" msgid "Move the selected database downwards in the list" msgstr "Déplacer la base de données sélectionnée vers le bas de la liste" -#: src/frontends/qt4/ui/BibtexUi.ui:228 src/frontends/qt4/ui/ModulesUi.ui:121 +#: src/frontends/qt4/ui/BibtexUi.ui:228 +#: src/frontends/qt4/ui/ModulesUi.ui:121 msgid "Do&wn" msgstr "Vers le &bas" @@ -540,7 +553,8 @@ msgstr "Vers le &bas" msgid "Move the selected database upwards in the list" msgstr "Déplacer la base de données sélectionnée vers le haut de la liste" -#: src/frontends/qt4/ui/BibtexUi.ui:238 src/frontends/qt4/ui/CitationUi.ui:127 +#: src/frontends/qt4/ui/BibtexUi.ui:238 +#: src/frontends/qt4/ui/CitationUi.ui:127 #: src/frontends/qt4/ui/ModulesUi.ui:114 msgid "&Up" msgstr "Vers le &haut" @@ -565,7 +579,8 @@ msgstr "&Ajouter..." msgid "Remove the selected database" msgstr "Enlever la base de données sélectionnée" -#: src/frontends/qt4/ui/BibtexUi.ui:282 src/frontends/qt4/ui/CitationUi.ui:95 +#: src/frontends/qt4/ui/BibtexUi.ui:282 +#: src/frontends/qt4/ui/CitationUi.ui:95 msgid "&Delete" msgstr "Suppri&mer" @@ -577,64 +592,84 @@ msgstr "Cocher si la boîte doit s'étaler sur plusieurs pages" msgid "Allow &page breaks" msgstr "Sauts de &page possibles" -#: src/frontends/qt4/ui/BoxUi.ui:38 src/frontends/qt4/ui/MathMatrixUi.ui:151 +#: src/frontends/qt4/ui/BoxUi.ui:38 +#: src/frontends/qt4/ui/MathMatrixUi.ui:151 #: src/frontends/qt4/ui/ParagraphUi.ui:153 msgid "Alignment" msgstr "Alignement" -#: src/frontends/qt4/ui/BoxUi.ui:59 src/frontends/qt4/ui/BoxUi.ui:174 +#: src/frontends/qt4/ui/BoxUi.ui:59 +#: src/frontends/qt4/ui/BoxUi.ui:174 msgid "Horizontal alignment of the content inside the box" msgstr "Alignement horizontal du contenu dans la boîte" -#: src/frontends/qt4/ui/BoxUi.ui:63 src/frontends/qt4/ui/ListingsUi.ui:103 -#: src/frontends/qt4/ui/TabularUi.ui:69 src/frontends/qt4/ui/TabularUi.ui:1387 -#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiParagraph.cpp:109 -#: src/frontends/qt4/GuiTabular.cpp:799 +#: src/frontends/qt4/ui/BoxUi.ui:63 +#: src/frontends/qt4/ui/ListingsUi.ui:103 +#: src/frontends/qt4/ui/TabularUi.ui:69 +#: src/frontends/qt4/ui/TabularUi.ui:1387 +#: src/frontends/qt4/ui/WrapUi.ui:209 +#: src/frontends/qt4/GuiParagraph.cpp:109 +#: src/frontends/qt4/GuiTabular.cpp:788 msgid "Left" msgstr "À gauche" -#: src/frontends/qt4/ui/BoxUi.ui:68 src/frontends/qt4/ui/TabularUi.ui:74 -#: src/frontends/qt4/ui/TabularUi.ui:1394 src/frontends/qt4/GuiExternal.cpp:78 -#: src/frontends/qt4/GuiGraphics.cpp:73 src/frontends/qt4/GuiParagraph.cpp:111 -#: src/frontends/qt4/GuiTabular.cpp:800 +#: src/frontends/qt4/ui/BoxUi.ui:68 +#: src/frontends/qt4/ui/TabularUi.ui:74 +#: src/frontends/qt4/ui/TabularUi.ui:1394 +#: src/frontends/qt4/GuiExternal.cpp:77 +#: src/frontends/qt4/GuiGraphics.cpp:72 +#: src/frontends/qt4/GuiParagraph.cpp:111 +#: src/frontends/qt4/GuiTabular.cpp:789 msgid "Center" msgstr "Centré" -#: src/frontends/qt4/ui/BoxUi.ui:73 src/frontends/qt4/ui/ListingsUi.ui:108 -#: src/frontends/qt4/ui/TabularUi.ui:79 src/frontends/qt4/ui/TabularUi.ui:1404 -#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiParagraph.cpp:110 -#: src/frontends/qt4/GuiTabular.cpp:801 +#: src/frontends/qt4/ui/BoxUi.ui:73 +#: src/frontends/qt4/ui/ListingsUi.ui:108 +#: src/frontends/qt4/ui/TabularUi.ui:79 +#: src/frontends/qt4/ui/TabularUi.ui:1404 +#: src/frontends/qt4/ui/WrapUi.ui:214 +#: src/frontends/qt4/GuiParagraph.cpp:110 +#: src/frontends/qt4/GuiTabular.cpp:790 msgid "Right" msgstr "À droite" -#: src/frontends/qt4/ui/BoxUi.ui:78 src/frontends/qt4/ui/BoxUi.ui:111 +#: src/frontends/qt4/ui/BoxUi.ui:78 +#: src/frontends/qt4/ui/BoxUi.ui:111 msgid "Stretch" msgstr "Élongation" -#: src/frontends/qt4/ui/BoxUi.ui:92 src/frontends/qt4/ui/BoxUi.ui:164 +#: src/frontends/qt4/ui/BoxUi.ui:92 +#: src/frontends/qt4/ui/BoxUi.ui:164 msgid "Vertical alignment of the content inside the box" msgstr "Alignement vertical du contenu dans la boîte" -#: src/frontends/qt4/ui/BoxUi.ui:96 src/frontends/qt4/ui/BoxUi.ui:123 +#: src/frontends/qt4/ui/BoxUi.ui:96 +#: src/frontends/qt4/ui/BoxUi.ui:123 #: src/frontends/qt4/ui/MathMatrixUi.ui:167 -#: src/frontends/qt4/ui/TabularUi.ui:210 src/frontends/qt4/ui/TabularUi.ui:371 +#: src/frontends/qt4/ui/TabularUi.ui:210 +#: src/frontends/qt4/ui/TabularUi.ui:371 msgid "Top" msgstr "En haut" -#: src/frontends/qt4/ui/BoxUi.ui:101 src/frontends/qt4/ui/BoxUi.ui:128 +#: src/frontends/qt4/ui/BoxUi.ui:101 +#: src/frontends/qt4/ui/BoxUi.ui:128 #: src/frontends/qt4/ui/MathMatrixUi.ui:172 -#: src/frontends/qt4/ui/TabularUi.ui:215 src/frontends/qt4/ui/TabularUi.ui:376 +#: src/frontends/qt4/ui/TabularUi.ui:215 +#: src/frontends/qt4/ui/TabularUi.ui:376 #: src/frontends/qt4/GuiTabular.cpp:212 msgid "Middle" msgstr "Au milieu" -#: src/frontends/qt4/ui/BoxUi.ui:106 src/frontends/qt4/ui/BoxUi.ui:133 +#: src/frontends/qt4/ui/BoxUi.ui:106 +#: src/frontends/qt4/ui/BoxUi.ui:133 #: src/frontends/qt4/ui/MathMatrixUi.ui:177 -#: src/frontends/qt4/ui/TabularUi.ui:220 src/frontends/qt4/ui/TabularUi.ui:381 +#: src/frontends/qt4/ui/TabularUi.ui:220 +#: src/frontends/qt4/ui/TabularUi.ui:381 msgid "Bottom" msgstr "En bas" -#: src/frontends/qt4/ui/BoxUi.ui:119 src/frontends/qt4/ui/BoxUi.ui:141 +#: src/frontends/qt4/ui/BoxUi.ui:119 +#: src/frontends/qt4/ui/BoxUi.ui:141 msgid "Vertical alignment of the box (with regard to baseline)" msgstr "Alignement vertical de la boîte (par rapport à la ligne)" @@ -654,7 +689,8 @@ msgstr "Vertical" msgid "Horizontal" msgstr "Horizontal" -#: src/frontends/qt4/ui/BoxUi.ui:197 src/frontends/qt4/ui/ExternalUi.ui:446 +#: src/frontends/qt4/ui/BoxUi.ui:197 +#: src/frontends/qt4/ui/ExternalUi.ui:446 #: src/frontends/qt4/ui/PageLayoutUi.ui:70 msgid "&Height:" msgstr "&Hauteur :" @@ -667,9 +703,12 @@ msgstr "Boîte &Intérieure :" msgid "&Decoration:" msgstr "&Décoration :" -#: src/frontends/qt4/ui/BoxUi.ui:242 src/frontends/qt4/ui/ExternalUi.ui:420 -#: src/frontends/qt4/ui/LineUi.ui:58 src/frontends/qt4/ui/PageLayoutUi.ui:99 -#: src/frontends/qt4/ui/TabularUi.ui:153 src/frontends/qt4/ui/WrapUi.ui:85 +#: src/frontends/qt4/ui/BoxUi.ui:242 +#: src/frontends/qt4/ui/ExternalUi.ui:420 +#: src/frontends/qt4/ui/LineUi.ui:58 +#: src/frontends/qt4/ui/PageLayoutUi.ui:99 +#: src/frontends/qt4/ui/TabularUi.ui:153 +#: src/frontends/qt4/ui/WrapUi.ui:85 msgid "&Width:" msgstr "&Largeur :" @@ -677,34 +716,41 @@ msgstr "&Largeur :" msgid "Height value" msgstr "Hauteur" -#: src/frontends/qt4/ui/BoxUi.ui:262 src/frontends/qt4/ui/WrapUi.ui:103 +#: src/frontends/qt4/ui/BoxUi.ui:262 +#: src/frontends/qt4/ui/WrapUi.ui:103 msgid "Width value" msgstr "Largeur" #: src/frontends/qt4/ui/BoxUi.ui:269 msgid "Inner box -- needed for fixed width & line breaks" -msgstr "" -"Boîte intérieure -- nécessaire pour avoir une largeur fixe et des passages à " -"la ligne" +msgstr "Boîte intérieure -- nécessaire pour avoir une largeur fixe et des passages à la ligne" -#: src/frontends/qt4/ui/BoxUi.ui:273 src/frontends/qt4/ui/HSpaceUi.ui:32 +#: src/frontends/qt4/ui/BoxUi.ui:273 +#: src/frontends/qt4/ui/HSpaceUi.ui:32 #: src/frontends/qt4/ui/ListingsUi.ui:98 #: src/frontends/qt4/ui/MathMatrixUi.ui:247 #: src/frontends/qt4/ui/TabularUi.ui:1037 #: src/frontends/qt4/ui/TabularUi.ui:1056 -#: src/frontends/qt4/ui/TabularUi.ui:1104 src/frontends/qt4/GuiBox.cpp:193 -#: src/frontends/qt4/GuiBox.cpp:311 src/frontends/qt4/GuiBox.cpp:388 -#: src/frontends/qt4/GuiDocument.cpp:114 src/frontends/qt4/GuiGraphics.cpp:580 -#: src/frontends/qt4/GuiPrefs.cpp:2138 src/frontends/qt4/GuiPrefs.cpp:2161 +#: src/frontends/qt4/ui/TabularUi.ui:1104 +#: src/frontends/qt4/GuiBox.cpp:193 +#: src/frontends/qt4/GuiBox.cpp:311 +#: src/frontends/qt4/GuiBox.cpp:388 +#: src/frontends/qt4/GuiDocument.cpp:113 +#: src/frontends/qt4/GuiGraphics.cpp:579 +#: src/frontends/qt4/GuiPrefs.cpp:2129 +#: src/frontends/qt4/GuiPrefs.cpp:2152 msgid "None" msgstr "Aucun" -#: src/frontends/qt4/ui/BoxUi.ui:278 src/frontends/qt4/GuiBox.cpp:313 -#: src/frontends/qt4/GuiBox.cpp:391 src/insets/InsetBox.cpp:135 +#: src/frontends/qt4/ui/BoxUi.ui:278 +#: src/frontends/qt4/GuiBox.cpp:313 +#: src/frontends/qt4/GuiBox.cpp:391 +#: src/insets/InsetBox.cpp:135 msgid "Parbox" msgstr "Parbox" -#: src/frontends/qt4/ui/BoxUi.ui:283 src/frontends/qt4/GuiBox.cpp:392 +#: src/frontends/qt4/ui/BoxUi.ui:283 +#: src/frontends/qt4/GuiBox.cpp:392 #: src/insets/InsetBox.cpp:139 msgid "Minipage" msgstr "Minipage" @@ -726,12 +772,8 @@ msgid "&New:[[branch]]" msgstr "&Nouvelle branche :" #: src/frontends/qt4/ui/BranchesUi.ui:35 -msgid "" -"Append the name of this branch to the output filename, given the branch is " -"active." -msgstr "" -"Adjoindre le nom de cette branche au fichier résultat, supposant que la " -"branche soit active." +msgid "Append the name of this branch to the output filename, given the branch is active." +msgstr "Adjoindre le nom de cette branche au fichier résultat, supposant que la branche soit active." #: src/frontends/qt4/ui/BranchesUi.ui:38 msgid "Filename &Suffix" @@ -775,8 +817,9 @@ msgid "Remove the selected branch" msgstr "Enlever la branche sélectionnée" #: src/frontends/qt4/ui/BranchesUi.ui:136 -#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:3957 -#: src/Buffer.cpp:3970 +#: src/frontends/qt4/ui/IndicesUi.ui:165 +#: src/Buffer.cpp:3871 +#: src/Buffer.cpp:3884 msgid "&Remove" msgstr "&Enlever" @@ -807,20 +850,31 @@ msgstr "Ajouter &tout" #: src/frontends/qt4/ui/BranchesUnknownUi.ui:58 #: src/frontends/qt4/ui/CitationUi.ui:220 #: src/frontends/qt4/ui/CompareHistoryUi.ui:205 -#: src/frontends/qt4/ui/DocumentUi.ui:84 src/frontends/qt4/ui/IndexUi.ui:78 +#: src/frontends/qt4/ui/DocumentUi.ui:84 +#: src/frontends/qt4/ui/IndexUi.ui:78 #: src/frontends/qt4/ui/ListingsUi.ui:559 -#: src/frontends/qt4/ui/PrintindexUi.ui:28 src/Buffer.cpp:1162 -#: src/Buffer.cpp:2467 src/Buffer.cpp:3932 src/Buffer.cpp:3995 -#: src/LyXVC.cpp:89 src/LyXVC.cpp:224 src/frontends/qt4/GuiBranches.cpp:216 +#: src/frontends/qt4/ui/PrintindexUi.ui:28 +#: src/Buffer.cpp:1147 +#: src/Buffer.cpp:2395 +#: src/Buffer.cpp:3846 +#: src/Buffer.cpp:3909 +#: src/LyXVC.cpp:89 +#: src/LyXVC.cpp:224 +#: src/frontends/qt4/GuiBranches.cpp:219 #: src/frontends/qt4/GuiClipboard.cpp:242 -#: src/frontends/qt4/GuiDocument.cpp:1936 +#: src/frontends/qt4/GuiDocument.cpp:1839 #: src/frontends/qt4/GuiParagraph.cpp:69 -#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:2146 -#: src/frontends/qt4/GuiView.cpp:2296 src/frontends/qt4/GuiView.cpp:2311 -#: src/frontends/qt4/GuiView.cpp:2386 src/frontends/qt4/GuiView.cpp:2434 -#: src/frontends/qt4/GuiView.cpp:2649 src/frontends/qt4/GuiView.cpp:2656 -#: src/frontends/qt4/GuiView.cpp:2755 src/frontends/qt4/GuiView.cpp:2783 -#: src/frontends/qt4/GuiView.cpp:3400 src/insets/InsetBibtex.cpp:153 +#: src/frontends/qt4/GuiParagraph.cpp:159 +#: src/frontends/qt4/GuiView.cpp:2121 +#: src/frontends/qt4/GuiView.cpp:2272 +#: src/frontends/qt4/GuiView.cpp:2287 +#: src/frontends/qt4/GuiView.cpp:2335 +#: src/frontends/qt4/GuiView.cpp:2550 +#: src/frontends/qt4/GuiView.cpp:2557 +#: src/frontends/qt4/GuiView.cpp:2656 +#: src/frontends/qt4/GuiView.cpp:2684 +#: src/frontends/qt4/GuiView.cpp:3299 +#: src/insets/InsetBibtex.cpp:148 msgid "&Cancel" msgstr "&Annuler" @@ -844,77 +898,106 @@ msgstr "&Taille :" #: src/frontends/qt4/ui/BulletsUi.ui:66 #: src/frontends/qt4/ui/ParagraphUi.ui:115 +#: src/frontends/qt4/ui/PrefLatexUi.ui:52 #: src/frontends/qt4/ui/TabularUi.ui:1042 #: src/frontends/qt4/ui/TabularUi.ui:1061 -#: src/frontends/qt4/ui/TabularUi.ui:1109 lib/ui/stdtoolbars.inc:112 -#: src/Font.cpp:178 src/HSpace.cpp:117 src/frontends/qt4/GuiDocument.cpp:110 -#: src/frontends/qt4/GuiDocument.cpp:128 src/frontends/qt4/GuiDocument.cpp:144 -#: src/frontends/qt4/GuiDocument.cpp:157 src/frontends/qt4/GuiDocument.cpp:764 -#: src/frontends/qt4/GuiDocument.cpp:877 src/frontends/qt4/GuiDocument.cpp:882 -#: src/frontends/qt4/GuiDocument.cpp:923 src/frontends/qt4/GuiDocument.cpp:934 -#: src/frontends/qt4/GuiDocument.cpp:1095 -#: src/frontends/qt4/GuiDocument.cpp:1181 -#: src/frontends/qt4/GuiDocument.cpp:1791 -#: src/frontends/qt4/GuiDocument.cpp:1814 -#: src/frontends/qt4/GuiDocument.cpp:1815 -#: src/frontends/qt4/GuiDocument.cpp:1816 -#: src/frontends/qt4/GuiDocument.cpp:1891 -#: src/frontends/qt4/GuiDocument.cpp:2321 -#: src/frontends/qt4/GuiDocument.cpp:3390 src/frontends/qt4/GuiExternal.cpp:76 -#: src/frontends/qt4/GuiGraphics.cpp:71 src/frontends/qt4/GuiIndices.cpp:57 -#: src/frontends/qt4/GuiListings.cpp:152 src/frontends/qt4/GuiListings.cpp:159 -#: src/frontends/qt4/GuiPrefs.cpp:2291 src/frontends/qt4/GuiPrefs.cpp:2546 +#: src/frontends/qt4/ui/TabularUi.ui:1109 +#: lib/ui/stdtoolbars.inc:112 +#: src/Font.cpp:178 +#: src/HSpace.cpp:117 +#: src/frontends/qt4/GuiDocument.cpp:109 +#: src/frontends/qt4/GuiDocument.cpp:127 +#: src/frontends/qt4/GuiDocument.cpp:143 +#: src/frontends/qt4/GuiDocument.cpp:156 +#: src/frontends/qt4/GuiDocument.cpp:685 +#: src/frontends/qt4/GuiDocument.cpp:796 +#: src/frontends/qt4/GuiDocument.cpp:801 +#: src/frontends/qt4/GuiDocument.cpp:842 +#: src/frontends/qt4/GuiDocument.cpp:853 +#: src/frontends/qt4/GuiDocument.cpp:1014 +#: src/frontends/qt4/GuiDocument.cpp:1092 +#: src/frontends/qt4/GuiDocument.cpp:1694 +#: src/frontends/qt4/GuiDocument.cpp:1717 +#: src/frontends/qt4/GuiDocument.cpp:1718 +#: src/frontends/qt4/GuiDocument.cpp:1719 +#: src/frontends/qt4/GuiDocument.cpp:1794 +#: src/frontends/qt4/GuiDocument.cpp:2158 +#: src/frontends/qt4/GuiDocument.cpp:3234 +#: src/frontends/qt4/GuiExternal.cpp:75 +#: src/frontends/qt4/GuiGraphics.cpp:70 +#: src/frontends/qt4/GuiIndices.cpp:57 +#: src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/GuiListings.cpp:159 +#: src/frontends/qt4/GuiPrefs.cpp:2277 +#: src/frontends/qt4/GuiPrefs.cpp:2533 #: src/frontends/qt4/GuiPrintNomencl.cpp:47 -#: src/frontends/qt4/GuiViewSource.cpp:198 +#: src/frontends/qt4/GuiViewSource.cpp:197 msgid "Default" msgstr "Implicite" -#: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:56 src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/ui/BulletsUi.ui:71 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:56 +#: src/frontends/qt4/GuiListings.cpp:152 msgid "Tiny" msgstr "Minuscule" -#: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:57 src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/ui/BulletsUi.ui:76 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:57 +#: src/frontends/qt4/GuiListings.cpp:152 msgid "Smallest" msgstr "Tout petit" -#: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:58 src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/ui/BulletsUi.ui:81 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:58 +#: src/frontends/qt4/GuiListings.cpp:152 msgid "Smaller" msgstr "Très petit" -#: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:59 src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/ui/BulletsUi.ui:86 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:59 +#: src/frontends/qt4/GuiListings.cpp:152 msgid "Small" msgstr "Petit" -#: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:60 src/frontends/qt4/GuiListings.cpp:152 +#: src/frontends/qt4/ui/BulletsUi.ui:91 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:60 +#: src/frontends/qt4/GuiListings.cpp:152 msgid "Normal" msgstr "Normal" -#: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:71 -#: src/frontends/qt4/GuiCharacter.cpp:61 src/frontends/qt4/GuiListings.cpp:153 +#: src/frontends/qt4/ui/BulletsUi.ui:96 +#: src/Font.cpp:71 +#: src/frontends/qt4/GuiCharacter.cpp:61 +#: src/frontends/qt4/GuiListings.cpp:153 msgid "Large" msgstr "Grand" -#: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:72 -#: src/frontends/qt4/GuiCharacter.cpp:62 src/frontends/qt4/GuiListings.cpp:153 +#: src/frontends/qt4/ui/BulletsUi.ui:101 +#: src/Font.cpp:72 +#: src/frontends/qt4/GuiCharacter.cpp:62 +#: src/frontends/qt4/GuiListings.cpp:153 msgid "Larger" msgstr "Très grand" -#: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:72 +#: src/frontends/qt4/ui/BulletsUi.ui:106 +#: src/Font.cpp:72 #: src/frontends/qt4/GuiCharacter.cpp:63 msgid "Largest" msgstr "Très très grand" -#: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:72 +#: src/frontends/qt4/ui/BulletsUi.ui:111 +#: src/Font.cpp:72 #: src/frontends/qt4/GuiCharacter.cpp:64 msgid "Huge" msgstr "Énorme" -#: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:72 +#: src/frontends/qt4/ui/BulletsUi.ui:116 +#: src/Font.cpp:72 #: src/frontends/qt4/GuiCharacter.cpp:65 msgid "Huger" msgstr "Très énorme" @@ -989,9 +1072,12 @@ msgstr "Série de police" #: src/frontends/qt4/ui/CharacterUi.ui:108 #: src/frontends/qt4/ui/CharacterUi.ui:145 -#: src/frontends/qt4/ui/ListingsUi.ui:339 lib/layouts/europecv.layout:119 -#: lib/layouts/moderncv.layout:116 src/frontends/qt4/GuiDocument.cpp:1419 -#: src/frontends/qt4/GuiPrefs.cpp:2241 src/frontends/qt4/Menus.cpp:849 +#: src/frontends/qt4/ui/ListingsUi.ui:339 +#: lib/layouts/europecv.layout:119 +#: lib/layouts/moderncv.layout:116 +#: src/frontends/qt4/GuiDocument.cpp:1313 +#: src/frontends/qt4/GuiPrefs.cpp:2232 +#: src/frontends/qt4/Menus.cpp:853 msgid "Language" msgstr "Langue" @@ -1001,7 +1087,7 @@ msgid "Font color" msgstr "Couleur de police" #: src/frontends/qt4/ui/CharacterUi.ui:148 -#: src/frontends/qt4/ui/LanguageUi.ui:20 +#: src/frontends/qt4/ui/LanguageUi.ui:19 #: src/frontends/qt4/ui/SpellcheckerUi.ui:27 #: src/frontends/qt4/ui/ThesaurusUi.ui:22 msgid "&Language:" @@ -1059,18 +1145,23 @@ msgstr "Appliquer les changements &immédiatement" #: src/frontends/qt4/ui/GraphicsUi.ui:742 #: src/frontends/qt4/ui/InsetParamsUi.ui:128 #: src/frontends/qt4/ui/ListingsUi.ui:549 -#: src/frontends/qt4/ui/ParagraphUi.ui:250 src/frontends/qt4/ui/PrefsUi.ui:80 -#: src/frontends/qt4/ui/RefUi.ui:330 src/frontends/qt4/ui/SendtoUi.ui:85 -#: src/frontends/qt4/ui/SymbolsUi.ui:59 src/frontends/qt4/ui/WrapUi.ui:163 -#: src/frontends/qt4/GuiDocument.cpp:2012 -#: src/frontends/qt4/GuiDocument.cpp:3333 +#: src/frontends/qt4/ui/ParagraphUi.ui:250 +#: src/frontends/qt4/ui/PrefsUi.ui:80 +#: src/frontends/qt4/ui/RefUi.ui:330 +#: src/frontends/qt4/ui/SendtoUi.ui:85 +#: src/frontends/qt4/ui/SymbolsUi.ui:59 +#: src/frontends/qt4/ui/WrapUi.ui:163 +#: src/frontends/qt4/GuiDocument.cpp:1915 +#: src/frontends/qt4/GuiDocument.cpp:3177 msgid "&Apply" msgstr "&Appliquer" #: src/frontends/qt4/ui/CharacterUi.ui:377 #: src/frontends/qt4/ui/GraphicsUi.ui:763 -#: src/frontends/qt4/ui/MathMatrixUi.ui:314 src/frontends/qt4/ui/NoteUi.ui:28 -#: src/frontends/qt4/ui/PhantomUi.ui:28 src/frontends/qt4/ui/PrintUi.ui:243 +#: src/frontends/qt4/ui/MathMatrixUi.ui:314 +#: src/frontends/qt4/ui/NoteUi.ui:28 +#: src/frontends/qt4/ui/PhantomUi.ui:28 +#: src/frontends/qt4/ui/PrintUi.ui:243 #: src/frontends/qt4/ui/TabularCreateUi.ui:72 #: src/frontends/qt4/ButtonController.cpp:241 #: src/frontends/qt4/GuiCompare.cpp:190 @@ -1087,15 +1178,11 @@ msgstr "Citations &sélectionnées :" #: src/frontends/qt4/ui/CitationUi.ui:72 msgid "Click or press Enter to add the selected citation to the list" -msgstr "" -"Cliquer ou presser sur Entrée pour ajouter les citations sélectionnées à la " -"liste" +msgstr "Cliquer ou presser sur Entrée pour ajouter les citations sélectionnées à la liste" #: src/frontends/qt4/ui/CitationUi.ui:92 msgid "Click or press Delete to delete the selected citation from the list" -msgstr "" -"Cliquer ou appuyer sur Suppression pour enlever la citation sélectionnée de " -"la liste" +msgstr "Cliquer ou appuyer sur Suppression pour enlever la citation sélectionnée de la liste" #: src/frontends/qt4/ui/CitationUi.ui:124 msgid "Move the selected citation up (Ctrl-Up)" @@ -1113,7 +1200,8 @@ msgstr "Vers le &bas" #: src/frontends/qt4/ui/DocumentUi.ui:44 #: src/frontends/qt4/ui/GraphicsUi.ui:692 #: src/frontends/qt4/ui/InsetParamsUi.ui:82 -#: src/frontends/qt4/ui/ParagraphUi.ui:217 src/frontends/qt4/ui/PrefsUi.ui:44 +#: src/frontends/qt4/ui/ParagraphUi.ui:217 +#: src/frontends/qt4/ui/PrefsUi.ui:44 #: src/frontends/qt4/ui/WrapUi.ui:121 msgid "&Restore" msgstr "&Restaurer" @@ -1122,100 +1210,97 @@ msgstr "&Restaurer" msgid "App&ly" msgstr "&Appliquer" -#: src/frontends/qt4/ui/CitationUi.ui:248 +#: src/frontends/qt4/ui/CitationUi.ui:242 msgid "Formatting" msgstr "Mise en page" -#: src/frontends/qt4/ui/CitationUi.ui:257 +#: src/frontends/qt4/ui/CitationUi.ui:251 msgid "Citation st&yle:" msgstr "&Style de citation :" -#: src/frontends/qt4/ui/CitationUi.ui:267 +#: src/frontends/qt4/ui/CitationUi.ui:261 msgid "Natbib citation style to use" msgstr "Style de citation Natbib" -#: src/frontends/qt4/ui/CitationUi.ui:274 +#: src/frontends/qt4/ui/CitationUi.ui:268 msgid "Text &before:" msgstr "Texte a&vant :" -#: src/frontends/qt4/ui/CitationUi.ui:284 +#: src/frontends/qt4/ui/CitationUi.ui:278 msgid "Text to place before citation" msgstr "Texte à ajouter avant la citation" -#: src/frontends/qt4/ui/CitationUi.ui:291 +#: src/frontends/qt4/ui/CitationUi.ui:285 msgid "Text a&fter:" msgstr "Texte a&près :" -#: src/frontends/qt4/ui/CitationUi.ui:301 +#: src/frontends/qt4/ui/CitationUi.ui:295 msgid "Text to place after citation" msgstr "Texte à ajouter après la citation" -#: src/frontends/qt4/ui/CitationUi.ui:329 +#: src/frontends/qt4/ui/CitationUi.ui:323 msgid "List all authors" msgstr "Donne la liste de tous les auteurs" -#: src/frontends/qt4/ui/CitationUi.ui:332 +#: src/frontends/qt4/ui/CitationUi.ui:326 msgid "Full aut&hor list" msgstr "&Liste complète des auteurs" -#: src/frontends/qt4/ui/CitationUi.ui:339 +#: src/frontends/qt4/ui/CitationUi.ui:333 msgid "Force upper case in citation" msgstr "Force les majuscules dans la citation" -#: src/frontends/qt4/ui/CitationUi.ui:342 +#: src/frontends/qt4/ui/CitationUi.ui:336 msgid "Force u&pper case" msgstr "Forcer les &majuscules" -#: src/frontends/qt4/ui/CitationUi.ui:354 +#: src/frontends/qt4/ui/CitationUi.ui:348 msgid "Search Citation" msgstr "Recherche citation" -#: src/frontends/qt4/ui/CitationUi.ui:369 +#: src/frontends/qt4/ui/CitationUi.ui:363 msgid "Searc&h:" msgstr "Rec&hercher :" -#: src/frontends/qt4/ui/CitationUi.ui:382 -msgid "" -"Enter the text to search for and press Enter or click the button to search" -msgstr "" -"Saisir le texte à rechercher et appuyer sur Entrée ou cliquer sur le bouton " -"pour démarrer la recherche" +#: src/frontends/qt4/ui/CitationUi.ui:376 +msgid "Enter the text to search for and press Enter or click the button to search" +msgstr "Saisir le texte à rechercher et appuyer sur Entrée ou cliquer sur le bouton pour démarrer la recherche" -#: src/frontends/qt4/ui/CitationUi.ui:395 +#: src/frontends/qt4/ui/CitationUi.ui:389 msgid "Click or press Enter in the search box to search" msgstr "Cliquer ou appuyer sur Entrée pour démarrer la recherche" -#: src/frontends/qt4/ui/CitationUi.ui:398 +#: src/frontends/qt4/ui/CitationUi.ui:392 msgid "&Search" msgstr "&Rechercher" -#: src/frontends/qt4/ui/CitationUi.ui:408 +#: src/frontends/qt4/ui/CitationUi.ui:402 msgid "Search field:" msgstr "Champ de recherche :" -#: src/frontends/qt4/ui/CitationUi.ui:428 -#: src/frontends/qt4/GuiCitation.cpp:285 +#: src/frontends/qt4/ui/CitationUi.ui:422 +#: src/frontends/qt4/GuiCitation.cpp:323 msgid "All fields" msgstr "Tous les champs" -#: src/frontends/qt4/ui/CitationUi.ui:449 +#: src/frontends/qt4/ui/CitationUi.ui:443 msgid "Regular e&xpression" msgstr "E&xpression régulière" -#: src/frontends/qt4/ui/CitationUi.ui:456 +#: src/frontends/qt4/ui/CitationUi.ui:450 msgid "Case se&nsitive" msgstr "Selon la &casse" -#: src/frontends/qt4/ui/CitationUi.ui:463 +#: src/frontends/qt4/ui/CitationUi.ui:457 msgid "Entry types:" msgstr "Types d'entrée :" -#: src/frontends/qt4/ui/CitationUi.ui:480 -#: src/frontends/qt4/GuiCitation.cpp:300 +#: src/frontends/qt4/ui/CitationUi.ui:474 +#: src/frontends/qt4/GuiCitation.cpp:338 msgid "All entry types" msgstr "Toutes les entrées" -#: src/frontends/qt4/ui/CitationUi.ui:501 +#: src/frontends/qt4/ui/CitationUi.ui:495 msgid "Search as you &type" msgstr "Chercher à la &volée" @@ -1227,22 +1312,29 @@ msgstr "Couleurs de police" msgid "Main text:" msgstr "Texte principal :" -#: src/frontends/qt4/ui/ColorUi.ui:54 src/frontends/qt4/ui/ColorUi.ui:115 -#: src/frontends/qt4/ui/ColorUi.ui:192 src/frontends/qt4/ui/ColorUi.ui:253 +#: src/frontends/qt4/ui/ColorUi.ui:54 +#: src/frontends/qt4/ui/ColorUi.ui:115 +#: src/frontends/qt4/ui/ColorUi.ui:192 +#: src/frontends/qt4/ui/ColorUi.ui:253 msgid "Click to change the color" msgstr "Cliquer pour changer la couleur" -#: src/frontends/qt4/ui/ColorUi.ui:57 src/frontends/qt4/ui/ColorUi.ui:195 +#: src/frontends/qt4/ui/ColorUi.ui:57 +#: src/frontends/qt4/ui/ColorUi.ui:195 msgid "Default..." msgstr "Implicite..." -#: src/frontends/qt4/ui/ColorUi.ui:70 src/frontends/qt4/ui/ColorUi.ui:131 -#: src/frontends/qt4/ui/ColorUi.ui:208 src/frontends/qt4/ui/ColorUi.ui:269 +#: src/frontends/qt4/ui/ColorUi.ui:70 +#: src/frontends/qt4/ui/ColorUi.ui:131 +#: src/frontends/qt4/ui/ColorUi.ui:208 +#: src/frontends/qt4/ui/ColorUi.ui:269 msgid "Revert the color to the default" msgstr "Revenir à la couleur implicite" -#: src/frontends/qt4/ui/ColorUi.ui:73 src/frontends/qt4/ui/ColorUi.ui:134 -#: src/frontends/qt4/ui/ColorUi.ui:211 src/frontends/qt4/ui/ColorUi.ui:272 +#: src/frontends/qt4/ui/ColorUi.ui:73 +#: src/frontends/qt4/ui/ColorUi.ui:134 +#: src/frontends/qt4/ui/ColorUi.ui:211 +#: src/frontends/qt4/ui/ColorUi.ui:272 msgid "R&eset" msgstr "Rà&Z" @@ -1250,9 +1342,10 @@ msgstr "Rà&Z" msgid "Greyed-out notes:" msgstr "Notes grisées :" -#: src/frontends/qt4/ui/ColorUi.ui:118 src/frontends/qt4/ui/ColorUi.ui:256 -#: src/frontends/qt4/GuiDocument.cpp:1648 -#: src/frontends/qt4/GuiDocument.cpp:1678 +#: src/frontends/qt4/ui/ColorUi.ui:118 +#: src/frontends/qt4/ui/ColorUi.ui:256 +#: src/frontends/qt4/GuiDocument.cpp:1542 +#: src/frontends/qt4/GuiDocument.cpp:1572 msgid "&Change..." msgstr "&Modifier..." @@ -1296,7 +1389,8 @@ msgstr "&Nouveau document :" msgid "&Old Document:" msgstr "&Ancien document :" -#: src/frontends/qt4/ui/CompareUi.ui:83 src/frontends/qt4/ui/PrefUi.ui:38 +#: src/frontends/qt4/ui/CompareUi.ui:83 +#: src/frontends/qt4/ui/PrefUi.ui:38 msgid "Bro&wse..." msgstr "&Parcourir..." @@ -1313,12 +1407,8 @@ msgid "Ol&d Document" msgstr "&Ancien document" #: src/frontends/qt4/ui/CompareUi.ui:178 -msgid "" -"Turns on the change tracking and showing changes in LaTeX output for the " -"resulting document" -msgstr "" -"Activer le suivi de modification et montre les modifications du résultat " -"imprimable LaTeX pour le document" +msgid "Turns on the change tracking and showing changes in LaTeX output for the resulting document" +msgstr "Activer le suivi de modification et montre les modifications du résultat imprimable LaTeX pour le document" #: src/frontends/qt4/ui/CompareUi.ui:181 msgid "Enable &change tracking features in the output" @@ -1366,7 +1456,8 @@ msgstr "Enregistrer les réglages comme valeurs implicites de LyX" msgid "Save as Document Defaults" msgstr "Enregistrer comme valeurs implicites" -#: src/frontends/qt4/ui/ERTUi.ui:28 src/frontends/qt4/GuiPrefs.cpp:1229 +#: src/frontends/qt4/ui/ERTUi.ui:28 +#: src/frontends/qt4/GuiPrefs.cpp:1231 msgid "Display" msgstr "Affichage écran" @@ -1410,19 +1501,24 @@ msgstr "Visionner le fichier &journal complet..." msgid "F&ile" msgstr "F&ichier" -#: src/frontends/qt4/ui/ExternalUi.ui:47 src/frontends/qt4/ui/ExternalUi.ui:54 -#: lib/layouts/agu_stdclass.inc:78 lib/layouts/agu_stdclass.inc:80 -#: lib/layouts/db_stdcharstyles.inc:6 lib/layouts/db_stdcharstyles.inc:8 +#: src/frontends/qt4/ui/ExternalUi.ui:47 +#: src/frontends/qt4/ui/ExternalUi.ui:54 +#: lib/layouts/agu_stdclass.inc:78 +#: lib/layouts/agu_stdclass.inc:80 +#: lib/layouts/db_stdcharstyles.inc:6 +#: lib/layouts/db_stdcharstyles.inc:8 msgid "Filename" msgstr "Nom du fichier" #: src/frontends/qt4/ui/ExternalUi.ui:57 #: src/frontends/qt4/ui/GraphicsUi.ui:266 -#: src/frontends/qt4/ui/IncludeUi.ui:265 src/frontends/qt4/ui/PrintUi.ui:293 +#: src/frontends/qt4/ui/IncludeUi.ui:265 +#: src/frontends/qt4/ui/PrintUi.ui:293 msgid "&File:" msgstr "&Fichier :" -#: src/frontends/qt4/ui/ExternalUi.ui:67 src/frontends/qt4/ui/IncludeUi.ui:332 +#: src/frontends/qt4/ui/ExternalUi.ui:67 +#: src/frontends/qt4/ui/IncludeUi.ui:332 msgid "Select a file" msgstr "Choisir un fichier" @@ -1456,12 +1552,8 @@ msgid "Forma&t:" msgstr "Forma&t :" #: src/frontends/qt4/ui/ExternalUi.ui:191 -msgid "" -"Enable LyX to preview this material; only if graphics previewing is not " -"disabled at application level (see Preference dialog)." -msgstr "" -"Autoriser l'affichage de ce graphique dans la fenêtre LyX, seulement si cet " -"affichage n'est pas inhibé au niveau applicatif (voir les Préférences)." +msgid "Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog)." +msgstr "Autoriser l'affichage de ce graphique dans la fenêtre LyX, seulement si cet affichage n'est pas inhibé au niveau applicatif (voir les Préférences)." #: src/frontends/qt4/ui/ExternalUi.ui:194 msgid "&Show in LyX" @@ -1583,7 +1675,8 @@ msgid "Sear&ch" msgstr "&Rechercher" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:26 -#: src/frontends/qt4/ui/LogUi.ui:28 src/frontends/qt4/ui/SearchUi.ui:28 +#: src/frontends/qt4/ui/LogUi.ui:28 +#: src/frontends/qt4/ui/SearchUi.ui:28 msgid "&Find:" msgstr "Rec&hercher :" @@ -1660,12 +1753,8 @@ msgid "Current &document" msgstr "&Document courant" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:215 -msgid "" -"Current document and all related documents belonging to the same master " -"document" -msgstr "" -"Document courant et tous les autres fichiers dépendant du même document " -"maître" +msgid "Current document and all related documents belonging to the same master document" +msgstr "Document courant et tous les autres fichiers dépendant du même document maître" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:218 msgid "&Master document" @@ -1684,24 +1773,16 @@ msgid "All ma&nuals" msgstr "Tous les man&uels" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:254 -msgid "" -"If unchecked, the search will be limited to occurrences of the selected text " -"and paragraph style" -msgstr "" -"Case non cochée, la recherche sera limitée aux occurrences du texte " -"sélectionné et du style de paragraphe" +msgid "If unchecked, the search will be limited to occurrences of the selected text and paragraph style" +msgstr "Case non cochée, la recherche sera limitée aux occurrences du texte sélectionné et du style de paragraphe" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:257 msgid "Ignore &format" msgstr "Ignorer le &format" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:267 -msgid "" -"Keep the case of the replacement's first letter as in each matching text " -"first letter" -msgstr "" -"Conserver la casse de la première lettre du remplacement telle quelle dans " -"chaque chaîne correspondante" +msgid "Keep the case of the replacement's first letter as in each matching text first letter" +msgstr "Conserver la casse de la première lettre du remplacement telle quelle dans chaque chaîne correspondante" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:270 msgid "&Preserve first case on replace" @@ -1712,7 +1793,8 @@ msgid "&Expand macros" msgstr "&Déployer les macros" #: src/frontends/qt4/ui/FloatPlacementUi.ui:13 -#: src/frontends/qt4/ui/OutputUi.ui:14 src/frontends/qt4/ui/PDFSupportUi.ui:13 +#: src/frontends/qt4/ui/OutputUi.ui:13 +#: src/frontends/qt4/ui/PDFSupportUi.ui:13 msgid "Form" msgstr "Placement" @@ -1765,13 +1847,8 @@ msgid "FontUi" msgstr "FontUi" #: src/frontends/qt4/ui/FontUi.ui:19 -#, fuzzy -msgid "" -"Use OpenType and TrueType fonts with the fontspec package (requires XeTeX or " -"LuaTeX)" -msgstr "" -"Utiliser directement les polices OpenType et TrueType (utilisation de XeTeX " -"ou LuaTeX indispensable)" +msgid "Use OpenType and TrueType fonts with the fontspec package (requires XeTeX or LuaTeX)" +msgstr "Utiliser les polices OpenType et TrueType via le paquetage fontspec (utilisation de XeTeX ou LuaTeX indispensable)" #: src/frontends/qt4/ui/FontUi.ui:22 msgid "&Use non-TeX fonts (via XeTeX/LuaTeX)" @@ -1793,7 +1870,8 @@ msgstr "Taille de &base :" msgid "LaTe&X font encoding:" msgstr "Encodage de police LaTe&X :" -#: src/frontends/qt4/ui/FontUi.ui:89 src/frontends/qt4/ui/PrefLatexUi.ui:34 +#: src/frontends/qt4/ui/FontUi.ui:89 +#: src/frontends/qt4/ui/PrefLatexUi.ui:34 msgid "Specify the font encoding (e.g., T1)." msgstr "Spécifier l'encodage de police (e.g. T1)." @@ -1819,9 +1897,7 @@ msgstr "Réduc&tion (%) :" #: src/frontends/qt4/ui/FontUi.ui:140 msgid "Scale the Sans Serif font to match the base font's dimensions" -msgstr "" -"Mettre à l'échelle la police sans empattements pour l'apparier aux " -"dimensions de base de la police" +msgstr "Mettre à l'échelle la police sans empattements pour l'apparier aux dimensions de base de la police" #: src/frontends/qt4/ui/FontUi.ui:153 msgid "&Typewriter:" @@ -1837,9 +1913,7 @@ msgstr "Réd&uction (%) :" #: src/frontends/qt4/ui/FontUi.ui:180 msgid "Scale the Typewriter font to match the base font's dimensions" -msgstr "" -"Mettre à l'échelle la police à chasse fixe pour l'apparier aux dimensions de " -"base de la police" +msgstr "Mettre à l'échelle la police à chasse fixe pour l'apparier aux dimensions de base de la police" #: src/frontends/qt4/ui/FontUi.ui:193 msgid "C&JK:" @@ -1847,9 +1921,7 @@ msgstr "C&JK:" #: src/frontends/qt4/ui/FontUi.ui:203 msgid "Input the font to be used for Chinese, Japanese or Korean (CJK) script" -msgstr "" -"Saisir la police à utiliser pour l'écriture en Chinois, japonais ou Coréen " -"(CJK)" +msgstr "Saisir la police à utiliser pour l'écriture en Chinois, japonais ou Coréen (CJK)" #: src/frontends/qt4/ui/FontUi.ui:210 msgid "Use a real small caps shape, if the font provides one" @@ -1901,9 +1973,7 @@ msgstr "&Largeur :" #: src/frontends/qt4/ui/GraphicsUi.ui:174 msgid "Scale image to maximum size not exceeding width and height" -msgstr "" -"Dilater l'image à la taille maximum sans dépasser la largeur et la hauteur " -"spécifiées" +msgstr "Dilater l'image à la taille maximum sans dépasser la largeur et la hauteur spécifiées" #: src/frontends/qt4/ui/GraphicsUi.ui:187 msgid "Rotate Graphics" @@ -1962,12 +2032,8 @@ msgid "LaTeX &options:" msgstr "Options LaTe&X :" #: src/frontends/qt4/ui/GraphicsUi.ui:527 -msgid "" -"Enable LyX to preview this graphics, only if graphics previewing is not " -"disabled at application level (see Preference dialog)." -msgstr "" -"Autoriser l'affichage de ce graphique dans la fenêtre LyX, seulement si cet " -"affichage n'est pas inhibé au niveau applicatif (voir les Préférences)." +msgid "Enable LyX to preview this graphics, only if graphics previewing is not disabled at application level (see Preference dialog)." +msgstr "Autoriser l'affichage de ce graphique dans la fenêtre LyX, seulement si cet affichage n'est pas inhibé au niveau applicatif (voir les Préférences)." #: src/frontends/qt4/ui/GraphicsUi.ui:530 msgid "Sho&w in LyX" @@ -1975,8 +2041,7 @@ msgstr "Afficher dans &LyX" #: src/frontends/qt4/ui/GraphicsUi.ui:595 msgid "Assign the graphic to a group of graphics that share the same settings" -msgstr "" -"Associer le graphique à un groupe de graphiques partageant les mêmes réglages" +msgstr "Associer le graphique à un groupe de graphiques partageant les mêmes réglages" #: src/frontends/qt4/ui/GraphicsUi.ui:598 msgid "Graphics Group" @@ -2034,19 +2099,23 @@ msgstr "\\-----v-----/" msgid "/-----^-----\\" msgstr "/-----^-----\\" -#: src/frontends/qt4/ui/HSpaceUi.ui:70 src/frontends/qt4/ui/VSpaceUi.ui:22 +#: src/frontends/qt4/ui/HSpaceUi.ui:70 +#: src/frontends/qt4/ui/VSpaceUi.ui:22 msgid "&Spacing:" msgstr "&Interligne :" -#: src/frontends/qt4/ui/HSpaceUi.ui:80 src/frontends/qt4/ui/VSpaceUi.ui:78 +#: src/frontends/qt4/ui/HSpaceUi.ui:80 +#: src/frontends/qt4/ui/VSpaceUi.ui:78 msgid "Supported spacing types" msgstr "Types d'espacement supportés" -#: src/frontends/qt4/ui/HSpaceUi.ui:87 src/frontends/qt4/ui/VSpaceUi.ui:68 +#: src/frontends/qt4/ui/HSpaceUi.ui:87 +#: src/frontends/qt4/ui/VSpaceUi.ui:68 msgid "&Value:" msgstr "&Valeur :" -#: src/frontends/qt4/ui/HSpaceUi.ui:100 src/frontends/qt4/ui/VSpaceUi.ui:61 +#: src/frontends/qt4/ui/HSpaceUi.ui:100 +#: src/frontends/qt4/ui/VSpaceUi.ui:61 msgid "Custom value. Needs spacing type \"Custom\"." msgstr "Valeur réglable. Nécessite un espacement de type « réglable »." @@ -2054,18 +2123,24 @@ msgstr "Valeur réglable. Nécessite un espacement de type « réglable »." msgid "&Fill Pattern:" msgstr "&Modèle de remplissage :" -#: src/frontends/qt4/ui/HSpaceUi.ui:123 src/frontends/qt4/ui/VSpaceUi.ui:45 +#: src/frontends/qt4/ui/HSpaceUi.ui:123 +#: src/frontends/qt4/ui/VSpaceUi.ui:45 msgid "&Protect:" msgstr "&Protégé :" -#: src/frontends/qt4/ui/HSpaceUi.ui:133 src/frontends/qt4/GuiHSpace.cpp:215 +#: src/frontends/qt4/ui/HSpaceUi.ui:133 +#: src/frontends/qt4/GuiHSpace.cpp:208 +#: src/frontends/qt4/GuiHSpace.cpp:214 msgid "Insert the spacing even after a line break" msgstr "Insérer l'espacement même après un saut de page" #: src/frontends/qt4/ui/HyperlinkUi.ui:19 -#: src/frontends/qt4/ui/HyperlinkUi.ui:32 lib/layouts/scrlttr2.layout:207 -#: lib/layouts/amsdefs.inc:153 lib/layouts/stdinsets.inc:336 -#: lib/layouts/stdinsets.inc:339 lib/layouts/minimalistic.module:26 +#: src/frontends/qt4/ui/HyperlinkUi.ui:32 +#: lib/layouts/scrlttr2.layout:207 +#: lib/layouts/amsdefs.inc:153 +#: lib/layouts/stdinsets.inc:336 +#: lib/layouts/stdinsets.inc:339 +#: lib/layouts/minimalistic.module:26 msgid "URL" msgstr "URL" @@ -2079,7 +2154,8 @@ msgid "Name associated with the URL" msgstr "Nom associé à l'URL" #: src/frontends/qt4/ui/HyperlinkUi.ui:42 -#: src/frontends/qt4/ui/PrefIdentityUi.ui:50 src/frontends/qt4/ui/RefUi.ui:257 +#: src/frontends/qt4/ui/PrefIdentityUi.ui:50 +#: src/frontends/qt4/ui/RefUi.ui:257 msgid "&Name:" msgstr "&Nom :" @@ -2168,20 +2244,23 @@ msgstr "Choisir le fichier sous-document" msgid "&Include Type:" msgstr "Type de &sous-document :" -#: src/frontends/qt4/ui/IncludeUi.ui:293 src/insets/InsetInclude.cpp:382 +#: src/frontends/qt4/ui/IncludeUi.ui:293 +#: src/insets/InsetInclude.cpp:383 msgid "Include" msgstr "Inclus (include)" -#: src/frontends/qt4/ui/IncludeUi.ui:298 src/insets/InsetInclude.cpp:372 +#: src/frontends/qt4/ui/IncludeUi.ui:298 +#: src/insets/InsetInclude.cpp:373 msgid "Input" msgstr "Incorporé (input)" -#: src/frontends/qt4/ui/IncludeUi.ui:303 lib/layouts/stdlayouts.inc:74 +#: src/frontends/qt4/ui/IncludeUi.ui:303 msgid "Verbatim" msgstr "Verbatim" -#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1145 -#: src/insets/InsetInclude.cpp:1151 +#: src/frontends/qt4/ui/IncludeUi.ui:308 +#: src/insets/InsetInclude.cpp:1139 +#: src/insets/InsetInclude.cpp:1145 msgid "Program Listing" msgstr "Listing de code source" @@ -2193,7 +2272,8 @@ msgstr "Modifier le fichier" msgid "&Edit" msgstr "Mo&difier" -#: src/frontends/qt4/ui/IndexUi.ui:59 src/frontends/qt4/ui/IndicesUi.ui:143 +#: src/frontends/qt4/ui/IndexUi.ui:59 +#: src/frontends/qt4/ui/IndicesUi.ui:143 msgid "A&vailable Indexes:" msgstr "Index &disponibles :" @@ -2202,14 +2282,11 @@ msgid "Select the index this entry should be listed in." msgstr "Sélectionner l'index dans lequel cette entrée doit apparaître." #: src/frontends/qt4/ui/IndicesUi.ui:19 -msgid "" -"Here you can define an alternative index processor and specify its options." -msgstr "" -"Vous pouvez définir ici un autre processeur pour l'indexation et spécifier " -"ses options." +msgid "Here you can define an alternative index processor and specify its options." +msgstr "Vous pouvez définir ici un autre processeur pour l'indexation et spécifier ses options." #: src/frontends/qt4/ui/IndicesUi.ui:22 -#: src/frontends/qt4/ui/PrefLatexUi.ui:148 +#: src/frontends/qt4/ui/PrefLatexUi.ui:202 msgid "Index generation" msgstr "Construction de l'index" @@ -2230,18 +2307,16 @@ msgid "&New:[[index]]" msgstr "&Nouvel index :" #: src/frontends/qt4/ui/IndicesUi.ui:124 -msgid "" -"Enter the name of the desired index (e.g. \"Index of Names\") and hit \"Add\"" -msgstr "" -"Saisir le nom de l'index désiré (e. g. « Index des noms ») et appuyez sur « " -"Add »" +msgid "Enter the name of the desired index (e.g. \"Index of Names\") and hit \"Add\"" +msgstr "Saisir le nom de l'index désiré (e. g. « Index des noms ») et appuyez sur « Add »" #: src/frontends/qt4/ui/IndicesUi.ui:131 msgid "Add a new index to the list" msgstr "Ajoute un nouvel index à la liste" #: src/frontends/qt4/ui/IndicesUi.ui:154 -#: src/frontends/qt4/ui/ProgressViewUi.ui:149 src/frontends/qt4/ui/RefUi.ui:60 +#: src/frontends/qt4/ui/ProgressViewUi.ui:149 +#: src/frontends/qt4/ui/RefUi.ui:60 msgid "1" msgstr "1" @@ -2327,12 +2402,8 @@ msgid "&Predefined:" msgstr "P&rédéfinie :" #: src/frontends/qt4/ui/LaTeXUi.ui:73 -msgid "" -"The options that are predefined in the layout file. Click to the left to " -"select/deselect." -msgstr "" -"Options prédéfinies dans le le fichier de format. Cliquer pour (dé)" -"sélectionner." +msgid "The options that are predefined in the layout file. Click to the left to select/deselect." +msgstr "Options prédéfinies dans le le fichier de format. Cliquer pour (dé)sélectionner." #: src/frontends/qt4/ui/LaTeXUi.ui:83 msgid "Cus&tom:" @@ -2364,41 +2435,38 @@ msgstr "&Supprimer la date implicite sur la première page" #: src/frontends/qt4/ui/LaTeXUi.ui:206 msgid "&Use refstyle (not prettyref) for cross-references" -msgstr "" -"Utiliser &refstyle (à la place de prettyref) pour les références croisées" +msgstr "Utiliser &refstyle (à la place de prettyref) pour les références croisées" -#: src/frontends/qt4/ui/LanguageUi.ui:53 +#: src/frontends/qt4/ui/LanguageUi.ui:52 msgid "&Quote Style:" msgstr "Style des &guillemets :" -#: src/frontends/qt4/ui/LanguageUi.ui:66 +#: src/frontends/qt4/ui/LanguageUi.ui:65 msgid "Encoding" msgstr "Encodage" -#: src/frontends/qt4/ui/LanguageUi.ui:81 +#: src/frontends/qt4/ui/LanguageUi.ui:80 msgid "Language &Default" msgstr "Langue i&mplicite" -#: src/frontends/qt4/ui/LanguageUi.ui:104 +#: src/frontends/qt4/ui/LanguageUi.ui:103 msgid "&Other:" msgstr "&Autre :" -#: src/frontends/qt4/ui/LanguageUi.ui:126 +#: src/frontends/qt4/ui/LanguageUi.ui:125 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:39 msgid "Language pac&kage:" msgstr "&Paquetage linguistique :" -#: src/frontends/qt4/ui/LanguageUi.ui:136 +#: src/frontends/qt4/ui/LanguageUi.ui:135 #: src/frontends/qt4/ui/PrefLanguageUi.ui:51 msgid "Select which language package LyX should use" msgstr "Sélectionner le paquetage de langue à utiliser par LyX" -#: src/frontends/qt4/ui/LanguageUi.ui:143 +#: src/frontends/qt4/ui/LanguageUi.ui:142 #: src/frontends/qt4/ui/PrefLanguageUi.ui:78 -msgid "" -"Enter the command to load the language package (default: \\usepackage{babel})" -msgstr "" -"Saisir la commande chargeant le paquetage de langue (implicitement : " -"\\usepackage{babel})" +msgid "Enter the command to load the language package (default: \\usepackage{babel})" +msgstr "Saisir la commande chargeant le paquetage de langue (implicitement : \\usepackage{babel})" #: src/frontends/qt4/ui/LineUi.ui:22 msgid "Of&fset:" @@ -2430,8 +2498,10 @@ msgstr "Saisir ici les paramètres des listings" msgid "Feedback window" msgstr "Fenêtre d'information" -#: src/frontends/qt4/ui/ListingsUi.ui:13 src/insets/InsetCaption.cpp:332 -#: src/insets/InsetListings.cpp:351 src/insets/InsetListings.cpp:353 +#: src/frontends/qt4/ui/ListingsUi.ui:13 +#: src/insets/InsetCaption.cpp:332 +#: src/insets/InsetListings.cpp:351 +#: src/insets/InsetListings.cpp:353 msgid "Listing" msgstr "Listing" @@ -2459,7 +2529,8 @@ msgstr "Cocher pour un listing flottant" msgid "&Float" msgstr "&Flottant" -#: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/WrapUi.ui:185 +#: src/frontends/qt4/ui/ListingsUi.ui:55 +#: src/frontends/qt4/ui/WrapUi.ui:185 msgid "&Placement:" msgstr "&Emplacement :" @@ -2534,8 +2605,7 @@ msgstr "Espace représenté par un s&ymbole" #: src/frontends/qt4/ui/ListingsUi.ui:294 msgid "Make spaces in strings visible by a special symbol" -msgstr "" -"Rendre les espaces visibles dans les chaînes grâce à un symbole spécial" +msgstr "Rendre les espaces visibles dans les chaînes grâce à un symbole spécial" #: src/frontends/qt4/ui/ListingsUi.ui:297 msgid "Space i&n string as symbol" @@ -2599,31 +2669,28 @@ msgstr "Autres paramètres" #: src/frontends/qt4/ui/ListingsUi.ui:499 msgid "Input listing parameters here. Enter ? for a list of parameters." -msgstr "" -"Entrer les paramètres du listing ici. Taper ? pour une liste des paramètres." +msgstr "Entrer les paramètres du listing ici. Taper ? pour une liste des paramètres." #: src/frontends/qt4/ui/LocalLayoutUi.ui:19 msgid "Document-specific layout information" msgstr "Informations de format spécifiques du document" #: src/frontends/qt4/ui/LocalLayoutUi.ui:35 -msgid "&Validate" -msgstr "&Valider" - -#: src/frontends/qt4/ui/LocalLayoutUi.ui:45 -#: src/frontends/qt4/ui/LocalLayoutUi.ui:68 msgid "Errors reported in terminal." msgstr "Erreurs affichées au terminal." -#: src/frontends/qt4/ui/LocalLayoutUi.ui:58 -#, fuzzy -msgid "Convert" -msgstr "Convertisseurs" +#: src/frontends/qt4/ui/LocalLayoutUi.ui:38 +#: src/frontends/qt4/GuiDocument.cpp:567 +msgid "Press button to check validity..." +msgstr "Appuyer sur le bouton pour vérifier la validité..." + +#: src/frontends/qt4/ui/LocalLayoutUi.ui:51 +msgid "&Validate" +msgstr "&Valider" #: src/frontends/qt4/ui/LogUi.ui:38 msgid "Hit Enter to search, or click Go!" -msgstr "" -"Sélectionner « Entrée » pour activer la recherche, ou cliquer sur « Go » !" +msgstr "Sélectionner « Entrée » pour activer la recherche, ou cliquer sur « Go » !" #: src/frontends/qt4/ui/LogUi.ui:45 msgid "Log &Type:" @@ -2633,8 +2700,9 @@ msgstr "&Type de journal :" msgid "Update the display" msgstr "Mettre à jour l'affichage" -#: src/frontends/qt4/ui/LogUi.ui:77 src/frontends/qt4/ui/RefUi.ui:294 -#: src/frontends/qt4/ui/ViewSourceUi.ui:93 +#: src/frontends/qt4/ui/LogUi.ui:77 +#: src/frontends/qt4/ui/RefUi.ui:294 +#: src/frontends/qt4/ui/ViewSourceUi.ui:82 msgid "&Update" msgstr "Mettre à &jour" @@ -2708,20 +2776,15 @@ msgstr "Document maître résultant" #: src/frontends/qt4/ui/MasterChildUi.ui:40 msgid "Include only the selected subdocuments in the output" -msgstr "" -"N'inclure que les sous-documents sélectionnés dans le résultat imprimable" +msgstr "N'inclure que les sous-documents sélectionnés dans le résultat imprimable" #: src/frontends/qt4/ui/MasterChildUi.ui:43 msgid "Include only &selected children" msgstr "N'inclure que les sous-documents sélecti&onnés" #: src/frontends/qt4/ui/MasterChildUi.ui:50 -msgid "" -"Assure counters and references are as in the complete document (prolonges " -"compilation)" -msgstr "" -"Garantir que les compteurs et les références soient identiques à celles du " -"document complet (augmente la durée de la compilation)" +msgid "Assure counters and references are as in the complete document (prolonges compilation)" +msgstr "Garantir que les compteurs et les références soient identiques à celles du document complet (augmente la durée de la compilation)" #: src/frontends/qt4/ui/MasterChildUi.ui:53 msgid "&Maintain counters and references" @@ -2763,7 +2826,8 @@ msgstr "&Colonnes :" msgid "Resize this to the correct table dimensions" msgstr "Repositionner ceci à la taille de tableau correcte" -#: src/frontends/qt4/ui/MathMatrixUi.ui:163 src/frontends/qt4/ui/WrapUi.ui:195 +#: src/frontends/qt4/ui/MathMatrixUi.ui:163 +#: src/frontends/qt4/ui/WrapUi.ui:195 msgid "Vertical alignment" msgstr "Alignement vertical" @@ -2811,6 +2875,70 @@ msgstr "|x|" msgid "||x||" msgstr "||x||" +#: src/frontends/qt4/ui/MathsUi.ui:19 +msgid "The AMS LaTeX packages are only used if symbols from the AMS math toolbars are inserted into formulas" +msgstr "Les paquetages LaTeX AMS ne sont utilisés que si des symboles en provenance des palettes mathématiques AMS sont insérés dans des formules." + +#: src/frontends/qt4/ui/MathsUi.ui:22 +msgid "&Use AMS math package automatically" +msgstr "Utiliser a&utomatiquement le paquetage maths AMS" + +#: src/frontends/qt4/ui/MathsUi.ui:32 +msgid "The AMS LaTeX packages are always used" +msgstr "Les paquetages LaTeX AMS sont utilisés dans tous les cas." + +#: src/frontends/qt4/ui/MathsUi.ui:35 +msgid "Use AMS &math package" +msgstr "Utiliser le paquetage maths &AMS" + +#: src/frontends/qt4/ui/MathsUi.ui:42 +msgid "The LaTeX package esint is only used if special integral symbols are inserted into formulas" +msgstr "Le paquetage LaTeX esint n'est utilisé que si des symboles d'intégration spécifiques sont insérés dans des formules." + +#: src/frontends/qt4/ui/MathsUi.ui:45 +msgid "Use esint package &automatically" +msgstr "Utiliser a&utomatiquement le paquetage esint" + +#: src/frontends/qt4/ui/MathsUi.ui:55 +msgid "The LaTeX package esint is always used" +msgstr "Le paquetage LaTeX esint est utilisé dans tous les cas." + +#: src/frontends/qt4/ui/MathsUi.ui:58 +msgid "Use &esint package" +msgstr "Utiliser le paquetage maths &esint" + +#: src/frontends/qt4/ui/MathsUi.ui:65 +msgid "The LaTeX package mathdots is only used if the command \\iddots is inserted into formulas" +msgstr "Le paquetage LaTeX mathdots n'est utilisé que si la commande \\iddots est insérée dans une formule" + +#: src/frontends/qt4/ui/MathsUi.ui:68 +msgid "Use math&dots package automatically" +msgstr "Utiliser automatiquement le paquetage math&dots" + +#: src/frontends/qt4/ui/MathsUi.ui:75 +msgid "The LaTeX package mathdots is used" +msgstr "Le paquetage LaTeX mathdots est utilisé" + +#: src/frontends/qt4/ui/MathsUi.ui:78 +msgid "Use mathdo&ts package" +msgstr "Utiliser le paquetage math&dots" + +#: src/frontends/qt4/ui/MathsUi.ui:85 +msgid "The LaTeX package mhchem is only used if either the command \\ce or \\cf is inserted into formulas" +msgstr "Le paquetage LaTeX mhchem n'est utilisé que si les commandes \\ce ou \\cf sont insérées dans des formules." + +#: src/frontends/qt4/ui/MathsUi.ui:88 +msgid "Use mhchem &package automatically" +msgstr "Utiliser a&utomatiquement le paquetage mhchem" + +#: src/frontends/qt4/ui/MathsUi.ui:98 +msgid "The LaTeX package mhchem is always used" +msgstr "Le paquetage LaTeX mhchem est utilisé dans tous les cas." + +#: src/frontends/qt4/ui/MathsUi.ui:101 +msgid "Use mh&chem package" +msgstr "Utiliser le paquetage mh&chem" + #: src/frontends/qt4/ui/ModulesUi.ui:60 msgid "A&vailable:" msgstr "&Disponible :" @@ -2829,7 +2957,8 @@ msgstr "Supprim&er" msgid "S&elected:" msgstr "Sél&ectionné :" -#: src/frontends/qt4/ui/NomenclUi.ui:13 src/insets/InsetNomencl.cpp:162 +#: src/frontends/qt4/ui/NomenclUi.ui:13 +#: src/insets/InsetNomencl.cpp:162 msgid "Nomenclature" msgstr "Glossaire" @@ -2845,7 +2974,8 @@ msgstr "&Description :" msgid "&Symbol:" msgstr "&Symbole :" -#: src/frontends/qt4/ui/NoteUi.ui:48 src/frontends/qt4/ui/PhantomUi.ui:48 +#: src/frontends/qt4/ui/NoteUi.ui:48 +#: src/frontends/qt4/ui/PhantomUi.ui:48 msgid "Type" msgstr "Type" @@ -2881,90 +3011,87 @@ msgstr "Dans la &table des matières" msgid "&Numbering" msgstr "&Numérotation" -#: src/frontends/qt4/ui/OutputUi.ui:20 +#: src/frontends/qt4/ui/OutputUi.ui:19 msgid "Output Format" msgstr "Format du résultat" -#: src/frontends/qt4/ui/OutputUi.ui:43 src/frontends/qt4/ui/OutputUi.ui:56 +#: src/frontends/qt4/ui/OutputUi.ui:42 +#: src/frontends/qt4/ui/OutputUi.ui:55 msgid "Specify the default output format (for view/update)" -msgstr "" -"Spécifier le format implicite du résultat (pour visionner/mettre à jour)" +msgstr "Spécifier le format implicite du résultat (pour visionner/mettre à jour)" -#: src/frontends/qt4/ui/OutputUi.ui:46 -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:190 +#: src/frontends/qt4/ui/OutputUi.ui:45 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:177 msgid "De&fault Output Format:" msgstr "&Format implicite du résultat :" -#: src/frontends/qt4/ui/OutputUi.ui:68 +#: src/frontends/qt4/ui/OutputUi.ui:67 msgid "Enable forward/reverse search between editor and output (e.g., SyncTeX)" -msgstr "" -"Activer la recherche directe/inversée entre l'éditeur et la sortie (e. g. " -"SyncTeX)" +msgstr "Activer la recherche directe/inversée entre l'éditeur et la sortie (e. g. SyncTeX)" -#: src/frontends/qt4/ui/OutputUi.ui:71 +#: src/frontends/qt4/ui/OutputUi.ui:70 msgid "S&ynchronize with Output" msgstr "S&ynchroniser avec le résultat imprimable" -#: src/frontends/qt4/ui/OutputUi.ui:88 +#: src/frontends/qt4/ui/OutputUi.ui:87 msgid "C&ustom Macro:" msgstr "Macro pers&onnalisée :" -#: src/frontends/qt4/ui/OutputUi.ui:98 +#: src/frontends/qt4/ui/OutputUi.ui:97 msgid "Custom LaTeX preamble macro" msgstr "Macro du préambule LaTeX personnalisée" -#: src/frontends/qt4/ui/OutputUi.ui:113 +#: src/frontends/qt4/ui/OutputUi.ui:112 msgid "XHTML Output Options" msgstr "Options export XHTML" -#: src/frontends/qt4/ui/OutputUi.ui:122 +#: src/frontends/qt4/ui/OutputUi.ui:121 msgid "Whether to comply strictly with XHTML 1.1." msgstr "Se conformer strictement ou non à XHTML 1.1." -#: src/frontends/qt4/ui/OutputUi.ui:125 +#: src/frontends/qt4/ui/OutputUi.ui:124 msgid "&Strict XHTML 1.1" msgstr "XHTML 1.1 &strict" -#: src/frontends/qt4/ui/OutputUi.ui:138 +#: src/frontends/qt4/ui/OutputUi.ui:137 msgid "&Math output:" msgstr "Traduction des &maths :" -#: src/frontends/qt4/ui/OutputUi.ui:154 +#: src/frontends/qt4/ui/OutputUi.ui:153 msgid "Format to use for math output." msgstr "Format à utiliser dans l'impression des maths." -#: src/frontends/qt4/ui/OutputUi.ui:158 +#: src/frontends/qt4/ui/OutputUi.ui:157 msgid "MathML" msgstr "MathML" -#: src/frontends/qt4/ui/OutputUi.ui:163 +#: src/frontends/qt4/ui/OutputUi.ui:162 +#: lib/configure.py:647 msgid "HTML" msgstr "HTML" -#: src/frontends/qt4/ui/OutputUi.ui:168 +#: src/frontends/qt4/ui/OutputUi.ui:167 msgid "Images" msgstr "Images" -#: src/frontends/qt4/ui/OutputUi.ui:173 lib/layouts/aapaper.layout:61 -#: lib/layouts/egs.layout:615 lib/languages:69 -#: src/frontends/qt4/GuiErrorList.cpp:48 src/frontends/qt4/GuiLog.cpp:226 -#: src/frontends/qt4/GuiPrefs.cpp:701 +#: src/frontends/qt4/ui/OutputUi.ui:172 +#: lib/layouts/aapaper.layout:61 +#: lib/layouts/egs.layout:615 +#: lib/languages:69 +#: src/frontends/qt4/GuiErrorList.cpp:48 +#: src/frontends/qt4/GuiLog.cpp:226 +#: src/frontends/qt4/GuiPrefs.cpp:697 msgid "LaTeX" msgstr "LaTeX" -#: src/frontends/qt4/ui/OutputUi.ui:187 +#: src/frontends/qt4/ui/OutputUi.ui:186 msgid "Math &image scaling:" msgstr "Mise à l'échelle des &images mathématiques :" -#: src/frontends/qt4/ui/OutputUi.ui:203 +#: src/frontends/qt4/ui/OutputUi.ui:202 msgid "Scaling factor for images used for math output." msgstr "Facteur d'échelle des images créées pour l'impression des maths." -#: src/frontends/qt4/ui/OutputUi.ui:222 -#, fuzzy -msgid "Write CSS to File" -msgstr "Imprimer vers" - #: src/frontends/qt4/ui/PDFSupportUi.ui:28 msgid "&Use hyperref support" msgstr "&Utiliser le support pour hyperref" @@ -2994,11 +3121,8 @@ msgid "&Keywords:" msgstr "Mots-&clés :" #: src/frontends/qt4/ui/PDFSupportUi.ui:166 -msgid "" -"If not stated explicitly, fill title and author from appropriate environments" -msgstr "" -"Sauf mention explicite, compléter le titre et l'auteur à partir des " -"environnements appropriés" +msgid "If not stated explicitly, fill title and author from appropriate environments" +msgstr "Sauf mention explicite, compléter le titre et l'auteur à partir des environnements appropriés" #: src/frontends/qt4/ui/PDFSupportUi.ui:169 msgid "Automatically fi&ll header" @@ -3080,9 +3204,7 @@ msgstr "&Format :" #: src/frontends/qt4/ui/PageLayoutUi.ui:44 msgid "Choose a particular paper size, or set your own with \"Custom\"" -msgstr "" -"Choisir une taille de papier spécifique, ou préciser la vôtre avec « " -"réglable »" +msgstr "Choisir une taille de papier spécifique, ou préciser la vôtre avec « réglable »" #: src/frontends/qt4/ui/PageLayoutUi.ui:125 msgid "&Orientation:" @@ -3097,7 +3219,7 @@ msgid "&Landscape" msgstr "Pa&ysage" #: src/frontends/qt4/ui/PageLayoutUi.ui:161 -#: src/frontends/qt4/GuiDocument.cpp:1417 +#: src/frontends/qt4/GuiDocument.cpp:1311 msgid "Page Layout" msgstr "Format de la page" @@ -3134,8 +3256,9 @@ msgstr "Étiquette la plus &longue" msgid "Line &spacing" msgstr "&Interligne" -#: src/frontends/qt4/ui/ParagraphUi.ui:120 src/Text.cpp:1849 -#: src/frontends/qt4/GuiDocument.cpp:771 +#: src/frontends/qt4/ui/ParagraphUi.ui:120 +#: src/Text.cpp:1822 +#: src/frontends/qt4/GuiDocument.cpp:692 msgid "Single" msgstr "Simple" @@ -3143,8 +3266,9 @@ msgstr "Simple" msgid "1.5" msgstr "Un et demi" -#: src/frontends/qt4/ui/ParagraphUi.ui:130 src/Text.cpp:1855 -#: src/frontends/qt4/GuiDocument.cpp:775 +#: src/frontends/qt4/ui/ParagraphUi.ui:130 +#: src/Text.cpp:1828 +#: src/frontends/qt4/GuiDocument.cpp:696 msgid "Double" msgstr "Double" @@ -3152,14 +3276,21 @@ msgstr "Double" #: src/frontends/qt4/ui/PrefLanguageUi.ui:65 #: src/frontends/qt4/ui/TabularUi.ui:1047 #: src/frontends/qt4/ui/TabularUi.ui:1066 -#: src/frontends/qt4/ui/TabularUi.ui:1114 src/frontends/qt4/ui/VSpaceUi.ui:107 -#: lib/layouts/stdcustom.inc:8 src/frontends/qt4/GuiDocument.cpp:765 -#: src/frontends/qt4/GuiDocument.cpp:769 src/frontends/qt4/GuiDocument.cpp:777 -#: src/frontends/qt4/GuiDocument.cpp:883 src/frontends/qt4/GuiDocument.cpp:935 -#: src/frontends/qt4/GuiDocument.cpp:1101 src/frontends/qt4/GuiHSpace.cpp:56 -#: src/frontends/qt4/GuiHSpace.cpp:67 src/frontends/qt4/GuiPrefs.cpp:851 -#: src/frontends/qt4/GuiPrefs.cpp:878 src/frontends/qt4/GuiPrefs.cpp:2140 -#: src/frontends/qt4/GuiPrefs.cpp:2163 +#: src/frontends/qt4/ui/TabularUi.ui:1114 +#: src/frontends/qt4/ui/VSpaceUi.ui:107 +#: lib/layouts/stdcustom.inc:8 +#: src/frontends/qt4/GuiDocument.cpp:686 +#: src/frontends/qt4/GuiDocument.cpp:690 +#: src/frontends/qt4/GuiDocument.cpp:698 +#: src/frontends/qt4/GuiDocument.cpp:802 +#: src/frontends/qt4/GuiDocument.cpp:854 +#: src/frontends/qt4/GuiDocument.cpp:1020 +#: src/frontends/qt4/GuiHSpace.cpp:54 +#: src/frontends/qt4/GuiHSpace.cpp:63 +#: src/frontends/qt4/GuiPrefs.cpp:851 +#: src/frontends/qt4/GuiPrefs.cpp:878 +#: src/frontends/qt4/GuiPrefs.cpp:2131 +#: src/frontends/qt4/GuiPrefs.cpp:2154 #: src/frontends/qt4/GuiPrintNomencl.cpp:51 msgid "Custom" msgstr "Réglable" @@ -3229,12 +3360,8 @@ msgid "In Math" msgstr "En mode mathématique" #: src/frontends/qt4/ui/PrefCompletionUi.ui:40 -msgid "" -"Show the grey inline completion behind the cursor in math mode after the " -"delay." -msgstr "" -"Afficher la complétion en ligne grisée sous le curseur en mode mathématique, " -"après la temporisation." +msgid "Show the grey inline completion behind the cursor in math mode after the delay." +msgstr "Afficher la complétion en ligne grisée sous le curseur en mode mathématique, après la temporisation." #: src/frontends/qt4/ui/PrefCompletionUi.ui:43 msgid "Automatic in&line completion" @@ -3242,8 +3369,7 @@ msgstr "Complétion automatique en &ligne" #: src/frontends/qt4/ui/PrefCompletionUi.ui:50 msgid "Show the popup in math mode after the delay." -msgstr "" -"Afficher la fenêtre auxiliaire en mode mathématique, après la temporisation." +msgstr "Afficher la fenêtre auxiliaire en mode mathématique, après la temporisation." #: src/frontends/qt4/ui/PrefCompletionUi.ui:53 msgid "Automatic p&opup" @@ -3258,12 +3384,8 @@ msgid "In Text" msgstr "Dans le texte" #: src/frontends/qt4/ui/PrefCompletionUi.ui:85 -msgid "" -"Show the grey inline completion behind the cursor in text mode after the " -"delay." -msgstr "" -"Afficher la complétion en ligne grisée sous le curseur en mode texte, après " -"la temporisation." +msgid "Show the grey inline completion behind the cursor in text mode after the delay." +msgstr "Afficher la complétion en ligne grisée sous le curseur en mode texte, après la temporisation." #: src/frontends/qt4/ui/PrefCompletionUi.ui:88 msgid "Automatic &inline completion" @@ -3278,72 +3400,48 @@ msgid "Automatic &popup" msgstr "Fenêtre auxiliaire &automatique" #: src/frontends/qt4/ui/PrefCompletionUi.ui:105 -msgid "" -"Show a small triangle on the cursor if a completion is available in text " -"mode." -msgstr "" -"Afficher un petit triangle sur le curseur si la complétion est disponible en " -"mode texte." +msgid "Show a small triangle on the cursor if a completion is available in text mode." +msgstr "Afficher un petit triangle sur le curseur si la complétion est disponible en mode texte." #: src/frontends/qt4/ui/PrefCompletionUi.ui:108 msgid "Cursor i&ndicator" msgstr "I&ndicateur curseur" #: src/frontends/qt4/ui/PrefCompletionUi.ui:118 -#: lib/layouts/hollywood.layout:280 src/frontends/qt4/GuiPrefs.cpp:389 +#: lib/layouts/hollywood.layout:280 +#: src/frontends/qt4/GuiPrefs.cpp:389 msgid "General" msgstr "Général" #: src/frontends/qt4/ui/PrefCompletionUi.ui:141 -msgid "" -"After the cursor has not moved for this time, the inline completion is shown " -"if it is available." -msgstr "" -"Si le curseur ne bouge pas pendant cette durée, la complétion en ligne est " -"affichée si elle est disponible." +msgid "After the cursor has not moved for this time, the inline completion is shown if it is available." +msgstr "Si le curseur ne bouge pas pendant cette durée, la complétion en ligne est affichée si elle est disponible." #: src/frontends/qt4/ui/PrefCompletionUi.ui:154 msgid "s inline completion dela&y" msgstr "s temporisation de la complétion en li&gne" #: src/frontends/qt4/ui/PrefCompletionUi.ui:187 -msgid "" -"After the cursor has not moved for this time, the completion popup is shown " -"if it is available." -msgstr "" -"Si le curseur ne bouge pas pendant cette durée, la fenêtre auxiliaire de " -"complétion est affichée si elle est disponible." +msgid "After the cursor has not moved for this time, the completion popup is shown if it is available." +msgstr "Si le curseur ne bouge pas pendant cette durée, la fenêtre auxiliaire de complétion est affichée si elle est disponible." #: src/frontends/qt4/ui/PrefCompletionUi.ui:200 msgid "s popup d&elay" msgstr "s temporisation f&enêtre auxiliaire" -#: src/frontends/qt4/ui/PrefCompletionUi.ui:233 -msgid "." -msgstr "" +#: src/frontends/qt4/ui/PrefCompletionUi.ui:225 +msgid "When the TAB completion is not unique, there won't be a delay of the popup. It will be shown right away." +msgstr "Si la complétion par TAB n'est pas unique, il n'y aura pas de temporisation de la fenêtre auxiliaire, elle sera affichée immédiatement." -#: src/frontends/qt4/ui/PrefCompletionUi.ui:249 -msgid "Minimum word length for completion" -msgstr "" - -#: src/frontends/qt4/ui/PrefCompletionUi.ui:274 -msgid "" -"When the TAB completion is not unique, there won't be a delay of the popup. " -"It will be shown right away." -msgstr "" -"Si la complétion par TAB n'est pas unique, il n'y aura pas de temporisation " -"de la fenêtre auxiliaire, elle sera affichée immédiatement." - -#: src/frontends/qt4/ui/PrefCompletionUi.ui:277 +#: src/frontends/qt4/ui/PrefCompletionUi.ui:228 msgid "Sho&w popup without delay for non-unique completions" -msgstr "" -"A&fficher la fenêtre auxiliaire sans délai pour le complétions multiples" +msgstr "A&fficher la fenêtre auxiliaire sans délai pour le complétions multiples" -#: src/frontends/qt4/ui/PrefCompletionUi.ui:284 +#: src/frontends/qt4/ui/PrefCompletionUi.ui:235 msgid "Long completions are cut-off and shown with \"...\"." msgstr "Les complétions longues sont tronquées et affichées avec \"...\"." -#: src/frontends/qt4/ui/PrefCompletionUi.ui:287 +#: src/frontends/qt4/ui/PrefCompletionUi.ui:238 msgid "&Use \"...\" to shorten long completions" msgstr "&Utiliser \"...\" pour tronquer les complétions longues" @@ -3370,7 +3468,8 @@ msgstr "&Modifier" #: src/frontends/qt4/ui/PrefConvertersUi.ui:209 #: src/frontends/qt4/ui/PrefShortcutsUi.ui:61 -#: src/frontends/qt4/GuiPrefs.cpp:2944 src/frontends/qt4/GuiPrefs.cpp:3008 +#: src/frontends/qt4/GuiPrefs.cpp:2931 +#: src/frontends/qt4/GuiPrefs.cpp:2995 msgid "Remo&ve" msgstr "&Enlever" @@ -3398,8 +3497,9 @@ msgstr "Affichage écran des &graphiques" msgid "Instant &Preview:" msgstr "Aperçu sur le &vif :" -#: src/frontends/qt4/ui/PrefDisplayUi.ui:56 src/Font.cpp:76 -#: src/frontends/qt4/GuiDocument.cpp:171 +#: src/frontends/qt4/ui/PrefDisplayUi.ui:56 +#: src/Font.cpp:76 +#: src/frontends/qt4/GuiDocument.cpp:170 msgid "Off" msgstr "Désactivé" @@ -3407,7 +3507,8 @@ msgstr "Désactivé" msgid "No math" msgstr "Pas de maths" -#: src/frontends/qt4/ui/PrefDisplayUi.ui:66 src/Font.cpp:76 +#: src/frontends/qt4/ui/PrefDisplayUi.ui:66 +#: src/Font.cpp:76 msgid "On" msgstr "Activé" @@ -3421,14 +3522,14 @@ msgstr "Facteur multiplicatif de la taille de l'aperçu" #: src/frontends/qt4/ui/PrefDisplayUi.ui:114 msgid "Mark end of paragraphs on screen with a pilcrow character." -msgstr "" -"Marquer à l'écran les fins de paragraphe par un caractère « pied-de-mouche »." +msgstr "Marquer à l'écran les fins de paragraphe par un caractère « pied-de-mouche »." #: src/frontends/qt4/ui/PrefDisplayUi.ui:117 msgid "&Mark end of paragraphs" msgstr "&Marquer la fin des paragraphes" -#: src/frontends/qt4/ui/PrefEditUi.ui:25 src/frontends/qt4/GuiPrefs.cpp:252 +#: src/frontends/qt4/ui/PrefEditUi.ui:25 +#: src/frontends/qt4/GuiPrefs.cpp:252 msgid "Editing" msgstr "Saisie" @@ -3436,13 +3537,10 @@ msgstr "Saisie" msgid "Cursor &follows scrollbar" msgstr "Le curseur suit la barre de &défilement" -#: src/frontends/qt4/ui/PrefEditUi.ui:46 src/LyXRC.cpp:3124 -msgid "" -"Configure the width of the text cursor. Automatic zoom-controlled cursor " -"width used when set to 0." -msgstr "" -"Configurer le largeur du curseur de texte. Si la valeur vaut 0, une largeur " -"de curseur avec zoom automatique est utilisée." +#: src/frontends/qt4/ui/PrefEditUi.ui:46 +#: src/LyXRC.cpp:3147 +msgid "Configure the width of the text cursor. Automatic zoom-controlled cursor width used when set to 0." +msgstr "Configurer le largeur du curseur de texte. Si la valeur vaut 0, une largeur de curseur avec zoom automatique est utilisée." #: src/frontends/qt4/ui/PrefEditUi.ui:49 msgid "Cursor width (&pixels):" @@ -3466,14 +3564,11 @@ msgstr "Modifier les macros mathématiques en ligne, encadrées" #: src/frontends/qt4/ui/PrefEditUi.ui:104 msgid "Edit Math Macros inline with the name in the status bar" -msgstr "" -"Modifier les macros mathématiques en ligne, avec le nom dans la barre d'état" +msgstr "Modifier les macros mathématiques en ligne, avec le nom dans la barre d'état" #: src/frontends/qt4/ui/PrefEditUi.ui:109 msgid "Edit Math Macros with a parameter list (like in LyX < 1.6)" -msgstr "" -"Modifier les macros mathématiques avec une liste de paramètres (comme avec " -"LyX < 1.6)" +msgstr "Modifier les macros mathématiques avec une liste de paramètres (comme avec LyX < 1.6)" #: src/frontends/qt4/ui/PrefEditUi.ui:130 msgid "Skip trailing non-word characters" @@ -3540,35 +3635,30 @@ msgid "S&hort Name:" msgstr "Nom cour&t :" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:96 -#, fuzzy -msgid "E&xtensions:" +msgid "E&xtension:" msgstr "E&xtension :" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:109 -msgid "&MIME:" -msgstr "" - -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:122 msgid "Shortc&ut:" msgstr "&Raccourci :" -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:145 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:132 msgid "&Viewer:" msgstr "&Visionneuse :" -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:165 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:152 msgid "Co&pier:" msgstr "&Copieur :" -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:178 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:165 msgid "Specify the default output format when using (PDF)LaTeX" msgstr "Spécifier le format implicite du résultat pour (PDF)LaTeX" -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:181 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:168 msgid "Default Format" msgstr "Format implicite" -#: src/frontends/qt4/ui/PrefFileformatsUi.ui:232 +#: src/frontends/qt4/ui/PrefFileformatsUi.ui:219 msgid "Ed&itor:" msgstr "É&diteur :" @@ -3606,12 +3696,8 @@ msgid "S&econd:" msgstr "&Deuxième :" #: src/frontends/qt4/ui/PrefInputUi.ui:120 -msgid "" -"Mac OS X specific setting for use with emacs bindings. Takes effect next " -"time LyX is launched." -msgstr "" -"Réglage spécifique Mac OS X pour utilisation avec les raccourcis emacs. " -"Activé lors du prochain lancement de LyX." +msgid "Mac OS X specific setting for use with emacs bindings. Takes effect next time LyX is launched." +msgstr "Réglage spécifique Mac OS X pour utilisation avec les raccourcis emacs. Activé lors du prochain lancement de LyX." #: src/frontends/qt4/ui/PrefInputUi.ui:123 msgid "Do not swap Apple and Control keys" @@ -3626,12 +3712,8 @@ msgid "&Wheel scrolling speed:" msgstr "Vitesse de défilement via la &molette :" #: src/frontends/qt4/ui/PrefInputUi.ui:158 -msgid "" -"1.0 is the standard scrolling speed with the mouse wheel. Higher values will " -"speed it up, low values slow it down." -msgstr "" -"1.0 est la vitesse de défilement standard avec la molette de la souris. Les " -"valeurs supérieures l'accélèrent, les valeurs inférieures la ralentissent." +msgid "1.0 is the standard scrolling speed with the mouse wheel. Higher values will speed it up, low values slow it down." +msgstr "1.0 est la vitesse de défilement standard avec la molette de la souris. Les valeurs supérieures l'accélèrent, les valeurs inférieures la ralentissent." #: src/frontends/qt4/ui/PrefInputUi.ui:202 msgid "Scroll wheel zoom" @@ -3659,26 +3741,20 @@ msgstr "Langage de l'interface &utilisateur :" #: src/frontends/qt4/ui/PrefLanguageUi.ui:29 msgid "Select the language of the user interface (menus, dialogs, etc.)" -msgstr "" -"Sélectionner la langue de l'interface utilisateur (menus, dialogues, etc.)" - -#: src/frontends/qt4/ui/PrefLanguageUi.ui:39 -#, fuzzy -msgid "Language &package:" -msgstr "&Paquetage linguistique :" +msgstr "Sélectionner la langue de l'interface utilisateur (menus, dialogues, etc.)" #: src/frontends/qt4/ui/PrefLanguageUi.ui:55 -#: src/frontends/qt4/GuiDocument.cpp:1097 +#: src/frontends/qt4/GuiDocument.cpp:1016 msgid "Automatic" msgstr "Automatique" #: src/frontends/qt4/ui/PrefLanguageUi.ui:60 -#: src/frontends/qt4/GuiDocument.cpp:1099 +#: src/frontends/qt4/GuiDocument.cpp:1018 msgid "Always Babel" msgstr "Toujours utiliser babel" #: src/frontends/qt4/ui/PrefLanguageUi.ui:70 -#: src/frontends/qt4/GuiDocument.cpp:1103 +#: src/frontends/qt4/GuiDocument.cpp:1022 msgid "None[[language package]]" msgstr "Aucun[[paquetage de langue]]" @@ -3699,161 +3775,173 @@ msgid "The LaTeX command that ends a switch to a foreign language" msgstr "La commande LaTeX pour terminer changement temporaire de langue" #: src/frontends/qt4/ui/PrefLanguageUi.ui:134 -#, fuzzy -msgid "Default Decimal &Separator:" -msgstr "Au séparateur décimal" - -#: src/frontends/qt4/ui/PrefLanguageUi.ui:160 -#, fuzzy -msgid "Default length &unit:" +msgid "Default Decimal &Point:" msgstr "Caractère &décimal implicite :" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:173 -msgid "" -"Check to pass the language globally (to the document class), not locally (to " -"the language package)" -msgstr "" -"Cocher pour passer l'option de langue globalement (à la classe du document), " -"et non pas localement (au paquetage de langue)" +#: src/frontends/qt4/ui/PrefLanguageUi.ui:160 +msgid "Check to pass the language globally (to the document class), not locally (to the language package)" +msgstr "Cocher pour passer l'option de langue globalement (à la classe du document), et non pas localement (au paquetage de langue)" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:176 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:163 msgid "Set languages &globally" msgstr "Régler les langues &globalement" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:183 -msgid "" -"If checked, the document language is not explicitly set by a language switch " -"command" -msgstr "" -"Si cette case est cochée, la langue du document n'est pas sélectionnée " -"explicitement par une commande de changement de langue" +#: src/frontends/qt4/ui/PrefLanguageUi.ui:170 +msgid "If checked, the document language is not explicitly set by a language switch command" +msgstr "Si cette case est cochée, la langue du document n'est pas sélectionnée explicitement par une commande de changement de langue" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:186 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:173 msgid "Auto &begin" msgstr "Début &auto" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:193 -msgid "" -"If checked, the document language is not explicitly closed by a language " -"switch command" -msgstr "" -"Si cette case est cochée, la langue du document n'est pas désélectionnée " -"explicitement par une commande de changement de langue" +#: src/frontends/qt4/ui/PrefLanguageUi.ui:180 +msgid "If checked, the document language is not explicitly closed by a language switch command" +msgstr "Si cette case est cochée, la langue du document n'est pas désélectionnée explicitement par une commande de changement de langue" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:196 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:183 msgid "Auto &end" msgstr "Fin a&uto" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:203 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:190 msgid "Check to highlight foreign languages visually in the work area" -msgstr "" -"Cocher pour mettre les langues étrangères visuellement en évidence dans la " -"zone de travail" +msgstr "Cocher pour mettre les langues étrangères visuellement en évidence dans la zone de travail" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:206 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:193 msgid "Mark &foreign languages" msgstr "&Marquer les langues étrangères" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:216 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:203 msgid "Right-to-left language support" msgstr "Support des langues écrites de droite à gauche" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:228 src/LyXRC.cpp:3401 -msgid "" -"Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)." -msgstr "" -"Sélectionner pour activer le support des langues écrites de droite à gauche " -"(par ex. l'hébreu ou l'arabe)." +#: src/frontends/qt4/ui/PrefLanguageUi.ui:215 +#: src/LyXRC.cpp:3428 +msgid "Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)." +msgstr "Sélectionner pour activer le support des langues écrites de droite à gauche (par ex. l'hébreu ou l'arabe)." -#: src/frontends/qt4/ui/PrefLanguageUi.ui:231 -#, fuzzy -msgid "Enable &RTL support" +#: src/frontends/qt4/ui/PrefLanguageUi.ui:218 +msgid "Enable RTL su&pport" msgstr "Activer la fonctionnalité &RTL (droite à gauche)" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:246 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:233 msgid "Cursor movement:" msgstr "Mouvement du curseur :" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:256 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:243 msgid "&Logical" msgstr "&Logique" -#: src/frontends/qt4/ui/PrefLanguageUi.ui:266 +#: src/frontends/qt4/ui/PrefLanguageUi.ui:253 msgid "&Visual" msgstr "&Visuel" #: src/frontends/qt4/ui/PrefLatexUi.ui:24 -msgid "" -"Enable if a specific font encoding (such as T1) should be used (via fontenc)" -msgstr "" -"Autorise l'utilisation (via fontenc) d'un encodage de police spécifique (tel " -"que T1)" +msgid "Enable if a specific font encoding (such as T1) should be used (via fontenc)" +msgstr "Autorise l'utilisation (via fontenc) d'un encodage de police spécifique (tel que T1)" #: src/frontends/qt4/ui/PrefLatexUi.ui:27 msgid "Use LaTe&X font encoding:" msgstr "Utiliser l'encodage de police LaTe&X :" #: src/frontends/qt4/ui/PrefLatexUi.ui:41 +msgid "Default paper si&ze:" +msgstr "Taille de &papier implicite :" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:57 +#: src/frontends/qt4/GuiDocument.cpp:855 +msgid "US letter" +msgstr "Lettre US" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:62 +#: src/frontends/qt4/GuiDocument.cpp:856 +msgid "US legal" +msgstr "Légal US" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:67 +#: src/frontends/qt4/GuiDocument.cpp:857 +msgid "US executive" +msgstr "Executive US" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:72 +#: src/frontends/qt4/GuiDocument.cpp:861 +msgid "A3" +msgstr "A3" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:77 +#: src/frontends/qt4/GuiDocument.cpp:862 +msgid "A4" +msgstr "A4" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:82 +#: src/frontends/qt4/GuiDocument.cpp:863 +msgid "A5" +msgstr "A5" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:87 +#: src/frontends/qt4/GuiDocument.cpp:870 +msgid "B5" +msgstr "B5" + +#: src/frontends/qt4/ui/PrefLatexUi.ui:95 msgid "&DVI viewer paper size options:" msgstr "Option de taille du papier pour la visionneuse &DVI :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:51 +#: src/frontends/qt4/ui/PrefLatexUi.ui:105 msgid "Optional paper size flag (-paper) for some DVI viewers" msgstr "Option facultative -paper pour certaines visionneuses DVI" -#: src/frontends/qt4/ui/PrefLatexUi.ui:108 +#: src/frontends/qt4/ui/PrefLatexUi.ui:162 msgid "BibTeX command and options" msgstr "Commande et options BibTeX" -#: src/frontends/qt4/ui/PrefLatexUi.ui:128 -#: src/frontends/qt4/ui/PrefLatexUi.ui:203 +#: src/frontends/qt4/ui/PrefLatexUi.ui:182 +#: src/frontends/qt4/ui/PrefLatexUi.ui:257 msgid "Processor for &Japanese:" msgstr "Processeur pour le &japonais :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:138 +#: src/frontends/qt4/ui/PrefLatexUi.ui:192 msgid "Specific BibTeX command and options for pLaTeX (Japanese)" msgstr "Commande et options bibtex spécifiques pour pLaTeX (japonais)" -#: src/frontends/qt4/ui/PrefLatexUi.ui:160 +#: src/frontends/qt4/ui/PrefLatexUi.ui:214 msgid "Pr&ocessor:" msgstr "Pr&ocesseur :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:186 src/frontends/qt4/GuiPrefs.cpp:801 +#: src/frontends/qt4/ui/PrefLatexUi.ui:240 +#: src/frontends/qt4/GuiPrefs.cpp:799 #: src/frontends/qt4/GuiPrefs.cpp:896 msgid "Op&tions:" msgstr "O&ptions :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:196 +#: src/frontends/qt4/ui/PrefLatexUi.ui:250 msgid "Index command and options (makeindex, xindy)" msgstr "Commande et options d'index (makeindex, xindy)" -#: src/frontends/qt4/ui/PrefLatexUi.ui:213 +#: src/frontends/qt4/ui/PrefLatexUi.ui:267 msgid "Specific index command and options for pLaTeX (Japanese)" msgstr "Commande et options d'indexation spécifiques pour pLaTeX (japonais)" -#: src/frontends/qt4/ui/PrefLatexUi.ui:235 +#: src/frontends/qt4/ui/PrefLatexUi.ui:289 msgid "&Nomenclature command:" msgstr "Commande de &nomenclature :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:245 +#: src/frontends/qt4/ui/PrefLatexUi.ui:299 msgid "Command and options for nomencl (usually makeindex)" msgstr "Commande et options pour nomencl (usuellement makeindex)" -#: src/frontends/qt4/ui/PrefLatexUi.ui:252 +#: src/frontends/qt4/ui/PrefLatexUi.ui:306 msgid "Chec&kTeX command:" msgstr "Commande Chec&kTeX :" -#: src/frontends/qt4/ui/PrefLatexUi.ui:262 +#: src/frontends/qt4/ui/PrefLatexUi.ui:316 msgid "CheckTeX start options and flags" msgstr "Options et drapeaux de CheckTeX" -#: src/frontends/qt4/ui/PrefLatexUi.ui:272 -#, fuzzy +#: src/frontends/qt4/ui/PrefLatexUi.ui:326 msgid "" -"Select whether LyX should output Windows or Cygwin style paths to LaTeX " -"files.\n" -"Change the default only if the TeX engine was not correctly detected at " -"configure time.\n" +"Select whether LyX should output Windows or Cygwin style\n" +"paths to LaTeX files. Don't change the default unless the\n" +"TeX engine was not correctly detected at configure time.\n" "Warning: Your changes here will not be saved." msgstr "" "Choisir le style des chemins d'accès aux fichiers LaTeX\n" @@ -3862,17 +3950,15 @@ msgstr "" "détectée lors de la configuration.\n" "Attention : votre choix ne sera pas enregistré." -#: src/frontends/qt4/ui/PrefLatexUi.ui:278 +#: src/frontends/qt4/ui/PrefLatexUi.ui:332 msgid "&Use Windows-style paths in LaTeX files" msgstr "Utiliser les &chemins Windows dans les fichiers LaTeX" -#: src/frontends/qt4/ui/PrefLatexUi.ui:285 +#: src/frontends/qt4/ui/PrefLatexUi.ui:339 msgid "Set class options to default on class change" -msgstr "" -"Repositionner les options de classe à leur valeur implicite quand la classe " -"change" +msgstr "Repositionner les options de classe à leur valeur implicite quand la classe change" -#: src/frontends/qt4/ui/PrefLatexUi.ui:288 +#: src/frontends/qt4/ui/PrefLatexUi.ui:342 msgid "R&eset class options when document class changes" msgstr "Réinitialiser les options quand la classe de &document change" @@ -3880,16 +3966,10 @@ msgstr "Réinitialiser les options quand la classe de &document change" msgid "Output &line length:" msgstr "&Longueur de la ligne exportée :" -#: src/frontends/qt4/ui/PrefOutputUi.ui:37 src/LyXRC.cpp:3071 -msgid "" -"The maximum line length of exported plain text/LaTeX/SGML files. If set to " -"0, paragraphs are output in a single line; if the line length is > 0, " -"paragraphs are separated by a blank line." -msgstr "" -"Longueur maximale des lignes pour l'exportation vers un fichier texte brut/" -"LaTeX/HTML. Si mise à 0, les paragraphes sont exportés sous la forme d'un " -"ligne unique ; si la longueur de ligne est > 0, les paragraphes sont séparés " -"les uns des autres par une ligne vide." +#: src/frontends/qt4/ui/PrefOutputUi.ui:37 +#: src/LyXRC.cpp:3094 +msgid "The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line." +msgstr "Longueur maximale des lignes pour l'exportation vers un fichier texte brut/LaTeX/HTML. Si mise à 0, les paragraphes sont exportés sous la forme d'un ligne unique ; si la longueur de ligne est > 0, les paragraphes sont séparés les uns des autres par une ligne vide." #: src/frontends/qt4/ui/PrefOutputUi.ui:64 msgid "&Date format:" @@ -3917,9 +3997,7 @@ msgstr "Tous les fichiers" #: src/frontends/qt4/ui/PrefOutputUi.ui:129 msgid "What to do when existing files are going to be overwritten on export." -msgstr "" -"Quoi faire quand les fichiers existants sont susceptibles d'être écrasés " -"lors des exportations." +msgstr "Quoi faire quand les fichiers existants sont susceptibles d'être écrasés lors des exportations." #: src/frontends/qt4/ui/PrefOutputUi.ui:151 msgid "Forward search" @@ -3937,30 +4015,27 @@ msgstr "Commande &PDF :" msgid "&PATH prefix:" msgstr "Préfixe PAT&H :" -#: src/frontends/qt4/ui/PrefPathsUi.ui:51 src/LyXRC.cpp:3311 +#: src/frontends/qt4/ui/PrefPathsUi.ui:51 +#: src/LyXRC.cpp:3338 msgid "" -"Specify those directories which should be prepended to the PATH environment " -"variable.\n" +"Specify those directories which should be prepended to the PATH environment variable.\n" "Use the OS native format." msgstr "" -"Spécifier les répertoires qui doivent être préfixés à la variable " -"d'environnement PATH.\n" +"Spécifier les répertoires qui doivent être préfixés à la variable d'environnement PATH.\n" "Utiliser le format natif du système d'exploitation." #: src/frontends/qt4/ui/PrefPathsUi.ui:58 msgid "TEX&INPUTS prefix:" msgstr "Préfixe TEX&INPUTS :" -#: src/frontends/qt4/ui/PrefPathsUi.ui:68 src/LyXRC.cpp:3470 +#: src/frontends/qt4/ui/PrefPathsUi.ui:68 +#: src/LyXRC.cpp:3497 msgid "" -"Specify those directories which should be prepended to the TEXINPUTS " -"environment variable.\n" +"Specify those directories which should be prepended to the TEXINPUTS environment variable.\n" "A '.' represents the current document directory. Use the OS native format." msgstr "" -"Spécifier les répertoires qui doivent être préfixés à la variable " -"d'environnement TEXINPUTS.\n" -"Un « . » désigne le répertoire courant. Utiliser le format natif du système " -"d'exploitation." +"Spécifier les répertoires qui doivent être préfixés à la variable d'environnement TEXINPUTS.\n" +"Un « . » désigne le répertoire courant. Utiliser le format natif du système d'exploitation." #: src/frontends/qt4/ui/PrefPathsUi.ui:75 #: src/frontends/qt4/ui/PrefPathsUi.ui:98 @@ -4027,9 +4102,7 @@ msgstr "Imprimer dans un &fichier :" #: src/frontends/qt4/ui/PrefPrinterUi.ui:98 msgid "Option used to print to non-default printer." -msgstr "" -"Option à transmettre au programme d'impression pour imprimer sur une " -"imprimante donnée." +msgstr "Option à transmettre au programme d'impression pour imprimer sur une imprimante donnée." #: src/frontends/qt4/ui/PrefPrinterUi.ui:101 msgid "Set &printer:" @@ -4037,9 +4110,7 @@ msgstr "Sélectionner l'imp&rimante :" #: src/frontends/qt4/ui/PrefPrinterUi.ui:114 msgid "Option used with spool command to set printer." -msgstr "" -"Option à utiliser avec la commande de spoule pour désigner l'imprimante à " -"utiliser." +msgstr "Option à utiliser avec la commande de spoule pour désigner l'imprimante à utiliser." #: src/frontends/qt4/ui/PrefPrinterUi.ui:117 msgid "Spool &printer:" @@ -4047,12 +4118,8 @@ msgstr "Imprim&ante de spoule :" # Pas très clair ... #: src/frontends/qt4/ui/PrefPrinterUi.ui:130 -msgid "" -"Setting causes printer command to print to file and then use this actually " -"to print." -msgstr "" -"Cette option fait que la commande d'impression imprime dans un fichier et " -"utilise cette commande pour effectuer l'impression." +msgid "Setting causes printer command to print to file and then use this actually to print." +msgstr "Cette option fait que la commande d'impression imprime dans un fichier et utilise cette commande pour effectuer l'impression." #: src/frontends/qt4/ui/PrefPrinterUi.ui:136 msgid "Spool co&mmand:" @@ -4112,8 +4179,7 @@ msgstr "&Taille de papier :" #: src/frontends/qt4/ui/PrefPrinterUi.ui:279 msgid "Any other options you'd like to use with the printer command." -msgstr "" -"Toutes les autres options que vous voulez ajouter à la commande d'impression." +msgstr "Toutes les autres options que vous voulez ajouter à la commande d'impression." #: src/frontends/qt4/ui/PrefPrinterUi.ui:282 msgid "E&xtra options:" @@ -4121,19 +4187,11 @@ msgstr "A&utres Options :" #: src/frontends/qt4/ui/PrefPrinterUi.ui:298 msgid "Customizes output to a given printer. Expert option." -msgstr "" -"Personnalise la sortie sur une imprimante donnée. Option pour utilisateur " -"expérimenté." +msgstr "Personnalise la sortie sur une imprimante donnée. Option pour utilisateur expérimenté." #: src/frontends/qt4/ui/PrefPrinterUi.ui:301 -msgid "" -"Normally, this needs to be checked only if you are using dvips as your " -"printer command and you have config. files installed for all your " -"printers." -msgstr "" -"En principe, vous n'avez besoin de cocher cette option que si vous utilisez " -"dvips comme commande d'impression et que vous avez des fichiers config." -" installés pour toutes vos imprimantes." +msgid "Normally, this needs to be checked only if you are using dvips as your printer command and you have config. files installed for all your printers." +msgstr "En principe, vous n'avez besoin de cocher cette option que si vous utilisez dvips comme commande d'impression et que vous avez des fichiers config. installés pour toutes vos imprimantes." #: src/frontends/qt4/ui/PrefPrinterUi.ui:304 msgid "Adapt &output to printer" @@ -4212,12 +4270,8 @@ msgid "&Tiny:" msgstr "Min&uscule :" #: src/frontends/qt4/ui/PrefScreenFontsUi.ui:364 -msgid "" -"Checking this improves performance, but might decrease the on-screen quality " -"of fonts" -msgstr "" -"Cocher ceci améliore les performances, mais peut dégrader l'affichage écran " -"des caractères" +msgid "Checking this improves performance, but might decrease the on-screen quality of fonts" +msgstr "Cocher ceci améliore les performances, mais peut dégrader l'affichage écran des caractères" #: src/frontends/qt4/ui/PrefScreenFontsUi.ui:367 msgid "&Use pixmap cache to speed up font rendering" @@ -4237,9 +4291,7 @@ msgstr "Afficher les raccourcis cla&viers contenant :" #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:41 msgid "If unchecked, notes and comments will be excluded from spell checking" -msgstr "" -"Case non cochée, les notes et les commentaires seront exclus de la " -"vérification orthographique" +msgstr "Case non cochée, les notes et les commentaires seront exclus de la vérification orthographique" #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:44 msgid "Spellcheck ¬es and comments" @@ -4266,10 +4318,8 @@ msgid "S&pellcheck continuously" msgstr "Correction &orthographique à la volée" #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:100 -#, fuzzy -msgid "The characters inserted here are ignored by the spellchecker." -msgstr "" -"Les caractères insérés ici seront ignorés par le correcteur orthographique. " +msgid "The characters inserted here are ignored by the spellchecker. " +msgstr "Les caractères insérés ici seront ignorés par le correcteur orthographique. " #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:107 msgid "&Escape characters:" @@ -4305,18 +4355,12 @@ msgid "Automatic help" msgstr "Aide automatique" #: src/frontends/qt4/ui/PrefUi.ui:93 -msgid "" -"Checking this allows the automatic display of helpful comments for insets in " -"the main work area of an edited document" -msgstr "" -"Cocher ceci permet l'affichage automatique de commentaires d'aide pour les " -"inserts dans la zone de travail principale d'un document en cours de " -"modification" +msgid "Checking this allows the automatic display of helpful comments for insets in the main work area of an edited document" +msgstr "Cocher ceci permet l'affichage automatique de commentaires d'aide pour les inserts dans la zone de travail principale d'un document en cours de modification" #: src/frontends/qt4/ui/PrefUi.ui:96 msgid "&Enable tool tips in main work area" -msgstr "" -"Au&toriser l'affichage des bulles d'aide dans la zone de travail principale" +msgstr "Au&toriser l'affichage des bulles d'aide dans la zone de travail principale" #: src/frontends/qt4/ui/PrefUi.ui:106 msgid "Session" @@ -4328,9 +4372,7 @@ msgstr "Restaurer l'apparence et de la &géométrie des fenêtres" #: src/frontends/qt4/ui/PrefUi.ui:125 msgid "Restore to the cursor position when the file was last closed" -msgstr "" -"Restaurer la position qu'avait le curseur quand le fichier a été fermé la " -"dernière fois" +msgstr "Restaurer la position qu'avait le curseur quand le fichier a été fermé la dernière fois" #: src/frontends/qt4/ui/PrefUi.ui:128 msgid "Restore cursor &positions" @@ -4387,16 +4429,16 @@ msgstr "Une seule &instance" #: src/frontends/qt4/ui/PrefUi.ui:272 msgid "Whether to place close button on each tab or only one in the top left." -msgstr "" -"Placer un bouton de fermeture dans chaque onglet ou bien placer un bouton " -"global en haut à gauche." +msgstr "Placer un bouton de fermeture dans chaque onglet ou bien placer un bouton global en haut à gauche." #: src/frontends/qt4/ui/PrefUi.ui:275 msgid "&Single close-tab button" msgstr "Bouton &unique pour fermer les onglets" -#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2649 -#: src/frontends/qt4/GuiView.cpp:2656 src/frontends/qt4/GuiView.cpp:2755 +#: src/frontends/qt4/ui/PrefsUi.ui:70 +#: src/frontends/qt4/GuiView.cpp:2550 +#: src/frontends/qt4/GuiView.cpp:2557 +#: src/frontends/qt4/GuiView.cpp:2656 msgid "&Save" msgstr "&Enregistrer" @@ -4407,9 +4449,7 @@ msgstr "Paramètres de nomenclature" #: src/frontends/qt4/ui/PrintNomenclUi.ui:19 #: src/frontends/qt4/ui/PrintNomenclUi.ui:32 msgid "Define hanging indentation/label length for the nomenclature list." -msgstr "" -"Définir l'indentation du renfoncement/la longueur d'étiquette pour la " -"nomenclature." +msgstr "Définir l'indentation du renfoncement/la longueur d'étiquette pour la nomenclature." #: src/frontends/qt4/ui/PrintNomenclUi.ui:22 msgid "&List Indentation:" @@ -4421,9 +4461,7 @@ msgstr "&Largeur réglable :" #: src/frontends/qt4/ui/PrintNomenclUi.ui:52 msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"." -msgstr "" -"Valeur réglable. Le paramètre « indentation de la liste » doit être établi à " -"« réglable »." +msgstr "Valeur réglable. Le paramètre « indentation de la liste » doit être établi à « réglable »." #: src/frontends/qt4/ui/PrintUi.ui:28 msgid "Pages" @@ -4441,7 +4479,8 @@ msgstr "&À :" msgid "Page number to print to" msgstr "Numéro de la dernière page à imprimer" -#: src/frontends/qt4/ui/PrintUi.ui:88 src/frontends/qt4/ui/PrintUi.ui:101 +#: src/frontends/qt4/ui/PrintUi.ui:88 +#: src/frontends/qt4/ui/PrintUi.ui:101 msgid "Print all pages" msgstr "Imprime toutes les pages" @@ -4506,15 +4545,14 @@ msgstr "I&mprimante :" msgid "Send output to the given printer" msgstr "Envoyer le résultat à l'imprimante spécifiée" -#: src/frontends/qt4/ui/PrintUi.ui:290 src/frontends/qt4/ui/PrintUi.ui:303 +#: src/frontends/qt4/ui/PrintUi.ui:290 +#: src/frontends/qt4/ui/PrintUi.ui:303 msgid "Send output to a file" msgstr "Envoyer le résultat dans un fichier" #: src/frontends/qt4/ui/PrintindexUi.ui:61 msgid "Check if this index should be part (e.g., a section) of the former one." -msgstr "" -"Vérifier si cet index doit être inclus (e.g. comme une section) dans le " -"précédent." +msgstr "Vérifier si cet index doit être inclus (e.g. comme une section) dans le précédent." #: src/frontends/qt4/ui/PrintindexUi.ui:64 msgid "&Subindex" @@ -4529,7 +4567,8 @@ msgid "Select the index that shall be printed at this place of the document." msgstr "Sélectionner l'index qui sera imprimé à cet endroit du document." #: src/frontends/qt4/ui/ProgressViewUi.ui:90 -#: src/frontends/qt4/GuiDocument.cpp:1430 src/frontends/qt4/GuiPrefs.cpp:254 +#: src/frontends/qt4/GuiDocument.cpp:1324 +#: src/frontends/qt4/GuiPrefs.cpp:254 msgid "Output" msgstr "Sortie" @@ -4543,8 +4582,7 @@ msgstr "Sélectionner les messages d'analyse qui doivent être affichés" #: src/frontends/qt4/ui/ProgressViewUi.ui:173 msgid "Automatic cleanup of the window before LaTeX compilation proceeds" -msgstr "" -"Nettoyage automatique de la la fenêtre avant le début de la compilation" +msgstr "Nettoyage automatique de la la fenêtre avant le début de la compilation" #: src/frontends/qt4/ui/ProgressViewUi.ui:176 msgid "&Clear automatically" @@ -4607,12 +4645,8 @@ msgid "Case-sensiti&ve" msgstr "Selon la &casse" #: src/frontends/qt4/ui/RefUi.ui:127 -msgid "" -"Sort labels in alphabetical order (case-insensitively unless the Case-" -"sensitive option is checked)" -msgstr "" -"Trier le étiquettes par ordre alphabétique (quelle que soit la casse sauf si " -"l'option « Selon la casse » est cochée)" +msgid "Sort labels in alphabetical order (case-insensitively unless the Case-sensitive option is checked)" +msgstr "Trier le étiquettes par ordre alphabétique (quelle que soit la casse sauf si l'option « Selon la casse » est cochée)" #: src/frontends/qt4/ui/RefUi.ui:130 msgid "&Sort" @@ -4634,7 +4668,8 @@ msgstr "Classer les étiquettes par préfixe (e.g. « sec: »)" msgid "Grou&p" msgstr "Grou&pe" -#: src/frontends/qt4/ui/RefUi.ui:181 src/frontends/qt4/GuiRef.cpp:314 +#: src/frontends/qt4/ui/RefUi.ui:181 +#: src/frontends/qt4/GuiRef.cpp:308 msgid "&Go to Label" msgstr "A&ller à l'étiquette" @@ -4684,9 +4719,7 @@ msgstr "&Mots complets seulement" #: src/frontends/qt4/ui/SendtoUi.ui:42 msgid "Process the converted file with this command ($$FName = file name)" -msgstr "" -"Traiter le fichier à convertir avec cette commande ($$FName pour le nom du " -"fichier)" +msgstr "Traiter le fichier à convertir avec cette commande ($$FName pour le nom du fichier)" #: src/frontends/qt4/ui/SendtoUi.ui:101 msgid "&Export formats:" @@ -4730,23 +4763,18 @@ msgid "&Function:" msgstr "&Fonction :" #: src/frontends/qt4/ui/ShortcutUi.ui:130 -msgid "" -"Type shortcut after clicking on this field. You can reset the content with " -"the 'Clear' button" -msgstr "" -"Saisir le raccourci après un clic dans ce champ. Vous pouvez effacer le " -"contenu à l'aide du bouton 'Effacer'" +msgid "Type shortcut after clicking on this field. You can reset the content with the 'Clear' button" +msgstr "Saisir le raccourci après un clic dans ce champ. Vous pouvez effacer le contenu à l'aide du bouton 'Effacer'" #: src/frontends/qt4/ui/SpellcheckerUi.ui:19 #: src/frontends/qt4/GuiSpellchecker.cpp:251 #: src/frontends/qt4/GuiSpellchecker.cpp:258 -#: src/frontends/qt4/GuiSpellchecker.cpp:529 +#: src/frontends/qt4/GuiSpellchecker.cpp:539 msgid "Spell Checker" msgstr "Correcteur orthographique" #: src/frontends/qt4/ui/SpellcheckerUi.ui:43 -msgid "" -"The checked language. Switching this alters the language of the checked word." +msgid "The checked language. Switching this alters the language of the checked word." msgstr "Langue de correction. Commuter ceci modifie la langue du mot vérifié." #: src/frontends/qt4/ui/SpellcheckerUi.ui:59 @@ -4798,12 +4826,8 @@ msgid "Add the word to your personal dictionary" msgstr "Ajouter le mot au dictionnaire personnel" #: src/frontends/qt4/ui/SymbolsUi.ui:83 -msgid "" -"Available categories depend on the document encoding. Select UTF-8 for the " -"full range." -msgstr "" -"Les catégories disponibles dépendent de l'encodage du document. Sélectionner " -"UTF-8 pour accéder à toutes." +msgid "Available categories depend on the document encoding. Select UTF-8 for the full range." +msgstr "Les catégories disponibles dépendent de l'encodage du document. Sélectionner UTF-8 pour accéder à toutes." #: src/frontends/qt4/ui/SymbolsUi.ui:86 msgid "Ca&tegory:" @@ -4833,12 +4857,14 @@ msgstr "Alignement &horizontal :" msgid "Horizontal alignment in column" msgstr "Alignement horizontal dans la colonne" -#: src/frontends/qt4/ui/TabularUi.ui:64 src/frontends/qt4/GuiParagraph.cpp:108 -#: src/frontends/qt4/GuiTabular.cpp:803 +#: src/frontends/qt4/ui/TabularUi.ui:64 +#: src/frontends/qt4/GuiParagraph.cpp:108 +#: src/frontends/qt4/GuiTabular.cpp:792 msgid "Justified" msgstr "Justifié" -#: src/frontends/qt4/ui/TabularUi.ui:84 src/frontends/qt4/GuiTabular.cpp:805 +#: src/frontends/qt4/ui/TabularUi.ui:84 +#: src/frontends/qt4/GuiTabular.cpp:794 msgid "At Decimal Separator" msgstr "Au séparateur décimal" @@ -4855,12 +4881,8 @@ msgid "&Vertical alignment in row:" msgstr "Alignement &vertical dans la ligne :" #: src/frontends/qt4/ui/TabularUi.ui:206 -msgid "" -"Specifies the vertical alignment of this cell in relation to the baseline of " -"the row." -msgstr "" -"Spécifier l'alignement vertical de cette cellule par rapport à la base de la " -"ligne." +msgid "Specifies the vertical alignment of this cell in relation to the baseline of the row." +msgstr "Spécifier l'alignement vertical de cette cellule par rapport à la base de la ligne." #: src/frontends/qt4/ui/TabularUi.ui:228 msgid "Merge cells of different columns" @@ -4964,9 +4986,7 @@ msgstr "Enlever toutes les bordures des cases sélectionnées" #: src/frontends/qt4/ui/TabularUi.ui:972 msgid "Use formal (a.k.a. booktabs) border style (no vertical borders)" -msgstr "" -"Utiliser le style de bordures formel (c.-à-d. booktabs), sans bordures " -"verticales" +msgstr "Utiliser le style de bordures formel (c.-à-d. booktabs), sans bordures verticales" #: src/frontends/qt4/ui/TabularUi.ui:975 msgid "Fo&rmal" @@ -5040,8 +5060,9 @@ msgstr "Répèter cette ligne comme en-tête de toutes les pages sauf la premiè #: src/frontends/qt4/ui/TabularUi.ui:1242 #: src/frontends/qt4/ui/TabularUi.ui:1283 #: src/frontends/qt4/ui/TabularUi.ui:1314 -#: src/frontends/qt4/ui/TabularUi.ui:1352 src/frontends/qt4/GuiToolbar.cpp:361 -#: src/frontends/qt4/GuiToolbar.cpp:370 +#: src/frontends/qt4/ui/TabularUi.ui:1352 +#: src/frontends/qt4/GuiToolbar.cpp:385 +#: src/frontends/qt4/GuiToolbar.cpp:394 msgid "on" msgstr "activé" @@ -5134,15 +5155,12 @@ msgid "Rebuild the file lists" msgstr "Reconstruire la liste des fichiers" #: src/frontends/qt4/ui/TexinfoUi.ui:104 -msgid "" -"Show contents of marked file. Only possible when files are shown with path" -msgstr "" -"Afficher le contenu du fichier sélectionné. Seulement possible quand le " -"chemin est affiché." +msgid "Show contents of marked file. Only possible when files are shown with path" +msgstr "Afficher le contenu du fichier sélectionné. Seulement possible quand le chemin est affiché." #: src/frontends/qt4/ui/TexinfoUi.ui:107 msgid "&View" -msgstr "&Visionner" +msgstr "&Affichage" #: src/frontends/qt4/ui/TexinfoUi.ui:124 msgid "Selected classes or styles" @@ -5160,77 +5178,62 @@ msgstr "Styles LaTeX" msgid "BibTeX styles" msgstr "Styles BibTeX" -#: src/frontends/qt4/ui/TexinfoUi.ui:143 -#, fuzzy -msgid "BibTeX databases" -msgstr "Base de données BibTeX à utiliser" - -#: src/frontends/qt4/ui/TexinfoUi.ui:167 +#: src/frontends/qt4/ui/TexinfoUi.ui:162 msgid "Toggles view of the file list" msgstr "Basculer la vue de la liste des fichiers" -#: src/frontends/qt4/ui/TexinfoUi.ui:170 +#: src/frontends/qt4/ui/TexinfoUi.ui:165 msgid "Show &path" msgstr "&Afficher le chemin" -#: src/frontends/qt4/ui/TextLayoutUi.ui:20 +#: src/frontends/qt4/ui/TextLayoutUi.ui:19 msgid "Separate paragraphs with" msgstr "Séparer les paragraphes avec" -#: src/frontends/qt4/ui/TextLayoutUi.ui:35 +#: src/frontends/qt4/ui/TextLayoutUi.ui:34 msgid "Indent consecutive paragraphs" msgstr "Les paragraphes successifs sont indentés" -#: src/frontends/qt4/ui/TextLayoutUi.ui:38 +#: src/frontends/qt4/ui/TextLayoutUi.ui:37 msgid "&Indentation:" msgstr "&Indentation :" -#: src/frontends/qt4/ui/TextLayoutUi.ui:48 +#: src/frontends/qt4/ui/TextLayoutUi.ui:47 msgid "Size of the indentation" msgstr "Taille de l'indentation" -#: src/frontends/qt4/ui/TextLayoutUi.ui:116 +#: src/frontends/qt4/ui/TextLayoutUi.ui:115 msgid "&Vertical space:" msgstr "&Espacement vertical :" -#: src/frontends/qt4/ui/TextLayoutUi.ui:126 +#: src/frontends/qt4/ui/TextLayoutUi.ui:125 msgid "Size of the vertical space" msgstr "Taille de l'espacement vertical" -#: src/frontends/qt4/ui/TextLayoutUi.ui:191 +#: src/frontends/qt4/ui/TextLayoutUi.ui:190 msgid "Spacing" msgstr "Espacement" -#: src/frontends/qt4/ui/TextLayoutUi.ui:209 +#: src/frontends/qt4/ui/TextLayoutUi.ui:208 msgid "&Line spacing:" msgstr "&Interligne :" -#: src/frontends/qt4/ui/TextLayoutUi.ui:219 +#: src/frontends/qt4/ui/TextLayoutUi.ui:218 msgid "Spacing type" msgstr "Type d'espacement" -#: src/frontends/qt4/ui/TextLayoutUi.ui:232 +#: src/frontends/qt4/ui/TextLayoutUi.ui:231 msgid "Number of lines" msgstr "Nombre de lignes" -#: src/frontends/qt4/ui/TextLayoutUi.ui:271 +#: src/frontends/qt4/ui/TextLayoutUi.ui:251 msgid "Format text into two columns" msgstr "Mettre le texte en page sur deux colonnes" -#: src/frontends/qt4/ui/TextLayoutUi.ui:274 +#: src/frontends/qt4/ui/TextLayoutUi.ui:254 msgid "Two-&column document" msgstr "Document sur &deux colonnes" -#: src/frontends/qt4/ui/TextLayoutUi.ui:281 -msgid "" -"Justify text in the LyX editor (this does not affect whether the text is " -"justified in the output)" -msgstr "" - -#: src/frontends/qt4/ui/TextLayoutUi.ui:284 -msgid "Use &justification in LyX work area" -msgstr "" - #: src/frontends/qt4/ui/ThesaurusUi.ui:32 msgid "Language of the thesaurus" msgstr "Langue du dictionnaire des synonymes" @@ -5277,19 +5280,17 @@ msgid "Enter string to filter contents" msgstr "Saisir une chaîne de caractères pour filtrer le contenu" #: src/frontends/qt4/ui/TocUi.ui:63 -msgid "" -"Switch between available lists (table of contents, list of figures, list of " -"tables, and others)" -msgstr "" -"Permuter entre la table des matières, la liste des figures, la liste des " -"tableaux, et autres" +msgid "Switch between available lists (table of contents, list of figures, list of tables, and others)" +msgstr "Permuter entre la table des matières, la liste des figures, la liste des tableaux, et autres" #: src/frontends/qt4/ui/TocUi.ui:90 msgid "Update navigation tree" msgstr "Mettre à jour l'arborescence" -#: src/frontends/qt4/ui/TocUi.ui:93 src/frontends/qt4/ui/TocUi.ui:125 -#: src/frontends/qt4/ui/TocUi.ui:144 src/frontends/qt4/ui/TocUi.ui:163 +#: src/frontends/qt4/ui/TocUi.ui:93 +#: src/frontends/qt4/ui/TocUi.ui:125 +#: src/frontends/qt4/ui/TocUi.ui:144 +#: src/frontends/qt4/ui/TocUi.ui:163 #: src/frontends/qt4/ui/TocUi.ui:182 msgid "..." msgstr "..." @@ -5346,15 +5347,18 @@ msgstr "Conserver l'espacement même après un saut de page" msgid "DefSkip" msgstr "Implicite" -#: src/frontends/qt4/ui/VSpaceUi.ui:87 src/frontends/qt4/GuiDocument.cpp:766 +#: src/frontends/qt4/ui/VSpaceUi.ui:87 +#: src/frontends/qt4/GuiDocument.cpp:687 msgid "SmallSkip" msgstr "Petit" -#: src/frontends/qt4/ui/VSpaceUi.ui:92 src/frontends/qt4/GuiDocument.cpp:767 +#: src/frontends/qt4/ui/VSpaceUi.ui:92 +#: src/frontends/qt4/GuiDocument.cpp:688 msgid "MedSkip" msgstr "Moyen" -#: src/frontends/qt4/ui/VSpaceUi.ui:97 src/frontends/qt4/GuiDocument.cpp:768 +#: src/frontends/qt4/ui/VSpaceUi.ui:97 +#: src/frontends/qt4/GuiDocument.cpp:689 msgid "BigSkip" msgstr "Grand" @@ -5362,35 +5366,31 @@ msgstr "Grand" msgid "VFill" msgstr "Ressort vertical" -#: src/frontends/qt4/ui/ViewSourceUi.ui:33 -#, fuzzy +#: src/frontends/qt4/ui/ViewSourceUi.ui:32 msgid "F&ormat:" msgstr "&Format :" -#: src/frontends/qt4/ui/ViewSourceUi.ui:46 +#: src/frontends/qt4/ui/ViewSourceUi.ui:45 msgid "Select the output format" msgstr "Sélectionner le format de sortie" -#: src/frontends/qt4/ui/ViewSourceUi.ui:57 -#, fuzzy +#: src/frontends/qt4/ui/ViewSourceUi.ui:56 msgid "Current Paragraph" -msgstr "In&denter paragraphe" +msgstr "Paragraphe courant" -#: src/frontends/qt4/ui/ViewSourceUi.ui:62 -#, fuzzy +#: src/frontends/qt4/ui/ViewSourceUi.ui:61 msgid "Complete Source" msgstr "Code source complet" -#: src/frontends/qt4/ui/ViewSourceUi.ui:67 +#: src/frontends/qt4/ui/ViewSourceUi.ui:66 msgid "Preamble Only" -msgstr "" +msgstr "Seulement le préambule" -#: src/frontends/qt4/ui/ViewSourceUi.ui:72 -#, fuzzy +#: src/frontends/qt4/ui/ViewSourceUi.ui:71 msgid "Body Only" -msgstr "Seulement" +msgstr "Seulement le corps" -#: src/frontends/qt4/ui/ViewSourceUi.ui:80 +#: src/frontends/qt4/ui/ViewSourceUi.ui:89 msgid "Automatic update" msgstr "Mise à jour automatique" @@ -5442,57 +5442,99 @@ msgstr "Cocher ici pour permettre un placement flexible" msgid "Allow &floating" msgstr "Autoriser le &flottement" -#: lib/layouts/AEA.layout:55 lib/layouts/apa.layout:92 +#: lib/layouts/AEA.layout:55 +#: lib/layouts/apa.layout:92 msgid "ShortTitle" msgstr "TitreCourt" -#: lib/layouts/AEA.layout:56 lib/layouts/AEA.layout:99 -#: lib/layouts/IEEEtran.layout:68 lib/layouts/IEEEtran.layout:117 -#: lib/layouts/IEEEtran.layout:158 lib/layouts/IEEEtran.layout:192 -#: lib/layouts/aa.layout:124 lib/layouts/aa.layout:147 -#: lib/layouts/aa.layout:162 lib/layouts/aa.layout:186 -#: lib/layouts/aa.layout:326 lib/layouts/aastex.layout:276 -#: lib/layouts/aastex.layout:293 lib/layouts/aastex.layout:333 -#: lib/layouts/aastex.layout:359 lib/layouts/aastex.layout:398 -#: lib/layouts/achemso.layout:57 lib/layouts/achemso.layout:190 -#: lib/layouts/acmsiggraph.layout:68 lib/layouts/acmsiggraph.layout:114 -#: lib/layouts/acmsiggraph.layout:141 lib/layouts/agutex.layout:58 -#: lib/layouts/agutex.layout:75 lib/layouts/agutex.layout:116 -#: lib/layouts/agutex.layout:134 lib/layouts/ectaart.layout:22 -#: lib/layouts/ectaart.layout:47 lib/layouts/ectaart.layout:70 -#: lib/layouts/elsarticle.layout:58 lib/layouts/elsarticle.layout:83 -#: lib/layouts/elsarticle.layout:126 lib/layouts/elsarticle.layout:145 -#: lib/layouts/elsarticle.layout:223 lib/layouts/elsarticle.layout:251 -#: lib/layouts/elsarticle.layout:280 lib/layouts/entcs.layout:74 -#: lib/layouts/ijmpc.layout:66 lib/layouts/ijmpc.layout:85 -#: lib/layouts/ijmpc.layout:103 lib/layouts/ijmpc.layout:121 -#: lib/layouts/ijmpc.layout:156 lib/layouts/ijmpc.layout:204 -#: lib/layouts/ijmpd.layout:71 lib/layouts/ijmpd.layout:90 -#: lib/layouts/ijmpd.layout:108 lib/layouts/ijmpd.layout:126 -#: lib/layouts/ijmpd.layout:146 lib/layouts/ijmpd.layout:211 -#: lib/layouts/ijmpd.layout:223 lib/layouts/iopart.layout:60 -#: lib/layouts/iopart.layout:130 lib/layouts/iopart.layout:149 -#: lib/layouts/iopart.layout:174 lib/layouts/iopart.layout:203 -#: lib/layouts/jasatex.layout:61 lib/layouts/jasatex.layout:82 -#: lib/layouts/jasatex.layout:102 lib/layouts/jasatex.layout:140 -#: lib/layouts/jasatex.layout:160 lib/layouts/jasatex.layout:189 -#: lib/layouts/revtex4-1.layout:79 lib/layouts/revtex4-1.layout:164 -#: lib/layouts/revtex4-1.layout:183 lib/layouts/revtex4.layout:103 -#: lib/layouts/revtex4.layout:133 lib/layouts/revtex4.layout:250 -#: lib/layouts/siamltex.layout:279 lib/layouts/siamltex.layout:299 -#: lib/layouts/sigplanconf.layout:71 lib/layouts/sigplanconf.layout:124 -#: lib/layouts/sigplanconf.layout:157 lib/layouts/svmult.layout:48 -#: lib/layouts/svmult.layout:98 lib/layouts/tufte-handout.layout:49 -#: lib/layouts/amsdefs.inc:25 lib/layouts/amsdefs.inc:48 -#: lib/layouts/amsdefs.inc:68 lib/layouts/amsdefs.inc:92 -#: lib/layouts/amsdefs.inc:119 lib/layouts/lyxmacros.inc:45 -#: lib/layouts/lyxmacros.inc:66 lib/layouts/stdstruct.inc:16 -#: lib/layouts/stdtitle.inc:58 lib/layouts/stdtitle.inc:79 -#: lib/layouts/stdtitle.inc:98 lib/layouts/svcommon.inc:348 -#: lib/layouts/svcommon.inc:372 lib/layouts/svcommon.inc:423 -#: lib/layouts/svcommon.inc:460 lib/layouts/svcommon.inc:478 -#: lib/layouts/svcommon.inc:499 lib/layouts/svcommon.inc:523 -#: lib/layouts/bicaption.module:13 +#: lib/layouts/AEA.layout:56 +#: lib/layouts/AEA.layout:99 +#: lib/layouts/IEEEtran.layout:68 +#: lib/layouts/IEEEtran.layout:117 +#: lib/layouts/IEEEtran.layout:158 +#: lib/layouts/IEEEtran.layout:192 +#: lib/layouts/aa.layout:124 +#: lib/layouts/aa.layout:147 +#: lib/layouts/aa.layout:162 +#: lib/layouts/aa.layout:186 +#: lib/layouts/aa.layout:326 +#: lib/layouts/aastex.layout:276 +#: lib/layouts/aastex.layout:293 +#: lib/layouts/aastex.layout:333 +#: lib/layouts/aastex.layout:359 +#: lib/layouts/aastex.layout:398 +#: lib/layouts/achemso.layout:57 +#: lib/layouts/achemso.layout:190 +#: lib/layouts/acmsiggraph.layout:68 +#: lib/layouts/acmsiggraph.layout:114 +#: lib/layouts/acmsiggraph.layout:141 +#: lib/layouts/agutex.layout:58 +#: lib/layouts/agutex.layout:75 +#: lib/layouts/agutex.layout:116 +#: lib/layouts/agutex.layout:134 +#: lib/layouts/ectaart.layout:22 +#: lib/layouts/ectaart.layout:47 +#: lib/layouts/ectaart.layout:70 +#: lib/layouts/elsarticle.layout:59 +#: lib/layouts/elsarticle.layout:102 +#: lib/layouts/elsarticle.layout:121 +#: lib/layouts/elsarticle.layout:199 +#: lib/layouts/elsarticle.layout:227 +#: lib/layouts/elsarticle.layout:256 +#: lib/layouts/entcs.layout:74 +#: lib/layouts/ijmpc.layout:54 +#: lib/layouts/ijmpc.layout:73 +#: lib/layouts/ijmpc.layout:91 +#: lib/layouts/ijmpc.layout:109 +#: lib/layouts/ijmpc.layout:144 +#: lib/layouts/ijmpc.layout:192 +#: lib/layouts/ijmpd.layout:59 +#: lib/layouts/ijmpd.layout:78 +#: lib/layouts/ijmpd.layout:96 +#: lib/layouts/ijmpd.layout:114 +#: lib/layouts/ijmpd.layout:134 +#: lib/layouts/ijmpd.layout:199 +#: lib/layouts/ijmpd.layout:211 +#: lib/layouts/iopart.layout:60 +#: lib/layouts/iopart.layout:130 +#: lib/layouts/iopart.layout:149 +#: lib/layouts/iopart.layout:174 +#: lib/layouts/iopart.layout:203 +#: lib/layouts/jasatex.layout:61 +#: lib/layouts/jasatex.layout:82 +#: lib/layouts/jasatex.layout:102 +#: lib/layouts/jasatex.layout:140 +#: lib/layouts/jasatex.layout:160 +#: lib/layouts/jasatex.layout:189 +#: lib/layouts/revtex4.layout:112 +#: lib/layouts/revtex4.layout:150 +#: lib/layouts/revtex4.layout:247 +#: lib/layouts/siamltex.layout:280 +#: lib/layouts/siamltex.layout:300 +#: lib/layouts/sigplanconf.layout:71 +#: lib/layouts/sigplanconf.layout:124 +#: lib/layouts/sigplanconf.layout:157 +#: lib/layouts/svmult.layout:48 +#: lib/layouts/svmult.layout:98 +#: lib/layouts/tufte-handout.layout:49 +#: lib/layouts/amsdefs.inc:25 +#: lib/layouts/amsdefs.inc:48 +#: lib/layouts/amsdefs.inc:68 +#: lib/layouts/amsdefs.inc:92 +#: lib/layouts/amsdefs.inc:119 +#: lib/layouts/lyxmacros.inc:45 +#: lib/layouts/lyxmacros.inc:66 +#: lib/layouts/stdstruct.inc:16 +#: lib/layouts/stdtitle.inc:60 +#: lib/layouts/stdtitle.inc:81 +#: lib/layouts/stdtitle.inc:100 +#: lib/layouts/svcommon.inc:348 +#: lib/layouts/svcommon.inc:372 +#: lib/layouts/svcommon.inc:423 +#: lib/layouts/svcommon.inc:460 +#: lib/layouts/svcommon.inc:478 +#: lib/layouts/svcommon.inc:499 +#: lib/layouts/svcommon.inc:523 msgid "FrontMatter" msgstr "Préliminaires" @@ -5528,45 +5570,78 @@ msgstr "Parution de la publication" msgid "Publication Issue:" msgstr "Parution de la publication :" -#: lib/layouts/AEA.layout:94 lib/layouts/IEEEtran.layout:188 -#: lib/layouts/aa.layout:88 lib/layouts/aa.layout:322 -#: lib/layouts/aa.layout:338 lib/layouts/aapaper.layout:100 -#: lib/layouts/aapaper.layout:203 lib/layouts/aastex.layout:113 -#: lib/layouts/aastex.layout:252 lib/layouts/achemso.layout:186 -#: lib/layouts/achemso.layout:203 lib/layouts/acmsiggraph.layout:110 -#: lib/layouts/acmsiggraph.layout:126 lib/layouts/agutex.layout:130 -#: lib/layouts/apa.layout:70 lib/layouts/cl2emult.layout:81 -#: lib/layouts/cl2emult.layout:92 lib/layouts/ectaart.layout:42 -#: lib/layouts/ectaart.layout:55 lib/layouts/egs.layout:484 -#: lib/layouts/elsart.layout:205 lib/layouts/elsart.layout:220 -#: lib/layouts/elsarticle.layout:247 lib/layouts/elsarticle.layout:264 -#: lib/layouts/entcs.layout:85 lib/layouts/foils.layout:147 -#: lib/layouts/ijmpc.layout:200 lib/layouts/ijmpd.layout:207 -#: lib/layouts/iopart.layout:170 lib/layouts/iopart.layout:187 -#: lib/layouts/isprs.layout:25 lib/layouts/jasatex.layout:156 -#: lib/layouts/jasatex.layout:173 lib/layouts/kluwer.layout:259 -#: lib/layouts/latex8.layout:107 lib/layouts/llncs.layout:242 -#: lib/layouts/ltugboat.layout:171 lib/layouts/ltugboat.layout:185 -#: lib/layouts/paper.layout:130 lib/layouts/revtex.layout:139 -#: lib/layouts/revtex4-1.layout:73 lib/layouts/revtex4.layout:223 -#: lib/layouts/siamltex.layout:251 lib/layouts/sigplanconf.layout:153 -#: lib/layouts/sigplanconf.layout:169 lib/layouts/spie.layout:75 -#: lib/layouts/svglobal.layout:149 lib/layouts/svjog.layout:153 -#: lib/layouts/svmono.layout:20 lib/layouts/svmult.layout:95 -#: lib/layouts/svmult.layout:99 lib/layouts/svprobth.layout:183 -#: lib/layouts/tufte-handout.layout:45 lib/layouts/tufte-handout.layout:60 -#: lib/layouts/agu_stdtitle.inc:193 lib/layouts/amsdefs.inc:91 -#: lib/layouts/db_stdstruct.inc:11 lib/layouts/scrclass.inc:239 -#: lib/layouts/stdstruct.inc:12 lib/layouts/stdstruct.inc:27 -#: lib/layouts/svcommon.inc:422 lib/layouts/svcommon.inc:428 -#: src/output_plaintext.cpp:138 +#: lib/layouts/AEA.layout:94 +#: lib/layouts/IEEEtran.layout:188 +#: lib/layouts/aa.layout:88 +#: lib/layouts/aa.layout:322 +#: lib/layouts/aa.layout:338 +#: lib/layouts/aapaper.layout:100 +#: lib/layouts/aapaper.layout:203 +#: lib/layouts/aastex.layout:113 +#: lib/layouts/aastex.layout:252 +#: lib/layouts/achemso.layout:186 +#: lib/layouts/achemso.layout:203 +#: lib/layouts/acmsiggraph.layout:110 +#: lib/layouts/acmsiggraph.layout:126 +#: lib/layouts/agutex.layout:130 +#: lib/layouts/apa.layout:70 +#: lib/layouts/cl2emult.layout:81 +#: lib/layouts/cl2emult.layout:92 +#: lib/layouts/ectaart.layout:42 +#: lib/layouts/ectaart.layout:55 +#: lib/layouts/egs.layout:484 +#: lib/layouts/elsart.layout:205 +#: lib/layouts/elsart.layout:220 +#: lib/layouts/elsarticle.layout:223 +#: lib/layouts/elsarticle.layout:240 +#: lib/layouts/entcs.layout:85 +#: lib/layouts/foils.layout:147 +#: lib/layouts/ijmpc.layout:188 +#: lib/layouts/ijmpd.layout:195 +#: lib/layouts/iopart.layout:170 +#: lib/layouts/iopart.layout:187 +#: lib/layouts/isprs.layout:25 +#: lib/layouts/jasatex.layout:156 +#: lib/layouts/jasatex.layout:173 +#: lib/layouts/kluwer.layout:259 +#: lib/layouts/latex8.layout:107 +#: lib/layouts/llncs.layout:242 +#: lib/layouts/ltugboat.layout:171 +#: lib/layouts/ltugboat.layout:185 +#: lib/layouts/paper.layout:130 +#: lib/layouts/revtex.layout:139 +#: lib/layouts/revtex4.layout:220 +#: lib/layouts/siamltex.layout:252 +#: lib/layouts/sigplanconf.layout:153 +#: lib/layouts/sigplanconf.layout:169 +#: lib/layouts/spie.layout:75 +#: lib/layouts/svglobal.layout:37 +#: lib/layouts/svjog.layout:40 +#: lib/layouts/svmono.layout:20 +#: lib/layouts/svmult.layout:95 +#: lib/layouts/svmult.layout:99 +#: lib/layouts/tufte-handout.layout:45 +#: lib/layouts/tufte-handout.layout:60 +#: lib/layouts/agu_stdtitle.inc:193 +#: lib/layouts/amsdefs.inc:91 +#: lib/layouts/db_stdstruct.inc:11 +#: lib/layouts/scrclass.inc:239 +#: lib/layouts/stdstruct.inc:12 +#: lib/layouts/stdstruct.inc:27 +#: lib/layouts/svcommon.inc:422 +#: lib/layouts/svcommon.inc:428 +#: src/output_plaintext.cpp:133 msgid "Abstract" msgstr "Résumé" -#: lib/layouts/AEA.layout:98 lib/layouts/aa.layout:91 -#: lib/layouts/aa.layout:205 lib/layouts/aapaper.layout:103 -#: lib/layouts/egs.layout:530 lib/layouts/elsart.layout:424 -#: lib/layouts/svmult.layout:146 lib/layouts/aapaper.inc:80 +#: lib/layouts/AEA.layout:98 +#: lib/layouts/aa.layout:91 +#: lib/layouts/aa.layout:205 +#: lib/layouts/aapaper.layout:103 +#: lib/layouts/egs.layout:530 +#: lib/layouts/elsart.layout:424 +#: lib/layouts/svmult.layout:146 +#: lib/layouts/aapaper.inc:80 #: lib/layouts/svcommon.inc:535 #: lib/layouts/theorems-ams-extended-bytype.module:304 #: lib/layouts/theorems-ams-extended-bytype.module:313 @@ -5581,45 +5656,69 @@ msgstr "Résumé" msgid "Acknowledgement" msgstr "Remerciements" -#: lib/layouts/AEA.layout:100 lib/layouts/egs.layout:544 +#: lib/layouts/AEA.layout:100 +#: lib/layouts/egs.layout:544 #: lib/layouts/theorems-ams-extended-bytype.module:325 #: lib/layouts/theorems-ams-extended.module:296 msgid "Acknowledgement." msgstr "Remerciements." -#: lib/layouts/AEA.layout:105 lib/layouts/IEEEtran.layout:290 -#: lib/layouts/beamer.layout:1053 lib/layouts/elsart.layout:259 -#: lib/layouts/foils.layout:218 lib/layouts/heb-article.layout:18 -#: lib/layouts/ijmpc.layout:318 lib/layouts/ijmpc.layout:335 -#: lib/layouts/ijmpd.layout:321 lib/layouts/ijmpd.layout:341 -#: lib/layouts/llncs.layout:417 lib/layouts/siamltex.layout:66 -#: lib/layouts/siamltex.layout:116 lib/layouts/svcommon.inc:626 +#: lib/layouts/AEA.layout:105 +#: lib/layouts/IEEEtran.layout:290 +#: lib/layouts/beamer.layout:1097 +#: lib/layouts/elsart.layout:259 +#: lib/layouts/foils.layout:218 +#: lib/layouts/heb-article.layout:18 +#: lib/layouts/ijmpc.layout:305 +#: lib/layouts/ijmpc.layout:308 +#: lib/layouts/ijmpc.layout:330 +#: lib/layouts/ijmpd.layout:311 +#: lib/layouts/ijmpd.layout:330 +#: lib/layouts/ijmpd.layout:333 +#: lib/layouts/ijmpd.layout:351 +#: lib/layouts/llncs.layout:417 +#: lib/layouts/siamltex.layout:67 +#: lib/layouts/siamltex.layout:117 +#: lib/layouts/svcommon.inc:626 #: lib/layouts/theorems-ams-bytype.inc:50 #: lib/layouts/theorems-ams-bytype.inc:51 #: lib/layouts/theorems-ams-bytype.inc:82 -#: lib/layouts/theorems-ams-bytype.inc:85 lib/layouts/theorems-ams.inc:24 -#: lib/layouts/theorems-ams.inc:25 lib/layouts/theorems-ams.inc:56 -#: lib/layouts/theorems-ams.inc:59 lib/layouts/theorems-bytype.inc:26 -#: lib/layouts/theorems-bytype.inc:27 lib/layouts/theorems-bytype.inc:58 -#: lib/layouts/theorems-bytype.inc:61 lib/layouts/theorems-case.inc:28 -#: lib/layouts/theorems-order.inc:7 lib/layouts/theorems-proof.inc:14 +#: lib/layouts/theorems-ams-bytype.inc:85 +#: lib/layouts/theorems-ams.inc:24 +#: lib/layouts/theorems-ams.inc:25 +#: lib/layouts/theorems-ams.inc:56 +#: lib/layouts/theorems-ams.inc:59 +#: lib/layouts/theorems-bytype.inc:26 +#: lib/layouts/theorems-bytype.inc:27 +#: lib/layouts/theorems-bytype.inc:58 +#: lib/layouts/theorems-bytype.inc:61 +#: lib/layouts/theorems-case.inc:28 +#: lib/layouts/theorems-order.inc:7 +#: lib/layouts/theorems-proof.inc:14 #: lib/layouts/theorems-starred-equivalents.inc:6 -#: lib/layouts/theorems-starred.inc:24 lib/layouts/theorems-starred.inc:54 +#: lib/layouts/theorems-starred.inc:24 +#: lib/layouts/theorems-starred.inc:54 #: lib/layouts/theorems-starred.inc:57 #: lib/layouts/theorems-without-preamble.inc:34 #: lib/layouts/theorems-without-preamble.inc:35 #: lib/layouts/theorems-without-preamble.inc:62 -#: lib/layouts/theorems-without-preamble.inc:65 lib/layouts/theorems.inc:24 -#: lib/layouts/theorems.inc:25 lib/layouts/theorems.inc:56 -#: lib/layouts/theorems.inc:59 lib/layouts/theorems-chap-bytype.module:54 -#: lib/layouts/theorems-chap.module:19 lib/layouts/theorems-named.module:13 +#: lib/layouts/theorems-without-preamble.inc:65 +#: lib/layouts/theorems.inc:23 +#: lib/layouts/theorems.inc:24 +#: lib/layouts/theorems.inc:55 +#: lib/layouts/theorems.inc:58 +#: lib/layouts/theorems-chap-bytype.module:54 +#: lib/layouts/theorems-chap.module:19 +#: lib/layouts/theorems-named.module:13 #: lib/layouts/theorems-sec-bytype.module:54 #: lib/layouts/theorems-sec.module:18 msgid "Theorem" msgstr "Théorème" -#: lib/layouts/AEA.layout:112 lib/layouts/elsart.layout:343 -#: lib/layouts/powerdot.layout:397 lib/layouts/siamltex.layout:115 +#: lib/layouts/AEA.layout:112 +#: lib/layouts/elsart.layout:343 +#: lib/layouts/powerdot.layout:397 +#: lib/layouts/siamltex.layout:116 #: lib/layouts/stdfloats.inc:41 #: lib/layouts/theorems-ams-extended-bytype.module:94 #: lib/layouts/theorems-ams-extended-bytype.module:103 @@ -5648,9 +5747,12 @@ msgstr "Algorithme" msgid "Axiom" msgstr "Axiome" -#: lib/layouts/AEA.layout:126 lib/layouts/elsart.layout:414 -#: lib/layouts/llncs.layout:286 lib/layouts/theorems-case.inc:27 -#: lib/layouts/theorems-case.inc:51 lib/layouts/theorems-case.inc:54 +#: lib/layouts/AEA.layout:126 +#: lib/layouts/elsart.layout:414 +#: lib/layouts/llncs.layout:286 +#: lib/layouts/theorems-case.inc:27 +#: lib/layouts/theorems-case.inc:51 +#: lib/layouts/theorems-case.inc:54 #: lib/layouts/theorems-order.inc:73 #: lib/layouts/theorems-without-preamble.inc:337 #: lib/layouts/theorems-without-preamble.inc:344 @@ -5658,26 +5760,38 @@ msgstr "Axiome" msgid "Case" msgstr "Cas" -#: lib/layouts/AEA.layout:130 lib/layouts/theorems-without-preamble.inc:341 +#: lib/layouts/AEA.layout:130 +#: lib/layouts/theorems-without-preamble.inc:341 msgid "Case \\thecase." msgstr "Cas \\thecase." -#: lib/layouts/AEA.layout:136 lib/layouts/elsart.layout:399 -#: lib/layouts/heb-article.layout:65 lib/layouts/ijmpc.layout:377 -#: lib/layouts/ijmpd.layout:397 lib/layouts/llncs.layout:307 -#: lib/layouts/svmono.layout:80 lib/layouts/theorems-ams-bytype.inc:289 +#: lib/layouts/AEA.layout:136 +#: lib/layouts/elsart.layout:399 +#: lib/layouts/heb-article.layout:65 +#: lib/layouts/ijmpc.layout:391 +#: lib/layouts/ijmpd.layout:415 +#: lib/layouts/llncs.layout:307 +#: lib/layouts/svmono.layout:80 +#: lib/layouts/theorems-ams-bytype.inc:289 #: lib/layouts/theorems-ams-bytype.inc:299 -#: lib/layouts/theorems-ams-bytype.inc:302 lib/layouts/theorems-ams.inc:257 -#: lib/layouts/theorems-ams.inc:266 lib/layouts/theorems-ams.inc:269 -#: lib/layouts/theorems-bytype.inc:265 lib/layouts/theorems-bytype.inc:275 -#: lib/layouts/theorems-bytype.inc:278 lib/layouts/theorems-order.inc:67 +#: lib/layouts/theorems-ams-bytype.inc:302 +#: lib/layouts/theorems-ams.inc:257 +#: lib/layouts/theorems-ams.inc:266 +#: lib/layouts/theorems-ams.inc:269 +#: lib/layouts/theorems-bytype.inc:265 +#: lib/layouts/theorems-bytype.inc:275 +#: lib/layouts/theorems-bytype.inc:278 +#: lib/layouts/theorems-order.inc:67 #: lib/layouts/theorems-starred-equivalents.inc:76 -#: lib/layouts/theorems-starred.inc:258 lib/layouts/theorems-starred.inc:261 +#: lib/layouts/theorems-starred.inc:258 +#: lib/layouts/theorems-starred.inc:261 #: lib/layouts/theorems-without-preamble.inc:322 #: lib/layouts/theorems-without-preamble.inc:325 #: lib/layouts/theorems-without-preamble.inc:327 -#: lib/layouts/theorems-without-preamble.inc:330 lib/layouts/theorems.inc:257 -#: lib/layouts/theorems.inc:266 lib/layouts/theorems.inc:269 +#: lib/layouts/theorems-without-preamble.inc:330 +#: lib/layouts/theorems.inc:256 +#: lib/layouts/theorems.inc:265 +#: lib/layouts/theorems.inc:268 #: lib/layouts/theorems-chap-bytype.module:186 #: lib/layouts/theorems-sec-bytype.module:142 msgid "Claim" @@ -5711,48 +5825,71 @@ msgstr "Conclusion" msgid "Condition" msgstr "Condition" -#: lib/layouts/AEA.layout:159 lib/layouts/elsart.layout:364 -#: lib/layouts/ijmpc.layout:389 lib/layouts/ijmpd.layout:408 -#: lib/layouts/llncs.layout:314 lib/layouts/siamltex.layout:106 +#: lib/layouts/AEA.layout:159 +#: lib/layouts/elsart.layout:364 +#: lib/layouts/ijmpc.layout:400 +#: lib/layouts/ijmpd.layout:424 +#: lib/layouts/llncs.layout:314 +#: lib/layouts/siamltex.layout:107 #: lib/layouts/theorems-ams-bytype.inc:145 #: lib/layouts/theorems-ams-bytype.inc:154 -#: lib/layouts/theorems-ams-bytype.inc:157 lib/layouts/theorems-ams.inc:119 -#: lib/layouts/theorems-ams.inc:129 lib/layouts/theorems-ams.inc:132 -#: lib/layouts/theorems-bytype.inc:121 lib/layouts/theorems-bytype.inc:130 -#: lib/layouts/theorems-bytype.inc:133 lib/layouts/theorems-order.inc:31 +#: lib/layouts/theorems-ams-bytype.inc:157 +#: lib/layouts/theorems-ams.inc:119 +#: lib/layouts/theorems-ams.inc:129 +#: lib/layouts/theorems-ams.inc:132 +#: lib/layouts/theorems-bytype.inc:121 +#: lib/layouts/theorems-bytype.inc:130 +#: lib/layouts/theorems-bytype.inc:133 +#: lib/layouts/theorems-order.inc:31 #: lib/layouts/theorems-starred-equivalents.inc:34 -#: lib/layouts/theorems-starred.inc:123 lib/layouts/theorems-starred.inc:126 +#: lib/layouts/theorems-starred.inc:123 +#: lib/layouts/theorems-starred.inc:126 #: lib/layouts/theorems-without-preamble.inc:136 #: lib/layouts/theorems-without-preamble.inc:149 -#: lib/layouts/theorems-without-preamble.inc:152 lib/layouts/theorems.inc:119 -#: lib/layouts/theorems.inc:129 lib/layouts/theorems.inc:132 +#: lib/layouts/theorems-without-preamble.inc:152 +#: lib/layouts/theorems.inc:118 +#: lib/layouts/theorems.inc:128 +#: lib/layouts/theorems.inc:131 #: lib/layouts/theorems-chap-bytype.module:102 #: lib/layouts/theorems-sec-bytype.module:86 msgid "Conjecture" msgstr "Conjecture" -#: lib/layouts/AEA.layout:166 lib/layouts/beamer.layout:983 -#: lib/layouts/elsart.layout:322 lib/layouts/foils.layout:250 -#: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:354 -#: lib/layouts/ijmpd.layout:366 lib/layouts/llncs.layout:321 -#: lib/layouts/siamltex.layout:76 lib/layouts/theorems-ams-bytype.inc:91 +#: lib/layouts/AEA.layout:166 +#: lib/layouts/beamer.layout:1027 +#: lib/layouts/elsart.layout:322 +#: lib/layouts/foils.layout:250 +#: lib/layouts/heb-article.layout:55 +#: lib/layouts/ijmpc.layout:346 +#: lib/layouts/ijmpd.layout:370 +#: lib/layouts/llncs.layout:321 +#: lib/layouts/siamltex.layout:77 +#: lib/layouts/theorems-ams-bytype.inc:91 #: lib/layouts/theorems-ams-bytype.inc:101 -#: lib/layouts/theorems-ams-bytype.inc:104 lib/layouts/theorems-ams.inc:65 -#: lib/layouts/theorems-ams.inc:75 lib/layouts/theorems-ams.inc:78 -#: lib/layouts/theorems-bytype.inc:67 lib/layouts/theorems-bytype.inc:76 -#: lib/layouts/theorems-bytype.inc:79 lib/layouts/theorems-order.inc:13 +#: lib/layouts/theorems-ams-bytype.inc:104 +#: lib/layouts/theorems-ams.inc:65 +#: lib/layouts/theorems-ams.inc:75 +#: lib/layouts/theorems-ams.inc:78 +#: lib/layouts/theorems-bytype.inc:67 +#: lib/layouts/theorems-bytype.inc:76 +#: lib/layouts/theorems-bytype.inc:79 +#: lib/layouts/theorems-order.inc:13 #: lib/layouts/theorems-starred-equivalents.inc:13 -#: lib/layouts/theorems-starred.inc:72 lib/layouts/theorems-starred.inc:75 +#: lib/layouts/theorems-starred.inc:72 +#: lib/layouts/theorems-starred.inc:75 #: lib/layouts/theorems-without-preamble.inc:72 #: lib/layouts/theorems-without-preamble.inc:78 -#: lib/layouts/theorems-without-preamble.inc:81 lib/layouts/theorems.inc:65 -#: lib/layouts/theorems.inc:75 lib/layouts/theorems.inc:78 +#: lib/layouts/theorems-without-preamble.inc:81 +#: lib/layouts/theorems.inc:64 +#: lib/layouts/theorems.inc:74 +#: lib/layouts/theorems.inc:77 #: lib/layouts/theorems-chap-bytype.module:66 #: lib/layouts/theorems-sec-bytype.module:62 msgid "Corollary" msgstr "Corollaire" -#: lib/layouts/AEA.layout:173 lib/layouts/elsart.layout:336 +#: lib/layouts/AEA.layout:173 +#: lib/layouts/elsart.layout:336 #: lib/layouts/theorems-ams-extended-bytype.module:60 #: lib/layouts/theorems-ams-extended-bytype.module:69 #: lib/layouts/theorems-ams-extended-bytype.module:72 @@ -5766,88 +5903,128 @@ msgstr "Corollaire" msgid "Criterion" msgstr "Critère" -#: lib/layouts/AEA.layout:181 lib/layouts/beamer.layout:1011 -#: lib/layouts/elsart.layout:350 lib/layouts/foils.layout:264 -#: lib/layouts/heb-article.layout:75 lib/layouts/llncs.layout:335 -#: lib/layouts/siamltex.layout:125 lib/layouts/theorems-ams-bytype.inc:181 +#: lib/layouts/AEA.layout:181 +#: lib/layouts/beamer.layout:1055 +#: lib/layouts/elsart.layout:350 +#: lib/layouts/foils.layout:264 +#: lib/layouts/heb-article.layout:75 +#: lib/layouts/llncs.layout:335 +#: lib/layouts/siamltex.layout:126 +#: lib/layouts/theorems-ams-bytype.inc:181 #: lib/layouts/theorems-ams-bytype.inc:197 -#: lib/layouts/theorems-ams-bytype.inc:200 lib/layouts/theorems-ams.inc:155 -#: lib/layouts/theorems-ams.inc:172 lib/layouts/theorems-ams.inc:175 -#: lib/layouts/theorems-bytype.inc:157 lib/layouts/theorems-bytype.inc:173 -#: lib/layouts/theorems-bytype.inc:176 lib/layouts/theorems-order.inc:37 +#: lib/layouts/theorems-ams-bytype.inc:200 +#: lib/layouts/theorems-ams.inc:155 +#: lib/layouts/theorems-ams.inc:172 +#: lib/layouts/theorems-ams.inc:175 +#: lib/layouts/theorems-bytype.inc:157 +#: lib/layouts/theorems-bytype.inc:173 +#: lib/layouts/theorems-bytype.inc:176 +#: lib/layouts/theorems-order.inc:37 #: lib/layouts/theorems-starred-equivalents.inc:41 -#: lib/layouts/theorems-starred.inc:165 lib/layouts/theorems-starred.inc:168 +#: lib/layouts/theorems-starred.inc:165 +#: lib/layouts/theorems-starred.inc:168 #: lib/layouts/theorems-without-preamble.inc:175 #: lib/layouts/theorems-without-preamble.inc:189 -#: lib/layouts/theorems-without-preamble.inc:192 lib/layouts/theorems.inc:155 -#: lib/layouts/theorems.inc:172 lib/layouts/theorems.inc:175 +#: lib/layouts/theorems-without-preamble.inc:192 +#: lib/layouts/theorems.inc:154 +#: lib/layouts/theorems.inc:171 +#: lib/layouts/theorems.inc:174 #: lib/layouts/theorems-chap-bytype.module:126 #: lib/layouts/theorems-sec-bytype.module:102 msgid "Definition" msgstr "Définition" -#: lib/layouts/AEA.layout:188 lib/layouts/beamer.layout:1023 -#: lib/layouts/elsart.layout:371 lib/layouts/llncs.layout:342 +#: lib/layouts/AEA.layout:188 +#: lib/layouts/beamer.layout:1067 +#: lib/layouts/elsart.layout:371 +#: lib/layouts/llncs.layout:342 #: lib/layouts/theorems-ams-bytype.inc:206 #: lib/layouts/theorems-ams-bytype.inc:216 -#: lib/layouts/theorems-ams-bytype.inc:219 lib/layouts/theorems-ams.inc:180 -#: lib/layouts/theorems-ams.inc:189 lib/layouts/theorems-ams.inc:192 -#: lib/layouts/theorems-bytype.inc:182 lib/layouts/theorems-bytype.inc:192 -#: lib/layouts/theorems-bytype.inc:195 lib/layouts/theorems-order.inc:43 +#: lib/layouts/theorems-ams-bytype.inc:219 +#: lib/layouts/theorems-ams.inc:180 +#: lib/layouts/theorems-ams.inc:189 +#: lib/layouts/theorems-ams.inc:192 +#: lib/layouts/theorems-bytype.inc:182 +#: lib/layouts/theorems-bytype.inc:192 +#: lib/layouts/theorems-bytype.inc:195 +#: lib/layouts/theorems-order.inc:43 #: lib/layouts/theorems-starred-equivalents.inc:48 -#: lib/layouts/theorems-starred.inc:182 lib/layouts/theorems-starred.inc:185 +#: lib/layouts/theorems-starred.inc:182 +#: lib/layouts/theorems-starred.inc:185 #: lib/layouts/theorems-without-preamble.inc:199 #: lib/layouts/theorems-without-preamble.inc:206 -#: lib/layouts/theorems-without-preamble.inc:209 lib/layouts/theorems.inc:180 -#: lib/layouts/theorems.inc:189 lib/layouts/theorems.inc:192 +#: lib/layouts/theorems-without-preamble.inc:209 +#: lib/layouts/theorems.inc:179 +#: lib/layouts/theorems.inc:188 +#: lib/layouts/theorems.inc:191 #: lib/layouts/theorems-chap-bytype.module:138 #: lib/layouts/theorems-sec-bytype.module:110 -#: src/frontends/qt4/GuiDocument.cpp:1137 +#: src/frontends/qt4/GuiDocument.cpp:1056 msgid "Example" msgstr "Exemple" -#: lib/layouts/AEA.layout:195 lib/layouts/llncs.layout:349 +#: lib/layouts/AEA.layout:195 +#: lib/layouts/llncs.layout:349 #: lib/layouts/theorems-ams-bytype.inc:244 #: lib/layouts/theorems-ams-bytype.inc:254 -#: lib/layouts/theorems-ams-bytype.inc:257 lib/layouts/theorems-ams.inc:214 -#: lib/layouts/theorems-ams.inc:223 lib/layouts/theorems-ams.inc:226 -#: lib/layouts/theorems-bytype.inc:220 lib/layouts/theorems-bytype.inc:230 -#: lib/layouts/theorems-bytype.inc:233 lib/layouts/theorems-order.inc:55 +#: lib/layouts/theorems-ams-bytype.inc:257 +#: lib/layouts/theorems-ams.inc:214 +#: lib/layouts/theorems-ams.inc:223 +#: lib/layouts/theorems-ams.inc:226 +#: lib/layouts/theorems-bytype.inc:220 +#: lib/layouts/theorems-bytype.inc:230 +#: lib/layouts/theorems-bytype.inc:233 +#: lib/layouts/theorems-order.inc:55 #: lib/layouts/theorems-starred-equivalents.inc:62 -#: lib/layouts/theorems-starred.inc:216 lib/layouts/theorems-starred.inc:219 +#: lib/layouts/theorems-starred.inc:216 +#: lib/layouts/theorems-starred.inc:219 #: lib/layouts/theorems-without-preamble.inc:218 #: lib/layouts/theorems-without-preamble.inc:237 #: lib/layouts/theorems-without-preamble.inc:290 #: lib/layouts/theorems-without-preamble.inc:297 -#: lib/layouts/theorems-without-preamble.inc:300 lib/layouts/theorems.inc:214 -#: lib/layouts/theorems.inc:223 lib/layouts/theorems.inc:226 +#: lib/layouts/theorems-without-preamble.inc:300 +#: lib/layouts/theorems.inc:213 +#: lib/layouts/theorems.inc:222 +#: lib/layouts/theorems.inc:225 #: lib/layouts/theorems-chap-bytype.module:162 #: lib/layouts/theorems-sec-bytype.module:126 msgid "Exercise" msgstr "Exercice" -#: lib/layouts/AEA.layout:202 lib/layouts/elsart.layout:315 -#: lib/layouts/foils.layout:243 lib/layouts/heb-article.layout:45 -#: lib/layouts/ijmpc.layout:358 lib/layouts/ijmpd.layout:373 -#: lib/layouts/llncs.layout:356 lib/layouts/siamltex.layout:86 +#: lib/layouts/AEA.layout:202 +#: lib/layouts/elsart.layout:315 +#: lib/layouts/foils.layout:243 +#: lib/layouts/heb-article.layout:45 +#: lib/layouts/ijmpc.layout:355 +#: lib/layouts/ijmpd.layout:379 +#: lib/layouts/llncs.layout:356 +#: lib/layouts/siamltex.layout:87 #: lib/layouts/theorems-ams-bytype.inc:109 #: lib/layouts/theorems-ams-bytype.inc:118 -#: lib/layouts/theorems-ams-bytype.inc:121 lib/layouts/theorems-ams.inc:83 -#: lib/layouts/theorems-ams.inc:93 lib/layouts/theorems-ams.inc:96 -#: lib/layouts/theorems-bytype.inc:85 lib/layouts/theorems-bytype.inc:94 -#: lib/layouts/theorems-bytype.inc:97 lib/layouts/theorems-order.inc:19 +#: lib/layouts/theorems-ams-bytype.inc:121 +#: lib/layouts/theorems-ams.inc:83 +#: lib/layouts/theorems-ams.inc:93 +#: lib/layouts/theorems-ams.inc:96 +#: lib/layouts/theorems-bytype.inc:85 +#: lib/layouts/theorems-bytype.inc:94 +#: lib/layouts/theorems-bytype.inc:97 +#: lib/layouts/theorems-order.inc:19 #: lib/layouts/theorems-starred-equivalents.inc:20 -#: lib/layouts/theorems-starred.inc:89 lib/layouts/theorems-starred.inc:92 +#: lib/layouts/theorems-starred.inc:89 +#: lib/layouts/theorems-starred.inc:92 #: lib/layouts/theorems-without-preamble.inc:88 #: lib/layouts/theorems-without-preamble.inc:94 -#: lib/layouts/theorems-without-preamble.inc:97 lib/layouts/theorems.inc:83 -#: lib/layouts/theorems.inc:93 lib/layouts/theorems.inc:96 +#: lib/layouts/theorems-without-preamble.inc:97 +#: lib/layouts/theorems.inc:82 +#: lib/layouts/theorems.inc:92 +#: lib/layouts/theorems.inc:95 #: lib/layouts/theorems-chap-bytype.module:78 #: lib/layouts/theorems-sec-bytype.module:70 msgid "Lemma" msgstr "Lemme" -#: lib/layouts/AEA.layout:209 lib/layouts/agutex.layout:157 +#: lib/layouts/AEA.layout:209 +#: lib/layouts/agutex.layout:157 #: lib/layouts/agutex.layout:169 #: lib/layouts/theorems-ams-extended-bytype.module:234 #: lib/layouts/theorems-ams-extended-bytype.module:243 @@ -5862,71 +6039,102 @@ msgstr "Lemme" msgid "Notation" msgstr "Notation" -#: lib/layouts/AEA.layout:217 lib/layouts/elsart.layout:378 -#: lib/layouts/llncs.layout:369 lib/layouts/theorems-ams-bytype.inc:225 +#: lib/layouts/AEA.layout:217 +#: lib/layouts/elsart.layout:378 +#: lib/layouts/llncs.layout:369 +#: lib/layouts/theorems-ams-bytype.inc:225 #: lib/layouts/theorems-ams-bytype.inc:235 -#: lib/layouts/theorems-ams-bytype.inc:238 lib/layouts/theorems-ams.inc:197 -#: lib/layouts/theorems-ams.inc:206 lib/layouts/theorems-ams.inc:209 -#: lib/layouts/theorems-bytype.inc:201 lib/layouts/theorems-bytype.inc:211 -#: lib/layouts/theorems-bytype.inc:214 lib/layouts/theorems-order.inc:49 +#: lib/layouts/theorems-ams-bytype.inc:238 +#: lib/layouts/theorems-ams.inc:197 +#: lib/layouts/theorems-ams.inc:206 +#: lib/layouts/theorems-ams.inc:209 +#: lib/layouts/theorems-bytype.inc:201 +#: lib/layouts/theorems-bytype.inc:211 +#: lib/layouts/theorems-bytype.inc:214 +#: lib/layouts/theorems-order.inc:49 #: lib/layouts/theorems-starred-equivalents.inc:55 -#: lib/layouts/theorems-starred.inc:199 lib/layouts/theorems-starred.inc:202 +#: lib/layouts/theorems-starred.inc:199 +#: lib/layouts/theorems-starred.inc:202 #: lib/layouts/theorems-without-preamble.inc:216 #: lib/layouts/theorems-without-preamble.inc:224 -#: lib/layouts/theorems-without-preamble.inc:227 lib/layouts/theorems.inc:197 -#: lib/layouts/theorems.inc:206 lib/layouts/theorems.inc:209 +#: lib/layouts/theorems-without-preamble.inc:227 +#: lib/layouts/theorems.inc:196 +#: lib/layouts/theorems.inc:205 +#: lib/layouts/theorems.inc:208 #: lib/layouts/theorems-chap-bytype.module:150 #: lib/layouts/theorems-sec-bytype.module:118 msgid "Problem" msgstr "Problème" -#: lib/layouts/AEA.layout:225 lib/layouts/elsart.layout:329 -#: lib/layouts/foils.layout:257 lib/layouts/ijmpc.layout:362 -#: lib/layouts/ijmpd.layout:380 lib/layouts/llncs.layout:390 -#: lib/layouts/siamltex.layout:96 lib/layouts/theorems-ams-bytype.inc:127 +#: lib/layouts/AEA.layout:225 +#: lib/layouts/elsart.layout:329 +#: lib/layouts/foils.layout:257 +#: lib/layouts/ijmpc.layout:364 +#: lib/layouts/ijmpd.layout:388 +#: lib/layouts/llncs.layout:390 +#: lib/layouts/siamltex.layout:97 +#: lib/layouts/theorems-ams-bytype.inc:127 #: lib/layouts/theorems-ams-bytype.inc:136 -#: lib/layouts/theorems-ams-bytype.inc:139 lib/layouts/theorems-ams.inc:101 -#: lib/layouts/theorems-ams.inc:111 lib/layouts/theorems-ams.inc:114 -#: lib/layouts/theorems-bytype.inc:103 lib/layouts/theorems-bytype.inc:112 -#: lib/layouts/theorems-bytype.inc:115 lib/layouts/theorems-order.inc:25 +#: lib/layouts/theorems-ams-bytype.inc:139 +#: lib/layouts/theorems-ams.inc:101 +#: lib/layouts/theorems-ams.inc:111 +#: lib/layouts/theorems-ams.inc:114 +#: lib/layouts/theorems-bytype.inc:103 +#: lib/layouts/theorems-bytype.inc:112 +#: lib/layouts/theorems-bytype.inc:115 +#: lib/layouts/theorems-order.inc:25 #: lib/layouts/theorems-starred-equivalents.inc:27 -#: lib/layouts/theorems-starred.inc:106 lib/layouts/theorems-starred.inc:109 +#: lib/layouts/theorems-starred.inc:106 +#: lib/layouts/theorems-starred.inc:109 #: lib/layouts/theorems-without-preamble.inc:104 #: lib/layouts/theorems-without-preamble.inc:110 -#: lib/layouts/theorems-without-preamble.inc:113 lib/layouts/theorems.inc:101 -#: lib/layouts/theorems.inc:111 lib/layouts/theorems.inc:114 +#: lib/layouts/theorems-without-preamble.inc:113 +#: lib/layouts/theorems.inc:100 +#: lib/layouts/theorems.inc:110 +#: lib/layouts/theorems.inc:113 #: lib/layouts/theorems-chap-bytype.module:90 #: lib/layouts/theorems-sec-bytype.module:78 msgid "Proposition" msgstr "Proposition" -#: lib/layouts/AEA.layout:232 lib/layouts/elsart.layout:385 -#: lib/layouts/ijmpc.layout:346 lib/layouts/ijmpd.layout:355 -#: lib/layouts/llncs.layout:403 lib/layouts/theorems-ams-bytype.inc:263 +#: lib/layouts/AEA.layout:232 +#: lib/layouts/elsart.layout:385 +#: lib/layouts/ijmpd.layout:309 +#: lib/layouts/llncs.layout:403 +#: lib/layouts/theorems-ams-bytype.inc:263 #: lib/layouts/theorems-ams-bytype.inc:280 -#: lib/layouts/theorems-ams-bytype.inc:283 lib/layouts/theorems-ams.inc:231 -#: lib/layouts/theorems-ams.inc:249 lib/layouts/theorems-ams.inc:252 -#: lib/layouts/theorems-bytype.inc:239 lib/layouts/theorems-bytype.inc:256 -#: lib/layouts/theorems-bytype.inc:259 lib/layouts/theorems-order.inc:61 +#: lib/layouts/theorems-ams-bytype.inc:283 +#: lib/layouts/theorems-ams.inc:231 +#: lib/layouts/theorems-ams.inc:249 +#: lib/layouts/theorems-ams.inc:252 +#: lib/layouts/theorems-bytype.inc:239 +#: lib/layouts/theorems-bytype.inc:256 +#: lib/layouts/theorems-bytype.inc:259 +#: lib/layouts/theorems-order.inc:61 #: lib/layouts/theorems-starred-equivalents.inc:69 -#: lib/layouts/theorems-starred.inc:241 lib/layouts/theorems-starred.inc:244 +#: lib/layouts/theorems-starred.inc:241 +#: lib/layouts/theorems-starred.inc:244 #: lib/layouts/theorems-without-preamble.inc:307 #: lib/layouts/theorems-without-preamble.inc:314 -#: lib/layouts/theorems-without-preamble.inc:317 lib/layouts/theorems.inc:231 -#: lib/layouts/theorems.inc:249 lib/layouts/theorems.inc:252 +#: lib/layouts/theorems-without-preamble.inc:317 +#: lib/layouts/theorems.inc:230 +#: lib/layouts/theorems.inc:248 +#: lib/layouts/theorems.inc:251 #: lib/layouts/theorems-chap-bytype.module:174 #: lib/layouts/theorems-sec-bytype.module:134 msgid "Remark" msgstr "Remarque" -#: lib/layouts/AEA.layout:234 lib/layouts/ijmpc.layout:347 -#: lib/layouts/ijmpd.layout:356 lib/layouts/theorems-ams-bytype.inc:266 +#: lib/layouts/AEA.layout:234 +#: lib/layouts/ijmpd.layout:313 +#: lib/layouts/theorems-ams-bytype.inc:266 #: lib/layouts/theorems-bytype.inc:242 #: lib/layouts/theorems-without-preamble.inc:311 msgid "Remark \\theremark." msgstr "Remarque \\theremark." -#: lib/layouts/AEA.layout:240 lib/layouts/llncs.layout:410 +#: lib/layouts/AEA.layout:240 +#: lib/layouts/llncs.layout:410 #: lib/layouts/svglobal3.layout:85 #: lib/layouts/theorems-without-preamble.inc:264 #: lib/layouts/theorems-without-preamble.inc:271 @@ -5934,11 +6142,13 @@ msgstr "Remarque \\theremark." msgid "Solution" msgstr "Solution" -#: lib/layouts/AEA.layout:244 lib/layouts/theorems-without-preamble.inc:268 +#: lib/layouts/AEA.layout:244 +#: lib/layouts/theorems-without-preamble.inc:268 msgid "Solution \\thesolution." msgstr "Solution \\thesolution." -#: lib/layouts/AEA.layout:250 lib/layouts/elsart.layout:406 +#: lib/layouts/AEA.layout:250 +#: lib/layouts/elsart.layout:406 #: lib/layouts/theorems-ams-extended-bytype.module:269 #: lib/layouts/theorems-ams-extended-bytype.module:278 #: lib/layouts/theorems-ams-extended-bytype.module:281 @@ -5952,24 +6162,34 @@ msgstr "Solution \\thesolution." msgid "Summary" msgstr "Résumé" -#: lib/layouts/AEA.layout:258 lib/ui/stdmenus.inc:365 +#: lib/layouts/AEA.layout:258 +#: lib/ui/stdmenus.inc:361 msgid "Caption" msgstr "Légende" -#: lib/layouts/AEA.layout:260 lib/layouts/amsart.layout:31 -#: lib/layouts/amsbook.layout:32 lib/layouts/beamer.layout:33 -#: lib/layouts/beamer.layout:904 lib/layouts/beamer.layout:923 -#: lib/layouts/beamer.layout:942 lib/layouts/beamer.layout:1062 -#: lib/layouts/beamer.layout:1086 lib/layouts/beamer.layout:1124 -#: lib/layouts/revtex4.layout:45 lib/layouts/siamltex.layout:36 -#: lib/layouts/tufte-book.layout:195 lib/layouts/lyxmacros.inc:13 -#: lib/layouts/scrclass.inc:295 lib/layouts/stdclass.inc:29 -#: lib/layouts/stdlayouts.inc:13 lib/layouts/stdlayouts.inc:34 -#: lib/layouts/stdlayouts.inc:55 lib/layouts/stdlayouts.inc:75 -#: lib/layouts/stdlayouts.inc:99 lib/layouts/svcommon.inc:597 -#: lib/layouts/svcommon.inc:608 lib/layouts/bicaption.module:37 -#: lib/layouts/initials.module:26 lib/layouts/multicol.module:12 -#: lib/layouts/rsphrase.module:45 +#: lib/layouts/AEA.layout:260 +#: lib/layouts/amsart.layout:31 +#: lib/layouts/amsbook.layout:32 +#: lib/layouts/beamer.layout:33 +#: lib/layouts/beamer.layout:948 +#: lib/layouts/beamer.layout:967 +#: lib/layouts/beamer.layout:986 +#: lib/layouts/beamer.layout:1106 +#: lib/layouts/beamer.layout:1130 +#: lib/layouts/beamer.layout:1168 +#: lib/layouts/revtex4.layout:45 +#: lib/layouts/siamltex.layout:37 +#: lib/layouts/tufte-book.layout:195 +#: lib/layouts/lyxmacros.inc:13 +#: lib/layouts/scrclass.inc:295 +#: lib/layouts/stdclass.inc:29 +#: lib/layouts/stdlayouts.inc:13 +#: lib/layouts/stdlayouts.inc:34 +#: lib/layouts/stdlayouts.inc:55 +#: lib/layouts/stdlayouts.inc:75 +#: lib/layouts/svcommon.inc:597 +#: lib/layouts/svcommon.inc:608 +#: lib/layouts/initials.module:26 msgid "MainText" msgstr "Corps" @@ -5977,82 +6197,141 @@ msgstr "Corps" msgid "Caption: " msgstr "Légende : " -#: lib/layouts/AEA.layout:269 lib/layouts/IEEEtran.layout:289 -#: lib/layouts/beamer.layout:1047 lib/layouts/elsart.layout:288 -#: lib/layouts/foils.layout:278 lib/layouts/heb-article.layout:95 -#: lib/layouts/ijmpc.layout:315 lib/layouts/ijmpd.layout:318 -#: lib/layouts/llncs.layout:376 lib/layouts/siamltex.layout:154 -#: lib/layouts/svmono.layout:84 lib/layouts/svcommon.inc:625 -#: lib/layouts/svcommon.inc:640 lib/layouts/svcommon.inc:643 -#: lib/layouts/theorems-order.inc:76 lib/layouts/theorems-proof-std.inc:6 -#: lib/layouts/theorems-proof.inc:13 lib/layouts/theorems-bytype.module:46 +#: lib/layouts/AEA.layout:269 +#: lib/layouts/IEEEtran.layout:289 +#: lib/layouts/beamer.layout:1091 +#: lib/layouts/elsart.layout:288 +#: lib/layouts/foils.layout:278 +#: lib/layouts/heb-article.layout:95 +#: lib/layouts/ijmpc.layout:327 +#: lib/layouts/ijmpd.layout:348 +#: lib/layouts/llncs.layout:376 +#: lib/layouts/siamltex.layout:155 +#: lib/layouts/svmono.layout:84 +#: lib/layouts/svcommon.inc:625 +#: lib/layouts/svcommon.inc:640 +#: lib/layouts/svcommon.inc:643 +#: lib/layouts/theorems-order.inc:76 +#: lib/layouts/theorems-proof-std.inc:6 +#: lib/layouts/theorems-proof.inc:13 +#: lib/layouts/theorems-bytype.module:46 msgid "Proof" msgstr "Preuve" -#: lib/layouts/IEEEtran.layout:34 lib/layouts/aa.layout:27 -#: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:52 -#: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:34 -#: lib/layouts/agutex.layout:31 lib/layouts/amsart.layout:30 -#: lib/layouts/amsbook.layout:31 lib/layouts/apa.layout:24 -#: lib/layouts/beamer.layout:32 lib/layouts/broadway.layout:173 -#: lib/layouts/chess.layout:29 lib/layouts/cl2emult.layout:126 -#: lib/layouts/dtk.layout:31 lib/layouts/egs.layout:18 -#: lib/layouts/elsart.layout:47 lib/layouts/elsarticle.layout:31 -#: lib/layouts/europecv.layout:16 lib/layouts/foils.layout:30 -#: lib/layouts/g-brief2.layout:30 lib/layouts/hollywood.layout:345 -#: lib/layouts/ijmpc.layout:22 lib/layouts/ijmpd.layout:27 -#: lib/layouts/iopart.layout:34 lib/layouts/jasatex.layout:34 -#: lib/layouts/kluwer.layout:33 lib/layouts/lettre.layout:30 -#: lib/layouts/llncs.layout:23 lib/layouts/ltugboat.layout:30 -#: lib/layouts/memoir.layout:31 lib/layouts/moderncv.layout:19 -#: lib/layouts/paper.layout:13 lib/layouts/powerdot.layout:106 -#: lib/layouts/revtex.layout:22 lib/layouts/revtex4.layout:44 -#: lib/layouts/scrlettr.layout:7 lib/layouts/scrlttr2.layout:10 -#: lib/layouts/siamltex.layout:35 lib/layouts/sigplanconf.layout:37 -#: lib/layouts/simplecv.layout:17 lib/layouts/slides.layout:60 -#: lib/layouts/tufte-book.layout:19 lib/layouts/agu_stdclass.inc:22 -#: lib/layouts/db_stdclass.inc:22 lib/layouts/scrclass.inc:17 -#: lib/layouts/stdclass.inc:28 lib/layouts/stdletter.inc:12 -#: lib/layouts/svcommon.inc:26 lib/ui/stdtoolbars.inc:69 -#: src/insets/InsetRef.cpp:338 +#: lib/layouts/IEEEtran.layout:34 +#: lib/layouts/aa.layout:27 +#: lib/layouts/aapaper.layout:34 +#: lib/layouts/aastex.layout:52 +#: lib/layouts/achemso.layout:32 +#: lib/layouts/acmsiggraph.layout:34 +#: lib/layouts/agutex.layout:31 +#: lib/layouts/amsart.layout:30 +#: lib/layouts/amsbook.layout:31 +#: lib/layouts/apa.layout:24 +#: lib/layouts/beamer.layout:32 +#: lib/layouts/broadway.layout:173 +#: lib/layouts/chess.layout:29 +#: lib/layouts/cl2emult.layout:126 +#: lib/layouts/dtk.layout:31 +#: lib/layouts/egs.layout:18 +#: lib/layouts/elsart.layout:47 +#: lib/layouts/elsarticle.layout:32 +#: lib/layouts/europecv.layout:16 +#: lib/layouts/foils.layout:30 +#: lib/layouts/g-brief2.layout:30 +#: lib/layouts/hollywood.layout:345 +#: lib/layouts/ijmpc.layout:22 +#: lib/layouts/ijmpd.layout:27 +#: lib/layouts/iopart.layout:34 +#: lib/layouts/jasatex.layout:34 +#: lib/layouts/kluwer.layout:33 +#: lib/layouts/lettre.layout:30 +#: lib/layouts/llncs.layout:23 +#: lib/layouts/ltugboat.layout:30 +#: lib/layouts/memoir.layout:31 +#: lib/layouts/moderncv.layout:19 +#: lib/layouts/paper.layout:13 +#: lib/layouts/powerdot.layout:106 +#: lib/layouts/revtex.layout:22 +#: lib/layouts/revtex4.layout:44 +#: lib/layouts/scrlettr.layout:7 +#: lib/layouts/scrlttr2.layout:10 +#: lib/layouts/siamltex.layout:36 +#: lib/layouts/sigplanconf.layout:37 +#: lib/layouts/simplecv.layout:17 +#: lib/layouts/slides.layout:60 +#: lib/layouts/tufte-book.layout:19 +#: lib/layouts/agu_stdclass.inc:22 +#: lib/layouts/db_stdclass.inc:22 +#: lib/layouts/scrclass.inc:17 +#: lib/layouts/stdclass.inc:28 +#: lib/layouts/stdletter.inc:12 +#: lib/layouts/svcommon.inc:26 +#: lib/ui/stdtoolbars.inc:69 +#: src/insets/InsetRef.cpp:340 msgid "Standard" msgstr "Standard" -#: lib/layouts/IEEEtran.layout:64 lib/layouts/aa.layout:67 -#: lib/layouts/aa.layout:264 lib/layouts/aapaper.layout:76 -#: lib/layouts/aapaper.layout:170 lib/layouts/aastex.layout:95 -#: lib/layouts/aastex.layout:217 lib/layouts/achemso.layout:54 -#: lib/layouts/agutex.layout:54 lib/layouts/apa.layout:39 -#: lib/layouts/beamer.layout:734 lib/layouts/broadway.layout:185 -#: lib/layouts/cl2emult.layout:40 lib/layouts/docbook-book.layout:11 -#: lib/layouts/docbook-chapter.layout:9 lib/layouts/docbook-section.layout:9 -#: lib/layouts/ectaart.layout:15 lib/layouts/egs.layout:249 -#: lib/layouts/elsart.layout:91 lib/layouts/elsarticle.layout:79 -#: lib/layouts/entcs.layout:39 lib/layouts/foils.layout:125 -#: lib/layouts/hollywood.layout:331 lib/layouts/ijmpc.layout:99 -#: lib/layouts/ijmpd.layout:104 lib/layouts/iopart.layout:56 -#: lib/layouts/isprs.layout:93 lib/layouts/jasatex.layout:57 -#: lib/layouts/kluwer.layout:111 lib/layouts/latex8.layout:38 -#: lib/layouts/llncs.layout:106 lib/layouts/ltugboat.layout:136 -#: lib/layouts/paper.layout:110 lib/layouts/powerdot.layout:41 -#: lib/layouts/revtex.layout:94 lib/layouts/revtex4-1.layout:202 -#: lib/layouts/revtex4.layout:115 lib/layouts/scrlettr.layout:188 -#: lib/layouts/scrlttr2.layout:271 lib/layouts/siamltex.layout:187 -#: lib/layouts/sigplanconf.layout:104 lib/layouts/simplecv.layout:124 -#: lib/layouts/svmult.layout:46 lib/layouts/svprobth.layout:79 -#: lib/layouts/tufte-book.layout:34 lib/layouts/agu_stdtitle.inc:246 -#: lib/layouts/amsdefs.inc:24 lib/layouts/db_stdtitle.inc:13 -#: lib/layouts/scrclass.inc:162 lib/layouts/stdtitle.inc:55 -#: lib/layouts/svcommon.inc:56 lib/layouts/svcommon.inc:318 +#: lib/layouts/IEEEtran.layout:64 +#: lib/layouts/aa.layout:67 +#: lib/layouts/aa.layout:264 +#: lib/layouts/aapaper.layout:76 +#: lib/layouts/aapaper.layout:170 +#: lib/layouts/aastex.layout:95 +#: lib/layouts/aastex.layout:217 +#: lib/layouts/achemso.layout:54 +#: lib/layouts/agutex.layout:54 +#: lib/layouts/apa.layout:39 +#: lib/layouts/beamer.layout:778 +#: lib/layouts/broadway.layout:185 +#: lib/layouts/cl2emult.layout:40 +#: lib/layouts/docbook-book.layout:11 +#: lib/layouts/docbook-chapter.layout:9 +#: lib/layouts/docbook-section.layout:9 +#: lib/layouts/ectaart.layout:15 +#: lib/layouts/egs.layout:249 +#: lib/layouts/elsart.layout:91 +#: lib/layouts/elsarticle.layout:55 +#: lib/layouts/entcs.layout:39 +#: lib/layouts/foils.layout:125 +#: lib/layouts/hollywood.layout:331 +#: lib/layouts/ijmpc.layout:87 +#: lib/layouts/ijmpd.layout:92 +#: lib/layouts/iopart.layout:56 +#: lib/layouts/isprs.layout:93 +#: lib/layouts/jasatex.layout:57 +#: lib/layouts/kluwer.layout:111 +#: lib/layouts/latex8.layout:38 +#: lib/layouts/llncs.layout:106 +#: lib/layouts/ltugboat.layout:136 +#: lib/layouts/paper.layout:110 +#: lib/layouts/powerdot.layout:41 +#: lib/layouts/revtex.layout:94 +#: lib/layouts/revtex4.layout:124 +#: lib/layouts/scrlettr.layout:188 +#: lib/layouts/scrlttr2.layout:271 +#: lib/layouts/siamltex.layout:188 +#: lib/layouts/sigplanconf.layout:104 +#: lib/layouts/simplecv.layout:124 +#: lib/layouts/svmult.layout:46 +#: lib/layouts/svprobth.layout:42 +#: lib/layouts/tufte-book.layout:34 +#: lib/layouts/agu_stdtitle.inc:246 +#: lib/layouts/amsdefs.inc:24 +#: lib/layouts/db_stdtitle.inc:13 +#: lib/layouts/scrclass.inc:162 +#: lib/layouts/stdtitle.inc:57 +#: lib/layouts/svcommon.inc:56 +#: lib/layouts/svcommon.inc:318 msgid "Title" msgstr "Titre" -#: lib/layouts/IEEEtran.layout:84 lib/layouts/IEEEtran.layout:88 +#: lib/layouts/IEEEtran.layout:84 +#: lib/layouts/IEEEtran.layout:88 msgid "IEEE membership" msgstr "Appartenance à l'IEEE" -#: lib/layouts/IEEEtran.layout:103 lib/layouts/revtex4-1.layout:279 -#: lib/layouts/revtex4-1.layout:281 +#: lib/layouts/IEEEtran.layout:103 msgid "Lowercase" msgstr "Minuscules" @@ -6060,27 +6339,49 @@ msgstr "Minuscules" msgid "lowercase" msgstr "minuscules" -#: lib/layouts/IEEEtran.layout:114 lib/layouts/aa.layout:73 -#: lib/layouts/aa.layout:276 lib/layouts/aapaper.layout:82 -#: lib/layouts/aapaper.layout:181 lib/layouts/aastex.layout:98 -#: lib/layouts/aastex.layout:229 lib/layouts/achemso.layout:77 -#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:791 -#: lib/layouts/broadway.layout:199 lib/layouts/cl2emult.layout:58 -#: lib/layouts/ectaart.layout:102 lib/layouts/ectaart.layout:177 -#: lib/layouts/ectaart.layout:180 lib/layouts/egs.layout:291 -#: lib/layouts/elsart.layout:112 lib/layouts/elsarticle.layout:142 -#: lib/layouts/entcs.layout:50 lib/layouts/foils.layout:133 -#: lib/layouts/hollywood.layout:318 lib/layouts/ijmpc.layout:118 -#: lib/layouts/ijmpd.layout:123 lib/layouts/iopart.layout:126 -#: lib/layouts/isprs.layout:76 lib/layouts/jasatex.layout:78 -#: lib/layouts/kluwer.layout:165 lib/layouts/llncs.layout:180 -#: lib/layouts/ltugboat.layout:155 lib/layouts/paper.layout:120 -#: lib/layouts/powerdot.layout:64 lib/layouts/revtex.layout:102 -#: lib/layouts/siamltex.layout:209 lib/layouts/sigplanconf.layout:120 -#: lib/layouts/svmult.layout:78 lib/layouts/svprobth.layout:96 -#: lib/layouts/tufte-book.layout:38 lib/layouts/agu_stdtitle.inc:167 -#: lib/layouts/amsdefs.inc:47 lib/layouts/db_stdtitle.inc:21 -#: lib/layouts/scrclass.inc:178 lib/layouts/stdtitle.inc:76 +#: lib/layouts/IEEEtran.layout:114 +#: lib/layouts/aa.layout:73 +#: lib/layouts/aa.layout:276 +#: lib/layouts/aapaper.layout:82 +#: lib/layouts/aapaper.layout:181 +#: lib/layouts/aastex.layout:98 +#: lib/layouts/aastex.layout:229 +#: lib/layouts/achemso.layout:77 +#: lib/layouts/apa.layout:114 +#: lib/layouts/beamer.layout:835 +#: lib/layouts/broadway.layout:199 +#: lib/layouts/cl2emult.layout:58 +#: lib/layouts/ectaart.layout:102 +#: lib/layouts/ectaart.layout:177 +#: lib/layouts/ectaart.layout:180 +#: lib/layouts/egs.layout:291 +#: lib/layouts/elsart.layout:112 +#: lib/layouts/elsarticle.layout:118 +#: lib/layouts/entcs.layout:50 +#: lib/layouts/foils.layout:133 +#: lib/layouts/hollywood.layout:318 +#: lib/layouts/ijmpc.layout:106 +#: lib/layouts/ijmpd.layout:111 +#: lib/layouts/iopart.layout:126 +#: lib/layouts/isprs.layout:76 +#: lib/layouts/jasatex.layout:78 +#: lib/layouts/kluwer.layout:165 +#: lib/layouts/llncs.layout:180 +#: lib/layouts/ltugboat.layout:155 +#: lib/layouts/paper.layout:120 +#: lib/layouts/powerdot.layout:64 +#: lib/layouts/revtex.layout:102 +#: lib/layouts/revtex4.layout:132 +#: lib/layouts/siamltex.layout:210 +#: lib/layouts/sigplanconf.layout:120 +#: lib/layouts/svmult.layout:78 +#: lib/layouts/svprobth.layout:59 +#: lib/layouts/tufte-book.layout:38 +#: lib/layouts/agu_stdtitle.inc:167 +#: lib/layouts/amsdefs.inc:47 +#: lib/layouts/db_stdtitle.inc:21 +#: lib/layouts/scrclass.inc:178 +#: lib/layouts/stdtitle.inc:78 #: lib/layouts/svcommon.inc:338 msgid "Author" msgstr "Auteur" @@ -6097,8 +6398,9 @@ msgstr "Texte après le titre" msgid "Page headings" msgstr "En-têtes des pages" -#: lib/layouts/IEEEtran.layout:173 lib/layouts/ijmpc.layout:63 -#: lib/layouts/ijmpd.layout:68 +#: lib/layouts/IEEEtran.layout:173 +#: lib/layouts/ijmpc.layout:51 +#: lib/layouts/ijmpd.layout:56 msgid "MarkBoth" msgstr "DoubleMarque" @@ -6110,21 +6412,29 @@ msgstr "ID publication" msgid "Abstract---" msgstr "Résumé---" -#: lib/layouts/IEEEtran.layout:210 lib/layouts/aa.layout:352 -#: lib/layouts/aastex.layout:116 lib/layouts/aastex.layout:327 -#: lib/layouts/elsart.layout:62 lib/layouts/elsarticle.layout:276 -#: lib/layouts/ijmpc.layout:213 lib/layouts/ijmpc.layout:217 -#: lib/layouts/ijmpd.layout:220 lib/layouts/iopart.layout:199 -#: lib/layouts/isprs.layout:52 lib/layouts/jasatex.layout:185 -#: lib/layouts/kluwer.layout:282 lib/layouts/paper.layout:172 -#: lib/layouts/revtex4-1.layout:163 lib/layouts/revtex4.layout:261 -#: lib/layouts/siamltex.layout:303 lib/layouts/sigplanconf.layout:146 -#: lib/layouts/spie.layout:41 lib/layouts/svglobal.layout:113 -#: lib/layouts/svglobal.layout:116 lib/layouts/svglobal3.layout:56 -#: lib/layouts/svglobal3.layout:59 lib/layouts/svjog.layout:117 -#: lib/layouts/svjog.layout:120 lib/layouts/svprobth.layout:147 -#: lib/layouts/svprobth.layout:150 lib/layouts/agu_stdtitle.inc:120 -#: lib/layouts/amsdefs.inc:161 lib/layouts/svcommon.inc:456 +#: lib/layouts/IEEEtran.layout:210 +#: lib/layouts/aa.layout:352 +#: lib/layouts/aastex.layout:116 +#: lib/layouts/aastex.layout:327 +#: lib/layouts/elsart.layout:62 +#: lib/layouts/elsarticle.layout:252 +#: lib/layouts/ijmpc.layout:201 +#: lib/layouts/ijmpc.layout:205 +#: lib/layouts/ijmpd.layout:208 +#: lib/layouts/iopart.layout:199 +#: lib/layouts/isprs.layout:52 +#: lib/layouts/jasatex.layout:185 +#: lib/layouts/kluwer.layout:282 +#: lib/layouts/paper.layout:172 +#: lib/layouts/revtex4.layout:258 +#: lib/layouts/siamltex.layout:304 +#: lib/layouts/sigplanconf.layout:146 +#: lib/layouts/spie.layout:41 +#: lib/layouts/svglobal3.layout:56 +#: lib/layouts/svglobal3.layout:59 +#: lib/layouts/agu_stdtitle.inc:120 +#: lib/layouts/amsdefs.inc:161 +#: lib/layouts/svcommon.inc:456 #: lib/layouts/svcommon.inc:471 msgid "Keywords" msgstr "Mots-clés" @@ -6133,74 +6443,127 @@ msgstr "Mots-clés" msgid "Index Terms---" msgstr "Termes d'index---" -#: lib/layouts/IEEEtran.layout:217 lib/layouts/IEEEtran.layout:227 +#: lib/layouts/IEEEtran.layout:217 +#: lib/layouts/IEEEtran.layout:227 msgid "Appendices" msgstr "Appendices" -#: lib/layouts/IEEEtran.layout:221 lib/layouts/IEEEtran.layout:246 -#: lib/layouts/IEEEtran.layout:269 lib/layouts/aa.layout:209 -#: lib/layouts/aastex.layout:457 lib/layouts/aastex.layout:489 -#: lib/layouts/acmsiggraph.layout:155 lib/layouts/agutex.layout:151 -#: lib/layouts/agutex.layout:161 lib/layouts/agutex.layout:181 -#: lib/layouts/agutex.layout:204 lib/layouts/beamer.layout:880 -#: lib/layouts/elsarticle.layout:301 lib/layouts/ijmpc.layout:411 -#: lib/layouts/ijmpc.layout:435 lib/layouts/ijmpd.layout:424 -#: lib/layouts/ijmpd.layout:448 lib/layouts/iopart.layout:243 -#: lib/layouts/iopart.layout:265 lib/layouts/iopart.layout:288 -#: lib/layouts/jasatex.layout:223 lib/layouts/jasatex.layout:262 -#: lib/layouts/revtex4-1.layout:215 lib/layouts/revtex4.layout:231 -#: lib/layouts/siamltex.layout:318 lib/layouts/sigplanconf.layout:184 -#: lib/layouts/stdstruct.inc:57 lib/layouts/svcommon.inc:536 +#: lib/layouts/IEEEtran.layout:221 +#: lib/layouts/IEEEtran.layout:246 +#: lib/layouts/IEEEtran.layout:269 +#: lib/layouts/aa.layout:209 +#: lib/layouts/aastex.layout:457 +#: lib/layouts/aastex.layout:489 +#: lib/layouts/acmsiggraph.layout:155 +#: lib/layouts/agutex.layout:151 +#: lib/layouts/agutex.layout:161 +#: lib/layouts/agutex.layout:181 +#: lib/layouts/agutex.layout:204 +#: lib/layouts/beamer.layout:924 +#: lib/layouts/elsarticle.layout:277 +#: lib/layouts/ijmpc.layout:412 +#: lib/layouts/ijmpc.layout:436 +#: lib/layouts/ijmpd.layout:436 +#: lib/layouts/ijmpd.layout:460 +#: lib/layouts/iopart.layout:243 +#: lib/layouts/iopart.layout:265 +#: lib/layouts/iopart.layout:288 +#: lib/layouts/jasatex.layout:223 +#: lib/layouts/jasatex.layout:262 +#: lib/layouts/revtex4.layout:228 +#: lib/layouts/siamltex.layout:319 +#: lib/layouts/sigplanconf.layout:184 +#: lib/layouts/stdstruct.inc:57 +#: lib/layouts/svcommon.inc:536 #: lib/layouts/svcommon.inc:570 msgid "BackMatter" msgstr "Compléments" -#: lib/layouts/IEEEtran.layout:234 lib/layouts/IEEEtran.layout:237 -#: lib/layouts/aastex.layout:122 lib/layouts/aastex.layout:453 -#: lib/layouts/ijmpc.layout:408 lib/layouts/ijmpd.layout:421 -#: lib/layouts/kluwer.layout:321 lib/layouts/kluwer.layout:334 -#: src/rowpainter.cpp:533 +#: lib/layouts/IEEEtran.layout:234 +#: lib/layouts/IEEEtran.layout:237 +#: lib/layouts/aastex.layout:122 +#: lib/layouts/aastex.layout:453 +#: lib/layouts/ijmpc.layout:409 +#: lib/layouts/ijmpd.layout:433 +#: lib/layouts/kluwer.layout:321 +#: lib/layouts/kluwer.layout:334 +#: src/rowpainter.cpp:547 msgid "Appendix" msgstr "Appendice" -#: lib/layouts/IEEEtran.layout:242 lib/layouts/aa.layout:94 -#: lib/layouts/aa.layout:381 lib/layouts/aapaper.layout:106 -#: lib/layouts/aapaper.layout:220 lib/layouts/achemso.layout:238 -#: lib/layouts/agutex.layout:200 lib/layouts/beamer.layout:879 -#: lib/layouts/book.layout:21 lib/layouts/book.layout:23 -#: lib/layouts/cl2emult.layout:103 lib/layouts/egs.layout:555 -#: lib/layouts/elsarticle.layout:297 lib/layouts/foils.layout:210 -#: lib/layouts/ijmpc.layout:431 lib/layouts/ijmpd.layout:444 -#: lib/layouts/jasatex.layout:258 lib/layouts/latex8.layout:125 -#: lib/layouts/llncs.layout:263 lib/layouts/memoir.layout:163 -#: lib/layouts/memoir.layout:165 lib/layouts/moderncv.layout:150 -#: lib/layouts/mwbk.layout:22 lib/layouts/mwbk.layout:24 -#: lib/layouts/mwrep.layout:13 lib/layouts/mwrep.layout:15 -#: lib/layouts/powerdot.layout:287 lib/layouts/recipebook.layout:46 -#: lib/layouts/recipebook.layout:48 lib/layouts/report.layout:12 -#: lib/layouts/report.layout:14 lib/layouts/scrbook.layout:22 -#: lib/layouts/scrbook.layout:24 lib/layouts/scrreprt.layout:11 -#: lib/layouts/scrreprt.layout:13 lib/layouts/siamltex.layout:317 -#: lib/layouts/simplecv.layout:145 lib/layouts/tufte-book.layout:241 -#: lib/layouts/tufte-book.layout:243 lib/layouts/aguplus.inc:172 -#: lib/layouts/aguplus.inc:174 lib/layouts/amsdefs.inc:196 -#: lib/layouts/scrclass.inc:246 lib/layouts/stdstruct.inc:53 -#: lib/layouts/svcommon.inc:566 src/frontends/qt4/GuiDocument.cpp:1422 +#: lib/layouts/IEEEtran.layout:242 +#: lib/layouts/aa.layout:94 +#: lib/layouts/aa.layout:381 +#: lib/layouts/aapaper.layout:106 +#: lib/layouts/aapaper.layout:220 +#: lib/layouts/achemso.layout:238 +#: lib/layouts/agutex.layout:200 +#: lib/layouts/beamer.layout:923 +#: lib/layouts/book.layout:21 +#: lib/layouts/book.layout:23 +#: lib/layouts/cl2emult.layout:103 +#: lib/layouts/egs.layout:555 +#: lib/layouts/elsarticle.layout:273 +#: lib/layouts/foils.layout:210 +#: lib/layouts/ijmpc.layout:432 +#: lib/layouts/ijmpd.layout:456 +#: lib/layouts/jasatex.layout:258 +#: lib/layouts/latex8.layout:125 +#: lib/layouts/llncs.layout:263 +#: lib/layouts/memoir.layout:163 +#: lib/layouts/memoir.layout:165 +#: lib/layouts/moderncv.layout:150 +#: lib/layouts/mwbk.layout:22 +#: lib/layouts/mwbk.layout:24 +#: lib/layouts/mwrep.layout:13 +#: lib/layouts/mwrep.layout:15 +#: lib/layouts/powerdot.layout:287 +#: lib/layouts/recipebook.layout:46 +#: lib/layouts/recipebook.layout:48 +#: lib/layouts/report.layout:12 +#: lib/layouts/report.layout:14 +#: lib/layouts/scrbook.layout:22 +#: lib/layouts/scrbook.layout:24 +#: lib/layouts/scrreprt.layout:11 +#: lib/layouts/scrreprt.layout:13 +#: lib/layouts/siamltex.layout:318 +#: lib/layouts/simplecv.layout:145 +#: lib/layouts/tufte-book.layout:241 +#: lib/layouts/tufte-book.layout:243 +#: lib/layouts/aguplus.inc:172 +#: lib/layouts/aguplus.inc:174 +#: lib/layouts/amsdefs.inc:196 +#: lib/layouts/scrclass.inc:246 +#: lib/layouts/stdstruct.inc:53 +#: lib/layouts/svcommon.inc:566 +#: src/frontends/qt4/GuiDocument.cpp:1316 msgid "Bibliography" msgstr "Bibliographie" -#: lib/layouts/IEEEtran.layout:257 lib/layouts/aastex.layout:125 -#: lib/layouts/aastex.layout:485 lib/layouts/aastex.layout:498 -#: lib/layouts/achemso.layout:252 lib/layouts/agutex.layout:215 -#: lib/layouts/beamer.layout:893 lib/layouts/cl2emult.layout:117 -#: lib/layouts/egs.layout:569 lib/layouts/elsarticle.layout:312 -#: lib/layouts/ijmpc.layout:446 lib/layouts/ijmpd.layout:459 -#: lib/layouts/iopart.layout:276 lib/layouts/iopart.layout:291 -#: lib/layouts/jasatex.layout:273 lib/layouts/kluwer.layout:342 -#: lib/layouts/kluwer.layout:354 lib/layouts/llncs.layout:277 -#: lib/layouts/moderncv.layout:164 lib/layouts/siamltex.layout:332 -#: lib/layouts/amsdefs.inc:210 lib/layouts/stdstruct.inc:68 -#: lib/layouts/svcommon.inc:581 src/output_plaintext.cpp:150 +#: lib/layouts/IEEEtran.layout:257 +#: lib/layouts/aastex.layout:125 +#: lib/layouts/aastex.layout:485 +#: lib/layouts/aastex.layout:498 +#: lib/layouts/achemso.layout:252 +#: lib/layouts/agutex.layout:215 +#: lib/layouts/beamer.layout:937 +#: lib/layouts/cl2emult.layout:117 +#: lib/layouts/egs.layout:569 +#: lib/layouts/elsarticle.layout:288 +#: lib/layouts/ijmpc.layout:447 +#: lib/layouts/ijmpd.layout:471 +#: lib/layouts/iopart.layout:276 +#: lib/layouts/iopart.layout:291 +#: lib/layouts/jasatex.layout:273 +#: lib/layouts/kluwer.layout:342 +#: lib/layouts/kluwer.layout:354 +#: lib/layouts/llncs.layout:277 +#: lib/layouts/moderncv.layout:164 +#: lib/layouts/siamltex.layout:333 +#: lib/layouts/amsdefs.inc:210 +#: lib/layouts/stdstruct.inc:68 +#: lib/layouts/svcommon.inc:581 +#: src/output_plaintext.cpp:145 msgid "References" msgstr "Références" @@ -6216,175 +6579,295 @@ msgstr "Biographie_sans_photo" msgid "BiographyNoPhoto" msgstr "BiographieSansPhoto" -#: lib/layouts/IEEEtran.layout:306 lib/layouts/beamer.layout:1050 -#: lib/layouts/foils.layout:281 lib/layouts/llncs.layout:379 -#: lib/layouts/siamltex.layout:170 lib/layouts/svmono.layout:85 -#: lib/layouts/svmono.layout:89 lib/layouts/svmono.layout:93 -#: lib/layouts/svcommon.inc:635 lib/layouts/theorems-proof.inc:30 +#: lib/layouts/IEEEtran.layout:306 +#: lib/layouts/beamer.layout:1094 +#: lib/layouts/foils.layout:281 +#: lib/layouts/ijmpc.layout:336 +#: lib/layouts/llncs.layout:379 +#: lib/layouts/siamltex.layout:171 +#: lib/layouts/svmono.layout:85 +#: lib/layouts/svmono.layout:89 +#: lib/layouts/svmono.layout:93 +#: lib/layouts/svcommon.inc:635 +#: lib/layouts/theorems-proof.inc:30 msgid "Proof." msgstr "Preuve." -#: lib/layouts/aa.layout:42 lib/layouts/aa.layout:229 -#: lib/layouts/aapaper.layout:64 lib/layouts/aapaper.layout:137 -#: lib/layouts/aastex.layout:67 lib/layouts/aastex.layout:177 -#: lib/layouts/amsart.layout:63 lib/layouts/amsbook.layout:54 -#: lib/layouts/apa.layout:310 lib/layouts/beamer.layout:108 -#: lib/layouts/beamer.layout:139 lib/layouts/beamer.layout:140 -#: lib/layouts/beamer.layout:183 lib/layouts/egs.layout:30 -#: lib/layouts/europecv.layout:29 lib/layouts/isprs.layout:147 -#: lib/layouts/kluwer.layout:60 lib/layouts/latex8.layout:46 -#: lib/layouts/llncs.layout:46 lib/layouts/ltugboat.layout:45 -#: lib/layouts/memoir.layout:70 lib/layouts/memoir.layout:134 -#: lib/layouts/moderncv.layout:33 lib/layouts/paper.layout:58 -#: lib/layouts/powerdot.layout:220 lib/layouts/revtex.layout:38 -#: lib/layouts/revtex4-1.layout:45 lib/layouts/revtex4.layout:64 -#: lib/layouts/siamltex.layout:357 lib/layouts/simplecv.layout:29 -#: lib/layouts/spie.layout:20 lib/layouts/tufte-book.layout:64 -#: lib/layouts/tufte-book.layout:85 lib/layouts/tufte-book.layout:86 -#: lib/layouts/tufte-handout.layout:23 lib/layouts/agu_stdsections.inc:32 -#: lib/layouts/aguplus.inc:29 lib/layouts/db_stdsections.inc:30 -#: lib/layouts/numrevtex.inc:6 lib/layouts/scrclass.inc:68 -#: lib/layouts/scrclass.inc:144 lib/layouts/stdsections.inc:13 -#: lib/layouts/stdsections.inc:41 lib/layouts/stdsections.inc:65 -#: lib/layouts/stdsections.inc:66 lib/layouts/svcommon.inc:116 -#: lib/layouts/svcommon.inc:153 lib/layouts/svcommon.inc:166 -#: lib/layouts/svcommon.inc:178 lib/layouts/svcommon.inc:190 -#: lib/layouts/svcommon.inc:410 src/frontends/qt4/GuiDocument.cpp:171 +#: lib/layouts/aa.layout:42 +#: lib/layouts/aa.layout:229 +#: lib/layouts/aapaper.layout:64 +#: lib/layouts/aapaper.layout:137 +#: lib/layouts/aastex.layout:67 +#: lib/layouts/aastex.layout:177 +#: lib/layouts/amsart.layout:63 +#: lib/layouts/amsbook.layout:54 +#: lib/layouts/apa.layout:287 +#: lib/layouts/beamer.layout:108 +#: lib/layouts/beamer.layout:139 +#: lib/layouts/beamer.layout:140 +#: lib/layouts/beamer.layout:183 +#: lib/layouts/beamer.layout:227 +#: lib/layouts/egs.layout:30 +#: lib/layouts/europecv.layout:29 +#: lib/layouts/isprs.layout:147 +#: lib/layouts/kluwer.layout:60 +#: lib/layouts/latex8.layout:46 +#: lib/layouts/llncs.layout:46 +#: lib/layouts/ltugboat.layout:45 +#: lib/layouts/memoir.layout:70 +#: lib/layouts/memoir.layout:134 +#: lib/layouts/moderncv.layout:33 +#: lib/layouts/paper.layout:58 +#: lib/layouts/powerdot.layout:220 +#: lib/layouts/revtex.layout:38 +#: lib/layouts/revtex4.layout:64 +#: lib/layouts/siamltex.layout:358 +#: lib/layouts/simplecv.layout:29 +#: lib/layouts/spie.layout:20 +#: lib/layouts/tufte-book.layout:64 +#: lib/layouts/tufte-book.layout:85 +#: lib/layouts/tufte-book.layout:86 +#: lib/layouts/tufte-handout.layout:23 +#: lib/layouts/agu_stdsections.inc:32 +#: lib/layouts/aguplus.inc:29 +#: lib/layouts/db_stdsections.inc:30 +#: lib/layouts/numrevtex.inc:6 +#: lib/layouts/scrclass.inc:68 +#: lib/layouts/scrclass.inc:144 +#: lib/layouts/stdsections.inc:13 +#: lib/layouts/stdsections.inc:41 +#: lib/layouts/stdsections.inc:65 +#: lib/layouts/stdsections.inc:66 +#: lib/layouts/svcommon.inc:116 +#: lib/layouts/svcommon.inc:153 +#: lib/layouts/svcommon.inc:166 +#: lib/layouts/svcommon.inc:178 +#: lib/layouts/svcommon.inc:190 +#: lib/layouts/svcommon.inc:410 +#: src/frontends/qt4/GuiDocument.cpp:170 msgid "Section" msgstr "Section" -#: lib/layouts/aa.layout:46 lib/layouts/aa.layout:240 -#: lib/layouts/aapaper.layout:68 lib/layouts/aapaper.layout:147 -#: lib/layouts/aastex.layout:71 lib/layouts/aastex.layout:190 -#: lib/layouts/amsart.layout:104 lib/layouts/amsbook.layout:64 -#: lib/layouts/apa.layout:321 lib/layouts/beamer.layout:182 -#: lib/layouts/egs.layout:52 lib/layouts/isprs.layout:159 -#: lib/layouts/kluwer.layout:69 lib/layouts/latex8.layout:55 -#: lib/layouts/llncs.layout:55 lib/layouts/ltugboat.layout:65 -#: lib/layouts/memoir.layout:76 lib/layouts/moderncv.layout:53 -#: lib/layouts/paper.layout:67 lib/layouts/revtex.layout:50 -#: lib/layouts/siamltex.layout:368 lib/layouts/simplecv.layout:51 -#: lib/layouts/tufte-book.layout:109 lib/layouts/agu_stdsections.inc:43 -#: lib/layouts/aguplus.inc:44 lib/layouts/db_stdsections.inc:39 -#: lib/layouts/numrevtex.inc:15 lib/layouts/scrclass.inc:76 -#: lib/layouts/stdsections.inc:90 lib/layouts/svcommon.inc:199 +#: lib/layouts/aa.layout:46 +#: lib/layouts/aa.layout:240 +#: lib/layouts/aapaper.layout:68 +#: lib/layouts/aapaper.layout:147 +#: lib/layouts/aastex.layout:71 +#: lib/layouts/aastex.layout:190 +#: lib/layouts/amsart.layout:104 +#: lib/layouts/amsbook.layout:64 +#: lib/layouts/apa.layout:298 +#: lib/layouts/beamer.layout:182 +#: lib/layouts/egs.layout:52 +#: lib/layouts/isprs.layout:159 +#: lib/layouts/kluwer.layout:69 +#: lib/layouts/latex8.layout:55 +#: lib/layouts/llncs.layout:55 +#: lib/layouts/ltugboat.layout:65 +#: lib/layouts/memoir.layout:76 +#: lib/layouts/moderncv.layout:53 +#: lib/layouts/paper.layout:67 +#: lib/layouts/revtex.layout:50 +#: lib/layouts/revtex4.layout:73 +#: lib/layouts/siamltex.layout:369 +#: lib/layouts/simplecv.layout:51 +#: lib/layouts/tufte-book.layout:109 +#: lib/layouts/agu_stdsections.inc:43 +#: lib/layouts/aguplus.inc:44 +#: lib/layouts/db_stdsections.inc:39 +#: lib/layouts/numrevtex.inc:15 +#: lib/layouts/scrclass.inc:76 +#: lib/layouts/stdsections.inc:90 +#: lib/layouts/svcommon.inc:199 msgid "Subsection" msgstr "SousSection" -#: lib/layouts/aa.layout:50 lib/layouts/aa.layout:253 -#: lib/layouts/aapaper.layout:72 lib/layouts/aapaper.layout:159 -#: lib/layouts/aastex.layout:75 lib/layouts/aastex.layout:203 -#: lib/layouts/amsart.layout:127 lib/layouts/amsbook.layout:73 -#: lib/layouts/apa.layout:331 lib/layouts/isprs.layout:169 -#: lib/layouts/kluwer.layout:79 lib/layouts/llncs.layout:64 -#: lib/layouts/ltugboat.layout:85 lib/layouts/memoir.layout:82 -#: lib/layouts/paper.layout:76 lib/layouts/recipebook.layout:97 -#: lib/layouts/revtex.layout:59 lib/layouts/revtex4-1.layout:53 -#: lib/layouts/revtex4.layout:73 lib/layouts/siamltex.layout:377 -#: lib/layouts/agu_stdsections.inc:54 lib/layouts/db_stdsections.inc:48 -#: lib/layouts/numrevtex.inc:24 lib/layouts/scrclass.inc:84 -#: lib/layouts/stdsections.inc:106 lib/layouts/svcommon.inc:208 +#: lib/layouts/aa.layout:50 +#: lib/layouts/aa.layout:253 +#: lib/layouts/aapaper.layout:72 +#: lib/layouts/aapaper.layout:159 +#: lib/layouts/aastex.layout:75 +#: lib/layouts/aastex.layout:203 +#: lib/layouts/amsart.layout:127 +#: lib/layouts/amsbook.layout:73 +#: lib/layouts/apa.layout:308 +#: lib/layouts/beamer.layout:226 +#: lib/layouts/isprs.layout:169 +#: lib/layouts/kluwer.layout:79 +#: lib/layouts/llncs.layout:64 +#: lib/layouts/ltugboat.layout:85 +#: lib/layouts/memoir.layout:82 +#: lib/layouts/paper.layout:76 +#: lib/layouts/recipebook.layout:97 +#: lib/layouts/revtex.layout:59 +#: lib/layouts/revtex4.layout:82 +#: lib/layouts/siamltex.layout:378 +#: lib/layouts/agu_stdsections.inc:54 +#: lib/layouts/db_stdsections.inc:48 +#: lib/layouts/numrevtex.inc:24 +#: lib/layouts/scrclass.inc:84 +#: lib/layouts/stdsections.inc:106 +#: lib/layouts/svcommon.inc:208 msgid "Subsubsection" msgstr "SousSousSection" -#: lib/layouts/aa.layout:54 lib/layouts/aapaper.layout:48 -#: lib/layouts/aastex.layout:83 lib/layouts/apa.layout:362 -#: lib/layouts/beamer.layout:46 lib/layouts/egs.layout:168 -#: lib/layouts/powerdot.layout:237 lib/layouts/simplecv.layout:80 -#: lib/layouts/agu_stdlists.inc:13 lib/layouts/db_stdlists.inc:12 +#: lib/layouts/aa.layout:54 +#: lib/layouts/aapaper.layout:48 +#: lib/layouts/aastex.layout:83 +#: lib/layouts/apa.layout:339 +#: lib/layouts/beamer.layout:46 +#: lib/layouts/egs.layout:168 +#: lib/layouts/powerdot.layout:237 +#: lib/layouts/simplecv.layout:80 +#: lib/layouts/agu_stdlists.inc:13 +#: lib/layouts/db_stdlists.inc:12 #: lib/layouts/stdlists.inc:13 msgid "Itemize" msgstr "ListePuces" -#: lib/layouts/aa.layout:57 lib/layouts/aapaper.layout:51 -#: lib/layouts/aastex.layout:86 lib/layouts/apa.layout:379 -#: lib/layouts/beamer.layout:64 lib/layouts/egs.layout:149 -#: lib/layouts/powerdot.layout:261 lib/layouts/agu_stdlists.inc:21 -#: lib/layouts/db_stdlists.inc:19 lib/layouts/stdlists.inc:34 +#: lib/layouts/aa.layout:57 +#: lib/layouts/aapaper.layout:51 +#: lib/layouts/aastex.layout:86 +#: lib/layouts/apa.layout:356 +#: lib/layouts/beamer.layout:64 +#: lib/layouts/egs.layout:149 +#: lib/layouts/powerdot.layout:261 +#: lib/layouts/agu_stdlists.inc:21 +#: lib/layouts/db_stdlists.inc:19 +#: lib/layouts/stdlists.inc:34 msgid "Enumerate" msgstr "Énumération" -#: lib/layouts/aa.layout:60 lib/layouts/aapaper.layout:54 -#: lib/layouts/aastex.layout:89 lib/layouts/beamer.layout:84 -#: lib/layouts/egs.layout:185 lib/layouts/hollywood.layout:129 -#: lib/layouts/paper.layout:101 lib/layouts/scrlettr.layout:17 -#: lib/layouts/scrlttr2.layout:21 lib/layouts/agu_stdlists.inc:29 -#: lib/layouts/db_stdlists.inc:26 lib/layouts/scrclass.inc:36 -#: lib/layouts/stdlists.inc:57 lib/layouts/svcommon.inc:588 +#: lib/layouts/aa.layout:60 +#: lib/layouts/aapaper.layout:54 +#: lib/layouts/aastex.layout:89 +#: lib/layouts/beamer.layout:84 +#: lib/layouts/egs.layout:185 +#: lib/layouts/hollywood.layout:129 +#: lib/layouts/paper.layout:101 +#: lib/layouts/scrlettr.layout:17 +#: lib/layouts/scrlttr2.layout:21 +#: lib/layouts/agu_stdlists.inc:29 +#: lib/layouts/db_stdlists.inc:26 +#: lib/layouts/scrclass.inc:36 +#: lib/layouts/stdlists.inc:57 +#: lib/layouts/svcommon.inc:588 #: lib/ui/stdtoolbars.inc:116 msgid "Description" msgstr "Description" -#: lib/layouts/aa.layout:63 lib/layouts/aapaper.layout:57 -#: lib/layouts/aastex.layout:92 lib/layouts/beamer.layout:47 -#: lib/layouts/beamer.layout:65 lib/layouts/beamer.layout:85 -#: lib/layouts/egs.layout:132 lib/layouts/ijmpc.layout:272 -#: lib/layouts/ijmpc.layout:292 lib/layouts/ijmpd.layout:275 -#: lib/layouts/ijmpd.layout:295 lib/layouts/scrlettr.layout:32 -#: lib/layouts/scrlttr2.layout:37 lib/layouts/stdlists.inc:14 -#: lib/layouts/stdlists.inc:35 lib/layouts/stdlists.inc:58 -#: lib/layouts/stdlists.inc:87 lib/layouts/stdlyxlist.inc:7 +#: lib/layouts/aa.layout:63 +#: lib/layouts/aapaper.layout:57 +#: lib/layouts/aastex.layout:92 +#: lib/layouts/beamer.layout:47 +#: lib/layouts/beamer.layout:65 +#: lib/layouts/beamer.layout:85 +#: lib/layouts/egs.layout:132 +#: lib/layouts/ijmpc.layout:260 +#: lib/layouts/ijmpc.layout:280 +#: lib/layouts/ijmpd.layout:263 +#: lib/layouts/ijmpd.layout:283 +#: lib/layouts/scrlettr.layout:32 +#: lib/layouts/scrlttr2.layout:37 +#: lib/layouts/stdlists.inc:14 +#: lib/layouts/stdlists.inc:35 +#: lib/layouts/stdlists.inc:58 +#: lib/layouts/stdlists.inc:87 +#: lib/layouts/stdlyxlist.inc:7 #: lib/ui/stdtoolbars.inc:115 msgid "List" msgstr "Liste" -#: lib/layouts/aa.layout:70 lib/layouts/aa.layout:119 -#: lib/layouts/aapaper.layout:79 lib/layouts/beamer.layout:766 -#: lib/layouts/kluwer.layout:129 lib/layouts/llncs.layout:128 -#: lib/layouts/sigplanconf.layout:110 lib/layouts/svprobth.layout:88 -#: lib/layouts/aapaper.inc:9 lib/layouts/scrclass.inc:169 +#: lib/layouts/aa.layout:70 +#: lib/layouts/aa.layout:119 +#: lib/layouts/aapaper.layout:79 +#: lib/layouts/beamer.layout:810 +#: lib/layouts/kluwer.layout:129 +#: lib/layouts/llncs.layout:128 +#: lib/layouts/sigplanconf.layout:110 +#: lib/layouts/svprobth.layout:51 +#: lib/layouts/aapaper.inc:9 +#: lib/layouts/scrclass.inc:169 #: lib/layouts/svcommon.inc:327 msgid "Subtitle" msgstr "SousTitre" -#: lib/layouts/aa.layout:76 lib/layouts/aa.layout:141 -#: lib/layouts/aapaper.layout:85 lib/layouts/dinbrief.layout:250 -#: lib/layouts/ectaart.layout:62 lib/layouts/egs.layout:236 -#: lib/layouts/elsarticle.layout:220 lib/layouts/entcs.layout:60 -#: lib/layouts/g-brief.layout:180 lib/layouts/g-brief2.layout:715 -#: lib/layouts/ijmpc.layout:137 lib/layouts/iopart.layout:145 -#: lib/layouts/isprs.layout:111 lib/layouts/kluwer.layout:182 -#: lib/layouts/revtex.layout:120 lib/layouts/revtex4-1.layout:116 -#: lib/layouts/revtex4.layout:176 lib/layouts/scrlettr.layout:139 -#: lib/layouts/scrlttr2.layout:47 lib/layouts/siamltex.layout:278 -#: lib/layouts/aapaper.inc:29 lib/layouts/amsdefs.inc:118 +#: lib/layouts/aa.layout:76 +#: lib/layouts/aa.layout:141 +#: lib/layouts/aapaper.layout:85 +#: lib/layouts/dinbrief.layout:250 +#: lib/layouts/ectaart.layout:62 +#: lib/layouts/egs.layout:236 +#: lib/layouts/elsarticle.layout:196 +#: lib/layouts/entcs.layout:60 +#: lib/layouts/g-brief.layout:180 +#: lib/layouts/g-brief2.layout:715 +#: lib/layouts/ijmpc.layout:125 +#: lib/layouts/iopart.layout:145 +#: lib/layouts/isprs.layout:111 +#: lib/layouts/kluwer.layout:182 +#: lib/layouts/revtex.layout:120 +#: lib/layouts/revtex4.layout:180 +#: lib/layouts/scrlettr.layout:139 +#: lib/layouts/scrlttr2.layout:47 +#: lib/layouts/siamltex.layout:279 +#: lib/layouts/aapaper.inc:29 +#: lib/layouts/amsdefs.inc:118 #: lib/layouts/lyxmacros.inc:44 msgid "Address" msgstr "Adresse" -#: lib/layouts/aa.layout:79 lib/layouts/aa.layout:159 -#: lib/layouts/aapaper.layout:91 lib/layouts/aapaper.inc:63 +#: lib/layouts/aa.layout:79 +#: lib/layouts/aa.layout:159 +#: lib/layouts/aapaper.layout:91 +#: lib/layouts/aapaper.inc:63 msgid "Offprint" msgstr "Tiré à part" -#: lib/layouts/aa.layout:82 lib/layouts/aa.layout:182 -#: lib/layouts/svglobal.layout:133 lib/layouts/svjog.layout:137 -#: lib/layouts/svprobth.layout:167 +#: lib/layouts/aa.layout:82 +#: lib/layouts/aa.layout:182 msgid "Mail" msgstr "Courrier" -#: lib/layouts/aa.layout:85 lib/layouts/aa.layout:287 -#: lib/layouts/aapaper.layout:97 lib/layouts/aapaper.layout:192 -#: lib/layouts/aastex.layout:110 lib/layouts/aastex.layout:241 -#: lib/layouts/beamer.layout:856 lib/layouts/dinbrief.layout:152 -#: lib/layouts/egs.layout:469 lib/layouts/foils.layout:140 -#: lib/layouts/frletter.layout:21 lib/layouts/g-brief.layout:189 -#: lib/layouts/g-brief2.layout:800 lib/layouts/jasatex.layout:137 -#: lib/layouts/kluwer.layout:149 lib/layouts/lettre.layout:51 -#: lib/layouts/lettre.layout:213 lib/layouts/powerdot.layout:85 -#: lib/layouts/revtex.layout:110 lib/layouts/revtex4-1.layout:154 -#: lib/layouts/revtex4.layout:123 lib/layouts/scrlettr.layout:160 -#: lib/layouts/scrlttr2.layout:239 lib/layouts/siamltex.layout:228 -#: lib/layouts/tufte-book.layout:42 lib/layouts/agu_stdtitle.inc:238 -#: lib/layouts/amsdefs.inc:67 lib/layouts/db_stdtitle.inc:35 -#: lib/layouts/scrclass.inc:185 lib/layouts/stdtitle.inc:95 -#: lib/layouts/svcommon.inc:364 lib/ui/stdmenus.inc:378 -#: lib/external_templates:343 lib/external_templates:344 +#: lib/layouts/aa.layout:85 +#: lib/layouts/aa.layout:287 +#: lib/layouts/aapaper.layout:97 +#: lib/layouts/aapaper.layout:192 +#: lib/layouts/aastex.layout:110 +#: lib/layouts/aastex.layout:241 +#: lib/layouts/beamer.layout:900 +#: lib/layouts/dinbrief.layout:152 +#: lib/layouts/egs.layout:469 +#: lib/layouts/foils.layout:140 +#: lib/layouts/frletter.layout:21 +#: lib/layouts/g-brief.layout:189 +#: lib/layouts/g-brief2.layout:800 +#: lib/layouts/jasatex.layout:137 +#: lib/layouts/kluwer.layout:149 +#: lib/layouts/lettre.layout:51 +#: lib/layouts/lettre.layout:213 +#: lib/layouts/powerdot.layout:85 +#: lib/layouts/revtex.layout:110 +#: lib/layouts/revtex4.layout:140 +#: lib/layouts/scrlettr.layout:160 +#: lib/layouts/scrlttr2.layout:239 +#: lib/layouts/siamltex.layout:229 +#: lib/layouts/tufte-book.layout:42 +#: lib/layouts/agu_stdtitle.inc:238 +#: lib/layouts/amsdefs.inc:67 +#: lib/layouts/db_stdtitle.inc:35 +#: lib/layouts/scrclass.inc:185 +#: lib/layouts/stdtitle.inc:97 +#: lib/layouts/svcommon.inc:364 +#: lib/ui/stdmenus.inc:374 +#: lib/external_templates:343 +#: lib/external_templates:344 #: lib/external_templates:348 msgid "Date" msgstr "Date" -#: lib/layouts/aa.layout:168 lib/layouts/aapaper.inc:71 +#: lib/layouts/aa.layout:168 +#: lib/layouts/aapaper.inc:71 msgid "Offprint Requests to:" msgstr "Demandes de tirés à part pour :" @@ -6392,7 +6875,8 @@ msgstr "Demandes de tirés à part pour :" msgid "Correspondence to:" msgstr "Correspondance pour :" -#: lib/layouts/aa.layout:217 lib/layouts/egs.layout:519 +#: lib/layouts/aa.layout:217 +#: lib/layouts/egs.layout:519 msgid "Acknowledgements." msgstr "Remerciements." @@ -6408,105 +6892,148 @@ msgstr "marque institution" msgid "Key words." msgstr "Mots-clés." -#: lib/layouts/aa.layout:389 lib/layouts/beamer.layout:813 -#: lib/layouts/cl2emult.layout:70 lib/layouts/llncs.layout:216 +#: lib/layouts/aa.layout:389 +#: lib/layouts/beamer.layout:857 +#: lib/layouts/cl2emult.layout:70 +#: lib/layouts/llncs.layout:216 #: lib/layouts/svcommon.inc:347 msgid "Institute" msgstr "Institut" -#: lib/layouts/aa.layout:399 lib/layouts/scrlttr2.layout:199 +#: lib/layouts/aa.layout:399 +#: lib/layouts/scrlttr2.layout:199 msgid "E-Mail" msgstr "E-mail" -#: lib/layouts/aa.layout:410 lib/layouts/aapaper.layout:88 -#: lib/layouts/aastex.layout:104 lib/layouts/aastex.layout:354 -#: lib/layouts/achemso.layout:89 lib/layouts/ectaart.layout:69 -#: lib/layouts/elsarticle.layout:237 lib/layouts/iopart.layout:160 -#: lib/layouts/jasatex.layout:131 lib/layouts/latex8.layout:64 -#: lib/layouts/lettre.layout:45 lib/layouts/lettre.layout:398 -#: lib/layouts/llncs.layout:234 lib/layouts/aapaper.inc:46 -#: lib/layouts/amsdefs.inc:145 lib/layouts/db_stdcharstyles.inc:71 -#: lib/layouts/db_stdcharstyles.inc:73 lib/layouts/svcommon.inc:665 +#: lib/layouts/aa.layout:410 +#: lib/layouts/aapaper.layout:88 +#: lib/layouts/aastex.layout:104 +#: lib/layouts/aastex.layout:354 +#: lib/layouts/achemso.layout:89 +#: lib/layouts/ectaart.layout:69 +#: lib/layouts/elsarticle.layout:213 +#: lib/layouts/iopart.layout:160 +#: lib/layouts/jasatex.layout:131 +#: lib/layouts/latex8.layout:64 +#: lib/layouts/lettre.layout:45 +#: lib/layouts/lettre.layout:398 +#: lib/layouts/llncs.layout:234 +#: lib/layouts/aapaper.inc:46 +#: lib/layouts/amsdefs.inc:145 +#: lib/layouts/db_stdcharstyles.inc:71 +#: lib/layouts/db_stdcharstyles.inc:73 +#: lib/layouts/svcommon.inc:665 #: lib/layouts/svcommon.inc:670 msgid "Email" msgstr "E-mail" -#: lib/layouts/aa.layout:414 src/insets/InsetHyperlink.cpp:261 +#: lib/layouts/aa.layout:414 +#: src/insets/InsetHyperlink.cpp:298 msgid "email" msgstr "e-mail" -#: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.inc:103 -#: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:46 +#: lib/layouts/aapaper.layout:94 +#: lib/layouts/aapaper.inc:103 +#: lib/ui/stdtoolbars.inc:139 +#: src/frontends/qt4/GuiThesaurus.cpp:46 msgid "Thesaurus" msgstr "Dictionnaire de synonymes" -#: lib/layouts/aastex.layout:79 lib/layouts/agutex.layout:149 -#: lib/layouts/amsbook.layout:126 lib/layouts/apa.layout:341 -#: lib/layouts/egs.layout:71 lib/layouts/kluwer.layout:89 -#: lib/layouts/llncs.layout:73 lib/layouts/ltugboat.layout:105 -#: lib/layouts/memoir.layout:88 lib/layouts/paper.layout:85 -#: lib/layouts/revtex.layout:68 lib/layouts/revtex4-1.layout:60 -#: lib/layouts/revtex4.layout:81 lib/layouts/agu_stdsections.inc:65 -#: lib/layouts/aguplus.inc:59 lib/layouts/db_stdsections.inc:57 -#: lib/layouts/numrevtex.inc:33 lib/layouts/scrclass.inc:92 -#: lib/layouts/stdsections.inc:121 lib/layouts/svcommon.inc:217 +#: lib/layouts/aastex.layout:79 +#: lib/layouts/agutex.layout:149 +#: lib/layouts/amsbook.layout:126 +#: lib/layouts/apa.layout:318 +#: lib/layouts/egs.layout:71 +#: lib/layouts/kluwer.layout:89 +#: lib/layouts/llncs.layout:73 +#: lib/layouts/ltugboat.layout:105 +#: lib/layouts/memoir.layout:88 +#: lib/layouts/paper.layout:85 +#: lib/layouts/revtex.layout:68 +#: lib/layouts/revtex4.layout:90 +#: lib/layouts/agu_stdsections.inc:65 +#: lib/layouts/aguplus.inc:59 +#: lib/layouts/db_stdsections.inc:57 +#: lib/layouts/numrevtex.inc:33 +#: lib/layouts/scrclass.inc:92 +#: lib/layouts/stdsections.inc:121 +#: lib/layouts/svcommon.inc:217 msgid "Paragraph" msgstr "Paragraphe" -#: lib/layouts/aastex.layout:101 lib/layouts/aastex.layout:272 -#: lib/layouts/achemso.layout:94 lib/layouts/apa.layout:150 -#: lib/layouts/jasatex.layout:98 lib/layouts/latex8.layout:88 -#: lib/layouts/revtex4-1.layout:78 lib/layouts/revtex4.layout:132 -#: lib/layouts/agu_stdtitle.inc:128 lib/layouts/aguplus.inc:65 +#: lib/layouts/aastex.layout:101 +#: lib/layouts/aastex.layout:272 +#: lib/layouts/achemso.layout:94 +#: lib/layouts/apa.layout:150 +#: lib/layouts/jasatex.layout:98 +#: lib/layouts/latex8.layout:88 +#: lib/layouts/revtex4.layout:149 +#: lib/layouts/agu_stdtitle.inc:128 +#: lib/layouts/aguplus.inc:65 msgid "Affiliation" msgstr "Affiliation" -#: lib/layouts/aastex.layout:107 lib/layouts/aastex.layout:393 +#: lib/layouts/aastex.layout:107 +#: lib/layouts/aastex.layout:393 msgid "And" msgstr "Et" -#: lib/layouts/aastex.layout:119 lib/layouts/aastex.layout:373 -#: lib/layouts/apa.layout:222 lib/layouts/egs.layout:505 -#: lib/layouts/elsart.layout:430 lib/layouts/isprs.layout:208 -#: lib/layouts/kluwer.layout:301 lib/layouts/kluwer.layout:312 -#: lib/layouts/aapaper.inc:91 lib/layouts/svcommon.inc:550 +#: lib/layouts/aastex.layout:119 +#: lib/layouts/aastex.layout:373 +#: lib/layouts/apa.layout:199 +#: lib/layouts/egs.layout:505 +#: lib/layouts/elsart.layout:430 +#: lib/layouts/isprs.layout:208 +#: lib/layouts/kluwer.layout:301 +#: lib/layouts/kluwer.layout:312 +#: lib/layouts/aapaper.inc:91 +#: lib/layouts/svcommon.inc:550 #: lib/layouts/svcommon.inc:561 msgid "Acknowledgements" msgstr "Remerciements" -#: lib/layouts/aastex.layout:128 lib/layouts/aastex.layout:413 +#: lib/layouts/aastex.layout:128 +#: lib/layouts/aastex.layout:413 msgid "PlaceFigure" msgstr "PlacementFigure" -#: lib/layouts/aastex.layout:131 lib/layouts/aastex.layout:433 +#: lib/layouts/aastex.layout:131 +#: lib/layouts/aastex.layout:433 msgid "PlaceTable" msgstr "PlacementTableau" -#: lib/layouts/aastex.layout:134 lib/layouts/aastex.layout:553 +#: lib/layouts/aastex.layout:134 +#: lib/layouts/aastex.layout:553 msgid "TableComments" msgstr "RemarquesTableau" -#: lib/layouts/aastex.layout:137 lib/layouts/aastex.layout:533 +#: lib/layouts/aastex.layout:137 +#: lib/layouts/aastex.layout:533 msgid "TableRefs" msgstr "RéfsTableau" -#: lib/layouts/aastex.layout:141 lib/layouts/aastex.layout:473 +#: lib/layouts/aastex.layout:141 +#: lib/layouts/aastex.layout:473 msgid "MathLetters" msgstr "LettresMathématiques" -#: lib/layouts/aastex.layout:144 lib/layouts/aastex.layout:512 +#: lib/layouts/aastex.layout:144 +#: lib/layouts/aastex.layout:512 msgid "NoteToEditor" msgstr "Note_À_l'Éditeur" -#: lib/layouts/aastex.layout:147 lib/layouts/aastex.layout:625 +#: lib/layouts/aastex.layout:147 +#: lib/layouts/aastex.layout:625 msgid "Facility" msgstr "Facilité" -#: lib/layouts/aastex.layout:150 lib/layouts/aastex.layout:651 +#: lib/layouts/aastex.layout:150 +#: lib/layouts/aastex.layout:651 msgid "Objectname" msgstr "NomObjet" -#: lib/layouts/aastex.layout:153 lib/layouts/aastex.layout:678 +#: lib/layouts/aastex.layout:153 +#: lib/layouts/aastex.layout:678 msgid "Dataset" msgstr "EnsembleDonnées" @@ -6534,10 +7061,11 @@ msgstr "En-têtes de sujet :" msgid "[Acknowledgements]" msgstr "[Remerciements]" -#: lib/layouts/aastex.layout:404 src/frontends/qt4/GuiDocument.cpp:2130 -#: src/frontends/qt4/GuiDocument.cpp:2142 -#: src/frontends/qt4/GuiDocument.cpp:2241 -#: src/frontends/qt4/GuiDocument.cpp:2260 +#: lib/layouts/aastex.layout:404 +#: src/frontends/qt4/GuiDocument.cpp:1974 +#: src/frontends/qt4/GuiDocument.cpp:1986 +#: src/frontends/qt4/GuiDocument.cpp:2078 +#: src/frontends/qt4/GuiDocument.cpp:2097 msgid "and" msgstr "et" @@ -6609,18 +7137,22 @@ msgstr "Autre affiliation" msgid "Also Affiliation" msgstr "Également affiliation" -#: lib/layouts/achemso.layout:110 lib/layouts/lettre.layout:41 -#: lib/layouts/lettre.layout:342 lib/layouts/scrlttr2.layout:191 -#: lib/configure.py:603 +#: lib/layouts/achemso.layout:110 +#: lib/layouts/lettre.layout:41 +#: lib/layouts/lettre.layout:342 +#: lib/layouts/scrlttr2.layout:191 +#: lib/configure.py:663 msgid "Fax" msgstr "Fax" -#: lib/layouts/achemso.layout:115 lib/layouts/dinbrief.layout:295 +#: lib/layouts/achemso.layout:115 +#: lib/layouts/dinbrief.layout:295 #: lib/layouts/g-brief.layout:117 msgid "Phone" msgstr "Téléphone" -#: lib/layouts/achemso.layout:122 lib/layouts/achemso.layout:133 +#: lib/layouts/achemso.layout:122 +#: lib/layouts/achemso.layout:133 msgid "Scheme" msgstr "Schéma" @@ -6628,7 +7160,8 @@ msgstr "Schéma" msgid "List of Schemes" msgstr "Liste des schémas" -#: lib/layouts/achemso.layout:144 lib/layouts/achemso.layout:155 +#: lib/layouts/achemso.layout:144 +#: lib/layouts/achemso.layout:155 msgid "Chart" msgstr "Diagramme" @@ -6636,7 +7169,8 @@ msgstr "Diagramme" msgid "List of Charts" msgstr "Liste des diagrammes" -#: lib/layouts/achemso.layout:166 lib/layouts/achemso.layout:177 +#: lib/layouts/achemso.layout:166 +#: lib/layouts/achemso.layout:177 msgid "Graph" msgstr "Graphique" @@ -6684,13 +7218,18 @@ msgstr "Catégories CR" msgid "Computing Review Categories" msgstr "Catégories « Computing Review »" -#: lib/layouts/acmsiggraph.layout:152 lib/layouts/acmsiggraph.layout:159 -#: lib/layouts/agutex.layout:177 lib/layouts/apa.layout:243 -#: lib/layouts/iopart.layout:239 lib/layouts/iopart.layout:253 -#: lib/layouts/jasatex.layout:220 lib/layouts/jasatex.layout:225 -#: lib/layouts/revtex4-1.layout:213 lib/layouts/revtex4.layout:230 -#: lib/layouts/revtex4.layout:240 lib/layouts/sigplanconf.layout:181 -#: lib/layouts/sigplanconf.layout:188 lib/layouts/spie.layout:90 +#: lib/layouts/acmsiggraph.layout:152 +#: lib/layouts/acmsiggraph.layout:159 +#: lib/layouts/agutex.layout:177 +#: lib/layouts/apa.layout:220 +#: lib/layouts/iopart.layout:239 +#: lib/layouts/iopart.layout:253 +#: lib/layouts/jasatex.layout:220 +#: lib/layouts/jasatex.layout:225 +#: lib/layouts/revtex4.layout:227 +#: lib/layouts/sigplanconf.layout:181 +#: lib/layouts/sigplanconf.layout:188 +#: lib/layouts/spie.layout:90 msgid "Acknowledgments" msgstr "Remerciements" @@ -6698,7 +7237,8 @@ msgstr "Remerciements" msgid "Authors" msgstr "Auteurs" -#: lib/layouts/agutex.layout:90 lib/layouts/agutex.layout:94 +#: lib/layouts/agutex.layout:90 +#: lib/layouts/agutex.layout:94 msgid "Affiliation Mark" msgstr "Marque d'affiliation" @@ -6710,10 +7250,13 @@ msgstr "Affiliation de l'auteur" msgid "Author affiliation:" msgstr "Affiliation de l'auteur :" -#: lib/layouts/agutex.layout:142 lib/layouts/egs.layout:498 -#: lib/layouts/kluwer.layout:271 lib/layouts/llncs.layout:256 -#: lib/layouts/siamltex.layout:264 lib/layouts/svglobal.layout:164 -#: lib/layouts/svjog.layout:168 lib/layouts/svprobth.layout:198 +#: lib/layouts/agutex.layout:142 +#: lib/layouts/egs.layout:498 +#: lib/layouts/kluwer.layout:271 +#: lib/layouts/llncs.layout:256 +#: lib/layouts/siamltex.layout:265 +#: lib/layouts/svglobal.layout:52 +#: lib/layouts/svjog.layout:55 #: lib/layouts/amsdefs.inc:105 msgid "Abstract." msgstr "Résumé." @@ -6722,11 +7265,16 @@ msgstr "Résumé." msgid "Acknowledgments." msgstr "Remerciements." -#: lib/layouts/amsart.layout:74 lib/layouts/amsbook.layout:83 -#: lib/layouts/beamer.layout:172 lib/layouts/egs.layout:579 -#: lib/layouts/isprs.layout:179 lib/layouts/spie.layout:31 -#: lib/layouts/aguplus.inc:37 lib/layouts/db_stdstarsections.inc:36 -#: lib/layouts/stdstarsections.inc:35 lib/layouts/svcommon.inc:249 +#: lib/layouts/amsart.layout:74 +#: lib/layouts/amsbook.layout:83 +#: lib/layouts/beamer.layout:172 +#: lib/layouts/egs.layout:579 +#: lib/layouts/isprs.layout:179 +#: lib/layouts/spie.layout:31 +#: lib/layouts/aguplus.inc:37 +#: lib/layouts/db_stdstarsections.inc:36 +#: lib/layouts/stdstarsections.inc:35 +#: lib/layouts/svcommon.inc:249 msgid "Section*" msgstr "Section*" @@ -6738,26 +7286,41 @@ msgstr "Section-spéciale" msgid "SpecialSection*" msgstr "Section-spéciale*" -#: lib/layouts/amsart.layout:95 lib/layouts/beamer.layout:174 -#: lib/layouts/beamer.layout:218 lib/layouts/memoir.layout:153 -#: lib/layouts/stdstarsections.inc:15 lib/layouts/stdstarsections.inc:26 -#: lib/layouts/stdstarsections.inc:37 lib/layouts/stdstarsections.inc:48 -#: lib/layouts/stdstarsections.inc:59 lib/layouts/stdstarsections.inc:70 -#: lib/layouts/stdstarsections.inc:81 lib/layouts/svcommon.inc:284 +#: lib/layouts/amsart.layout:95 +#: lib/layouts/beamer.layout:174 +#: lib/layouts/beamer.layout:218 +#: lib/layouts/beamer.layout:262 +#: lib/layouts/memoir.layout:153 +#: lib/layouts/stdstarsections.inc:15 +#: lib/layouts/stdstarsections.inc:26 +#: lib/layouts/stdstarsections.inc:37 +#: lib/layouts/stdstarsections.inc:48 +#: lib/layouts/stdstarsections.inc:59 +#: lib/layouts/stdstarsections.inc:70 +#: lib/layouts/stdstarsections.inc:81 +#: lib/layouts/svcommon.inc:284 msgid "Unnumbered" msgstr "NonNuméroté" -#: lib/layouts/amsart.layout:116 lib/layouts/amsbook.layout:92 -#: lib/layouts/beamer.layout:216 lib/layouts/egs.layout:599 -#: lib/layouts/isprs.layout:190 lib/layouts/aguplus.inc:52 -#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:46 +#: lib/layouts/amsart.layout:116 +#: lib/layouts/amsbook.layout:92 +#: lib/layouts/beamer.layout:216 +#: lib/layouts/egs.layout:599 +#: lib/layouts/isprs.layout:190 +#: lib/layouts/aguplus.inc:52 +#: lib/layouts/db_stdstarsections.inc:48 +#: lib/layouts/stdstarsections.inc:46 #: lib/layouts/svcommon.inc:257 msgid "Subsection*" msgstr "SousSection*" -#: lib/layouts/amsart.layout:137 lib/layouts/amsbook.layout:100 -#: lib/layouts/isprs.layout:199 lib/layouts/db_stdstarsections.inc:60 -#: lib/layouts/stdstarsections.inc:57 lib/layouts/svcommon.inc:265 +#: lib/layouts/amsart.layout:137 +#: lib/layouts/amsbook.layout:100 +#: lib/layouts/beamer.layout:260 +#: lib/layouts/isprs.layout:199 +#: lib/layouts/db_stdstarsections.inc:60 +#: lib/layouts/stdstarsections.inc:57 +#: lib/layouts/svcommon.inc:265 msgid "Subsubsection*" msgstr "SousSousSection*" @@ -6793,8 +7356,9 @@ msgstr "TroisAuteurs" msgid "FourAuthors" msgstr "QuatreAuteurs" -#: lib/layouts/apa.layout:162 lib/layouts/egs.layout:326 -#: lib/layouts/revtex4-1.layout:89 lib/layouts/revtex4.layout:143 +#: lib/layouts/apa.layout:162 +#: lib/layouts/egs.layout:326 +#: lib/layouts/revtex4.layout:160 #: lib/layouts/agu_stdtitle.inc:131 msgid "Affiliation:" msgstr "Affiliation :" @@ -6811,72 +7375,52 @@ msgstr "TroisAffiliations" msgid "FourAffiliations" msgstr "QuatreAffiliations" -#: lib/layouts/apa.layout:192 lib/layouts/egs.layout:335 -msgid "Journal" -msgstr "Journal" - -#: lib/layouts/apa.layout:206 -msgid "CopNum" -msgstr "NumCopie" - -#: lib/layouts/apa.layout:213 lib/layouts/elsart.layout:392 -#: lib/layouts/iopart.layout:95 lib/layouts/llncs.layout:362 -#: lib/layouts/powerdot.layout:194 lib/layouts/slides.layout:167 -#: lib/layouts/stdinsets.inc:101 lib/layouts/theorems-without-preamble.inc:388 -#: lib/layouts/theorems-without-preamble.inc:395 -#: lib/layouts/theorems-without-preamble.inc:398 -#: lib/layouts/theorems-ams-extended-bytype.module:199 -#: lib/layouts/theorems-ams-extended-bytype.module:208 -#: lib/layouts/theorems-ams-extended-bytype.module:211 -#: lib/layouts/theorems-ams-extended-bytype.module:226 -#: lib/layouts/theorems-ams-extended-bytype.module:229 -#: lib/layouts/theorems-ams-extended.module:174 -#: lib/layouts/theorems-ams-extended.module:183 -#: lib/layouts/theorems-ams-extended.module:186 -#: lib/layouts/theorems-ams-extended.module:200 -#: lib/layouts/theorems-ams-extended.module:203 -msgid "Note" -msgstr "Note" - -#: lib/layouts/apa.layout:234 +#: lib/layouts/apa.layout:211 msgid "Acknowledgements:" msgstr "Remerciements :" -#: lib/layouts/apa.layout:248 +#: lib/layouts/apa.layout:225 msgid "ThickLine" msgstr "LigneÉpaisse" -#: lib/layouts/apa.layout:258 +#: lib/layouts/apa.layout:235 msgid "CenteredCaption" msgstr "LégendeCentrée" -#: lib/layouts/apa.layout:268 lib/layouts/scrclass.inc:265 +#: lib/layouts/apa.layout:245 +#: lib/layouts/scrclass.inc:265 #: lib/layouts/scrclass.inc:285 msgid "Senseless!" msgstr "Absurde !" -#: lib/layouts/apa.layout:278 +#: lib/layouts/apa.layout:255 msgid "FitFigure" msgstr "AjusteFigure" -#: lib/layouts/apa.layout:284 +#: lib/layouts/apa.layout:261 msgid "FitBitmap" msgstr "AjusteBitmap" -#: lib/layouts/apa.layout:351 lib/layouts/egs.layout:89 -#: lib/layouts/kluwer.layout:99 lib/layouts/llncs.layout:83 -#: lib/layouts/memoir.layout:94 lib/layouts/paper.layout:94 -#: lib/layouts/agu_stdsections.inc:76 lib/layouts/db_stdsections.inc:66 -#: lib/layouts/scrclass.inc:100 lib/layouts/stdsections.inc:131 +#: lib/layouts/apa.layout:328 +#: lib/layouts/egs.layout:89 +#: lib/layouts/kluwer.layout:99 +#: lib/layouts/llncs.layout:83 +#: lib/layouts/memoir.layout:94 +#: lib/layouts/paper.layout:94 +#: lib/layouts/agu_stdsections.inc:76 +#: lib/layouts/db_stdsections.inc:66 +#: lib/layouts/scrclass.inc:100 +#: lib/layouts/stdsections.inc:131 #: lib/layouts/svcommon.inc:228 msgid "Subparagraph" msgstr "SousParagraphe" -#: lib/layouts/apa.layout:398 +#: lib/layouts/apa.layout:375 msgid "Seriate" msgstr "Sérié" -#: lib/layouts/apa.layout:414 lib/layouts/apa.layout:415 +#: lib/layouts/apa.layout:391 +#: lib/layouts/apa.layout:392 #: lib/layouts/stdcounters.inc:48 msgid "(\\alph{enumii})" msgstr "(\\alph{enumii})" @@ -6898,25 +7442,36 @@ msgid "Latin off" msgstr "Latin inactif" # Cadre = Frame ? -#: lib/layouts/article-beamer.layout:26 lib/layouts/beamer.layout:226 +#: lib/layouts/article-beamer.layout:26 +#: lib/layouts/beamer.layout:270 #: lib/layouts/scrarticle-beamer.layout:22 msgid "BeginFrame" msgstr "DébutCadre" -#: lib/layouts/article.layout:19 lib/layouts/beamer.layout:107 -#: lib/layouts/beamer.layout:122 lib/layouts/memoir.layout:52 -#: lib/layouts/mwart.layout:24 lib/layouts/paper.layout:46 -#: lib/layouts/scrartcl.layout:21 lib/layouts/svmult.layout:102 -#: lib/layouts/tufte-handout.layout:22 lib/layouts/agu_stdsections.inc:12 -#: lib/layouts/db_stdsections.inc:12 lib/layouts/numreport.inc:6 -#: lib/layouts/scrclass.inc:51 lib/layouts/stdsections.inc:12 +#: lib/layouts/article.layout:19 +#: lib/layouts/beamer.layout:107 +#: lib/layouts/beamer.layout:122 +#: lib/layouts/memoir.layout:52 +#: lib/layouts/mwart.layout:24 +#: lib/layouts/paper.layout:46 +#: lib/layouts/scrartcl.layout:21 +#: lib/layouts/svmult.layout:102 +#: lib/layouts/tufte-handout.layout:22 +#: lib/layouts/agu_stdsections.inc:12 +#: lib/layouts/db_stdsections.inc:12 +#: lib/layouts/numreport.inc:6 +#: lib/layouts/scrclass.inc:51 +#: lib/layouts/stdsections.inc:12 #: lib/layouts/svcommon.inc:107 msgid "Part" msgstr "Partie" -#: lib/layouts/article.layout:31 lib/layouts/mwart.layout:35 -#: lib/layouts/scrartcl.layout:31 lib/layouts/db_stdstarsections.inc:13 -#: lib/layouts/stdstarsections.inc:13 lib/layouts/svcommon.inc:240 +#: lib/layouts/article.layout:31 +#: lib/layouts/mwart.layout:35 +#: lib/layouts/scrartcl.layout:31 +#: lib/layouts/db_stdstarsections.inc:13 +#: lib/layouts/stdstarsections.inc:13 +#: lib/layouts/svcommon.inc:240 msgid "Part*" msgstr "Partie*" @@ -6924,7 +7479,8 @@ msgstr "Partie*" msgid "Section \\arabic{section}" msgstr "Section \\arabic{section}" -#: lib/layouts/beamer.layout:167 lib/layouts/powerdot.layout:231 +#: lib/layouts/beamer.layout:167 +#: lib/layouts/powerdot.layout:231 #: lib/layouts/numarticle.inc:10 msgid "\\Alph{section}" msgstr "\\Alph{section}" @@ -6937,334 +7493,388 @@ msgstr "SousSection \\arabic{section}.\\arabic{subsection}" msgid "\\arabic{section}.\\arabic{subsection}" msgstr "\\arabic{section}.\\arabic{subsection}" -#: lib/layouts/beamer.layout:227 lib/layouts/beamer.layout:269 -#: lib/layouts/beamer.layout:307 lib/layouts/beamer.layout:346 -#: lib/layouts/beamer.layout:375 +#: lib/layouts/beamer.layout:241 +msgid "Subsubsection \\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}" +msgstr "SousSousSection \\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}" + +#: lib/layouts/beamer.layout:255 +msgid "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}" +msgstr "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}" + +#: lib/layouts/beamer.layout:271 +#: lib/layouts/beamer.layout:313 +#: lib/layouts/beamer.layout:351 +#: lib/layouts/beamer.layout:390 +#: lib/layouts/beamer.layout:419 msgid "Frames" msgstr "Cadres" -#: lib/layouts/beamer.layout:244 +#: lib/layouts/beamer.layout:288 msgid "Frame" msgstr "Cadre" -#: lib/layouts/beamer.layout:268 +#: lib/layouts/beamer.layout:312 msgid "BeginPlainFrame" msgstr "DébutCadreSimple" # paquetage beamer -#: lib/layouts/beamer.layout:285 +#: lib/layouts/beamer.layout:329 msgid "Frame (no head/foot/sidebars)" msgstr "Cadre (pas d'en-tête/pied de page/barres latérales)" # Beamer -#: lib/layouts/beamer.layout:306 +#: lib/layouts/beamer.layout:350 msgid "AgainFrame" msgstr "CadreReprise" # Paquetage Beamer -#: lib/layouts/beamer.layout:323 +#: lib/layouts/beamer.layout:367 msgid "Again frame with label" msgstr "Cadre de reprise avec étiquette" -#: lib/layouts/beamer.layout:345 +#: lib/layouts/beamer.layout:389 msgid "EndFrame" msgstr "FinCadre" -#: lib/layouts/beamer.layout:359 +#: lib/layouts/beamer.layout:403 msgid "________________________________" msgstr "________________________________" -#: lib/layouts/beamer.layout:374 +#: lib/layouts/beamer.layout:418 msgid "FrameSubtitle" msgstr "SousTitreCadre" -#: lib/layouts/beamer.layout:397 +#: lib/layouts/beamer.layout:441 msgid "Column" msgstr "Colonne" -#: lib/layouts/beamer.layout:398 lib/layouts/beamer.layout:422 -#: lib/layouts/beamer.layout:423 lib/layouts/beamer.layout:434 -#: lib/layouts/beamer.layout:452 lib/layouts/beamer.layout:483 +#: lib/layouts/beamer.layout:442 +#: lib/layouts/beamer.layout:466 +#: lib/layouts/beamer.layout:467 +#: lib/layouts/beamer.layout:478 +#: lib/layouts/beamer.layout:496 +#: lib/layouts/beamer.layout:527 msgid "Columns" msgstr "Colonnes" # paquetage Beamer -#: lib/layouts/beamer.layout:410 +#: lib/layouts/beamer.layout:454 msgid "Start column (increase depth!), width:" msgstr "Début colonne (augmenter la profondeur !), largeur :" -#: lib/layouts/beamer.layout:451 +#: lib/layouts/beamer.layout:495 msgid "ColumnsCenterAligned" msgstr "ColonnesCentréesVerticalement" -#: lib/layouts/beamer.layout:463 +#: lib/layouts/beamer.layout:507 msgid "Columns (center aligned)" msgstr "Colonnes (centrées verticalement)" -#: lib/layouts/beamer.layout:482 +#: lib/layouts/beamer.layout:526 msgid "ColumnsTopAligned" msgstr "ColonnesAlignéesSurPremièreLigne" -#: lib/layouts/beamer.layout:494 +#: lib/layouts/beamer.layout:538 msgid "Columns (top aligned)" msgstr "Colonnes (alignées sur première ligne)" -#: lib/layouts/beamer.layout:514 +#: lib/layouts/beamer.layout:558 msgid "Pause" msgstr "Pause" -#: lib/layouts/beamer.layout:515 lib/layouts/beamer.layout:541 -#: lib/layouts/beamer.layout:568 lib/layouts/beamer.layout:594 -#: lib/layouts/beamer.layout:620 +#: lib/layouts/beamer.layout:559 +#: lib/layouts/beamer.layout:585 +#: lib/layouts/beamer.layout:612 +#: lib/layouts/beamer.layout:638 +#: lib/layouts/beamer.layout:664 msgid "Overlays" msgstr "Recouvrements" -#: lib/layouts/beamer.layout:530 +#: lib/layouts/beamer.layout:574 msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _" msgstr "_ _ _ _ _ _ _ _ _ _ _ _ _ _" # Beamer -#: lib/layouts/beamer.layout:540 lib/layouts/beamer.layout:551 +#: lib/layouts/beamer.layout:584 +#: lib/layouts/beamer.layout:595 msgid "Overprint" msgstr "SurImpression" # Beamer -#: lib/layouts/beamer.layout:567 +#: lib/layouts/beamer.layout:611 msgid "OverlayArea" msgstr "ZoneRecouvrement" # Beamer -#: lib/layouts/beamer.layout:578 +#: lib/layouts/beamer.layout:622 msgid "Overlayarea" msgstr "ZoneRecouvrement" # Beamer -#: lib/layouts/beamer.layout:593 +#: lib/layouts/beamer.layout:637 msgid "Uncover" msgstr "Découvrir" # Beamer -#: lib/layouts/beamer.layout:604 +#: lib/layouts/beamer.layout:648 msgid "Uncovered on slides" msgstr "Découvrir sur diapos" -#: lib/layouts/beamer.layout:619 +#: lib/layouts/beamer.layout:663 msgid "Only" msgstr "Seulement" -#: lib/layouts/beamer.layout:630 +#: lib/layouts/beamer.layout:674 msgid "Only on slides" msgstr "Seulement sur diapos" -#: lib/layouts/beamer.layout:646 +#: lib/layouts/beamer.layout:690 msgid "Block" msgstr "Bloc" -#: lib/layouts/beamer.layout:647 lib/layouts/beamer.layout:673 -#: lib/layouts/beamer.layout:703 +#: lib/layouts/beamer.layout:691 +#: lib/layouts/beamer.layout:717 +#: lib/layouts/beamer.layout:747 msgid "Blocks" msgstr "Blocs" -#: lib/layouts/beamer.layout:657 +#: lib/layouts/beamer.layout:701 msgid "Block:" msgstr "Bloc :" # beamer -#: lib/layouts/beamer.layout:672 +#: lib/layouts/beamer.layout:716 msgid "ExampleBlock" msgstr "BlocExemple" # beamer -#: lib/layouts/beamer.layout:683 +#: lib/layouts/beamer.layout:727 msgid "Example Block:" msgstr "Bloc exemple :" # beamer -#: lib/layouts/beamer.layout:702 +#: lib/layouts/beamer.layout:746 msgid "AlertBlock" msgstr "BlocAlerte" # beamer -#: lib/layouts/beamer.layout:713 +#: lib/layouts/beamer.layout:757 msgid "Alert Block:" msgstr "Bloc alerte :" -#: lib/layouts/beamer.layout:735 lib/layouts/beamer.layout:767 -#: lib/layouts/beamer.layout:792 lib/layouts/beamer.layout:814 -#: lib/layouts/beamer.layout:857 lib/layouts/beamer.layout:960 +#: lib/layouts/beamer.layout:779 +#: lib/layouts/beamer.layout:811 +#: lib/layouts/beamer.layout:836 +#: lib/layouts/beamer.layout:858 +#: lib/layouts/beamer.layout:901 +#: lib/layouts/beamer.layout:1004 msgid "Titling" msgstr "Titrage" # Cadre pour Frame et Diapositive pour Slide ? # (beamer) -#: lib/layouts/beamer.layout:758 +#: lib/layouts/beamer.layout:802 msgid "Title (Plain Frame)" msgstr "Titre (Cadre Simple)" -#: lib/layouts/beamer.layout:834 +#: lib/layouts/beamer.layout:878 msgid "InstituteMark" msgstr "MarqueInstitution" -#: lib/layouts/beamer.layout:838 +#: lib/layouts/beamer.layout:882 msgid "Institute mark" msgstr "Marque institution" -#: lib/layouts/beamer.layout:903 lib/layouts/egs.layout:98 -#: lib/layouts/powerdot.layout:308 lib/layouts/db_stdlayouts.inc:19 +#: lib/layouts/beamer.layout:947 +#: lib/layouts/egs.layout:98 +#: lib/layouts/powerdot.layout:308 +#: lib/layouts/db_stdlayouts.inc:19 #: lib/layouts/stdlayouts.inc:12 msgid "Quotation" msgstr "Citation" -#: lib/layouts/beamer.layout:922 lib/layouts/egs.layout:116 -#: lib/layouts/powerdot.layout:328 lib/layouts/stdlayouts.inc:33 +#: lib/layouts/beamer.layout:966 +#: lib/layouts/egs.layout:116 +#: lib/layouts/powerdot.layout:328 +#: lib/layouts/stdlayouts.inc:33 msgid "Quote" msgstr "Cite" -#: lib/layouts/beamer.layout:939 lib/layouts/egs.layout:206 -#: lib/layouts/powerdot.layout:346 lib/layouts/stdlayouts.inc:52 +#: lib/layouts/beamer.layout:983 +#: lib/layouts/egs.layout:206 +#: lib/layouts/powerdot.layout:346 +#: lib/layouts/stdlayouts.inc:52 msgid "Verse" msgstr "Vers" # Beamer -#: lib/layouts/beamer.layout:959 +#: lib/layouts/beamer.layout:1003 msgid "TitleGraphic" msgstr "GraphiqueTitre" -#: lib/layouts/beamer.layout:984 lib/layouts/theorems-std.module:2 +#: lib/layouts/beamer.layout:1028 +#: lib/layouts/theorems-std.module:2 msgid "Theorems" msgstr "Théorèmes" -#: lib/layouts/beamer.layout:994 lib/layouts/foils.layout:309 +#: lib/layouts/beamer.layout:1038 +#: lib/layouts/foils.layout:309 #: lib/layouts/theorems-starred.inc:66 msgid "Corollary." msgstr "Corollaire." -#: lib/layouts/beamer.layout:1014 lib/layouts/foils.layout:323 +#: lib/layouts/beamer.layout:1058 +#: lib/layouts/foils.layout:323 #: lib/layouts/theorems-starred.inc:152 msgid "Definition." msgstr "Définition." -#: lib/layouts/beamer.layout:1017 +#: lib/layouts/beamer.layout:1061 msgid "Definitions" msgstr "Définitions" -#: lib/layouts/beamer.layout:1020 +#: lib/layouts/beamer.layout:1064 msgid "Definitions." msgstr "Définitions." -#: lib/layouts/beamer.layout:1026 lib/layouts/theorems-starred.inc:176 +#: lib/layouts/beamer.layout:1070 +#: lib/layouts/theorems-starred.inc:176 msgid "Example." msgstr "Exemple." -#: lib/layouts/beamer.layout:1034 +#: lib/layouts/beamer.layout:1078 msgid "Examples" msgstr "Exemples" -#: lib/layouts/beamer.layout:1037 +#: lib/layouts/beamer.layout:1081 msgid "Examples." msgstr "Exemples." -#: lib/layouts/beamer.layout:1041 lib/layouts/theorems-ams-bytype.inc:163 +#: lib/layouts/beamer.layout:1085 +#: lib/layouts/theorems-ams-bytype.inc:163 #: lib/layouts/theorems-ams-bytype.inc:172 -#: lib/layouts/theorems-ams-bytype.inc:175 lib/layouts/theorems-ams.inc:137 -#: lib/layouts/theorems-ams.inc:147 lib/layouts/theorems-ams.inc:150 -#: lib/layouts/theorems-bytype.inc:139 lib/layouts/theorems-bytype.inc:148 -#: lib/layouts/theorems-bytype.inc:151 lib/layouts/theorems-starred.inc:140 +#: lib/layouts/theorems-ams-bytype.inc:175 +#: lib/layouts/theorems-ams.inc:137 +#: lib/layouts/theorems-ams.inc:147 +#: lib/layouts/theorems-ams.inc:150 +#: lib/layouts/theorems-bytype.inc:139 +#: lib/layouts/theorems-bytype.inc:148 +#: lib/layouts/theorems-bytype.inc:151 +#: lib/layouts/theorems-starred.inc:140 #: lib/layouts/theorems-starred.inc:143 #: lib/layouts/theorems-without-preamble.inc:159 #: lib/layouts/theorems-without-preamble.inc:165 -#: lib/layouts/theorems-without-preamble.inc:168 lib/layouts/theorems.inc:137 -#: lib/layouts/theorems.inc:147 lib/layouts/theorems.inc:150 +#: lib/layouts/theorems-without-preamble.inc:168 +#: lib/layouts/theorems.inc:136 +#: lib/layouts/theorems.inc:146 +#: lib/layouts/theorems.inc:149 #: lib/layouts/theorems-chap-bytype.module:114 #: lib/layouts/theorems-sec-bytype.module:94 msgid "Fact" msgstr "Fait" -#: lib/layouts/beamer.layout:1044 lib/layouts/theorems-starred.inc:134 +#: lib/layouts/beamer.layout:1088 +#: lib/layouts/theorems-starred.inc:134 msgid "Fact." msgstr "Fait." -#: lib/layouts/beamer.layout:1056 lib/layouts/foils.layout:295 +#: lib/layouts/beamer.layout:1100 +#: lib/layouts/foils.layout:295 #: lib/layouts/theorems-starred.inc:29 msgid "Theorem." msgstr "Théorème." -#: lib/layouts/beamer.layout:1061 +#: lib/layouts/beamer.layout:1105 msgid "Separator" msgstr "Séparateur" -#: lib/layouts/beamer.layout:1075 +#: lib/layouts/beamer.layout:1119 msgid "___" msgstr "___" -#: lib/layouts/beamer.layout:1085 lib/layouts/egs.layout:633 -#: lib/layouts/db_lyxmacros.inc:19 lib/layouts/lyxmacros.inc:12 +#: lib/layouts/beamer.layout:1129 +#: lib/layouts/egs.layout:633 +#: lib/layouts/db_lyxmacros.inc:19 +#: lib/layouts/lyxmacros.inc:12 msgid "LyX-Code" msgstr "LyX-Code" # Beamer -#: lib/layouts/beamer.layout:1123 +#: lib/layouts/beamer.layout:1167 msgid "NoteItem" msgstr "ÉlémentNote" -#: lib/layouts/beamer.layout:1135 lib/layouts/powerdot.layout:206 +#: lib/layouts/beamer.layout:1179 +#: lib/layouts/powerdot.layout:206 msgid "Note:" msgstr "Note :" -#: lib/layouts/beamer.layout:1151 lib/layouts/beamer.layout:1153 +#: lib/layouts/beamer.layout:1195 +#: lib/layouts/beamer.layout:1197 msgid "Alert" msgstr "Alerte" -#: lib/layouts/beamer.layout:1162 lib/layouts/beamer.layout:1164 -#: lib/layouts/svcommon.inc:68 lib/layouts/svcommon.inc:95 +#: lib/layouts/beamer.layout:1206 +#: lib/layouts/beamer.layout:1208 +#: lib/layouts/svcommon.inc:68 +#: lib/layouts/svcommon.inc:95 #: lib/layouts/svcommon.inc:102 msgid "Structure" msgstr "Structure" -#: lib/layouts/beamer.layout:1173 +#: lib/layouts/beamer.layout:1217 msgid "ArticleMode" msgstr "ModeArticle" -#: lib/layouts/beamer.layout:1178 +#: lib/layouts/beamer.layout:1222 msgid "Article" msgstr "Article" -#: lib/layouts/beamer.layout:1183 +#: lib/layouts/beamer.layout:1227 msgid "PresentationMode" msgstr "ModePresentation" -#: lib/layouts/beamer.layout:1188 +#: lib/layouts/beamer.layout:1232 msgid "Presentation" msgstr "Presentation" -#: lib/layouts/beamer.layout:1195 lib/layouts/powerdot.layout:373 -#: lib/layouts/stdfloats.inc:11 lib/ui/stdtoolbars.inc:142 +#: lib/layouts/beamer.layout:1239 +#: lib/layouts/powerdot.layout:373 +#: lib/layouts/stdfloats.inc:11 +#: lib/ui/stdtoolbars.inc:142 #: src/insets/Inset.cpp:97 msgid "Table" msgstr "Tableau" -#: lib/layouts/beamer.layout:1200 lib/layouts/powerdot.layout:377 -#: lib/layouts/tufte-book.layout:222 lib/layouts/stdfloats.inc:16 -#: src/insets/InsetFloatList.cpp:195 +#: lib/layouts/beamer.layout:1244 +#: lib/layouts/powerdot.layout:377 +#: lib/layouts/tufte-book.layout:222 +#: lib/layouts/stdfloats.inc:16 +#: src/insets/InsetFloatList.cpp:177 msgid "List of Tables" msgstr "Liste des tableaux" -#: lib/layouts/beamer.layout:1209 lib/layouts/powerdot.layout:385 +#: lib/layouts/beamer.layout:1253 +#: lib/layouts/powerdot.layout:385 #: lib/layouts/stdfloats.inc:26 msgid "Figure" msgstr "Figure" -#: lib/layouts/beamer.layout:1214 lib/layouts/powerdot.layout:389 -#: lib/layouts/tufte-book.layout:235 lib/layouts/stdfloats.inc:31 -#: src/insets/InsetFloatList.cpp:198 +#: lib/layouts/beamer.layout:1258 +#: lib/layouts/powerdot.layout:389 +#: lib/layouts/tufte-book.layout:235 +#: lib/layouts/stdfloats.inc:31 +#: src/insets/InsetFloatList.cpp:180 msgid "List of Figures" msgstr "Liste des figures" -#: lib/layouts/broadway.layout:31 lib/layouts/hollywood.layout:40 +#: lib/layouts/broadway.layout:31 +#: lib/layouts/hollywood.layout:40 msgid "Dialogue" msgstr "Dialogue" -#: lib/layouts/broadway.layout:42 lib/layouts/hollywood.layout:208 +#: lib/layouts/broadway.layout:42 +#: lib/layouts/hollywood.layout:208 msgid "Narrative" msgstr "Narratif" @@ -7276,7 +7886,8 @@ msgstr "ACTE" msgid "ACT \\arabic{act}" msgstr "ACTE \\arabic{act}" -#: lib/layouts/broadway.layout:74 lib/layouts/broadway.layout:101 +#: lib/layouts/broadway.layout:74 +#: lib/layouts/broadway.layout:101 msgid "SCENE" msgstr "SCÈNE" @@ -7288,33 +7899,41 @@ msgstr "SCÈNE \\arabic{scene}" msgid "SCENE*" msgstr "SCÈNE*" -#: lib/layouts/broadway.layout:105 lib/layouts/broadway.layout:116 +#: lib/layouts/broadway.layout:105 +#: lib/layouts/broadway.layout:116 msgid "AT RISE:" msgstr "LEVER_RIDEAU :" # ou "Acteur" ou "Intervenant" (Hollywood/Broadway) -#: lib/layouts/broadway.layout:121 lib/layouts/hollywood.layout:144 +#: lib/layouts/broadway.layout:121 +#: lib/layouts/hollywood.layout:144 msgid "Speaker" msgstr "Personnage" -#: lib/layouts/broadway.layout:134 lib/layouts/hollywood.layout:159 +#: lib/layouts/broadway.layout:134 +#: lib/layouts/hollywood.layout:159 msgid "Parenthetical" msgstr "Parenthèses" -#: lib/layouts/broadway.layout:145 lib/layouts/hollywood.layout:170 +#: lib/layouts/broadway.layout:145 +#: lib/layouts/hollywood.layout:170 msgid "(" msgstr "(" -#: lib/layouts/broadway.layout:147 lib/layouts/hollywood.layout:172 +#: lib/layouts/broadway.layout:147 +#: lib/layouts/hollywood.layout:172 msgid ")" msgstr ")" -#: lib/layouts/broadway.layout:158 lib/layouts/broadway.layout:168 +#: lib/layouts/broadway.layout:158 +#: lib/layouts/broadway.layout:168 msgid "CURTAIN" msgstr "RIDEAU" -#: lib/layouts/broadway.layout:212 lib/layouts/egs.layout:225 -#: lib/layouts/hollywood.layout:305 lib/layouts/siamltex.layout:298 +#: lib/layouts/broadway.layout:212 +#: lib/layouts/egs.layout:225 +#: lib/layouts/hollywood.layout:305 +#: lib/layouts/siamltex.layout:299 #: lib/layouts/lyxmacros.inc:65 msgid "Right Address" msgstr "Adresse_À_Droite" @@ -7427,28 +8046,40 @@ msgstr "Mouvement_Cavalier :" msgid "DinBrief" msgstr "DinBrief" -#: lib/layouts/dinbrief.layout:47 lib/layouts/frletter.layout:16 -#: lib/layouts/heb-letter.layout:15 lib/layouts/lettre.layout:55 -#: lib/layouts/lettre.layout:481 lib/layouts/stdletter.inc:35 +#: lib/layouts/dinbrief.layout:47 +#: lib/layouts/frletter.layout:16 +#: lib/layouts/heb-letter.layout:15 +#: lib/layouts/lettre.layout:55 +#: lib/layouts/lettre.layout:481 +#: lib/layouts/stdletter.inc:35 msgid "Send To Address" msgstr "Envoi à l'adresse" -#: lib/layouts/dinbrief.layout:49 lib/layouts/ectaart.layout:66 -#: lib/layouts/elsart.layout:139 lib/layouts/g-brief.layout:185 -#: lib/layouts/g-brief2.layout:726 lib/layouts/revtex.layout:132 -#: lib/layouts/revtex4-1.layout:119 lib/layouts/revtex4.layout:179 -#: lib/layouts/scrlettr.layout:142 lib/layouts/scrlttr2.layout:62 -#: lib/layouts/siamltex.layout:290 lib/layouts/amsdefs.inc:130 +#: lib/layouts/dinbrief.layout:49 +#: lib/layouts/ectaart.layout:66 +#: lib/layouts/elsart.layout:139 +#: lib/layouts/g-brief.layout:185 +#: lib/layouts/g-brief2.layout:726 +#: lib/layouts/revtex.layout:132 +#: lib/layouts/revtex4.layout:183 +#: lib/layouts/scrlettr.layout:142 +#: lib/layouts/scrlttr2.layout:62 +#: lib/layouts/siamltex.layout:291 +#: lib/layouts/amsdefs.inc:130 msgid "Address:" msgstr "Adresse :" -#: lib/layouts/dinbrief.layout:61 lib/layouts/frletter.layout:12 -#: lib/layouts/heb-letter.layout:10 lib/layouts/lettre.layout:33 -#: lib/layouts/lettre.layout:137 lib/layouts/stdletter.inc:24 +#: lib/layouts/dinbrief.layout:61 +#: lib/layouts/frletter.layout:12 +#: lib/layouts/heb-letter.layout:10 +#: lib/layouts/lettre.layout:33 +#: lib/layouts/lettre.layout:137 +#: lib/layouts/stdletter.inc:24 msgid "My Address" msgstr "Mon_Adresse" -#: lib/layouts/dinbrief.layout:63 lib/layouts/scrlttr2.layout:179 +#: lib/layouts/dinbrief.layout:63 +#: lib/layouts/scrlttr2.layout:179 msgid "Sender Address:" msgstr "Adresse de l'expéditeur :" @@ -7456,7 +8087,8 @@ msgstr "Adresse de l'expéditeur :" msgid "Return address" msgstr "Adresse de retour" -#: lib/layouts/dinbrief.layout:73 lib/layouts/scrlettr.layout:170 +#: lib/layouts/dinbrief.layout:73 +#: lib/layouts/scrlettr.layout:170 #: lib/layouts/scrlttr2.layout:251 msgid "Backaddress:" msgstr "AdresseRetour :" @@ -7477,24 +8109,30 @@ msgstr "Handling" msgid "Handling:" msgstr "Étiquette :" -#: lib/layouts/dinbrief.layout:94 lib/layouts/g-brief.layout:103 -#: lib/layouts/g-brief2.layout:757 lib/layouts/lettre.layout:59 +#: lib/layouts/dinbrief.layout:94 +#: lib/layouts/g-brief.layout:103 +#: lib/layouts/g-brief2.layout:757 +#: lib/layouts/lettre.layout:59 #: lib/layouts/lettre.layout:450 msgid "YourRef" msgstr "VotreRéf" -#: lib/layouts/dinbrief.layout:96 lib/layouts/scrlettr.layout:206 +#: lib/layouts/dinbrief.layout:96 +#: lib/layouts/scrlettr.layout:206 #: lib/layouts/scrlttr2.layout:292 msgid "Your ref.:" msgstr "Vos réf. :" -#: lib/layouts/dinbrief.layout:100 lib/layouts/g-brief.layout:96 -#: lib/layouts/g-brief2.layout:736 lib/layouts/lettre.layout:61 +#: lib/layouts/dinbrief.layout:100 +#: lib/layouts/g-brief.layout:96 +#: lib/layouts/g-brief2.layout:736 +#: lib/layouts/lettre.layout:61 #: lib/layouts/lettre.layout:466 msgid "MyRef" msgstr "MaRéf" -#: lib/layouts/dinbrief.layout:102 lib/layouts/scrlettr.layout:227 +#: lib/layouts/dinbrief.layout:102 +#: lib/layouts/scrlettr.layout:227 #: lib/layouts/scrlttr2.layout:316 msgid "Our ref.:" msgstr "Nos réf. :" @@ -7507,17 +8145,24 @@ msgstr "Auteur" msgid "Writer:" msgstr "Auteur :" -#: lib/layouts/dinbrief.layout:112 lib/layouts/frletter.layout:40 -#: lib/layouts/g-brief.layout:54 lib/layouts/g-brief2.layout:891 -#: lib/layouts/lettre.layout:67 lib/layouts/lettre.layout:568 -#: lib/layouts/scrlettr.layout:132 lib/layouts/scrlttr2.layout:167 +#: lib/layouts/dinbrief.layout:112 +#: lib/layouts/frletter.layout:40 +#: lib/layouts/g-brief.layout:54 +#: lib/layouts/g-brief2.layout:891 +#: lib/layouts/lettre.layout:67 +#: lib/layouts/lettre.layout:568 +#: lib/layouts/scrlettr.layout:132 +#: lib/layouts/scrlttr2.layout:167 #: lib/layouts/stdletter.inc:71 msgid "Signature" msgstr "Signature" -#: lib/layouts/dinbrief.layout:114 lib/layouts/g-brief.layout:57 -#: lib/layouts/g-brief2.layout:901 lib/layouts/lettre.layout:571 -#: lib/layouts/scrlettr.layout:135 lib/layouts/scrlttr2.layout:171 +#: lib/layouts/dinbrief.layout:114 +#: lib/layouts/g-brief.layout:57 +#: lib/layouts/g-brief2.layout:901 +#: lib/layouts/lettre.layout:571 +#: lib/layouts/scrlettr.layout:135 +#: lib/layouts/scrlttr2.layout:171 #: lib/layouts/stdletter.inc:83 msgid "Signature:" msgstr "Signature :" @@ -7538,114 +8183,160 @@ msgstr "Code de zone" msgid "Area Code:" msgstr "Code de zone :" -#: lib/layouts/dinbrief.layout:135 lib/layouts/lettre.layout:37 -#: lib/layouts/lettre.layout:286 lib/layouts/scrlettr.layout:146 -#: lib/layouts/scrlttr2.layout:183 lib/layouts/stdletter.inc:126 +#: lib/layouts/dinbrief.layout:135 +#: lib/layouts/lettre.layout:37 +#: lib/layouts/lettre.layout:286 +#: lib/layouts/scrlettr.layout:146 +#: lib/layouts/scrlttr2.layout:183 +#: lib/layouts/stdletter.inc:126 msgid "Telephone" msgstr "Téléphone" -#: lib/layouts/dinbrief.layout:137 lib/layouts/scrlettr.layout:149 +#: lib/layouts/dinbrief.layout:137 +#: lib/layouts/scrlettr.layout:149 #: lib/layouts/stdletter.inc:129 msgid "Telephone:" msgstr "Téléphone :" -#: lib/layouts/dinbrief.layout:142 lib/layouts/lettre.layout:35 -#: lib/layouts/lettre.layout:256 lib/layouts/scrlettr.layout:181 -#: lib/layouts/scrlttr2.layout:263 lib/layouts/stdletter.inc:119 +#: lib/layouts/dinbrief.layout:142 +#: lib/layouts/lettre.layout:35 +#: lib/layouts/lettre.layout:256 +#: lib/layouts/scrlettr.layout:181 +#: lib/layouts/scrlttr2.layout:263 +#: lib/layouts/stdletter.inc:119 msgid "Location" msgstr "Adresse" -#: lib/layouts/dinbrief.layout:144 lib/layouts/scrlettr.layout:184 -#: lib/layouts/scrlttr2.layout:267 lib/layouts/stdletter.inc:122 +#: lib/layouts/dinbrief.layout:144 +#: lib/layouts/scrlettr.layout:184 +#: lib/layouts/scrlttr2.layout:267 +#: lib/layouts/stdletter.inc:122 msgid "Location:" msgstr "Adresse :" -#: lib/layouts/dinbrief.layout:154 lib/layouts/g-brief.layout:192 -#: lib/layouts/g-brief2.layout:810 lib/layouts/lettre.layout:226 -#: lib/layouts/revtex.layout:112 lib/layouts/revtex4-1.layout:156 -#: lib/layouts/revtex4.layout:125 lib/layouts/scrlettr.layout:163 -#: lib/layouts/scrlttr2.layout:243 lib/layouts/siamltex.layout:240 +#: lib/layouts/dinbrief.layout:154 +#: lib/layouts/g-brief.layout:192 +#: lib/layouts/g-brief2.layout:810 +#: lib/layouts/lettre.layout:226 +#: lib/layouts/revtex.layout:112 +#: lib/layouts/revtex4.layout:142 +#: lib/layouts/scrlettr.layout:163 +#: lib/layouts/scrlttr2.layout:243 +#: lib/layouts/siamltex.layout:241 #: lib/layouts/amsdefs.inc:80 msgid "Date:" msgstr "Date :" -#: lib/layouts/dinbrief.layout:159 lib/layouts/lettre.layout:57 -#: lib/layouts/lettre.layout:428 lib/layouts/scrlettr.layout:196 -#: lib/layouts/scrlttr2.layout:280 lib/layouts/scrclass.inc:192 +#: lib/layouts/dinbrief.layout:159 +#: lib/layouts/lettre.layout:57 +#: lib/layouts/lettre.layout:428 +#: lib/layouts/scrlettr.layout:196 +#: lib/layouts/scrlttr2.layout:280 +#: lib/layouts/scrclass.inc:192 msgid "Subject" msgstr "Sujet" -#: lib/layouts/dinbrief.layout:161 lib/layouts/lettre.layout:433 -#: lib/layouts/scrlettr.layout:199 lib/layouts/scrlttr2.layout:284 +#: lib/layouts/dinbrief.layout:161 +#: lib/layouts/lettre.layout:433 +#: lib/layouts/scrlettr.layout:199 +#: lib/layouts/scrlttr2.layout:284 msgid "Subject:" msgstr "Sujet :" -#: lib/layouts/dinbrief.layout:175 lib/layouts/frletter.layout:36 -#: lib/layouts/g-brief.layout:205 lib/layouts/g-brief2.layout:843 -#: lib/layouts/lettre.layout:63 lib/layouts/lettre.layout:541 -#: lib/layouts/scrlettr.layout:60 lib/layouts/scrlttr2.layout:94 +#: lib/layouts/dinbrief.layout:175 +#: lib/layouts/frletter.layout:36 +#: lib/layouts/g-brief.layout:205 +#: lib/layouts/g-brief2.layout:843 +#: lib/layouts/lettre.layout:63 +#: lib/layouts/lettre.layout:541 +#: lib/layouts/scrlettr.layout:60 +#: lib/layouts/scrlttr2.layout:94 #: lib/layouts/stdletter.inc:49 msgid "Opening" msgstr "Ouverture" -#: lib/layouts/dinbrief.layout:179 lib/layouts/g-brief.layout:210 -#: lib/layouts/g-brief2.layout:855 lib/layouts/lettre.layout:545 -#: lib/layouts/scrlttr2.layout:105 lib/layouts/stdletter.inc:62 +#: lib/layouts/dinbrief.layout:179 +#: lib/layouts/g-brief.layout:210 +#: lib/layouts/g-brief2.layout:855 +#: lib/layouts/lettre.layout:545 +#: lib/layouts/scrlttr2.layout:105 +#: lib/layouts/stdletter.inc:62 msgid "Opening:" msgstr "Ouverture :" -#: lib/layouts/dinbrief.layout:191 lib/layouts/frletter.layout:44 -#: lib/layouts/g-brief.layout:231 lib/layouts/g-brief2.layout:865 -#: lib/layouts/lettre.layout:65 lib/layouts/lettre.layout:555 -#: lib/layouts/scrlettr.layout:70 lib/layouts/scrlttr2.layout:114 +#: lib/layouts/dinbrief.layout:191 +#: lib/layouts/frletter.layout:44 +#: lib/layouts/g-brief.layout:231 +#: lib/layouts/g-brief2.layout:865 +#: lib/layouts/lettre.layout:65 +#: lib/layouts/lettre.layout:555 +#: lib/layouts/scrlettr.layout:70 +#: lib/layouts/scrlttr2.layout:114 #: lib/layouts/stdletter.inc:92 msgid "Closing" msgstr "Fermeture" -#: lib/layouts/dinbrief.layout:193 lib/layouts/g-brief.layout:236 -#: lib/layouts/g-brief2.layout:876 lib/layouts/lettre.layout:559 -#: lib/layouts/scrlttr2.layout:118 lib/layouts/stdletter.inc:95 +#: lib/layouts/dinbrief.layout:193 +#: lib/layouts/g-brief.layout:236 +#: lib/layouts/g-brief2.layout:876 +#: lib/layouts/lettre.layout:559 +#: lib/layouts/scrlttr2.layout:118 +#: lib/layouts/stdletter.inc:95 msgid "Closing:" msgstr "Fermeture :" -#: lib/layouts/dinbrief.layout:199 lib/layouts/lettre.layout:69 -#: lib/layouts/lettre.layout:605 lib/layouts/stdletter.inc:111 +#: lib/layouts/dinbrief.layout:199 +#: lib/layouts/lettre.layout:69 +#: lib/layouts/lettre.layout:605 +#: lib/layouts/stdletter.inc:111 msgid "encl" msgstr "P.J." -#: lib/layouts/dinbrief.layout:201 lib/layouts/lettre.layout:610 -#: lib/layouts/scrlettr.layout:108 lib/layouts/scrlttr2.layout:141 +#: lib/layouts/dinbrief.layout:201 +#: lib/layouts/lettre.layout:610 +#: lib/layouts/scrlettr.layout:108 +#: lib/layouts/scrlttr2.layout:141 #: lib/layouts/stdletter.inc:114 msgid "encl:" msgstr "P.J. :" -#: lib/layouts/dinbrief.layout:214 lib/layouts/g-brief.layout:222 -#: lib/layouts/g-brief2.layout:932 lib/layouts/lettre.layout:71 -#: lib/layouts/lettre.layout:628 lib/layouts/stdletter.inc:99 +#: lib/layouts/dinbrief.layout:214 +#: lib/layouts/g-brief.layout:222 +#: lib/layouts/g-brief2.layout:932 +#: lib/layouts/lettre.layout:71 +#: lib/layouts/lettre.layout:628 +#: lib/layouts/stdletter.inc:99 msgid "cc" msgstr "cc" -#: lib/layouts/dinbrief.layout:216 lib/layouts/g-brief.layout:227 -#: lib/layouts/g-brief2.layout:943 lib/layouts/lettre.layout:632 -#: lib/layouts/scrlettr.layout:101 lib/layouts/scrlttr2.layout:134 +#: lib/layouts/dinbrief.layout:216 +#: lib/layouts/g-brief.layout:227 +#: lib/layouts/g-brief2.layout:943 +#: lib/layouts/lettre.layout:632 +#: lib/layouts/scrlettr.layout:101 +#: lib/layouts/scrlttr2.layout:134 #: lib/layouts/stdletter.inc:102 msgid "cc:" msgstr "cc :" -#: lib/layouts/dinbrief.layout:220 lib/layouts/scrlettr.layout:81 +#: lib/layouts/dinbrief.layout:220 +#: lib/layouts/scrlettr.layout:81 #: lib/layouts/scrlttr2.layout:122 msgid "PS" msgstr "PS" -#: lib/layouts/dinbrief.layout:222 lib/layouts/scrlttr2.layout:126 +#: lib/layouts/dinbrief.layout:222 +#: lib/layouts/scrlttr2.layout:126 msgid "Post Scriptum:" msgstr "Post Scriptum :" -#: lib/layouts/dinbrief.layout:235 lib/layouts/scrlttr2.layout:175 +#: lib/layouts/dinbrief.layout:235 +#: lib/layouts/scrlttr2.layout:175 msgid "SenderAddress" msgstr "AdresseExpéditeur" -#: lib/layouts/dinbrief.layout:240 lib/layouts/scrlettr.layout:167 +#: lib/layouts/dinbrief.layout:240 +#: lib/layouts/scrlettr.layout:167 #: lib/layouts/scrlttr2.layout:247 msgid "Backaddress" msgstr "Adresse_Retour" @@ -7670,7 +8361,8 @@ msgstr "Post scriptum" msgid "IhrZeichen" msgstr "VotreRéférence" -#: lib/layouts/dinbrief.layout:275 lib/layouts/g-brief.layout:110 +#: lib/layouts/dinbrief.layout:275 +#: lib/layouts/g-brief.layout:110 #: lib/layouts/g-brief2.layout:779 msgid "YourMail" msgstr "VotreMail" @@ -7691,8 +8383,10 @@ msgstr "Signature" msgid "Telefon" msgstr "Téléphone" -#: lib/layouts/dinbrief.layout:305 lib/layouts/lettre.layout:47 -#: lib/layouts/lettre.layout:157 lib/layouts/scrlettr.layout:153 +#: lib/layouts/dinbrief.layout:305 +#: lib/layouts/lettre.layout:47 +#: lib/layouts/lettre.layout:157 +#: lib/layouts/scrlettr.layout:153 #: lib/layouts/scrlttr2.layout:231 msgid "Place" msgstr "Lieu" @@ -7701,7 +8395,8 @@ msgstr "Lieu" msgid "Stadt" msgstr "Ville" -#: lib/layouts/dinbrief.layout:315 lib/layouts/g-brief.layout:75 +#: lib/layouts/dinbrief.layout:315 +#: lib/layouts/g-brief.layout:75 msgid "Town" msgstr "Ville" @@ -7713,7 +8408,8 @@ msgstr "Lieu" msgid "Datum" msgstr "Date" -#: lib/layouts/dinbrief.layout:330 lib/layouts/g-brief.layout:196 +#: lib/layouts/dinbrief.layout:330 +#: lib/layouts/g-brief.layout:196 #: lib/layouts/g-brief2.layout:820 msgid "Reference" msgstr "Référence" @@ -7726,8 +8422,10 @@ msgstr "Objet" msgid "Anrede" msgstr "Ouverture" -#: lib/layouts/dinbrief.layout:345 lib/layouts/g-brief.layout:17 -#: lib/layouts/g-brief2.layout:38 lib/layouts/iopart.layout:119 +#: lib/layouts/dinbrief.layout:345 +#: lib/layouts/g-brief.layout:17 +#: lib/layouts/g-brief2.layout:38 +#: lib/layouts/iopart.layout:119 #: lib/layouts/scrlettr.layout:40 msgid "Letter" msgstr "Lettre" @@ -7744,7 +8442,8 @@ msgstr "Salutation" msgid "ps" msgstr "ps" -#: lib/layouts/dinbrief.layout:364 lib/layouts/g-brief.layout:214 +#: lib/layouts/dinbrief.layout:364 +#: lib/layouts/g-brief.layout:214 #: lib/layouts/g-brief2.layout:911 msgid "Encl." msgstr "P.J." @@ -7753,7 +8452,8 @@ msgstr "P.J." msgid "Anlagen" msgstr "Anlagen" -#: lib/layouts/dinbrief.layout:374 lib/layouts/scrlettr.layout:91 +#: lib/layouts/dinbrief.layout:374 +#: lib/layouts/scrlettr.layout:91 #: lib/layouts/scrlttr2.layout:130 msgid "CC" msgstr "CC" @@ -7778,7 +8478,8 @@ msgstr "AuteurCourant" msgid "Running Author:" msgstr "Auteur courant :" -#: lib/layouts/ectaart.layout:77 lib/layouts/latex8.layout:77 +#: lib/layouts/ectaart.layout:77 +#: lib/layouts/latex8.layout:77 msgid "E-mail:" msgstr "E-mail :" @@ -7799,18 +8500,26 @@ msgstr "Bloc auteurs" msgid "Authors Block:" msgstr "Bloc auteurs :" -#: lib/layouts/ectaart.layout:116 lib/layouts/ectaart.layout:198 -#: lib/layouts/ectaart.layout:201 lib/layouts/entcs.layout:100 -#: lib/layouts/agu_stdtitle.inc:403 lib/layouts/agu_stdtitle.inc:405 +#: lib/layouts/ectaart.layout:116 +#: lib/layouts/ectaart.layout:198 +#: lib/layouts/ectaart.layout:201 +#: lib/layouts/entcs.layout:100 +#: lib/layouts/agu_stdtitle.inc:403 +#: lib/layouts/agu_stdtitle.inc:405 msgid "Keyword" msgstr "Mot-Clé" -#: lib/layouts/ectaart.layout:120 lib/layouts/elsarticle.layout:289 -#: lib/layouts/ijmpd.layout:224 lib/layouts/iopart.layout:210 -#: lib/layouts/jasatex.layout:199 lib/layouts/kluwer.layout:289 -#: lib/layouts/paper.layout:175 lib/layouts/revtex4-1.layout:171 -#: lib/layouts/revtex4.layout:266 lib/layouts/sigplanconf.layout:149 -#: lib/layouts/spie.layout:48 lib/layouts/agu_stdtitle.inc:123 +#: lib/layouts/ectaart.layout:120 +#: lib/layouts/elsarticle.layout:265 +#: lib/layouts/ijmpd.layout:212 +#: lib/layouts/iopart.layout:210 +#: lib/layouts/jasatex.layout:199 +#: lib/layouts/kluwer.layout:289 +#: lib/layouts/paper.layout:175 +#: lib/layouts/revtex4.layout:263 +#: lib/layouts/sigplanconf.layout:149 +#: lib/layouts/spie.layout:48 +#: lib/layouts/agu_stdtitle.inc:123 msgid "Keywords:" msgstr "Mots-clés :" @@ -7842,7 +8551,8 @@ msgstr "Référence à adresse Internet" msgid "Internet Addess Ref" msgstr "Référence à une adresse internet" -#: lib/layouts/ectaart.layout:170 lib/layouts/ectaart.layout:173 +#: lib/layouts/ectaart.layout:170 +#: lib/layouts/ectaart.layout:173 msgid "Corresponding Author" msgstr "Auteur référent" @@ -7858,10 +8568,12 @@ msgstr "Prénom" msgid "Name (Surname)" msgstr "Nom (de famille)" -#: lib/layouts/ectaart.layout:194 lib/layouts/revtex4-1.layout:292 -#: lib/layouts/revtex4-1.layout:294 lib/layouts/agu_stdclass.inc:63 -#: lib/layouts/agu_stdclass.inc:65 lib/layouts/db_stdcharstyles.inc:46 -#: lib/layouts/db_stdcharstyles.inc:48 lib/layouts/db_stdtitle.inc:98 +#: lib/layouts/ectaart.layout:194 +#: lib/layouts/agu_stdclass.inc:63 +#: lib/layouts/agu_stdclass.inc:65 +#: lib/layouts/db_stdcharstyles.inc:46 +#: lib/layouts/db_stdcharstyles.inc:48 +#: lib/layouts/db_stdtitle.inc:98 msgid "Surname" msgstr "Nom" @@ -7873,7 +8585,8 @@ msgstr "Par le même auteur (bib)" msgid "bysame" msgstr "du même" -#: lib/layouts/egs.layout:145 lib/layouts/stdlyxlist.inc:20 +#: lib/layouts/egs.layout:145 +#: lib/layouts/stdlyxlist.inc:20 msgid "00.00.0000" msgstr "00.00.0000" @@ -7881,7 +8594,8 @@ msgstr "00.00.0000" msgid "LaTeX Title" msgstr "Titre_LaTeX" -#: lib/layouts/egs.layout:304 lib/layouts/svmult.layout:82 +#: lib/layouts/egs.layout:304 +#: lib/layouts/svmult.layout:82 msgid "Author:" msgstr "Auteur :" @@ -7889,6 +8603,10 @@ msgstr "Auteur :" msgid "Affil" msgstr "Affil." +#: lib/layouts/egs.layout:335 +msgid "Journal" +msgstr "Journal" + #: lib/layouts/egs.layout:348 msgid "Journal:" msgstr "Journal :" @@ -7909,24 +8627,30 @@ msgstr "PremierAuteur" msgid "1st_author_surname:" msgstr "Nom_Famille_Premier_Auteur :" -#: lib/layouts/egs.layout:403 lib/layouts/ijmpc.layout:166 -#: lib/layouts/ijmpc.layout:170 lib/layouts/ijmpd.layout:156 -#: lib/layouts/ijmpd.layout:160 lib/layouts/agu_stdtitle.inc:198 +#: lib/layouts/egs.layout:403 +#: lib/layouts/ijmpc.layout:154 +#: lib/layouts/ijmpc.layout:158 +#: lib/layouts/ijmpd.layout:144 +#: lib/layouts/ijmpd.layout:148 +#: lib/layouts/agu_stdtitle.inc:198 #: lib/layouts/aguplus.inc:111 msgid "Received" msgstr "Reçu" -#: lib/layouts/egs.layout:416 lib/layouts/agu_stdtitle.inc:201 +#: lib/layouts/egs.layout:416 +#: lib/layouts/agu_stdtitle.inc:201 #: lib/layouts/aguplus.inc:115 msgid "Received:" msgstr "Reçu :" -#: lib/layouts/egs.layout:425 lib/layouts/agu_stdtitle.inc:214 +#: lib/layouts/egs.layout:425 +#: lib/layouts/agu_stdtitle.inc:214 #: lib/layouts/aguplus.inc:127 msgid "Accepted" msgstr "Accepté" -#: lib/layouts/egs.layout:438 lib/layouts/agu_stdtitle.inc:217 +#: lib/layouts/egs.layout:438 +#: lib/layouts/agu_stdtitle.inc:217 #: lib/layouts/aguplus.inc:131 msgid "Accepted:" msgstr "Accepté :" @@ -7943,28 +8667,31 @@ msgstr "demande_tirés_à_part_à :" msgid "Author Address" msgstr "Adresse Auteur" -#: lib/layouts/elsart.layout:147 lib/layouts/revtex4-1.layout:123 -#: lib/layouts/revtex4.layout:197 +#: lib/layouts/elsart.layout:147 +#: lib/layouts/revtex4.layout:194 msgid "Author Email" msgstr "E-mail auteur" -#: lib/layouts/elsart.layout:157 lib/layouts/lettre.layout:404 +#: lib/layouts/elsart.layout:157 +#: lib/layouts/lettre.layout:404 #: lib/layouts/llncs.layout:238 msgid "Email:" msgstr "E-mail :" -#: lib/layouts/elsart.layout:168 lib/layouts/revtex4-1.layout:138 -#: lib/layouts/revtex4.layout:213 +#: lib/layouts/elsart.layout:168 +#: lib/layouts/revtex4.layout:210 msgid "Author URL" msgstr "URL Auteur" -#: lib/layouts/elsart.layout:179 lib/layouts/revtex4-1.layout:141 -#: lib/layouts/revtex4.layout:219 lib/layouts/amsdefs.inc:157 +#: lib/layouts/elsart.layout:179 +#: lib/layouts/revtex4.layout:216 +#: lib/layouts/amsdefs.inc:157 msgid "URL:" msgstr "URL :" -#: lib/layouts/elsart.layout:191 lib/layouts/revtex4-1.layout:195 -#: lib/layouts/revtex4.layout:190 lib/layouts/amsdefs.inc:168 +#: lib/layouts/elsart.layout:191 +#: lib/layouts/revtex4.layout:187 +#: lib/layouts/amsdefs.inc:168 msgid "Thanks" msgstr "Remerciements" @@ -8016,6 +8743,28 @@ msgstr "Problème \\arabic{theorem}" msgid "Remark \\arabic{theorem}" msgstr "Remarque \\arabic{theorem}" +#: lib/layouts/elsart.layout:392 +#: lib/layouts/iopart.layout:95 +#: lib/layouts/llncs.layout:362 +#: lib/layouts/powerdot.layout:194 +#: lib/layouts/slides.layout:167 +#: lib/layouts/stdinsets.inc:101 +#: lib/layouts/theorems-without-preamble.inc:388 +#: lib/layouts/theorems-without-preamble.inc:395 +#: lib/layouts/theorems-without-preamble.inc:398 +#: lib/layouts/theorems-ams-extended-bytype.module:199 +#: lib/layouts/theorems-ams-extended-bytype.module:208 +#: lib/layouts/theorems-ams-extended-bytype.module:211 +#: lib/layouts/theorems-ams-extended-bytype.module:226 +#: lib/layouts/theorems-ams-extended-bytype.module:229 +#: lib/layouts/theorems-ams-extended.module:174 +#: lib/layouts/theorems-ams-extended.module:183 +#: lib/layouts/theorems-ams-extended.module:186 +#: lib/layouts/theorems-ams-extended.module:200 +#: lib/layouts/theorems-ams-extended.module:203 +msgid "Note" +msgstr "Note" + #: lib/layouts/elsart.layout:395 msgid "Note \\arabic{theorem}" msgstr "Note \\arabic{theorem}" @@ -8032,84 +8781,67 @@ msgstr "Résumé \\arabic{summ}" msgid "Case \\arabic{case}" msgstr "Cas \\arabic{case}" -#: lib/layouts/elsarticle.layout:54 -#, fuzzy -msgid "BeginFrontmatter" -msgstr "Préliminaires" - -#: lib/layouts/elsarticle.layout:64 -#, fuzzy -msgid "Begin frontmatter" -msgstr "Préliminaires" - -#: lib/layouts/elsarticle.layout:72 -#, fuzzy -msgid "EndFrontmatter" -msgstr "Préliminaires" - -#: lib/layouts/elsarticle.layout:75 -#, fuzzy -msgid "End frontmatter" -msgstr "Préliminaires" - -#: lib/layouts/elsarticle.layout:100 +#: lib/layouts/elsarticle.layout:76 msgid "Titlenotemark" msgstr "MarqueNoteTitre" -#: lib/layouts/elsarticle.layout:104 +#: lib/layouts/elsarticle.layout:80 msgid "Titlenote mark" msgstr "Marque de note de titre" -#: lib/layouts/elsarticle.layout:122 +#: lib/layouts/elsarticle.layout:98 msgid "Title footnote" msgstr "Note de bas de page (titre)" -#: lib/layouts/elsarticle.layout:134 +#: lib/layouts/elsarticle.layout:110 msgid "Title footnote:" msgstr "Note de bas de page (titre) :" -#: lib/layouts/elsarticle.layout:162 +#: lib/layouts/elsarticle.layout:138 msgid "Authormark" msgstr "MarqueAuteur" -#: lib/layouts/elsarticle.layout:166 +#: lib/layouts/elsarticle.layout:142 msgid "Author mark" msgstr "Marque d'auteur" -#: lib/layouts/elsarticle.layout:184 +#: lib/layouts/elsarticle.layout:160 msgid "Author footnote" msgstr "Note de bas de page (auteur)" -#: lib/layouts/elsarticle.layout:187 +#: lib/layouts/elsarticle.layout:163 msgid "Author footnote:" msgstr "Note de bas de page (auteur) :" -#: lib/layouts/elsarticle.layout:191 +#: lib/layouts/elsarticle.layout:167 msgid "CorAuthormark" msgstr "MarqueAuteurRéférent" -#: lib/layouts/elsarticle.layout:195 +#: lib/layouts/elsarticle.layout:171 msgid "CorAuthor mark" msgstr "Marque d'auteur référent" -#: lib/layouts/elsarticle.layout:213 +#: lib/layouts/elsarticle.layout:189 msgid "Corresponding author" msgstr "Auteur référent" -#: lib/layouts/elsarticle.layout:216 +#: lib/layouts/elsarticle.layout:192 msgid "Corresponding author text:" msgstr "Texte auteur référent :" -#: lib/layouts/entcs.layout:110 lib/layouts/siamltex.layout:306 +#: lib/layouts/entcs.layout:110 +#: lib/layouts/siamltex.layout:307 msgid "Key words:" msgstr "Mots-clés :" -#: lib/layouts/europecv.layout:50 lib/layouts/moderncv.layout:82 +#: lib/layouts/europecv.layout:50 +#: lib/layouts/moderncv.layout:82 msgid "Item" msgstr "ÉlémentListe" # paquetage europCV -#: lib/layouts/europecv.layout:59 lib/layouts/moderncv.layout:91 +#: lib/layouts/europecv.layout:59 +#: lib/layouts/moderncv.layout:91 msgid "Item:" msgstr "Élément de liste :" @@ -8155,7 +8887,8 @@ msgstr "LangDébut" msgid "Language Header:" msgstr "Début langues :" -#: lib/layouts/europecv.layout:122 lib/layouts/moderncv.layout:119 +#: lib/layouts/europecv.layout:122 +#: lib/layouts/moderncv.layout:119 msgid "Language:" msgstr "Langue :" @@ -8233,108 +8966,140 @@ msgstr "Restriction" msgid "Restriction:" msgstr "Restriction :" -#: lib/layouts/foils.layout:185 lib/layouts/simplecv.layout:100 -#: lib/layouts/aguplus.inc:80 lib/layouts/customHeadersFooters.module:11 +#: lib/layouts/foils.layout:185 +#: lib/layouts/simplecv.layout:100 +#: lib/layouts/aguplus.inc:80 +#: lib/layouts/customHeadersFooters.module:11 msgid "Left Header" msgstr "En-tête gauche" -#: lib/layouts/foils.layout:189 lib/layouts/aguplus.inc:93 +#: lib/layouts/foils.layout:189 +#: lib/layouts/aguplus.inc:93 #: lib/layouts/customHeadersFooters.module:18 msgid "Left Header:" msgstr "En-tête gauche :" -#: lib/layouts/foils.layout:193 lib/layouts/simplecv.layout:117 -#: lib/layouts/aguplus.inc:103 lib/layouts/customHeadersFooters.module:36 +#: lib/layouts/foils.layout:193 +#: lib/layouts/simplecv.layout:117 +#: lib/layouts/aguplus.inc:103 +#: lib/layouts/customHeadersFooters.module:36 msgid "Right Header" msgstr "En-tête droit" -#: lib/layouts/foils.layout:197 lib/layouts/aguplus.inc:107 +#: lib/layouts/foils.layout:197 +#: lib/layouts/aguplus.inc:107 #: lib/layouts/customHeadersFooters.module:39 msgid "Right Header:" msgstr "En-tête droit :" -#: lib/layouts/foils.layout:201 lib/layouts/customHeadersFooters.module:54 +#: lib/layouts/foils.layout:201 +#: lib/layouts/customHeadersFooters.module:54 msgid "Right Footer" msgstr "Pied droit" -#: lib/layouts/foils.layout:205 lib/layouts/customHeadersFooters.module:57 +#: lib/layouts/foils.layout:205 +#: lib/layouts/customHeadersFooters.module:57 msgid "Right Footer:" msgstr "Pied droit :" -#: lib/layouts/foils.layout:232 lib/layouts/heb-article.layout:33 +#: lib/layouts/foils.layout:232 +#: lib/layouts/heb-article.layout:33 #: lib/layouts/llncs.layout:420 msgid "Theorem #." msgstr "Théorème #." -#: lib/layouts/foils.layout:246 lib/layouts/heb-article.layout:48 +#: lib/layouts/foils.layout:246 +#: lib/layouts/heb-article.layout:48 #: lib/layouts/llncs.layout:359 msgid "Lemma #." msgstr "Lemme #." -#: lib/layouts/foils.layout:253 lib/layouts/heb-article.layout:58 +#: lib/layouts/foils.layout:253 +#: lib/layouts/heb-article.layout:58 #: lib/layouts/llncs.layout:324 msgid "Corollary #." msgstr "Corollaire #." -#: lib/layouts/foils.layout:260 lib/layouts/llncs.layout:393 +#: lib/layouts/foils.layout:260 +#: lib/layouts/llncs.layout:393 msgid "Proposition #." msgstr "Proposition #." -#: lib/layouts/foils.layout:267 lib/layouts/heb-article.layout:78 +#: lib/layouts/foils.layout:267 +#: lib/layouts/heb-article.layout:78 #: lib/layouts/llncs.layout:338 msgid "Definition #." msgstr "Définition #." -#: lib/layouts/foils.layout:292 lib/layouts/siamltex.layout:72 -#: lib/layouts/theorems-order.inc:10 lib/layouts/theorems-starred.inc:23 +#: lib/layouts/foils.layout:292 +#: lib/layouts/siamltex.layout:73 +#: lib/layouts/theorems-order.inc:10 +#: lib/layouts/theorems-starred.inc:23 msgid "Theorem*" msgstr "Théorème*" -#: lib/layouts/foils.layout:299 lib/layouts/siamltex.layout:92 -#: lib/layouts/theorems-order.inc:22 lib/layouts/theorems-starred.inc:80 +#: lib/layouts/foils.layout:299 +#: lib/layouts/siamltex.layout:93 +#: lib/layouts/theorems-order.inc:22 +#: lib/layouts/theorems-starred.inc:80 msgid "Lemma*" msgstr "Lemme*" -#: lib/layouts/foils.layout:302 lib/layouts/theorems-starred.inc:83 +#: lib/layouts/foils.layout:302 +#: lib/layouts/theorems-starred.inc:83 msgid "Lemma." msgstr "Lemme." -#: lib/layouts/foils.layout:306 lib/layouts/siamltex.layout:82 -#: lib/layouts/theorems-order.inc:16 lib/layouts/theorems-starred.inc:63 +#: lib/layouts/foils.layout:306 +#: lib/layouts/siamltex.layout:83 +#: lib/layouts/theorems-order.inc:16 +#: lib/layouts/theorems-starred.inc:63 msgid "Corollary*" msgstr "Corollaire*" -#: lib/layouts/foils.layout:313 lib/layouts/siamltex.layout:102 -#: lib/layouts/theorems-order.inc:28 lib/layouts/theorems-starred.inc:97 +#: lib/layouts/foils.layout:313 +#: lib/layouts/siamltex.layout:103 +#: lib/layouts/theorems-order.inc:28 +#: lib/layouts/theorems-starred.inc:97 msgid "Proposition*" msgstr "Proposition*" -#: lib/layouts/foils.layout:316 lib/layouts/theorems-starred.inc:100 +#: lib/layouts/foils.layout:316 +#: lib/layouts/theorems-starred.inc:100 msgid "Proposition." msgstr "Proposition." -#: lib/layouts/foils.layout:320 lib/layouts/siamltex.layout:131 -#: lib/layouts/theorems-order.inc:40 lib/layouts/theorems-starred.inc:148 +#: lib/layouts/foils.layout:320 +#: lib/layouts/siamltex.layout:132 +#: lib/layouts/theorems-order.inc:40 +#: lib/layouts/theorems-starred.inc:148 msgid "Definition*" msgstr "Définition*" -#: lib/layouts/g-brief.layout:26 lib/layouts/g-brief2.layout:48 +#: lib/layouts/g-brief.layout:26 +#: lib/layouts/g-brief2.layout:48 msgid "Letter:" msgstr "Lettre :" -#: lib/layouts/g-brief.layout:35 lib/layouts/g-brief2.layout:57 -#: lib/layouts/scrlettr.layout:112 lib/layouts/scrlttr2.layout:145 -#: lib/layouts/agu_stdtitle.inc:184 src/frontends/qt4/GuiIndices.cpp:51 +#: lib/layouts/g-brief.layout:35 +#: lib/layouts/g-brief2.layout:57 +#: lib/layouts/scrlettr.layout:112 +#: lib/layouts/scrlttr2.layout:145 +#: lib/layouts/agu_stdtitle.inc:184 +#: src/frontends/qt4/GuiIndices.cpp:51 #: src/mathed/MathMacroTemplate.cpp:487 msgid "Name" msgstr "Nom" -#: lib/layouts/g-brief.layout:45 lib/layouts/g-brief2.layout:67 -#: lib/layouts/scrlettr.layout:123 lib/layouts/agu_stdtitle.inc:188 +#: lib/layouts/g-brief.layout:45 +#: lib/layouts/g-brief2.layout:67 +#: lib/layouts/scrlettr.layout:123 +#: lib/layouts/agu_stdtitle.inc:188 msgid "Name:" msgstr "Nom :" -#: lib/layouts/g-brief.layout:61 lib/layouts/agu_stdtitle.inc:437 +#: lib/layouts/g-brief.layout:61 +#: lib/layouts/agu_stdtitle.inc:437 #: lib/layouts/agu_stdtitle.inc:439 msgid "Street" msgstr "Rue" @@ -8355,7 +9120,8 @@ msgstr "Addition :" msgid "Town:" msgstr "Ville :" -#: lib/layouts/g-brief.layout:82 lib/layouts/agu_stdtitle.inc:459 +#: lib/layouts/g-brief.layout:82 +#: lib/layouts/agu_stdtitle.inc:459 #: lib/layouts/agu_stdtitle.inc:461 msgid "State" msgstr "État" @@ -8364,25 +9130,30 @@ msgstr "État" msgid "State:" msgstr "État :" -#: lib/layouts/g-brief.layout:89 lib/layouts/g-brief2.layout:674 +#: lib/layouts/g-brief.layout:89 +#: lib/layouts/g-brief2.layout:674 msgid "ReturnAddress" msgstr "AdresseRetour" -#: lib/layouts/g-brief.layout:92 lib/layouts/g-brief2.layout:685 +#: lib/layouts/g-brief.layout:92 +#: lib/layouts/g-brief2.layout:685 msgid "ReturnAddress:" msgstr "AdresseRetour :" -#: lib/layouts/g-brief.layout:99 lib/layouts/g-brief2.layout:747 +#: lib/layouts/g-brief.layout:99 +#: lib/layouts/g-brief2.layout:747 #: lib/layouts/lettre.layout:472 msgid "MyRef:" msgstr "MaRéf :" -#: lib/layouts/g-brief.layout:106 lib/layouts/g-brief2.layout:768 +#: lib/layouts/g-brief.layout:106 +#: lib/layouts/g-brief2.layout:768 #: lib/layouts/lettre.layout:456 msgid "YourRef:" msgstr "VotreRéf :" -#: lib/layouts/g-brief.layout:113 lib/layouts/g-brief2.layout:789 +#: lib/layouts/g-brief.layout:113 +#: lib/layouts/g-brief2.layout:789 msgid "YourMail:" msgstr "VotreMail :" @@ -8422,11 +9193,13 @@ msgstr "HTTP" msgid "HTTP:" msgstr "HTTP:" -#: lib/layouts/g-brief.layout:152 lib/layouts/scrlttr2.layout:215 +#: lib/layouts/g-brief.layout:152 +#: lib/layouts/scrlttr2.layout:215 msgid "Bank" msgstr "Banque" -#: lib/layouts/g-brief.layout:155 lib/layouts/scrlttr2.layout:219 +#: lib/layouts/g-brief.layout:155 +#: lib/layouts/scrlttr2.layout:219 msgid "Bank:" msgstr "Banque :" @@ -8446,19 +9219,23 @@ msgstr "CompteBancaire" msgid "BankAccount:" msgstr "CompteBancaire :" -#: lib/layouts/g-brief.layout:173 lib/layouts/g-brief2.layout:695 +#: lib/layouts/g-brief.layout:173 +#: lib/layouts/g-brief2.layout:695 msgid "PostalComment" msgstr "CommentairePostal" -#: lib/layouts/g-brief.layout:176 lib/layouts/g-brief2.layout:705 +#: lib/layouts/g-brief.layout:176 +#: lib/layouts/g-brief2.layout:705 msgid "PostalComment:" msgstr "CommentairePostal :" -#: lib/layouts/g-brief.layout:201 lib/layouts/g-brief2.layout:832 +#: lib/layouts/g-brief.layout:201 +#: lib/layouts/g-brief2.layout:832 msgid "Reference:" msgstr "Référence :" -#: lib/layouts/g-brief.layout:218 lib/layouts/g-brief2.layout:922 +#: lib/layouts/g-brief.layout:218 +#: lib/layouts/g-brief2.layout:922 msgid "Encl.:" msgstr "P.J. :" @@ -8722,8 +9499,8 @@ msgstr "Remarques" msgid "Remarks #." msgstr "Remarques #." -#: lib/layouts/heb-article.layout:110 lib/layouts/ijmpc.layout:324 -#: lib/layouts/ijmpd.layout:327 +#: lib/layouts/heb-article.layout:110 +#: lib/layouts/ijmpd.layout:357 msgid "Proof:" msgstr "Preuve :" @@ -8735,15 +9512,18 @@ msgstr "Poursuivre" msgid "(MORE)" msgstr "(POURSUIVRE)" -#: lib/layouts/hollywood.layout:79 lib/layouts/hollywood.layout:90 +#: lib/layouts/hollywood.layout:79 +#: lib/layouts/hollywood.layout:90 msgid "FADE IN:" msgstr "FONDU OUVERTURE :" -#: lib/layouts/hollywood.layout:99 lib/layouts/hollywood.layout:109 +#: lib/layouts/hollywood.layout:99 +#: lib/layouts/hollywood.layout:109 msgid "INT." msgstr "INT." -#: lib/layouts/hollywood.layout:113 lib/layouts/hollywood.layout:123 +#: lib/layouts/hollywood.layout:113 +#: lib/layouts/hollywood.layout:123 msgid "EXT." msgstr "EXT." @@ -8759,7 +9539,8 @@ msgstr "(suite)" msgid "Transition" msgstr "Transition" -#: lib/layouts/hollywood.layout:234 lib/layouts/hollywood.layout:245 +#: lib/layouts/hollywood.layout:234 +#: lib/layouts/hollywood.layout:245 msgid "TITLE OVER:" msgstr "TITRE DESSUS :" @@ -8771,7 +9552,8 @@ msgstr "COUPE" msgid "INTERCUT WITH:" msgstr "COUPE AVEC :" -#: lib/layouts/hollywood.layout:264 lib/layouts/hollywood.layout:275 +#: lib/layouts/hollywood.layout:264 +#: lib/layouts/hollywood.layout:275 msgid "FADE OUT" msgstr "FONDU FERMETURE" @@ -8779,78 +9561,114 @@ msgstr "FONDU FERMETURE" msgid "Scene" msgstr "Scène" -#: lib/layouts/ijmpc.layout:80 lib/layouts/ijmpc.layout:84 -#: lib/layouts/ijmpc.layout:92 lib/layouts/ijmpd.layout:85 -#: lib/layouts/ijmpd.layout:89 lib/layouts/ijmpd.layout:97 +#: lib/layouts/ijmpc.layout:68 +#: lib/layouts/ijmpc.layout:72 +#: lib/layouts/ijmpc.layout:80 +#: lib/layouts/ijmpd.layout:73 +#: lib/layouts/ijmpd.layout:77 +#: lib/layouts/ijmpd.layout:85 msgid "Catchline" msgstr "Catchline" -#: lib/layouts/ijmpc.layout:152 lib/layouts/ijmpd.layout:142 +#: lib/layouts/ijmpc.layout:140 +#: lib/layouts/ijmpd.layout:130 msgid "History" msgstr "Historique" -#: lib/layouts/ijmpc.layout:183 lib/layouts/ijmpc.layout:187 -#: lib/layouts/ijmpd.layout:173 lib/layouts/ijmpd.layout:177 -#: lib/layouts/agu_stdtitle.inc:206 lib/layouts/aguplus.inc:119 +#: lib/layouts/ijmpc.layout:171 +#: lib/layouts/ijmpc.layout:175 +#: lib/layouts/ijmpd.layout:161 +#: lib/layouts/ijmpd.layout:165 +#: lib/layouts/agu_stdtitle.inc:206 +#: lib/layouts/aguplus.inc:119 msgid "Revised" msgstr "Révisé" -#: lib/layouts/ijmpc.layout:230 +#: lib/layouts/ijmpc.layout:218 msgid "Classification Codes" msgstr "Codes de classification" -#: lib/layouts/ijmpc.layout:237 lib/layouts/ijmpd.layout:240 +#: lib/layouts/ijmpc.layout:225 +#: lib/layouts/ijmpd.layout:228 #: lib/layouts/aguplus.inc:217 msgid "TableCaption" msgstr "LégendeTableau" -#: lib/layouts/ijmpc.layout:241 lib/layouts/ijmpd.layout:244 +#: lib/layouts/ijmpc.layout:229 +#: lib/layouts/ijmpd.layout:232 msgid "Table caption" msgstr "Légende de tableau" -#: lib/layouts/ijmpc.layout:254 lib/layouts/ijmpd.layout:257 +#: lib/layouts/ijmpc.layout:242 +#: lib/layouts/ijmpd.layout:245 msgid "Refcite" msgstr "CiteRef" -#: lib/layouts/ijmpc.layout:258 lib/layouts/ijmpd.layout:261 +#: lib/layouts/ijmpc.layout:246 +#: lib/layouts/ijmpd.layout:249 msgid "Cite reference" msgstr "Citer la référence" -#: lib/layouts/ijmpc.layout:271 lib/layouts/ijmpd.layout:274 +#: lib/layouts/ijmpc.layout:259 +#: lib/layouts/ijmpd.layout:262 msgid "ItemList" msgstr "ListeÉlements" -#: lib/layouts/ijmpc.layout:291 lib/layouts/ijmpd.layout:294 +#: lib/layouts/ijmpc.layout:279 +#: lib/layouts/ijmpd.layout:282 msgid "RomanList" msgstr "ListeRomaine" -#: lib/layouts/ijmpc.layout:337 lib/layouts/ijmpd.layout:343 -#: lib/layouts/theorems-ams-bytype.inc:68 lib/layouts/theorems-ams.inc:42 +#: lib/layouts/ijmpc.layout:316 +#: lib/layouts/ijmpd.layout:341 +#: lib/layouts/theorems-ams-bytype.inc:68 +#: lib/layouts/theorems-ams.inc:42 #: lib/layouts/theorems-bytype.inc:44 -#: lib/layouts/theorems-without-preamble.inc:52 lib/layouts/theorems.inc:42 +#: lib/layouts/theorems-without-preamble.inc:52 +#: lib/layouts/theorems.inc:41 msgid "Theorem \\thetheorem." msgstr "Théorème \\thetheorem." -#: lib/layouts/ijmpc.layout:355 lib/layouts/ijmpd.layout:367 -#: lib/layouts/theorems-ams-bytype.inc:94 lib/layouts/theorems-bytype.inc:70 +#: lib/layouts/ijmpc.layout:350 +#: lib/layouts/ijmpd.layout:374 +#: lib/layouts/theorems-ams-bytype.inc:94 +#: lib/layouts/theorems-bytype.inc:70 #: lib/layouts/theorems-without-preamble.inc:76 msgid "Corollary \\thecorollary." msgstr "Corollaire \\thecorollary." -#: lib/layouts/ijmpc.layout:359 lib/layouts/ijmpd.layout:374 -#: lib/layouts/theorems-ams-bytype.inc:112 lib/layouts/theorems-bytype.inc:88 +#: lib/layouts/ijmpc.layout:359 +#: lib/layouts/ijmpd.layout:383 +#: lib/layouts/theorems-ams-bytype.inc:112 +#: lib/layouts/theorems-bytype.inc:88 #: lib/layouts/theorems-without-preamble.inc:92 msgid "Lemma \\thelemma." msgstr "Lemme \\thelemma." -#: lib/layouts/ijmpc.layout:363 lib/layouts/ijmpd.layout:381 -#: lib/layouts/theorems-ams-bytype.inc:130 lib/layouts/theorems-bytype.inc:106 +#: lib/layouts/ijmpc.layout:368 +#: lib/layouts/ijmpd.layout:392 +#: lib/layouts/theorems-ams-bytype.inc:130 +#: lib/layouts/theorems-bytype.inc:106 #: lib/layouts/theorems-without-preamble.inc:108 msgid "Proposition \\theproposition." msgstr "Proposition \\theproposition." -#: lib/layouts/ijmpc.layout:366 lib/layouts/ijmpd.layout:387 -#: lib/layouts/llncs.layout:396 lib/layouts/theorems-without-preamble.inc:371 +#: lib/layouts/ijmpc.layout:373 +#: lib/layouts/ijmpd.layout:397 +#: lib/layouts/theorems-without-preamble.inc:120 +msgid "Prop" +msgstr "Prop" + +#: lib/layouts/ijmpc.layout:377 +#: lib/layouts/ijmpd.layout:401 +#: lib/layouts/theorems-without-preamble.inc:124 +msgid "Prop \\theprop." +msgstr "Prop \\theprop." + +#: lib/layouts/ijmpc.layout:382 +#: lib/layouts/ijmpd.layout:406 +#: lib/layouts/llncs.layout:396 +#: lib/layouts/theorems-without-preamble.inc:371 #: lib/layouts/theorems-without-preamble.inc:378 #: lib/layouts/theorems-without-preamble.inc:381 #: lib/layouts/theorems-ams-extended.module:378 @@ -8861,31 +9679,34 @@ msgstr "Proposition \\theproposition." msgid "Question" msgstr "Question" -#: lib/layouts/ijmpc.layout:367 lib/layouts/ijmpd.layout:388 +#: lib/layouts/ijmpc.layout:386 +#: lib/layouts/ijmpd.layout:410 #: lib/layouts/theorems-without-preamble.inc:375 msgid "Question \\thequestion." msgstr "Question \\thequestion." -#: lib/layouts/ijmpc.layout:379 lib/layouts/ijmpd.layout:399 -#: lib/layouts/theorems-ams-bytype.inc:292 lib/layouts/theorems-bytype.inc:268 +#: lib/layouts/ijmpc.layout:395 +#: lib/layouts/ijmpd.layout:419 +#: lib/layouts/theorems-ams-bytype.inc:292 +#: lib/layouts/theorems-bytype.inc:268 msgid "Claim \\theclaim." msgstr "Affirmation \\\\theclaim." -#: lib/layouts/ijmpc.layout:390 lib/layouts/ijmpd.layout:409 -#: lib/layouts/theorems-ams-bytype.inc:148 lib/layouts/theorems-bytype.inc:124 +#: lib/layouts/ijmpc.layout:404 +#: lib/layouts/ijmpd.layout:428 +#: lib/layouts/theorems-ams-bytype.inc:148 +#: lib/layouts/theorems-bytype.inc:124 #: lib/layouts/theorems-without-preamble.inc:140 msgid "Conjecture \\theconjecture." msgstr "Conjecture \\theconjecture." -#: lib/layouts/ijmpc.layout:400 lib/layouts/theorems-without-preamble.inc:120 -msgid "Prop" -msgstr "Prop" - -#: lib/layouts/ijmpc.layout:419 lib/layouts/ijmpd.layout:432 +#: lib/layouts/ijmpc.layout:420 +#: lib/layouts/ijmpd.layout:444 msgid "Appendix \\Alph{appendix}." msgstr "Appendice \\Alph{appendix}." -#: lib/layouts/ijmpd.layout:190 lib/layouts/ijmpd.layout:194 +#: lib/layouts/ijmpd.layout:178 +#: lib/layouts/ijmpd.layout:182 msgid "Comby" msgstr "CommuniquéPar" @@ -8897,7 +9718,8 @@ msgstr "Suivi modifications" msgid "Topical" msgstr "Topical" -#: lib/layouts/iopart.layout:89 lib/layouts/stdinsets.inc:80 +#: lib/layouts/iopart.layout:89 +#: lib/layouts/stdinsets.inc:80 msgid "Comment" msgstr "Commentaire" @@ -8913,9 +9735,11 @@ msgstr "CommPrelim" msgid "Rapid" msgstr "CommRapide" -#: lib/layouts/iopart.layout:218 lib/layouts/jasatex.layout:207 -#: lib/layouts/revtex4-1.layout:175 lib/layouts/revtex4.layout:249 -#: lib/layouts/svglobal3.layout:66 lib/layouts/svglobal3.layout:69 +#: lib/layouts/iopart.layout:218 +#: lib/layouts/jasatex.layout:207 +#: lib/layouts/revtex4.layout:246 +#: lib/layouts/svglobal3.layout:66 +#: lib/layouts/svglobal3.layout:69 msgid "PACS" msgstr "PACS" @@ -8971,7 +9795,7 @@ msgstr "Autre affiliation" msgid "Homepage" msgstr "Page d'accueil" -#: lib/layouts/jasatex.layout:210 lib/layouts/revtex4-1.layout:178 +#: lib/layouts/jasatex.layout:210 msgid "PACS numbers:" msgstr "Numéros PACS :" @@ -8983,7 +9807,8 @@ msgstr "Numéro de preprint" msgid "Preprint number:" msgstr "Numéro de preprint :" -#: lib/layouts/jasatex.layout:236 lib/layouts/jasatex.layout:240 +#: lib/layouts/jasatex.layout:236 +#: lib/layouts/jasatex.layout:240 msgid "Online citation" msgstr "Citation en ligne" @@ -8999,7 +9824,8 @@ msgstr "Adresse pour tirés à part :" msgid "RunningTitle" msgstr "TitreCourant" -#: lib/layouts/kluwer.layout:224 lib/layouts/llncs.layout:163 +#: lib/layouts/kluwer.layout:224 +#: lib/layouts/llncs.layout:163 #: lib/layouts/svcommon.inc:399 msgid "Running title:" msgstr "Titre courant :" @@ -9008,46 +9834,59 @@ msgstr "Titre courant :" msgid "RunningAuthor" msgstr "AuteurCourant" -#: lib/layouts/kluwer.layout:245 lib/layouts/svcommon.inc:405 +#: lib/layouts/kluwer.layout:245 +#: lib/layouts/svcommon.inc:405 msgid "Running author:" msgstr "Auteur courant :" -#: lib/layouts/lettre.layout:39 lib/layouts/lettre.layout:316 +#: lib/layouts/lettre.layout:39 +#: lib/layouts/lettre.layout:316 msgid "NoTelephone" msgstr "Sans téléphone" -#: lib/layouts/lettre.layout:43 lib/layouts/lettre.layout:372 +#: lib/layouts/lettre.layout:43 +#: lib/layouts/lettre.layout:372 #: lib/layouts/lettre.layout:380 msgid "NoFax" msgstr "Sans télécopie" -#: lib/layouts/lettre.layout:49 lib/layouts/lettre.layout:187 +#: lib/layouts/lettre.layout:49 +#: lib/layouts/lettre.layout:187 #: lib/layouts/lettre.layout:194 msgid "NoPlace" msgstr "Sans lieu" -#: lib/layouts/lettre.layout:53 lib/layouts/lettre.layout:236 +#: lib/layouts/lettre.layout:53 +#: lib/layouts/lettre.layout:236 #: lib/layouts/lettre.layout:244 msgid "NoDate" msgstr "Sans date" -#: lib/layouts/lettre.layout:73 lib/layouts/lettre.layout:649 +#: lib/layouts/lettre.layout:73 +#: lib/layouts/lettre.layout:649 msgid "Post Scriptum" msgstr "Post Scriptum" -#: lib/layouts/lettre.layout:75 lib/layouts/lettre.layout:515 +#: lib/layouts/lettre.layout:75 +#: lib/layouts/lettre.layout:515 msgid "EndOfMessage" msgstr "Fin de lettre" -#: lib/layouts/lettre.layout:77 lib/layouts/lettre.layout:535 +#: lib/layouts/lettre.layout:77 +#: lib/layouts/lettre.layout:535 msgid "EndOfFile" msgstr "Fin de fichier" -#: lib/layouts/lettre.layout:139 lib/layouts/lettre.layout:158 -#: lib/layouts/lettre.layout:188 lib/layouts/lettre.layout:214 -#: lib/layouts/lettre.layout:237 lib/layouts/lettre.layout:257 -#: lib/layouts/lettre.layout:287 lib/layouts/lettre.layout:317 -#: lib/layouts/lettre.layout:343 lib/layouts/lettre.layout:373 +#: lib/layouts/lettre.layout:139 +#: lib/layouts/lettre.layout:158 +#: lib/layouts/lettre.layout:188 +#: lib/layouts/lettre.layout:214 +#: lib/layouts/lettre.layout:237 +#: lib/layouts/lettre.layout:257 +#: lib/layouts/lettre.layout:287 +#: lib/layouts/lettre.layout:317 +#: lib/layouts/lettre.layout:343 +#: lib/layouts/lettre.layout:373 #: lib/layouts/lettre.layout:399 msgid "Headings" msgstr "En-têtes" @@ -9072,7 +9911,8 @@ msgstr "Sans téléphone" msgid "Fax:" msgstr "Télécopie :" -#: lib/layouts/lettre.layout:516 lib/layouts/lettre.layout:607 +#: lib/layouts/lettre.layout:516 +#: lib/layouts/lettre.layout:607 #: lib/layouts/lettre.layout:650 msgid "Closings" msgstr "Annexes" @@ -9089,11 +9929,16 @@ msgstr "Fin de fichier." msgid "P.S.:" msgstr "P.S. :" -#: lib/layouts/llncs.layout:39 lib/layouts/memoir.layout:59 -#: lib/layouts/recipebook.layout:41 lib/layouts/scrbook.layout:16 -#: lib/layouts/svmult.layout:110 lib/layouts/tufte-book.layout:62 -#: lib/layouts/agu_stdsections.inc:22 lib/layouts/db_stdsections.inc:21 -#: lib/layouts/scrclass.inc:59 lib/layouts/stdsections.inc:39 +#: lib/layouts/llncs.layout:39 +#: lib/layouts/memoir.layout:59 +#: lib/layouts/recipebook.layout:41 +#: lib/layouts/scrbook.layout:16 +#: lib/layouts/svmult.layout:110 +#: lib/layouts/tufte-book.layout:62 +#: lib/layouts/agu_stdsections.inc:22 +#: lib/layouts/db_stdsections.inc:21 +#: lib/layouts/scrclass.inc:59 +#: lib/layouts/stdsections.inc:39 #: lib/layouts/svcommon.inc:146 msgid "Chapter" msgstr "Chapitre" @@ -9102,11 +9947,13 @@ msgstr "Chapitre" msgid "Running LaTeX Title" msgstr "Titre Latex courant" -#: lib/layouts/llncs.layout:172 lib/layouts/svcommon.inc:371 +#: lib/layouts/llncs.layout:172 +#: lib/layouts/svcommon.inc:371 msgid "TOC Title" msgstr "Titre TdM" -#: lib/layouts/llncs.layout:176 lib/layouts/svcommon.inc:382 +#: lib/layouts/llncs.layout:176 +#: lib/layouts/svcommon.inc:382 msgid "TOC title:" msgstr "Titre TdM :" @@ -9118,7 +9965,8 @@ msgstr "Auteur courant" msgid "Author Running:" msgstr "AuteurCourant :" -#: lib/layouts/llncs.layout:208 lib/layouts/svcommon.inc:389 +#: lib/layouts/llncs.layout:208 +#: lib/layouts/svcommon.inc:389 msgid "TOC Author" msgstr "Auteur TdM" @@ -9130,7 +9978,8 @@ msgstr "Auteur TdM :" msgid "Case #." msgstr "Cas #." -#: lib/layouts/llncs.layout:310 lib/layouts/svmono.layout:81 +#: lib/layouts/llncs.layout:310 +#: lib/layouts/svmono.layout:81 #: lib/layouts/theorems-starred.inc:252 msgid "Claim." msgstr "Affirmation." @@ -9155,7 +10004,8 @@ msgstr "Note #." msgid "Problem #." msgstr "Problème #." -#: lib/layouts/llncs.layout:383 lib/layouts/theorems-without-preamble.inc:354 +#: lib/layouts/llncs.layout:383 +#: lib/layouts/theorems-without-preamble.inc:354 #: lib/layouts/theorems-without-preamble.inc:361 #: lib/layouts/theorems-without-preamble.inc:364 msgid "Property" @@ -9177,8 +10027,10 @@ msgstr "Remarque #." msgid "Solution #." msgstr "Solution #." -#: lib/layouts/memoir.layout:65 lib/layouts/db_stdstarsections.inc:24 -#: lib/layouts/stdstarsections.inc:24 lib/layouts/svcommon.inc:245 +#: lib/layouts/memoir.layout:65 +#: lib/layouts/db_stdstarsections.inc:24 +#: lib/layouts/stdstarsections.inc:24 +#: lib/layouts/svcommon.inc:245 msgid "Chapter*" msgstr "Chapitre*" @@ -9190,7 +10042,8 @@ msgstr "ChapitrePrécis" msgid "Epigraph" msgstr "Épigraphe" -#: lib/layouts/memoir.layout:121 lib/layouts/memoir.layout:177 +#: lib/layouts/memoir.layout:121 +#: lib/layouts/memoir.layout:177 msgid "Maintext" msgstr "Corps" @@ -9262,11 +10115,13 @@ msgstr "FermeSection" msgid "Close Section" msgstr "Ferme Section" -#: lib/layouts/moderncv.layout:173 lib/layouts/stdlayouts.inc:98 +#: lib/layouts/moderncv.layout:173 +#: lib/layouts/stdlayouts.inc:74 msgid "--Separator--" msgstr "--Séparateur--" -#: lib/layouts/moderncv.layout:181 lib/layouts/stdlayouts.inc:107 +#: lib/layouts/moderncv.layout:181 +#: lib/layouts/stdlayouts.inc:83 msgid "--- Separate Environment ---" msgstr "--- Séparateur d'environnement ---" @@ -9278,8 +10133,10 @@ msgstr "SousTitre" msgid "Institution" msgstr "Institution" -#: lib/layouts/powerdot.layout:119 lib/layouts/seminar.layout:36 -#: lib/layouts/slides.layout:89 src/frontends/qt4/GuiDocument.cpp:171 +#: lib/layouts/powerdot.layout:119 +#: lib/layouts/seminar.layout:96 +#: lib/layouts/slides.layout:89 +#: src/frontends/qt4/GuiDocument.cpp:170 msgid "Slide" msgstr "Diapo" @@ -9307,7 +10164,8 @@ msgstr "DiapoVide" msgid "Empty slide:" msgstr "Diapo vide :" -#: lib/layouts/powerdot.layout:226 lib/layouts/numarticle.inc:9 +#: lib/layouts/powerdot.layout:226 +#: lib/layouts/numarticle.inc:9 msgid "\\arabic{section}" msgstr "\\arabic{section}" @@ -9319,11 +10177,13 @@ msgstr "ListePucesType1" msgid "EnumerateType1" msgstr "ÉnumérationType1" -#: lib/layouts/powerdot.layout:401 lib/layouts/stdfloats.inc:46 +#: lib/layouts/powerdot.layout:401 +#: lib/layouts/stdfloats.inc:46 msgid "List of Algorithms" msgstr "Liste des algorithmes" -#: lib/layouts/recipebook.layout:42 lib/layouts/scrbook.layout:17 +#: lib/layouts/recipebook.layout:42 +#: lib/layouts/scrbook.layout:17 msgid "\\thechapter" msgstr "\\thechapter" @@ -9343,97 +10203,36 @@ msgstr "Ingrédients" msgid "Ingredients:" msgstr "Ingrédients :" -#: lib/layouts/revtex4-1.layout:97 lib/layouts/revtex4.layout:151 -#, fuzzy -msgid "Affiliation (alternate)" -msgstr "Marque d'affiliation" - -#: lib/layouts/revtex4-1.layout:100 lib/layouts/revtex4.layout:157 -#, fuzzy -msgid "Affiliation (alternate):" -msgstr "Marque d'affiliation" - -#: lib/layouts/revtex4-1.layout:106 lib/layouts/revtex4.layout:161 -#, fuzzy -msgid "Affiliation (none)" -msgstr "Affiliation" - -#: lib/layouts/revtex4-1.layout:109 lib/layouts/revtex4.layout:164 -#, fuzzy -msgid "No affiliation" -msgstr "Affiliation de l'auteur" - -#: lib/layouts/revtex4-1.layout:126 lib/layouts/revtex4.layout:203 -msgid "Electronic Address:" -msgstr "Adresse électronique :" - -#: lib/layouts/revtex4-1.layout:147 lib/layouts/revtex4.layout:183 -#, fuzzy -msgid "Collaboration" -msgstr "Variante" - -#: lib/layouts/revtex4-1.layout:150 lib/layouts/revtex4.layout:186 -#, fuzzy -msgid "Collaboration:" -msgstr "Variante :" - -#: lib/layouts/revtex4-1.layout:182 lib/layouts/revtex4.layout:102 +#: lib/layouts/revtex4.layout:111 msgid "Preprint" msgstr "Preprint" -#: lib/layouts/revtex4-1.layout:198 lib/layouts/revtex4.layout:193 +#: lib/layouts/revtex4.layout:168 +#: lib/layouts/revtex4.layout:174 +msgid "AltAffiliation" +msgstr "AffiliationAlt" + +#: lib/layouts/revtex4.layout:190 #: lib/layouts/amsdefs.inc:171 msgid "Thanks:" msgstr "Remerciements :" -#: lib/layouts/revtex4-1.layout:219 +#: lib/layouts/revtex4.layout:200 +msgid "Electronic Address:" +msgstr "Adresse électronique :" + +#: lib/layouts/revtex4.layout:237 msgid "acknowledgments" msgstr "remerciements" -#: lib/layouts/revtex4-1.layout:232 -#, fuzzy -msgid "Ruled Table" -msgstr "PlacementTableau" - -#: lib/layouts/revtex4-1.layout:234 lib/layouts/revtex4-1.layout:242 -#: lib/layouts/revtex4-1.layout:250 src/frontends/qt4/GuiSymbols.cpp:123 -msgid "Specials" -msgstr "Caractères spéciaux" - -#: lib/layouts/revtex4-1.layout:240 -#, fuzzy -msgid "Turn Page" -msgstr "Saut de page (vide le tampon)" - -#: lib/layouts/revtex4-1.layout:248 -#, fuzzy -msgid "Wide Text" -msgstr "Dans le texte" - -#: lib/layouts/revtex4-1.layout:258 -msgid "Video" -msgstr "" - -#: lib/layouts/revtex4-1.layout:261 -#, fuzzy -msgid "List of Videos" -msgstr "Liste des figures" - -#: lib/layouts/revtex4-1.layout:270 lib/layouts/revtex4-1.layout:272 -#, fuzzy -msgid "Float Link" -msgstr "Flottant" - -#: lib/layouts/revtex4.layout:169 -msgid "AltAffiliation" -msgstr "AffiliationAlt" - -#: lib/layouts/revtex4.layout:257 +#: lib/layouts/revtex4.layout:254 msgid "PACS number:" msgstr "Numéro PACS :" -#: lib/layouts/scrlettr.layout:24 lib/layouts/scrlttr2.layout:28 -#: lib/layouts/scrclass.inc:42 lib/layouts/stdlyxlist.inc:6 +#: lib/layouts/scrlettr.layout:24 +#: lib/layouts/scrlttr2.layout:28 +#: lib/layouts/scrclass.inc:42 +#: lib/layouts/stdlyxlist.inc:6 #: lib/layouts/enumitem.module:73 msgid "Labeling" msgstr "Étiquetage" @@ -9446,55 +10245,68 @@ msgstr "L" msgid "O" msgstr "O" -#: lib/layouts/scrlettr.layout:105 lib/layouts/scrlttr2.layout:138 +#: lib/layouts/scrlettr.layout:105 +#: lib/layouts/scrlttr2.layout:138 msgid "Encl" msgstr "P.J." -#: lib/layouts/scrlettr.layout:156 lib/layouts/scrlttr2.layout:235 +#: lib/layouts/scrlettr.layout:156 +#: lib/layouts/scrlttr2.layout:235 msgid "Place:" msgstr "Lieu :" -#: lib/layouts/scrlettr.layout:174 lib/layouts/scrlttr2.layout:255 +#: lib/layouts/scrlettr.layout:174 +#: lib/layouts/scrlttr2.layout:255 msgid "Specialmail" msgstr "CourrierSpécial" -#: lib/layouts/scrlettr.layout:177 lib/layouts/scrlttr2.layout:259 +#: lib/layouts/scrlettr.layout:177 +#: lib/layouts/scrlttr2.layout:259 msgid "Specialmail:" msgstr "CourrierSpécial :" -#: lib/layouts/scrlettr.layout:191 lib/layouts/scrlttr2.layout:275 +#: lib/layouts/scrlettr.layout:191 +#: lib/layouts/scrlttr2.layout:275 msgid "Title:" msgstr "Titre :" -#: lib/layouts/scrlettr.layout:203 lib/layouts/scrlttr2.layout:288 +#: lib/layouts/scrlettr.layout:203 +#: lib/layouts/scrlttr2.layout:288 msgid "Yourref" msgstr "VotreRéf" -#: lib/layouts/scrlettr.layout:217 lib/layouts/scrlttr2.layout:304 +#: lib/layouts/scrlettr.layout:217 +#: lib/layouts/scrlttr2.layout:304 msgid "Yourmail" msgstr "VotreMail" -#: lib/layouts/scrlettr.layout:220 lib/layouts/scrlttr2.layout:308 +#: lib/layouts/scrlettr.layout:220 +#: lib/layouts/scrlttr2.layout:308 msgid "Your letter of:" msgstr "Votre lettre du :" -#: lib/layouts/scrlettr.layout:224 lib/layouts/scrlttr2.layout:312 +#: lib/layouts/scrlettr.layout:224 +#: lib/layouts/scrlttr2.layout:312 msgid "Myref" msgstr "MaRéf" -#: lib/layouts/scrlettr.layout:231 lib/layouts/scrlttr2.layout:320 +#: lib/layouts/scrlettr.layout:231 +#: lib/layouts/scrlttr2.layout:320 msgid "Customer" msgstr "Client" -#: lib/layouts/scrlettr.layout:234 lib/layouts/scrlttr2.layout:324 +#: lib/layouts/scrlettr.layout:234 +#: lib/layouts/scrlttr2.layout:324 msgid "Customer no.:" msgstr "Numéro de client :" -#: lib/layouts/scrlettr.layout:238 lib/layouts/scrlttr2.layout:328 +#: lib/layouts/scrlettr.layout:238 +#: lib/layouts/scrlttr2.layout:328 msgid "Invoice" msgstr "Facture" -#: lib/layouts/scrlettr.layout:241 lib/layouts/scrlttr2.layout:332 +#: lib/layouts/scrlettr.layout:241 +#: lib/layouts/scrlttr2.layout:332 msgid "Invoice no.:" msgstr "Numéro de facture :" @@ -9542,82 +10354,109 @@ msgstr "FinLettre" msgid "End of letter" msgstr "Fin de lettre" -#: lib/layouts/seminar.layout:24 +#: lib/layouts/seminar.layout:25 +#: lib/layouts/seminar.layout:84 msgid "LandscapeSlide" msgstr "DiapoPaysage" -#: lib/layouts/seminar.layout:34 -msgid "Landscape Slide:" -msgstr "Diapo paysage :" +#: lib/layouts/seminar.layout:26 +msgid "Landscape Slide" +msgstr "Diapo paysage" -#: lib/layouts/seminar.layout:40 +#: lib/layouts/seminar.layout:38 +#: lib/layouts/seminar.layout:100 msgid "PortraitSlide" msgstr "DiapoPortrait" -#: lib/layouts/seminar.layout:43 -msgid "Portrait Slide:" -msgstr "Diapo portrait :" +#: lib/layouts/seminar.layout:40 +msgid "Portrait Slide" +msgstr "Diapo portrait" #: lib/layouts/seminar.layout:45 -msgid "Slide*" -msgstr "Diapo*" - -#: lib/layouts/seminar.layout:52 -msgid "EndOfSlide" -msgstr "FinDiapo" - -#: lib/layouts/seminar.layout:57 msgid "SlideHeading" msgstr "TitreDiapo" -#: lib/layouts/seminar.layout:64 +#: lib/layouts/seminar.layout:52 msgid "SlideSubHeading" msgstr "SousTitreDiapo" -#: lib/layouts/seminar.layout:70 +#: lib/layouts/seminar.layout:58 +#: lib/layouts/seminar.layout:116 msgid "ListOfSlides" msgstr "ListeDiapos" -#: lib/layouts/seminar.layout:78 -msgid "[List Of Slides]" -msgstr "[Liste des diapos]" +#: lib/layouts/seminar.layout:60 +msgid "List of Slides" +msgstr "Liste des diapos" -#: lib/layouts/seminar.layout:81 +#: lib/layouts/seminar.layout:67 +#: lib/layouts/seminar.layout:126 msgid "SlideContents" msgstr "ContenuDiapo" -#: lib/layouts/seminar.layout:84 -msgid "[Slide Contents]" -msgstr "[Contenu des diapos]" +#: lib/layouts/seminar.layout:69 +msgid "Slide Contents" +msgstr "Contenu diapo" -#: lib/layouts/seminar.layout:87 +#: lib/layouts/seminar.layout:73 +#: lib/layouts/seminar.layout:132 msgid "ProgressContents" msgstr "SommaireProgression" -#: lib/layouts/seminar.layout:90 +#: lib/layouts/seminar.layout:75 +msgid "Progress Contents" +msgstr "Sommaire progression" + +#: lib/layouts/seminar.layout:94 +msgid "Landscape Slide:" +msgstr "Diapo paysage :" + +#: lib/layouts/seminar.layout:103 +msgid "Portrait Slide:" +msgstr "Diapo portrait :" + +#: lib/layouts/seminar.layout:105 +msgid "Slide*" +msgstr "Diapo*" + +#: lib/layouts/seminar.layout:112 +msgid "EndOfSlide" +msgstr "FinDiapo" + +#: lib/layouts/seminar.layout:124 +msgid "[List Of Slides]" +msgstr "[Liste des diapos]" + +#: lib/layouts/seminar.layout:129 +msgid "[Slide Contents]" +msgstr "[Contenu des diapos]" + +#: lib/layouts/seminar.layout:135 msgid "[Progress Contents]" msgstr "[Progession]" -#: lib/layouts/siamltex.layout:111 lib/layouts/theorems-order.inc:34 +#: lib/layouts/siamltex.layout:112 +#: lib/layouts/theorems-order.inc:34 #: lib/layouts/theorems-starred.inc:114 msgid "Conjecture*" msgstr "Conjecture*" -#: lib/layouts/siamltex.layout:121 +#: lib/layouts/siamltex.layout:122 #: lib/layouts/theorems-ams-extended-bytype.module:112 #: lib/layouts/theorems-ams-extended.module:88 msgid "Algorithm*" msgstr "Algorithme*" -#: lib/layouts/siamltex.layout:135 +#: lib/layouts/siamltex.layout:136 msgid "AMS" msgstr "AMS" -#: lib/layouts/siamltex.layout:310 lib/layouts/amsdefs.inc:189 +#: lib/layouts/siamltex.layout:311 +#: lib/layouts/amsdefs.inc:189 msgid "Subjectclass" msgstr "ClassificationSujet" -#: lib/layouts/siamltex.layout:313 +#: lib/layouts/siamltex.layout:314 msgid "AMS subject classifications:" msgstr "Classifications de sujet AMS :" @@ -9705,59 +10544,6 @@ msgstr "RÉSUMÉ" msgid "ACKNOWLEDGMENTS" msgstr "REMERCIEMENTS" -#: lib/layouts/svglobal.layout:70 lib/layouts/svjog.layout:74 -#: lib/layouts/svprobth.layout:104 -msgid "Headnote" -msgstr "Note d'en-tête" - -#: lib/layouts/svglobal.layout:84 lib/layouts/svjog.layout:88 -#: lib/layouts/svprobth.layout:118 -msgid "Headnote (optional):" -msgstr "Note d'en-tête (optionnelle) :" - -#: lib/layouts/svglobal.layout:93 lib/layouts/svglobal.layout:95 -#: lib/layouts/svjog.layout:97 lib/layouts/svjog.layout:99 -#: lib/layouts/svprobth.layout:127 lib/layouts/svprobth.layout:129 -#, fuzzy -msgid "thanks" -msgstr "Remerciements" - -#: lib/layouts/svglobal.layout:105 lib/layouts/svjog.layout:109 -#: lib/layouts/svprobth.layout:139 -msgid "Inst" -msgstr "Inst" - -#: lib/layouts/svglobal.layout:108 lib/layouts/svjog.layout:112 -#: lib/layouts/svprobth.layout:142 -msgid "Institute #" -msgstr "Num. institut" - -#: lib/layouts/svglobal.layout:125 lib/layouts/svjog.layout:129 -#: lib/layouts/svmult.layout:134 lib/layouts/svprobth.layout:159 -#: lib/layouts/scrclass.inc:204 lib/layouts/svcommon.inc:477 -msgid "Dedication" -msgstr "Dédicace" - -#: lib/layouts/svglobal.layout:129 lib/layouts/svjog.layout:133 -#: lib/layouts/svprobth.layout:163 lib/layouts/amsdefs.inc:178 -msgid "Dedication:" -msgstr "Dédicace :" - -#: lib/layouts/svglobal.layout:137 lib/layouts/svjog.layout:141 -#: lib/layouts/svprobth.layout:171 -msgid "Corr Author:" -msgstr "Auteur réf. :" - -#: lib/layouts/svglobal.layout:141 lib/layouts/svjog.layout:145 -#: lib/layouts/svprobth.layout:175 -msgid "Offprints" -msgstr "Tirés à part" - -#: lib/layouts/svglobal.layout:145 lib/layouts/svjog.layout:149 -#: lib/layouts/svprobth.layout:179 -msgid "Offprints:" -msgstr "Tirés à part :" - #: lib/layouts/svglobal3.layout:72 msgid "Subclass" msgstr "Sous-classe" @@ -9778,11 +10564,13 @@ msgstr "Classification de sujet CR" msgid "Solution \\thesolution" msgstr "Solution \\thesolution" -#: lib/layouts/svmono.layout:88 lib/layouts/svcommon.inc:647 +#: lib/layouts/svmono.layout:88 +#: lib/layouts/svcommon.inc:647 msgid "Proof(QED)" msgstr "Preuve(CQFD)" -#: lib/layouts/svmono.layout:92 lib/layouts/svcommon.inc:656 +#: lib/layouts/svmono.layout:92 +#: lib/layouts/svcommon.inc:656 msgid "Proof(smartQED)" msgstr "Preuve(élégantCQFD)" @@ -9794,7 +10582,8 @@ msgstr "Titre*" msgid "Title*: " msgstr "Titre* : " -#: lib/layouts/svmult.layout:65 lib/layouts/svmult.layout:150 +#: lib/layouts/svmult.layout:65 +#: lib/layouts/svmult.layout:150 msgid "Contributors" msgstr "Collaborateurs" @@ -9806,51 +10595,73 @@ msgstr "Liste des collaborateurs" msgid "Contributor List" msgstr "Liste des collaborateurs" -#: lib/layouts/svmult.layout:103 lib/layouts/svmult.layout:107 -#: lib/layouts/svmult.layout:111 lib/layouts/svmult.layout:115 -#: lib/layouts/svmult.layout:119 lib/layouts/svmult.layout:123 -#: lib/layouts/svmult.layout:127 lib/layouts/svmult.layout:131 -#: lib/layouts/svmult.layout:135 lib/layouts/svmult.layout:139 -#: lib/layouts/svmult.layout:143 lib/layouts/svmult.layout:147 -#: lib/layouts/svmult.layout:151 lib/layouts/svmult.layout:155 +#: lib/layouts/svmult.layout:103 +#: lib/layouts/svmult.layout:107 +#: lib/layouts/svmult.layout:111 +#: lib/layouts/svmult.layout:115 +#: lib/layouts/svmult.layout:119 +#: lib/layouts/svmult.layout:123 +#: lib/layouts/svmult.layout:127 +#: lib/layouts/svmult.layout:131 +#: lib/layouts/svmult.layout:135 +#: lib/layouts/svmult.layout:139 +#: lib/layouts/svmult.layout:143 +#: lib/layouts/svmult.layout:147 +#: lib/layouts/svmult.layout:151 +#: lib/layouts/svmult.layout:155 msgid "For editors" msgstr "Pour éditeurs" -#: lib/layouts/svmult.layout:106 lib/layouts/svcommon.inc:115 +#: lib/layouts/svmult.layout:106 +#: lib/layouts/svcommon.inc:115 msgid "PartBacktext" msgstr "PartieTexteVerso" -#: lib/layouts/svmult.layout:114 lib/layouts/svcommon.inc:408 +#: lib/layouts/svmult.layout:114 +#: lib/layouts/svcommon.inc:408 msgid "Running Chapter" msgstr "Chapitre courant" -#: lib/layouts/svmult.layout:118 lib/layouts/svcommon.inc:163 +#: lib/layouts/svmult.layout:118 +#: lib/layouts/svcommon.inc:163 msgid "ChapAuthor" msgstr "AuteurChapitre" -#: lib/layouts/svmult.layout:122 lib/layouts/svcommon.inc:150 +#: lib/layouts/svmult.layout:122 +#: lib/layouts/svcommon.inc:150 msgid "ChapSubtitle" msgstr "SousTitreChapitre" -#: lib/layouts/svmult.layout:126 lib/layouts/svcommon.inc:313 +#: lib/layouts/svmult.layout:126 +#: lib/layouts/svcommon.inc:313 msgid "extrachap" msgstr "extrachap" -#: lib/layouts/svmult.layout:130 lib/layouts/svcommon.inc:308 +#: lib/layouts/svmult.layout:130 +#: lib/layouts/svcommon.inc:308 msgid "Extrachap" msgstr "Extrachap" -#: lib/layouts/svmult.layout:138 lib/layouts/svcommon.inc:497 +#: lib/layouts/svmult.layout:134 +#: lib/layouts/scrclass.inc:204 +#: lib/layouts/svcommon.inc:477 +msgid "Dedication" +msgstr "Dédicace" + +#: lib/layouts/svmult.layout:138 +#: lib/layouts/svcommon.inc:497 #: lib/layouts/svcommon.inc:501 msgid "Foreword" msgstr "Préambule" -#: lib/layouts/svmult.layout:142 lib/layouts/svcommon.inc:521 +#: lib/layouts/svmult.layout:142 +#: lib/layouts/svcommon.inc:521 #: lib/layouts/svcommon.inc:530 msgid "Preface" msgstr "Préface" -#: lib/layouts/svmult.layout:154 lib/layouts/svcommon.inc:175 +#: lib/layouts/svmult.layout:154 +#: lib/layouts/svcommon.inc:175 msgid "ChapMotto" msgstr "ChapDevise" @@ -9914,60 +10725,76 @@ msgstr "E-mail :" msgid "Thesaurus not supported in recent A&A:" msgstr "Dictionnaire de Synonymes non supporté dans les récents A&A :" -#: lib/layouts/agu_stdclass.inc:34 lib/layouts/agu_stdclass.inc:36 -#: lib/layouts/db_stdcharstyles.inc:35 lib/layouts/db_stdcharstyles.inc:37 +#: lib/layouts/agu_stdclass.inc:34 +#: lib/layouts/agu_stdclass.inc:36 +#: lib/layouts/db_stdcharstyles.inc:35 +#: lib/layouts/db_stdcharstyles.inc:37 msgid "Firstname" msgstr "Prénom" -#: lib/layouts/agu_stdclass.inc:48 lib/layouts/agu_stdclass.inc:50 +#: lib/layouts/agu_stdclass.inc:48 +#: lib/layouts/agu_stdclass.inc:50 msgid "Fname" msgstr "Prénom" -#: lib/layouts/agu_stdclass.inc:93 lib/layouts/agu_stdclass.inc:95 -#: lib/layouts/db_stdcharstyles.inc:57 lib/layouts/db_stdcharstyles.inc:59 +#: lib/layouts/agu_stdclass.inc:93 +#: lib/layouts/agu_stdclass.inc:95 +#: lib/layouts/db_stdcharstyles.inc:57 +#: lib/layouts/db_stdcharstyles.inc:59 #: lib/layouts/db_stdlayouts.inc:11 msgid "Literal" msgstr "Littéral" -#: lib/layouts/agu_stdclass.inc:108 lib/layouts/agu_stdclass.inc:110 -#: lib/layouts/logicalmkup.module:31 src/frontends/qt4/GuiCharacter.cpp:77 +#: lib/layouts/agu_stdclass.inc:108 +#: lib/layouts/agu_stdclass.inc:110 +#: lib/layouts/logicalmkup.module:31 +#: src/frontends/qt4/GuiCharacter.cpp:77 msgid "Emph" msgstr "En évidence" -#: lib/layouts/agu_stdclass.inc:124 lib/layouts/agu_stdclass.inc:126 +#: lib/layouts/agu_stdclass.inc:124 +#: lib/layouts/agu_stdclass.inc:126 msgid "Abbrev" msgstr "Abrévié" -#: lib/layouts/agu_stdclass.inc:135 lib/layouts/agu_stdclass.inc:137 +#: lib/layouts/agu_stdclass.inc:135 +#: lib/layouts/agu_stdclass.inc:137 #: lib/layouts/agu_stdtitle.inc:56 msgid "Citation-number" msgstr "Numéro-Citation" -#: lib/layouts/agu_stdclass.inc:146 lib/layouts/agu_stdclass.inc:148 +#: lib/layouts/agu_stdclass.inc:146 +#: lib/layouts/agu_stdclass.inc:148 msgid "Volume" msgstr "Volume" -#: lib/layouts/agu_stdclass.inc:157 lib/layouts/agu_stdclass.inc:159 +#: lib/layouts/agu_stdclass.inc:157 +#: lib/layouts/agu_stdclass.inc:159 msgid "Day" msgstr "Jour" -#: lib/layouts/agu_stdclass.inc:168 lib/layouts/agu_stdclass.inc:170 +#: lib/layouts/agu_stdclass.inc:168 +#: lib/layouts/agu_stdclass.inc:170 msgid "Month" msgstr "Mois" -#: lib/layouts/agu_stdclass.inc:179 lib/layouts/agu_stdclass.inc:181 +#: lib/layouts/agu_stdclass.inc:179 +#: lib/layouts/agu_stdclass.inc:181 msgid "Year" msgstr "Année" -#: lib/layouts/agu_stdclass.inc:190 lib/layouts/agu_stdclass.inc:192 +#: lib/layouts/agu_stdclass.inc:190 +#: lib/layouts/agu_stdclass.inc:192 msgid "Issue-number" msgstr "Numéro d'émission" -#: lib/layouts/agu_stdclass.inc:201 lib/layouts/agu_stdclass.inc:203 +#: lib/layouts/agu_stdclass.inc:201 +#: lib/layouts/agu_stdclass.inc:203 msgid "Issue-day" msgstr "Date de publication" -#: lib/layouts/agu_stdclass.inc:212 lib/layouts/agu_stdclass.inc:214 +#: lib/layouts/agu_stdclass.inc:212 +#: lib/layouts/agu_stdclass.inc:214 msgid "Issue-months" msgstr "Mois de publication" @@ -10071,7 +10898,8 @@ msgstr "Cite-autre" msgid "Cite-other:" msgstr "Cite-autre :" -#: lib/layouts/agu_stdtitle.inc:209 lib/layouts/aguplus.inc:123 +#: lib/layouts/agu_stdtitle.inc:209 +#: lib/layouts/aguplus.inc:123 msgid "Revised:" msgstr "Révisé :" @@ -10095,7 +10923,8 @@ msgstr "En-Tête-Courant :" msgid "Published-online:" msgstr "Publié-en-ligne :" -#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitation.cpp:88 +#: lib/layouts/agu_stdtitle.inc:263 +#: src/frontends/qt4/GuiCitation.cpp:87 msgid "Citation" msgstr "Citation" @@ -10151,57 +10980,72 @@ msgstr "EnsemblesDonnées" msgid "Datasets:" msgstr "EnsemblesDonnées :" -#: lib/layouts/agu_stdtitle.inc:321 lib/layouts/agu_stdtitle.inc:323 +#: lib/layouts/agu_stdtitle.inc:321 +#: lib/layouts/agu_stdtitle.inc:323 msgid "ISSN" msgstr "ISSN" -#: lib/layouts/agu_stdtitle.inc:332 lib/layouts/agu_stdtitle.inc:334 +#: lib/layouts/agu_stdtitle.inc:332 +#: lib/layouts/agu_stdtitle.inc:334 msgid "CODEN" msgstr "CODEN" -#: lib/layouts/agu_stdtitle.inc:344 lib/layouts/agu_stdtitle.inc:346 +#: lib/layouts/agu_stdtitle.inc:344 +#: lib/layouts/agu_stdtitle.inc:346 msgid "SS-Code" msgstr "Code SS" -#: lib/layouts/agu_stdtitle.inc:355 lib/layouts/agu_stdtitle.inc:357 +#: lib/layouts/agu_stdtitle.inc:355 +#: lib/layouts/agu_stdtitle.inc:357 msgid "SS-Title" msgstr "Titre SS" -#: lib/layouts/agu_stdtitle.inc:367 lib/layouts/agu_stdtitle.inc:369 +#: lib/layouts/agu_stdtitle.inc:367 +#: lib/layouts/agu_stdtitle.inc:369 msgid "CCC-Code" msgstr "Code CCC" -#: lib/layouts/agu_stdtitle.inc:380 lib/layouts/agu_stdtitle.inc:382 -#: lib/layouts/db_lyxmacros.inc:11 lib/layouts/logicalmkup.module:60 +#: lib/layouts/agu_stdtitle.inc:380 +#: lib/layouts/agu_stdtitle.inc:382 +#: lib/layouts/db_lyxmacros.inc:11 +#: lib/layouts/logicalmkup.module:60 msgid "Code" msgstr "Code" -#: lib/layouts/agu_stdtitle.inc:391 lib/layouts/agu_stdtitle.inc:393 +#: lib/layouts/agu_stdtitle.inc:391 +#: lib/layouts/agu_stdtitle.inc:393 msgid "Dscr" msgstr "Dscr" -#: lib/layouts/agu_stdtitle.inc:415 lib/layouts/agu_stdtitle.inc:417 +#: lib/layouts/agu_stdtitle.inc:415 +#: lib/layouts/agu_stdtitle.inc:417 msgid "Orgdiv" msgstr "Division organisation" -#: lib/layouts/agu_stdtitle.inc:426 lib/layouts/agu_stdtitle.inc:428 +#: lib/layouts/agu_stdtitle.inc:426 +#: lib/layouts/agu_stdtitle.inc:428 msgid "Orgname" msgstr "Nom organisation" -#: lib/layouts/agu_stdtitle.inc:448 lib/layouts/agu_stdtitle.inc:450 +#: lib/layouts/agu_stdtitle.inc:448 +#: lib/layouts/agu_stdtitle.inc:450 msgid "City" msgstr "Cité" -#: lib/layouts/agu_stdtitle.inc:470 lib/layouts/agu_stdtitle.inc:472 +#: lib/layouts/agu_stdtitle.inc:470 +#: lib/layouts/agu_stdtitle.inc:472 msgid "Postcode" msgstr "Code postal" -#: lib/layouts/agu_stdtitle.inc:481 lib/layouts/agu_stdtitle.inc:483 +#: lib/layouts/agu_stdtitle.inc:481 +#: lib/layouts/agu_stdtitle.inc:483 msgid "Country" msgstr "Pays" -#: lib/layouts/aguplus.inc:71 lib/layouts/db_stdstarsections.inc:72 -#: lib/layouts/stdstarsections.inc:68 lib/layouts/svcommon.inc:273 +#: lib/layouts/aguplus.inc:71 +#: lib/layouts/db_stdstarsections.inc:72 +#: lib/layouts/stdstarsections.inc:68 +#: lib/layouts/svcommon.inc:273 msgid "Paragraph*" msgstr "Paragraphe*" @@ -10269,6 +11113,10 @@ msgstr "Mots et phrases clés :" msgid "Dedicatory" msgstr "Dédicace" +#: lib/layouts/amsdefs.inc:178 +msgid "Dedication:" +msgstr "Dédicace :" + #: lib/layouts/amsdefs.inc:182 msgid "Translator" msgstr "Traducteur" @@ -10281,31 +11129,38 @@ msgstr "Traducteur :" msgid "2000 Mathematics Subject Classification:" msgstr "Classification des sujets mathématiques de 2000 :" -#: lib/layouts/db_stdcharstyles.inc:20 lib/layouts/db_stdcharstyles.inc:22 +#: lib/layouts/db_stdcharstyles.inc:20 +#: lib/layouts/db_stdcharstyles.inc:22 msgid "Directory" msgstr "Répertoire" -#: lib/layouts/db_stdcharstyles.inc:85 lib/layouts/db_stdcharstyles.inc:87 +#: lib/layouts/db_stdcharstyles.inc:85 +#: lib/layouts/db_stdcharstyles.inc:87 msgid "KeyCombo" msgstr "Combinaison de touches" -#: lib/layouts/db_stdcharstyles.inc:99 lib/layouts/db_stdcharstyles.inc:101 +#: lib/layouts/db_stdcharstyles.inc:99 +#: lib/layouts/db_stdcharstyles.inc:101 msgid "KeyCap" msgstr "Touche Majuscules" -#: lib/layouts/db_stdcharstyles.inc:113 lib/layouts/db_stdcharstyles.inc:115 +#: lib/layouts/db_stdcharstyles.inc:113 +#: lib/layouts/db_stdcharstyles.inc:115 msgid "GuiMenu" msgstr "Menu d'interface" -#: lib/layouts/db_stdcharstyles.inc:127 lib/layouts/db_stdcharstyles.inc:129 +#: lib/layouts/db_stdcharstyles.inc:127 +#: lib/layouts/db_stdcharstyles.inc:129 msgid "GuiMenuItem" msgstr "Élement du menu d'interface" -#: lib/layouts/db_stdcharstyles.inc:141 lib/layouts/db_stdcharstyles.inc:143 +#: lib/layouts/db_stdcharstyles.inc:141 +#: lib/layouts/db_stdcharstyles.inc:143 msgid "GuiButton" msgstr "Bouton d'interface" -#: lib/layouts/db_stdcharstyles.inc:155 lib/layouts/db_stdcharstyles.inc:157 +#: lib/layouts/db_stdcharstyles.inc:155 +#: lib/layouts/db_stdcharstyles.inc:157 msgid "MenuChoice" msgstr "Choix de menu" @@ -10313,7 +11168,8 @@ msgstr "Choix de menu" msgid "SGML" msgstr "SGML" -#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:79 +#: lib/layouts/db_stdstarsections.inc:84 +#: lib/layouts/stdstarsections.inc:79 msgid "Subparagraph*" msgstr "SousParagraphe*" @@ -10341,8 +11197,10 @@ msgstr "RemarqueRévision" msgid "FirstName" msgstr "Prénom" -#: lib/layouts/literate-scrap.inc:12 lib/layouts/knitr.module:35 -#: lib/layouts/noweb.module:11 lib/layouts/sweave.module:45 +#: lib/layouts/literate-scrap.inc:12 +#: lib/layouts/knitr.module:35 +#: lib/layouts/noweb.module:11 +#: lib/layouts/sweave.module:45 msgid "Scrap" msgstr "Scrap" @@ -10382,7 +11240,8 @@ msgstr "\\arabic{subsubsection}." msgid "\\alph{subsubsection}." msgstr "\\alph{subsubsection}." -#: lib/layouts/numrevtex.inc:36 lib/layouts/numrevtex.inc:37 +#: lib/layouts/numrevtex.inc:36 +#: lib/layouts/numrevtex.inc:37 msgid "\\alph{paragraph}." msgstr "\\alph{paragraph}." @@ -10434,7 +11293,8 @@ msgstr "TitreSupplémentaire" msgid "Captionabove" msgstr "LégendeDessus" -#: lib/layouts/scrclass.inc:255 lib/layouts/scrclass.inc:275 +#: lib/layouts/scrclass.inc:255 +#: lib/layouts/scrclass.inc:275 msgid "Captions" msgstr "Légendes" @@ -10446,7 +11306,8 @@ msgstr "LégendeDessous" msgid "Dictum" msgstr "Dicton" -#: lib/layouts/stdcharstyles.inc:10 lib/layouts/stdcustom.inc:10 +#: lib/layouts/stdcharstyles.inc:10 +#: lib/layouts/stdcustom.inc:10 msgid "UNDEFINED" msgstr "INDÉFINI" @@ -10482,12 +11343,14 @@ msgstr "Partie \\Roman{part}" msgid "Chapter ##" msgstr "Chapitre # #" -#: lib/layouts/stdcounters.inc:19 lib/layouts/stdcounters.inc:24 +#: lib/layouts/stdcounters.inc:19 +#: lib/layouts/stdcounters.inc:24 #: lib/layouts/stdcounters.inc:29 msgid "Section ##" msgstr "Section ##" -#: lib/layouts/stdcounters.inc:34 lib/layouts/stdcounters.inc:39 +#: lib/layouts/stdcounters.inc:34 +#: lib/layouts/stdcounters.inc:39 msgid "Paragraph ##" msgstr "Paragraphe # #" @@ -10511,7 +11374,8 @@ msgstr "Équation # #" msgid "Footnote ##" msgstr "NoteDeBasDePage # #" -#: lib/layouts/stdinsets.inc:12 src/insets/InsetMarginal.cpp:35 +#: lib/layouts/stdinsets.inc:12 +#: src/insets/InsetMarginal.cpp:35 msgid "margin" msgstr "marge" @@ -10523,12 +11387,14 @@ msgstr "bas" msgid "Greyedout" msgstr "Grisée" -#: lib/layouts/stdinsets.inc:142 src/insets/InsetERT.cpp:146 +#: lib/layouts/stdinsets.inc:142 +#: src/insets/InsetERT.cpp:146 #: src/insets/InsetERT.cpp:148 msgid "ERT" msgstr "TeX" -#: lib/layouts/stdinsets.inc:174 src/frontends/qt4/GuiDocument.cpp:1427 +#: lib/layouts/stdinsets.inc:174 +#: src/frontends/qt4/GuiDocument.cpp:1321 msgid "Listings" msgstr "Listings" @@ -10544,7 +11410,8 @@ msgstr "opt" msgid "Preview" msgstr "Aperçu" -#: lib/layouts/stdsections.inc:15 lib/layouts/svcommon.inc:118 +#: lib/layouts/stdsections.inc:15 +#: lib/layouts/svcommon.inc:118 msgid "Part \\thepart" msgstr "Partie \\thepart" @@ -10632,112 +11499,129 @@ msgstr "Petit" msgid "Svgraybox" msgstr "Svgraybox" -#: lib/layouts/theorems-ams-bytype.inc:166 lib/layouts/theorems-bytype.inc:142 +#: lib/layouts/theorems-ams-bytype.inc:166 +#: lib/layouts/theorems-bytype.inc:142 #: lib/layouts/theorems-without-preamble.inc:163 msgid "Fact \\thefact." msgstr "Fait \\thefact." -#: lib/layouts/theorems-ams-bytype.inc:184 lib/layouts/theorems-bytype.inc:160 +#: lib/layouts/theorems-ams-bytype.inc:184 +#: lib/layouts/theorems-bytype.inc:160 #: lib/layouts/theorems-without-preamble.inc:179 msgid "Definition \\thedefinition." msgstr "Definition \\thedefinition." -#: lib/layouts/theorems-ams-bytype.inc:209 lib/layouts/theorems-bytype.inc:185 +#: lib/layouts/theorems-ams-bytype.inc:209 +#: lib/layouts/theorems-bytype.inc:185 #: lib/layouts/theorems-without-preamble.inc:203 msgid "Example \\theexample." msgstr "Exemple \\theexample." -#: lib/layouts/theorems-ams-bytype.inc:228 lib/layouts/theorems-bytype.inc:204 +#: lib/layouts/theorems-ams-bytype.inc:228 +#: lib/layouts/theorems-bytype.inc:204 #: lib/layouts/theorems-without-preamble.inc:221 msgid "Problem \\theproblem." msgstr "Problème \\theproblem." -#: lib/layouts/theorems-ams-bytype.inc:247 lib/layouts/theorems-bytype.inc:223 +#: lib/layouts/theorems-ams-bytype.inc:247 +#: lib/layouts/theorems-bytype.inc:223 #: lib/layouts/theorems-without-preamble.inc:294 msgid "Exercise \\theexercise." msgstr "Exercice \\theexercise." -#: lib/layouts/theorems-ams.inc:69 lib/layouts/theorems.inc:69 +#: lib/layouts/theorems-ams.inc:69 +#: lib/layouts/theorems.inc:68 msgid "Corollary \\thetheorem." msgstr "Corollaire \\thetheorem." -#: lib/layouts/theorems-ams.inc:87 lib/layouts/theorems.inc:87 +#: lib/layouts/theorems-ams.inc:87 +#: lib/layouts/theorems.inc:86 msgid "Lemma \\thetheorem." msgstr "Lemme \\thetheorem." -#: lib/layouts/theorems-ams.inc:105 lib/layouts/theorems.inc:105 +#: lib/layouts/theorems-ams.inc:105 +#: lib/layouts/theorems.inc:104 msgid "Proposition \\thetheorem." msgstr "Proposition \\thetheorem." -#: lib/layouts/theorems-ams.inc:123 lib/layouts/theorems.inc:123 +#: lib/layouts/theorems-ams.inc:123 +#: lib/layouts/theorems.inc:122 msgid "Conjecture \\thetheorem." msgstr "Conjecture \\thetheorem." -#: lib/layouts/theorems-ams.inc:141 lib/layouts/theorems.inc:141 +#: lib/layouts/theorems-ams.inc:141 +#: lib/layouts/theorems.inc:140 msgid "Fact \\thetheorem." msgstr "Note \\thetheorem." -#: lib/layouts/theorems-ams.inc:159 lib/layouts/theorems.inc:159 +#: lib/layouts/theorems-ams.inc:159 +#: lib/layouts/theorems.inc:158 msgid "Definition \\thetheorem." msgstr "Définition \\thetheorem." -#: lib/layouts/theorems-ams.inc:183 lib/layouts/theorems.inc:183 +#: lib/layouts/theorems-ams.inc:183 +#: lib/layouts/theorems.inc:182 msgid "Example \\thetheorem." msgstr "Exemple \\thetheorem." -#: lib/layouts/theorems-ams.inc:200 lib/layouts/theorems.inc:200 +#: lib/layouts/theorems-ams.inc:200 +#: lib/layouts/theorems.inc:199 msgid "Problem \\thetheorem." msgstr "Problème \\thetheorem." -#: lib/layouts/theorems-ams.inc:217 lib/layouts/theorems.inc:217 +#: lib/layouts/theorems-ams.inc:217 +#: lib/layouts/theorems.inc:216 msgid "Exercise \\thetheorem." msgstr "Exercice \\thetheorem." -#: lib/layouts/theorems-ams.inc:235 lib/layouts/theorems.inc:235 +#: lib/layouts/theorems-ams.inc:235 +#: lib/layouts/theorems.inc:234 msgid "Remark \\thetheorem." msgstr "Remarque \\thetheorem." -#: lib/layouts/theorems-ams.inc:260 lib/layouts/theorems.inc:260 +#: lib/layouts/theorems-ams.inc:260 +#: lib/layouts/theorems.inc:259 msgid "Claim \\thetheorem." msgstr "Affirmation \\thetheorem." #: lib/layouts/theorems-case.inc:12 -#, fuzzy msgid "Case \\arabic{casei}." -msgstr "Cas \\arabic{case}" +msgstr "Cas \\arabic{casei}." #: lib/layouts/theorems-case.inc:16 -#, fuzzy msgid "Case \\roman{caseii}." -msgstr "Cas \\arabic{case}" +msgstr "Cas \\arabic{caseii}." #: lib/layouts/theorems-case.inc:20 -#, fuzzy msgid "Case \\alph{caseiii}." -msgstr "Cas \\thecase." +msgstr "Cas \\alph{caseiii}." #: lib/layouts/theorems-case.inc:24 -#, fuzzy msgid "Case \\arabic{caseiv}." -msgstr "Cas \\arabic{case}" +msgstr "Cas \\arabic{caseiv}." -#: lib/layouts/theorems-order.inc:46 lib/layouts/theorems-starred.inc:173 +#: lib/layouts/theorems-order.inc:46 +#: lib/layouts/theorems-starred.inc:173 msgid "Example*" msgstr "Exemple*" -#: lib/layouts/theorems-order.inc:52 lib/layouts/theorems-starred.inc:190 +#: lib/layouts/theorems-order.inc:52 +#: lib/layouts/theorems-starred.inc:190 msgid "Problem*" msgstr "Problème*" -#: lib/layouts/theorems-order.inc:58 lib/layouts/theorems-starred.inc:207 +#: lib/layouts/theorems-order.inc:58 +#: lib/layouts/theorems-starred.inc:207 msgid "Exercise*" msgstr "Exercice*" -#: lib/layouts/theorems-order.inc:64 lib/layouts/theorems-starred.inc:224 +#: lib/layouts/theorems-order.inc:64 +#: lib/layouts/theorems-starred.inc:224 msgid "Remark*" msgstr "Remarque*" -#: lib/layouts/theorems-order.inc:70 lib/layouts/theorems-starred.inc:249 +#: lib/layouts/theorems-order.inc:70 +#: lib/layouts/theorems-starred.inc:249 msgid "Claim*" msgstr "Affirmation*" @@ -10761,10 +11645,6 @@ msgstr "Exercice." msgid "Remark." msgstr "Remarque." -#: lib/layouts/theorems-without-preamble.inc:124 -msgid "Prop \\theprop." -msgstr "Prop \\theprop." - #: lib/layouts/theorems-without-preamble.inc:236 msgid "Prob" msgstr "Prob" @@ -10790,74 +11670,20 @@ msgstr "Propriété \\theproperty." msgid "Note \\thenote." msgstr "Note \\thenote." -#: lib/layouts/basic.module:2 -#, fuzzy -msgid "Default (basic)" -msgstr "Implicite" - -#: lib/layouts/basic.module:6 lib/layouts/jurabib.module:8 -#: lib/layouts/natbib.module:9 -#, fuzzy -msgid "Citation engine" -msgstr "Citation" - -#: lib/layouts/basic.module:22 lib/layouts/jurabib.module:49 -#: lib/layouts/natbib.module:44 -msgid "not cited" -msgstr "non cité" - -#: lib/layouts/basic.module:23 lib/layouts/jurabib.module:50 -#: lib/layouts/natbib.module:45 -msgid "Add to bibliography only." -msgstr "Ajouter seulement à la bibliographie." - -#: lib/layouts/bicaption.module:2 -#, fuzzy -msgid "Multilingual captions" -msgstr "Autres o&ptions" - -#: lib/layouts/bicaption.module:6 -msgid "" -"Provides two styles to typeset multilingual captions. For a description see " -"the file MultilingualCaptions.lyx in LyX's examples folder." -msgstr "" - -#: lib/layouts/bicaption.module:10 -#, fuzzy -msgid "Caption setup" -msgstr "Légendes" - -#: lib/layouts/bicaption.module:25 -#, fuzzy -msgid "Caption setup:" -msgstr "Légende :" - -#: lib/layouts/bicaption.module:34 -#, fuzzy -msgid "Bicaption" -msgstr "Légende" - -#: lib/layouts/bicaption.module:42 -msgid "Multilingual caption:" -msgstr "" - #: lib/layouts/braille.module:2 msgid "Braille" msgstr "Braille" #: lib/layouts/braille.module:6 -msgid "" -"Defines an environment to typeset Braille. For more details see Braille.lyx " -"in examples." -msgstr "" -"Définit un environnement pour saisir le Braille. Pour les détails, voir " -"Braille.lyx dans les exemples." +msgid "Defines an environment to typeset Braille. For more details see Braille.lyx in examples." +msgstr "Définit un environnement pour saisir le Braille. Pour les détails, voir Braille.lyx dans les exemples." #: lib/layouts/braille.module:22 msgid "Braille (default)" msgstr "Braille (implicite)" -#: lib/layouts/braille.module:36 lib/layouts/braille.module:59 +#: lib/layouts/braille.module:36 +#: lib/layouts/braille.module:59 msgid "Braille:" msgstr "Braille :" @@ -10910,14 +11736,8 @@ msgid "Custom Header/Footerlines" msgstr "Personnalisation en-têtes/pieds de page" #: lib/layouts/customHeadersFooters.module:7 -msgid "" -"Adds environments to define header and footer lines. NOTE: To use this " -"module you must set the 'Headings style' in the menu Document Settings -> " -"Page Layout to 'fancy'!" -msgstr "" -"Ajoute des environnements pour définir les en-têtes et pieds de page. NOTA : " -"pour utiliser ce module, vous devez choisir le style d'en-têtes « " -"sophistiqué » dans le menu Documents -> Paramètres -> Format de la page !" +msgid "Adds environments to define header and footer lines. NOTE: To use this module you must set the 'Headings style' in the menu Document Settings -> Page Layout to 'fancy'!" +msgstr "Ajoute des environnements pour définir les en-têtes et pieds de page. NOTA : pour utiliser ce module, vous devez choisir le style d'en-têtes « sophistiqué » dans le menu Documents -> Paramètres -> Format de la page !" #: lib/layouts/customHeadersFooters.module:12 msgid "Header/Footer" @@ -10947,18 +11767,14 @@ msgstr "Pied central" msgid "Center Footer:" msgstr "Pied central :" -#: lib/layouts/endnotes.module:2 lib/layouts/endnotes.module:9 +#: lib/layouts/endnotes.module:2 +#: lib/layouts/endnotes.module:9 msgid "Endnote" msgstr "Notes en fin de document" #: lib/layouts/endnotes.module:6 -msgid "" -"Adds an endnote inset, in addition to footnotes. You will need to add " -"\\theendnotes in TeX-code where you want the endnotes to appear." -msgstr "" -"Ajouter un insert de groupement de notes. Vous devrez ajouter \\theendnotes " -"en code TeX à l'endroit où vous souhaitez voir apparaître les notes " -"regroupées." +msgid "Adds an endnote inset, in addition to footnotes. You will need to add \\theendnotes in TeX-code where you want the endnotes to appear." +msgstr "Ajouter un insert de groupement de notes. Vous devrez ajouter \\theendnotes en code TeX à l'endroit où vous souhaitez voir apparaître les notes regroupées." #: lib/layouts/endnotes.module:18 msgid "endnote" @@ -10969,13 +11785,8 @@ msgid "Customisable Lists (enumitem)" msgstr "Liste personnalisable (enumitem)" #: lib/layouts/enumitem.module:6 -msgid "" -"Controls the layout of enumerate, itemize, description, and list/labeling. " -"See section Customized Lists of the User's Guide for a detailed description." -msgstr "" -"Règle la disposition des listes à puces, énumérations, descriptions, et des " -"listes étiquetées. Voir la section Listes personnalisées du Guide de " -"l'utilisateur pour les détails." +msgid "Controls the layout of enumerate, itemize, description, and list/labeling. See section Customized Lists of the User's Guide for a detailed description." +msgstr "Règle la disposition des listes à puces, énumérations, descriptions, et des listes étiquetées. Voir la section Listes personnalisées du Guide de l'utilisateur pour les détails." #: lib/layouts/enumitem.module:93 msgid "Enumerate-Resume" @@ -10986,12 +11797,8 @@ msgid "Number Equations by Section" msgstr "Numéroter les équations par section" #: lib/layouts/eqs-within-sections.module:6 -msgid "" -"Resets the equation number at section start and prepends the section number " -"to the equation number, as in '(2.1)'." -msgstr "" -"Réinitialiser la numérotation des équations au début de chaque section et " -"ajouter le numéro de section au numéro d'équation, comme dans « (2.1) »." +msgid "Resets the equation number at section start and prepends the section number to the equation number, as in '(2.1)'." +msgstr "Réinitialiser la numérotation des équations au début de chaque section et ajouter le numéro de section au numéro d'équation, comme dans « (2.1) »." #: lib/layouts/eqs-within-sections.module:17 msgid "\\thesection.\\arabic{equation}" @@ -11002,155 +11809,101 @@ msgid "Number Figures by Section" msgstr "Numéroter les figures par section" #: lib/layouts/figs-within-sections.module:6 -msgid "" -"Resets the figure number at section start and prepends the section number to " -"the figure number, as in 'fig. 2.1'." -msgstr "" -"Réinitialiser la numérotation des figures au début de chaque section et " -"ajouter le numéro de section au numéro de figure, comme dans « fig. 2.1 »." +msgid "Resets the figure number at section start and prepends the section number to the figure number, as in 'fig. 2.1'." +msgstr "Réinitialiser la numérotation des figures au début de chaque section et ajouter le numéro de section au numéro de figure, comme dans « fig. 2.1 »." #: lib/layouts/fix-cm.module:2 msgid "Fix cm" msgstr "fix-cm" #: lib/layouts/fix-cm.module:8 -msgid "" -"Fix-cm improves the appearance of Computer Modern fonts and makes them " -"available with arbitrary sizes. For details see the documentation of the fix-" -"cm.sty package: http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" -msgstr "" -"fix-c améliore l'apparence des polices Computer Modern et les rend " -"disponibles dans toutes les tailles. Pour les détails voir la documentation " -"du paquetage fix-cm : http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" +msgid "Fix-cm improves the appearance of Computer Modern fonts and makes them available with arbitrary sizes. For details see the documentation of the fix-cm.sty package: http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" +msgstr "fix-c améliore l'apparence des polices Computer Modern et les rend disponibles dans toutes les tailles. Pour les détails voir la documentation du paquetage fix-cm : http://tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf" #: lib/layouts/fixltx2e.module:2 msgid "Fix LaTeX" msgstr "Correction LaTeX" #: lib/layouts/fixltx2e.module:9 -msgid "" -"Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX. " -"Those fixes are not part of the LaTeX kernel because of backward " -"compatibility. If you use this module your typeset document may look " -"different when you process it with future LaTeX versions, because fixltx2e " -"may provide more bugfixes in future versions." -msgstr "" -"Charge le paquetage LaTeX fixltx2e qui contient quelques corrections " -"d'erreurs LaTeX. Ces corrections ne figure pas dans le noyau LaTeX pour des " -"raisons de rétro-compatibilité. Si vous utilisez ce module, votre document " -"imprimé pourra se présenter différemment avec de futures versions de LaTeX, " -"parce que fixltx2e pourra proposer de nouvelles corrections dans le futur." +msgid "Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX. Those fixes are not part of the LaTeX kernel because of backward compatibility. If you use this module your typeset document may look different when you process it with future LaTeX versions, because fixltx2e may provide more bugfixes in future versions." +msgstr "Charge le paquetage LaTeX fixltx2e qui contient quelques corrections d'erreurs LaTeX. Ces corrections ne figure pas dans le noyau LaTeX pour des raisons de rétro-compatibilité. Si vous utilisez ce module, votre document imprimé pourra se présenter différemment avec de futures versions de LaTeX, parce que fixltx2e pourra proposer de nouvelles corrections dans le futur." #: lib/layouts/foottoend.module:2 msgid "Foot to End" msgstr "Note de bas de page en fin de document" #: lib/layouts/foottoend.module:6 -msgid "" -"Sets all footnotes as endnotes. You will need to add \\theendnotes in TeX-" -"code where you want the endnotes to appear." -msgstr "" -"Positionner toutes les notes de bas de pages en notes regroupées. Vous " -"devrez ajouter \\theendnotes en code TeX à l'endroit où vous souhaitez voir " -"apparaître les notes regroupées." +msgid "Sets all footnotes as endnotes. You will need to add \\theendnotes in TeX-code where you want the endnotes to appear." +msgstr "Positionner toutes les notes de bas de pages en notes regroupées. Vous devrez ajouter \\theendnotes en code TeX à l'endroit où vous souhaitez voir apparaître les notes regroupées." -#: lib/layouts/hanging.module:2 lib/layouts/hanging.module:16 +#: lib/layouts/hanging.module:2 +#: lib/layouts/hanging.module:16 msgid "Hanging" msgstr "Renfoncement" #: lib/layouts/hanging.module:6 -msgid "" -"Adds an environment for hanging paragraphs. Hanging paragraph is a paragraph " -"in which the first line is set to the left margin, but all subsequent lines " -"are indented." -msgstr "" -"Ajouter un environnement pour les paragraphes avec renfoncement. Un " -"paragraphe avec renfoncement est un paragraphe dans lequel la première ligne " -"est au fer à gauche, alors que les autres lignes présentent un retrait." +msgid "Adds an environment for hanging paragraphs. Hanging paragraph is a paragraph in which the first line is set to the left margin, but all subsequent lines are indented." +msgstr "Ajouter un environnement pour les paragraphes avec renfoncement. Un paragraphe avec renfoncement est un paragraphe dans lequel la première ligne est au fer à gauche, alors que les autres lignes présentent un retrait." #: lib/layouts/initials.module:2 msgid "Initials" msgstr "Lettrines" #: lib/layouts/initials.module:6 -msgid "" -"Define a style for paragraphs with an initial. See the EmbeddedObjects " -"manual for a detailed description." -msgstr "" -"Définir un style pour un paragraphe avec une lettrine. Voir le manuel des " -"Objets insérés pour les détails." +msgid "Define a style for paragraphs with an initial. See the EmbeddedObjects manual for a detailed description." +msgstr "Définir un style pour un paragraphe avec une lettrine. Voir le manuel des Objets insérés pour les détails." -#: lib/layouts/initials.module:14 lib/layouts/initials.module:16 -#: lib/layouts/initials.module:25 lib/layouts/initials.module:31 +#: lib/layouts/initials.module:14 +#: lib/layouts/initials.module:16 +#: lib/layouts/initials.module:25 +#: lib/layouts/initials.module:31 msgid "Initial" msgstr "Lettrine" -#: lib/layouts/jurabib.module:2 -#, fuzzy -msgid "Jurabib" -msgstr "&Jurabib" - -#: lib/layouts/jurabib.module:51 -#, fuzzy -msgid "bibliography entry" -msgstr "Entrée bibliographique" - -#: lib/layouts/jurabib.module:52 -#, fuzzy -msgid "Bibliography entry." -msgstr "Entrée bibliographique" - -#: lib/layouts/jurabib.module:53 -msgid "before" -msgstr "avant" - -#: lib/layouts/jurabib.module:54 -#, fuzzy -msgid "short title" -msgstr "Titre Court :" - -#: lib/layouts/knitr.module:2 lib/configure.py:536 +#: lib/layouts/knitr.module:2 +#: lib/configure.py:592 msgid "Rnw (knitr)" msgstr "Rnw (knitr)" #: lib/layouts/knitr.module:6 -msgid "" -"Uses the knitr package in R for dynamic report generation. This R package " -"has to be installed for this module to work: install.packages('knitr'). Note " -"it depends on R >= 2.14.1. For more info see http://yihui.github.com/knitr" -msgstr "" -"Utiliser le paquetage R « knitr » pour la création dynamique de rapports. Ce " -"paquetage R doit être installé pour que ce module fonctionne, via install." -"packages('knitr'). Nota: la version de R doit être supérieure à 2.14.1. Pour " -"les détails voir http://yihui.github.com/knitr" +msgid "Uses the knitr package in R for dynamic report generation. This R package has to be installed for this module to work: install.packages('knitr'). Note it depends on R >= 2.14.1. For more info see http://yihui.name/knitr" +msgstr "Utilise le paquetage « knitr » de R pour la création dynamique de rapports. Ce paquetage R doit être installé pour que ce module fonctionne, via install.packages('knitr'). Nota: la version de R doit être supérieure ou égale à 2.14.1. Pour les détails, voir http://yihui.name/knitr" -#: lib/layouts/knitr.module:6 lib/layouts/noweb.module:5 +#: lib/layouts/knitr.module:6 +#: lib/layouts/noweb.module:5 #: lib/layouts/sweave.module:6 msgid "literate" msgstr "littéraire" -#: lib/layouts/knitr.module:13 lib/layouts/sweave.module:23 +#: lib/layouts/knitr.module:13 +#: lib/layouts/sweave.module:23 msgid "Chunk" msgstr "Bloc" -#: lib/layouts/knitr.module:14 lib/layouts/sweave.module:2 -#: lib/layouts/sweave.module:24 lib/configure.py:534 +#: lib/layouts/knitr.module:14 +#: lib/layouts/sweave.module:2 +#: lib/layouts/sweave.module:24 +#: lib/configure.py:590 msgid "Sweave" msgstr "Sweave" -#: lib/layouts/knitr.module:39 lib/layouts/sweave.module:49 +#: lib/layouts/knitr.module:39 +#: lib/layouts/sweave.module:49 msgid "Sweave Options" msgstr "Options Sweave" -#: lib/layouts/knitr.module:40 lib/layouts/sweave.module:50 +#: lib/layouts/knitr.module:40 +#: lib/layouts/sweave.module:50 msgid "Sweave opts" msgstr "Sweave opts" -#: lib/layouts/knitr.module:61 lib/layouts/sweave.module:71 +#: lib/layouts/knitr.module:61 +#: lib/layouts/sweave.module:71 msgid "S/R expression" msgstr "S/R expression" -#: lib/layouts/knitr.module:62 lib/layouts/sweave.module:72 +#: lib/layouts/knitr.module:62 +#: lib/layouts/sweave.module:72 msgid "S/R expr" msgstr "S/R expr" @@ -11159,15 +11912,11 @@ msgid "LilyPond Book" msgstr "Livre LilyPond" #: lib/layouts/lilypond.module:6 -msgid "" -"This module adds an inset to enter LilyPond code directly into LyX. It will " -"be processed in the output. See the lilypond.lyx example file." -msgstr "" -"Ce module ajoute un insert pour la saisie directe du code LilyPond dans LyX. " -"Ce code sera traité dans le résultat imprimable. Voir le fichier d'exemple " -"lilypond.lyx." +msgid "This module adds an inset to enter LilyPond code directly into LyX. It will be processed in the output. See the lilypond.lyx example file." +msgstr "Ce module ajoute un insert pour la saisie directe du code LilyPond dans LyX. Ce code sera traité dans le résultat imprimable. Voir le fichier d'exemple lilypond.lyx." -#: lib/layouts/lilypond.module:13 lib/layouts/lilypond.module:14 +#: lib/layouts/lilypond.module:13 +#: lib/layouts/lilypond.module:14 #: lib/external_templates:251 msgid "LilyPond" msgstr "LilyPond" @@ -11177,14 +11926,8 @@ msgid "Linguistics" msgstr "Linguistique" #: lib/layouts/linguistics.module:7 -msgid "" -"Defines some special environments useful for linguistics (numbered examples, " -"glosses, semantic markup, tableau floats). See linguistics.lyx file in " -"examples." -msgstr "" -"Définir certains environnements spéciaux utiles pour la linguistique " -"(exemples numérotés, glosses, balisage sémantique, tableaux flottants). Voir " -"le fichier linguistics.lyx dans les exemples." +msgid "Defines some special environments useful for linguistics (numbered examples, glosses, semantic markup, tableau floats). See linguistics.lyx file in examples." +msgstr "Définir certains environnements spéciaux utiles pour la linguistique (exemples numérotés, glosses, balisage sémantique, tableaux flottants). Voir le fichier linguistics.lyx dans les exemples." #: lib/layouts/linguistics.module:13 msgid "Numbered Example (multiline)" @@ -11210,11 +11953,13 @@ msgstr "Sous-exemple" msgid "Subexample:" msgstr "Sous-exemple :" -#: lib/layouts/linguistics.module:65 lib/layouts/linguistics.module:67 +#: lib/layouts/linguistics.module:65 +#: lib/layouts/linguistics.module:67 msgid "Glosse" msgstr "Glose" -#: lib/layouts/linguistics.module:94 lib/layouts/linguistics.module:96 +#: lib/layouts/linguistics.module:94 +#: lib/layouts/linguistics.module:96 msgid "Tri-Glosse" msgstr "Tri-glose" @@ -11255,18 +12000,15 @@ msgid "Logical Markup" msgstr "Balisage logique" #: lib/layouts/logicalmkup.module:5 -msgid "" -"Defines some character styles for logical markup: noun, emph, strong, and " -"code." -msgstr "" -"Définition de quelques styles de caractères pour le balisage logique: nom, " -"emphase, force, et code." +msgid "Defines some character styles for logical markup: noun, emph, strong, and code." +msgstr "Définition de quelques styles de caractères pour le balisage logique: nom, emphase, force, et code." #: lib/layouts/logicalmkup.module:5 msgid "charstyles" msgstr "styles de caractères" -#: lib/layouts/logicalmkup.module:11 src/frontends/qt4/GuiCharacter.cpp:82 +#: lib/layouts/logicalmkup.module:11 +#: src/frontends/qt4/GuiCharacter.cpp:82 msgid "Noun" msgstr "Nom propre" @@ -11299,40 +12041,6 @@ msgstr "Minimaliste" msgid "Redefines several insets (Index, Branch, URL) as being Minimalistic." msgstr "Redéfinir plusieurs inserts (index, branche, URL) comme minimalistes." -#: lib/layouts/multicol.module:2 -#, fuzzy -msgid "Multiple Columns" -msgstr "&Multi-colonnes" - -#: lib/layouts/multicol.module:7 -msgid "" -"Adds 2 styles to begin and end text in multiple columns. The begin style " -"contains the number of columns, the end style must be kept empty. See the " -"Additional manual for a detailed description of multiple columns." -msgstr "" - -#: lib/layouts/multicol.module:11 -msgid "Begin Multiple Columns" -msgstr "" - -#: lib/layouts/multicol.module:18 -msgid "---Begin Multiple Columns---" -msgstr "" - -#: lib/layouts/multicol.module:37 -#, fuzzy -msgid "End Multiple Columns" -msgstr "&Multi-colonnes" - -#: lib/layouts/multicol.module:40 -msgid "---End Multiple Columns---" -msgstr "" - -#: lib/layouts/natbib.module:2 -#, fuzzy -msgid "Natbib" -msgstr "&Natbib" - #: lib/layouts/noweb.module:2 msgid "Noweb" msgstr "NoWeb" @@ -11341,44 +12049,12 @@ msgstr "NoWeb" msgid "Allows to use Noweb as a literate programming tool." msgstr "Autoriser l'usage de Noweb comme outil de programmation littéraire." -#: lib/layouts/rsphrase.module:2 -msgid "Risk and Safety Statements" -msgstr "" - -#: lib/layouts/rsphrase.module:7 -msgid "" -"Provides two insets and one environment to typeset numbers and phrases of " -"chemical risk and safety statements. For a description see the file R-S-" -"statements.lyx in LyX's examples folder." -msgstr "" - -#: lib/layouts/rsphrase.module:15 lib/layouts/rsphrase.module:19 -#, fuzzy -msgid "R-S number" -msgstr "Pas de numéro" - -#: lib/layouts/rsphrase.module:36 lib/layouts/rsphrase.module:39 -msgid "R-S phrase" -msgstr "" - -#: lib/layouts/rsphrase.module:42 -msgid "Safety phrase" -msgstr "" - -#: lib/layouts/rsphrase.module:59 -msgid "S phrase:" -msgstr "" - #: lib/layouts/sweave.module:6 -msgid "" -"Allows to use the statistical language S/R as a literate programming tool " -"via the Sweave() function. For more info see the LyX example file sweave.lyx." -msgstr "" -"Autoriser l'utilisation du langage statistique S/R pour la programmation " -"littéraire via la fonction Sweave(). Voir le fichier sweave.lyx dans les " -"exemples." +msgid "Allows to use the statistical language S/R as a literate programming tool via the Sweave() function. For more info see the LyX example file sweave.lyx." +msgstr "Autoriser l'utilisation du langage statistique S/R pour la programmation littéraire via la fonction Sweave(). Voir le fichier sweave.lyx dans les exemples." -#: lib/layouts/sweave.module:93 lib/layouts/sweave.module:94 +#: lib/layouts/sweave.module:93 +#: lib/layouts/sweave.module:94 msgid "Sweave Input File" msgstr "Fichier source Sweave" @@ -11387,60 +12063,24 @@ msgid "Number Tables by Section" msgstr "Numéroter les tableaux par section" #: lib/layouts/tabs-within-sections.module:6 -msgid "" -"Resets the table number at section start and prepends the section number to " -"the table number, as in 'Table 2.1'." -msgstr "" -"Réinitialiser la numérotation des tableaux au début de chaque section et " -"ajouter le numéro de section au numéro de tableau, comme dans « Tableau 2.1 " -"»." +msgid "Resets the table number at section start and prepends the section number to the table number, as in 'Table 2.1'." +msgstr "Réinitialiser la numérotation des tableaux au début de chaque section et ajouter le numéro de section au numéro de tableau, comme dans « Tableau 2.1 »." #: lib/layouts/theorems-ams-bytype.module:2 msgid "Theorems (AMS, Numbered by Type)" msgstr "Théorèmes (AMS, numérotation par type)" #: lib/layouts/theorems-ams-bytype.module:11 -msgid "" -"Defines theorem environments and the proof environment using the extended " -"AMS machinery. Both numbered and unnumbered types are provided. Contrary to " -"the plain AMS Theorem module, the different theorem types provided here each " -"have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, " -"theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, " -"proposition 4, ...). The numbering's scope is the whole document. For " -"chapter- and section-wide numbering, use one of the 'within " -"Sections'/'within Chapters' modules, respectively." -msgstr "" -"Définir les environnements « preuve » et « théorème » en utilisant le " -"mécanisme AMS étendu. Les deux types numéroté et non numéroté sont " -"disponibles. Au contraire du module Théorème AMS ordinaire, les différents " -"types de théorème disponibles ont un compteur séparé (e.g. théorème 1, " -"théorème 2, lemme 1, proposition 1, théorème 3, lemme 2, ..., et non pas " -"théorème 1, théorème 2, lemme 3, proposition 4, ...). La numérotation porte " -"sur le document entier. Pour les numérotation par chapitre ou par section, " -"utiliser l'un des modules « numérotation par sections » ou « numérotation " -"par chapitres », respectivement." +msgid "Defines theorem environments and the proof environment using the extended AMS machinery. Both numbered and unnumbered types are provided. Contrary to the plain AMS Theorem module, the different theorem types provided here each have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, proposition 4, ...). The numbering's scope is the whole document. For chapter- and section-wide numbering, use one of the 'within Sections'/'within Chapters' modules, respectively." +msgstr "Définir les environnements « preuve » et « théorème » en utilisant le mécanisme AMS étendu. Les deux types numéroté et non numéroté sont disponibles. Au contraire du module Théorème AMS ordinaire, les différents types de théorème disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, lemme 3, proposition 4, ...). La numérotation porte sur le document entier. Pour les numérotation par chapitre ou par section, utiliser l'un des modules « numérotation par sections » ou « numérotation par chapitres », respectivement." #: lib/layouts/theorems-ams-extended-bytype.module:2 msgid "Theorems (AMS-Extended, Numbered by Type)" msgstr "Théorèmes (AMS étendu, numérotation par type)" #: lib/layouts/theorems-ams-extended-bytype.module:12 -msgid "" -"Defines some additional theorem environments for use with the AMS theorems " -"packages. Includes Criterion, Algorithm, Axiom, Condition, Note, Notation, " -"Summary, Acknowledgement, Conclusion, Assumption, and Case, in both numbered " -"and non-numbered forms. Contrary to the plain AMS-Extended module, the " -"different theorem types provided here each have a separate counter (e.g., " -"criterion 1, criterion 2, axiom 1, assumption 1, criterion 3, ..., as " -"opposed to criterion 1, criterion 2, axiom 3, assumption 4, ...)." -msgstr "" -"Définir certains environnements additionnels de théorèmes pour l'usage des " -"paquetages de théorèmes AMS. Inclut Critère, Algorithme, Axiome, Condition, " -"Note, Notation, Résumé, Remerciements, Conclusion, Hypothèse et Cas, " -"numérotés ou non numérotés. Au contraire du module AMS étendu ordinaire, les " -"différents types de théorème disponibles ont un compteur séparé (e.g. " -"critère 1, critère 2, axiome 1, hypothèse 1, critère 3, ..., et non pas " -"critère 1, critère 2, axiome 3, hypothèse 4, ...)." +msgid "Defines some additional theorem environments for use with the AMS theorems packages. Includes Criterion, Algorithm, Axiom, Condition, Note, Notation, Summary, Acknowledgement, Conclusion, Assumption, and Case, in both numbered and non-numbered forms. Contrary to the plain AMS-Extended module, the different theorem types provided here each have a separate counter (e.g., criterion 1, criterion 2, axiom 1, assumption 1, criterion 3, ..., as opposed to criterion 1, criterion 2, axiom 3, assumption 4, ...)." +msgstr "Définir certains environnements additionnels de théorèmes pour l'usage des paquetages de théorèmes AMS. Inclut Critère, Algorithme, Axiome, Condition, Note, Notation, Résumé, Remerciements, Conclusion, Hypothèse et Cas, numérotés ou non numérotés. Au contraire du module AMS étendu ordinaire, les différents types de théorème disponibles ont un compteur séparé (e.g. critère 1, critère 2, axiome 1, hypothèse 1, critère 3, ..., et non pas critère 1, critère 2, axiome 3, hypothèse 4, ...)." #: lib/layouts/theorems-ams-extended-bytype.module:63 msgid "Criterion \\thecriterion." @@ -11586,20 +12226,14 @@ msgid "Theorems (AMS-Extended)" msgstr "Théorèmes (extensions AMS)" #: lib/layouts/theorems-ams-extended.module:9 -msgid "" -"Defines some additional theorem environments for use with the AMS theorems " -"packages. Includes Criterion, Algorithm, Axiom, Condition, Note, Notation, " -"Summary, Acknowledgement, Conclusion, Fact, Assumption, Case, and Question, " -"in both numbered and non-numbered forms." -msgstr "" -"Définir certains environnements additionnels de théorèmes pour l'usage des " -"paquetages de théorèmes AMS. Inclut Critère, Algorithme, Axiome, Condition, " -"Note, Notation, Résumé, Remerciements, Conclusion, Fait, Hypothèse, Cas et " -"Question, numérotés ou non numérotés." +msgid "Defines some additional theorem environments for use with the AMS theorems packages. Includes Criterion, Algorithm, Axiom, Condition, Note, Notation, Summary, Acknowledgement, Conclusion, Fact, Assumption, Case, and Question, in both numbered and non-numbered forms." +msgstr "Définir certains environnements additionnels de théorèmes pour l'usage des paquetages de théorèmes AMS. Inclut Critère, Algorithme, Axiome, Condition, Note, Notation, Résumé, Remerciements, Conclusion, Fait, Hypothèse, Cas et Question, numérotés ou non numérotés." #: lib/layouts/theorems-ams-extended.module:10 -#: lib/layouts/theorems-ams.module:9 lib/layouts/theorems-chap.module:9 -#: lib/layouts/theorems-sec.module:8 lib/layouts/theorems-starred.module:7 +#: lib/layouts/theorems-ams.module:9 +#: lib/layouts/theorems-chap.module:9 +#: lib/layouts/theorems-sec.module:8 +#: lib/layouts/theorems-starred.module:7 #: lib/layouts/theorems-std.module:8 msgid "theorems" msgstr "théorèmes" @@ -11661,85 +12295,40 @@ msgid "Theorems (AMS)" msgstr "Théorèmes (AMS)" #: lib/layouts/theorems-ams.module:8 -msgid "" -"Defines theorem environments and the proof environment using the extended " -"AMS machinery. Both numbered and unnumbered types are provided. By default, " -"the theorems are numbered consecutively throughout the document. This can be " -"changed by loading one of the 'Theorems (Numbered by ...)' modules." -msgstr "" -"Définir les environnements « théorème » et « preuve » à l'aide du mécanisme " -"AMS étendu. Les types numéroté et non-numéroté sont tous deux disponibles. " -"Implicitement, les théorèmes sont numérotés consécutivement dans tout le " -"document. Ceci peut être modifié en chargeant un des modules « Théorèmes " -"(numérotation par ...) »." +msgid "Defines theorem environments and the proof environment using the extended AMS machinery. Both numbered and unnumbered types are provided. By default, the theorems are numbered consecutively throughout the document. This can be changed by loading one of the 'Theorems (Numbered by ...)' modules." +msgstr "Définir les environnements « théorème » et « preuve » à l'aide du mécanisme AMS étendu. Les types numéroté et non-numéroté sont tous deux disponibles. Implicitement, les théorèmes sont numérotés consécutivement dans tout le document. Ceci peut être modifié en chargeant un des modules « Théorèmes (numérotation par ...) »." #: lib/layouts/theorems-bytype.module:2 msgid "Theorems (Numbered by Type)" msgstr "Théorèmes (numérotation par type)" #: lib/layouts/theorems-bytype.module:10 -msgid "" -"Defines some theorem environments for use with non-AMS classes. Contrary to " -"the plain Theorem module, the different theorem types provided here each " -"have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, " -"theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, " -"proposition 4, ...). The numbering's scope is the whole document. For " -"chapter- and section-wide numbering, use one of the 'within " -"Sections'/'within Chapters' modules, respectively." -msgstr "" -"Définir quelques environnements « théorème » pour les classes non- AMS. Au " -"contraire du module Théorème ordinaire, les différents types de théorème " -"disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, " -"proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, " -"lemme 3, proposition 4, ...). La numérotation porte sur le document entier. " -"Pour les numérotation par chapitre ou par section, utiliser l'un des modules " -"« numérotation par sections » ou « numérotation par chapitres », " -"respectivement." +msgid "Defines some theorem environments for use with non-AMS classes. Contrary to the plain Theorem module, the different theorem types provided here each have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, proposition 4, ...). The numbering's scope is the whole document. For chapter- and section-wide numbering, use one of the 'within Sections'/'within Chapters' modules, respectively." +msgstr "Définir quelques environnements « théorème » pour les classes non- AMS. Au contraire du module Théorème ordinaire, les différents types de théorème disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, lemme 3, proposition 4, ...). La numérotation porte sur le document entier. Pour les numérotation par chapitre ou par section, utiliser l'un des modules « numérotation par sections » ou « numérotation par chapitres », respectivement." #: lib/layouts/theorems-chap-bytype.module:2 msgid "Theorems (Numbered by Type within Chapters)" msgstr "Théorèmes (numérotation par type et par chapitre)" #: lib/layouts/theorems-chap-bytype.module:9 -msgid "" -"Defines some theorem environments for use with non-AMS classes. Contrary to " -"the plain Theorem module, the different theorem types provided here each " -"have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, " -"theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, " -"proposition 4, ...). The numbering is reset at each chapter start." -msgstr "" -"Définir quelques environnements « théorème » pour les classes non- AMS. Au " -"contraire du module Théorème ordinaire, les différents types de théorème " -"disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, " -"proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, " -"lemme 3, proposition 4, ...). La numérotation redémarre à chaque début de " -"chapitre." +msgid "Defines some theorem environments for use with non-AMS classes. Contrary to the plain Theorem module, the different theorem types provided here each have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, proposition 4, ...). The numbering is reset at each chapter start." +msgstr "Définir quelques environnements « théorème » pour les classes non- AMS. Au contraire du module Théorème ordinaire, les différents types de théorème disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, lemme 3, proposition 4, ...). La numérotation redémarre à chaque début de chapitre." #: lib/layouts/theorems-chap.module:2 msgid "Theorems (Numbered by Chapter)" msgstr "Théorèmes (numérotation par chapitre)" #: lib/layouts/theorems-chap.module:7 -msgid "" -"Numbers theorems and the like by chapter (i.e., the counter is reset at each " -"chapter start). Use this module only with document classes that provide a " -"chapter environment." -msgstr "" -"Numéroter les théorèmes et similaires par chapitre (i. e., le compteur est " -"redémarré à chaque début de chapitre). N'utiliser ce module qu'avec des " -"classes de document fournissant une environnement de chapitre." +msgid "Numbers theorems and the like by chapter (i.e., the counter is reset at each chapter start). Use this module only with document classes that provide a chapter environment." +msgstr "Numéroter les théorèmes et similaires par chapitre (i. e., le compteur est redémarré à chaque début de chapitre). N'utiliser ce module qu'avec des classes de document fournissant une environnement de chapitre." #: lib/layouts/theorems-named.module:3 msgid "Named Theorems" msgstr "Théorèmes nommés" #: lib/layouts/theorems-named.module:7 -msgid "" -"Facilitates the use of named theorems. The name of the theorem goes into the " -"'Short Title' inset." -msgstr "" -"Facilite l'utilisation des théorèmes explicitement nommés. Le nom explicite " -"est saisi dans l'insert « Titre court »." +msgid "Facilitates the use of named theorems. The name of the theorem goes into the 'Short Title' inset." +msgstr "Facilite l'utilisation des théorèmes explicitement nommés. Le nom explicite est saisi dans l'insert « Titre court »." #: lib/layouts/theorems-named.module:11 msgid "Named Theorem" @@ -11754,57 +12343,35 @@ msgid "Theorems (Numbered by Type within Sections)" msgstr "Théorèmes (numérotation par type et par section)" #: lib/layouts/theorems-sec-bytype.module:9 -msgid "" -"Defines some theorem environments for use with non-AMS classes. Contrary to " -"the plain Theorem module, the different theorem types provided here each " -"have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, " -"theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, " -"proposition 4, ...). The numbering is reset at each section start." -msgstr "" -"Définir quelques environnements « théorème » pour les classes non- AMS. Au " -"contraire du module Théorème ordinaire, les différents types de théorème " -"disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, " -"proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, " -"lemme 3, proposition 4, ...). La numérotation redémarre à chaque début de " -"section." +msgid "Defines some theorem environments for use with non-AMS classes. Contrary to the plain Theorem module, the different theorem types provided here each have a separate counter (e.g., theorem 1, theorem 2, lemma 1, proposition 1, theorem 3, lemma 2, ..., as opposed to theorem 1, theorem 2, lemma 3, proposition 4, ...). The numbering is reset at each section start." +msgstr "Définir quelques environnements « théorème » pour les classes non- AMS. Au contraire du module Théorème ordinaire, les différents types de théorème disponibles ont un compteur séparé (e.g. théorème 1, théorème 2, lemme 1, proposition 1, théorème 3, lemme 2, ..., et non pas théorème 1, théorème 2, lemme 3, proposition 4, ...). La numérotation redémarre à chaque début de section." #: lib/layouts/theorems-sec.module:2 msgid "Theorems (Numbered by Section)" msgstr "Théorèmes (numérotation par section)" #: lib/layouts/theorems-sec.module:6 -msgid "" -"Numbers theorems and the like by section (i.e., the counter is reset at each " -"section start)." -msgstr "" -"Numéroter les théorèmes et similaires par chapitre (i. e., le compteur est " -"redémarré à chaque début de chapitre)." +msgid "Numbers theorems and the like by section (i.e., the counter is reset at each section start)." +msgstr "Numéroter les théorèmes et similaires par chapitre (i. e., le compteur est redémarré à chaque début de chapitre)." #: lib/layouts/theorems-starred.module:2 msgid "Theorems (Unnumbered)" msgstr "Théorèmes (non numérotés)" #: lib/layouts/theorems-starred.module:6 -msgid "" -"Defines only unnumbered theorem environments, and the proof environment, " -"using the extended AMS machinery." -msgstr "" -"Définir seulement des environnements de théorème non numérotés, et " -"l'environnement de preuve, via le mécanisme AMS étendu." +msgid "Defines only unnumbered theorem environments, and the proof environment, using the extended AMS machinery." +msgstr "Définir seulement des environnements de théorème non numérotés, et l'environnement de preuve, via le mécanisme AMS étendu." #: lib/layouts/theorems-std.module:7 -msgid "" -"Defines some theorem environments for use with non-AMS classes. By default, " -"the theorems are numbered consecutively throughout the document. This can be " -"changed by loading one of the 'Theorems (Numbered by ...)' modules." -msgstr "" -"Définir certains environnements de théorème utilisables avec des classes non-" -"AMS. Implicitement, les théorèmes sont numérotés consécutivement dans tout " -"le document. Ceci peut être modifié en chargeant un des modules « Théorèmes " -"(numérotation par ...) »." +msgid "Defines some theorem environments for use with non-AMS classes. By default, the theorems are numbered consecutively throughout the document. This can be changed by loading one of the 'Theorems (Numbered by ...)' modules." +msgstr "Définir certains environnements de théorème utilisables avec des classes non-AMS. Implicitement, les théorèmes sont numérotés consécutivement dans tout le document. Ceci peut être modifié en chargeant un des modules « Théorèmes (numérotation par ...) »." -#: lib/languages:61 src/Font.cpp:61 src/Font.cpp:64 src/Font.cpp:68 -#: src/Font.cpp:73 src/Font.cpp:76 +#: lib/languages:61 +#: src/Font.cpp:61 +#: src/Font.cpp:64 +#: src/Font.cpp:68 +#: src/Font.cpp:73 +#: src/Font.cpp:76 msgid "Ignore" msgstr "Ignorer" @@ -11828,141 +12395,140 @@ msgstr "Arabe (ArabTeX)" msgid "Arabic (Arabi)" msgstr "Arabe" -#: lib/languages:131 src/frontends/qt4/GuiSymbols.cpp:63 +#: lib/languages:132 +#: src/frontends/qt4/GuiSymbols.cpp:63 msgid "Armenian" msgstr "Arménien" -#: lib/languages:138 -#, fuzzy -msgid "English (Australia)" -msgstr "Anglais (États-Unis d'Amérique)" - -#: lib/languages:147 +#: lib/languages:139 msgid "German (Austria, old spelling)" msgstr "Allemand (Autriche, ancienne orthographe)" -#: lib/languages:154 +#: lib/languages:146 msgid "German (Austria)" msgstr "Allemand (Autriche)" -#: lib/languages:161 +#: lib/languages:153 msgid "Indonesian" msgstr "Indonesien" -#: lib/languages:169 +#: lib/languages:161 msgid "Malay" msgstr "Malais" -#: lib/languages:177 +#: lib/languages:169 msgid "Basque" msgstr "Basque" -#: lib/languages:185 +#: lib/languages:180 msgid "Belarusian" msgstr "Biélorusse" -#: lib/languages:192 +#: lib/languages:187 msgid "Portuguese (Brazil)" msgstr "Portugais (Brésil)" -#: lib/languages:200 +#: lib/languages:195 msgid "Breton" msgstr "Breton" -#: lib/languages:208 +#: lib/languages:203 msgid "English (UK)" msgstr "Anglais (Royaume Uni)" -#: lib/languages:217 +#: lib/languages:212 msgid "Bulgarian" msgstr "Bulgare" -#: lib/languages:226 +#: lib/languages:221 msgid "English (Canada)" msgstr "Anglais (Canada)" -#: lib/languages:236 +#: lib/languages:231 msgid "French (Canada)" msgstr "Français (Canadien)" -#: lib/languages:245 +#: lib/languages:240 msgid "Catalan" msgstr "Catalan" -#: lib/languages:255 +#: lib/languages:250 msgid "Chinese (simplified)" msgstr "Chinois (simplifié)" -#: lib/languages:262 +#: lib/languages:257 msgid "Chinese (traditional)" msgstr "Chinois (traditionnel)" -#: lib/languages:275 +#: lib/languages:270 msgid "Croatian" msgstr "Croate" -#: lib/languages:283 +#: lib/languages:278 msgid "Czech" msgstr "Tchèque" -#: lib/languages:291 +#: lib/languages:286 msgid "Danish" msgstr "Danois" -#: lib/languages:306 +#: lib/languages:301 msgid "Dutch" msgstr "Néerlandais" -#: lib/languages:315 +#: lib/languages:310 msgid "English" msgstr "Anglais" -#: lib/languages:324 +#: lib/languages:320 msgid "Esperanto" msgstr "Espéranto" -#: lib/languages:332 +#: lib/languages:328 msgid "Estonian" msgstr "Estonien" -#: lib/languages:343 +#: lib/languages:341 msgid "Farsi" msgstr "Farsi" -#: lib/languages:356 +#: lib/languages:354 msgid "Finnish" msgstr "Finnois" -#: lib/languages:365 +#: lib/languages:363 msgid "French" msgstr "Français" -#: lib/languages:379 +#: lib/languages:377 msgid "Galician" msgstr "Galicien" -#: lib/languages:388 +#: lib/languages:389 msgid "German (old spelling)" msgstr "Allemand (ancienne orthographe)" -#: lib/languages:398 +#: lib/languages:399 msgid "German" msgstr "Allemand" -#: lib/languages:409 +#: lib/languages:410 msgid "German (Switzerland)" msgstr "Allemand (Suisse)" -#: lib/languages:418 lib/ui/stdtoolbars.inc:281 lib/ui/stdtoolbars.inc:536 +#: lib/languages:419 +#: lib/ui/stdtoolbars.inc:281 +#: lib/ui/stdtoolbars.inc:529 #: src/frontends/qt4/GuiSymbols.cpp:61 msgid "Greek" msgstr "Grec" -#: lib/languages:427 +#: lib/languages:428 msgid "Greek (polytonic)" msgstr "Grec (polytonique)" -#: lib/languages:437 src/frontends/qt4/GuiSymbols.cpp:64 +#: lib/languages:438 +#: src/frontends/qt4/GuiSymbols.cpp:64 msgid "Hebrew" msgstr "Hébreu" @@ -11970,27 +12536,27 @@ msgstr "Hébreu" msgid "Icelandic" msgstr "Islandais" -#: lib/languages:475 +#: lib/languages:476 msgid "Interlingua" msgstr "Interlingua" -#: lib/languages:483 +#: lib/languages:484 msgid "Irish" msgstr "Irlandais" -#: lib/languages:491 +#: lib/languages:492 msgid "Italian" msgstr "Italien" -#: lib/languages:502 +#: lib/languages:503 msgid "Japanese" msgstr "Japonnais" -#: lib/languages:511 +#: lib/languages:512 msgid "Japanese (CJK)" msgstr "Japonnais (CJK)" -#: lib/languages:517 +#: lib/languages:518 msgid "Kazakh" msgstr "Kazakh" @@ -12024,96 +12590,92 @@ msgid "Mongolian" msgstr "Mongol" #: lib/languages:610 -#, fuzzy -msgid "English (New Zealand)" -msgstr "Anglais (Canada)" - -#: lib/languages:619 msgid "Norwegian (Bokmaal)" msgstr "Norvégien (Bokmaal)" -#: lib/languages:627 +#: lib/languages:618 msgid "Norwegian (Nynorsk)" msgstr "Norvégien (Nynorsk)" -#: lib/languages:652 +#: lib/languages:643 msgid "Polish" msgstr "Polonais" -#: lib/languages:660 +#: lib/languages:651 msgid "Portuguese" msgstr "Portugais" -#: lib/languages:668 +#: lib/languages:659 msgid "Romanian" msgstr "Roumain" -#: lib/languages:676 +#: lib/languages:667 msgid "Russian" msgstr "Russe" -#: lib/languages:684 +#: lib/languages:675 msgid "North Sami" msgstr "Nord Sami" -#: lib/languages:700 +#: lib/languages:690 msgid "Scottish" msgstr "Écossais" -#: lib/languages:708 +#: lib/languages:698 msgid "Serbian" msgstr "Serbe" -#: lib/languages:716 +#: lib/languages:706 msgid "Serbian (Latin)" msgstr "Serbe (latin)" -#: lib/languages:725 +#: lib/languages:715 msgid "Slovak" msgstr "Slovaque" -#: lib/languages:733 +#: lib/languages:723 msgid "Slovene" msgstr "Slovène" -#: lib/languages:741 +#: lib/languages:731 msgid "Spanish" msgstr "Espagnol" -#: lib/languages:753 +#: lib/languages:743 msgid "Spanish (Mexico)" msgstr "Espagnol (Mexique)" -#: lib/languages:764 +#: lib/languages:754 msgid "Swedish" msgstr "Suédois" -#: lib/languages:793 src/frontends/qt4/GuiSymbols.cpp:75 +#: lib/languages:783 +#: src/frontends/qt4/GuiSymbols.cpp:75 msgid "Thai" msgstr "Thaï" -#: lib/languages:804 +#: lib/languages:794 msgid "Turkish" msgstr "Turc" -#: lib/languages:817 +#: lib/languages:807 msgid "Turkmen" msgstr "Turkmen" -#: lib/languages:826 +#: lib/languages:816 msgid "Ukrainian" msgstr "Ukrainien" # C'est un dialecte allemand -#: lib/languages:834 +#: lib/languages:824 msgid "Upper Sorbian" msgstr "Haut Sorabe" -#: lib/languages:852 +#: lib/languages:842 msgid "Vietnamese" msgstr "Vietnamien" -#: lib/languages:861 +#: lib/languages:851 msgid "Welsh" msgstr "Gallois" @@ -12309,71 +12871,95 @@ msgstr "Unicode (XeTeX) (utf8)" msgid "ASCII" msgstr "ASCII" -#: lib/ui/stdcontext.inc:30 lib/ui/stdmenus.inc:431 +#: lib/ui/stdcontext.inc:30 +#: lib/ui/stdmenus.inc:426 msgid "Array Environment|y" msgstr "Environnement tableau|b" -#: lib/ui/stdcontext.inc:31 lib/ui/stdmenus.inc:432 +#: lib/ui/stdcontext.inc:31 +#: lib/ui/stdmenus.inc:427 msgid "Cases Environment|C" msgstr "Environnement cas|c" -#: lib/ui/stdcontext.inc:32 lib/ui/stdmenus.inc:433 +#: lib/ui/stdcontext.inc:32 +#: lib/ui/stdmenus.inc:428 msgid "Aligned Environment|l" msgstr "Environnement Aligné|v" -#: lib/ui/stdcontext.inc:33 lib/ui/stdmenus.inc:434 +#: lib/ui/stdcontext.inc:33 +#: lib/ui/stdmenus.inc:429 msgid "AlignedAt Environment|v" msgstr "Environnement AlignéSur|é" -#: lib/ui/stdcontext.inc:34 lib/ui/stdmenus.inc:435 +#: lib/ui/stdcontext.inc:34 +#: lib/ui/stdmenus.inc:430 msgid "Gathered Environment|h" msgstr "Environnement Rassemblé|m" -#: lib/ui/stdcontext.inc:35 lib/ui/stdmenus.inc:436 +#: lib/ui/stdcontext.inc:35 +#: lib/ui/stdmenus.inc:431 msgid "Split Environment|S" msgstr "Environnement disjoint|j" -#: lib/ui/stdcontext.inc:37 lib/ui/stdmenus.inc:438 +#: lib/ui/stdcontext.inc:37 +#: lib/ui/stdmenus.inc:433 msgid "Delimiters...|r" msgstr "Délimiteurs...|r" -#: lib/ui/stdcontext.inc:38 lib/ui/stdmenus.inc:439 +#: lib/ui/stdcontext.inc:38 +#: lib/ui/stdmenus.inc:434 msgid "Matrix...|x" msgstr "Matrice...|t" -#: lib/ui/stdcontext.inc:39 lib/ui/stdmenus.inc:440 +#: lib/ui/stdcontext.inc:39 +#: lib/ui/stdmenus.inc:435 msgid "Macro|o" msgstr "Macro|o" -#: lib/ui/stdcontext.inc:43 lib/ui/stdmenus.inc:306 lib/ui/stdmenus.inc:424 +#: lib/ui/stdcontext.inc:43 +#: lib/ui/stdmenus.inc:302 +#: lib/ui/stdmenus.inc:419 msgid "AMS align Environment|a" msgstr "Environnement AMS align|S" -#: lib/ui/stdcontext.inc:44 lib/ui/stdmenus.inc:307 lib/ui/stdmenus.inc:425 +#: lib/ui/stdcontext.inc:44 +#: lib/ui/stdmenus.inc:303 +#: lib/ui/stdmenus.inc:420 msgid "AMS alignat Environment|t" msgstr "Environnement AMS alignat|i" -#: lib/ui/stdcontext.inc:45 lib/ui/stdmenus.inc:308 lib/ui/stdmenus.inc:426 +#: lib/ui/stdcontext.inc:45 +#: lib/ui/stdmenus.inc:304 +#: lib/ui/stdmenus.inc:421 msgid "AMS flalign Environment|f" msgstr "Environnement AMS flalign|f" -#: lib/ui/stdcontext.inc:46 lib/ui/stdmenus.inc:309 lib/ui/stdmenus.inc:427 +#: lib/ui/stdcontext.inc:46 +#: lib/ui/stdmenus.inc:305 +#: lib/ui/stdmenus.inc:422 msgid "AMS gather Environment|g" msgstr "Environnement AMS gather|g" -#: lib/ui/stdcontext.inc:47 lib/ui/stdmenus.inc:310 lib/ui/stdmenus.inc:428 +#: lib/ui/stdcontext.inc:47 +#: lib/ui/stdmenus.inc:306 +#: lib/ui/stdmenus.inc:423 msgid "AMS multline Environment|m" msgstr "Environnement AMS multline|u" -#: lib/ui/stdcontext.inc:51 lib/ui/stdmenus.inc:303 lib/ui/stdmenus.inc:420 +#: lib/ui/stdcontext.inc:51 +#: lib/ui/stdmenus.inc:299 +#: lib/ui/stdmenus.inc:415 msgid "Inline Formula|I" msgstr "Formule en ligne|l" -#: lib/ui/stdcontext.inc:52 lib/ui/stdmenus.inc:304 +#: lib/ui/stdcontext.inc:52 +#: lib/ui/stdmenus.inc:300 msgid "Displayed Formula|D" msgstr "Formule hors ligne|h" -#: lib/ui/stdcontext.inc:53 lib/ui/stdmenus.inc:305 lib/ui/stdmenus.inc:423 +#: lib/ui/stdcontext.inc:53 +#: lib/ui/stdmenus.inc:301 +#: lib/ui/stdmenus.inc:418 msgid "Eqnarray Environment|E" msgstr "Environnement tableau d'équations|E" @@ -12381,11 +12967,13 @@ msgstr "Environnement tableau d'équations|E" msgid "AMS Environment|A" msgstr "Environnement AMS|S" -#: lib/ui/stdcontext.inc:56 lib/ui/stdmenus.inc:221 +#: lib/ui/stdcontext.inc:56 +#: lib/ui/stdmenus.inc:217 msgid "Number Whole Formula|N" msgstr "Numéroter toute la formule|N" -#: lib/ui/stdcontext.inc:57 lib/ui/stdmenus.inc:222 +#: lib/ui/stdcontext.inc:57 +#: lib/ui/stdmenus.inc:218 msgid "Number This Line|u" msgstr "Numéroter cette ligne|m" @@ -12398,19 +12986,21 @@ msgid "Copy as Reference|R" msgstr "Copier comme référence|C" # menu éditer math -#: lib/ui/stdcontext.inc:61 lib/ui/stdmenus.inc:232 +#: lib/ui/stdcontext.inc:61 +#: lib/ui/stdmenus.inc:228 msgid "Split Cell|C" msgstr "Fractionner cellule|u" #: lib/ui/stdcontext.inc:63 msgid "Insert|s" -msgstr "Insérer|I" +msgstr "Insertion|I" #: lib/ui/stdcontext.inc:65 msgid "Add Line Above|o" msgstr "Ajouter une ligne au-dessus|A" -#: lib/ui/stdcontext.inc:66 lib/ui/stdmenus.inc:235 +#: lib/ui/stdcontext.inc:66 +#: lib/ui/stdmenus.inc:231 msgid "Add Line Below|B" msgstr "Ajouter une ligne au-dessous|o" @@ -12422,19 +13012,23 @@ msgstr "Supprimer la ligne au-dessus|S" msgid "Delete Line Below|w" msgstr "Supprimer la ligne au-dessous|p" -#: lib/ui/stdcontext.inc:70 lib/ui/stdmenus.inc:239 +#: lib/ui/stdcontext.inc:70 +#: lib/ui/stdmenus.inc:235 msgid "Add Line to Left" msgstr "Ajouter une ligne à gauche" -#: lib/ui/stdcontext.inc:71 lib/ui/stdmenus.inc:240 +#: lib/ui/stdcontext.inc:71 +#: lib/ui/stdmenus.inc:236 msgid "Add Line to Right" msgstr "Ajouter une ligne à droite" -#: lib/ui/stdcontext.inc:72 lib/ui/stdmenus.inc:241 +#: lib/ui/stdcontext.inc:72 +#: lib/ui/stdmenus.inc:237 msgid "Delete Line to Left" msgstr "Supprimer la ligne à gauche" -#: lib/ui/stdcontext.inc:73 lib/ui/stdmenus.inc:242 +#: lib/ui/stdcontext.inc:73 +#: lib/ui/stdmenus.inc:238 msgid "Delete Line to Right" msgstr "Supprimer la ligne à droite" @@ -12454,7 +13048,8 @@ msgstr "Afficher la barre d'outils tableaux" msgid "Use Computer Algebra System|m" msgstr "Appel à un logiciel de calcul formel|g" -#: lib/ui/stdcontext.inc:87 lib/ui/stdcontext.inc:105 +#: lib/ui/stdcontext.inc:87 +#: lib/ui/stdcontext.inc:105 msgid "Next Cross-Reference|N" msgstr "Référence croisée suivante|v" @@ -12490,19 +13085,32 @@ msgstr "Référence mise en forme|o" msgid "Textual Reference|x" msgstr "Référence textuelle|x" -#: lib/ui/stdcontext.inc:98 lib/ui/stdcontext.inc:110 -#: lib/ui/stdcontext.inc:120 lib/ui/stdcontext.inc:128 -#: lib/ui/stdcontext.inc:137 lib/ui/stdcontext.inc:148 -#: lib/ui/stdcontext.inc:155 lib/ui/stdcontext.inc:219 -#: lib/ui/stdcontext.inc:237 lib/ui/stdcontext.inc:264 -#: lib/ui/stdcontext.inc:358 lib/ui/stdcontext.inc:371 -#: lib/ui/stdcontext.inc:433 lib/ui/stdcontext.inc:453 -#: lib/ui/stdcontext.inc:464 lib/ui/stdcontext.inc:472 -#: lib/ui/stdcontext.inc:482 lib/ui/stdcontext.inc:490 -#: lib/ui/stdcontext.inc:498 lib/ui/stdcontext.inc:506 -#: lib/ui/stdcontext.inc:519 lib/ui/stdcontext.inc:529 -#: lib/ui/stdcontext.inc:550 lib/ui/stdcontext.inc:558 -#: lib/ui/stdcontext.inc:604 lib/ui/stdmenus.inc:512 +#: lib/ui/stdcontext.inc:98 +#: lib/ui/stdcontext.inc:110 +#: lib/ui/stdcontext.inc:120 +#: lib/ui/stdcontext.inc:128 +#: lib/ui/stdcontext.inc:137 +#: lib/ui/stdcontext.inc:148 +#: lib/ui/stdcontext.inc:155 +#: lib/ui/stdcontext.inc:218 +#: lib/ui/stdcontext.inc:236 +#: lib/ui/stdcontext.inc:263 +#: lib/ui/stdcontext.inc:357 +#: lib/ui/stdcontext.inc:370 +#: lib/ui/stdcontext.inc:432 +#: lib/ui/stdcontext.inc:452 +#: lib/ui/stdcontext.inc:463 +#: lib/ui/stdcontext.inc:471 +#: lib/ui/stdcontext.inc:481 +#: lib/ui/stdcontext.inc:489 +#: lib/ui/stdcontext.inc:497 +#: lib/ui/stdcontext.inc:505 +#: lib/ui/stdcontext.inc:518 +#: lib/ui/stdcontext.inc:528 +#: lib/ui/stdcontext.inc:549 +#: lib/ui/stdcontext.inc:557 +#: lib/ui/stdcontext.inc:603 +#: lib/ui/stdmenus.inc:507 msgid "Settings...|S" msgstr "Paramètres...|m" @@ -12510,7 +13118,8 @@ msgstr "Paramètres...|m" msgid "Go Back|G" msgstr "Revenir|R" -#: lib/ui/stdcontext.inc:108 lib/ui/stdcontext.inc:450 +#: lib/ui/stdcontext.inc:108 +#: lib/ui/stdcontext.inc:449 msgid "Copy as Reference|C" msgstr "Copier comme référence|C" @@ -12528,8 +13137,9 @@ msgid "Close Inset|C" msgstr "Fermer l'insert|i" # menu Editer quand on est dans un insert -#: lib/ui/stdcontext.inc:147 lib/ui/stdcontext.inc:153 -#: lib/ui/stdcontext.inc:566 +#: lib/ui/stdcontext.inc:147 +#: lib/ui/stdcontext.inc:153 +#: lib/ui/stdcontext.inc:565 msgid "Dissolve Inset|D" msgstr "Supprimer l'insert|u" @@ -12537,11 +13147,13 @@ msgstr "Supprimer l'insert|u" msgid "Show Label|L" msgstr "Afficher l'étiquette|A" -#: lib/ui/stdcontext.inc:163 lib/ui/stdmenus.inc:468 +#: lib/ui/stdcontext.inc:163 +#: lib/ui/stdmenus.inc:463 msgid "Frameless|l" msgstr "Sans cadre|S" -#: lib/ui/stdcontext.inc:164 lib/ui/stdmenus.inc:469 +#: lib/ui/stdcontext.inc:164 +#: lib/ui/stdmenus.inc:464 msgid "Simple Frame|F" msgstr "Cadre simple|p" @@ -12549,27 +13161,33 @@ msgstr "Cadre simple|p" msgid "Simple Frame, Page Breaks|P" msgstr "Cadre simple, sauts de page|a" -#: lib/ui/stdcontext.inc:166 lib/ui/stdmenus.inc:470 +#: lib/ui/stdcontext.inc:166 +#: lib/ui/stdmenus.inc:465 msgid "Oval, Thin|a" msgstr "Ovale, fin|O" -#: lib/ui/stdcontext.inc:167 lib/ui/stdmenus.inc:471 +#: lib/ui/stdcontext.inc:167 +#: lib/ui/stdmenus.inc:466 msgid "Oval, Thick|v" msgstr "Ovale, épais|v" -#: lib/ui/stdcontext.inc:168 lib/ui/stdmenus.inc:472 +#: lib/ui/stdcontext.inc:168 +#: lib/ui/stdmenus.inc:467 msgid "Drop Shadow|w" msgstr "Ombre en relief|f" -#: lib/ui/stdcontext.inc:169 lib/ui/stdmenus.inc:473 +#: lib/ui/stdcontext.inc:169 +#: lib/ui/stdmenus.inc:468 msgid "Shaded Background|B" msgstr "Fond ombré|b" -#: lib/ui/stdcontext.inc:170 lib/ui/stdmenus.inc:474 +#: lib/ui/stdcontext.inc:170 +#: lib/ui/stdmenus.inc:469 msgid "Double Frame|u" msgstr "Double cadre|D" -#: lib/ui/stdcontext.inc:178 lib/ui/stdmenus.inc:478 +#: lib/ui/stdcontext.inc:178 +#: lib/ui/stdmenus.inc:473 msgid "LyX Note|N" msgstr "Note LyX|N" @@ -12577,7 +13195,8 @@ msgstr "Note LyX|N" msgid "Comment|m" msgstr "Commentaire|C" -#: lib/ui/stdcontext.inc:180 lib/ui/stdmenus.inc:480 +#: lib/ui/stdcontext.inc:180 +#: lib/ui/stdmenus.inc:475 msgid "Greyed Out|G" msgstr "Grisée|G" @@ -12590,19 +13209,23 @@ msgstr "Ouvrir toutes les notes|v" msgid "Close All Notes|l" msgstr "Fermer toutes les notes|F" -#: lib/ui/stdcontext.inc:191 lib/ui/stdmenus.inc:490 +#: lib/ui/stdcontext.inc:191 +#: lib/ui/stdmenus.inc:485 msgid "Phantom|P" msgstr "Fantôme|F" -#: lib/ui/stdcontext.inc:192 lib/ui/stdmenus.inc:491 +#: lib/ui/stdcontext.inc:192 +#: lib/ui/stdmenus.inc:486 msgid "Horizontal Phantom|H" msgstr "Fantôme horizontal|z" -#: lib/ui/stdcontext.inc:193 lib/ui/stdmenus.inc:492 +#: lib/ui/stdcontext.inc:193 +#: lib/ui/stdmenus.inc:487 msgid "Vertical Phantom|V" msgstr "Fantôme vertical|c" -#: lib/ui/stdcontext.inc:200 lib/ui/stdmenus.inc:399 +#: lib/ui/stdcontext.inc:200 +#: lib/ui/stdmenus.inc:395 msgid "Interword Space|w" msgstr "Espace entre mots|t" @@ -12611,495 +13234,547 @@ msgid "Protected Space|o" msgstr "Espace insécable|E" #: lib/ui/stdcontext.inc:202 -#, fuzzy -msgid "Visible Space|a" -msgstr "Espacement vertical" - -#: lib/ui/stdcontext.inc:203 lib/ui/stdcontext.inc:226 lib/ui/stdmenus.inc:401 +#: lib/ui/stdcontext.inc:225 +#: lib/ui/stdmenus.inc:396 msgid "Thin Space|T" msgstr "Espace fine|f" -#: lib/ui/stdcontext.inc:204 lib/ui/stdcontext.inc:229 +#: lib/ui/stdcontext.inc:203 +#: lib/ui/stdcontext.inc:228 msgid "Negative Thin Space|N" msgstr "Espace fine négative|v" -#: lib/ui/stdcontext.inc:205 lib/ui/stdcontext.inc:232 +#: lib/ui/stdcontext.inc:204 +#: lib/ui/stdcontext.inc:231 msgid "Half Quad Space (Enskip)|k" msgstr "Saut demi-cadratin (saut de dimension n)|S" -#: lib/ui/stdcontext.inc:206 +#: lib/ui/stdcontext.inc:205 msgid "Protected Half Quad Space (Enspace)|E" msgstr "Espace insécable demi-cadratin (espace-n)|n" -#: lib/ui/stdcontext.inc:207 lib/ui/stdcontext.inc:233 +#: lib/ui/stdcontext.inc:206 +#: lib/ui/stdcontext.inc:232 msgid "Quad Space|Q" msgstr "Espace cadratin|c" -#: lib/ui/stdcontext.inc:208 lib/ui/stdcontext.inc:234 +#: lib/ui/stdcontext.inc:207 +#: lib/ui/stdcontext.inc:233 msgid "Double Quad Space|u" msgstr "Espace double cadratin|u" -#: lib/ui/stdcontext.inc:209 +#: lib/ui/stdcontext.inc:208 msgid "Horizontal Fill|F" msgstr "Ressort horizontal|t" -#: lib/ui/stdcontext.inc:210 +#: lib/ui/stdcontext.inc:209 msgid "Protected Horizontal Fill|i" msgstr "Remplissage horizontal insécable|z" -#: lib/ui/stdcontext.inc:211 +#: lib/ui/stdcontext.inc:210 msgid "Horizontal Fill (Dots)|D" msgstr "Remplissage horizontal (points)|p" -#: lib/ui/stdcontext.inc:212 +#: lib/ui/stdcontext.inc:211 msgid "Horizontal Fill (Rule)|R" msgstr "Remplissage horizontal (filet)|l" -#: lib/ui/stdcontext.inc:213 +#: lib/ui/stdcontext.inc:212 msgid "Horizontal Fill (Left Arrow)|L" msgstr "Remplissage horizontal (flèche gauche)|g" -#: lib/ui/stdcontext.inc:214 +#: lib/ui/stdcontext.inc:213 msgid "Horizontal Fill (Right Arrow)|g" msgstr "Remplissage horizontal (flèche droite)|d" -#: lib/ui/stdcontext.inc:215 +#: lib/ui/stdcontext.inc:214 msgid "Horizontal Fill (Up Brace)|p" msgstr "Remplissage horizontal (accolade vers le haut)|h" -#: lib/ui/stdcontext.inc:216 +#: lib/ui/stdcontext.inc:215 msgid "Horizontal Fill (Down Brace)|B" msgstr "Remplissage horizontal (accolade vers le bas)|b" -#: lib/ui/stdcontext.inc:217 lib/ui/stdcontext.inc:235 +#: lib/ui/stdcontext.inc:216 +#: lib/ui/stdcontext.inc:234 msgid "Custom Length|C" msgstr "Dimension réglable|a" -#: lib/ui/stdcontext.inc:227 +#: lib/ui/stdcontext.inc:226 msgid "Medium Space|M" msgstr "Espace moyenne|m" -#: lib/ui/stdcontext.inc:228 +#: lib/ui/stdcontext.inc:227 msgid "Thick Space|h" msgstr "Espace large|l" -#: lib/ui/stdcontext.inc:230 +#: lib/ui/stdcontext.inc:229 msgid "Negative Medium Space|u" msgstr "Espace moyenne négative|n" -#: lib/ui/stdcontext.inc:231 +#: lib/ui/stdcontext.inc:230 msgid "Negative Thick Space|i" msgstr "Espace large négative|g" -#: lib/ui/stdcontext.inc:244 +#: lib/ui/stdcontext.inc:243 msgid "DefSkip|D" msgstr "Implicite|I" -#: lib/ui/stdcontext.inc:245 +#: lib/ui/stdcontext.inc:244 msgid "SmallSkip|S" msgstr "Petit|P" -#: lib/ui/stdcontext.inc:246 +#: lib/ui/stdcontext.inc:245 msgid "MedSkip|M" msgstr "Moyen|y" -#: lib/ui/stdcontext.inc:247 +#: lib/ui/stdcontext.inc:246 msgid "BigSkip|B" msgstr "Grand|G" -#: lib/ui/stdcontext.inc:248 +#: lib/ui/stdcontext.inc:247 msgid "VFill|F" msgstr "Ressort vertical|v" -#: lib/ui/stdcontext.inc:249 +#: lib/ui/stdcontext.inc:248 msgid "Custom|C" msgstr "Réglable|R" -#: lib/ui/stdcontext.inc:251 +#: lib/ui/stdcontext.inc:250 msgid "Settings...|e" msgstr "Paramètres...|e" -#: lib/ui/stdcontext.inc:258 lib/ui/stdcontext.inc:513 +#: lib/ui/stdcontext.inc:257 +#: lib/ui/stdcontext.inc:512 msgid "Include|c" msgstr "Inclus (include)|c" -#: lib/ui/stdcontext.inc:259 lib/ui/stdcontext.inc:514 +#: lib/ui/stdcontext.inc:258 +#: lib/ui/stdcontext.inc:513 msgid "Input|p" msgstr "Incorporé (input)|p" -#: lib/ui/stdcontext.inc:260 lib/ui/stdcontext.inc:515 +#: lib/ui/stdcontext.inc:259 +#: lib/ui/stdcontext.inc:514 msgid "Verbatim|V" msgstr "Verbatim|V" -#: lib/ui/stdcontext.inc:261 lib/ui/stdcontext.inc:516 +#: lib/ui/stdcontext.inc:260 +#: lib/ui/stdcontext.inc:515 msgid "Verbatim (marked blanks)|b" msgstr "Verbatim (espaces marqués)|b" -#: lib/ui/stdcontext.inc:262 lib/ui/stdcontext.inc:517 +#: lib/ui/stdcontext.inc:261 +#: lib/ui/stdcontext.inc:516 msgid "Listing|L" msgstr "Listing|L" -#: lib/ui/stdcontext.inc:266 lib/ui/stdcontext.inc:521 +#: lib/ui/stdcontext.inc:265 +#: lib/ui/stdcontext.inc:520 msgid "Edit Included File...|E" msgstr "Modifier le fichier inclus...|s" -#: lib/ui/stdcontext.inc:273 lib/ui/stdmenus.inc:412 +#: lib/ui/stdcontext.inc:272 +#: lib/ui/stdmenus.inc:407 msgid "New Page|N" msgstr "Saut de page (fer en haut)|g" -#: lib/ui/stdcontext.inc:274 lib/ui/stdmenus.inc:413 +#: lib/ui/stdcontext.inc:273 +#: lib/ui/stdmenus.inc:408 msgid "Page Break|a" msgstr "Saut de page (justifié)|S" -#: lib/ui/stdcontext.inc:275 lib/ui/stdmenus.inc:414 +#: lib/ui/stdcontext.inc:274 +#: lib/ui/stdmenus.inc:409 msgid "Clear Page|C" msgstr "Saut de page (vide le tampon)|o" -#: lib/ui/stdcontext.inc:276 lib/ui/stdmenus.inc:415 +#: lib/ui/stdcontext.inc:275 +#: lib/ui/stdmenus.inc:410 msgid "Clear Double Page|D" msgstr "Saut de page impaire|u" -#: lib/ui/stdcontext.inc:283 lib/ui/stdmenus.inc:409 +#: lib/ui/stdcontext.inc:282 +#: lib/ui/stdmenus.inc:404 msgid "Ragged Line Break|R" msgstr "Passage à la ligne (fer à gauche)|l" -#: lib/ui/stdcontext.inc:284 lib/ui/stdmenus.inc:410 +#: lib/ui/stdcontext.inc:283 +#: lib/ui/stdmenus.inc:405 msgid "Justified Line Break|J" msgstr "Passage à la ligne (justifié)|j" -#: lib/ui/stdcontext.inc:293 lib/ui/stdmenus.inc:103 lib/ui/stdtoolbars.inc:80 -#: src/Text3.cpp:1241 src/mathed/InsetMathNest.cpp:596 +#: lib/ui/stdcontext.inc:292 +#: lib/ui/stdmenus.inc:102 +#: lib/ui/stdtoolbars.inc:80 +#: src/Text3.cpp:1224 +#: src/mathed/InsetMathNest.cpp:596 msgid "Cut" msgstr "Couper" -#: lib/ui/stdcontext.inc:294 lib/ui/stdmenus.inc:104 lib/ui/stdtoolbars.inc:81 -#: src/Text3.cpp:1246 src/mathed/InsetMathNest.cpp:605 +#: lib/ui/stdcontext.inc:293 +#: lib/ui/stdmenus.inc:103 +#: lib/ui/stdtoolbars.inc:81 +#: src/Text3.cpp:1229 +#: src/mathed/InsetMathNest.cpp:605 msgid "Copy" msgstr "Copier" -#: lib/ui/stdcontext.inc:295 lib/ui/stdmenus.inc:105 lib/ui/stdtoolbars.inc:82 -#: src/Text3.cpp:1194 src/mathed/InsetMathGrid.cpp:1316 +#: lib/ui/stdcontext.inc:294 +#: lib/ui/stdmenus.inc:104 +#: lib/ui/stdtoolbars.inc:82 +#: src/Text3.cpp:1177 +#: src/mathed/InsetMathGrid.cpp:1327 #: src/mathed/InsetMathNest.cpp:575 msgid "Paste" msgstr "Coller" -#: lib/ui/stdcontext.inc:296 lib/ui/stdmenus.inc:106 +#: lib/ui/stdcontext.inc:295 +#: lib/ui/stdmenus.inc:105 msgid "Paste Recent|e" msgstr "Coller une sélection récente|é" -#: lib/ui/stdcontext.inc:298 +#: lib/ui/stdcontext.inc:297 msgid "Jump Back to Saved Bookmark|B" msgstr "Revenir au signet enregistré|v" -#: lib/ui/stdcontext.inc:299 lib/ui/stdmenus.inc:534 +#: lib/ui/stdcontext.inc:298 +#: lib/ui/stdmenus.inc:529 msgid "Forward search|F" msgstr "Recherche directe|d" -#: lib/ui/stdcontext.inc:301 lib/ui/stdmenus.inc:115 +#: lib/ui/stdcontext.inc:300 +#: lib/ui/stdmenus.inc:114 msgid "Move Paragraph Up|o" msgstr "Déplacer le paragraphe vers le haut|h" -#: lib/ui/stdcontext.inc:302 lib/ui/stdmenus.inc:116 +#: lib/ui/stdcontext.inc:301 +#: lib/ui/stdmenus.inc:115 msgid "Move Paragraph Down|v" msgstr "Déplacer le paragraphe vers le bas|b" -#: lib/ui/stdcontext.inc:304 +#: lib/ui/stdcontext.inc:303 msgid "Promote Section|r" msgstr "Promouvoir la section|m" -#: lib/ui/stdcontext.inc:305 +#: lib/ui/stdcontext.inc:304 msgid "Demote Section|m" msgstr "Rétrograder la section|g" -#: lib/ui/stdcontext.inc:306 +#: lib/ui/stdcontext.inc:305 msgid "Move Section Down|D" msgstr "Déplacer la section vers le bas|D" -#: lib/ui/stdcontext.inc:307 lib/ui/stdcontext.inc:586 +#: lib/ui/stdcontext.inc:306 +#: lib/ui/stdcontext.inc:585 msgid "Move Section Up|U" msgstr "Déplacer la section vers le haut|u" -#: lib/ui/stdcontext.inc:308 +#: lib/ui/stdcontext.inc:307 msgid "Insert Short Title|T" msgstr "Insérer un titre court|c" -#: lib/ui/stdcontext.inc:309 lib/ui/stdmenus.inc:360 +#: lib/ui/stdcontext.inc:308 +#: lib/ui/stdmenus.inc:356 msgid "Insert Regular Expression" msgstr "Insérer une expression régulière" -#: lib/ui/stdcontext.inc:311 lib/ui/stdcontext.inc:575 +#: lib/ui/stdcontext.inc:310 +#: lib/ui/stdcontext.inc:574 msgid "Accept Change|c" msgstr "Accepter la modification|A" -#: lib/ui/stdcontext.inc:312 +#: lib/ui/stdcontext.inc:311 msgid "Reject Change|j" msgstr "Rejeter la modification|R" -#: lib/ui/stdcontext.inc:314 +#: lib/ui/stdcontext.inc:313 msgid "Apply Last Text Style|A" msgstr "Appliquer le dernier style de texte|q" -#: lib/ui/stdcontext.inc:315 lib/ui/stdmenus.inc:118 -msgid "Text Style|S" +#: lib/ui/stdcontext.inc:314 +msgid "Text Style|x" msgstr "Style de texte|y" -#: lib/ui/stdcontext.inc:316 lib/ui/stdmenus.inc:120 +#: lib/ui/stdcontext.inc:315 +#: lib/ui/stdmenus.inc:119 msgid "Paragraph Settings...|P" msgstr "Paramètres de paragraphe...|è" -#: lib/ui/stdcontext.inc:319 +#: lib/ui/stdcontext.inc:318 msgid "Fullscreen Mode" msgstr "Plein écran" -#: lib/ui/stdcontext.inc:327 +#: lib/ui/stdcontext.inc:326 msgid "Anything|A" msgstr "Tout|T" -#: lib/ui/stdcontext.inc:328 +#: lib/ui/stdcontext.inc:327 msgid "Anything Non-Empty|o" msgstr "Une chaîne non vide quelconque|v" -#: lib/ui/stdcontext.inc:329 +#: lib/ui/stdcontext.inc:328 msgid "Any Word|W" msgstr "Un mot quelconque|m" -#: lib/ui/stdcontext.inc:330 +#: lib/ui/stdcontext.inc:329 msgid "Any Number|N" msgstr "Un nombre quelconque|n" -#: lib/ui/stdcontext.inc:331 +#: lib/ui/stdcontext.inc:330 msgid "User Defined|U" msgstr "Défini par l'utilisateur|u" -#: lib/ui/stdcontext.inc:340 lib/ui/stdmenus.inc:246 +#: lib/ui/stdcontext.inc:339 +#: lib/ui/stdmenus.inc:242 msgid "Append Argument" msgstr "Ajouter un argument" -#: lib/ui/stdcontext.inc:341 lib/ui/stdmenus.inc:247 +#: lib/ui/stdcontext.inc:340 +#: lib/ui/stdmenus.inc:243 msgid "Remove Last Argument" msgstr "Supprimer le dernier argument" -#: lib/ui/stdcontext.inc:343 +#: lib/ui/stdcontext.inc:342 msgid "Make First Non-Optional Into Optional Argument" msgstr "Rendre optionnel le premier argument non optionnel" -#: lib/ui/stdcontext.inc:344 +#: lib/ui/stdcontext.inc:343 msgid "Make Last Optional Into Non-Optional Argument" msgstr "Rendre non optionnel le dernier argument optionnel" -#: lib/ui/stdcontext.inc:345 lib/ui/stdmenus.inc:251 +#: lib/ui/stdcontext.inc:344 +#: lib/ui/stdmenus.inc:247 msgid "Insert Optional Argument" msgstr "Insérer un argument optionnel" -#: lib/ui/stdcontext.inc:346 lib/ui/stdmenus.inc:252 +#: lib/ui/stdcontext.inc:345 +#: lib/ui/stdmenus.inc:248 msgid "Remove Optional Argument" msgstr "Supprimer un argument optionnel" -#: lib/ui/stdcontext.inc:348 lib/ui/stdmenus.inc:254 +#: lib/ui/stdcontext.inc:347 +#: lib/ui/stdmenus.inc:250 msgid "Append Argument Eating From the Right" msgstr "Ajouter l'argument en intégrant depuis la droite" -#: lib/ui/stdcontext.inc:349 lib/ui/stdmenus.inc:255 +#: lib/ui/stdcontext.inc:348 +#: lib/ui/stdmenus.inc:251 msgid "Append Optional Argument Eating From the Right" msgstr "Ajouter l'argument optionnel en intégrant depuis la droite" -#: lib/ui/stdcontext.inc:350 lib/ui/stdmenus.inc:256 +#: lib/ui/stdcontext.inc:349 +#: lib/ui/stdmenus.inc:252 msgid "Remove Last Argument Spitting Out to the Right" msgstr "Enlever le dernier argument en éjectant par la droite" -#: lib/ui/stdcontext.inc:359 +#: lib/ui/stdcontext.inc:358 msgid "Reload|R" msgstr "Recharger|R" -#: lib/ui/stdcontext.inc:361 lib/ui/stdcontext.inc:373 -#: lib/ui/stdcontext.inc:474 +#: lib/ui/stdcontext.inc:360 +#: lib/ui/stdcontext.inc:372 +#: lib/ui/stdcontext.inc:473 msgid "Edit Externally...|x" msgstr "Modifier le fichier via une application externe...|l" -#: lib/ui/stdcontext.inc:381 +#: lib/ui/stdcontext.inc:380 msgid "Multicolumn|u" msgstr "Multi-colonnes|n" # Conflit raccourci avec « Au milieu » insoluble -#: lib/ui/stdcontext.inc:382 +#: lib/ui/stdcontext.inc:381 msgid "Multirow|w" msgstr "Multi-lignes|e" -#: lib/ui/stdcontext.inc:384 +#: lib/ui/stdcontext.inc:383 msgid "Top Line|n" msgstr "Ligne du haut|h" -#: lib/ui/stdcontext.inc:385 +#: lib/ui/stdcontext.inc:384 msgid "Bottom Line|i" msgstr "Ligne du bas|b" -#: lib/ui/stdcontext.inc:386 lib/ui/stdmenus.inc:192 +#: lib/ui/stdcontext.inc:385 +#: lib/ui/stdmenus.inc:188 msgid "Left Line|L" msgstr "Ligne de gauche|g" -#: lib/ui/stdcontext.inc:387 lib/ui/stdmenus.inc:193 +#: lib/ui/stdcontext.inc:386 +#: lib/ui/stdmenus.inc:189 msgid "Right Line|R" msgstr "Ligne de droite|d" -#: lib/ui/stdcontext.inc:389 +#: lib/ui/stdcontext.inc:388 msgid "Left|f" msgstr "À gauche|À" -#: lib/ui/stdcontext.inc:390 lib/ui/stdmenus.inc:202 +#: lib/ui/stdcontext.inc:389 +#: lib/ui/stdmenus.inc:198 msgid "Center|C" msgstr "Centré|é" -#: lib/ui/stdcontext.inc:391 +#: lib/ui/stdcontext.inc:390 msgid "Right|h" msgstr "À droite|r" -#: lib/ui/stdcontext.inc:392 +#: lib/ui/stdcontext.inc:391 msgid "Decimal" msgstr "Décimal" -#: lib/ui/stdcontext.inc:394 lib/ui/stdmenus.inc:205 +#: lib/ui/stdcontext.inc:393 +#: lib/ui/stdmenus.inc:201 msgid "Top|T" msgstr "En haut|t" -#: lib/ui/stdcontext.inc:395 lib/ui/stdmenus.inc:206 +#: lib/ui/stdcontext.inc:394 +#: lib/ui/stdmenus.inc:202 msgid "Middle|M" msgstr "Au milieu|l" -#: lib/ui/stdcontext.inc:396 lib/ui/stdmenus.inc:207 +#: lib/ui/stdcontext.inc:395 +#: lib/ui/stdmenus.inc:203 msgid "Bottom|B" msgstr "En bas|s" -#: lib/ui/stdcontext.inc:398 +#: lib/ui/stdcontext.inc:397 msgid "Append Row|A" msgstr "Ajouter une ligne|j" -#: lib/ui/stdcontext.inc:399 lib/ui/stdmenus.inc:210 +#: lib/ui/stdcontext.inc:398 +#: lib/ui/stdmenus.inc:206 msgid "Delete Row|D" msgstr "Supprimer la ligne|u" -#: lib/ui/stdcontext.inc:400 lib/ui/stdmenus.inc:211 +#: lib/ui/stdcontext.inc:399 +#: lib/ui/stdmenus.inc:207 msgid "Copy Row|o" msgstr "Copier la ligne|o" -#: lib/ui/stdcontext.inc:403 +#: lib/ui/stdcontext.inc:402 msgid "Append Column|p" msgstr "Ajouter une colonne|A" -#: lib/ui/stdcontext.inc:404 lib/ui/stdmenus.inc:215 +#: lib/ui/stdcontext.inc:403 +#: lib/ui/stdmenus.inc:211 msgid "Delete Column|e" msgstr "Supprimer la colonne|p" -#: lib/ui/stdcontext.inc:405 +#: lib/ui/stdcontext.inc:404 msgid "Copy Column|y" msgstr "Copier la colonne|i" -#: lib/ui/stdcontext.inc:408 +#: lib/ui/stdcontext.inc:407 msgid "Settings...|g" msgstr "Paramètres...|m" -#: lib/ui/stdcontext.inc:416 lib/ui/stdmenus.inc:30 +#: lib/ui/stdcontext.inc:415 +#: lib/ui/stdmenus.inc:30 msgid "File|F" msgstr "Fichier|F" -#: lib/ui/stdcontext.inc:417 +#: lib/ui/stdcontext.inc:416 msgid "Path|P" msgstr "Répertoires|R" -#: lib/ui/stdcontext.inc:418 +#: lib/ui/stdcontext.inc:417 msgid "Class|C" msgstr "Classe|C" -#: lib/ui/stdcontext.inc:420 +#: lib/ui/stdcontext.inc:419 msgid "File Revision|R" msgstr "Révision du fichier|R" -#: lib/ui/stdcontext.inc:421 +#: lib/ui/stdcontext.inc:420 msgid "Tree Revision|T" msgstr "Révision de l'arborescence|n" -#: lib/ui/stdcontext.inc:422 +#: lib/ui/stdcontext.inc:421 msgid "Revision Author|A" msgstr "Auteur de la révision|A" -#: lib/ui/stdcontext.inc:423 +#: lib/ui/stdcontext.inc:422 msgid "Revision Date|D" msgstr "date de la révision|D" -#: lib/ui/stdcontext.inc:424 +#: lib/ui/stdcontext.inc:423 msgid "Revision Time|i" msgstr "Heure de la révision|H" -#: lib/ui/stdcontext.inc:426 +#: lib/ui/stdcontext.inc:425 msgid "LyX Version|X" msgstr "Version de LyX|X" -#: lib/ui/stdcontext.inc:430 +#: lib/ui/stdcontext.inc:429 msgid "Document Info|D" msgstr "Informations sur le document|d" -#: lib/ui/stdcontext.inc:432 +#: lib/ui/stdcontext.inc:431 msgid "Copy Text|o" msgstr "Copier le texte|C" -#: lib/ui/stdcontext.inc:441 lib/ui/stdcontext.inc:461 +#: lib/ui/stdcontext.inc:440 +#: lib/ui/stdcontext.inc:460 msgid "Activate Branch|A" msgstr "Activer la branche|A" -#: lib/ui/stdcontext.inc:442 lib/ui/stdcontext.inc:462 +#: lib/ui/stdcontext.inc:441 +#: lib/ui/stdcontext.inc:461 msgid "Deactivate Branch|e" msgstr "Désactiver la branche|e" -#: lib/ui/stdcontext.inc:451 +#: lib/ui/stdcontext.inc:450 msgid "Insert Reference at Cursor Position|I" msgstr "Insérer la référence à la position du curseur|I" -#: lib/ui/stdcontext.inc:545 +#: lib/ui/stdcontext.inc:544 msgid "All Indexes|A" msgstr "Tous les index|A" -#: lib/ui/stdcontext.inc:548 +#: lib/ui/stdcontext.inc:547 msgid "Subindex|b" msgstr "Sous-index|S" -#: lib/ui/stdcontext.inc:576 lib/ui/stdmenus.inc:519 +#: lib/ui/stdcontext.inc:575 +#: lib/ui/stdmenus.inc:514 msgid "Reject Change|R" msgstr "Rejeter la modification|R" -#: lib/ui/stdcontext.inc:584 +#: lib/ui/stdcontext.inc:583 msgid "Promote Section|P" msgstr "Promouvoir la section|m" -#: lib/ui/stdcontext.inc:585 +#: lib/ui/stdcontext.inc:584 msgid "Demote Section|D" msgstr "Rétrograder la section|g" -#: lib/ui/stdcontext.inc:587 +#: lib/ui/stdcontext.inc:586 msgid "Move Section Down|w" msgstr "Déplacer la section vers le bas|D" -#: lib/ui/stdcontext.inc:589 +#: lib/ui/stdcontext.inc:588 msgid "Select Section|S" msgstr "Sélectionner la section|S" -#: lib/ui/stdcontext.inc:597 -msgid "Wrap by Preview|P" +#: lib/ui/stdcontext.inc:596 +msgid "Wrap by Preview|y" msgstr "Enrober par l'aperçu|p" #: lib/ui/stdmenus.inc:31 msgid "Edit|E" -msgstr "Éditer|e" +msgstr "Édition|É" #: lib/ui/stdmenus.inc:32 msgid "View|V" -msgstr "Visionner|V" +msgstr "Affichage|A" #: lib/ui/stdmenus.inc:33 msgid "Insert|I" -msgstr "Insérer|I" +msgstr "Insertion|I" #: lib/ui/stdmenus.inc:34 msgid "Navigate|N" -msgstr "Naviguer|N" +msgstr "Navigation|N" #: lib/ui/stdmenus.inc:35 msgid "Document|D" @@ -13222,865 +13897,841 @@ msgstr "Afficher l'historique...|h" msgid "Use Locking Property|L" msgstr "Utiliser la propriété de verrouillage|p" -#: lib/ui/stdmenus.inc:90 -#, fuzzy -msgid "Export As...|s" -msgstr "Exportation en cours..." - -#: lib/ui/stdmenus.inc:92 +#: lib/ui/stdmenus.inc:91 msgid "More Formats & Options...|O" msgstr "Plus de formats et d'options...|o" -#: lib/ui/stdmenus.inc:100 +#: lib/ui/stdmenus.inc:99 msgid "Undo|U" msgstr "Annuler|A" -#: lib/ui/stdmenus.inc:101 +#: lib/ui/stdmenus.inc:100 msgid "Redo|R" msgstr "Refaire|R" -#: lib/ui/stdmenus.inc:107 +#: lib/ui/stdmenus.inc:106 msgid "Paste Special" msgstr "Collage spécial" -#: lib/ui/stdmenus.inc:109 +#: lib/ui/stdmenus.inc:108 msgid "Select Whole Inset" msgstr "Sélectionner tout l'insert" -#: lib/ui/stdmenus.inc:110 +#: lib/ui/stdmenus.inc:109 msgid "Select All" msgstr "Sélectionner tout" -#: lib/ui/stdmenus.inc:112 +#: lib/ui/stdmenus.inc:111 msgid "Find & Replace (Quick)...|F" msgstr "Rechercher et remplacer (simple)...|e" -#: lib/ui/stdmenus.inc:113 +#: lib/ui/stdmenus.inc:112 msgid "Find & Replace (Advanced)..." msgstr "Rechercher et remplacer (élaboré)..." -#: lib/ui/stdmenus.inc:123 +#: lib/ui/stdmenus.inc:117 +msgid "Text Style|S" +msgstr "Style de texte|y" + +#: lib/ui/stdmenus.inc:122 msgid "Table|T" msgstr "Tableau|T" -#: lib/ui/stdmenus.inc:124 lib/ui/stdmenus.inc:579 +#: lib/ui/stdmenus.inc:123 +#: lib/ui/stdmenus.inc:574 msgid "Math|M" msgstr "Maths|M" -#: lib/ui/stdmenus.inc:125 +#: lib/ui/stdmenus.inc:124 msgid "Rows & Columns|C" msgstr "Lignes & colonnes|L" -#: lib/ui/stdmenus.inc:132 +#: lib/ui/stdmenus.inc:131 msgid "Increase List Depth|I" msgstr "Augmenter la profondeur de liste|f" -#: lib/ui/stdmenus.inc:133 +#: lib/ui/stdmenus.inc:132 msgid "Decrease List Depth|D" msgstr "Réduire la profondeur de liste|u" # menu Editer quand on est dans un insert -#: lib/ui/stdmenus.inc:134 +#: lib/ui/stdmenus.inc:133 msgid "Dissolve Inset" msgstr "Supprimer l'insert" -#: lib/ui/stdmenus.inc:135 +#: lib/ui/stdmenus.inc:134 msgid "TeX Code Settings...|C" msgstr "Paramètres de code TeX...|X" -#: lib/ui/stdmenus.inc:137 +#: lib/ui/stdmenus.inc:136 msgid "Float Settings...|a" msgstr "Paramètres de flottant...|f" -#: lib/ui/stdmenus.inc:138 +#: lib/ui/stdmenus.inc:137 msgid "Text Wrap Settings...|W" msgstr "Paramètres d'enrobage...|e" -#: lib/ui/stdmenus.inc:139 +#: lib/ui/stdmenus.inc:138 msgid "Note Settings...|N" msgstr "Paramètres de note...|n" -#: lib/ui/stdmenus.inc:140 +#: lib/ui/stdmenus.inc:139 msgid "Phantom Settings...|h" msgstr "Paramètres de fantôme...|ô" -#: lib/ui/stdmenus.inc:141 +#: lib/ui/stdmenus.inc:140 msgid "Branch Settings...|B" msgstr "Paramètres de branche...|P" -#: lib/ui/stdmenus.inc:142 +#: lib/ui/stdmenus.inc:141 msgid "Box Settings...|x" msgstr "Paramètres de boîte...|o" -#: lib/ui/stdmenus.inc:143 +#: lib/ui/stdmenus.inc:142 msgid "Index Entry Settings...|y" msgstr "Paramètres d'entrée d'index...|d" -#: lib/ui/stdmenus.inc:144 +#: lib/ui/stdmenus.inc:143 msgid "Index Settings...|x" msgstr "Paramètres d'index...|x" -#: lib/ui/stdmenus.inc:145 +#: lib/ui/stdmenus.inc:144 msgid "Info Settings...|n" msgstr "Paramètres d'information...|f" -#: lib/ui/stdmenus.inc:146 +#: lib/ui/stdmenus.inc:145 msgid "Listings Settings...|g" msgstr "Paramètres de listing...|g" -#: lib/ui/stdmenus.inc:150 +#: lib/ui/stdmenus.inc:149 msgid "Table Settings...|a" msgstr "Paramètres de tableau...|u" -#: lib/ui/stdmenus.inc:154 +#: lib/ui/stdmenus.inc:153 msgid "Plain Text|T" msgstr "Texte brut|T" -#: lib/ui/stdmenus.inc:155 +#: lib/ui/stdmenus.inc:154 msgid "Plain Text, Join Lines|J" msgstr "Texte brut par lignes|b" -#: lib/ui/stdmenus.inc:157 +#: lib/ui/stdmenus.inc:156 msgid "Selection|S" msgstr "Sélection|S" -#: lib/ui/stdmenus.inc:158 +#: lib/ui/stdmenus.inc:157 msgid "Selection, Join Lines|i" msgstr "Sélection par lignes|l" -#: lib/ui/stdmenus.inc:160 -msgid "Unformatted Text|U" -msgstr "" - -#: lib/ui/stdmenus.inc:161 -#, fuzzy -msgid "Unformatted, Join Lines|o" -msgstr "Texte brut par lignes|b" - -#: lib/ui/stdmenus.inc:163 +#: lib/ui/stdmenus.inc:159 msgid "Paste as LinkBack PDF" msgstr "Copier en PDF LinkBack" -#: lib/ui/stdmenus.inc:164 +#: lib/ui/stdmenus.inc:160 msgid "Paste as PDF" msgstr "Copier en PDF" -#: lib/ui/stdmenus.inc:165 +#: lib/ui/stdmenus.inc:161 msgid "Paste as PNG" msgstr "Copier en PNG" -#: lib/ui/stdmenus.inc:166 +#: lib/ui/stdmenus.inc:162 msgid "Paste as JPEG" msgstr "Copier en JPEG" # menu Editer quand on est dans un insert -#: lib/ui/stdmenus.inc:174 +#: lib/ui/stdmenus.inc:170 msgid "Dissolve Text Style" msgstr "Supprimer le style de caractère" -#: lib/ui/stdmenus.inc:178 +#: lib/ui/stdmenus.inc:174 msgid "Customized...|C" msgstr "Personnalisé...|P" -#: lib/ui/stdmenus.inc:180 +#: lib/ui/stdmenus.inc:176 msgid "Capitalize|a" msgstr "Majuscule initiale|i" -#: lib/ui/stdmenus.inc:181 +#: lib/ui/stdmenus.inc:177 msgid "Uppercase|U" msgstr "Majuscule|j" -#: lib/ui/stdmenus.inc:182 +#: lib/ui/stdmenus.inc:178 msgid "Lowercase|L" msgstr "Minuscules|l" -#: lib/ui/stdmenus.inc:187 +#: lib/ui/stdmenus.inc:183 msgid "Multicolumn|M" msgstr "Multi-colonnes|n" # Conflit raccourci avec « Au milieu » insoluble -#: lib/ui/stdmenus.inc:188 +#: lib/ui/stdmenus.inc:184 msgid "Multirow|u" msgstr "Multi-lignes|e" -#: lib/ui/stdmenus.inc:190 +#: lib/ui/stdmenus.inc:186 msgid "Top Line|T" msgstr "Ligne du haut|h" -#: lib/ui/stdmenus.inc:191 +#: lib/ui/stdmenus.inc:187 msgid "Bottom Line|B" msgstr "Ligne du bas|b" -#: lib/ui/stdmenus.inc:195 +#: lib/ui/stdmenus.inc:191 msgid "Top|p" msgstr "En haut|t" -#: lib/ui/stdmenus.inc:196 +#: lib/ui/stdmenus.inc:192 msgid "Middle|i" msgstr "Au milieu|l" -#: lib/ui/stdmenus.inc:197 +#: lib/ui/stdmenus.inc:193 msgid "Bottom|o" msgstr "En bas|s" -#: lib/ui/stdmenus.inc:201 +#: lib/ui/stdmenus.inc:197 msgid "Left|L" msgstr "À gauche|À" -#: lib/ui/stdmenus.inc:203 +#: lib/ui/stdmenus.inc:199 msgid "Right|R" msgstr "À droite|r" -#: lib/ui/stdmenus.inc:209 +#: lib/ui/stdmenus.inc:205 msgid "Add Row|A" msgstr "Ajouter une ligne|j" -#: lib/ui/stdmenus.inc:214 +#: lib/ui/stdmenus.inc:210 msgid "Add Column|u" msgstr "Ajouter une colonne|A" -#: lib/ui/stdmenus.inc:216 +#: lib/ui/stdmenus.inc:212 msgid "Copy Column|p" msgstr "Copier la colonne|i" -#: lib/ui/stdmenus.inc:223 +#: lib/ui/stdmenus.inc:219 msgid "Change Limits Type|L" msgstr "Changer le type de limite|i" -#: lib/ui/stdmenus.inc:224 +#: lib/ui/stdmenus.inc:220 msgid "Macro Definition" msgstr "Définition de macro" -#: lib/ui/stdmenus.inc:226 +#: lib/ui/stdmenus.inc:222 msgid "Change Formula Type|F" msgstr "Changer le type de formule|f" -#: lib/ui/stdmenus.inc:228 +#: lib/ui/stdmenus.inc:224 msgid "Text Style|T" msgstr "Style de texte|t" -#: lib/ui/stdmenus.inc:230 +#: lib/ui/stdmenus.inc:226 msgid "Use Computer Algebra System|S" msgstr "Appel à un logiciel de calcul formel|g" -#: lib/ui/stdmenus.inc:234 +#: lib/ui/stdmenus.inc:230 msgid "Add Line Above|A" msgstr "Ajouter une ligne au-dessus|A" -#: lib/ui/stdmenus.inc:236 +#: lib/ui/stdmenus.inc:232 msgid "Delete Line Above|D" msgstr "Supprimer la ligne au-dessus|S" -#: lib/ui/stdmenus.inc:237 +#: lib/ui/stdmenus.inc:233 msgid "Delete Line Below|e" msgstr "Supprimer la ligne au-dessous|p" -#: lib/ui/stdmenus.inc:249 +#: lib/ui/stdmenus.inc:245 msgid "Make First Non-Optional into Optional Argument" msgstr "Rendre optionnel le premier argument non optionnel" -#: lib/ui/stdmenus.inc:250 +#: lib/ui/stdmenus.inc:246 msgid "Make Last Optional into Non-Optional Argument" msgstr "Rendre non optionnel le dernier argument optionnel" -#: lib/ui/stdmenus.inc:260 +#: lib/ui/stdmenus.inc:256 msgid "Default|t" msgstr "Implicite|p" -#: lib/ui/stdmenus.inc:261 +#: lib/ui/stdmenus.inc:257 msgid "Display|D" msgstr "Hors ligne|H" -#: lib/ui/stdmenus.inc:262 +#: lib/ui/stdmenus.inc:258 msgid "Inline|I" msgstr "En ligne|l" -#: lib/ui/stdmenus.inc:266 +#: lib/ui/stdmenus.inc:262 msgid "Math Normal Font|N" msgstr "Math police normale|n" -#: lib/ui/stdmenus.inc:268 +#: lib/ui/stdmenus.inc:264 msgid "Math Calligraphic Family|C" msgstr "Math famille calligraphique|c" -#: lib/ui/stdmenus.inc:269 +#: lib/ui/stdmenus.inc:265 msgid "Math Formal Script Family|o" msgstr "Math famille Script formel|o" -#: lib/ui/stdmenus.inc:270 +#: lib/ui/stdmenus.inc:266 msgid "Math Fraktur Family|F" msgstr "Math famille Fraktur|F" -#: lib/ui/stdmenus.inc:271 +#: lib/ui/stdmenus.inc:267 msgid "Math Roman Family|R" msgstr "Math famille romaine|r" -#: lib/ui/stdmenus.inc:272 +#: lib/ui/stdmenus.inc:268 msgid "Math Sans Serif Family|S" msgstr "Math famille sans empattement|e" -#: lib/ui/stdmenus.inc:274 +#: lib/ui/stdmenus.inc:270 msgid "Math Bold Series|B" msgstr "Math série grasse|g" -#: lib/ui/stdmenus.inc:276 +#: lib/ui/stdmenus.inc:272 msgid "Text Normal Font|T" msgstr "Texte police normale|T" -#: lib/ui/stdmenus.inc:278 +#: lib/ui/stdmenus.inc:274 msgid "Text Roman Family" msgstr "Texte famille romaine" -#: lib/ui/stdmenus.inc:279 +#: lib/ui/stdmenus.inc:275 msgid "Text Sans Serif Family" msgstr "Texte famille sans empattement" -#: lib/ui/stdmenus.inc:280 +#: lib/ui/stdmenus.inc:276 msgid "Text Typewriter Family" msgstr "Texte famille chasse fixe" -#: lib/ui/stdmenus.inc:282 +#: lib/ui/stdmenus.inc:278 msgid "Text Bold Series" msgstr "Texte série grasse" -#: lib/ui/stdmenus.inc:283 +#: lib/ui/stdmenus.inc:279 msgid "Text Medium Series" msgstr "Texte série moyenne" -#: lib/ui/stdmenus.inc:285 +#: lib/ui/stdmenus.inc:281 msgid "Text Italic Shape" msgstr "Texte forme italique" -#: lib/ui/stdmenus.inc:286 +#: lib/ui/stdmenus.inc:282 msgid "Text Small Caps Shape" msgstr "Texte forme petites capitales" -#: lib/ui/stdmenus.inc:287 +#: lib/ui/stdmenus.inc:283 msgid "Text Slanted Shape" msgstr "Texte forme inclinée" -#: lib/ui/stdmenus.inc:288 +#: lib/ui/stdmenus.inc:284 msgid "Text Upright Shape" msgstr "Texte forme droite" -#: lib/ui/stdmenus.inc:292 +#: lib/ui/stdmenus.inc:288 msgid "Octave|O" msgstr "Octave|O" -#: lib/ui/stdmenus.inc:293 +#: lib/ui/stdmenus.inc:289 msgid "Maxima|M" msgstr "Maxima|M" -#: lib/ui/stdmenus.inc:294 +#: lib/ui/stdmenus.inc:290 msgid "Mathematica|a" msgstr "Mathematica|a" -#: lib/ui/stdmenus.inc:296 +#: lib/ui/stdmenus.inc:292 msgid "Maple, Simplify|S" msgstr "Maple, simplify|s" -#: lib/ui/stdmenus.inc:297 +#: lib/ui/stdmenus.inc:293 msgid "Maple, Factor|F" msgstr "Maple, factor|f" -#: lib/ui/stdmenus.inc:298 +#: lib/ui/stdmenus.inc:294 msgid "Maple, Evalm|E" msgstr "Maple, evalm|e" -#: lib/ui/stdmenus.inc:299 +#: lib/ui/stdmenus.inc:295 msgid "Maple, Evalf|v" msgstr "Maple, evalf|v" -#: lib/ui/stdmenus.inc:318 +#: lib/ui/stdmenus.inc:314 msgid "Open All Insets|O" msgstr "Ouvrir tous les inserts|O" # ajouter raccourci -#: lib/ui/stdmenus.inc:319 +#: lib/ui/stdmenus.inc:315 msgid "Close All Insets|C" msgstr "Fermer tous les inserts|i" -#: lib/ui/stdmenus.inc:321 +#: lib/ui/stdmenus.inc:317 msgid "Unfold Math Macro|n" msgstr "Déplier la macro mathématique|D" -#: lib/ui/stdmenus.inc:322 +#: lib/ui/stdmenus.inc:318 msgid "Fold Math Macro|d" msgstr "Replier la macro mathématique|R" -#: lib/ui/stdmenus.inc:324 +#: lib/ui/stdmenus.inc:320 msgid "View Source|S" msgstr "Afficher le code LaTeX|X" -#: lib/ui/stdmenus.inc:325 +#: lib/ui/stdmenus.inc:321 msgid "View Messages|g" msgstr "Afficher les messages|g" -#: lib/ui/stdmenus.inc:328 +#: lib/ui/stdmenus.inc:324 msgid "View Master Document|M" msgstr "Visionner le document maître|m" -#: lib/ui/stdmenus.inc:329 +#: lib/ui/stdmenus.inc:325 msgid "Update Master Document|a" msgstr "Mettre à jour le document maître|a" -#: lib/ui/stdmenus.inc:331 +#: lib/ui/stdmenus.inc:327 msgid "Split View Into Left and Right Half|i" msgstr "Diviser la vue gauche/droite|c" -#: lib/ui/stdmenus.inc:332 +#: lib/ui/stdmenus.inc:328 msgid "Split View Into Upper and Lower Half|e" msgstr "Diviser la vue haut/bas|h" -#: lib/ui/stdmenus.inc:333 +#: lib/ui/stdmenus.inc:329 msgid "Close Current View|w" msgstr "Fermer la vue active|F" -#: lib/ui/stdmenus.inc:334 +#: lib/ui/stdmenus.inc:330 msgid "Fullscreen|l" msgstr "Plein écran|l" -#: lib/ui/stdmenus.inc:335 +#: lib/ui/stdmenus.inc:331 msgid "Toolbars|b" msgstr "Barres d'outils|B" -#: lib/ui/stdmenus.inc:350 +#: lib/ui/stdmenus.inc:346 msgid "Math|h" msgstr "Maths|h" -#: lib/ui/stdmenus.inc:351 +#: lib/ui/stdmenus.inc:347 msgid "Special Character|p" msgstr "Caractère spécial|p" -#: lib/ui/stdmenus.inc:352 +#: lib/ui/stdmenus.inc:348 msgid "Formatting|o" msgstr "Typographie spéciale|é" -#: lib/ui/stdmenus.inc:353 +#: lib/ui/stdmenus.inc:349 msgid "List / TOC|i" msgstr "Listes & TdM|L" -#: lib/ui/stdmenus.inc:354 +#: lib/ui/stdmenus.inc:350 msgid "Float|a" msgstr "Flottant|o" -#: lib/ui/stdmenus.inc:355 +#: lib/ui/stdmenus.inc:351 msgid "Note|N" msgstr "Annotation|n" -#: lib/ui/stdmenus.inc:356 +#: lib/ui/stdmenus.inc:352 msgid "Branch|B" msgstr "Branche|e" -#: lib/ui/stdmenus.inc:357 +#: lib/ui/stdmenus.inc:353 msgid "Custom Insets" msgstr "Inserts personnalisables" -#: lib/ui/stdmenus.inc:358 +#: lib/ui/stdmenus.inc:354 msgid "File|e" msgstr "Fichier|F" -#: lib/ui/stdmenus.inc:359 +#: lib/ui/stdmenus.inc:355 msgid "Box[[Menu]]" msgstr "Boîte" -#: lib/ui/stdmenus.inc:362 +#: lib/ui/stdmenus.inc:358 msgid "Citation...|C" msgstr "Citation...|a" -#: lib/ui/stdmenus.inc:363 +#: lib/ui/stdmenus.inc:359 msgid "Cross-Reference...|R" msgstr "Référence croisée...|R" -#: lib/ui/stdmenus.inc:364 +#: lib/ui/stdmenus.inc:360 msgid "Label...|L" msgstr "Étiquette...|q" -#: lib/ui/stdmenus.inc:367 +#: lib/ui/stdmenus.inc:363 msgid "Nomenclature Entry...|y" msgstr "Entrée de glossaire...|s" -#: lib/ui/stdmenus.inc:369 +#: lib/ui/stdmenus.inc:365 msgid "Table...|T" msgstr "Tableau...|T" -#: lib/ui/stdmenus.inc:370 +#: lib/ui/stdmenus.inc:366 msgid "Graphics...|G" msgstr "Graphique...|G" -#: lib/ui/stdmenus.inc:371 +#: lib/ui/stdmenus.inc:367 msgid "URL|U" msgstr "URL|U" -#: lib/ui/stdmenus.inc:372 +#: lib/ui/stdmenus.inc:368 msgid "Hyperlink...|k" msgstr "Hyperlien...|y" -#: lib/ui/stdmenus.inc:373 +#: lib/ui/stdmenus.inc:369 msgid "Footnote|F" msgstr "Note de bas de page|b" -#: lib/ui/stdmenus.inc:374 +#: lib/ui/stdmenus.inc:370 msgid "Marginal Note|M" msgstr "Note en marge|m" -#: lib/ui/stdmenus.inc:375 +#: lib/ui/stdmenus.inc:371 msgid "Short Title|S" msgstr "Titre court|c" -#: lib/ui/stdmenus.inc:376 +#: lib/ui/stdmenus.inc:372 msgid "TeX Code|X" msgstr "Code TeX|X" -#: lib/ui/stdmenus.inc:377 +#: lib/ui/stdmenus.inc:373 msgid "Program Listing[[Menu]]" msgstr "Listing de code source" -#: lib/ui/stdmenus.inc:379 +#: lib/ui/stdmenus.inc:375 msgid "Preview|w" msgstr "Aperçu|ç" -#: lib/ui/stdmenus.inc:383 +#: lib/ui/stdmenus.inc:379 msgid "Symbols...|b" msgstr "Symboles...|b" -#: lib/ui/stdmenus.inc:384 +#: lib/ui/stdmenus.inc:380 msgid "Ellipsis|i" msgstr "Points de suspension|s" -#: lib/ui/stdmenus.inc:385 +#: lib/ui/stdmenus.inc:381 msgid "End of Sentence|E" msgstr "Point final|f" -#: lib/ui/stdmenus.inc:386 +#: lib/ui/stdmenus.inc:382 msgid "Ordinary Quote|Q" msgstr "Guillemet droit|G" -#: lib/ui/stdmenus.inc:387 +#: lib/ui/stdmenus.inc:383 msgid "Single Quote|S" msgstr "Guillemet simple|u" -#: lib/ui/stdmenus.inc:388 +#: lib/ui/stdmenus.inc:384 msgid "Protected Hyphen|y" msgstr "Césure protégée|r" -#: lib/ui/stdmenus.inc:389 +#: lib/ui/stdmenus.inc:385 msgid "Breakable Slash|a" msgstr "Barre oblique sécable|a" -#: lib/ui/stdmenus.inc:390 +#: lib/ui/stdmenus.inc:386 msgid "Menu Separator|M" msgstr "Séparateur de menu|m" -#: lib/ui/stdmenus.inc:391 +#: lib/ui/stdmenus.inc:387 msgid "Phonetic Symbols|P" msgstr "Symboles phonétiques|y" -#: lib/ui/stdmenus.inc:395 +#: lib/ui/stdmenus.inc:391 msgid "Superscript|S" msgstr "Exposant|x" -#: lib/ui/stdmenus.inc:396 +#: lib/ui/stdmenus.inc:392 msgid "Subscript|u" msgstr "Indice|I" -#: lib/ui/stdmenus.inc:398 +#: lib/ui/stdmenus.inc:394 msgid "Protected Space|P" msgstr "Espace insécable|E" -#: lib/ui/stdmenus.inc:400 -#, fuzzy -msgid "Visible Space|i" -msgstr "Espacement vertical" - -#: lib/ui/stdmenus.inc:402 +#: lib/ui/stdmenus.inc:397 msgid "Horizontal Space...|o" msgstr "Espacement horizontal...|p" -#: lib/ui/stdmenus.inc:403 +#: lib/ui/stdmenus.inc:398 msgid "Horizontal Line...|L" msgstr "Ligne horizontale...|z" -#: lib/ui/stdmenus.inc:404 +#: lib/ui/stdmenus.inc:399 msgid "Vertical Space...|V" msgstr "Espacement vertical...|v" -#: lib/ui/stdmenus.inc:405 +#: lib/ui/stdmenus.inc:400 msgid "Phantom|m" msgstr "Fantôme|m" -#: lib/ui/stdmenus.inc:407 +#: lib/ui/stdmenus.inc:402 msgid "Hyphenation Point|H" msgstr "Point de césure|c" -#: lib/ui/stdmenus.inc:408 +#: lib/ui/stdmenus.inc:403 msgid "Ligature Break|k" msgstr "Séparation de ligature|a" -#: lib/ui/stdmenus.inc:421 +#: lib/ui/stdmenus.inc:416 msgid "Display Formula|D" msgstr "Formule hors ligne|h" -#: lib/ui/stdmenus.inc:422 +#: lib/ui/stdmenus.inc:417 msgid "Numbered Formula|N" msgstr "Formule numérotée|n" -#: lib/ui/stdmenus.inc:446 +#: lib/ui/stdmenus.inc:441 msgid "Figure Wrap Float|F" msgstr "Flottant d'enrobage de figure|i" -#: lib/ui/stdmenus.inc:447 +#: lib/ui/stdmenus.inc:442 msgid "Table Wrap Float|T" msgstr "Flottant d'enrobage de tableau|n" -#: lib/ui/stdmenus.inc:451 +#: lib/ui/stdmenus.inc:446 msgid "Table of Contents|C" msgstr "Table des matières|e" -#: lib/ui/stdmenus.inc:454 +#: lib/ui/stdmenus.inc:449 msgid "Nomenclature|N" msgstr "Glossaire|G" -#: lib/ui/stdmenus.inc:455 +#: lib/ui/stdmenus.inc:450 msgid "BibTeX Bibliography...|B" msgstr "Bibliographie BibTeX...|B" -#: lib/ui/stdmenus.inc:459 +#: lib/ui/stdmenus.inc:454 msgid "LyX Document...|X" msgstr "Document LyX...|X" -#: lib/ui/stdmenus.inc:460 +#: lib/ui/stdmenus.inc:455 msgid "Plain Text...|T" msgstr "Texte brut...|T" -#: lib/ui/stdmenus.inc:461 +#: lib/ui/stdmenus.inc:456 msgid "Plain Text, Join Lines...|J" msgstr "Texte brut par lignes...|b" -#: lib/ui/stdmenus.inc:463 +#: lib/ui/stdmenus.inc:458 msgid "External Material...|M" msgstr "Objet externe...|e" -#: lib/ui/stdmenus.inc:464 +#: lib/ui/stdmenus.inc:459 msgid "Child Document...|d" msgstr "Sous-document...|d" -#: lib/ui/stdmenus.inc:479 +#: lib/ui/stdmenus.inc:474 msgid "Comment|C" msgstr "Commentaire|C" -#: lib/ui/stdmenus.inc:486 +#: lib/ui/stdmenus.inc:481 msgid "Insert New Branch...|I" msgstr "Insérer une nouvelle branche...|I" -#: lib/ui/stdmenus.inc:504 +#: lib/ui/stdmenus.inc:499 msgid "Change Tracking|C" msgstr "Suivi des modifications|S" -#: lib/ui/stdmenus.inc:505 +#: lib/ui/stdmenus.inc:500 msgid "Build Program|B" msgstr "Compiler|C" -#: lib/ui/stdmenus.inc:506 +#: lib/ui/stdmenus.inc:501 msgid "LaTeX Log|L" msgstr "Fichier journal LaTeX|L" # raccourci à revoir -#: lib/ui/stdmenus.inc:507 +#: lib/ui/stdmenus.inc:502 msgid "Outline|O" msgstr "Plan|n" -#: lib/ui/stdmenus.inc:508 +#: lib/ui/stdmenus.inc:503 msgid "Start Appendix Here|A" msgstr "Début appendice ici|a" -#: lib/ui/stdmenus.inc:510 +#: lib/ui/stdmenus.inc:505 msgid "Save in Bundled Format|F" msgstr "Enregistrer sous forme de liasse|f" -#: lib/ui/stdmenus.inc:511 +#: lib/ui/stdmenus.inc:506 msgid "Compressed|m" msgstr "Comprimé|C" -#: lib/ui/stdmenus.inc:516 +#: lib/ui/stdmenus.inc:511 msgid "Track Changes|T" msgstr "Suivre les modifications|S" -#: lib/ui/stdmenus.inc:517 +#: lib/ui/stdmenus.inc:512 msgid "Merge Changes...|M" msgstr "Fusionner les modifications...|F" -#: lib/ui/stdmenus.inc:518 +#: lib/ui/stdmenus.inc:513 msgid "Accept Change|A" msgstr "Accepter la modification|A" -#: lib/ui/stdmenus.inc:520 +#: lib/ui/stdmenus.inc:515 msgid "Accept All Changes|c" msgstr "Accepter toutes les modifications|c" -#: lib/ui/stdmenus.inc:521 +#: lib/ui/stdmenus.inc:516 msgid "Reject All Changes|e" msgstr "Rejeter toutes les modifications|e" -#: lib/ui/stdmenus.inc:522 +#: lib/ui/stdmenus.inc:517 msgid "Show Changes in Output|S" msgstr "Afficher les modifications dans la sortie|h" -#: lib/ui/stdmenus.inc:529 +#: lib/ui/stdmenus.inc:524 msgid "Bookmarks|B" msgstr "Signets|S" -#: lib/ui/stdmenus.inc:530 +#: lib/ui/stdmenus.inc:525 msgid "Next Note|N" msgstr "Note suivante|N" -#: lib/ui/stdmenus.inc:531 +#: lib/ui/stdmenus.inc:526 msgid "Next Change|C" msgstr "Modification suivante|M" -#: lib/ui/stdmenus.inc:532 +#: lib/ui/stdmenus.inc:527 msgid "Next Cross-Reference|R" msgstr "Référence croisée suivante|R" -#: lib/ui/stdmenus.inc:533 +#: lib/ui/stdmenus.inc:528 msgid "Go to Label|L" msgstr "Aller à l'étiquette|A" -#: lib/ui/stdmenus.inc:540 +#: lib/ui/stdmenus.inc:535 msgid "Save Bookmark 1|S" msgstr "Enregistrer le signet 1|E" -#: lib/ui/stdmenus.inc:541 +#: lib/ui/stdmenus.inc:536 msgid "Save Bookmark 2" msgstr "Enregistrer le signet 2" -#: lib/ui/stdmenus.inc:542 +#: lib/ui/stdmenus.inc:537 msgid "Save Bookmark 3" msgstr "Enregistrer le signet 3" -#: lib/ui/stdmenus.inc:543 +#: lib/ui/stdmenus.inc:538 msgid "Save Bookmark 4" msgstr "Enregistrer le signet 4" -#: lib/ui/stdmenus.inc:544 +#: lib/ui/stdmenus.inc:539 msgid "Save Bookmark 5" msgstr "Enregistrer le signet 5" -#: lib/ui/stdmenus.inc:545 +#: lib/ui/stdmenus.inc:540 msgid "Clear Bookmarks|C" msgstr "Effacer les signets|s" -#: lib/ui/stdmenus.inc:547 +#: lib/ui/stdmenus.inc:542 msgid "Navigate Back|B" msgstr "Naviguer en arrière|r" -#: lib/ui/stdmenus.inc:556 +#: lib/ui/stdmenus.inc:551 msgid "Spellchecker...|S" msgstr "Correcteur orthographique...|o" -#: lib/ui/stdmenus.inc:557 +#: lib/ui/stdmenus.inc:552 msgid "Thesaurus...|T" msgstr "Dictionnaire de synonymes...|y" -#: lib/ui/stdmenus.inc:558 +#: lib/ui/stdmenus.inc:553 msgid "Statistics...|a" msgstr "Statistiques...|a" -#: lib/ui/stdmenus.inc:559 +#: lib/ui/stdmenus.inc:554 msgid "Check TeX|h" msgstr "Correcteur TeX|T" -#: lib/ui/stdmenus.inc:560 +#: lib/ui/stdmenus.inc:555 msgid "TeX Information|I" msgstr "Informations TeX|X" -#: lib/ui/stdmenus.inc:561 +#: lib/ui/stdmenus.inc:556 msgid "Compare...|C" msgstr "Comparer...|e" -#: lib/ui/stdmenus.inc:566 +#: lib/ui/stdmenus.inc:561 msgid "Reconfigure|R" msgstr "Reconfigurer|R" -#: lib/ui/stdmenus.inc:567 +#: lib/ui/stdmenus.inc:562 msgid "Preferences...|P" msgstr "Préférences...|P" -#: lib/ui/stdmenus.inc:574 +#: lib/ui/stdmenus.inc:569 msgid "Introduction|I" msgstr "Introduction|I" -#: lib/ui/stdmenus.inc:575 +#: lib/ui/stdmenus.inc:570 msgid "Tutorial|T" msgstr "Manuel d'apprentissage|a" -#: lib/ui/stdmenus.inc:576 +#: lib/ui/stdmenus.inc:571 msgid "User's Guide|U" msgstr "Guide de l'utilisateur|u" -#: lib/ui/stdmenus.inc:577 +#: lib/ui/stdmenus.inc:572 msgid "Additional Features|F" msgstr "Options avancées|O" -#: lib/ui/stdmenus.inc:578 +#: lib/ui/stdmenus.inc:573 msgid "Embedded Objects|O" msgstr "Objets insérés|b" -#: lib/ui/stdmenus.inc:580 +#: lib/ui/stdmenus.inc:575 msgid "Customization|C" msgstr "Personnalisation|P" -#: lib/ui/stdmenus.inc:581 +#: lib/ui/stdmenus.inc:576 msgid "Shortcuts|S" msgstr "Raccourcis|c" -#: lib/ui/stdmenus.inc:582 +#: lib/ui/stdmenus.inc:577 msgid "LyX Functions|y" msgstr "Fonctions LyX|y" -#: lib/ui/stdmenus.inc:583 +#: lib/ui/stdmenus.inc:578 msgid "LaTeX Configuration|L" msgstr "Configuration LaTeX|X" -#: lib/ui/stdmenus.inc:584 +#: lib/ui/stdmenus.inc:579 msgid "Specific Manuals|p" msgstr "Manuels spécifiques|s" -#: lib/ui/stdmenus.inc:586 +#: lib/ui/stdmenus.inc:581 msgid "About LyX|X" msgstr "À propos de LyX|L" -#: lib/ui/stdmenus.inc:590 +#: lib/ui/stdmenus.inc:585 msgid "Braille Manual|B" msgstr "Manuel de Braille|B" -#: lib/ui/stdmenus.inc:591 +#: lib/ui/stdmenus.inc:586 msgid "Feynman-diagram Manual|F" msgstr "Manuel des diagrammes de Feynman|F" -#: lib/ui/stdmenus.inc:592 -#, fuzzy -msgid "LilyPond Manual|M" -msgstr "Manuel pour multi-colonnes|m" - -#: lib/ui/stdmenus.inc:593 +#: lib/ui/stdmenus.inc:587 msgid "Linguistics Manual|L" msgstr "Manuel pour Linguistique|L" -#: lib/ui/stdmenus.inc:594 -#, fuzzy -msgid "Multilingual Captions Manual|C" +#: lib/ui/stdmenus.inc:588 +msgid "Multicolumn Manual|M" msgstr "Manuel pour multi-colonnes|m" -#: lib/ui/stdmenus.inc:595 -msgid "Risk and safety statements Manual|R" -msgstr "" - -#: lib/ui/stdmenus.inc:596 +#: lib/ui/stdmenus.inc:589 msgid "Sweave Manual|S" msgstr "Manuel Sweave|S" -#: lib/ui/stdmenus.inc:597 +#: lib/ui/stdmenus.inc:590 msgid "XY-pic Manual|X" msgstr "Manuel pour XY-pic|X" @@ -14104,11 +14755,13 @@ msgstr "Imprimer le document" msgid "Check spelling" msgstr "Correction orthographique" -#: lib/ui/stdtoolbars.inc:78 src/BufferView.cpp:1347 +#: lib/ui/stdtoolbars.inc:78 +#: src/BufferView.cpp:1335 msgid "Undo" msgstr "Annuler" -#: lib/ui/stdtoolbars.inc:79 src/BufferView.cpp:1357 +#: lib/ui/stdtoolbars.inc:79 +#: src/BufferView.cpp:1345 msgid "Redo" msgstr "Refaire" @@ -14248,7 +14901,8 @@ msgstr "Insérer une note de bas de page" msgid "Insert margin note" msgstr "Insérer une note en marge" -#: lib/ui/stdtoolbars.inc:130 lib/ui/stdtoolbars.inc:229 +#: lib/ui/stdtoolbars.inc:130 +#: lib/ui/stdtoolbars.inc:229 msgid "Insert note" msgstr "Insérer une note" @@ -14280,19 +14934,23 @@ msgstr "Style de texte" msgid "Paragraph settings" msgstr "Paramètres de paragraphe" -#: lib/ui/stdtoolbars.inc:143 lib/ui/stdtoolbars.inc:190 +#: lib/ui/stdtoolbars.inc:143 +#: lib/ui/stdtoolbars.inc:190 msgid "Add row" msgstr "Ajouter une ligne" -#: lib/ui/stdtoolbars.inc:144 lib/ui/stdtoolbars.inc:191 +#: lib/ui/stdtoolbars.inc:144 +#: lib/ui/stdtoolbars.inc:191 msgid "Add column" msgstr "Ajouter une colonne" -#: lib/ui/stdtoolbars.inc:145 lib/ui/stdtoolbars.inc:192 +#: lib/ui/stdtoolbars.inc:145 +#: lib/ui/stdtoolbars.inc:192 msgid "Delete row" msgstr "Supprimer la ligne" -#: lib/ui/stdtoolbars.inc:146 lib/ui/stdtoolbars.inc:193 +#: lib/ui/stdtoolbars.inc:146 +#: lib/ui/stdtoolbars.inc:193 msgid "Delete column" msgstr "Supprimer la colonne" @@ -14376,11 +15034,13 @@ msgstr "Maths" msgid "Set display mode" msgstr "Mode hors ligne" -#: lib/ui/stdtoolbars.inc:174 src/insets/InsetScript.cpp:63 +#: lib/ui/stdtoolbars.inc:174 +#: src/insets/InsetScript.cpp:63 msgid "Subscript" msgstr "Indice" -#: lib/ui/stdtoolbars.inc:175 src/insets/InsetScript.cpp:64 +#: lib/ui/stdtoolbars.inc:175 +#: src/insets/InsetScript.cpp:64 msgid "Superscript" msgstr "Exposant" @@ -14528,7 +15188,8 @@ msgstr "Visionner les autres formats" msgid "Update Other Formats" msgstr "Mettre à jour les autres formats" -#: lib/ui/stdtoolbars.inc:257 src/frontends/qt4/GuiLog.cpp:243 +#: lib/ui/stdtoolbars.inc:257 +#: src/frontends/qt4/GuiLog.cpp:243 msgid "Version Control" msgstr "Contrôle de version" @@ -14580,20 +15241,24 @@ msgstr "Palettes mathématiques" msgid "Math spacings" msgstr "Espacements mathématiques" -#: lib/ui/stdtoolbars.inc:274 lib/ui/stdtoolbars.inc:350 +#: lib/ui/stdtoolbars.inc:274 +#: lib/ui/stdtoolbars.inc:346 msgid "Styles" msgstr "Styles" -#: lib/ui/stdtoolbars.inc:275 lib/ui/stdtoolbars.inc:357 +#: lib/ui/stdtoolbars.inc:275 +#: lib/ui/stdtoolbars.inc:353 msgid "Fractions" msgstr "Fractions" -#: lib/ui/stdtoolbars.inc:276 lib/ui/stdtoolbars.inc:374 -#: src/frontends/qt4/GuiDocument.cpp:1415 +#: lib/ui/stdtoolbars.inc:276 +#: lib/ui/stdtoolbars.inc:370 +#: src/frontends/qt4/GuiDocument.cpp:1309 msgid "Fonts" msgstr "Polices" -#: lib/ui/stdtoolbars.inc:277 lib/ui/stdtoolbars.inc:293 +#: lib/ui/stdtoolbars.inc:277 +#: lib/ui/stdtoolbars.inc:293 msgid "Functions" msgstr "Fonctions" @@ -14605,11 +15270,13 @@ msgstr "Décors de fenêtre" msgid "Big operators" msgstr "Grands opérateurs" -#: lib/ui/stdtoolbars.inc:280 lib/ui/stdtoolbars.inc:579 +#: lib/ui/stdtoolbars.inc:280 +#: lib/ui/stdtoolbars.inc:572 msgid "Miscellaneous" msgstr "Divers" -#: lib/ui/stdtoolbars.inc:282 lib/ui/stdtoolbars.inc:430 +#: lib/ui/stdtoolbars.inc:282 +#: lib/ui/stdtoolbars.inc:423 #: src/frontends/qt4/GuiSymbols.cpp:89 msgid "Arrows" msgstr "Flèches" @@ -14618,11 +15285,13 @@ msgstr "Flèches" msgid "AMS arrows" msgstr "Flèches AMS" -#: lib/ui/stdtoolbars.inc:284 lib/ui/stdtoolbars.inc:464 +#: lib/ui/stdtoolbars.inc:284 +#: lib/ui/stdtoolbars.inc:457 msgid "Operators" msgstr "Opérateurs" -#: lib/ui/stdtoolbars.inc:285 lib/ui/stdtoolbars.inc:498 +#: lib/ui/stdtoolbars.inc:285 +#: lib/ui/stdtoolbars.inc:491 msgid "Relations" msgstr "Relations Binaires" @@ -14634,7 +15303,8 @@ msgstr "Relations AMS" msgid "AMS negative relations" msgstr "Négations de relations AMS" -#: lib/ui/stdtoolbars.inc:288 lib/ui/stdtoolbars.inc:388 +#: lib/ui/stdtoolbars.inc:288 +#: lib/ui/stdtoolbars.inc:384 msgid "Dots" msgstr "Points" @@ -14818,2044 +15488,2010 @@ msgstr "Fantôme horizontal\t\\hphantom" msgid "Vertical phantom\t\\vphantom" msgstr "Fantôme vertical\t\\vphantom" -#: lib/ui/stdtoolbars.inc:339 -msgid "Smash \\smash" -msgstr "" - -#: lib/ui/stdtoolbars.inc:340 -msgid "Left overlap \\mathllap" -msgstr "" - #: lib/ui/stdtoolbars.inc:341 -msgid "Center overlap \\mathclap" -msgstr "" - -#: lib/ui/stdtoolbars.inc:342 -msgid "Right overlap \\mathrlap" -msgstr "" - -#: lib/ui/stdtoolbars.inc:345 msgid "Roots" msgstr "Racines" -#: lib/ui/stdtoolbars.inc:346 +#: lib/ui/stdtoolbars.inc:342 msgid "Square root\t\\sqrt" msgstr "Racine carrée\t\\sqrt" -#: lib/ui/stdtoolbars.inc:347 +#: lib/ui/stdtoolbars.inc:343 msgid "Other root\t\\root" msgstr "Autre racine\t\\root" -#: lib/ui/stdtoolbars.inc:351 +#: lib/ui/stdtoolbars.inc:347 msgid "Display style\t\\displaystyle" msgstr "Style hors ligne\t\\displaystyle" -#: lib/ui/stdtoolbars.inc:352 +#: lib/ui/stdtoolbars.inc:348 msgid "Normal text style\t\\textstyle" msgstr "Style texte normal\t\\textstyle" -#: lib/ui/stdtoolbars.inc:353 +#: lib/ui/stdtoolbars.inc:349 msgid "Script (small) style\t\\scriptstyle" msgstr "Style script (petit)\t\\scriptstyle" -#: lib/ui/stdtoolbars.inc:354 +#: lib/ui/stdtoolbars.inc:350 msgid "Scriptscript (smaller) style\t\\scriptscriptstyle" msgstr "Style scriptscript (plus petit)\t\\scriptscriptstyle" -#: lib/ui/stdtoolbars.inc:358 +#: lib/ui/stdtoolbars.inc:354 msgid "Standard\t\\frac" msgstr "Standard\t\\frac" -#: lib/ui/stdtoolbars.inc:359 -msgid "Nice fraction (3/4)\t\\nicefrac" -msgstr "Fraction esthétique (3/4)\t\\nicefrac" +#: lib/ui/stdtoolbars.inc:355 +msgid "" +"Nice fraction (3/4)\t\\n" +"icefrac" +msgstr "" +"Fraction esthétique (3/4)\t\\n" +"icefrac" -#: lib/ui/stdtoolbars.inc:360 +#: lib/ui/stdtoolbars.inc:356 msgid "Unit (km)\t\\unitone" msgstr "Unité (km)\t\\unitone" -#: lib/ui/stdtoolbars.inc:361 +#: lib/ui/stdtoolbars.inc:357 msgid "Unit (864 m)\t\\unittwo" msgstr "Unité (864 m)\t\\unittwo" -#: lib/ui/stdtoolbars.inc:362 +#: lib/ui/stdtoolbars.inc:358 msgid "Unit fraction (km/h)\t\\unitfrac" msgstr "Fraction unité (km/h)\t\\unitfrac" -#: lib/ui/stdtoolbars.inc:363 +#: lib/ui/stdtoolbars.inc:359 msgid "Unit fraction (20 km/h)\t\\unitfracthree" msgstr "Fraction unité (20 km/h)\t\\unitfracthree" -#: lib/ui/stdtoolbars.inc:364 +#: lib/ui/stdtoolbars.inc:360 msgid "Text fraction\t\\tfrac" msgstr "Fraction en ligne \t\\tfrac" -#: lib/ui/stdtoolbars.inc:365 +#: lib/ui/stdtoolbars.inc:361 msgid "Display fraction\t\\dfrac" msgstr "Fraction hors ligne\t\\dfrac" -#: lib/ui/stdtoolbars.inc:366 +#: lib/ui/stdtoolbars.inc:362 msgid "Continued fraction\t\\cfrac" msgstr "Fraction continue\t\\cfrac" -#: lib/ui/stdtoolbars.inc:367 +#: lib/ui/stdtoolbars.inc:363 msgid "Continued fraction (left)\t\\cfracleft" msgstr "Fraction continue (gauche)\t\\cfracleft" -#: lib/ui/stdtoolbars.inc:368 +#: lib/ui/stdtoolbars.inc:364 msgid "Continued fraction (right)\t\\cfracright" msgstr "Fraction continue (droite)\t\\cfracright" -#: lib/ui/stdtoolbars.inc:369 +#: lib/ui/stdtoolbars.inc:365 msgid "Binomial\t\\binom" msgstr "Binomial\t\\binom" -#: lib/ui/stdtoolbars.inc:370 +#: lib/ui/stdtoolbars.inc:366 msgid "Text binomial\t\\tbinom" msgstr "Binomial en ligne\t\\tbinom" -#: lib/ui/stdtoolbars.inc:371 +#: lib/ui/stdtoolbars.inc:367 msgid "Display binomial\t\\dbinom" msgstr "Binomial hors ligne\t\\dbinom" -#: lib/ui/stdtoolbars.inc:375 +#: lib/ui/stdtoolbars.inc:371 msgid "Roman\t\\mathrm" msgstr "Romain\t\\mathrm" -#: lib/ui/stdtoolbars.inc:376 +#: lib/ui/stdtoolbars.inc:372 msgid "Bold\t\\mathbf" msgstr "Gras\t\\mathbf" -#: lib/ui/stdtoolbars.inc:377 +#: lib/ui/stdtoolbars.inc:373 msgid "Bold symbol\t\\boldsymbol" msgstr "Gras symbole\t\\boldsymbol" -#: lib/ui/stdtoolbars.inc:378 +#: lib/ui/stdtoolbars.inc:374 msgid "Sans serif\t\\mathsf" msgstr "Sans empattement\t\\mathsf" -#: lib/ui/stdtoolbars.inc:379 +#: lib/ui/stdtoolbars.inc:375 msgid "Italic\t\\mathit" msgstr "Italique\t\\mathit" -#: lib/ui/stdtoolbars.inc:380 +#: lib/ui/stdtoolbars.inc:376 msgid "Typewriter\t\\mathtt" msgstr "Chasse fixe\t\\mathtt" -#: lib/ui/stdtoolbars.inc:381 +#: lib/ui/stdtoolbars.inc:377 msgid "Blackboard\t\\mathbb" msgstr "Tableau noir\t\\mathbb" -#: lib/ui/stdtoolbars.inc:382 +#: lib/ui/stdtoolbars.inc:378 msgid "Fraktur\t\\mathfrak" msgstr "Fraktur\t\\mathfrak" -#: lib/ui/stdtoolbars.inc:383 +#: lib/ui/stdtoolbars.inc:379 msgid "Calligraphic\t\\mathcal" msgstr "Calligraphique\t\\mathcal" -#: lib/ui/stdtoolbars.inc:384 +#: lib/ui/stdtoolbars.inc:380 msgid "Formal Script\t\\mathscr" msgstr "Script formel\t\\mathscr" -#: lib/ui/stdtoolbars.inc:385 +#: lib/ui/stdtoolbars.inc:381 msgid "Normal text mode\t\\textrm" msgstr "Mode texte normal\t\\textrm" -#: lib/ui/stdtoolbars.inc:389 +#: lib/ui/stdtoolbars.inc:385 msgid "ldots" msgstr "ldots" -#: lib/ui/stdtoolbars.inc:390 +#: lib/ui/stdtoolbars.inc:386 msgid "cdots" msgstr "cdots" -#: lib/ui/stdtoolbars.inc:391 +#: lib/ui/stdtoolbars.inc:387 msgid "vdots" msgstr "vdots" -#: lib/ui/stdtoolbars.inc:392 +#: lib/ui/stdtoolbars.inc:388 msgid "ddots" msgstr "ddots" -#: lib/ui/stdtoolbars.inc:393 +#: lib/ui/stdtoolbars.inc:389 msgid "iddots" msgstr "iddots" -#: lib/ui/stdtoolbars.inc:396 +#: lib/ui/stdtoolbars.inc:392 msgid "Frame Decorations" msgstr "Décors de fenêtre" -#: lib/ui/stdtoolbars.inc:397 +#: lib/ui/stdtoolbars.inc:393 msgid "hat" msgstr "hat" -#: lib/ui/stdtoolbars.inc:398 +#: lib/ui/stdtoolbars.inc:394 msgid "tilde" msgstr "tilde" -#: lib/ui/stdtoolbars.inc:399 +#: lib/ui/stdtoolbars.inc:395 msgid "bar" msgstr "bar" -#: lib/ui/stdtoolbars.inc:400 +#: lib/ui/stdtoolbars.inc:396 msgid "grave" msgstr "grave" -#: lib/ui/stdtoolbars.inc:401 +#: lib/ui/stdtoolbars.inc:397 msgid "dot" msgstr "dot" -#: lib/ui/stdtoolbars.inc:402 +#: lib/ui/stdtoolbars.inc:398 msgid "check" msgstr "check" -#: lib/ui/stdtoolbars.inc:403 +#: lib/ui/stdtoolbars.inc:399 msgid "widehat" msgstr "widehat" -#: lib/ui/stdtoolbars.inc:404 +#: lib/ui/stdtoolbars.inc:400 msgid "widetilde" msgstr "widetilde" -#: lib/ui/stdtoolbars.inc:405 -#, fuzzy -msgid "utilde" -msgstr "tilde" - -#: lib/ui/stdtoolbars.inc:406 +#: lib/ui/stdtoolbars.inc:403 msgid "vec" msgstr "vec" -#: lib/ui/stdtoolbars.inc:407 +#: lib/ui/stdtoolbars.inc:404 msgid "acute" msgstr "acute" -#: lib/ui/stdtoolbars.inc:408 +#: lib/ui/stdtoolbars.inc:405 msgid "ddot" msgstr "ddot" -#: lib/ui/stdtoolbars.inc:409 +#: lib/ui/stdtoolbars.inc:406 msgid "dddot" msgstr "dddot" -#: lib/ui/stdtoolbars.inc:410 +#: lib/ui/stdtoolbars.inc:407 msgid "ddddot" msgstr "ddddot" -#: lib/ui/stdtoolbars.inc:411 +#: lib/ui/stdtoolbars.inc:408 msgid "breve" msgstr "breve" -#: lib/ui/stdtoolbars.inc:412 +#: lib/ui/stdtoolbars.inc:409 msgid "overline" msgstr "overline" -#: lib/ui/stdtoolbars.inc:413 +#: lib/ui/stdtoolbars.inc:410 msgid "overbrace" msgstr "overbrace" -#: lib/ui/stdtoolbars.inc:414 +#: lib/ui/stdtoolbars.inc:411 msgid "overleftarrow" msgstr "overleftarrow" -#: lib/ui/stdtoolbars.inc:415 +#: lib/ui/stdtoolbars.inc:412 msgid "overrightarrow" msgstr "overrightarrow" -#: lib/ui/stdtoolbars.inc:416 +#: lib/ui/stdtoolbars.inc:413 msgid "overleftrightarrow" msgstr "overleftrightarrow" -#: lib/ui/stdtoolbars.inc:417 +#: lib/ui/stdtoolbars.inc:414 msgid "overset" msgstr "overset" -#: lib/ui/stdtoolbars.inc:418 +#: lib/ui/stdtoolbars.inc:415 msgid "underline" msgstr "underline" -#: lib/ui/stdtoolbars.inc:419 +#: lib/ui/stdtoolbars.inc:416 msgid "underbrace" msgstr "underbrace" -#: lib/ui/stdtoolbars.inc:420 +#: lib/ui/stdtoolbars.inc:417 msgid "underleftarrow" msgstr "underleftarrow" -#: lib/ui/stdtoolbars.inc:421 +#: lib/ui/stdtoolbars.inc:418 msgid "underrightarrow" msgstr "underrightarrow" -#: lib/ui/stdtoolbars.inc:422 +#: lib/ui/stdtoolbars.inc:419 msgid "underleftrightarrow" msgstr "underleftrightarrow" -#: lib/ui/stdtoolbars.inc:423 +#: lib/ui/stdtoolbars.inc:420 msgid "underset" msgstr "underset" #: lib/ui/stdtoolbars.inc:424 -#, fuzzy -msgid "cancel" -msgstr "Annuler" - -#: lib/ui/stdtoolbars.inc:425 -#, fuzzy -msgid "bcancel" -msgstr "Annuler" - -#: lib/ui/stdtoolbars.inc:426 -#, fuzzy -msgid "xcancel" -msgstr "Annuler" - -#: lib/ui/stdtoolbars.inc:427 -#, fuzzy -msgid "cancelto" -msgstr "Annuler" - -#: lib/ui/stdtoolbars.inc:431 msgid "leftarrow" msgstr "leftarrow" -#: lib/ui/stdtoolbars.inc:432 +#: lib/ui/stdtoolbars.inc:425 msgid "rightarrow" msgstr "rightarrow" -#: lib/ui/stdtoolbars.inc:433 +#: lib/ui/stdtoolbars.inc:426 msgid "downarrow" msgstr "downarrow" -#: lib/ui/stdtoolbars.inc:434 +#: lib/ui/stdtoolbars.inc:427 msgid "uparrow" msgstr "uparrow" -#: lib/ui/stdtoolbars.inc:435 +#: lib/ui/stdtoolbars.inc:428 msgid "updownarrow" msgstr "updownarrow" -#: lib/ui/stdtoolbars.inc:436 +#: lib/ui/stdtoolbars.inc:429 msgid "leftrightarrow" msgstr "leftrightarrow" -#: lib/ui/stdtoolbars.inc:437 +#: lib/ui/stdtoolbars.inc:430 msgid "Leftarrow" msgstr "Leftarrow" -#: lib/ui/stdtoolbars.inc:438 +#: lib/ui/stdtoolbars.inc:431 msgid "Rightarrow" msgstr "Rightarrow" -#: lib/ui/stdtoolbars.inc:439 +#: lib/ui/stdtoolbars.inc:432 msgid "Downarrow" msgstr "Downarrow" -#: lib/ui/stdtoolbars.inc:440 +#: lib/ui/stdtoolbars.inc:433 msgid "Uparrow" msgstr "Uparrow" -#: lib/ui/stdtoolbars.inc:441 +#: lib/ui/stdtoolbars.inc:434 msgid "Updownarrow" msgstr "Updownarrow" -#: lib/ui/stdtoolbars.inc:442 +#: lib/ui/stdtoolbars.inc:435 msgid "Leftrightarrow" msgstr "Leftrightarrow" -#: lib/ui/stdtoolbars.inc:443 +#: lib/ui/stdtoolbars.inc:436 msgid "Longleftrightarrow" msgstr "Longleftrightarrow" -#: lib/ui/stdtoolbars.inc:444 +#: lib/ui/stdtoolbars.inc:437 msgid "Longleftarrow" msgstr "Longleftarrow" -#: lib/ui/stdtoolbars.inc:445 +#: lib/ui/stdtoolbars.inc:438 msgid "Longrightarrow" msgstr "Longrightarrow" -#: lib/ui/stdtoolbars.inc:446 +#: lib/ui/stdtoolbars.inc:439 msgid "longleftrightarrow" msgstr "longleftrightarrow" -#: lib/ui/stdtoolbars.inc:447 +#: lib/ui/stdtoolbars.inc:440 msgid "longleftarrow" msgstr "longleftarrow" -#: lib/ui/stdtoolbars.inc:448 +#: lib/ui/stdtoolbars.inc:441 msgid "longrightarrow" msgstr "longrightarrow" -#: lib/ui/stdtoolbars.inc:449 +#: lib/ui/stdtoolbars.inc:442 msgid "leftharpoondown" msgstr "leftharpoondown" -#: lib/ui/stdtoolbars.inc:450 +#: lib/ui/stdtoolbars.inc:443 msgid "rightharpoondown" msgstr "rightharpoondown" -#: lib/ui/stdtoolbars.inc:451 +#: lib/ui/stdtoolbars.inc:444 msgid "mapsto" msgstr "mapsto" -#: lib/ui/stdtoolbars.inc:452 +#: lib/ui/stdtoolbars.inc:445 msgid "longmapsto" msgstr "longmapsto" -#: lib/ui/stdtoolbars.inc:453 +#: lib/ui/stdtoolbars.inc:446 msgid "nwarrow" msgstr "nwarrow" -#: lib/ui/stdtoolbars.inc:454 +#: lib/ui/stdtoolbars.inc:447 msgid "nearrow" msgstr "nearrow" -#: lib/ui/stdtoolbars.inc:455 +#: lib/ui/stdtoolbars.inc:448 msgid "leftharpoonup" msgstr "leftharpoonup" -#: lib/ui/stdtoolbars.inc:456 +#: lib/ui/stdtoolbars.inc:449 msgid "rightharpoonup" msgstr "rightharpoonup" -#: lib/ui/stdtoolbars.inc:457 +#: lib/ui/stdtoolbars.inc:450 msgid "hookleftarrow" msgstr "hookleftarrow" -#: lib/ui/stdtoolbars.inc:458 +#: lib/ui/stdtoolbars.inc:451 msgid "hookrightarrow" msgstr "hookrightarrow" -#: lib/ui/stdtoolbars.inc:459 +#: lib/ui/stdtoolbars.inc:452 msgid "swarrow" msgstr "swarrow" -#: lib/ui/stdtoolbars.inc:460 +#: lib/ui/stdtoolbars.inc:453 msgid "searrow" msgstr "searrow" -#: lib/ui/stdtoolbars.inc:461 lib/ui/stdtoolbars.inc:736 +#: lib/ui/stdtoolbars.inc:454 +#: lib/ui/stdtoolbars.inc:729 msgid "rightleftharpoons" msgstr "rightleftharpoons" -#: lib/ui/stdtoolbars.inc:465 +#: lib/ui/stdtoolbars.inc:458 msgid "pm" msgstr "pm" -#: lib/ui/stdtoolbars.inc:466 +#: lib/ui/stdtoolbars.inc:459 msgid "cap" msgstr "cap" -#: lib/ui/stdtoolbars.inc:467 +#: lib/ui/stdtoolbars.inc:460 msgid "diamond" msgstr "diamond" -#: lib/ui/stdtoolbars.inc:468 +#: lib/ui/stdtoolbars.inc:461 msgid "oplus" msgstr "oplus" -#: lib/ui/stdtoolbars.inc:469 +#: lib/ui/stdtoolbars.inc:462 msgid "mp" msgstr "mp" -#: lib/ui/stdtoolbars.inc:470 +#: lib/ui/stdtoolbars.inc:463 msgid "cup" msgstr "cup" -#: lib/ui/stdtoolbars.inc:471 +#: lib/ui/stdtoolbars.inc:464 msgid "bigtriangleup" msgstr "bigtriangleup" -#: lib/ui/stdtoolbars.inc:472 +#: lib/ui/stdtoolbars.inc:465 msgid "ominus" msgstr "ominus" -#: lib/ui/stdtoolbars.inc:473 +#: lib/ui/stdtoolbars.inc:466 msgid "times" msgstr "times" -#: lib/ui/stdtoolbars.inc:474 +#: lib/ui/stdtoolbars.inc:467 msgid "uplus" msgstr "uplus" -#: lib/ui/stdtoolbars.inc:475 +#: lib/ui/stdtoolbars.inc:468 msgid "bigtriangledown" msgstr "bigtriangledown" -#: lib/ui/stdtoolbars.inc:476 +#: lib/ui/stdtoolbars.inc:469 msgid "otimes" msgstr "otimes" -#: lib/ui/stdtoolbars.inc:477 +#: lib/ui/stdtoolbars.inc:470 msgid "div" msgstr "div" -#: lib/ui/stdtoolbars.inc:478 +#: lib/ui/stdtoolbars.inc:471 msgid "sqcap" msgstr "sqcap" -#: lib/ui/stdtoolbars.inc:479 +#: lib/ui/stdtoolbars.inc:472 msgid "triangleright" msgstr "triangleright" -#: lib/ui/stdtoolbars.inc:480 +#: lib/ui/stdtoolbars.inc:473 msgid "oslash" msgstr "oslash" -#: lib/ui/stdtoolbars.inc:481 +#: lib/ui/stdtoolbars.inc:474 msgid "cdot" msgstr "cdot" -#: lib/ui/stdtoolbars.inc:482 +#: lib/ui/stdtoolbars.inc:475 msgid "sqcup" msgstr "sqcup" -#: lib/ui/stdtoolbars.inc:483 +#: lib/ui/stdtoolbars.inc:476 msgid "triangleleft" msgstr "triangleleft" -#: lib/ui/stdtoolbars.inc:484 +#: lib/ui/stdtoolbars.inc:477 msgid "odot" msgstr "odot" -#: lib/ui/stdtoolbars.inc:485 +#: lib/ui/stdtoolbars.inc:478 msgid "star" msgstr "star" -#: lib/ui/stdtoolbars.inc:486 +#: lib/ui/stdtoolbars.inc:479 msgid "vee" msgstr "vee" -#: lib/ui/stdtoolbars.inc:487 +#: lib/ui/stdtoolbars.inc:480 msgid "amalg" msgstr "amalg" -#: lib/ui/stdtoolbars.inc:488 +#: lib/ui/stdtoolbars.inc:481 msgid "bigcirc" msgstr "bigcirc" -#: lib/ui/stdtoolbars.inc:489 +#: lib/ui/stdtoolbars.inc:482 msgid "setminus" msgstr "setminus" -#: lib/ui/stdtoolbars.inc:490 +#: lib/ui/stdtoolbars.inc:483 msgid "wedge" msgstr "wedge" -#: lib/ui/stdtoolbars.inc:491 +#: lib/ui/stdtoolbars.inc:484 msgid "dagger" msgstr "dagger" -#: lib/ui/stdtoolbars.inc:492 +#: lib/ui/stdtoolbars.inc:485 msgid "circ" msgstr "circ" -#: lib/ui/stdtoolbars.inc:493 +#: lib/ui/stdtoolbars.inc:486 msgid "bullet" msgstr "bullet" -#: lib/ui/stdtoolbars.inc:494 +#: lib/ui/stdtoolbars.inc:487 msgid "wr" msgstr "wr" -#: lib/ui/stdtoolbars.inc:495 +#: lib/ui/stdtoolbars.inc:488 msgid "ddagger" msgstr "ddagger" -#: lib/ui/stdtoolbars.inc:499 +#: lib/ui/stdtoolbars.inc:492 msgid "leq" msgstr "leq" -#: lib/ui/stdtoolbars.inc:500 +#: lib/ui/stdtoolbars.inc:493 msgid "geq" msgstr "geq" -#: lib/ui/stdtoolbars.inc:501 +#: lib/ui/stdtoolbars.inc:494 msgid "equiv" msgstr "equiv" -#: lib/ui/stdtoolbars.inc:502 +#: lib/ui/stdtoolbars.inc:495 msgid "models" msgstr "models" -#: lib/ui/stdtoolbars.inc:503 +#: lib/ui/stdtoolbars.inc:496 msgid "prec" msgstr "prec" -#: lib/ui/stdtoolbars.inc:504 +#: lib/ui/stdtoolbars.inc:497 msgid "succ" msgstr "succ" -#: lib/ui/stdtoolbars.inc:505 +#: lib/ui/stdtoolbars.inc:498 msgid "sim" msgstr "sim" -#: lib/ui/stdtoolbars.inc:506 +#: lib/ui/stdtoolbars.inc:499 msgid "perp" msgstr "perp" -#: lib/ui/stdtoolbars.inc:507 +#: lib/ui/stdtoolbars.inc:500 msgid "preceq" msgstr "preceq" -#: lib/ui/stdtoolbars.inc:508 +#: lib/ui/stdtoolbars.inc:501 msgid "succeq" msgstr "succeq" -#: lib/ui/stdtoolbars.inc:509 +#: lib/ui/stdtoolbars.inc:502 msgid "simeq" msgstr "simeq" -#: lib/ui/stdtoolbars.inc:510 +#: lib/ui/stdtoolbars.inc:503 msgid "mid" msgstr "mid" -#: lib/ui/stdtoolbars.inc:511 +#: lib/ui/stdtoolbars.inc:504 msgid "ll" msgstr "ll" -#: lib/ui/stdtoolbars.inc:512 +#: lib/ui/stdtoolbars.inc:505 msgid "gg" msgstr "gg" -#: lib/ui/stdtoolbars.inc:513 +#: lib/ui/stdtoolbars.inc:506 msgid "asymp" msgstr "asymp" -#: lib/ui/stdtoolbars.inc:514 +#: lib/ui/stdtoolbars.inc:507 msgid "parallel" msgstr "parallel" -#: lib/ui/stdtoolbars.inc:515 +#: lib/ui/stdtoolbars.inc:508 msgid "subset" msgstr "subset" -#: lib/ui/stdtoolbars.inc:516 +#: lib/ui/stdtoolbars.inc:509 msgid "supset" msgstr "supset" -#: lib/ui/stdtoolbars.inc:517 +#: lib/ui/stdtoolbars.inc:510 msgid "approx" msgstr "approx" -#: lib/ui/stdtoolbars.inc:518 +#: lib/ui/stdtoolbars.inc:511 msgid "smile" msgstr "smile" -#: lib/ui/stdtoolbars.inc:519 +#: lib/ui/stdtoolbars.inc:512 msgid "subseteq" msgstr "subseteq" -#: lib/ui/stdtoolbars.inc:520 +#: lib/ui/stdtoolbars.inc:513 msgid "supseteq" msgstr "supseteq" -#: lib/ui/stdtoolbars.inc:521 +#: lib/ui/stdtoolbars.inc:514 msgid "cong" msgstr "cong" -#: lib/ui/stdtoolbars.inc:522 +#: lib/ui/stdtoolbars.inc:515 msgid "frown" msgstr "frown" -#: lib/ui/stdtoolbars.inc:523 +#: lib/ui/stdtoolbars.inc:516 msgid "sqsubseteq" msgstr "sqsubseteq" -#: lib/ui/stdtoolbars.inc:524 +#: lib/ui/stdtoolbars.inc:517 msgid "sqsupseteq" msgstr "sqsupseteq" -#: lib/ui/stdtoolbars.inc:525 +#: lib/ui/stdtoolbars.inc:518 msgid "doteq" msgstr "doteq" -#: lib/ui/stdtoolbars.inc:526 +#: lib/ui/stdtoolbars.inc:519 msgid "neq" msgstr "neq" -#: lib/ui/stdtoolbars.inc:527 +#: lib/ui/stdtoolbars.inc:520 msgid "in[[math relation]]" msgstr "dans[[relation mathématique]]" -#: lib/ui/stdtoolbars.inc:528 +#: lib/ui/stdtoolbars.inc:521 msgid "ni" msgstr "ni" -#: lib/ui/stdtoolbars.inc:529 +#: lib/ui/stdtoolbars.inc:522 msgid "propto" msgstr "propto" -#: lib/ui/stdtoolbars.inc:530 +#: lib/ui/stdtoolbars.inc:523 msgid "notin" msgstr "notin" -#: lib/ui/stdtoolbars.inc:531 +#: lib/ui/stdtoolbars.inc:524 msgid "vdash" msgstr "vdash" -#: lib/ui/stdtoolbars.inc:532 +#: lib/ui/stdtoolbars.inc:525 msgid "dashv" msgstr "dashv" -#: lib/ui/stdtoolbars.inc:533 +#: lib/ui/stdtoolbars.inc:526 msgid "bowtie" msgstr "bowtie" -#: lib/ui/stdtoolbars.inc:537 +#: lib/ui/stdtoolbars.inc:530 msgid "alpha" msgstr "alpha" -#: lib/ui/stdtoolbars.inc:538 +#: lib/ui/stdtoolbars.inc:531 msgid "beta" msgstr "beta" -#: lib/ui/stdtoolbars.inc:539 +#: lib/ui/stdtoolbars.inc:532 msgid "gamma" msgstr "gamma" -#: lib/ui/stdtoolbars.inc:540 +#: lib/ui/stdtoolbars.inc:533 msgid "delta" msgstr "delta" -#: lib/ui/stdtoolbars.inc:541 +#: lib/ui/stdtoolbars.inc:534 msgid "epsilon" msgstr "epsilon" -#: lib/ui/stdtoolbars.inc:542 +#: lib/ui/stdtoolbars.inc:535 msgid "varepsilon" msgstr "varepsilon" -#: lib/ui/stdtoolbars.inc:543 +#: lib/ui/stdtoolbars.inc:536 msgid "zeta" msgstr "zeta" -#: lib/ui/stdtoolbars.inc:544 +#: lib/ui/stdtoolbars.inc:537 msgid "eta" msgstr "eta" -#: lib/ui/stdtoolbars.inc:545 +#: lib/ui/stdtoolbars.inc:538 msgid "theta" msgstr "theta" -#: lib/ui/stdtoolbars.inc:546 +#: lib/ui/stdtoolbars.inc:539 msgid "vartheta" msgstr "vartheta" -#: lib/ui/stdtoolbars.inc:547 +#: lib/ui/stdtoolbars.inc:540 msgid "iota" msgstr "iota" -#: lib/ui/stdtoolbars.inc:548 +#: lib/ui/stdtoolbars.inc:541 msgid "kappa" msgstr "kappa" -#: lib/ui/stdtoolbars.inc:549 +#: lib/ui/stdtoolbars.inc:542 msgid "lambda" msgstr "lambda" -#: lib/ui/stdtoolbars.inc:550 +#: lib/ui/stdtoolbars.inc:543 msgid "mu" msgstr "mu" -#: lib/ui/stdtoolbars.inc:551 +#: lib/ui/stdtoolbars.inc:544 msgid "nu" msgstr "nu" -#: lib/ui/stdtoolbars.inc:552 +#: lib/ui/stdtoolbars.inc:545 msgid "xi" msgstr "xi" -#: lib/ui/stdtoolbars.inc:553 +#: lib/ui/stdtoolbars.inc:546 msgid "pi" msgstr "pi" -#: lib/ui/stdtoolbars.inc:554 +#: lib/ui/stdtoolbars.inc:547 msgid "varpi" msgstr "varpi" -#: lib/ui/stdtoolbars.inc:555 +#: lib/ui/stdtoolbars.inc:548 msgid "rho" msgstr "rho" -#: lib/ui/stdtoolbars.inc:556 +#: lib/ui/stdtoolbars.inc:549 msgid "varrho" msgstr "varrho" -#: lib/ui/stdtoolbars.inc:557 +#: lib/ui/stdtoolbars.inc:550 msgid "sigma" msgstr "sigma" -#: lib/ui/stdtoolbars.inc:558 +#: lib/ui/stdtoolbars.inc:551 msgid "varsigma" msgstr "varsigma" -#: lib/ui/stdtoolbars.inc:559 +#: lib/ui/stdtoolbars.inc:552 msgid "tau" msgstr "tau" -#: lib/ui/stdtoolbars.inc:560 +#: lib/ui/stdtoolbars.inc:553 msgid "upsilon" msgstr "upsilon" -#: lib/ui/stdtoolbars.inc:561 +#: lib/ui/stdtoolbars.inc:554 msgid "phi" msgstr "phi" -#: lib/ui/stdtoolbars.inc:562 +#: lib/ui/stdtoolbars.inc:555 msgid "varphi" msgstr "varphi" -#: lib/ui/stdtoolbars.inc:563 +#: lib/ui/stdtoolbars.inc:556 msgid "chi" msgstr "chi" -#: lib/ui/stdtoolbars.inc:564 +#: lib/ui/stdtoolbars.inc:557 msgid "psi" msgstr "psi" -#: lib/ui/stdtoolbars.inc:565 +#: lib/ui/stdtoolbars.inc:558 msgid "omega" msgstr "omega" -#: lib/ui/stdtoolbars.inc:566 +#: lib/ui/stdtoolbars.inc:559 msgid "Gamma" msgstr "Gamma" -#: lib/ui/stdtoolbars.inc:567 +#: lib/ui/stdtoolbars.inc:560 msgid "Delta" msgstr "Delta" -#: lib/ui/stdtoolbars.inc:568 +#: lib/ui/stdtoolbars.inc:561 msgid "Theta" msgstr "Theta" -#: lib/ui/stdtoolbars.inc:569 +#: lib/ui/stdtoolbars.inc:562 msgid "Lambda" msgstr "Lambda" -#: lib/ui/stdtoolbars.inc:570 +#: lib/ui/stdtoolbars.inc:563 msgid "Xi" msgstr "Xi" -#: lib/ui/stdtoolbars.inc:571 +#: lib/ui/stdtoolbars.inc:564 msgid "Pi" msgstr "Pi" -#: lib/ui/stdtoolbars.inc:572 +#: lib/ui/stdtoolbars.inc:565 msgid "Sigma" msgstr "Sigma" -#: lib/ui/stdtoolbars.inc:573 +#: lib/ui/stdtoolbars.inc:566 msgid "Upsilon" msgstr "Upsilon" -#: lib/ui/stdtoolbars.inc:574 +#: lib/ui/stdtoolbars.inc:567 msgid "Phi" msgstr "Phi" -#: lib/ui/stdtoolbars.inc:575 +#: lib/ui/stdtoolbars.inc:568 msgid "Psi" msgstr "Psi" -#: lib/ui/stdtoolbars.inc:576 +#: lib/ui/stdtoolbars.inc:569 msgid "Omega" msgstr "Omega" -#: lib/ui/stdtoolbars.inc:580 +#: lib/ui/stdtoolbars.inc:573 msgid "nabla" msgstr "nabla" -#: lib/ui/stdtoolbars.inc:581 +#: lib/ui/stdtoolbars.inc:574 msgid "partial" msgstr "partial" -#: lib/ui/stdtoolbars.inc:582 +#: lib/ui/stdtoolbars.inc:575 msgid "infty" msgstr "infty" -#: lib/ui/stdtoolbars.inc:583 +#: lib/ui/stdtoolbars.inc:576 msgid "prime" msgstr "prime" -#: lib/ui/stdtoolbars.inc:584 +#: lib/ui/stdtoolbars.inc:577 msgid "ell" msgstr "ell" -#: lib/ui/stdtoolbars.inc:585 +#: lib/ui/stdtoolbars.inc:578 msgid "emptyset" msgstr "emptyset" -#: lib/ui/stdtoolbars.inc:586 +#: lib/ui/stdtoolbars.inc:579 msgid "exists" msgstr "exists" -#: lib/ui/stdtoolbars.inc:587 +#: lib/ui/stdtoolbars.inc:580 msgid "forall" msgstr "forall" -#: lib/ui/stdtoolbars.inc:588 +#: lib/ui/stdtoolbars.inc:581 msgid "imath" msgstr "imath" -#: lib/ui/stdtoolbars.inc:589 +#: lib/ui/stdtoolbars.inc:582 msgid "jmath" msgstr "jmath" -#: lib/ui/stdtoolbars.inc:590 +#: lib/ui/stdtoolbars.inc:583 msgid "Re" msgstr "Re" -#: lib/ui/stdtoolbars.inc:591 +#: lib/ui/stdtoolbars.inc:584 msgid "Im" msgstr "Im" -#: lib/ui/stdtoolbars.inc:592 +#: lib/ui/stdtoolbars.inc:585 msgid "aleph" msgstr "aleph" -#: lib/ui/stdtoolbars.inc:593 +#: lib/ui/stdtoolbars.inc:586 msgid "wp" msgstr "wp" -#: lib/ui/stdtoolbars.inc:594 lib/ui/stdtoolbars.inc:679 +#: lib/ui/stdtoolbars.inc:587 +#: lib/ui/stdtoolbars.inc:672 msgid "hbar" msgstr "hbar" -#: lib/ui/stdtoolbars.inc:595 lib/ui/stdtoolbars.inc:686 +#: lib/ui/stdtoolbars.inc:588 +#: lib/ui/stdtoolbars.inc:679 msgid "angle" msgstr "angle" -#: lib/ui/stdtoolbars.inc:596 +#: lib/ui/stdtoolbars.inc:589 msgid "top" msgstr "top" -#: lib/ui/stdtoolbars.inc:597 +#: lib/ui/stdtoolbars.inc:590 msgid "bot" msgstr "bot" -#: lib/ui/stdtoolbars.inc:598 +#: lib/ui/stdtoolbars.inc:591 msgid "Vert" msgstr "Vert" -#: lib/ui/stdtoolbars.inc:599 +#: lib/ui/stdtoolbars.inc:592 msgid "neg" msgstr "neg" -#: lib/ui/stdtoolbars.inc:600 +#: lib/ui/stdtoolbars.inc:593 msgid "flat" msgstr "flat" -#: lib/ui/stdtoolbars.inc:601 +#: lib/ui/stdtoolbars.inc:594 msgid "natural" msgstr "natural" -#: lib/ui/stdtoolbars.inc:602 +#: lib/ui/stdtoolbars.inc:595 msgid "sharp" msgstr "sharp" -#: lib/ui/stdtoolbars.inc:603 +#: lib/ui/stdtoolbars.inc:596 msgid "surd" msgstr "surd" -#: lib/ui/stdtoolbars.inc:604 +#: lib/ui/stdtoolbars.inc:597 msgid "triangle" msgstr "triangle" -#: lib/ui/stdtoolbars.inc:605 +#: lib/ui/stdtoolbars.inc:598 msgid "diamondsuit" msgstr "diamondsuit" -#: lib/ui/stdtoolbars.inc:606 +#: lib/ui/stdtoolbars.inc:599 msgid "heartsuit" msgstr "heartsuit" -#: lib/ui/stdtoolbars.inc:607 +#: lib/ui/stdtoolbars.inc:600 msgid "clubsuit" msgstr "clubsuit" -#: lib/ui/stdtoolbars.inc:608 +#: lib/ui/stdtoolbars.inc:601 msgid "spadesuit" msgstr "spadesuit" -#: lib/ui/stdtoolbars.inc:609 +#: lib/ui/stdtoolbars.inc:602 msgid "textrm \\AA" msgstr "textrm \\AA" -#: lib/ui/stdtoolbars.inc:610 +#: lib/ui/stdtoolbars.inc:603 msgid "textrm \\O" msgstr "textrm \\O" -#: lib/ui/stdtoolbars.inc:611 +#: lib/ui/stdtoolbars.inc:604 msgid "mathcircumflex" msgstr "mathcircumflex" -#: lib/ui/stdtoolbars.inc:612 +#: lib/ui/stdtoolbars.inc:605 msgid "_" msgstr "_" -#: lib/ui/stdtoolbars.inc:613 +#: lib/ui/stdtoolbars.inc:606 msgid "mathrm T" msgstr "mathrm T" -#: lib/ui/stdtoolbars.inc:614 +#: lib/ui/stdtoolbars.inc:607 msgid "mathbb N" msgstr "mathbb N" -#: lib/ui/stdtoolbars.inc:615 +#: lib/ui/stdtoolbars.inc:608 msgid "mathbb Z" msgstr "mathbb Z" -#: lib/ui/stdtoolbars.inc:616 +#: lib/ui/stdtoolbars.inc:609 msgid "mathbb Q" msgstr "mathbb Q" -#: lib/ui/stdtoolbars.inc:617 +#: lib/ui/stdtoolbars.inc:610 msgid "mathbb R" msgstr "mathbb R" -#: lib/ui/stdtoolbars.inc:618 +#: lib/ui/stdtoolbars.inc:611 msgid "mathbb C" msgstr "mathbb C" -#: lib/ui/stdtoolbars.inc:619 +#: lib/ui/stdtoolbars.inc:612 msgid "mathbb H" msgstr "mathbb H" -#: lib/ui/stdtoolbars.inc:620 +#: lib/ui/stdtoolbars.inc:613 msgid "mathcal F" msgstr "mathcal F" -#: lib/ui/stdtoolbars.inc:621 +#: lib/ui/stdtoolbars.inc:614 msgid "mathcal L" msgstr "mathcal L" -#: lib/ui/stdtoolbars.inc:622 +#: lib/ui/stdtoolbars.inc:615 msgid "mathcal H" msgstr "mathcal H" -#: lib/ui/stdtoolbars.inc:623 +#: lib/ui/stdtoolbars.inc:616 msgid "mathcal O" msgstr "mathcal O" -#: lib/ui/stdtoolbars.inc:626 +#: lib/ui/stdtoolbars.inc:619 msgid "Big Operators" msgstr "Grands Opérateurs" -#: lib/ui/stdtoolbars.inc:627 +#: lib/ui/stdtoolbars.inc:620 msgid "intop" msgstr "intop" -#: lib/ui/stdtoolbars.inc:628 +#: lib/ui/stdtoolbars.inc:621 msgid "int" msgstr "int" -#: lib/ui/stdtoolbars.inc:629 +#: lib/ui/stdtoolbars.inc:622 msgid "iint" msgstr "iint" -#: lib/ui/stdtoolbars.inc:630 +#: lib/ui/stdtoolbars.inc:623 msgid "iintop" msgstr "iintop" -#: lib/ui/stdtoolbars.inc:631 +#: lib/ui/stdtoolbars.inc:624 msgid "iiint" msgstr "iiint" -#: lib/ui/stdtoolbars.inc:632 +#: lib/ui/stdtoolbars.inc:625 msgid "iiintop" msgstr "iiintop" -#: lib/ui/stdtoolbars.inc:633 +#: lib/ui/stdtoolbars.inc:626 msgid "iiiint" msgstr "iiiint" -#: lib/ui/stdtoolbars.inc:634 +#: lib/ui/stdtoolbars.inc:627 msgid "iiiintop" msgstr "iiiintop" -#: lib/ui/stdtoolbars.inc:635 +#: lib/ui/stdtoolbars.inc:628 msgid "dotsint" msgstr "dotsint" -#: lib/ui/stdtoolbars.inc:636 +#: lib/ui/stdtoolbars.inc:629 msgid "dotsintop" msgstr "dotsintop" -#: lib/ui/stdtoolbars.inc:637 +#: lib/ui/stdtoolbars.inc:630 msgid "oint" msgstr "oint" -#: lib/ui/stdtoolbars.inc:638 +#: lib/ui/stdtoolbars.inc:631 msgid "ointop" msgstr "ointop" -#: lib/ui/stdtoolbars.inc:639 +#: lib/ui/stdtoolbars.inc:632 msgid "oiint" msgstr "oiint" -#: lib/ui/stdtoolbars.inc:640 +#: lib/ui/stdtoolbars.inc:633 msgid "oiintop" msgstr "oiintop" -#: lib/ui/stdtoolbars.inc:641 +#: lib/ui/stdtoolbars.inc:634 msgid "ointctrclockwiseop" msgstr "ointctrclockwiseop" -#: lib/ui/stdtoolbars.inc:642 +#: lib/ui/stdtoolbars.inc:635 msgid "ointctrclockwise" msgstr "ointctrclockwise" -#: lib/ui/stdtoolbars.inc:643 +#: lib/ui/stdtoolbars.inc:636 msgid "ointclockwiseop" msgstr "ointclockwiseop" -#: lib/ui/stdtoolbars.inc:644 +#: lib/ui/stdtoolbars.inc:637 msgid "ointclockwise" msgstr "ointclockwise" -#: lib/ui/stdtoolbars.inc:645 +#: lib/ui/stdtoolbars.inc:638 msgid "sqint" msgstr "sqint" -#: lib/ui/stdtoolbars.inc:646 +#: lib/ui/stdtoolbars.inc:639 msgid "sqintop" msgstr "sqintop" -#: lib/ui/stdtoolbars.inc:647 +#: lib/ui/stdtoolbars.inc:640 msgid "sqiint" msgstr "sqiint" -#: lib/ui/stdtoolbars.inc:648 +#: lib/ui/stdtoolbars.inc:641 msgid "sqiintop" msgstr "sqiintop" -#: lib/ui/stdtoolbars.inc:649 +#: lib/ui/stdtoolbars.inc:642 msgid "fint" msgstr "fint" -#: lib/ui/stdtoolbars.inc:650 +#: lib/ui/stdtoolbars.inc:643 msgid "fintop" msgstr "fintop" -#: lib/ui/stdtoolbars.inc:651 +#: lib/ui/stdtoolbars.inc:644 msgid "landupint" msgstr "landupint" -#: lib/ui/stdtoolbars.inc:652 +#: lib/ui/stdtoolbars.inc:645 msgid "landupintop" msgstr "landupintop" -#: lib/ui/stdtoolbars.inc:653 +#: lib/ui/stdtoolbars.inc:646 msgid "landdownint" msgstr "landdownint" -#: lib/ui/stdtoolbars.inc:654 +#: lib/ui/stdtoolbars.inc:647 msgid "landdownintop" msgstr "landdownintop" -#: lib/ui/stdtoolbars.inc:655 +#: lib/ui/stdtoolbars.inc:648 msgid "sum" msgstr "sum" -#: lib/ui/stdtoolbars.inc:656 +#: lib/ui/stdtoolbars.inc:649 msgid "prod" msgstr "prod" -#: lib/ui/stdtoolbars.inc:657 +#: lib/ui/stdtoolbars.inc:650 msgid "coprod" msgstr "coprod" -#: lib/ui/stdtoolbars.inc:658 +#: lib/ui/stdtoolbars.inc:651 msgid "bigsqcup" msgstr "bigsqcup" -#: lib/ui/stdtoolbars.inc:659 +#: lib/ui/stdtoolbars.inc:652 msgid "bigotimes" msgstr "bigotimes" -#: lib/ui/stdtoolbars.inc:660 +#: lib/ui/stdtoolbars.inc:653 msgid "bigodot" msgstr "bigodot" -#: lib/ui/stdtoolbars.inc:661 +#: lib/ui/stdtoolbars.inc:654 msgid "bigoplus" msgstr "bigoplus" -#: lib/ui/stdtoolbars.inc:662 +#: lib/ui/stdtoolbars.inc:655 msgid "bigcap" msgstr "bigcap" -#: lib/ui/stdtoolbars.inc:663 +#: lib/ui/stdtoolbars.inc:656 msgid "bigcup" msgstr "bigcup" -#: lib/ui/stdtoolbars.inc:664 +#: lib/ui/stdtoolbars.inc:657 msgid "biguplus" msgstr "biguplus" -#: lib/ui/stdtoolbars.inc:665 +#: lib/ui/stdtoolbars.inc:658 msgid "bigvee" msgstr "bigvee" -#: lib/ui/stdtoolbars.inc:666 +#: lib/ui/stdtoolbars.inc:659 msgid "bigwedge" msgstr "bigwedge" -#: lib/ui/stdtoolbars.inc:669 +#: lib/ui/stdtoolbars.inc:662 msgid "AMS Miscellaneous" msgstr "Divers AMS" -#: lib/ui/stdtoolbars.inc:670 +#: lib/ui/stdtoolbars.inc:663 msgid "digamma" msgstr "digamma" -#: lib/ui/stdtoolbars.inc:671 +#: lib/ui/stdtoolbars.inc:664 msgid "varkappa" msgstr "varkappa" -#: lib/ui/stdtoolbars.inc:672 +#: lib/ui/stdtoolbars.inc:665 msgid "beth" msgstr "beth" -#: lib/ui/stdtoolbars.inc:673 +#: lib/ui/stdtoolbars.inc:666 msgid "daleth" msgstr "daleth" -#: lib/ui/stdtoolbars.inc:674 +#: lib/ui/stdtoolbars.inc:667 msgid "gimel" msgstr "gimel" -#: lib/ui/stdtoolbars.inc:675 +#: lib/ui/stdtoolbars.inc:668 msgid "ulcorner" msgstr "ulcorner" -#: lib/ui/stdtoolbars.inc:676 +#: lib/ui/stdtoolbars.inc:669 msgid "urcorner" msgstr "urcorner" -#: lib/ui/stdtoolbars.inc:677 +#: lib/ui/stdtoolbars.inc:670 msgid "llcorner" msgstr "llcorner" -#: lib/ui/stdtoolbars.inc:678 +#: lib/ui/stdtoolbars.inc:671 msgid "lrcorner" msgstr "lrcorner" -#: lib/ui/stdtoolbars.inc:680 +#: lib/ui/stdtoolbars.inc:673 msgid "hslash" msgstr "hslash" -#: lib/ui/stdtoolbars.inc:681 +#: lib/ui/stdtoolbars.inc:674 msgid "vartriangle" msgstr "vartriangle" -#: lib/ui/stdtoolbars.inc:682 +#: lib/ui/stdtoolbars.inc:675 msgid "triangledown" msgstr "triangledown" -#: lib/ui/stdtoolbars.inc:683 +#: lib/ui/stdtoolbars.inc:676 msgid "square" msgstr "square" -#: lib/ui/stdtoolbars.inc:684 +#: lib/ui/stdtoolbars.inc:677 msgid "lozenge" msgstr "lozenge" -#: lib/ui/stdtoolbars.inc:685 +#: lib/ui/stdtoolbars.inc:678 msgid "circledS" msgstr "circledS" -#: lib/ui/stdtoolbars.inc:687 +#: lib/ui/stdtoolbars.inc:680 msgid "measuredangle" msgstr "measuredangle" -#: lib/ui/stdtoolbars.inc:688 +#: lib/ui/stdtoolbars.inc:681 msgid "nexists" msgstr "nexists" -#: lib/ui/stdtoolbars.inc:689 +#: lib/ui/stdtoolbars.inc:682 msgid "mho" msgstr "mho" -#: lib/ui/stdtoolbars.inc:690 +#: lib/ui/stdtoolbars.inc:683 msgid "Finv" msgstr "Finv" -#: lib/ui/stdtoolbars.inc:691 +#: lib/ui/stdtoolbars.inc:684 msgid "Game" msgstr "Game" -#: lib/ui/stdtoolbars.inc:692 +#: lib/ui/stdtoolbars.inc:685 msgid "Bbbk" msgstr "Bbbk" -#: lib/ui/stdtoolbars.inc:693 +#: lib/ui/stdtoolbars.inc:686 msgid "backprime" msgstr "backprime" -#: lib/ui/stdtoolbars.inc:694 +#: lib/ui/stdtoolbars.inc:687 msgid "varnothing" msgstr "varnothing" -#: lib/ui/stdtoolbars.inc:695 +#: lib/ui/stdtoolbars.inc:688 msgid "Diamond" msgstr "Diamond" -#: lib/ui/stdtoolbars.inc:696 +#: lib/ui/stdtoolbars.inc:689 msgid "blacktriangle" msgstr "blacktriangle" -#: lib/ui/stdtoolbars.inc:697 +#: lib/ui/stdtoolbars.inc:690 msgid "blacktriangledown" msgstr "blacktriangledown" -#: lib/ui/stdtoolbars.inc:698 +#: lib/ui/stdtoolbars.inc:691 msgid "blacksquare" msgstr "blacksquare" -#: lib/ui/stdtoolbars.inc:699 +#: lib/ui/stdtoolbars.inc:692 msgid "blacklozenge" msgstr "blacklozenge" -#: lib/ui/stdtoolbars.inc:700 +#: lib/ui/stdtoolbars.inc:693 msgid "bigstar" msgstr "bigstar" -#: lib/ui/stdtoolbars.inc:701 +#: lib/ui/stdtoolbars.inc:694 msgid "sphericalangle" msgstr "sphericalangle" -#: lib/ui/stdtoolbars.inc:702 +#: lib/ui/stdtoolbars.inc:695 msgid "complement" msgstr "complement" -#: lib/ui/stdtoolbars.inc:703 +#: lib/ui/stdtoolbars.inc:696 msgid "eth" msgstr "eth" -#: lib/ui/stdtoolbars.inc:704 +#: lib/ui/stdtoolbars.inc:697 msgid "diagup" msgstr "diagup" -#: lib/ui/stdtoolbars.inc:705 +#: lib/ui/stdtoolbars.inc:698 msgid "diagdown" msgstr "diagdown" -#: lib/ui/stdtoolbars.inc:708 +#: lib/ui/stdtoolbars.inc:701 msgid "AMS Arrows" msgstr "Flèches AMS" -#: lib/ui/stdtoolbars.inc:709 +#: lib/ui/stdtoolbars.inc:702 msgid "dashleftarrow" msgstr "dashleftarrow" -#: lib/ui/stdtoolbars.inc:710 +#: lib/ui/stdtoolbars.inc:703 msgid "dashrightarrow" msgstr "dashrightarrow" -#: lib/ui/stdtoolbars.inc:711 +#: lib/ui/stdtoolbars.inc:704 msgid "leftleftarrows" msgstr "leftleftarrows" -#: lib/ui/stdtoolbars.inc:712 +#: lib/ui/stdtoolbars.inc:705 msgid "leftrightarrows" msgstr "leftrightarrows" -#: lib/ui/stdtoolbars.inc:713 +#: lib/ui/stdtoolbars.inc:706 msgid "rightrightarrows" msgstr "rightrightarrows" -#: lib/ui/stdtoolbars.inc:714 +#: lib/ui/stdtoolbars.inc:707 msgid "rightleftarrows" msgstr "rightleftarrows" -#: lib/ui/stdtoolbars.inc:715 +#: lib/ui/stdtoolbars.inc:708 msgid "Lleftarrow" msgstr "Lleftarrow" -#: lib/ui/stdtoolbars.inc:716 +#: lib/ui/stdtoolbars.inc:709 msgid "Rrightarrow" msgstr "Rrightarrow" -#: lib/ui/stdtoolbars.inc:717 +#: lib/ui/stdtoolbars.inc:710 msgid "twoheadleftarrow" msgstr "twoheadleftarrow" -#: lib/ui/stdtoolbars.inc:718 +#: lib/ui/stdtoolbars.inc:711 msgid "twoheadrightarrow" msgstr "twoheadrightarrow" -#: lib/ui/stdtoolbars.inc:719 +#: lib/ui/stdtoolbars.inc:712 msgid "leftarrowtail" msgstr "leftarrowtail" -#: lib/ui/stdtoolbars.inc:720 +#: lib/ui/stdtoolbars.inc:713 msgid "rightarrowtail" msgstr "rightarrowtail" -#: lib/ui/stdtoolbars.inc:721 +#: lib/ui/stdtoolbars.inc:714 msgid "looparrowleft" msgstr "looparrowleft" -#: lib/ui/stdtoolbars.inc:722 +#: lib/ui/stdtoolbars.inc:715 msgid "looparrowright" msgstr "looparrowright" -#: lib/ui/stdtoolbars.inc:723 +#: lib/ui/stdtoolbars.inc:716 msgid "curvearrowleft" msgstr "curvearrowleft" -#: lib/ui/stdtoolbars.inc:724 +#: lib/ui/stdtoolbars.inc:717 msgid "curvearrowright" msgstr "curvearrowright" -#: lib/ui/stdtoolbars.inc:725 +#: lib/ui/stdtoolbars.inc:718 msgid "circlearrowleft" msgstr "circlearrowleft" -#: lib/ui/stdtoolbars.inc:726 +#: lib/ui/stdtoolbars.inc:719 msgid "circlearrowright" msgstr "circlearrowright" -#: lib/ui/stdtoolbars.inc:727 +#: lib/ui/stdtoolbars.inc:720 msgid "Lsh" msgstr "Lsh" -#: lib/ui/stdtoolbars.inc:728 +#: lib/ui/stdtoolbars.inc:721 msgid "Rsh" msgstr "Rsh" -#: lib/ui/stdtoolbars.inc:729 +#: lib/ui/stdtoolbars.inc:722 msgid "upuparrows" msgstr "upuparrows" -#: lib/ui/stdtoolbars.inc:730 +#: lib/ui/stdtoolbars.inc:723 msgid "downdownarrows" msgstr "downdownarrows" -#: lib/ui/stdtoolbars.inc:731 +#: lib/ui/stdtoolbars.inc:724 msgid "upharpoonleft" msgstr "upharpoonleft" -#: lib/ui/stdtoolbars.inc:732 +#: lib/ui/stdtoolbars.inc:725 msgid "upharpoonright" msgstr "upharpoonright" -#: lib/ui/stdtoolbars.inc:733 +#: lib/ui/stdtoolbars.inc:726 msgid "downharpoonleft" msgstr "downharpoonleft" -#: lib/ui/stdtoolbars.inc:734 +#: lib/ui/stdtoolbars.inc:727 msgid "downharpoonright" msgstr "downharpoonright" -#: lib/ui/stdtoolbars.inc:735 +#: lib/ui/stdtoolbars.inc:728 msgid "leftrightharpoons" msgstr "leftrightharpoons" -#: lib/ui/stdtoolbars.inc:737 +#: lib/ui/stdtoolbars.inc:730 msgid "rightsquigarrow" msgstr "rightsquigarrow" -#: lib/ui/stdtoolbars.inc:738 +#: lib/ui/stdtoolbars.inc:731 msgid "leftrightsquigarrow" msgstr "leftrightsquigarrow" -#: lib/ui/stdtoolbars.inc:739 +#: lib/ui/stdtoolbars.inc:732 msgid "nleftarrow" msgstr "nleftarrow" -#: lib/ui/stdtoolbars.inc:740 +#: lib/ui/stdtoolbars.inc:733 msgid "nrightarrow" msgstr "nrightarrow" -#: lib/ui/stdtoolbars.inc:741 +#: lib/ui/stdtoolbars.inc:734 msgid "nleftrightarrow" msgstr "nleftrightarrow" -#: lib/ui/stdtoolbars.inc:742 +#: lib/ui/stdtoolbars.inc:735 msgid "nLeftarrow" msgstr "nLeftarrow" -#: lib/ui/stdtoolbars.inc:743 +#: lib/ui/stdtoolbars.inc:736 msgid "nRightarrow" msgstr "nRightarrow" -#: lib/ui/stdtoolbars.inc:744 +#: lib/ui/stdtoolbars.inc:737 msgid "nLeftrightarrow" msgstr "nLeftrightarrow" -#: lib/ui/stdtoolbars.inc:745 +#: lib/ui/stdtoolbars.inc:738 msgid "multimap" msgstr "multimap" -#: lib/ui/stdtoolbars.inc:748 +#: lib/ui/stdtoolbars.inc:741 msgid "AMS Relations" msgstr "Relations AMS" -#: lib/ui/stdtoolbars.inc:749 +#: lib/ui/stdtoolbars.inc:742 msgid "leqq" msgstr "leqq" -#: lib/ui/stdtoolbars.inc:750 +#: lib/ui/stdtoolbars.inc:743 msgid "geqq" msgstr "geqq" -#: lib/ui/stdtoolbars.inc:751 +#: lib/ui/stdtoolbars.inc:744 msgid "leqslant" msgstr "leqslant" -#: lib/ui/stdtoolbars.inc:752 +#: lib/ui/stdtoolbars.inc:745 msgid "geqslant" msgstr "geqslant" -#: lib/ui/stdtoolbars.inc:753 +#: lib/ui/stdtoolbars.inc:746 msgid "eqslantless" msgstr "eqslantless" -#: lib/ui/stdtoolbars.inc:754 +#: lib/ui/stdtoolbars.inc:747 msgid "eqslantgtr" msgstr "eqslantgtr" -#: lib/ui/stdtoolbars.inc:755 +#: lib/ui/stdtoolbars.inc:748 msgid "lesssim" msgstr "lesssim" -#: lib/ui/stdtoolbars.inc:756 +#: lib/ui/stdtoolbars.inc:749 msgid "gtrsim" msgstr "gtrsim" -#: lib/ui/stdtoolbars.inc:757 +#: lib/ui/stdtoolbars.inc:750 msgid "lessapprox" msgstr "lessapprox" -#: lib/ui/stdtoolbars.inc:758 +#: lib/ui/stdtoolbars.inc:751 msgid "gtrapprox" msgstr "gtrapprox" -#: lib/ui/stdtoolbars.inc:759 +#: lib/ui/stdtoolbars.inc:752 msgid "approxeq" msgstr "approxeq" -#: lib/ui/stdtoolbars.inc:760 +#: lib/ui/stdtoolbars.inc:753 msgid "triangleq" msgstr "triangleq" -#: lib/ui/stdtoolbars.inc:761 +#: lib/ui/stdtoolbars.inc:754 msgid "lessdot" msgstr "lessdot" -#: lib/ui/stdtoolbars.inc:762 +#: lib/ui/stdtoolbars.inc:755 msgid "gtrdot" msgstr "gtrdot" -#: lib/ui/stdtoolbars.inc:763 +#: lib/ui/stdtoolbars.inc:756 msgid "lll" msgstr "lll" -#: lib/ui/stdtoolbars.inc:764 +#: lib/ui/stdtoolbars.inc:757 msgid "ggg" msgstr "ggg" -#: lib/ui/stdtoolbars.inc:765 +#: lib/ui/stdtoolbars.inc:758 msgid "lessgtr" msgstr "lessgtr" -#: lib/ui/stdtoolbars.inc:766 +#: lib/ui/stdtoolbars.inc:759 msgid "gtrless" msgstr "gtrless" -#: lib/ui/stdtoolbars.inc:767 +#: lib/ui/stdtoolbars.inc:760 msgid "lesseqgtr" msgstr "lesseqgtr" -#: lib/ui/stdtoolbars.inc:768 +#: lib/ui/stdtoolbars.inc:761 msgid "gtreqless" msgstr "gtreqless" -#: lib/ui/stdtoolbars.inc:769 +#: lib/ui/stdtoolbars.inc:762 msgid "lesseqqgtr" msgstr "lesseqqgtr" -#: lib/ui/stdtoolbars.inc:770 +#: lib/ui/stdtoolbars.inc:763 msgid "gtreqqless" msgstr "gtreqqless" -#: lib/ui/stdtoolbars.inc:771 +#: lib/ui/stdtoolbars.inc:764 msgid "eqcirc" msgstr "eqcirc" -#: lib/ui/stdtoolbars.inc:772 +#: lib/ui/stdtoolbars.inc:765 msgid "circeq" msgstr "circeq" -#: lib/ui/stdtoolbars.inc:773 +#: lib/ui/stdtoolbars.inc:766 msgid "thicksim" msgstr "thicksim" -#: lib/ui/stdtoolbars.inc:774 +#: lib/ui/stdtoolbars.inc:767 msgid "thickapprox" msgstr "thickapprox" -#: lib/ui/stdtoolbars.inc:775 +#: lib/ui/stdtoolbars.inc:768 msgid "backsim" msgstr "backsim" -#: lib/ui/stdtoolbars.inc:776 +#: lib/ui/stdtoolbars.inc:769 msgid "backsimeq" msgstr "backsimeq" -#: lib/ui/stdtoolbars.inc:777 +#: lib/ui/stdtoolbars.inc:770 msgid "subseteqq" msgstr "subseteqq" -#: lib/ui/stdtoolbars.inc:778 +#: lib/ui/stdtoolbars.inc:771 msgid "supseteqq" msgstr "supseteqq" -#: lib/ui/stdtoolbars.inc:779 +#: lib/ui/stdtoolbars.inc:772 msgid "Subset" msgstr "Subset" -#: lib/ui/stdtoolbars.inc:780 +#: lib/ui/stdtoolbars.inc:773 msgid "Supset" msgstr "Supset" -#: lib/ui/stdtoolbars.inc:781 +#: lib/ui/stdtoolbars.inc:774 msgid "sqsubset" msgstr "sqsubset" -#: lib/ui/stdtoolbars.inc:782 +#: lib/ui/stdtoolbars.inc:775 msgid "sqsupset" msgstr "sqsupset" -#: lib/ui/stdtoolbars.inc:783 +#: lib/ui/stdtoolbars.inc:776 msgid "preccurlyeq" msgstr "preccurlyeq" -#: lib/ui/stdtoolbars.inc:784 +#: lib/ui/stdtoolbars.inc:777 msgid "succcurlyeq" msgstr "succcurlyeq" -#: lib/ui/stdtoolbars.inc:785 +#: lib/ui/stdtoolbars.inc:778 msgid "curlyeqprec" msgstr "curlyeqprec" -#: lib/ui/stdtoolbars.inc:786 +#: lib/ui/stdtoolbars.inc:779 msgid "curlyeqsucc" msgstr "curlyeqsucc" -#: lib/ui/stdtoolbars.inc:787 +#: lib/ui/stdtoolbars.inc:780 msgid "precsim" msgstr "precsim" -#: lib/ui/stdtoolbars.inc:788 +#: lib/ui/stdtoolbars.inc:781 msgid "succsim" msgstr "succsim" -#: lib/ui/stdtoolbars.inc:789 +#: lib/ui/stdtoolbars.inc:782 msgid "precapprox" msgstr "precapprox" -#: lib/ui/stdtoolbars.inc:790 +#: lib/ui/stdtoolbars.inc:783 msgid "succapprox" msgstr "succapprox" -#: lib/ui/stdtoolbars.inc:791 +#: lib/ui/stdtoolbars.inc:784 msgid "vartriangleleft" msgstr "vartriangleleft" -#: lib/ui/stdtoolbars.inc:792 +#: lib/ui/stdtoolbars.inc:785 msgid "vartriangleright" msgstr "vartriangleright" -#: lib/ui/stdtoolbars.inc:793 +#: lib/ui/stdtoolbars.inc:786 msgid "trianglelefteq" msgstr "trianglelefteq" -#: lib/ui/stdtoolbars.inc:794 +#: lib/ui/stdtoolbars.inc:787 msgid "trianglerighteq" msgstr "trianglerighteq" -#: lib/ui/stdtoolbars.inc:795 +#: lib/ui/stdtoolbars.inc:788 msgid "bumpeq" msgstr "bumpeq" -#: lib/ui/stdtoolbars.inc:796 +#: lib/ui/stdtoolbars.inc:789 msgid "Bumpeq" msgstr "Bumpeq" -#: lib/ui/stdtoolbars.inc:797 +#: lib/ui/stdtoolbars.inc:790 msgid "doteqdot" msgstr "doteqdot" -#: lib/ui/stdtoolbars.inc:798 +#: lib/ui/stdtoolbars.inc:791 msgid "risingdotseq" msgstr "risingdotseq" -#: lib/ui/stdtoolbars.inc:799 +#: lib/ui/stdtoolbars.inc:792 msgid "fallingdotseq" msgstr "fallingdotseq" -#: lib/ui/stdtoolbars.inc:800 +#: lib/ui/stdtoolbars.inc:793 msgid "vDash" msgstr "vDash" -#: lib/ui/stdtoolbars.inc:801 +#: lib/ui/stdtoolbars.inc:794 msgid "Vvdash" msgstr "Vvdash" -#: lib/ui/stdtoolbars.inc:802 +#: lib/ui/stdtoolbars.inc:795 msgid "Vdash" msgstr "Vdash" -#: lib/ui/stdtoolbars.inc:803 +#: lib/ui/stdtoolbars.inc:796 msgid "shortmid" msgstr "shortmid" -#: lib/ui/stdtoolbars.inc:804 +#: lib/ui/stdtoolbars.inc:797 msgid "shortparallel" msgstr "shortparallel" -#: lib/ui/stdtoolbars.inc:805 +#: lib/ui/stdtoolbars.inc:798 msgid "smallsmile" msgstr "smallsmile" -#: lib/ui/stdtoolbars.inc:806 +#: lib/ui/stdtoolbars.inc:799 msgid "smallfrown" msgstr "smallfrown" -#: lib/ui/stdtoolbars.inc:807 +#: lib/ui/stdtoolbars.inc:800 msgid "blacktriangleleft" msgstr "blacktriangleleft" -#: lib/ui/stdtoolbars.inc:808 +#: lib/ui/stdtoolbars.inc:801 msgid "blacktriangleright" msgstr "blacktriangleright" -#: lib/ui/stdtoolbars.inc:809 +#: lib/ui/stdtoolbars.inc:802 msgid "because" msgstr "because" -#: lib/ui/stdtoolbars.inc:810 +#: lib/ui/stdtoolbars.inc:803 msgid "therefore" msgstr "therefore" -#: lib/ui/stdtoolbars.inc:811 +#: lib/ui/stdtoolbars.inc:804 msgid "backepsilon" msgstr "backepsilon" -#: lib/ui/stdtoolbars.inc:812 +#: lib/ui/stdtoolbars.inc:805 msgid "varpropto" msgstr "varpropto" -#: lib/ui/stdtoolbars.inc:813 +#: lib/ui/stdtoolbars.inc:806 msgid "between" msgstr "between" -#: lib/ui/stdtoolbars.inc:814 +#: lib/ui/stdtoolbars.inc:807 msgid "pitchfork" msgstr "pitchfork" -#: lib/ui/stdtoolbars.inc:817 +#: lib/ui/stdtoolbars.inc:810 msgid "AMS Negative Relations" msgstr "Négations de relations AMS" -#: lib/ui/stdtoolbars.inc:818 +#: lib/ui/stdtoolbars.inc:811 msgid "nless" msgstr "nless" -#: lib/ui/stdtoolbars.inc:819 +#: lib/ui/stdtoolbars.inc:812 msgid "ngtr" msgstr "ngtr" -#: lib/ui/stdtoolbars.inc:820 +#: lib/ui/stdtoolbars.inc:813 msgid "nleq" msgstr "nleq" -#: lib/ui/stdtoolbars.inc:821 +#: lib/ui/stdtoolbars.inc:814 msgid "ngeq" msgstr "ngeq" -#: lib/ui/stdtoolbars.inc:822 +#: lib/ui/stdtoolbars.inc:815 msgid "nleqslant" msgstr "nleqslant" -#: lib/ui/stdtoolbars.inc:823 +#: lib/ui/stdtoolbars.inc:816 msgid "ngeqslant" msgstr "ngeqslant" -#: lib/ui/stdtoolbars.inc:824 +#: lib/ui/stdtoolbars.inc:817 msgid "nleqq" msgstr "nleqq" -#: lib/ui/stdtoolbars.inc:825 +#: lib/ui/stdtoolbars.inc:818 msgid "ngeqq" msgstr "ngeqq" -#: lib/ui/stdtoolbars.inc:826 +#: lib/ui/stdtoolbars.inc:819 msgid "lneq" msgstr "lneq" -#: lib/ui/stdtoolbars.inc:827 +#: lib/ui/stdtoolbars.inc:820 msgid "gneq" msgstr "gneq" -#: lib/ui/stdtoolbars.inc:828 +#: lib/ui/stdtoolbars.inc:821 msgid "lneqq" msgstr "lneqq" -#: lib/ui/stdtoolbars.inc:829 +#: lib/ui/stdtoolbars.inc:822 msgid "gneqq" msgstr "gneqq" -#: lib/ui/stdtoolbars.inc:830 +#: lib/ui/stdtoolbars.inc:823 msgid "lvertneqq" msgstr "lvertneqq" -#: lib/ui/stdtoolbars.inc:831 +#: lib/ui/stdtoolbars.inc:824 msgid "gvertneqq" msgstr "gvertneqq" -#: lib/ui/stdtoolbars.inc:832 +#: lib/ui/stdtoolbars.inc:825 msgid "lnsim" msgstr "lnsim" -#: lib/ui/stdtoolbars.inc:833 +#: lib/ui/stdtoolbars.inc:826 msgid "gnsim" msgstr "gnsim" -#: lib/ui/stdtoolbars.inc:834 +#: lib/ui/stdtoolbars.inc:827 msgid "lnapprox" msgstr "lnapprox" -#: lib/ui/stdtoolbars.inc:835 +#: lib/ui/stdtoolbars.inc:828 msgid "gnapprox" msgstr "gnapprox" -#: lib/ui/stdtoolbars.inc:836 +#: lib/ui/stdtoolbars.inc:829 msgid "nprec" msgstr "nprec" -#: lib/ui/stdtoolbars.inc:837 +#: lib/ui/stdtoolbars.inc:830 msgid "nsucc" msgstr "nsucc" -#: lib/ui/stdtoolbars.inc:838 +#: lib/ui/stdtoolbars.inc:831 msgid "npreceq" msgstr "npreceq" -#: lib/ui/stdtoolbars.inc:839 +#: lib/ui/stdtoolbars.inc:832 msgid "nsucceq" msgstr "nsucceq" -#: lib/ui/stdtoolbars.inc:840 +#: lib/ui/stdtoolbars.inc:833 msgid "precnsim" msgstr "precnsim" -#: lib/ui/stdtoolbars.inc:841 +#: lib/ui/stdtoolbars.inc:834 msgid "succnsim" msgstr "succnsim" -#: lib/ui/stdtoolbars.inc:842 +#: lib/ui/stdtoolbars.inc:835 msgid "precnapprox" msgstr "precnapprox" -#: lib/ui/stdtoolbars.inc:843 +#: lib/ui/stdtoolbars.inc:836 msgid "succnapprox" msgstr "succnapprox" -#: lib/ui/stdtoolbars.inc:844 +#: lib/ui/stdtoolbars.inc:837 msgid "subsetneq" msgstr "subsetneq" -#: lib/ui/stdtoolbars.inc:845 +#: lib/ui/stdtoolbars.inc:838 msgid "supsetneq" msgstr "supsetneq" -#: lib/ui/stdtoolbars.inc:846 +#: lib/ui/stdtoolbars.inc:839 msgid "subsetneqq" msgstr "subsetneqq" -#: lib/ui/stdtoolbars.inc:847 +#: lib/ui/stdtoolbars.inc:840 msgid "supsetneqq" msgstr "supsetneqq" -#: lib/ui/stdtoolbars.inc:848 +#: lib/ui/stdtoolbars.inc:841 msgid "nsubseteq" msgstr "nsubseteq" -#: lib/ui/stdtoolbars.inc:849 +#: lib/ui/stdtoolbars.inc:842 msgid "nsupseteq" msgstr "nsupseteq" -#: lib/ui/stdtoolbars.inc:850 +#: lib/ui/stdtoolbars.inc:843 msgid "nsupseteqq" msgstr "nsupseteqq" -#: lib/ui/stdtoolbars.inc:851 +#: lib/ui/stdtoolbars.inc:844 msgid "nvdash" msgstr "nvdash" -#: lib/ui/stdtoolbars.inc:852 +#: lib/ui/stdtoolbars.inc:845 msgid "nvDash" msgstr "nvDash" -#: lib/ui/stdtoolbars.inc:853 +#: lib/ui/stdtoolbars.inc:846 msgid "nVDash" msgstr "nVDash" -#: lib/ui/stdtoolbars.inc:854 +#: lib/ui/stdtoolbars.inc:847 msgid "varsubsetneq" msgstr "varsubsetneq" -#: lib/ui/stdtoolbars.inc:855 +#: lib/ui/stdtoolbars.inc:848 msgid "varsupsetneq" msgstr "varsupsetneq" -#: lib/ui/stdtoolbars.inc:856 +#: lib/ui/stdtoolbars.inc:849 msgid "varsubsetneqq" msgstr "varsubsetneqq" -#: lib/ui/stdtoolbars.inc:857 +#: lib/ui/stdtoolbars.inc:850 msgid "varsupsetneqq" msgstr "varsupsetneqq" -#: lib/ui/stdtoolbars.inc:858 +#: lib/ui/stdtoolbars.inc:851 msgid "ntriangleleft" msgstr "ntriangleleft" -#: lib/ui/stdtoolbars.inc:859 +#: lib/ui/stdtoolbars.inc:852 msgid "ntriangleright" msgstr "ntriangleright" -#: lib/ui/stdtoolbars.inc:860 +#: lib/ui/stdtoolbars.inc:853 msgid "ntrianglelefteq" msgstr "ntrianglelefteq" -#: lib/ui/stdtoolbars.inc:861 +#: lib/ui/stdtoolbars.inc:854 msgid "ntrianglerighteq" msgstr "ntrianglerighteq" -#: lib/ui/stdtoolbars.inc:862 +#: lib/ui/stdtoolbars.inc:855 msgid "ncong" msgstr "ncong" -#: lib/ui/stdtoolbars.inc:863 +#: lib/ui/stdtoolbars.inc:856 msgid "nsim" msgstr "nsim" -#: lib/ui/stdtoolbars.inc:864 +#: lib/ui/stdtoolbars.inc:857 msgid "nmid" msgstr "nmid" -#: lib/ui/stdtoolbars.inc:865 +#: lib/ui/stdtoolbars.inc:858 msgid "nshortmid" msgstr "nshortmid" -#: lib/ui/stdtoolbars.inc:866 +#: lib/ui/stdtoolbars.inc:859 msgid "nparallel" msgstr "nparallel" -#: lib/ui/stdtoolbars.inc:867 +#: lib/ui/stdtoolbars.inc:860 msgid "nshortparallel" msgstr "nshortparallel" -#: lib/ui/stdtoolbars.inc:870 +#: lib/ui/stdtoolbars.inc:863 msgid "AMS Operators" msgstr "Opérateurs AMS" -#: lib/ui/stdtoolbars.inc:871 +#: lib/ui/stdtoolbars.inc:864 msgid "dotplus" msgstr "dotplus" -#: lib/ui/stdtoolbars.inc:872 +#: lib/ui/stdtoolbars.inc:865 msgid "smallsetminus" msgstr "smallsetminus" -#: lib/ui/stdtoolbars.inc:873 +#: lib/ui/stdtoolbars.inc:866 msgid "Cap" msgstr "Cap" -#: lib/ui/stdtoolbars.inc:874 +#: lib/ui/stdtoolbars.inc:867 msgid "Cup" msgstr "Cup" -#: lib/ui/stdtoolbars.inc:875 +#: lib/ui/stdtoolbars.inc:868 msgid "barwedge" msgstr "barwedge" -#: lib/ui/stdtoolbars.inc:876 +#: lib/ui/stdtoolbars.inc:869 msgid "veebar" msgstr "veebar" -#: lib/ui/stdtoolbars.inc:877 +#: lib/ui/stdtoolbars.inc:870 msgid "doublebarwedge" msgstr "doublebarwedge" -#: lib/ui/stdtoolbars.inc:878 +#: lib/ui/stdtoolbars.inc:871 msgid "boxminus" msgstr "boxminus" -#: lib/ui/stdtoolbars.inc:879 +#: lib/ui/stdtoolbars.inc:872 msgid "boxtimes" msgstr "boxtimes" -#: lib/ui/stdtoolbars.inc:880 +#: lib/ui/stdtoolbars.inc:873 msgid "boxdot" msgstr "boxdot" -#: lib/ui/stdtoolbars.inc:881 +#: lib/ui/stdtoolbars.inc:874 msgid "boxplus" msgstr "boxplus" -#: lib/ui/stdtoolbars.inc:882 +#: lib/ui/stdtoolbars.inc:875 msgid "divideontimes" msgstr "divideontimes" -#: lib/ui/stdtoolbars.inc:883 +#: lib/ui/stdtoolbars.inc:876 msgid "ltimes" msgstr "ltimes" -#: lib/ui/stdtoolbars.inc:884 +#: lib/ui/stdtoolbars.inc:877 msgid "rtimes" msgstr "rtimes" -#: lib/ui/stdtoolbars.inc:885 +#: lib/ui/stdtoolbars.inc:878 msgid "leftthreetimes" msgstr "leftthreetimes" -#: lib/ui/stdtoolbars.inc:886 +#: lib/ui/stdtoolbars.inc:879 msgid "rightthreetimes" msgstr "rightthreetimes" -#: lib/ui/stdtoolbars.inc:887 +#: lib/ui/stdtoolbars.inc:880 msgid "curlywedge" msgstr "curlywedge" -#: lib/ui/stdtoolbars.inc:888 +#: lib/ui/stdtoolbars.inc:881 msgid "curlyvee" msgstr "curlyvee" -#: lib/ui/stdtoolbars.inc:889 +#: lib/ui/stdtoolbars.inc:882 msgid "circleddash" msgstr "circleddash" -#: lib/ui/stdtoolbars.inc:890 +#: lib/ui/stdtoolbars.inc:883 msgid "circledast" msgstr "circledast" -#: lib/ui/stdtoolbars.inc:891 +#: lib/ui/stdtoolbars.inc:884 msgid "circledcirc" msgstr "circledcirc" -#: lib/ui/stdtoolbars.inc:892 +#: lib/ui/stdtoolbars.inc:885 msgid "centerdot" msgstr "centerdot" -#: lib/ui/stdtoolbars.inc:893 +#: lib/ui/stdtoolbars.inc:886 msgid "intercal" msgstr "intercal" @@ -16863,7 +17499,8 @@ msgstr "intercal" msgid "GnumericSpreadsheet" msgstr "TableurGnumeric" -#: lib/external_templates:37 lib/external_templates:44 +#: lib/external_templates:37 +#: lib/external_templates:44 msgid "Spreadsheet" msgstr "Tableur" @@ -16885,10 +17522,10 @@ msgstr "" msgid "RasterImage" msgstr "ImageTramée" -#: lib/external_templates:79 lib/external_templates:85 -#, fuzzy -msgid "Raster image" -msgstr "ImageTramée" +#: lib/external_templates:79 +#: lib/external_templates:85 +msgid "Bitmap: $$AbsOrRelPathParent$$Basename" +msgstr "Bitmap: $$AbsOrRelPathParent$$Basename" # Je n'aime pas bitmap #: lib/external_templates:84 @@ -16899,10 +17536,10 @@ msgstr "Un fichier bitmap.\n" msgid "XFig" msgstr "XFig" -#: lib/external_templates:149 lib/external_templates:152 -#, fuzzy -msgid "Xfig figure" -msgstr "Une figure Xfig.\n" +#: lib/external_templates:149 +#: lib/external_templates:152 +msgid "Xfig: $$AbsOrRelPathParent$$Basename" +msgstr "Xfig: $$AbsOrRelPathParent$$Basename" #: lib/external_templates:151 msgid "An Xfig figure.\n" @@ -16912,10 +17549,10 @@ msgstr "Une figure Xfig.\n" msgid "ChessDiagram" msgstr "Échiquier" -#: lib/external_templates:202 lib/external_templates:221 -#, fuzzy -msgid "Chess diagram" -msgstr "Échiquier" +#: lib/external_templates:202 +#: lib/external_templates:221 +msgid "Chess: $$AbsOrRelPathParent$$Basename" +msgstr "Échiquier : $$AbsOrRelPathParent$$Basename" # XBoard (WinBoard sous Windows) est peut-être traduit en français ? #: lib/external_templates:204 @@ -16944,13 +17581,13 @@ msgstr "" "la position que vous voulez afficher.\n" "Assurez vois de bien lui donner une extension en '.fen'\n" "et un nom qui soit relatif à l'endroit où se trouve le document LyX.\n" -"Dans XBoard, utilisez 'Edit->Edit Position' pour autoriser lamodification " -"générale de l'échiquier.\n" +"Dans XBoard, utilisez 'Edit->Edit Position' pour autoriser lamodification générale de l'échiquier.\n" "Vous pouvez aussi activer l'option 'Option->Test Legality',\n" "et rappelez-vous que vous pouvez cliquer sur les boutons du\n" "milieu et de droite pour ajouter de nouvelles pièces sur l'échiquier.\n" -#: lib/external_templates:252 lib/external_templates:258 +#: lib/external_templates:252 +#: lib/external_templates:258 msgid "Lilypond typeset music" msgstr "Musique mise en forme avec Lilypond" @@ -16970,10 +17607,10 @@ msgstr "" msgid "PDFPages" msgstr "PDFPages" -#: lib/external_templates:301 lib/external_templates:315 -#, fuzzy -msgid "PDF pages" -msgstr "PDFPages" +#: lib/external_templates:301 +#: lib/external_templates:315 +msgid "PDF pages: $$AbsOrRelPathParent$$Basename" +msgstr "PDF pages : $$AbsOrRelPathParent$$Basename" #: lib/external_templates:303 msgid "" @@ -17015,448 +17652,468 @@ msgstr "" msgid "Dia" msgstr "Dia" -#: lib/external_templates:376 lib/external_templates:379 -#, fuzzy -msgid "Dia diagram" -msgstr "Diagramme Dia.\n" +#: lib/external_templates:376 +#: lib/external_templates:379 +msgid "Dia: $$AbsOrRelPathParent$$Basename" +msgstr "Dia : $$AbsOrRelPathParent$$Basename" #: lib/external_templates:378 msgid "Dia diagram.\n" msgstr "Diagramme Dia.\n" -#: lib/configure.py:487 -#, fuzzy -msgid "tgo" -msgstr "top" - -#: lib/configure.py:487 -#, fuzzy -msgid "tgo|Tgif" +#: lib/configure.py:528 +msgid "Tgif" msgstr "Tgif" -#: lib/configure.py:490 +#: lib/configure.py:531 msgid "FIG" msgstr "FIG" -#: lib/configure.py:493 +#: lib/configure.py:534 msgid "DIA" msgstr "DIA" -#: lib/configure.py:496 -msgid "sxd" -msgstr "" - -#: lib/configure.py:496 -msgid "sxd|OpenOffice" -msgstr "" - -#: lib/configure.py:499 +#: lib/configure.py:537 msgid "Grace" msgstr "Grace" -#: lib/configure.py:502 +#: lib/configure.py:540 msgid "FEN" msgstr "FEN" -#: lib/configure.py:505 +#: lib/configure.py:543 msgid "SVG" msgstr "SVG" -#: lib/configure.py:507 +#: lib/configure.py:546 +#: lib/configure.py:557 +#: lib/configure.py:567 msgid "BMP" msgstr "BMP" -#: lib/configure.py:508 +#: lib/configure.py:547 +#: lib/configure.py:558 +#: lib/configure.py:568 msgid "GIF" msgstr "GIF" -#: lib/configure.py:509 -msgid "jpeg" -msgstr "" - -#: lib/configure.py:509 -#, fuzzy -msgid "jpeg|JPEG" +#: lib/configure.py:548 +#: lib/configure.py:559 +#: lib/configure.py:569 +#: src/frontends/qt4/GuiClipboard.cpp:172 +msgid "JPEG" msgstr "JPEG" -#: lib/configure.py:510 +#: lib/configure.py:549 +#: lib/configure.py:560 +#: lib/configure.py:570 msgid "PBM" msgstr "PBM" -#: lib/configure.py:511 +#: lib/configure.py:550 +#: lib/configure.py:561 +#: lib/configure.py:571 msgid "PGM" msgstr "PGM" -#: lib/configure.py:512 src/frontends/qt4/GuiClipboard.cpp:171 +#: lib/configure.py:551 +#: lib/configure.py:562 +#: lib/configure.py:572 +#: src/frontends/qt4/GuiClipboard.cpp:171 msgid "PNG" msgstr "PNG" -#: lib/configure.py:513 +#: lib/configure.py:552 +#: lib/configure.py:563 +#: lib/configure.py:573 msgid "PPM" msgstr "PPM" -#: lib/configure.py:514 +#: lib/configure.py:553 +#: lib/configure.py:564 +#: lib/configure.py:574 msgid "TIFF" msgstr "TIFF" -#: lib/configure.py:515 +#: lib/configure.py:554 +#: lib/configure.py:565 +#: lib/configure.py:575 msgid "XBM" msgstr "XBM" -#: lib/configure.py:516 +#: lib/configure.py:555 +#: lib/configure.py:566 +#: lib/configure.py:576 msgid "XPM" msgstr "XPM" -#: lib/configure.py:524 +#: lib/configure.py:581 msgid "Plain text (chess output)" msgstr "Texte brut (échecs)" -#: lib/configure.py:525 +#: lib/configure.py:582 msgid "Plain text (image)" msgstr "Texte brut (image)" -#: lib/configure.py:526 +#: lib/configure.py:583 msgid "Plain text (Xfig output)" msgstr "Texte brut (Xfig)" -#: lib/configure.py:527 +#: lib/configure.py:584 msgid "date (output)" msgstr "date (sortie)" -#: lib/configure.py:528 src/frontends/qt4/GuiErrorList.cpp:42 +#: lib/configure.py:585 +#: src/frontends/qt4/GuiErrorList.cpp:42 msgid "DocBook" msgstr "DocBook" -#: lib/configure.py:528 +#: lib/configure.py:585 msgid "DocBook|B" msgstr "DocBook|B" -#: lib/configure.py:529 +#: lib/configure.py:586 msgid "DocBook (XML)" msgstr "DocBook (XML)" -#: lib/configure.py:530 +#: lib/configure.py:587 msgid "Graphviz Dot" msgstr "Graphviz Dot" -#: lib/configure.py:531 -#, fuzzy -msgid "LaTeX (dviluatex)" -msgstr "LaTeX (pdflatex)" - -#: lib/configure.py:532 +#: lib/configure.py:588 msgid "LaTeX (pLaTeX)" msgstr "LaTeX (pLaTeX)" -#: lib/configure.py:533 +#: lib/configure.py:589 msgid "NoWeb" msgstr "NoWeb" -#: lib/configure.py:533 +#: lib/configure.py:589 msgid "NoWeb|N" msgstr "NoWeb|N" -#: lib/configure.py:534 +#: lib/configure.py:590 msgid "Sweave|S" msgstr "Sweave|S" -#: lib/configure.py:535 +#: lib/configure.py:591 msgid "R/S code" msgstr "R/S code" -#: lib/configure.py:537 +#: lib/configure.py:593 msgid "LilyPond music" msgstr "Format musical LilyPond" -#: lib/configure.py:538 +#: lib/configure.py:594 msgid "LilyPond book (LaTeX)" msgstr "Livre LilyPond (LaTeX)" -#: lib/configure.py:539 +#: lib/configure.py:595 msgid "LaTeX (plain)" msgstr "LaTeX (standard)" -#: lib/configure.py:539 +#: lib/configure.py:595 msgid "LaTeX (plain)|L" msgstr "LaTeX (standard)|L" -#: lib/configure.py:540 +#: lib/configure.py:596 msgid "LaTeX (LuaTeX)" msgstr "LaTeX (LuaTeX)" -#: lib/configure.py:541 +#: lib/configure.py:597 msgid "LaTeX (pdflatex)" msgstr "LaTeX (pdflatex)" -#: lib/configure.py:542 +#: lib/configure.py:598 +msgid "LaTeX (dviluatex)" +msgstr "LaTeX (dviluatex)" + +#: lib/configure.py:599 msgid "LaTeX (XeTeX)" msgstr "LaTeX (XeTeX)" -#: lib/configure.py:543 +#: lib/configure.py:600 msgid "Plain text" msgstr "Texte brut" -#: lib/configure.py:543 +#: lib/configure.py:600 msgid "Plain text|a" msgstr "Texte brut|r" -#: lib/configure.py:544 +#: lib/configure.py:601 msgid "Plain text (pstotext)" msgstr "Texte brut (pstotext)" -#: lib/configure.py:545 +#: lib/configure.py:602 msgid "Plain text (ps2ascii)" msgstr "Texte brut (ps2ascii)" -#: lib/configure.py:546 +#: lib/configure.py:603 msgid "Plain text (catdvi)" msgstr "Texte brut (catdvi)" -#: lib/configure.py:547 +#: lib/configure.py:604 msgid "Plain Text, Join Lines" msgstr "Texte brut par Lignes" -#: lib/configure.py:550 +#: lib/configure.py:605 +msgid "Info (Beamer)" +msgstr "Info (Beamer)" + +#: lib/configure.py:608 msgid "Gnumeric spreadsheet" msgstr "Tableur Gnumeric" -#: lib/configure.py:551 +#: lib/configure.py:609 msgid "Excel spreadsheet" msgstr "Tableur Excel" -#: lib/configure.py:552 +#: lib/configure.py:610 msgid "OpenOffice spreadsheet" msgstr "Tableur Openoffice" -#: lib/configure.py:555 +#: lib/configure.py:613 +#: lib/configure.py:615 msgid "LyXHTML" msgstr "LyXHTML" -#: lib/configure.py:555 +#: lib/configure.py:613 +#: lib/configure.py:615 msgid "LyXHTML|y" msgstr "LyXHTML|y" -#: lib/configure.py:562 src/frontends/qt4/GuiLog.cpp:230 +#: lib/configure.py:623 +#: src/frontends/qt4/GuiLog.cpp:230 msgid "BibTeX" msgstr "BibTeX" -#: lib/configure.py:567 +#: lib/configure.py:628 msgid "EPS" msgstr "EPS" -#: lib/configure.py:568 -msgid "EPS (uncropped)" -msgstr "" - -#: lib/configure.py:569 +#: lib/configure.py:629 msgid "Postscript" msgstr "Postscript" -#: lib/configure.py:569 +#: lib/configure.py:629 msgid "Postscript|t" msgstr "Postscript|t" -#: lib/configure.py:573 +#: lib/configure.py:633 msgid "PDF (ps2pdf)" msgstr "PDF (ps2pdf)" -#: lib/configure.py:573 +#: lib/configure.py:633 msgid "PDF (ps2pdf)|P" msgstr "PDF (ps2pdf)|P" -#: lib/configure.py:574 +#: lib/configure.py:634 msgid "PDF (pdflatex)" msgstr "PDF (pdflatex)" -#: lib/configure.py:574 +#: lib/configure.py:634 msgid "PDF (pdflatex)|F" msgstr "PDF (pdflatex)|F" -#: lib/configure.py:575 +#: lib/configure.py:635 msgid "PDF (dvipdfm)" msgstr "PDF (dvipdfm)" -#: lib/configure.py:575 +#: lib/configure.py:635 msgid "PDF (dvipdfm)|m" msgstr "PDF (dvipdfm)|m" -#: lib/configure.py:576 +#: lib/configure.py:636 msgid "PDF (XeTeX)" msgstr "PDF (XeTeX)" -#: lib/configure.py:576 +#: lib/configure.py:636 msgid "PDF (XeTeX)|X" msgstr "PDF (XeTeX)|X" -#: lib/configure.py:577 +#: lib/configure.py:637 msgid "PDF (LuaTeX)" msgstr "PDF (LuaTeX)" -#: lib/configure.py:577 +#: lib/configure.py:637 msgid "PDF (LuaTeX)|u" msgstr "PDF (LuaTeX)|u" -#: lib/configure.py:580 +#: lib/configure.py:640 msgid "DVI" msgstr "DVI" -#: lib/configure.py:580 +#: lib/configure.py:640 msgid "DVI|D" msgstr "DVI|D" -#: lib/configure.py:581 +#: lib/configure.py:641 msgid "DVI (LuaTeX)" msgstr "DVI (LuaTeX)" -#: lib/configure.py:581 +#: lib/configure.py:641 msgid "DVI (LuaTeX)|V" msgstr "DVI (LuaTeX)|V" -#: lib/configure.py:584 +#: lib/configure.py:644 msgid "DraftDVI" msgstr "BrouillonDVI" -#: lib/configure.py:587 lib/configure.py:619 -#, fuzzy -msgid "htm" -msgstr "hom" +#: lib/configure.py:647 +msgid "HTML|H" +msgstr "HTML|H" -#: lib/configure.py:587 lib/configure.py:619 -#, fuzzy -msgid "htm|HTML" -msgstr "HTML" - -#: lib/configure.py:590 +#: lib/configure.py:650 msgid "Noteedit" msgstr "Noteedit" -#: lib/configure.py:593 +#: lib/configure.py:653 msgid "OpenDocument" msgstr "OpenDocument" -#: lib/configure.py:594 +#: lib/configure.py:654 msgid "OpenOffice.Org (sxw)" msgstr "OpenOffice.Org (sxw)" -#: lib/configure.py:597 +#: lib/configure.py:657 msgid "Rich Text Format" msgstr "Rich Text Format" -#: lib/configure.py:598 +#: lib/configure.py:658 msgid "MS Word" msgstr "MS Word" -#: lib/configure.py:598 +#: lib/configure.py:658 msgid "MS Word|W" msgstr "MS Word|W" -#: lib/configure.py:601 +#: lib/configure.py:661 msgid "date command" msgstr "commande 'date'" -#: lib/configure.py:602 +#: lib/configure.py:662 msgid "Table (CSV)" msgstr "Tableau (CSV)" -#: lib/configure.py:604 src/frontends/qt4/GuiView.cpp:1182 -#: src/frontends/qt4/GuiView.cpp:1183 src/mathed/MathMacroTemplate.cpp:543 +#: lib/configure.py:664 +#: src/frontends/qt4/GuiView.cpp:1150 +#: src/frontends/qt4/GuiView.cpp:1151 +#: src/mathed/MathMacroTemplate.cpp:543 msgid "LyX" msgstr "LyX" -#: lib/configure.py:605 +#: lib/configure.py:665 msgid "LyX 1.3.x" msgstr "LyX 1.3.x" -#: lib/configure.py:606 +#: lib/configure.py:666 msgid "LyX 1.4.x" msgstr "LyX 1.4.x" -#: lib/configure.py:607 +#: lib/configure.py:667 msgid "LyX 1.5.x" msgstr "LyX 1.5.x" -#: lib/configure.py:608 +#: lib/configure.py:668 msgid "LyX 1.6.x" msgstr "LyX 1.6.x" -#: lib/configure.py:609 -#, fuzzy -msgid "LyX 2.0.x" -msgstr "LyX 1.3.x" - -#: lib/configure.py:610 +#: lib/configure.py:669 msgid "CJK LyX 1.4.x (big5)" msgstr "CJK LyX 1.4.x (big5)" -#: lib/configure.py:611 +#: lib/configure.py:670 msgid "CJK LyX 1.4.x (euc-jp)" msgstr "CJK LyX 1.4.x (euc-jp)" -#: lib/configure.py:612 +#: lib/configure.py:671 msgid "CJK LyX 1.4.x (euc-kr)" msgstr "CJK LyX 1.4.x (euc-kr)" -#: lib/configure.py:613 +#: lib/configure.py:672 msgid "LyX Preview" msgstr "Aperçu" -#: lib/configure.py:614 +#: lib/configure.py:673 +msgid "LyX Preview (LilyPond book)" +msgstr "Aperçu LyX (livre LilyPond)" + +#: lib/configure.py:674 +msgid "LyX Preview (pLaTeX)" +msgstr "Aperçu (pLaTeX)" + +#: lib/configure.py:675 msgid "PDFTEX" msgstr "PDFTEX" -#: lib/configure.py:615 +#: lib/configure.py:676 msgid "Program" msgstr "Listing de code source" -#: lib/configure.py:616 +#: lib/configure.py:677 msgid "PSTEX" msgstr "PSTEX" -#: lib/configure.py:617 src/frontends/qt4/GuiClipboard.cpp:168 +#: lib/configure.py:678 +#: src/frontends/qt4/GuiClipboard.cpp:168 msgid "Windows Metafile" msgstr "Métafichier Windows" -#: lib/configure.py:618 src/frontends/qt4/GuiClipboard.cpp:167 +#: lib/configure.py:679 +#: src/frontends/qt4/GuiClipboard.cpp:167 msgid "Enhanced Metafile" msgstr "Métafichier amélioré" -#: lib/configure.py:712 +#: lib/configure.py:680 +msgid "HTML (MS Word)" +msgstr "HTML (MS Word)" + +#: lib/configure.py:776 msgid "LyXBlogger" msgstr "LyxBlogger" -#: lib/configure.py:910 +#: lib/configure.py:985 msgid "LyX Archive (zip)" msgstr "Archive LyX (zip)" -#: lib/configure.py:913 +#: lib/configure.py:988 msgid "LyX Archive (tar.gz)" msgstr "Archive LyX (tar.gz)" -#: src/BiblioInfo.cpp:249 src/frontends/qt4/GuiDocument.cpp:2129 +#: src/BiblioInfo.cpp:247 +#: src/frontends/qt4/GuiDocument.cpp:1973 #, c-format msgid "%1$s and %2$s" msgstr "%1$s et %2$s" -#: src/BiblioInfo.cpp:253 +#: src/BiblioInfo.cpp:251 #, c-format msgid "%1$s et al." msgstr "%1$s et al." -#: src/BiblioInfo.cpp:419 src/BiblioInfo.cpp:458 src/BiblioInfo.cpp:469 -#: src/BiblioInfo.cpp:523 src/BiblioInfo.cpp:527 +#: src/BiblioInfo.cpp:416 +#: src/BiblioInfo.cpp:453 +#: src/BiblioInfo.cpp:464 +#: src/BiblioInfo.cpp:514 +#: src/BiblioInfo.cpp:518 msgid "ERROR!" msgstr "ERREUR !" -#: src/BiblioInfo.cpp:727 src/BiblioInfo.cpp:730 +#: src/BiblioInfo.cpp:657 +#: src/BiblioInfo.cpp:660 msgid "No year" msgstr "Pas d'année" -#: src/BiblioInfo.cpp:745 -#, fuzzy -msgid "Bibliography entry not found!" -msgstr "Construction de la bibliographie" +#: src/BiblioInfo.cpp:733 +#: src/BiblioInfo.cpp:793 +msgid "Add to bibliography only." +msgstr "Ajouter seulement à la bibliographie." -#: src/Buffer.cpp:136 +#: src/BiblioInfo.cpp:789 +msgid "before" +msgstr "avant" + +#: src/Buffer.cpp:137 #, c-format msgid "" "Could not print the document %1$s.\n" @@ -17465,210 +18122,182 @@ msgstr "" "Le document %1$s n'a pas pu être imprimé.\n" "Vérifiez que votre imprimante est réglée correctement." -#: src/Buffer.cpp:139 +#: src/Buffer.cpp:140 msgid "Print document failed" msgstr "Échec de l'impression du document" -#: src/Buffer.cpp:347 +#: src/Buffer.cpp:354 msgid "Disk Error: " msgstr "Erreur disque : " -#: src/Buffer.cpp:348 +#: src/Buffer.cpp:355 #, c-format -msgid "" -"LyX could not create the temporary directory '%1$s' (Disk is full maybe?)" +msgid "LyX could not create the temporary directory '%1$s' (Disk is full maybe?)" msgstr "LyX n'a pu créer le répertoire temporaire %1$s (disque plein ?)" -#: src/Buffer.cpp:459 +#: src/Buffer.cpp:467 msgid "LyX attempted to close a document that had unsaved changes!\n" -msgstr "" -"LyX a tenté de fermer un document comportant des modifications non " -"enregistrées !\n" +msgstr "LyX a tenté de fermer un document comportant des modifications non enregistrées !\n" -#: src/Buffer.cpp:461 +#: src/Buffer.cpp:469 msgid "Attempting to close changed document!" msgstr "Tentative de fermeture d'un document modifié !" -#: src/Buffer.cpp:470 +#: src/Buffer.cpp:478 msgid "Could not remove temporary directory" msgstr "Impossible d'enlever le répertoire temporaire" -#: src/Buffer.cpp:471 +#: src/Buffer.cpp:479 #, c-format msgid "Could not remove the temporary directory %1$s" msgstr "Impossible d'enlever le répertoire temporaire %1$s" -#: src/Buffer.cpp:822 +#: src/Buffer.cpp:831 msgid "Unknown document class" msgstr "Classe de document inconnue" -#: src/Buffer.cpp:823 +#: src/Buffer.cpp:832 #, c-format msgid "Using the default document class, because the class %1$s is unknown." -msgstr "" -"Utilise la classe de document implicite, parce que la classe %1$s est " -"inconnue." +msgstr "Utilise la classe de document implicite, parce que la classe %1$s est inconnue." -#: src/Buffer.cpp:827 src/Text.cpp:509 +#: src/Buffer.cpp:836 +#: src/Text.cpp:487 #, c-format msgid "Unknown token: %1$s %2$s\n" msgstr "Élément inconnu : %1$s %2$s\n" -#: src/Buffer.cpp:831 src/Buffer.cpp:838 src/Buffer.cpp:861 +#: src/Buffer.cpp:840 +#: src/Buffer.cpp:847 +#: src/Buffer.cpp:870 msgid "Document header error" msgstr "Erreur d'en-tête de document" -#: src/Buffer.cpp:837 +#: src/Buffer.cpp:846 msgid "\\begin_header is missing" msgstr "il manque \\begin_header" -#: src/Buffer.cpp:860 +#: src/Buffer.cpp:869 msgid "\\begin_document is missing" msgstr "il manque \\begin_document" -#: src/Buffer.cpp:873 src/Buffer.cpp:879 src/BufferView.cpp:1452 -#: src/BufferView.cpp:1458 +#: src/Buffer.cpp:882 +#: src/Buffer.cpp:888 +#: src/BufferView.cpp:1440 +#: src/BufferView.cpp:1446 msgid "Changes not shown in LaTeX output" msgstr "Modifications non affichées dans la sortie" -#: src/Buffer.cpp:874 src/BufferView.cpp:1453 +#: src/Buffer.cpp:883 +#: src/BufferView.cpp:1441 msgid "" -"Changes will not be highlighted in LaTeX output, because neither dvipost nor " -"xcolor/ulem are installed.\n" -"Please install these packages or redefine \\lyxadded and \\lyxdeleted in the " -"LaTeX preamble." +"Changes will not be highlighted in LaTeX output, because neither dvipost nor xcolor/ulem are installed.\n" +"Please install these packages or redefine \\lyxadded and \\lyxdeleted in the LaTeX preamble." msgstr "" -"Les modifications ne seront pas mises en évidence dans la sortie LaTeX, " -"parce que ni dvipost, ni xcolor/ulem ne sont installés.\n" -"Installer ces paquetages ou redéfinir \\lyxadded et \\lyxdeleted dans le " -"préambule LaTeX." +"Les modifications ne seront pas mises en évidence dans la sortie LaTeX, parce que ni dvipost, ni xcolor/ulem ne sont installés.\n" +"Installer ces paquetages ou redéfinir \\lyxadded et \\lyxdeleted dans le préambule LaTeX." -#: src/Buffer.cpp:880 src/BufferView.cpp:1459 +#: src/Buffer.cpp:889 +#: src/BufferView.cpp:1447 msgid "" -"Changes will not be highlighted in LaTeX output when using pdflatex, because " -"xcolor and ulem are not installed.\n" -"Please install both packages or redefine \\lyxadded and \\lyxdeleted in the " -"LaTeX preamble." +"Changes will not be highlighted in LaTeX output when using pdflatex, because xcolor and ulem are not installed.\n" +"Please install both packages or redefine \\lyxadded and \\lyxdeleted in the LaTeX preamble." msgstr "" -"Les modifications ne seront pas mises en évidence dans la sortie LaTeX si " -"vous utilisez pdflatex, parce que xcolor et ulem ne sont pas installés.\n" -"Installer ces deux paquetages ou redéfinir \\lyxadded et \\lyxdeleted dans " -"le préambule LaTeX." +"Les modifications ne seront pas mises en évidence dans la sortie LaTeX si vous utilisez pdflatex, parce que xcolor et ulem ne sont pas installés.\n" +"Installer ces deux paquetages ou redéfinir \\lyxadded et \\lyxdeleted dans le préambule LaTeX." -#: src/Buffer.cpp:918 src/BufferParams.cpp:411 -#: src/frontends/qt4/GuiLog.cpp:233 src/insets/InsetIndex.cpp:446 -#: src/insets/InsetIndex.cpp:710 +#: src/Buffer.cpp:927 +#: src/BufferParams.cpp:414 +#: src/frontends/qt4/GuiLog.cpp:233 +#: src/insets/InsetIndex.cpp:446 +#: src/insets/InsetIndex.cpp:714 msgid "Index" msgstr "Index" -#: src/Buffer.cpp:972 -#, fuzzy -msgid "File Not Found" -msgstr "Fichier introuvable" - -#: src/Buffer.cpp:973 -#, fuzzy, c-format -msgid "Unable to open file `%1$s'." -msgstr "Impossible d'explorer « %1$s »" - -#: src/Buffer.cpp:996 src/Buffer.cpp:1059 +#: src/Buffer.cpp:1000 +#: src/Buffer.cpp:1044 msgid "Document format failure" msgstr "Problème de format de document" -#: src/Buffer.cpp:997 +#: src/Buffer.cpp:1001 #, c-format msgid "%1$s ended unexpectedly, which means that it is probably corrupted." -msgstr "" -"%1$s se termine de façon inattendue, ce qui signifie qu'il est sans doute " -"corrompu." +msgstr "%1$s se termine de façon inattendue, ce qui signifie qu'il est sans doute corrompu." -#: src/Buffer.cpp:1060 +#: src/Buffer.cpp:1045 #, c-format msgid "%1$s is not a readable LyX document." msgstr "%1$s n'est pas un document LyX consultable." -#: src/Buffer.cpp:1085 +#: src/Buffer.cpp:1070 msgid "Conversion failed" msgstr "Échec conversion" -#: src/Buffer.cpp:1086 +#: src/Buffer.cpp:1071 #, c-format -msgid "" -"%1$s is from a different version of LyX, but a temporary file for converting " -"it could not be created." -msgstr "" -"%1$s est d'une ancienne version de LyX, et la création d'un fichier " -"temporaire de conversion a échoué." +msgid "%1$s is from a different version of LyX, but a temporary file for converting it could not be created." +msgstr "%1$s est d'une ancienne version de LyX, et la création d'un fichier temporaire de conversion a échoué." -#: src/Buffer.cpp:1096 +#: src/Buffer.cpp:1081 msgid "Conversion script not found" msgstr "Script de conversion introuvable" -#: src/Buffer.cpp:1097 +#: src/Buffer.cpp:1082 #, c-format -msgid "" -"%1$s is from a different version of LyX, but the conversion script lyx2lyx " -"could not be found." -msgstr "" -"%1$s est d'une ancienne version de LyX, et le script de conversion lyx2lyx " -"est introuvable." +msgid "%1$s is from a different version of LyX, but the conversion script lyx2lyx could not be found." +msgstr "%1$s est d'une ancienne version de LyX, et le script de conversion lyx2lyx est introuvable." -#: src/Buffer.cpp:1120 src/Buffer.cpp:1127 +#: src/Buffer.cpp:1105 +#: src/Buffer.cpp:1112 msgid "Conversion script failed" msgstr "Échec du script de conversion" -#: src/Buffer.cpp:1121 +#: src/Buffer.cpp:1106 #, c-format -msgid "" -"%1$s is from an older version of LyX and the lyx2lyx script failed to " -"convert it." -msgstr "" -"%1$s vient d'une ancienne version de LyX, et le script lyx2lyx n'a pas " -"réussi à le convertir." +msgid "%1$s is from an older version of LyX and the lyx2lyx script failed to convert it." +msgstr "%1$s vient d'une ancienne version de LyX, et le script lyx2lyx n'a pas réussi à le convertir." -#: src/Buffer.cpp:1128 +#: src/Buffer.cpp:1113 #, c-format -msgid "" -"%1$s is from a newer version of LyX and the lyx2lyx script failed to convert " -"it." -msgstr "" -"%1$s vient d'une version plus récente de LyX, et le script lyx2lyx n'a pas " -"réussi à le convertir." +msgid "%1$s is from a newer version of LyX and the lyx2lyx script failed to convert it." +msgstr "%1$s vient d'une version plus récente de LyX, et le script lyx2lyx n'a pas réussi à le convertir." -#: src/Buffer.cpp:1149 src/Buffer.cpp:3942 src/Buffer.cpp:4004 +#: src/Buffer.cpp:1134 +#: src/Buffer.cpp:3856 +#: src/Buffer.cpp:3918 msgid "File is read-only" msgstr "Fichier en lecture seule" -#: src/Buffer.cpp:1150 +#: src/Buffer.cpp:1135 #, c-format msgid "The file %1$s cannot be written because it is marked as read-only." -msgstr "" -"Le fichier %1$s ne peut pas être écrasé parce qu'il est en lecture seule." +msgstr "Le fichier %1$s ne peut pas être écrasé parce qu'il est en lecture seule." -#: src/Buffer.cpp:1159 +#: src/Buffer.cpp:1144 #, c-format -msgid "" -"Document %1$s has been externally modified. Are you sure you want to " -"overwrite this file?" +msgid "Document %1$s has been externally modified. Are you sure you want to overwrite this file?" msgstr "" "Le document %1$s a été modifié par une application externe.\n" "Êtes-vous sûr de vouloir écrire par dessus ce document ?" -#: src/Buffer.cpp:1161 +#: src/Buffer.cpp:1146 msgid "Overwrite modified file?" msgstr "Écraser le fichier modifié ?" -#: src/Buffer.cpp:1162 src/Buffer.cpp:2467 src/Exporter.cpp:50 -#: src/frontends/qt4/GuiClipboard.cpp:242 src/frontends/qt4/GuiView.cpp:2146 -#: src/frontends/qt4/GuiView.cpp:2311 src/frontends/qt4/GuiView.cpp:2386 +#: src/Buffer.cpp:1147 +#: src/Buffer.cpp:2395 +#: src/Exporter.cpp:50 +#: src/frontends/qt4/GuiClipboard.cpp:242 +#: src/frontends/qt4/GuiView.cpp:2121 +#: src/frontends/qt4/GuiView.cpp:2287 msgid "&Overwrite" msgstr "É&craser" -#: src/Buffer.cpp:1191 +#: src/Buffer.cpp:1176 msgid "Backup failure" msgstr "Échec de la copie de sauvegarde" -#: src/Buffer.cpp:1192 +#: src/Buffer.cpp:1177 #, c-format msgid "" "Cannot create backup file %1$s.\n" @@ -17677,91 +18306,83 @@ msgstr "" "LyX n'a pas pu faire de copie de sauvegarde dans %1$s.\n" "Veuillez vérifier l'existence du répertoire et ses droits d'écriture." -#: src/Buffer.cpp:1223 +#: src/Buffer.cpp:1203 #, c-format msgid "Saving document %1$s..." msgstr "Enregistrement du document %1$s..." -#: src/Buffer.cpp:1238 +#: src/Buffer.cpp:1218 msgid " could not write file!" msgstr " n'a pu enregistrer le fichier !" -#: src/Buffer.cpp:1246 +#: src/Buffer.cpp:1226 msgid " done." msgstr " terminé." -#: src/Buffer.cpp:1261 +#: src/Buffer.cpp:1241 #, c-format msgid "LyX: Attempting to save document %1$s\n" msgstr "LyX : tente de sauvegarder le document %1$s\n" -#: src/Buffer.cpp:1271 src/Buffer.cpp:1284 src/Buffer.cpp:1298 +#: src/Buffer.cpp:1251 +#: src/Buffer.cpp:1264 +#: src/Buffer.cpp:1278 #, c-format msgid "Saved to %1$s. Phew.\n" msgstr "Enregistré comme %1$s. Ouf !\n" -#: src/Buffer.cpp:1274 +#: src/Buffer.cpp:1254 msgid "Save failed! Trying again...\n" msgstr "La sauvegarde a échoué ! LyX essaie encore...\n" -#: src/Buffer.cpp:1288 +#: src/Buffer.cpp:1268 msgid "Save failed! Trying yet again...\n" msgstr "La sauvegarde a échoué ! Nouvel essai...\n" -#: src/Buffer.cpp:1302 +#: src/Buffer.cpp:1282 msgid "Save failed! Bummer. Document is lost." msgstr "La sauvegarde a échoué. Las ! le document est perdu." -#: src/Buffer.cpp:1389 +#: src/Buffer.cpp:1369 msgid "Iconv software exception Detected" msgstr "Détection d'une exception logicielle dans le logiciel iconv" -#: src/Buffer.cpp:1389 +#: src/Buffer.cpp:1369 #, c-format -msgid "" -"Please verify that the support software for your encoding (%1$s) is properly " -"installed" -msgstr "" -"Merci de vérifier que le support pour votre encodage (%1$s) est correctement " -"installé" +msgid "Please verify that the support software for your encoding (%1$s) is properly installed" +msgstr "Merci de vérifier que le support pour votre encodage (%1$s) est correctement installé" -#: src/Buffer.cpp:1419 +#: src/Buffer.cpp:1391 #, c-format msgid "Could not find LaTeX command for character '%1$s' (code point %2$s)" -msgstr "" -"Commande LaTeX pour le caractère '%1$s' introuvable (point %2$s du code)" +msgstr "Commande LaTeX pour le caractère '%1$s' introuvable (point %2$s du code)" -#: src/Buffer.cpp:1422 +#: src/Buffer.cpp:1394 msgid "" -"Some characters of your document are probably not representable in the " -"chosen encoding.\n" +"Some characters of your document are probably not representable in the chosen encoding.\n" "Changing the document encoding to utf8 could help." msgstr "" -"Certains caractères de votre document ne sont probablement pas " -"représentables en utilisant l'encodage choisi.\n" +"Certains caractères de votre document ne sont probablement pas représentables en utilisant l'encodage choisi.\n" "Changer l'encodage du document pour utf8 devrait améliorer les choses." -#: src/Buffer.cpp:1429 +#: src/Buffer.cpp:1401 msgid "iconv conversion failed" msgstr "Échec conversion iconv" -#: src/Buffer.cpp:1434 +#: src/Buffer.cpp:1406 msgid "conversion failed" msgstr "Échec conversion" -#: src/Buffer.cpp:1525 +#: src/Buffer.cpp:1514 msgid "Uncodable character in file path" msgstr "Caractère incodable dans le chemin d'accès au fichier" -#: src/Buffer.cpp:1527 +#: src/Buffer.cpp:1516 #, c-format msgid "" "The path of your document\n" "(%1$s)\n" -"contains glyphs that are unknown in the current document encoding (namely " -"%2$s). This may result in incomplete output, unless TEXINPUTS contains the " -"document directory and you don't use explicitly relative paths (i.e., paths " -"starting with './' or '../') in the preamble or in ERT.\n" +"contains glyphs that are unknown in the current document encoding (namely %2$s). This may result in incomplete output, unless TEXINPUTS contains the document directory and you don't use explicitly relative paths (i.e., paths starting with './' or '../') in the preamble or in ERT.\n" "\n" "In case of problems, choose an appropriate document encoding\n" "(such as utf8) or change the file path name." @@ -17770,58 +18391,56 @@ msgstr "" "(%1$s)\n" "contient des caractères inconnus \n" "de l'encodage en cours (i. e. %2$s).\n" -"Il en résultera probablement une sortie imprimable incomplète, sauf si " -"TEXINPUTS contient le répertoire du document\n" -"et si vous n'utilisez pas explicitement de chemins relatifs (i.e. des " -"chemins commençant par « ./ » ou « ../ ») dans le préambule ou en code " -"TeX.\n" +"Il en résultera probablement une sortie imprimable incomplète, sauf si TEXINPUTS contient le répertoire du document\n" +"et si vous n'utilisez pas explicitement de chemins relatifs (i.e. des chemins commençant par « ./ » ou « ../ ») dans le préambule ou en code TeX.\n" "\n" -"En cas de difficultés, choisir un encodage de document approprié (par " -"exemple utf8)\n" +"En cas de difficultés, choisir un encodage de document approprié (par exemple utf8)\n" "ou modifier le nom du chemin d'accès au fichier." -#: src/Buffer.cpp:1879 +#: src/Buffer.cpp:1828 msgid "Running chktex..." msgstr "Exécution de chktex..." -#: src/Buffer.cpp:1893 +#: src/Buffer.cpp:1842 msgid "chktex failure" msgstr "échec de chktex" -#: src/Buffer.cpp:1894 +#: src/Buffer.cpp:1843 msgid "Could not run chktex successfully." msgstr "Chktex ne s'est pas exécuté correctement." -#: src/Buffer.cpp:2172 +#: src/Buffer.cpp:2097 #, c-format msgid "Don't know how to export to format: %1$s" msgstr "Pas d'information pour exporter au format : %1$s." -#: src/Buffer.cpp:2236 +#: src/Buffer.cpp:2161 +#: src/frontends/qt4/GuiView.cpp:3130 #, c-format msgid "Error exporting to format: %1$s." msgstr "Erreur à l'exportation au format %1$s." -#: src/Buffer.cpp:2319 +#: src/Buffer.cpp:2244 #, c-format msgid "Branch \"%1$s\" already exists." msgstr "La branche « %1$s » existe déjà." -#: src/Buffer.cpp:2384 +#: src/Buffer.cpp:2309 #, c-format msgid "Unable to parse \"%1$s\"" msgstr "Impossible d'explorer « %1$s »" -#: src/Buffer.cpp:2391 +#: src/Buffer.cpp:2316 #, c-format msgid "Unrecognized target \"%1$s\"" msgstr "Cible « %1$s » inconnue" -#: src/Buffer.cpp:2398 +#: src/Buffer.cpp:2326 msgid "Error exporting to DVI." msgstr "Erreur lors de l'exportation DVI." -#: src/Buffer.cpp:2463 src/Exporter.cpp:45 +#: src/Buffer.cpp:2391 +#: src/Exporter.cpp:45 #, c-format msgid "" "The file %1$s already exists.\n" @@ -17832,83 +18451,86 @@ msgstr "" "\n" "Voulez-vous écraser ce fichier ?" -#: src/Buffer.cpp:2466 src/Exporter.cpp:48 +#: src/Buffer.cpp:2394 +#: src/Exporter.cpp:48 msgid "Overwrite file?" msgstr "Écraser le fichier ?" -#: src/Buffer.cpp:2483 +#: src/Buffer.cpp:2411 msgid "Error running external commands." msgstr "Erreur à l'exécution de commandes externes." -#: src/Buffer.cpp:3292 +#: src/Buffer.cpp:3218 #, c-format msgid "Preview source code for paragraph %1$d" msgstr "Visionner le code LaTeX du paragraphe %1$d" -#: src/Buffer.cpp:3296 +#: src/Buffer.cpp:3222 #, c-format msgid "Preview source code from paragraph %1$s to %2$s" msgstr "Visionner le code LaTeX des paragraphes %1$s à %2$s" -#: src/Buffer.cpp:3326 +#: src/Buffer.cpp:3275 msgid "Preview source code" msgstr "Visionner le code LaTeX" -#: src/Buffer.cpp:3328 -#, fuzzy +#: src/Buffer.cpp:3277 msgid "Preview preamble" -msgstr "Aperçu prêt" +msgstr "Aperçu préambule" -#: src/Buffer.cpp:3330 -#, fuzzy +#: src/Buffer.cpp:3279 msgid "Preview body" -msgstr "Aperçu prêt" +msgstr "Aperçu corps" -#: src/Buffer.cpp:3432 +#: src/Buffer.cpp:3294 +msgid "Plain text does not have a preamble." +msgstr "Le texte brut ne possède pas de préambule." + +#: src/Buffer.cpp:3406 #, c-format msgid "Auto-saving %1$s" msgstr "Sauvegarde automatique de %1$s" -#: src/Buffer.cpp:3486 +#: src/Buffer.cpp:3460 msgid "Autosave failed!" msgstr "La sauvegarde automatique a échoué !" -#: src/Buffer.cpp:3547 +#: src/Buffer.cpp:3521 msgid "Autosaving current document..." msgstr "Sauvegarde automatique du document..." -#: src/Buffer.cpp:3692 +#: src/Buffer.cpp:3611 msgid "Couldn't export file" msgstr "Exportation du fichier impossible" -#: src/Buffer.cpp:3693 +#: src/Buffer.cpp:3612 #, c-format msgid "No information for exporting the format %1$s." msgstr "Pas d'information pour exporter au format %1$s." -#: src/Buffer.cpp:3749 +#: src/Buffer.cpp:3668 msgid "File name error" msgstr "Erreur de nom de fichier" -#: src/Buffer.cpp:3750 +#: src/Buffer.cpp:3669 msgid "The directory path to the document cannot contain spaces." msgstr "Le chemin des répertoires du document ne doit pas contenir d'espaces." -#: src/Buffer.cpp:3849 src/Buffer.cpp:3863 src/frontends/qt4/GuiView.cpp:548 +#: src/Buffer.cpp:3753 msgid "Document export cancelled." msgstr "Export du document annulé." -#: src/Buffer.cpp:3866 +#: src/Buffer.cpp:3763 #, c-format msgid "Document exported as %1$s to file `%2$s'" msgstr "Document exporté en tant que %1$s vers le fichier `%2$s'" -#: src/Buffer.cpp:3873 +#: src/Buffer.cpp:3769 #, c-format msgid "Document exported as %1$s" msgstr "Document exporté en tant que %1$s" -#: src/Buffer.cpp:3928 +#: src/Buffer.cpp:3842 #, c-format msgid "" "An emergency save of the document %1$s exists.\n" @@ -17919,37 +18541,32 @@ msgstr "" "\n" "Voulez-vous récupérer la sauvegarde d'urgence ?" -#: src/Buffer.cpp:3931 +#: src/Buffer.cpp:3845 msgid "Load emergency save?" msgstr "Charger la sauvegarde d'urgence ?" -#: src/Buffer.cpp:3932 +#: src/Buffer.cpp:3846 msgid "&Recover" msgstr "&Récupérer" -#: src/Buffer.cpp:3932 +#: src/Buffer.cpp:3846 msgid "&Load Original" msgstr "&Charger l'original" -#: src/Buffer.cpp:3943 +#: src/Buffer.cpp:3857 #, c-format -msgid "" -"An emergency file is successfully loaded, but the original file %1$s is " -"marked read-only. Please make sure to save the document as a different file." -msgstr "" -"Une sauvegarde d'urgence a été correctement chargée, mais le fichier " -"original %1$s est en lecture seule. Il faudra sauvegarder le document sous " -"un autre nom." +msgid "An emergency file is successfully loaded, but the original file %1$s is marked read-only. Please make sure to save the document as a different file." +msgstr "Une sauvegarde d'urgence a été correctement chargée, mais le fichier original %1$s est en lecture seule. Il faudra sauvegarder le document sous un autre nom." -#: src/Buffer.cpp:3949 +#: src/Buffer.cpp:3863 msgid "Document was successfully recovered." msgstr "Le document a été récupéré correctement." -#: src/Buffer.cpp:3951 +#: src/Buffer.cpp:3865 msgid "Document was NOT successfully recovered." msgstr "Le document n'a PAS été récupéré avec succès." -#: src/Buffer.cpp:3952 +#: src/Buffer.cpp:3866 #, c-format msgid "" "Remove emergency file now?\n" @@ -17958,27 +18575,29 @@ msgstr "" "Supprimer la sauvegarde d'urgence maintenant ?\n" "(%1$s)" -#: src/Buffer.cpp:3956 src/Buffer.cpp:3968 +#: src/Buffer.cpp:3870 +#: src/Buffer.cpp:3882 msgid "Delete emergency file?" msgstr "Supprimer la sauvegarde d'urgence ?" -#: src/Buffer.cpp:3957 src/Buffer.cpp:3970 +#: src/Buffer.cpp:3871 +#: src/Buffer.cpp:3884 msgid "&Keep" msgstr "&Conserver" -#: src/Buffer.cpp:3961 +#: src/Buffer.cpp:3875 msgid "Emergency file deleted" msgstr "Sauvegarde d'urgence supprimée" -#: src/Buffer.cpp:3962 +#: src/Buffer.cpp:3876 msgid "Do not forget to save your file now!" msgstr "N'oubliez pas d'enregistrer votre fichier maintenant !" -#: src/Buffer.cpp:3969 +#: src/Buffer.cpp:3883 msgid "Remove emergency file now?" msgstr "Supprimer la sauvegarde d'urgence maintenant ?" -#: src/Buffer.cpp:3992 +#: src/Buffer.cpp:3906 #, c-format msgid "" "The backup of the document %1$s is newer.\n" @@ -17989,47 +18608,43 @@ msgstr "" "\n" "Voulez-vous charger la sauvegarde automatique ?" -#: src/Buffer.cpp:3994 +#: src/Buffer.cpp:3908 msgid "Load backup?" msgstr "Charger la sauvegarde automatique ?" -#: src/Buffer.cpp:3995 +#: src/Buffer.cpp:3909 msgid "&Load backup" msgstr "&Charger la sauvegarde" -#: src/Buffer.cpp:3995 +#: src/Buffer.cpp:3909 msgid "Load &original" msgstr "Charger l'&original" -#: src/Buffer.cpp:4005 +#: src/Buffer.cpp:3919 #, c-format -msgid "" -"A backup file is successfully loaded, but the original file %1$s is marked " -"read-only. Please make sure to save the document as a different file." -msgstr "" -"Un fichier de sauvegarde a été correctement chargé, mais le fichier " -"original %1$s est en lecture seule. Il faudra sauvegarder le document sous " -"un autre nom." +msgid "A backup file is successfully loaded, but the original file %1$s is marked read-only. Please make sure to save the document as a different file." +msgstr "Un fichier de sauvegarde a été correctement chargé, mais le fichier original %1$s est en lecture seule. Il faudra sauvegarder le document sous un autre nom." -#: src/Buffer.cpp:4345 src/insets/InsetCaption.cpp:326 +#: src/Buffer.cpp:4261 +#: src/insets/InsetCaption.cpp:326 msgid "Senseless!!! " msgstr "Absurde ! " -#: src/Buffer.cpp:4540 +#: src/Buffer.cpp:4461 #, c-format msgid "Document %1$s reloaded." msgstr "Document %1$s rechargé." -#: src/Buffer.cpp:4543 +#: src/Buffer.cpp:4464 #, c-format msgid "Could not reload document %1$s." msgstr "Impossible de recharger le document %1$s." -#: src/Buffer.cpp:4609 +#: src/Buffer.cpp:4531 msgid "Included File Invalid" msgstr "Fichier inclus invalide" -#: src/Buffer.cpp:4610 +#: src/Buffer.cpp:4532 #, c-format msgid "" "Saving this document to a new location has made the file:\n" @@ -18040,7 +18655,7 @@ msgstr "" " %1$s\n" "inaccessible. Vous devrez mettre à jour le nouveau nom du fichier." -#: src/BufferParams.cpp:599 +#: src/BufferParams.cpp:571 #, c-format msgid "" "The selected document class\n" @@ -18063,11 +18678,11 @@ msgstr "" "Voir le paragraphe 3.1.2.2 (Disponibilité des classes) du\n" "Guide de l'Utilisateur pour en savoir plus." -#: src/BufferParams.cpp:608 +#: src/BufferParams.cpp:580 msgid "Document class not available" msgstr "Classe de document non disponible" -#: src/BufferParams.cpp:1973 +#: src/BufferParams.cpp:1985 #, c-format msgid "" "The layout file:\n" @@ -18082,11 +18697,11 @@ msgstr "" "sera utilisée. LyX ne pourra pas produire\n" "un résultat imprimable correct." -#: src/BufferParams.cpp:1979 +#: src/BufferParams.cpp:1991 msgid "Document class not found" msgstr "Classe de document introuvable" -#: src/BufferParams.cpp:1986 +#: src/BufferParams.cpp:1998 #, c-format msgid "" "Due to some error in it, the layout file:\n" @@ -18101,146 +18716,152 @@ msgstr "" "sera utilisée. LyX ne pourra pas produire\n" "un résultat imprimable correct." -#: src/BufferParams.cpp:1992 src/BufferView.cpp:1297 src/BufferView.cpp:1329 +#: src/BufferParams.cpp:2004 +#: src/BufferView.cpp:1285 +#: src/BufferView.cpp:1317 msgid "Could not load class" msgstr "Chargement de la classe impossible" -#: src/BufferParams.cpp:2040 +#: src/BufferParams.cpp:2038 msgid "Error reading internal layout information" msgstr "Erreur de lecture du format interne" -#: src/BufferParams.cpp:2041 src/TextClass.cpp:1496 +#: src/BufferParams.cpp:2039 +#: src/TextClass.cpp:1349 msgid "Read Error" msgstr "Erreur de lecture" -#: src/BufferView.cpp:186 +#: src/BufferView.cpp:188 msgid "No more insets" msgstr "Pas d'autre insert" -#: src/BufferView.cpp:729 +#: src/BufferView.cpp:731 msgid "Save bookmark" msgstr "Enregistrer le signet" -#: src/BufferView.cpp:946 +#: src/BufferView.cpp:948 msgid "Converting document to new document class..." msgstr "Conversion du document vers sa nouvelle classe..." -#: src/BufferView.cpp:989 +#: src/BufferView.cpp:991 msgid "Document is read-only" msgstr "Document en lecture seule" -#: src/BufferView.cpp:998 +#: src/BufferView.cpp:1000 msgid "This portion of the document is deleted." msgstr "Cette portion du document est supprimée." -#: src/BufferView.cpp:1041 src/BufferView.cpp:1966 -#: src/frontends/qt4/GuiView.cpp:3287 src/frontends/qt4/GuiView.cpp:3362 +#: src/BufferView.cpp:1043 +#: src/BufferView.cpp:1930 +#: src/frontends/qt4/GuiView.cpp:3186 +#: src/frontends/qt4/GuiView.cpp:3261 msgid "Absolute filename expected." msgstr "Chemin absolu requis." -#: src/BufferView.cpp:1295 src/BufferView.cpp:1327 +#: src/BufferView.cpp:1283 +#: src/BufferView.cpp:1315 #, c-format msgid "The document class `%1$s' could not be loaded." msgstr "La classe de document « %1$s » n'a pas pu être chargée." -#: src/BufferView.cpp:1350 +#: src/BufferView.cpp:1338 msgid "No further undo information" msgstr "Pas d'information pour Annuler" -#: src/BufferView.cpp:1360 +#: src/BufferView.cpp:1348 msgid "No further redo information" msgstr "Pas d'information pour Refaire" -#: src/BufferView.cpp:1549 src/lyxfind.cpp:378 src/lyxfind.cpp:396 +#: src/BufferView.cpp:1537 +#: src/lyxfind.cpp:375 +#: src/lyxfind.cpp:393 msgid "String not found!" msgstr "Chaîne de caractères introuvable !" -#: src/BufferView.cpp:1592 +#: src/BufferView.cpp:1580 msgid "Mark off" msgstr "Marque désactivée" -#: src/BufferView.cpp:1598 +#: src/BufferView.cpp:1586 msgid "Mark on" msgstr "Marque activée" -#: src/BufferView.cpp:1605 +#: src/BufferView.cpp:1593 msgid "Mark removed" msgstr "Marque enlevée" -#: src/BufferView.cpp:1608 +#: src/BufferView.cpp:1596 msgid "Mark set" msgstr "Marque posée" -#: src/BufferView.cpp:1664 +#: src/BufferView.cpp:1652 msgid "Statistics for the selection:" msgstr "Statistiques pour la sélection :" -#: src/BufferView.cpp:1666 +#: src/BufferView.cpp:1654 msgid "Statistics for the document:" msgstr "Statistiques pour le document :" -#: src/BufferView.cpp:1669 +#: src/BufferView.cpp:1657 #, c-format msgid "%1$d words" msgstr "%1$d mots" -#: src/BufferView.cpp:1671 +#: src/BufferView.cpp:1659 msgid "One word" msgstr "Un mot" -#: src/BufferView.cpp:1674 +#: src/BufferView.cpp:1662 #, c-format msgid "%1$d characters (including blanks)" msgstr "%1$d caractères (espaces inclus)" -#: src/BufferView.cpp:1677 +#: src/BufferView.cpp:1665 msgid "One character (including blanks)" msgstr "Un caractère (espaces inclus)" -#: src/BufferView.cpp:1680 +#: src/BufferView.cpp:1668 #, c-format msgid "%1$d characters (excluding blanks)" msgstr "%1$d caractères (espaces exclus)" -#: src/BufferView.cpp:1683 +#: src/BufferView.cpp:1671 msgid "One character (excluding blanks)" msgstr "Un caractère (espaces exclus)" -#: src/BufferView.cpp:1685 +#: src/BufferView.cpp:1673 msgid "Statistics" msgstr "Statistiques" -#: src/BufferView.cpp:1839 +#: src/BufferView.cpp:1807 #, c-format -msgid "" -"`inset-forall' interrupted because number of actions is larger than %1$d" -msgstr "" -"Interruption de « inset-forall » du fait d'un nombre d'actions supérieur à " -"%1$d" +msgid "`inset-forall' interrupted because number of actions is larger than %1$d" +msgstr "Interruption de « inset-forall » du fait d'un nombre d'actions supérieur à %1$d" -#: src/BufferView.cpp:1841 +#: src/BufferView.cpp:1809 #, c-format msgid "Applied \"%1$s\" to %2$d insets" msgstr " \"%1$s\" appliqué à %2$d inserts" -#: src/BufferView.cpp:1849 +#: src/BufferView.cpp:1817 msgid "Branch name" msgstr "Nom de la branche" -#: src/BufferView.cpp:1856 src/frontends/qt4/GuiBranches.cpp:215 +#: src/BufferView.cpp:1824 +#: src/frontends/qt4/GuiBranches.cpp:218 msgid "Branch already exists" msgstr "La branche existe déjà" -#: src/BufferView.cpp:1992 +#: src/BufferView.cpp:1956 #, c-format msgid "Branch \"%1$s\" does not exist." msgstr "Branche « %1$s » inexistante." -#: src/BufferView.cpp:2316 +#: src/BufferView.cpp:2305 msgid "Inverse Search Failed" msgstr "Échec de la recherche inversée" -#: src/BufferView.cpp:2317 +#: src/BufferView.cpp:2306 msgid "" "Invalid position requested by inverse search.\n" "You need to update the viewed document." @@ -18248,22 +18869,22 @@ msgstr "" "Position requise par la recherche inversée invalide.\n" "Vous devez mettre à jour le document dans la visionneuse." -#: src/BufferView.cpp:2691 +#: src/BufferView.cpp:2685 #, c-format msgid "Inserting document %1$s..." msgstr "Insertion du document %1$s..." -#: src/BufferView.cpp:2702 +#: src/BufferView.cpp:2696 #, c-format msgid "Document %1$s inserted." msgstr "Document %1$s inséré." -#: src/BufferView.cpp:2704 +#: src/BufferView.cpp:2698 #, c-format msgid "Could not insert document %1$s" msgstr "Impossible d'insérer le document %1$s" -#: src/BufferView.cpp:2969 +#: src/BufferView.cpp:2963 #, c-format msgid "" "Could not read the specified document\n" @@ -18274,11 +18895,11 @@ msgstr "" "%1$s\n" "à cause de l'erreur : %2$s" -#: src/BufferView.cpp:2971 +#: src/BufferView.cpp:2965 msgid "Could not read file" msgstr "Lecture du fichier impossible" -#: src/BufferView.cpp:2978 +#: src/BufferView.cpp:2972 #, c-format msgid "" "%1$s\n" @@ -18287,15 +18908,16 @@ msgstr "" "%1$s\n" "est illisible." -#: src/BufferView.cpp:2979 src/output.cpp:39 +#: src/BufferView.cpp:2973 +#: src/output.cpp:39 msgid "Could not open file" msgstr "Ouverture du fichier impossible" -#: src/BufferView.cpp:2986 +#: src/BufferView.cpp:2980 msgid "Reading not UTF-8 encoded file" msgstr "Lecture d'un fichier non encodé en UTF-8" -#: src/BufferView.cpp:2987 +#: src/BufferView.cpp:2981 msgid "" "The file is not UTF-8 encoded.\n" "It will be read as local 8Bit-encoded.\n" @@ -18308,17 +18930,28 @@ msgstr "" "Si cela ne donne pas un résultat satisfaisant\n" "encodez le fichier en UTF-8 en utilisant un programme externe.\n" -#: src/Changes.cpp:363 src/Paragraph.cpp:2564 -#: src/frontends/qt4/LaTeXHighlighter.cpp:108 src/insets/InsetBibitem.cpp:300 -#: src/insets/InsetCommandParams.cpp:390 src/insets/InsetListings.cpp:182 -#: src/insets/InsetListings.cpp:190 src/insets/InsetListings.cpp:212 -#: src/insets/InsetNomencl.cpp:285 src/mathed/InsetMathString.cpp:161 +#: src/Changes.cpp:363 +#: src/Paragraph.cpp:2523 +#: src/frontends/qt4/LaTeXHighlighter.cpp:108 +#: src/insets/InsetBibitem.cpp:300 +#: src/insets/InsetCommandParams.cpp:390 +#: src/insets/InsetHyperlink.cpp:209 +#: src/insets/InsetListings.cpp:182 +#: src/insets/InsetListings.cpp:190 +#: src/insets/InsetListings.cpp:212 +#: src/insets/InsetNomencl.cpp:285 +#: src/mathed/InsetMathString.cpp:161 msgid "LyX Warning: " msgstr "Avertissement LyX : " -#: src/Changes.cpp:364 src/Paragraph.cpp:2565 src/insets/InsetBibitem.cpp:301 -#: src/insets/InsetCommandParams.cpp:391 src/insets/InsetListings.cpp:183 -#: src/insets/InsetListings.cpp:191 src/insets/InsetNomencl.cpp:286 +#: src/Changes.cpp:364 +#: src/Paragraph.cpp:2524 +#: src/insets/InsetBibitem.cpp:301 +#: src/insets/InsetCommandParams.cpp:391 +#: src/insets/InsetHyperlink.cpp:210 +#: src/insets/InsetListings.cpp:183 +#: src/insets/InsetListings.cpp:191 +#: src/insets/InsetNomencl.cpp:286 #: src/mathed/InsetMathString.cpp:162 msgid "uncodable character" msgstr "caractère incodable" @@ -18339,8 +18972,7 @@ msgid "" "or change the spelling of the author name." msgstr "" "Le nom d'auteur '%1$s',\n" -"utilisé pour le suivi de modifications, contient des caractères qui ne " -"peuvent pas être\n" +"utilisé pour le suivi de modifications, contient des caractères qui ne peuvent pas être\n" "représentés avec l'encodage en cours d'utilisation. Ces caractères\n" "seront omis dans le fichier LaTeX exporté.\n" "\n" @@ -18357,8 +18989,9 @@ msgid "ChkTeX warning id # " msgstr "Avertissement ChkTeX n° " # à revoir, accord avec les autres mots incertain -#: src/Color.cpp:201 src/insets/InsetBibtex.cpp:183 -#: src/insets/InsetBibtex.cpp:208 +#: src/Color.cpp:201 +#: src/insets/InsetBibtex.cpp:178 +#: src/insets/InsetBibtex.cpp:203 msgid "none" msgstr "aucune" @@ -18530,7 +19163,8 @@ msgstr "fond mathématique" msgid "graphics background" msgstr "fond graphique" -#: src/Color.cpp:247 src/Color.cpp:251 +#: src/Color.cpp:247 +#: src/Color.cpp:251 msgid "math macro background" msgstr "fond de macro mathématique" @@ -18690,12 +19324,14 @@ msgstr "cadre d'expression régulière" msgid "ignore" msgstr "ignorer" -#: src/Converter.cpp:310 src/Converter.cpp:481 src/Converter.cpp:504 -#: src/Converter.cpp:547 +#: src/Converter.cpp:344 +#: src/Converter.cpp:526 +#: src/Converter.cpp:549 +#: src/Converter.cpp:592 msgid "Cannot convert file" msgstr "Conversion du fichier impossible" -#: src/Converter.cpp:311 +#: src/Converter.cpp:345 #, c-format msgid "" "No information for converting %1$s format files to %2$s.\n" @@ -18705,19 +19341,21 @@ msgstr "" "du format %1$s vers le format %2$s.\n" "Définissez un convertisseur dans les préférences." -#: src/Converter.cpp:432 src/Format.cpp:657 src/Format.cpp:725 +#: src/Converter.cpp:477 +#: src/Format.cpp:317 +#: src/Format.cpp:385 msgid "Executing command: " msgstr "Exécution de la commande : " -#: src/Converter.cpp:476 +#: src/Converter.cpp:521 msgid "Build errors" msgstr "Erreurs de compilation" -#: src/Converter.cpp:477 +#: src/Converter.cpp:522 msgid "There were errors during the build process." msgstr "Il y a eu des erreurs pendant la compilation." -#: src/Converter.cpp:482 +#: src/Converter.cpp:527 #, c-format msgid "" "An error occurred while running:\n" @@ -18726,47 +19364,43 @@ msgstr "" "Une erreur s'est produite lors de l'exécution :\n" "%1$s." -#: src/Converter.cpp:505 +#: src/Converter.cpp:550 #, c-format msgid "Could not move a temporary directory from %1$s to %2$s." msgstr "Impossible de déplacer un répertoire temporaire de %1$s à %2$s." -#: src/Converter.cpp:549 +#: src/Converter.cpp:594 #, c-format msgid "Could not copy a temporary file from %1$s to %2$s." msgstr "Impossible de copier un fichier temporaire de %1$s vers %2$s." -#: src/Converter.cpp:550 +#: src/Converter.cpp:595 #, c-format msgid "Could not move a temporary file from %1$s to %2$s." msgstr "Impossible de déplacer un fichier temporaire de %1$s à %2$s." -#: src/Converter.cpp:606 +#: src/Converter.cpp:651 msgid "Running LaTeX..." msgstr "Exécution de LaTeX..." -#: src/Converter.cpp:625 +#: src/Converter.cpp:670 #, c-format -msgid "" -"LaTeX did not run successfully. Additionally, LyX could not locate the LaTeX " -"log %1$s." -msgstr "" -"LaTeX ne s'est pas exécuté correctement. En plus, LyX n'a pas pu trouver le " -"fichier journal LaTeX %1$s." +msgid "LaTeX did not run successfully. Additionally, LyX could not locate the LaTeX log %1$s." +msgstr "LaTeX ne s'est pas exécuté correctement. En plus, LyX n'a pas pu trouver le fichier journal LaTeX %1$s." -#: src/Converter.cpp:628 +#: src/Converter.cpp:673 msgid "LaTeX failed" msgstr "Échec de LaTeX" -#: src/Converter.cpp:630 +#: src/Converter.cpp:675 msgid "Output is empty" msgstr "La sortie est vide" -#: src/Converter.cpp:631 +#: src/Converter.cpp:676 msgid "An empty output file was generated." msgstr "La fichier de sortie généré est vide." -#: src/CutAndPaste.cpp:347 +#: src/CutAndPaste.cpp:345 #, c-format msgid "" "The pasted branch \"%1$s\" is undefined.\n" @@ -18775,41 +19409,37 @@ msgstr "" "La branche copiée %1$s est indéfinie.\n" "Voulez-vous l'ajouter à la liste des branches du document ?" -#: src/CutAndPaste.cpp:350 +#: src/CutAndPaste.cpp:348 msgid "Unknown branch" msgstr "Branche inconnue" -#: src/CutAndPaste.cpp:351 +#: src/CutAndPaste.cpp:349 msgid "&Don't Add" msgstr "&Ne pas ajouter" -#: src/CutAndPaste.cpp:666 src/Text.cpp:388 +#: src/CutAndPaste.cpp:664 +#: src/Text.cpp:366 #, c-format msgid "Layout `%1$s' was not found." msgstr "Format `%1$s' introuvable." -#: src/CutAndPaste.cpp:668 src/Text.cpp:390 +#: src/CutAndPaste.cpp:666 +#: src/Text.cpp:368 msgid "Layout Not Found" msgstr "Format introuvable" -#: src/CutAndPaste.cpp:696 +#: src/CutAndPaste.cpp:694 #, c-format msgid "Flex inset %1$s is undefined after reloading `%2$s' layout." -msgstr "" -"L'insert flexible %1$s n'est pas défini après rechargement du format « %2$s " -"»." +msgstr "L'insert flexible %1$s n'est pas défini après rechargement du format « %2$s »." -#: src/CutAndPaste.cpp:699 +#: src/CutAndPaste.cpp:697 #, c-format -msgid "" -"Flex inset %1$s is undefined because of conversion from `%2$s' layout to `" -"%3$s'." -msgstr "" -"L'insert flexible %1$s n'est pas défini du fait de la conversion du format « " -"%2$s » vers « %3$s »." +msgid "Flex inset %1$s is undefined because of conversion from `%2$s' layout to `%3$s'." +msgstr "L'insert flexible %1$s n'est pas défini du fait de la conversion du format « %2$s » vers « %3$s »." # à revoir -#: src/CutAndPaste.cpp:704 +#: src/CutAndPaste.cpp:702 msgid "Undefined flex inset" msgstr "Insert flexible indéfini" @@ -18825,29 +19455,32 @@ msgstr "Écraser &tout" msgid "&Cancel export" msgstr "&Annuler l'exportation" -#: src/Exporter.cpp:97 +#: src/Exporter.cpp:96 msgid "Couldn't copy file" msgstr "Copie du fichier impossible" -#: src/Exporter.cpp:98 +#: src/Exporter.cpp:97 #, c-format msgid "Copying %1$s to %2$s failed." msgstr "La copie de %1$s vers %2$s a échoué." -#: src/Font.cpp:59 src/frontends/qt4/GuiCharacter.cpp:121 -#: src/frontends/qt4/GuiDocument.cpp:3390 +#: src/Font.cpp:59 +#: src/frontends/qt4/GuiCharacter.cpp:121 +#: src/frontends/qt4/GuiDocument.cpp:3234 #: src/frontends/qt4/GuiListings.cpp:159 msgid "Roman" msgstr "Romain" -#: src/Font.cpp:59 src/frontends/qt4/GuiCharacter.cpp:122 -#: src/frontends/qt4/GuiDocument.cpp:3390 +#: src/Font.cpp:59 +#: src/frontends/qt4/GuiCharacter.cpp:122 +#: src/frontends/qt4/GuiDocument.cpp:3234 #: src/frontends/qt4/GuiListings.cpp:159 msgid "Sans Serif" msgstr "Sans empattement" -#: src/Font.cpp:59 src/frontends/qt4/GuiCharacter.cpp:123 -#: src/frontends/qt4/GuiDocument.cpp:3390 +#: src/Font.cpp:59 +#: src/frontends/qt4/GuiCharacter.cpp:123 +#: src/frontends/qt4/GuiDocument.cpp:3234 #: src/frontends/qt4/GuiListings.cpp:159 msgid "Typewriter" msgstr "Chasse fixe" @@ -18856,28 +19489,36 @@ msgstr "Chasse fixe" msgid "Symbol" msgstr "Symbole" -#: src/Font.cpp:61 src/Font.cpp:64 src/Font.cpp:67 src/Font.cpp:73 +#: src/Font.cpp:61 +#: src/Font.cpp:64 +#: src/Font.cpp:67 +#: src/Font.cpp:73 #: src/Font.cpp:76 msgid "Inherit" msgstr "Hériter" -#: src/Font.cpp:64 src/frontends/qt4/GuiCharacter.cpp:110 +#: src/Font.cpp:64 +#: src/frontends/qt4/GuiCharacter.cpp:110 msgid "Medium" msgstr "Maigre" -#: src/Font.cpp:64 src/frontends/qt4/GuiCharacter.cpp:111 +#: src/Font.cpp:64 +#: src/frontends/qt4/GuiCharacter.cpp:111 msgid "Bold" msgstr "Grasse" -#: src/Font.cpp:67 src/frontends/qt4/GuiCharacter.cpp:43 +#: src/Font.cpp:67 +#: src/frontends/qt4/GuiCharacter.cpp:43 msgid "Upright" msgstr "Droite" -#: src/Font.cpp:67 src/frontends/qt4/GuiCharacter.cpp:44 +#: src/Font.cpp:67 +#: src/frontends/qt4/GuiCharacter.cpp:44 msgid "Italic" msgstr "Italique" -#: src/Font.cpp:67 src/frontends/qt4/GuiCharacter.cpp:45 +#: src/Font.cpp:67 +#: src/frontends/qt4/GuiCharacter.cpp:45 msgid "Slanted" msgstr "Inclinée" @@ -18885,11 +19526,13 @@ msgstr "Inclinée" msgid "Smallcaps" msgstr "Petites capitales" -#: src/Font.cpp:72 src/frontends/qt4/GuiCharacter.cpp:66 +#: src/Font.cpp:72 +#: src/frontends/qt4/GuiCharacter.cpp:66 msgid "Increase" msgstr "Augmenter" -#: src/Font.cpp:72 src/frontends/qt4/GuiCharacter.cpp:67 +#: src/Font.cpp:72 +#: src/frontends/qt4/GuiCharacter.cpp:67 msgid "Decrease" msgstr "Diminuer" @@ -18937,44 +19580,52 @@ msgstr "Langue : %1$s, " msgid "Number %1$s" msgstr "Numéro %1$s" -#: src/Format.cpp:605 src/Format.cpp:618 src/Format.cpp:628 +#: src/Format.cpp:265 +#: src/Format.cpp:278 +#: src/Format.cpp:288 msgid "Cannot view file" msgstr "Visionnement du fichier impossible" -#: src/Format.cpp:606 src/Format.cpp:673 src/frontends/qt4/GuiView.cpp:3014 +#: src/Format.cpp:266 +#: src/Format.cpp:333 +#: src/frontends/qt4/GuiView.cpp:2915 #, c-format msgid "File does not exist: %1$s" msgstr "Fichier inexistant : %1$s" -#: src/Format.cpp:619 +#: src/Format.cpp:279 #, c-format msgid "No information for viewing %1$s" msgstr "Pas d´information pour visionner %1$s" -#: src/Format.cpp:629 +#: src/Format.cpp:289 #, c-format msgid "Auto-view file %1$s failed" msgstr "Échec de l'auto-vision du fichier %1$s" -#: src/Format.cpp:672 src/Format.cpp:684 src/Format.cpp:697 src/Format.cpp:708 +#: src/Format.cpp:332 +#: src/Format.cpp:344 +#: src/Format.cpp:357 +#: src/Format.cpp:368 msgid "Cannot edit file" msgstr "Modification du fichier impossible" -#: src/Format.cpp:685 +#: src/Format.cpp:345 msgid "LinkBack files can only be edited on Apple Mac OSX." msgstr "Les fichiers LinkBack ne peuvent être modifés que sur Apple Mac OSX." -#: src/Format.cpp:698 +#: src/Format.cpp:358 #, c-format msgid "No information for editing %1$s" msgstr "Pas d´information pour modifier %1$s" -#: src/Format.cpp:709 +#: src/Format.cpp:369 #, c-format msgid "Auto-edit file %1$s failed" msgstr "Échec de l'auto-modification du fichier %1$s" -#: src/KeyMap.cpp:227 src/KeyMap.cpp:242 +#: src/KeyMap.cpp:227 +#: src/KeyMap.cpp:242 msgid "Could not find bind file" msgstr "Fichier de raccourcis (bind) introuvable" @@ -19021,11 +19672,13 @@ msgstr " options : " msgid "Waiting for LaTeX run number %1$d" msgstr "Attend l'exécution LaTeX n°%1$d" -#: src/LaTeX.cpp:266 src/LaTeX.cpp:369 +#: src/LaTeX.cpp:266 +#: src/LaTeX.cpp:369 msgid "Running Index Processor." msgstr "Construction de l'index." -#: src/LaTeX.cpp:292 src/LaTeX.cpp:352 +#: src/LaTeX.cpp:292 +#: src/LaTeX.cpp:352 msgid "Running BibTeX." msgstr "Exécution de BibTeX." @@ -19033,11 +19686,11 @@ msgstr "Exécution de BibTeX." msgid "Running MakeIndex for nomencl." msgstr "Exécution de MakeIndex pour le paquetage nomencl." -#: src/LyX.cpp:120 +#: src/LyX.cpp:121 msgid "Could not read configuration file" msgstr "Lecture du fichier de configuration impossible" -#: src/LyX.cpp:121 +#: src/LyX.cpp:122 #, c-format msgid "" "Error while reading the configuration file\n" @@ -19048,70 +19701,66 @@ msgstr "" "%1$s.\n" "Veuillez vérifier votre installation." -#: src/LyX.cpp:130 +#: src/LyX.cpp:131 msgid "LyX: reconfiguring user directory" msgstr "LyX : reconfiguration du répertoire utilisateur" -#: src/LyX.cpp:134 +#: src/LyX.cpp:135 msgid "Done!" msgstr "Terminé !" -#: src/LyX.cpp:397 +#: src/LyX.cpp:378 msgid "The following files could not be loaded:" msgstr "Les fichiers suivants n'ont pu être chargés :" -#: src/LyX.cpp:434 +#: src/LyX.cpp:415 #, c-format msgid "%1$s does not appear like a LyX created temporary directory." msgstr "%1$s ne semble pas être un répertoire temporaire créé par LyX." -#: src/LyX.cpp:436 +#: src/LyX.cpp:417 msgid "Cannot remove temporary directory" msgstr "Impossible d'enlever le répertoire temporaire" -#: src/LyX.cpp:442 +#: src/LyX.cpp:423 #, c-format msgid "Unable to remove the temporary directory %1$s" msgstr "Impossible d'enlever le répertoire temporaire %1$s" -#: src/LyX.cpp:444 +#: src/LyX.cpp:425 msgid "Unable to remove temporary directory" msgstr "Impossible d'enlever le répertoire temporaire" -#: src/LyX.cpp:472 +#: src/LyX.cpp:454 #, c-format msgid "Wrong command line option `%1$s'. Exiting." msgstr "Mauvaise option de ligne de commande « %1$s ». Sortie du programme." -#: src/LyX.cpp:546 +#: src/LyX.cpp:528 msgid "No textclass is found" msgstr "Classe (textclass) introuvable" # Je n'ai pas tout compris... en plus faut-il traduire textclass ? # textclass->classe -#: src/LyX.cpp:547 -msgid "" -"LyX will only have minimal functionality because no textclasses have been " -"found. You can either try to reconfigure LyX normally, try to reconfigure " -"without checking your LaTeX installation, or continue." -msgstr "" -"LyX aura une fonctionnalité minimale car il n'a pas trouvé de classes de " -"documents. Vous pouvez soit reconfigurer LyX normalement, soit essayer de " -"reconfigurer sans vérifier votre installation LaTeX, soit poursuivre." +#: src/LyX.cpp:529 +msgid "LyX will only have minimal functionality because no textclasses have been found. You can either try to reconfigure LyX normally, try to reconfigure without checking your LaTeX installation, or continue." +msgstr "LyX aura une fonctionnalité minimale car il n'a pas trouvé de classes de documents. Vous pouvez soit reconfigurer LyX normalement, soit essayer de reconfigurer sans vérifier votre installation LaTeX, soit poursuivre." -#: src/LyX.cpp:551 +#: src/LyX.cpp:533 msgid "&Reconfigure" msgstr "&Reconfigurer" -#: src/LyX.cpp:552 +#: src/LyX.cpp:534 msgid "&Without LaTeX" msgstr "&Sans LaTeX" -#: src/LyX.cpp:553 src/VCBackend.cpp:858 src/VCBackend.cpp:862 +#: src/LyX.cpp:535 +#: src/VCBackend.cpp:845 +#: src/VCBackend.cpp:849 msgid "&Continue" msgstr "&Continuer" -#: src/LyX.cpp:656 +#: src/LyX.cpp:638 msgid "" "SIGHUP signal caught!\n" "Bye." @@ -19119,7 +19768,7 @@ msgstr "" "Signal SIGHUP perçu !\n" "Au revoir." -#: src/LyX.cpp:660 +#: src/LyX.cpp:642 msgid "" "SIGFPE signal caught!\n" "Bye." @@ -19127,12 +19776,11 @@ msgstr "" "Signal SIGFPE perçu !\n" "Au revoir." -#: src/LyX.cpp:663 +#: src/LyX.cpp:645 msgid "" "SIGSEGV signal caught!\n" "Sorry, you have found a bug in LyX, hope you have not lost any data.\n" -"Please read the bug-reporting instructions in 'Help->Introduction' and send " -"us a bug report, if necessary. Thanks!\n" +"Please read the bug-reporting instructions in 'Help->Introduction' and send us a bug report, if necessary. Thanks!\n" "Bye." msgstr "" "Signal SIGSEGV perçu !\n" @@ -19142,19 +19790,20 @@ msgstr "" "« Aide->Introduction » et d'envoyer un rapport, si nécessaire.\n" "Merci et au revoir !" -#: src/LyX.cpp:679 +#: src/LyX.cpp:661 msgid "LyX crashed!" msgstr "Crash LyX !" -#: src/LyX.cpp:713 src/frontends/qt4/GuiView.cpp:1018 +#: src/LyX.cpp:695 +#: src/frontends/qt4/GuiView.cpp:989 msgid "LyX: " msgstr "LyX : " -#: src/LyX.cpp:853 +#: src/LyX.cpp:826 msgid "Could not create temporary directory" msgstr "Impossible de créer un répertoire temporaire" -#: src/LyX.cpp:854 +#: src/LyX.cpp:827 #, c-format msgid "" "Could not create a temporary directory in\n" @@ -19166,11 +19815,11 @@ msgstr "" "Vérifier que ce chemin\n" "existe et qu'il est ouvert en écriture, puis réessayer." -#: src/LyX.cpp:937 +#: src/LyX.cpp:910 msgid "Missing user LyX directory" msgstr "Répertoire utilisateur LyX manquant" -#: src/LyX.cpp:938 +#: src/LyX.cpp:911 #, c-format msgid "" "You have specified a non-existent user LyX directory, %1$s.\n" @@ -19179,38 +19828,37 @@ msgstr "" "Vous avez spécifié un répertoire utilisateur LyX inexistant, %1$s.\n" "Ce répertoire est nécessaire pour conserver votre configuration." -#: src/LyX.cpp:943 +#: src/LyX.cpp:916 msgid "&Create directory" msgstr "&Créer un répertoire" -#: src/LyX.cpp:944 +#: src/LyX.cpp:917 msgid "&Exit LyX" msgstr "&Quitter LyX" -#: src/LyX.cpp:945 +#: src/LyX.cpp:918 msgid "No user LyX directory. Exiting." msgstr "Pas de répertoire utilisateur LyX. Sortie du programme." -#: src/LyX.cpp:949 +#: src/LyX.cpp:922 #, c-format msgid "LyX: Creating directory %1$s" msgstr "LyX : création du répertoire %1$s" -#: src/LyX.cpp:954 +#: src/LyX.cpp:927 msgid "Failed to create directory. Exiting." msgstr "Échec de la création du répertoire. Sortie du programme." -#: src/LyX.cpp:1027 +#: src/LyX.cpp:1000 msgid "List of supported debug flags:" msgstr "Liste des options de débogage acceptées :" -#: src/LyX.cpp:1031 +#: src/LyX.cpp:1004 #, c-format msgid "Setting debug level to %1$s" msgstr "Niveau de débogage %1$s" -#: src/LyX.cpp:1042 -#, fuzzy +#: src/LyX.cpp:1015 msgid "" "Usage: lyx [ command line switches ] [ name.lyx ... ]\n" "Command line switches (case sensitive):\n" @@ -19228,20 +19876,14 @@ msgid "" " Look on Tools->Preferences->File formats->Format\n" " to get an idea which parameters should be passed.\n" " Note that the order of -e and -x switches matters.\n" -"\t-E [--export-to] fmt filename\n" -" where fmt is the export format of choice (see --export),\n" -" and filename is the destination filename.\n" "\t-i [--import] fmt file.xxx\n" " where fmt is the import format of choice\n" " and file.xxx is the file to be imported.\n" "\t-f [--force-overwrite] what\n" " where what is either `all', `main' or `none',\n" -" specifying whether all files, main file only, or no " -"files,\n" -" respectively, are to be overwritten during a batch " -"export.\n" -" Anything else is equivalent to `all', but is not " -"consumed.\n" +" specifying whether all files, main file only, or no files,\n" +" respectively, are to be overwritten during a batch export.\n" +" Anything else is equivalent to `all', but is not consumed.\n" "\t-n [--no-remote]\n" " open documents in a new instance\n" "\t-r [--remote]\n" @@ -19271,10 +19913,8 @@ msgstr "" " où fmt est le format d'importation choisi\n" " et fichier.xxx le fichier à importer.\n" "\t-f [--force-overwrite] ceci\n" -" où « ceci » est soit « all », soit « main », soit « none " -"»,\n" -" spécifiant si tous les fichiers, seulement le fichier " -"principal,\n" +" où « ceci » est soit « all », soit « main », soit « none »,\n" +" spécifiant si tous les fichiers, seulement le fichier principal,\n" " ou aucun fichier (respectivement) seront écrasés pendant \n" " une exportation depuis la ligne de commande.\n" " Une chaîne quelconque est équivalente à « all »,\n" @@ -19288,644 +19928,422 @@ msgstr "" "\t-version résumé de la version et de la compilation de LyX.\n" "Voir la page man de LyX pour les détails." -#: src/LyX.cpp:1097 src/support/Package.cpp:589 +#: src/LyX.cpp:1067 +#: src/support/Package.cpp:563 msgid "No system directory" msgstr "Pas de répertoire système" -#: src/LyX.cpp:1098 +#: src/LyX.cpp:1068 msgid "Missing directory for -sysdir switch" msgstr "Il manque un répertoire pour l'option -sysdir" -#: src/LyX.cpp:1109 +#: src/LyX.cpp:1079 msgid "No user directory" msgstr "Pas de répertoire utilisateur" -#: src/LyX.cpp:1110 +#: src/LyX.cpp:1080 msgid "Missing directory for -userdir switch" msgstr "Il manque un répertoire pour l'option -userdir" -#: src/LyX.cpp:1121 +#: src/LyX.cpp:1091 msgid "Incomplete command" msgstr "Commande incomplète" -#: src/LyX.cpp:1122 +#: src/LyX.cpp:1092 msgid "Missing command string after --execute switch" msgstr "Il manque une commande après l'option --execute" -#: src/LyX.cpp:1133 -#, fuzzy -msgid "Missing file type [eg latex, ps...] after --export-to switch" -msgstr "" -"Il manque un type de fichier [par ex. latex, ps...] après l'option --export" - -#: src/LyX.cpp:1138 -#, fuzzy -msgid "Missing destination filename after --export-to switch" -msgstr "" -"Il manque un type de fichier [par ex. latex, ps...] après l'option --export" - -#: src/LyX.cpp:1151 +#: src/LyX.cpp:1103 msgid "Missing file type [eg latex, ps...] after --export switch" -msgstr "" -"Il manque un type de fichier [par ex. latex, ps...] après l'option --export" +msgstr "Il manque un type de fichier [par ex. latex, ps...] après l'option --export" -#: src/LyX.cpp:1164 +#: src/LyX.cpp:1116 msgid "Missing file type [eg latex, ps...] after --import switch" -msgstr "" -"Il manque un type de fichier [par ex. latex, ps...] après l'option --import" +msgstr "Il manque un type de fichier [par ex. latex, ps...] après l'option --import" -#: src/LyX.cpp:1169 +#: src/LyX.cpp:1121 msgid "Missing filename for --import" msgstr "Il manque le nom du fichier à importer pour --import" # Trouver un meilleur exemple ! -#: src/LyXRC.cpp:3063 -msgid "" -"Consider run-together words, such as \"diskdrive\" for \"disk drive\", as " -"legal words?" -msgstr "" -"Autoriser ou non les mots composés accolés, comme « diskdrive » pour « disk " -"drive » ?" - -#: src/LyXRC.cpp:3067 -msgid "" -"Specify an alternate language. The default is to use the language of the " -"document." -msgstr "Spécifier une autre langue. La langue implicite est celle du document." - -#: src/LyXRC.cpp:3075 -msgid "" -"De-select if you don't want the current selection to be replaced " -"automatically by what you type." -msgstr "" -"Désélectionner si vous ne voulez pas que le texte sélectionné soit remplacé " -"automatiquement par ce que vous tapez." - -#: src/LyXRC.cpp:3079 -msgid "" -"De-select if you don't want the class options to be reset to defaults after " -"class change." -msgstr "" -"Désélectionner si vous ne voulez pas que les options de classe soient " -"réinitialisées aux valeurs implicites après un changement de classe." - -#: src/LyXRC.cpp:3083 -msgid "" -"The time interval between auto-saves (in seconds). 0 means no auto-save." -msgstr "" -"Intervalle de temps entre deux sauvegardes automatiques (en secondes). 0 " -"signifie pas de sauvegarde automatique." +#: src/LyXRC.cpp:3086 +msgid "Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?" +msgstr "Autoriser ou non les mots composés accolés, comme « diskdrive » pour « disk drive » ?" #: src/LyXRC.cpp:3090 -msgid "" -"The path for storing backup files. If it is an empty string, LyX will store " -"the backup file in the same directory as the original file." -msgstr "" -"Répertoire dans lequel mettre les copies de sauvegarde. Si laissé vide, LyX " -"mettra la copie de sauvegarde dans le même répertoire que l'original." - -#: src/LyXRC.cpp:3094 -msgid "" -"Define the options of bibtex (cf. man bibtex) or select an alternative " -"compiler (e.g. mlbibtex or bibulus)." -msgstr "" -"Définir les options de bibtex (voir man bibtex) ou sélectionner un autre " -"compilateur (par ex. mlbibtex ou bibulus)." +msgid "Specify an alternate language. The default is to use the language of the document." +msgstr "Spécifier une autre langue. La langue implicite est celle du document." #: src/LyXRC.cpp:3098 +msgid "De-select if you don't want the current selection to be replaced automatically by what you type." +msgstr "Désélectionner si vous ne voulez pas que le texte sélectionné soit remplacé automatiquement par ce que vous tapez." + +#: src/LyXRC.cpp:3102 +msgid "De-select if you don't want the class options to be reset to defaults after class change." +msgstr "Désélectionner si vous ne voulez pas que les options de classe soient réinitialisées aux valeurs implicites après un changement de classe." + +#: src/LyXRC.cpp:3106 +msgid "The time interval between auto-saves (in seconds). 0 means no auto-save." +msgstr "Intervalle de temps entre deux sauvegardes automatiques (en secondes). 0 signifie pas de sauvegarde automatique." + +#: src/LyXRC.cpp:3113 +msgid "The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file." +msgstr "Répertoire dans lequel mettre les copies de sauvegarde. Si laissé vide, LyX mettra la copie de sauvegarde dans le même répertoire que l'original." + +#: src/LyXRC.cpp:3117 +msgid "Define the options of bibtex (cf. man bibtex) or select an alternative compiler (e.g. mlbibtex or bibulus)." +msgstr "Définir les options de bibtex (voir man bibtex) ou sélectionner un autre compilateur (par ex. mlbibtex ou bibulus)." + +#: src/LyXRC.cpp:3121 msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)." msgstr "Définir les options du programme BibTeX pour PLaTeX (LaTeX japonais)." -#: src/LyXRC.cpp:3102 -msgid "" -"Keybindings file. Can either specify an absolute path, or LyX will look in " -"its global and local bind/ directories." -msgstr "" -"Fichier de raccourcis clavier (bind). Vous pouvez mettre son chemin absolu, " -"ou bien LyX cherchera dans ses répertoires bind/ global et local." +#: src/LyXRC.cpp:3125 +msgid "Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories." +msgstr "Fichier de raccourcis clavier (bind). Vous pouvez mettre son chemin absolu, ou bien LyX cherchera dans ses répertoires bind/ global et local." -#: src/LyXRC.cpp:3106 +#: src/LyXRC.cpp:3129 msgid "Select to check whether the lastfiles still exist." msgstr "Sélectionner pour vérifier si les fichiers récents existent toujours." -#: src/LyXRC.cpp:3110 -msgid "" -"Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -" -"n38\" Refer to the ChkTeX documentation." -msgstr "" -"Définir comment lancer chktex. Par ex. « chktex -n11 -n1 -n3 -n6 -n9 -n22 -" -"n25 -n30 -n38 ». Voir la documentation de ChkTeX." +#: src/LyXRC.cpp:3133 +msgid "Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation." +msgstr "Définir comment lancer chktex. Par ex. « chktex -n11 -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38 ». Voir la documentation de ChkTeX." -#: src/LyXRC.cpp:3120 -msgid "" -"LyX normally doesn't update the cursor position if you move the scrollbar. " -"Set to true if you'd prefer to always have the cursor on screen." -msgstr "" -"LyX normalement ne change pas la position du curseur quand vous vous " -"déplacez avec la barre de défilement. Cochez si vous préférez avoir toujours " -"le curseur à l'écran." +#: src/LyXRC.cpp:3143 +msgid "LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen." +msgstr "LyX normalement ne change pas la position du curseur quand vous vous déplacez avec la barre de défilement. Cochez si vous préférez avoir toujours le curseur à l'écran." -#: src/LyXRC.cpp:3128 -msgid "" -"LyX normally doesn't allow the user to scroll further than the bottom of the " -"document. Set to true if you prefer to scroll the bottom of the document to " -"the top of the screen" -msgstr "" -"LyX ne permet pas normalement le défilement au-delà de la fin du document. " -"Positionnez sur « vrai » si vous préférez voir la fin du document en haut de " -"la fenêtre." +#: src/LyXRC.cpp:3151 +msgid "LyX normally doesn't allow the user to scroll further than the bottom of the document. Set to true if you prefer to scroll the bottom of the document to the top of the screen" +msgstr "LyX ne permet pas normalement le défilement au-delà de la fin du document. Positionnez sur « vrai » si vous préférez voir la fin du document en haut de la fenêtre." -#: src/LyXRC.cpp:3132 +#: src/LyXRC.cpp:3155 msgid "Make Apple key act as Meta and Control key as Ctrl." msgstr "Faire agir la touche Apple comme Meta et la touche Control comme Ctrl." -#: src/LyXRC.cpp:3136 +#: src/LyXRC.cpp:3159 msgid "Use the Mac OS X conventions for the word-level cursor movement" -msgstr "" -"Utiliser la convention Mac OS X pour le mouvement du curseur au niveau des " -"mots" +msgstr "Utiliser la convention Mac OS X pour le mouvement du curseur au niveau des mots" -#: src/LyXRC.cpp:3140 -msgid "" -"Show a small box around a Math Macro with the macro name when the cursor is " -"inside." -msgstr "" -"Afficher une petite boîte autour d'une macro mathématique avec le nom de la " -"macro quand le curseur est à l'intérieur." +#: src/LyXRC.cpp:3163 +msgid "Show a small box around a Math Macro with the macro name when the cursor is inside." +msgstr "Afficher une petite boîte autour d'une macro mathématique avec le nom de la macro quand le curseur est à l'intérieur." -#: src/LyXRC.cpp:3145 +#: src/LyXRC.cpp:3168 #, no-c-format -msgid "" -"This accepts the normal strftime formats; see man strftime for full details. " -"E.g.\"%A, %e. %B %Y\"." -msgstr "" -"Accepter les formats strftime normaux ; faites man strftime pour plus de " -"détails. Par ex. « %A, %e. %B %Y »." +msgid "This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\"." +msgstr "Accepter les formats strftime normaux ; faites man strftime pour plus de détails. Par ex. « %A, %e. %B %Y »." -#: src/LyXRC.cpp:3149 -msgid "" -"Command definition file. Can either specify an absolute path, or LyX will " -"look in its global and local commands/ directories." -msgstr "" -"Fichier de définition de commandes. Vous pouvez mettre son chemin absolu, ou " -"bien LyX cherchera dans ses répertoires commands/ global et local." +#: src/LyXRC.cpp:3172 +msgid "Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories." +msgstr "Fichier de définition de commandes. Vous pouvez mettre son chemin absolu, ou bien LyX cherchera dans ses répertoires commands/ global et local." -#: src/LyXRC.cpp:3153 +#: src/LyXRC.cpp:3176 msgid "The default format used with LFUN_BUFFER_[VIEW|UPDATE]." msgstr "Format implicite utilisé avec LFUN_BUFFER_[VIEW|UPDATE]." -#: src/LyXRC.cpp:3157 +#: src/LyXRC.cpp:3180 msgid "New documents will be assigned this language." msgstr "Langue utilisée pour les nouveaux documents." -#: src/LyXRC.cpp:3161 -msgid "" -"Iconify the dialogs when the main window is iconified. (Affects only dialogs " -"shown after the change has been made.)" -msgstr "" -"Iconifier les fenêtres auxiliaires quand la fenêtre principale. (N'affecte " -"que les fenêtres affichées après que le changement a été fait.)" +#: src/LyXRC.cpp:3184 +msgid "Specify the default paper size." +msgstr "Spécifier la taille de papier implicite." -#: src/LyXRC.cpp:3165 +#: src/LyXRC.cpp:3188 +msgid "Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)" +msgstr "Iconifier les fenêtres auxiliaires quand la fenêtre principale. (N'affecte que les fenêtres affichées après que le changement a été fait.)" + +#: src/LyXRC.cpp:3192 msgid "Select how LyX will display any graphics." msgstr "Déterminer comment LyX affiche tous les graphiques." -#: src/LyXRC.cpp:3169 -msgid "" -"The default path for your documents. An empty value selects the directory " -"LyX was started from." -msgstr "" -"Chemin implicite pour vos documents. Si la valeur est vide, ce sera le " -"répertoire dans lequel LyX a été lancé." +#: src/LyXRC.cpp:3196 +msgid "The default path for your documents. An empty value selects the directory LyX was started from." +msgstr "Chemin implicite pour vos documents. Si la valeur est vide, ce sera le répertoire dans lequel LyX a été lancé." -#: src/LyXRC.cpp:3173 +#: src/LyXRC.cpp:3200 msgid "Specify additional chars that can be part of a word." msgstr "Spécifier des caractères spéciaux pouvant faire partie d'un mot." -#: src/LyXRC.cpp:3177 -msgid "" -"The path that LyX will set when offering to choose an example. An empty " -"value selects the directory LyX was started from." -msgstr "" -"Chemin dans lequel LyX proposera un choix d'exemples. Si la valeur est vide, " -"ce sera le répertoire dans lequel LyX a été lancé." +#: src/LyXRC.cpp:3204 +msgid "The path that LyX will set when offering to choose an example. An empty value selects the directory LyX was started from." +msgstr "Chemin dans lequel LyX proposera un choix d'exemples. Si la valeur est vide, ce sera le répertoire dans lequel LyX a été lancé." -#: src/LyXRC.cpp:3181 -msgid "" -"The font encoding used for the LaTeX2e fontenc package. T1 is highly " -"recommended for non-English languages." -msgstr "" -"Encodage de police pour le paquetage LaTeX2e fontenc. T1 est vivement " -"recommandé pour toutes les langues autres que l'anglais." +#: src/LyXRC.cpp:3208 +msgid "The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages." +msgstr "Encodage de police pour le paquetage LaTeX2e fontenc. T1 est vivement recommandé pour toutes les langues autres que l'anglais." -#: src/LyXRC.cpp:3185 +#: src/LyXRC.cpp:3212 msgid "Disable any kerning and ligatures for text drawing on screen." msgstr "Inhiber tout crénage ou ligature dans l'affichage du texte à l'écran." -#: src/LyXRC.cpp:3192 -msgid "" -"Define the options of makeindex (cf. man makeindex) or select an alternative " -"compiler. E.g., using xindy/make-rules, the command string would be " -"\"makeindex.sh -m $$lang\"." -msgstr "" -"Définir les options de makeindex (voir man makeindex) ou sélectionner un " -"autre compilateur. Par ex., avec xindy / make-rules, la commande serait « " -"makeindex.sh -m $$lang »." +#: src/LyXRC.cpp:3219 +msgid "Define the options of makeindex (cf. man makeindex) or select an alternative compiler. E.g., using xindy/make-rules, the command string would be \"makeindex.sh -m $$lang\"." +msgstr "Définir les options de makeindex (voir man makeindex) ou sélectionner un autre compilateur. Par ex., avec xindy / make-rules, la commande serait « makeindex.sh -m $$lang »." -#: src/LyXRC.cpp:3196 +#: src/LyXRC.cpp:3223 msgid "Define the options of the index program for PLaTeX (Japanese LaTeX)." -msgstr "" -"Définir les options du programme d'indexation pour PLaTeX (LaTeX japonais)." +msgstr "Définir les options du programme d'indexation pour PLaTeX (LaTeX japonais)." -#: src/LyXRC.cpp:3200 -msgid "" -"Define the options of makeindex (cf. man makeindex) to be used for " -"nomenclatures. This might differ from the index processing options." -msgstr "" -"Définir les options de makeindex (cf. man makeindex) utilisées pour les " -"nomenclatures. Elles peuvent différer des options utilisées pour l'index." +#: src/LyXRC.cpp:3227 +msgid "Define the options of makeindex (cf. man makeindex) to be used for nomenclatures. This might differ from the index processing options." +msgstr "Définir les options de makeindex (cf. man makeindex) utilisées pour les nomenclatures. Elles peuvent différer des options utilisées pour l'index." -#: src/LyXRC.cpp:3209 -msgid "" -"Use this to set the correct mapping file for your keyboard. You'll need this " -"if you for instance want to type German documents on an American keyboard." -msgstr "" -"Choix du fichier de réaffectation clavier. Vous en avez besoin si vous tapez " -"par exemple des documents en allemand sur un clavier français." +#: src/LyXRC.cpp:3236 +msgid "Use this to set the correct mapping file for your keyboard. You'll need this if you for instance want to type German documents on an American keyboard." +msgstr "Choix du fichier de réaffectation clavier. Vous en avez besoin si vous tapez par exemple des documents en allemand sur un clavier français." -#: src/LyXRC.cpp:3213 -msgid "" -"Select if a language switching command is needed at the beginning of the " -"document." +#: src/LyXRC.cpp:3240 +msgid "Select if a language switching command is needed at the beginning of the document." msgstr "Sélectionner s'il faut une commande de langue au début du document." -#: src/LyXRC.cpp:3217 -msgid "" -"Select if a language switching command is needed at the end of the document." +#: src/LyXRC.cpp:3244 +msgid "Select if a language switching command is needed at the end of the document." msgstr "Sélectionner s'il faut une commande de langue à la fin du document." -#: src/LyXRC.cpp:3221 -msgid "" -"The LaTeX command for changing from the language of the document to another " -"language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the " -"name of the second language." -msgstr "" -"Commande LaTeX pour passer de la langue du document à une autre langue. Par " -"exemple \\selectlanguage{$$lang} où $$lang est le nom de la seconde langue." +#: src/LyXRC.cpp:3248 +msgid "The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language." +msgstr "Commande LaTeX pour passer de la langue du document à une autre langue. Par exemple \\selectlanguage{$$lang} où $$lang est le nom de la seconde langue." -#: src/LyXRC.cpp:3225 +#: src/LyXRC.cpp:3252 msgid "The LaTeX command for changing back to the language of the document." msgstr "Commande LaTeX pour revenir à la langue du document." -#: src/LyXRC.cpp:3229 +#: src/LyXRC.cpp:3256 msgid "The LaTeX command for local changing of the language." msgstr "Commande LaTeX pour un changement temporaire de langue." -#: src/LyXRC.cpp:3233 -msgid "" -"De-select if you don't want the language(s) used as an argument to " -"\\documentclass." -msgstr "" -"Désélectionner si vous ne voulez pas que la langue soit un paramètre de " -"\\documentclass." +#: src/LyXRC.cpp:3260 +msgid "De-select if you don't want the language(s) used as an argument to \\documentclass." +msgstr "Désélectionner si vous ne voulez pas que la langue soit un paramètre de \\documentclass." -#: src/LyXRC.cpp:3237 -msgid "" -"The LaTeX command for loading the language package. E.g. \"\\usepackage" -"{babel}\", \"\\usepackage{omega}\"." -msgstr "" -"Commande LaTeX pour charger le paquetage linguistique. Par exemple « " -"\\usepackage{babel} », « \\usepackage{omega} »." +#: src/LyXRC.cpp:3264 +msgid "The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\"." +msgstr "Commande LaTeX pour charger le paquetage linguistique. Par exemple « \\usepackage{babel} », « \\usepackage{omega} »." -#: src/LyXRC.cpp:3241 -msgid "" -"De-select if you don't want babel to be used when the language of the " -"document is the default language." -msgstr "" -"Désélectionner si vous ne voulez pas utiliser babel quand la langue du " -"document est la langue implicite." +#: src/LyXRC.cpp:3268 +msgid "De-select if you don't want babel to be used when the language of the document is the default language." +msgstr "Désélectionner si vous ne voulez pas utiliser babel quand la langue du document est la langue implicite." -#: src/LyXRC.cpp:3245 +#: src/LyXRC.cpp:3272 msgid "De-select if you do not want LyX to scroll to saved position." -msgstr "" -"Désélectionner si vous ne voulez pas que LyX saute à la position qu'il a " -"enregistré." +msgstr "Désélectionner si vous ne voulez pas que LyX saute à la position qu'il a enregistré." -#: src/LyXRC.cpp:3249 +#: src/LyXRC.cpp:3276 msgid "De-select to prevent loading files opened from the last LyX session." -msgstr "" -"Décocher pour éviter de charger les fichiers qui étaient ouverts lors de la " -"dernière session LyX." +msgstr "Décocher pour éviter de charger les fichiers qui étaient ouverts lors de la dernière session LyX." -#: src/LyXRC.cpp:3253 +#: src/LyXRC.cpp:3280 msgid "De-select if you don't want LyX to create backup files." -msgstr "" -"Désélectionner si vous ne voulez pas que LyX crée des copies de sauvegarde." +msgstr "Désélectionner si vous ne voulez pas que LyX crée des copies de sauvegarde." -#: src/LyXRC.cpp:3257 -msgid "" -"Select to control the highlighting of words with a language foreign to that " -"of the document." -msgstr "" -"Sélectionner pour activer le soulignement des mots dans une langue autre que " -"celle du document." +#: src/LyXRC.cpp:3284 +msgid "Select to control the highlighting of words with a language foreign to that of the document." +msgstr "Sélectionner pour activer le soulignement des mots dans une langue autre que celle du document." -#: src/LyXRC.cpp:3261 +#: src/LyXRC.cpp:3288 msgid "The scrolling speed of the mouse wheel." msgstr "Vitesse de défilement de la molette de la souris." -#: src/LyXRC.cpp:3266 +#: src/LyXRC.cpp:3293 msgid "The completion popup delay." msgstr "Temporisation de l'affichage de la fenêtre auxiliaire de complétion." -#: src/LyXRC.cpp:3270 +#: src/LyXRC.cpp:3297 msgid "Select to display the completion popup in math mode." -msgstr "" -"Sélectionner pour afficher la fenêtre auxiliaire de complétion en mode " -"mathématique." +msgstr "Sélectionner pour afficher la fenêtre auxiliaire de complétion en mode mathématique." -#: src/LyXRC.cpp:3274 +#: src/LyXRC.cpp:3301 msgid "Select to display the completion popup in text mode." -msgstr "" -"Sélectionner pour afficher la fenêtre auxiliaire de complétion en mode texte." +msgstr "Sélectionner pour afficher la fenêtre auxiliaire de complétion en mode texte." -#: src/LyXRC.cpp:3278 -msgid "" -"Show the completion popup without delay after non-unique completion attempt." -msgstr "" -"Afficher la fenêtre auxiliaire de complétion sans délai après une tentative " -"de complétion multiple." +#: src/LyXRC.cpp:3305 +msgid "Show the completion popup without delay after non-unique completion attempt." +msgstr "Afficher la fenêtre auxiliaire de complétion sans délai après une tentative de complétion multiple." -#: src/LyXRC.cpp:3282 -msgid "" -"Show a small triangle on the cursor to indicate that a completion is " -"available." -msgstr "" -"Afficher un petit triangle sur le curseur pour indiquer qu'une complétion " -"est disponible." +#: src/LyXRC.cpp:3309 +msgid "Show a small triangle on the cursor to indicate that a completion is available." +msgstr "Afficher un petit triangle sur le curseur pour indiquer qu'une complétion est disponible." -#: src/LyXRC.cpp:3286 +#: src/LyXRC.cpp:3313 msgid "The inline completion delay." msgstr "Temporisation de complétion en ligne." -#: src/LyXRC.cpp:3290 +#: src/LyXRC.cpp:3317 msgid "Select to display the inline completion in math mode." -msgstr "" -"Sélectionner pour afficher la complétion en ligne en mode mathématique." +msgstr "Sélectionner pour afficher la complétion en ligne en mode mathématique." -#: src/LyXRC.cpp:3294 +#: src/LyXRC.cpp:3321 msgid "Select to display the inline completion in text mode." msgstr "Sélectionner pour afficher la complétion en ligne en mode texte." -#: src/LyXRC.cpp:3298 +#: src/LyXRC.cpp:3325 msgid "Use \"...\" to shorten long completions." msgstr "Utiliser \"...\" pour raccourcir le complétions longues." -#: src/LyXRC.cpp:3302 +#: src/LyXRC.cpp:3329 msgid "Allow TeXMacs shorthand, like => converting to \\Rightarrow." msgstr "Autoriser les raccourcis TeXMacs, comme => convertie en \\Rightarrow." -#: src/LyXRC.cpp:3306 +#: src/LyXRC.cpp:3333 #, c-format msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu." -msgstr "" -"Nombre maximum de fichiers récents. On peut en avoir jusqu'à %1$d dans le " -"menu Fichier." +msgstr "Nombre maximum de fichiers récents. On peut en avoir jusqu'à %1$d dans le menu Fichier." -#: src/LyXRC.cpp:3317 +#: src/LyXRC.cpp:3344 msgid "Shows a typeset preview of things such as math" -msgstr "" -"Afficher un aperçu de l'aspect final de certains éléments comme les math." +msgstr "Afficher un aperçu de l'aspect final de certains éléments comme les math." -#: src/LyXRC.cpp:3321 +#: src/LyXRC.cpp:3348 msgid "Previewed equations will have \"(#)\" labels rather than numbered ones" -msgstr "" -"Les équations en aperçu auront des étiquettes « (#) » au lieu d'avoir des " -"numéros." +msgstr "Les équations en aperçu auront des étiquettes « (#) » au lieu d'avoir des numéros." -#: src/LyXRC.cpp:3325 +#: src/LyXRC.cpp:3352 msgid "Scale the preview size to suit." msgstr "Mettre l'aperçu à l'échelle pour qu'il tienne à l'écran." -#: src/LyXRC.cpp:3329 +#: src/LyXRC.cpp:3356 msgid "The option for specifying whether the copies should be collated." msgstr "Option pour spécifier si les copies doivent être accolées." -#: src/LyXRC.cpp:3333 +#: src/LyXRC.cpp:3360 msgid "The option for specifying the number of copies to print." msgstr "Option pour spécifier le nombre de copies à imprimer." -#: src/LyXRC.cpp:3337 -msgid "" -"The default printer to print on. If none is specified, LyX will use the " -"environment variable PRINTER." -msgstr "" -"Imprimante implicite. Si aucune n'est spécifiée, LyX se sert de la variable " -"d'environnement PRINTER." +#: src/LyXRC.cpp:3364 +msgid "The default printer to print on. If none is specified, LyX will use the environment variable PRINTER." +msgstr "Imprimante implicite. Si aucune n'est spécifiée, LyX se sert de la variable d'environnement PRINTER." -#: src/LyXRC.cpp:3341 +#: src/LyXRC.cpp:3368 msgid "The option to print only even pages." msgstr "Option pour n'imprimer que les pages paires." -#: src/LyXRC.cpp:3345 -msgid "" -"Extra options to pass to printing program after everything else, but before " -"the filename of the DVI file to be printed." -msgstr "" -"Autres options à transmettre au programme d'impression, après toutes les " -"précédentes, mais avant le nom du fichier DVI à imprimer." +#: src/LyXRC.cpp:3372 +msgid "Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed." +msgstr "Autres options à transmettre au programme d'impression, après toutes les précédentes, mais avant le nom du fichier DVI à imprimer." -#: src/LyXRC.cpp:3349 +#: src/LyXRC.cpp:3376 msgid "Extension of printer program output file. Usually \".ps\"." -msgstr "" -"Extension du fichier de sortie du programme d'impression. D'habitude c'est " -"« .ps »." +msgstr "Extension du fichier de sortie du programme d'impression. D'habitude c'est « .ps »." -#: src/LyXRC.cpp:3353 +#: src/LyXRC.cpp:3380 msgid "The option to print out in landscape." msgstr "Option pour imprimer en format paysage." -#: src/LyXRC.cpp:3357 +#: src/LyXRC.cpp:3384 msgid "The option to print only odd pages." msgstr "Option pour n'imprimer que les pages impaires." -#: src/LyXRC.cpp:3361 +#: src/LyXRC.cpp:3388 msgid "The option for specifying a comma-separated list of pages to print." -msgstr "" -"Option pour spécifier la liste des pages à imprimer, séparées par une " -"virgule." +msgstr "Option pour spécifier la liste des pages à imprimer, séparées par une virgule." -#: src/LyXRC.cpp:3365 +#: src/LyXRC.cpp:3392 msgid "Option to specify the dimensions of the print paper." msgstr "Option pour spécifier les dimensions du papier." -#: src/LyXRC.cpp:3369 +#: src/LyXRC.cpp:3396 msgid "The option to specify paper type." msgstr "Option pour spécifier le type de papier." -#: src/LyXRC.cpp:3373 +#: src/LyXRC.cpp:3400 msgid "The option to reverse the order of the pages printed." msgstr "Option pour inverser l'ordre d'impression des pages." -#: src/LyXRC.cpp:3377 -msgid "" -"When set, this printer option automatically prints to a file and then calls " -"a separate print spooling program on that file with the given name and " -"arguments." -msgstr "" -"Quand elle est définie, cette option imprime automatiquement vers un fichier " -"puis appelle sur ce fichier un programme de spoule d'impression séparé, avec " -"le nom et les paramètres indiqués." +#: src/LyXRC.cpp:3404 +msgid "When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments." +msgstr "Quand elle est définie, cette option imprime automatiquement vers un fichier puis appelle sur ce fichier un programme de spoule d'impression séparé, avec le nom et les paramètres indiqués." -#: src/LyXRC.cpp:3381 -msgid "" -"If you specify a printer name in the print dialog, the following argument is " -"prepended along with the printer name after the spool command." -msgstr "" -"Si vous spécifiez un nom d'imprimante dans la fenêtre Imprimer, cette option " -"est transmise avec le nom de l'imprimante à la commande de spoule." +#: src/LyXRC.cpp:3408 +msgid "If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command." +msgstr "Si vous spécifiez un nom d'imprimante dans la fenêtre Imprimer, cette option est transmise avec le nom de l'imprimante à la commande de spoule." -#: src/LyXRC.cpp:3385 +#: src/LyXRC.cpp:3412 msgid "Option to pass to the print program to print to a file." -msgstr "" -"Option à transmettre au programme d'impression pour imprimer dans un fichier " -"donné." +msgstr "Option à transmettre au programme d'impression pour imprimer dans un fichier donné." -#: src/LyXRC.cpp:3389 +#: src/LyXRC.cpp:3416 msgid "Option to pass to the print program to print on a specific printer." -msgstr "" -"Option à transmettre au programme d'impression pour imprimer sur une " -"imprimante donnée." +msgstr "Option à transmettre au programme d'impression pour imprimer sur une imprimante donnée." -#: src/LyXRC.cpp:3393 -msgid "" -"Select for LyX to pass the name of the destination printer to your print " -"command." -msgstr "" -"Sélectionner pour que LyX transmette le nom de l'imprimante de destination à " -"votre commande d'impression." +#: src/LyXRC.cpp:3420 +msgid "Select for LyX to pass the name of the destination printer to your print command." +msgstr "Sélectionner pour que LyX transmette le nom de l'imprimante de destination à votre commande d'impression." -#: src/LyXRC.cpp:3397 +#: src/LyXRC.cpp:3424 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"." msgstr "Votre programme d'impression favori, par ex. « dvips », « dvilj4 »." -#: src/LyXRC.cpp:3405 -msgid "" -"Select to have visual bidi cursor movement, unselect for logical movement." -msgstr "" -"Sélectionner pour avoir un mouvement visuel de curseur bidirectionnel, " -"désélectionner pour un mouvement logique." +#: src/LyXRC.cpp:3432 +msgid "Select to have visual bidi cursor movement, unselect for logical movement." +msgstr "Sélectionner pour avoir un mouvement visuel de curseur bidirectionnel, désélectionner pour un mouvement logique." -#: src/LyXRC.cpp:3409 -msgid "" -"DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes " -"wrong, override the setting here." -msgstr "" -"LyX détecte tout seul la résolution de votre moniteur en DPI (points par " -"pouce). Si ça ne va pas, changez le réglage ici." +#: src/LyXRC.cpp:3436 +msgid "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here." +msgstr "LyX détecte tout seul la résolution de votre moniteur en DPI (points par pouce). Si ça ne va pas, changez le réglage ici." -#: src/LyXRC.cpp:3415 +#: src/LyXRC.cpp:3442 msgid "The screen fonts used to display the text while editing." -msgstr "" -"Polices d'écran dans lesquelles s'affiche le texte en cours de modification." +msgstr "Polices d'écran dans lesquelles s'affiche le texte en cours de modification." -#: src/LyXRC.cpp:3424 -msgid "" -"Allow bitmap fonts to be resized. If you are using a bitmap font, selecting " -"this option may make some fonts look blocky in LyX. Deselecting this option " -"makes LyX use the nearest bitmap font size available, instead of scaling." -msgstr "" -"Permet aux polices bitmap d'être mises à l'échelle. Si vous utilisez une " -"police bitmap, choisir cette option peut rendre certaines polices laides " -"dans LyX. Si vous décochez cette option, LyX utilise la police bitmap de " -"taille la plus proche disponible, au lieu de la mettre à l'échelle." +#: src/LyXRC.cpp:3451 +msgid "Allow bitmap fonts to be resized. If you are using a bitmap font, selecting this option may make some fonts look blocky in LyX. Deselecting this option makes LyX use the nearest bitmap font size available, instead of scaling." +msgstr "Permet aux polices bitmap d'être mises à l'échelle. Si vous utilisez une police bitmap, choisir cette option peut rendre certaines polices laides dans LyX. Si vous décochez cette option, LyX utilise la police bitmap de taille la plus proche disponible, au lieu de la mettre à l'échelle." -#: src/LyXRC.cpp:3428 +#: src/LyXRC.cpp:3455 msgid "The font sizes used for calculating the scaling of the screen fonts." -msgstr "" -"Tailles de police utilisées pour calculer l'ajustement des polices d'écran." +msgstr "Tailles de police utilisées pour calculer l'ajustement des polices d'écran." -#: src/LyXRC.cpp:3433 +#: src/LyXRC.cpp:3460 #, no-c-format -msgid "" -"The zoom percentage for screen fonts. A setting of 100% will make the fonts " -"roughly the same size as on paper." -msgstr "" -"Facteur d'agrandissement des polices d'écran. Avec 100% les polices feront à " -"peu près la même taille que sur le papier." +msgid "The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper." +msgstr "Facteur d'agrandissement des polices d'écran. Avec 100% les polices feront à peu près la même taille que sur le papier." -#: src/LyXRC.cpp:3437 +#: src/LyXRC.cpp:3464 msgid "Allow session manager to save and restore windows geometry." -msgstr "" -"Permettre au gestionnaire de session d'enregistrer et de restaurer la " -"position des fenêtres." +msgstr "Permettre au gestionnaire de session d'enregistrer et de restaurer la position des fenêtres." -#: src/LyXRC.cpp:3441 -msgid "" -"This starts the lyxserver. The pipes get an additional extension \".in\" and " -"\".out\". Only for advanced users." -msgstr "" -"Démarrer le serveur LyX. Les tubes reçoivent l'extension supplémentaire « ." -"in » et « .out ». Réservé aux utilisateurs expérimentés." +#: src/LyXRC.cpp:3468 +msgid "This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users." +msgstr "Démarrer le serveur LyX. Les tubes reçoivent l'extension supplémentaire « .in » et « .out ». Réservé aux utilisateurs expérimentés." -#: src/LyXRC.cpp:3448 +#: src/LyXRC.cpp:3475 msgid "De-select if you don't want the startup banner." msgstr "Désélectionner pour inhiber la bannière de démarrage." -#: src/LyXRC.cpp:3452 -msgid "" -"LyX will place its temporary directories in this path. They will be deleted " -"when you quit LyX." -msgstr "" -"LyX mettra ses répertoires temporaires ici. Ils seront supprimés quand vous " -"quitterez LyX." +#: src/LyXRC.cpp:3479 +msgid "LyX will place its temporary directories in this path. They will be deleted when you quit LyX." +msgstr "LyX mettra ses répertoires temporaires ici. Ils seront supprimés quand vous quitterez LyX." -#: src/LyXRC.cpp:3456 +#: src/LyXRC.cpp:3483 msgid "This is the place where the files of the thesaurus library reside." -msgstr "" -"C'est l'endroit où résident les fichiers du dictionnaire des synonymes." - -#: src/LyXRC.cpp:3460 -msgid "" -"The path that LyX will set when offering to choose a template. An empty " -"value selects the directory LyX was started from." -msgstr "" -"Chemin dans lequel LyX va chercher les modèles. Si la valeur est vide, ce " -"sera le répertoire dans lequel LyX a été lancé." - -#: src/LyXRC.cpp:3477 -msgid "" -"The UI (user interface) file. Can either specify an absolute path, or LyX " -"will look in its global and local ui/ directories." -msgstr "" -"Fichier d'interface utilisateur (UI). Vous pouvez mettre son chemin absolu, " -"ou bien LyX cherchera dans ses répertoires ui/ global et local." +msgstr "C'est l'endroit où résident les fichiers du dictionnaire des synonymes." #: src/LyXRC.cpp:3487 -msgid "" -"Enable use the system colors for some things like main window background and " -"selection." -msgstr "" -"Activer les couleurs du système pour quelques objets comme la fenêtre " -"principale et la sélection." +msgid "The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from." +msgstr "Chemin dans lequel LyX va chercher les modèles. Si la valeur est vide, ce sera le répertoire dans lequel LyX a été lancé." -#: src/LyXRC.cpp:3491 +#: src/LyXRC.cpp:3504 +msgid "The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories." +msgstr "Fichier d'interface utilisateur (UI). Vous pouvez mettre son chemin absolu, ou bien LyX cherchera dans ses répertoires ui/ global et local." + +#: src/LyXRC.cpp:3514 +msgid "Enable use the system colors for some things like main window background and selection." +msgstr "Activer les couleurs du système pour quelques objets comme la fenêtre principale et la sélection." + +#: src/LyXRC.cpp:3518 msgid "Enable the automatic appearance of tool tips in the work area." -msgstr "" -"Activer l'affichage automatique des bulles d'aide dans la zone de travail." +msgstr "Activer l'affichage automatique des bulles d'aide dans la zone de travail." -#: src/LyXRC.cpp:3495 -msgid "" -"Enable the pixmap cache that might improve performance on Mac and Windows." -msgstr "" -"Activer le cache pixmap, susceptible d'améliorer les performances sur Mac et " -"Windows." +#: src/LyXRC.cpp:3522 +msgid "Enable the pixmap cache that might improve performance on Mac and Windows." +msgstr "Activer le cache pixmap, susceptible d'améliorer les performances sur Mac et Windows." -#: src/LyXRC.cpp:3499 +#: src/LyXRC.cpp:3526 msgid "Specify the paper command to DVI viewer (leave empty or use \"-paper\")" -msgstr "" -"Spécifier la commande de papier de la visionneuse DVI (laisser vide ou " -"mettre « -paper »)" +msgstr "Spécifier la commande de papier de la visionneuse DVI (laisser vide ou mettre « -paper »)" #: src/LyXVC.cpp:86 #, c-format @@ -19946,15 +20364,14 @@ msgstr "Le document n'a pas été enregistré" #: src/LyXVC.cpp:116 msgid "You must save the document before it can be registered." -msgstr "" -"Vous devez enregistrer le document avant de l'inscrire dans le contrôle de " -"version." +msgstr "Vous devez enregistrer le document avant de l'inscrire dans le contrôle de version." #: src/LyXVC.cpp:148 msgid "LyX VC: Initial description" msgstr "LyX CV : Description initiale" -#: src/LyXVC.cpp:149 src/LyXVC.cpp:156 +#: src/LyXVC.cpp:149 +#: src/LyXVC.cpp:156 msgid "(no initial description)" msgstr "(pas de description initiale)" @@ -19962,20 +20379,19 @@ msgstr "(pas de description initiale)" msgid "(no log message)" msgstr "(aucun message de journal)" -#: src/LyXVC.cpp:170 src/frontends/qt4/GuiView.cpp:2872 +#: src/LyXVC.cpp:170 +#: src/frontends/qt4/GuiView.cpp:2773 msgid "LyX VC: Log Message" msgstr "LyX CV : Message de journal" #: src/LyXVC.cpp:218 #, c-format msgid "" -"Reverting to the stored version of the document %1$s will lose all current " -"changes.\n" +"Reverting to the stored version of the document %1$s will lose all current changes.\n" "\n" "Do you want to revert to the older version?" msgstr "" -"Revenir à la version enregistrée du document %1$s vous fera perdre toutes " -"les modifications.\n" +"Revenir à la version enregistrée du document %1$s vous fera perdre toutes les modifications.\n" "\n" "Voulez-vous revenir à l'ancienne version ?" @@ -19983,195 +20399,192 @@ msgstr "" msgid "Revert to stored version of document?" msgstr "Revenir à la version enregistrée du document ?" -#: src/LyXVC.cpp:224 src/frontends/qt4/GuiView.cpp:3400 +#: src/LyXVC.cpp:224 +#: src/frontends/qt4/GuiView.cpp:3299 msgid "&Revert" msgstr "&Revenir à la Sauvegarde" -#: src/Paragraph.cpp:2008 +#: src/Paragraph.cpp:1967 msgid "Senseless with this layout!" msgstr "Aucun sens avec ce style !" -#: src/Paragraph.cpp:2070 +#: src/Paragraph.cpp:2029 msgid "Alignment not permitted" msgstr "Alignement non autorisé" -#: src/Paragraph.cpp:2071 +#: src/Paragraph.cpp:2030 msgid "" "The new layout does not permit the alignment previously used.\n" "Setting to default." msgstr "" -"Le nouvel environnement ne permet pas le type d'alignement utilisé " -"précédemment.\n" +"Le nouvel environnement ne permet pas le type d'alignement utilisé précédemment.\n" "Utilise l'alignement implicite." -#: src/Paragraph.cpp:3150 +#: src/Paragraph.cpp:3109 msgid "Memory problem" msgstr "Problème mémoire" -#: src/Paragraph.cpp:3150 +#: src/Paragraph.cpp:3109 msgid "Paragraph not properly initialized" msgstr "Initialisation du paragraphe incorrecte" -#: src/Text.cpp:415 +#: src/Text.cpp:393 msgid "Unknown Inset" msgstr "Insert inconnu" -#: src/Text.cpp:496 +#: src/Text.cpp:474 msgid "Change tracking error" msgstr "Erreur dans le suivi des modifications" -#: src/Text.cpp:497 +#: src/Text.cpp:475 #, c-format msgid "Unknown author index for change: %1$d\n" msgstr "Index d'auteur inconnu pour le suivi : %1$d\n" -#: src/Text.cpp:508 +#: src/Text.cpp:486 msgid "Unknown token" msgstr "Élément inconnu" -#: src/Text.cpp:972 -msgid "" -"You cannot insert a space at the beginning of a paragraph. Please read the " -"Tutorial." -msgstr "" -"Vous ne pouvez pas entrer d'espace en début de paragraphe. Lisez le Manuel " -"d'Apprentissage." +#: src/Text.cpp:949 +msgid "You cannot insert a space at the beginning of a paragraph. Please read the Tutorial." +msgstr "Vous ne pouvez pas entrer d'espace en début de paragraphe. Lisez le Manuel d'Apprentissage." -#: src/Text.cpp:980 +#: src/Text.cpp:957 msgid "You cannot type two spaces this way. Please read the Tutorial." -msgstr "" -"Vous ne pouvez pas entrer deux espaces ainsi. Lisez le Manuel " -"d'Apprentissage." +msgstr "Vous ne pouvez pas entrer deux espaces ainsi. Lisez le Manuel d'Apprentissage." -#: src/Text.cpp:1815 +#: src/Text.cpp:1788 msgid "[Change Tracking] " msgstr "[Suivi des Modifications] " -#: src/Text.cpp:1821 +#: src/Text.cpp:1794 msgid "Change: " msgstr "Modification : " -#: src/Text.cpp:1825 +#: src/Text.cpp:1798 msgid " at " msgstr " le " -#: src/Text.cpp:1835 +#: src/Text.cpp:1808 #, c-format msgid "Font: %1$s" msgstr "Police : %1$s" -#: src/Text.cpp:1840 +#: src/Text.cpp:1813 #, c-format msgid ", Depth: %1$d" msgstr ", Profondeur : %1$d" -#: src/Text.cpp:1846 +#: src/Text.cpp:1819 msgid ", Spacing: " msgstr ", Espacement : " -#: src/Text.cpp:1852 src/frontends/qt4/GuiDocument.cpp:773 +#: src/Text.cpp:1825 +#: src/frontends/qt4/GuiDocument.cpp:694 msgid "OneHalf" msgstr "Un et Demi" -#: src/Text.cpp:1858 +#: src/Text.cpp:1831 msgid "Other (" msgstr "Autre (" -#: src/Text.cpp:1867 +#: src/Text.cpp:1840 msgid ", Inset: " msgstr ", Insert : " -#: src/Text.cpp:1868 +#: src/Text.cpp:1841 msgid ", Paragraph: " msgstr ", Paragraphe : " -#: src/Text.cpp:1869 +#: src/Text.cpp:1842 msgid ", Id: " msgstr ", Identifiant : " -#: src/Text.cpp:1870 +#: src/Text.cpp:1843 msgid ", Position: " msgstr ", Position : " -#: src/Text.cpp:1876 +#: src/Text.cpp:1849 msgid ", Char: 0x" msgstr ", Char: 0x" -#: src/Text.cpp:1878 +#: src/Text.cpp:1851 msgid ", Boundary: " msgstr ", Frontière : " -#: src/Text2.cpp:383 +#: src/Text2.cpp:364 msgid "No font change defined." msgstr "Aucune modification de police définie." -#: src/Text2.cpp:423 +#: src/Text2.cpp:404 msgid "Nothing to index!" msgstr "Rien à faire !" -#: src/Text2.cpp:425 +#: src/Text2.cpp:406 msgid "Cannot index more than one paragraph!" msgstr "Impossible d'indexer plus d'un paragraphe !" -#: src/Text3.cpp:194 +#: src/Text3.cpp:193 msgid "Math editor mode" msgstr "Mode éditeur mathématique" -#: src/Text3.cpp:196 +#: src/Text3.cpp:195 msgid "No valid math formula" msgstr "Pas de formule mathématique valide" -#: src/Text3.cpp:204 src/mathed/InsetMathNest.cpp:1029 +#: src/Text3.cpp:203 +#: src/mathed/InsetMathNest.cpp:1029 msgid "Already in regular expression mode" msgstr "Déjà en mode « expression régulière »" -#: src/Text3.cpp:217 +#: src/Text3.cpp:216 msgid "Regexp editor mode" msgstr "Mode « expression régulière »" -#: src/Text3.cpp:1306 +#: src/Text3.cpp:1289 msgid "Layout " msgstr "Environnement " -#: src/Text3.cpp:1307 +#: src/Text3.cpp:1290 msgid " not known" msgstr " inconnu" -#: src/Text3.cpp:1781 src/frontends/qt4/GuiApplication.cpp:1410 +#: src/Text3.cpp:1760 +#: src/frontends/qt4/GuiApplication.cpp:1388 msgid "Missing argument" msgstr "Paramètre manquant" -#: src/Text3.cpp:1930 src/Text3.cpp:1942 +#: src/Text3.cpp:1916 +#: src/Text3.cpp:1928 msgid "Character set" msgstr "Encodage" -#: src/Text3.cpp:2149 src/Text3.cpp:2160 +#: src/Text3.cpp:2135 +#: src/Text3.cpp:2146 msgid "Paragraph layout set" msgstr "Style du paragraphe redéfini" -#: src/TextClass.cpp:157 +#: src/TextClass.cpp:155 msgid "Plain Layout" msgstr "Format ordinaire" -#: src/TextClass.cpp:804 +#: src/TextClass.cpp:741 msgid "Missing File" msgstr "Fichier manquant" -#: src/TextClass.cpp:805 +#: src/TextClass.cpp:742 msgid "Could not find stdinsets.inc! This may lead to data loss!" -msgstr "" -"Fichier stdinsets.inc introuvable. Ceci peut provoquer une perte de données !" +msgstr "Fichier stdinsets.inc introuvable. Ceci peut provoquer une perte de données !" -#: src/TextClass.cpp:808 +#: src/TextClass.cpp:745 msgid "Corrupt File" msgstr "Fichier corrompu" -#: src/TextClass.cpp:809 +#: src/TextClass.cpp:746 msgid "Could not read stdinsets.inc! This may lead to data loss!" -msgstr "" -"Fichier stdinsets.inc illisible ! Ceci peut provoquer une perte de données !" +msgstr "Fichier stdinsets.inc illisible ! Ceci peut provoquer une perte de données !" -#: src/TextClass.cpp:1473 +#: src/TextClass.cpp:1326 #, c-format msgid "" "The module %1$s has been requested by\n" @@ -20181,14 +20594,13 @@ msgid "" msgstr "" "Le module %1$s a été requis par ce\n" "document mais n'a pas été trouvé dans la liste des modules disponibles.\n" -"Si vous l'avez installé récemment, vous devez probablement reconfigurer " -"LyX.\n" +"Si vous l'avez installé récemment, vous devez probablement reconfigurer LyX.\n" -#: src/TextClass.cpp:1477 +#: src/TextClass.cpp:1330 msgid "Module not available" msgstr "Module non disponible" -#: src/TextClass.cpp:1483 +#: src/TextClass.cpp:1336 #, c-format msgid "" "The module %1$s requires a package that is not\n" @@ -20206,20 +20618,27 @@ msgstr "" "Voir le paragraphe 3.1.2.3 (Modules) du\n" "Guide de l'Utilisateur pour en savoir plus." -#: src/TextClass.cpp:1490 +#: src/TextClass.cpp:1343 msgid "Package not available" msgstr "Paquetage indisponible" -#: src/TextClass.cpp:1495 +#: src/TextClass.cpp:1348 #, c-format msgid "Error reading module %1$s\n" msgstr "Erreur de lecture du module %1$s\n" -#: src/VCBackend.cpp:60 src/VCBackend.cpp:765 src/VCBackend.cpp:770 -#: src/VCBackend.cpp:818 src/VCBackend.cpp:879 src/VCBackend.cpp:940 -#: src/VCBackend.cpp:948 src/VCBackend.cpp:1155 src/VCBackend.cpp:1248 -#: src/VCBackend.cpp:1254 src/VCBackend.cpp:1275 -#: src/frontends/qt4/GuiView.cpp:2834 +#: src/VCBackend.cpp:60 +#: src/VCBackend.cpp:752 +#: src/VCBackend.cpp:757 +#: src/VCBackend.cpp:805 +#: src/VCBackend.cpp:866 +#: src/VCBackend.cpp:927 +#: src/VCBackend.cpp:935 +#: src/VCBackend.cpp:1143 +#: src/VCBackend.cpp:1236 +#: src/VCBackend.cpp:1242 +#: src/VCBackend.cpp:1263 +#: src/frontends/qt4/GuiView.cpp:2735 msgid "Revision control error." msgstr "Erreur de contrôle de version." @@ -20232,44 +20651,54 @@ msgstr "" "Une erreur s'est produite lors de l'exécution de la commande :\n" "'%1$s'." -#: src/VCBackend.cpp:570 +#: src/VCBackend.cpp:431 +#: src/VCBackend.cpp:1086 +#: src/VCBackend.cpp:1132 +#: src/VCBackend.cpp:1253 +#: src/VCBackend.cpp:1290 +#: src/VCBackend.cpp:1346 +#: src/VCBackend.cpp:1464 +#: src/VCBackend.cpp:1517 +msgid "Error: Could not generate logfile." +msgstr " Erreur : échec de la génération du fichier journal." + +#: src/VCBackend.cpp:557 msgid "Up-to-date" msgstr "Mis à jour" -#: src/VCBackend.cpp:572 +#: src/VCBackend.cpp:559 msgid "Locally Modified" msgstr "Modifié localement" -#: src/VCBackend.cpp:574 +#: src/VCBackend.cpp:561 msgid "Locally Added" msgstr "Ajouté localement" -#: src/VCBackend.cpp:576 +#: src/VCBackend.cpp:563 msgid "Needs Merge" msgstr "Nécessite une fusion" -#: src/VCBackend.cpp:578 +#: src/VCBackend.cpp:565 msgid "Needs Checkout" msgstr "Nécessite un téléchargement" -#: src/VCBackend.cpp:580 +#: src/VCBackend.cpp:567 msgid "No CVS file" msgstr "Pas de fichier CVS" -#: src/VCBackend.cpp:582 +#: src/VCBackend.cpp:569 msgid "Cannot retrieve CVS status" msgstr "Téléchargement de l'état CVS impossible" -#: src/VCBackend.cpp:766 +#: src/VCBackend.cpp:753 msgid "" "The repository version is newer then the current check out.\n" "You have to update from repository first or revert your changes." msgstr "" "Le version du dépôt est plus récente que l'enregistrement proposé.\n" -"Vous devez effectuer une mise à jour à partir du dépôt d'abord, ou " -"abandonner vos modifications." +"Vous devez effectuer une mise à jour à partir du dépôt d'abord, ou abandonner vos modifications." -#: src/VCBackend.cpp:771 +#: src/VCBackend.cpp:758 #, c-format msgid "" "Bad status when checking in changes.\n" @@ -20282,7 +20711,8 @@ msgstr "" "« %1$s »\n" "\n" -#: src/VCBackend.cpp:819 src/VCBackend.cpp:1276 +#: src/VCBackend.cpp:806 +#: src/VCBackend.cpp:1264 #, c-format msgid "" "Error when updating from repository.\n" @@ -20297,35 +20727,37 @@ msgstr "" "\n" "Après appui sur OK, LyX tentera de réouvrir le document fusionné." -#: src/VCBackend.cpp:853 +#: src/VCBackend.cpp:840 #, c-format msgid "" "There were detected changes in the working directory:\n" "%1$s\n" "\n" -"Possible file conflicts must be then resolved manually or you will need to " -"revert back to the repository version." +"Possible file conflicts must be then resolved manually or you will need to revert back to the repository version." msgstr "" "Des modifications ont été détectées dans le répertoire de travail :\n" "%1$s\n" "\n" -"En cas de conflit de fichier, il faut résoudre manuellement ou vous devrez " -"revenir à la version du dépôt." +"En cas de conflit de fichier, il faut résoudre manuellement ou vous devrez revenir à la version du dépôt." -#: src/VCBackend.cpp:857 src/VCBackend.cpp:861 src/VCBackend.cpp:1317 -#: src/VCBackend.cpp:1321 +#: src/VCBackend.cpp:844 +#: src/VCBackend.cpp:848 +#: src/VCBackend.cpp:1305 +#: src/VCBackend.cpp:1309 msgid "Changes detected" msgstr "Modifications détectées" -#: src/VCBackend.cpp:858 src/VCBackend.cpp:862 +#: src/VCBackend.cpp:845 +#: src/VCBackend.cpp:849 msgid "&Abort" msgstr "&Interrompu" -#: src/VCBackend.cpp:858 src/VCBackend.cpp:1318 +#: src/VCBackend.cpp:845 +#: src/VCBackend.cpp:1306 msgid "View &Log ..." msgstr "Visionner le fichier &journal..." -#: src/VCBackend.cpp:880 +#: src/VCBackend.cpp:867 #, c-format msgid "" "Error when updating document %1$s from repository.\n" @@ -20340,7 +20772,7 @@ msgstr "" "\n" "Après appui sur OK, LyX tentera de réouvrir le document fusionné." -#: src/VCBackend.cpp:941 +#: src/VCBackend.cpp:928 #, c-format msgid "" "The document %1$s is not in repository.\n" @@ -20349,7 +20781,7 @@ msgstr "" "Le document %1$s n'est pas dans le dépôt.\n" "Vous devez enregistrer une première révision pour pouvoir télécharger." -#: src/VCBackend.cpp:949 +#: src/VCBackend.cpp:936 #, c-format msgid "" "Cannot revert document %1$s to repository version.\n" @@ -20358,12 +20790,7 @@ msgstr "" "Impossible de remettre le document %1$s dans le dépôt;\n" "L'état « %2$s » est inattendu." -#: src/VCBackend.cpp:1144 src/VCBackend.cpp:1265 src/VCBackend.cpp:1302 -#: src/VCBackend.cpp:1358 -msgid "Error: Could not generate logfile." -msgstr " Erreur : échec de la génération du fichier journal." - -#: src/VCBackend.cpp:1156 +#: src/VCBackend.cpp:1144 msgid "" "Error when committing to repository.\n" "You have to manually resolve the problem.\n" @@ -20373,7 +20800,7 @@ msgstr "" "Vous devez résoudre manuellement le problème.\n" "Après appui sur OK, LyX rouvrira le document." -#: src/VCBackend.cpp:1249 +#: src/VCBackend.cpp:1237 msgid "" "Error while acquiring write lock.\n" "Another user is most probably editing\n" @@ -20385,7 +20812,7 @@ msgstr "" "de modifier le document courant !\n" "Vérifier également les droits d'accès au dépôt." -#: src/VCBackend.cpp:1255 +#: src/VCBackend.cpp:1243 msgid "" "Error while releasing write lock.\n" "Check the access to the repository." @@ -20393,14 +20820,13 @@ msgstr "" "Erreur lors de la restitution du contrôle de la version.\n" "Vérifier les droits d'accès au dépôt." -#: src/VCBackend.cpp:1312 +#: src/VCBackend.cpp:1300 #, c-format msgid "" "There were detected changes in the working directory:\n" "%1$s\n" "\n" -"In case of file conflict version of the local directory files will be " -"preferred.\n" +"In case of file conflict version of the local directory files will be preferred.\n" "\n" "Continue?" msgstr "" @@ -20411,53 +20837,56 @@ msgstr "" "\n" "Poursuivre ?" -#: src/VCBackend.cpp:1318 src/VCBackend.cpp:1322 -#: src/frontends/qt4/FindAndReplace.cpp:360 +#: src/VCBackend.cpp:1306 +#: src/VCBackend.cpp:1310 +#: src/frontends/qt4/FindAndReplace.cpp:346 msgid "&Yes" msgstr "&Oui" -#: src/VCBackend.cpp:1318 src/VCBackend.cpp:1322 -#: src/frontends/qt4/FindAndReplace.cpp:360 +#: src/VCBackend.cpp:1306 +#: src/VCBackend.cpp:1310 +#: src/frontends/qt4/FindAndReplace.cpp:346 msgid "&No" msgstr "&Non" -#: src/VCBackend.cpp:1384 +#: src/VCBackend.cpp:1372 msgid "VCN File Locking" msgstr "Verrouillage de fichier VCN" -#: src/VCBackend.cpp:1385 +#: src/VCBackend.cpp:1373 msgid "Locking property unset." msgstr "Propriété de verrouillage non positionnée." -#: src/VCBackend.cpp:1385 src/VCBackend.cpp:1389 +#: src/VCBackend.cpp:1373 +#: src/VCBackend.cpp:1377 msgid "Locking property set." msgstr "Propriété de verrouillage positionnée." -#: src/VCBackend.cpp:1386 +#: src/VCBackend.cpp:1374 msgid "Do not forget to commit the locking property into the repository." msgstr "Ne pas oublier de propager la propriété de verrouillage dans le dépôt." -#: src/VSpace.cpp:161 +#: src/VSpace.cpp:468 msgid "Default skip" msgstr "Implicite" -#: src/VSpace.cpp:164 +#: src/VSpace.cpp:471 msgid "Small skip" msgstr "Petit" -#: src/VSpace.cpp:167 +#: src/VSpace.cpp:474 msgid "Medium skip" msgstr "Moyen" -#: src/VSpace.cpp:170 +#: src/VSpace.cpp:477 msgid "Big skip" msgstr "Grand" -#: src/VSpace.cpp:173 +#: src/VSpace.cpp:480 msgid "Vertical fill" msgstr "Ressort vertical" -#: src/VSpace.cpp:180 +#: src/VSpace.cpp:487 msgid "protected" msgstr "protégé" @@ -20474,7 +20903,8 @@ msgstr "" msgid "Reload saved document?" msgstr "Revenir à la sauvegarde ?" -#: src/buffer_funcs.cpp:76 src/frontends/qt4/GuiView.cpp:2783 +#: src/buffer_funcs.cpp:76 +#: src/frontends/qt4/GuiView.cpp:2684 msgid "&Reload" msgstr "&Recharger" @@ -20549,7 +20979,7 @@ msgstr "Dings 3" msgid "Dings 4" msgstr "Dings 4" -#: src/frontends/qt4/FileDialog.cpp:191 +#: src/frontends/qt4/FileDialog.cpp:181 msgid "Directories" msgstr "Répertoires" @@ -20587,27 +21017,19 @@ msgstr "" "%1$s : début atteint lors de la recherche en arrière.\n" "Continuer la recherche depuis la fin ?" -#: src/frontends/qt4/FindAndReplace.cpp:297 -msgid "Advanced search in progress (press ESC to cancel) . . ." -msgstr "" - -#: src/frontends/qt4/FindAndReplace.cpp:341 -msgid "Advanced search cancelled by user" -msgstr "" - -#: src/frontends/qt4/FindAndReplace.cpp:359 +#: src/frontends/qt4/FindAndReplace.cpp:345 msgid "Wrap search?" msgstr "Recherche récursive ?" -#: src/frontends/qt4/FindAndReplace.cpp:406 +#: src/frontends/qt4/FindAndReplace.cpp:390 msgid "Nothing to search" msgstr "Rien à rechercher" -#: src/frontends/qt4/FindAndReplace.cpp:446 +#: src/frontends/qt4/FindAndReplace.cpp:430 msgid "No open document(s) in which to search" msgstr "Aucun document ouvert dans lequel rechercher" -#: src/frontends/qt4/FindAndReplace.cpp:552 +#: src/frontends/qt4/FindAndReplace.cpp:530 msgid "Advanced Find and Replace" msgstr "Rechercher et remplacer (élaboré)" @@ -20633,34 +21055,15 @@ msgstr "" "Équipe LyX 1995--%1$s" #: src/frontends/qt4/GuiAbout.cpp:92 -msgid "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " -"any later version." -msgstr "" -"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le " -"modifier selon les termes de la Licence Publique Générale GNU telle qu'elle " -"est publiée par la Free Software Foundation ; soit la version 2 de la " -"Licence, ou (si vous le souhaitez) n'importe quelle version ultérieure." +msgid "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU telle qu'elle est publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (si vous le souhaitez) n'importe quelle version ultérieure." #: src/frontends/qt4/GuiAbout.cpp:98 msgid "" -"LyX is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE.\n" +"LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "See the GNU General Public License for more details.\n" -"You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." -msgstr "" -"LyX est distribué en espérant qu'il sera utile, mais SANS AUCUNE GARANTIE ; " -"sans même la garantie implicite qu'il est COMMERCIALEMENT VALABLE ou qu'il " -"est ADAPTÉ À UNE TÂCHE DONNÉE. Reportez-vous à la Licence Publique Générale " -"GNU pour plus de détails. Vous devez avoir reçu une copie de la Licence " -"Publique Générale GNU en même temps que ce programme ; si ce n'est pas le " -"cas, écrivez à la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, " -"MA 02139, USA." +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." +msgstr "LyX est distribué en espérant qu'il sera utile, mais SANS AUCUNE GARANTIE ; sans même la garantie implicite qu'il est COMMERCIALEMENT VALABLE ou qu'il est ADAPTÉ À UNE TÂCHE DONNÉE. Reportez-vous à la Licence Publique Générale GNU pour plus de détails. Vous devez avoir reçu une copie de la Licence Publique Générale GNU en même temps que ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." #: src/frontends/qt4/GuiAbout.cpp:111 msgid "not released yet" @@ -20687,74 +21090,75 @@ msgstr "Répertoire utilisateur : " msgid "About LyX" msgstr "À propos de LyX" -#: src/frontends/qt4/GuiAlert.cpp:93 src/frontends/qt4/GuiAlert.cpp:149 -#: src/frontends/qt4/GuiAlert.cpp:193 src/frontends/qt4/GuiAlert.cpp:230 +#: src/frontends/qt4/GuiAlert.cpp:93 +#: src/frontends/qt4/GuiAlert.cpp:149 +#: src/frontends/qt4/GuiAlert.cpp:193 +#: src/frontends/qt4/GuiAlert.cpp:230 #: src/frontends/qt4/GuiAlert.cpp:271 #, c-format msgid "LyX: %1$s" msgstr "LyX : %1$s" -#: src/frontends/qt4/GuiApplication.cpp:492 +#: src/frontends/qt4/GuiApplication.cpp:489 msgid "About %1" msgstr "À propos de %1" -#: src/frontends/qt4/GuiApplication.cpp:492 -#: src/frontends/qt4/GuiPrefs.cpp:3213 +#: src/frontends/qt4/GuiApplication.cpp:489 +#: src/frontends/qt4/GuiPrefs.cpp:3200 msgid "Preferences" msgstr "Préférences" -#: src/frontends/qt4/GuiApplication.cpp:493 +#: src/frontends/qt4/GuiApplication.cpp:490 msgid "Reconfigure" msgstr "Reconfigurer" -#: src/frontends/qt4/GuiApplication.cpp:493 +#: src/frontends/qt4/GuiApplication.cpp:490 msgid "Quit %1" msgstr "Quitter %1" -#: src/frontends/qt4/GuiApplication.cpp:912 +#: src/frontends/qt4/GuiApplication.cpp:869 msgid "Nothing to do" msgstr "Rien à faire" -#: src/frontends/qt4/GuiApplication.cpp:918 +#: src/frontends/qt4/GuiApplication.cpp:875 msgid "Unknown action" msgstr "Action inconnue" -#: src/frontends/qt4/GuiApplication.cpp:962 +#: src/frontends/qt4/GuiApplication.cpp:919 msgid "Command not handled" msgstr "Commande non gérée" -#: src/frontends/qt4/GuiApplication.cpp:968 +#: src/frontends/qt4/GuiApplication.cpp:925 msgid "Command disabled" msgstr "Commande désactivée" -#: src/frontends/qt4/GuiApplication.cpp:1243 +#: src/frontends/qt4/GuiApplication.cpp:1214 msgid "Running configure..." msgstr "Lancement de configure..." -#: src/frontends/qt4/GuiApplication.cpp:1254 +#: src/frontends/qt4/GuiApplication.cpp:1225 msgid "Reloading configuration..." msgstr "Rechargement de la configuration..." -#: src/frontends/qt4/GuiApplication.cpp:1260 +#: src/frontends/qt4/GuiApplication.cpp:1231 msgid "System reconfiguration failed" msgstr "Échec de la reconfiguration" -#: src/frontends/qt4/GuiApplication.cpp:1261 +#: src/frontends/qt4/GuiApplication.cpp:1232 msgid "" "The system reconfiguration has failed.\n" "Default textclass is used but LyX may not be able to work properly.\n" "Please reconfigure again if needed." msgstr "" "La reconfiguration a échoué.\n" -"Les classes implicites sont utilisées, mais LyX ne pourra peut-être pas " -"fonctionner correctement.\n" +"Les classes implicites sont utilisées, mais LyX ne pourra peut-être pas fonctionner correctement.\n" "Merci de reconfigurer de nouveau si c'est la cas." -#: src/frontends/qt4/GuiApplication.cpp:1266 +#: src/frontends/qt4/GuiApplication.cpp:1237 msgid "System reconfigured" msgstr "Système reconfiguré" -#: src/frontends/qt4/GuiApplication.cpp:1267 +#: src/frontends/qt4/GuiApplication.cpp:1238 msgid "" "The system has been reconfigured.\n" "You need to restart LyX to make use of any\n" @@ -20764,74 +21168,66 @@ msgstr "" "Il faut redémarrer LyX pour utiliser\n" "les classes de document mises à jour." -#: src/frontends/qt4/GuiApplication.cpp:1340 +#: src/frontends/qt4/GuiApplication.cpp:1318 msgid "Exiting." msgstr "Quitte." -#: src/frontends/qt4/GuiApplication.cpp:1422 +#: src/frontends/qt4/GuiApplication.cpp:1400 #, c-format msgid "Opening help file %1$s..." msgstr "Ouverture du fichier d'aide %1$s..." -#: src/frontends/qt4/GuiApplication.cpp:1441 +#: src/frontends/qt4/GuiApplication.cpp:1419 msgid "Syntax: set-color " msgstr "Syntaxe : set-color " -#: src/frontends/qt4/GuiApplication.cpp:1457 +#: src/frontends/qt4/GuiApplication.cpp:1435 #, c-format msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined" -msgstr "" -"Set-color « %1$s » a échoué - la couleur n'est pas définie ou ne peut pas " -"être redéfinie" +msgstr "Set-color « %1$s » a échoué - la couleur n'est pas définie ou ne peut pas être redéfinie" -#: src/frontends/qt4/GuiApplication.cpp:1636 +#: src/frontends/qt4/GuiApplication.cpp:1614 #, c-format msgid "Document defaults saved in %1$s" msgstr "Les valeurs implicites du document ont été enregistrées dans %1$s" -#: src/frontends/qt4/GuiApplication.cpp:1640 +#: src/frontends/qt4/GuiApplication.cpp:1618 msgid "Unable to save document defaults" msgstr "Impossible d'enregistrer les valeurs implicites du document" -#: src/frontends/qt4/GuiApplication.cpp:1777 +#: src/frontends/qt4/GuiApplication.cpp:1758 msgid "Unknown function." msgstr "Fonction inconnue." -#: src/frontends/qt4/GuiApplication.cpp:2199 +#: src/frontends/qt4/GuiApplication.cpp:2184 msgid "The current document was closed." msgstr "Le document courant était fermé." -#: src/frontends/qt4/GuiApplication.cpp:2209 +#: src/frontends/qt4/GuiApplication.cpp:2194 msgid "" -"LyX has caught an exception, it will now attempt to save all unsaved " -"documents and exit.\n" +"LyX has caught an exception, it will now attempt to save all unsaved documents and exit.\n" "\n" "Exception: " msgstr "" -"LyX a reçu une exception, et va maintenant essayer d'enregistrer tous les " -"documents en cours de modification avant de quitter.\n" +"LyX a reçu une exception, et va maintenant essayer d'enregistrer tous les documents en cours de modification avant de quitter.\n" "\n" "Exception : " -#: src/frontends/qt4/GuiApplication.cpp:2213 -#: src/frontends/qt4/GuiApplication.cpp:2219 +#: src/frontends/qt4/GuiApplication.cpp:2198 +#: src/frontends/qt4/GuiApplication.cpp:2204 msgid "Software exception Detected" msgstr "Détection d'une exception logicielle" -#: src/frontends/qt4/GuiApplication.cpp:2217 -msgid "" -"LyX has caught some really weird exception, it will now attempt to save all " -"unsaved documents and exit." -msgstr "" -"LyX a reçu une exception vraiment sérieuse, il va maintenant essayer " -"d'enregistrer tous les documents en cours de modification avant de quitter." +#: src/frontends/qt4/GuiApplication.cpp:2202 +msgid "LyX has caught some really weird exception, it will now attempt to save all unsaved documents and exit." +msgstr "LyX a reçu une exception vraiment sérieuse, il va maintenant essayer d'enregistrer tous les documents en cours de modification avant de quitter." -#: src/frontends/qt4/GuiApplication.cpp:2482 -#: src/frontends/qt4/GuiApplication.cpp:2494 +#: src/frontends/qt4/GuiApplication.cpp:2467 +#: src/frontends/qt4/GuiApplication.cpp:2479 msgid "Could not find UI definition file" msgstr "Fichier descriptif d'interface utilisateur introuvable" -#: src/frontends/qt4/GuiApplication.cpp:2483 +#: src/frontends/qt4/GuiApplication.cpp:2468 #, c-format msgid "" "Error while reading the included file\n" @@ -20842,11 +21238,11 @@ msgstr "" "%1$s.\n" "Veuillez vérifier votre installation." -#: src/frontends/qt4/GuiApplication.cpp:2489 +#: src/frontends/qt4/GuiApplication.cpp:2474 msgid "Could not find default UI file" msgstr "Fichier interface utilisateur implicite introuvable" -#: src/frontends/qt4/GuiApplication.cpp:2490 +#: src/frontends/qt4/GuiApplication.cpp:2475 msgid "" "LyX could not find the default UI file!\n" "Please check your installation." @@ -20854,7 +21250,7 @@ msgstr "" "LyX n'a pu trouver le fichier interface utilisateur implicite !\n" "Veuillez vérifier votre installation." -#: src/frontends/qt4/GuiApplication.cpp:2495 +#: src/frontends/qt4/GuiApplication.cpp:2480 #, c-format msgid "" "Error while reading the configuration file\n" @@ -20873,14 +21269,19 @@ msgstr "" msgid "BibTeX Bibliography" msgstr "Bibliographie BibTeX" -#: src/frontends/qt4/GuiBibtex.cpp:435 src/frontends/qt4/GuiBibtex.cpp:445 -#: src/frontends/qt4/GuiCompare.cpp:162 src/frontends/qt4/GuiCompare.cpp:166 -#: src/frontends/qt4/GuiDocument.cpp:1978 -#: src/frontends/qt4/GuiExternal.cpp:645 src/frontends/qt4/GuiGraphics.cpp:800 -#: src/frontends/qt4/GuiInclude.cpp:333 src/frontends/qt4/GuiView.cpp:1898 -#: src/frontends/qt4/GuiView.cpp:1955 src/frontends/qt4/GuiView.cpp:2096 -#: src/frontends/qt4/GuiView.cpp:2218 src/frontends/qt4/GuiView.cpp:2261 -#: src/frontends/qt4/GuiView.cpp:2339 +#: src/frontends/qt4/GuiBibtex.cpp:435 +#: src/frontends/qt4/GuiBibtex.cpp:445 +#: src/frontends/qt4/GuiCompare.cpp:162 +#: src/frontends/qt4/GuiCompare.cpp:166 +#: src/frontends/qt4/GuiDocument.cpp:1881 +#: src/frontends/qt4/GuiExternal.cpp:637 +#: src/frontends/qt4/GuiGraphics.cpp:799 +#: src/frontends/qt4/GuiInclude.cpp:332 +#: src/frontends/qt4/GuiView.cpp:1873 +#: src/frontends/qt4/GuiView.cpp:1930 +#: src/frontends/qt4/GuiView.cpp:2071 +#: src/frontends/qt4/GuiView.cpp:2193 +#: src/frontends/qt4/GuiView.cpp:2236 msgid "Documents|#o#O" msgstr "Documents|#D" @@ -20944,50 +21345,54 @@ msgstr "Hauteur totale" msgid "Width" msgstr "Largeur" -#: src/frontends/qt4/GuiBox.cpp:315 src/frontends/qt4/GuiBox.cpp:390 +#: src/frontends/qt4/GuiBox.cpp:315 +#: src/frontends/qt4/GuiBox.cpp:390 #: src/insets/InsetBox.cpp:137 msgid "Makebox" msgstr "Makebox" -#: src/frontends/qt4/GuiBranches.cpp:50 src/insets/Inset.cpp:108 +#: src/frontends/qt4/GuiBranches.cpp:53 +#: src/insets/Inset.cpp:108 msgid "Branch" msgstr "Branche" -#: src/frontends/qt4/GuiBranches.cpp:51 +#: src/frontends/qt4/GuiBranches.cpp:54 msgid "Activated" msgstr "Activées" -#: src/frontends/qt4/GuiBranches.cpp:52 +#: src/frontends/qt4/GuiBranches.cpp:55 msgid "Color" msgstr "Couleurs" -#: src/frontends/qt4/GuiBranches.cpp:53 +#: src/frontends/qt4/GuiBranches.cpp:56 msgid "Filename Suffix" msgstr "Suffixe du fichier" -#: src/frontends/qt4/GuiBranches.cpp:132 src/frontends/qt4/GuiBranches.cpp:140 -#: src/frontends/qt4/GuiDocument.cpp:2286 -#: src/frontends/qt4/GuiDocument.cpp:3276 +#: src/frontends/qt4/GuiBranches.cpp:135 +#: src/frontends/qt4/GuiBranches.cpp:143 +#: src/frontends/qt4/GuiDocument.cpp:2123 +#: src/frontends/qt4/GuiDocument.cpp:3120 #: src/frontends/qt4/GuiProgressView.cpp:123 #: src/frontends/qt4/GuiProgressView.cpp:137 #: src/frontends/qt4/GuiProgressView.cpp:158 msgid "Yes" msgstr "Oui" -#: src/frontends/qt4/GuiBranches.cpp:132 src/frontends/qt4/GuiBranches.cpp:140 -#: src/frontends/qt4/GuiDocument.cpp:2285 -#: src/frontends/qt4/GuiDocument.cpp:3275 +#: src/frontends/qt4/GuiBranches.cpp:135 +#: src/frontends/qt4/GuiBranches.cpp:143 +#: src/frontends/qt4/GuiDocument.cpp:2122 +#: src/frontends/qt4/GuiDocument.cpp:3119 #: src/frontends/qt4/GuiProgressView.cpp:89 #: src/frontends/qt4/GuiProgressView.cpp:122 #: src/frontends/qt4/GuiProgressView.cpp:158 msgid "No" msgstr "Non" -#: src/frontends/qt4/GuiBranches.cpp:207 +#: src/frontends/qt4/GuiBranches.cpp:210 msgid "Enter new branch name" msgstr "Saisir un nouveau nom de branche" -#: src/frontends/qt4/GuiBranches.cpp:212 +#: src/frontends/qt4/GuiBranches.cpp:215 #, c-format msgid "" "A branch with the name \"%1$s\" already exists.\n" @@ -20997,15 +21402,16 @@ msgstr "" "\n" "Voulez-vous fusionner la branche « %2$s » avec celle-là ?" -#: src/frontends/qt4/GuiBranches.cpp:216 +#: src/frontends/qt4/GuiBranches.cpp:219 msgid "&Merge" msgstr "&Fusionner" -#: src/frontends/qt4/GuiBranches.cpp:224 src/frontends/qt4/GuiIndices.cpp:221 +#: src/frontends/qt4/GuiBranches.cpp:227 +#: src/frontends/qt4/GuiIndices.cpp:221 msgid "Renaming failed" msgstr "Échec de la modification du nom" -#: src/frontends/qt4/GuiBranches.cpp:225 +#: src/frontends/qt4/GuiBranches.cpp:228 msgid "The branch could not be renamed." msgstr "Impossible de renommer la branche." @@ -21027,8 +21433,10 @@ msgstr "" msgid "Change made at %1$s\n" msgstr "Modifié le %1$s\n" -#: src/frontends/qt4/GuiCharacter.cpp:42 src/frontends/qt4/GuiCharacter.cpp:55 -#: src/frontends/qt4/GuiCharacter.cpp:76 src/frontends/qt4/GuiCharacter.cpp:91 +#: src/frontends/qt4/GuiCharacter.cpp:42 +#: src/frontends/qt4/GuiCharacter.cpp:55 +#: src/frontends/qt4/GuiCharacter.cpp:76 +#: src/frontends/qt4/GuiCharacter.cpp:91 #: src/frontends/qt4/GuiCharacter.cpp:109 #: src/frontends/qt4/GuiCharacter.cpp:120 #: src/frontends/qt4/GuiCharacter.cpp:191 @@ -21039,7 +21447,8 @@ msgstr "Inchangé" msgid "Small Caps" msgstr "Petites capitales" -#: src/frontends/qt4/GuiCharacter.cpp:47 src/frontends/qt4/GuiCharacter.cpp:68 +#: src/frontends/qt4/GuiCharacter.cpp:47 +#: src/frontends/qt4/GuiCharacter.cpp:68 #: src/frontends/qt4/GuiCharacter.cpp:83 #: src/frontends/qt4/GuiCharacter.cpp:101 #: src/frontends/qt4/GuiCharacter.cpp:112 @@ -21104,7 +21513,7 @@ msgstr "Jaune" msgid "Text Style" msgstr "Style de texte" -#: src/frontends/qt4/GuiCitation.cpp:286 +#: src/frontends/qt4/GuiCitation.cpp:324 msgid "Keys" msgstr "Clés" @@ -21116,10 +21525,6 @@ msgstr "LinkBack PDF" msgid "PDF" msgstr "PDF" -#: src/frontends/qt4/GuiClipboard.cpp:172 -msgid "JPEG" -msgstr "JPEG" - #: src/frontends/qt4/GuiClipboard.cpp:181 msgid "pasted" msgstr "collé" @@ -21133,10 +21538,13 @@ msgstr "Fichiers %1$s" msgid "Choose a filename to save the pasted graphic as" msgstr "Choisir le nom de fichier sous lequel enregistrer le graphique collé" -#: src/frontends/qt4/GuiClipboard.cpp:210 src/frontends/qt4/GuiView.cpp:1974 -#: src/frontends/qt4/GuiView.cpp:2116 src/frontends/qt4/GuiView.cpp:2132 -#: src/frontends/qt4/GuiView.cpp:2149 src/frontends/qt4/GuiView.cpp:2235 -#: src/frontends/qt4/GuiView.cpp:3375 +#: src/frontends/qt4/GuiClipboard.cpp:210 +#: src/frontends/qt4/GuiView.cpp:1949 +#: src/frontends/qt4/GuiView.cpp:2091 +#: src/frontends/qt4/GuiView.cpp:2107 +#: src/frontends/qt4/GuiView.cpp:2124 +#: src/frontends/qt4/GuiView.cpp:2210 +#: src/frontends/qt4/GuiView.cpp:3274 msgid "Canceled." msgstr "Annulé." @@ -21165,16 +21573,19 @@ msgstr "Comparer les fichiers LyX" msgid "Select document" msgstr "Sélectionner le document" -#: src/frontends/qt4/GuiCompare.cpp:156 src/frontends/qt4/GuiView.cpp:1902 -#: src/frontends/qt4/GuiView.cpp:1959 src/frontends/qt4/GuiView.cpp:2224 -#: src/frontends/qt4/GuiView.cpp:2269 +#: src/frontends/qt4/GuiCompare.cpp:156 +#: src/frontends/qt4/GuiView.cpp:1877 +#: src/frontends/qt4/GuiView.cpp:1934 +#: src/frontends/qt4/GuiView.cpp:2199 +#: src/frontends/qt4/GuiView.cpp:2244 msgid "LyX Documents (*.lyx)" msgstr "Documents LyX (*.lyx)" # Format du texte -#: src/frontends/qt4/GuiCompare.cpp:198 src/frontends/qt4/GuiDocument.cpp:1949 -#: src/frontends/qt4/GuiDocument.cpp:2024 -#: src/frontends/qt4/GuiDocument.cpp:3341 +#: src/frontends/qt4/GuiCompare.cpp:198 +#: src/frontends/qt4/GuiDocument.cpp:1852 +#: src/frontends/qt4/GuiDocument.cpp:1927 +#: src/frontends/qt4/GuiDocument.cpp:3185 msgid "Error" msgstr "Erreur" @@ -21231,575 +21642,417 @@ msgstr "(Aucun)" msgid "Variable" msgstr "Variable" -#: src/frontends/qt4/GuiDocument.cpp:128 +#: src/frontends/qt4/GuiDocument.cpp:127 msgid "Computer Modern Roman" msgstr "Computer Modern Roman" -#: src/frontends/qt4/GuiDocument.cpp:128 +#: src/frontends/qt4/GuiDocument.cpp:127 msgid "Latin Modern Roman" msgstr "Latin Modern Roman" -#: src/frontends/qt4/GuiDocument.cpp:129 +#: src/frontends/qt4/GuiDocument.cpp:128 msgid "AE (Almost European)" msgstr "AE (Almost European)" -#: src/frontends/qt4/GuiDocument.cpp:129 +#: src/frontends/qt4/GuiDocument.cpp:128 msgid "Times Roman" msgstr "Times Roman" -#: src/frontends/qt4/GuiDocument.cpp:129 +#: src/frontends/qt4/GuiDocument.cpp:128 msgid "Palatino" msgstr "Palatino" -#: src/frontends/qt4/GuiDocument.cpp:130 +#: src/frontends/qt4/GuiDocument.cpp:129 msgid "Bitstream Charter" msgstr "Bitstream Charter" -#: src/frontends/qt4/GuiDocument.cpp:130 +#: src/frontends/qt4/GuiDocument.cpp:129 msgid "New Century Schoolbook" msgstr "New Century Schoolbook" -#: src/frontends/qt4/GuiDocument.cpp:130 +#: src/frontends/qt4/GuiDocument.cpp:129 msgid "Bookman" msgstr "Bookman" -#: src/frontends/qt4/GuiDocument.cpp:131 +#: src/frontends/qt4/GuiDocument.cpp:130 msgid "Utopia" msgstr "Utopia" -#: src/frontends/qt4/GuiDocument.cpp:131 +#: src/frontends/qt4/GuiDocument.cpp:130 msgid "Bera Serif" msgstr "Bera Serif" -#: src/frontends/qt4/GuiDocument.cpp:131 +#: src/frontends/qt4/GuiDocument.cpp:130 msgid "Concrete Roman" msgstr "Concrete Roman" -#: src/frontends/qt4/GuiDocument.cpp:131 +#: src/frontends/qt4/GuiDocument.cpp:130 msgid "Zapf Chancery" msgstr "Zapf Chancery" -#: src/frontends/qt4/GuiDocument.cpp:144 +#: src/frontends/qt4/GuiDocument.cpp:143 msgid "Computer Modern Sans" msgstr "Computer Modern Sans" -#: src/frontends/qt4/GuiDocument.cpp:144 +#: src/frontends/qt4/GuiDocument.cpp:143 msgid "Latin Modern Sans" msgstr "Latin Modern Sans" -#: src/frontends/qt4/GuiDocument.cpp:145 +#: src/frontends/qt4/GuiDocument.cpp:144 msgid "Helvetica" msgstr "Helvetica" -#: src/frontends/qt4/GuiDocument.cpp:145 +#: src/frontends/qt4/GuiDocument.cpp:144 msgid "Avant Garde" msgstr "Avant Garde" -#: src/frontends/qt4/GuiDocument.cpp:145 +#: src/frontends/qt4/GuiDocument.cpp:144 msgid "Bera Sans" msgstr "Bera Sans" -#: src/frontends/qt4/GuiDocument.cpp:145 +#: src/frontends/qt4/GuiDocument.cpp:144 msgid "CM Bright" msgstr "CM Bright" -#: src/frontends/qt4/GuiDocument.cpp:157 +#: src/frontends/qt4/GuiDocument.cpp:156 msgid "Computer Modern Typewriter" msgstr "Computer Modern Typewriter" -#: src/frontends/qt4/GuiDocument.cpp:158 +#: src/frontends/qt4/GuiDocument.cpp:157 msgid "Latin Modern Typewriter" msgstr "Latin Modern Typewriter" -#: src/frontends/qt4/GuiDocument.cpp:158 +#: src/frontends/qt4/GuiDocument.cpp:157 msgid "Courier" msgstr "Courier" -#: src/frontends/qt4/GuiDocument.cpp:158 +#: src/frontends/qt4/GuiDocument.cpp:157 msgid "Bera Mono" msgstr "Bera Mono" -#: src/frontends/qt4/GuiDocument.cpp:159 +#: src/frontends/qt4/GuiDocument.cpp:158 msgid "LuxiMono" msgstr "LuxiMono" -#: src/frontends/qt4/GuiDocument.cpp:159 +#: src/frontends/qt4/GuiDocument.cpp:158 msgid "CM Typewriter Light" msgstr "CM chasse fixe léger" -#: src/frontends/qt4/GuiDocument.cpp:171 +#: src/frontends/qt4/GuiDocument.cpp:170 msgid "Page" msgstr "Page" -#: src/frontends/qt4/GuiDocument.cpp:178 -msgid "&Use AMS math package automatically" -msgstr "Utiliser a&utomatiquement le paquetage maths AMS" - -#: src/frontends/qt4/GuiDocument.cpp:179 -msgid "Use AMS &math package" -msgstr "Utiliser le paquetage maths &AMS" - -#: src/frontends/qt4/GuiDocument.cpp:180 -msgid "" -"The AMS LaTeX packages are only used if symbols from the AMS math toolbars " -"are inserted into formulas" -msgstr "" -"Les paquetages LaTeX AMS ne sont utilisés que si des symboles en provenance " -"des palettes mathématiques AMS sont insérés dans des formules." - -#: src/frontends/qt4/GuiDocument.cpp:182 -msgid "Use esint package &automatically" -msgstr "Utiliser a&utomatiquement le paquetage esint" - -#: src/frontends/qt4/GuiDocument.cpp:183 -msgid "Use &esint package" -msgstr "Utiliser le paquetage maths &esint" - -#: src/frontends/qt4/GuiDocument.cpp:184 -msgid "" -"The LaTeX package esint is only used if special integral symbols are " -"inserted into formulas" -msgstr "" -"Le paquetage LaTeX esint n'est utilisé que si des symboles d'intégration " -"spécifiques sont insérés dans des formules." - -#: src/frontends/qt4/GuiDocument.cpp:186 -msgid "Use math&dots package automatically" -msgstr "Utiliser automatiquement le paquetage math&dots" - -#: src/frontends/qt4/GuiDocument.cpp:187 -msgid "Use mathdo&ts package" -msgstr "Utiliser le paquetage math&dots" - -#: src/frontends/qt4/GuiDocument.cpp:188 -msgid "" -"The LaTeX package mathdots is only used if the command \\iddots is inserted " -"into formulas" -msgstr "" -"Le paquetage LaTeX mathdots n'est utilisé que si la commande \\iddots est " -"insérée dans une formule" - -#: src/frontends/qt4/GuiDocument.cpp:190 -#, fuzzy -msgid "Use mathtools package automatically" -msgstr "Utiliser automatiquement le paquetage math&dots" - -#: src/frontends/qt4/GuiDocument.cpp:191 -#, fuzzy -msgid "Use mathtools package" -msgstr "Utiliser le paquetage math&dots" - -#: src/frontends/qt4/GuiDocument.cpp:192 -#, fuzzy -msgid "" -"The LaTeX package mathtools is only used if some mathematical relations are " -"inserted into formulas" -msgstr "" -"Le paquetage LaTeX mathdots n'est utilisé que si la commande \\iddots est " -"insérée dans une formule" - -#: src/frontends/qt4/GuiDocument.cpp:194 -msgid "Use mhchem &package automatically" -msgstr "Utiliser a&utomatiquement le paquetage mhchem" - -#: src/frontends/qt4/GuiDocument.cpp:195 -msgid "Use mh&chem package" -msgstr "Utiliser le paquetage mh&chem" - -#: src/frontends/qt4/GuiDocument.cpp:196 -msgid "" -"The LaTeX package mhchem is only used if either the command \\ce or \\cf is " -"inserted into formulas" -msgstr "" -"Le paquetage LaTeX mhchem n'est utilisé que si les commandes \\ce ou \\cf " -"sont insérées dans des formules." - -#: src/frontends/qt4/GuiDocument.cpp:198 -#, fuzzy -msgid "Use u&ndertilde package automatically" -msgstr "Utiliser a&utomatiquement le paquetage esint" - -#: src/frontends/qt4/GuiDocument.cpp:199 -#, fuzzy -msgid "Use undertilde pac&kage" -msgstr "Utiliser le paquetage maths &esint" - -#: src/frontends/qt4/GuiDocument.cpp:200 -#, fuzzy -msgid "" -"The LaTeX package undertilde is only used if you use the math frame " -"decoration 'utilde'" -msgstr "" -"Le paquetage LaTeX esint n'est utilisé que si des symboles d'intégration " -"spécifiques sont insérés dans des formules." - -#: src/frontends/qt4/GuiDocument.cpp:277 +#: src/frontends/qt4/GuiDocument.cpp:236 msgid "Module not found!" msgstr "Module introuvable !" -#: src/frontends/qt4/GuiDocument.cpp:609 -msgid "Press button to check validity..." -msgstr "Appuyer sur le bouton pour vérifier la validité..." - -#: src/frontends/qt4/GuiDocument.cpp:625 -#, fuzzy -msgid "Conversion Failed!" -msgstr "Échec conversion" - -#: src/frontends/qt4/GuiDocument.cpp:626 -msgid "Failed to convert local layout to current format." -msgstr "" - -#: src/frontends/qt4/GuiDocument.cpp:641 +#: src/frontends/qt4/GuiDocument.cpp:577 msgid "Layout is valid!" msgstr "Le format est valide !" -#: src/frontends/qt4/GuiDocument.cpp:645 +#: src/frontends/qt4/GuiDocument.cpp:581 msgid "Layout is invalid!" msgstr "Format invalide !" -#: src/frontends/qt4/GuiDocument.cpp:666 -#, fuzzy -msgid "Convert to current format" -msgstr "Conversion vers un format lisible..." - -#: src/frontends/qt4/GuiDocument.cpp:690 +#: src/frontends/qt4/GuiDocument.cpp:613 msgid "Document Settings" msgstr "Paramètres du document" -#: src/frontends/qt4/GuiDocument.cpp:799 src/frontends/qt4/GuiInclude.cpp:48 -#: src/frontends/qt4/Menus.cpp:1393 +#: src/frontends/qt4/GuiDocument.cpp:720 +#: src/frontends/qt4/GuiInclude.cpp:48 +#: src/frontends/qt4/Menus.cpp:1398 msgid "Child Document" msgstr "Sous-document" -#: src/frontends/qt4/GuiDocument.cpp:800 +#: src/frontends/qt4/GuiDocument.cpp:721 msgid "Include to Output" msgstr "Inclus dans le résultat" -#: src/frontends/qt4/GuiDocument.cpp:878 +#: src/frontends/qt4/GuiDocument.cpp:797 msgid "10" msgstr "10" -#: src/frontends/qt4/GuiDocument.cpp:879 +#: src/frontends/qt4/GuiDocument.cpp:798 msgid "11" msgstr "11" -#: src/frontends/qt4/GuiDocument.cpp:880 +#: src/frontends/qt4/GuiDocument.cpp:799 msgid "12" msgstr "12" -#: src/frontends/qt4/GuiDocument.cpp:884 +#: src/frontends/qt4/GuiDocument.cpp:803 msgid "None (no fontenc)" msgstr "Aucune (pas de fontenc)" -#: src/frontends/qt4/GuiDocument.cpp:892 +#: src/frontends/qt4/GuiDocument.cpp:811 msgid "" "Use OpenType and TrueType fonts directly (requires XeTeX or LuaTeX)\n" "You need to install the package \"fontspec\" to use this feature" msgstr "" -"Utiliser directement les polices OpenType et TrueType (utilisation de XeTeX " -"ou LuaTeX indispensable).\n" -"Vous devez installer le paquetage « fontspec » pour utiliser cette " -"fonctionnalité." +"Utiliser directement les polices OpenType et TrueType (utilisation de XeTeX ou LuaTeX indispensable).\n" +"Vous devez installer le paquetage « fontspec » pour utiliser cette fonctionnalité." -#: src/frontends/qt4/GuiDocument.cpp:924 +#: src/frontends/qt4/GuiDocument.cpp:843 msgid "empty" msgstr "vide" -#: src/frontends/qt4/GuiDocument.cpp:925 +#: src/frontends/qt4/GuiDocument.cpp:844 msgid "plain" msgstr "ordinaire" -#: src/frontends/qt4/GuiDocument.cpp:926 +#: src/frontends/qt4/GuiDocument.cpp:845 msgid "headings" msgstr "en-têtes" -#: src/frontends/qt4/GuiDocument.cpp:927 +#: src/frontends/qt4/GuiDocument.cpp:846 msgid "fancy" msgstr "sophistiqué" -#: src/frontends/qt4/GuiDocument.cpp:936 -msgid "US letter" -msgstr "Lettre US" - -#: src/frontends/qt4/GuiDocument.cpp:937 -msgid "US legal" -msgstr "Légal US" - -#: src/frontends/qt4/GuiDocument.cpp:938 -msgid "US executive" -msgstr "Executive US" - -#: src/frontends/qt4/GuiDocument.cpp:939 +#: src/frontends/qt4/GuiDocument.cpp:858 msgid "A0" msgstr "A0" -#: src/frontends/qt4/GuiDocument.cpp:940 +#: src/frontends/qt4/GuiDocument.cpp:859 msgid "A1" msgstr "A1" -#: src/frontends/qt4/GuiDocument.cpp:941 +#: src/frontends/qt4/GuiDocument.cpp:860 msgid "A2" msgstr "A2" -#: src/frontends/qt4/GuiDocument.cpp:942 -msgid "A3" -msgstr "A3" - -#: src/frontends/qt4/GuiDocument.cpp:943 -msgid "A4" -msgstr "A4" - -#: src/frontends/qt4/GuiDocument.cpp:944 -msgid "A5" -msgstr "A5" - -#: src/frontends/qt4/GuiDocument.cpp:945 +#: src/frontends/qt4/GuiDocument.cpp:864 msgid "A6" msgstr "A6" -#: src/frontends/qt4/GuiDocument.cpp:946 +#: src/frontends/qt4/GuiDocument.cpp:865 msgid "B0" msgstr "B0" -#: src/frontends/qt4/GuiDocument.cpp:947 +#: src/frontends/qt4/GuiDocument.cpp:866 msgid "B1" msgstr "B1" -#: src/frontends/qt4/GuiDocument.cpp:948 +#: src/frontends/qt4/GuiDocument.cpp:867 msgid "B2" msgstr "B2" -#: src/frontends/qt4/GuiDocument.cpp:949 +#: src/frontends/qt4/GuiDocument.cpp:868 msgid "B3" msgstr "B3" -#: src/frontends/qt4/GuiDocument.cpp:950 +#: src/frontends/qt4/GuiDocument.cpp:869 msgid "B4" msgstr "B4" -#: src/frontends/qt4/GuiDocument.cpp:951 -msgid "B5" -msgstr "B5" - -#: src/frontends/qt4/GuiDocument.cpp:952 +#: src/frontends/qt4/GuiDocument.cpp:871 msgid "B6" msgstr "B6" -#: src/frontends/qt4/GuiDocument.cpp:953 +#: src/frontends/qt4/GuiDocument.cpp:872 msgid "C0" msgstr "C0" -#: src/frontends/qt4/GuiDocument.cpp:954 +#: src/frontends/qt4/GuiDocument.cpp:873 msgid "C1" msgstr "C1" -#: src/frontends/qt4/GuiDocument.cpp:955 +#: src/frontends/qt4/GuiDocument.cpp:874 msgid "C2" msgstr "C2" -#: src/frontends/qt4/GuiDocument.cpp:956 +#: src/frontends/qt4/GuiDocument.cpp:875 msgid "C3" msgstr "C3" -#: src/frontends/qt4/GuiDocument.cpp:957 +#: src/frontends/qt4/GuiDocument.cpp:876 msgid "C4" msgstr "C4" -#: src/frontends/qt4/GuiDocument.cpp:958 +#: src/frontends/qt4/GuiDocument.cpp:877 msgid "C5" msgstr "C5" -#: src/frontends/qt4/GuiDocument.cpp:959 +#: src/frontends/qt4/GuiDocument.cpp:878 msgid "C6" msgstr "C6" -#: src/frontends/qt4/GuiDocument.cpp:960 +#: src/frontends/qt4/GuiDocument.cpp:879 msgid "JIS B0" msgstr "JIS B0" -#: src/frontends/qt4/GuiDocument.cpp:961 +#: src/frontends/qt4/GuiDocument.cpp:880 msgid "JIS B1" msgstr "JIS B1" -#: src/frontends/qt4/GuiDocument.cpp:962 +#: src/frontends/qt4/GuiDocument.cpp:881 msgid "JIS B2" msgstr "JIS B2" -#: src/frontends/qt4/GuiDocument.cpp:963 +#: src/frontends/qt4/GuiDocument.cpp:882 msgid "JIS B3" msgstr "JIS B3" -#: src/frontends/qt4/GuiDocument.cpp:964 +#: src/frontends/qt4/GuiDocument.cpp:883 msgid "JIS B4" msgstr "JIS B4" -#: src/frontends/qt4/GuiDocument.cpp:965 +#: src/frontends/qt4/GuiDocument.cpp:884 msgid "JIS B5" msgstr "JIS B5" -#: src/frontends/qt4/GuiDocument.cpp:966 +#: src/frontends/qt4/GuiDocument.cpp:885 msgid "JIS B6" msgstr "JIS B6" -#: src/frontends/qt4/GuiDocument.cpp:1078 +#: src/frontends/qt4/GuiDocument.cpp:997 msgid "Language Default (no inputenc)" msgstr "Langue implicite (pas de recours à inputenc)" -#: src/frontends/qt4/GuiDocument.cpp:1087 +#: src/frontends/qt4/GuiDocument.cpp:1006 msgid "``text''" msgstr "``text''" -#: src/frontends/qt4/GuiDocument.cpp:1088 +#: src/frontends/qt4/GuiDocument.cpp:1007 msgid "''text''" msgstr "''text''" -#: src/frontends/qt4/GuiDocument.cpp:1089 +#: src/frontends/qt4/GuiDocument.cpp:1008 msgid ",,text``" msgstr ",,text``" -#: src/frontends/qt4/GuiDocument.cpp:1090 +#: src/frontends/qt4/GuiDocument.cpp:1009 msgid ",,text''" msgstr ",,text''" -#: src/frontends/qt4/GuiDocument.cpp:1091 +#: src/frontends/qt4/GuiDocument.cpp:1010 msgid "<>" msgstr "«texte»" -#: src/frontends/qt4/GuiDocument.cpp:1092 +#: src/frontends/qt4/GuiDocument.cpp:1011 msgid ">>text<<" msgstr "»texte«" -#: src/frontends/qt4/GuiDocument.cpp:1138 +#: src/frontends/qt4/GuiDocument.cpp:1057 msgid "Numbered" msgstr "Numéroté" -#: src/frontends/qt4/GuiDocument.cpp:1139 +#: src/frontends/qt4/GuiDocument.cpp:1058 msgid "Appears in TOC" msgstr "Apparaît dans la TdM" -#: src/frontends/qt4/GuiDocument.cpp:1175 +#: src/frontends/qt4/GuiDocument.cpp:1086 msgid "Author-year" msgstr "Auteur-année" -#: src/frontends/qt4/GuiDocument.cpp:1176 +#: src/frontends/qt4/GuiDocument.cpp:1087 msgid "Numerical" msgstr "Numéroté" -#: src/frontends/qt4/GuiDocument.cpp:1218 -msgid "The AMS LaTeX packages are always used" -msgstr "Les paquetages LaTeX AMS sont utilisés dans tous les cas." - -#: src/frontends/qt4/GuiDocument.cpp:1221 -#, fuzzy, c-format -msgid "The LaTeX package %1$s is always used" -msgstr "Le paquetage LaTeX esint est utilisé dans tous les cas." - -#: src/frontends/qt4/GuiDocument.cpp:1290 +#: src/frontends/qt4/GuiDocument.cpp:1184 #, c-format msgid "Unavailable: %1$s" msgstr "Indisponible : %1$s" -#: src/frontends/qt4/GuiDocument.cpp:1407 -#: src/frontends/qt4/GuiDocument.cpp:1508 +#: src/frontends/qt4/GuiDocument.cpp:1301 +#: src/frontends/qt4/GuiDocument.cpp:1402 msgid "Input listings parameters below. Enter ? for a list of parameters." -msgstr "" -"Saisir les paramètres du listing ci-dessous. Taper ? pour une liste des " -"paramètres." +msgstr "Saisir les paramètres du listing ci-dessous. Taper ? pour une liste des paramètres." -#: src/frontends/qt4/GuiDocument.cpp:1411 -#: src/frontends/qt4/GuiDocument.cpp:1432 -#: src/frontends/qt4/GuiDocument.cpp:3030 +#: src/frontends/qt4/GuiDocument.cpp:1305 +#: src/frontends/qt4/GuiDocument.cpp:1326 +#: src/frontends/qt4/GuiDocument.cpp:2875 msgid "Document Class" msgstr "Classe de document" -#: src/frontends/qt4/GuiDocument.cpp:1412 -#: src/frontends/qt4/GuiDocument.cpp:3028 -#: src/frontends/qt4/GuiDocument.cpp:3029 -#: src/frontends/qt4/GuiDocument.cpp:3032 src/frontends/qt4/qt_helpers.cpp:554 +#: src/frontends/qt4/GuiDocument.cpp:1306 +#: src/frontends/qt4/GuiDocument.cpp:2873 +#: src/frontends/qt4/GuiDocument.cpp:2874 +#: src/frontends/qt4/GuiDocument.cpp:2877 +#: src/frontends/qt4/qt_helpers.cpp:553 msgid "Child Documents" msgstr "Sous-documents" -#: src/frontends/qt4/GuiDocument.cpp:1413 +#: src/frontends/qt4/GuiDocument.cpp:1307 msgid "Modules" msgstr "Modules" -#: src/frontends/qt4/GuiDocument.cpp:1414 +#: src/frontends/qt4/GuiDocument.cpp:1308 msgid "Local Layout" msgstr "Format local" -#: src/frontends/qt4/GuiDocument.cpp:1416 +#: src/frontends/qt4/GuiDocument.cpp:1310 msgid "Text Layout" msgstr "Format du texte" -#: src/frontends/qt4/GuiDocument.cpp:1418 +#: src/frontends/qt4/GuiDocument.cpp:1312 msgid "Page Margins" msgstr "Marges" -#: src/frontends/qt4/GuiDocument.cpp:1420 src/frontends/qt4/GuiPrefs.cpp:1107 +#: src/frontends/qt4/GuiDocument.cpp:1314 +#: src/frontends/qt4/GuiPrefs.cpp:1109 msgid "Colors" msgstr "Couleurs" -#: src/frontends/qt4/GuiDocument.cpp:1421 +#: src/frontends/qt4/GuiDocument.cpp:1315 msgid "Numbering & TOC" msgstr "Numérotation & TdM" -#: src/frontends/qt4/GuiDocument.cpp:1423 +#: src/frontends/qt4/GuiDocument.cpp:1317 msgid "Indexes" msgstr "Index" -#: src/frontends/qt4/GuiDocument.cpp:1424 +#: src/frontends/qt4/GuiDocument.cpp:1318 msgid "PDF Properties" msgstr "Propriétés du PDF" -#: src/frontends/qt4/GuiDocument.cpp:1425 +#: src/frontends/qt4/GuiDocument.cpp:1319 msgid "Math Options" msgstr "Options mode math" -#: src/frontends/qt4/GuiDocument.cpp:1426 +#: src/frontends/qt4/GuiDocument.cpp:1320 msgid "Float Placement" msgstr "Placement des flottants" -#: src/frontends/qt4/GuiDocument.cpp:1428 +#: src/frontends/qt4/GuiDocument.cpp:1322 msgid "Bullets" msgstr "Puces" -#: src/frontends/qt4/GuiDocument.cpp:1429 +#: src/frontends/qt4/GuiDocument.cpp:1323 msgid "Branches" msgstr "Branches" -#: src/frontends/qt4/GuiDocument.cpp:1431 +#: src/frontends/qt4/GuiDocument.cpp:1325 msgid "LaTeX Preamble" msgstr "Préambule LaTeX" -#: src/frontends/qt4/GuiDocument.cpp:1661 -#: src/frontends/qt4/GuiDocument.cpp:1691 +#: src/frontends/qt4/GuiDocument.cpp:1555 +#: src/frontends/qt4/GuiDocument.cpp:1585 msgid "&Default..." msgstr "&Implicite..." -#: src/frontends/qt4/GuiDocument.cpp:1831 -#: src/frontends/qt4/GuiDocument.cpp:1837 -#: src/frontends/qt4/GuiDocument.cpp:1843 -#: src/frontends/qt4/GuiDocument.cpp:3063 -#: src/frontends/qt4/GuiDocument.cpp:3071 -#: src/frontends/qt4/GuiDocument.cpp:3079 +#: src/frontends/qt4/GuiDocument.cpp:1734 +#: src/frontends/qt4/GuiDocument.cpp:1740 +#: src/frontends/qt4/GuiDocument.cpp:1746 +#: src/frontends/qt4/GuiDocument.cpp:2908 +#: src/frontends/qt4/GuiDocument.cpp:2916 +#: src/frontends/qt4/GuiDocument.cpp:2924 msgid " (not installed)" msgstr " (pas installé)" -#: src/frontends/qt4/GuiDocument.cpp:1918 +#: src/frontends/qt4/GuiDocument.cpp:1821 msgid "Layouts|#o#O" msgstr "Format|#t#T" -#: src/frontends/qt4/GuiDocument.cpp:1920 +#: src/frontends/qt4/GuiDocument.cpp:1823 msgid "LyX Layout (*.layout)" msgstr "Formats LyX (*.layout)" -#: src/frontends/qt4/GuiDocument.cpp:1922 -#: src/frontends/qt4/GuiDocument.cpp:1931 +#: src/frontends/qt4/GuiDocument.cpp:1825 +#: src/frontends/qt4/GuiDocument.cpp:1834 msgid "Local layout file" msgstr "Fichier de format local" -#: src/frontends/qt4/GuiDocument.cpp:1932 +#: src/frontends/qt4/GuiDocument.cpp:1835 msgid "" "The layout file you have selected is a local layout\n" "file, not one in the system or user directory. Your\n" @@ -21812,123 +22065,116 @@ msgstr "" "Votre document peut ne plus fonctionner avec ce format si vous ne\n" "conservez pas le fichier de format dans le répertoire du document." -#: src/frontends/qt4/GuiDocument.cpp:1936 +#: src/frontends/qt4/GuiDocument.cpp:1839 msgid "&Set Layout" msgstr "&Sélectionner le format" -#: src/frontends/qt4/GuiDocument.cpp:1950 +#: src/frontends/qt4/GuiDocument.cpp:1853 msgid "Unable to read local layout file." msgstr "Échec de la lecture d'un fichier de format local." -#: src/frontends/qt4/GuiDocument.cpp:1972 +#: src/frontends/qt4/GuiDocument.cpp:1875 msgid "Select master document" msgstr "Sélectionner le document maître" -#: src/frontends/qt4/GuiDocument.cpp:1976 +#: src/frontends/qt4/GuiDocument.cpp:1879 msgid "LyX Files (*.lyx)" msgstr "Documents LyX (*.lyx)" -#: src/frontends/qt4/GuiDocument.cpp:2009 -#: src/frontends/qt4/GuiDocument.cpp:3330 +#: src/frontends/qt4/GuiDocument.cpp:1912 +#: src/frontends/qt4/GuiDocument.cpp:3174 msgid "Unapplied changes" msgstr "Modifications non appliquées" -#: src/frontends/qt4/GuiDocument.cpp:2010 -#: src/frontends/qt4/GuiDocument.cpp:3331 +#: src/frontends/qt4/GuiDocument.cpp:1913 +#: src/frontends/qt4/GuiDocument.cpp:3175 msgid "" "Some changes in the dialog were not yet applied.\n" "If you do not apply now, they will be lost after this action." -msgstr "" -"Certaines modifications dans le dialogue n'ont pas encore été appliquées. Si " -"vous ne la appliquez pas maintenant, elles seront perdues après cette action." +msgstr "Certaines modifications dans le dialogue n'ont pas encore été appliquées. Si vous ne la appliquez pas maintenant, elles seront perdues après cette action." -#: src/frontends/qt4/GuiDocument.cpp:2012 -#: src/frontends/qt4/GuiDocument.cpp:3333 +#: src/frontends/qt4/GuiDocument.cpp:1915 +#: src/frontends/qt4/GuiDocument.cpp:3177 msgid "&Dismiss" msgstr "Aban&donner" -#: src/frontends/qt4/GuiDocument.cpp:2024 -#: src/frontends/qt4/GuiDocument.cpp:3341 +#: src/frontends/qt4/GuiDocument.cpp:1927 +#: src/frontends/qt4/GuiDocument.cpp:3185 msgid "Unable to set document class." msgstr "Impossible d'appliquer la classe du document." -#: src/frontends/qt4/GuiDocument.cpp:2136 +#: src/frontends/qt4/GuiDocument.cpp:1980 #, c-format msgid "%1$s, %2$s" msgstr "%1$s, %2$s" -#: src/frontends/qt4/GuiDocument.cpp:2141 +#: src/frontends/qt4/GuiDocument.cpp:1985 #, c-format msgid "%1$s, %2$s, and %3$s" msgstr "%1$s, %2$s and %3$s" -#: src/frontends/qt4/GuiDocument.cpp:2155 +#: src/frontends/qt4/GuiDocument.cpp:1999 #, c-format msgid "%1$s (unavailable)" msgstr "%1$s (indisponible)" -#: src/frontends/qt4/GuiDocument.cpp:2230 +#: src/frontends/qt4/GuiDocument.cpp:2074 msgid "Module provided by document class." msgstr "Module fourni par la classe de document." -#: src/frontends/qt4/GuiDocument.cpp:2237 -#, fuzzy, c-format -msgid "Category: %1$s." -msgstr "Ca&tegorie :" - -#: src/frontends/qt4/GuiDocument.cpp:2245 +#: src/frontends/qt4/GuiDocument.cpp:2082 #, c-format msgid "Package(s) required: %1$s." msgstr "Paquetage(s) requis : %1$s." -#: src/frontends/qt4/GuiDocument.cpp:2251 +#: src/frontends/qt4/GuiDocument.cpp:2088 msgid "or" msgstr "ou" -#: src/frontends/qt4/GuiDocument.cpp:2254 +#: src/frontends/qt4/GuiDocument.cpp:2091 #, c-format msgid "Modules required: %1$s." msgstr "Modules requis : %1$s." -#: src/frontends/qt4/GuiDocument.cpp:2263 +#: src/frontends/qt4/GuiDocument.cpp:2100 #, c-format msgid "Modules excluded: %1$s." msgstr "Modules exclus : %1$s." -#: src/frontends/qt4/GuiDocument.cpp:2269 +#: src/frontends/qt4/GuiDocument.cpp:2106 msgid "WARNING: Some required packages are unavailable!" msgstr "AVERTISSEMENT : certains paquetages ne sont pas disponibles !" -#: src/frontends/qt4/GuiDocument.cpp:3005 +#: src/frontends/qt4/GuiDocument.cpp:2850 msgid "[No options predefined]" msgstr "[Aucune option prédéfinie]" -#: src/frontends/qt4/GuiDocument.cpp:3202 +#: src/frontends/qt4/GuiDocument.cpp:3046 msgid "C&ustomize Hyperref Options" msgstr "Personnaliser les options h&yperref" -#: src/frontends/qt4/GuiDocument.cpp:3204 +#: src/frontends/qt4/GuiDocument.cpp:3048 msgid "&Use Hyperref Support" msgstr "&Utiliser le support pour hyperref" -#: src/frontends/qt4/GuiDocument.cpp:3353 +#: src/frontends/qt4/GuiDocument.cpp:3197 msgid "Can't set layout!" msgstr "Impossible d'appliquer le format !" -#: src/frontends/qt4/GuiDocument.cpp:3354 +#: src/frontends/qt4/GuiDocument.cpp:3198 #, c-format msgid "Unable to set layout for ID: %1$s" msgstr "Impossible d'appliquer le format pour ID : %1$s" -#: src/frontends/qt4/GuiDocument.cpp:3447 +#: src/frontends/qt4/GuiDocument.cpp:3291 msgid "Not Found" msgstr "Introuvable" -#: src/frontends/qt4/GuiDocument.cpp:3501 +#: src/frontends/qt4/GuiDocument.cpp:3345 msgid "Assigned master does not include this file" msgstr "Le document maître désigné n'inclut pas ce fichier" -#: src/frontends/qt4/GuiDocument.cpp:3502 +#: src/frontends/qt4/GuiDocument.cpp:3346 #, c-format msgid "" "You must include this file in the document\n" @@ -21939,11 +22185,11 @@ msgstr "" "%1$s' pour pouvoir utiliser les fonctionnalités\n" "« document maître »." -#: src/frontends/qt4/GuiDocument.cpp:3506 +#: src/frontends/qt4/GuiDocument.cpp:3350 msgid "Could not load master" msgstr "Chargement du document maître impossible" -#: src/frontends/qt4/GuiDocument.cpp:3507 +#: src/frontends/qt4/GuiDocument.cpp:3351 #, c-format msgid "" "The master document '%1$s'\n" @@ -21952,7 +22198,8 @@ msgstr "" "Le document maître %1$s\n" " n'a pas pu être chargé." -#: src/frontends/qt4/GuiErrorList.cpp:44 src/frontends/qt4/GuiLog.cpp:237 +#: src/frontends/qt4/GuiErrorList.cpp:44 +#: src/frontends/qt4/GuiLog.cpp:237 msgid "Literate" msgstr "Littéraire" @@ -21969,67 +22216,77 @@ msgstr "Liste des erreurs" msgid "%1$s Errors (%2$s)" msgstr "Erreurs %1$s (%2$s)" -#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:72 +#: src/frontends/qt4/GuiExternal.cpp:76 +#: src/frontends/qt4/GuiGraphics.cpp:71 msgid "Top left" msgstr "Haut gauche" -#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:72 +#: src/frontends/qt4/GuiExternal.cpp:76 +#: src/frontends/qt4/GuiGraphics.cpp:71 msgid "Bottom left" msgstr "Bas gauche" -#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:72 +#: src/frontends/qt4/GuiExternal.cpp:76 +#: src/frontends/qt4/GuiGraphics.cpp:71 msgid "Baseline left" msgstr "Ligne de base gauche" -#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:73 +#: src/frontends/qt4/GuiExternal.cpp:77 +#: src/frontends/qt4/GuiGraphics.cpp:72 msgid "Top center" msgstr "Haut centre" -#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:73 +#: src/frontends/qt4/GuiExternal.cpp:77 +#: src/frontends/qt4/GuiGraphics.cpp:72 msgid "Bottom center" msgstr "Bas centre" -#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:73 +#: src/frontends/qt4/GuiExternal.cpp:77 +#: src/frontends/qt4/GuiGraphics.cpp:72 msgid "Baseline center" msgstr "Ligne de Base Centre" -#: src/frontends/qt4/GuiExternal.cpp:79 src/frontends/qt4/GuiGraphics.cpp:74 +#: src/frontends/qt4/GuiExternal.cpp:78 +#: src/frontends/qt4/GuiGraphics.cpp:73 msgid "Top right" msgstr "Haut droite" -#: src/frontends/qt4/GuiExternal.cpp:79 src/frontends/qt4/GuiGraphics.cpp:74 +#: src/frontends/qt4/GuiExternal.cpp:78 +#: src/frontends/qt4/GuiGraphics.cpp:73 msgid "Bottom right" msgstr "Bas Droite" -#: src/frontends/qt4/GuiExternal.cpp:79 src/frontends/qt4/GuiGraphics.cpp:74 +#: src/frontends/qt4/GuiExternal.cpp:78 +#: src/frontends/qt4/GuiGraphics.cpp:73 msgid "Baseline right" msgstr "Ligne de base droite" -#: src/frontends/qt4/GuiExternal.cpp:96 +#: src/frontends/qt4/GuiExternal.cpp:95 msgid "External Material" msgstr "Objet externe" -#: src/frontends/qt4/GuiExternal.cpp:210 +#: src/frontends/qt4/GuiExternal.cpp:209 msgid "Scale%" msgstr "Échelle%" -#: src/frontends/qt4/GuiExternal.cpp:641 +#: src/frontends/qt4/GuiExternal.cpp:633 msgid "Select external file" msgstr "Choisir le fichier externe" -#: src/frontends/qt4/GuiGraphics.cpp:78 +#: src/frontends/qt4/GuiGraphics.cpp:77 msgid "automatically" msgstr "automatiquement" -#: src/frontends/qt4/GuiGraphics.cpp:113 +#: src/frontends/qt4/GuiGraphics.cpp:112 msgid "Graphics" msgstr "Graphique" -#: src/frontends/qt4/GuiGraphics.cpp:263 src/frontends/qt4/GuiGraphics.cpp:279 +#: src/frontends/qt4/GuiGraphics.cpp:262 +#: src/frontends/qt4/GuiGraphics.cpp:278 msgid "Dissolve previous group?" msgstr "Supprimer le groupe précédent ?" -#: src/frontends/qt4/GuiGraphics.cpp:264 +#: src/frontends/qt4/GuiGraphics.cpp:263 #, c-format msgid "" "If you assign this graphic to group '%2$s',\n" @@ -22042,17 +22299,18 @@ msgstr "" "parce que ce graphique y est seul.\n" "Comment voulez-vous poursuivre ?" -#: src/frontends/qt4/GuiGraphics.cpp:270 src/frontends/qt4/GuiGraphics.cpp:286 +#: src/frontends/qt4/GuiGraphics.cpp:269 +#: src/frontends/qt4/GuiGraphics.cpp:285 #, c-format msgid "Stick with group '%1$s'" msgstr "Rester dans le groupe '%1$s'" -#: src/frontends/qt4/GuiGraphics.cpp:272 +#: src/frontends/qt4/GuiGraphics.cpp:271 #, c-format msgid "Assign to group '%1$s' anyway" msgstr "Associer au groupe '%1$s' quand même" -#: src/frontends/qt4/GuiGraphics.cpp:280 +#: src/frontends/qt4/GuiGraphics.cpp:279 #, c-format msgid "" "If you sign off this graphic from group '%1$s',\n" @@ -22065,121 +22323,125 @@ msgstr "" "parce que ce graphique y est seul.\n" "Comment voulez-vous poursuivre ?" -#: src/frontends/qt4/GuiGraphics.cpp:288 +#: src/frontends/qt4/GuiGraphics.cpp:287 #, c-format msgid "Sign off from group '%1$s'" msgstr "Enlever du groupe '%1$s'" -#: src/frontends/qt4/GuiGraphics.cpp:328 +#: src/frontends/qt4/GuiGraphics.cpp:327 msgid "Enter unique group name:" msgstr "Saisir un nom de groupe unique :" -#: src/frontends/qt4/GuiGraphics.cpp:333 +#: src/frontends/qt4/GuiGraphics.cpp:332 msgid "Group already defined!" msgstr "Groupe déjà défini !" -#: src/frontends/qt4/GuiGraphics.cpp:334 +#: src/frontends/qt4/GuiGraphics.cpp:333 #, c-format msgid "A graphics group with the name '%1$s' already exists." msgstr "Un groupe de graphiques dénommé '%1$s' existe déjà." -#: src/frontends/qt4/GuiGraphics.cpp:476 src/lengthcommon.cpp:44 +#: src/frontends/qt4/GuiGraphics.cpp:475 +#: src/lengthcommon.cpp:37 msgid "bp" msgstr "bp" -#: src/frontends/qt4/GuiGraphics.cpp:476 src/lengthcommon.cpp:44 +#: src/frontends/qt4/GuiGraphics.cpp:475 +#: src/lengthcommon.cpp:37 msgid "cm" msgstr "cm" -#: src/frontends/qt4/GuiGraphics.cpp:476 src/lengthcommon.cpp:45 +#: src/frontends/qt4/GuiGraphics.cpp:475 +#: src/lengthcommon.cpp:38 msgid "mm" msgstr "mm" -#: src/frontends/qt4/GuiGraphics.cpp:476 src/lengthcommon.cpp:45 +#: src/frontends/qt4/GuiGraphics.cpp:475 +#: src/lengthcommon.cpp:38 msgid "in[[unit of measure]]" msgstr "in[[unité de mesure]]" -#: src/frontends/qt4/GuiGraphics.cpp:787 +#: src/frontends/qt4/GuiGraphics.cpp:786 msgid "Select graphics file" msgstr "Choisir le fichier graphique" -#: src/frontends/qt4/GuiGraphics.cpp:799 +#: src/frontends/qt4/GuiGraphics.cpp:798 msgid "Clipart|#C#c" msgstr "Clipart|#C" -#: src/frontends/qt4/GuiHSpace.cpp:45 src/frontends/qt4/GuiHSpace.cpp:58 +#: src/frontends/qt4/GuiHSpace.cpp:45 +#: src/frontends/qt4/GuiHSpace.cpp:57 +#: src/insets/InsetSpace.cpp:74 +msgid "Thin Space" +msgstr "Espace fine" + +#: src/frontends/qt4/GuiHSpace.cpp:46 +#: src/insets/InsetSpace.cpp:77 +msgid "Medium Space" +msgstr "Espace moyenne" + +#: src/frontends/qt4/GuiHSpace.cpp:47 +#: src/insets/InsetSpace.cpp:80 +msgid "Thick Space" +msgstr "Espace large" + +#: src/frontends/qt4/GuiHSpace.cpp:48 +#: src/frontends/qt4/GuiHSpace.cpp:58 +#: src/insets/InsetSpace.cpp:95 +msgid "Negative Thin Space" +msgstr "Espace fine négative" + +#: src/frontends/qt4/GuiHSpace.cpp:49 +#: src/insets/InsetSpace.cpp:98 +msgid "Negative Medium Space" +msgstr "Espace moyenne négative" + +#: src/frontends/qt4/GuiHSpace.cpp:50 +#: src/insets/InsetSpace.cpp:101 +msgid "Negative Thick Space" +msgstr "Espace large négative" + +#: src/frontends/qt4/GuiHSpace.cpp:51 +#: src/frontends/qt4/GuiHSpace.cpp:59 +msgid "Half Quad (0.5 em)" +msgstr "Demi-cadratin (0.5 em)" + +#: src/frontends/qt4/GuiHSpace.cpp:52 +#: src/frontends/qt4/GuiHSpace.cpp:60 +msgid "Quad (1 em)" +msgstr "Cadratin (1 em)" + +#: src/frontends/qt4/GuiHSpace.cpp:53 +#: src/frontends/qt4/GuiHSpace.cpp:61 +msgid "Double Quad (2 em)" +msgstr "Double cadratin (2 em)" + +#: src/frontends/qt4/GuiHSpace.cpp:56 #: src/insets/InsetSpace.cpp:68 msgid "Interword Space" msgstr "Espace entre mots" -#: src/frontends/qt4/GuiHSpace.cpp:46 src/frontends/qt4/GuiHSpace.cpp:59 -#: src/insets/InsetSpace.cpp:77 -msgid "Thin Space" -msgstr "Espace fine" - -#: src/frontends/qt4/GuiHSpace.cpp:47 src/insets/InsetSpace.cpp:80 -msgid "Medium Space" -msgstr "Espace moyenne" - -#: src/frontends/qt4/GuiHSpace.cpp:48 src/insets/InsetSpace.cpp:83 -msgid "Thick Space" -msgstr "Espace large" - -#: src/frontends/qt4/GuiHSpace.cpp:49 src/frontends/qt4/GuiHSpace.cpp:60 -#: src/insets/InsetSpace.cpp:98 -msgid "Negative Thin Space" -msgstr "Espace fine négative" - -#: src/frontends/qt4/GuiHSpace.cpp:50 src/frontends/qt4/GuiHSpace.cpp:61 -#: src/insets/InsetSpace.cpp:101 -msgid "Negative Medium Space" -msgstr "Espace moyenne négative" - -#: src/frontends/qt4/GuiHSpace.cpp:51 src/frontends/qt4/GuiHSpace.cpp:62 +#: src/frontends/qt4/GuiHSpace.cpp:62 #: src/insets/InsetSpace.cpp:104 -msgid "Negative Thick Space" -msgstr "Espace large négative" - -#: src/frontends/qt4/GuiHSpace.cpp:52 src/frontends/qt4/GuiHSpace.cpp:63 -msgid "Half Quad (0.5 em)" -msgstr "Demi-cadratin (0.5 em)" - -#: src/frontends/qt4/GuiHSpace.cpp:53 src/frontends/qt4/GuiHSpace.cpp:64 -msgid "Quad (1 em)" -msgstr "Cadratin (1 em)" - -#: src/frontends/qt4/GuiHSpace.cpp:54 src/frontends/qt4/GuiHSpace.cpp:65 -msgid "Double Quad (2 em)" -msgstr "Double cadratin (2 em)" - -#: src/frontends/qt4/GuiHSpace.cpp:55 src/frontends/qt4/GuiHSpace.cpp:66 -#: src/insets/InsetSpace.cpp:107 msgid "Horizontal Fill" msgstr "Ressort horizontal" -#: src/frontends/qt4/GuiHSpace.cpp:68 src/insets/InsetSpace.cpp:74 -#, fuzzy -msgid "Visible Space" -msgstr "TexteVisible" - -#: src/frontends/qt4/GuiHSpace.cpp:211 +#: src/frontends/qt4/GuiHSpace.cpp:210 msgid "" "Insert the spacing even after a line break.\n" "Note that a protected Half Quad will be turned into\n" "a vertical space if used at the beginning of a paragraph!" msgstr "" "Insérer l'espace même après un saut de ligne.\n" -"Notez qu'un espace insécable demi-cadratin apparaîtra comme un espacement " -"vertical s'il est utilisé au début d'un paragraphe !" +"Notez qu'un espace insécable demi-cadratin apparaîtra comme un espacement vertical s'il est utilisé au début d'un paragraphe !" -#: src/frontends/qt4/GuiInclude.cpp:120 src/frontends/qt4/GuiInclude.cpp:182 -#: src/frontends/qt4/GuiListings.cpp:239 src/frontends/qt4/GuiListings.cpp:375 +#: src/frontends/qt4/GuiInclude.cpp:120 +#: src/frontends/qt4/GuiInclude.cpp:182 +#: src/frontends/qt4/GuiListings.cpp:239 +#: src/frontends/qt4/GuiListings.cpp:375 #: src/frontends/qt4/GuiListings.cpp:450 -msgid "" -"Input listing parameters on the right. Enter ? for a list of parameters." -msgstr "" -"Mettez les paramètres du listing à droite. Tapez ? pour une liste des " -"paramètres disponibles." +msgid "Input listing parameters on the right. Enter ? for a list of parameters." +msgstr "Mettez les paramètres du listing à droite. Tapez ? pour une liste des paramètres disponibles." #: src/frontends/qt4/GuiInclude.cpp:315 msgid "Select document to include" @@ -22253,19 +22515,19 @@ msgstr "buffer" msgid "lyxinfo" msgstr "lyxinfo" -#: src/frontends/qt4/GuiKeySymbol.cpp:709 +#: src/frontends/qt4/GuiKeySymbol.cpp:711 msgid "Shift-" msgstr "Maj-" -#: src/frontends/qt4/GuiKeySymbol.cpp:710 +#: src/frontends/qt4/GuiKeySymbol.cpp:712 msgid "Control-" msgstr "Control-" -#: src/frontends/qt4/GuiKeySymbol.cpp:711 +#: src/frontends/qt4/GuiKeySymbol.cpp:713 msgid "Option-" msgstr "Option-" -#: src/frontends/qt4/GuiKeySymbol.cpp:712 +#: src/frontends/qt4/GuiKeySymbol.cpp:714 msgid "Command-" msgstr "Command-" @@ -22281,7 +22543,8 @@ msgstr "Paramètres de listing de programme" msgid "No dialect" msgstr "Pas de dialecte" -#: src/frontends/qt4/GuiLog.cpp:112 src/frontends/qt4/GuiLog.cpp:265 +#: src/frontends/qt4/GuiLog.cpp:112 +#: src/frontends/qt4/GuiLog.cpp:265 msgid "LaTeX Log" msgstr "Fichier journal LaTeX" @@ -22307,8 +22570,7 @@ msgstr "Fichier journal introuvable." #: src/frontends/qt4/GuiLog.cpp:300 msgid "No literate programming build log file found." -msgstr "" -"Fichier journal de compilation de programmation littéraire introuvable." +msgstr "Fichier journal de compilation de programmation littéraire introuvable." #: src/frontends/qt4/GuiLog.cpp:303 msgid "No lyx2lyx error log file found." @@ -22332,17 +22594,12 @@ msgstr "Paramètres de paragraphe" #: src/frontends/qt4/GuiParagraph.cpp:78 msgid "" -"As described in the User Guide, the width of this text determines the width " -"of the label part of each item in environments like List and Description.\n" +"As described in the User Guide, the width of this text determines the width of the label part of each item in environments like List and Description.\n" "\n" -" Normally, you won't need to set this, since the largest label width of all " -"the items is used." +" Normally, you won't need to set this, since the largest label width of all the items is used." msgstr "" -"Comme expliqué dans le Guide de l'Utilisateur, la largeur de ce texte " -"détermine la taille de l'étiquette de chaque élément dans les environnements " -"comme Liste et Description.\n" -"En principe, vous n'avez pas à le modifier puisqu'on utilise la plus grande " -"largeur d'étiquette de tous les éléments." +"Comme expliqué dans le Guide de l'Utilisateur, la largeur de ce texte détermine la taille de l'étiquette de chaque élément dans les environnements comme Liste et Description.\n" +"En principe, vous n'avez pas à le modifier puisqu'on utilise la plus grande largeur d'étiquette de tous les éléments." #: src/frontends/qt4/GuiPhantom.cpp:25 msgid "Phantom Settings" @@ -22377,73 +22634,75 @@ msgstr "Clavier/Souris" msgid "Input Completion" msgstr "Complétion de saisie" -#: src/frontends/qt4/GuiPrefs.cpp:760 src/frontends/qt4/GuiPrefs.cpp:785 -#: src/frontends/qt4/GuiPrefs.cpp:873 src/frontends/qt4/GuiPrefs.cpp:900 +#: src/frontends/qt4/GuiPrefs.cpp:758 +#: src/frontends/qt4/GuiPrefs.cpp:783 +#: src/frontends/qt4/GuiPrefs.cpp:873 +#: src/frontends/qt4/GuiPrefs.cpp:900 msgid "Co&mmand:" msgstr "&Commande :" -#: src/frontends/qt4/GuiPrefs.cpp:930 +#: src/frontends/qt4/GuiPrefs.cpp:932 msgid "Screen Fonts" msgstr "Polices d'écran" -#: src/frontends/qt4/GuiPrefs.cpp:1311 +#: src/frontends/qt4/GuiPrefs.cpp:1305 msgid "Paths" msgstr "Répertoires" -#: src/frontends/qt4/GuiPrefs.cpp:1398 +#: src/frontends/qt4/GuiPrefs.cpp:1392 msgid "Select directory for example files" msgstr "Choisir le répertoire des fichiers d'exemple" -#: src/frontends/qt4/GuiPrefs.cpp:1407 +#: src/frontends/qt4/GuiPrefs.cpp:1401 msgid "Select a document templates directory" msgstr "Choisir un répertoire de modèles de document" -#: src/frontends/qt4/GuiPrefs.cpp:1416 +#: src/frontends/qt4/GuiPrefs.cpp:1410 msgid "Select a temporary directory" msgstr "Choisir un répertoire temporaire" -#: src/frontends/qt4/GuiPrefs.cpp:1425 +#: src/frontends/qt4/GuiPrefs.cpp:1419 msgid "Select a backups directory" msgstr "Choisir un répertoire de sauvegardes automatiques" -#: src/frontends/qt4/GuiPrefs.cpp:1434 +#: src/frontends/qt4/GuiPrefs.cpp:1428 msgid "Select a document directory" msgstr "Choisir un répertoire de documents" -#: src/frontends/qt4/GuiPrefs.cpp:1443 +#: src/frontends/qt4/GuiPrefs.cpp:1437 msgid "Set the path to the thesaurus dictionaries" msgstr "Positionner le chemin vers les dictionnaires de synonymes" -#: src/frontends/qt4/GuiPrefs.cpp:1452 +#: src/frontends/qt4/GuiPrefs.cpp:1446 msgid "Set the path to the Hunspell dictionaries" msgstr "Saisir le chemin d'accès au dictionnaire hunspell" -#: src/frontends/qt4/GuiPrefs.cpp:1461 +#: src/frontends/qt4/GuiPrefs.cpp:1455 msgid "Give a filename for the LyX server pipe" msgstr "Donnez un nom de fichier au tube du serveur LyX" -#: src/frontends/qt4/GuiPrefs.cpp:1474 -#: src/frontends/qt4/GuiSpellchecker.cpp:582 +#: src/frontends/qt4/GuiPrefs.cpp:1468 +#: src/frontends/qt4/GuiSpellchecker.cpp:592 msgid "Spellchecker" msgstr "Correcteur Orthographique" -#: src/frontends/qt4/GuiPrefs.cpp:1480 +#: src/frontends/qt4/GuiPrefs.cpp:1474 msgid "Native" msgstr "natif" -#: src/frontends/qt4/GuiPrefs.cpp:1486 +#: src/frontends/qt4/GuiPrefs.cpp:1480 msgid "Aspell" msgstr "Aspell" -#: src/frontends/qt4/GuiPrefs.cpp:1489 +#: src/frontends/qt4/GuiPrefs.cpp:1483 msgid "Enchant" msgstr "Enchant" -#: src/frontends/qt4/GuiPrefs.cpp:1492 +#: src/frontends/qt4/GuiPrefs.cpp:1486 msgid "Hunspell" msgstr "Hunspell" -#: src/frontends/qt4/GuiPrefs.cpp:1565 +#: src/frontends/qt4/GuiPrefs.cpp:1559 msgid "Converters" msgstr "Convertisseurs" @@ -22451,106 +22710,101 @@ msgstr "Convertisseurs" msgid "File Formats" msgstr "Formats de fichier" -#: src/frontends/qt4/GuiPrefs.cpp:2068 src/frontends/qt4/GuiPrefs.cpp:2220 +#: src/frontends/qt4/GuiPrefs.cpp:2059 +#: src/frontends/qt4/GuiPrefs.cpp:2211 msgid "Format in use" msgstr "Format utilisé" -#: src/frontends/qt4/GuiPrefs.cpp:2069 -msgid "" -"You cannot change a format's short name if the format is used by a " -"converter. Please remove the converter first." -msgstr "" -"Impossible de modifier le nom abrégé d'un format utilisé par un " -"convertisseur. Enlever d'abord le convertisseur." +#: src/frontends/qt4/GuiPrefs.cpp:2060 +msgid "You cannot change a format's short name if the format is used by a converter. Please remove the converter first." +msgstr "Impossible de modifier le nom abrégé d'un format utilisé par un convertisseur. Enlever d'abord le convertisseur." -#: src/frontends/qt4/GuiPrefs.cpp:2221 +#: src/frontends/qt4/GuiPrefs.cpp:2212 msgid "Cannot remove a Format used by a Converter. Remove the converter first." -msgstr "" -"Impossible d'enlever un Format utilisé par un Convertisseur. Enlevez d'abord " -"le convertisseur." +msgstr "Impossible d'enlever un Format utilisé par un Convertisseur. Enlevez d'abord le convertisseur." -#: src/frontends/qt4/GuiPrefs.cpp:2312 +#: src/frontends/qt4/GuiPrefs.cpp:2302 msgid "LyX needs to be restarted!" msgstr "LyX doit être redémarré !" -#: src/frontends/qt4/GuiPrefs.cpp:2313 -msgid "" -"The change of user interface language will be fully effective only after a " -"restart." -msgstr "" -"La modification de la langue de l'interface ne sera complètement effective " -"qu'après un redémarrage de LyX." +#: src/frontends/qt4/GuiPrefs.cpp:2303 +msgid "The change of user interface language will be fully effective only after a restart." +msgstr "La modification de la langue de l'interface ne sera complètement effective qu'après un redémarrage de LyX." -#: src/frontends/qt4/GuiPrefs.cpp:2387 +#: src/frontends/qt4/GuiPrefs.cpp:2374 msgid "Printer" msgstr "Imprimante" -#: src/frontends/qt4/GuiPrefs.cpp:2503 src/frontends/qt4/GuiPrefs.cpp:3256 +#: src/frontends/qt4/GuiPrefs.cpp:2490 +#: src/frontends/qt4/GuiPrefs.cpp:3243 msgid "User Interface" msgstr "Interface utilisateur" -#: src/frontends/qt4/GuiPrefs.cpp:2547 +#: src/frontends/qt4/GuiPrefs.cpp:2534 msgid "Classic" msgstr "Classique" -#: src/frontends/qt4/GuiPrefs.cpp:2548 +#: src/frontends/qt4/GuiPrefs.cpp:2535 msgid "Oxygen" msgstr "Oxygen" -#: src/frontends/qt4/GuiPrefs.cpp:2626 +#: src/frontends/qt4/GuiPrefs.cpp:2613 msgid "Control" msgstr "Contrôle" -#: src/frontends/qt4/GuiPrefs.cpp:2714 +#: src/frontends/qt4/GuiPrefs.cpp:2701 msgid "Shortcuts" msgstr "Raccourcis" -#: src/frontends/qt4/GuiPrefs.cpp:2719 +#: src/frontends/qt4/GuiPrefs.cpp:2706 msgid "Function" msgstr "Fonction" -#: src/frontends/qt4/GuiPrefs.cpp:2720 +#: src/frontends/qt4/GuiPrefs.cpp:2707 msgid "Shortcut" msgstr "Raccourci" -#: src/frontends/qt4/GuiPrefs.cpp:2799 +#: src/frontends/qt4/GuiPrefs.cpp:2786 msgid "Cursor, Mouse and Editing Functions" msgstr "Contrôle du curseur, de la souris et de la saisie" -#: src/frontends/qt4/GuiPrefs.cpp:2803 +#: src/frontends/qt4/GuiPrefs.cpp:2790 msgid "Mathematical Symbols" msgstr "Symboles mathématiques" -#: src/frontends/qt4/GuiPrefs.cpp:2807 +#: src/frontends/qt4/GuiPrefs.cpp:2794 msgid "Document and Window" msgstr "Document et fenêtre" -#: src/frontends/qt4/GuiPrefs.cpp:2811 +#: src/frontends/qt4/GuiPrefs.cpp:2798 msgid "Font, Layouts and Textclasses" msgstr "Polices, formats et classes" -#: src/frontends/qt4/GuiPrefs.cpp:2815 +#: src/frontends/qt4/GuiPrefs.cpp:2802 msgid "System and Miscellaneous" msgstr "Système et divers" -#: src/frontends/qt4/GuiPrefs.cpp:2942 src/frontends/qt4/GuiPrefs.cpp:2988 +#: src/frontends/qt4/GuiPrefs.cpp:2929 +#: src/frontends/qt4/GuiPrefs.cpp:2975 msgid "Res&tore" msgstr "&Restaurer" -#: src/frontends/qt4/GuiPrefs.cpp:3099 src/frontends/qt4/GuiPrefs.cpp:3106 -#: src/frontends/qt4/GuiPrefs.cpp:3126 src/frontends/qt4/GuiPrefs.cpp:3145 +#: src/frontends/qt4/GuiPrefs.cpp:3086 +#: src/frontends/qt4/GuiPrefs.cpp:3093 +#: src/frontends/qt4/GuiPrefs.cpp:3113 +#: src/frontends/qt4/GuiPrefs.cpp:3132 msgid "Failed to create shortcut" msgstr "Échec de la création du raccourci" -#: src/frontends/qt4/GuiPrefs.cpp:3100 +#: src/frontends/qt4/GuiPrefs.cpp:3087 msgid "Unknown or invalid LyX function" msgstr "Fonction LyX inconnue ou invalide" -#: src/frontends/qt4/GuiPrefs.cpp:3107 +#: src/frontends/qt4/GuiPrefs.cpp:3094 msgid "Invalid or empty key sequence" msgstr "Séquence de touches invalide ou vide" -#: src/frontends/qt4/GuiPrefs.cpp:3127 +#: src/frontends/qt4/GuiPrefs.cpp:3114 #, c-format msgid "" "Shortcut `%1$s' is already bound to:\n" @@ -22561,35 +22815,35 @@ msgstr "" "%2$s\n" "Vous devez supprimer ce lien avant d'en créer un nouveau." -#: src/frontends/qt4/GuiPrefs.cpp:3146 +#: src/frontends/qt4/GuiPrefs.cpp:3133 msgid "Can not insert shortcut to the list" msgstr "Échec de l'insertion du raccourci à la liste" -#: src/frontends/qt4/GuiPrefs.cpp:3177 +#: src/frontends/qt4/GuiPrefs.cpp:3164 msgid "Identity" msgstr "Identité" -#: src/frontends/qt4/GuiPrefs.cpp:3386 +#: src/frontends/qt4/GuiPrefs.cpp:3373 msgid "Choose bind file" msgstr "Choisir un fichier de raccourcis" -#: src/frontends/qt4/GuiPrefs.cpp:3387 +#: src/frontends/qt4/GuiPrefs.cpp:3374 msgid "LyX bind files (*.bind)" msgstr "Fichiers de raccourcis LyX (*.bind)" -#: src/frontends/qt4/GuiPrefs.cpp:3393 +#: src/frontends/qt4/GuiPrefs.cpp:3380 msgid "Choose UI file" msgstr "Choisir un fichier d'interface" -#: src/frontends/qt4/GuiPrefs.cpp:3394 +#: src/frontends/qt4/GuiPrefs.cpp:3381 msgid "LyX UI files (*.ui)" msgstr "Fichiers d'interface LyX (*.ui)" -#: src/frontends/qt4/GuiPrefs.cpp:3400 +#: src/frontends/qt4/GuiPrefs.cpp:3387 msgid "Choose keyboard map" msgstr "Choisir une réaffectation clavier" -#: src/frontends/qt4/GuiPrefs.cpp:3401 +#: src/frontends/qt4/GuiPrefs.cpp:3388 msgid "LyX keyboard maps (*.kmap)" msgstr "Réaffectations clavier LyX (*.kmap)" @@ -22633,19 +22887,20 @@ msgstr "Fixer" msgid "Cross-reference" msgstr "Référence croisée" -#: src/frontends/qt4/GuiRef.cpp:306 +#: src/frontends/qt4/GuiRef.cpp:300 msgid "&Go Back" msgstr "&Revenir" -#: src/frontends/qt4/GuiRef.cpp:308 +#: src/frontends/qt4/GuiRef.cpp:302 msgid "Jump back" msgstr "Revient en arrière" -#: src/frontends/qt4/GuiRef.cpp:316 +#: src/frontends/qt4/GuiRef.cpp:310 msgid "Jump to label" msgstr "Sauter à l'étiquette" -#: src/frontends/qt4/GuiRef.cpp:371 src/frontends/qt4/GuiRef.cpp:390 +#: src/frontends/qt4/GuiRef.cpp:365 +#: src/frontends/qt4/GuiRef.cpp:384 msgid "" msgstr "" @@ -22667,15 +22922,13 @@ msgstr "Erreur -> Impossible de charger le fichier !" #: src/frontends/qt4/GuiSpellchecker.cpp:252 msgid "Spell check of the selection done, did not find any errors." -msgstr "" +msgstr "Correction orthographique terminée, aucune erreur trouvée." #: src/frontends/qt4/GuiSpellchecker.cpp:259 -msgid "" -"We reached the end of the document, would you like to continue from the " -"beginning?" +msgid "We reached the end of the document, would you like to continue from the beginning?" msgstr "Fin du document atteinte, continuer au début ?" -#: src/frontends/qt4/GuiSpellchecker.cpp:530 +#: src/frontends/qt4/GuiSpellchecker.cpp:540 msgid "Spell checker has no dictionaries." msgstr "Le correcteur orthographique ne connaît aucun dictionnaire." @@ -22936,6 +23189,10 @@ msgstr "Formes B de présentation arabes" msgid "Halfwidth and Fullwidth Forms" msgstr "Formes de demi et pleine chasse" +#: src/frontends/qt4/GuiSymbols.cpp:123 +msgid "Specials" +msgstr "Caractères spéciaux" + #: src/frontends/qt4/GuiSymbols.cpp:124 msgid "Linear B Syllabary" msgstr "Syllabaire linéaire B" @@ -23052,7 +23309,7 @@ msgstr "Insérer un tableau" msgid "TeX Information" msgstr "Informations TeX" -#: src/frontends/qt4/GuiThesaurus.cpp:203 +#: src/frontends/qt4/GuiThesaurus.cpp:207 msgid "No thesaurus available for this language!" msgstr "Aucun dictionnaire des synonymes défini pour cette langue !" @@ -23060,15 +23317,17 @@ msgstr "Aucun dictionnaire des synonymes défini pour cette langue !" msgid "Outline" msgstr "Plan" -#: src/frontends/qt4/GuiToolbar.cpp:353 src/frontends/qt4/Toolbars.cpp:376 +#: src/frontends/qt4/GuiToolbar.cpp:377 +#: src/frontends/qt4/Toolbars.cpp:376 msgid "auto" msgstr "auto" -#: src/frontends/qt4/GuiToolbar.cpp:358 src/frontends/qt4/GuiToolbar.cpp:367 +#: src/frontends/qt4/GuiToolbar.cpp:382 +#: src/frontends/qt4/GuiToolbar.cpp:391 msgid "off" msgstr "désactivé" -#: src/frontends/qt4/GuiToolbar.cpp:374 +#: src/frontends/qt4/GuiToolbar.cpp:398 #, c-format msgid "Toolbar \"%1$s\" state set to %2$s" msgstr "État de la barre d'outils \"%1$s\" fixé à %2$s" @@ -23093,99 +23352,84 @@ msgstr "Icônes de taille normale" msgid "Big-sized icons" msgstr "Icônes de grande taille" -#: src/frontends/qt4/GuiView.cpp:545 -#, c-format -msgid "Successful export to format: %1$s" -msgstr "Succès de l'exportation au format : %1$s." - -#: src/frontends/qt4/GuiView.cpp:554 -#, c-format -msgid "Error while exporting format: %1$s" -msgstr "Erreur à l'exportation au format : %1$s." - -#: src/frontends/qt4/GuiView.cpp:557 -#, c-format -msgid "Successful preview of format: %1$s" -msgstr "Succès de l'aperçu du format : %1$s" - -#: src/frontends/qt4/GuiView.cpp:560 -#, c-format -msgid "Error while previewing format: %1$s" -msgstr "Erreur au visionnement du format : %1$s" - -#: src/frontends/qt4/GuiView.cpp:852 +#: src/frontends/qt4/GuiView.cpp:823 msgid "Exit LyX" msgstr "Quitter LyX" -#: src/frontends/qt4/GuiView.cpp:853 +#: src/frontends/qt4/GuiView.cpp:824 msgid "LyX could not be closed because documents are being processed by LyX." msgstr "Impossible de fermer LyX, des documents sont en cours de traitement." -#: src/frontends/qt4/GuiView.cpp:1102 +#: src/frontends/qt4/GuiView.cpp:1070 msgid "Welcome to LyX!" msgstr "Bienvenue dans LyX !" -#: src/frontends/qt4/GuiView.cpp:1565 +#: src/frontends/qt4/GuiView.cpp:1541 msgid "Automatic save done." msgstr "Sauvegarde automatique effective." -#: src/frontends/qt4/GuiView.cpp:1566 +#: src/frontends/qt4/GuiView.cpp:1542 msgid "Automatic save failed!" msgstr "La sauvegarde automatique a échoué !" -#: src/frontends/qt4/GuiView.cpp:1612 +#: src/frontends/qt4/GuiView.cpp:1588 msgid "Command not allowed without any document open" msgstr "Commande non autorisée si aucun document n'est ouvert" -#: src/frontends/qt4/GuiView.cpp:1715 +#: src/frontends/qt4/GuiView.cpp:1690 #, c-format msgid "Unknown toolbar \"%1$s\"" msgstr "Barre d'outils inconnue \"%1$s\"" -#: src/frontends/qt4/GuiView.cpp:1897 +#: src/frontends/qt4/GuiView.cpp:1872 msgid "Select template file" msgstr "Choisir le modèle" -#: src/frontends/qt4/GuiView.cpp:1899 src/frontends/qt4/GuiView.cpp:2262 +#: src/frontends/qt4/GuiView.cpp:1874 +#: src/frontends/qt4/GuiView.cpp:2237 msgid "Templates|#T#t" msgstr "Modèles|#M#m" -#: src/frontends/qt4/GuiView.cpp:1926 +#: src/frontends/qt4/GuiView.cpp:1901 msgid "Document not loaded." msgstr "Le document n'a pas été chargé." -#: src/frontends/qt4/GuiView.cpp:1954 +#: src/frontends/qt4/GuiView.cpp:1929 msgid "Select document to open" msgstr "Choisir le document à ouvrir" -#: src/frontends/qt4/GuiView.cpp:1956 src/frontends/qt4/GuiView.cpp:2097 -#: src/frontends/qt4/GuiView.cpp:2219 +#: src/frontends/qt4/GuiView.cpp:1931 +#: src/frontends/qt4/GuiView.cpp:2072 +#: src/frontends/qt4/GuiView.cpp:2194 msgid "Examples|#E#e" msgstr "Exemples|#E#e" -#: src/frontends/qt4/GuiView.cpp:1960 +#: src/frontends/qt4/GuiView.cpp:1935 msgid "LyX-1.3.x Documents (*.lyx13)" msgstr "Documents LyX-1.3.x (*.lyx)" -#: src/frontends/qt4/GuiView.cpp:1961 +#: src/frontends/qt4/GuiView.cpp:1936 msgid "LyX-1.4.x Documents (*.lyx14)" msgstr "Documents LyX-1.4.x (*.lyx)" -#: src/frontends/qt4/GuiView.cpp:1962 +#: src/frontends/qt4/GuiView.cpp:1937 msgid "LyX-1.5.x Documents (*.lyx15)" msgstr "Documents LyX-1.5.x (*.lyx)" -#: src/frontends/qt4/GuiView.cpp:1963 +#: src/frontends/qt4/GuiView.cpp:1938 msgid "LyX-1.6.x Documents (*.lyx16)" msgstr "Documents LyX-1.6.x (*.lyx16)" -#: src/frontends/qt4/GuiView.cpp:1988 src/frontends/qt4/Validator.cpp:200 -#: src/insets/ExternalSupport.cpp:368 src/insets/InsetBibtex.cpp:298 -#: src/insets/InsetGraphics.cpp:596 src/insets/InsetInclude.cpp:540 +#: src/frontends/qt4/GuiView.cpp:1963 +#: src/frontends/qt4/Validator.cpp:200 +#: src/insets/ExternalSupport.cpp:368 +#: src/insets/InsetBibtex.cpp:290 +#: src/insets/InsetGraphics.cpp:596 +#: src/insets/InsetInclude.cpp:535 msgid "Invalid filename" msgstr "Nom de fichier invalide" -#: src/frontends/qt4/GuiView.cpp:1989 +#: src/frontends/qt4/GuiView.cpp:1964 #, c-format msgid "" "The directory in the given path\n" @@ -23196,41 +23440,41 @@ msgstr "" "%1$s\n" "n'existe pas." -#: src/frontends/qt4/GuiView.cpp:2005 +#: src/frontends/qt4/GuiView.cpp:1980 #, c-format msgid "Opening document %1$s..." msgstr "Ouverture du document %1$s..." -#: src/frontends/qt4/GuiView.cpp:2010 +#: src/frontends/qt4/GuiView.cpp:1985 #, c-format msgid "Document %1$s opened." msgstr "Document %1$s ouvert." -#: src/frontends/qt4/GuiView.cpp:2013 +#: src/frontends/qt4/GuiView.cpp:1988 msgid "Version control detected." msgstr "Contrôle de version détecté." -#: src/frontends/qt4/GuiView.cpp:2015 +#: src/frontends/qt4/GuiView.cpp:1990 #, c-format msgid "Could not open document %1$s" msgstr "Impossible d'ouvrir le document %1$s" -#: src/frontends/qt4/GuiView.cpp:2044 +#: src/frontends/qt4/GuiView.cpp:2019 msgid "Couldn't import file" msgstr "Impossible d'importer le fichier" -#: src/frontends/qt4/GuiView.cpp:2045 +#: src/frontends/qt4/GuiView.cpp:2020 #, c-format msgid "No information for importing the format %1$s." msgstr "Pas d'information pour importer le format %1$s." -#: src/frontends/qt4/GuiView.cpp:2092 +#: src/frontends/qt4/GuiView.cpp:2067 #, c-format msgid "Select %1$s file to import" msgstr "Choisir le fichier %1$s à importer" -#: src/frontends/qt4/GuiView.cpp:2143 src/frontends/qt4/GuiView.cpp:2306 -#: src/frontends/qt4/GuiView.cpp:2381 +#: src/frontends/qt4/GuiView.cpp:2118 +#: src/frontends/qt4/GuiView.cpp:2282 #, c-format msgid "" "The document %1$s already exists.\n" @@ -23241,37 +23485,37 @@ msgstr "" "\n" "Voulez-vous écrire par dessus ce document ?" -#: src/frontends/qt4/GuiView.cpp:2145 src/frontends/qt4/GuiView.cpp:2310 -#: src/frontends/qt4/GuiView.cpp:2385 +#: src/frontends/qt4/GuiView.cpp:2120 +#: src/frontends/qt4/GuiView.cpp:2286 msgid "Overwrite document?" msgstr "Écraser le document ?" -#: src/frontends/qt4/GuiView.cpp:2154 +#: src/frontends/qt4/GuiView.cpp:2129 #, c-format msgid "Importing %1$s..." msgstr "Importe %1$s..." -#: src/frontends/qt4/GuiView.cpp:2157 +#: src/frontends/qt4/GuiView.cpp:2132 msgid "imported." msgstr "importé." -#: src/frontends/qt4/GuiView.cpp:2159 +#: src/frontends/qt4/GuiView.cpp:2134 msgid "file not imported!" msgstr "fichier non importé !" -#: src/frontends/qt4/GuiView.cpp:2184 +#: src/frontends/qt4/GuiView.cpp:2159 msgid "newfile" msgstr "nouveau" -#: src/frontends/qt4/GuiView.cpp:2217 +#: src/frontends/qt4/GuiView.cpp:2192 msgid "Select LyX document to insert" msgstr "Choisir le document à insérer" -#: src/frontends/qt4/GuiView.cpp:2259 +#: src/frontends/qt4/GuiView.cpp:2234 msgid "Choose a filename to save document as" msgstr "Choisir le nom sous lequel enregistrer le fichier" -#: src/frontends/qt4/GuiView.cpp:2291 +#: src/frontends/qt4/GuiView.cpp:2267 #, c-format msgid "" "The file\n" @@ -23286,21 +23530,17 @@ msgstr "" "Merci de le fermer avant d'essayer de l'écraser.\n" "Vouez-vous définir un nouveau nom de fichier ?" -#: src/frontends/qt4/GuiView.cpp:2295 +#: src/frontends/qt4/GuiView.cpp:2271 msgid "Chosen File Already Open" msgstr "Fichier sélectionné déjà ouvert" -#: src/frontends/qt4/GuiView.cpp:2296 src/frontends/qt4/GuiView.cpp:2311 -#: src/frontends/qt4/GuiView.cpp:2386 src/frontends/qt4/GuiView.cpp:2434 +#: src/frontends/qt4/GuiView.cpp:2272 +#: src/frontends/qt4/GuiView.cpp:2287 +#: src/frontends/qt4/GuiView.cpp:2335 msgid "&Rename" msgstr "&Renommer" -#: src/frontends/qt4/GuiView.cpp:2338 -#, fuzzy -msgid "Choose a filename to export the document as" -msgstr "Choisir le nom sous lequel enregistrer le fichier" - -#: src/frontends/qt4/GuiView.cpp:2430 +#: src/frontends/qt4/GuiView.cpp:2331 #, c-format msgid "" "The document %1$s could not be saved.\n" @@ -23311,24 +23551,24 @@ msgstr "" "\n" "Voulez-vous renommer le document et essayer à nouveau ?" -#: src/frontends/qt4/GuiView.cpp:2433 +#: src/frontends/qt4/GuiView.cpp:2334 msgid "Rename and save?" msgstr "Renommer et enregistrer ?" -#: src/frontends/qt4/GuiView.cpp:2434 +#: src/frontends/qt4/GuiView.cpp:2335 msgid "&Retry" msgstr "&Réessayer" -#: src/frontends/qt4/GuiView.cpp:2540 +#: src/frontends/qt4/GuiView.cpp:2441 msgid "Close document" msgstr "Fermer le document" -#: src/frontends/qt4/GuiView.cpp:2541 +#: src/frontends/qt4/GuiView.cpp:2442 msgid "Document could not be closed because it is being processed by LyX." -msgstr "" -"Impossible de fermer le document, il est en cours de traitement par LyX." +msgstr "Impossible de fermer le document, il est en cours de traitement par LyX." -#: src/frontends/qt4/GuiView.cpp:2645 src/frontends/qt4/GuiView.cpp:2750 +#: src/frontends/qt4/GuiView.cpp:2546 +#: src/frontends/qt4/GuiView.cpp:2651 #, c-format msgid "" "The document %1$s has not been saved yet.\n" @@ -23339,11 +23579,12 @@ msgstr "" "\n" "Voulez-vous enregistrer le document ?" -#: src/frontends/qt4/GuiView.cpp:2648 src/frontends/qt4/GuiView.cpp:2753 +#: src/frontends/qt4/GuiView.cpp:2549 +#: src/frontends/qt4/GuiView.cpp:2654 msgid "Save new document?" msgstr "Enregistrer le nouveau document ?" -#: src/frontends/qt4/GuiView.cpp:2653 +#: src/frontends/qt4/GuiView.cpp:2554 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -23354,15 +23595,16 @@ msgstr "" "\n" "Voulez-vous enregistrer le document ou ignorer ces modifications ?" -#: src/frontends/qt4/GuiView.cpp:2655 src/frontends/qt4/GuiView.cpp:2747 +#: src/frontends/qt4/GuiView.cpp:2556 +#: src/frontends/qt4/GuiView.cpp:2648 msgid "Save changed document?" msgstr "Enregistrer le document modifié ?" -#: src/frontends/qt4/GuiView.cpp:2656 +#: src/frontends/qt4/GuiView.cpp:2557 msgid "&Discard" msgstr "I&gnorer" -#: src/frontends/qt4/GuiView.cpp:2744 +#: src/frontends/qt4/GuiView.cpp:2645 #, c-format msgid "" "The document %1$s has unsaved changes.\n" @@ -23373,7 +23615,7 @@ msgstr "" "\n" "Voulez-vous enregistrer le document ?" -#: src/frontends/qt4/GuiView.cpp:2779 +#: src/frontends/qt4/GuiView.cpp:2680 #, c-format msgid "" "Document \n" @@ -23382,138 +23624,139 @@ msgid "" msgstr "" "Le document \n" "%1$s\n" -"a été modifié par une application externe. Le recharger maintenant ? Toutes " -"les modifications locales seront perdues." +"a été modifié par une application externe. Le recharger maintenant ? Toutes les modifications locales seront perdues." -#: src/frontends/qt4/GuiView.cpp:2782 +#: src/frontends/qt4/GuiView.cpp:2683 msgid "Reload externally changed document?" msgstr "Recharger le document modifié par une application externe ?" -#: src/frontends/qt4/GuiView.cpp:2835 +#: src/frontends/qt4/GuiView.cpp:2736 msgid "Error when setting the locking property." msgstr "Erreur lors du positionnement de la propriété de verrouillage." -#: src/frontends/qt4/GuiView.cpp:2881 +#: src/frontends/qt4/GuiView.cpp:2782 msgid "Directory is not accessible." msgstr "Répertoire inaccessible." -#: src/frontends/qt4/GuiView.cpp:2957 +#: src/frontends/qt4/GuiView.cpp:2858 #, c-format msgid "Opening child document %1$s..." msgstr "Ouverture du sous-document %1$s..." -#: src/frontends/qt4/GuiView.cpp:3021 +#: src/frontends/qt4/GuiView.cpp:2922 #, c-format msgid "No buffer for file: %1$s." msgstr "Pas de tampon pour le fichier : %1$s." -#: src/frontends/qt4/GuiView.cpp:3117 -#, fuzzy -msgid "Export Error" -msgstr "Exporter|x" +#: src/frontends/qt4/GuiView.cpp:2949 +#, c-format +msgid "Successful preview of format: %1$s" +msgstr "Succès de l'aperçu du format : %1$s" -#: src/frontends/qt4/GuiView.cpp:3118 -#, fuzzy -msgid "Error cloning the Buffer." -msgstr "Erreur lors de la conversion vers un format lisible" +#: src/frontends/qt4/GuiView.cpp:2950 +#, c-format +msgid "Error while previewing format: %1$s" +msgstr "Erreur au visionnement du format : %1$s" -#: src/frontends/qt4/GuiView.cpp:3226 -#, fuzzy, c-format -msgid "Error exporting to format: %1$s" -msgstr "Erreur à l'exportation au format %1$s." +#: src/frontends/qt4/GuiView.cpp:2953 +#, c-format +msgid "Successful export to format: %1$s" +msgstr "Succès de l'exportation au format : %1$s." -#: src/frontends/qt4/GuiView.cpp:3234 src/frontends/qt4/GuiView.cpp:3251 +#: src/frontends/qt4/GuiView.cpp:2954 +#, c-format +msgid "Error while exporting format: %1$s" +msgstr "Erreur à l'exportation au format : %1$s." + +#: src/frontends/qt4/GuiView.cpp:3138 +#: src/frontends/qt4/GuiView.cpp:3150 msgid "Exporting ..." msgstr "Exportation en cours..." -#: src/frontends/qt4/GuiView.cpp:3260 +#: src/frontends/qt4/GuiView.cpp:3159 msgid "Previewing ..." msgstr "Visionnement en cours..." -#: src/frontends/qt4/GuiView.cpp:3294 +#: src/frontends/qt4/GuiView.cpp:3193 msgid "Document not loaded" msgstr "Le document n'a pas été chargé" -#: src/frontends/qt4/GuiView.cpp:3368 +#: src/frontends/qt4/GuiView.cpp:3267 msgid "Select file to insert" msgstr "Choisir le fichier à insérer" -#: src/frontends/qt4/GuiView.cpp:3372 +#: src/frontends/qt4/GuiView.cpp:3271 msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: src/frontends/qt4/GuiView.cpp:3396 +#: src/frontends/qt4/GuiView.cpp:3295 #, c-format -msgid "" -"Any changes will be lost. Are you sure you want to revert to the saved " -"version of the document %1$s?" -msgstr "" -"Toutes les modifications seront perdues. Êtes-vous sûr de vouloir revenir à " -"la dernière version enregistrée du document %1$s ?" +msgid "Any changes will be lost. Are you sure you want to revert to the saved version of the document %1$s?" +msgstr "Toutes les modifications seront perdues. Êtes-vous sûr de vouloir revenir à la dernière version enregistrée du document %1$s ?" -#: src/frontends/qt4/GuiView.cpp:3399 +#: src/frontends/qt4/GuiView.cpp:3298 msgid "Revert to saved document?" msgstr "Revenir à la sauvegarde ?" -#: src/frontends/qt4/GuiView.cpp:3425 +#: src/frontends/qt4/GuiView.cpp:3324 msgid "Saving all documents..." msgstr "Enregistrement de tous les documents..." -#: src/frontends/qt4/GuiView.cpp:3435 +#: src/frontends/qt4/GuiView.cpp:3334 msgid "All documents saved." msgstr "Tous les documents sont enregistrés." -#: src/frontends/qt4/GuiView.cpp:3535 +#: src/frontends/qt4/GuiView.cpp:3434 #, c-format msgid "%1$s unknown command!" msgstr "%1$s : commande inconnue !" -#: src/frontends/qt4/GuiView.cpp:3651 +#: src/frontends/qt4/GuiView.cpp:3552 msgid "Please, preview the document first." msgstr "Merci d'afficher d'abord un aperçu du document." -#: src/frontends/qt4/GuiView.cpp:3671 +#: src/frontends/qt4/GuiView.cpp:3572 msgid "Couldn't proceed." msgstr "Impossible de poursuivre." -#: src/frontends/qt4/GuiViewSource.cpp:228 -#: src/frontends/qt4/GuiViewSource.cpp:271 +#: src/frontends/qt4/GuiViewSource.cpp:222 +#: src/frontends/qt4/GuiViewSource.cpp:265 msgid "LaTeX Source" msgstr "Source LaTeX" -#: src/frontends/qt4/GuiViewSource.cpp:273 +#: src/frontends/qt4/GuiViewSource.cpp:267 msgid "DocBook Source" msgstr "Source DocBook" -#: src/frontends/qt4/GuiViewSource.cpp:275 +#: src/frontends/qt4/GuiViewSource.cpp:269 msgid "Literate Source" msgstr "Source Literate" -#: src/frontends/qt4/GuiWorkArea.cpp:1347 +#: src/frontends/qt4/GuiWorkArea.cpp:1325 msgid " (version control, locking)" msgstr " (contrôle de version, verrouillage)" -#: src/frontends/qt4/GuiWorkArea.cpp:1349 +#: src/frontends/qt4/GuiWorkArea.cpp:1327 msgid " (version control)" msgstr " (contrôle de version)" -#: src/frontends/qt4/GuiWorkArea.cpp:1352 +#: src/frontends/qt4/GuiWorkArea.cpp:1330 msgid " (changed)" msgstr " (modifié)" -#: src/frontends/qt4/GuiWorkArea.cpp:1356 +#: src/frontends/qt4/GuiWorkArea.cpp:1334 msgid " (read only)" msgstr " (en lecture seule)" -#: src/frontends/qt4/GuiWorkArea.cpp:1532 +#: src/frontends/qt4/GuiWorkArea.cpp:1485 msgid "Close File" msgstr "Fermer le fichier" -#: src/frontends/qt4/GuiWorkArea.cpp:1976 +#: src/frontends/qt4/GuiWorkArea.cpp:1929 msgid "Hide tab" msgstr "Cacher l'onglet" -#: src/frontends/qt4/GuiWorkArea.cpp:1978 +#: src/frontends/qt4/GuiWorkArea.cpp:1931 msgid "Close tab" msgstr "Fermer l'onglet" @@ -23528,15 +23771,14 @@ msgstr "Cliquer pour désolidariser" #: src/frontends/qt4/LayoutBox.cpp:389 #, c-format msgid "Filtering layouts with \"%1$s\". Press ESC to remove filter." -msgstr "" -"Fitrage des formats (layouts) avec \"%1$s\". Presser ESC pour supprimer le " -"filtre." +msgstr "Fitrage des formats (layouts) avec \"%1$s\". Presser ESC pour supprimer le filtre." -#: src/frontends/qt4/LayoutBox.cpp:393 src/frontends/qt4/LayoutBox.cpp:448 +#: src/frontends/qt4/LayoutBox.cpp:393 +#: src/frontends/qt4/LayoutBox.cpp:443 msgid "Enter characters to filter the layout list." msgstr "Saisir des caractères pour filtrer la liste des formats." -#: src/frontends/qt4/LayoutBox.cpp:573 +#: src/frontends/qt4/LayoutBox.cpp:565 msgid " (unknown)" msgstr "(inconnu)" @@ -23548,133 +23790,121 @@ msgstr "Plus...|P" msgid "No Group" msgstr "Aucun groupe défini" -#: src/frontends/qt4/Menus.cpp:778 src/frontends/qt4/Menus.cpp:779 +#: src/frontends/qt4/Menus.cpp:778 +#: src/frontends/qt4/Menus.cpp:779 msgid "More Spelling Suggestions" msgstr "Autres suggestions orthographiques" -#: src/frontends/qt4/Menus.cpp:797 +#: src/frontends/qt4/Menus.cpp:801 msgid "Add to personal dictionary|n" msgstr "Ajouter au dictionnaire personnel|c" -#: src/frontends/qt4/Menus.cpp:799 +#: src/frontends/qt4/Menus.cpp:803 msgid "Ignore all|I" msgstr "Tout ignorer|i" -#: src/frontends/qt4/Menus.cpp:807 +#: src/frontends/qt4/Menus.cpp:811 msgid "Remove from personal dictionary|r" msgstr "Supprimer du dictionnaire personnel|s" -#: src/frontends/qt4/Menus.cpp:848 +#: src/frontends/qt4/Menus.cpp:852 msgid "Language|L" -msgstr "Langue|e" +msgstr "Langue|g" -#: src/frontends/qt4/Menus.cpp:850 +#: src/frontends/qt4/Menus.cpp:854 msgid "More Languages ...|M" msgstr "Autres langues...|A" -#: src/frontends/qt4/Menus.cpp:920 src/frontends/qt4/Menus.cpp:921 +#: src/frontends/qt4/Menus.cpp:924 +#: src/frontends/qt4/Menus.cpp:925 msgid "Hidden|H" msgstr "Caché|é" -#: src/frontends/qt4/Menus.cpp:925 +#: src/frontends/qt4/Menus.cpp:929 msgid "" msgstr "" -#: src/frontends/qt4/Menus.cpp:987 +#: src/frontends/qt4/Menus.cpp:992 msgid "" msgstr "" -#: src/frontends/qt4/Menus.cpp:1028 +#: src/frontends/qt4/Menus.cpp:1029 msgid "View (Other Formats)|F" msgstr "Visionner (autres formats)|a" -#: src/frontends/qt4/Menus.cpp:1029 +#: src/frontends/qt4/Menus.cpp:1030 msgid "Update (Other Formats)|p" msgstr "Mettre à jour (autres formats)|j" -#: src/frontends/qt4/Menus.cpp:1059 +#: src/frontends/qt4/Menus.cpp:1063 #, c-format msgid "View [%1$s]|V" msgstr "Visionner [%1$s]|V" -#: src/frontends/qt4/Menus.cpp:1060 +#: src/frontends/qt4/Menus.cpp:1064 #, c-format msgid "Update [%1$s]|U" msgstr "Mettre à jour [%1$s]|u" -#: src/frontends/qt4/Menus.cpp:1170 +#: src/frontends/qt4/Menus.cpp:1175 msgid "No Custom Insets Defined!" msgstr "Aucun insert paramétrable défini !" -#: src/frontends/qt4/Menus.cpp:1242 +#: src/frontends/qt4/Menus.cpp:1247 msgid "" msgstr "" -#: src/frontends/qt4/Menus.cpp:1252 +#: src/frontends/qt4/Menus.cpp:1257 msgid "Master Document" msgstr "Document maître" -#: src/frontends/qt4/Menus.cpp:1269 +#: src/frontends/qt4/Menus.cpp:1274 msgid "Open Navigator..." msgstr "Ouvrir le navigateur..." -#: src/frontends/qt4/Menus.cpp:1290 +#: src/frontends/qt4/Menus.cpp:1295 msgid "Other Lists" msgstr "Autres listes" -#: src/frontends/qt4/Menus.cpp:1303 +#: src/frontends/qt4/Menus.cpp:1308 msgid "" msgstr "" -#: src/frontends/qt4/Menus.cpp:1338 +#: src/frontends/qt4/Menus.cpp:1343 msgid "Other Toolbars" msgstr "Autres barres d'outils" -#: src/frontends/qt4/Menus.cpp:1353 +#: src/frontends/qt4/Menus.cpp:1358 msgid "No Branches Set for Document!" msgstr "Pas de branche sélectionnée dans le document !" -#: src/frontends/qt4/Menus.cpp:1409 +#: src/frontends/qt4/Menus.cpp:1414 msgid "Index List|I" msgstr "Index|I" -#: src/frontends/qt4/Menus.cpp:1414 +#: src/frontends/qt4/Menus.cpp:1419 msgid "Index Entry|d" msgstr "Entrée d'index|i" -#: src/frontends/qt4/Menus.cpp:1429 +#: src/frontends/qt4/Menus.cpp:1434 #, c-format msgid "Index: %1$s" msgstr "Index : %1$s" -#: src/frontends/qt4/Menus.cpp:1434 src/frontends/qt4/Menus.cpp:1463 +#: src/frontends/qt4/Menus.cpp:1439 +#: src/frontends/qt4/Menus.cpp:1468 #, c-format msgid "Index Entry (%1$s)" msgstr "Entrée d'index (%1$s)" -#: src/frontends/qt4/Menus.cpp:1480 +#: src/frontends/qt4/Menus.cpp:1485 msgid "No Citation in Scope!" msgstr "Aucune citation accessible !" -#: src/frontends/qt4/Menus.cpp:1493 src/insets/InsetCitation.cpp:127 -#: src/insets/InsetCitation.cpp:219 -msgid "No citations selected!" -msgstr "Aucune citation sélectionnée !" - -#: src/frontends/qt4/Menus.cpp:2124 +#: src/frontends/qt4/Menus.cpp:2093 msgid "No Action Defined!" msgstr "Aucune action définie !" -#: src/frontends/qt4/PanelStack.cpp:75 -#, fuzzy -msgid "Search" -msgstr "&Rechercher" - -#: src/frontends/qt4/PanelStack.cpp:81 -#, fuzzy -msgid "Clear text" -msgstr "Saut de page (vide le tampon)" - #: src/frontends/qt4/Toolbars.cpp:217 #, c-format msgid "Export %1$s" @@ -23700,12 +23930,8 @@ msgid "space" msgstr "espace" #: src/frontends/qt4/Validator.cpp:201 -msgid "" -"LyX does not provide LaTeX support for file names containing any of these " -"characters:\n" -msgstr "" -"LyX ne fournit pas de support LaTeX pour les noms de fichier contenant l'un " -"de ces caractères :\n" +msgid "LyX does not provide LaTeX support for file names containing any of these characters:\n" +msgstr "LyX ne fournit pas de support LaTeX pour les noms de fichier contenant l'un de ces caractères :\n" #: src/frontends/qt4/qt_helpers.cpp:225 msgid "Could not update TeX information" @@ -23716,81 +23942,80 @@ msgstr "Impossible de mettre à jour l'information TeX" msgid "The script `%1$s' failed." msgstr "Le script `%1$s' a échoué." -#: src/frontends/qt4/qt_helpers.cpp:479 +#: src/frontends/qt4/qt_helpers.cpp:478 msgid "All Files " msgstr "Tous les fichiers " -#: src/frontends/qt4/qt_helpers.cpp:552 src/insets/InsetTOC.cpp:59 -#: src/insets/InsetTOC.cpp:114 +#: src/frontends/qt4/qt_helpers.cpp:551 +#: src/insets/InsetTOC.cpp:58 +#: src/insets/InsetTOC.cpp:113 msgid "Table of Contents" msgstr "Table des matières" -#: src/frontends/qt4/qt_helpers.cpp:556 +#: src/frontends/qt4/qt_helpers.cpp:555 msgid "List of Graphics" msgstr "Liste des figures" -#: src/frontends/qt4/qt_helpers.cpp:558 +#: src/frontends/qt4/qt_helpers.cpp:557 msgid "List of Equations" msgstr "Liste des équations" -#: src/frontends/qt4/qt_helpers.cpp:560 +#: src/frontends/qt4/qt_helpers.cpp:559 msgid "List of Footnotes" msgstr "Liste des notes de bas de page" -#: src/frontends/qt4/qt_helpers.cpp:562 +#: src/frontends/qt4/qt_helpers.cpp:561 msgid "List of Listings" msgstr "Liste des listings" -#: src/frontends/qt4/qt_helpers.cpp:564 +#: src/frontends/qt4/qt_helpers.cpp:563 msgid "List of Index Entries" msgstr "Liste des entrées d'index" -#: src/frontends/qt4/qt_helpers.cpp:566 +#: src/frontends/qt4/qt_helpers.cpp:565 msgid "List of Marginal notes" msgstr "Liste des notes en marge" -#: src/frontends/qt4/qt_helpers.cpp:568 +#: src/frontends/qt4/qt_helpers.cpp:567 msgid "List of Notes" msgstr "Liste des notes" -#: src/frontends/qt4/qt_helpers.cpp:570 +#: src/frontends/qt4/qt_helpers.cpp:569 msgid "List of Citations" msgstr "Liste des citations" -#: src/frontends/qt4/qt_helpers.cpp:572 +#: src/frontends/qt4/qt_helpers.cpp:571 msgid "Labels and References" msgstr "Étiquettes et références" -#: src/frontends/qt4/qt_helpers.cpp:574 +#: src/frontends/qt4/qt_helpers.cpp:573 msgid "List of Branches" msgstr "Liste des branches" -#: src/frontends/qt4/qt_helpers.cpp:576 +#: src/frontends/qt4/qt_helpers.cpp:575 msgid "List of Changes" msgstr "Liste des modifications" -#: src/insets/ExternalSupport.cpp:369 src/insets/InsetBibtex.cpp:299 -#: src/insets/InsetGraphics.cpp:597 src/insets/InsetInclude.cpp:541 -msgid "" -"The following filename will cause troubles when running the exported file " -"through LaTeX: " -msgstr "" -"Le nom de fichier suivant risque de causer des problèmes quand le fichier " -"exporté sera traité avec LaTeX : " +#: src/insets/ExternalSupport.cpp:369 +#: src/insets/InsetBibtex.cpp:291 +#: src/insets/InsetGraphics.cpp:597 +#: src/insets/InsetInclude.cpp:536 +msgid "The following filename will cause troubles when running the exported file through LaTeX: " +msgstr "Le nom de fichier suivant risque de causer des problèmes quand le fichier exporté sera traité avec LaTeX : " -#: src/insets/ExternalSupport.cpp:374 src/insets/InsetBibtex.cpp:304 -#: src/insets/InsetGraphics.cpp:604 src/insets/InsetInclude.cpp:546 +#: src/insets/ExternalSupport.cpp:374 +#: src/insets/InsetBibtex.cpp:296 +#: src/insets/InsetGraphics.cpp:604 +#: src/insets/InsetInclude.cpp:541 msgid "Problematic filename for DVI" msgstr "Nom de fichier problématique pour DVI" -#: src/insets/ExternalSupport.cpp:375 src/insets/InsetBibtex.cpp:305 -#: src/insets/InsetGraphics.cpp:605 src/insets/InsetInclude.cpp:547 -msgid "" -"The following filename can cause troubles when running the exported file " -"through LaTeX and opening the resulting DVI: " -msgstr "" -"Le nom de fichier suivant risque de causer des problèmes quand le fichier " -"exporté sera traité avec LaTeX, à l'ouverture du fichier DVI : " +#: src/insets/ExternalSupport.cpp:375 +#: src/insets/InsetBibtex.cpp:297 +#: src/insets/InsetGraphics.cpp:605 +#: src/insets/InsetInclude.cpp:542 +msgid "The following filename can cause troubles when running the exported file through LaTeX and opening the resulting DVI: " +msgstr "Le nom de fichier suivant risque de causer des problèmes quand le fichier exporté sera traité avec LaTeX, à l'ouverture du fichier DVI : " #: src/insets/Inset.cpp:88 msgid "Bibliography Entry" @@ -23804,7 +24029,8 @@ msgstr "Code TeX" msgid "Float" msgstr "Flottant" -#: src/insets/Inset.cpp:109 src/insets/InsetBox.cpp:130 +#: src/insets/Inset.cpp:109 +#: src/insets/InsetBox.cpp:130 msgid "Box" msgstr "Boîte" @@ -23812,7 +24038,8 @@ msgstr "Boîte" msgid "Horizontal Space" msgstr "Espacement horizontal" -#: src/insets/Inset.cpp:112 src/insets/InsetVSpace.cpp:112 +#: src/insets/Inset.cpp:112 +#: src/insets/InsetVSpace.cpp:112 msgid "Vertical Space" msgstr "Espacement vertical" @@ -23820,7 +24047,7 @@ msgstr "Espacement vertical" msgid "Info" msgstr "Info" -#: src/insets/Inset.cpp:160 +#: src/insets/Inset.cpp:158 msgid "Horizontal Math Space" msgstr "Espacement horizontal mathématique" @@ -23837,7 +24064,7 @@ msgstr "" "La clé de citation %1$s existe déjà,\n" "elle va être remplacés par %2$s." -#: src/insets/InsetBibtex.cpp:149 +#: src/insets/InsetBibtex.cpp:144 #, c-format msgid "" "The BibTeX inset includes %1$s databases.\n" @@ -23846,39 +24073,40 @@ msgstr "" "L'insert BibTeX inclut %1$s bases de données.\n" "Si vous poursuivez, elles seront toutes ouvertes." -#: src/insets/InsetBibtex.cpp:152 +#: src/insets/InsetBibtex.cpp:147 msgid "Open Databases?" msgstr "Ouvrir les bases de données ?" -#: src/insets/InsetBibtex.cpp:153 +#: src/insets/InsetBibtex.cpp:148 msgid "&Proceed" msgstr "&Poursuivre" -#: src/insets/InsetBibtex.cpp:171 +#: src/insets/InsetBibtex.cpp:166 msgid "BibTeX Generated Bibliography" msgstr "Bibliographie BibTeX" -#: src/insets/InsetBibtex.cpp:178 +#: src/insets/InsetBibtex.cpp:173 msgid "Databases:" msgstr "Bases de données :" -#: src/insets/InsetBibtex.cpp:203 +#: src/insets/InsetBibtex.cpp:198 msgid "Style File:" msgstr "Fichier de style :" -#: src/insets/InsetBibtex.cpp:210 +#: src/insets/InsetBibtex.cpp:205 msgid "Lists:" msgstr "Listes :" -#: src/insets/InsetBibtex.cpp:221 +#: src/insets/InsetBibtex.cpp:216 msgid "included in TOC" msgstr "inclus dans la TDM" -#: src/insets/InsetBibtex.cpp:326 src/insets/InsetBibtex.cpp:375 +#: src/insets/InsetBibtex.cpp:318 +#: src/insets/InsetBibtex.cpp:364 msgid "Export Warning!" msgstr "Alerte d'exportation !" -#: src/insets/InsetBibtex.cpp:327 +#: src/insets/InsetBibtex.cpp:319 msgid "" "There are spaces in the paths to your BibTeX databases.\n" "BibTeX will be unable to find them." @@ -23886,7 +24114,7 @@ msgstr "" "Il y a des espaces dans les chemins de vos bases de données BibTeX.\n" "BibTeX n'arrivera pas à les trouver." -#: src/insets/InsetBibtex.cpp:376 +#: src/insets/InsetBibtex.cpp:365 msgid "" "There are spaces in the path to your BibTeX style file.\n" "BibTeX will be unable to find it." @@ -23926,7 +24154,8 @@ msgstr "fond ombré" msgid "double frame" msgstr "double cadre" -#: src/insets/InsetBox.cpp:150 src/insets/InsetBox.cpp:153 +#: src/insets/InsetBox.cpp:150 +#: src/insets/InsetBox.cpp:153 #, c-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -23940,7 +24169,8 @@ msgstr "%1$s (%2$s, %3$s)" msgid "active" msgstr "actif" -#: src/insets/InsetBranch.cpp:68 src/insets/InsetIndex.cpp:454 +#: src/insets/InsetBranch.cpp:68 +#: src/insets/InsetIndex.cpp:454 msgid "non-active" msgstr "non-actif" @@ -23970,10 +24200,18 @@ msgstr "Undef : " msgid "Sub-%1$s" msgstr "Sous-%1$s" -#: src/insets/InsetCitation.cpp:123 +#: src/insets/InsetCitation.cpp:121 msgid "No bibliography defined!" msgstr "Aucune bibliographie définie !" +#: src/insets/InsetCitation.cpp:125 +msgid "No citations selected!" +msgstr "Aucune citation sélectionnée !" + +#: src/insets/InsetCitation.cpp:296 +msgid "not cited" +msgstr "non cité" + #: src/insets/InsetCommand.cpp:131 msgid "LaTeX Command: " msgstr "Commande LaTeX : " @@ -23982,11 +24220,13 @@ msgstr "Commande LaTeX : " msgid "InsetCommand Error: " msgstr "Erreur de commande d'insert : " -#: src/insets/InsetCommandParams.cpp:265 src/insets/InsetCommandParams.cpp:282 +#: src/insets/InsetCommandParams.cpp:265 +#: src/insets/InsetCommandParams.cpp:282 msgid "Incompatible command name." msgstr "Nom de commande incompatible." -#: src/insets/InsetCommandParams.cpp:281 src/insets/InsetCommandParams.cpp:312 +#: src/insets/InsetCommandParams.cpp:281 +#: src/insets/InsetCommandParams.cpp:312 msgid "InsetCommandParams Error: " msgstr "Erreur de paramètres de commande d'insert : " @@ -24003,6 +24243,7 @@ msgid "Missing \\end_inset at this point: " msgstr "Il manque un \\end_inset à cet endroit : " #: src/insets/InsetCommandParams.cpp:401 +#: src/insets/InsetHyperlink.cpp:220 msgid "Uncodable characters" msgstr "Caractères incodables" @@ -24022,7 +24263,8 @@ msgstr "" msgid "External template %1$s is not installed" msgstr "Le modèle externe %1$s n'est pas installé" -#: src/insets/InsetFloat.cpp:275 src/insets/InsetFloat.cpp:456 +#: src/insets/InsetFloat.cpp:275 +#: src/insets/InsetFloat.cpp:456 msgid "float: " msgstr "flottant : " @@ -24043,11 +24285,11 @@ msgstr "sous-flottant : " msgid " (sideways)" msgstr " (couché)" -#: src/insets/InsetFloatList.cpp:81 +#: src/insets/InsetFloatList.cpp:78 msgid "ERROR: Nonexistent float type!" msgstr "ERREUR : type de flottant non existant !" -#: src/insets/InsetFloatList.cpp:151 +#: src/insets/InsetFloatList.cpp:133 #, c-format msgid "LyX cannot generate a list of %1$s" msgstr "LyX ne peut créer une liste de %1$s" @@ -24056,7 +24298,8 @@ msgstr "LyX ne peut créer une liste de %1$s" msgid "footnote" msgstr "note de bas de page" -#: src/insets/InsetGraphics.cpp:474 src/insets/InsetInclude.cpp:675 +#: src/insets/InsetGraphics.cpp:474 +#: src/insets/InsetInclude.cpp:672 #, c-format msgid "" "Could not copy the file\n" @@ -24067,54 +24310,67 @@ msgstr "" "%1$s\n" "dans le répertoire temporaire." -#: src/insets/InsetGraphics.cpp:719 src/insets/InsetGraphics.cpp:945 +#: src/insets/InsetGraphics.cpp:719 +#: src/insets/InsetGraphics.cpp:934 #, c-format msgid "No conversion of %1$s is needed after all" msgstr "Aucune conversion de %1$s n'est nécessaire" -#: src/insets/InsetGraphics.cpp:822 +#: src/insets/InsetGraphics.cpp:811 #, c-format msgid "Graphics file: %1$s" msgstr "Fichier graphique : %1$s" -#: src/insets/InsetHyperlink.cpp:259 +#: src/insets/InsetHyperlink.cpp:221 +#, c-format +msgid "" +"The following characters that are used in the href inset are not\n" +"representable in the current encoding and therefore have been omitted:\n" +"%1$s." +msgstr "" +"Les caractères suivants utilisés dans l'insert href ne sont\n" +"pas représentables dans l'encodage courant et on donc été omis :\n" +"%1$s." + +#: src/insets/InsetHyperlink.cpp:296 msgid "www" msgstr "www" -#: src/insets/InsetHyperlink.cpp:263 +#: src/insets/InsetHyperlink.cpp:300 msgid "file" msgstr "fichier" -#: src/insets/InsetHyperlink.cpp:264 +#: src/insets/InsetHyperlink.cpp:301 #, c-format msgid "Hyperlink (%1$s) to %2$s" msgstr "Hyperlien (%1$s) : %2$s" -#: src/insets/InsetInclude.cpp:375 +#: src/insets/InsetInclude.cpp:376 msgid "Verbatim Input" msgstr "Incorporation verbatim" -#: src/insets/InsetInclude.cpp:378 +#: src/insets/InsetInclude.cpp:379 msgid "Verbatim Input*" msgstr "Incorporation verbatim*" -#: src/insets/InsetInclude.cpp:384 +#: src/insets/InsetInclude.cpp:385 msgid "Include (excluded)" msgstr "Inclure (exclus)" -#: src/insets/InsetInclude.cpp:500 src/insets/InsetInclude.cpp:777 +#: src/insets/InsetInclude.cpp:501 +#: src/insets/InsetInclude.cpp:772 #: src/insets/InsetInclude.cpp:838 msgid "Recursive input" msgstr "Inclusions récursives" -#: src/insets/InsetInclude.cpp:501 src/insets/InsetInclude.cpp:778 +#: src/insets/InsetInclude.cpp:502 +#: src/insets/InsetInclude.cpp:773 #: src/insets/InsetInclude.cpp:839 #, c-format msgid "Attempted to include file %1$s in itself! Ignoring inclusion." -msgstr "" -"Tentative d'incorporer le fichier %1$s dans lui-même ! Inclusion ignorée." +msgstr "Tentative d'incorporer le fichier %1$s dans lui-même ! Inclusion ignorée." -#: src/insets/InsetInclude.cpp:567 +#: src/insets/InsetInclude.cpp:562 #, c-format msgid "" "Could not load included file\n" @@ -24125,11 +24381,11 @@ msgstr "" "« %1$s ».\n" "Veuillez vérifier l'existence effective du fichier." -#: src/insets/InsetInclude.cpp:571 +#: src/insets/InsetInclude.cpp:566 msgid "Missing included file" msgstr "Fichier inclus manquant" -#: src/insets/InsetInclude.cpp:577 +#: src/insets/InsetInclude.cpp:572 #, c-format msgid "" "Included file `%1$s'\n" @@ -24140,11 +24396,11 @@ msgstr "" "est de la classe '%2$s'\n" "alors que le document est de la classe '%3$s'." -#: src/insets/InsetInclude.cpp:583 +#: src/insets/InsetInclude.cpp:578 msgid "Different textclasses" msgstr "Classes de document différentes" -#: src/insets/InsetInclude.cpp:598 +#: src/insets/InsetInclude.cpp:593 #, c-format msgid "" "Included file `%1$s'\n" @@ -24155,11 +24411,12 @@ msgstr "" "utilise le module '%2$s'\n" "qui n'est pas utilisé par le document parent." -#: src/insets/InsetInclude.cpp:602 +#: src/insets/InsetInclude.cpp:597 msgid "Module not found" msgstr "Module introuvable" -#: src/insets/InsetInclude.cpp:628 src/insets/InsetInclude.cpp:651 +#: src/insets/InsetInclude.cpp:624 +#: src/insets/InsetInclude.cpp:648 #, c-format msgid "" "Included file `%1$s' was not exported correctly.\n" @@ -24168,23 +24425,22 @@ msgstr "" "Le fichier inclus « %1$s » n'a pas été correctement exporté.\n" "Attention : l'exportation LaTeX est probablement incomplète." -#: src/insets/InsetInclude.cpp:637 src/insets/InsetInclude.cpp:659 +#: src/insets/InsetInclude.cpp:633 +#: src/insets/InsetInclude.cpp:656 msgid "Export failure" msgstr "Échec de l'exportation" -#: src/insets/InsetInclude.cpp:765 +#: src/insets/InsetInclude.cpp:760 msgid "Unsupported Inclusion" msgstr "Inclusion non acceptée" -#: src/insets/InsetInclude.cpp:766 +#: src/insets/InsetInclude.cpp:761 #, c-format msgid "" -"LyX does not know how to include non-LyX files when generating HTML output. " -"Offending file:\n" +"LyX does not know how to include non-LyX files when generating HTML output. Offending file:\n" "%1$s" msgstr "" -"LyX ignore comment inclure des fichiers autres que LyX lors de la génération " -"HTML. Fichier incorrect :\n" +"LyX ignore comment inclure des fichiers autres que LyX lors de la génération HTML. Fichier incorrect :\n" "%1$s" #: src/insets/InsetIndex.cpp:147 @@ -24208,7 +24464,8 @@ msgstr "" msgid "Index Entry" msgstr "Entrée d'index" -#: src/insets/InsetIndex.cpp:282 src/insets/InsetIndex.cpp:303 +#: src/insets/InsetIndex.cpp:282 +#: src/insets/InsetIndex.cpp:303 msgid "unknown type!" msgstr "type inconnu !" @@ -24224,37 +24481,41 @@ msgstr "Tous les index" msgid "subindex" msgstr "sous-index" -#: src/insets/InsetInfo.cpp:119 +#: src/insets/InsetInfo.cpp:118 #, c-format msgid "Information regarding %1$s '%2$s'" msgstr "Information concernant %1$s '%2$s'" -#: src/insets/InsetInfo.cpp:143 +#: src/insets/InsetInfo.cpp:142 msgid "Missing \\end_inset at this point." msgstr "Il manque un \\end_inset à cet endroit." -#: src/insets/InsetInfo.cpp:304 src/insets/InsetInfo.cpp:316 -#: src/insets/InsetInfo.cpp:322 src/insets/InsetInfo.cpp:329 +#: src/insets/InsetInfo.cpp:303 +#: src/insets/InsetInfo.cpp:315 +#: src/insets/InsetInfo.cpp:321 +#: src/insets/InsetInfo.cpp:328 msgid "undefined" msgstr "indéfini" -#: src/insets/InsetInfo.cpp:343 src/insets/InsetInfo.cpp:352 +#: src/insets/InsetInfo.cpp:342 +#: src/insets/InsetInfo.cpp:351 msgid "yes" msgstr "oui" -#: src/insets/InsetInfo.cpp:343 src/insets/InsetInfo.cpp:352 +#: src/insets/InsetInfo.cpp:342 +#: src/insets/InsetInfo.cpp:351 msgid "no" msgstr "non" -#: src/insets/InsetInfo.cpp:436 +#: src/insets/InsetInfo.cpp:435 msgid "No version control" msgstr "Pas de contrôle de version" -#: src/insets/InsetLabel.cpp:74 +#: src/insets/InsetLabel.cpp:76 msgid "Label names must be unique!" msgstr "Les étiquettes doivent être uniques !" -#: src/insets/InsetLabel.cpp:75 +#: src/insets/InsetLabel.cpp:77 #, c-format msgid "" "The label %1$s already exists,\n" @@ -24263,7 +24524,7 @@ msgstr "" "L'étiquette %1$s existe déjà,\n" "elle va être remplacée par %2$s." -#: src/insets/InsetLabel.cpp:147 +#: src/insets/InsetLabel.cpp:149 msgid "DUPLICATE: " msgstr "DUPLICATION : " @@ -24372,28 +24633,16 @@ msgid "Should be composed of one or more of %1$s." msgstr "Devrait être composé de un %1$s ou plus." #: src/insets/InsetListingsParams.cpp:283 -msgid "" -"Use \\footnotesize, \\small, \\itshape, \\ttfamily or something like that" -msgstr "" -"Utiliser \\footnotesize, \\small, \\itshape, \\ttfamily ou quelque chose du " -"même genre" +msgid "Use \\footnotesize, \\small, \\itshape, \\ttfamily or something like that" +msgstr "Utiliser \\footnotesize, \\small, \\itshape, \\ttfamily ou quelque chose du même genre" #: src/insets/InsetListingsParams.cpp:285 -msgid "" -"none, leftline, topline, bottomline, lines, single, shadowbox or subset of " -"trblTRBL" -msgstr "" -"none, leftline, topline, bottomline, lines, single, shadowbox or subset of " -"trblTRBL" +msgid "none, leftline, topline, bottomline, lines, single, shadowbox or subset of trblTRBL" +msgstr "none, leftline, topline, bottomline, lines, single, shadowbox or subset of trblTRBL" #: src/insets/InsetListingsParams.cpp:287 -msgid "" -"Enter four letters (either t = round or f = square) for top right, bottom " -"right, bottom left and top left corner." -msgstr "" -"Entrer quatre lettres (soit t = arrondi ou f = carré) pour respectivement " -"les angles en haut à droite, en bas à droite, en bas à gauche et en haut à " -"gauche." +msgid "Enter four letters (either t = round or f = square) for top right, bottom right, bottom left and top left corner." +msgstr "Entrer quatre lettres (soit t = arrondi ou f = carré) pour respectivement les angles en haut à droite, en bas à droite, en bas à gauche et en haut à gauche." #: src/insets/InsetListingsParams.cpp:290 msgid "Enter something like \\color{white}" @@ -24408,24 +24657,12 @@ msgid "auto, last or a number" msgstr "automatique, dernier saisi ou un chiffre" #: src/insets/InsetListingsParams.cpp:412 -msgid "" -"This parameter should not be entered here. Please use the caption edit box " -"(when using the child document dialog) or menu Insert->Caption (when " -"defining a listing inset)" -msgstr "" -"Ce paramètre ne doit pas être entré ici. Utilisez la boîte de modification " -"de la légende (si vous utilisez la fenêtre de dialogue Sous-document) ou " -"utilisez Insérer->Légende (si vous définissez un insert de listing)." +msgid "This parameter should not be entered here. Please use the caption edit box (when using the child document dialog) or menu Insert->Caption (when defining a listing inset)" +msgstr "Ce paramètre ne doit pas être entré ici. Utilisez la boîte de modification de la légende (si vous utilisez la fenêtre de dialogue Sous-document) ou utilisez Insertion->Légende (si vous définissez un insert de listing)." #: src/insets/InsetListingsParams.cpp:418 -msgid "" -"This parameter should not be entered here. Please use the label edit box " -"(when using the child document dialog) or menu Insert->Label (when defining " -"a listing inset)" -msgstr "" -"Ce paramètre ne doit pas être entré ici. Utilisez la boîte d'édition de " -"l'étiquette (si vous utilisez la fenêtre de dialogue Sous-document) ou " -"utilisez Insérer->Étiquette (si vous définissez un insert de listing)." +msgid "This parameter should not be entered here. Please use the label edit box (when using the child document dialog) or menu Insert->Label (when defining a listing inset)" +msgstr "Ce paramètre ne doit pas être entré ici. Utilisez la boîte d'édition de l'étiquette (si vous utilisez la fenêtre de dialogue Sous-document) ou utilisez Insertion->Étiquette (si vous définissez un insert de listing)." #: src/insets/InsetListingsParams.cpp:623 msgid "Invalid (empty) listing parameter name." @@ -24439,8 +24676,7 @@ msgstr "Les paramètre de listing disponibles sont %1$s" #: src/insets/InsetListingsParams.cpp:642 #, c-format msgid "Available listings parameters containing string \"%1$s\" are %2$s" -msgstr "" -"Les paramètres de listings disponibles contenant la chaîne \"%1$s\" sont %2$s" +msgstr "Les paramètres de listings disponibles contenant la chaîne \"%1$s\" sont %2$s" #: src/insets/InsetListingsParams.cpp:653 #, c-format @@ -24457,7 +24693,8 @@ msgstr "Paramètre de listing inconnu : %1$s" msgid "Parameters starting with '%1$s': %2$s" msgstr "Paramètres commençant par '%1$s': %2$s" -#: src/insets/InsetNewpage.cpp:181 src/insets/InsetNewpage.cpp:193 +#: src/insets/InsetNewpage.cpp:181 +#: src/insets/InsetNewpage.cpp:193 msgid "New Page" msgstr "Saut de page (fer en haut)" @@ -24490,7 +24727,7 @@ msgstr "Description : " msgid "Sorting: " msgstr "Tri : " -#: src/insets/InsetNote.cpp:267 +#: src/insets/InsetNote.cpp:268 msgid "note" msgstr "note" @@ -24518,63 +24755,72 @@ msgstr "hfantôme" msgid "vphantom" msgstr "vfantôme" -#: src/insets/InsetRef.cpp:219 +#: src/insets/InsetRef.cpp:221 msgid "elsewhere" msgstr "ailleurs" -#: src/insets/InsetRef.cpp:298 +#: src/insets/InsetRef.cpp:300 msgid "BROKEN: " msgstr "CASSÉ : " -#: src/insets/InsetRef.cpp:338 src/mathed/InsetMathRef.cpp:225 +#: src/insets/InsetRef.cpp:340 +#: src/mathed/InsetMathRef.cpp:225 msgid "Ref: " msgstr "Réf : " -#: src/insets/InsetRef.cpp:339 src/mathed/InsetMathRef.cpp:226 +#: src/insets/InsetRef.cpp:341 +#: src/mathed/InsetMathRef.cpp:226 msgid "Equation" msgstr "Équation" -#: src/insets/InsetRef.cpp:339 src/mathed/InsetMathRef.cpp:226 +#: src/insets/InsetRef.cpp:341 +#: src/mathed/InsetMathRef.cpp:226 msgid "EqRef: " msgstr "RéfÉq : " -#: src/insets/InsetRef.cpp:340 src/mathed/InsetMathRef.cpp:227 +#: src/insets/InsetRef.cpp:342 +#: src/mathed/InsetMathRef.cpp:227 msgid "Page Number" msgstr "Numéro de page" -#: src/insets/InsetRef.cpp:340 src/mathed/InsetMathRef.cpp:227 +#: src/insets/InsetRef.cpp:342 +#: src/mathed/InsetMathRef.cpp:227 msgid "Page: " msgstr "Page : " -#: src/insets/InsetRef.cpp:341 src/mathed/InsetMathRef.cpp:228 +#: src/insets/InsetRef.cpp:343 +#: src/mathed/InsetMathRef.cpp:228 msgid "Textual Page Number" msgstr "N° de page du texte" -#: src/insets/InsetRef.cpp:341 src/mathed/InsetMathRef.cpp:228 +#: src/insets/InsetRef.cpp:343 +#: src/mathed/InsetMathRef.cpp:228 msgid "TextPage: " msgstr "Page du texte : " -#: src/insets/InsetRef.cpp:342 src/mathed/InsetMathRef.cpp:229 +#: src/insets/InsetRef.cpp:344 +#: src/mathed/InsetMathRef.cpp:229 msgid "Standard+Textual Page" msgstr "Standard + N° de page du texte" -#: src/insets/InsetRef.cpp:342 src/mathed/InsetMathRef.cpp:229 +#: src/insets/InsetRef.cpp:344 +#: src/mathed/InsetMathRef.cpp:229 msgid "Ref+Text: " msgstr "Réf+Texte : " -#: src/insets/InsetRef.cpp:343 +#: src/insets/InsetRef.cpp:345 msgid "Formatted" msgstr "Mis en page" -#: src/insets/InsetRef.cpp:343 +#: src/insets/InsetRef.cpp:345 msgid "Format: " msgstr "Format : " -#: src/insets/InsetRef.cpp:344 +#: src/insets/InsetRef.cpp:346 msgid "Reference to Name" msgstr "Référence au nom" -#: src/insets/InsetRef.cpp:344 +#: src/insets/InsetRef.cpp:346 msgid "NameRef:" msgstr "NomRef :" @@ -24590,70 +24836,70 @@ msgstr "exposant" msgid "Protected Space" msgstr "Espace insécable" -#: src/insets/InsetSpace.cpp:86 +#: src/insets/InsetSpace.cpp:83 msgid "Quad Space" msgstr "Espace cadratin" -#: src/insets/InsetSpace.cpp:89 +#: src/insets/InsetSpace.cpp:86 msgid "Double Quad Space" msgstr "Espace double cadratin" -#: src/insets/InsetSpace.cpp:92 +#: src/insets/InsetSpace.cpp:89 msgid "Enspace" msgstr "Espace de largeur en" -#: src/insets/InsetSpace.cpp:95 +#: src/insets/InsetSpace.cpp:92 msgid "Enskip" msgstr "Saut de hauteur en" -#: src/insets/InsetSpace.cpp:110 +#: src/insets/InsetSpace.cpp:107 msgid "Protected Horizontal Fill" msgstr "Remplissage horizontal insécable" -#: src/insets/InsetSpace.cpp:113 +#: src/insets/InsetSpace.cpp:110 msgid "Horizontal Fill (Dots)" msgstr "Remplissage horizontal (points)" -#: src/insets/InsetSpace.cpp:116 +#: src/insets/InsetSpace.cpp:113 msgid "Horizontal Fill (Rule)" msgstr "Remplissage horizontal (filet)" -#: src/insets/InsetSpace.cpp:119 +#: src/insets/InsetSpace.cpp:116 msgid "Horizontal Fill (Left Arrow)" msgstr "Remplissage horizontal (flèche gauche)" -#: src/insets/InsetSpace.cpp:122 +#: src/insets/InsetSpace.cpp:119 msgid "Horizontal Fill (Right Arrow)" msgstr "Remplissage horizontal (flèche droite)" -#: src/insets/InsetSpace.cpp:125 +#: src/insets/InsetSpace.cpp:122 msgid "Horizontal Fill (Up Brace)" msgstr "Remplissage horizontal (accolade vers le haut)" -#: src/insets/InsetSpace.cpp:128 +#: src/insets/InsetSpace.cpp:125 msgid "Horizontal Fill (Down Brace)" msgstr "Remplissage horizontal (accolade vers le bas)" -#: src/insets/InsetSpace.cpp:132 +#: src/insets/InsetSpace.cpp:129 #, c-format msgid "Horizontal Space (%1$s)" msgstr "Espace horizontale (%1$s)" -#: src/insets/InsetSpace.cpp:137 +#: src/insets/InsetSpace.cpp:134 #, c-format msgid "Protected Horizontal Space (%1$s)" msgstr "Espace horizontal insécable (%1$s)" -#: src/insets/InsetTOC.cpp:60 +#: src/insets/InsetTOC.cpp:59 msgid "Unknown TOC type" msgstr "Type de TDM inconnu" -#: src/insets/InsetTabular.cpp:4757 +#: src/insets/InsetTabular.cpp:4769 msgid "Selection size should match clipboard content." -msgstr "" -"La taille de la sélection doit correspondre au contenu du presse-papier." +msgstr "La taille de la sélection doit correspondre au contenu du presse-papier." -#: src/insets/InsetWrap.cpp:46 src/insets/InsetWrap.cpp:121 +#: src/insets/InsetWrap.cpp:46 +#: src/insets/InsetWrap.cpp:121 msgid "wrap: " msgstr "enrober : " @@ -24661,7 +24907,8 @@ msgstr "enrober : " msgid "wrap" msgstr "enrober" -#: src/insets/RenderGraphic.cpp:83 src/insets/RenderGraphic.cpp:87 +#: src/insets/RenderGraphic.cpp:83 +#: src/insets/RenderGraphic.cpp:87 msgid "Not shown." msgstr "Non affiché." @@ -24705,71 +24952,71 @@ msgstr "Erreur lors de la génération du pixmap" msgid "No image" msgstr "Pas d'image" -#: src/insets/RenderPreview.cpp:89 +#: src/insets/RenderPreview.cpp:95 msgid "Preview loading" msgstr "Chargement de l'aperçu" -#: src/insets/RenderPreview.cpp:92 +#: src/insets/RenderPreview.cpp:98 msgid "Preview ready" msgstr "Aperçu prêt" -#: src/insets/RenderPreview.cpp:95 +#: src/insets/RenderPreview.cpp:101 msgid "Preview failed" msgstr "Échec de l'aperçu" -#: src/lengthcommon.cpp:44 +#: src/lengthcommon.cpp:37 msgid "cc[[unit of measure]]" msgstr "cc" -#: src/lengthcommon.cpp:44 +#: src/lengthcommon.cpp:37 msgid "dd" msgstr "dd" -#: src/lengthcommon.cpp:44 +#: src/lengthcommon.cpp:37 msgid "em" msgstr "em" -#: src/lengthcommon.cpp:45 +#: src/lengthcommon.cpp:38 msgid "ex" msgstr "ex" -#: src/lengthcommon.cpp:45 +#: src/lengthcommon.cpp:38 msgid "mu[[unit of measure]]" msgstr "mu[[unité de mesure]]" -#: src/lengthcommon.cpp:45 +#: src/lengthcommon.cpp:38 msgid "pc" msgstr "pc" -#: src/lengthcommon.cpp:46 +#: src/lengthcommon.cpp:39 msgid "pt" msgstr "pt" -#: src/lengthcommon.cpp:46 +#: src/lengthcommon.cpp:39 msgid "sp" msgstr "sp" -#: src/lengthcommon.cpp:46 +#: src/lengthcommon.cpp:39 msgid "Text Width %" msgstr "Largeur texte %" -#: src/lengthcommon.cpp:47 +#: src/lengthcommon.cpp:40 msgid "Column Width %" msgstr "Largeur colonne %" -#: src/lengthcommon.cpp:47 +#: src/lengthcommon.cpp:40 msgid "Page Width %" msgstr "Largeur page %" -#: src/lengthcommon.cpp:47 +#: src/lengthcommon.cpp:40 msgid "Line Width %" msgstr "Largeur ligne %" -#: src/lengthcommon.cpp:48 +#: src/lengthcommon.cpp:41 msgid "Text Height %" msgstr "Hauteur texte %" -#: src/lengthcommon.cpp:48 +#: src/lengthcommon.cpp:41 msgid "Page Height %" msgstr "Hauteur page %" @@ -24781,28 +25028,28 @@ msgstr "Erreur de recherche" msgid "Search string is empty" msgstr "La chaîne de caractères à chercher est vide" -#: src/lyxfind.cpp:381 +#: src/lyxfind.cpp:378 msgid "String found." msgstr "Chaîne de caractères trouvée." -#: src/lyxfind.cpp:383 +#: src/lyxfind.cpp:380 msgid "String has been replaced." msgstr "Chaîne remplacée." -#: src/lyxfind.cpp:386 +#: src/lyxfind.cpp:383 #, c-format msgid "%1$d strings have been replaced." msgstr "%1$d chaînes remplacées." -#: src/lyxfind.cpp:1413 +#: src/lyxfind.cpp:1429 msgid "Invalid regular expression!" msgstr "Expression régulière invalide !" -#: src/lyxfind.cpp:1418 +#: src/lyxfind.cpp:1434 msgid "Match not found!" msgstr "Chaîne de caractères introuvable !" -#: src/lyxfind.cpp:1422 +#: src/lyxfind.cpp:1438 msgid "Match found!" msgstr "Chaîne de caractères reconnue !" @@ -24811,8 +25058,10 @@ msgstr "Chaîne de caractères reconnue !" msgid " Macro: %1$s: " msgstr "Macro %1$s : " -#: src/mathed/InsetMathAMSArray.cpp:119 src/mathed/InsetMathHull.cpp:1700 -#: src/mathed/InsetMathSplit.cpp:82 src/mathed/InsetMathSubstack.cpp:76 +#: src/mathed/InsetMathAMSArray.cpp:119 +#: src/mathed/InsetMathHull.cpp:1685 +#: src/mathed/InsetMathSplit.cpp:82 +#: src/mathed/InsetMathSubstack.cpp:76 #, c-format msgid "Can't add vertical grid lines in '%1$s'" msgstr "Ne peut pas ajouter de lignes de grille verticales dans '%1$s'" @@ -24826,40 +25075,38 @@ msgstr "Pas de lignes de grille verticales dans 'cases' : option %1$s" #: src/mathed/InsetMathCases.cpp:117 #, c-format msgid "Changing number of columns not allowed in 'cases': feature %1$s" -msgstr "" -"Interdiction de changer le nombre de colonnes dans 'cases' : fonctionnalité " -"%1$s" +msgstr "Interdiction de changer le nombre de colonnes dans 'cases' : fonctionnalité %1$s" -#: src/mathed/InsetMathGrid.cpp:1442 +#: src/mathed/InsetMathGrid.cpp:1453 msgid "Cursor not in table" msgstr "Le curseur n'est pas dans le tableau" -#: src/mathed/InsetMathGrid.cpp:1448 +#: src/mathed/InsetMathGrid.cpp:1459 msgid "Only one row" msgstr "Une seule ligne" -#: src/mathed/InsetMathGrid.cpp:1454 +#: src/mathed/InsetMathGrid.cpp:1465 msgid "Only one column" msgstr "Une seule colonne" -#: src/mathed/InsetMathGrid.cpp:1462 +#: src/mathed/InsetMathGrid.cpp:1473 msgid "No hline to delete" msgstr "Pas de ligne horizontale à supprimer" -#: src/mathed/InsetMathGrid.cpp:1471 +#: src/mathed/InsetMathGrid.cpp:1482 msgid "No vline to delete" msgstr "Pas de ligne verticale à supprimer" -#: src/mathed/InsetMathGrid.cpp:1500 +#: src/mathed/InsetMathGrid.cpp:1511 #, c-format msgid "Unknown tabular feature '%1$s'" msgstr "Option de tableau inconnue '%1$s'" -#: src/mathed/InsetMathHull.cpp:1293 +#: src/mathed/InsetMathHull.cpp:1278 msgid "Bad math environment" msgstr "Environnement mathématique incorrect" -#: src/mathed/InsetMathHull.cpp:1294 +#: src/mathed/InsetMathHull.cpp:1279 msgid "" "Computation cannot be performed for AMS math environments.\n" "Change the math formula type and try again." @@ -24867,25 +25114,27 @@ msgstr "" "Le calcul ne peut pas être effectué pour l'environnement mathématique AMS.\n" "Modifier le type de formule mathématique et réessayer." -#: src/mathed/InsetMathHull.cpp:1400 src/mathed/InsetMathHull.cpp:1409 +#: src/mathed/InsetMathHull.cpp:1385 +#: src/mathed/InsetMathHull.cpp:1394 msgid "No number" msgstr "Pas de numéro" -#: src/mathed/InsetMathHull.cpp:1400 src/mathed/InsetMathHull.cpp:1409 +#: src/mathed/InsetMathHull.cpp:1385 +#: src/mathed/InsetMathHull.cpp:1394 msgid "Number" msgstr "Numéro" -#: src/mathed/InsetMathHull.cpp:1673 +#: src/mathed/InsetMathHull.cpp:1658 #, c-format msgid "Can't change number of rows in '%1$s'" msgstr "Impossible de changer le nombre de lignes dans '%1$s'" -#: src/mathed/InsetMathHull.cpp:1683 +#: src/mathed/InsetMathHull.cpp:1668 #, c-format msgid "Can't change number of columns in '%1$s'" msgstr "Impossible de changer le nombre de colonnes dans '%1$s'" -#: src/mathed/InsetMathHull.cpp:1693 +#: src/mathed/InsetMathHull.cpp:1678 #, c-format msgid "Can't add horizontal grid lines in '%1$s'" msgstr "Impossible d'ajouter les lignes de grille horizontales dans '%1$s'" @@ -24902,11 +25151,13 @@ msgstr "entré en mode texte math (textrm)" msgid "Regular expression editor mode" msgstr "Mode d'édition « expression régulière »" -#: src/mathed/InsetMathNest.cpp:1689 src/mathed/InsetMathNest.cpp:1834 +#: src/mathed/InsetMathNest.cpp:1665 +#: src/mathed/InsetMathNest.cpp:1810 msgid "Autocorrect Off ('!' to enter)" msgstr "Autocorrection inhibée ('!' pour commencer)" -#: src/mathed/InsetMathNest.cpp:1694 src/mathed/InsetMathNest.cpp:1836 +#: src/mathed/InsetMathNest.cpp:1670 +#: src/mathed/InsetMathNest.cpp:1812 msgid "Autocorrect On ( to exit)" msgstr "Autocorrection active ( pour quitter)" @@ -24948,27 +25199,28 @@ msgstr "" "Impossible d'ouvrir le document\n" "%1$s" -#: src/output_plaintext.cpp:141 +#: src/output_plaintext.cpp:136 msgid "Abstract: " msgstr "Résumé : " -#: src/output_plaintext.cpp:153 +#: src/output_plaintext.cpp:148 msgid "References: " msgstr "Références : " -#: src/support/Package.cpp:470 +#: src/support/Messages.cpp:108 +msgid "[[Replace with the code of your language]]" +msgstr "fr" + +#: src/support/Package.cpp:444 msgid "LyX binary not found" msgstr "Binaire de LyX introuvable" -#: src/support/Package.cpp:471 +#: src/support/Package.cpp:445 #, c-format -msgid "" -"Unable to determine the path to the LyX binary from the command line %1$s" -msgstr "" -"N'a pas pu déterminer le chemin vers l'exécutable LyX dans la ligne de " -"commande %1$s" +msgid "Unable to determine the path to the LyX binary from the command line %1$s" +msgstr "N'a pas pu déterminer le chemin vers l'exécutable LyX dans la ligne de commande %1$s" -#: src/support/Package.cpp:590 +#: src/support/Package.cpp:564 #, c-format msgid "" "Unable to determine the system directory having searched\n" @@ -24978,15 +25230,15 @@ msgid "" msgstr "" "Impossible de déterminer le répertoire système après avoir exploré\n" "\t%1$s\n" -"Utiliser l'option de ligne de commande '-sysdir' ou positionner la variable " -"d'environnement\n" +"Utiliser l'option de ligne de commande '-sysdir' ou positionner la variable d'environnement\n" " %2$s sur le répertoire système LyX qui contient le fichier 'chkconfig.ltx'." -#: src/support/Package.cpp:671 src/support/Package.cpp:698 +#: src/support/Package.cpp:645 +#: src/support/Package.cpp:672 msgid "File not found" msgstr "Fichier introuvable" -#: src/support/Package.cpp:672 +#: src/support/Package.cpp:646 #, c-format msgid "" "Invalid %1$s switch.\n" @@ -24995,7 +25247,7 @@ msgstr "" "Option %1$s non valable.\n" "Le répertoire %2$s ne contient pas %3$s." -#: src/support/Package.cpp:699 +#: src/support/Package.cpp:673 #, c-format msgid "" "Invalid %1$s environment variable.\n" @@ -25004,7 +25256,7 @@ msgstr "" "Variable d'environnement %1$s non valable.\n" "Le répertoire %2$s ne contient pas %3$s." -#: src/support/Package.cpp:723 +#: src/support/Package.cpp:697 #, c-format msgid "" "Invalid %1$s environment variable.\n" @@ -25013,12 +25265,12 @@ msgstr "" "Variable d'environnement %1$s non valable.\n" "%2$s n'est pas un répertoire." -#: src/support/Package.cpp:725 +#: src/support/Package.cpp:699 msgid "Directory not found" msgstr "Répertoire introuvable" -#: src/support/Systemcall.cpp:382 -#, fuzzy, c-format +#: src/support/Systemcall.cpp:374 +#, c-format msgid "" "The command\n" "%1$s\n" @@ -25026,169 +25278,165 @@ msgid "" "\n" "Do you want to stop it?" msgstr "" -"Le document %1$s n'a pas encore été enregistré.\n" +"La commande\n" +" %1$s\n" +"n'est pas encore terminée.\n" "\n" -"Voulez-vous enregistrer le document ?" +"Voulez-vous l'interrompre ?" -#: src/support/Systemcall.cpp:384 -#, fuzzy +#: src/support/Systemcall.cpp:376 msgid "Stop command?" -msgstr "commande 'date'" +msgstr "Interrompre la commande ?" -#: src/support/Systemcall.cpp:385 -#, fuzzy +#: src/support/Systemcall.cpp:377 msgid "&Stop it" -msgstr "(Dés)Activer la bordure du haut" +msgstr "&Interrompre" -#: src/support/Systemcall.cpp:385 +#: src/support/Systemcall.cpp:377 msgid "Let it &run" -msgstr "" +msgstr "Laisser &tourner" -#: src/support/debug.cpp:41 +#: src/support/debug.cpp:42 msgid "No debugging messages" msgstr "Pas de message d'analyse" -#: src/support/debug.cpp:42 +#: src/support/debug.cpp:43 msgid "General information" msgstr "Information générale" -#: src/support/debug.cpp:43 +#: src/support/debug.cpp:44 msgid "Program initialisation" msgstr "Initialisation du programme" -#: src/support/debug.cpp:44 +#: src/support/debug.cpp:45 msgid "Keyboard events handling" msgstr "Gestion des événements clavier" -#: src/support/debug.cpp:45 +#: src/support/debug.cpp:46 msgid "GUI handling" msgstr "Gestion de l'interface graphique" -#: src/support/debug.cpp:46 +#: src/support/debug.cpp:47 msgid "Lyxlex grammar parser" msgstr "Parseur grammatical lyxlex" -#: src/support/debug.cpp:47 +#: src/support/debug.cpp:48 msgid "Configuration files reading" msgstr "Lecture des fichiers de configuration" -#: src/support/debug.cpp:48 +#: src/support/debug.cpp:49 msgid "Custom keyboard definition" msgstr "Définition d'un clavier personnalisé" -#: src/support/debug.cpp:49 +#: src/support/debug.cpp:50 msgid "LaTeX generation/execution" msgstr "Generation/Exécution de LaTeX" -#: src/support/debug.cpp:50 +#: src/support/debug.cpp:51 msgid "Math editor" msgstr "Éditeur mathématique" -#: src/support/debug.cpp:51 +#: src/support/debug.cpp:52 msgid "Font handling" msgstr "Gestion des polices" -#: src/support/debug.cpp:52 +#: src/support/debug.cpp:53 msgid "Textclass files reading" msgstr "Lecture des fichiers de classe" -#: src/support/debug.cpp:53 +#: src/support/debug.cpp:54 msgid "Version control" msgstr "Contrôle de version" -#: src/support/debug.cpp:54 +#: src/support/debug.cpp:55 msgid "External control interface" msgstr "Interface de contrôle externe" -#: src/support/debug.cpp:55 +#: src/support/debug.cpp:56 msgid "Undo/Redo mechanism" msgstr "Mécanisme défaire/refaire" -#: src/support/debug.cpp:56 +#: src/support/debug.cpp:57 msgid "User commands" msgstr "Commandes utilisateur" -#: src/support/debug.cpp:57 +#: src/support/debug.cpp:58 msgid "The LyX Lexer" msgstr "Le lexeur LyX" -#: src/support/debug.cpp:58 +#: src/support/debug.cpp:59 msgid "Dependency information" msgstr "Information sur les dépendances" -#: src/support/debug.cpp:59 +#: src/support/debug.cpp:60 msgid "LyX Insets" msgstr "Inserts LyX" -#: src/support/debug.cpp:60 +#: src/support/debug.cpp:61 msgid "Files used by LyX" msgstr "Fichiers utilisés par LyX" -#: src/support/debug.cpp:61 +#: src/support/debug.cpp:62 msgid "Workarea events" msgstr "Événements de la zone de travail" -#: src/support/debug.cpp:62 +#: src/support/debug.cpp:63 msgid "Insettext/tabular messages" msgstr "Messages d'insert/tabulaire" -#: src/support/debug.cpp:63 +#: src/support/debug.cpp:64 msgid "Graphics conversion and loading" msgstr "Conversion et chargement du graphique" -#: src/support/debug.cpp:64 +#: src/support/debug.cpp:65 msgid "Change tracking" msgstr "Suivi des modifications" -#: src/support/debug.cpp:65 +#: src/support/debug.cpp:66 msgid "External template/inset messages" msgstr "Messages des modèles/inserts externes" -#: src/support/debug.cpp:66 +#: src/support/debug.cpp:67 msgid "RowPainter profiling" msgstr "Profilage de RowPainter" -#: src/support/debug.cpp:67 +#: src/support/debug.cpp:68 msgid "Scrolling debugging" msgstr "Déverminage déroulant" -#: src/support/debug.cpp:68 +#: src/support/debug.cpp:69 msgid "Math macros" msgstr "Macros mathématiques" -#: src/support/debug.cpp:69 +#: src/support/debug.cpp:70 msgid "RTL/Bidi" msgstr "RTL/Bidi" -#: src/support/debug.cpp:70 +#: src/support/debug.cpp:71 msgid "Locale/Internationalisation" msgstr "Locale/internationalisation" -#: src/support/debug.cpp:71 +#: src/support/debug.cpp:72 msgid "Selection copy/paste mechanism" msgstr "Mécanisme de sélection copier/coller" -#: src/support/debug.cpp:72 +#: src/support/debug.cpp:73 msgid "Find and replace mechanism" msgstr "Rechercher et remplacer" -#: src/support/debug.cpp:73 +#: src/support/debug.cpp:74 msgid "Developers' general debug messages" msgstr "Messages de débogage généraux pour les développeurs" -#: src/support/debug.cpp:74 +#: src/support/debug.cpp:75 msgid "All debugging messages" msgstr "Tous les messages de débogage" -#: src/support/debug.cpp:153 +#: src/support/debug.cpp:154 #, c-format msgid "Debugging `%1$s' (%2$s)" msgstr "Débogage de '%1$s' (%2$s)" -#: src/support/lstrings.cpp:1300 -msgid "[[Replace with the code of your language]]" -msgstr "fr" - #: src/support/os_win32.cpp:482 msgid "System file not found" msgstr "Fichier système introuvable !" @@ -25217,144 +25465,90 @@ msgstr "" msgid "Unknown user" msgstr "Utilisateur inconnu" -#~ msgid "The LaTeX package mathdots is used" -#~ msgstr "Le paquetage LaTeX mathdots est utilisé" - -#~ msgid "The LaTeX package mhchem is always used" -#~ msgstr "Le paquetage LaTeX mhchem est utilisé dans tous les cas." - -#~ msgid "Default paper si&ze:" -#~ msgstr "Taille de &papier implicite :" - +#~ msgid "CopNum" +#~ msgstr "NumCopie" #~ msgid "&Output Format:" #~ msgstr "&Format de la sortie :" - -#~ msgid "Bitmap: $$AbsOrRelPathParent$$Basename" -#~ msgstr "Bitmap: $$AbsOrRelPathParent$$Basename" - -#~ msgid "Xfig: $$AbsOrRelPathParent$$Basename" -#~ msgstr "Xfig: $$AbsOrRelPathParent$$Basename" - -#~ msgid "Chess: $$AbsOrRelPathParent$$Basename" -#~ msgstr "Échiquier : $$AbsOrRelPathParent$$Basename" - -#~ msgid "PDF pages: $$AbsOrRelPathParent$$Basename" -#~ msgstr "PDF pages : $$AbsOrRelPathParent$$Basename" - -#~ msgid "Dia: $$AbsOrRelPathParent$$Basename" -#~ msgstr "Dia : $$AbsOrRelPathParent$$Basename" - -#~ msgid "HTML|H" -#~ msgstr "HTML|H" - -#~ msgid "LyX Preview (LilyPond book)" -#~ msgstr "Aperçu LyX (livre LilyPond)" - -#~ msgid "LyX Preview (pLaTeX)" -#~ msgstr "Aperçu (pLaTeX)" - -#~ msgid "HTML (MS Word)" -#~ msgstr "HTML (MS Word)" - -#~ msgid "Specify the default paper size." -#~ msgstr "Spécifier la taille de papier implicite." - #~ msgid "*" #~ msgstr "*" - #~ msgid "MM" #~ msgstr "MM" - #~ msgid "MMMMM" #~ msgstr "MMMMM" - #~ msgid "Theorem \\thetheorem" #~ msgstr "Théorème \\thetheorem" - #~ msgid "Corollary \\thecorollary" #~ msgstr "Corollaire \\thecorollary" - #~ msgid "Lemma \\thelemma" #~ msgstr "Lemme \\thelemma" - #~ msgid "Proposition \\theproposition" #~ msgstr "Proposition \\theproposition" - #~ msgid "Conjecture \\theconjecture" #~ msgstr "Conjecture \\theconjecture" - #~ msgid "Definition \\thedefinition" #~ msgstr "Définition \\thedefinition" - #~ msgid "Example \\theexample" #~ msgstr "Exemple \\theexample" - #~ msgid "Problem \\theproblem" #~ msgstr "Problème \\theproblem" - #~ msgid "Exercise \\theexercise" #~ msgstr "Exercice \\theexercise" - #~ msgid "Remark \\theremark" #~ msgstr "Remark \\theremark" - #~ msgid "Case \\thecase" #~ msgstr "Cas \\thecase" - #~ msgid "Question \\thequestion" #~ msgstr "Question \\thequestion" - #~ msgid "Note \\thenote" #~ msgstr "Note \\thenote" - #~ msgid "&New:" #~ msgstr "&Nouvelle :" - #~ msgid "Enter the command to load the language package (default: babel)" #~ msgstr "" #~ "Saisir la commande chargeant le paquetage de langue (implicitement : " #~ "babel)" - #~ msgid "Preface:" #~ msgstr "Préface :" - #~ msgid "Contributor \\Roman{svmultlsti}:" #~ msgstr "Collaborateur \\Roman{svmultlsti}:" - #~ msgid "Institute and e-mail: " #~ msgstr "Institution et e-mail : " - #~ msgid "MiniTOC" #~ msgstr "MiniTDM" - #~ msgid "TOC depth (provide a number):" #~ msgstr "Profondeur de TdM (fournir un nombre) :" - #~ msgid "List of Abbreviations & Symbols" #~ msgstr "Liste des abréviations & symboles" - +#~ msgid "Inst" +#~ msgstr "Inst" +#~ msgid "Institute #" +#~ msgstr "Num. institut" +#~ msgid "Headnote" +#~ msgstr "Note d'en-tête" +#~ msgid "Headnote (optional):" +#~ msgstr "Note d'en-tête (optionnelle) :" +#~ msgid "Corr Author:" +#~ msgstr "Auteur réf. :" +#~ msgid "Offprints" +#~ msgstr "Tirés à part" +#~ msgid "Offprints:" +#~ msgstr "Tirés à part :" #~ msgid "" #~ "Define character style for initials. Hint: try to use math and its " #~ "artistic font styles like Fractur or the Calligraphic one." #~ msgstr "" #~ "Définir le style de caractères pour les lettrines. Suggestion : essayer " #~ "d'utiliser les polices artistiques comme Fraktur ou Calligraphique" - #~ msgid "branch" #~ msgstr "branche" - #~ msgid "Step" #~ msgstr "Étape" - #~ msgid "Step \\thestep." #~ msgstr "Étape \\thestep." - #~ msgid "Appendices Section" #~ msgstr "Section d'appendices" - #~ msgid "--- Appendices ---" #~ msgstr "--- Appendices ---" - #~ msgid "" #~ "Select if LyX should output Windows-style paths rather than Posix-style " #~ "paths to LaTeX files. Useful if you're using the native Windows MikTeX " @@ -25363,334 +25557,224 @@ msgstr "Utilisateur inconnu" #~ "Sélectionner pour que LyX utilise des chemins du type Windows et non du " #~ "type Posix pour les fichiers LaTeX. Utile si vous utilisez le MikTeX " #~ "spécifique à Windows au lieu du teTeX de Cygwin." - #~ msgid "List of %1$s" #~ msgstr "Liste des %1$s" - #~ msgid "Liber" #~ msgstr "Liber" - #~ msgid "%1$s unknown" #~ msgstr "%1$s inconnu" - #~ msgid "Layout|L" #~ msgstr "Format|t" - #~ msgid "Documents|D" #~ msgstr "Documents|D" - #~ msgid "New from Template...|T" #~ msgstr "Nouveau avec modèle...|m" - #~ msgid "Revert|R" #~ msgstr "Revenir à la sauvegarde|R" - #~ msgid "Custom...|C" #~ msgstr "Personnaliser...|e" - #~ msgid "Redo|d" #~ msgstr "Refaire|R" - #~ msgid "Cut|C" #~ msgstr "Couper|o" - #~ msgid "Copy|o" #~ msgstr "Copier|C" - #~ msgid "Paste|a" #~ msgstr "Coller|l" - #~ msgid "Paste External Selection|x" #~ msgstr "Copier une sélection extérieure|s" - #~ msgid "Find & Replace...|F" #~ msgstr "Rechercher et remplacer...|e" - #~ msgid "Tabular|T" #~ msgstr "Tableau|T" - #~ msgid "Thesaurus..." #~ msgstr "Dictionnaire de Synonymes..." - #~ msgid "Statistics...|i" #~ msgstr "Statistiques...|i" - #~ msgid "Change Tracking|g" #~ msgstr "Suivi des modifications|S" - #~ msgid "Selection as Lines|L" #~ msgstr "Sélection par lignes|l" - #~ msgid "Selection as Paragraphs|P" #~ msgstr "Sélection par paragraphes|p" - #~ msgid "Line Top|T" #~ msgstr "Bord haut|h" - #~ msgid "Line Bottom|B" #~ msgstr "Bord bas|b" - #~ msgid "Line Left|L" #~ msgstr "Bord gauche|g" - #~ msgid "Line Right|R" #~ msgstr "Bord droit|d" - #~ msgid "Alignment|i" #~ msgstr "Alignement|i" - #~ msgid "Delete Row|w" #~ msgstr "Supprimer la ligne|u" - #~ msgid "Copy Row" #~ msgstr "Copier la ligne" - #~ msgid "Swap Rows" #~ msgstr "Échanger les lignes" - #~ msgid "Delete Column|D" #~ msgstr "Supprimer la colonne|p" - #~ msgid "Copy Column" #~ msgstr "Copier la colonne" - #~ msgid "Swap Columns" #~ msgstr "Échanger les colonnes" - #~ msgid "Toggle Numbering|N" #~ msgstr "(Dés)Activer numérotation|N" - #~ msgid "Toggle Numbering of Line|u" #~ msgstr "(Dés)Activer numérotation de cette ligne|m" - #~ msgid "Alignment|A" #~ msgstr "Alignement|A" - #~ msgid "Add Row|R" #~ msgstr "Ajouter une ligne|j" - #~ msgid "Add Column|C" #~ msgstr "Ajouter une colonne|o" - #~ msgid "Octave" #~ msgstr "Octave" - #~ msgid "Maxima" #~ msgstr "Maxima" - #~ msgid "Mathematica" #~ msgstr "Mathematica" - #~ msgid "Maple, simplify" #~ msgstr "Maple, simplify" - #~ msgid "Maple, factor" #~ msgstr "Maple, factor" - #~ msgid "Maple, evalm" #~ msgstr "Maple, evalm" - #~ msgid "Maple, evalf" #~ msgstr "Maple, evalf" - #~ msgid "Eqnarray Environment|q" #~ msgstr "Environnement tableau d'équations|q" - #~ msgid "Align Environment|A" #~ msgstr "Environnement align|a" - #~ msgid "AlignAt Environment" #~ msgstr "Environnement alignat" - #~ msgid "Flalign Environment|F" #~ msgstr "Environnement flalign|f" - #~ msgid "Gather Environment" #~ msgstr "Environnement gather" - #~ msgid "Multline Environment" #~ msgstr "Environnement multline" - #~ msgid "Special Character|S" #~ msgstr "Caractère spécial|s" - #~ msgid "Cross-reference...|r" #~ msgstr "Référence croisée...|R" - #~ msgid "Short Title" #~ msgstr "Titre court" - #~ msgid "Index Entry|I" #~ msgstr "Entrée d'index|i" - #~ msgid "Nomenclature Entry" #~ msgstr "Entrée de glossaire" - #~ msgid "URL...|U" #~ msgstr "URL...|U" - #~ msgid "Lists & TOC|O" #~ msgstr "Listes & TdM|L" - #~ msgid "TeX Code|T" #~ msgstr "Code TeX|T" - #~ msgid "Minipage|p" #~ msgstr "Minipage|p" - #~ msgid "Tabular Material...|b" #~ msgstr "Tableau...|b" - #~ msgid "Floats|a" #~ msgstr "Flottants|o" - #~ msgid "Include File...|d" #~ msgstr "Fichier Sous-document...|S" - #~ msgid "Insert File|e" #~ msgstr "Insérer fichier|I" - #~ msgid "External Material...|x" #~ msgstr "Objet externe...|e" - #~ msgid "Hyphenation Point|P" #~ msgstr "Point de césure|c" - #~ msgid "Protected Space|r" #~ msgstr "Espace insécable|E" - #~ msgid "Vertical Space..." #~ msgstr "Espacement vertical..." - #~ msgid "Line Break|L" #~ msgstr "Passage à la ligne|l" - #~ msgid "Protected Dash|D" #~ msgstr "Tiret protégé|E" - #~ msgid "Single Quote|Q" #~ msgstr "Guillemet simple|u" - #~ msgid "Ordinary Quote|O" #~ msgstr "Guillemet droit|G" - #~ msgid "Horizontal Line" #~ msgstr "Ligne horizontale" - #~ msgid "Font Change|o" #~ msgstr "Changement de police|o" - #~ msgid "Math Normal Font" #~ msgstr "Math police normale" - #~ msgid "Math Calligraphic Family" #~ msgstr "Math famille calligraphique" - #~ msgid "Math Fraktur Family" #~ msgstr "Math famille Fraktur" - #~ msgid "Math Roman Family" #~ msgstr "Math famille romaine" - #~ msgid "Math Sans Serif Family" #~ msgstr "Math famille sans empattement" - #~ msgid "Math Bold Series" #~ msgstr "Math série grasse" - #~ msgid "Text Normal Font" #~ msgstr "Texte police normale" - #~ msgid "Floatflt Figure" #~ msgstr "Figure floatflt" - #~ msgid "Accept All Changes|A" #~ msgstr "Accepter toutes les modifications|A" - #~ msgid "Reject All Changes|R" #~ msgstr "Rejeter toutes les modifications|R" - #~ msgid "Character...|C" #~ msgstr "Caractère...|C" - #~ msgid "Paragraph...|P" #~ msgstr "Paragraphe...|P" - #~ msgid "Document...|D" #~ msgstr "Document...|D" - #~ msgid "Tabular...|T" #~ msgstr "Tableau...|T" - #~ msgid "Emphasize Style|E" #~ msgstr "En évidence|E" - #~ msgid "Noun Style|N" #~ msgstr "Nom propre|N" - #~ msgid "Bold Style|B" #~ msgstr "Gras|G" - #~ msgid "Decrease Environment Depth|v" #~ msgstr "Réduire la profondeur d'environnement|f" - #~ msgid "Increase Environment Depth|i" #~ msgstr "Augmenter la profondeur d'environnement|g" - #~ msgid "Start Appendix Here|S" #~ msgstr "Début appendice ici|a" - #~ msgid "Update|U" #~ msgstr "Mettre à jour|j" - #~ msgid "TeX Information|X" #~ msgstr "Informations TeX|X" - #~ msgid "Go to Bookmark 1|1" #~ msgstr "Aller au signet 1|1" - #~ msgid "Go to Bookmark 2|2" #~ msgstr "Aller au signet 2|2" - #~ msgid "Go to Bookmark 3|3" #~ msgstr "Aller au signet 3|3" - #~ msgid "Go to Bookmark 4|4" #~ msgstr "Aller au signet 4|4" - #~ msgid "Go to Bookmark 5|5" #~ msgstr "Aller au signet 5|5" - #~ msgid "Extended Features|E" #~ msgstr "Options avancées|O" - #~ msgid "Embedded Objects|m" #~ msgstr "Objets insérés|b" - #~ msgid "Preferences..." #~ msgstr "Préférences..." - #~ msgid "Quit LyX" #~ msgstr "Quitter LyX" - #~ msgid "%1$d words checked." #~ msgstr "%1$d mots vérifiés." - #~ msgid "One word checked." #~ msgstr "Un mot vérifié." - #~ msgid "Spelling check completed" #~ msgstr "Correction orthographique terminée" - #~ msgid "Basi&c" #~ msgstr "&Basique" - #~ msgid "&Command:" #~ msgstr "&Commande :" - #~ msgid "Search text is empty!" #~ msgstr "La chaîne de caractères à rechercher est vide !" - #~ msgid "" #~ "Use to define an external program to render tables in plain text output. " #~ "E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If " @@ -25699,73 +25783,50 @@ msgstr "Utilisateur inconnu" #~ "Désigner un programme externe pour sortir les tableaux au format texte " #~ "brut. Par ex. « groff -t -Tlatin1 $$FName » où $$FName est le fichier " #~ "d'entrée. Si vous ne mettez rien, LyX utilise une fonction interne." - #~ msgid "Custom value. Needs spacing type "Custom"." #~ msgstr "Valeur réglable. Nécessite un espacement de type « réglable »." - #~ msgid "Affilation:" #~ msgstr "Affiliation :" - #~ msgid "varGamma" #~ msgstr "varGamma" - #~ msgid "varDelta" #~ msgstr "varDelta" - #~ msgid "varTheta" #~ msgstr "varTheta" - #~ msgid "varLambda" #~ msgstr "varLambda" - #~ msgid "varXi" #~ msgstr "varXi" - #~ msgid "varPi" #~ msgstr "varPi" - #~ msgid "varSigma" #~ msgstr "varSigma" - #~ msgid "varUpsilon" #~ msgstr "varUpsilon" - #~ msgid "varPhi" #~ msgstr "varPhi" - #~ msgid "varPsi" #~ msgstr "varPsi" - #~ msgid "varOmega" #~ msgstr "varOmega" - #~ msgid "Group labels by prefix (e.g. "sec:")" #~ msgstr "Classer les étiquettes par préfixe (e.g. « sec: »)" - #~ msgid "DockWidget" #~ msgstr "DockWidget" - #~ msgid "X; " #~ msgstr "X; " - #~ msgid "value of the optional vertical offset" #~ msgstr "valeur du décalage vertical optionnel" - #~ msgid "comment" #~ msgstr "commentaire" - #~ msgid "greyedout" #~ msgstr "grisé" - #~ msgid "Open Target...|O" #~ msgstr "Ouvrir la cible...|O" - #~ msgid "&Use Defaults" #~ msgstr "&Utiliser les réglages implicites" - #~ msgid "Note[[InsetNote]]" #~ msgstr "Note" - #~ msgid "" #~ "{%author%[[%author%, ]][[{%editor%[[%editor%, ed., ]]}]]}\"%title%" #~ "\"{%journal%[[, {!!}%journal%{!!}]][[{%publisher%[[, %publisher%]]" @@ -25776,216 +25837,146 @@ msgstr "Utilisateur inconnu" #~ "\"{%journal%[[, {!!}%journal%{!!}]][[{%publisher%[[, %publisher%]]" #~ "[[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages" #~ "%[[, %pages%]]}." - #~ msgid "Use the XeTeX processing engine" #~ msgstr "Utiliser le moteur de traitement XeTeX" - #~ msgid "Use &XeTeX" #~ msgstr "Utiliser &XeTeX" - #~ msgid "Use the babel package for multilingual support" #~ msgstr "Utiliser la paquetage babel pour le support multilingue" - #~ msgid "&Use babel" #~ msgstr "Utiliser &babel" - #~ msgid "&Global" #~ msgstr "&Global" - #~ msgid "Flex:Institute" #~ msgstr "Flex : institution" - #~ msgid "Flex:E-Mail" #~ msgstr "Fles : e-mail" - #~ msgid "scheme" #~ msgstr "schéma" - #~ msgid "chart" #~ msgstr "diagramme" - #~ msgid "graph" #~ msgstr "graphique" - #~ msgid "Flex:Alert" #~ msgstr "Flex : alerte" - #~ msgid "Flex:Structure" #~ msgstr "Flex : structure" - #~ msgid "Flex:ArticleMode" #~ msgstr "Flex : modeArticle" - #~ msgid "Flex:PresentationMode" #~ msgstr "Flex : modePrésentation" - #~ msgid "Flex:Firstname" #~ msgstr "Flex : prénom" - #~ msgid "Flex:Fname" #~ msgstr "Flex : prénom" - #~ msgid "Flex:Surname" #~ msgstr "Flex : nom" - #~ msgid "Flex:Filename" #~ msgstr "Flex : nom de fichier" - #~ msgid "Flex:Literal" #~ msgstr "Flex : Littéral" - #~ msgid "Flex:Emph" #~ msgstr "Flex : en évidence" - #~ msgid "Flex:Abbrev" #~ msgstr "Flex : abrévié" - #~ msgid "Flex:Citation-number" #~ msgstr "Flex : numéro de citation" - #~ msgid "Flex:Volume" #~ msgstr "Flex : volume" - #~ msgid "Flex:Day" #~ msgstr "Flex : jour" - #~ msgid "Flex:Month" #~ msgstr "Flex : mois" - #~ msgid "Flex:Year" #~ msgstr "Flex : année" - #~ msgid "Flex:Issue-number" #~ msgstr "Flex : numéro d'émission" - #~ msgid "Flex:Issue-day" #~ msgstr "Flex : date de publication" - #~ msgid "Flex:Issue-months" #~ msgstr "Flex : mois de publication" - #~ msgid "Flex:ISSN" #~ msgstr "Flex : ISSN" - #~ msgid "Flex:CODEN" #~ msgstr "Flex : CODEN" - #~ msgid "Flex:SS-Code" #~ msgstr "Flex : code SS" - #~ msgid "Flex:SS-Title" #~ msgstr "Flex : titre SS" - #~ msgid "Flex:CCC-Code" #~ msgstr "Flex : code CCC" - #~ msgid "Flex:Code" #~ msgstr "Flex : code" - #~ msgid "Flex:Dscr" #~ msgstr "Flex : Dscr" - #~ msgid "Flex:Keyword" #~ msgstr "Flex : mot-clé" - #~ msgid "Flex:Orgdiv" #~ msgstr "Flex : division organisation" - #~ msgid "Flex:Orgname" #~ msgstr "Flex : nom organisation" - #~ msgid "Flex:Street" #~ msgstr "Flex : rue" - #~ msgid "Flex:City" #~ msgstr "Flex : ville" - #~ msgid "Flex:State" #~ msgstr "Flex : état" - #~ msgid "Flex:Postcode" #~ msgstr "Flex : code postal" - #~ msgid "Flex:Country" #~ msgstr "Flex : pays" - #~ msgid "Flex:Directory" #~ msgstr "Flex : répertoire" - #~ msgid "Flex:Email" #~ msgstr "Flex : e-mail" - #~ msgid "Flex:KeyCombo" #~ msgstr "Flex : combinaison de touches" - #~ msgid "Flex:KeyCap" #~ msgstr "Flex : touche majuscules" - #~ msgid "Flex:GuiMenu" #~ msgstr "Flex : menu d'interface" - #~ msgid "Flex:GuiMenuItem" #~ msgstr "Flex : élément du menu d'interface" - #~ msgid "Flex:GuiButton" #~ msgstr "Flex : bouton d'interface" - #~ msgid "Flex:MenuChoice" #~ msgstr "Flex : choix de menu" - #~ msgid "Flex" #~ msgstr "Flex" - #~ msgid "Foot" #~ msgstr "NoteDeBasDePage" - #~ msgid "Note:Comment" #~ msgstr "Note : commentaire" - #~ msgid "Note:Note" #~ msgstr "Note : note" - #~ msgid "Note:Greyedout" #~ msgstr "Note : grisée" - #~ msgid "Box:Shaded" #~ msgstr "Boîte : ombrée" - #~ msgid "Wrap" #~ msgstr "Enrober" - #~ msgid "Argument" #~ msgstr "Argument" - #~ msgid "Info:menu" #~ msgstr "Info : menu" - #~ msgid "Info:shortcut" #~ msgstr "Info : raccourci" - #~ msgid "Info:shortcuts" #~ msgstr "Info : raccourcis" - #~ msgid "Flex:Endnote" #~ msgstr "Flex : notes en fin de document" - #~ msgid "Flex:Initial" #~ msgstr "Flex : initial" - #~ msgid "Flex:Glosse" #~ msgstr "Flex : glose" - #~ msgid "Flex:Tri-Glosse" #~ msgstr "Flex : tri-glose" - #~ msgid "Flex:Expression" #~ msgstr "Flex : expression" - #~ msgid "Flex:Concepts" #~ msgstr "Flex : concepts" - #~ msgid "Flex:Meaning" #~ msgstr "Flex : signification" - #~ msgid "Flex:Noun" #~ msgstr "Flex : nom prop" + From a45a5b4f6dc3b2d5228c426b98e0686a83238d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 3 Nov 2012 23:56:58 +0100 Subject: [PATCH 30/93] French doc files: port from branch ported changes from [313163e1/lyxgit] --- lib/doc/fr/Additional.lyx | 1499 +++++++------------------------ lib/doc/fr/Customization.lyx | 32 +- lib/doc/fr/EmbeddedObjects.lyx | 93 +- lib/doc/fr/Intro.lyx | 2 +- lib/doc/fr/Math.lyx | 107 +-- lib/doc/fr/Shortcuts.lyx | 31 +- lib/doc/fr/Tutorial.lyx | 71 +- lib/doc/fr/UserGuide.lyx | 325 +++---- lib/examples/fr/Braille.lyx | 2 +- lib/examples/fr/linguistics.lyx | 24 +- lib/examples/fr/splash.lyx | 2 +- lib/examples/fr/xypic.lyx | 8 +- 12 files changed, 681 insertions(+), 1515 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 03078e8bca..d62856b5c6 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -46,7 +46,6 @@ logicalmkup theorems-ams theorems-ams-extended -multicol \end_modules \maintain_unincluded_children false \begin_local_layout @@ -112,7 +111,6 @@ End \paperorientation portrait \suppress_date false \use_refstyle 1 -\notefontcolor #0000ff \index Index \shortcut idx \color #008000 @@ -142,14 +140,16 @@ Options avancées de LyX \begin_layout Subtitle Version 2.0.x \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout Informations de révision : \end_layout \begin_layout Plain Layout -Traduction : Mise à jour pour 2.0 par JPChrétien, Date : 30/07/12011 +Traduction : Mise à jour pour 2.0 par JPChrétien, Date : 30/07/12011, relecture + partielle pour 2.0.5, 31/10/2012, remplacement de Éditer/Visionner/Insérer/Navigu +er par Édition/Affichage/Insertion/Navigation \end_layout \begin_layout Plain Layout @@ -429,7 +429,7 @@ LaTeX \family default , (ou bien \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Afficher le code LaTeX \family default ) puis regardez le préambule du fichier @@ -451,7 +451,7 @@ Il y a plusieurs commandes qui invoquent LaTeX automatiquement. \begin_layout Itemize \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator \emph on Format @@ -460,7 +460,7 @@ Format \begin_layout Itemize \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mise \begin_inset space ~ \end_inset @@ -537,7 +537,7 @@ S'il y a des erreurs, il affiche le journal d'erreurs. \begin_layout Standard Si vous avez lancé LaTeX avec \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator DVI \family default , LyX exécute alors @@ -547,7 +547,7 @@ xdvi sur le fichier DVI. Si vous avez utilisé \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator PostScript \family default ou @@ -648,7 +648,7 @@ code TeX \family default , que vous pouvez mettre dans votre document avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code \begin_inset space ~ \end_inset @@ -864,7 +864,7 @@ code TeX complexe. Vous pouvez alors utiliser \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -2461,9 +2461,9 @@ end{document} LyX permet l'inclusion de fichiers en sélectionnant \family sans \bar under -I +Insertion \bar default -nsérer\SpecialChar \menuseparator +\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -2909,11 +2909,11 @@ book (KOMA script) \end_inset (livre), donc il est un peu plus fourni, mais pour réellement en mettre - plein la vue, il faut choisir la mise en page + plein la vue, il faut choisir le style d'en-têtes \begin_inset Quotes fld \end_inset -fancy +sophistiqué \begin_inset Quotes frd \end_inset @@ -3538,7 +3538,7 @@ pifont.sty \begin_layout Standard LyX ne vous empêche pas d'utiliser les puces correspondant à des paquetages que vous n'avez pas. - Si vous obtenez des erreurs LaTeX lorsque vous essayez de Visionner ou + Si vous obtenez des erreurs LaTeX lorsque vous essayez de visionner ou d'imprimer le fichier, c'est sûrement qu'il vous manque un paquetage. LyX ne vous empêche pas d'agir car vous pourriez vouloir éditer quelque part et imprimer avec un autre système. @@ -4731,7 +4731,7 @@ pipe . La racine de ces deux noms peut être définie dans la fenêtre \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Préférences\SpecialChar \menuseparator Entrées\SpecialChar \menuseparator Répertoires @@ -5227,6 +5227,8 @@ name "sub:rev-search" \end_inset + +\lang french Activation automatique \end_layout @@ -5277,14 +5279,7 @@ Synchroniser avec la sortie imprimable \end_inset . -\end_layout - -\begin_layout Standard - -\lang english -Note that the method -\lang french - + Notez que la méthode \begin_inset Flex Code status collapsed @@ -5296,10 +5291,14 @@ synctex=1 \end_inset - + active la compression +\family sans +gzip +\family default +. + Si votre visionneuse ne la supporte pas, vous devez utiliser à la place \lang english - enables gzip compression. - If your viewer does not support it, you should instead use + \begin_inset Flex Code status collapsed @@ -5315,7 +5314,7 @@ synctex=-1 \end_layout \begin_layout Standard -Notez bien que la l'inclusion des paquetages +Notez également que la l'inclusion des paquetages \begin_inset Flex Code status collapsed @@ -5457,7 +5456,7 @@ status collapsed \end_inset -eX (plain)->DVI +eX (standard)->DVI \end_layout \end_inset @@ -5480,7 +5479,7 @@ status collapsed \end_inset -eX (plain)->DraftDVI +eX (standard)->DraftDVI \end_layout \end_inset @@ -5721,7 +5720,7 @@ status collapsed \end_inset -eX (plain) -> DVI +eX (standard) -> DVI \end_layout \end_inset @@ -5744,7 +5743,7 @@ status collapsed \end_inset -eX (plain) -> DraftDVI +eX (standard) -> DraftDVI \end_layout \end_inset @@ -6746,7 +6745,7 @@ l'opposé status collapsed \begin_layout Plain Layout -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Recherche directe \end_layout @@ -7106,19 +7105,17 @@ altaffiltext de modèle. Pour des commandes comme celles-là, le code LaTeX doit être entré directement et signalé comme tel. - De telles commandes sont du Vilain Texte Rouge, ou ERT -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -NdT : Evil Red Text -\end_layout + De telles commandes sont dénommées +\begin_inset Quotes fld +\end_inset +code TeX +\begin_inset Quotes frd \end_inset . - J'essaye de minimiser la quantité de Vilain Texte Rouge nécessaire dans - un document AASTeX, mais il y en a toujours trop. + J'essaye de minimiser la quantité de code TeX nécessaire dans un document + AASTeX, mais il y en a toujours trop. \end_layout \begin_layout Subsection @@ -7801,7 +7798,7 @@ deluxetable , je vous suggère de l'éditer avec un éditeur de texte dans un fichier séparé, puis de faire \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -7923,7 +7920,7 @@ LyX, par défaut, tente de centrer la légende/titre du tableau. Vous devez donc cliquer quelque part dans la légende/titre, puis faire \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -7995,7 +7992,7 @@ citep \begin_layout Enumerate entrez toutes vos citations en utilisant le mécanisme prédéfini \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Citation \family default ; au moins vous pourrez tirer avantage des insertions automatiques. @@ -8431,7 +8428,7 @@ Si vous voulez placer des notes de bas de page dans le bloc d'en-tête, par exemple pour entrer votre adresse actuelle, utilisez les notes de bas de page standard avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -8758,7 +8755,7 @@ Il y a une seule chose spéciale : les figures avec la légende à côté. \begin_layout Enumerate Créez une grande figure flottante : faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottants\SpecialChar \menuseparator Figure \family default @@ -8793,7 +8790,7 @@ Insérez votre figure. Positionnez le curseur derrière la figure et insérez un ressort horizontal : \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Ressort \begin_inset space ~ @@ -9288,7 +9285,7 @@ Traducteur \end_layout \begin_layout Standard -Les environnments suivants sont fournis aussi bien par le module +Les environnements suivants sont fournis aussi bien par le module \begin_inset Flex Code status collapsed @@ -9466,7 +9463,7 @@ Utilisé parfois à la fin d'une argumentation \end_layout \begin_layout Fact -Utilsable comme Propositon, à une échelle peut-être réduite +Utilisable comme Proposition, à une échelle peut-être réduite \end_layout \begin_layout Standard @@ -10105,7 +10102,7 @@ ou \emph default \emph on -excutive +executive \emph default \emph toggle @@ -10189,7 +10186,7 @@ centré au bas de la page. \family sans \series bold -empty +vide \family default \series default Les diapos ne présenteront ni numéro de page, ni en-tête ou pied de page @@ -10201,7 +10198,7 @@ empty \family sans \series bold -plain +ordinaire \family default \series default Les diapos auront un numéro de page centré en bas de la page. @@ -10223,7 +10220,7 @@ foilheadings \labelwidthstring MMMMMMM \series bold -fancy +sophistiqué \series default Vous donne accès au paquetage \family sans @@ -10695,7 +10692,7 @@ end{multicols} \end_layout \begin_layout Standard -Les versions sans étoiles sont numérotées, tandis que celles avec étoiles +Les versions sans étoile sont numérotées, tandis que celles avec étoile ne le sont pas. Il y a enfin des environnements de liste ajoutés par LyX : \end_layout @@ -11560,14 +11557,15 @@ LogoOn \end_layout \begin_layout Standard -Si vous voulez utiliser la mise en page +Si vous voulez utiliser le style d'en-têtes \family sans -fancy +sophistiqué \family default dans la fenêtre \family sans Document\SpecialChar \menuseparator -Paramètres +Paramètres\SpecialChar \menuseparator +Format de la page \family default , il vous faudra sûrement ajouter \family typewriter @@ -11876,7 +11874,7 @@ Paramètres \begin_layout Description \family sans -plain +ordinaire \family default Le rendu final contient des numéros de page dans le coin inférieur droit. \end_layout @@ -11884,20 +11882,17 @@ plain \begin_layout Description \family sans -headings +en-têtes \family default - Comme -\family sans -plain -\family default -, mais imprime aussi tous les marqueurs temporels que vous aurez placés. - C'est le choix par défaut. + Comme ordinaire, mais imprime aussi tous les marqueurs temporels que vous + aurez placés. + C'est le choix implicite. \end_layout \begin_layout Description \family sans -empty +vide \family default Le rendu final ne contient pas de numéros de page, de marqueurs temporels ni de marqueurs d'alignement. @@ -12085,7 +12080,7 @@ ListePuces \begin_layout Itemize \family sans -Énumeration +Énumération \end_layout \begin_layout Itemize @@ -12534,7 +12529,7 @@ NewSlide: Les diapos sont sûrement les seules fois dans LyX où vous aurez à forcer la fin des pages (vous pouvez toujours le faire dans \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -14130,7 +14125,7 @@ ijmpd \emph on I \lang english -ntenational Journal of Modern Physics D +nternational Journal of Modern Physics D \emph default \lang french . @@ -14228,7 +14223,7 @@ LyX ne vous laissera pas changer la taille de police ni la mise en page \begin_layout Enumerate La langue du document ne doit pas être modifiée. - Avant de Visionner votre papier, assurez-vous que vous n'utilisez pas le + Avant de visionner votre papier, assurez-vous que vous n'utilisez pas le paquetage \family typewriter babel @@ -14433,7 +14428,7 @@ natbib . Dans LyX, les citations s'affichent comme d'habitude ; dans la sortie, les citations apparaissent comme des exposants. - Si vous voules utiliser une citation en texte normal, vous devez utiliser + Si vous voulez utiliser une citation en texte normal, vous devez utiliser la commande \family typewriter refcite @@ -14472,7 +14467,7 @@ Il n'y a pas de section \begin_inset Quotes fld \end_inset -Remerciments +Remerciements \begin_inset Quotes frd \end_inset @@ -14520,7 +14515,7 @@ Appendices Section \end_inset qui indique le début des appendices. - Cet environnement doit être laissé vide ; il sert juste à emettre une commande + Cet environnement doit être laissé vide ; il sert juste à émettre une commande LaTeX, mais rien n'est imprimé. Dans LyX, le mot \begin_inset Quotes fld @@ -14531,7 +14526,7 @@ Appendices \end_inset apparaît en lettres bleues, comme indications que toutes les sections qui - suvent ce point sont des appendices. + suivent ce point sont des appendices. Pour écrire un appendice, utilisez l'environnement \begin_inset Quotes fld \end_inset @@ -14555,7 +14550,7 @@ Section d'appendices \emph on doit \emph default - être présente avant le premier appendice ; si ce n'est pasle cas, tous + être présente avant le premier appendice ; si ce n'est pas le cas, tous les appendices seront numérotés comme des sections normales, dans la sortie. Un appendice peut contenir des \family sans @@ -14588,7 +14583,7 @@ tbl pour les légendes des tableaux. La conséquence en est qu'un tableau créé avec LyX est affiché correctement, mais sans sa légende. - Cependant, vous pouvez utiliser un peu d'ERT our contourner ce problème, + Cependant, vous pouvez utiliser un peu de code TeX pour contourner ce problème, de façon à ce que les légendes s'impriment comme prévu. Pour le faire, créez un flottant de tableau comme d'habitude, effacez la légende, et remplacez la par le code LaTeX @@ -14602,16 +14597,16 @@ tbl{votre légende de tableau}{ } \family default immédiatement après votre tableau. - Étudiez l'exemple de tableau qui est inclu dans le fichier modèle pour + Étudiez l'exemple de tableau qui est inclus dans le fichier modèle pour voir comme cette astuce est utilisée. - Une autre soution, si vous avez besoin de légendes de tableaux, est de + Une autre solution, si vous avez besoin de légendes de tableaux, est de construire tout le tableau dans un fichier \family typewriter .tex \family default , puis inclure celui-ci dans le document LyX (par \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -14653,14 +14648,14 @@ En fait, vous avez le choix entre LaTeX \begin_inset space ~ \end_inset -(plain) et LaTeX +(standard) et LaTeX \begin_inset space ~ \end_inset (pdflatex). Si vous prévoyez d'utiliser pdflatex pour préparer votre papier, vous devez utiliser l'option pdflatex pour que les graphiques soient convertis au - format PDF, prêts à être utiliséspar pdflatex. + format PDF, prêts à être utilisés par pdflatex. \end_layout \end_inset @@ -14725,9 +14720,9 @@ ijmpd.lyx \family default , le code TeX nécessaire est déjà là, et vous n'avez normalement pas besoin de l'effacer. - Vous pouvez seulement changer le premier ERT pour spécifier ce qui s'imprime - en haut des pages paires et impaires (respectivement le titre abrégé et - le nom des auteurs). + Vous pouvez seulement changer le premier code TeX pour spécifier ce qui + s'imprime en haut des pages paires et impaires (respectivement le titre + abrégé et le nom des auteurs). Ce code TeX doit être de la forme \family typewriter @@ -14813,7 +14808,7 @@ Modèle \end_layout \begin_layout Itemize -Pour pouvoir compiler votre document en PDF, PS ou DVI, vérifiez ques les +Pour pouvoir compiler votre document en PDF, PS ou DVI, vérifiez que les deux options \family sans Utilise @@ -14885,7 +14880,7 @@ Topical \begin_layout Itemize \family sans -Comment +Commentaire \family default pour un commentaire (Comment) \end_layout @@ -14909,7 +14904,7 @@ Paper \begin_layout Itemize \family sans -Prelim +CommPrelim \family default pour une communication préliminaire \end_layout @@ -14917,7 +14912,7 @@ Prelim \begin_layout Itemize \family sans -Rapid +CommRapid \family default pour une communication rapide \end_layout @@ -14945,8 +14940,8 @@ Il y a un environnement de titre général Article \family default qui n'est pas géré par LyX. - Il peut être utilisé en ERT si votre document ne correspond pas à l'un - des autres types de titres. + Il peut être utilisé en code TeX si votre document ne correspond pas à + l'un des autres types de titres. \end_layout \begin_layout Standard @@ -15331,7 +15326,7 @@ particularités \end_layout \begin_layout Enumerate -n'effacez pas le Texte Rouge qui se trouve dans le modèle, et +n'effacez pas le code TeX qui se trouve dans le modèle, et \end_layout \begin_layout Enumerate @@ -15416,7 +15411,7 @@ letter.cls \end_layout \begin_layout Itemize -La taille de caractère standard est de 11 +la taille de caractère standard est de 11 \begin_inset space ~ \end_inset @@ -15438,13 +15433,11 @@ book (koma-script) pt dans \emph on -letter (koma-script) -\emph default -. +letter (koma-script); \end_layout \begin_layout Itemize -Les en-têtes, les marqueurs de l'environnement +les en-têtes, les marqueurs de l'environnement \family sans Description \family default @@ -15535,12 +15528,11 @@ scrguien \end_inset -. - +.; \end_layout \begin_layout Itemize -La principale méthode utilisée dans les classes de cocuments pour modifier +la principale méthode utilisée dans les classes de cocuments pour modifier le type \begin_inset Note Note status collapsed @@ -15598,13 +15590,11 @@ Paramètres. \family typewriter scrguide \family default - de la documentation Koma-script -\family sans -. + de la documentation Koma-script; \end_layout \begin_layout Itemize -Les classes de document LaTeX de la famille Koma-Script définissent un certain +les classes de document LaTeX de la famille Koma-Script définissent un certain nombre de commandes supplémentaires. Celles d'entre elles qui ont une signification dans LyX sont implémentées par des types de paragraphes y correspondant. @@ -15872,7 +15862,7 @@ Maxime d'un chapitre. Si vous utilisez le paramètre optionnel ( \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Titre \begin_inset space ~ \end_inset @@ -16483,9 +16473,9 @@ Ouverture \end_layout \begin_layout Standard -Une implémentation de ces types dans une logique WYSIWYG n'aurait pas de - sens, car l'aspect réel de la lettre produite ne dépendra pas seulement - de l'utilisation d'un type donné, mais aussi d'autres facteurs. +Une implantation de ces types dans une logique WYSIWYG n'aurait pas de sens, + car l'aspect réel de la lettre produite ne dépendra pas seulement de l'utilisat +ion d'un type donné, mais aussi d'autres facteurs. Par exemple, dans le comportement par défaut, une signature entrée avec le type \family sans @@ -16918,7 +16908,7 @@ Logo \family default (par \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default ) dans l'en-tête. @@ -17013,7 +17003,7 @@ Avec LyX, la visualisation d'un document de classe Koma-Script peut poser \end_layout \begin_layout Itemize -Le numéro de chapitre pour un type +le numéro de chapitre pour un type \family sans Chapitre \family default @@ -17024,12 +17014,11 @@ Chapitre \family sans Counter_Chapter \family default - dans le fichier de format. - + dans le fichier de format; \end_layout \begin_layout Itemize -Les en-têtes des types +les en-têtes des types \family sans AjoutChap \family default @@ -17050,11 +17039,11 @@ vraie Document\SpecialChar \menuseparator Plan \family default -). +); \end_layout \begin_layout Itemize -Les paragraphes avec la classe de document +les paragraphes avec la classe de document \emph on letter \emph default @@ -17301,7 +17290,7 @@ lyx-devel@lists.lyx.org , beaucoup ne le seront probablement jamais, à cause des limitations de la structure de LyX. Bien sûr, vous pouvez quand même utiliser toutes les fonctions avec l'aide - de quelques commandes LaTeX ( en ERT + de quelques commandes LaTeX (en code TeX \begin_inset Foot status collapsed @@ -17325,8 +17314,8 @@ reference "sec:Insérer-du-code-LaTeX" ). Dans cette section, nous ne listerons que les fonctions qui sont gérées par LyX de façon native. - Pour une description détaillée (et pour le reste des fonctions) nous recommendo -ns de jetter un œil au manuel détaillé de la classe + Pour une description détaillée (et pour le reste des fonctions) nous recommando +ns de jeter un œil au manuel détaillé de la classe \family sans Memoir \family default @@ -17407,7 +17396,7 @@ page \begin_inset Quotes fld \end_inset -fancy +sophistiqué \begin_inset Quotes frd \end_inset @@ -17469,7 +17458,7 @@ Sectionnement long). Dans LyX, vous pouvez le faire avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Titre \begin_inset space ~ \end_inset @@ -17743,8 +17732,8 @@ Memoir \family sans vers \family default -, mais vous aurez besoin d'utiliser des ERT, puisqu'ils doivent être emboîtés - à l'intérieur d'environnements +, mais vous aurez besoin d'utiliser du code TeX, puisqu'ils doivent être + emboîtés à l'intérieur d'environnements \family sans vers \family default @@ -17880,7 +17869,7 @@ texhash \family default dans le cas de teTeX, en tant que super-utilisateur si nécessaire – LyX ne s'occupe-t-il pas tout seul de ça ?), reconfigurez LyX et ça devrait - marcher. + fonctionner. \end_layout \begin_layout Subsection @@ -18257,8 +18246,7 @@ jgrga \family sans Options \family default - de la classe de document. - (C'est effectivement un bogue.) + de la classe de document (c'est effectivement un bogue.) \end_layout \begin_layout Enumerate @@ -18920,45 +18908,45 @@ NdT : Certaines de ces règles me sont totalement inconnues. \end_layout \begin_layout Itemize -De mauvais points de suspension : +de mauvais points de suspension : \begin_inset Newline newline \end_inset Utiliser \SpecialChar \ldots{} - et non pas ... + et non pas ...; \end_layout \begin_layout Itemize -Des espaces à l'intérieur des parenthèses : +des espaces à l'intérieur des parenthèses : \begin_inset Newline newline \end_inset -( mauvais espacement ) +( mauvais espacement ); \end_layout \begin_layout Itemize -L'utisation d'espaces normaux dans des abréviations courantes : +l'utilisation d'espaces normaux dans des abréviations courantes : \begin_inset Newline newline \end_inset Par exemple il y a ici trop d'espaces dans l'abréviation C. N. R. - S. + S.; \end_layout \begin_layout Itemize -L'utilisation d'un mauvais espacement à la fin d'une phrase dont la dernière +l'utilisation d'un mauvais espacement à la fin d'une phrase dont la dernière lettre est une majuscule : \begin_inset Newline newline \end_inset Voici un TEST. - Et l'espacement n'est pas bon. + Et l'espacement n'est pas bon; \end_layout \begin_layout Itemize -L'insertion d'une espace avant une étiquette ou un autre objet de ce type +l'insertion d'une espace avant une étiquette ou un autre objet de ce type : \begin_inset Newline newline \end_inset @@ -18984,11 +18972,11 @@ Cette note peut apparaître sur une mauvaise page, car son appel (le petit \end_inset . - L'étiquette est ici trop séparée. + L'étiquette est ici trop séparée; \end_layout \begin_layout Itemize -L'utilisation d'espaces simples au lieu d'espaces insécables devant des +l'utilisation d'espaces simples au lieu d'espaces insécables devant des références : \begin_inset Newline newline \end_inset @@ -19010,11 +18998,11 @@ reference "sec:chktex" \end_inset -. +; \end_layout \begin_layout Itemize -L'utilisation d'un +l'utilisation d'un \begin_inset Quotes fld \end_inset @@ -19042,7 +19030,7 @@ x \begin_inset Formula $2\times2$ \end_inset -. + \end_layout \begin_layout Standard @@ -19094,7 +19082,7 @@ ChkTeX Ces avertissements seront placés au plus près de l'erreur, et vous pourrez facilement les trouver avec \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Erreur \family default , ou par le raccourci clavier @@ -19215,12 +19203,12 @@ ChkTeX \family default dans \family sans -Éditer\SpecialChar \menuseparator +Outils\SpecialChar \menuseparator Préférences\SpecialChar \menuseparator Sorties\SpecialChar \menuseparator - +LaTeX \family default -LaTeX, ou alors dans le fichier de configuration de l'installation de +, ou alors dans le fichier de configuration de l'installation de \family sans ChkTeX \family default @@ -23577,7 +23565,7 @@ Arrivé ici, vous avez déjà un nouveau fichier avec sa propre classe de docume Bien ; et maintenant, comment je l'imprime ? La réponse est simple : vous faites \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator DVI \family default , etc. @@ -23593,7 +23581,7 @@ Pour vous aider à vous y retrouver, je vais vous expliquer ce qui se passe \begin_layout Enumerate Quand vous choisissez \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mise \begin_inset space ~ \end_inset @@ -23650,12 +23638,13 @@ status collapsed \begin_layout Plain Layout Les convertisseurs sont définis dans la fenêtre \family sans -Éditer\SpecialChar \menuseparator -Préférences +Outils\SpecialChar \menuseparator +Préférences\SpecialChar \menuseparator +Gestion de fichiers \family default , dans l'onglet \family sans -Conversion +Convertisseurs \family default . \end_layout @@ -23966,11 +23955,11 @@ Configurer LyX Vous pouvez configurer ce qui concerne la Programmation Littéraire dans l'onglet \family sans -Conversion +Convertisseurs \family default de la fenêtre \family sans -Éditer\SpecialChar \menuseparator +Outils\SpecialChar \menuseparator Préférences \family default . @@ -24196,17 +24185,14 @@ ddd \family default dans la fenêtre \family sans -Éditer\SpecialChar \menuseparator +Outils\SpecialChar \menuseparator Préférences\SpecialChar \menuseparator -Helpers +Gestion des fichiers\SpecialChar \menuseparator +Formats de fichier \family default en changeant l'entrée \family sans -Edit -\begin_inset space ~ -\end_inset - -Sources +Éditeur \family default . \end_layout @@ -24218,11 +24204,7 @@ ddd \family default en réglant \family sans -Edit -\begin_inset space ~ -\end_inset - -Sources +Éditeur \family default sur : \end_layout @@ -24342,7 +24324,7 @@ LyX a tout une série de boutons qui peuvent être intégrés dans la barre Personnellement, j'ai combiné les six raccourcis ci-dessus avec deux autres : un pour \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mise \begin_inset space ~ \end_inset @@ -24356,7 +24338,7 @@ DVI \family default et un autre pour \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator DVI \family default . @@ -24497,114 +24479,102 @@ Multi-colonnes \end_layout \begin_layout Standard +Le but de ce paragraphe est de montrer comment utiliser le paquetage +\series bold +multicol +\series default + dans un document LyX. + LyX ne connaît pas encore le paquetage, vous devrez donc utiliser du code + TeX. + +\end_layout -\lang english -This feature is independent of the option -\family sans -Two-column document -\family default - in the document settings under -\family sans -Text Layout -\family default -. - If you want to have 2 -\begin_inset space ~ +\begin_layout Standard +Le paquetage +\series bold +multicol +\series default + permet de +\begin_inset Quotes frd \end_inset -columns for the whole document, it is recommended to use the -\family sans -Two-column document -\family default - option. - For all other cases use this feature. +commuter entre une et plusieurs colonnes dans la même page. + Les notes de bas de page sont correctement gérées, mais seront placées + en bas de la page et non pas en bas de chaque colonne. + Au sein de chaque colonne, vous pouvez utiliser n'importe quelle construction, + à ceci près que l'option +\begin_inset Flex MenuItem +status collapsed + +\begin_layout Plain Layout +Plusieurs colonnes +\end_layout + +\end_inset + + doit être positionnée pour les flottants. +\end_layout + +\begin_layout Subsection +Deux Colonnes +\end_layout + +\begin_layout Standard +Si vous voulez avoir deux colonnes dans votre texte, il faut insérer \end_layout \begin_layout Standard -\lang english -To use multiple text columns in your document, you have to load the module - -\family sans -Multiple Columns -\family default - (menu -\family sans -Document\SpecialChar \menuseparator -Settings\SpecialChar \menuseparator -Modules -\family default -) and must have the LaTeX-package \series bold -multicol -\series default -\begin_inset Index idx +\backslash +begin{multicols}{2} +\end_layout + +\begin_layout Standard +en mode LaTeX à l'endroit où vous voulez démarrer la disposition en deux + colonnes, et +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +end{multicols} +\end_layout + +\begin_layout Standard +là où vous voulez qu'elle se termine. + Comme ceci +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +NdT : Les lecteurs anglophobes me pardonneront, mais je ne me lance pas + à traduire des passages de Sherlock Holmes. + :-) – of +\end_layout + +\end_inset + + : +\end_layout + +\begin_layout Standard +\begin_inset ERT status collapsed \begin_layout Plain Layout -\lang english -LaTeX-packages ! multicol + +\backslash +begin{multicols}{2} \end_layout \end_inset - installed. -\end_layout -\begin_layout Standard - -\lang english -Footnotes within multiple columns will be placed at the bottom of the page - and not under each column. - Within the different columns you can use everything, with the limitation - that for floats you need to use the float option -\family sans -Span columns -\family default -. -\end_layout - -\begin_layout Subsection - -\lang english -Basics -\end_layout - -\begin_layout Standard - -\lang english -If you want to have 2 columns in your text, use the style -\family sans -Begin Multiple Columns -\family default - where the columns should start. - The content of the style is the number of the columns, so in this case - use a -\begin_inset Quotes eld -\end_inset - -2 -\begin_inset Quotes erd -\end_inset - -. - At the point where the columns should end use the style -\family sans -End Multiple Columns -\family default - and keep it empty. -\end_layout - -\begin_layout Standard - -\lang english -Here is an example: -\end_layout - -\begin_layout Begin Multiple Columns -2 \end_layout \begin_layout Standard @@ -24651,24 +24621,46 @@ ty which utterly submerged my mind. only withdrawn upon the third of last month. \end_layout -\begin_layout End Multiple Columns +\begin_layout Standard +\begin_inset ERT +status collapsed +\begin_layout Plain Layout + + +\backslash +end{multicols} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Subsection +Colonnes Multiples \end_layout \begin_layout Standard - -\lang english -Here is an example with 3 -\begin_inset space ~ -\end_inset - -columns: +Le même schéma s'applique si vous voulez plus de deux colonnes (vous pouvez + avoir plus de 3 colonnes si vous voulez, mais ça risque de ne pas être + très agréable à regarder.) \end_layout -\begin_layout Begin Multiple Columns +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +begin{multicols}{3} +\end_layout + +\end_inset + -\lang english -3 \end_layout \begin_layout Standard @@ -24696,26 +24688,28 @@ It can be imagined that my close intimacy with Sherlock Holmes had interested as they were known to the public at the conclusion of the inquest. \end_layout -\begin_layout End Multiple Columns +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +end{multicols} +\end_layout + +\end_inset + \end_layout \begin_layout Standard - -\lang english -You can have up to 10 +Vous pouvez sans problème avoir plus de 3 \begin_inset space ~ \end_inset -columns if you want to, but that might not be very pleasant for the readers - of your document. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - +colonnes, si vous le voulez, mais ce n'est plus très agréable à lire. \end_layout \begin_layout Subsection @@ -24726,8 +24720,20 @@ Des Colonnes dans une Colonne Vous pouvez même avoir des colonnes dans une colonne : \end_layout -\begin_layout Begin Multiple Columns -2 +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +begin{multicols}{2} +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -24741,8 +24747,20 @@ The Honourable Ronald Adair was the second son of the Earl of Maynooth, at 427 Park Lane. \end_layout -\begin_layout Begin Multiple Columns -2 +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +begin{multicols}{2} +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -24761,7 +24779,19 @@ The youth moved in the best society–had, so far as was known, no enemies on the night of March 30, 1894. \end_layout -\begin_layout End Multiple Columns +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +end{multicols} +\end_layout + +\end_inset + \end_layout @@ -24793,876 +24823,29 @@ The evidence of those who had played with him– Mr. So much for his recent history as it came out at the inquest. \end_layout -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Subsection - -\lang english -Advanced Examples -\end_layout - \begin_layout Standard - -\lang english -The examples in this section show some more special features of multiple - columns. -\end_layout - -\begin_layout Standard - -\lang english -For more features of multiple columns, have a look at the documentation - of the LaTeX-package -\series bold -multicol -\series default - -\begin_inset Index idx +\begin_inset ERT status collapsed \begin_layout Plain Layout -\lang english -LaTeX-packages ! multicol + +\backslash +end{multicols} \end_layout \end_inset -\lang french -, -\begin_inset CommandInset citation -LatexCommand cite -key "multicol" - -\end_inset - -. -\end_layout - -\begin_layout Subsubsection - -\lang english -Preface \end_layout \begin_layout Standard - -\lang english -To add a preface text for multiple columns, add the command -\end_layout - -\begin_layout Standard - -\series bold -}[ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code behind the number of columns in the -\family sans - Begin Multiple Columns +Veuillez lire le fichier +\family typewriter +d'exemple MultiColonnes.lyx \family default - style. - behind the command write the text. - At the end of the style use the command -\end_layout - -\begin_layout Standard - -\series bold -]{ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code. - An example with some preface text: -\end_layout - -\begin_layout Standard - -\lang english -\begin_inset VSpace bigskip -\end_inset - - -\end_layout - -\begin_layout Begin Multiple Columns -2 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - - -\lang english -And the story continues and continues and continues and continues -\lang french -\SpecialChar \ldots{} - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard - -\size small -\lang english -On the evening of the crime, he returned from the club exactly at ten. - His mother and sister were out spending the evening with a relation. - The servant deposed that she heard him enter the front room on the second - floor, generally used as his sitting-room. - She had lit a fire there, and as it smoked she had opened the window. - No sound was heard from the room until eleven-twenty, the hour of the return - of Lady Maynooth and her daughter. - Desiring to say good-night, she attempted to enter her son's room. - The door was locked on the inside, and no answer could be got to their - cries and knocking. - Help was obtained, and the door forced. - The unfortunate young man was found lying near the table. - His head had been horribly mutilated by an expanding revolver bullet, but - no weapon of any sort was to be found in the room. -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Standard - -\lang english -You can also use a section heading as the preface if you use a section command - as TeX Code behind the first TeX Code. - For example the command -\end_layout - -\begin_layout Standard - -\series bold -\lang english - -\backslash -subsection{subsection title} -\end_layout - -\begin_layout Standard - -\lang english -creates a subsection. - In this example the preface is a subsubsection: -\end_layout - -\begin_layout Begin Multiple Columns - -\lang english -2 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -subsubsection{ -\end_layout - -\end_inset - -This is a subsubsection heading as a preface -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard - -\size small -\lang english -A minute examination of the circumstances served only to make the case more - complex. - In the first place, no reason could be given why the young man should have - fastened the door upon the inside. - There was the possibility that the murderer had done this, and had afterwards - escaped by the window. - The drop was at least twenty feet, however, and a bed of crocuses in full - bloom lay beneath. - Neither the flowers nor the earth showed any sign of having been disturbed, - nor were there any marks upon the narrow strip of grass which separated - the house from the road. - Apparently, therefore, it was the young man himself who had fastened the - door. - But how did he come by his death? No one could have climbed up to the window - without leaving traces. - Suppose a man had fired through the window, he would indeed be a remarkable - shot who could with a revolver inflict so deadly a wound. - Again, Park Lane is a frequented thoroughfare; there is a cab stand within - a hundred yards of the house. - No one had heard a shot. -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Standard - -\lang english -If there is less vertical space left on the page at the beginning of the - multiple columns than needed for 6 -\begin_inset space ~ -\end_inset - -text lines, a page break will be inserted before the multiple columns. - Depending on the number of lines of the preface text, you might want to - change this value. - It is determined by inserting the command -\end_layout - -\begin_layout Standard - -\series bold -][number -\backslash -baselineskip -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code behind the preface definition but before the final -\series bold -]{ -\series default - command. - -\emph on -number -\emph default - is hereby the number of text lines. - In this example the space is set to 7 -\begin_inset space ~ -\end_inset - -text lines: -\end_layout - -\begin_layout Begin Multiple Columns -2 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -subsubsection{ -\end_layout - -\end_inset - - -\lang english -This is the sectioning command -\begin_inset Newline newline -\end_inset - -as a preface and -\begin_inset Newline newline -\end_inset - -with multiple text lines -\lang french - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -][7 -\backslash -baselineskip -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard - -\size small -\lang english -On the evening of the crime, he returned from the club exactly at ten. - His mother and sister were out spending the evening with a relation. - The servant deposed that she heard him enter the front room on the second - floor, generally used as his sitting-room. - She had lit a fire there, and as it smoked she had opened the window. - No sound was heard from the room until eleven-twenty, the hour of the return - of Lady Maynooth and her daughter. - Desiring to say good-night, she attempted to enter her son's room. - The door was locked on the inside, and no answer could be got to their - cries and knocking. - Help was obtained, and the door forced. - The unfortunate young man was found lying near the table. - His head had been horribly mutilated by an expanding revolver bullet, but - no weapon of any sort was to be found in the room. -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Subsubsection - -\lang english -Surrounding Space -\end_layout - -\begin_layout Standard - -\lang english -The amount of space before and after multiple columns can be changed by - changing the length -\series bold - -\backslash -multicolsep -\series default -. - For example the command -\end_layout - -\begin_layout Standard - -\series bold -\lang english - -\backslash -setlength{ -\backslash -multicolsep}{3cm} -\end_layout - -\begin_layout Standard - -\lang english -in TeX Code changes its value to 3 -\begin_inset space \thinspace{} -\end_inset - -cm. - The change must be made before the multiple columns' start. - The predefined value is 13 -\begin_inset space \thinspace{} -\end_inset - -pt. -\end_layout - -\begin_layout Standard - -\lang english -For this example -\series bold - -\backslash -multicolsep -\series default - was set to 2.5 -\begin_inset space \thinspace{} -\end_inset - -cm: -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -multicolsep}{2.5cm} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Begin Multiple Columns -2 -\end_layout - -\begin_layout Standard - -\size small -\lang english -All day I turned these facts over in my mind, endeavouring to hit upon some - theory which could reconcile them all, and to find that line of least resistanc -e which my poor friend had declared to be the starting-point of every investigat -ion. - I confess that I made little progress. - In the evening I strolled across the Park, and found myself about six o'clock - at the Oxford Street end of Park Lane. - A group of loafers upon the pavements, all staring up at a particular window, - directed me to the house which I had come to see. - A tall, thin man with coloured glasses, whom I strongly suspected of being - a plain-clothes detective, was pointing out some theory of his own, while - the others crowded round to listen to what he said. - I got as near him as I could, but his observations seemed to me to be absurd, - so I withdrew again in some disgust. - As I did so I struck against an elderly, deformed man, who had been behind - me, and I knocked down several books which he was carrying. -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Standard - -\lang english -\begin_inset Note Greyedout -status open - -\begin_layout Plain Layout - -\series bold -\lang english -Note: -\series default - The values you set with -\series bold - -\backslash -setlength -\series default - will be used for all following multiple columns until to change them again. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -multicolsep}{13pt} -\end_layout - -\end_inset - - -\lang english - -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout - -\lang english -go back to the default -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsubsection - -\lang english -Column Separation -\end_layout - -\begin_layout Standard - -\lang english -The width of the columns is automatically calculated, but you can modify - the space between the columns. - This is done by changing the length -\series bold - -\backslash -columnsep -\series default -. - Its predefined value is 10 -\begin_inset space \thinspace{} -\end_inset - -pt. - Here is an example where -\series bold - -\backslash -columnsep -\series default - is set to 3 -\begin_inset space \thinspace{} -\end_inset - -cm: -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -columnsep}{3cm} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Begin Multiple Columns -2 -\end_layout - -\begin_layout Standard - -\size small -\lang english -My observations of No. -\begin_inset space \space{} -\end_inset - -427 Park Lane did little to clear up the problem in which I was interested. - The house was separated from the street by a low wall and railing, the - whole not more than five feet high. - It was perfectly easy, therefore, for anyone to get into the garden, but - the window was entirely inaccessible, since there was no water pipe or - anything which could help the most active man to climb it. - More puzzled than ever, I retraced my steps to Kensington. - I had not been in my study five minutes when the maid entered to say that - a person desired to see me. - To my astonishment it was none other than my strange old book collector, - his sharp, wizened face peering out from a frame of white hair, and his - precious volumes, a dozen of them at least, wedged under his right arm. -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -columnsep}{10pt} -\end_layout - -\end_inset - - -\lang english - -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout - -\lang english -go back to the default -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsubsection - -\lang english -Vertical Lines -\end_layout - -\begin_layout Standard - -\lang english -Between the columns a rule with a width of the length -\series bold - -\backslash -columnseprule -\series default - is placed. - If this rule width is set to 0 -\begin_inset space \thinspace{} -\end_inset - -pt (this is the default), the rule is suppressed. - In the following example, the line separating the columns is 2 -\begin_inset space \thinspace{} -\end_inset - -pt wide. -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -columnseprule}{2pt} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Begin Multiple Columns -2 -\end_layout - -\begin_layout Standard - -\size small -\lang english -\begin_inset Quotes eld -\end_inset - -You're surprised to see me, sir, -\begin_inset Quotes erd -\end_inset - - said he, in a strange, croaking voice. -\end_layout - -\begin_layout Standard - -\size small -\lang english -I acknowledged that I was. -\end_layout - -\begin_layout Standard - -\size small -\lang english -\begin_inset Quotes eld -\end_inset - -Well, I've a conscience, sir, and when I chanced to see you go into this - house, as I came hobbling after you, I thought to myself, I'll just step - in and see that kind gentleman, and tell him that if I was a bit gruff - in my manner there was not any harm meant, and that I am much obliged to - him for picking up my books. -\begin_inset Quotes erd -\end_inset - - -\end_layout - -\begin_layout Standard - -\size small -\lang english -\begin_inset Quotes eld -\end_inset - -You make too much of a trifle, -\begin_inset Quotes erd -\end_inset - - said I. - -\begin_inset Quotes eld -\end_inset - -May I ask how you knew who I was? -\begin_inset Quotes erd -\end_inset - - -\end_layout - -\begin_layout Standard - -\size small -\lang english -\begin_inset Quotes eld -\end_inset - -Well, sir, if it isn't too great a liberty, I am a neighbour of yours, for - you'll find my little bookshop at the corner of Church Street, and very - happy to see you, I am sure. - Maybe you collect yourself, sir. - Here's -\noun on -British -\begin_inset space ~ -\end_inset - -Birds -\noun default -, and -\noun on -Catullus -\noun default -, and -\noun on -The Holy War -\noun default ---a bargain, every one of them. - With five volumes you could just fill that gap on that second shelf. - It looks untidy, does it not, sir? -\begin_inset Quotes erd -\end_inset - - -\end_layout - -\begin_layout End Multiple Columns - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -setlength{ -\backslash -columnseprule}{0pt} -\end_layout - -\end_inset - - -\lang english - -\begin_inset Note Note -status collapsed - -\begin_layout Plain Layout - -\lang english -go back to the default -\end_layout - -\end_inset - - + pour des exemples plus complexes avec l'espacement des colonnes et de l'en-tête +, les lignes de séparation verticale, et plus encore. \end_layout \begin_layout Standard @@ -25974,42 +25157,6 @@ end{sloppypar} \end_inset -\end_layout - -\begin_layout Bibliography -\begin_inset CommandInset bibitem -LatexCommand bibitem -key "multicol" - -\end_inset - - -\lang english -Documentation of the LaTeX-package -\lang french - -\begin_inset CommandInset href -LatexCommand href -name "multicol" -target "http://mirror.ctan.org/macros/latex/required/tools/multicol.pdf" - -\end_inset - - -\lang english - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout - -\lang english -LaTeX-packages ! multicol -\end_layout - -\end_inset - - \end_layout \end_body diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 573d03cb76..c10e5e3f31 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -128,7 +128,7 @@ End \begin_layout Title Personnaliser LyX : fonctions pour l'utilisateur avancé \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout Informations de révision : @@ -138,6 +138,11 @@ Informations de révision : Traduction : Mise à jour OK pour la publication 2.0.0, Date: 03/04/2011 \end_layout +\begin_layout Plain Layout +remplacement de Éditer/Visionner/Insérer/Naviguer par Édition/Affichage/Insertio +n/Navigation, 31/10/2012 +\end_layout + \begin_layout Plain Layout Original : Révision: 37808, Date: 28/02/2011 \end_layout @@ -327,7 +332,7 @@ RépLyX servir à personnaliser le comportement de LyX. Vous pouvez modifier ces fichiers depuis LyX lui-même avec la fenêtre \family sans -Éditer\SpecialChar \menuseparator +Outils\SpecialChar \menuseparator Préférences \family default . @@ -1324,7 +1329,7 @@ Alt-V a D status collapsed \begin_layout Plain Layout -Visionner +Affichage \lang english \SpecialChar \menuseparator @@ -1374,7 +1379,7 @@ status collapsed status collapsed \begin_layout Plain Layout -Visionner +Affichage \end_layout \end_inset @@ -1422,8 +1427,11 @@ Exporter \end_inset . - Le format apparaîtra également dans le menu Visionner si une visionneuse - est définie pour lui. + Le format apparaîtra également dans le menu +\family sans +Affichage +\family default + si une visionneuse est définie pour lui. Les formats purement graphiques, comme png, ne doivent pas utiliser cette option. Les formats adaptés à la fois aux graphiques et aux documents, comme pdf, @@ -5979,7 +5987,7 @@ Démarrez LyX et faites status collapsed \begin_layout Plain Layout -Éditer\SpecialChar \menuseparator +Outils\SpecialChar \menuseparator Reconfigurer \end_layout @@ -11756,7 +11764,7 @@ LabelWidthString status collapsed \begin_layout Plain Layout -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -11998,7 +12006,7 @@ Manual status collapsed \begin_layout Plain Layout -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -15097,7 +15105,7 @@ status collapsed \begin_layout Plain Layout \lang english -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -16006,7 +16014,7 @@ LabelWidthString status collapsed \begin_layout Plain Layout -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -20482,7 +20490,7 @@ template status collapsed \begin_layout Plain Layout -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Objet \begin_inset space ~ \end_inset diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index ebb69f61f5..9d7f59785a 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -280,7 +280,7 @@ type "mailto:" \begin_inset Note Note -status collapsed +status open \begin_layout Plain Layout auteur original : Uwe Stöhr @@ -290,6 +290,11 @@ auteur original : Uwe Stöhr Traduction française : Siegfried Meunier-Guttin-Cluzel \end_layout +\begin_layout Plain Layout +remplacement de Éditer/Visionner/Insérer/Naviguer par Édition/Affichage/Insertio +n/Navigation, 31/10/2012, JPChrétien +\end_layout + \begin_layout Plain Layout version 2.0.x novembre 2011 \end_layout @@ -437,7 +442,7 @@ arg "dialog-show-new-inset graphics" dans la barre d'outils, ou faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default . @@ -886,7 +891,7 @@ arg "float-insert figure" de la barre d'outils et le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Figure \family default @@ -1063,7 +1068,7 @@ reference "fig:escher" légende. On insère donc une étiquette dans la légende en utilisant le menu \family sans -Insérer +Insertion \family default \SpecialChar \menuseparator @@ -1079,7 +1084,7 @@ arg "label-insert" de la barre d'outils. On peut alors faire référence à cette étiquette en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -1882,7 +1887,7 @@ arg "tabular-insert" soit \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Tableau \family default . @@ -2857,12 +2862,12 @@ Note : \end_layout \begin_layout Section -Le menu éditer tableau +Le menu Édition tableau \begin_inset Index idx status collapsed \begin_layout Plain Layout -Tableau ! Menu Éditer +Tableau ! Menu Édition \end_layout \end_inset @@ -2874,7 +2879,7 @@ Tableau ! Menu Éditer En plus de la fenêtre de dialogue et de la barre d'outils tableau, le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Tableau \family default vous permet d'ajouter ou de supprimer les lignes de bordure de la colonne @@ -3076,7 +3081,7 @@ c & d \begin_layout Standard Les flottants de tableau sont insérés en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Tableau \family default @@ -3221,7 +3226,7 @@ References@Références ! à des Tableaux en faisant référence à sa légende. On insère donc une étiquette dans la légende en utilisant le menu \family sans -Insérer +Insertion \family default \SpecialChar \menuseparator @@ -3237,7 +3242,7 @@ arg "label-insert" de la barre d'outils. On peut alors faire référence à cette étiquette en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -9773,7 +9778,7 @@ Il peut y avoir des problèmes quand un flottant apparaît sur la page où commence un tableau long. Pour éviter une telle situation, insérez un saut de page (menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -11774,7 +11779,7 @@ arg "inset-modify tabular multicolumn" de la barre d'outils tableau, ou le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Tableau\SpecialChar \menuseparator Multi-colonnes \family default @@ -12553,7 +12558,7 @@ arg "inset-modify tabular multirow" de la barre d'outils tableau, ou le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Tableau\SpecialChar \menuseparator Multi-lignes \family default @@ -17334,7 +17339,7 @@ i Si vous voulez seulement avoir du texte en couleur, sélectionnez les cellules et choisissez une couleur dans le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -17684,7 +17689,7 @@ Les deux commandes sont insérées au début d'une cellule comme du code TeX. Pour colorer de caractères dans un tableau, sélectionnez les cellules et choisissez une couleur dans le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -17789,7 +17794,7 @@ cellcolor{Maroon} \begin_layout Standard Les caractères peuvent maintenant être colorés en utilisant le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -24686,7 +24691,7 @@ reference "sec:Referencer-les-Flottants" \begin_layout Standard Pour insérer un flottant, on utilise un des sous menus du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant \family default (barre d'outils @@ -24870,7 +24875,7 @@ end loop \begin_layout Standard Ce type de flottant est inséré à l'aide du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Algorithme \family default @@ -24975,7 +24980,7 @@ algorithme \begin_layout Standard Pour insérer la liste des algorithmes, vous pouvez utiliser le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -25308,7 +25313,7 @@ References@Références ! à des Flottants Pour faire référence à un flottant, insérez une étiquette dans sa légende en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou le bouton @@ -25343,7 +25348,7 @@ fig: L'étiquette sert à la fois de point d'ancrage et de nom pour la référence. Vous pouvez faire référence à cette étiquette en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -29929,7 +29934,7 @@ De la même façon que la table des matières fait la liste des sections du exemple pour les figures du document. Vous pouvez les insérer en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -29981,7 +29986,7 @@ arg "note-insert" de la barre d'outils ou avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \family default . @@ -30282,7 +30287,7 @@ arg "footnote-insert" de la barre d'outils, soit en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -31811,7 +31816,7 @@ Les notes en marge dans LyX ressemblent aux notes en bas de page et se comporten t de la même façon. Quand vous insérez une note en marge avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -32720,7 +32725,7 @@ reference "sec:Boîtes-colorées" \begin_layout Standard On peut insérer une boîte en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Boîte \family default ou avec le bouton @@ -34786,7 +34791,7 @@ Ci-dessous, vous avez deux exemples de minipages côte-à-côte. col% et elles sont séparées par un ressort horizontal, qui a été inséré via le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -35185,7 +35190,7 @@ motTrèsTrèsLong Bien sûr, maintenant le mot dépasse dans la marge latérale. Pour éviter cela, ajoutez un saut de ligne avant le mot avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -37488,7 +37493,7 @@ Ceci est une figure habillée. de sorte qu'elle n'occupe plus qu'une partie de la largeur de la colonne. Vous pouvez en insérer un en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Flottant \begin_inset space ~ @@ -38724,7 +38729,7 @@ Initial Ce dernier a un paramètre obligatoire et un autre facultatif. Le paramètre obligatoire est inséré avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Titre \begin_inset space ~ \end_inset @@ -39233,7 +39238,7 @@ Trucs externes \begin_layout Standard Avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier \family default vous pouvez insérer un contenu externe à votre document. @@ -39344,7 +39349,7 @@ Externe \family default qui est accessible via le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichiers\SpecialChar \menuseparator Objet \begin_inset space ~ @@ -39411,7 +39416,7 @@ Retirer l'espace protégé quand le bug 4398 sera résolu ! La date n'apparaîtra pas dans LyX, mais seulement dans la sortie imprimée. Il y a deux autre méthodes pour insérer une date : Avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Date \family default et avec la commande LaTeX @@ -39749,7 +39754,7 @@ Externe comme les images qui sont habituellement incorporées en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default , comme c'est décrit dans la section @@ -39863,7 +39868,7 @@ Date \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Date \end_layout @@ -40091,7 +40096,7 @@ Trucs externes ! Sous-documents status collapsed \begin_layout Plain Layout -Fichiers ! Insérer +Fichiers ! Insertion \end_layout \end_inset @@ -40139,7 +40144,7 @@ Les documents inclus sont visualisés dans LyX sous la forme d'une boîte Pour inclure des sous-documents dans un document maître , on utilise le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -40344,7 +40349,7 @@ textvisiblespace . La différence avec la méthode qui consiste à utiliser le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Texte \begin_inset space ~ @@ -40596,7 +40601,7 @@ Listings \family default qui peut être créé grâce au menu \family sans -Insérer +Insertion \family default \SpecialChar \menuseparator @@ -40771,7 +40776,7 @@ Flottant \begin_layout Standard Vous pouvez ajouter une légende à un listing avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Légende \family default . @@ -41101,7 +41106,7 @@ Il est aussi possible d'imprimer les lignes d'un fichier sous la forme d'un listing. Pour le faire, il suffit d'utiliser le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \family default @@ -41165,7 +41170,7 @@ Pour faire référence à un sous-document de type listing, tapez une étiquette dans le champ correspondant de la fenêtre de dialogue. On peut alors faire référence à cette étiquette en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx index 7ba6ff7b2d..03d24acd2f 100644 --- a/lib/doc/fr/Intro.lyx +++ b/lib/doc/fr/Intro.lyx @@ -1024,7 +1024,7 @@ Si certains d'entre vous ont imprimé les manuels, d'autres les lisent en Vous pouvez consulter la table des matières soit en cliquant sur la boîte grise située sous le titre, soit en utilisant le menu \family sans -Naviguer +Navigation \family default , qui la fait apparaître automatiquement (essayez!). \end_layout diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 55a36a55de..4ac4143540 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -261,8 +261,9 @@ traducteur: Siegfried Meunier-Guttin-Cluzel \end_layout \begin_layout Plain Layout -Dernière revue : 22/10/2012 pour 2.0.5 (quelques mises à jour de Uwe -> 19/10/2012 -) par J.P. +Dernière revue : 31/10/2012 pour 2.0.5 (quelques mises à jour de Uwe -> 19/10/2012 + + remplacement de Éditer/Visionner/Insérer/Naviguer par Édition/Affichage/Inser +tion/Navigation) par J.P. Chrétien \end_layout @@ -357,7 +358,7 @@ Formules Mathématiques La plupart des symboles et plusieurs constructions expliquées dans ce manuel sont aussi accessibles par le menu \family sans - Insérer\SpecialChar \menuseparator + Insertion\SpecialChar \menuseparator Math \family default , ou par la @@ -540,7 +541,7 @@ Ctrl-M, Alt+C M, Alt+M M \family default ou utilisez \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Changer le type de formule \family default @@ -652,7 +653,7 @@ Mode TeX de la barre d'outils ou en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code \begin_inset space ~ \end_inset @@ -740,12 +741,12 @@ eX Pour éditer des matrices, des différentiations de cas et des formules multiligne s après coup, on peut utiliser les menus \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math \family default and \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes \begin_inset space \thinspace{} \end_inset @@ -3241,7 +3242,7 @@ cases \series default est aussi accessible par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Environnement \begin_inset space ~ @@ -4037,7 +4038,7 @@ reference "sub:Crochets-multilignes" Les réserves peuvent aussi être utilisées avec du texte en les insérant via le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -4404,7 +4405,7 @@ rule peut aussi être utilisé avec du texte si la ligne est insérée via le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -4882,7 +4883,7 @@ A_{n1} & \cdots & A_{nm} \begin_layout Standard Les points de suspension accessibles avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset @@ -5147,7 +5148,7 @@ On peut insérer des matrices avec le bouton de la barre d'outils mathématique ou en utilisant le menu \family sans - Insérer\SpecialChar \menuseparator + Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Matrice \begin_inset space ~ @@ -5295,7 +5296,7 @@ Pour ajouter ou supprimer des lignes ou des colonnes après coup, on peut de la barre d'outils mathématique, ou le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes \begin_inset space \thinspace{} \end_inset @@ -11859,7 +11860,7 @@ Les espaces sont nécessaires pour les unités physiques, parce que l'espace normale. Pour les unités dans le texte, l'espace fine est insérée avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -12375,7 +12376,7 @@ reference "sub:Points-de-suspension" Pour le texte, on peut insérer une espace de longueur variable avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -14012,7 +14013,7 @@ texte de la barre d'outils, ou avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -14453,7 +14454,7 @@ On peut créer une boîte qui peut contenir plusieurs lignes, voir des paragraph entiers, c'est ce que l'on nomme une boîte de paragraphe (parbox en anglais). On la crée avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Boîte \family default ou le bouton @@ -16231,7 +16232,7 @@ Pour les formules en lignes, les limites sont placées juste après l'opérateur Pour forcer les limites à être après l'opérateur, on place le curseur juste après l'opérateur et on change le type de limite avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Changer \begin_inset space ~ @@ -16475,7 +16476,7 @@ Tableaux \family default ou avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes \begin_inset space ~ \end_inset @@ -17818,7 +17819,7 @@ menu \family default du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractères \begin_inset space ~ \end_inset @@ -18851,7 +18852,7 @@ target "http://www.lyx.org/trac/ticket/4629" \begin_layout Standard À la place des commandes de style, on peut utiliser le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Style \begin_inset space ~ @@ -28268,7 +28269,7 @@ reference "sub:Environnement-align-standard" Il y a d'autres environnement de formules multi-lignes qui peuvent être créés en passant par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math \family default . @@ -28299,7 +28300,7 @@ Ctrl+Entrée de la barre d'outils mathématique ou bien le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes \begin_inset space \thinspace{} \end_inset @@ -29191,13 +29192,13 @@ Les environnement Align sont composés de colonnes. \begin_layout Standard Les environnement Align sont créés avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math \family default . Avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Change le type de formule \family default @@ -29222,7 +29223,7 @@ Pour ajouter ou supprimer des colonnes, on peut utiliser soit les boutons , respectivement, soit le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes & colonnes \family default . @@ -29256,7 +29257,7 @@ Ctrl+Entrée \family default dans une formule ou en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Environnement \begin_inset space ~ @@ -29790,7 +29791,7 @@ split . Ils peuvent être insérés en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math \family default ou en utilisant les commandes décrites dans cette section. @@ -30085,7 +30086,7 @@ Généralités \begin_layout Standard On peut créer des formules numérotées avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Formule \begin_inset space ~ @@ -30104,7 +30105,7 @@ Ctrl+Alt N). On peut aussi numéroter des formules existantes avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator (Dés)Activer \begin_inset space ~ @@ -30146,7 +30147,7 @@ Quand on active la numérotation sur des formules multi-lignes, toutes les La numérotation peut ensuite être contrôlée pour chaque ligne avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator (Dés)Activer \begin_inset space ~ @@ -30211,7 +30212,7 @@ References@Références croisées ! à des formules On peut faire référence à toute formule ayant une étiquette. On ajoute une étiquette avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou avec le bouton @@ -30252,7 +30253,7 @@ eq: une étiquette de section. Pour modifier l'étiquette vous devez repasser par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou effectuer un clic droit sur la formule et choisir @@ -30271,7 +30272,7 @@ Le nom de l'étiquette est affiché dans LyX entre deux parenthèses, après \begin_layout Standard On insère une référence croisée avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -33962,7 +33963,7 @@ newcommand \begin_layout Standard Une macro est créée en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Macro \family default @@ -34357,7 +34358,7 @@ La barre d'outils macro contient de la gauche vers la droite les boutons \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34408,7 +34409,7 @@ argument \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34455,7 +34456,7 @@ argument \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34477,7 +34478,7 @@ status open \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34529,7 +34530,7 @@ optionnel \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34551,7 +34552,7 @@ status open \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34599,7 +34600,7 @@ optionnel \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34650,7 +34651,7 @@ optionnel \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34701,7 +34702,7 @@ optionnel \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34739,7 +34740,7 @@ status open \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34795,7 +34796,7 @@ droite \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34829,7 +34830,7 @@ status open \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34881,7 +34882,7 @@ droite \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34915,7 +34916,7 @@ status open \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Définition \begin_inset space ~ @@ -34992,7 +34993,7 @@ Utilisation \begin_layout Standard Écrivez une expression dans une formule puis allez dans \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Maths \family default \SpecialChar \menuseparator @@ -36509,7 +36510,7 @@ Propriétés du PDF Les deux problèmes peuvent être résolus en insérant à la fin de l'entête de section un titre court avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Titre \begin_inset space ~ \end_inset @@ -37693,7 +37694,7 @@ times \series default ou par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset @@ -37799,7 +37800,7 @@ F \series default , soit avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset diff --git a/lib/doc/fr/Shortcuts.lyx b/lib/doc/fr/Shortcuts.lyx index 94b57c0de2..35c593b192 100644 --- a/lib/doc/fr/Shortcuts.lyx +++ b/lib/doc/fr/Shortcuts.lyx @@ -69,8 +69,9 @@ Par l'équipe LyX \end_layout \begin_layout Standard -Ce fichier fait la liste des raccourcis clavier qui sont utilisés actuellement - et qui sont définis dans le fichier d'interface utilisateur +Ce fichier récapitule la liste des raccourcis clavier qui sont utilisés + actuellement et qui sont définis dans le fichier d'interface utilisateur + \family typewriter \begin_inset Info @@ -81,26 +82,24 @@ arg "bind_file" \family default . - Vous pouvez modifier les raccourcis -\lang english -in the menu + Vous pouvez modifier les raccourcis dans le menu \family sans -Tools\SpecialChar \menuseparator -Preferences\SpecialChar \menuseparator -Editing\SpecialChar \menuseparator -Shortcuts +ToolsOutils\SpecialChar \menuseparator +Préférences\SpecialChar \menuseparator +Saisie\SpecialChar \menuseparator +Raccourcis \family default - as described in section -\begin_inset Quotes eld + comme il est expliqué dans la section +\begin_inset Quotes fld \end_inset -Shortcuts -\begin_inset Quotes erd +Raccourcis +\begin_inset Quotes frd \end_inset - of the LyX + du \emph on -User's Guide +Guide de l'utilisateur \emph default . \end_layout @@ -467,7 +466,7 @@ arg "buffer-previous" \end_layout \begin_layout Subsection* -Éditer +Édition \end_layout \begin_layout Standard diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx index 6972c8bae3..f8a7648dee 100644 --- a/lib/doc/fr/Tutorial.lyx +++ b/lib/doc/fr/Tutorial.lyx @@ -115,10 +115,15 @@ dernière revue JPChrétien pour 1.6.10, mai 2005 \end_layout \begin_layout Plain Layout -(synchonisation avec l'interface, ajout d'un paragraphe section 3.2 mentionnant +(synchronisation avec l'interface, ajout d'un paragraphe section 3.2 mentionnant le modèle lettre.lyx) \end_layout +\begin_layout Plain Layout +Remplacement de Éditer/Visionner/Insérer/Naviguer par Édition/Affichage/Insertio +n/Navigation, 31/10/2012 +\end_layout + \end_inset @@ -663,8 +668,8 @@ Sous\SpecialChar \ldots{} \begin_layout Itemize Générer un fichier PDF avec \family sans -Visualiser\SpecialChar \menuseparator -Visualiser +Affichage\SpecialChar \menuseparator +Visionner \family default ou avec le bouton \begin_inset Info @@ -764,7 +769,7 @@ annuler Ça signifie que vous pouvez annuler tout ce que vous avez fait depuis le début de votre session d'édition, en faisant \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Annuler \family default (bouton @@ -776,7 +781,7 @@ arg "undo" de la barre d'outils) de façon répétitive. Si vous annulez trop de fois, faites juste \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Refaire \family default (bouton @@ -799,7 +804,7 @@ Actuellement, le nombre maximal d'opérations que l'on peut annuler est de \begin_layout Description Couper/Copier/Coller Vous pouvez utiliser \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Couper \family default (bouton @@ -810,7 +815,7 @@ arg "cut" ), \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Copier \family default (bouton @@ -821,7 +826,7 @@ arg "copy" ), et \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Coller \family default (bouton @@ -846,7 +851,7 @@ de la souris \begin_layout Description Rechercher/Remplacer Utilisez \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Rechercher \begin_inset space ~ \end_inset @@ -916,7 +921,7 @@ Style Nom propre (généralement en petites capitales, utilisées pour les noms de personnes) à partir des listes déroulantes du menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -2709,7 +2714,7 @@ Allons à notre seconde section, dont le titre est . Cliquez en fin d'en-tête de cette section, et sélectionnez \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou cliquez sur le bouton @@ -2776,7 +2781,7 @@ section et faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -2884,7 +2889,7 @@ Copier comme référence et peut ensuite être copiée à la position courante du curseur via le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Coller ( \family default raccourci @@ -3147,7 +3152,7 @@ arg "footnote-insert" , dans la barre d'outils ou par menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -3296,7 +3301,7 @@ arg "marginalnote-insert" de la barre d'outils, ou par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -3444,7 +3449,7 @@ tutorielLyX Déplacez-vous alors à un endroit où vous souhaiteriez insérer une citation. Avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Citation \family default ou le bouton @@ -3571,7 +3576,7 @@ Entrée juste après le titre de votre document, et avant la première section, et faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -3667,7 +3672,7 @@ Plan ouverte tout au long de l'édition du document. Vous aurez également la même chose dans le menu \family sans -Naviguer +Navigation \family default , dans lequel la table des matières apparaît automatiquement. \end_layout @@ -3786,7 +3791,7 @@ arg "math-mode" ou utilisez le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Formule \begin_inset space ~ @@ -3920,7 +3925,7 @@ Arrière la souris. \family sans -Éditer +Édition \family default \SpecialChar \menuseparator @@ -3953,7 +3958,7 @@ Suppr , l'expression entière est effacée. Heureusement, \family sans -Éditer +Édition \family default \SpecialChar \menuseparator @@ -4169,12 +4174,12 @@ Math Plusieurs de ces opérations peuvent être exécutées depuis le clavier ou les menus \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math \family default et \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math \family default . @@ -4369,7 +4374,7 @@ Délimiteurs. \begin_layout Standard Une fois que vous avez choisi vos délimiteurs, cliquez sur \family sans -Insérer +Insertion \family default pour les mettre dans votre expression . Si vous êtes paresseux, vous pouvez utiliser les parenthèses du clavier @@ -4729,7 +4734,7 @@ Bas Si vous avez besoin de changer le nombre de lignes ou de colonnes, faites \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Lignes \begin_inset space ~ \end_inset @@ -4998,7 +5003,7 @@ status collapsed \begin_layout Plain Layout Après avoir sué sur cet exercice, essayez \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Environnement \begin_inset space ~ @@ -5124,7 +5129,7 @@ Insérés LyX traite les tableaux en mode WYSIWYM. Faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Tableau \family default (bouton @@ -5179,7 +5184,7 @@ Tableau \family default (également accessible par le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -5211,7 +5216,7 @@ LyX permet également d'inclure des images dans n'importe quel format à l'inté ur d'un document. (Vous l'avez deviné : \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default , ou bouton @@ -5414,7 +5419,7 @@ Tout ce que vous entrez en mode TeX est transmis tel quel à LaTeX et apparaît en rouge à l'écran. Vous pouvez mettre des commandes TeX dans LyX en faisant \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code \begin_inset space ~ \end_inset @@ -5763,7 +5768,7 @@ LyX supporte BibTeX, qui vous permet de créer des bases de données de référe bibliographiques et de les utiliser dans plusieurs documents différents. Faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -5825,7 +5830,7 @@ Style Après ça, vous pouvez citer n'importe quel ouvrage des bibliographies que vous avez choisies, avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Citation \family default (voir la section @@ -6087,7 +6092,7 @@ Les points de suspension s'obtiennent quant à eux avec trois points ordinaires successifs et les tirets longs – comme ici – avec deux tirets juxtaposés (ou via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index a653e010b3..bbb36d9b65 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -152,11 +152,12 @@ Informations de révision : \end_layout \begin_layout Plain Layout -Traduction : Mise à jour pour 2.0.5 par JPChrétien, Date : 22/10/2012 +Traduction : Mise à jour pour 2.0.5 par JPChrétien, Date : 31/10/2012 \end_layout \begin_layout Plain Layout -Quelques corrections de Uwe +Quelques corrections de Uwe + remplacement de Éditer/Visionner/Insérer/Naviguer + par Édition/Affichage/Insertion/Navigation \end_layout \begin_layout Plain Layout @@ -252,7 +253,7 @@ Si votre distribution LaTeX est un peu ancienne , \begin_inset Quotes fld \end_inset -Visionner +Affichage \begin_inset Quotes frd \end_inset @@ -1041,7 +1042,7 @@ Comme la plupart des traitements de texte modernes, LyX peut opérer des \begin_layout Standard Comme vous pouvez vous y attendre, le menu \family sans -Éditer +Édition \family default et la barre d'outils standard contiennent les commandes de copier-coller, ainsi que diverses autres fonctions d'édition. @@ -1168,7 +1169,7 @@ Récente \begin_layout Standard Le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Collage \begin_inset space ~ \end_inset @@ -1208,7 +1209,7 @@ brut \begin_layout Standard L'élément \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Rechercher \begin_inset space ~ \end_inset @@ -1445,7 +1446,7 @@ Si vous faites une erreur, vous pouvez facilement la réparer, car LyX a un tampon d'annulation de grande capacité. Faites \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Annuler \family default ou utilisez le bouton @@ -1457,7 +1458,7 @@ arg "undo" de la barre d'outils pour corriger une erreur. Si vous avez accidentellement annulé trop d'opérations, faites \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Refaire \family default ou utilisez le bouton @@ -1566,7 +1567,7 @@ bouton gauche LyX marque le texte entre les ancienne et nouvelle positions du pointeur. Utilisez \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Copier \family default pour créer une copie du texte dans le presse-papiers de LyX. @@ -1575,7 +1576,7 @@ Copier \begin_layout Itemize Repositionnez le curseur et recollez le texte dans LyX en utilisant \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Coller \family default . @@ -1595,7 +1596,7 @@ Cliquez avec le bouton droit pour modifier ses propriétés. \end_deeper \begin_layout Section -Naviguer +Navigation \begin_inset CommandInset label LatexCommand label name "sec:Naviguer" @@ -1607,7 +1608,7 @@ name "sec:Naviguer" status collapsed \begin_layout Plain Layout -Naviguer +Navigation \end_layout \end_inset @@ -1622,7 +1623,7 @@ LyX propose plusieurs façons de naviguer dans un document: \begin_layout Itemize le menu \family sans -Naviguer +Navigation \family default liste toutes les sections du document sous la forme d'entrées de sous-menus sur lesquelles vous pouvez cliquer pour sauter à la partie correspondante @@ -1655,7 +1656,7 @@ arg "dialog-toggle toc" \begin_layout Itemize les signets, que vous pouvez poser depuis le menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets \family default et utiliser via le même menu. @@ -1671,7 +1672,7 @@ arg "bookmark-goto 0" de la barre d'outils (correspondant au menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets\SpecialChar \menuseparator Naviguer en arrière \family default @@ -4247,7 +4248,7 @@ Réglage fin Vous pouvez aussi changer la méthode de séparation d'un paragraphe donné. Allez dans \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -5115,7 +5116,7 @@ LaTeX vous permet de donner un titre court pour une en-tête de section, matières, ce qui évite le problème cité. Pour définir un titre court, utilisez le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Titre court \family default . @@ -6045,7 +6046,7 @@ arg "space-insert protected" soit avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Espace \begin_inset space ~ @@ -6246,7 +6247,7 @@ Pour changer la largeur implicite, sélectionnez tous les éléments de la liste. Ensuite ouvrez le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -7488,7 +7489,7 @@ arg "newline-insert newline" ou \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -8224,7 +8225,7 @@ Comment mettre une liste dans une liste ? Désormais la réponse devrait vous C'est assez simple d'emboîter un environnement. Faites \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Augmenter \begin_inset space ~ \end_inset @@ -10431,7 +10432,7 @@ reference "sec:Bibliographie" . On crée une espace insécable grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Espace \bar under @@ -10469,7 +10470,7 @@ Espace ! Horizontal \begin_layout Standard Tous les espace horizontaux peuvent être insérés grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator Espacement horizontal \family default @@ -10527,7 +10528,7 @@ reference "sub:Abbreviations" Pourtant, parfois, nous voulons quand même un espace normal. Dans ce cas, on en insère un avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator Espace \begin_inset space ~ @@ -10634,7 +10635,7 @@ kg (espace fine) \begin_layout Standard L'espace fine s'insère en passant par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -11382,7 +11383,7 @@ Edge Pour obtenir cet effet, vous pouvez utiliser les insert fantômes accessibles par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator Fantôme. @@ -11442,7 +11443,7 @@ name "sub:Espacement-Vertical" Pour ajouter un espace supplémentaire au-dessus ou au-dessous d'un paragraphe, utilisez la fenêtre de dialogue \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator Espacement \begin_inset space ~ @@ -11647,7 +11648,7 @@ Paragraphe ! Alignement Vous pouvez modifier la justification des paragraphes avec la fenêtre de dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres de paragraphe \family default (bouton @@ -11810,7 +11811,7 @@ Il y a deux sortes de sauts de page. Le premier termine la page sans entreprendre d'action spéciale. Il peut être inséré avant ou après un paragraphe avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -11837,7 +11838,7 @@ haut) . Le second type, qui est inséré avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -11917,7 +11918,7 @@ Alors que le saut de page forcé va placer tout ce qui suit l'instruction \begin_layout Standard Vous insérez un tel saut de page avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Saut \begin_inset space ~ @@ -11945,7 +11946,7 @@ tampon) Quand vous avez un document imprimé en recto-verso comme un livre, vous pouvez utiliser le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Saut \begin_inset space ~ @@ -11987,7 +11988,7 @@ Comme pour les sauts de page, il y a deux types de sauts de ligne. Le premier saute simplement à la ligne, on l'insère dans un paragraphe grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -12016,7 +12017,7 @@ arg "newline-insert newline" . Le deuxième type de saut de ligne, qui est inséré avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -12113,7 +12114,7 @@ height "1pt" A partir du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Formats\SpecialChar \menuseparator Ligne \begin_inset space ~ @@ -12173,7 +12174,7 @@ Symboles \family default grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère spécial\SpecialChar \menuseparator Symboles. \end_layout @@ -13563,7 +13564,7 @@ arg "font-default" ou la fenêtre de dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \family default @@ -13655,7 +13656,7 @@ Personnalisé \family default en faisant \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -14607,7 +14608,7 @@ Vous avez donc le choix d'un grand nombre de combinaisons. Quand vous avez choisi un nouveau style de caractères avec la fenêtre de dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -15881,7 +15882,7 @@ Pour avoir une idée de l'aspect final de votre document, avec tous ses sauts de pages à la bonne place, les notes de bas de page bien numérotées et ainsi de suite, utilisez le menu \family sans -Visionner +Affichage \family default et choisissez Visionner ou le bouton de la barre d'outils \begin_inset Info @@ -15916,7 +15917,7 @@ reference "sec:Doc-Output" ). D'autres formats de sortie peuvent être sélectionnés par \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Visionner (autres formats) \family default ou le bouton de la barre d'outils @@ -15935,7 +15936,7 @@ Si vous avez modifié votre document depuis votre dernier visionnement, inutile de fermer la fenêtre de la visionneuse, appuyez juste sur un des boutons de mise à jour ou utilisez le menu \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mettre \begin_inset space ~ \end_inset @@ -15948,7 +15949,7 @@ jour \family default .ou \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mettre \begin_inset space ~ \end_inset @@ -16282,7 +16283,7 @@ tiret \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset @@ -16319,7 +16320,7 @@ tiret long \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset @@ -16569,7 +16570,7 @@ h3knix/m0n0wall Si, pour une raison quelconque, LaTeX n'arrivait pas à couper un mot correcteme nt, vous pouvez disposer les points de césure à la main, avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -16804,7 +16805,7 @@ Espace ! Fine \begin_layout Enumerate utiliser \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère \begin_inset space ~ \end_inset @@ -17207,7 +17208,7 @@ Ctrl-" \family default , ou utilisez \family sans - Insérer\SpecialChar \menuseparator + Insertion\SpecialChar \menuseparator Caractère spécial\SpecialChar \menuseparator Guillemet \begin_inset space ~ @@ -17361,7 +17362,7 @@ NdT : faute d'idée d'exemple en français\SpecialChar \ldots{} Pour empêcher une ligature, vous devez insérer un caractère spécial entre les lettres, avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie \begin_inset space ~ \end_inset @@ -17679,7 +17680,7 @@ demi-espace pour les unités, utilisez le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator Espace \begin_inset space ~ @@ -18003,7 +18004,7 @@ arg "note-insert" de la barre d'outils ou grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \family default . @@ -18036,7 +18037,7 @@ Notes en bas de page LyX utilise des boîtes pour saisir et afficher les notes en bas de page: quand vous insérez une Note de bas de page avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -18184,7 +18185,7 @@ Dans LyX, les notes en marge ressemblent aux notes en bas de page et se comportent de la même façon. Quand vous insérez une note en marge avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -18295,7 +18296,7 @@ arg "dialog-show-new-inset graphics" dans la barre d'outils, ou faites \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default . @@ -19005,7 +19006,7 @@ arg "tabular-insert" soit \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Tableau \family default . @@ -19650,7 +19651,7 @@ pied: la ligne courante et toutes celles situées au-dessous et qui n'ont Légende: la première ligne est transformée en une seule colonne. Vous pouvez maintenant y mettre la légende du tableau grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Légende \family default \series bold @@ -22165,7 +22166,7 @@ reference "sec:Références-croisées" \begin_layout Standard Pour insérer un flottant, on utilise un des sous menus du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant. \family default @@ -22255,7 +22256,7 @@ reference "fig:Ornithorinque" a été créée via le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Figure \family default @@ -22269,7 +22270,7 @@ arg "float-insert figure" L'image a été insérée en positionnant le curseur au(-dessus de la légende et en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \family default ou le bouton @@ -22282,7 +22283,7 @@ arg "dialog-show-new-inset graphics" L'image a été centrée horizontalement en positionnant le curseur devant ou derrière l'image et en appelant le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres de paragraphe \family default ou le bouton @@ -22340,7 +22341,7 @@ Ce flottant de figure montrent aussi comment ajouter une étiquette et créer une référence croisée pointant sur elle : Insérez-vous une étiquette dans la légende à l'aide du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou le bouton @@ -22352,7 +22353,7 @@ arg "label-insert" de la barre d'outils, et ensuite y faire référence en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -22593,7 +22594,7 @@ name "sec:Flottant-de-tableau" \begin_layout Standard Les flottants de tableau sont insérés en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Tableau ou le bouton \family default @@ -22825,7 +22826,7 @@ ur d'une page. Les minipages de LyX ont leur propre boîte repliable qui peut être insérée grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Boîte \family default . @@ -23057,7 +23058,7 @@ Pour écrire une formule mathématique, vous pouvez simplement cliquer sur Vous pouvez aussi choisir une type particulier de formule avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math \family default . @@ -23166,7 +23167,7 @@ Naviguer dans une formule status collapsed \begin_layout Plain Layout -Math ! Naviguer +Math ! Navigation \end_layout \end_inset @@ -23753,7 +23754,7 @@ arg "math-limits" ou en utilisant le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Changer \begin_inset space ~ @@ -24733,7 +24734,7 @@ Il est très facile de construire les crochets que vous souhaitez. gauche et sur celui que vous voulez à droite dans la fenêtre de droite, et placez-les dans le document en appuyant sur le bouton \family sans -Insérer +Insertion \family default . Si vous voulez un côté sans délimiteur, utilisez le bouton vide. @@ -24759,7 +24760,7 @@ Shift Ensuite, choisissez les délimiteurs gauche et droit appropriés, et cliquez sur \family sans -Insérer +Insertion \family default . Les parenthèses seront placées autour de la structure sélectionnée. @@ -24961,7 +24962,7 @@ arg "newline-insert newline" dans la matrice, et vous pouvez ajouter des colonnes, et supprimer lignes et colonnes, dans le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math \family default ou les boutons de la palette. @@ -24980,7 +24981,7 @@ cas peut être inséré directement avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Environnement \begin_inset space ~ @@ -25259,7 +25260,7 @@ On peut faire référence à chaque formule hors ligne du document par son numéro en utilisant une étiquette. Comme d'habitude, on ajoute une étiquette en utilisant \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \family default ou en utilisant le bouton @@ -25316,7 +25317,7 @@ Toutes les lignes avec une étiquette sont numérotées, ce qui fait que LyX Comme pour toutes les étiquettes, vous pouvez faire référence à votre formule en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -25865,7 +25866,7 @@ boldsymbol Un certain nombre d'options pour les polices de caractères sont disponibles dans le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math\SpecialChar \menuseparator Style \family default @@ -26170,7 +26171,7 @@ Toutes ces tailles de polices du mode mathématique sont relatives, ce qui veut dire que si tout une structure est mise à une certaine taille avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \family default @@ -26465,7 +26466,7 @@ Troisième élément D'abord nous ajoutons une étiquette dans le second élément, soit avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Etiquette \family default , soit en utilisant le bouton @@ -26540,7 +26541,7 @@ sec: Pour faire référence à l'élément que l'on vient d'identifier, nous allons utiliser le nom de son étiquette soit en activant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -26572,7 +26573,7 @@ arg "dialog-show-new-inset ref" \begin_layout Standard Plutôt que d'utiliser \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence \begin_inset space ~ \end_inset @@ -26588,7 +26589,7 @@ Copier comme référence La référence croisée à cette étiquette est copiée dans le presse-papier et peut être collée à la position courante du curseur avec le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Coller \family default (raccourci clavier @@ -27107,7 +27108,7 @@ name "sub:Table-des-Matières" \begin_layout Standard La Table des Matières (TdM) est insérée à partir du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -27206,7 +27207,7 @@ Les listes des figures, des tableaux et des algorithmes sont à peu près comme la tables des matières. Vous pouvez les insérer avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -27262,7 +27263,7 @@ name "sub:URLs" On peut insérer des liens vers des pages web ou des adresses mail grâce au menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator URL \family default . @@ -27332,7 +27333,7 @@ name "sub:Hyperliens" \begin_layout Standard On insère des hyperliens avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Hyperlien \family default ou avec le bouton @@ -27395,7 +27396,7 @@ Les hyperliens seront coupés automatiquement en fin de ligne dans une sortie Pour modifier le style du texte du lien, sélectionnez l'insert de l'hyperlien et utilisez la fenêtre de dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style de texte \family default . @@ -27637,7 +27638,7 @@ latexcompanion A tout endroit de votre document vous pouvez faire référence à la clé de votre entrée bibliographique, soit en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Citation \family default , soit en utilisant le bouton @@ -27810,7 +27811,7 @@ vous trouverez une sélection de programmes pour gérer des bases de données Pour utiliser une base de données dans votre document, utilisez le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -28190,7 +28191,7 @@ name "sec:Index" \begin_layout Standard Une entrée d'index est créée en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Entrée \begin_inset space ~ \end_inset @@ -28212,7 +28213,7 @@ arg "index-insert" \begin_layout Standard L'index lui même est inséré dans le document avec le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -29191,7 +29192,7 @@ Ajouter Une fois ces modifications faites, vous devez retrouver le nouvel index dans \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -29204,7 +29205,7 @@ TdM \family default : le menu \family sans -Insérer +Insertion \family default doit faire apparaître une entrée pour chacun des index supplémentaires que vous avez définis. @@ -29332,7 +29333,7 @@ key "TeXCatalogue" Une entrée de glossaire est créée en plaçant le curseur juste après le symbole que l'on veut référencer en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Entrée \begin_inset space ~ \end_inset @@ -29483,7 +29484,7 @@ reference "sub:Syntaxe-de-Latex" \begin_layout Standard Vous ne pouvez pas utiliser le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -30015,7 +30016,7 @@ Glossaire ! Impression \begin_layout Standard Pour imprimer le glossaire dans votre document, utilisez \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes \begin_inset space ~ \end_inset @@ -30212,7 +30213,7 @@ Dans ces cas, LyX permet de créer plusieurs branches pour le même document. Le texte n'apparaîtra dans la sortie que si sa branche est activée. Pour créer une branche, vous pouvez utiliser \family sans - Insérer\SpecialChar \menuseparator + Insertion\SpecialChar \menuseparator Branche\SpecialChar \menuseparator Insérer une nouvelle branche \family default @@ -30249,7 +30250,7 @@ branches inconnues Le texte qui est spécifique à une branche est mis dans des boîtes de branche. Ces boîtes sont insérées en passant par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Branche \family default où vous pouvez choisir la branche à laquelle doit être rattaché le texte. @@ -30763,7 +30764,7 @@ Mais ne vous inquiétez pas, vous pouvez quand même utiliser votre paquetage Vous n'aurez qu'à les placer dans une boîte de code TeX. On crée une boîte de code TeX soit en utilisant le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code \begin_inset space ~ \end_inset @@ -31633,7 +31634,7 @@ trois Pour le paramétrage, vous aurez besoin de quelques commandes LaTeX insérée en code TeX (menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code \begin_inset space ~ \end_inset @@ -32289,7 +32290,7 @@ En dehors des mathématiques, il y a d'autres cas qui peuvent nécessiter par LyX. Pour ce faire, insérez un insert d'aperçu via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Aperçu \family default , ou collez ce que vous voulez voir dans un tel insert. @@ -32671,7 +32672,7 @@ Rechercher et remplacer est activée par le menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Rechercher et remplacer (élaboré) \family default (raccourci @@ -32997,7 +32998,7 @@ Rechercher . Ceci se fait par le menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Insérer une expression régulière \family default quand le curseur est dans l'éditeur @@ -34018,7 +34019,7 @@ arg "change-next" \begin_layout Plain Layout \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Modification \begin_inset space ~ \end_inset @@ -34295,7 +34296,7 @@ arg "note-insert" \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note\SpecialChar \menuseparator Note \begin_inset space ~ @@ -34330,7 +34331,7 @@ arg "note-next" \begin_layout Plain Layout \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -38518,12 +38519,12 @@ Vous propose d'enregistrer tous les documents non enregistrés et puis quitte. \end_layout \begin_layout Section -Le menu Éditer +Le menu Édition \begin_inset Index idx status collapsed \begin_layout Plain Layout -Menu ! Éditer +Menu ! Édition \end_layout \end_inset @@ -38796,12 +38797,12 @@ reference "sub:Profondeur-section" \end_layout \begin_layout Section -Le menu Visionner +Le menu Affichage \begin_inset Index idx status collapsed \begin_layout Plain Layout -Menu ! Visionner +Menu ! Affichage \end_layout \end_inset @@ -39290,12 +39291,12 @@ reference "sec:Barres-d'Outils" \end_layout \begin_layout Section -Le menu Insérer +Le menu Insertion \begin_inset Index idx status collapsed \begin_layout Plain Layout -Menu ! Insérer +Menu ! Insertion \end_layout \end_inset @@ -40546,12 +40547,12 @@ reference "sec:Aperçu-de-morceaux" \end_layout \begin_layout Section -Le menu Naviguer +Le menu Navigation \begin_inset Index idx status collapsed \begin_layout Plain Layout -Menu ! Naviguer +Menu ! Navigation \end_layout \end_inset @@ -40590,7 +40591,7 @@ Avec ce menu, vous pouvez définir vos propres signets. 2.5 et utilisez le menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets\SpecialChar \menuseparator Enregistrer \begin_inset space ~ @@ -40631,7 +40632,7 @@ Signet Maintenant vous pouvez facilement sauter entre ces deux sections en utilisant le menu (tous les signets sont listés en bas du menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets \family default ) ou les raccourcis claviers @@ -41440,7 +41441,7 @@ orthographique \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Annuler \end_layout @@ -41470,7 +41471,7 @@ Annuler \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Refaire \end_layout @@ -41500,7 +41501,7 @@ Refaire \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Couper \end_layout @@ -41530,7 +41531,7 @@ Couper \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Copier \end_layout @@ -41560,7 +41561,7 @@ Copier \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Coller \end_layout @@ -41590,7 +41591,7 @@ Coller \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Rechercher \begin_inset space ~ \end_inset @@ -41628,7 +41629,7 @@ remplacer \begin_layout Plain Layout \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets\SpecialChar \menuseparator Naviguer en arrière \end_layout @@ -41659,7 +41660,7 @@ Naviguer en arrière \begin_layout Plain Layout Mise en évidence, fonction du dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -41697,7 +41698,7 @@ texte \begin_layout Plain Layout Donner le style nom propre au texte, fonction du dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -41735,7 +41736,7 @@ texte \begin_layout Plain Layout Donner au texte le dernier style sélectionné dans le dialogue \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -41773,7 +41774,7 @@ texte \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Formule \begin_inset space ~ @@ -41812,7 +41813,7 @@ ligne \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Graphique \end_layout @@ -41842,7 +41843,7 @@ Graphique \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Tableau \end_layout @@ -42147,7 +42148,7 @@ Description \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Augmenter \begin_inset space ~ \end_inset @@ -42185,7 +42186,7 @@ profondeur \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Réduire \begin_inset space ~ \end_inset @@ -42223,7 +42224,7 @@ profondeur \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Figure \end_layout @@ -42254,7 +42255,7 @@ Figure \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottant\SpecialChar \menuseparator Tableau \end_layout @@ -42285,7 +42286,7 @@ Tableau \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Étiquette \end_layout @@ -42315,7 +42316,7 @@ Insérer\SpecialChar \menuseparator \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Référence croisée \end_layout @@ -42345,7 +42346,7 @@ Référence croisée \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Citation \end_layout @@ -42375,7 +42376,7 @@ Citation \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Entrée \begin_inset space ~ \end_inset @@ -42409,7 +42410,7 @@ d'index \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Entrée \begin_inset space ~ \end_inset @@ -42447,7 +42448,7 @@ glossaire \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -42493,7 +42494,7 @@ page \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note \begin_inset space ~ \end_inset @@ -42531,7 +42532,7 @@ marge \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Note\SpecialChar \menuseparator Note \begin_inset space ~ @@ -42566,7 +42567,7 @@ LyX \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Boîte \end_layout @@ -42596,7 +42597,7 @@ Boîte \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator URL \end_layout @@ -42626,7 +42627,7 @@ URL \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Code T \family default @@ -42671,7 +42672,7 @@ eX \begin_layout Plain Layout \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Fichier\SpecialChar \menuseparator Sous-document \end_layout @@ -42702,7 +42703,7 @@ Sous-document \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style \begin_inset space ~ \end_inset @@ -42740,7 +42741,7 @@ texte \begin_layout Plain Layout \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Paramètres \begin_inset space ~ \end_inset @@ -42871,7 +42872,7 @@ arg "buffer-view" \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Visionner \end_layout @@ -42901,7 +42902,7 @@ arg "buffer-update" \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mettre à jour \end_layout @@ -42931,7 +42932,7 @@ arg "master-buffer-view" \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Visionner le document maître \end_layout @@ -42961,7 +42962,7 @@ arg "master-buffer-update" \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mettre à jour le document maître \end_layout @@ -43025,7 +43026,7 @@ Synchroniser avec le résultat imprimable \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Visionner (autres formats) \end_layout @@ -43055,7 +43056,7 @@ Visionner (autres formats) \begin_layout Plain Layout \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Mettre à jour (autres formats) \end_layout @@ -45060,11 +45061,7 @@ du \begin_inset space ~ \end_inset -résultat est le format utilisé quand vous sél -\begin_inset Quotes frd -\end_inset - -ctionnez +résultat est le format utilisé quand vous sélectionnez \begin_inset Quotes fld \end_inset @@ -45084,7 +45081,11 @@ Mettre à jour \begin_inset Quotes fld \end_inset -Visionner le document maître' et +Visionner le document maître +\begin_inset Quotes frd +\end_inset + + et \begin_inset Quotes fld \end_inset @@ -45097,13 +45098,13 @@ mettre à jour le document maître Visionner \family default ou dans la barre d'outils. - La velur implicitee est fixée dans + La velur implicite est fixée dans \family sans Outils\SpecialChar \menuseparator Préférences\SpecialChar \menuseparator Formats \family default - de fichier, see sec. + de fichier, voir sec. \begin_inset space \thinspace{} \end_inset @@ -45136,7 +45137,7 @@ résultat imprimable positionne les réglages pour le menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Recherche \begin_inset space ~ \end_inset @@ -45445,7 +45446,7 @@ LyX Maintenant voyons un exemple: supposons que nous utilisions souvent le menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Signets \family default et que de ce fait nous voulions un signet supplémentaire, vous pouvez ajouter @@ -47446,7 +47447,7 @@ Recherche directe définit les commandes à utiliser pour la rubrique de menu \family sans -Naviguer\SpecialChar \menuseparator +Navigation\SpecialChar \menuseparator Recherche \begin_inset space ~ \end_inset @@ -48148,7 +48149,7 @@ Mettre à jour le document maître \family default du menu \family sans -Visionner +Affichage \family default ou de la barre d'outils \end_layout diff --git a/lib/examples/fr/Braille.lyx b/lib/examples/fr/Braille.lyx index 7f211986a1..fff96adb2a 100644 --- a/lib/examples/fr/Braille.lyx +++ b/lib/examples/fr/Braille.lyx @@ -534,7 +534,7 @@ Les caractères Braille peuvent être également créés en saisissant un nombre dans une boîte Braille. Une boîte Braille est insérée à l'aide du menu \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Inserts \begin_inset space ~ \end_inset diff --git a/lib/examples/fr/linguistics.lyx b/lib/examples/fr/linguistics.lyx index 9f33f7e804..ea048c5d17 100644 --- a/lib/examples/fr/linguistics.lyx +++ b/lib/examples/fr/linguistics.lyx @@ -330,7 +330,7 @@ Un de plus Les références aux exemples sont créés comme d'habitude: insérer une étiquette dans l'exemple et une référence via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Références croisées \family default . @@ -367,7 +367,7 @@ Gloses Le module linguistique offre deux sortes de gloses, qui peuvent être insérées, via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Inserts personnalisables \family default . @@ -589,9 +589,9 @@ Du fait que le texte des gloses est transmis tel quel à LaTeX, LyX ne modifie \begin_deeper \begin_layout Itemize -soit vous saisissez le texte en dehors de la glose, ouvez +soit vous saisissez le texte en dehors de la glose, ouvrez \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Afficher le code LaTeX \family default et copiez le code LaTeX dans la glose; @@ -601,7 +601,7 @@ Afficher le code LaTeX soit vous marquez la totalité de la glose (bornes comprises) et vous positionnez la langue appropriée via \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Langue\SpecialChar \menuseparator Autre langues \family default @@ -643,7 +643,7 @@ Des sauts de page peuvent apparaître dans des gloses, ce qui est bien entendu regrettable. Une solution consiste à inclure les gloses dans des boîtes (via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Boîte\SpecialChar \menuseparator Sans cadre \family default @@ -832,7 +832,7 @@ Liste des tableaux Le module linguistique permet de gérer les deux. Avec \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Flottants \family default , vous pourrez créer un tableau (TO) flottant: @@ -1182,7 +1182,7 @@ Liste des tableaux (TO) \emph default est accessible via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Listes & TdM \family default . @@ -1252,7 +1252,7 @@ signification \begin_layout Standard Vous pouvez insérer les styles de caractères via le sous-menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Style de texte \family default . @@ -1359,7 +1359,7 @@ Affichage écran. \begin_layout Standard Les symboles phonétiques peuvent être saisis via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère spécial\SpecialChar \menuseparator Symboles phonétiques. @@ -1403,7 +1403,7 @@ g. via \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère spécial\SpecialChar \menuseparator Symboles\SpecialChar \ldots{} @@ -1424,7 +1424,7 @@ la saisie directe peut conduire à un mélange de polices (dans l'exemple vu plus haut, les caractères latins appartiennent à la police de base, les glyphes API à la police API, alors que \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Caractère spécial\SpecialChar \menuseparator Symboles phonétiques \family default diff --git a/lib/examples/fr/splash.lyx b/lib/examples/fr/splash.lyx index 49c2480a61..3e1faf1c33 100644 --- a/lib/examples/fr/splash.lyx +++ b/lib/examples/fr/splash.lyx @@ -107,7 +107,7 @@ constructeur de documents \begin_layout Enumerate Les résultats de mise en page de LyX sont très esthétiques! Faites \family sans -Visionner\SpecialChar \menuseparator +Affichage\SpecialChar \menuseparator Visionner \begin_inset space ~ \end_inset diff --git a/lib/examples/fr/xypic.lyx b/lib/examples/fr/xypic.lyx index 6411f30fe5..55b1b52572 100644 --- a/lib/examples/fr/xypic.lyx +++ b/lib/examples/fr/xypic.lyx @@ -558,7 +558,7 @@ ar[r] & B} \begin_layout Enumerate Sélectionner tout ce texte et choisir \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Math\SpecialChar \menuseparator Formule hors ligne \family default @@ -1976,7 +1976,7 @@ Ctrl-M Les diagrammes disposés en ligne peuvent être positionnés hors ligne plus tard, via \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math \family default @@ -2617,7 +2617,7 @@ Alt-m c i Ensuite, vous pourrez ajouter lignes et colonnes quand vous le désirerez, en utilisant les commandes du menu \family sans -Éditer\SpecialChar \menuseparator +Édition\SpecialChar \menuseparator Math, \family default leurs raccourcis qui débutent par @@ -3375,7 +3375,7 @@ Cette astuce a deux inconvénients mineurs: d'abord, elle ne fonctionne pas suivant ou le paragraphe précédent (sauf a créer un espacement négatif à l'aide de \family sans -Insérer\SpecialChar \menuseparator +Insertion\SpecialChar \menuseparator Typographie spéciale\SpecialChar \menuseparator \family typewriter From 39e23a8c5c322da6c8c755ea75de154c506d957d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 3 Nov 2012 23:56:29 +0100 Subject: [PATCH 31/93] Let lyxclient.cpp be cleaned by make clean. I would wait with backporting for 2.0.6. --- src/client/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 09444ef63c..a79b720aa3 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -41,6 +41,7 @@ if MONOLITHIC_CLIENT AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES) BUILT_SOURCES = lyxclient.cpp +CLEANFILES += lyxclient.cpp lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES) From 22d4b628ed5d2d7cc514ce297bccddaf28c5323e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 4 Nov 2012 00:12:13 +0100 Subject: [PATCH 32/93] French Additional.lyx: correct porting there was a section that is for a new feature in lyX 2.1 and I accidentally overwrote this in previous commit --- lib/doc/fr/Additional.lyx | 1161 +++++++++++++++++++++++++++++++------ 1 file changed, 999 insertions(+), 162 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index d62856b5c6..a2aabe8688 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -46,6 +46,7 @@ logicalmkup theorems-ams theorems-ams-extended +multicol \end_modules \maintain_unincluded_children false \begin_local_layout @@ -111,6 +112,7 @@ End \paperorientation portrait \suppress_date false \use_refstyle 1 +\notefontcolor #0000ff \index Index \shortcut idx \color #008000 @@ -24479,102 +24481,114 @@ Multi-colonnes \end_layout \begin_layout Standard -Le but de ce paragraphe est de montrer comment utiliser le paquetage -\series bold -multicol -\series default - dans un document LyX. - LyX ne connaît pas encore le paquetage, vous devrez donc utiliser du code - TeX. - + +\lang english +This feature is independent of the option +\family sans +Two-column document +\family default + in the document settings under +\family sans +Text Layout +\family default +. + If you want to have 2 +\begin_inset space ~ +\end_inset + +columns for the whole document, it is recommended to use the +\family sans +Two-column document +\family default + option. + For all other cases use this feature. \end_layout \begin_layout Standard -Le paquetage + +\lang english +To use multiple text columns in your document, you have to load the module + +\family sans +Multiple Columns +\family default + (menu +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +Modules +\family default +) and must have the LaTeX-package \series bold multicol \series default - permet de -\begin_inset Quotes frd -\end_inset -commuter entre une et plusieurs colonnes dans la même page. - Les notes de bas de page sont correctement gérées, mais seront placées - en bas de la page et non pas en bas de chaque colonne. - Au sein de chaque colonne, vous pouvez utiliser n'importe quelle construction, - à ceci près que l'option -\begin_inset Flex MenuItem +\begin_inset Index idx status collapsed \begin_layout Plain Layout -Plusieurs colonnes + +\lang english +LaTeX-packages ! multicol \end_layout \end_inset - doit être positionnée pour les flottants. + installed. +\end_layout + +\begin_layout Standard + +\lang english +Footnotes within multiple columns will be placed at the bottom of the page + and not under each column. + Within the different columns you can use everything, with the limitation + that for floats you need to use the float option +\family sans +Span columns +\family default +. \end_layout \begin_layout Subsection -Deux Colonnes -\end_layout -\begin_layout Standard -Si vous voulez avoir deux colonnes dans votre texte, il faut insérer +\lang english +Basics \end_layout \begin_layout Standard -\series bold - -\backslash -begin{multicols}{2} -\end_layout - -\begin_layout Standard -en mode LaTeX à l'endroit où vous voulez démarrer la disposition en deux - colonnes, et -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -end{multicols} -\end_layout - -\begin_layout Standard -là où vous voulez qu'elle se termine. - Comme ceci -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -NdT : Les lecteurs anglophobes me pardonneront, mais je ne me lance pas - à traduire des passages de Sherlock Holmes. - :-) – of -\end_layout - +\lang english +If you want to have 2 columns in your text, use the style +\family sans +Begin Multiple Columns +\family default + where the columns should start. + The content of the style is the number of the columns, so in this case + use a +\begin_inset Quotes eld \end_inset - : +2 +\begin_inset Quotes erd +\end_inset + +. + At the point where the columns should end use the style +\family sans +End Multiple Columns +\family default + and keep it empty. \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} +\lang english +Here is an example: \end_layout -\end_inset - - +\begin_layout Begin Multiple Columns +2 \end_layout \begin_layout Standard @@ -24621,46 +24635,24 @@ ty which utterly submerged my mind. only withdrawn upon the third of last month. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed +\begin_layout End Multiple Columns -\begin_layout Plain Layout - - -\backslash -end{multicols} \end_layout +\begin_layout Standard + +\lang english +Here is an example with 3 +\begin_inset space ~ \end_inset - +columns: \end_layout -\begin_layout Subsection -Colonnes Multiples -\end_layout - -\begin_layout Standard -Le même schéma s'applique si vous voulez plus de deux colonnes (vous pouvez - avoir plus de 3 colonnes si vous voulez, mais ça risque de ne pas être - très agréable à regarder.) -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{multicols}{3} -\end_layout - -\end_inset - +\begin_layout Begin Multiple Columns +\lang english +3 \end_layout \begin_layout Standard @@ -24688,28 +24680,26 @@ It can be imagined that my close intimacy with Sherlock Holmes had interested as they were known to the public at the conclusion of the inquest. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{multicols} -\end_layout - -\end_inset - +\begin_layout End Multiple Columns \end_layout \begin_layout Standard -Vous pouvez sans problème avoir plus de 3 + +\lang english +You can have up to 10 \begin_inset space ~ \end_inset -colonnes, si vous le voulez, mais ce n'est plus très agréable à lire. +columns if you want to, but that might not be very pleasant for the readers + of your document. +\end_layout + +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + \end_layout \begin_layout Subsection @@ -24720,20 +24710,8 @@ Des Colonnes dans une Colonne Vous pouvez même avoir des colonnes dans une colonne : \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} -\end_layout - -\end_inset - - +\begin_layout Begin Multiple Columns +2 \end_layout \begin_layout Standard @@ -24747,20 +24725,8 @@ The Honourable Ronald Adair was the second son of the Earl of Maynooth, at 427 Park Lane. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} -\end_layout - -\end_inset - - +\begin_layout Begin Multiple Columns +2 \end_layout \begin_layout Standard @@ -24779,19 +24745,7 @@ The youth moved in the best society–had, so far as was known, no enemies on the night of March 30, 1894. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{multicols} -\end_layout - -\end_inset - +\begin_layout End Multiple Columns \end_layout @@ -24823,15 +24777,131 @@ The evidence of those who had played with him– Mr. So much for his recent history as it came out at the inquest. \end_layout +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Subsection + +\lang english +Advanced Examples +\end_layout + \begin_layout Standard + +\lang english +The examples in this section show some more special features of multiple + columns. +\end_layout + +\begin_layout Standard + +\lang english +For more features of multiple columns, have a look at the documentation + of the LaTeX-package +\series bold +multicol +\series default + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout + +\lang english +LaTeX-packages ! multicol +\end_layout + +\end_inset + + +\lang french +, +\begin_inset CommandInset citation +LatexCommand cite +key "multicol" + +\end_inset + +. +\end_layout + +\begin_layout Subsubsection + +\lang english +Preface +\end_layout + +\begin_layout Standard + +\lang english +To add a preface text for multiple columns, add the command +\end_layout + +\begin_layout Standard + +\series bold +}[ +\end_layout + +\begin_layout Standard + +\lang english +as TeX Code behind the number of columns in the +\family sans + Begin Multiple Columns +\family default + style. + behind the command write the text. + At the end of the style use the command +\end_layout + +\begin_layout Standard + +\series bold +]{ +\end_layout + +\begin_layout Standard + +\lang english +as TeX Code. + An example with some preface text: +\end_layout + +\begin_layout Standard + +\lang english +\begin_inset VSpace bigskip +\end_inset + + +\end_layout + +\begin_layout Begin Multiple Columns +2 \begin_inset ERT status collapsed \begin_layout Plain Layout +}[ +\end_layout -\backslash -end{multicols} +\end_inset + + +\lang english +And the story continues and continues and continues and continues +\lang french +\SpecialChar \ldots{} + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +]{ \end_layout \end_inset @@ -24840,12 +24910,743 @@ end{multicols} \end_layout \begin_layout Standard -Veuillez lire le fichier -\family typewriter -d'exemple MultiColonnes.lyx -\family default - pour des exemples plus complexes avec l'espacement des colonnes et de l'en-tête -, les lignes de séparation verticale, et plus encore. + +\size small +\lang english +On the evening of the crime, he returned from the club exactly at ten. + His mother and sister were out spending the evening with a relation. + The servant deposed that she heard him enter the front room on the second + floor, generally used as his sitting-room. + She had lit a fire there, and as it smoked she had opened the window. + No sound was heard from the room until eleven-twenty, the hour of the return + of Lady Maynooth and her daughter. + Desiring to say good-night, she attempted to enter her son's room. + The door was locked on the inside, and no answer could be got to their + cries and knocking. + Help was obtained, and the door forced. + The unfortunate young man was found lying near the table. + His head had been horribly mutilated by an expanding revolver bullet, but + no weapon of any sort was to be found in the room. +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Standard + +\lang english +You can also use a section heading as the preface if you use a section command + as TeX Code behind the first TeX Code. + For example the command +\end_layout + +\begin_layout Standard + +\series bold +\lang english + +\backslash +subsection{subsection title} +\end_layout + +\begin_layout Standard + +\lang english +creates a subsection. + In this example the preface is a subsubsection: +\end_layout + +\begin_layout Begin Multiple Columns + +\lang english +2 +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +}[ +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +subsubsection{ +\end_layout + +\end_inset + +This is a subsubsection heading as a preface +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +]{ +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\size small +\lang english +A minute examination of the circumstances served only to make the case more + complex. + In the first place, no reason could be given why the young man should have + fastened the door upon the inside. + There was the possibility that the murderer had done this, and had afterwards + escaped by the window. + The drop was at least twenty feet, however, and a bed of crocuses in full + bloom lay beneath. + Neither the flowers nor the earth showed any sign of having been disturbed, + nor were there any marks upon the narrow strip of grass which separated + the house from the road. + Apparently, therefore, it was the young man himself who had fastened the + door. + But how did he come by his death? No one could have climbed up to the window + without leaving traces. + Suppose a man had fired through the window, he would indeed be a remarkable + shot who could with a revolver inflict so deadly a wound. + Again, Park Lane is a frequented thoroughfare; there is a cab stand within + a hundred yards of the house. + No one had heard a shot. +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Standard + +\lang english +If there is less vertical space left on the page at the beginning of the + multiple columns than needed for 6 +\begin_inset space ~ +\end_inset + +text lines, a page break will be inserted before the multiple columns. + Depending on the number of lines of the preface text, you might want to + change this value. + It is determined by inserting the command +\end_layout + +\begin_layout Standard + +\series bold +][number +\backslash +baselineskip +\end_layout + +\begin_layout Standard + +\lang english +as TeX Code behind the preface definition but before the final +\series bold +]{ +\series default + command. + +\emph on +number +\emph default + is hereby the number of text lines. + In this example the space is set to 7 +\begin_inset space ~ +\end_inset + +text lines: +\end_layout + +\begin_layout Begin Multiple Columns +2 +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +}[ +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +subsubsection{ +\end_layout + +\end_inset + + +\lang english +This is the sectioning command +\begin_inset Newline newline +\end_inset + +as a preface and +\begin_inset Newline newline +\end_inset + +with multiple text lines +\lang french + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +} +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +][7 +\backslash +baselineskip +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + +]{ +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\size small +\lang english +On the evening of the crime, he returned from the club exactly at ten. + His mother and sister were out spending the evening with a relation. + The servant deposed that she heard him enter the front room on the second + floor, generally used as his sitting-room. + She had lit a fire there, and as it smoked she had opened the window. + No sound was heard from the room until eleven-twenty, the hour of the return + of Lady Maynooth and her daughter. + Desiring to say good-night, she attempted to enter her son's room. + The door was locked on the inside, and no answer could be got to their + cries and knocking. + Help was obtained, and the door forced. + The unfortunate young man was found lying near the table. + His head had been horribly mutilated by an expanding revolver bullet, but + no weapon of any sort was to be found in the room. +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Subsubsection + +\lang english +Surrounding Space +\end_layout + +\begin_layout Standard + +\lang english +The amount of space before and after multiple columns can be changed by + changing the length +\series bold + +\backslash +multicolsep +\series default +. + For example the command +\end_layout + +\begin_layout Standard + +\series bold +\lang english + +\backslash +setlength{ +\backslash +multicolsep}{3cm} +\end_layout + +\begin_layout Standard + +\lang english +in TeX Code changes its value to 3 +\begin_inset space \thinspace{} +\end_inset + +cm. + The change must be made before the multiple columns' start. + The predefined value is 13 +\begin_inset space \thinspace{} +\end_inset + +pt. +\end_layout + +\begin_layout Standard + +\lang english +For this example +\series bold + +\backslash +multicolsep +\series default + was set to 2.5 +\begin_inset space \thinspace{} +\end_inset + +cm: +\end_layout + +\begin_layout Standard +\begin_inset ERT +status open + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +multicolsep}{2.5cm} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Begin Multiple Columns +2 +\end_layout + +\begin_layout Standard + +\size small +\lang english +All day I turned these facts over in my mind, endeavouring to hit upon some + theory which could reconcile them all, and to find that line of least resistanc +e which my poor friend had declared to be the starting-point of every investigat +ion. + I confess that I made little progress. + In the evening I strolled across the Park, and found myself about six o'clock + at the Oxford Street end of Park Lane. + A group of loafers upon the pavements, all staring up at a particular window, + directed me to the house which I had come to see. + A tall, thin man with coloured glasses, whom I strongly suspected of being + a plain-clothes detective, was pointing out some theory of his own, while + the others crowded round to listen to what he said. + I got as near him as I could, but his observations seemed to me to be absurd, + so I withdrew again in some disgust. + As I did so I struck against an elderly, deformed man, who had been behind + me, and I knocked down several books which he was carrying. +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Standard + +\lang english +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +\lang english +Note: +\series default + The values you set with +\series bold + +\backslash +setlength +\series default + will be used for all following multiple columns until to change them again. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +multicolsep}{13pt} +\end_layout + +\end_inset + + +\lang english + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\lang english +go back to the default +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Subsubsection + +\lang english +Column Separation +\end_layout + +\begin_layout Standard + +\lang english +The width of the columns is automatically calculated, but you can modify + the space between the columns. + This is done by changing the length +\series bold + +\backslash +columnsep +\series default +. + Its predefined value is 10 +\begin_inset space \thinspace{} +\end_inset + +pt. + Here is an example where +\series bold + +\backslash +columnsep +\series default + is set to 3 +\begin_inset space \thinspace{} +\end_inset + +cm: +\end_layout + +\begin_layout Standard +\begin_inset ERT +status open + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +columnsep}{3cm} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Begin Multiple Columns +2 +\end_layout + +\begin_layout Standard + +\size small +\lang english +My observations of No. +\begin_inset space \space{} +\end_inset + +427 Park Lane did little to clear up the problem in which I was interested. + The house was separated from the street by a low wall and railing, the + whole not more than five feet high. + It was perfectly easy, therefore, for anyone to get into the garden, but + the window was entirely inaccessible, since there was no water pipe or + anything which could help the most active man to climb it. + More puzzled than ever, I retraced my steps to Kensington. + I had not been in my study five minutes when the maid entered to say that + a person desired to see me. + To my astonishment it was none other than my strange old book collector, + his sharp, wizened face peering out from a frame of white hair, and his + precious volumes, a dozen of them at least, wedged under his right arm. +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +columnsep}{10pt} +\end_layout + +\end_inset + + +\lang english + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\lang english +go back to the default +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Subsubsection + +\lang english +Vertical Lines +\end_layout + +\begin_layout Standard + +\lang english +Between the columns a rule with a width of the length +\series bold + +\backslash +columnseprule +\series default + is placed. + If this rule width is set to 0 +\begin_inset space \thinspace{} +\end_inset + +pt (this is the default), the rule is suppressed. + In the following example, the line separating the columns is 2 +\begin_inset space \thinspace{} +\end_inset + +pt wide. +\end_layout + +\begin_layout Standard +\begin_inset ERT +status open + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +columnseprule}{2pt} +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Begin Multiple Columns +2 +\end_layout + +\begin_layout Standard + +\size small +\lang english +\begin_inset Quotes eld +\end_inset + +You're surprised to see me, sir, +\begin_inset Quotes erd +\end_inset + + said he, in a strange, croaking voice. +\end_layout + +\begin_layout Standard + +\size small +\lang english +I acknowledged that I was. +\end_layout + +\begin_layout Standard + +\size small +\lang english +\begin_inset Quotes eld +\end_inset + +Well, I've a conscience, sir, and when I chanced to see you go into this + house, as I came hobbling after you, I thought to myself, I'll just step + in and see that kind gentleman, and tell him that if I was a bit gruff + in my manner there was not any harm meant, and that I am much obliged to + him for picking up my books. +\begin_inset Quotes erd +\end_inset + + +\end_layout + +\begin_layout Standard + +\size small +\lang english +\begin_inset Quotes eld +\end_inset + +You make too much of a trifle, +\begin_inset Quotes erd +\end_inset + + said I. + +\begin_inset Quotes eld +\end_inset + +May I ask how you knew who I was? +\begin_inset Quotes erd +\end_inset + + +\end_layout + +\begin_layout Standard + +\size small +\lang english +\begin_inset Quotes eld +\end_inset + +Well, sir, if it isn't too great a liberty, I am a neighbour of yours, for + you'll find my little bookshop at the corner of Church Street, and very + happy to see you, I am sure. + Maybe you collect yourself, sir. + Here's +\noun on +British +\begin_inset space ~ +\end_inset + +Birds +\noun default +, and +\noun on +Catullus +\noun default +, and +\noun on +The Holy War +\noun default +--a bargain, every one of them. + With five volumes you could just fill that gap on that second shelf. + It looks untidy, does it not, sir? +\begin_inset Quotes erd +\end_inset + + +\end_layout + +\begin_layout End Multiple Columns + +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +setlength{ +\backslash +columnseprule}{0pt} +\end_layout + +\end_inset + + +\lang english + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\lang english +go back to the default +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -25157,6 +25958,42 @@ end{sloppypar} \end_inset +\end_layout + +\begin_layout Bibliography +\begin_inset CommandInset bibitem +LatexCommand bibitem +key "multicol" + +\end_inset + + +\lang english +Documentation of the LaTeX-package +\lang french + +\begin_inset CommandInset href +LatexCommand href +name "multicol" +target "http://mirror.ctan.org/macros/latex/required/tools/multicol.pdf" + +\end_inset + + +\lang english + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout + +\lang english +LaTeX-packages ! multicol +\end_layout + +\end_inset + + \end_layout \end_body From 0a9735c5f7bbbaa24ac2e3e4fa745c6dfbc95a18 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 01:18:16 +0100 Subject: [PATCH 33/93] LyX 2.1 will support only Qt>=4.5. (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg175737.html) Now start with simple cases. --- src/frontends/qt4/FileDialog.cpp | 2 - src/frontends/qt4/GuiApplication.cpp | 6 -- src/frontends/qt4/GuiSymbols.cpp | 4 -- src/frontends/qt4/GuiView.cpp | 96 +--------------------------- src/frontends/qt4/GuiWorkArea.cpp | 18 ------ src/frontends/qt4/InGuiThread.h | 4 -- src/frontends/qt4/LyXFileDialog.cpp | 8 --- src/frontends/qt4/TocModel.cpp | 4 -- src/support/FileName.cpp | 6 -- src/support/lyxtime.cpp | 37 ----------- 10 files changed, 3 insertions(+), 182 deletions(-) diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp index ca27df9f27..0d6abdc5b6 100644 --- a/src/frontends/qt4/FileDialog.cpp +++ b/src/frontends/qt4/FileDialog.cpp @@ -103,9 +103,7 @@ FileDialog::Result FileDialog::save(QString const & path, result.second = toqstr(os::internal_path(fromqstr(name))); #else LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2); -#if QT_VERSION != 0x040203 dlg.setFileMode(QFileDialog::AnyFile); -#endif dlg.setAcceptMode(QFileDialog::AcceptSave); dlg.setConfirmOverwrite(false); diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 60473c9ff7..424c1af108 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -109,9 +109,7 @@ #include #include #include -#if QT_VERSION >= 0x040400 #include -#endif #include #ifdef Q_WS_X11 @@ -886,12 +884,10 @@ GuiApplication::GuiApplication(int & argc, char ** argv) this, SLOT(handleRegularEvents())); d->general_timer_.start(); -#if QT_VERSION >= 0x040400 // maxThreadCount() defaults in general to 2 on single or dual-processor. // This is clearly not enough in a time where we use threads for // document preview and/or export. 20 should be OK. QThreadPool::globalInstance()->setMaxThreadCount(20); -#endif } @@ -2184,9 +2180,7 @@ QAbstractItemModel * GuiApplication::languageModel() } d->language_model_ = new QSortFilterProxyModel(this); d->language_model_->setSourceModel(lang_model); -#if QT_VERSION >= 0x040300 d->language_model_->setSortLocaleAware(true); -#endif return d->language_model_; } diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index 6bd5ba210a..6e1217d4a7 100644 --- a/src/frontends/qt4/GuiSymbols.cpp +++ b/src/frontends/qt4/GuiSymbols.cpp @@ -425,11 +425,7 @@ void GuiSymbols::updateSymbolList(bool update_combo) char_type c = *it; if (!update_combo && !show_all && (c <= range_start || c >= range_end)) continue; -#if QT_VERSION >= 0x040300 QChar::Category const cat = QChar::category(uint(c)); -#else - QChar::Category const cat = QChar(uint(c)).category(); -#endif // we do not want control or space characters if (cat == QChar::Other_Control || cat == QChar::Separator_Space) continue; diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 4b39cecd05..8ad76d9ba7 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -113,12 +113,9 @@ #define EXPORT_in_THREAD 1 -// QtConcurrent was introduced in Qt 4.4 -#if (QT_VERSION >= 0x040400) #include #include #include -#endif #include "support/bind.h" @@ -342,7 +339,6 @@ struct GuiView::GuiViewPrivate return count; } -#if (QT_VERSION >= 0x040400) void setPreviewFuture(QFuture const & f) { if (processing_thread_watcher_.isRunning()) { @@ -352,7 +348,6 @@ struct GuiView::GuiViewPrivate } processing_thread_watcher_.setFuture(f); } -#endif public: GuiView * gv_; @@ -391,17 +386,12 @@ public: /// TocModels toc_models_; -#if (QT_VERSION >= 0x040400) /// QFutureWatcher autosave_watcher_; QFutureWatcher processing_thread_watcher_; /// string last_export_format; string processing_format; -#else - struct DummyWatcher { bool isRunning(){return false;} }; - DummyWatcher processing_thread_watcher_; -#endif static QSet busyBuffers; static Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format); @@ -468,17 +458,13 @@ GuiView::GuiView(int id) #endif -#if (QT_VERSION >= 0x040300) // use tabbed dock area for multiple docks // (such as "source" and "messages") setDockOptions(QMainWindow::ForceTabbedDocks); -#endif // For Drag&Drop. setAcceptDrops(true); -#if (QT_VERSION >= 0x040400) - // add busy indicator to statusbar QLabel * busylabel = new QLabel(statusBar()); statusBar()->addPermanentWidget(busylabel); @@ -504,8 +490,6 @@ GuiView::GuiView(int id) connect(&d.processing_thread_watcher_, SIGNAL(finished()), this, SLOT(processingThreadFinished())); -#endif - connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)), SLOT(doShowDialog(QString const &, QString const &, Inset *))); @@ -576,8 +560,6 @@ static void handleExportStatus(GuiView * view, Buffer::ExportStatus status, } -#if QT_VERSION >= 0x040400 - void GuiView::processingThreadStarted() { } @@ -609,23 +591,6 @@ void GuiView::autoSaveThreadFinished() updateToolbars(); } -#else - -void GuiView::processingThreadStarted() -{ -} - - -void GuiView::processingThreadFinished() -{ -} - - -void GuiView::autoSaveThreadFinished() -{ -} -#endif - void GuiView::saveLayout() const { @@ -765,29 +730,20 @@ void GuiView::initToolbars() } if (visibility & Toolbars::BOTTOM) { - // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. -#if (QT_VERSION >= 0x040202) if (newline) addToolBarBreak(Qt::BottomToolBarArea); -#endif addToolBar(Qt::BottomToolBarArea, tb); } if (visibility & Toolbars::LEFT) { - // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. -#if (QT_VERSION >= 0x040202) if (newline) addToolBarBreak(Qt::LeftToolBarArea); -#endif addToolBar(Qt::LeftToolBarArea, tb); } if (visibility & Toolbars::RIGHT) { - // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. -#if (QT_VERSION >= 0x040202) if (newline) addToolBarBreak(Qt::RightToolBarArea); -#endif addToolBar(Qt::RightToolBarArea, tb); } @@ -1167,9 +1123,7 @@ bool GuiView::event(QEvent * e) } case QEvent::ShortcutOverride: { - -// See bug 4888 -#if (!defined Q_WS_X11) || (QT_VERSION >= 0x040500) + // See bug 4888 if (isFullScreen() && menuBar()->isHidden()) { QKeyEvent * ke = static_cast(e); // FIXME: we should also try to detect special LyX shortcut such as @@ -1181,7 +1135,6 @@ bool GuiView::event(QEvent * e) return QMainWindow::event(e); } } -#endif return QMainWindow::event(e); } @@ -1487,7 +1440,7 @@ void GuiView::errors(string const & error_type, bool from_master) if (!bv) return; -#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) +#if EXPORT_in_THREAD // We are called with from_master == false by default, so we // have to figure out whether that is the case or not. ErrorList & el = bv->buffer().errorList(error_type); @@ -1569,7 +1522,6 @@ BufferView const * GuiView::currentBufferView() const } -#if (QT_VERSION >= 0x040400) docstring GuiView::GuiViewPrivate::autosaveAndDestroy( Buffer const * orig, Buffer * clone) { @@ -1580,7 +1532,6 @@ docstring GuiView::GuiViewPrivate::autosaveAndDestroy( ? _("Automatic save done.") : _("Automatic save failed!"); } -#endif void GuiView::autoSave() @@ -3082,7 +3033,6 @@ bool GuiView::goToFileRow(string const & argument) } -#if (QT_VERSION >= 0x040400) template Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * clone, string const & format) { @@ -3117,32 +3067,6 @@ Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * o return runAndDestroy(lyx::bind(mem_func, clone, _1), orig, clone, format); } -#else - -// not used, but the linker needs them - -Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy( - Buffer const *, Buffer *, string const &) -{ - return Buffer::ExportSuccess; -} - - -Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy( - Buffer const *, Buffer *, string const &) -{ - return Buffer::ExportSuccess; -} - - -Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy( - Buffer const *, Buffer *, string const &) -{ - return Buffer::ExportSuccess; -} - -#endif - bool GuiView::GuiViewPrivate::asyncBufferProcessing( string const & argument, @@ -3159,7 +3083,7 @@ bool GuiView::GuiViewPrivate::asyncBufferProcessing( if (format.empty()) format = used_buffer->params().getDefaultOutputFormat(); processing_format = format; -#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) +#if EXPORT_in_THREAD if (!msg.empty()) { progress_->clearMessages(); gv_->message(msg); @@ -3273,13 +3197,6 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), dr); break; } -#if QT_VERSION < 0x040400 - if (!doc_buffer->doExport(argument, false)) { - dr.setError(true); - dr.setMessage(bformat(_("Error exporting to format: %1$s"), - cmd.argument())); - } -#else /* TODO/Review: Is it a problem to also export the children? See the update_unincluded flag */ d.asyncBufferProcessing(argument, @@ -3289,7 +3206,6 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) &Buffer::doExport, 0); // TODO Inform user about success -#endif break; } @@ -3787,7 +3703,6 @@ bool GuiView::lfunUiToggle(string const & ui_component) } else if (ui_component == "menubar") { menuBar()->setVisible(!menuBar()->isVisible()); } else -#if QT_VERSION >= 0x040300 if (ui_component == "frame") { int l, t, r, b; getContentsMargins(&l, &t, &r, &b); @@ -3799,7 +3714,6 @@ bool GuiView::lfunUiToggle(string const & ui_component) setContentsMargins(0, 0, 0, 0); } } else -#endif if (ui_component == "fullscreen") { toggleFullScreen(); } else @@ -3813,9 +3727,7 @@ void GuiView::toggleFullScreen() if (isFullScreen()) { for (int i = 0; i != d.splitter_->count(); ++i) d.tabWorkArea(i)->setFullScreen(false); -#if QT_VERSION >= 0x040300 setContentsMargins(0, 0, 0, 0); -#endif setWindowState(windowState() ^ Qt::WindowFullScreen); restoreLayout(); menuBar()->show(); @@ -3825,9 +3737,7 @@ void GuiView::toggleFullScreen() hideDialogs("prefs", 0); for (int i = 0; i != d.splitter_->count(); ++i) d.tabWorkArea(i)->setFullScreen(true); -#if QT_VERSION >= 0x040300 setContentsMargins(-2, -2, -2, -2); -#endif saveLayout(); setWindowState(windowState() ^ Qt::WindowFullScreen); statusBar()->hide(); diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index b0dd01e5f4..135d7b29e1 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -2025,19 +2025,6 @@ DragTabBar::DragTabBar(QWidget* parent) } -#if QT_VERSION < 0x040300 -int DragTabBar::tabAt(QPoint const & position) const -{ - const int max = count(); - for (int i = 0; i < max; ++i) { - if (tabRect(i).contains(position)) - return i; - } - return -1; -} -#endif - - void DragTabBar::mousePressEvent(QMouseEvent * event) { if (event->button() == Qt::LeftButton) @@ -2076,17 +2063,12 @@ void DragTabBar::mouseMoveEvent(QMouseEvent * event) mimeData->setData("action", "tab-reordering") ; drag->setMimeData(mimeData); -#if QT_VERSION >= 0x040300 // get tab pixmap as cursor QRect r = tabRect(tab); QPixmap pixmap(r.size()); render(&pixmap, - r.topLeft()); drag->setPixmap(pixmap); drag->exec(); -#else - drag->start(Qt::MoveAction); -#endif - } diff --git a/src/frontends/qt4/InGuiThread.h b/src/frontends/qt4/InGuiThread.h index 0609cb085e..65fd648fff 100644 --- a/src/frontends/qt4/InGuiThread.h +++ b/src/frontends/qt4/InGuiThread.h @@ -19,10 +19,6 @@ #include "support/bind.h" #include "support/functional.h" -#if QT_VERSION < 0x040400 -#define Q_EMIT -#endif - namespace lyx { namespace frontend { diff --git a/src/frontends/qt4/LyXFileDialog.cpp b/src/frontends/qt4/LyXFileDialog.cpp index 5fabf915c2..c0981611b5 100644 --- a/src/frontends/qt4/LyXFileDialog.cpp +++ b/src/frontends/qt4/LyXFileDialog.cpp @@ -50,14 +50,6 @@ LyXFileDialog::LyXFileDialog(QString const & title, : QFileDialog(qApp->focusWidget(), title, path) { setFilters(filters); -#if QT_VERSION < 0x040304 - // FIXME: workaround for a bug in qt which makes LyX crash - // with hidden paths (bug 4513). Fixed as of Qt 4.3.4 - QDir dir(path); - if (path.contains("/.")) - dir.setFilter(QDir::Hidden); - setDirectory(dir); -#endif setWindowTitle(title); QList layout = findChildren(); diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp index d4017fc3e2..755d260fd6 100644 --- a/src/frontends/qt4/TocModel.cpp +++ b/src/frontends/qt4/TocModel.cpp @@ -76,9 +76,7 @@ TocModel::TocModel(QObject * parent) sorted_model_(new QSortFilterProxyModel(parent)), is_sorted_(false), maxdepth_(0), mindepth_(0) { -#if QT_VERSION >= 0x040300 sorted_model_->setSortLocaleAware(true); -#endif sorted_model_->setSourceModel(model_); } @@ -248,9 +246,7 @@ TocModels::TocModels() names_ = new TocTypeModel(this); names_sorted_ = new TocModelSortProxyModel(this); names_sorted_->setSourceModel(names_); -#if QT_VERSION >= 0x040300 names_sorted_->setSortLocaleAware(true); -#endif names_sorted_->sort(0); } diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 8a1176d60f..fe081ab655 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -98,13 +98,7 @@ struct FileName::Private /// inline void refresh() { -// There seems to be a bug in Qt >= 4.2.0 and < 4.5.0, that causes problems with -// QFileInfo::refresh() on *nix. So we recreate the object in that case. -#if defined(_WIN32) || (QT_VERSION >= 0x040500) fi.refresh(); -#else - fi = QFileInfo(fi.absoluteFilePath()); -#endif } diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp index c302531e2e..9bdde9cb3a 100644 --- a/src/support/lyxtime.cpp +++ b/src/support/lyxtime.cpp @@ -45,7 +45,6 @@ time_t from_ctime(string t) // Example for the format: "Sun Nov 6 10:39:39 2011\n" // Generously remove trailing '\n' (and other whitespace if needed) t = trim(t, " \t\r\n"); -#if QT_VERSION >= 0x040400 // toDateTime() is too stupid to recognize variable amounts of // whitespace (needed because ctime() outputs double spaces before // single digit day numbers and hours) @@ -59,42 +58,6 @@ time_t from_ctime(string t) return static_cast(-1); } return loc_dt.toTime_t(); -#elif defined(_WIN32) -#error "The minimum required Qt version on windows is Qt 4.4." -#else - // strptime() is not available on windows (defined by POSIX) - - // strptime() uses the current locale, so we need to switch to "C" - LYXERR(Debug::LOCALE, "Setting LC_ALL and LC_TIME to C"); - string oldLC_ALL = getEnv("LC_ALL"); - string oldLC_TIME = getEnv("LC_TIME"); - if (!setEnv("LC_ALL", "C")) - LYXERR(Debug::LOCALE, "\t... LC_ALL failed!"); - if (!setEnv("LC_TIME", "C")) - LYXERR(Debug::LOCALE, "\t... LC_TIME failed!"); - - struct tm loc_tm; - char const * const format = "%a%n%b%n%d%n%T%n%Y"; - char * remainder = strptime(t.c_str(), format, &loc_tm); - - LYXERR(Debug::LOCALE, "Resetting LC_ALL and LC_TIME"); - if(!setEnv("LC_TIME", oldLC_TIME)) - LYXERR(Debug::LOCALE, "\t... LC_TIME failed!"); - if (!setEnv("LC_ALL", oldLC_ALL)) - LYXERR(Debug::LOCALE, "\t... LC_ALL failed!"); - - if (!remainder) { - LYXERR(Debug::LOCALE, "Could not parse `" << t - << "´ (invalid format)"); - return static_cast(-1); - } - if (*remainder != '\0') { - LYXERR(Debug::LOCALE, "Could not parse `" << t - << "´ (excess characters)"); - return static_cast(-1); - } - return mktime(&loc_tm); -#endif } } // namespace support From 4a0911f25ef5f4a64da343ca0e41dd98f6c8f02c Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 01:26:11 +0100 Subject: [PATCH 34/93] Header sorting. --- src/frontends/qt4/GuiView.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 8ad76d9ba7..0675680734 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -88,6 +88,8 @@ #include #include #include +#include +#include #include #include #include @@ -98,24 +100,22 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include #include -#include #define EXPORT_in_THREAD 1 -#include -#include -#include #include "support/bind.h" From 38c836f65d7f84f3612830e73af0934cc1a1e7fe Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 01:29:08 +0100 Subject: [PATCH 35/93] Leftover. --- src/frontends/qt4/TocWidget.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index 345b40ea21..247addbcc9 100644 --- a/src/frontends/qt4/TocWidget.cpp +++ b/src/frontends/qt4/TocWidget.cpp @@ -291,27 +291,10 @@ void TocWidget::setTreeDepth(int depth) if (!tocTV->model()) return; -#if QT_VERSION >= 0x040300 - // this should be faster than our own code below if (depth == 0) tocTV->collapseAll(); else tocTV->expandToDepth(depth - 1); -#else - // expanding and then collapsing is probably better, - // but my qt 4.1.2 doesn't have expandAll().. - //tocTV->expandAll(); - QModelIndexList indices = tocTV->model()->match( - tocTV->model()->index(0, 0), - Qt::DisplayRole, "*", -1, - Qt::MatchFlags(Qt::MatchWildcard|Qt::MatchRecursive)); - - int size = indices.size(); - for (int i = 0; i < size; i++) { - QModelIndex index = indices[i]; - tocTV->setExpanded(index, indexDepth(index) < depth_); - } -#endif } From eb9151c5994dc217f14b7e63365b0e68723e1d1a Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 01:37:54 +0100 Subject: [PATCH 36/93] Close tab button started with 4.5. --- src/frontends/qt4/GuiPrefs.cpp | 7 +------ src/frontends/qt4/GuiWorkArea.cpp | 9 --------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 902d2dd9cd..e2ecb06e70 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2515,9 +2515,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) this, SIGNAL(changed())); connect(singleInstanceCB, SIGNAL(clicked()), this, SIGNAL(changed())); -#if QT_VERSION < 0x040500 - singleCloseTabButtonCB->setEnabled(false); -#endif connect(singleCloseTabButtonCB, SIGNAL(clicked()), this, SIGNAL(changed())); connect(uiFilePB, SIGNAL(clicked()), @@ -2571,9 +2568,7 @@ void PrefUserInterface::apply(LyXRC & rc) const rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked(); rc.single_instance = singleInstanceCB->isChecked(); rc.single_close_tab_button = singleCloseTabButtonCB->isChecked(); -#if QT_VERSION < 0x040500 - rc.single_close_tab_button = true; -#endif + switch (closeLastViewCO->currentIndex()) { case 0: rc.close_buffer_with_last_view = "yes"; diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index 135d7b29e1..a693c23c58 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -1508,9 +1508,6 @@ TabWorkArea::TabWorkArea(QWidget * parent) #ifdef Q_WS_MACX setStyle(&noTabFrameMacStyle); #endif -#if QT_VERSION < 0x040500 - lyxrc.single_close_tab_button = true; -#endif QPalette pal = palette(); pal.setColor(QPalette::Active, QPalette::Button, @@ -1547,10 +1544,8 @@ TabWorkArea::TabWorkArea(QWidget * parent) tb->setContextMenuPolicy(Qt::CustomContextMenu); connect(tb, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showContextMenu(const QPoint &))); -#if QT_VERSION >= 0x040500 connect(tb, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int))); -#endif setUsesScrollButtons(true); } @@ -1608,9 +1603,7 @@ void TabWorkArea::showBar(bool show) tabBar()->setEnabled(show); tabBar()->setVisible(show); closeBufferButton->setVisible(show && lyxrc.single_close_tab_button); -#if QT_VERSION >= 0x040500 setTabsClosable(!lyxrc.single_close_tab_button); -#endif } @@ -2019,9 +2012,7 @@ DragTabBar::DragTabBar(QWidget* parent) : QTabBar(parent) { setAcceptDrops(true); -#if QT_VERSION >= 0x040500 setTabsClosable(!lyxrc.single_close_tab_button); -#endif } From 4f24d123b2ad53ee275e5a2d3854cdea3cd5b9bf Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 01:38:34 +0100 Subject: [PATCH 37/93] Next leftover. --- src/frontends/qt4/GuiWorkArea.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h index e283d3130a..a33e158a54 100644 --- a/src/frontends/qt4/GuiWorkArea.h +++ b/src/frontends/qt4/GuiWorkArea.h @@ -244,11 +244,6 @@ public: /// DragTabBar(QWidget * parent = 0); -#if QT_VERSION < 0x040300 - /// - int tabAt(QPoint const & position) const; -#endif - protected: /// void mousePressEvent(QMouseEvent * event); From 1bd1fe71219b506e39fdd60b35f1a396f3f8bf93 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 02:02:16 +0100 Subject: [PATCH 38/93] * INSTALL, README --- INSTALL | 4 ++-- README | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/INSTALL b/INSTALL index 6a9feb2e5c..57a46650d0 100644 --- a/INSTALL +++ b/INSTALL @@ -55,9 +55,9 @@ LyX makes great use of C++ Standard Template Library (STL). This means that gcc users will have to install the relevant libstdc++ library to be able to compile this version of LyX. -For full LyX usability we suggest to use at least Qt 4.6 which has been +For full LyX usability we suggest to use at least Qt 4.8 which has been widely tested. For compilation you need to compile against at least -Qt 4.2.2. The only special point to make is that you must ensure that both +Qt 4.5.0. The only special point to make is that you must ensure that both LyX and the Qt libraries are compiled with the same C++ compiler. To build LyX with spell checking capabilities included you have to diff --git a/README b/README index 4901cad631..2da3d1a116 100644 --- a/README +++ b/README @@ -92,8 +92,8 @@ What do I need to compile LyX from the source distribution? gcc/g++, but some others work also. As of LyX 1.6.0, you need at least gcc 3.2.x. - * The Qt4 library, at least version 4.2.2. For all features - newer versions (e.g. Qt 4.6) are recommended. + * The Qt4 library, at least version 4.5.0. For all features + newer versions (e.g. Qt 4.8) are recommended. Read the file "INSTALL" for more information on compiling. @@ -135,10 +135,9 @@ Internet resources of relevance to LyX ftp://ftp.lyx.org/pub/lyx/ The LyX Development page has information about the development - effort. LyX is under Subversion control, so you can get the very + effort. LyX is under Git version control, so you can get the very latest sources from there at any time. - http://www.lyx.org/devel - ftp://ftp.devel.lyx.org/pub/lyx/ + http://www.lyx.org/Development How do I submit a bug report? @@ -146,7 +145,8 @@ How do I submit a bug report? You'll find detailed info on submitting bug reports there. If you can't do that, send details to the LyX Developers' mailing - list, or use the LyX bug tracker at http://www.lyx.org/trac/. + list, or use the LyX bug tracker at + http://www.lyx.org/trac/wiki/BugTrackerHome. Don't forget to mention which version you are having problems with! How can I participate in the development of LyX? From d49a4e5c5e69a27dcff00165dea4dc1a7bade7a1 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 3 Nov 2012 22:10:40 -0400 Subject: [PATCH 39/93] Updates to lyx-build script. --- development/tools/lyx-build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/development/tools/lyx-build b/development/tools/lyx-build index 971d9d2a87..c86698fa9f 100755 --- a/development/tools/lyx-build +++ b/development/tools/lyx-build @@ -18,7 +18,7 @@ MAKEOPTS="-j4"; # Determine LyX version cd $SRCDIR/ -VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/(\d\.\d+\.\d+)/; print $1;}'); +VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/AC_INIT\(LyX,([^,]+)/; print $1;}'); echo "This is version $VERSION."; echo -n "Ready to build source packages..."; @@ -86,16 +86,18 @@ if [ ! -d "$BASE/lyx-patch/" ]; then mkdir "$BASE/lyx-patch/" || exit 1; fi -if [ ! -d lyx-$LAST ]; then +if [ ! -d $BASE/lyx-patch/lyx-$LAST ]; then echo "Can't find directory for last version $LAST."; echo "Will try to download from LyX site...."; read; + pushd $BASE/lyx-patch/; wget ftp://ftp.lyx.org/pub/lyx/stable/${FIRST}x/lyx-$LAST.tar.gz; tar -zxvf lyx-$LAST.tar.gz; if [ ! -f lyx-$LAST.tar.gz ]; then echo "Still unable to find directory for last version $LAST."; exit 1; fi + popd; fi echo -n "Ready to make patch against $LAST..."; @@ -131,7 +133,9 @@ if [ -f $PATCH.gz.sig ]; then fi gpg -b $PATCH.gz xz -zc $PATCH > $PATCH.xz -rm $PATCH.xz.sig; +if [ -f $PATCH.xz.sig ]; then + rm $PATCH.xz.sig; +fi gpg -b $PATCH.xz echo -n "Patch and signatures created..."; From 3f4b4d767605b9acbeb6bc2a9b1bc75a25fe2b08 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 3 Nov 2012 22:13:36 -0400 Subject: [PATCH 40/93] Add lyx-fedora script, which builds a LyX RPM from the git sources on Fedora. --- development/tools/lyx-fedora | 810 +++++++++++++++++++++++++++++++++++ 1 file changed, 810 insertions(+) create mode 100644 development/tools/lyx-fedora diff --git a/development/tools/lyx-fedora b/development/tools/lyx-fedora new file mode 100644 index 0000000000..075f7e8083 --- /dev/null +++ b/development/tools/lyx-fedora @@ -0,0 +1,810 @@ +#!/bin/sh +# +# lyx-fedora build script for Fedora +# +# Author: Kayvan Sylvan +# +# +# Easily build lyx from the git repository for Fedora systems. +# Tested on Fedora 15, 16, 17. +# +# Just run "lyx-fedora init", then "lyx-fedora rpm" and "lyx-fedora install" +# +# Subsequently: "lyx-fedora pull", "lyx-fedora rpm" and "lyx-fedora install" +# +VER=2.1.0dev +EXT=fc$(sed 's/[^0-9]*\([0-9]*\)[^0-9]*/\1/' /etc/fedora-release) + +TOPDIR=$HOME/src +SRCDIR=$HOME/src/lyx +BUILDDIR=$HOME/src/lyx-build +RPMDIR=$HOME/rpmbuild + +case "X$1" in +Xinit) + # install packages + sudo yum -y install lyx git rpm-build cmake qt-devel qt gcc-c++ \ + automake autogen autoconf fontpackages-devel enchant-devel \ + boost-devel hunspell-devel file-devel zlib-devel + + # set up the src dir + if [ ! -d $SRCDIR ] + then + mkdir -p $TOPDIR + cd $TOPDIR + git clone git://git.lyx.org/lyx + fi + + # set up rpmbuild + mkdir -p $RPMDIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} + if [ ! -r $HOME/.rpmmacros ] + then + echo '%_topdir %(echo $HOME)/rpmbuild' > $HOME/.rpmmacros + echo '%_smp_mflags -j3' >> $HOME/.rpmmacros + fi + + # set up the directory to make the source tarball + mkdir -p $BUILDDIR + cd $BUILDDIR + cmake $SRCDIR -DLYX_CPACK:BOOL=ON + perl -pi -e 's@;/Makefile\\\\.in\$@@' CPackSourceConfig.cmake + perl -pi -e 's@;/POTFILES@@' CPackSourceConfig.cmake + + # extra files to include in the Fedora RPM + cat > $RPMDIR/SOURCES/lyxrc.dist << EOF +# -*- text -*- +# This file has the Fedora specific configuration for lyx. +# If you want to make your own modifications you should do them from +# inside LyX and save. + +Format 1 + +\hunspelldir_path "/usr/share/myspell/" +\thesaurusdir_path "/usr/share/mythes/" + +\serverpipe "~/.lyx/lyxpipe" + +\screen_zoom 100 +\screen_font_roman "Serif" +\screen_font_sans "Sans Serif" +\screen_font_typewriter "Monospace" +EOF + cat > $RPMDIR/SOURCES/lyx.desktop << EOF +[Desktop Entry] +Name=LyX +GenericName=Structured Word Processor +Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output +Exec=lyx +Icon=lyx +MimeType=application/x-lyx;text/x-lyx; +Type=Application +Encoding=UTF-8 +Categories=Office;WordProcessor; +EOF + cat > $RPMDIR/SOURCES/lyx-2.0.1-xdg_open.patch << EOF +--- lyx-2.0.1.orig/lib/configure.py 2011-08-29 23:23:17.000000000 +0100 ++++ lyx-2.0.1/lib/configure.py 2011-09-05 19:14:37.461269747 +0100 +@@ -510,7 +510,7 @@ + checkViewerEditor('a SVG viewer and editor', ['inkscape'], + rc_entry = [r'\Format svg svg SVG "" "%%" "%%" "vector"']) + # +- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], ++ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'], + rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" "" + \Format gif gif GIF "" "%s" "%s" "" + \Format jpg jpg JPEG "" "%s" "%s" "" +@@ -573,7 +573,7 @@ + \Format excel xls "Excel spreadsheet" "" "" "%%" "document" + \Format oocalc ods "OpenOffice spreadsheet" "" "" "%%" "document"''']) + # +- path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://\$\$p\$\$i', 'netscape'], ++ path, xhtmlview = checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://\$\$p\$\$i', 'netscape'], + rc_entry = [r'\Format xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export"']) + if xhtmlview == "": + addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document,menu=export"') +@@ -587,11 +587,11 @@ + # + #checkProg('a Postscript interpreter', ['gs'], + # rc_entry = [ r'\ps_command "%%"' ]) +- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], ++ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], + rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" + \Format ps ps Postscript t "%%" "" "document,vector,menu=export"''']) + # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html +- checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \\ ++ checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \\ + 'gv', 'ghostview'], + rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector,menu=export" + \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export" +@@ -599,14 +599,14 @@ + \Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector,menu=export" + \Format pdf5 pdf "PDF (LuaTeX)" u "%%" "" "document,vector,menu=export"''']) + # +- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'], ++ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'], + rc_entry = [r'''\Format dvi dvi DVI D "%%" "" "document,vector,menu=export" + \Format dvi3 dvi "DVI (LuaTeX)" V "%%" "" "document,vector,menu=export"''']) + if dtl_tools: + # Windows only: DraftDVI + addToRC(r'\Format dvi2 dvi DraftDVI "" "" "" "vector"') + # +- checkViewer('an HTML previewer', ['firefox', 'mozilla file://\$\$p\$\$i', 'netscape'], ++ checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://\$\$p\$\$i', 'netscape'], + rc_entry = [r'\Format html html HTML H "%%" "" "document,menu=export"']) + # + checkViewerEditor('Noteedit', ['noteedit'], +EOF + cat > $RPMDIR/SPECS/lyx-cmake.spec << EOF +## lyx-fonts +%global fontname lyx +%if 1 +%define fontpackages 1 +BuildRequires: fontpackages-devel +%else +%define _fontdir %{_datadir}/fonts/%{fontname} +%endif + +%define _without_included_boost --without-included-boost + +Summary: WYSIWYM (What You See Is What You Mean) document processor +Name: lyx +Version: 2.1.0dev +Release: 1%{?dist} + +License: GPLv2+ +Group: Applications/Publishing +Url: http://www.lyx.org/ +Source0: LyX-2.1.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source1: lyxrc.dist +Source10: lyx.desktop + +## upstreamable patches +# submitted, but upstream rejected it. we currently agree to disagree. +Patch50: lyx-2.0.1-xdg_open.patch +# Do we need to rebuild configuration files? +%global autotools 0 + +%if 0%{?autotools} +BuildRequires: automake libtool +%endif +BuildRequires: enchant-devel +%if 0%{?_without_included_boost:1} +BuildRequires: boost-devel +%endif +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: hunspell-devel +BuildRequires: python +BuildRequires: qt4-devel +BuildRequires: zlib-devel + +# optional minimal qt4 dep +%{?_qt_version:Requires: qt4 >= %{_qt4_version}} + +Obsoletes: %{name}-qt < 1.5.0 +Provides: %{name}-qt = %{version}-%{release} +Obsoletes: %{name}-xforms < 1.5.0 + +Requires: %{name}-common = %{version}-%{release} + +Requires: %{fontname}-fonts = %{version}-%{release} + +%if 0%{?fedora} > 8 || 0%{?rhel} > 5 +BuildRequires: tex(dvips) tex(latex) texlive-fonts +Requires(post): texlive +Requires(postun): texlive +Requires: dvipdfm +Requires: tex(dvips) tex(latex) +Requires: tex-simplecv +%else +BuildRequires: tetex-dvips tetex-latex tetex-fonts +Requires(post): tetex-fonts +Requires(postun): tetex-fonts +Requires: tetex-dvips tetex-latex +%endif +Requires: ghostscript +## Soft dependencies +%if 0%{?fedora} > 3 && 0%{?fedora} < 9 +# Document->Change Tracking feature +Requires: tetex-dvipost +Requires: tetex-preview +Requires: tetex-IEEEtran +%endif +# convert doc files to lyx (bug #193858) +Requires: wv +Requires: xdg-utils +# required for instant preview +# we use a file require because depending on the texlive version used +# the package can either be texlive-dviutils for texlive 2007 or +# texlive-dtl-bin for texlive >= 2010 +Requires: /usr/bin/dv2dt +Requires: ImageMagick + +%description +LyX is a modern approach to writing documents which breaks with the +obsolete "typewriter paradigm" of most other document preparation +systems. + +It is designed for people who want professional quality output +with a minimum of time and effort, without becoming specialists in +typesetting. + +The major innovation in LyX is WYSIWYM (What You See Is What You Mean). +That is, the author focuses on content, not on the details of formatting. +This allows for greater productivity, and leaves the final typesetting +to the backends (like LaTeX) that are specifically designed for the task. + +With LyX, the author can concentrate on the contents of his writing, +and let the computer take care of the rest. + +%package common +Summary: Common files of %{name} +Group: Applications/Publishing +Requires: %{name} = %{version}-%{release} +BuildArch: noarch +%description common +{summary}. + +%package fonts +Summary: Lyx/MathML fonts +Group: Applications/Publishing +# The actual license says "The author of these fonts, Basil K. Malyshev, has +# kindly granted permission to use and modify these fonts." +# One of the font files (wasy10) is separately licensed GPL+. +License: Copyright only and GPL+ +%{?fontpackages:Requires: fontpackages-filesystem} +Obsoletes: mathml-fonts < 1.0-50 +Provides: mathml-fonts = 1.0-50 +Obsoletes: lyx-fonts-common < 1.6.5-3 +Obsoletes: lyx-fonts-compat < 1.6.5-3 +Obsoletes: lyx-cmex10-fonts < 1.6.5-3 +Obsoletes: lyx-cmmi10-fonts < 1.6.5-3 +Obsoletes: lyx-cmr10-fonts < 1.6.5-3 +Obsoletes: lyx-cmsy10-fonts < 1.6.5-3 +Obsoletes: lyx-esint10-fonts < 1.6.5-3 +Obsoletes: lyx-eufm10-fonts < 1.6.5-3 +Obsoletes: lyx-msam10-fonts < 1.6.5-3 +Obsoletes: lyx-msbm10-fonts < 1.6.5-3 +Obsoletes: lyx-wasy10-fonts < 1.6.5-3 +Provides: lyx-cmex10-fonts = %{version}-%{release} +Provides: lyx-cmmi10-fonts = %{version}-%{release} +Provides: lyx-cmr10-fonts = %{version}-%{release} +Provides: lyx-cmsy10-fonts = %{version}-%{release} +BuildArch: noarch +%description fonts +A collection of Math symbol fonts for %{name}. + + +%prep + +%setup -q -n LyX-2.1 + +#%patch50 -p1 -b .xdg_open + +%if 0%{?autotools} +./autogen.sh +%endif + + +%build + +%configure \\ + --disable-dependency-tracking \\ + --disable-rpath \\ + --enable-build-type=release \\ + --enable-optimization="%{optflags}" \\ + --without-included-boost \\ + --with-enchant \\ + --with-hunspell + +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} + +# misc/extras +install -p -m644 -D %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist + +# Set up the lyx-specific class files where TeX can see them +texmf=%{_datadir}/texmf +mkdir -p %{buildroot}\${texmf}/tex/latex +mv %{buildroot}%{_datadir}/lyx/tex \\ + %{buildroot}\${texmf}/tex/latex/lyx + +# .desktop +desktop-file-install --vendor="" \\ + --dir="%{buildroot}%{_datadir}/applications" \\ + %{SOURCE10} + +# icon +install -p -D -m644 lib/images/lyx.png \\ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png + +# ghost'd files +touch %{buildroot}%{_datadir}/lyx/lyxrc.defaults +touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst + +# fonts +install -m 0755 -d %{buildroot}%{_fontdir} +mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/ +rm -rf %{buildroot}%{_datadir}/lyx/fonts + +%find_lang %{name} + + +%check +# tests/test_filetools error bogus ( see http://bugzilla.redhat.com/723938 ) +make -k check ||: + + +%post common +touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : + +%postun common +if [ \$1 -eq 0 ] ; then + texhash >& /dev/null + update-desktop-database -q &> /dev/null + touch --no-create %{_datadir}/icons/hicolor &> /dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +fi + +%posttrans common +texhash >& /dev/null +update-desktop-database -q &> /dev/null +gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : + +## Catch installed/uninstalled helpers +## not sure if this is really needed anymore, as it seems to be a per-user thing, +## and besides, we use xdg-open now -- Rex +#triggerin common -- latex2html,wv +#if [ \$2 -gt 1 ]; then +#cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: +#fi +# +#triggerun common -- latex2html,wv +#if [ \$2 -eq 0 ]; then +#cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: +#fi + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc ANNOUNCE COPYING lib/CREDITS NEWS README +%{_bindir}/* + +%files common -f %{name}.lang +%defattr(-,root,root,-) +%{_mandir}/man1/* +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/lyx/ +%config(noreplace) %{_datadir}/lyx/lyxrc.dist +%ghost %{_datadir}/lyx/lyxrc.defaults +%ghost %{_datadir}/lyx/*.lst +%{_datadir}/texmf/tex/latex/lyx/ + +%if 0%{?fontpackages:1} +%_font_pkg +%{_fontdir}/*.ttf +%doc lib/fonts/BaKoMaFontLicense.txt +%doc lib/fonts/ReadmeBaKoMa4LyX.txt +%else +%files fonts +%defattr(-,root,root,-) +%dir %{_fontdir}/ +%{_fontdir}/*.ttf +%doc lib/fonts/BaKoMaFontLicense.txt +%doc lib/fonts/ReadmeBaKoMa4LyX.txt + +%posttrans fonts +fc-cache %{_fontdir} 2> /dev/null ||: +%endif + + +%changelog +* Fri Nov 2 2012 Kayvan Sylvan - 2.1 +- lyx-2.1 dev + +* Sat Jun 30 2012 Rex Dieter 2.0.4-1 +- lyx-2.0.4 +- Omitted backslash in code for floatingfootnote, after export to latex, and re-import (#811719) + +* Mon Mar 5 2012 José Matos - 2.0.3-1 +- New bugfix release + +* Wed Feb 29 2012 Rex Dieter 2.0.2-4 +- hack around gcc-4.7 ftbfs for now + +* Tue Feb 28 2012 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for c++ ABI breakage + +* Sat Jan 7 2012 José Matos - 2.0.2-2 +- Require ImageMagick (#753626) + +* Thu Dec 1 2011 José Matos - 2.0.2-1 +- New stable release. + +* Tue Nov 22 2011 Rex Dieter 2.0.1-3 +- rebuild (boost) + +* Mon Sep 5 2011 José Matos - 2.0.1-2 +- Update xdg_open patch for version 2.0.1 + +* Mon Sep 5 2011 José Matos - 2.0.1-1 +- Update to 2.0.1 + +* Thu Jul 21 2011 Rex Dieter 2.0.0-5 +- rebuild (boost) + +* Wed Jun 1 2011 José Matos - 2.0.0-4 +- LaTeXConfig.lyx is no longer a ghost (#684428) + +* Thu May 26 2011 Rex Dieter 2.0.0-3 +- fix hunspell support (use pkgconfig) + +* Thu May 26 2011 Rex Dieter 2.0.0-2 +- rebuild (hunspell) + +* Fri Apr 29 2011 José Matos - 2.0.0-1 +- Update to 2.0.0 final + +* Mon Apr 11 2011 José Matos - 2.0.0-0.21.rc3 +- Update to rc3 + +* Thu Apr 7 2011 José Matos - 2.0.0-0.20.rc2 +- Rebuild for new boost (just applies to F16) + +* Tue Mar 29 2011 José Matos - 2.0.0-0.19.rc2 +- New upstream release (rc2) + +* Mon Mar 14 2011 José Matos - 2.0.0-0.18.rc1 +- Rebuild for boost upgrade + +* Sat Mar 12 2011 José Matos - 2.0.0-0.17.rc1 +- Add thesaurus and hunspell paths to lyxrc.dist thus fixing + http://www.lyx.org/trac/ticket/7253 +- Simplified the content of lyxrc.dist leaving only the relevant + options and updating the format to the current one + +* Fri Mar 11 2011 José Matos - 2.0.0-0.16.rc1 +- Update for rc1 and add a dependency to ensure that math instant + preview works by default +- Removed patch applied upstream for gcc 4.6 fixes +- Renamed patch for xdg_open to be in sync with current version (rc1) + +* Fri Feb 11 2011 Orion Poplawski 2.0.0-0.15.beta4 +- Get gcc46 fixes from svn + +* Tue Feb 08 2011 Fedora Release Engineering - 2.0.0-0.14.beta4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Rex Dieter 2.0.0-0.13.beta4 +- 2.0.0-beta4 + +* Mon Feb 07 2011 Thomas Spura 2.0.0-0.12.beta3 +- rebuild for new boost + +* Tue Jan 11 2011 Rex Dieter 2.0.0-0.11.beta3 +- lyx-2.0.0-beta3 + +* Wed Dec 08 2010 Rex Dieter 2.0.0-0.10.beta2 +- lyx-2.0.0-beta2 + +* Wed Nov 10 2010 Rex Dieter - 2.0.0-0.9.beta1 +- lyx-2.0.0-beta1 (#651488) + +* Tue Nov 09 2010 Rex Dieter - 2.0.0-0.8.alpha6 +- lyx-2.0.0-alpha6 (#651488) + +* Wed Nov 03 2010 Rex Dieter - 2.0.0-0.7.alpha5 +- drop %%triggers, *may* affect selinux labels (#632944) + +* Thu Aug 05 2010 Orion Poplawski - 2.0.0-0.6.alpha5 +- Rebuild for newer boost + +* Wed Jul 21 2010 Rex Dieter - 2.0.0-0.5.alpha5 +- lyx-2.0.0-alpha5 + +* Thu Jun 17 2010 Rex Dieter - 2.0.0-0.4.alpha4 +- lyx-2.0.0-alpha4 + +* Thu May 13 2010 Rex Dieter - 2.0.0-0.3.alpha3 +- lyx-2.0.0-alpha3 + +* Sat Apr 17 2010 Rex Dieter - 2.0.0-0.2.alpha2 +- lyx-2.0.0-alpha2 + +* Sat Apr 03 2010 Rex Dieter - 2.0.0-0.1.alpha1 +- lyx-2.0.0-alpha1 + +* Sun Feb 14 2010 Rex Dieter - 1.6.5-5 +- FTBFS lyx-1.6.5-4.fc13: ImplicitDSOLinking (#565009) + +* Thu Jan 21 2010 Rex Dieter - 1.6.5-4 +- -fonts: Provides: lyx-{cmex10,cmmi10,cmr10,cmsy10}-fonts + +* Sat Jan 16 2010 Rex Dieter - 1.6.5-3 +- rebiuld (boost) +- use simple font template + +* Wed Dec 9 2009 José Matos - 1.6.5-2 +- Add patch for autoconf 2.65 (F13+) + +* Wed Dec 9 2009 José Matos - 1.6.5-1 +- lyx-1.6.5 + +* Thu Nov 19 2009 José Matos - 1.6.4-3 +- LyX supports autoconf 2.64 (should be upstream for 1.6.5) + +* Thu Sep 17 2009 Rex Dieter - 1.6.4-2 +- use enchant instead of aspell (#524046) + +* Sat Aug 22 2009 Rex Dieter - 1.6.4-1 +- lyx-1.6.4 +- handle fonts manually (now EPEL-5 compatible) + +* Mon Aug 03 2009 Rex Dieter - 1.6.3-3 +- add lyx-*-fonts subpkgs (#452357, #514549) +- -common (noarch) subpkg +- trim %%changelog + +* Sat Jul 25 2009 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 04 2009 Rex Dieter - 1.6.3-1 +- lyx-1.6.3 + +* Mon Mar 23 2009 Rex Dieter - 1.6.2-2 +- scriptlet optimization + +* Sun Mar 15 2009 Rex Dieter - 1.6.2-1 +- lyx-1.6.2 +- use --without-included-boost unconditionally + +* Wed Mar 04 2009 Rex Dieter - 1.6.1-3 +- --without-included-boost (f11+) + +* Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Dec 14 2008 Rex Dieter - 1.6.1-1 +- lyx-1.6.1 + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1.6.0-2 +- Rebuild for Python 2.6 + +* Fri Nov 07 2008 Rex Dieter - 1.6.0-1 +- lyx-1.6.0(final) + +* Tue Oct 28 2008 José Matos - 1.6.0-0.11.rc5 +- lyx-1.6.0rc5 + +* Fri Oct 24 2008 Rex Dieter - 1.6.0-0.10.rc4 +- lyx-1.6.0rc4 + +* Tue Sep 30 2008 Rex Dieter - 1.6.0-0.9.rc3 +- lyx-1.6.0rc3 + +* Fri Sep 26 2008 Rex Dieter - 1.6.0-0.8.rc3 +- lyx-1.6.0rc3-svn26576 + +* Fri Sep 12 2008 Rex Dieter - 1.6.0-0.7.rc2 +- lyx-1.6.0rc2 + +* Wed Aug 06 2008 Rex Dieter - 1.6.0-0.6.rc1 +- lyx-1.6.0rc1 + +* Sun Aug 03 2008 Rex Dieter - 1.6.0-0.5.beta4 +- Requires: dvipdfm (f9+, #448647) +- add (optional) minimal qt4 dep +- make Req: tex-simplecv fedora only +- drop file deps (texhash) + +* Wed Jul 16 2008 José Matos - 1.6.0-0.4.beta4 +- Changelog has been removed from the distribution + +* Wed Jul 16 2008 José Matos - 1.6.0-0.3.beta4 +- icon has changed from xpm to png + +* Wed Jul 16 2008 José Matos - 1.6.0-0.2.beta4 +- revert to use pre instead of devrel. +- require tex-simplecv (#428526) + +* Wed Jul 16 2008 José Matos - 1.6.0-0.1.beta4 +- lyx-1.6.0beta4 +- --enable-build-type=release disables extra debug information (no + warnings, debug, assertions, concept-checks and stdlib-debug). + +* Mon May 12 2008 Rex Dieter 1.5.5-1 +- lyx-1.5.5 + +* Mon Feb 25 2008 Rex Dieter 1.5.4-1 +- lyx-1.5.4 (#434689) +- reintroduce xdg-utils patch (reverted upstream). +- omit bakoma ttf fonts + +* Mon Feb 11 2008 José Matos - 1.5.3-2 +- Rebuild for gcc 4.3 + +* Mon Dec 17 2007 Rex Dieter 1.5.3-1 +- lyx-1.5.3 + +* Tue Dec 04 2007 Rex Dieter 1.5.2-2 +- drop scriptlet optimization hack + +* Mon Oct 08 2007 Rex Dieter 1.5.2-1 +- lyx-1.5.2 + +* Sat Aug 25 2007 Rex Dieter 1.5.1-2 +- respin (BuildID) + +* Thu Aug 09 2007 Rex Dieter 1.5.1-1 +- lyx-1.5.1 +- License: GPLv2+ + +* Wed Jul 25 2007 Rex Dieter 1.5.0-1 +- lyx-1.5.0(final) + +* Sun Jul 15 2007 Rex Dieter 1.5.0-0.10.rc2 +- upstream patch for 'lyx --export latex' crasher (#248282) + +* Thu Jun 28 2007 Rex Dieter 1.5.0-0.9.rc2 +- scriptlet optmization + +* Thu Jun 28 2007 Rex Dieter 1.5.0-0.8.rc2 +- lyx-1.5.0rc2 + +* Fri Jun 01 2007 Rex Dieter 1.5.0-0.7.rc1 +- lyx-1.5.0rc1 + +* Fri May 18 2007 Rex Dieter 1.5.0-0.6.beta3 +- lyx-1.5.0beta3 + +* Sun Apr 22 2007 Rex Dieter 1.5.0-0.5.beta2 +- lyx-1.5.0beta2 + +* Mon Apr 02 2007 Rex Dieter 1.5.0-0.4.beta1 +- fix qt-4.3 crasher + +* Tue Mar 27 2007 Rex Dieter 1.5.0-0.3.beta1 +- stop omitting -fexceptions + +* Wed Mar 21 2007 Rex Dieter 1.5.0-0.2.beta1 +- +Requires: tetex-IEEEtran (#232840) + +* Mon Mar 05 2007 Rex Dieter 1.5.0-0.1.beta1 +- lyx-1.5.0beta1 +- tweak lyxrc.dist + +* Thu Feb 15 2007 Rex Dieter 1.4.4-2 +- biffed sources, respin + +* Wed Feb 14 2007 Rex Dieter 1.4.4-1 +- lyx-1.4.4 +- .desktop's: -Category=Application +- mark -xforms as deprecated + +* Sun Oct 01 2006 Rex Dieter 1.4.3-3 +- sync .desktop files with upstream +- use xdg-open as default helper, +Requires: xdg-utils + +* Thu Sep 21 2006 Rex Dieter 1.4.3-1 +- lyx-1.4.3 + +* Thu Sep 07 2006 Rex Dieter 1.4.2-5 +- fc6 respin + +* Thu Aug 17 2006 Rex Dieter 1.4.2-4 +- owowned files, incomplete package removal (bug #201197) + +* Thu Jul 13 2006 Rex Dieter 1.4.2-2 +- 1.4.2 + +* Wed Jun 29 2006 Rex Dieter 1.4.1-9 +- Requires(hint): wv (bug #193858) +- fix dependancy -> dependency + +* Thu Jun 15 2006 Rex Dieter 1.4.1-8 +- BR: gettext +- fc4: restore Requires(hint): tetex-preview + +* Thu May 25 2006 Rex Dieter 1.4.1-7.1 +- fc4: drop Requires: tetex-preview, it's not ready yet. + +* Wed May 24 2006 Rex Dieter 1.4.1-7 +- use serverpipe "~/.lyx/lyxpipe" instead, that was the old default + and what pybibliographer expects. + +* Tue May 23 2006 Rex Dieter 1.4.1-6 +- set defaults for (see %{_datadir}/lyx/lyxrc.defaults.custom) + screen_font_roman "Serif" + screen_font_sans "Sans" + screen_font_typewriter "Monospace" + screen_zoom 100 + serverpipe "~/.lyx/pipe" + (bug #192253) + +* Mon May 22 2006 Rex Dieter 1.4.1-5 +- Requires(hint): tetex-preview + +* Tue May 16 2006 Rex Dieter 1.4.1-4 +- add generic app icon (rh #191944) + +* Fri Apr 28 2006 Rex Dieter 1.4.1-3 +- Requires(hint): tetex-dvipost + adds support for lyx's Document->Change Tracking + +* Tue Apr 11 2006 Rex Dieter 1.4.1-2 +- 1.4.1 + +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + +* Thu Mar 09 2006 Rex Dieter 1.4.0-4 +- fix stripping of -fexceptions from %%optflags + +* Wed Mar 08 2006 Rex Dieter 1.4.0-3 +- include beamer.layout + +* Wed Mar 08 2006 Rex Dieter 1.4.0-2 +- 1.4.0(final) +- drop boost bits +EOF + cd $SRCDIR + git pull + ./autogen.sh + ;; +Xpull) + cd $SRCDIR + git pull + ./autogen.sh + ;; +Xrpm) + cd $BUILDDIR + make package_source + mv LyX-2.1.tar.bz2 $HOME/rpmbuild/SOURCES + rpmbuild -bb $HOME/rpmbuild/SPECS/lyx-cmake.spec + ;; +Xinstall) + rpm -q lyx | grep -q lyx-$VER + if [ $? -eq 0 ] + then + cmd="reinstall" + else + cmd="install" + fi + sudo yum $cmd \ + $HOME/rpmbuild/RPMS/x86_64/lyx-$VER-1.$EXT.x86_64.rpm \ + $HOME/rpmbuild/RPMS/noarch/lyx-common-$VER-1.$EXT.noarch.rpm \ + $HOME/rpmbuild/RPMS/noarch/lyx-fonts-$VER-1.$EXT.noarch.rpm + ;; +*) +cat << EOF +On recent Fedora install (F15, F16, and F17 work): + +To install the needed packages, create the rpmbuild directory, and set +up the build directory: + + $0 init + $0 rpm + $0 install + +After this, you can refresh and re-install the latest like this: + + $0 pull + $0 rpm + $0 install + +For any problems, Email Kayvan Sylvan . +EOF + ;; +esac From d7ed0ba7e484da744e278685794d4ed316a5f601 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Nov 2012 16:50:56 +0100 Subject: [PATCH 41/93] Autosaving is now always threaded. --- src/Buffer.cpp | 31 ++++++++++++------------------- src/frontends/qt4/GuiView.cpp | 4 ---- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index c5de4c8169..313b937940 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -3625,26 +3625,19 @@ bool Buffer::autoSave() const buf->d->bak_clean = true; FileName const fname = getAutosaveFileName(); - if (d->cloned_buffer_) { - // If this buffer is cloned, we assume that - // we are running in a separate thread already. - FileName const tmp_ret = FileName::tempName("lyxauto"); - if (!tmp_ret.empty()) { - writeFile(tmp_ret); - // assume successful write of tmp_ret - if (tmp_ret.moveTo(fname)) - return true; - } - // failed to write/rename tmp_ret so try writing direct - return writeFile(fname); - } else { - /// This function is deprecated as the frontend needs to take care - /// of cloning the buffer and autosaving it in another thread. It - /// is still here to allow (QT_VERSION < 0x040400). - AutoSaveBuffer autosave(*this, fname); - autosave.start(); - return true; + LASSERT(d->cloned_buffer_, return false); + + // If this buffer is cloned, we assume that + // we are running in a separate thread already. + FileName const tmp_ret = FileName::tempName("lyxauto"); + if (!tmp_ret.empty()) { + writeFile(tmp_ret); + // assume successful write of tmp_ret + if (tmp_ret.moveTo(fname)) + return true; } + // failed to write/rename tmp_ret so try writing direct + return writeFile(fname); } diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 0675680734..871a2d282d 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1545,14 +1545,10 @@ void GuiView::autoSave() return; } -#if (QT_VERSION >= 0x040400) GuiViewPrivate::busyBuffers.insert(buffer); QFuture f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy, buffer, buffer->cloneBufferOnly()); d.autosave_watcher_.setFuture(f); -#else - buffer->autoSave(); -#endif resetAutosaveTimers(); } From 1b74d3e7295eabd07e4dc7fbe1fb8dcb22865a61 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 5 Nov 2012 14:28:26 +0100 Subject: [PATCH 42/93] Correctly clean lyxclient.cpp in monolithic build. --- src/client/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index a79b720aa3..3621ef1a66 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -44,6 +44,7 @@ BUILT_SOURCES = lyxclient.cpp CLEANFILES += lyxclient.cpp lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES) +CLEANFILES += lyxclient.cpp else From 02ec8457c9d0ae9296dea15e9364a143d05cdb39 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 18 Oct 2012 00:08:42 +0200 Subject: [PATCH 43/93] Continue menu tweaking Move View/toolbar submenu together with the various pane entries. --- lib/ui/stdmenus.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 1bc9fbdee9..f1fd9e1487 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -324,12 +324,12 @@ Menuset Item "Outline Pane|u" "dialog-toggle toc" Item "Source Pane|S" "dialog-toggle view-source" Item "Messages Pane|g" "dialog-toggle progress" + Submenu "Toolbars|b" "toolbars" Separator Item "Split View Into Left and Right Half|i" "view-split horizontal" Item "Split View Into Upper and Lower Half|e" "view-split vertical" OptItem "Close Current View|w" "tab-group-close" Item "Fullscreen|l" "ui-toggle fullscreen" - Submenu "Toolbars|b" "toolbars" Separator Documents End From 76e66aaea89045842dc3651d09e2ab525f1a4e61 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Tue, 6 Nov 2012 20:25:32 +0100 Subject: [PATCH 44/93] Additional support for Japanese pLaTeX with utf8 encoding (#8408). Patch from Koji. --- lib/encodings | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/encodings b/lib/encodings index 2bd80c6f79..899a1a813a 100644 --- a/lib/encodings +++ b/lib/encodings @@ -183,6 +183,8 @@ Encoding jis-plain jis "Japanese (non-CJK) (JIS)" ISO-2022-JP variable japanese End Encoding shift-jis-plain sjis "Japanese (non-CJK) (SJIS)" CP932 variable japanese End +Encoding utf8 utf8 "Japanese (non-CJK) (utf8)" UTF-8 variable japanese +End # This one needs hardcoded support, since the inputenc package does not know # tis620-0, and thailatex sets up babel directly to use tis620-0, so the From 2e25a65c25b5faa7bc82a1a44eef96ef1ef98b10 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 6 Nov 2012 20:48:51 +0100 Subject: [PATCH 45/93] Revert "Correctly clean lyxclient.cpp in monolithic build." Sanda has been faster than me... See 39e23a. This reverts commit 1b74d3e7295eabd07e4dc7fbe1fb8dcb22865a61. --- src/client/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 3621ef1a66..a79b720aa3 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -44,7 +44,6 @@ BUILT_SOURCES = lyxclient.cpp CLEANFILES += lyxclient.cpp lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES) -CLEANFILES += lyxclient.cpp else From bd0bb681caaf37ee6cd1082f5f0c52ac1eb9ec24 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 8 Nov 2012 00:42:37 +0100 Subject: [PATCH 46/93] * cs/Tutorial.lyx --- lib/doc/cs/Tutorial.lyx | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/doc/cs/Tutorial.lyx b/lib/doc/cs/Tutorial.lyx index 2efb0a13dd..3317595df4 100644 --- a/lib/doc/cs/Tutorial.lyx +++ b/lib/doc/cs/Tutorial.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 431 +\lyxformat 445 \begin_document \begin_header \textclass book @@ -39,13 +39,13 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 - \graphics default \default_output_format default \output_sync 0 @@ -1149,6 +1149,26 @@ Program vlna automaticky přidává chráněné mezery za neslabičné předlož vestavěného mechanismu konvertorů. Samotný program je součástí nových distribucí TeX Live, nebo ho lze samostatně stáhnout na internetu. +\begin_inset Foot +status open + +\begin_layout Plain Layout +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +ftp://math.feld.cvut.cz/pub/olsak/vlna/ +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard From b8698ec8e99e53cfc3be41b151d78336b6d75398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 8 Nov 2012 01:19:26 +0100 Subject: [PATCH 47/93] French UserGuide.lyx: translations by Jean-Pierre (will also go to branch when it is open again) --- lib/doc/fr/UserGuide.lyx | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index bbb36d9b65..24c11a56c9 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4555,11 +4555,8 @@ Entrée Standard \family default . - -\lang english -Also the nesting depth is preserved -\lang french - (les détails sur l'emboîtement dans la section + La profondeur d'emboîtement est également préservée (voir les détails sur + l'emboîtement dans la section \begin_inset space ~ \end_inset @@ -29580,9 +29577,7 @@ emph \end_layout \begin_layout Standard - -\lang english -If the characters | +Si les caractères | \begin_inset space \space{} \end_inset @@ -29594,24 +29589,20 @@ If the characters | \begin_inset space \space{} \end_inset -, @ and +, @ et \begin_inset space \space{} \end_inset -" -\begin_inset space \space{} +" apparaissent dans les entrées de la nomenclature, ils doivent être protégés + en ajoutant un caractère +\begin_inset Quotes fld \end_inset -should appear in nomenclature entries they need to be escaped by adding - a quote character in front of them. -\begin_inset CommandInset nomenclature -LatexCommand nomenclature -symbol "\"@, \"|, \"!, \"\"" -description "The quote sign is output by writing ' \"\"\"\" '" - +double apostrophe +\begin_inset Quotes frd \end_inset - + avant eux. \end_layout \begin_layout Subsection From 2e55d993471eaf5eb334f6009599325b15319415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 8 Nov 2012 01:22:07 +0100 Subject: [PATCH 48/93] Czech Tutorial.lyx: reset fileformat please don't change the fileformat if not necessary (only necessary to describe new features in LyX 2.1). This helps me a lot keeping all language and release versions in sync and to update all --- lib/doc/cs/Tutorial.lyx | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/doc/cs/Tutorial.lyx b/lib/doc/cs/Tutorial.lyx index 3317595df4..a12c519d41 100644 --- a/lib/doc/cs/Tutorial.lyx +++ b/lib/doc/cs/Tutorial.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 445 +\lyxformat 413 \begin_document \begin_header \textclass book @@ -39,7 +39,6 @@ \font_roman default \font_sans default \font_typewriter default -\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -70,21 +69,15 @@ \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize default \use_geometry false -\use_package amsmath 0 -\use_package amssymb 0 -\use_package esint 0 -\use_package mathdots 1 -\use_package mathtools 0 -\use_package mhchem 1 -\use_package undertilde 0 +\use_amsmath 0 +\use_esint 0 +\use_mathdots 1 +\use_mhchem 1 \cite_engine basic -\cite_engine_type numerical -\biblio_style plain \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false -\justification true \use_refstyle 0 \index Index \shortcut idx @@ -2618,7 +2611,7 @@ Uživatelské příručce. \align center \begin_inset Tabular - + From f6a0356a5f7b52901852db8271305eba47b05c51 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Fri, 9 Nov 2012 10:59:04 +0100 Subject: [PATCH 49/93] * tools/lyx-fedora update from Kayvan. --- development/tools/lyx-fedora | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/development/tools/lyx-fedora b/development/tools/lyx-fedora index 075f7e8083..254e334da4 100644 --- a/development/tools/lyx-fedora +++ b/development/tools/lyx-fedora @@ -12,7 +12,6 @@ # # Subsequently: "lyx-fedora pull", "lyx-fedora rpm" and "lyx-fedora install" # -VER=2.1.0dev EXT=fc$(sed 's/[^0-9]*\([0-9]*\)[^0-9]*/\1/' /etc/fedora-release) TOPDIR=$HOME/src @@ -192,7 +191,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: %{fontname}-fonts = %{version}-%{release} %if 0%{?fedora} > 8 || 0%{?rhel} > 5 -BuildRequires: tex(dvips) tex(latex) texlive-fonts +BuildRequires: tex(dvips) tex(latex) Requires(post): texlive Requires(postun): texlive Requires: dvipdfm @@ -411,6 +410,9 @@ fc-cache %{_fontdir} 2> /dev/null ||: %changelog +* Sun Nov 4 2012 Kayvan Sylvan +- Remove texlive-fonts from BuildRequires (Fedora 18 obsoletes texlive-fonts) + * Fri Nov 2 2012 Kayvan Sylvan - 2.1 - lyx-2.1 dev @@ -772,9 +774,10 @@ Xrpm) cd $BUILDDIR make package_source mv LyX-2.1.tar.bz2 $HOME/rpmbuild/SOURCES - rpmbuild -bb $HOME/rpmbuild/SPECS/lyx-cmake.spec + rpmbuild -ba $HOME/rpmbuild/SPECS/lyx-cmake.spec ;; Xinstall) + VER=$(head $SRCDIR/configure.ac | grep AC_INIT|awk -F, '{print $2}') rpm -q lyx | grep -q lyx-$VER if [ $? -eq 0 ] then From eac5840040c0b9a8c9af9764e70a6ce71f623a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Nov 2012 07:05:19 +0100 Subject: [PATCH 50/93] installer: updates to dictionary handling - settings.nsh: update to LyX 2.0.5 - thesaurus.nsh: - don't download already existing dictionaries when installing over an existing LyX installation - the list of available dictionaries is 120 - detection: - detect existing dictionaries - fix detection of Gimp and Photoshop - init.nsh: detect existing dictionaries and modify the list of available dictionaries accordingly in the installer sections --- .../packaging/installer/include/detection.nsh | 69 +- .../packaging/installer/include/init.nsh | 890 +++++++++++++++--- .../packaging/installer/include/thesaurus.nsh | 38 +- .../packaging/installer/include/variables.nsh | 2 + .../Win32/packaging/installer/settings.nsh | 8 +- .../packaging/installer/setup/install.nsh | 4 +- 6 files changed, 833 insertions(+), 178 deletions(-) diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 33b0c7dac6..f5d6748aed 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -11,11 +11,14 @@ Detection of external component locations # - SearchExternal, calls the functions: # LaTeXActions # MissingPrograms +# FindDictionaries # # - MissingPrograms, (check if third-party programs are installed), uses: # SEARCH_MIKTEX # SEARCH_TEXLIVE # +# - FindDictionaries (finds installed spellcheck and thesaurus dictionaries) +# # - EditorCheck, # (test if an editor with syntax-highlighting for LaTeX-files is installed) # @@ -27,6 +30,7 @@ Detection of external component locations Function SearchExternal Call LaTeXActions # function from LaTeX.nsh Call MissingPrograms + Call FindDictionaries FunctionEnd # --------------------------------------- @@ -92,21 +96,23 @@ Function MissingPrograms # test if an image editor is installed StrCpy $ImageEditorPath "" - ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinGimp-2.0_is1" "DisplayIcon" + ReadRegStr $ImageEditorPath HKLM "Software\Classes\GIMP-2.8-xcf\shell\open\command" "" ${if} $ImageEditorPath != "" - StrCpy $ImageEditorPath "$ImageEditorPath" -13 # delete "\gimp-2.x.exe" + StrCpy $ImageEditorPath "$ImageEditorPath" -19 # delete '\gimp-2.x.exe" "%1"' + StrCpy $ImageEditorPath $ImageEditorPath "" 1 # remove the leading quote ${endif} # check for Photoshop - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\Photoshop.exe" "Path" + ReadRegStr $0 HKLM "Software\Classes\Applications\Photoshop.exe\shell\open\command" "" ${if} $0 != "" - StrCpy $0 "$0" -1 # delete the last "\" + StrCpy $0 "$0" -20 # delete '\photoshop.exe" "%1"' + StrCpy $0 $0 "" 1 # remove the leading quote ${if} $ImageEditorPath != "" StrCpy $ImageEditorPath "$ImageEditorPath;$0" ${else} StrCpy $ImageEditorPath $0 ${endif} ${endif} - + # test if and where the BibTeX-editor JabRef is installed ReadRegStr $PathBibTeXEditor HKCU "Software\JabRef" "Path" ${if} $PathBibTeXEditor == "" @@ -129,9 +135,6 @@ Function MissingPrograms # test if Inkscape is installed ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation" - # test if metafile2eps is installed - ReadRegStr $WMFPath HKLM "Software\Microsoft\Windows NT\CurrentVersion\Print\Printers\Metafile to EPS Converter" "Name" - # test if Gnumeric is installed ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" "" ${if} $0 != "" @@ -144,6 +147,56 @@ FunctionEnd # --------------------------------------- +Function FindDictionaries + # find the installed dictionaries + + # start with empty strings + StrCpy $FoundDict "" + StrCpy $FoundThes "" + + # read out the possible spell-checker filenames from the file + FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r + ${for} $5 1 60 + # the file has 120 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 # $String is now the dictionary name + FileRead $R5 $String # $String is now the dictionary name + StrCpy $String $String -2 # remove the linebreak characters + StrCpy $R3 $String -4 # $R3 is now the dictionary language code + # we have 2 cases where we renamed the file to a 3 letter code, see thesaurus.nsh + ${if} $String == "db_DE.dic" + StrCpy $String "dsb_DE.dic" + ${endif} + ${if} $String == "hb_DE.dic" + StrCpy $String "hsb_DE.dic" + ${endif} + !insertmacro FileCheck $4 $String "$INSTDIR\Resources\dicts" # macro from LyXUtils.nsh + ${if} $4 == "True" + StrCpy $FoundDict "$R3 $FoundDict" + ${endif} + ${next} + FileClose $R5 + + # read out the possible thesaurus filenames from the file + FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r + ${for} $5 1 22 + # the file has 44 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 # $String is now the dictionary name + FileRead $R5 $String # $String is now the dictionary name + StrCpy $String $String -2 # remove the linebreak characters + StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code + !insertmacro FileCheck $4 $String "$INSTDIR\Resources\thes" # macro from LyXUtils.nsh + ${if} $4 == "True" + StrCpy $FoundThes "$R3 $FoundThes" + ${endif} + ${next} + FileClose $R5 + +FunctionEnd + +# --------------------------------------- + Function EditorCheck # test if an editor with syntax-highlighting for LaTeX-files is installed diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index f4cf09bf1c..87437b4c0c 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -6,152 +6,6 @@ Initialization function */ -#-------------------------------- -# Installer initialization - -!macro PRINTER_INIT - - ${If} ${AtLeastWinVista} - StrCpy $PrinterConf "printui.exe" - ${Else} - StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry" - ${EndIf} - -!macroend - -Function .onInit - - ${IfNot} ${IsNT} - ${OrIfNot} ${AtLeastWinXP} - MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows XP or later." - Quit - ${EndIf} - - # check that the installer is not currently running - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e' - Pop $R0 - ${if} $R0 != "0" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e' - Pop $R0 - ${if} $R0 != "0" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - - # check if LyX is already installed - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" - ${else} - ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "Publisher" - # handle also the case that LyX is already installed in HKLM - ${if} $0 == "" - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" - ${endif} - ${endif} - ${if} $0 != "" - MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" - Abort - ${endif} - - !insertmacro PRINTER_INIT - !insertmacro MULTIUSER_INIT - - # this can be reset to "true" in section SecDesktop - StrCpy $CreateDesktopIcon "false" - StrCpy $CreateFileAssociations "false" - - ${IfNot} ${Silent} - # Show banner while installer is intializating - Banner::show /NOUNLOAD "Checking system" - ${EndIf} - - Call SearchExternal - #Call InitExternal - - !if ${SETUPTYPE} == BUNDLE - # don't let the installer sections appear when the programs are already installed - ${if} $PathBibTeXEditor != "" - SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef} - ${endif} - !endif - - ${IfNot} ${Silent} - Banner::destroy - ${EndIf} - -FunctionEnd - -# this function is called at first after starting the uninstaller -Function un.onInit - - !insertmacro PRINTER_INIT - !insertmacro MULTIUSER_UNINIT - - # Check that LyX is not currently running - FindProcDLL::FindProc "lyx.exe" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" - Abort - ${endif} - - # set registry root key - ${if} $MultiUser.Privileges == "Admin" - ${orif} $MultiUser.Privileges == "Power" - SetShellVarContext all - ${else} - SetShellVarContext current - ${endif} - - # Ascertain whether the user has sufficient privileges to uninstall. - # abort when LyX was installed with admin permissions but the user doesn't have administrator privileges - ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayVersion" - ${if} $0 != "" - ${andif} $MultiUser.Privileges != "Admin" - ${andif} $MultiUser.Privileges != "Power" - MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" - Abort - ${endif} - # abort when LyX couldn't be found in the registry - ${if} $0 == "" # check in HKCU - ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion" - ${if} $0 == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)" - ${endif} - ${endif} - - # Macro to investigate name of LyX's preferences folders to be able remove them - !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh - - # test if MiKTeX was installed together with LyX - ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes${APP_SERIES_KEY}" - SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section - StrCpy $LaTeXInstalled "MiKTeX" - DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${else} - SectionSetText 2 "" # hides the corresponding uninstaller section - ${endif} - - # test if JabRef was installed together with LyX - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" - ${if} $0 == "Yes${APP_SERIES_KEY}" - SectionSetText 3 "JabRef" # names the corersponding uninstaller section - StrCpy $JabRefInstalled "Yes" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" - ${else} - SectionSetText 3 "" # hides the corresponding uninstaller section - ${endif} - - # question message if the user really wants to uninstall LyX - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2 # continue if yes - Abort - -FunctionEnd - #-------------------------------- # User initialization @@ -283,6 +137,7 @@ SectionEnd Section "German (D)" SecDGermanD # already installed by default + SectionIn RO #StrCpy $DictCodes "de_DE$DictCodes" AddSize 2650 SectionEnd @@ -310,6 +165,7 @@ SectionEnd Section "English (GB)" SecDEnglishGB # already installed by default + SectionIn RO #StrCpy $DictCodes "en_GB$DictCodes" AddSize 757 SectionEnd @@ -322,18 +178,21 @@ SectionEnd Section "English (US)" SecDEnglishUS # already installed by default + SectionIn RO #StrCpy $DictCodes "en_US$DictCodes" AddSize 688 SectionEnd Section "Espaol (ES)" SecDSpanishES # already installed by default + SectionIn RO #StrCpy $DictCodes "es_ES$DictCodes" AddSize 974 SectionEnd Section "Espaol (MX)" SecDSpanishMX # already installed by default + SectionIn RO #StrCpy $DictCodes "es_MX$DictCodes" AddSize 924 SectionEnd @@ -355,6 +214,7 @@ SectionEnd Section "Franais" SecDFrench # already installed by default + SectionIn RO #StrCpy $DictCodes "fr_FR$DictCodes" AddSize 1200 SectionEnd @@ -464,9 +324,8 @@ Section /o "Rom AddSize 1930 SectionEnd -Section "Russian" SecDRussian - # already installed by default - #StrCpy $DictCodes "ru_RU$DictCodes" +Section /o "Russian" SecDRussian + StrCpy $DictCodes "ru_RU$DictCodes" AddSize 1920 SectionEnd @@ -646,3 +505,736 @@ SectionGroupEnd !endif !insertmacro MUI_FUNCTION_DESCRIPTION_END + +#-------------------------------- +# Installer initialization + +!macro PRINTER_INIT + + ${If} ${AtLeastWinVista} + StrCpy $PrinterConf "printui.exe" + ${Else} + StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry" + ${EndIf} + +!macroend + +# .onInit must be here after the section definition because we have to set +# the selection states of the dictionary sections +Function .onInit + + ${IfNot} ${IsNT} + ${OrIfNot} ${AtLeastWinXP} + MessageBox MB_OK|MB_ICONSTOP "${APP_NAME} ${APP_VERSION} requires Windows XP or later." + Quit + ${EndIf} + + # check that the installer is not currently running + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e' + Pop $R0 + ${if} $R0 != "0" + MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" + Abort + ${endif} + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e' + Pop $R0 + ${if} $R0 != "0" + MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" + Abort + ${endif} + + # check if this LyX version is already installed + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" + ${else} + ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "Publisher" + # handle also the case that LyX is already installed in HKLM + ${if} $0 == "" + ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" + ${endif} + ${endif} + ${if} $0 != "" + MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" + Abort + ${endif} + + !insertmacro PRINTER_INIT + !insertmacro MULTIUSER_INIT + + # this can be reset to "true" in section SecDesktop + StrCpy $CreateDesktopIcon "false" + StrCpy $CreateFileAssociations "false" + + ${IfNot} ${Silent} + # Show banner while installer is intializating + Banner::show /NOUNLOAD "Checking system" + ${EndIf} + + Call SearchExternal + #Call InitExternal + + !if ${SETUPTYPE} == BUNDLE + # don't let the installer sections appear when the programs are already installed + ${if} $PathBibTeXEditor != "" + SectionSetText 3 "" # hides the corresponding uninstaller section, ${SecInstJabRef} + ${endif} + !endif + + # select sections of already installed spell-checker dictionaries, make them read-only + # and set the necessary size to 0 bytes + StrCpy $String $FoundDict + StrCpy $Search "af_ZA" + Call StrPoint # function from LyXUtils.nsh + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDAfrikaans} $0 + SectionSetSize ${SecDAfrikaans} 0 + ${endif} + StrCpy $Search "ar_DZ" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDArabic} $0 + SectionSetSize ${SecDArabic} 0 + ${endif} + StrCpy $Search "hy_AM" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDArmenian} $0 + SectionSetSize ${SecDArmenian} 0 + ${endif} + StrCpy $Search "id_ID" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDIndonesian} $0 + SectionSetSize ${SecDIndonesian} 0 + ${endif} + StrCpy $Search "ms_MY" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDMalayan} $0 + SectionSetSize ${SecDMalayan} 0 + ${endif} + StrCpy $Search "be_BY" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDBelarusian} $0 + SectionSetSize ${SecDBelarusian} 0 + ${endif} + StrCpy $Search "br_FR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDBreton} $0 + SectionSetSize ${SecDBreton} 0 + ${endif} + StrCpy $Search "bg_BG" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDBulgarian} $0 + SectionSetSize ${SecDBulgarian} 0 + ${endif} + StrCpy $Search "ca_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDCatalanian} $0 + SectionSetSize ${SecDCatalanian} 0 + ${endif} + StrCpy $Search "cs_CZ" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDCzech} $0 + SectionSetSize ${SecDCzech} 0 + ${endif} + StrCpy $Search "cy_GB" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDWelsh} $0 + SectionSetSize ${SecDWelsh} 0 + ${endif} + StrCpy $Search "da_DK" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDDanish} $0 + SectionSetSize ${SecDDanish} 0 + ${endif} + StrCpy $Search "de_AT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGermanAT} $0 + SectionSetSize ${SecDGermanAT} 0 + ${endif} + StrCpy $Search "de_CH" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGermanCH} $0 + SectionSetSize ${SecDGermanCH} 0 + ${endif} + StrCpy $Search "de_DE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGermanD} $0 + SectionSetSize ${SecDGermanD} 0 + ${endif} + StrCpy $Search "el_GR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGreek} $0 + SectionSetSize ${SecDGreek} 0 + ${endif} + StrCpy $Search "et_EE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDEstonian} $0 + SectionSetSize ${SecDEstonian} 0 + ${endif} + StrCpy $Search "en_AU" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDEnglishAU} $0 + # SectionSetSize ${SecDEnglishAU} 0 + ${endif} + StrCpy $Search "en_CA" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDEnglishCA} $0 + SectionSetSize ${SecDEnglishCA} 0 + ${endif} + StrCpy $Search "en_GB" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDEnglishGB} $0 + SectionSetSize ${SecDEnglishGB} 0 + ${endif} + StrCpy $Search "en_NZ" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDEnglishNZ} $0 + # SectionSetSize ${SecDEnglishNZ} 0 + ${endif} + StrCpy $Search "en_US" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDEnglishUS} $0 + SectionSetSize ${SecDEnglishUS} 0 + ${endif} + StrCpy $Search "es_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSpanishES} $0 + SectionSetSize ${SecDSpanishES} 0 + ${endif} + StrCpy $Search "es_MX" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSpanishMX} $0 + SectionSetSize ${SecDSpanishMX} 0 + ${endif} + StrCpy $Search "eo_EO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDEsperanto} $0 + SectionSetSize ${SecDEsperanto} 0 + ${endif} + StrCpy $Search "eu_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDBasque} $0 + SectionSetSize ${SecDBasque} 0 + ${endif} + StrCpy $Search "fa_IR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDFarsi} $0 + SectionSetSize ${SecDFarsi} 0 + ${endif} + StrCpy $Search "fr_FR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDFrench} $0 + SectionSetSize ${SecDFrench} 0 + ${endif} + StrCpy $Search "ga_IR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGaelic} $0 + SectionSetSize ${SecDGaelic} 0 + ${endif} + StrCpy $Search "gd_GB" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDScottish} $0 + SectionSetSize ${SecDScottish} 0 + ${endif} + StrCpy $Search "gl_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDGalician} $0 + SectionSetSize ${SecDGalician} 0 + ${endif} + StrCpy $Search "he_IL" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDHebrew} $0 + SectionSetSize ${SecDHebrew} 0 + ${endif} + StrCpy $Search "hr_HR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDCroatian} $0 + SectionSetSize ${SecDCroatian} 0 + ${endif} + StrCpy $Search "hu_HU" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDHungarian} $0 + SectionSetSize ${SecDHungarian} 0 + ${endif} + StrCpy $Search "ia_IA" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDInterlingua} $0 + SectionSetSize ${SecDInterlingua} 0 + ${endif} + StrCpy $Search "is_IS" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDIcelandic} $0 + SectionSetSize ${SecDIcelandic} 0 + ${endif} + StrCpy $Search "it_IT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDItalian} $0 + SectionSetSize ${SecDItalian} 0 + ${endif} + StrCpy $Search "kk_KZ" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDKazakh} $0 + SectionSetSize ${SecDKazakh} 0 + ${endif} + StrCpy $Search "ko_KR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDKorean} $0 + SectionSetSize ${SecDKorean} 0 + ${endif} + StrCpy $Search "la_LA" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDLatin} $0 + SectionSetSize ${SecDLatin} 0 + ${endif} + StrCpy $Search "lt_LT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDLithuanian} $0 + SectionSetSize ${SecDLithuanian} 0 + ${endif} + StrCpy $Search "lv_LV" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDLatvian} $0 + SectionSetSize ${SecDLatvian} 0 + ${endif} + StrCpy $Search "nl_NL" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDDutch} $0 + SectionSetSize ${SecDDutch} 0 + ${endif} + StrCpy $Search "nb_NO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDNorwegianNB} $0 + SectionSetSize ${SecDNorwegianNB} 0 + ${endif} + StrCpy $Search "nn_NO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDNorwegianNN} $0 + SectionSetSize ${SecDNorwegianNN} 0 + ${endif} + StrCpy $Search "pl_PL" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDPolish} $0 + SectionSetSize ${SecDPolish} 0 + ${endif} + StrCpy $Search "pt_BR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDPortugueseBR} $0 + SectionSetSize ${SecDPortugueseBR} 0 + ${endif} + StrCpy $Search "pt_PT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDPortuguesePT} $0 + SectionSetSize ${SecDPortuguesePT} 0 + ${endif} + StrCpy $Search "ro_RO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDRomanian} $0 + SectionSetSize ${SecDRomanian} 0 + ${endif} + StrCpy $Search "ru_RU" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDRussian} $0 + SectionSetSize ${SecDRussian} 0 + ${endif} + StrCpy $Search "db_DE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSorbianD} $0 + SectionSetSize ${SecDSorbianD} 0 + ${endif} + StrCpy $Search "hb_DE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSorbianH} $0 + SectionSetSize ${SecDSorbianH} 0 + ${endif} + StrCpy $Search "sq_AL" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDAlbanian} $0 + SectionSetSize ${SecDAlbanian} 0 + ${endif} + StrCpy $Search "sl_SI" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSlowenian} $0 + SectionSetSize ${SecDSlowenian} 0 + ${endif} + StrCpy $Search "sk_SK" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSlowakian} $0 + SectionSetSize ${SecDSlowakian} 0 + ${endif} + StrCpy $Search "sr_RS" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSerbian} $0 + SectionSetSize ${SecDSerbian} 0 + ${endif} + StrCpy $Search "sv_SE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDSwedish} $0 + SectionSetSize ${SecDSwedish} 0 + ${endif} + StrCpy $Search "th_TH" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDThai} $0 + SectionSetSize ${SecDThai} 0 + ${endif} + StrCpy $Search "uk_UA" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDUkrainian} $0 + SectionSetSize ${SecDUkrainian} 0 + ${endif} + StrCpy $Search "vi_VN" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecDVietnamese} $0 + SectionSetSize ${SecDVietnamese} 0 + ${endif} + + # select sections of already installed thesaurus dictionaries, make them read-only + # and set the necessary size to 0 bytes + StrCpy $String $FoundThes + StrCpy $Search "bg_BG" + Call StrPoint # function from LyXUtils.nsh + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTBulgarian} $0 + SectionSetSize ${SecTBulgarian} 0 + ${endif} + StrCpy $Search "ca_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTCatalan} $0 + SectionSetSize ${SecTCatalan} 0 + ${endif} + StrCpy $Search "cs_CZ" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTCzech} $0 + SectionSetSize ${SecTCzech} 0 + ${endif} + StrCpy $Search "da_DK" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTDanish} $0 + SectionSetSize ${SecTDanish} 0 + ${endif} + StrCpy $Search "de_DE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTGermanDA} $0 + SectionSetSize ${SecTGermanDA} 0 + ${endif} + StrCpy $Search "de_CH" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTGermanCH} $0 + SectionSetSize ${SecTGermanCH} 0 + ${endif} + StrCpy $Search "en_GB" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTEnglishGB} $0 + SectionSetSize ${SecTEnglishGB} 0 + ${endif} + StrCpy $Search "en_US" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTEnglishUSAU} $0 + SectionSetSize ${SecTEnglishUSAU} 0 + ${endif} + StrCpy $Search "es_ES" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTSpanish} $0 + SectionSetSize ${SecTSpanish} 0 + ${endif} + StrCpy $Search "fr_FR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTFrench} $0 + SectionSetSize ${SecTFrench} 0 + ${endif} + StrCpy $Search "ga_IR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTGaelic} $0 + SectionSetSize ${SecTGaelic} 0 + ${endif} + StrCpy $Search "el_GR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTGreek} $0 + SectionSetSize ${SecTGreek} 0 + ${endif} + StrCpy $Search "it_IT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTItalian} $0 + SectionSetSize ${SecTItalian} 0 + ${endif} + StrCpy $Search "hu_HU" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTHungarian} $0 + SectionSetSize ${SecTHungarian} 0 + ${endif} + StrCpy $Search "no_NO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTNorwegian} $0 + SectionSetSize ${SecTNorwegian} 0 + ${endif} + StrCpy $Search "pl_PL" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTPolish} $0 + SectionSetSize ${SecTPolish} 0 + ${endif} + StrCpy $Search "pt_PT" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTPortuguese} $0 + SectionSetSize ${SecTPortuguese} 0 + ${endif} + StrCpy $Search "ro_RO" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTRomanian} $0 + SectionSetSize ${SecTRomanian} 0 + ${endif} + StrCpy $Search "ru_RU" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTRussian} $0 + SectionSetSize ${SecTRussian} 0 + ${endif} + StrCpy $Search "sl_SI" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTSlowenian} $0 + SectionSetSize ${SecTSlowenian} 0 + ${endif} + StrCpy $Search "sk_SK" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTSlowakian} $0 + SectionSetSize ${SecTSlowakian} 0 + ${endif} + StrCpy $Search "sv_SE" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + SectionSetFlags ${SecTSwedish} $0 + SectionSetSize ${SecTSwedish} 0 + ${endif}*/ + + ${IfNot} ${Silent} + Banner::destroy + ${EndIf} + +FunctionEnd + +# this function is called at first after starting the uninstaller +Function un.onInit + + !insertmacro PRINTER_INIT + !insertmacro MULTIUSER_UNINIT + + # Check that LyX is not currently running + FindProcDLL::FindProc "lyx.exe" + ${if} $R0 == "1" + MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" + Abort + ${endif} + + # set registry root key + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + SetShellVarContext all + ${else} + SetShellVarContext current + ${endif} + + # Ascertain whether the user has sufficient privileges to uninstall. + # abort when LyX was installed with admin permissions but the user doesn't have administrator privileges + ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "DisplayVersion" + ${if} $0 != "" + ${andif} $MultiUser.Privileges != "Admin" + ${andif} $MultiUser.Privileges != "Power" + MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" + Abort + ${endif} + # abort when LyX couldn't be found in the registry + ${if} $0 == "" # check in HKCU + ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion" + ${if} $0 == "" + MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)" + ${endif} + ${endif} + + # Macro to investigate name of LyX's preferences folders to be able remove them + !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh + + # test if MiKTeX was installed together with LyX + ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" + ${if} $0 == "Yes${APP_SERIES_KEY}" + SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section + StrCpy $LaTeXInstalled "MiKTeX" + DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" + ${else} + SectionSetText 2 "" # hides the corresponding uninstaller section + ${endif} + + # test if JabRef was installed together with LyX + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" + ${if} $0 == "Yes${APP_SERIES_KEY}" + SectionSetText 3 "JabRef" # names the corersponding uninstaller section + StrCpy $JabRefInstalled "Yes" + DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" + ${else} + SectionSetText 3 "" # hides the corresponding uninstaller section + ${endif} + + # question message if the user really wants to uninstall LyX + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2 # continue if yes + Abort + +FunctionEnd + diff --git a/development/Win32/packaging/installer/include/thesaurus.nsh b/development/Win32/packaging/installer/include/thesaurus.nsh index fcfb007d34..1efb27bdd0 100644 --- a/development/Win32/packaging/installer/include/thesaurus.nsh +++ b/development/Win32/packaging/installer/include/thesaurus.nsh @@ -6,7 +6,8 @@ Function DownloadHunspellDictionary # read out the locations from the file FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${For} $5 1 114 + ${For} $5 1 120 # the file has 120 lines + FileRead $R5 $String # $String is now the dictionary name StrCpy $R3 $String 5 # $R3 is now the dictionary language code @@ -51,8 +52,9 @@ Function DownloadThesaurusDictionary # read out the locations from the file FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${For} $5 1 44 - FileRead $R5 $String # $String is now the dictionary name + ${For} $5 1 44 # the file has 44 lines + + FileRead $R5 $String # $String is now the dictionary name StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code ${if} $ThesCode == $R3 @@ -91,18 +93,22 @@ FunctionEnd #-------------------------------- Function InstallHunspellDictionary - # install hunspell dictionaries + # install the selected hunspell dictionaries except of already existing ones - # install the dictionary corresponding to the system and the chosen menu language - # check if the system language and the chosen menu language are the same, if not install - # both dictionaries + # download the dictionaries ${Do} StrCpy $DictCode $DictCodes 5 StrCpy $DictCodes $DictCodes "" 5 - Call DownloadHunspellDictionary + # don't dowload existing ones thus check if $DictCode is in $FoundDict + StrCpy $String $FoundDict + StrCpy $Search $DictCode + Call StrPoint # function from LyXUtils.nsh + ${if} $Pointer == "-1" + Call DownloadHunspellDictionary + ${endif} ${LoopUntil} $DictCodes == "" - # some dictionaries need to be renamed + # some dictionaries need to be renamed to have a 2 letter code ${if} ${FileExists} "$INSTDIR\Resources\dicts\db_DE.aff" Rename "$INSTDIR\Resources\dicts\db_DE.aff" "$INSTDIR\Resources\dicts\dsb_DE.aff" Rename "$INSTDIR\Resources\dicts\db_DE.dic" "$INSTDIR\Resources\dicts\dsb_DE.dic" @@ -117,15 +123,19 @@ FunctionEnd #-------------------------------- Function InstallThesaurusDictionary - # install thesaurus dictionaries + # install the selected thesaurus dictionaries except of already existing ones - # install the dictionary corresponding to the system and the chosen menu language - # check if the system language and the chosen menu language are the same, if not install - # both dictionaries + # download the dictionaries ${Do} StrCpy $ThesCode $ThesCodes 5 StrCpy $ThesCodes $ThesCodes "" 5 - Call DownloadThesaurusDictionary + # don't dowload existing ones thus check if $ThesCode is in $FoundThes + StrCpy $String $FoundThes + StrCpy $Search $ThesCode + Call StrPoint # function from LyXUtils.nsh + ${if} $Pointer == "-1" + Call DownloadThesaurusDictionary + ${endif} ${LoopUntil} $ThesCodes == "" # some dictionaries of language variants are identic diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index 8e926cac18..729dec48b7 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -24,6 +24,8 @@ Var DictCode Var DictCodes Var DelPythonFiles Var EditorPath +Var FoundDict +Var FoundThes Var GhostscriptPath Var GnumericPath Var ImageEditorPath diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index ed6881d564..b2d70b199e 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -11,8 +11,8 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 0 -!define APP_VERSION_REVISION 4 -!define APP_VERSION_BUILD 1 # Start with 1 for the installer releases of each version +!define APP_VERSION_REVISION 5 +!define APP_VERSION_BUILD 2 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display @@ -38,7 +38,7 @@ These typically need to be modified for each LyX release !define FILES_LYX "C:\LyX\lyx-20-install" !define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20" !define FILES_BUNDLE "C:\LyX\depsbundle" -!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.2" +!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" @@ -50,7 +50,7 @@ These typically need to be modified for each LyX release !define JabRefVersion "2.8" !define MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "6.7.7" +!define ImageMagickVersion "6.8.0" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 5b3562b39c..27291bee4e 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -139,10 +139,8 @@ Section -ProgramFiles SecProgramFiles ${if} $ThesCodes != "" Call InstallThesaurusDictionary # Function from Thesaurus.nsh ${endif} - # finally delete the list of dictionaries and mirrors + # finally delete the list of mirrors Delete "$INSTDIR\Resources\DictionaryMirrors.txt" - Delete "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" - Delete "$INSTDIR\Resources\HunspellDictionaryNames.txt" # Create uninstaller WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}" From dab1b4bbc0d15389ef6339835928ef298853b72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Nov 2012 07:09:20 +0100 Subject: [PATCH 51/93] installer: remove special handling of WMF converter metafile2eps is sine a while a real Windows printer therefore the former handling for the old program can go --- .../Win32/packaging/installer/include/variables.nsh | 1 - development/Win32/packaging/installer/setup/configure.nsh | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index 729dec48b7..d96b0b6f67 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -52,7 +52,6 @@ Var ThesCode Var ThesCodes Var UpdateFNDBReturn Var UserList -Var WMFPath Var LangName diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 925b432fa0..8c3af60c92 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -117,9 +117,6 @@ Section -Configure ${if} $SVGPath != "" StrCpy $PathPrefix "$PathPrefix;$SVGPath" ${endif} - ${if} $WMFPath != "" - StrCpy $PathPrefix "$PathPrefix;$WMFPath" - ${endif} ${if} $GnumericPath != "" StrCpy $PathPrefix "$PathPrefix;$GnumericPath" ${endif} @@ -128,8 +125,8 @@ Section -Configure ${EndIf} ${if} $LilyPondPath != "" StrCpy $PathPrefix "$PathPrefix;$LilyPondPath" - ${endif} - + ${endif} + # Set the path prefix in lyxrc.dist ClearErrors Delete "$INSTDIR\Resources\lyxrc.dist" From e447cdbd6b828e796107624b3a91841fb4517782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Nov 2012 07:21:00 +0100 Subject: [PATCH 52/93] installer: clarify a message It is possible to install a newer lyX over an existing older LyX installation, but we cannot allow to install over the same lyX version. Therefore output the version number if this error message is shown --- development/Win32/packaging/installer/include/declarations.nsh | 1 + development/Win32/packaging/installer/lang/arabic.nsh | 2 +- development/Win32/packaging/installer/lang/catalan.nsh | 2 +- development/Win32/packaging/installer/lang/czech.nsh | 2 +- development/Win32/packaging/installer/lang/danish.nsh | 2 +- development/Win32/packaging/installer/lang/dutch.nsh | 2 +- development/Win32/packaging/installer/lang/english.nsh | 2 +- development/Win32/packaging/installer/lang/french.nsh | 2 +- development/Win32/packaging/installer/lang/galician.nsh | 2 +- development/Win32/packaging/installer/lang/german.nsh | 2 +- development/Win32/packaging/installer/lang/hungarian.nsh | 2 +- development/Win32/packaging/installer/lang/indonesian.nsh | 2 +- development/Win32/packaging/installer/lang/italian.nsh | 2 +- development/Win32/packaging/installer/lang/japanese.nsh | 2 +- development/Win32/packaging/installer/lang/norwegian.nsh | 2 +- development/Win32/packaging/installer/lang/polish.nsh | 2 +- development/Win32/packaging/installer/lang/portuguese.nsh | 2 +- development/Win32/packaging/installer/lang/romanian.nsh | 2 +- development/Win32/packaging/installer/lang/slovak.nsh | 2 +- development/Win32/packaging/installer/lang/spanish.nsh | 2 +- development/Win32/packaging/installer/lang/swedish.nsh | 2 +- development/Win32/packaging/installer/lang/turkish.nsh | 2 +- development/Win32/packaging/installer/lang/ukrainian.nsh | 2 +- 23 files changed, 23 insertions(+), 22 deletions(-) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 5095ca335f..d40d0b70ca 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -47,6 +47,7 @@ Configuration of LyX installer # to check if it is exactly this version (to support side by side installations) !define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}" +!define APP_SERIES_KEY2 "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" !define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}" !define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/lang/arabic.nsh index ad9c5b7223..000c302d80 100644 --- a/development/Win32/packaging/installer/lang/arabic.nsh +++ b/development/Win32/packaging/installer/lang/arabic.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c ${LangFileString} RunConfigureFailed " configure script" ${LangFileString} NotAdmin " !" ${LangFileString} InstallRunning " !" -${LangFileString} StillInstalled " ." +${LangFileString} StillInstalled " ${APP_SERIES_KEY2} ." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh index 9dca374eec..d384acd638 100644 --- a/development/Win32/packaging/installer/lang/catalan.nsh +++ b/development/Win32/packaging/installer/lang/catalan.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' dur ${LangFileString} RunConfigureFailed "No es pot executar el programa de configuraci" ${LangFileString} NotAdmin "Necessiteu drets d'administrador per installar el LyX!" ${LangFileString} InstallRunning "L'installador ja s'est executant!" -${LangFileString} StillInstalled "El LyX ja es troba installat! Desinstalleu-lo primer." +${LangFileString} StillInstalled "El LyX ${APP_SERIES_KEY2} ja es troba installat! Desinstalleu-lo primer." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh index 4487919c41..9726956c1c 100644 --- a/development/Win32/packaging/installer/lang/czech.nsh +++ b/development/Win32/packaging/installer/lang/czech.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v konfi ${LangFileString} RunConfigureFailed "Nelze spustit konfiguran skript" ${LangFileString} NotAdmin "Potebujete administrtorsk prva pro nainstalovn LyXu!" ${LangFileString} InstallRunning "Instaltor je ji sputn!" -${LangFileString} StillInstalled "LyX je ji nainstalovn! Nejprve LyX odinstalujte." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je ji nainstalovn! Nejprve LyX odinstalujte." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh index 4c20071215..dca82d758c 100644 --- a/development/Win32/packaging/installer/lang/danish.nsh +++ b/development/Win32/packaging/installer/lang/danish.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Forsoget p ${LangFileString} RunConfigureFailed "Mislykket forsog p at afvikle konfigurations-scriptet" ${LangFileString} NotAdmin "Du skal have administrator-rettigheder for at installere LyX!" ${LangFileString} InstallRunning "Installationsprogrammet krer allerede!" -${LangFileString} StillInstalled "LyX er allerede installeret! Afinstaller LyX frst." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret! Afinstaller LyX frst." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh index 660de6fe39..c7c7775295 100644 --- a/development/Win32/packaging/installer/lang/dutch.nsh +++ b/development/Win32/packaging/installer/lang/dutch.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' te ${LangFileString} RunConfigureFailed "Mislukte configuratie poging" ${LangFileString} NotAdmin "U heeft systeem-beheerrechten nodig om LyX te installeren!" ${LangFileString} InstallRunning "Het installatieprogramma is al gestart!" -${LangFileString} StillInstalled "LyX is reeds geinstalleerd! Verwijder LyX eerst." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd! Verwijder LyX eerst." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index b49653ce1d..485e9b3ae8 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -82,7 +82,7 @@ ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used t ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script" #${LangFileString} RunConfigureFailed "Could not execute the configure script" ${LangFileString} InstallRunning "The installer is already running!" -${LangFileString} StillInstalled "LyX is already installed! Deinstall LyX first." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is already installed! Deinstall LyX first." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 7abbac2c6c..8329f5c5bd 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -81,7 +81,7 @@ ${LangFileString} ModifyingConfigureFailed " ${LangFileString} RunConfigureFailed "chec de la tentative de configuration initiale de LyX." ${LangFileString} NotAdmin "Vous devez avoir les droits d'administration pour installer LyX !" ${LangFileString} InstallRunning "Le programme d'installation est toujours en cours !" -${LangFileString} StillInstalled "LyX est dj install ! Le dsinstaller d'abord." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} est dj install ! Le dsinstaller d'abord." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh index 41f85f2a7e..c46f12b2a0 100644 --- a/development/Win32/packaging/installer/lang/galician.nsh +++ b/development/Win32/packaging/installer/lang/galician.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 'path_prefix' ${LangFileString} RunConfigureFailed "Non se deu executado o script de configuracin" ${LangFileString} NotAdmin "Precisa de privilxios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador xa est a correr!" -${LangFileString} StillInstalled "O LyX xa est instalado! Desinstale o LyX primeiro." +${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} xa est instalado! Desinstale o LyX primeiro." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index 7de08fb7f5..beb96c05eb 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -83,7 +83,7 @@ ${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_pr ${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausfhren." ${LangFileString} NotAdmin "Sie bentigen Administratorrechte um LyX zu installieren!" ${LangFileString} InstallRunning "Der Installer luft bereits!" -${LangFileString} StillInstalled "LyX ist bereits installiert! Deinstallieren Sie LyX zuerst." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert! Deinstallieren Sie LyX zuerst." ${LangFileString} MultipleIndexesNotAvailable "Die Untersttzung fr mehrere Indexe in einem Dokument wird nicht verfgbar sein, denn$\r$\n\ MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese." diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh index 96a630ee2e..2167b57a90 100644 --- a/development/Win32/packaging/installer/lang/hungarian.nsh +++ b/development/Win32/packaging/installer/lang/hungarian.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Nem tudom be ${LangFileString} RunConfigureFailed "Nem tudom vgrehajtani a configure parancsfjlt!" ${LangFileString} NotAdmin "A LyX teleptshez rendszergazdai jogok szksgesek!" ${LangFileString} InstallRunning "A telept mr fut!" -${LangFileString} StillInstalled "A LyX mr teleptve van! Elszr tvoltsa el a rgit." +${LangFileString} StillInstalled "A LyX ${APP_SERIES_KEY2} mr teleptve van! Elszr tvoltsa el a rgit." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh index 3264cb15ed..b1a553fcf3 100644 --- a/development/Win32/packaging/installer/lang/indonesian.nsh +++ b/development/Win32/packaging/installer/lang/indonesian.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix' ${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip configure" ${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!" ${LangFileString} InstallRunning "Program instalasi sedang berjalan!" -${LangFileString} StillInstalled "LyX sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh index e84bb2f0ed..aac390201f 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/lang/italian.nsh @@ -81,7 +81,7 @@ ${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 'pat ${LangFileString} RunConfigureFailed "Fallito tentativo di eseguire lo script di configurazione" ${LangFileString} NotAdmin "Occorrono i privilegi da amministratore per installare LyX!" ${LangFileString} InstallRunning "Il programma di installazione gi in esecuzione!" -${LangFileString} StillInstalled "LyX gi installato! Occorre rimuoverlo per poter procedere." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} gi installato! Occorre rimuoverlo per poter procedere." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh index 385f6c2ae5..6f8a46cc31 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/lang/japanese.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "configure ${LangFileString} RunConfigureFailed "configureXNvgs邱Ƃł܂ł" ${LangFileString} NotAdmin "LyXCXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" ${LangFileString} InstallRunning "CXg[[͊ɓĂ܂I" -${LangFileString} StillInstalled "LyX͊ɃCXg[Ă܂ILyXACXg[ĂB" +${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}͊ɃCXg[Ă܂ILyXACXg[ĂB" ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh index d8c3ec3f5a..199a92b7f0 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/lang/norwegian.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Fors ${LangFileString} RunConfigureFailed "Fikk ikke kjrt konfigurasjonsscriptet" ${LangFileString} NotAdmin "Du trenger administratorrettigheter for installere LyX!" ${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!" -${LangFileString} StillInstalled "LyX er allerede installert! Fjern LyX frst." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installert! Fjern LyX frst." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh index fc118486d1..021a0a8442 100644 --- a/development/Win32/packaging/installer/lang/polish.nsh +++ b/development/Win32/packaging/installer/lang/polish.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Nieudana pr ${LangFileString} RunConfigureFailed "Niedana prba wykonania skryptu konfiguracyjnego" ${LangFileString} NotAdmin "Musisz mie prawa administratora aby zainstalowa LyX-a!" ${LangFileString} InstallRunning "Instalator jest ju uruchomiony!" -${LangFileString} StillInstalled "LyX jest ju zainstalowany! Aby kontynowa musisz go najpierw usun." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jest ju zainstalowany! Aby kontynowa musisz go najpierw usun." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh index 085c398e8b..0693efe86b 100644 --- a/development/Win32/packaging/installer/lang/portuguese.nsh +++ b/development/Win32/packaging/installer/lang/portuguese.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "N ${LangFileString} RunConfigureFailed "No foi possvel executar o script de configurao" ${LangFileString} NotAdmin "Precisa de privilgios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador j est a correr!" -${LangFileString} StillInstalled "O LyX j est instalado! Desinstale o LyX primeiro." +${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} j est instalado! Desinstale o LyX primeiro." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh index 5416bb0ea9..14d1e9965c 100644 --- a/development/Win32/packaging/installer/lang/romanian.nsh +++ b/development/Win32/packaging/installer/lang/romanian.nsh @@ -74,7 +74,7 @@ ${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' ${LangFileString} RunConfigureFailed "Nu am putut executa scriptul de configurare" ${LangFileString} NotAdmin "Trebuie s avei drepturi de administrator pentru instalarea programului LyX!" ${LangFileString} InstallRunning "Programul de instalare este deja pornit!" -${LangFileString} StillInstalled "LyX este deja instalat! Dezinstalai LyX prima oar." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} este deja instalat! Dezinstalai LyX prima oar." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh index ff79fda1b1..9fad2f22e0 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/lang/slovak.nsh @@ -76,7 +76,7 @@ ${LangFileString} ModifyingConfigureFailed "Nemohol uvies ${LangFileString} RunConfigureFailed "Nemohol vykona konfiguran skript" ${LangFileString} NotAdmin "Pre intalciu LyX potrebujete administrtorsk prva!" ${LangFileString} InstallRunning "Intalatr u beh!" -${LangFileString} StillInstalled "LyX je u intalovan! Najprv treba odintalova LyX." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u intalovan! Najprv treba odintalova LyX." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index 9ede731b4f..de857d9f87 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Error al intentar a ${LangFileString} RunConfigureFailed "Error al intentar ejecutar el programa de configuracin" ${LangFileString} NotAdmin "Necesita privilegios de administrador para instalar LyX!" ${LangFileString} InstallRunning "El instalador ya esta siendo ejecutado!" -${LangFileString} StillInstalled "LyX ya esta instalado! Antes desinstale LyX." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ya esta instalado! Antes desinstale LyX." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh index 60b6c74ca0..7b3b8d7ddb 100644 --- a/development/Win32/packaging/installer/lang/swedish.nsh +++ b/development/Win32/packaging/installer/lang/swedish.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Misslyckades med att s ${LangFileString} RunConfigureFailed "Misslyckades med att kra konfigurationsskriptet" ${LangFileString} NotAdmin "Du mste ha administratrsrttigheter fr att installera LyX!" ${LangFileString} InstallRunning "Installationsprogrammet krs readan!" -${LangFileString} StillInstalled "LyX r redan installerat! Avinstallera LyX frst." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} r redan installerat! Avinstallera LyX frst." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh index e5b5764081..63a6e6462a 100644 --- a/development/Win32/packaging/installer/lang/turkish.nsh +++ b/development/Win32/packaging/installer/lang/turkish.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed "Yap ${LangFileString} RunConfigureFailed "Yaplandrma program altrlamad" ${LangFileString} NotAdmin "LyX kurabilmek iin ynetici yetkileri gerekiyor!" ${LangFileString} InstallRunning "Kurulum program zaten alyor!" -${LangFileString} StillInstalled "LyX kurulu zaten! nce onu kaldrn." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten! nce onu kaldrn." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh index d70af11a7f..cbb959a6ba 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/lang/ukrainian.nsh @@ -75,7 +75,7 @@ ${LangFileString} ModifyingConfigureFailed " ${LangFileString} RunConfigureFailed " " ${LangFileString} NotAdmin " LyX !" ${LangFileString} InstallRunning " !" -${LangFileString} StillInstalled "LyX ! LyX." +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ! LyX." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." From 45b4bd1f0c784efc7dabaaaa764231f2a7f8de67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 10 Nov 2012 22:08:43 +0100 Subject: [PATCH 53/93] installer: further work on dictionary handling and bugfixes - remove the error-prone method of finding dictionaries by renaming some - add new dictionaries for future LyX 2.1 (more to come) - update and correct some dictionary sizes - fix detection of the possible 64bit programs jedit, Gimp, GhostScript and GSview - remove detection of old Vim version --- .../installer/HunspellDictionaryNames.txt | 20 ++- .../packaging/installer/include/detection.nsh | 75 ++++++--- .../packaging/installer/include/init.nsh | 147 ++++++++++-------- .../packaging/installer/include/nsis.nsh | 1 + .../packaging/installer/include/thesaurus.nsh | 31 ++-- .../packaging/installer/setup/configure.nsh | 2 +- 6 files changed, 164 insertions(+), 112 deletions(-) diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt index 46913fd7f6..4ee0bb01aa 100644 --- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt +++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt @@ -10,14 +10,16 @@ br_FR.aff br_FR.dic ca_ES.aff ca_ES.dic +cop_EG.aff +cop_EG.dic cs_CZ.aff cs_CZ.dic cy_GB.aff cy_GB.dic da_DK.aff da_DK.dic -db_DE.aff -db_DE.dic +dsb_DE.aff +dsb_DE.dic de_AT.aff de_AT.dic de_CH.aff @@ -56,8 +58,10 @@ gd_GB.aff gd_GB.dic gl_ES.aff gl_ES.dic -hb_DE.aff -hb_DE.dic +hi_IN.aff +hi_IN.dic +hsb_DE.aff +hsb_DE.dic he_IL.aff he_IL.dic hr_HR.aff @@ -92,6 +96,8 @@ nl_NL.aff nl_NL.dic nn_NO.aff nn_NO.dic +oc_FR.aff +oc_FR.dic pl_PL.aff pl_PL.dic pt_BR.aff @@ -112,9 +118,15 @@ sr_RS.aff sr_RS.dic sv_SE.aff sv_SE.dic +ta_IN.aff +ta_IN.dic +te_IN.aff +te_IN.dic th_TH.aff th_TH.dic uk_UA.aff uk_UA.dic +ur_PK.aff +ur_PK.dic vi_VN.aff vi_VN.dic diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index f5d6748aed..574e2cdf36 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -39,7 +39,15 @@ Function MissingPrograms # check if third-party programs are installed # test if Ghostscript is installed + # Ghostscript is a mandatory program for LyX thus check all cases: + # 1. 32bit Windows + # 2. 64bit Windows but 32bit Ghostscript + # 3. 64bit Windows and 64bit Ghostscript StrCpy $3 0 + ${if} ${RunningX64} + SetRegView 64 + ${endif} + # case 1. and 3. GSloop: EnumRegKey $1 HKLM "Software\GPL Ghostscript" $3 ${if} $1 != "" @@ -61,6 +69,13 @@ Function MissingPrograms goto GSloop ${endif} # if $2 ${endif} + SetRegView 32 + # repeat for case 2. + ${if} ${RunningX64} + ${andif} $GhostscriptPath == "" + StrCpy $3 0 + goto GSloop + ${endif} # test if Python is installed # only use an existing python when it is version 2.5 or newer because some @@ -87,19 +102,37 @@ Function MissingPrograms StrCpy $Acrobat "Yes" ${endif} - # test if a PostScript-viewer is installed, only check for GSview32 - StrCpy $PSVPath "" - ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" + # test if a PostScript-viewer is installed, only check for GSview + # check all cases: + # 1. 32bit Windows + # 2. 64bit Windows but 32bit GSview + # 3. 64bit Windows and 64bit GSview + ${if} ${RunningX64} + SetRegView 64 + StrCpy $PSVPath "" + ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview64.exe" "Path" + SetRegView 32 + ${endif} + # repeat for case 2. and 3. + ${if} $PSVPath == "" + ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" + ${endif} # test if an editor with syntax-highlighting for LaTeX-files is installed Call EditorCheck # test if an image editor is installed StrCpy $ImageEditorPath "" - ReadRegStr $ImageEditorPath HKLM "Software\Classes\GIMP-2.8-xcf\shell\open\command" "" + # first check for Gimp which is a 64bit application on x64 Windows + ${if} ${RunningX64} + SetRegView 64 + ${endif} + ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1" "InstallLocation" ${if} $ImageEditorPath != "" - StrCpy $ImageEditorPath "$ImageEditorPath" -19 # delete '\gimp-2.x.exe" "%1"' - StrCpy $ImageEditorPath $ImageEditorPath "" 1 # remove the leading quote + StrCpy $ImageEditorPath "$ImageEditorPathbin" # add the bin folder + ${endif} + ${if} ${RunningX64} + SetRegView 32 ${endif} # check for Photoshop ReadRegStr $0 HKLM "Software\Classes\Applications\Photoshop.exe\shell\open\command" "" @@ -156,20 +189,13 @@ Function FindDictionaries # read out the possible spell-checker filenames from the file FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${for} $5 1 60 - # the file has 120 lines, but we only need to check for one of the 2 dictionary files per language + ${for} $5 1 66 + # the file has 132 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 # $String is now the dictionary name - FileRead $R5 $String # $String is now the dictionary name + FileRead $R5 $String # skip the .aff file + FileRead $R5 $String # $String is now the .dic filename StrCpy $String $String -2 # remove the linebreak characters StrCpy $R3 $String -4 # $R3 is now the dictionary language code - # we have 2 cases where we renamed the file to a 3 letter code, see thesaurus.nsh - ${if} $String == "db_DE.dic" - StrCpy $String "dsb_DE.dic" - ${endif} - ${if} $String == "hb_DE.dic" - StrCpy $String "hsb_DE.dic" - ${endif} !insertmacro FileCheck $4 $String "$INSTDIR\Resources\dicts" # macro from LyXUtils.nsh ${if} $4 == "True" StrCpy $FoundDict "$R3 $FoundDict" @@ -203,11 +229,17 @@ Function EditorCheck # (check for jEdit, PSPad, WinShell, ConTEXT, Crimson Editor, Vim, TeXnicCenter, LaTeXEditor, WinEdt, LEd, WinTeX) StrCpy $EditorPath "" StrCpy $0 "" - # check for jEdit + # check for jEdit which is a 64bit application on x64 Windows + ${if} ${RunningX64} + SetRegView 64 + ${endif} ReadRegStr $EditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jEdit_is1" "InstallLocation" ${if} $EditorPath != "" StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string ${endif} + ${if} ${RunningX64} + SetRegView 32 + ${endif} # check for PSPad StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation" @@ -236,13 +268,6 @@ Function EditorCheck StrCpy $0 $0 -14 # remove "\uninstall.exe" StrCpy $EditorPath "$EditorPath;$0" ${endif} - # check for Vim 6.x - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Classes\Applications\gvim.exe\shell\edit\command" "" - ${if} $0 != "" - StrCpy $0 $0 -13 # remove "gvim.exe "%1"" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} # check for Vim 7.0 StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0" "UninstallString" diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 87437b4c0c..6264e6ce74 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -66,286 +66,292 @@ SectionEnd SectionGroup "Dictionaries" SecDictionaries Section /o "Afrikaans" SecDAfrikaans - StrCpy $DictCodes "af_ZA$DictCodes" + StrCpy $DictCodes "af_ZA,$DictCodes" AddSize 1440 SectionEnd Section /o "Arabic" SecDArabic - StrCpy $DictCodes "ar_DZ$DictCodes" + StrCpy $DictCodes "ar_DZ,$DictCodes" AddSize 2500 SectionEnd Section /o "Armenian" SecDArmenian - StrCpy $DictCodes "hy_AM$DictCodes" + StrCpy $DictCodes "hy_AM,$DictCodes" AddSize 2000 SectionEnd Section /o "Bahasa Indonesia" SecDIndonesian - StrCpy $DictCodes "id_ID$DictCodes" + StrCpy $DictCodes "id_ID,$DictCodes" AddSize 217 SectionEnd Section /o "Bahasa Melayu" SecDMalayan - StrCpy $DictCodes "ms_MY$DictCodes" + StrCpy $DictCodes "ms_MY,$DictCodes" AddSize 227 SectionEnd Section /o "Belarusian" SecDBelarusian - StrCpy $DictCodes "be_BY$DictCodes" - AddSize 1040 + StrCpy $DictCodes "be_BY,$DictCodes" + AddSize 1730 SectionEnd Section /o "Brezhoneg" SecDBreton - StrCpy $DictCodes "br_FR$DictCodes" + StrCpy $DictCodes "br_FR,$DictCodes" AddSize 11000 SectionEnd Section /o "Bulgarian" SecDBulgarian - StrCpy $DictCodes "bg_BG$DictCodes" + StrCpy $DictCodes "bg_BG,$DictCodes" AddSize 985 SectionEnd Section /o "Catal" SecDCatalanian - StrCpy $DictCodes "ca_ES$DictCodes" + StrCpy $DictCodes "ca_ES,$DictCodes" AddSize 1210 SectionEnd Section /o "Cetina" SecDCzech - StrCpy $DictCodes "cs_CZ$DictCodes" + StrCpy $DictCodes "cs_CZ,$DictCodes" AddSize 2190 SectionEnd +# enable this for LyX 2.1! +#Section /o "Coptic" SecDCoptic +# StrCpy $DictCodes "cop_EG,$DictCodes" +# AddSize 151 +#SectionEnd + Section /o "Cymraeg" SecDWelsh - StrCpy $DictCodes "cy_GB$DictCodes" + StrCpy $DictCodes "cy_GB,$DictCodes" AddSize 1540 SectionEnd Section /o "Dansk" SecDDanish - StrCpy $DictCodes "da_DK$DictCodes" + StrCpy $DictCodes "da_DK,$DictCodes" AddSize 2470 SectionEnd Section /o "German (A)" SecDGermanAT - StrCpy $DictCodes "de_AT$DictCodes" - AddSize 1000 + StrCpy $DictCodes "de_AT,$DictCodes" + AddSize 3620 SectionEnd Section /o "German (CH)" SecDGermanCH - StrCpy $DictCodes "de_CH$DictCodes" - AddSize 1000 + StrCpy $DictCodes "de_CH,$DictCodes" + AddSize 3620 SectionEnd Section "German (D)" SecDGermanD # already installed by default SectionIn RO - #StrCpy $DictCodes "de_DE$DictCodes" - AddSize 2650 + #StrCpy $DictCodes "de_DE,$DictCodes" + AddSize 3620 SectionEnd Section /o "Greek" SecDGreek - StrCpy $DictCodes "el_GR$DictCodes" + StrCpy $DictCodes "el_GR,$DictCodes" AddSize 6550 SectionEnd Section /o "Eesti" SecDEstonian - StrCpy $DictCodes "et_EE$DictCodes" + StrCpy $DictCodes "et_EE,$DictCodes" AddSize 4400 SectionEnd # enable this for LyX 2.1! #Section /o "English (AU)" SecDEnglishAU -# StrCpy $DictCodes "en_AU$DictCodes" +# StrCpy $DictCodes "en_AU,$DictCodes" # AddSize 587 #SectionEnd Section /o "English (CA)" SecDEnglishCA - StrCpy $DictCodes "en_CA$DictCodes" + StrCpy $DictCodes "en_CA,$DictCodes" AddSize 690 SectionEnd Section "English (GB)" SecDEnglishGB # already installed by default SectionIn RO - #StrCpy $DictCodes "en_GB$DictCodes" + #StrCpy $DictCodes "en_GB,$DictCodes" AddSize 757 SectionEnd # enable this for LyX 2.1! #Section /o "English (NZ)" SecDEnglishNZ -# StrCpy $DictCodes "en_NZ$DictCodes" +# StrCpy $DictCodes "en_NZ,$DictCodes" # AddSize 551 #SectionEnd Section "English (US)" SecDEnglishUS # already installed by default SectionIn RO - #StrCpy $DictCodes "en_US$DictCodes" + #StrCpy $DictCodes "en_US,$DictCodes" AddSize 688 SectionEnd Section "Espaol (ES)" SecDSpanishES # already installed by default SectionIn RO - #StrCpy $DictCodes "es_ES$DictCodes" + #StrCpy $DictCodes "es_ES,$DictCodes" AddSize 974 SectionEnd Section "Espaol (MX)" SecDSpanishMX # already installed by default SectionIn RO - #StrCpy $DictCodes "es_MX$DictCodes" + #StrCpy $DictCodes "es_MX,$DictCodes" AddSize 924 SectionEnd Section /o "Esperanto" SecDEsperanto - StrCpy $DictCodes "eo_EO$DictCodes" + StrCpy $DictCodes "eo_EO,$DictCodes" AddSize 389 SectionEnd Section /o "Euskara" SecDBasque - StrCpy $DictCodes "eu_ES$DictCodes" + StrCpy $DictCodes "eu_ES,$DictCodes" AddSize 4850 SectionEnd Section /o "Farsi" SecDFarsi - StrCpy $DictCodes "fa_IR$DictCodes" + StrCpy $DictCodes "fa_IR,$DictCodes" AddSize 6710 SectionEnd Section "Franais" SecDFrench # already installed by default SectionIn RO - #StrCpy $DictCodes "fr_FR$DictCodes" + #StrCpy $DictCodes "fr_FR,$DictCodes" AddSize 1200 SectionEnd Section /o "Gaeilge" SecDGaelic - StrCpy $DictCodes "ga_IR$DictCodes" + StrCpy $DictCodes "ga_IR,$DictCodes" AddSize 1090 SectionEnd Section /o "Gidhlig" SecDScottish - StrCpy $DictCodes "gd_GB$DictCodes" + StrCpy $DictCodes "gd_GB,$DictCodes" AddSize 2460 SectionEnd Section /o "Galego" SecDGalician - StrCpy $DictCodes "gl_ES$DictCodes" + StrCpy $DictCodes "gl_ES,$DictCodes" AddSize 916 SectionEnd Section /o "Hebrew" SecDHebrew - StrCpy $DictCodes "he_IL$DictCodes" + StrCpy $DictCodes "he_IL,$DictCodes" AddSize 3120 SectionEnd Section /o "Hrvatski" SecDCroatian - StrCpy $DictCodes "hr_HR$DictCodes" + StrCpy $DictCodes "hr_HR,$DictCodes" AddSize 2240 SectionEnd Section /o "Magyar" SecDHungarian - StrCpy $DictCodes "hu_HU$DictCodes" + StrCpy $DictCodes "hu_HU,$DictCodes" AddSize 3380 SectionEnd Section /o "Interlingua" SecDInterlingua - StrCpy $DictCodes "ia_IA$DictCodes" + StrCpy $DictCodes "ia_IA,$DictCodes" AddSize 649 SectionEnd Section /o "slenska" SecDIcelandic - StrCpy $DictCodes "is_IS$DictCodes" + StrCpy $DictCodes "is_IS,$DictCodes" AddSize 2320 SectionEnd Section /o "Italiano" SecDItalian - StrCpy $DictCodes "it_IT$DictCodes" + StrCpy $DictCodes "it_IT,$DictCodes" AddSize 1300 SectionEnd Section /o "Kazakh" SecDKazakh - StrCpy $DictCodes "kk_KZ$DictCodes" + StrCpy $DictCodes "kk_KZ,$DictCodes" AddSize 2120 SectionEnd Section /o "Korean" SecDKorean - StrCpy $DictCodes "ko_KR$DictCodes" + StrCpy $DictCodes "ko_KR,$DictCodes" AddSize 15200 SectionEnd Section /o "Latina" SecDLatin - StrCpy $DictCodes "la_LA$DictCodes" + StrCpy $DictCodes "la_LA,$DictCodes" AddSize 1250 SectionEnd Section /o "Lietuviu" SecDLithuanian - StrCpy $DictCodes "lt_LT$DictCodes" + StrCpy $DictCodes "lt_LT,$DictCodes" AddSize 1320 SectionEnd Section /o "Latvieu" SecDLatvian - StrCpy $DictCodes "lv_LV$DictCodes" + StrCpy $DictCodes "lv_LV,$DictCodes" AddSize 2140 SectionEnd Section /o "Nederlands" SecDDutch - StrCpy $DictCodes "nl_NL$DictCodes" + StrCpy $DictCodes "nl_NL,$DictCodes" AddSize 1820 SectionEnd Section /o "Norsk (Bokml)" SecDNorwegianNB - StrCpy $DictCodes "nb_NO$DictCodes" + StrCpy $DictCodes "nb_NO,$DictCodes" AddSize 4890 SectionEnd Section /o "Norsk (Nynorsk)" SecDNorwegianNN - StrCpy $DictCodes "nn_NO$DictCodes" + StrCpy $DictCodes "nn_NO,$DictCodes" AddSize 2890 SectionEnd Section /o "Polski" SecDPolish - StrCpy $DictCodes "pl_PL$DictCodes" + StrCpy $DictCodes "pl_PL,$DictCodes" AddSize 4540 SectionEnd Section /o "Portugus (BR)" SecDPortugueseBR - StrCpy $DictCodes "pt_BR$DictCodes" + StrCpy $DictCodes "pt_BR,$DictCodes" AddSize 5280 SectionEnd Section /o "Portugus (PT)" SecDPortuguesePT - StrCpy $DictCodes "pt_PT$DictCodes" + StrCpy $DictCodes "pt_PT,$DictCodes" AddSize 1460 SectionEnd Section /o "Romna" SecDRomanian - StrCpy $DictCodes "ro_RO$DictCodes" + StrCpy $DictCodes "ro_RO,$DictCodes" AddSize 1930 SectionEnd Section /o "Russian" SecDRussian - StrCpy $DictCodes "ru_RU$DictCodes" + StrCpy $DictCodes "ru_RU,$DictCodes" AddSize 1920 SectionEnd Section /o "Serbcina (Dolno)" SecDSorbianD - StrCpy $DictCodes "db_DE$DictCodes" + StrCpy $DictCodes "dsb_DE,$DictCodes" AddSize 904 SectionEnd Section /o "Serbcina (Horno)" SecDSorbianH - StrCpy $DictCodes "hb_DE$DictCodes" + StrCpy $DictCodes "hsb_DE,$DictCodes" AddSize 740 SectionEnd Section /o "Shqipe" SecDAlbanian - StrCpy $DictCodes "sq_AL$DictCodes" + StrCpy $DictCodes "sq_AL,$DictCodes" AddSize 2400 SectionEnd Section /o "Slovencina" SecDSlowenian - StrCpy $DictCodes "sl_SI$DictCodes" + StrCpy $DictCodes "sl_SI,$DictCodes" AddSize 2840 SectionEnd @@ -355,28 +361,28 @@ Section /o "Slovensk SectionEnd Section /o "Srpski" SecDSerbian - StrCpy $DictCodes "sr_RS$DictCodes" + StrCpy $DictCodes "sr_RS,$DictCodes" AddSize 3460 SectionEnd Section /o "Svenska" SecDSwedish - StrCpy $DictCodes "sv_SE$DictCodes" + StrCpy $DictCodes "sv_SE,$DictCodes" AddSize 1030 SectionEnd Section /o "Thai" SecDThai - StrCpy $DictCodes "th_TH$DictCodes" + StrCpy $DictCodes "th_TH,$DictCodes" AddSize 351 SectionEnd Section /o "Ukrainian" SecDUkrainian - StrCpy $DictCodes "uk_UA$DictCodes" + StrCpy $DictCodes "uk_UA,$DictCodes" AddSize 2620 SectionEnd Section /o "Vietnamese" SecDVietnamese - StrCpy $DictCodes "vi_VN$DictCodes" - AddSize 39600 + StrCpy $DictCodes "vi_VN,$DictCodes" + AddSize 40 SectionEnd SectionGroupEnd @@ -654,6 +660,15 @@ Function .onInit SectionSetFlags ${SecDCzech} $0 SectionSetSize ${SecDCzech} 0 ${endif} + + StrCpy $Search "cop_EG" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDCoptic} $0 + # SectionSetSize ${SecDCoptic} 0 + ${endif} StrCpy $Search "cy_GB" Call StrPoint ${if} $Pointer != "-1" @@ -936,14 +951,14 @@ Function .onInit SectionSetFlags ${SecDRussian} $0 SectionSetSize ${SecDRussian} 0 ${endif} - StrCpy $Search "db_DE" + StrCpy $Search "dsb_DE" Call StrPoint ${if} $Pointer != "-1" IntOp $0 ${SF_SELECTED} | ${SF_RO} SectionSetFlags ${SecDSorbianD} $0 SectionSetSize ${SecDSorbianD} 0 ${endif} - StrCpy $Search "hb_DE" + StrCpy $Search "hsb_DE" Call StrPoint ${if} $Pointer != "-1" IntOp $0 ${SF_SELECTED} | ${SF_RO} diff --git a/development/Win32/packaging/installer/include/nsis.nsh b/development/Win32/packaging/installer/include/nsis.nsh index 5634a2d531..108ae0cb71 100644 --- a/development/Win32/packaging/installer/include/nsis.nsh +++ b/development/Win32/packaging/installer/include/nsis.nsh @@ -35,6 +35,7 @@ Configuration of standard NSIS header files !include MultiUser.nsh !include nsDialogs.nsh !include InstallOptions.nsh +!include x64.nsh # Set of various macros and functions !include include\LyXUtils.nsh diff --git a/development/Win32/packaging/installer/include/thesaurus.nsh b/development/Win32/packaging/installer/include/thesaurus.nsh index 1efb27bdd0..9f9a4643a6 100644 --- a/development/Win32/packaging/installer/include/thesaurus.nsh +++ b/development/Win32/packaging/installer/include/thesaurus.nsh @@ -6,10 +6,10 @@ Function DownloadHunspellDictionary # read out the locations from the file FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${For} $5 1 120 # the file has 120 lines + ${For} $5 1 132 # the file has 132 lines FileRead $R5 $String # $String is now the dictionary name - StrCpy $R3 $String 5 # $R3 is now the dictionary language code + 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 @@ -97,8 +97,16 @@ Function InstallHunspellDictionary # download the dictionaries ${Do} - StrCpy $DictCode $DictCodes 5 - StrCpy $DictCodes $DictCodes "" 5 + # take the first code + StrCpy $Search "," + StrCpy $String $DictCodes + Call StrPoint + ${if} $Pointer != "-1" + StrCpy $DictCode $DictCodes $Pointer + # remove the taken code from the list + IntOp $Pointer $Pointer + 1 + StrCpy $DictCodes $DictCodes "" $Pointer + ${endif} # don't dowload existing ones thus check if $DictCode is in $FoundDict StrCpy $String $FoundDict StrCpy $Search $DictCode @@ -108,16 +116,6 @@ Function InstallHunspellDictionary ${endif} ${LoopUntil} $DictCodes == "" - # some dictionaries need to be renamed to have a 2 letter code - ${if} ${FileExists} "$INSTDIR\Resources\dicts\db_DE.aff" - Rename "$INSTDIR\Resources\dicts\db_DE.aff" "$INSTDIR\Resources\dicts\dsb_DE.aff" - Rename "$INSTDIR\Resources\dicts\db_DE.dic" "$INSTDIR\Resources\dicts\dsb_DE.dic" - ${endif} - ${if} ${FileExists} "$INSTDIR\Resources\dicts\hb_DE.aff" - Rename "$INSTDIR\Resources\dicts\hb_DE.aff" "$INSTDIR\Resources\dicts\hsb_DE.aff" - Rename "$INSTDIR\Resources\dicts\hb_DE.dic" "$INSTDIR\Resources\dicts\hsb_DE.dic" - ${endif} - FunctionEnd #-------------------------------- @@ -127,8 +125,9 @@ Function InstallThesaurusDictionary # download the dictionaries ${Do} - StrCpy $ThesCode $ThesCodes 5 - StrCpy $ThesCodes $ThesCodes "" 5 + # all codes have 5 characters + StrCpy $ThesCode $ThesCodes 5 # take the first code + StrCpy $ThesCodes $ThesCodes "" 5 # remove the taken code from the list # don't dowload existing ones thus check if $ThesCode is in $FoundThes StrCpy $String $FoundThes StrCpy $Search $ThesCode diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 8c3af60c92..29b4c131ba 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -111,7 +111,7 @@ Section -Configure ${if} $ImageEditorPath != "" StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath" ${endif} - ${if} $GhostscriptPath != "" + ${if} $GhostscriptPath != "" StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath" ${endif} ${if} $SVGPath != "" From ea7cf4f5ebc555f36f5d306967e6d116dab82e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 11 Nov 2012 07:12:43 +0100 Subject: [PATCH 54/93] installer: some registry and detection fixes - detection.nsh: - fixed detection of the LaTeX source file editors - removed support for obsolete LaTeX source file editors - init.nsh: - don't allow to install an older LyX version over a newer one - support dictionaries for new languages that will be supported by LyX 2.1 - remove registry entries of current LyX version when installing a newer version over it --- .../Win32/packaging/installer/ChangeLog.txt | 37 +++++++ .../packaging/installer/include/detection.nsh | 79 +++++--------- .../packaging/installer/include/init.nsh | 103 +++++++++++++++++- .../packaging/installer/include/variables.nsh | 1 + .../packaging/installer/lang/english.nsh | 2 + .../packaging/installer/setup/configure.nsh | 5 + 6 files changed, 175 insertions(+), 52 deletions(-) create mode 100644 development/Win32/packaging/installer/ChangeLog.txt diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt new file mode 100644 index 0000000000..5b9fa03cc5 --- /dev/null +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -0,0 +1,37 @@ +Changelog for LyX-205-2: +- the installer detects now existing spell-checker and thesaurus dictionaries + of existing LyX installations +- fixed detection for already installed Ghostscript and GSview on 64bit Windows +- fixed detection for jEdit, Vim, WinEdt and TeXnicCenter as LaTeX source file editor +- fixed detection of Gimp and Photoshop as image manipulating program +- updated spell-checker dictionaries for German and Belorussion + (To benefit from them you must uninstall an already installed LyX 2.0.x and + then use this installer.) +- updated thesaurus for German + (need to uninstall to benefit from this) +- bugfix: remove registry entries of existing LyX version when installing over it +- don't allow to install an older LyX version over an existing newer one + + +Changelog for LyX-205-1: +- installs LyX 2.0.5 +- updated to Python 2.7.3 +- updated to ImageMagick 6.8.0-4 +- updated to Ghostscript 9.06 + + +Changelog for LyX-204-3: +- renamed the proposed LyX installation folder to "LyX 2.0" instead of the former "LyX 2.0.4" + (reason: it should be default be possible to override existing older version of the LyX 2.0.x series) +- link the LyX Wiki and website in LyX's start menu folder Changelog for LyX-204-2: +- Prevent that LyX can first be installed with admin privileges and afterwards without them +- In the uninstaller it is now the default not to uninstall the user preferences and settings +- Fix the path in which the LyX start menu shortcut is executed - Also if LyX is installed without admin privileges, the .lyx file associations are set +- Fix a typo in English translation + + +Changelog for LyX-204-1: +- It is now possible to install LyX also without administrator privileges. + (Note that the support for the image file formats WMF and EMF can only be installed if LyX is installed with administrator privileges.) +- Added support for multiple indexes in LyX documents +- Support to install spell checker and thesaurus dictionaries for all languages supported by LyX. \ No newline at end of file diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 574e2cdf36..d076302678 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -38,8 +38,7 @@ FunctionEnd Function MissingPrograms # check if third-party programs are installed - # test if Ghostscript is installed - # Ghostscript is a mandatory program for LyX thus check all cases: + # test if Ghostscript is installed, check all cases: # 1. 32bit Windows # 2. 64bit Windows but 32bit Ghostscript # 3. 64bit Windows and 64bit Ghostscript @@ -113,7 +112,7 @@ Function MissingPrograms ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview64.exe" "Path" SetRegView 32 ${endif} - # repeat for case 2. and 3. + # repeat for case 1. and 2. ${if} $PSVPath == "" ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" ${endif} @@ -237,75 +236,57 @@ Function EditorCheck ${if} $EditorPath != "" StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string ${endif} - ${if} ${RunningX64} - SetRegView 32 - ${endif} + SetRegView 32 + # check for PSPad StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation" ${if} $0 != "" - StrCpy $0 $0 -1 + StrCpy $0 $0 -1 # remove the "\" StrCpy $EditorPath "$EditorPath;$0" ${endif} + # check for WinShell StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinShell_is1" "InstallLocation" ${if} $0 != "" - StrCpy $0 $0 -1 + StrCpy $0 $0 -1 # remove the "\" StrCpy $EditorPath "$EditorPath;$0" ${endif} - # check for ConTEXT + + # check for Vim which is a 64bit application on x64 Windows StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ConTEXTEditor_is1" "InstallLocation" + ${if} ${RunningX64} + SetRegView 64 + ${endif} + ReadRegStr $0 HKLM "Software\Vim\Gvim" "path" ${if} $0 != "" - StrCpy $0 $0 -1 + StrCpy $0 $0 -9 # remove "\gvim.exe" StrCpy $EditorPath "$EditorPath;$0" ${endif} - # check for Crimson Editor + SetRegView 32 + + # check for TeXnicCenter which can be a 64bit application on x64 Windows StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Crimson Editor" "UninstallString" - ${if} $0 != "" - StrCpy $0 $0 -14 # remove "\uninstall.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for Vim 7.0 - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0" "UninstallString" - ${if} $0 != "" - StrCpy $0 $0 -18 # remove "\uninstall-gui.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for TeXnicCenter - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "Inno Setup: App Path" - ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for LaTeXEditor - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LaTeX Editor" "InstallLocation" + ${if} ${RunningX64} + SetRegView 64 + ${endif} + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation" ${if} $0 != "" + StrCpy $0 $0 -1 # remove the "\" + StrCpy $EditorPath "$EditorPath;$0" + ${else} + SetRegView 32 + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation" + StrCpy $0 $0 -1 # remove the "\" StrCpy $EditorPath "$EditorPath;$0" ${endif} + SetRegView 32 + # check for WinEdt StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt_is1" "InstallLocation" + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation" ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for LEd - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LEd_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for WinTeX - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinTeX XP" "DisplayIcon" - ${if} $0 != "" - StrCpy $0 $0 -11 # remove "\wintex.exe" StrCpy $EditorPath "$EditorPath;$0" ${endif} diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 6264e6ce74..7d296ffd48 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -255,6 +255,12 @@ Section /o "Magyar" SecDHungarian AddSize 3380 SectionEnd +# enable this for LyX 2.1! +#Section /o "Hindi" SecDHindi +# StrCpy $DictCodes "hi_IN,$DictCodes" +# AddSize 1900 +#SectionEnd + Section /o "Interlingua" SecDInterlingua StrCpy $DictCodes "ia_IA,$DictCodes" AddSize 649 @@ -310,6 +316,12 @@ Section /o "Norsk (Nynorsk)" SecDNorwegianNN AddSize 2890 SectionEnd +# enable this for LyX 2.1! +#Section /o "Occitan" SecDOccitan +# StrCpy $DictCodes "oc_FR,$DictCodes" +# AddSize 31710 +#SectionEnd + Section /o "Polski" SecDPolish StrCpy $DictCodes "pl_PL,$DictCodes" AddSize 4540 @@ -369,6 +381,18 @@ Section /o "Svenska" SecDSwedish StrCpy $DictCodes "sv_SE,$DictCodes" AddSize 1030 SectionEnd + +# enable this for LyX 2.1! +#Section /o "Tamil" SecDTamil +# StrCpy $DictCodes "ta_IN,$DictCodes" +# AddSize 5911 +#SectionEnd + +# enable this for LyX 2.1! +#Section /o "Telugu" SecDTelugu +# StrCpy $DictCodes "te_IN,$DictCodes" +# AddSize 3400 +#SectionEnd Section /o "Thai" SecDThai StrCpy $DictCodes "th_TH,$DictCodes" @@ -380,6 +404,12 @@ Section /o "Ukrainian" SecDUkrainian AddSize 2620 SectionEnd +# enable this for LyX 2.1! +#Section /o "Urdu" SecDUrdu +# StrCpy $DictCodes "ur_PK,$DictCodes" +# AddSize 1401 +#SectionEnd + Section /o "Vietnamese" SecDVietnamese StrCpy $DictCodes "vi_VN,$DictCodes" AddSize 40 @@ -387,6 +417,7 @@ SectionEnd SectionGroupEnd + SectionGroup "Thesaurus" SecThesaurus Section /o "Bulgarian" SecTBulgarian @@ -549,6 +580,8 @@ Function .onInit Abort ${endif} + !insertmacro MULTIUSER_INIT + # check if this LyX version is already installed ${if} $MultiUser.Privileges == "Admin" ${orif} $MultiUser.Privileges == "Power" @@ -564,9 +597,33 @@ Function .onInit MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" Abort ${endif} + + # check if there is an existing LyX installation of the same LyX series + # we usually don't release more than 10 versions so with 20 we are safe to check if a newer version is installed + IntOp $4 ${APP_VERSION_REVISION} + 20 + ${for} $5 0 $4 + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion" + ${else} + ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" "DisplayVersion" + ${endif} + ${if} $0 != "" + StrCpy $R5 $0 # store the read version number + StrCpy $OldVersionNumber "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5" + # we don't stop here because we want the latest installed version + ${endif} + ${next} + ${if} $OldVersionNumber > ${APP_SERIES_KEY} + # store the version number and reformat it temporarily for the error message + StrCpy $R0 $OldVersionNumber + StrCpy $OldVersionNumber $R5 + MessageBox MB_OK|MB_ICONSTOP "$(NewerInstalled)" + StrCpy $OldVersionNumber $R0 + Abort + ${endif} !insertmacro PRINTER_INIT - !insertmacro MULTIUSER_INIT # this can be reset to "true" in section SecDesktop StrCpy $CreateDesktopIcon "false" @@ -825,6 +882,14 @@ Function .onInit SectionSetFlags ${SecDHebrew} $0 SectionSetSize ${SecDHebrew} 0 ${endif} + StrCpy $Search "hi_IN" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDHindi} $0 + # SectionSetSize ${SecDHindi} 0 + ${endif} StrCpy $Search "hr_HR" Call StrPoint ${if} $Pointer != "-1" @@ -916,6 +981,14 @@ Function .onInit SectionSetFlags ${SecDNorwegianNN} $0 SectionSetSize ${SecDNorwegianNN} 0 ${endif} + StrCpy $Search "oc_FR" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDOccitan} $0 + # SectionSetSize ${SecDOccitan} 0 + ${endif} StrCpy $Search "pl_PL" Call StrPoint ${if} $Pointer != "-1" @@ -1000,6 +1073,22 @@ Function .onInit SectionSetFlags ${SecDSwedish} $0 SectionSetSize ${SecDSwedish} 0 ${endif} + StrCpy $Search "ta_IN" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDTamil} $0 + # SectionSetSize ${SecDTamil} 0 + ${endif} + StrCpy $Search "te_IN" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDTelugu} $0 + # SectionSetSize ${SecDTelugu} 0 + ${endif} StrCpy $Search "th_TH" Call StrPoint ${if} $Pointer != "-1" @@ -1014,6 +1103,14 @@ Function .onInit SectionSetFlags ${SecDUkrainian} $0 SectionSetSize ${SecDUkrainian} 0 ${endif} + StrCpy $Search "ur_PK" + Call StrPoint + ${if} $Pointer != "-1" + IntOp $0 ${SF_SELECTED} | ${SF_RO} + # enable this for LyX 2.1! + # SectionSetFlags ${SecDUrdu} $0 + # SectionSetSize ${SecDUrdu} 0 + ${endif} StrCpy $Search "vi_VN" Call StrPoint ${if} $Pointer != "-1" @@ -1228,11 +1325,11 @@ Function un.onInit !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh # test if MiKTeX was installed together with LyX - ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" + ReadRegStr $0 SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" ${if} $0 == "Yes${APP_SERIES_KEY}" SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section StrCpy $LaTeXInstalled "MiKTeX" - DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" + DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" ${else} SectionSetText 2 "" # hides the corresponding uninstaller section ${endif} diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh index d96b0b6f67..c403fe8f3b 100644 --- a/development/Win32/packaging/installer/include/variables.nsh +++ b/development/Win32/packaging/installer/include/variables.nsh @@ -38,6 +38,7 @@ Var LaTeXInstalled Var LilyPondPath Var MiKTeXUser Var MiKTeXVersion +Var OldVersionNumber Var Pointer Var PSVPath Var PythonPath diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index 485e9b3ae8..b9eea4617f 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -83,6 +83,8 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c #${LangFileString} RunConfigureFailed "Could not execute the configure script" ${LangFileString} InstallRunning "The installer is already running!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is already installed! Deinstall LyX first." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really need this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 29b4c131ba..74194150b3 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -51,6 +51,11 @@ Section -InstallData WriteRegDWORD SHCTX ${APP_UNINST_KEY} "NoRepair" 0x00000001 WriteRegStr SHCTX ${APP_UNINST_KEY} "StartMenu" "$SMPROGRAMS\$StartmenuFolder" + # if we install over an existing version, remove the old uninstaller information + ${if} $OldVersionNumber != "" + DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}$OldVersionNumber" + ${endif} + SectionEnd #-------------------------------- From 290efe6190c6c5ff6065af202acd476060c29861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 11 Nov 2012 18:07:55 +0100 Subject: [PATCH 55/93] installer: bugfixes, code simplification and documentation - dictionaries.nsh: code documentation and simplification - lyx.nsi: comment out currently unused code - init.nsh: some corrections and fix bug that info that JabRef and MiKTeX were installed together with LyX was deleted before the uninstaller was really run - LaTeX.nsh: documentation and fix a bug (for an unknown reason SHCTX can be used to read and delte but not to write in the registry) - gui.nsh: enable descriptions - detection: move dictionary code to dictionaries --- .../packaging/installer/include/LaTeX.nsh | 39 +++++++-- .../packaging/installer/include/detection.nsh | 45 +---------- .../{thesaurus.nsh => dictionaries.nsh} | 79 ++++++++++++++++--- .../Win32/packaging/installer/include/gui.nsh | 1 - .../packaging/installer/include/init.nsh | 14 ++-- .../packaging/installer/include/nsis.nsh | 4 +- .../packaging/installer/lang/english.nsh | 11 ++- .../Win32/packaging/installer/lang/german.nsh | 71 +++++++++-------- .../Win32/packaging/installer/lyx-bundle.nsi | 11 ++- .../packaging/installer/lyx-standard.nsi | 11 ++- development/Win32/packaging/installer/lyx.nsi | 6 +- .../packaging/installer/setup/install.nsh | 17 ++-- .../packaging/installer/setup/uninstall.nsh | 12 +-- 13 files changed, 197 insertions(+), 124 deletions(-) rename development/Win32/packaging/installer/include/{thesaurus.nsh => dictionaries.nsh} (65%) diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index d1b0168192..d47dabcd7e 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -1,5 +1,28 @@ +/* +LaTeX.nsh + +Handling of LaTeX distributions +*/ + +# This script contains the following functions: +# +# - LaTeXActions (checks if MiKTeX or TeXLive is installed) +# +# - InstallMiKTeX (installs MiKTeX if not already installed), +# only for bunlde installer, uses: +# LaTeXCheck # function from LyXUtils.nsh +# +# - ConfigureMiKTeX +# (installs the LaTeX class files that are delivered with LyX, +# a Perl interpreter for splitindex +# and enable MiKTeX's automatic package installation) +# +# - UpdateMiKTeX (asks to update MiKTeX) + +# --------------------------------------- + Function LaTeXActions - # check if MiKTeX or TeXLive is installed + # checks if MiKTeX or TeXLive is installed # test if MiKTeX is installed # reads the PATH variable via the registry because NSIS' "$%Path%" variable is not updated when the PATH changes @@ -109,8 +132,8 @@ FunctionEnd !if ${SETUPTYPE} == BUNDLE Function InstallMiKTeX + # installs MiKTeX if not already installed - # install MiKTeX if not already installed ${if} $PathLaTeX == "" # launch MiKTeX's installer MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" @@ -130,7 +153,9 @@ FunctionEnd ${if} $PathLaTeX != "" # set package repository (MiKTeX's primary package repository) ${if} $MiKTeXUser == "HKCU" - WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX + # special entry that it was installed together with LyX + # so that we can later uninstall it together with LyX + WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" ${else} WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" ${endif} @@ -214,14 +239,14 @@ Function ConfigureMiKTeX # enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user ${if} $MiKTeXUser != "HKCU" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" + WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" ${endif} # set package repository (MiKTeX's primary package repository) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" # if only for current user WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" # if only for current user ${if} $MiKTeXUser != "HKCU" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" + WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" + WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" ${endif} # enable MiKTeX's automatic package installation @@ -234,7 +259,7 @@ Function ConfigureMiKTeX FunctionEnd Function UpdateMiKTeX - # ask to update MiKTeX + # asks to update MiKTeX ${if} $LaTeXInstalled == "MiKTeX" MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index d076302678..a27e5bbf78 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -30,7 +30,7 @@ Detection of external component locations Function SearchExternal Call LaTeXActions # function from LaTeX.nsh Call MissingPrograms - Call FindDictionaries + Call FindDictionaries # function from dictionaries.nsh FunctionEnd # --------------------------------------- @@ -179,49 +179,6 @@ FunctionEnd # --------------------------------------- -Function FindDictionaries - # find the installed dictionaries - - # start with empty strings - StrCpy $FoundDict "" - StrCpy $FoundThes "" - - # read out the possible spell-checker filenames from the file - FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r - ${for} $5 1 66 - # the file has 132 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 - StrCpy $String $String -2 # remove the linebreak characters - StrCpy $R3 $String -4 # $R3 is now the dictionary language code - !insertmacro FileCheck $4 $String "$INSTDIR\Resources\dicts" # macro from LyXUtils.nsh - ${if} $4 == "True" - StrCpy $FoundDict "$R3 $FoundDict" - ${endif} - ${next} - FileClose $R5 - - # read out the possible thesaurus filenames from the file - FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r - ${for} $5 1 22 - # the file has 44 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 # $String is now the dictionary name - FileRead $R5 $String # $String is now the dictionary name - StrCpy $String $String -2 # remove the linebreak characters - StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code - !insertmacro FileCheck $4 $String "$INSTDIR\Resources\thes" # macro from LyXUtils.nsh - ${if} $4 == "True" - StrCpy $FoundThes "$R3 $FoundThes" - ${endif} - ${next} - FileClose $R5 - -FunctionEnd - -# --------------------------------------- - Function EditorCheck # test if an editor with syntax-highlighting for LaTeX-files is installed diff --git a/development/Win32/packaging/installer/include/thesaurus.nsh b/development/Win32/packaging/installer/include/dictionaries.nsh similarity index 65% rename from development/Win32/packaging/installer/include/thesaurus.nsh rename to development/Win32/packaging/installer/include/dictionaries.nsh index 9f9a4643a6..14ee6927e0 100644 --- a/development/Win32/packaging/installer/include/thesaurus.nsh +++ b/development/Win32/packaging/installer/include/dictionaries.nsh @@ -1,6 +1,66 @@ -# download dictionaries +/* +dictionaries.nsh -Function DownloadHunspellDictionary +Handling of hunspell / MyThes dictionaries +*/ + +# This script contains the following functions: +# +# - FindDictionaries (finds already installed dictionaries) +# +# - DownloadHunspellDictionaries and DownloadThesaurusDictionaries +# (Downloads hunspell / MyThes dictionaries from a location that is +# given in the file $INSTDIR\Resources\HunspellDictionaryNames.txt) +# +# - InstallHunspellDictionaries and InstallThesaurusDictionaries +# (installs the selected hunspell / MyThes dictionaries except of +# already existing ones), uses: +# DownloadHunspellDictionaries or DownloadThesaurusDictionaries + +# --------------------------------------- + +Function FindDictionaries + # finds already installed dictionaries + + # start with empty strings + StrCpy $FoundDict "" + StrCpy $FoundThes "" + + # read out the possible spell-checker filenames from the file + FileOpen $R5 "$INSTDIR\Resources\HunspellDictionaryNames.txt" r + ${for} $5 1 66 + # the file has 132 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 + StrCpy $String $String -2 # remove the linebreak characters + StrCpy $R3 $String -4 # $R3 is now the dictionary language code + ${if} ${FileExists} "$INSTDIR\Resources\dicts\$String" + StrCpy $FoundDict "$R3 $FoundDict" + ${endif} + ${next} + FileClose $R5 + + # read out the possible thesaurus filenames from the file + FileOpen $R5 "$INSTDIR\Resources\ThesaurusDictionaryNames.txt" r + ${for} $5 1 22 + # the file has 44 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 # $String is now the dictionary name + FileRead $R5 $String # $String is now the dictionary name + StrCpy $String $String -2 # remove the linebreak characters + StrCpy $R3 $String 5 3 # $R3 is now the dictionary language code + ${if} ${FileExists} "$INSTDIR\Resources\thes\$String" + StrCpy $FoundThes "$R3 $FoundThes" + ${endif} + ${next} + FileClose $R5 + +FunctionEnd + +# --------------------------------------- + +Function DownloadHunspellDictionaries # Downloads hunspell dictionaries from a location that is given in the file # $INSTDIR\Resources\HunspellDictionaryNames.txt @@ -46,7 +106,7 @@ FunctionEnd #-------------------------------- -Function DownloadThesaurusDictionary +Function DownloadThesaurusDictionaries # Downloads thesaurus dictionaries from a location that is given in the file # $INSTDIR\Resources\ThesaurusDictionaryNames.txt @@ -92,8 +152,8 @@ FunctionEnd #-------------------------------- -Function InstallHunspellDictionary - # install the selected hunspell dictionaries except of already existing ones +Function InstallHunspellDictionaries + # installs the selected hunspell dictionaries except of already existing ones # download the dictionaries ${Do} @@ -112,7 +172,7 @@ Function InstallHunspellDictionary StrCpy $Search $DictCode Call StrPoint # function from LyXUtils.nsh ${if} $Pointer == "-1" - Call DownloadHunspellDictionary + Call DownloadHunspellDictionaries ${endif} ${LoopUntil} $DictCodes == "" @@ -120,8 +180,8 @@ FunctionEnd #-------------------------------- -Function InstallThesaurusDictionary - # install the selected thesaurus dictionaries except of already existing ones +Function InstallThesaurusDictionaries + # installs the selected thesaurus dictionaries except of already existing ones # download the dictionaries ${Do} @@ -133,7 +193,7 @@ Function InstallThesaurusDictionary StrCpy $Search $ThesCode Call StrPoint # function from LyXUtils.nsh ${if} $Pointer == "-1" - Call DownloadThesaurusDictionary + Call DownloadThesaurusDictionaries ${endif} ${LoopUntil} $ThesCodes == "" @@ -155,3 +215,4 @@ Function InstallThesaurusDictionary RMDir "$INSTDIR\Resources\backup" FunctionEnd + diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh index aaf9d4ff1a..5a4015c983 100644 --- a/development/Win32/packaging/installer/include/gui.nsh +++ b/development/Win32/packaging/installer/include/gui.nsh @@ -23,7 +23,6 @@ BrandingText " " !define MUI_HEADERIMAGE_RIGHT !define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}" -!define MUI_COMPONENTSPAGE_NODESC #-------------------------------- # Pages diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 7d296ffd48..058971d9ab 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -1,9 +1,7 @@ /* - init.nsh -Initialization function - +Initialization functions */ #-------------------------------- @@ -58,7 +56,7 @@ SectionEnd !if ${SETUPTYPE} == BUNDLE Section /o "$(SecInstJabRefTitle)" SecInstJabRef - AddSize 5000 + AddSize 12400 StrCpy $InstallJabRef "true" SectionEnd !endif @@ -540,6 +538,8 @@ SectionGroupEnd !if ${SETUPTYPE} == BUNDLE !insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)" !endif +!insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(SecDictionariesDescription)" +!insertmacro MUI_DESCRIPTION_TEXT ${SecThesaurus} "$(SecThesaurusDescription)" !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -1313,7 +1313,7 @@ Function un.onInit MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" Abort ${endif} - # abort when LyX couldn't be found in the registry + # warning when LyX couldn't be found in the registry ${if} $0 == "" # check in HKCU ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "DisplayVersion" ${if} $0 == "" @@ -1329,17 +1329,15 @@ Function un.onInit ${if} $0 == "Yes${APP_SERIES_KEY}" SectionSetText 2 "MiKTeX" # names the corersponding uninstaller section StrCpy $LaTeXInstalled "MiKTeX" - DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" ${else} SectionSetText 2 "" # hides the corresponding uninstaller section ${endif} # test if JabRef was installed together with LyX - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" + ReadRegStr $0 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" ${if} $0 == "Yes${APP_SERIES_KEY}" SectionSetText 3 "JabRef" # names the corersponding uninstaller section StrCpy $JabRefInstalled "Yes" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" ${else} SectionSetText 3 "" # hides the corresponding uninstaller section ${endif} diff --git a/development/Win32/packaging/installer/include/nsis.nsh b/development/Win32/packaging/installer/include/nsis.nsh index 108ae0cb71..0a6585d490 100644 --- a/development/Win32/packaging/installer/include/nsis.nsh +++ b/development/Win32/packaging/installer/include/nsis.nsh @@ -48,8 +48,8 @@ Configuration of standard NSIS header files !include gui\LaTeXFolder.nsh !endif # end if != BUNDLE -# Functions download dictionaries -!include include\Thesaurus.nsh +# Functions to download spell-checker and thesaurus dictionaries +!include include\dictionaries.nsh #-------------------------------- # Include standard functions diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index b9eea4617f..e3e70d4f67 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -33,6 +33,8 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e #${LangFileString} SecAllUsersDescription "Install LyX for all users or just the current user." ${LangFileString} SecFileAssocDescription "Files with a .lyx extension will automatically open in LyX." ${LangFileString} SecDesktopDescription "A LyX icon on the desktop." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Set the LaTeX-distribution that LyX should use.' @@ -84,7 +86,7 @@ ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the c ${LangFileString} InstallRunning "The installer is already running!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is already installed! Deinstall LyX first." ${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really need this, you must uninstall the existing LyX $OldVersionNumber before." + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ MiKTeX was installed with administrator privileges but you are installing LyX without them." @@ -106,7 +108,8 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." ${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." -${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ - "$AppPre\username\$AppSuff\${APP_DIR_USERDATA}"$\r$\n\ - for all users.' +${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration$\r$\n\ + (folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for you or for all users (if you are admin).' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." + diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index beb96c05eb..1433651319 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -14,39 +14,41 @@ ${LangFileString} TEXT_WELCOME "Dieser Assistent wird Sie durch die Installation $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualisiere MiKTeXs Dateinamen Datenbank..." +#${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualisiere MiKTeXs Dateinamen Datenbank..." ${LangFileString} TEXT_CONFIGURE_LYX "Konfiguriere LyX (MiKTeX kann fehlende Pakte herunterladen, was etwas Zeit braucht) ..." ${LangFileString} TEXT_CONFIGURE_PYTHON "Kompiliere Python Skripte..." ${LangFileString} TEXT_FINISH_DESKTOP "Ein Symbol auf der Arbeitsoberflche erzeugen" ${LangFileString} TEXT_FINISH_WEBSITE "Besuchen Sie lyx.org fr aktuelle Neuigkeiten" -${LangFileString} FileTypeTitle "LyX-Dokument" +#${LangFileString} FileTypeTitle "LyX-Dokument" ${LangFileString} SecInstJabRefTitle "JabRef" -${LangFileString} SecAllUsersTitle "Fr alle Nutzer installieren?" +#${LangFileString} SecAllUsersTitle "Fr alle Nutzer installieren?" ${LangFileString} SecFileAssocTitle "Dateizuordnungen" ${LangFileString} SecDesktopTitle "Desktopsymbol" ${LangFileString} SecCoreDescription "Das Programm LyX." ${LangFileString} SecInstJabRefDescription "Manager fr bibliografische Referenzen und Editor fr BibTeX-Dateien." -${LangFileString} SecAllUsersDescription "LyX fr alle Nutzer oder nur fr den aktuellen Nutzer installieren." +#${LangFileString} SecAllUsersDescription "LyX fr alle Nutzer oder nur fr den aktuellen Nutzer installieren." ${LangFileString} SecFileAssocDescription "Vernpfung zwischen LyX und der .lyx Dateiendung." ${LangFileString} SecDesktopDescription "Verknpfung zu LyX auf dem Desktop." +${LangFileString} SecDictionariesDescription "Rechtschreibprfung- Wrterbucher die heruntergeladen und installiert werden knnen." +${LangFileString} SecThesaurusDescription "Thesaurus- Wrterbucher die heruntergeladen und installiert werden knnen." ${LangFileString} EnterLaTeXHeader1 'LaTeX-Distribution' ${LangFileString} EnterLaTeXHeader2 'Legen Sie die LaTeX-Distribution fest die LyX verwenden soll.' ${LangFileString} EnterLaTeXFolder 'Optional knnen Sie hier den Pfad zur Datei $\"latex.exe$\" angeben und damit die \ - LaTeX-Distribution festlegen die LyX verwenden soll.$\r$\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ - $\r$\n\ - Der Installer hat auf Ihrem System die LaTeX-Distribution$\r$\n\ - $\"$LaTeXName$\" erkannt. Unten angegeben ist ihr Pfad.' + LaTeX-Distribution festlegen die LyX verwenden soll.$\r$\n\ + Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ + $\r$\n\ + Der Installer hat auf Ihrem System die LaTeX-Distribution$\r$\n\ + $\"$LaTeXName$\" erkannt. Unten angegeben ist ihr Pfad.' ${LangFileString} EnterLaTeXFolderNone 'Geben Sie unten den Pfad zur Datei $\"latex.exe$\" an. Damit legen Sie fest welche \ - LaTeX-Distribution LyX verwenden soll.$\r$\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ - $\r$\n\ - Der Installer konnte auf Ihrem System keine LaTeX-Distribution finden.' + LaTeX-Distribution LyX verwenden soll.$\r$\n\ + Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!$\r$\n\ + $\r$\n\ + Der Installer konnte auf Ihrem System keine LaTeX-Distribution finden.' ${LangFileString} PathName 'Pfad zur Datei $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Kein LaTeX benutzen" ${LangFileString} InvalidLaTeXFolder 'Kann die Datei $\"latex.exe$\" nicht finden.' @@ -56,34 +58,36 @@ ${LangFileString} LatexInfo 'Als N $\r$\n\ !!! Bitte verwenden Sie alle voreingestellten Optionen des MiKTeX-Installers !!!' ${LangFileString} LatexError1 'Es konnte keine LaTeX-Distribution gefunden werden!$\r$\n\ - LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\ - Die Installation wird daher abgebrochen.' + LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\ + Die Installation wird daher abgebrochen.' ${LangFileString} HunspellFailed 'Herunterladen des Wrterbuchs fr Sprache $\"$R3$\" fehlgeschlagen.' ${LangFileString} ThesaurusFailed 'Herunterladen des Thesaurus fr Sprache $\"$R3$\" fehlgeschlagen.' ${LangFileString} JabRefInfo 'Als Nchstes wird der Installer des Programms $\"JabRef$\" gestartet.$\r$\n\ - Sie knnen alle voreingestellten Optionen des JabRef-Installers verwenden.' + Sie knnen alle voreingestellten Optionen des JabRef-Installers verwenden.' ${LangFileString} JabRefError 'Das Programm $\"JabRef$\" konnte nicht erfolgreich installiert werden!$\r$\n\ - Der Installer wird trotzdem fortgesetzt.$\r$\n\ - Versuchen Sie JabRef spter noch einmal zu installieren.' + Der Installer wird trotzdem fortgesetzt.$\r$\n\ + Versuchen Sie JabRef spter noch einmal zu installieren.' -${LangFileString} LatexConfigInfo "Die folgende Konfiguration von LyX wird eine Weile dauern." +#${LangFileString} LatexConfigInfo "Die folgende Konfiguration von LyX wird eine Weile dauern." -${LangFileString} MiKTeXPathInfo "Damit jeder Benutzer spter MiKTeX fr seine Bedrfnisse anpassen kann,$\r$\n\ - ist es erforderlich fr MiKTeXs Installationsordner$\r$\n\ - $MiKTeXPath $\r$\n\ - und seine Unterordner Schreibrechte fr alle Benutzer zu setzen." +#${LangFileString} MiKTeXPathInfo "Damit jeder Benutzer spter MiKTeX fr seine Bedrfnisse anpassen kann,$\r$\n\ +# ist es erforderlich fr MiKTeXs Installationsordner$\r$\n\ +# $MiKTeXPath $\r$\n\ +# und seine Unterordner Schreibrechte fr alle Benutzer zu setzen." ${LangFileString} MiKTeXInfo 'Die LaTeX-Distribution $\"MiKTeX$\" wird zusammen mit LyX verwendet werden.$\r$\n\ - Es wird empfohlen dass Sie verfgbare MiKTeX-Updates mit Hilfe des Programms $\"MiKTeX Update Wizard$\"$\r$\n\ - installieren, bevor sie LyX das erste Mal benutzen.$\r$\n\ - Mchten Sie jetzt nach Updates fr MiKTeX suchen?' + Es wird empfohlen dass Sie verfgbare MiKTeX-Updates mit Hilfe des Programms $\"MiKTeX Update Wizard$\"$\r$\n\ + installieren, bevor sie LyX das erste Mal benutzen.$\r$\n\ + Mchten Sie jetzt nach Updates fr MiKTeX suchen?' ${LangFileString} ModifyingConfigureFailed 'Der $\"PATH_prfix$\" (Liste mit Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden.' -${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausfhren." +#${LangFileString} RunConfigureFailed "Konnte das Konfigurationsskript nicht ausfhren." ${LangFileString} NotAdmin "Sie bentigen Administratorrechte um LyX zu installieren!" ${LangFileString} InstallRunning "Der Installer luft bereits!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ist bereits installiert! Deinstallieren Sie LyX zuerst." +${LangFileString} NewerInstalled "Sie versuchen eine Vesion von LyX zu installieren, die lter als die derzeit installierte ist.$\r$\n\ + Wenn Sie das wirklich wollen, mssen Sie erst das existierende LyX $OldVersionNumber deinstallieren." ${LangFileString} MultipleIndexesNotAvailable "Die Untersttzung fr mehrere Indexe in einem Dokument wird nicht verfgbar sein, denn$\r$\n\ MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese." @@ -91,9 +95,9 @@ ${LangFileString} MetafileNotAvailable "Die LyX Unterst sein, denn dafr msste ein Software-Drucker fr Windows installiert werden,$\r$\n\ was jedoch nur mit Administratorrechten mglich ist." -${LangFileString} FinishPageMessage "Glckwunsch! LyX wurde erfolgreich installiert.$\r$\n\ - $\r$\n\ - (Der erste Start von LyX kann etwas lnger dauern.)" +#${LangFileString} FinishPageMessage "Glckwunsch! LyX wurde erfolgreich installiert.$\r$\n\ +# $\r$\n\ +# (Der erste Start von LyX kann etwas lnger dauern.)" ${LangFileString} FinishPageRun "LyX starten" ${LangFileString} UnNotInRegistryLabel "Kann LyX nicht in der Registry finden.$\r$\n\ @@ -105,9 +109,8 @@ ${LangFileString} UnLyXPreferencesTitle 'LyXs Benutzereinstellungen' ${LangFileString} SecUnMiKTeXDescription "Deinstalliert die LaTeX-Distribution MiKTeX." ${LangFileString} SecUnJabRefDescription "Deinstalliert den Bibliografiemanager JabRef." -${LangFileString} SecUnPreferencesDescription 'Lscht LyXs Benutzereinstellungen,$\r$\n\ - (den Ornder:$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\ - fr alle Benutzer.' +${LangFileString} SecUnPreferencesDescription 'Lscht LyXs Benutzereinstellungen$\r$\n\ + (Ordner $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\")$\r$\n\ + fr Sie oder fr alle Benutzer (wenn Sie Admin sind).' ${LangFileString} SecUnProgramFilesDescription "Deinstalliert LyX und all seine Komponenten." diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi index cdd71f8319..2f33623c07 100644 --- a/development/Win32/packaging/installer/lyx-bundle.nsi +++ b/development/Win32/packaging/installer/lyx-bundle.nsi @@ -1,2 +1,11 @@ -!define SETUPTYPE BUNDLE +/* +LyX 2.0 Installer for Windows +Authors: Joost Verburg, Angus Leeming, Uwe Stöhr +Compatible with NSIS 2.46 +*/ + +!ifndef SETUPTYPE + !define SETUPTYPE BUNDLE +!endif + !include lyx.nsi \ No newline at end of file diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi index 410cc64300..f18a0f9d64 100644 --- a/development/Win32/packaging/installer/lyx-standard.nsi +++ b/development/Win32/packaging/installer/lyx-standard.nsi @@ -1,2 +1,11 @@ -!define SETUPTYPE STANDARD +/* +LyX 2.0 Installer for Windows +Authors: Joost Verburg, Angus Leeming, Uwe Stöhr +Compatible with NSIS 2.46 +*/ + +!ifndef SETUPTYPE + !define SETUPTYPE STANDARD +!endif + !include lyx.nsi \ No newline at end of file diff --git a/development/Win32/packaging/installer/lyx.nsi b/development/Win32/packaging/installer/lyx.nsi index 4c7e520835..bd4b9835bf 100644 --- a/development/Win32/packaging/installer/lyx.nsi +++ b/development/Win32/packaging/installer/lyx.nsi @@ -34,7 +34,7 @@ SetCompressor /SOLID lzma # set up the installer pages !include include\gui.nsh -# +# sets the install sections and checks the system on starting the un/installer !include include\init.nsh # install LyX and needed third-party programs like Python etc. @@ -46,8 +46,8 @@ SetCompressor /SOLID lzma # configure LyX (set start menu and write registry entries) !include setup\configure.nsh -# -!include gui\external.nsh +# provides downloads of external programs +#!include gui\external.nsh #-------------------------------- # Output file diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 27291bee4e..8586aa7518 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -108,12 +108,19 @@ Section -ProgramFiles SecProgramFiles ExecWait "$INSTDIR\${JabRefInstall}" # test if JabRef is now installed StrCpy $PathBibTeXEditor "" - ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + ReadRegStr $PathBibTeXEditor SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" ${if} $PathBibTeXEditor == "" MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" ${else} - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # special entry to tell the uninstaller that it was installed with LyX - ${endif} + # special entry that it was installed together with LyX + # so that we can later uninstall it together with LyX + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" + ${else} + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" + ${endif} + ${endif} # end if PathBibTeXEditor ${endif} ${endif} !endif # end if BUNDLE @@ -134,10 +141,10 @@ Section -ProgramFiles SecProgramFiles # download dictionaries and thesaurus ${if} $DictCodes != "" - Call InstallHunspellDictionary # Function from Thesaurus.nsh + Call InstallHunspellDictionaries # Function from dictionaries.nsh ${endif} ${if} $ThesCodes != "" - Call InstallThesaurusDictionary # Function from Thesaurus.nsh + Call InstallThesaurusDictionaries # Function from dictionaries.nsh ${endif} # finally delete the list of mirrors Delete "$INSTDIR\Resources\DictionaryMirrors.txt" diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 2eeaa07d48..e47e197251 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -61,6 +61,8 @@ Section "un.LyX" un.SecUnProgramFiles DeleteRegKey SHCTX "Software\Classes\${APP_EXT}14" DeleteRegKey SHCTX "Software\Classes\${APP_EXT}15" DeleteRegKey SHCTX "Software\Classes\${APP_EXT}16" + # enable this for LyX 2.1! + # DeleteRegKey SHCTX "Software\Classes\${APP_EXT}20" DeleteRegKey SHCTX "Software\Classes\${APP_EXT}" DeleteRegKey SHCTX "Software\Classes\${APP_REGNAME_DOC}" ${endif} @@ -83,7 +85,6 @@ Section "un.LyX" un.SecUnProgramFiles DeleteRegKey HKCR "Applications\lyx.exe" # File associations - ReadRegStr $FileAssociation SHELL_CONTEXT "Software\Classes\${APP_EXT}" "" ${If} $FileAssociation == "${APP_REGNAME_DOC}" @@ -92,16 +93,17 @@ Section "un.LyX" un.SecUnProgramFiles ${If} $MultiUser.Privileges != "Admin" ${OrIf} $MultiUser.Privileges != "Power" - # Delete Postscript printer for metafile to EPS conversion ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' - ${EndIf} # clean other registry entries DeleteRegKey SHCTX "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" DeleteRegKey SHCTX "SOFTWARE\${APP_REGKEY}" + # delete info that programs were installed together with LyX + DeleteRegValue SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" + DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" SectionEnd @@ -120,7 +122,7 @@ SectionEnd Section /o "un.MiKTeX" un.SecUnMiKTeX ${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX - ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString" + ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString" ExecWait $1 # run MiKTeX's uninstaller ${endif} @@ -131,7 +133,7 @@ SectionEnd Section "un.JabRef" un.SecUnJabRef ${if} $JabRefInstalled == "Yes" # only uninstall JabRef when it was installed together with LyX - ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" ExecWait "$1" # run JabRef's uninstaller ${endif} From 4a3f80fe055bcaff79814238c36bd86195cea807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Mon, 12 Nov 2012 01:31:00 +0100 Subject: [PATCH 56/93] installer: uninstall fixes - fix uninstallation of Metafile2EPS pinter - fix un/installation of JabRef if the bundle version is executed without admin privileges - some whitespace fixes --- .../Win32/packaging/installer/ChangeLog.txt | 5 +++- .../packaging/installer/include/init.nsh | 8 ++++--- .../packaging/installer/setup/install.nsh | 8 ++++++- .../packaging/installer/setup/uninstall.nsh | 23 +++++++++++++------ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 5b9fa03cc5..9519886f85 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,6 +1,8 @@ Changelog for LyX-205-2: - the installer detects now existing spell-checker and thesaurus dictionaries of existing LyX installations +- fixed un/installation of Jabref if bundle installer is executed without having admin privileges +- fixed uninstallation of Metafile2EPS printer - fixed detection for already installed Ghostscript and GSview on 64bit Windows - fixed detection for jEdit, Vim, WinEdt and TeXnicCenter as LaTeX source file editor - fixed detection of Gimp and Photoshop as image manipulating program @@ -26,7 +28,8 @@ Changelog for LyX-204-3: - link the LyX Wiki and website in LyX's start menu folder Changelog for LyX-204-2: - Prevent that LyX can first be installed with admin privileges and afterwards without them - In the uninstaller it is now the default not to uninstall the user preferences and settings -- Fix the path in which the LyX start menu shortcut is executed - Also if LyX is installed without admin privileges, the .lyx file associations are set +- Fix the path in which the LyX start menu shortcut is executed +- Also if LyX is installed without admin privileges, the .lyx file associations are set - Fix a typo in English translation diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 058971d9ab..d10d3f15c5 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -45,13 +45,15 @@ FunctionEnd # visible installer sections Section "!${APP_NAME}" SecCore - SectionIn RO + SectionIn RO SectionEnd + Section "$(SecFileAssocTitle)" SecFileAssoc - StrCpy $CreateFileAssociations "true" + StrCpy $CreateFileAssociations "true" SectionEnd + Section "$(SecDesktopTitle)" SecDesktop - StrCpy $CreateDesktopIcon "true" + StrCpy $CreateDesktopIcon "true" SectionEnd !if ${SETUPTYPE} == BUNDLE diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 8586aa7518..68e553177e 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -108,7 +108,13 @@ Section -ProgramFiles SecProgramFiles ExecWait "$INSTDIR\${JabRefInstall}" # test if JabRef is now installed StrCpy $PathBibTeXEditor "" - ReadRegStr $PathBibTeXEditor SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + ${else} + # for non-admin users we can only check if it is in the start menu + ReadRegStr $PathBibTeXEditor HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu" + ${endif} ${if} $PathBibTeXEditor == "" MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" ${else} diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index e47e197251..0cf286ec07 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -12,6 +12,7 @@ Var FileAssociation Section "un.LyX" un.SecUnProgramFiles + SectionIn RO # LaTeX class files that were installed together with LyX # will not be uninstalled because other LyX versions will # need them and these few files don't harm to stay in LaTeX @@ -91,10 +92,10 @@ Section "un.LyX" un.SecUnProgramFiles DeleteRegKey SHELL_CONTEXT "Software\Classes\${APP_EXT}" ${EndIf} - ${If} $MultiUser.Privileges != "Admin" - ${OrIf} $MultiUser.Privileges != "Power" - # Delete Postscript printer for metafile to EPS conversion - ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' + ${If} $MultiUser.Privileges == "Admin" + ${OrIf} $MultiUser.Privileges == "Power" + # Delete Postscript printer for metafile to EPS conversion + ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' ${EndIf} # clean other registry entries @@ -132,9 +133,17 @@ SectionEnd # JabRef Section "un.JabRef" un.SecUnJabRef - ${if} $JabRefInstalled == "Yes" # only uninstall JabRef when it was installed together with LyX - ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" - ExecWait "$1" # run JabRef's uninstaller + ${if} $JabRefInstalled == "Yes" # only uninstall JabRef when it was installed together with LyX + ${If} $MultiUser.Privileges == "Admin" + ${OrIf} $MultiUser.Privileges == "Power" + ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + ExecWait "$1" # run JabRef's uninstaller + ${else} + # in this case we can only read the start menu location and then start the linked uninstaller + ReadRegStr $1 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu" + StrCpy $1 "$1\Uninstall JabRef 2.8.lnk" + ExecShell "" "$1" # run JabRef's uninstaller + ${endif} ${endif} SectionEnd From 7cda6b9d57eab366db5977d40296b46f41237637 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 12 Nov 2012 02:44:54 +0100 Subject: [PATCH 57/93] Header no more needed. --- src/support/lstrings.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp index 1aee6f2881..73ab5a769c 100644 --- a/src/support/lstrings.cpp +++ b/src/support/lstrings.cpp @@ -19,7 +19,6 @@ #include "support/qstring_helpers.h" #include "support/textutils.h" -#include #include "support/lassert.h" #include From 2257040be4c0cf96ca8e75f6a2a7a57c72bd0c24 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 12 Nov 2012 03:02:28 +0100 Subject: [PATCH 58/93] More headers from lstrings. --- src/support/lstrings.cpp | 3 --- src/support/lstrings.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp index 73ab5a769c..346e4e171a 100644 --- a/src/support/lstrings.cpp +++ b/src/support/lstrings.cpp @@ -15,14 +15,11 @@ #include "support/lstrings.h" #include "support/convert.h" -#include "support/gettext.h" #include "support/qstring_helpers.h" -#include "support/textutils.h" #include "support/lassert.h" #include -#include #include #include diff --git a/src/support/lstrings.h b/src/support/lstrings.h index 23ac71216a..66ea9df705 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -18,7 +18,6 @@ #include "support/docstring.h" -#include #include From d692d6f27e7b440a582c8bc524eb8755634fc568 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 12 Nov 2012 03:05:30 +0100 Subject: [PATCH 59/93] Less headers in docstring. --- src/support/docstring.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index c937ba3721..b525297c32 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -19,10 +19,6 @@ #include -#include -#include -#include - using namespace std; using lyx::support::isHexChar; From ea1d9cb39f59f3244ed36cb91cff9525381c884d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 12 Nov 2012 03:20:50 +0100 Subject: [PATCH 60/93] Less headers in unicode. Now lets wait for the scream from people on other compilers. --- src/support/unicode.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp index b48f10609f..574d9f904f 100644 --- a/src/support/unicode.cpp +++ b/src/support/unicode.cpp @@ -21,10 +21,8 @@ #include #include -#include #include #include -#include using namespace std; From cabf8e86b53009abade633992df5d5a96dc3a42c Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Mon, 12 Nov 2012 12:11:42 +0100 Subject: [PATCH 61/93] Make it compile again on systems that don't USE_WCHAR_T --- src/support/docstring.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index b525297c32..eae38f19b6 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -19,6 +19,12 @@ #include +#if ! defined(USE_WCHAR_T) && defined(__GNUC__) +#include +#include +#include +#endif + using namespace std; using lyx::support::isHexChar; From 8d135a981945635f0e95f1e2cd9882158cb6b946 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 12 Nov 2012 13:06:22 +0100 Subject: [PATCH 62/93] Typeinfo needed in Ubuntu. --- src/support/docstring.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index eae38f19b6..9883425ab2 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -19,10 +19,10 @@ #include +#include #if ! defined(USE_WCHAR_T) && defined(__GNUC__) #include #include -#include #endif using namespace std; From b53243295a4c1cb87eee9ee99f5df240d1bed963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 Nov 2012 00:27:46 +0100 Subject: [PATCH 63/93] unicode.cpp: make it compile again the removal of this header in [ea1d9cb3/lyxgit] was too much --- src/support/unicode.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp index 574d9f904f..8b0f9cb0db 100644 --- a/src/support/unicode.cpp +++ b/src/support/unicode.cpp @@ -23,6 +23,7 @@ #include #include #include +#include using namespace std; From 05e05f55bed3476aadd936cf1ffc008aacef2cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 Nov 2012 00:29:50 +0100 Subject: [PATCH 64/93] installer: update languages file the installer is hopefully now really finished --- .../Win32/packaging/installer/lang/arabic.nsh | 64 +++++++++--------- .../packaging/installer/lang/catalan.nsh | 66 ++++++++++--------- .../Win32/packaging/installer/lang/czech.nsh | 66 ++++++++++--------- .../Win32/packaging/installer/lang/danish.nsh | 66 ++++++++++--------- .../Win32/packaging/installer/lang/dutch.nsh | 66 ++++++++++--------- .../packaging/installer/lang/english.nsh | 60 ++++++++--------- .../Win32/packaging/installer/lang/french.nsh | 66 ++++++++++--------- .../packaging/installer/lang/galician.nsh | 66 ++++++++++--------- .../Win32/packaging/installer/lang/german.nsh | 16 ++--- .../packaging/installer/lang/hungarian.nsh | 66 ++++++++++--------- .../packaging/installer/lang/indonesian.nsh | 66 ++++++++++--------- .../packaging/installer/lang/italian.nsh | 66 ++++++++++--------- .../packaging/installer/lang/japanese.nsh | 60 +++++++++-------- .../packaging/installer/lang/norwegian.nsh | 62 +++++++++-------- .../Win32/packaging/installer/lang/polish.nsh | 66 ++++++++++--------- .../packaging/installer/lang/portuguese.nsh | 66 ++++++++++--------- .../packaging/installer/lang/romanian.nsh | 64 +++++++++--------- .../Win32/packaging/installer/lang/slovak.nsh | 64 +++++++++--------- .../packaging/installer/lang/spanish.nsh | 66 ++++++++++--------- .../packaging/installer/lang/swedish.nsh | 66 ++++++++++--------- .../packaging/installer/lang/turkish.nsh | 66 ++++++++++--------- .../packaging/installer/lang/ukrainian.nsh | 66 ++++++++++--------- 22 files changed, 731 insertions(+), 649 deletions(-) diff --git a/development/Win32/packaging/installer/lang/arabic.nsh b/development/Win32/packaging/installer/lang/arabic.nsh index 000c302d80..f38665f80e 100644 --- a/development/Win32/packaging/installer/lang/arabic.nsh +++ b/development/Win32/packaging/installer/lang/arabic.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME " .$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -29,67 +29,69 @@ ${LangFileString} SecDesktopDescription " ${LangFileString} EnterLaTeXHeader1 '-' ${LangFileString} EnterLaTeXHeader2 ' - .' ${LangFileString} EnterLaTeXFolder ' $\"latex.exe$\" \ - - .$\r$\n\ - !$\r$\n\ - $\r$\n\ - - \ - $\"$LaTeXName$\" .' + - .$\r$\n\ + !$\r$\n\ + $\r$\n\ + - \ + $\"$LaTeXName$\" .' ${LangFileString} EnterLaTeXFolderNone ' $\"latex.exe$\". \ - - .$\r$\n\ - !$\r$\n\ - $\r$\n\ - - .' + - .$\r$\n\ + !$\r$\n\ + $\r$\n\ + - .' ${LangFileString} PathName ' $\"latex.exe$\"' ${LangFileString} DontUseLaTeX " " ${LangFileString} InvalidLaTeXFolder ' $\"latex.exe$\" .' ${LangFileString} LatexInfo ' - $\"MiKTeX$\".$\r$\n\ - .$\r$\n\ - $\r$\n\ - !!! MiKTeX !!!' + .$\r$\n\ + $\r$\n\ + !!! MiKTeX !!!' ${LangFileString} LatexError1 ' -!$\r$\n\ - MiKTeX!$\r$\n\ - .' + MiKTeX!$\r$\n\ + .' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo ' JabRef.$\r$\n\ - JabRef.' + JabRef.' ${LangFileString} JabRefError ' JabRef!$\r$\n\ - .$\r$\n\ - JabRef .' + .$\r$\n\ + JabRef .' ${LangFileString} LatexConfigInfo " ." ${LangFileString} MiKTeXPathInfo " miktex $\r$\n\ - MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - ." + MiKTeX$\r$\n\ + $MiKTeXPath $\r$\n\ + ." ${LangFileString} MiKTeXInfo '- MiKTeX .$\r$\n\ - miktex - $\" miktex$\"$\r$\n\ - .$\r$\n\ - ' + miktex - $\" miktex$\"$\r$\n\ + .$\r$\n\ + ' ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script" ${LangFileString} RunConfigureFailed " configure script" ${LangFileString} NotAdmin " !" ${LangFileString} InstallRunning " !" ${LangFileString} StillInstalled " ${APP_SERIES_KEY2} ." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "! .$\r$\n\ - $\r$\n\ - ( .)" + $\r$\n\ + ( .)" ${LangFileString} FinishPageRun " " ${LangFileString} UnNotInRegistryLabel " .$\r$\n\ - ." + ." ${LangFileString} UnInstallRunning " !" ${LangFileString} UnNotAdminLabel " !" ${LangFileString} UnReallyRemoveLabel " " @@ -98,7 +100,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s ${LangFileString} SecUnMiKTeXDescription " - MiKTeX." ${LangFileString} SecUnJabRefDescription " JabRef." ${LangFileString} SecUnPreferencesDescription ' $\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - .' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + .' ${LangFileString} SecUnProgramFilesDescription " ." diff --git a/development/Win32/packaging/installer/lang/catalan.nsh b/development/Win32/packaging/installer/lang/catalan.nsh index d384acd638..b793b862a1 100644 --- a/development/Win32/packaging/installer/lang/catalan.nsh +++ b/development/Win32/packaging/installer/lang/catalan.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Aquest assistent us guiar en la installaci del LyX.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Gestor i editor de refer ${LangFileString} SecAllUsersDescription "Installa el LyX per a tots els usuaris o noms per a l'usuari actual." ${LangFileString} SecFileAssocDescription "Els fitxers amb extensi .lyx s'obriran automticament amb el LyX." ${LangFileString} SecDesktopDescription "Una icona del LyX a l'escriptori." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuci LaTeX' ${LangFileString} EnterLaTeXHeader2 'Establiu la distribuci LaTeX que ha de fer servir el LyX.' ${LangFileString} EnterLaTeXFolder 'Opcionalment podeu establir aqu el cam al fitxer $\"latex.exe$\" i posteriorment establir la \ - distribuci LaTeX que el LyX ha de fer servir.$\r$\n\ - Si no useu LaTeX, el LyX no podr generar documents!$\r$\n\ - $\r$\n\ - L$\'installador ha detectat la distribuci LaTeX \ - $\"$LaTeXName$\" al sistema, al cam que es mostra avall.' + distribuci LaTeX que el LyX ha de fer servir.$\r$\n\ + Si no useu LaTeX, el LyX no podr generar documents!$\r$\n\ + $\r$\n\ + L$\'installador ha detectat la distribuci LaTeX \ + $\"$LaTeXName$\" al sistema, al cam que es mostra avall.' ${LangFileString} EnterLaTeXFolderNone 'Indiqueu el cam al fitxer $\"latex.exe$\". Posteriorment establiu \ - quina distribuci LaTeX ha de fer servir el LyX.$\r$\n\ - Si no useu LaTeX, el LyX no podr generar documents!$\r$\n\ - $\r$\n\ - L$\'installador no ha trobat cap distribuci LaTeX al sistema.' + quina distribuci LaTeX ha de fer servir el LyX.$\r$\n\ + Si no useu LaTeX, el LyX no podr generar documents!$\r$\n\ + $\r$\n\ + L$\'installador no ha trobat cap distribuci LaTeX al sistema.' ${LangFileString} PathName 'Cam al fitxer $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usis LaTeX" ${LangFileString} InvalidLaTeXFolder 'El fitxer $\"latex.exe$\" no es troba al cam indicat.' ${LangFileString} LatexInfo 'Ara s$\'executar l$\'installador de la distribuci LaTeX $\"MiKTeX$\".$\r$\n\ - Per installar el programa pitgeu el bot $\"Segent$\" a les finestres de l$\'installador fins que la installaci comenci.$\r$\n\ - $\r$\n\ - Si us plau, useu les opcions predeterminades de l$\'installador MiKTeX !!!' + Per installar el programa pitgeu el bot $\"Segent$\" a les finestres de l$\'installador fins que la installaci comenci.$\r$\n\ + $\r$\n\ + Si us plau, useu les opcions predeterminades de l$\'installador MiKTeX !!!' ${LangFileString} LatexError1 'No s$\'ha trobat cap distribuci LaTeX!$\r$\n\ - No podeu usar el LyX sense cap distribuci LaTeX, com ara $\"MiKTeX$\"!$\r$\n\ - Es cancellar la installaci.' + No podeu usar el LyX sense cap distribuci LaTeX, com ara $\"MiKTeX$\"!$\r$\n\ + Es cancellar la installaci.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Ara s$\'executar l$\'installador del programa $\"JabRef$\".$\r$\n\ - Podeu usar totes les opcions predeterminades de l$\'installador del JabRef.' + Podeu usar totes les opcions predeterminades de l$\'installador del JabRef.' ${LangFileString} JabRefError 'El programa $\"JabRef$\" no s$\'ha installat correctament!$\r$\n\ - L$\'installador continuar igualment.$\r$\n\ - Intenteu installar el JabRef altre cop ms tard.' + L$\'installador continuar igualment.$\r$\n\ + Intenteu installar el JabRef altre cop ms tard.' ${LangFileString} LatexConfigInfo "La configuraci segent del LyX pot trigar una mica." ${LangFileString} MiKTeXPathInfo "Per a que cada usuari pugui personalitzar el MiKTeX segons les seves necessitats\r$\n\ - s necessari que la carpeta on es troba installat el MiKTeK$\r$\n\ - $MiKTeXPath $\r$\n\ - i a les seves subcarpetes tinguin permissos d'escriptura per a tots els usuaris." + s necessari que la carpeta on es troba installat el MiKTeK$\r$\n\ + $MiKTeXPath $\r$\n\ + i a les seves subcarpetes tinguin permissos d'escriptura per a tots els usuaris." ${LangFileString} MiKTeXInfo 'La distribuci LaTeX $\"MiKTeX$\" conjuntament amb el LyX.$\r$\n\ - s recomenable installar les actualitzacions MiKTeX fent servir el programa $\"MiKTeX Update Wizard$\"$\r$\n\ - abans d$\'executar el LyX per primer cop.$\r$\n\ - Voleu comprobar ara si hi ha actualitzacions del MiKTeX?' + s recomenable installar les actualitzacions MiKTeX fent servir el programa $\"MiKTeX Update Wizard$\"$\r$\n\ + abans d$\'executar el LyX per primer cop.$\r$\n\ + Voleu comprobar ara si hi ha actualitzacions del MiKTeX?' ${LangFileString} ModifyingConfigureFailed "No es pot establir 'path_prefix' durant el programa de configuraci" ${LangFileString} RunConfigureFailed "No es pot executar el programa de configuraci" ${LangFileString} NotAdmin "Necessiteu drets d'administrador per installar el LyX!" ${LangFileString} InstallRunning "L'installador ja s'est executant!" ${LangFileString} StillInstalled "El LyX ${APP_SERIES_KEY2} ja es troba installat! Desinstalleu-lo primer." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Felicitats! Heu installat correctament el LyX.$\r$\n\ - $\r$\n\ - (La primera execuci del LyX pot trigar alguns segons.)" + $\r$\n\ + (La primera execuci del LyX pot trigar alguns segons.)" ${LangFileString} FinishPageRun "Executa el LyX" ${LangFileString} UnNotInRegistryLabel "No es possible trobar el LyX al registre.$\r$\n\ - No se suprimiran les dreceres de l'escriptori i del men inici." + No se suprimiran les dreceres de l'escriptori i del men inici." ${LangFileString} UnInstallRunning "Primer heu de tancar el LyX!" ${LangFileString} UnNotAdminLabel "Necessiteu drets d'administrador per desinstallar el LyX!" ${LangFileString} UnReallyRemoveLabel "Esteu segur de voler suprimir completament el LyX i tots els seus components?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Prefer ${LangFileString} SecUnMiKTeXDescription "Desintalla la distribuci de LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Desinstalla el gestor de bibliografia JabRef." ${LangFileString} SecUnPreferencesDescription 'Suprimeix les carptes de configuraci del LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - de tots els usuaris.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + de tots els usuaris.' ${LangFileString} SecUnProgramFilesDescription "Desinstalla el LyX i tots els seus components." diff --git a/development/Win32/packaging/installer/lang/czech.nsh b/development/Win32/packaging/installer/lang/czech.nsh index 9726956c1c..bb55f103b6 100644 --- a/development/Win32/packaging/installer/lang/czech.nsh +++ b/development/Win32/packaging/installer/lang/czech.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Tento pomocnk vs provede instalac LyXu.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Spr ${LangFileString} SecAllUsersDescription "Instalovat LyX pro vechny uivatele nebo pouze pro souasnho uivatele." ${LangFileString} SecFileAssocDescription "Soubory s pponou .lyx se automaticky otevou v LyXu." ${LangFileString} SecDesktopDescription "Ikonu LyXu na plochu." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuce LaTeXu' ${LangFileString} EnterLaTeXHeader2 'Nastavte distribuci LaTeXu, kterou m LyX pouvat.' ${LangFileString} EnterLaTeXFolder 'Mete zde voliteln nastavit cestu k souboru $\"latex.exe$\" a tm urit \ - distribuci LaTeXu, kterou bude pouvat Lyx.$\r$\n\ - Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!$\r$\n\ - $\r$\n\ - Instaltor nalezl na vaem potai LaTeXovou distribuci \ - $\"$LaTeXName$\". Ne je uvedena jej cesta.' + distribuci LaTeXu, kterou bude pouvat Lyx.$\r$\n\ + Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!$\r$\n\ + $\r$\n\ + Instaltor nalezl na vaem potai LaTeXovou distribuci \ + $\"$LaTeXName$\". Ne je uvedena jej cesta.' ${LangFileString} EnterLaTeXFolderNone 'Ne nastavte cestu k souboru $\"latex.exe$\". Urte tm, kter \ - distribuce LaTeXu bude pouvna LyXem.$\r$\n\ - Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!$\r$\n\ - $\r$\n\ - Instaltor nemohl nalzt distribuci LaTeXu na vaem potai.' + distribuce LaTeXu bude pouvna LyXem.$\r$\n\ + Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!$\r$\n\ + $\r$\n\ + Instaltor nemohl nalzt distribuci LaTeXu na vaem potai.' ${LangFileString} PathName 'Cesta k souboru $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nepouvat LaTeX" ${LangFileString} InvalidLaTeXFolder 'Soubor $\"latex.exe$\" nen v zadan cest.' ${LangFileString} LatexInfo 'Nyn bude sputn instaltor LaTeXov-distribuce $\"MiKTeX$\".$\r$\n\ - V instaltoru pokraujte tlatkem $\"Next$\" dokud instalace nezane.$\r$\n\ - $\r$\n\ - !!! Uijte vechny pedvolby instaltoru MiKTeX !!!' + V instaltoru pokraujte tlatkem $\"Next$\" dokud instalace nezane.$\r$\n\ + $\r$\n\ + !!! Uijte vechny pedvolby instaltoru MiKTeX !!!' ${LangFileString} LatexError1 'dn LaTeXov-distribuce nebyla nalezena!$\r$\n\ - Nemete pouvat LyX bez distribuce LaTeXu jako je nap. $\"MiKTeX$\"!$\r$\n\ - Instalace bude proto peruena.' + Nemete pouvat LyX bez distribuce LaTeXu jako je nap. $\"MiKTeX$\"!$\r$\n\ + Instalace bude proto peruena.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Nyn bude sputn instaltor programu $\"JabRef$\".$\r$\n\ - Mete pout vechny pedvolby instaltoru JabRef.' + Mete pout vechny pedvolby instaltoru JabRef.' ${LangFileString} JabRefError 'Program $\"JabRef$\" nebyl spn nainstalovn.$\r$\n\ - Instaltor bude navzdory tomu pokraovat.$\r$\n\ - Pokuste se nainstalovat JabRef pozdji.' + Instaltor bude navzdory tomu pokraovat.$\r$\n\ + Pokuste se nainstalovat JabRef pozdji.' ${LangFileString} LatexConfigInfo "Nsledujc konfigurovn LyXu chvli potrv." ${LangFileString} MiKTeXPathInfo "Aby kad uivatel mohl pozdji pizpsobit MiKTeX pro sv poteby$\r$\n\ - je teba nastavit prva zpisu pro vechny uivatele do adrese MiKTeXu$\r$\n\ - $MiKTeXPath $\r$\n\ - a vech jeho podadres." + je teba nastavit prva zpisu pro vechny uivatele do adrese MiKTeXu$\r$\n\ + $MiKTeXPath $\r$\n\ + a vech jeho podadres." ${LangFileString} MiKTeXInfo 'LaTeXov distribuce $\"MiKTeX$\" bude pouita dohromady s LyXem.$\r$\n\ - Je doporueno nainstalovat dostupn aktualizace MiKTeXu pomoc programu $\"MiKTeX Update Wizard$\"$\r$\n\ - pedtm ne poprv spustte LyX.$\r$\n\ - Chcete zkontrolovat dostupn aktualizace MiKTeXu nyn?' + Je doporueno nainstalovat dostupn aktualizace MiKTeXu pomoc programu $\"MiKTeX Update Wizard$\"$\r$\n\ + pedtm ne poprv spustte LyX.$\r$\n\ + Chcete zkontrolovat dostupn aktualizace MiKTeXu nyn?' ${LangFileString} ModifyingConfigureFailed "Nelze nastavit 'path_prefix' v konfiguranm skriptu" ${LangFileString} RunConfigureFailed "Nelze spustit konfiguran skript" ${LangFileString} NotAdmin "Potebujete administrtorsk prva pro nainstalovn LyXu!" ${LangFileString} InstallRunning "Instaltor je ji sputn!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je ji nainstalovn! Nejprve LyX odinstalujte." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Blahopejeme! LyX byl spn nainstalovn.$\r$\n\ - $\r$\n\ - (Prvn sputn LyXu me trvat del dobu.)" + $\r$\n\ + (Prvn sputn LyXu me trvat del dobu.)" ${LangFileString} FinishPageRun "Spustit LyX" ${LangFileString} UnNotInRegistryLabel "Nelze nalzt LyX v registrech.$\r$\n\ - Zstupce na ploe a ve Start menu nebude smazn." + Zstupce na ploe a ve Start menu nebude smazn." ${LangFileString} UnInstallRunning "Nejprve muste zavt LyX!" ${LangFileString} UnNotAdminLabel "Muste mt administrtorsk prva pro odinstalovn LyXu!" ${LangFileString} UnReallyRemoveLabel "Chcete opravdu smazat LyX a vechny jeho komponenty?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'U ${LangFileString} SecUnMiKTeXDescription "Odinstalovat LaTeXovou-distribuci MiKTeX." ${LangFileString} SecUnJabRefDescription "Odinstalovat manaer bibliografie JabRef." ${LangFileString} SecUnPreferencesDescription 'Smazat konfiguran adres LyXu$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - pro vechny uivatele.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + pro vechny uivatele.' ${LangFileString} SecUnProgramFilesDescription "Odinstalovat LyX a vechny jeho komponenty." diff --git a/development/Win32/packaging/installer/lang/danish.nsh b/development/Win32/packaging/installer/lang/danish.nsh index dca82d758c..99cc58615a 100644 --- a/development/Win32/packaging/installer/lang/danish.nsh +++ b/development/Win32/packaging/installer/lang/danish.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Denne guide vil installere LyX p din computer.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e ${LangFileString} SecAllUsersDescription "Installer LyX til alle brugere, eller kun den aktuelle bruger." ${LangFileString} SecFileAssocDescription "Opret association mellem LyX og .lyx filer." ${LangFileString} SecDesktopDescription "Et LyX ikon p skrivebordet" +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Vlg den LaTeX-distribution som LyX skal bruge.' ${LangFileString} EnterLaTeXFolder 'Du kan her vlge stien til filen $\"latex.exe$\" og derved vlge hvilken \ - LaTeX-distribution som bruges LyX.$\r$\n\ - Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ - $\r$\n\ - Installationsprogrammet har detekteret LaTeX-distributionen \ - $\"$LaTeXName$\" p din computer i nedenstende sti:' + LaTeX-distribution som bruges LyX.$\r$\n\ + Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ + $\r$\n\ + Installationsprogrammet har detekteret LaTeX-distributionen \ + $\"$LaTeXName$\" p din computer i nedenstende sti:' ${LangFileString} EnterLaTeXFolderNone 'Vlg nedenfor stien til filen $\"latex.exe$\". Herved kan du vlge hvilken \ - LaTeX-distribution LyX skal bruge.$\r$\n\ - Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ - $\r$\n\ - Installationsprogrammet kunne ikke finde nogen LaTeX-distribution.' + LaTeX-distribution LyX skal bruge.$\r$\n\ + Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!$\r$\n\ + $\r$\n\ + Installationsprogrammet kunne ikke finde nogen LaTeX-distribution.' ${LangFileString} PathName 'Sti til filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Brug ikke LaTeX" ${LangFileString} InvalidLaTeXFolder 'Kunne ikke finde $\"latex.exe$\".' ${LangFileString} LatexInfo 'Installationen af LaTeX-distributionen $\"MiKTeX$\" startes.$\r$\n\ - For at installere programmet tryk p $\"Next$\"-knappen i installationsvinduet indtil installationen begynder.$\r$\n\ - $\r$\n\ - !!! Brug alle MiKTeX installationsprogrammets foreslde valg !!!' + For at installere programmet tryk p $\"Next$\"-knappen i installationsvinduet indtil installationen begynder.$\r$\n\ + $\r$\n\ + !!! Brug alle MiKTeX installationsprogrammets foreslde valg !!!' ${LangFileString} LatexError1 'Ingen LaTeX-distribution fundet!$\r$\n\ - LyX kan ikke bruges uden en LaTeX-distribution sasom $\"MiKTeX$\"!$\r$\n\ - Installationen afbrydes.' + LyX kan ikke bruges uden en LaTeX-distribution sasom $\"MiKTeX$\"!$\r$\n\ + Installationen afbrydes.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Installationen af programmet $\"JabRef$\" startes.$\r$\n\ - Du kan roligt bruge alle $\"default$\" valgmuligheder ved JabRef-installationen.' + Du kan roligt bruge alle $\"default$\" valgmuligheder ved JabRef-installationen.' ${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunne ikke installeres!$\r$\n\ - Installationen vil dog fortstte.$\r$\n\ - Prv at installere JabRef igen senere.' + Installationen vil dog fortstte.$\r$\n\ + Prv at installere JabRef igen senere.' ${LangFileString} LatexConfigInfo "Den flgende konfiguration af LyX vil tage et stykke tid." ${LangFileString} MiKTeXPathInfo "For at alle brugere senere kan konfigurere MiKTeX$\r$\n\ - er det ndvendigt at give skriverettigheder for alle MiKTeX brugere i installations mappen$\r$\n\ - $MiKTeXPath $\r$\n\ - og dennes undermapper." + er det ndvendigt at give skriverettigheder for alle MiKTeX brugere i installations mappen$\r$\n\ + $MiKTeXPath $\r$\n\ + og dennes undermapper." ${LangFileString} MiKTeXInfo 'LaTeX-distributionen $\"MiKTeX$\" vil blive brugt sammen med LyX.$\r$\n\ - Det anbefales at installere tilgngelige MiKTeX-opdateringer ved hjlp af programmet $\"MiKTeX Update Wizard$\"$\r$\n\ - fr LyX startes for frste gang.$\r$\n\ - Vil du tjekke om der findes MiKTeX opdateringer?' + Det anbefales at installere tilgngelige MiKTeX-opdateringer ved hjlp af programmet $\"MiKTeX Update Wizard$\"$\r$\n\ + fr LyX startes for frste gang.$\r$\n\ + Vil du tjekke om der findes MiKTeX opdateringer?' ${LangFileString} ModifyingConfigureFailed "Forsoget p at indstille 'path_prefix' i konfigurationen mislykkedes" ${LangFileString} RunConfigureFailed "Mislykket forsog p at afvikle konfigurations-scriptet" ${LangFileString} NotAdmin "Du skal have administrator-rettigheder for at installere LyX!" ${LangFileString} InstallRunning "Installationsprogrammet krer allerede!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installeret! Afinstaller LyX frst." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Tillykke!! LyX er installeret.$\r$\n\ - $\r$\n\ - (Nr LyX startes frste gang, kan det tage noget tid.)" + $\r$\n\ + (Nr LyX startes frste gang, kan det tage noget tid.)" ${LangFileString} FinishPageRun "Start LyX" ${LangFileString} UnNotInRegistryLabel "Kunne ikke finde LyX i registreringsdatabsen.$\r$\n\ - Genvejene p skrivebordet og i Start-menuen bliver ikke fjernet" + Genvejene p skrivebordet og i Start-menuen bliver ikke fjernet" ${LangFileString} UnInstallRunning "Du ma afslutte LyX forst!" ${LangFileString} UnNotAdminLabel "Du skal have administrator-rettigheder for at afinstallere LyX!" ${LangFileString} UnReallyRemoveLabel "Er du sikker p, at du vil slette LyX og alle tilhrende komponenter?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription 'Afinstallerer LaTeX-distributionen $\"MiKTeX$\".' ${LangFileString} SecUnJabRefDescription 'Afinstallerer bibliografi programmet $\"JabRef$\".' ${LangFileString} SecUnPreferencesDescription 'Sletter LyX$\'s konfigurations mappe$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for alle brugere.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for alle brugere.' ${LangFileString} SecUnProgramFilesDescription "Afinstallerer LyX og alle dets komponenter." diff --git a/development/Win32/packaging/installer/lang/dutch.nsh b/development/Win32/packaging/installer/lang/dutch.nsh index c7c7775295..e226c07a81 100644 --- a/development/Win32/packaging/installer/lang/dutch.nsh +++ b/development/Win32/packaging/installer/lang/dutch.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Dit installatie programma zal LyX op uw systeem installeren.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e ${LangFileString} SecAllUsersDescription "Installeer LyX voor alle gebruikers of uitsluitend de huidige gebruiker?" ${LangFileString} SecFileAssocDescription "Associeer het LyX programma met de .lyx extensie." ${LangFileString} SecDesktopDescription "Een LyX pictogram op het Bureaublad." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX software' ${LangFileString} EnterLaTeXHeader2 'Geef aan welke LaTeX-software LyX moet gebruiken.' ${LangFileString} EnterLaTeXFolder 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \ - welke LaTeX software gebruikt wordt door LyX.$\r$\n\ - Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ - $\r$\n\ - Het installatie programma heeft de LaTeX software \ - $\"$LaTeXName$\" op uw systeem gevonden in de volgende map.' + welke LaTeX software gebruikt wordt door LyX.$\r$\n\ + Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ + $\r$\n\ + Het installatie programma heeft de LaTeX software \ + $\"$LaTeXName$\" op uw systeem gevonden in de volgende map.' ${LangFileString} EnterLaTeXFolderNone 'U kunt hier opgeven in welke map het programma $\"latex.exe$\" zich bevindt en op deze manier bepalen \ - welke LaTeX software gebruikt wordt door LyX.$\r$\n\ - Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ - $\r$\n\ - Het installatie programma heeft geen LaTeX software op uw systeem gevonden.' + welke LaTeX software gebruikt wordt door LyX.$\r$\n\ + Zonder LaTeX kan LyX geen documenten generen!$\r$\n\ + $\r$\n\ + Het installatie programma heeft geen LaTeX software op uw systeem gevonden.' ${LangFileString} PathName 'Map met het programma $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Gebruik geen LaTeX" ${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" is niet gevonden.' ${LangFileString} LatexInfo 'Het installatieprogramma van $\"MiKTeX$\" word gestart.$\r$\n\ - Om het programma te installeren klik op de $\"Next$\"-knop in het installatie venster totdat de installatie begint.$\r$\n\ - $\r$\n\ - !!! Gebruik de standaard opties tijdens de installatie van MiKTeX !!!' + Om het programma te installeren klik op de $\"Next$\"-knop in het installatie venster totdat de installatie begint.$\r$\n\ + $\r$\n\ + !!! Gebruik de standaard opties tijdens de installatie van MiKTeX !!!' ${LangFileString} LatexError1 'Er is geen LaTeX software gevonden!$\r$\n\ - LyX kan niet worden gebruikt zonder LaTeX software zoals $\"MiKTeX$\"!$\r$\n\ - De installatie wordt daarom afgebroken.' + LyX kan niet worden gebruikt zonder LaTeX software zoals $\"MiKTeX$\"!$\r$\n\ + De installatie wordt daarom afgebroken.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Het installatie programma van $\"JabRef$\" wordt nu gestart.$\r$\n\ - U kunt de standaard opties gebruiken.' + U kunt de standaard opties gebruiken.' ${LangFileString} JabRefError 'Het programma $\"JabRef$\" kon niet worden geinstalleerd!$\r$\n\ - De LyX installatie gaat desondanks verder.$\r$\n\ - Probeer JabRef later te installeren.' + De LyX installatie gaat desondanks verder.$\r$\n\ + Probeer JabRef later te installeren.' ${LangFileString} LatexConfigInfo "De volgende configuratie van LyX zal enige tijd duren." ${LangFileString} MiKTeXPathInfo "Opdat elke gebruiker zijn MiKTeX configuratie kan aanpassen$\r$\n\ - is het noodzakelijk alle gebruikers schrijfpermissie te geven in MiKTeX's installatie map$\r$\n\ - $MiKTeXPath $\r$\n\ - en submappen." + is het noodzakelijk alle gebruikers schrijfpermissie te geven in MiKTeX's installatie map$\r$\n\ + $MiKTeXPath $\r$\n\ + en submappen." ${LangFileString} MiKTeXInfo 'LyX gebruikt de LaTeX software $\"MiKTeX$\".$\r$\n\ - Het is aanbevolen MiKTeX-updates te installeren via de $\"MiKTeX Update Wizard$\"$\r$\n\ - voordat u LyX voor de eerste keer gebruikt.$\r$\n\ - Wilt u controleren of er updates voor MiKTeX beschikbaar zijn?' + Het is aanbevolen MiKTeX-updates te installeren via de $\"MiKTeX Update Wizard$\"$\r$\n\ + voordat u LyX voor de eerste keer gebruikt.$\r$\n\ + Wilt u controleren of er updates voor MiKTeX beschikbaar zijn?' ${LangFileString} ModifyingConfigureFailed "Mislukte poging om 'path_prefix' te registreren tijdens de configuratie" ${LangFileString} RunConfigureFailed "Mislukte configuratie poging" ${LangFileString} NotAdmin "U heeft systeem-beheerrechten nodig om LyX te installeren!" ${LangFileString} InstallRunning "Het installatieprogramma is al gestart!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} is reeds geinstalleerd! Verwijder LyX eerst." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gefeliciteerd! LyX is succesvol geinstalleerd.$\r$\n\ - $\r$\n\ - (De eerste keer dat u LyX start kan dit enige seconden duren.)" + $\r$\n\ + (De eerste keer dat u LyX start kan dit enige seconden duren.)" ${LangFileString} FinishPageRun "Start LyX" ${LangFileString} UnNotInRegistryLabel "LyX is niet gevonden in het Windows register.$\r$\n\ - Snelkoppelingen op het Bureaublad en in het Start Menu worden niet verwijderd." + Snelkoppelingen op het Bureaublad en in het Start Menu worden niet verwijderd." ${LangFileString} UnInstallRunning "U moet LyX eerst afsluiten!" ${LangFileString} UnNotAdminLabel "U heeft systeem-beheerrechten nodig om LyX te verwijderen!" ${LangFileString} UnReallyRemoveLabel "Weet u zeker dat u LyX en alle componenten volledig wil verwijderen van deze computer?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Verwijder de LaTeX software MiKTeX." ${LangFileString} SecUnJabRefDescription "Verwijder de bibliografie manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Verwijder LyX$\'s configuratie map$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - voor alle gebruikers.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + voor alle gebruikers.' ${LangFileString} SecUnProgramFilesDescription "Verwijder LyX en alle bijbehorende onderdelen." diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index e3e70d4f67..174e3aee98 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -11,8 +11,8 @@ Author: Joost Verburg, Uwe St ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "This wizard will guide you through the installation of $(^NameDA), $\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" #${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -39,47 +39,47 @@ ${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be do ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Set the LaTeX-distribution that LyX should use.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer has detected the LaTeX-distribution \ + $\"$LaTeXName$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Don$\'t use LaTeX" ${LangFileString} InvalidLaTeXFolder 'The file $\"latex.exe$\" is not in the specified path.' ${LangFileString} LatexInfo 'Now the installer of the LaTeX-distribution $\"MiKTeX$\" will be launched.$\r$\n\ - To install the program press the $\"Next$\"-button in the installer windows until the installation begins.$\r$\n\ - $\r$\n\ - !!! Please use all default options of the MiKTeX-installer !!!' + To install the program press the $\"Next$\"-button in the installer windows until the installation begins.$\r$\n\ + $\r$\n\ + !!! Please use all default options of the MiKTeX-installer !!!' ${LangFileString} LatexError1 'No LaTeX-distribution could be found!$\r$\n\ - LyX cannot be used without a LaTeX-distribution like $\"MiKTeX$\"!$\r$\n\ - The installation will therefore be aborted.' + LyX cannot be used without a LaTeX-distribution like $\"MiKTeX$\"!$\r$\n\ + The installation will therefore be aborted.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' + You can use all default options of the JabRef-installer.' ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' + The installer will continue anyway.$\r$\n\ + Try to install JabRef again later.' #${LangFileString} LatexConfigInfo "The following configuration of LyX will take a while." #${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ -# it is necessary to set write permissions for all users to MiKTeX$\'s installation folder$\r$\n\ -# $MiKTeXPath $\r$\n\ -# and its subfolders." +# it is necessary to set write permissions for all users to MiKTeX$\'s installation folder$\r$\n\ +# $MiKTeXPath $\r$\n\ +# and its subfolders." ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ + before you use LyX for the first time.$\r$\n\ + Would you now check for MiKTeX updates?' ${LangFileString} ModifyingConfigureFailed "Could not set 'path_prefix' in the configure script" #${LangFileString} RunConfigureFailed "Could not execute the configure script" @@ -89,14 +89,14 @@ ${LangFileString} NewerInstalled "You are trying to install an older version of If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." #${LangFileString} FinishPageMessage "Congratulations! LyX has been installed successfully.$\r$\n\ -# $\r$\n\ -# (The first start of LyX might take some seconds.)" +# $\r$\n\ +# (The first start of LyX might take some seconds.)" ${LangFileString} FinishPageRun "Launch LyX" ${LangFileString} UnNotInRegistryLabel "Unable to find LyX in the registry.$\r$\n\ @@ -109,7 +109,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." ${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration$\r$\n\ - (folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for you or for all users (if you are admin).' + (folder $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for you or for all users (if you are admin).' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 8329f5c5bd..e4c281fbaa 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -10,7 +10,9 @@ Author: Jean-Pierre Chr ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installation pour l'utilisateur courant)" -${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA).$\r$\n$\r$\n$_CLICK" +${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA).$\r$\n + $\r$\n + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Mise jour de la base de donnes MiKTeX..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX (MiKTeX peut tlcharger les paquetages manquants, ceci peut prendre du temps) ..." @@ -31,71 +33,75 @@ ${LangFileString} SecInstJabRefDescription "Gestionnaire de r ${LangFileString} SecAllUsersDescription "Installer LyX pour tous les utilisateurs, ou seulement pour l'utilisateur courant ?." ${LangFileString} SecFileAssocDescription "Les fichiers de suffixe .lyx seront automatiquement ouverts dans LyX." ${LangFileString} SecDesktopDescription "Une icne LyX sur le bureau." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribution LaTeX' ${LangFileString} EnterLaTeXHeader2 'Choisir la distribution LaTeX que LyX devra utiliser.' ${LangFileString} EnterLaTeXFolder 'ventuellement, vous pouvez fixer ici le chemin d$\'accs au fichier $\"latex.exe$\" et de ce fait fixer \ - la distribution LaTeX utilise par Lyx.$\r$\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !$\r$\n\ - $\r$\n\ - L$\'assistant d$\'installation a dtect la distribution LaTeX \ - $\"$LaTeXName$\" sur votre systme. Le chemin d$\'accs est affich ci-dessous.' + la distribution LaTeX utilise par Lyx.$\r$\n\ + Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !$\r$\n\ + $\r$\n\ + L$\'assistant d$\'installation a dtect la distribution LaTeX \ + $\"$LaTeXName$\" sur votre systme. Le chemin d$\'accs est affich ci-dessous.' ${LangFileString} EnterLaTeXFolderNone 'Fixez ci-dessous le chemin d$\'accs au fichier $\"latex.exe$\". De ce fait vous fixez la \ - distribution LaTeX utilise par Lyx.$\r$\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !$\r$\n\ - $\r$\n\ - L$\'assistant d$\'installation n$\'a pas pu trouver de distribution LaTeX sur votre systme.' + distribution LaTeX utilise par Lyx.$\r$\n\ + Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !$\r$\n\ + $\r$\n\ + L$\'assistant d$\'installation n$\'a pas pu trouver de distribution LaTeX sur votre systme.' ${LangFileString} PathName 'Chemin vers le fichier $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "N'utilisez pas LaTeX" ${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" introuvable dans le chemin d$\'accs spcifi.' ${LangFileString} LatexInfo 'Lancement de l$\'installation de la distribution LaTeX $\"MiKTeX$\".$\r$\n\ - Pour installer l$\'application, appuyer sur le bouton $\"Next$\" de la fentre d$\'installation jusqu$\' ce que celle-ci commence.$\r$\n\ - $\r$\n\ - !!! Prenez garde utiliser toutes les options implicites du programme d$\'installation MikTeX !!!' + Pour installer l$\'application, appuyer sur le bouton $\"Next$\" de la fentre d$\'installation jusqu$\' ce que celle-ci commence.$\r$\n\ + $\r$\n\ + !!! Prenez garde utiliser toutes les options implicites du programme d$\'installation MikTeX !!!' ${LangFileString} LatexError1 'Distribution LaTeX introuvable !$\r$\n\ - LyX ne peut tre utilis sans distribution LaTeX, comme par exemple $\"MiKTeX$\" !$\r$\n\ - L$\'installation de LyX va donc tre abandonne.' + LyX ne peut tre utilis sans distribution LaTeX, comme par exemple $\"MiKTeX$\" !$\r$\n\ + L$\'installation de LyX va donc tre abandonne.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Lancement de l$\'installation de l$\'application $\"JabRef$\".$\r$\n\ - Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.' + Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.' ${LangFileString} JabRefError 'L$\'application $\"JabRef$\" n$\'a pas pu tre installe correctement !$\r$\n\ - L$\'installation de LyX va continuer.$\r$\n\ - Essayer d$\'installer JabRef de nouveau plus tard.' + L$\'installation de LyX va continuer.$\r$\n\ + Essayer d$\'installer JabRef de nouveau plus tard.' ${LangFileString} LatexConfigInfo "La configuration de LyX qui va suivre prendra un moment." ${LangFileString} MiKTeXPathInfo "Pour que chaque utilisateur soit capable de personnaliser MiKTeX pour ses besoins$\r$\n\ - il est ncessaire de positionner les permissions en criture dans le rpertoire d$\'installation de MiKTeX pour tous les utilisateurs$\r$\n\ - ($MiKTeXPath) $\r$\n\ - et pour ses sous-rpertoires." + il est ncessaire de positionner les permissions en criture dans le rpertoire d$\'installation de MiKTeX pour tous les utilisateurs$\r$\n\ + ($MiKTeXPath) $\r$\n\ + et pour ses sous-rpertoires." ${LangFileString} MiKTeXInfo 'La distribution LaTeX $\"MiKTeX$\" sera utilise par LyX.$\r$\n\ - Il est recommand d$\'installer les mises jour en utilisant l$\'application $\"MiKTeX Update Wizard$\"$\r$\n\ - avant d$\'utiliser LyX pour la premire fois.$\r$\n\ - Voulez-vous vrifier maintenant les mises jour de MiKTeX ?' + Il est recommand d$\'installer les mises jour en utilisant l$\'application $\"MiKTeX Update Wizard$\"$\r$\n\ + avant d$\'utiliser LyX pour la premire fois.$\r$\n\ + Voulez-vous vrifier maintenant les mises jour de MiKTeX ?' ${LangFileString} ModifyingConfigureFailed "chec de l'allocation 'path_prefix' lors de la configuration." ${LangFileString} RunConfigureFailed "chec de la tentative de configuration initiale de LyX." ${LangFileString} NotAdmin "Vous devez avoir les droits d'administration pour installer LyX !" ${LangFileString} InstallRunning "Le programme d'installation est toujours en cours !" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} est dj install ! Le dsinstaller d'abord." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Flicitations ! LyX est install avec succs.$\r$\n\ - $\r$\n\ - (Le premier dmarrage de LyX peut demander quelques secondes.)" + $\r$\n\ + (Le premier dmarrage de LyX peut demander quelques secondes.)" ${LangFileString} FinishPageRun "Dmarrer LyX" ${LangFileString} UnNotInRegistryLabel "LyX introuvable dans le base des registres.$\r$\n\ - Les raccourcis sur le bureau et dans le menu de dmarrage ne seront pas supprims." + Les raccourcis sur le bureau et dans le menu de dmarrage ne seront pas supprims." ${LangFileString} UnInstallRunning "Vous devez fermer LyX d'abord !" ${LangFileString} UnNotAdminLabel "Vous devez avoir les droits d'administration pour dsinstaller LyX !" ${LangFileString} UnReallyRemoveLabel "tes vous sr(e) de vouloir supprimer compltement LyX et tous ses composants ?" @@ -104,7 +110,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Pr ${LangFileString} SecUnMiKTeXDescription "Dsinstalle la distribution LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Supprime le rpertoire de configuration de LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - pour tous les utilisateurs.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + pour tous les utilisateurs.' ${LangFileString} SecUnProgramFilesDescription "Dsinstaller LyX et tous ses composants." diff --git a/development/Win32/packaging/installer/lang/galician.nsh b/development/Win32/packaging/installer/lang/galician.nsh index c46f12b2a0..f1a67c77fb 100644 --- a/development/Win32/packaging/installer/lang/galician.nsh +++ b/development/Win32/packaging/installer/lang/galician.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Este asistente vai-no guiar na instalacin do LyX no seu computador.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Xestor de refer ${LangFileString} SecAllUsersDescription "Instalar o LyX monousurio ou multiusurio." ${LangFileString} SecFileAssocDescription "Asociar a extensin .lyx co LyX." ${LangFileString} SecDesktopDescription "Cria un icone do LyX no ambiente de traballo." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuicin de LaTeX' ${LangFileString} EnterLaTeXHeader2 'Escolha a distribucin de LaTeX que vai usar o LyX.' ${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o camio do ficheiro $\"latex.exe$\" e posteriormente \ - escoller a distribuicin de LaTeX que vai usar o LyX.$\r$\n\ - Sen LaTeX o LyX non pode (pr-)imprimir os documentos!$\r$\n\ - $\r$\n\ - O instalador detectou a distribucin de LaTeX $\"$LaTeXName$\"\ - no seu sistema, no camio que se mostra abaixo.' + escoller a distribuicin de LaTeX que vai usar o LyX.$\r$\n\ + Sen LaTeX o LyX non pode (pr-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador detectou a distribucin de LaTeX $\"$LaTeXName$\"\ + no seu sistema, no camio que se mostra abaixo.' ${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o camio ao ficheiro $\"latex.exe$\". Posteriormente escolla \ - a distribucin de LaTeX que debe usar o LyX.$\r$\n\ - Sem LaTeX o LyX non pode (pr-)imprimir os documentos!$\r$\n\ - $\r$\n\ - O instalador non pudo achar nengunha distribucin de LaTeX no seu sistema.' + a distribucin de LaTeX que debe usar o LyX.$\r$\n\ + Sem LaTeX o LyX non pode (pr-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador non pudo achar nengunha distribucin de LaTeX no seu sistema.' ${LangFileString} PathName 'Camio ao ficheiro $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Non usar LaTeX" ${LangFileString} InvalidLaTeXFolder 'O ficheiro $\"latex.exe$\" non est no camio especificado.' ${LangFileString} LatexInfo 'Agora lanzar-se o instalador da distribucin de LaTeX $\"MiKTeX$\".$\r$\n\ - Para instalar o programa prema no botn $\"Prximo$\" na xanela de instalacin at a instalacin comezar.$\r$\n\ - $\r$\n\ - !!! Por favor use todas as opcins por defeito do instalador do MiKTeX !!!' + Para instalar o programa prema no botn $\"Prximo$\" na xanela de instalacin at a instalacin comezar.$\r$\n\ + $\r$\n\ + !!! Por favor use todas as opcins por defeito do instalador do MiKTeX !!!' ${LangFileString} LatexError1 'Non se achou nengunha distribucin de LaTeX!$\r$\n\ - Non se pode usar o LyX sen unha distribucin de LaTeX como a $\"MiKTeX$\"!$\r$\n\ - Por iso a instalacin vai ser abortada.' + Non se pode usar o LyX sen unha distribucin de LaTeX como a $\"MiKTeX$\"!$\r$\n\ + Por iso a instalacin vai ser abortada.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Agora lanzar-se o instalador do programa $\"JabRef$\".$\r$\n\ - Pode usar todas as opcins por defeito no instalador do JabRef.' + Pode usar todas as opcins por defeito no instalador do JabRef.' ${LangFileString} JabRefError 'Non se deu instalado o programa $\"JabRef$\"!$\r$\n\ - De todos os xeitos a instalacin do LyX continua.$\r$\n\ - Tente instalar mais adiante o JabRef.' + De todos os xeitos a instalacin do LyX continua.$\r$\n\ + Tente instalar mais adiante o JabRef.' ${LangFileString} LatexConfigInfo "A configuracin seguinte do LyX ir demorar un pouco." ${LangFileString} MiKTeXPathInfo "Para que cada usurio poda personalizar posteriormente o MiKTeX segundo as suas$\r$\n\ - necesidades, cumpre a pasta onde foi instalado o MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e as suas subpastas teren permiso de escritura para todos os usurios." + necesidades, cumpre a pasta onde foi instalado o MiKTeX$\r$\n\ + $MiKTeXPath $\r$\n\ + e as suas subpastas teren permiso de escritura para todos os usurios." ${LangFileString} MiKTeXInfo 'Xunto co LyX vai-se empregar a distribucin de LaTeX $\"MiKTeX$\".$\r$\n\ - Antes de usar o LyX pola primeira vez, recomenda-se instalar as actualizacins disponbeis$\r$\n\ - do MiKTeX co instalador $\"MiKTeX Update Wizard$\"$\r$\n\ - Desexa comprovar agora se ha actualizacins do MiKTeX?' + Antes de usar o LyX pola primeira vez, recomenda-se instalar as actualizacins disponbeis$\r$\n\ + do MiKTeX co instalador $\"MiKTeX Update Wizard$\"$\r$\n\ + Desexa comprovar agora se ha actualizacins do MiKTeX?' ${LangFileString} ModifyingConfigureFailed "Non se puido engadir o 'path_prefix' no script de configuracin" ${LangFileString} RunConfigureFailed "Non se deu executado o script de configuracin" ${LangFileString} NotAdmin "Precisa de privilxios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador xa est a correr!" ${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} xa est instalado! Desinstale o LyX primeiro." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Parabns! O LyX foi instalado con suceso.$\r$\n\ - $\r$\n\ - (O primeiro incio do LyX pode levar alguns segundos.)" + $\r$\n\ + (O primeiro incio do LyX pode levar alguns segundos.)" ${LangFileString} FinishPageRun "Lanzar o LyX" ${LangFileString} UnNotInRegistryLabel "Non se da achado o LyX no registo.$\r$\n\ - Non se eliminarn os atallos para o ambiente de traballo e no menu de Incio." + Non se eliminarn os atallos para o ambiente de traballo e no menu de Incio." ${LangFileString} UnInstallRunning "Debe fechar o LyX en primeiro lugar!" ${LangFileString} UnNotAdminLabel "Precisa de privilxios de administrador para desinstalar o LyX!" ${LangFileString} UnReallyRemoveLabel "Seguro que quer eliminar completamente o LyX e todos os seus componentes?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Prefer ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribucin de LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Desinstala o xestor de referncias bibliogrficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina as pastas de configuracin do LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - de todos os usurios.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + de todos os usurios.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todos os seus componentes." diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index 1433651319..ad64b7510f 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -54,11 +54,11 @@ ${LangFileString} DontUseLaTeX "Kein LaTeX benutzen" ${LangFileString} InvalidLaTeXFolder 'Kann die Datei $\"latex.exe$\" nicht finden.' ${LangFileString} LatexInfo 'Als Nchstes wird der Installer der LaTeX-Distribution $\"MiKTeX$\" gestartet.$\r$\n\ - Um das Programm zu installieren, drcken Sie den $\"Weiter$\"-Knopf in den Installerfenstern bis die Installation beginnt.$\r$\n\ - $\r$\n\ - !!! Bitte verwenden Sie alle voreingestellten Optionen des MiKTeX-Installers !!!' + Um das Programm zu installieren, drcken Sie den $\"Weiter$\"-Knopf in den Installerfenstern bis die Installation beginnt.$\r$\n\ + $\r$\n\ + !!! Bitte verwenden Sie alle voreingestellten Optionen des MiKTeX-Installers !!!' ${LangFileString} LatexError1 'Es konnte keine LaTeX-Distribution gefunden werden!$\r$\n\ - LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\ + LyX kann ohne eine LaTeX-Distribution wie z.B. $\"MiKTeX$\" nicht benutzt werden!$\r$\n\ Die Installation wird daher abgebrochen.' ${LangFileString} HunspellFailed 'Herunterladen des Wrterbuchs fr Sprache $\"$R3$\" fehlgeschlagen.' @@ -90,18 +90,18 @@ ${LangFileString} NewerInstalled "Sie versuchen eine Vesion von LyX zu installie Wenn Sie das wirklich wollen, mssen Sie erst das existierende LyX $OldVersionNumber deinstallieren." ${LangFileString} MultipleIndexesNotAvailable "Die Untersttzung fr mehrere Indexe in einem Dokument wird nicht verfgbar sein, denn$\r$\n\ - MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese." + MiKTeX wurde mit Administratorrechten installiert aber Sie installieren LyX ohne diese." ${LangFileString} MetafileNotAvailable "Die LyX Untersttzung fr Bilder im Format EMF oder WMF wird nicht verfgbar$\r$\n\ sein, denn dafr msste ein Software-Drucker fr Windows installiert werden,$\r$\n\ was jedoch nur mit Administratorrechten mglich ist." #${LangFileString} FinishPageMessage "Glckwunsch! LyX wurde erfolgreich installiert.$\r$\n\ -# $\r$\n\ -# (Der erste Start von LyX kann etwas lnger dauern.)" +# $\r$\n\ +# (Der erste Start von LyX kann etwas lnger dauern.)" ${LangFileString} FinishPageRun "LyX starten" ${LangFileString} UnNotInRegistryLabel "Kann LyX nicht in der Registry finden.$\r$\n\ - Desktopsymbole und Eintrge im Startmen knnen nicht entfernt werden." + Desktopsymbole und Eintrge im Startmen knnen nicht entfernt werden." ${LangFileString} UnInstallRunning "Sie mssen LyX zuerst beenden!" ${LangFileString} UnNotAdminLabel "Sie bentigen Administratorrechte um LyX zu deinstallieren!" ${LangFileString} UnReallyRemoveLabel "Sind Sie sicher, dass sie LyX und all seine Komponenten deinstallieren mchten?" diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh b/development/Win32/packaging/installer/lang/hungarian.nsh index 2167b57a90..e7b1efe989 100644 --- a/development/Win32/packaging/installer/lang/hungarian.nsh +++ b/development/Win32/packaging/installer/lang/hungarian.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "A varzsl segtsgvel tudja telepteni a LyX-et.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Irodalomjegyz ${LangFileString} SecAllUsersDescription "Minden felhasznlnak teleptsem vagy csak az aktulisnak?" ${LangFileString} SecFileAssocDescription "A .lyx kiterjesztssel rendelkez fjlok megnyitsa automatikusan a LyX-el trtnjen." ${LangFileString} SecDesktopDescription "LyX-ikon elhelyezse az asztalon." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-disztribci' ${LangFileString} EnterLaTeXHeader2 'Adja meg a LaTeX-disztribcit, amit a LyX-nek hasznlnia kell.' ${LangFileString} EnterLaTeXFolder 'Itt megadhatja az elrsi tvonalat a $\"latex.exe$\" fjlhoz s ezzel meg is adja \ - melyik LaTeX disztribcit fogja hasznlni a LyX.$\r$\n\ - Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!$\r$\n\ - $\r$\n\ - A telept megtallta az n szmtgpn a \ - $\"$LaTeXName$\" disztribcit. Lent lthatja az elrsi tvonalt.' + melyik LaTeX disztribcit fogja hasznlni a LyX.$\r$\n\ + Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!$\r$\n\ + $\r$\n\ + A telept megtallta az n szmtgpn a \ + $\"$LaTeXName$\" disztribcit. Lent lthatja az elrsi tvonalt.' ${LangFileString} EnterLaTeXFolderNone 'Adja meg a hasznland $\"latex.exe$\" fjl elrsi tvonalt. Ezzel azt is megadja \ - melyik LaTeX disztribcit fogja hasznlni a LyX.$\r$\n\ - Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!$\r$\n\ - $\r$\n\ - A telept nem tallt a szmtgpn LaTeX disztribcit!' + melyik LaTeX disztribcit fogja hasznlni a LyX.$\r$\n\ + Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!$\r$\n\ + $\r$\n\ + A telept nem tallt a szmtgpn LaTeX disztribcit!' ${LangFileString} PathName 'A $\"latex.exe$\" fjl elrsi tja' ${LangFileString} DontUseLaTeX "Ne hasznlja a LaTeX-et" ${LangFileString} InvalidLaTeXFolder 'Nem tallom a $\"latex.exe$\" fjlt, a megadott helyen.' ${LangFileString} LatexInfo 'A $\"MiKteX$\" LaTeX-disztribci teleptjnek indtsa kvetkezik.$\r$\n\ - A program teleptshez addig nyomkodja a $\"Kvetkez$\" gombot a telept ablakban, amg a telepts el nem kezd?dik.$\r$\n\ - $\r$\n\ - !!! Krem hasznlja a MikTeX-telept alaprtelmezett opciit!!!' + A program teleptshez addig nyomkodja a $\"Kvetkez$\" gombot a telept ablakban, amg a telepts el nem kezd?dik.$\r$\n\ + $\r$\n\ + !!! Krem hasznlja a MikTeX-telept alaprtelmezett opciit!!!' ${LangFileString} LatexError1 'Nem talltam LaTeX-disztribcit!$\r$\n\ - A LyX nem hasznlhat egy LaTeX-disztibci nlkl,(mint pldul a $\"MiKTeX$\")!$\r$\n\ - Ezrt a telepts nem folytathat!' + A LyX nem hasznlhat egy LaTeX-disztibci nlkl,(mint pldul a $\"MiKTeX$\")!$\r$\n\ + Ezrt a telepts nem folytathat!' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'A $\"JabRef$\" teleptjnek elindtsa kvetkezik.$\r$\n\ - Hasznlhatja az alaprtelmezett opcikat.' + Hasznlhatja az alaprtelmezett opcikat.' ${LangFileString} JabRefError 'Nem tudom telepteni a $\"JabRef$\" programot!$\r$\n\ - Azonban a telepts tovbb fog folytatdni.$\r$\n\ - Ksbb prblja meg jra telepteni a JabRef-et.' + Azonban a telepts tovbb fog folytatdni.$\r$\n\ + Ksbb prblja meg jra telepteni a JabRef-et.' ${LangFileString} LatexConfigInfo "A LyX telepts utni belltsa hossz idt vehet ignybe." ${LangFileString} MiKTeXPathInfo "Ahhoz, hogy a tbbi felhasznl is testre tudja hasznlni a MiKTeX-et$\r$\n\ - rs jogot kell adni minden felhasznl rszre a MiKTeX alknyvtrhoz.$\r$\n\ - A $MiKTeXPath $\r$\n\ - valamint alknyvtraihoz." + rs jogot kell adni minden felhasznl rszre a MiKTeX alknyvtrhoz.$\r$\n\ + A $MiKTeXPath $\r$\n\ + valamint alknyvtraihoz." ${LangFileString} MiKTeXInfo 'A $\"MiKTeX$\" LaTeX-disztibci lesz hasznlva a LyX ltal.$\r$\n\ - Javasolt telepteni a MiKTeX frisstseket a $\"MiKTeX Update Wizard$\" segtsgvel,$\r$\n\ - a LyX els indtsa eltt.$\r$\n\ - Szeretn ellenrizni a frisstseket most?' + Javasolt telepteni a MiKTeX frisstseket a $\"MiKTeX Update Wizard$\" segtsgvel,$\r$\n\ + a LyX els indtsa eltt.$\r$\n\ + Szeretn ellenrizni a frisstseket most?' ${LangFileString} ModifyingConfigureFailed "Nem tudom belltani a 'path_prefix'-et a configure parancsfjlban!" ${LangFileString} RunConfigureFailed "Nem tudom vgrehajtani a configure parancsfjlt!" ${LangFileString} NotAdmin "A LyX teleptshez rendszergazdai jogok szksgesek!" ${LangFileString} InstallRunning "A telept mr fut!" ${LangFileString} StillInstalled "A LyX ${APP_SERIES_KEY2} mr teleptve van! Elszr tvoltsa el a rgit." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gratullok! Sikeresen teleptette a LyX-et.$\r$\n\ - $\r$\n\ - (Az program els indtsa egy kis idt vehet ignybe...)" + $\r$\n\ + (Az program els indtsa egy kis idt vehet ignybe...)" ${LangFileString} FinishPageRun "LyX indtsa" ${LangFileString} UnNotInRegistryLabel "Nem tallom a LyX-et a regisztriben.$\r$\n\ - Az Asztalon s a Start Menben tallhat parancsikonok nem lesznek eltvoltva!." + Az Asztalon s a Start Menben tallhat parancsikonok nem lesznek eltvoltva!." ${LangFileString} UnInstallRunning "Elszr be kell zrnia a LyX-et!" ${LangFileString} UnNotAdminLabel "A LyX eltvoltshoz rendszergazdai jogokkal kell rendelkeznie!" ${LangFileString} UnReallyRemoveLabel "Biztosan abban, hogy el akarja tvoltani a LyX-t, minden tartozkval egytt?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX felhaszn ${LangFileString} SecUnMiKTeXDescription "MikTeX LaTeX-disztibci eltvoltsa." ${LangFileString} SecUnJabRefDescription "JabRef irodalomjegyzk kezel eltvoltsa." ${LangFileString} SecUnPreferencesDescription 'A LyX belltsok mappa trlse$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - minden felhasznlnl.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + minden felhasznlnl.' ${LangFileString} SecUnProgramFilesDescription "A LyX s minden komponensnek eltvoltsa." diff --git a/development/Win32/packaging/installer/lang/indonesian.nsh b/development/Win32/packaging/installer/lang/indonesian.nsh index b1a553fcf3..4b3edfd9f4 100644 --- a/development/Win32/packaging/installer/lang/indonesian.nsh +++ b/development/Win32/packaging/installer/lang/indonesian.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Program ini akan memandu anda dalam melakukan instalasi LyX.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Program manajemen acuan bibliografi ${LangFileString} SecAllUsersDescription "Instal LyX untuk semua pengguna atau hanya untuk pengguna ini saja." ${LangFileString} SecFileAssocDescription "Berkas dengan ekstensi .lyx akan otomatis dibuka menggunakan LyX." ${LangFileString} SecDesktopDescription "Ikon LyX muncul di desktop." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribusi LaTeX' ${LangFileString} EnterLaTeXHeader2 'Pengaturan distribusi LaTeX yang akan digunakan dalam LyX.' ${LangFileString} EnterLaTeXFolder 'Anda dapat mengatur sendiri lokasi tempat berkas $\"latex.exe$\" berada dan mengatur lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ - $\r$\n\ - Program instalasi ini mendeteksi adanya distribusi LaTeX \ - $\"$LaTeXName$\" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.' + tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ + Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ + $\r$\n\ + Program instalasi ini mendeteksi adanya distribusi LaTeX \ + $\"$LaTeXName$\" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.' ${LangFileString} EnterLaTeXFolderNone 'Aturlah lokasi tempat berkas $\"latex.exe$\" berada. Atur dan nyatakanlah lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ - $\r$\n\ - Program instalasi ini tidak menemukan adanya distribusi LaTeX di sistem anda.' + tempat distribusi LaTeX yang akan digunakan oleh LyX.$\r$\n\ + Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!$\r$\n\ + $\r$\n\ + Program instalasi ini tidak menemukan adanya distribusi LaTeX di sistem anda.' ${LangFileString} PathName 'Lokasi tempat berkas $\"latex.exe$\" berada' ${LangFileString} DontUseLaTeX "Tidak menggunakan LaTeX" ${LangFileString} InvalidLaTeXFolder 'Berkas $\"latex.exe$\" tidak berada di lokasi tempat yang dinyatakan.' ${LangFileString} LatexInfo 'Sekarang instalasi program distribusi LaTeX $\"MiKTeX$\" akan dijalankan.$\r$\n\ - Untuk meneruskan tekanlah tombol $\"Lanjut$\" yang ada di jendela dan tunggu sampai instalasi dimulai.$\r$\n\ - $\r$\n\ - !!! Gunakan semua pilihan default pada program instalasi MiKTeX !!!' + Untuk meneruskan tekanlah tombol $\"Lanjut$\" yang ada di jendela dan tunggu sampai instalasi dimulai.$\r$\n\ + $\r$\n\ + !!! Gunakan semua pilihan default pada program instalasi MiKTeX !!!' ${LangFileString} LatexError1 'Distribusi LaTeX tidak ditemukan!$\r$\n\ - LyX tidak bisa digunakan tanpa menggunakan salah satu distribusi LaTeX seperti $\"MiKTeX$\"!$\r$\n\ - Oleh karena itu proses instalasi dibatalkan.' + LyX tidak bisa digunakan tanpa menggunakan salah satu distribusi LaTeX seperti $\"MiKTeX$\"!$\r$\n\ + Oleh karena itu proses instalasi dibatalkan.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Sekarang instalasi program $\"JabRef$\" akan dijalankan.$\r$\n\ - Anda boleh memilih semua pilihan default yang ada di program instalasi JabRef.' + Anda boleh memilih semua pilihan default yang ada di program instalasi JabRef.' ${LangFileString} JabRefError 'Program $\"JabRef$\" tidak berhasil diinstal secara keseluruhan!$\r$\n\ - Namun proses instalasi dapat diteruskan.$\r$\n\ - Anda dapat mengulang instalasi JabRef nanti.' + Namun proses instalasi dapat diteruskan.$\r$\n\ + Anda dapat mengulang instalasi JabRef nanti.' ${LangFileString} LatexConfigInfo "Proses konfigurasi LyX selanjutnya akan memerlukan waktu beberapa saat." ${LangFileString} MiKTeXPathInfo "Agar memungkinkan semua pengguna dapat mengatur MiKTeX sesuai keinginannya$\r$\n\ - anda perlu memberikan hak merubah untuk semua pengguna pada lokasi instalasi MiKTeX yaitu folder$\r$\n\ - $MiKTeXPath $\r$\n\ - serta di semua subfoldernya." + anda perlu memberikan hak merubah untuk semua pengguna pada lokasi instalasi MiKTeX yaitu folder$\r$\n\ + $MiKTeXPath $\r$\n\ + serta di semua subfoldernya." ${LangFileString} MiKTeXInfo 'Distribusi LaTeX $\"MiKTeX$\" akan digunakan dengan LyX.$\r$\n\ - Sangat disarankan memperbarui program yang ada di MiKTeX menggunakan $\"MiKTeX Update Wizard$\"$\r$\n\ - sebelum anda menggunakan LyX untuk yang pertama kali.$\r$\n\ - Apakah anda akan memeriksa perlunya memperbarui MikTeX?' + Sangat disarankan memperbarui program yang ada di MiKTeX menggunakan $\"MiKTeX Update Wizard$\"$\r$\n\ + sebelum anda menggunakan LyX untuk yang pertama kali.$\r$\n\ + Apakah anda akan memeriksa perlunya memperbarui MikTeX?' ${LangFileString} ModifyingConfigureFailed "Tidak bisa menyatakan 'path_prefix' pada skrip configure" ${LangFileString} RunConfigureFailed "Tidak bisa menjalankan skrip configure" ${LangFileString} NotAdmin "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!" ${LangFileString} InstallRunning "Program instalasi sedang berjalan!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Selamat! LyX berhasil diinstal dengan sukses.$\r$\n\ - $\r$\n\ - (Menjalankan LyX untuk pertama kali memerlukan waktu beberapa detik.)" + $\r$\n\ + (Menjalankan LyX untuk pertama kali memerlukan waktu beberapa detik.)" ${LangFileString} FinishPageRun "Menjalankan LyX" ${LangFileString} UnNotInRegistryLabel "Tidak bisa menemukan LyX di catatan registry.$\r$\n\ - Shortcuts pada desktop dan yang ada di Menu Start tidak dihapus." + Shortcuts pada desktop dan yang ada di Menu Start tidak dihapus." ${LangFileString} UnInstallRunning "Anda harus menutup LyX terlebih dahulu!" ${LangFileString} UnNotAdminLabel "Anda harus berlaku dan mempunyai hak sebagai administrator untuk menghapus LyX!" ${LangFileString} UnReallyRemoveLabel "Apakah anda yakin akan menghapus LyX secara menyeluruh termasuk semua komponen yang ada?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferensi pengguna LyX' ${LangFileString} SecUnMiKTeXDescription "Penghapusan distribusi LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Penghapusan program manajemen bibliografi JabRef." ${LangFileString} SecUnPreferencesDescription 'Menghapus berkas konfigurasi LyX pada folder$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - untuk semua pengguna.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + untuk semua pengguna.' ${LangFileString} SecUnProgramFilesDescription "Penghapusan LyX serta semua komponen yang ada." diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh index aac390201f..869aecf418 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/lang/italian.nsh @@ -10,7 +10,9 @@ Author: Enrico Forestieri ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" -${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)$\r$\n$\r$\n$_CLICK" +${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)$\r$\n + $\r$\n + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -31,71 +33,75 @@ ${LangFileString} SecInstJabRefDescription "Gestore dei riferimenti bibliografic ${LangFileString} SecAllUsersDescription "Installazione LyX per tutti gli utenti o solo per l'utente attuale." ${LangFileString} SecFileAssocDescription "Associa i files con estensione .lyx al programma LyX." ${LangFileString} SecDesktopDescription "Icona LyX sul desktop." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuzione di LaTeX' ${LangFileString} EnterLaTeXHeader2 'Scegliere la distribuzione di LaTeX che LyX dovr usare.' ${LangFileString} EnterLaTeXFolder 'Puoi impostare qui il percorso del file $\"latex.exe$\" e impostare di conseguenza \ - la distribuzione di LaTeX che LyX dovr usare.$\r$\n\ - Senza LaTeX, LyX non pu generare documenti!$\r$\n\ - $\r$\n\ - Il programma di installazione ha rilevato la distribuzione di LaTeX \ - $\"$LaTeXName$\" sul tuo sistema. Il suo percorso riportato sotto.' + la distribuzione di LaTeX che LyX dovr usare.$\r$\n\ + Senza LaTeX, LyX non pu generare documenti!$\r$\n\ + $\r$\n\ + Il programma di installazione ha rilevato la distribuzione di LaTeX \ + $\"$LaTeXName$\" sul tuo sistema. Il suo percorso riportato sotto.' ${LangFileString} EnterLaTeXFolderNone 'Imposta qui sotto il percorso del file $\"latex.exe$\". Con questo imposti quale \ - distribuzione di LaTeX dovr essere usata da LyX.$\r$\n\ - Senza LaTeX, LyX non pu generare documenti!$\r$\n\ - $\r$\n\ - Il programma di installazione non ha trovato una distribuzione di LaTeX sul tuo sistema.' + distribuzione di LaTeX dovr essere usata da LyX.$\r$\n\ + Senza LaTeX, LyX non pu generare documenti!$\r$\n\ + $\r$\n\ + Il programma di installazione non ha trovato una distribuzione di LaTeX sul tuo sistema.' ${LangFileString} PathName 'Percorso del file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Non usare LaTeX" ${LangFileString} InvalidLaTeXFolder 'Il file $\"latex.exe$\" non nel percorso indicato.' ${LangFileString} LatexInfo 'Verr adesso lanciato il programma di installazione della distribuzione di LateX $\"MiKTeX$\".$\r$\n\ - Per installare il programma premere $\"Next$\" nelle finestre di installazione fino all$\'avvio dell$\'installazione.$\r$\n\ - $\r$\n\ - !!! Lasciare le impostazioni di default suggerite dal programma di installazione di $\"MiKTeX$\" !!!' + Per installare il programma premere $\"Next$\" nelle finestre di installazione fino all$\'avvio dell$\'installazione.$\r$\n\ + $\r$\n\ + !!! Lasciare le impostazioni di default suggerite dal programma di installazione di $\"MiKTeX$\" !!!' ${LangFileString} LatexError1 'Il programma non ha rilevato la presenza di alcuna distribuzione valida di LaTeX!$\r$\n\ - LyX non pu funzionare senza una distribuzione LaTeX (ad es. $\"MiKTeX$\")!$\r$\n\ - Il processo di installazione verr quindi terminato.' + LyX non pu funzionare senza una distribuzione LaTeX (ad es. $\"MiKTeX$\")!$\r$\n\ + Il processo di installazione verr quindi terminato.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Verr adesso lanciato il programma di installazione di $\"JabRef$\".$\r$\n\ - Puoi usare tutte le opzioni predefinite per il programma di installazione di JabRef.' + Puoi usare tutte le opzioni predefinite per il programma di installazione di JabRef.' ${LangFileString} JabRefError 'Il programma $\"JabRef$\" non stato installato correttamente!$\r$\n\ - L$\'installazione pu comunque proseguire.$\r$\n\ - Si consiglia di tentare nuovamente l$\'installazione di JabRef al termine.' + L$\'installazione pu comunque proseguire.$\r$\n\ + Si consiglia di tentare nuovamente l$\'installazione di JabRef al termine.' ${LangFileString} LatexConfigInfo "La seguente configurazione di LyX richieder un po' di tempo." ${LangFileString} MiKTeXPathInfo "Per permettere a tutti gli utenti di personalizzare successivamente MiKTeX in base alle loro esigenze$\r$\n\ - necessario impostare i permessi di scrittura per tutti gli utenti alla cartella di installazione di MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e alle sue sottocartelle." + necessario impostare i permessi di scrittura per tutti gli utenti alla cartella di installazione di MiKTeX$\r$\n\ + $MiKTeXPath $\r$\n\ + e alle sue sottocartelle." ${LangFileString} MiKTeXInfo 'La distribuzione di LaTeX $\"MiKTeX$\" verr usata insieme a LyX.$\r$\n\ - Si raccomanda di installare gli aggiornamenti disponibili per MiKTeX utilizzando il programma $\"MiKTeX Update Wizard$\"$\r$\n\ - prima di usare LyX per la prima volta.$\r$\n\ - Vuoi controllare ora la presenza di aggiornamenti per MiKTeX?' + Si raccomanda di installare gli aggiornamenti disponibili per MiKTeX utilizzando il programma $\"MiKTeX Update Wizard$\"$\r$\n\ + prima di usare LyX per la prima volta.$\r$\n\ + Vuoi controllare ora la presenza di aggiornamenti per MiKTeX?' ${LangFileString} ModifyingConfigureFailed "Fallito tentativo di aggiornare 'path_prefix' nello script di configurazione" ${LangFileString} RunConfigureFailed "Fallito tentativo di eseguire lo script di configurazione" ${LangFileString} NotAdmin "Occorrono i privilegi da amministratore per installare LyX!" ${LangFileString} InstallRunning "Il programma di installazione gi in esecuzione!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} gi installato! Occorre rimuoverlo per poter procedere." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Congratulazioni! LyX stato installato con successo.$\r$\n\ - $\r$\n\ - (Il primo avvio di LyX potrebbe richiedere qualche secondo in pi.)" + $\r$\n\ + (Il primo avvio di LyX potrebbe richiedere qualche secondo in pi.)" ${LangFileString} FinishPageRun "Lancia LyX" ${LangFileString} UnNotInRegistryLabel "Non riesco a trovare LyX nel registro.$\r$\n\ - I collegamenti sul desktop e nel menu Start non saranno rimossi." + I collegamenti sul desktop e nel menu Start non saranno rimossi." ${LangFileString} UnInstallRunning " necessario chiudere LyX!" ${LangFileString} UnNotAdminLabel "Occorrono i privilegi da amministratore per rimuovere LyX!" ${LangFileString} UnReallyRemoveLabel "Siete sicuri di voler rimuovere completamente LyX e tutti i suoi componenti?" @@ -104,7 +110,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Impostazioni personali di LyX' ${LangFileString} SecUnMiKTeXDescription 'Rimuove la distribuzione di LaTeX $\"MiKTeX$\".' ${LangFileString} SecUnJabRefDescription "Rimuove il gestore della bibliografia JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina la cartella con la configurazione di LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - per tutti gli utenti.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + per tutti gli utenti.' ${LangFileString} SecUnProgramFilesDescription "Rimuove LyX e tutti i suoi componenti." diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh index 6f8a46cc31..341964449b 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/lang/japanese.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "̃EBU[hAȂLyXCXg[Ԃ̂ē܂B$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,47 +25,49 @@ ${LangFileString} SecInstJabRefDescription " ${LangFileString} SecAllUsersDescription "LyXׂẴ[U[pɑ邩Ã݂[U[ɑ邩B" ${LangFileString} SecFileAssocDescription "gq.lyx̃t@C͎ILyXŊJB" ${LangFileString} SecDesktopDescription "fXNgbvLyXACRB" +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeXfBXgr[V' ${LangFileString} EnterLaTeXHeader2 'LyXgׂLaTeXfBXgr[Vw肵ĂB' ${LangFileString} EnterLaTeXFolder 'ł́A$\"latex.exe$\"t@Cւ̃pXw肷邱Ƃł܂B邱ƂɂāA\ - LyXgpׂLaTeXfBXgr[Vw肷邱Ƃł܂B$\r$\n\ - LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ - $\r$\n\ - CXg[[́AVXeLaTeXfBXgr[VƂ\ - $\"$LaTeXName$\"邱Ƃo܂Bɂ͂̃pX\Ă܂B' + LyXgpׂLaTeXfBXgr[Vw肷邱Ƃł܂B$\r$\n\ + LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ + $\r$\n\ + CXg[[́AVXeLaTeXfBXgr[VƂ\ + $\"$LaTeXName$\"邱Ƃo܂Bɂ͂̃pX\Ă܂B' ${LangFileString} EnterLaTeXFolderNone '$\"latex.exe$\"t@Cւ̃pXw肵ĂB邱ƂɂāA\ - LyXǂLaTeXfBXgr[Vgpׂw肷邱Ƃł܂B$\r$\n\ - LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ - $\r$\n\ - CXg[[́AVXeLaTeXfBXgr[V‚邱Ƃł܂łB' + LyXǂLaTeXfBXgr[Vgpׂw肷邱Ƃł܂B$\r$\n\ + LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ + $\r$\n\ + CXg[[́AVXeLaTeXfBXgr[V‚邱Ƃł܂łB' ${LangFileString} PathName '$\"latex.exe$\"t@Cւ̃pX' ${LangFileString} DontUseLaTeX "LaTeXgpȂ" ${LangFileString} InvalidLaTeXFolder 'w肳ꂽpX$\"latex.exe$\"t@C‚܂B' ${LangFileString} LatexInfo 'ꂩLaTeXfBXgr[V$\"MiKTeX$\"̃CXg[[N܂B$\r$\n\ - vOCXg[ɂ́ACXg[n܂܂ŃCXg[[̃EBhEɂ$\"Next$\"{^ĂB$\r$\n\ - $\r$\n\ - IIIׂMiKTeXCXg[[̃ftHgIvVɏ]ĂBIII' + vOCXg[ɂ́ACXg[n܂܂ŃCXg[[̃EBhEɂ$\"Next$\"{^ĂB$\r$\n\ + $\r$\n\ + IIIׂMiKTeXCXg[[̃ftHgIvVɏ]ĂBIII' ${LangFileString} LatexError1 'LaTeXfBXgr[V𔭌邱Ƃł܂łI$\r$\n\ - LyX́A$\"MiKTeX$\"̂悤LaTeXfBXgr[VȂł͎gƂł܂I$\r$\n\ - ăCXg[͒~܂B' + LyX́A$\"MiKTeX$\"̂悤LaTeXfBXgr[VȂł͎gƂł܂I$\r$\n\ + ăCXg[͒~܂B' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'ꂩvO$\"JabRef$\"̃CXg[[N܂B$\r$\n\ - JabRefCXg[[̃ftHg̃IvVׂĎ󂯓Ă܂܂B' + JabRefCXg[[̃ftHg̃IvVׂĎ󂯓Ă܂܂B' ${LangFileString} JabRefError 'vO$\"JabRef$\"͐CXg[܂łI$\r$\n\ - CXg[[́AƂ肠̂܂܃CXg[𑱂܂B$\r$\n\ - JabRef̃CXg[ēx݂ĂB' + CXg[[́AƂ肠̂܂܃CXg[𑱂܂B$\r$\n\ + JabRef̃CXg[ēx݂ĂB' ${LangFileString} LatexConfigInfo "ȉLyX̐ݒɂ͏XԂ܂B" ${LangFileString} MiKTeXPathInfo "ׂẴ[U[ŕKvɉMiKTeX$\r$\n\ - JX^}CYł悤ɁAMiKTeX̃CXg[tH_$\r$\n\ - $MiKTeXPath $\r$\n\ - Ƃ̉ʃtH_̏݌AׂẴ[U[ɗ^Kv܂B" + JX^}CYł悤ɁAMiKTeX̃CXg[tH_$\r$\n\ + $MiKTeXPath $\r$\n\ + Ƃ̉ʃtH_̏݌AׂẴ[U[ɗ^Kv܂B" ${LangFileString} MiKTeXInfo 'LyXƂƂɁALaTeXfBXgr[V$\"MiKTeX$\"p܂B$\r$\n\ LyX߂ĎgOɁA$\"MiKTeXXVEBU[h$\"vOgāA$\r$\n\ p”\MiKTeXXVCXg[Ƃ𐄏܂B$\r$\n\ @@ -76,20 +78,22 @@ ${LangFileString} RunConfigureFailed "configure ${LangFileString} NotAdmin "LyXCXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" ${LangFileString} InstallRunning "CXg[[͊ɓĂ܂I" ${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}͊ɃCXg[Ă܂ILyXACXg[ĂB" +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "߂łƂ܂ILyX܂B$\r$\n\ - $\r$\n\ - iLyX̋Nɂ͎Ԃ܂Bj" + $\r$\n\ + LyX̋Nɂ͎Ԃ܂Bj" ${LangFileString} FinishPageRun "LyXN" ${LangFileString} UnNotInRegistryLabel "WXgLyX܂B$\r$\n\ - fXNgbvƃX^[gj[̃V[gJbg͍폜܂B" + fXNgbvƃX^[gj[̃V[gJbg͍폜܂B" ${LangFileString} UnInstallRunning "܂LyX‚ĂI" ${LangFileString} UnNotAdminLabel "LyXACXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" ${LangFileString} UnReallyRemoveLabel "{ɁALyXƂׂĂ̕R|[lg폜Ă܂ςłH" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX ${LangFileString} SecUnMiKTeXDescription "LaTeXfBXgr[VMiKTeXE܂B" ${LangFileString} SecUnJabRefDescription "}l[W[JabRefE܂B" ${LangFileString} SecUnPreferencesDescription '[U[ʂLyX̐ݒtH_$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - 폜܂B' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + 폜܂B' ${LangFileString} SecUnProgramFilesDescription "LyXƂׂĂ̕R|[lgE܂B" diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh index 199a92b7f0..a084a00022 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/lang/norwegian.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Denne veiviseren installerer LyX p datamaskinen din.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e ${LangFileString} SecAllUsersDescription "Installere LyX for alle brukere, eller kun den aktuelle brukeren." ${LangFileString} SecFileAssocDescription "Files med endelsen .lyx pnes automatisk i LyX." ${LangFileString} SecDesktopDescription "Et LyX-ikon p skrivebordet." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribusjon' ${LangFileString} EnterLaTeXHeader2 'Velg LaTeX-distribusjonen LyX skal bruke.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer has detected the LaTeX-distribution \ + $\"$LaTeXName$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Ikke bruk LaTeX" ${LangFileString} InvalidLaTeXFolder 'Filen $\"latex.exe$\" fins ikke i den oppgitte mappa.' ${LangFileString} LatexInfo 'N starter installasjon av LaTeX-distribusjonen $\"MiKTeX$\"$\r$\n\ - For installere programmet, klikk $\"Neste$\"-knappen i installasjonsveiviseren til installasjonen begynner.$\r$\n\ - $\r$\n\ - !!! Vennligst bruk standardopsjonene for MiKTeX-instasjonen !!!' + For installere programmet, klikk $\"Neste$\"-knappen i installasjonsveiviseren til installasjonen begynner.$\r$\n\ + $\r$\n\ + !!! Vennligst bruk standardopsjonene for MiKTeX-instasjonen !!!' ${LangFileString} LatexError1 'Fant ikke noen LaTeX-distribusjon!$\r$\n\ - LyX kan ikke brukes uten en LaTeX-distribusjion som $\"MiKTeX$\"!$\r$\n\ - Derfor avbrytes installasjonen.' + LyX kan ikke brukes uten en LaTeX-distribusjion som $\"MiKTeX$\"!$\r$\n\ + Derfor avbrytes installasjonen.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' + You can use all default options of the JabRef-installer.' ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' + The installer will continue anyway.$\r$\n\ + Try to install JabRef again later.' ${LangFileString} LatexConfigInfo "Konfigurasjon av LyX vil ta en stund." ${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." + it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ + $MiKTeXPath $\r$\n\ + and its subfolders." ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ + before you use LyX for the first time.$\r$\n\ + Would you now check for MiKTeX updates?' ${LangFileString} ModifyingConfigureFailed "Forsket p stille inn 'path_prefix' i konfigurasjonsscriptet mislyktes" ${LangFileString} RunConfigureFailed "Fikk ikke kjrt konfigurasjonsscriptet" ${LangFileString} NotAdmin "Du trenger administratorrettigheter for installere LyX!" ${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installert! Fjern LyX frst." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gratulerer!! LyX er installert.$\r$\n\ - $\r$\n\ - (Frste gangs oppstart av LyX kan ta noen sekunder.)" + $\r$\n\ + (Frste gangs oppstart av LyX kan ta noen sekunder.)" ${LangFileString} FinishPageRun "Start LyX" ${LangFileString} UnNotInRegistryLabel "Fant ikke LyX i registeret.$\r$\n\ - Snarveier p skrivebordet og i startmenyen fjernes ikke." + Snarveier p skrivebordet og i startmenyen fjernes ikke." ${LangFileString} UnInstallRunning "Du m avslutte LyX frst!" ${LangFileString} UnNotAdminLabel "Du m ha administratorrettigheter for fjerne LyX!" ${LangFileString} UnReallyRemoveLabel "Er du sikker p at du vil fjerne LyX og alle tilhrende komponenter?" diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh index 021a0a8442..39c1b3161f 100644 --- a/development/Win32/packaging/installer/lang/polish.nsh +++ b/development/Win32/packaging/installer/lang/polish.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Kreator przeprowadzi Ciebie przez proces instalacji LyX-a.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e ${LangFileString} SecAllUsersDescription "Instalacja dla wszystkich uytkownikw lub tylko dla biecego uytkownika." ${LangFileString} SecFileAssocDescription "Skojarzenie LyX-a z plikami o rozszerzeniu .lyx." ${LangFileString} SecDesktopDescription "Ikona LyX-a na pulpicie." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Dystrybucja LaTeX-a' ${LangFileString} EnterLaTeXHeader2 'Wybierz dystrybucj LaTeX-a, ktr chcesz uywa z LyX-em.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer has detected the LaTeX-distribution \ + $\"$LaTeXName$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nie uywaj LaTeX-a" ${LangFileString} InvalidLaTeXFolder 'Plik $\"latex.exe$\" nie znajduje si w podanej ciece.' ${LangFileString} LatexInfo 'Teraz zostanie uruchomiony instalator dystrybucji LaTeX-a $\"MiKTeX$\".$\r$\n\ - Aby zainstalowa ten program nacinij przycisk $\"Dalej$\" w oknie instalatora.$\r$\n\ - $\r$\n\ - !!! Prosz uy wszystkich domylnych opcji instalatora MiKTeX-a !!!' + Aby zainstalowa ten program nacinij przycisk $\"Dalej$\" w oknie instalatora.$\r$\n\ + $\r$\n\ + !!! Prosz uy wszystkich domylnych opcji instalatora MiKTeX-a !!!' ${LangFileString} LatexError1 'Nie znaleziono dystrybucji LaTeX-a!$\r$\n\ - LyX nie moe by uyty bez dystrybucji LaTeX-a takiej jak $\"MiKTeX$\"!$\r$\n\ - Z tego powodu instalacja zostanie przerwana.' + LyX nie moe by uyty bez dystrybucji LaTeX-a takiej jak $\"MiKTeX$\"!$\r$\n\ + Z tego powodu instalacja zostanie przerwana.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' + You can use all default options of the JabRef-installer.' ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' + The installer will continue anyway.$\r$\n\ + Try to install JabRef again later.' ${LangFileString} LatexConfigInfo "Dalsza konfiguracja LyX-a chwil potrwa." ${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." + it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ + $MiKTeXPath $\r$\n\ + and its subfolders." ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ + before you use LyX for the first time.$\r$\n\ + Would you now check for MiKTeX updates?' ${LangFileString} ModifyingConfigureFailed "Nieudana prba ustawienia zmiennej 'path_prefix' w pliku skryptu konfigracyjnego" ${LangFileString} RunConfigureFailed "Niedana prba wykonania skryptu konfiguracyjnego" ${LangFileString} NotAdmin "Musisz mie prawa administratora aby zainstalowa LyX-a!" ${LangFileString} InstallRunning "Instalator jest ju uruchomiony!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jest ju zainstalowany! Aby kontynowa musisz go najpierw usun." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gratulacje! LyX zosta pomylnie zainstalowany.$\r$\n\ - $\r$\n\ - (Pierwsze uruchomienie moe potrwa kilka sekund.)" + $\r$\n\ + (Pierwsze uruchomienie moe potrwa kilka sekund.)" ${LangFileString} FinishPageRun "Uruchom LyX-a" ${LangFileString} UnNotInRegistryLabel "Nie mona znale LyX-a w rejestrze.$\r$\n\ - Skrty na pulpicie i w menu Start nie zostan usunite." + Skrty na pulpicie i w menu Start nie zostan usunite." ${LangFileString} UnInstallRunning "Musisz najpierw zamkn LyX-a!" ${LangFileString} UnNotAdminLabel "Musisz posiada prawa administratora do deinstalacji programu LyX." ${LangFileString} UnReallyRemoveLabel "Czy na pewno chcesz usun LyX-a i wszystkie jego komponenty?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." ${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for all users.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for all users.' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." diff --git a/development/Win32/packaging/installer/lang/portuguese.nsh b/development/Win32/packaging/installer/lang/portuguese.nsh index 0693efe86b..50d38caed6 100644 --- a/development/Win32/packaging/installer/lang/portuguese.nsh +++ b/development/Win32/packaging/installer/lang/portuguese.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Este assistente de instalao ir gui-lo atravs da instalao do LyX.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Gestor de refer ${LangFileString} SecAllUsersDescription "Instalar o LyX para todos os utilizadores ou apenas para o presente utilizador." ${LangFileString} SecFileAssocDescription "Os ficheiros com a extenso .lyx iro abrir automaticamente no LyX." ${LangFileString} SecDesktopDescription "Um icone do LyX no ambiente de trabalho." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuio de LaTeX' ${LangFileString} EnterLaTeXHeader2 'Escolher a distribuio de LaTeX que o LyX dever usar.' ${LangFileString} EnterLaTeXFolder 'Opcionalmente pode especificar o caminho do ficheiro $\"latex.exe$\" e posteriormente \ - escolher a distribuio de LaTeX que vai usar o LyX.$\r$\n\ - Sem LaTeX o LyX no pode (pr-)imprimir os documentos!$\r$\n\ - $\r$\n\ - O instalador detectou a distribuio de LaTeX $\"$LaTeXName$\"\ - no seu sistema, no caminho que se mostra abaixo.' + escolher a distribuio de LaTeX que vai usar o LyX.$\r$\n\ + Sem LaTeX o LyX no pode (pr-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador detectou a distribuio de LaTeX $\"$LaTeXName$\"\ + no seu sistema, no caminho que se mostra abaixo.' ${LangFileString} EnterLaTeXFolderNone 'Especifique abaixo o caminho ao ficheiro $\"latex.exe$\". Posteriormente escolha \ - a distribuio de LaTeX que deve usar o LyX.$\r$\n\ - Sem LaTeX o LyX no pode (pr-)imprimir os documentos!$\r$\n\ - $\r$\n\ - O instalador no pudo achar nenhuma distribuio de LaTeX no seu sistema.' + a distribuio de LaTeX que deve usar o LyX.$\r$\n\ + Sem LaTeX o LyX no pode (pr-)imprimir os documentos!$\r$\n\ + $\r$\n\ + O instalador no pudo achar nenhuma distribuio de LaTeX no seu sistema.' ${LangFileString} PathName 'Caminho ao ficheiro $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usar LaTeX" ${LangFileString} InvalidLaTeXFolder 'O ficheiro $\"latex.exe$\" no est no caminho especificado.' ${LangFileString} LatexInfo 'Agora lanar-se- o instalador da distribuio de LaTeX $\"MiKTeX$\".$\r$\n\ - Para instalar o programa carregue no boto $\"Prximo$\" na janela de instalao at a instalao comear.$\r$\n\ - $\r$\n\ - !!! Por favor use todas as opes por defeito do instalador do MiKTeX !!!' + Para instalar o programa carregue no boto $\"Prximo$\" na janela de instalao at a instalao comear.$\r$\n\ + $\r$\n\ + !!! Por favor use todas as opes por defeito do instalador do MiKTeX !!!' ${LangFileString} LatexError1 'No foi encontrada nenhuma distribuio de LaTeX!$\r$\n\ - O LyX no pode ser usado sem uma distribuio de LaTeX como o $\"MiKTeX$\"!$\r$\n\ - A instalao ser por isso abortada.' + O LyX no pode ser usado sem uma distribuio de LaTeX como o $\"MiKTeX$\"!$\r$\n\ + A instalao ser por isso abortada.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Agora lanar-se- o instalador do programa $\"JabRef$\".$\r$\n\ - Pode usar todas as opes por defeito no instalador do JabRef.' + Pode usar todas as opes por defeito no instalador do JabRef.' ${LangFileString} JabRefError 'No se conseguiu instalar o programa $\"JabRef$\"!$\r$\n\ - A instalao ir continuar na mesma.$\r$\n\ - Tente instalar o JabRef outra vez mais tarde.' + A instalao ir continuar na mesma.$\r$\n\ + Tente instalar o JabRef outra vez mais tarde.' ${LangFileString} LatexConfigInfo "A configurao seguinte do LyX ir demorar um bocado." ${LangFileString} MiKTeXPathInfo "Para que cada utilizador possa customizar posteriormente o MiKTeX segundo as suas$\r$\n\ - necesidades, preciso a pasta onde foi instalado o MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e as suas subpastas terem permisso de escritura para todos os utilizadores." + necesidades, preciso a pasta onde foi instalado o MiKTeX$\r$\n\ + $MiKTeXPath $\r$\n\ + e as suas subpastas terem permisso de escritura para todos os utilizadores." ${LangFileString} MiKTeXInfo 'Junto com o LyX vai-se utilizar a distribuio de LaTeX $\"MiKTeX$\".$\r$\n\ - Antes de usar o LyX pela primeira vez, recomenda-se instalar as actualizaes disponveis$\r$\n\ - do MiKTeX com o instalador $\"MiKTeX Update Wizard$\"$\r$\n\ - Deseja comprovar agora se h actualizaes do MiKTeX?' + Antes de usar o LyX pela primeira vez, recomenda-se instalar as actualizaes disponveis$\r$\n\ + do MiKTeX com o instalador $\"MiKTeX Update Wizard$\"$\r$\n\ + Deseja comprovar agora se h actualizaes do MiKTeX?' ${LangFileString} ModifyingConfigureFailed "No conseguimos establecer o 'path_prefix' no script de configurao" ${LangFileString} RunConfigureFailed "No foi possvel executar o script de configurao" ${LangFileString} NotAdmin "Precisa de privilgios de administrador para instalar o LyX!" ${LangFileString} InstallRunning "O instalador j est a correr!" ${LangFileString} StillInstalled "O LyX ${APP_SERIES_KEY2} j est instalado! Desinstale o LyX primeiro." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Parabns! O LyX foi instalado com sucesso.$\r$\n\ - $\r$\n\ - (O primeiro incio do LyX pode levar alguns segundos.)" + $\r$\n\ + (O primeiro incio do LyX pode levar alguns segundos.)" ${LangFileString} FinishPageRun "Lanar o LyX" ${LangFileString} UnNotInRegistryLabel "Incapaz de encontrar o LyX no registry.$\r$\n\ - Os atalhos para o ambiente de trabalho no menu Start no sero removidos." + Os atalhos para o ambiente de trabalho no menu Start no sero removidos." ${LangFileString} UnInstallRunning "Deve fechar o LyX em primeiro lugar!" ${LangFileString} UnNotAdminLabel "Precisa de privilgios de administrador para desinstalar o LyX!" ${LangFileString} UnReallyRemoveLabel "Tem a certeza que quer remover completamente o LyX e todas as suas componentes?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Prefer ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribuio de LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Desinstala o gestor de referncias bibliogrficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Apaga as pastas de configurao do LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - de todos os utilizadores.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + de todos os utilizadores.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX e todas as suas componentes." diff --git a/development/Win32/packaging/installer/lang/romanian.nsh b/development/Win32/packaging/installer/lang/romanian.nsh index 14d1e9965c..da228bfbbf 100644 --- a/development/Win32/packaging/installer/lang/romanian.nsh +++ b/development/Win32/packaging/installer/lang/romanian.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Acest asistent v va ghida n procesul de instalare a programului LyX. $\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,70 +25,74 @@ ${LangFileString} SecInstJabRefDescription "Gestionarul de Bibliografie ${LangFileString} SecAllUsersDescription "Instaleaz LyX pentru toi utilizatorii sau doar pentru utilizatorul curent." ${LangFileString} SecFileAssocDescription "Fiierele cu extensia .lyx vor fi deschise automat cu LyX." ${LangFileString} SecDesktopDescription "A iconi LyX pe desktop." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribuia LaTeX' ${LangFileString} EnterLaTeXHeader2 'Seteaz distribuia LaTeX pe care s o foloseasc LyX.' ${LangFileString} EnterLaTeXFolder 'Opional putei seta calea ctre fiierul $\"latex.exe$\" i, implicit, seta distribuia \ LaTeX pe care s o foloseasc LyX. $\r$\n\ - Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!$\r$\n\ - $\r$\n\ - Programul de instalare a detectat distribuia LaTeX \ - $\"$LaTeXName$\" instalat pe calculatorul dumneavoastr. Dedesupt este afiat calea acestei distribuii.' + Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!$\r$\n\ + $\r$\n\ + Programul de instalare a detectat distribuia LaTeX \ + $\"$LaTeXName$\" instalat pe calculatorul dumneavoastr. Dedesupt este afiat calea acestei distribuii.' ${LangFileString} EnterLaTeXFolderNone 'Setai calea ctre fiierul $\"latex.exe$\" i, implicit, seta distribuia \ LaTeX pe care s o foloseasc LyX. $\r$\n\ - Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!$\r$\n\ - $\r$\n\ - Programul de instalare nu a detectat nici o distribuia LaTeX instalat pe calculatorul dumneavoastr.' + Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!$\r$\n\ + $\r$\n\ + Programul de instalare nu a detectat nici o distribuia LaTeX instalat pe calculatorul dumneavoastr.' ${LangFileString} PathName 'Calea ctre fiierul $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nu folosi LaTeX" ${LangFileString} InvalidLaTeXFolder 'Fiierul $\"latex.exe$\" nu se afl n calea specificat.' ${LangFileString} LatexInfo 'Programul de instalare al distribuiei LaTeX $\"MiKTeX$\" va fi lansat. $\r$\n\ - Pentru instalare apsai butonul $\"Next$\" n fereastra prgramului de instalare pn cnd instalarea nncepe. $\r$\n\ - $\r$\n\ - !!! V rugm s folosii setrile implicite ale programului de instalat MiKTex !!!' + Pentru instalare apsai butonul $\"Next$\" n fereastra prgramului de instalare pn cnd instalarea nncepe. $\r$\n\ + $\r$\n\ + !!! V rugm s folosii setrile implicite ale programului de instalat MiKTex !!!' ${LangFileString} LatexError1 'Nu am detectat nici o distribuia LaTeX instalat pe calculatorul dumneavoastr!$\r$\n\ - LyX nu poate fi folosit fr o distribuia LaTeX ca $\"MiKTeX$\"!$\r$\n\ - Instalarea va fi abandonat.' + LyX nu poate fi folosit fr o distribuia LaTeX ca $\"MiKTeX$\"!$\r$\n\ + Instalarea va fi abandonat.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Acum va fi lansat programul de instalare al aplicaiei $\"JabRef$\".$\r$\n\ - Este indicat s folosii setrile implicite ale programului de instalat JabRef.' + Este indicat s folosii setrile implicite ale programului de instalat JabRef.' ${LangFileString} JabRefError 'Programul $\"JabRef$\" nu a putut fi instalat!$\r$\n\ - Programul de instalare LyX va continua totui.$\r$\n\ - ncercai s instalai JabRef mai trziu.' + Programul de instalare LyX va continua totui.$\r$\n\ + ncercai s instalai JabRef mai trziu.' ${LangFileString} LatexConfigInfo "Configurarea programului LyX va dura o perioad de timp." ${LangFileString} MiKTeXPathInfo "Pentru ca utilizatorii s poat modifica setrile MiKTeX$\r$\n\ - este necesar s setai dreptul de scriere la directorul$\r$\n\ - $MiKTeXPath $\r$\n\ - unde a fost instalat MiKTex i toate subdirectoarele pentru toi utilizatorii." + este necesar s setai dreptul de scriere la directorul$\r$\n\ + $MiKTeXPath $\r$\n\ + unde a fost instalat MiKTex i toate subdirectoarele pentru toi utilizatorii." ${LangFileString} MiKTeXInfo 'Distribuia LaTeX $\"MiKTeX$\" va fi folosit cu LyX.$\r$\n\ - Este recomandat s instalai actualizri ale programului MiKTex folosind programul $\"MiKTeX Update Wizard$\"$\r$\n\ - nainte de a folosi LyX pentru prima oar.$\r$\n\ - Dorii s verificai dac sunt disponibile actualizri pentru MiKTeX?' + Este recomandat s instalai actualizri ale programului MiKTex folosind programul $\"MiKTeX Update Wizard$\"$\r$\n\ + nainte de a folosi LyX pentru prima oar.$\r$\n\ + Dorii s verificai dac sunt disponibile actualizri pentru MiKTeX?' ${LangFileString} ModifyingConfigureFailed "Nu am putut seta 'path_prefix' n procesul de configurare" ${LangFileString} RunConfigureFailed "Nu am putut executa scriptul de configurare" ${LangFileString} NotAdmin "Trebuie s avei drepturi de administrator pentru instalarea programului LyX!" ${LangFileString} InstallRunning "Programul de instalare este deja pornit!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} este deja instalat! Dezinstalai LyX prima oar." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Felicitri! LyX a fost instalat cu succes.$\r$\n\ - $\r$\n\ - (Prima oar cnd pornii LyX s-ar putea s dureze cteva secunde.)" + $\r$\n\ + (Prima oar cnd pornii LyX s-ar putea s dureze cteva secunde.)" ${LangFileString} FinishPageRun "Lanseaz LyX" ${LangFileString} UnNotInRegistryLabel "Nu am gsit LyX n registri.$\r$\n\ - Scurtturile de pe desktop i Start Menu nu vor fi terse." + Scurtturile de pe desktop i Start Menu nu vor fi terse." ${LangFileString} UnInstallRunning "Trebuie s inchidei LyX prima oar!" ${LangFileString} UnNotAdminLabel "Trebuie s avei drepturi de administrator pentru dezinstalarea programului LyX!" ${LangFileString} UnReallyRemoveLabel "Suntei sigur c dorii s dezinstalai programul LyX i toate componentele lui?" @@ -97,7 +101,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferin ${LangFileString} SecUnMiKTeXDescription 'Dezinstaleaz Distribuia LaTeX $\"MiKTeX$\".' ${LangFileString} SecUnJabRefDescription "Dezinstaleaz gestionarul de bibliografie JabRef." ${LangFileString} SecUnPreferencesDescription 'terge directorul cu setrile LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - pentru toi utilizatorii.' -${LangFileString} SecUnProgramFilesDescription " Dezinstalai programul LyX i toate componentele lui." + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + pentru toi utilizatorii.' +${LangFileString} SecUnProgramFilesDescription "Dezinstalai programul LyX i toate componentele lui." diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh index 9fad2f22e0..060084007c 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/lang/slovak.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Tento sprievodca Vm pomha intalova LyX.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,68 +25,72 @@ ${LangFileString} SecInstJabRefDescription "Manager pre bibliografick ${LangFileString} SecAllUsersDescription "Intalova LyX pre vetkch uvatelov alebo len pre teraj uvate." ${LangFileString} SecFileAssocDescription "Data s lyx rozrenm sa automaticky otvraj v LyX." ${LangFileString} SecDesktopDescription "Symbol LyX na desktopu." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX distribcia' ${LangFileString} EnterLaTeXHeader2 'Urcujte LaTeX distribciu, ktor m uva LyX.' ${LangFileString} EnterLaTeXFolder 'Tu mete pouva chod k $\"latex.exe$\" a tm pouva chod \ - LaTeX-distribciu, ktor by mohla by pouvan cestou LyXu.$\r$\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ - $\r$\n\ - Intalatr detektoval LaTeX-distribciu \ - $\"$LaTeXName$\" na vaej sstave. Dolu vidte jeho chod.' + LaTeX-distribciu, ktor by mohla by pouvan cestou LyXu.$\r$\n\ + Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ + $\r$\n\ + Intalatr detektoval LaTeX-distribciu \ + $\"$LaTeXName$\" na vaej sstave. Dolu vidte jeho chod.' ${LangFileString} EnterLaTeXFolderNone 'Pouvajte dolu chod k $\"latex.exe$\". Tm urcujete, ktor \ - LaTeX-distribcia m by pouvan LyXom.$\r$\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ - $\r$\n\ - Intalatr nemohol njst LaTeX-distribciu na vaej sstave.' + LaTeX-distribcia m by pouvan LyXom.$\r$\n\ + Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ + $\r$\n\ + Intalatr nemohol njst LaTeX-distribciu na vaej sstave.' ${LangFileString} PathName 'Chod k $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Neuvajte LaTeX" ${LangFileString} InvalidLaTeXFolder 'Mapa $\"latex.exe$\" nie je na pecifikovanej ceste.' ${LangFileString} LatexInfo 'Teraz mete tartova LaTeX distribciu $\"MiKTeX$\".$\r$\n\ - Na intalovanie programu tlate gombk $\"Next$\" v intalovacch oknch a sa zana intalcia.$\r$\n\ - $\r$\n\ - !!! Prosm uvajte vetk obsiahnut nastavenia intalatra MiKTeX !!!' + Na intalovanie programu tlate gombk $\"Next$\" v intalovacch oknch a sa zana intalcia.$\r$\n\ + $\r$\n\ + !!! Prosm uvajte vetk obsiahnut nastavenia intalatra MiKTeX !!!' ${LangFileString} LatexError1 'LaTeX distribcia sa nemohla njst!$\r$\n\ - LyX sa neme uva bez LaTeX distribcie ako $\"MiKTeX$\"!$\r$\n\ - Preto sa intalcia zastavila.' + LyX sa neme uva bez LaTeX distribcie ako $\"MiKTeX$\"!$\r$\n\ + Preto sa intalcia zastavila.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Teraz sa tartuje intalatr programu $\"JabRef$\".$\r$\n\ - Mzete vetk obsiahnut nastavenia intalatra JabRef.' + Mzete vetk obsiahnut nastavenia intalatra JabRef.' ${LangFileString} JabRefError 'Program $\"JabRef$\" sa nemohol intalova spene!$\r$\n\ - Predsa intalcia pokrauje.$\r$\n\ - Skste intalova JabRef ete raz neskr.' + Predsa intalcia pokrauje.$\r$\n\ + Skste intalova JabRef ete raz neskr.' ${LangFileString} LatexConfigInfo "Na nasledujcu konfigurciu LyXu treba poka chvu." ${LangFileString} MiKTeXPathInfo "Aby kad pouvatel bol neskr schopn pouvat MiKTeX pre svoje potreby$\r$\n\ - je treba napsat povolenia pre vetkch pouvatelov do intalacnho papiera MiKTeX $\r$\n\ - $MiKTeXPath $\r$\n\ - aj do podriadench papierov." + je treba napsat povolenia pre vetkch pouvatelov do intalacnho papiera MiKTeX $\r$\n\ + $MiKTeXPath $\r$\n\ + aj do podriadench papierov." ${LangFileString} MiKTeXInfo 'LaTeX distribcia $\"MiKTeX$\" sa pouva spolu s LyXom.$\r$\n\ - Doporuuje sa intalovat platn MiKTeX aktualizcie pomocou programu $\"MiKTeX Update Wizard$\"$\r$\n\ - pred prvm pouvanm LyXu.$\r$\n\ - Chcete teraz testova MiKTeX aktualizcie?' + Doporuuje sa intalovat platn MiKTeX aktualizcie pomocou programu $\"MiKTeX Update Wizard$\"$\r$\n\ + pred prvm pouvanm LyXu.$\r$\n\ + Chcete teraz testova MiKTeX aktualizcie?' ${LangFileString} ModifyingConfigureFailed "Nemohol uvies v platnost 'path_prefix' (zoznam s cestami programu) v konfiguranom skripte" ${LangFileString} RunConfigureFailed "Nemohol vykona konfiguran skript" ${LangFileString} NotAdmin "Pre intalciu LyX potrebujete administrtorsk prva!" ${LangFileString} InstallRunning "Intalatr u beh!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u intalovan! Najprv treba odintalova LyX." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gratulcia! LyX bol spene intalovan.$\r$\n\ - $\r$\n\ - (Prv LyX tart me trva niekolko sekund.)" + $\r$\n\ + (Prv LyX tart me trva niekolko sekund.)" ${LangFileString} FinishPageRun "tartova LyX" ${LangFileString} UnNotInRegistryLabel "Neme njs LyX v registre.$\r$\n\ @@ -99,7 +103,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX prednosti u ${LangFileString} SecUnMiKTeXDescription "Odintaluje LaTeX distribciu MiKTeX." ${LangFileString} SecUnJabRefDescription "Odintaluje bibliografick manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Odstrni konfiguracn papiere LyXu $\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - pre vetkch uivateov.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + pre vetkch uivateov.' ${LangFileString} SecUnProgramFilesDescription "Odintaluj LyX a vetk jeho suiastky." diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index de857d9f87..c02a2ce7ff 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Este programa instalar LyX en su ordenador.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Administrador de referencias bibliog ${LangFileString} SecAllUsersDescription "Instalar LyX para todos los usuarios o slo para el usuario actual." ${LangFileString} SecFileAssocDescription "Asociar la extensin .lyx con LyX." ${LangFileString} SecDesktopDescription "Crear un icono de LyX en el escritorio." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'Distribucin LaTeX' ${LangFileString} EnterLaTeXHeader2 'Elija la distribucin de LaTeX que debera emplear LyX.' ${LangFileString} EnterLaTeXFolder 'Opcionalmente puede especificar el camino del fichero $\"latex.exe$\" y posteriormente \ - elegir la distribucin de LaTeX que va usar LyX.$\r$\n\ - Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\ - $\r$\n\ - El instalador ha detectado la distribucin de LaTeX $\"$LaTeXName$\" \ - en su sistema, en el camino que se muestra abajo.' + elegir la distribucin de LaTeX que va usar LyX.$\r$\n\ + Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\ + $\r$\n\ + El instalador ha detectado la distribucin de LaTeX $\"$LaTeXName$\" \ + en su sistema, en el camino que se muestra abajo.' ${LangFileString} EnterLaTeXFolderNone 'Especifique abajo el camino al fichero $\"latex.exe$\". Posteriormente elija \ - la distribucin de LaTeX que debe usar LyX.$\r$\n\ - Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\ - $\r$\n\ - El instalador non pudo encontrar ninguna distribucin LaTeX en su sistema.' + la distribucin de LaTeX que debe usar LyX.$\r$\n\ + Sin LaTeX LyX no puede (pre)imprimir documentos!$\r$\n\ + $\r$\n\ + El instalador non pudo encontrar ninguna distribucin LaTeX en su sistema.' ${LangFileString} PathName 'Camino al fichero $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "No usar LaTeX" ${LangFileString} InvalidLaTeXFolder 'Imposible encontrar $\"latex.exe$\".' ${LangFileString} LatexInfo 'Ahora se lanzar el instalador de $\"MiKTeX$\", la distribucin de LaTeX.$\r$\n\ - Para instalar el programa presione el botn $\"Next$\" en la ventana del instalador hasta que la aplicacin arranque.$\r$\n\ - $\r$\n\ - Por favor use todas las opciones por defecto del instalador de MiKTeX !!!' + Para instalar el programa presione el botn $\"Next$\" en la ventana del instalador hasta que la aplicacin arranque.$\r$\n\ + $\r$\n\ + Por favor use todas las opciones por defecto del instalador de MiKTeX !!!' ${LangFileString} LatexError1 'No se ha encontrado ninguna distribucin de LaTeX!$\r$\n\ - LyX no funciona sin una distribucin de LaTeX como $\"MiKTeX$\"!$\r$\n\ - Por lo tanto la instalacin se abortar.' + LyX no funciona sin una distribucin de LaTeX como $\"MiKTeX$\"!$\r$\n\ + Por lo tanto la instalacin se abortar.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Ahora se lanzar el instalador del programa $\"JabRef$\".$\r$\n\ - Puede utilizar todas las opciones por defecto del instaldor de JabRef.' + Puede utilizar todas las opciones por defecto del instaldor de JabRef.' ${LangFileString} JabRefError 'El programa $\"JabRef$\" no pudo instalarse con xito!$\r$\n\ - La instalacin se continuar de toda forma.$\r$\n\ - Intente instalar otra vez JabRef ms tarde.' + La instalacin se continuar de toda forma.$\r$\n\ + Intente instalar otra vez JabRef ms tarde.' ${LangFileString} LatexConfigInfo "La siguiente configuracin de LyX va a tardar un poco." ${LangFileString} MiKTeXPathInfo "Para que cada usuario pueda personalizar posteriormente MiKTeX acorde sus$\r$\n\ - necesidades, es necesario que la carpeta donde fue instalado MiKTeX's $\r$\n\ - $MiKTeXPath $\r$\n\ - y sus subcarpetas tengan permiso de escritura para todos los usuarios." + necesidades, es necesario que la carpeta donde fue instalado MiKTeX's $\r$\n\ + $MiKTeXPath $\r$\n\ + y sus subcarpetas tengan permiso de escritura para todos los usuarios." ${LangFileString} MiKTeXInfo 'Junto con LyX se va usar la distribucin de LaTeX $\"MiKTeX$\".$\r$\n\ - Antes de usar LyX por primera vez, se recomienda instalar las actualizaciones disponibles$\r$\n\ - de MiKTeX con el instalador $\"MiKTeX Update Wizard$\"$\r$\n\ - Desea comprobar ahora si hay actualizaciones de MiKTeX?' + Antes de usar LyX por primera vez, se recomienda instalar las actualizaciones disponibles$\r$\n\ + de MiKTeX con el instalador $\"MiKTeX Update Wizard$\"$\r$\n\ + Desea comprobar ahora si hay actualizaciones de MiKTeX?' ${LangFileString} ModifyingConfigureFailed "Error al intentar aadir 'path_prefix' durante la ejecucin del programa de configuracin" ${LangFileString} RunConfigureFailed "Error al intentar ejecutar el programa de configuracin" ${LangFileString} NotAdmin "Necesita privilegios de administrador para instalar LyX!" ${LangFileString} InstallRunning "El instalador ya esta siendo ejecutado!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ya esta instalado! Antes desinstale LyX." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Enhorabuena! LyX ha sido instalado con xito.$\r$\n\ - $\r$\n\ - (El primer arranque de LyX puede tardar algunos segundos.)" + $\r$\n\ + (El primer arranque de LyX puede tardar algunos segundos.)" ${LangFileString} FinishPageRun "Ejecutar LyX" ${LangFileString} UnNotInRegistryLabel "Imposible encontrar LyX en el registro.$\r$\n\ - Los accesos rpidos del escritorio y del Men de Inicio no sern eliminados." + Los accesos rpidos del escritorio y del Men de Inicio no sern eliminados." ${LangFileString} UnInstallRunning "Antes cierre LyX!" ${LangFileString} UnNotAdminLabel "Necesita privilegios de administrador para desinstalar LyX!" ${LangFileString} UnReallyRemoveLabel "Est seguro de que desea eliminar completamente LyX y todos sus componentes?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'Preferencias de usuario de LyX' ${LangFileString} SecUnMiKTeXDescription "Desinstala a distribucin de LaTeX MiKTeX." ${LangFileString} SecUnJabRefDescription "Desinstala el administrador de referencias bibliograficas JabRef." ${LangFileString} SecUnPreferencesDescription 'Elimina las carpetas de configuracin de LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - de todos los usuarios.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + de todos los usuarios.' ${LangFileString} SecUnProgramFilesDescription "Desinstala LyX y todos sus componentes." diff --git a/development/Win32/packaging/installer/lang/swedish.nsh b/development/Win32/packaging/installer/lang/swedish.nsh index 7b3b8d7ddb..df2a949adf 100644 --- a/development/Win32/packaging/installer/lang/swedish.nsh +++ b/development/Win32/packaging/installer/lang/swedish.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Denna guide tar dig igenom installationen av LyX.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Program f ${LangFileString} SecAllUsersDescription "Installera LyX fr alla anvndare, eller enbart fr den aktuella anvndare." ${LangFileString} SecFileAssocDescription "Skapa en association mellan programmet och filtillget .lyx." ${LangFileString} SecDesktopDescription "En LyXikon p skrivbordet." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribution' ${LangFileString} EnterLaTeXHeader2 'Stll in LaTeX-distributionen som LyX skall anvnda.' ${LangFileString} EnterLaTeXFolder 'Alternativt kan du hr stlla in skvgen till filen $\"latex.exe$\" och drmed manuellt bestmma vilken \ - LaTeX-distribution som skall anvndas av LyX.$\r$\n\ - Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\ - $\r$\n\ - Installationsprogrammet har upptckt LaTeX-distributionen \ - $\"$LaTeXName$\" i ditt system. Nedan visas dess skvg.' + LaTeX-distribution som skall anvndas av LyX.$\r$\n\ + Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\ + $\r$\n\ + Installationsprogrammet har upptckt LaTeX-distributionen \ + $\"$LaTeXName$\" i ditt system. Nedan visas dess skvg.' ${LangFileString} EnterLaTeXFolderNone 'Stt nedan skvgen till filen $\"latex.exe$\". Drmed vljer du vilken \ - LaTeX-distribution som skall anvndas av LyX.$\r$\n\ - Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\ - $\r$\n\ - Installationsprogrammetn kunde inte hitta LaTeX-distributionen i ditt system.' + LaTeX-distribution som skall anvndas av LyX.$\r$\n\ + Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!$\r$\n\ + $\r$\n\ + Installationsprogrammetn kunde inte hitta LaTeX-distributionen i ditt system.' ${LangFileString} PathName 'Skvg till filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Anvnd inte LaTeX" ${LangFileString} InvalidLaTeXFolder 'Kan inte hitta $\"latex.exe$\"' ${LangFileString} LatexInfo 'Nu kommer installationsprogrammet fr LaTeX-distribution $\"MiKTeX$\" att kras.$\r$\n\ - Fr att installera programmet, klicka p knappen $\"Next$\" i installationsfnstret tills installation brjar.$\r$\n\ - $\r$\n\ - !!! Var snll och anvnd standardinstllningarna i installationsprogrammet fr MiKTeX !!!' + Fr att installera programmet, klicka p knappen $\"Next$\" i installationsfnstret tills installation brjar.$\r$\n\ + $\r$\n\ + !!! Var snll och anvnd standardinstllningarna i installationsprogrammet fr MiKTeX !!!' ${LangFileString} LatexError1 'Kan inte hitta ngon LaTeX-distribution!$\r$\n\ - LyX kan inte anvndas utan en LaTeX-distribution som tex $\"MiKTeX$\"!$\r$\n\ - Installation avbryts drfr nu.' + LyX kan inte anvndas utan en LaTeX-distribution som tex $\"MiKTeX$\"!$\r$\n\ + Installation avbryts drfr nu.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Nu kommer installationsprogrammet fr $\"JabRef$\" att kras.$\r$\n\ - Du kan anvnda alla standardalternativ i installationsprogrammet fr JabRef.' + Du kan anvnda alla standardalternativ i installationsprogrammet fr JabRef.' ${LangFileString} JabRefError 'Programmet $\"JabRef$\" kunde inte installeras ordentligt!$\r$\n\ - Installationen av LyX kommer att fortstta nd.$\r$\n\ - Frsk installera GSview igen senare.' + Installationen av LyX kommer att fortstta nd.$\r$\n\ + Frsk installera GSview igen senare.' ${LangFileString} LatexConfigInfo "Fljande konfigurering av LyX kommer att ta ett tag." ${LangFileString} MiKTeXPathInfo "Fr att varje anvndare senare skall kunna anpassa MiKTeX fr sina behov$\r$\n\ - r det ndvndigt att ge skrivrttigheter till alla anvndare fr MiKTeX's installationskatalog$\r$\n\ - $MiKTeXPath $\r$\n\ - och dess underkataloger." + r det ndvndigt att ge skrivrttigheter till alla anvndare fr MiKTeX's installationskatalog$\r$\n\ + $MiKTeXPath $\r$\n\ + och dess underkataloger." ${LangFileString} MiKTeXInfo 'LaTeX-distributionen $\"MiKTeX$\" kommer att anvndas tillsammans med LyX.$\r$\n\ - Det rekommenderas att installera tillgngliga uppdateringar av MiKTeX med hjlp av programmet $\"MiKTeX Update Wizard$\".$\r$\n\ - innan du anvnder LyX fr frsta gngen.$\r$\n\ - Vill du kontrollera om det finns uppdateringar tillgngliga fr MiKTeX nu?' + Det rekommenderas att installera tillgngliga uppdateringar av MiKTeX med hjlp av programmet $\"MiKTeX Update Wizard$\".$\r$\n\ + innan du anvnder LyX fr frsta gngen.$\r$\n\ + Vill du kontrollera om det finns uppdateringar tillgngliga fr MiKTeX nu?' ${LangFileString} ModifyingConfigureFailed "Misslyckades med att stta 'path_prefix' i konfigurationsskriptet" ${LangFileString} RunConfigureFailed "Misslyckades med att kra konfigurationsskriptet" ${LangFileString} NotAdmin "Du mste ha administratrsrttigheter fr att installera LyX!" ${LangFileString} InstallRunning "Installationsprogrammet krs readan!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} r redan installerat! Avinstallera LyX frst." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Gratulerar! LyX har installerats framgngsrikt.$\r$\n\ - $\r$\n\ - (Frsta gngen LyX startas tar det litet lngre tid d programmet konfigurerar sig sjlv automatiskt.)" + $\r$\n\ + (Frsta gngen LyX startas tar det litet lngre tid d programmet konfigurerar sig sjlv automatiskt.)" ${LangFileString} FinishPageRun "Kr LyX" ${LangFileString} UnNotInRegistryLabel "Kan inte hitta LyX i registret\r$\n\ - Genvgar p skrivbordet och i startmeny kommer inte att tas bort." + Genvgar p skrivbordet och i startmeny kommer inte att tas bort." ${LangFileString} UnInstallRunning "Du mste stnga LyX frst!" ${LangFileString} UnNotAdminLabel "Du mste ha administratrsrttigheter fr att avinstallera LyX!" ${LangFileString} UnReallyRemoveLabel "r du sker p att du verkligen vill fullstndigt avinstallera LyX och alla dess komponenter?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s anv ${LangFileString} SecUnMiKTeXDescription "Avinstallerar LaTeX-distributionen MiKTeX." ${LangFileString} SecUnJabRefDescription "Avinstallerar programmet JabRef som anvnds fr att hantera bibliografiska referenser." ${LangFileString} SecUnPreferencesDescription 'Raderar LyX$\'s konfigurationskatalog$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - fr alla anvndare.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + fr alla anvndare.' ${LangFileString} SecUnProgramFilesDescription "Avinstallera LyX och alla dess komponenter." diff --git a/development/Win32/packaging/installer/lang/turkish.nsh b/development/Win32/packaging/installer/lang/turkish.nsh index 63a6e6462a..3c95f488e8 100644 --- a/development/Win32/packaging/installer/lang/turkish.nsh +++ b/development/Win32/packaging/installer/lang/turkish.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME "Bu sihirbaz size LyX programn kuracak.$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription "Bibliography reference manager and e ${LangFileString} SecAllUsersDescription "LyX tm kullanclar iin mi yoksa yalnzca bu kullancya m kurulacak." ${LangFileString} SecFileAssocDescription "Uzants .lyx olan dosyalar otomatik olarak LyX ile alsn." ${LangFileString} SecDesktopDescription "Masastne bir LyX ikonu koy." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 'LaTeX-datm' ${LangFileString} EnterLaTeXHeader2 'LyX in kullanaca LaTeX datmn sein.' ${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' + LaTeX-distribution that should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer has detected the LaTeX-distribution \ + $\"$LaTeXName$\" on your system. Displayed below is its path.' ${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' + LaTeX-distribution should be used by LyX.$\r$\n\ + If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + $\r$\n\ + The installer couldn$\'t find a LaTeX-distribution on your system.' ${LangFileString} PathName 'Path to the file $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "LaTeX kullanma" ${LangFileString} InvalidLaTeXFolder '$\"latex.exe$\" dosyas belirttiiniz dizinde bulunamad.' ${LangFileString} LatexInfo 'imdi LaTeX datm $\"MiKTeX$\" kurulumu balatlacak.$\r$\n\ - Program kurmak iin kurulum balayana kadar $\"Devam$\" tuuyla ilerleyin.$\r$\n\ - $\r$\n\ - !!! Ltfen MiKTeX kurucusunun ntanml ayarlarn deitirmeyin !!!' + Program kurmak iin kurulum balayana kadar $\"Devam$\" tuuyla ilerleyin.$\r$\n\ + $\r$\n\ + !!! Ltfen MiKTeX kurucusunun ntanml ayarlarn deitirmeyin !!!' ${LangFileString} LatexError1 'Hi bir LaTeX datm bulunamad!$\r$\n\ - LyX $\"MiKTeX$\" gibi bir LaTeX datm olmadan kullanlamaz!$\r$\n\ - Bu nedenle kurulum iptal edilecek.' + LyX $\"MiKTeX$\" gibi bir LaTeX datm olmadan kullanlamaz!$\r$\n\ + Bu nedenle kurulum iptal edilecek.' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' + You can use all default options of the JabRef-installer.' ${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' + The installer will continue anyway.$\r$\n\ + Try to install JabRef again later.' ${LangFileString} LatexConfigInfo "Sradaki LyX yaplandrmas biraz zaman alacak." ${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." + it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ + $MiKTeXPath $\r$\n\ + and its subfolders." ${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ + before you use LyX for the first time.$\r$\n\ + Would you now check for MiKTeX updates?' ${LangFileString} ModifyingConfigureFailed "Yaplandrma programnda 'path_prefix' ayarlanamad" ${LangFileString} RunConfigureFailed "Yaplandrma program altrlamad" ${LangFileString} NotAdmin "LyX kurabilmek iin ynetici yetkileri gerekiyor!" ${LangFileString} InstallRunning "Kurulum program zaten alyor!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} kurulu zaten! nce onu kaldrn." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "Tebrikler! LyX baaryla kuruldu.$\r$\n\ - $\r$\n\ - (LyX in ilk al birka saniye alabilir.)" + $\r$\n\ + (LyX in ilk al birka saniye alabilir.)" ${LangFileString} FinishPageRun "LyX Balat" ${LangFileString} UnNotInRegistryLabel "Sistem ktnde LyX bulunamad.$\r$\n\ - Balat mens ve masastnzdeki ksayollar silinemeyecek." + Balat mens ve masastnzdeki ksayollar silinemeyecek." ${LangFileString} UnInstallRunning "nce LyX i kapatmalsnz!" ${LangFileString} UnNotAdminLabel "LyX kaldrabilmek iin ynetici yetkileri gerekiyor!" ${LangFileString} UnReallyRemoveLabel "LyX ve tm bileenlerini kaldrmak istediinize emin misiniz?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' ${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." ${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." ${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for all users.' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for all users.' ${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh index cbb959a6ba..e3514c609b 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/lang/ukrainian.nsh @@ -3,8 +3,8 @@ ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" ${LangFileString} TEXT_WELCOME " LyX .$\r$\n\ - $\r$\n\ - $_CLICK" + $\r$\n\ + $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." @@ -25,71 +25,75 @@ ${LangFileString} SecInstJabRefDescription " ${LangFileString} SecAllUsersDescription ", LyX , ." ${LangFileString} SecFileAssocDescription " .lyx LyX." ${LangFileString} SecDesktopDescription "ϳ LyX ." +${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." +${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." ${LangFileString} EnterLaTeXHeader1 ' LaTeX' ${LangFileString} EnterLaTeXHeader2 ' LaTeX, LyX.' ${LangFileString} EnterLaTeXFolder ' , $\"latex.exe$\" \ - LaTeX, LyX.$\r$\n\ - LaTeX, LyX !$\r$\n\ - $\r$\n\ - LaTeX \ - $\"$LaTeXName$\" . .' + LaTeX, LyX.$\r$\n\ + LaTeX, LyX !$\r$\n\ + $\r$\n\ + LaTeX \ + $\"$LaTeXName$\" . .' ${LangFileString} EnterLaTeXFolderNone ' $\"latex.exe$\". , \ - LaTeX, LyX.$\r$\n\ - LaTeX, LyX !$\r$\n\ - $\r$\n\ - LaTeX .' + LaTeX, LyX.$\r$\n\ + LaTeX, LyX !$\r$\n\ + $\r$\n\ + LaTeX .' ${LangFileString} PathName ' $\"latex.exe$\"' ${LangFileString} DontUseLaTeX " LaTeX" ${LangFileString} InvalidLaTeXFolder ' $\"latex.exe$\".' ${LangFileString} LatexInfo ' LaTeX $\"MiKTeX$\".$\r$\n\ - , $\"Next$\" , .$\r$\n\ - $\r$\n\ - !!! , MiKTeX !!!' + , $\"Next$\" , .$\r$\n\ + $\r$\n\ + !!! , MiKTeX !!!' ${LangFileString} LatexError1 ' LaTeX !$\r$\n\ - LyX LaTeX $\"MiKTeX$\"!$\r$\n\ - .' + LyX LaTeX $\"MiKTeX$\"!$\r$\n\ + .' ${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' ${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' ${LangFileString} JabRefInfo ' $\"JabRef$\".$\r$\n\ - JabRef.' + JabRef.' ${LangFileString} JabRefError ' $\"JabRef$\"!$\r$\n\ - LyX .$\r$\n\ - JabRef .' + LyX .$\r$\n\ + JabRef .' ${LangFileString} LatexConfigInfo " LyX ." ${LangFileString} MiKTeXPathInfo " MiKTeX ,$\r$\n\ - MiKTeX , :$\r$\n\ - $MiKTeXPath $\r$\n\ - ." + MiKTeX , :$\r$\n\ + $MiKTeXPath $\r$\n\ + ." ${LangFileString} MiKTeXInfo ' LyX LaTeX $\"MiKTeX$\".$\r$\n\ - MiKTeX $\"MiKTeX Update Wizard$\"$\r$\n\ - , LyX.$\r$\n\ - MiKTeX?' + MiKTeX $\"MiKTeX Update Wizard$\"$\r$\n\ + , LyX.$\r$\n\ + MiKTeX?' ${LangFileString} ModifyingConfigureFailed " 'path_prefix' " ${LangFileString} RunConfigureFailed " " ${LangFileString} NotAdmin " LyX !" ${LangFileString} InstallRunning " !" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ! LyX." +${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ + If you really want this, you must uninstall the existing LyX $OldVersionNumber before." ${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." + MiKTeX was installed with administrator privileges but you are installing LyX without them." ${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ available because that requires to install a software printer to$\r$\n\ Windows which is only possible with administrator privileges." ${LangFileString} FinishPageMessage "³! LyX .$\r$\n\ - $\r$\n\ - ( LyX .)" + $\r$\n\ + ( LyX .)" ${LangFileString} FinishPageRun " LyX" ${LangFileString} UnNotInRegistryLabel " LyX .$\r$\n\ - ." + ." ${LangFileString} UnInstallRunning " LyX!" ${LangFileString} UnNotAdminLabel " LyX !" ${LangFileString} UnReallyRemoveLabel " LyX ?" @@ -98,7 +102,7 @@ ${LangFileString} UnLyXPreferencesTitle ' ${LangFileString} SecUnMiKTeXDescription " LaTeX - MiKTeX." ${LangFileString} SecUnJabRefDescription " JabRef." ${LangFileString} SecUnPreferencesDescription ' LyX$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - .' + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + .' ${LangFileString} SecUnProgramFilesDescription " LyX ." From 71992706190ba0e1e276d5aeb6b21b656f6e1a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 Nov 2012 00:37:15 +0100 Subject: [PATCH 65/93] installer: fix 2 issues introduced in last commit --- development/Win32/packaging/installer/lang/french.nsh | 4 ++-- development/Win32/packaging/installer/lang/italian.nsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index e4c281fbaa..6d787aece9 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -10,8 +10,8 @@ Author: Jean-Pierre Chr ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installation pour l'utilisateur courant)" -${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA).$\r$\n - $\r$\n +${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'installation de $(^NameDA).$\r$\n\ + $\r$\n\ $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Mise jour de la base de donnes MiKTeX..." diff --git a/development/Win32/packaging/installer/lang/italian.nsh b/development/Win32/packaging/installer/lang/italian.nsh index 869aecf418..fef75e6b45 100644 --- a/development/Win32/packaging/installer/lang/italian.nsh +++ b/development/Win32/packaging/installer/lang/italian.nsh @@ -10,8 +10,8 @@ Author: Enrico Forestieri ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" -${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)$\r$\n - $\r$\n +${LangFileString} TEXT_WELCOME "Verrete guidati nell'installazione di $(^NameDA)$\r$\n\ + $\r$\n\ $_CLICK" ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." From 06eb4594d76ba3a5b6cf34f773d77c7565f96dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 Nov 2012 00:41:29 +0100 Subject: [PATCH 66/93] configure.py: add 5 popular editors with LaTeX syntax highlighting I also need this for branch for the Windows installer, OK? --- lib/configure.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/configure.py b/lib/configure.py index 58234c0d5a..5948dd6499 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -563,6 +563,7 @@ def checkFormatEntries(dtl_tools): 'pybliographic', 'bibdesk', 'gbib', 'kbib', \ 'kbibtex', 'sixpack', 'bibedit', 'tkbibtex' \ 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \ + 'jedit', 'TeXnicCenter', 'WinEdt', 'WinShell', 'PSPad', \ 'nedit', 'gedit', 'notepad', 'geany', 'leafpad', 'mousepad'], rc_entry = [r'''\Format bibtex bib "BibTeX" "" "" "%%" "" "text/x-bibtex"''' ]) # From 2de7f0eeaf540db2b23377cd5d56be2185dfbdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 Nov 2012 01:00:29 +0100 Subject: [PATCH 67/93] installer: format fix in changelog --- development/Win32/packaging/installer/ChangeLog.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 9519886f85..58fd866958 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -25,7 +25,10 @@ Changelog for LyX-205-1: Changelog for LyX-204-3: - renamed the proposed LyX installation folder to "LyX 2.0" instead of the former "LyX 2.0.4" (reason: it should be default be possible to override existing older version of the LyX 2.0.x series) -- link the LyX Wiki and website in LyX's start menu folder Changelog for LyX-204-2: +- link the LyX Wiki and website in LyX's start menu folder + + +Changelog for LyX-204-2: - Prevent that LyX can first be installed with admin privileges and afterwards without them - In the uninstaller it is now the default not to uninstall the user preferences and settings - Fix the path in which the LyX start menu shortcut is executed From 56e3d2153fed6bd73dcc36ac2fe1d7d81e07ac70 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 13 Nov 2012 21:44:36 +0100 Subject: [PATCH 68/93] Get rid of redundant CVS/SVN file_ member It did always point to the buffer's file name, so it is not needed and it was not used in most cases anyway. Instead, ensure that owner_ is always set and cannot be changed later. --- src/LyXVC.cpp | 17 ++++++----------- src/VCBackend.cpp | 27 +++++++++++++-------------- src/VCBackend.h | 13 +++++-------- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 01743ecadb..449e24d1a8 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -50,20 +50,17 @@ bool LyXVC::file_found_hook(FileName const & fn) FileName found_file; // Check if file is under RCS if (!(found_file = RCS::findFile(fn)).empty()) { - vcs.reset(new RCS(found_file)); - vcs->owner(owner_); + vcs.reset(new RCS(found_file, owner_)); return true; } // Check if file is under CVS if (!(found_file = CVS::findFile(fn)).empty()) { - vcs.reset(new CVS(found_file, fn)); - vcs->owner(owner_); + vcs.reset(new CVS(found_file, owner_)); return true; } // Check if file is under SVN if (!(found_file = SVN::findFile(fn)).empty()) { - vcs.reset(new SVN(found_file, fn)); - vcs->owner(owner_); + vcs.reset(new SVN(found_file, owner_)); return true; } @@ -127,20 +124,18 @@ bool LyXVC::registrer() if (svn_entries.isReadableFile()) { LYXERR(Debug::LYXVC, "LyXVC: registering " << to_utf8(filename.displayName()) << " with SVN"); - vcs.reset(new SVN(cvs_entries, filename)); + vcs.reset(new SVN(cvs_entries, owner_)); } else if (cvs_entries.isReadableFile()) { LYXERR(Debug::LYXVC, "LyXVC: registering " << to_utf8(filename.displayName()) << " with CVS"); - vcs.reset(new CVS(cvs_entries, filename)); + vcs.reset(new CVS(cvs_entries, owner_)); } else { LYXERR(Debug::LYXVC, "LyXVC: registering " << to_utf8(filename.displayName()) << " with RCS"); - vcs.reset(new RCS(FileName())); + vcs.reset(new RCS(FileName(), owner_)); } - - vcs->owner(owner_); } LYXERR(Debug::LYXVC, "LyXVC: registrer"); diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index bd468d86a7..31a8eb32e5 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -122,7 +122,7 @@ bool VCS::checkparentdirs(FileName const & file, std::string const & pathname) // ///////////////////////////////////////////////////////////////////// -RCS::RCS(FileName const & m) +RCS::RCS(FileName const & m, Buffer * b) : VCS(b) { master_ = m; scanMaster(); @@ -472,10 +472,9 @@ bool RCS::prepareFileRevisionEnabled() // ///////////////////////////////////////////////////////////////////// -CVS::CVS(FileName const & m, FileName const & f) +CVS::CVS(FileName const & m, Buffer * b) : VCS(b) { master_ = m; - file_ = f; have_rev_info_ = false; scanMaster(); } @@ -510,7 +509,7 @@ void CVS::scanMaster() LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_); // Ok now we do the real scan... ifstream ifs(master_.toFilesystemEncoding().c_str()); - string name = onlyFileName(file_.absFileName()); + string name = onlyFileName(owner_->absFileName()); string tmpf = '/' + name + '/'; LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\''); string line; @@ -530,12 +529,13 @@ void CVS::scanMaster() //sm[4]; // options //sm[5]; // tag or tagdate - if (file_.isReadableFile()) { - time_t mod = file_.lastModified(); + FileName file(owner_->absFileName()); + if (file.isReadableFile()) { + time_t mod = file.lastModified(); string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date << "'\nModification date of file: `" << mod_date << '\''); - if (file_.isReadOnly()) { + if (file.isReadOnly()) { // readonly checkout is unlocked vcstatus = UNLOCKED; } else { @@ -1044,11 +1044,9 @@ bool CVS::prepareFileRevisionEnabled() // ///////////////////////////////////////////////////////////////////// -SVN::SVN(FileName const & m, FileName const & f) +SVN::SVN(FileName const & m, Buffer * b) : VCS(b) { - owner_ = 0; master_ = m; - file_ = f; locked_mode_ = 0; scanMaster(); } @@ -1103,9 +1101,9 @@ bool SVN::checkLockMode() } LYXERR(Debug::LYXVC, "Detecting locking mode..."); - if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName()) + if (doVCCommandCall("svn proplist " + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), - file_.onlyPath())) + FileName(owner_->filePath()))) return false; ifstream ifs(tmpf.toFilesystemEncoding().c_str()); @@ -1128,8 +1126,9 @@ bool SVN::checkLockMode() bool SVN::isLocked() const { - file_.refresh(); - return !file_.isReadOnly(); + FileName file(owner_->absFileName()); + file.refresh(); + return !file.isReadOnly(); } diff --git a/src/VCBackend.h b/src/VCBackend.h index abffaec044..6f81208be1 100644 --- a/src/VCBackend.h +++ b/src/VCBackend.h @@ -34,6 +34,7 @@ public: NOLOCKING }; + VCS(Buffer * b) : owner_(b) {} virtual ~VCS() {} /// register a file for version control @@ -71,8 +72,6 @@ public: virtual void getLog(support::FileName const &) = 0; /// return the current version description virtual std::string const versionString() const = 0; - /// set the owning buffer - void owner(Buffer * b) { owner_ = b; } /// return the owning buffer Buffer * owner() const { return owner_; } /// return the lock status of this file @@ -119,7 +118,7 @@ protected: VCStatus vcstatus; /// The buffer using this VC - Buffer * owner_; + Buffer * const owner_; }; @@ -128,7 +127,7 @@ class RCS : public VCS { public: explicit - RCS(support::FileName const & m); + RCS(support::FileName const & m, Buffer * b); /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); @@ -202,7 +201,7 @@ class CVS : public VCS { public: /// explicit - CVS(support::FileName const & m, support::FileName const & f); + CVS(support::FileName const & m, Buffer * b); /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); @@ -272,7 +271,6 @@ protected: }; private: - support::FileName file_; // revision number from scanMaster std::string version_; @@ -330,7 +328,7 @@ class SVN : public VCS { public: /// explicit - SVN(support::FileName const & m, support::FileName const & f); + SVN(support::FileName const & m, Buffer * b); /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); @@ -389,7 +387,6 @@ protected: void fileLock(bool lock, support::FileName const & tmpf, std::string & status); private: - support::FileName file_; /// is the loaded file under locking policy? bool locked_mode_; /** From 393e7924bd1d421875e020ee55c9c5c6f56f65fd Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 13 Nov 2012 21:52:38 +0100 Subject: [PATCH 69/93] Add missing VCS updates after filename changes --- src/Buffer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 313b937940..3920f23301 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -761,7 +761,10 @@ void Buffer::setReadonly(bool const flag) void Buffer::setFileName(FileName const & fname) { + bool const changed = fname != d->filename; d->filename = fname; + if (changed) + lyxvc().file_found_hook(fname); setReadonly(d->filename.isReadOnly()); saveCheckSum(); updateTitles(); @@ -4021,6 +4024,7 @@ Buffer::ReadStatus Buffer::loadEmergency() "file."), from_utf8(d->filename.absFileName()))); } markDirty(); + lyxvc().file_found_hook(d->filename); str = _("Document was successfully recovered."); } else str = _("Document was NOT successfully recovered."); @@ -4084,6 +4088,7 @@ Buffer::ReadStatus Buffer::loadAutosave() from_utf8(d->filename.absFileName()))); } markDirty(); + lyxvc().file_found_hook(d->filename); return ReadSuccess; } return ReadAutosaveFailure; From b07383b026e9c9d5bd17b53877ba5986d932b29b Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Tue, 13 Nov 2012 21:53:13 +0100 Subject: [PATCH 70/93] improve documentation --- src/LyXVC.h | 7 ++++--- src/VCBackend.h | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/LyXVC.h b/src/LyXVC.h index 55de93f103..df6f273ffc 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -47,12 +47,13 @@ public: LyX loads a file. This function then checks for a master VC file (for RCS this is *,v or RCS/ *,v ; for CVS this is CVS/Entries and .svn/entries for SVN) if this file or entry is found, the loaded file is assumed to be - under controll by VC, and the appropiate actions is taken. + under control by VC, and the appropiate actions is taken. Returns true if the file is under control by a VCS. */ bool file_found_hook(support::FileName const & fn); - /** This function should be run when a file is requested for loading, + /** Is \p fn in under version control? + This function should be run when a file is requested for loading, but it does not exist. This function will then check for a VC master file with the same name (see above function). If this exists the user should be asked if he/her wants to checkout a version for @@ -64,7 +65,7 @@ public: /// void setBuffer(Buffer *); - /// Register the document as an VC file. + /// Register the document as a VC file. bool registrer(); diff --git a/src/VCBackend.h b/src/VCBackend.h index 6f81208be1..3b48f206e3 100644 --- a/src/VCBackend.h +++ b/src/VCBackend.h @@ -41,29 +41,33 @@ public: virtual void registrer(std::string const & msg) = 0; /// check in the current revision, returns log virtual std::string checkIn(std::string const & msg) = 0; - // can be this operation processed in the current RCS? + /// can this operation be processed in the current VCS? virtual bool checkInEnabled() = 0; - // should a log message provided for next checkin? + /// should a log message provided for next checkin? virtual bool isCheckInWithConfirmation() = 0; /// check out for editing, returns log virtual std::string checkOut() = 0; - // can be this operation processed in the current RCS? + /// can this operation be processed in the current VCS? virtual bool checkOutEnabled() = 0; /// synchronize with repository, returns log virtual std::string repoUpdate() = 0; - // can be this operation processed in the current RCS? + /// can this operation be processed in the current VCS? virtual bool repoUpdateEnabled() = 0; - // toggle locking property of the file + /// toggle locking property of the file virtual std::string lockingToggle() = 0; - // can be this operation processed in the current RCS? + /// can this operation be processed in the current VCS? virtual bool lockingToggleEnabled() = 0; /// revert current edits virtual bool revert() = 0; - // should a confirmation before revert requested? + /// should a confirmation before revert requested? virtual bool isRevertWithConfirmation() = 0; - /// FIXME + /** + * Merge the current with the previous version + * in a reverse patch kind of way, so that the + * result is to revert the last changes. + */ virtual void undoLast() = 0; - // can be this operation processed in the current RCS? + /// can this operation be processed in the current VCS? virtual bool undoLastEnabled() = 0; /** * getLog - read the revision log into the given file @@ -81,13 +85,13 @@ public: virtual bool toggleReadOnlyEnabled() = 0; /// Return revision info specified by the argument. virtual std::string revisionInfo(LyXVC::RevisionInfo const info) = 0; - + /// can this operation be processed in the current VCS? virtual bool prepareFileRevision(std::string const & rev, std::string & f) = 0; - + /// can this operation be processed in the current VCS? virtual bool prepareFileRevisionEnabled() = 0; /// Check the directory of file and all parent directories - // for the existence of the given pathname + /// for the existence of the given pathname static bool checkparentdirs(support::FileName const & file, std::string const & pathname); protected: @@ -98,7 +102,7 @@ protected: /// If needed converts last or relative number to the absolute revision. bool makeRCSRevision(std::string const &version, std::string &revis) const; - // GUI container for doVCCommandCall + /// GUI container for doVCCommandCall int doVCCommand(std::string const & cmd, support::FileName const & path, bool reportError = true); /** * doVCCommandCall - call out to the version control utility From 25e4a1ce6bf18f88fc16dc826d2d3f7673462fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 14 Nov 2012 00:30:27 +0100 Subject: [PATCH 71/93] ja.po: updates for trunk from Koji --- po/ja.po | 366 +++++++++++++++++++++++-------------------------------- 1 file changed, 153 insertions(+), 213 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0ac99ed0c5..cb08e0043d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: LyX 2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" "POT-Creation-Date: 2012-03-12 11:29+0100\n" -"PO-Revision-Date: 2012-02-14 11:15+0900\n" +"PO-Revision-Date: 2012-11-14 04:22+0900\n" "Last-Translator: Koji Yokota \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" #: src/frontends/qt4/ui/AboutUi.ui:32 @@ -104,19 +104,16 @@ msgid "&Jurabib" msgstr "&Jurabib" #: src/frontends/qt4/ui/BiblioUi.ui:110 -#, fuzzy msgid "Bibliography Style" -msgstr "書誌情報項目" +msgstr "書誌情報様式" #: src/frontends/qt4/ui/BiblioUi.ui:121 -#, fuzzy msgid "Default st&yle:" -msgstr "既定プリンタ(&P):" +msgstr "既定様式(&Y):" #: src/frontends/qt4/ui/BiblioUi.ui:131 -#, fuzzy msgid "Define the default BibTeX style" -msgstr "BibTeXスタイルを選んで下さい" +msgstr "既定のBibTeXスタイルを選んで下さい" #: src/frontends/qt4/ui/BiblioUi.ui:140 msgid "Select this if you want to split your bibliography into sections" @@ -456,7 +453,7 @@ msgstr "派生枝を選択してください" #: src/frontends/qt4/ui/BranchesUi.ui:25 msgid "&New:[[branch]]" -msgstr "" +msgstr "新規(&N):" #: src/frontends/qt4/ui/BranchesUi.ui:35 msgid "" @@ -906,8 +903,7 @@ msgstr "検索フィールド(&H):" #: src/frontends/qt4/ui/CitationUi.ui:382 msgid "" "Enter the text to search for and press Enter or click the button to search" -msgstr "" -"検索する語句を入力してEnterを押すか、ボタンをクリックして検索してください" +msgstr "検索する語句を入力してEnterを押すか、ボタンをクリックして検索してください" #: src/frontends/qt4/ui/CitationUi.ui:395 msgid "Click or press Enter in the search box to search" @@ -1423,8 +1419,7 @@ msgstr "様式を無視(&F)" msgid "" "Keep the case of the replacement's first letter as in each matching text " "first letter" -msgstr "" -"置換後の語句の最初の文字の大小を、置換前の語句の最初の文字の大小に合わせる。" +msgstr "置換後の語句の最初の文字の大小を、置換前の語句の最初の文字の大小に合わせる。" #: src/frontends/qt4/ui/FindAndReplaceUi.ui:270 msgid "&Preserve first case on replace" @@ -1488,11 +1483,10 @@ msgid "FontUi" msgstr "フォントUI" #: src/frontends/qt4/ui/FontUi.ui:19 -#, fuzzy msgid "" "Use OpenType and TrueType fonts with the fontspec package (requires XeTeX or " "LuaTeX)" -msgstr "OpenTypeやTrueTypeフォントを直接使用する（要XeTeXないしLuaTeX）" +msgstr "fontspecパッケージを使用して、OpenTypeやTrueTypeフォントを使用する（要XeTeXないしLuaTeX）" #: src/frontends/qt4/ui/FontUi.ui:22 msgid "&Use non-TeX fonts (via XeTeX/LuaTeX)" @@ -1942,7 +1936,7 @@ msgstr "複数の索引を使用する(&U)" #: src/frontends/qt4/ui/IndicesUi.ui:114 msgid "&New:[[index]]" -msgstr "" +msgstr "新規(&N):" #: src/frontends/qt4/ui/IndicesUi.ui:124 msgid "" @@ -2670,9 +2664,8 @@ msgid "Scaling factor for images used for math output." msgstr "数式出力に使用する画像の伸縮係数" #: src/frontends/qt4/ui/OutputUi.ui:222 -#, fuzzy msgid "Write CSS to File" -msgstr "ファイルに書き出す" +msgstr "CSSをファイルに書き出す" #: src/frontends/qt4/ui/PDFSupportUi.ui:28 msgid "&Use hyperref support" @@ -2996,8 +2989,7 @@ msgstr "一般" msgid "" "After the cursor has not moved for this time, the inline completion is shown " "if it is available." -msgstr "" -"これだけの時間カーソルを動かさなかったとき、可能ならば補完入力を表示します。" +msgstr "これだけの時間カーソルを動かさなかったとき、可能ならば補完入力を表示します。" #: src/frontends/qt4/ui/PrefCompletionUi.ui:154 msgid "s inline completion dela&y" @@ -3017,18 +3009,17 @@ msgstr "秒のポップアップ遅延(&E)" #: src/frontends/qt4/ui/PrefCompletionUi.ui:233 msgid "." -msgstr "" +msgstr "." #: src/frontends/qt4/ui/PrefCompletionUi.ui:249 msgid "Minimum word length for completion" -msgstr "" +msgstr "補完を開始する最小文字数" #: src/frontends/qt4/ui/PrefCompletionUi.ui:274 msgid "" "When the TAB completion is not unique, there won't be a delay of the popup. " "It will be shown right away." -msgstr "" -"タブ補完に複数候補がある場合、ポップアップに遅延を置かず、直ちに表示する。" +msgstr "タブ補完に複数候補がある場合、ポップアップに遅延を置かず、直ちに表示する。" #: src/frontends/qt4/ui/PrefCompletionUi.ui:277 msgid "Sho&w popup without delay for non-unique completions" @@ -3216,8 +3207,7 @@ msgstr "文書形式(&D)" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:66 msgid "Check this to show the current format in the File > Export menu" -msgstr "" -"この形式をファイル→書き出しメニューに表示させたいときには有効にしてください" +msgstr "この形式をファイル→書き出しメニューに表示させたいときには有効にしてください" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:69 msgid "Sho&w in export menu" @@ -3237,7 +3227,7 @@ msgstr "拡張子(&X):" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:109 msgid "&MIME:" -msgstr "" +msgstr "&MIME:" #: src/frontends/qt4/ui/PrefFileformatsUi.ui:122 msgid "Shortc&ut:" @@ -3392,9 +3382,8 @@ msgid "Default Decimal &Separator:" msgstr "既定の小数点(&S):" #: src/frontends/qt4/ui/PrefLanguageUi.ui:160 -#, fuzzy msgid "Default length &unit:" -msgstr "既定プリンタ(&P):" +msgstr "長さ単位の既定値(&U):" #: src/frontends/qt4/ui/PrefLanguageUi.ui:173 msgid "" @@ -4075,8 +4064,7 @@ msgstr "ユーザー設定幅(&W):" #: src/frontends/qt4/ui/PrintNomenclUi.ui:52 msgid "Custom value. \"List Indentation\" needs to be set to \"Custom\"." -msgstr "" -"任意設定の値。「リストの行頭下げ」を「任意設定」に設定する必要があります。" +msgstr "任意設定の値。「リストの行頭下げ」を「任意設定」に設定する必要があります。" #: src/frontends/qt4/ui/PrintUi.ui:28 msgid "Pages" @@ -4807,9 +4795,8 @@ msgid "BibTeX styles" msgstr "BibTeXスタイル" #: src/frontends/qt4/ui/TexinfoUi.ui:143 -#, fuzzy msgid "BibTeX databases" -msgstr "使用するBibTeXデータベース" +msgstr "BibTeXデータベース" #: src/frontends/qt4/ui/TexinfoUi.ui:167 msgid "Toggles view of the file list" @@ -4871,11 +4858,11 @@ msgstr "二段組文書(&C)" msgid "" "Justify text in the LyX editor (this does not affect whether the text is " "justified in the output)" -msgstr "" +msgstr "LyXエディタ中で整形を行う(出力中で文書が整形されるかどうかには影響しません)" #: src/frontends/qt4/ui/TextLayoutUi.ui:284 msgid "Use &justification in LyX work area" -msgstr "" +msgstr "LyX作業域で整形を行う(&J)" #: src/frontends/qt4/ui/ThesaurusUi.ui:32 msgid "Language of the thesaurus" @@ -4912,8 +4899,7 @@ msgstr "見出しを選択語で置換" #: src/frontends/qt4/ui/ThesaurusUi.ui:102 msgid "Click to select a proposal, double click to look it up." -msgstr "" -"クリックすれば候補が選択されます。ダブルクリックするとその意味を引きます。" +msgstr "クリックすれば候補が選択されます。ダブルクリックするとその意味を引きます。" #: src/frontends/qt4/ui/TocUi.ui:36 msgid "Filter:" @@ -4977,8 +4963,7 @@ msgstr "LyX: 入力して下さい" #: src/frontends/qt4/ui/ToggleWarningUi.ui:44 msgid "If you check this, LyX will not warn you again in the given case." -msgstr "" -"これを有効にすると、LyXは当該ケースについて今後警告することはなくなります。" +msgstr "これを有効にすると、LyXは当該ケースについて今後警告することはなくなります。" #: src/frontends/qt4/ui/ToggleWarningUi.ui:47 msgid "&Do not show this warning again!" @@ -5009,32 +4994,28 @@ msgid "VFill" msgstr "垂直フィル" #: src/frontends/qt4/ui/ViewSourceUi.ui:33 -#, fuzzy msgid "F&ormat:" -msgstr "形式(&F):" +msgstr "形式(&O):" #: src/frontends/qt4/ui/ViewSourceUi.ui:46 msgid "Select the output format" msgstr "出力形式を指定して下さい" #: src/frontends/qt4/ui/ViewSourceUi.ui:57 -#, fuzzy msgid "Current Paragraph" -msgstr "段落の行頭下げ(&I)" +msgstr "現在の段落" #: src/frontends/qt4/ui/ViewSourceUi.ui:62 -#, fuzzy msgid "Complete Source" msgstr "全ソース" #: src/frontends/qt4/ui/ViewSourceUi.ui:67 msgid "Preamble Only" -msgstr "" +msgstr "プリアンブルのみ" #: src/frontends/qt4/ui/ViewSourceUi.ui:72 -#, fuzzy msgid "Body Only" -msgstr "限定表示" +msgstr "本文のみ" #: src/frontends/qt4/ui/ViewSourceUi.ui:80 msgid "Automatic update" @@ -7659,24 +7640,20 @@ msgid "Case \\arabic{case}" msgstr "ケース \\arabic{case}" #: lib/layouts/elsarticle.layout:54 -#, fuzzy msgid "BeginFrontmatter" -msgstr "文頭辞" +msgstr "文頭辞開始" #: lib/layouts/elsarticle.layout:64 -#, fuzzy msgid "Begin frontmatter" -msgstr "文頭辞" +msgstr "文頭辞開始" #: lib/layouts/elsarticle.layout:72 -#, fuzzy msgid "EndFrontmatter" -msgstr "文頭辞" +msgstr "文頭辞終了(EndFrontmatter)" #: lib/layouts/elsarticle.layout:75 -#, fuzzy msgid "End frontmatter" -msgstr "文頭辞" +msgstr "文頭辞終了" #: lib/layouts/elsarticle.layout:100 msgid "Titlenotemark" @@ -8585,33 +8562,28 @@ msgid "ACKNOWLEDGEMENTS" msgstr "謝辞" #: lib/layouts/jasatex.layout:114 -#, fuzzy msgid "Alternative Affiliation" -msgstr "第二所属:" +msgstr "第二所属" #: lib/layouts/jasatex.layout:122 -#, fuzzy msgid "Homepage" -msgstr "新規頁" +msgstr "ホームページ" #: lib/layouts/jasatex.layout:210 lib/layouts/revtex4-1.layout:178 msgid "PACS numbers:" msgstr "PACS 番号:" #: lib/layouts/jasatex.layout:213 -#, fuzzy msgid "Preprint number" -msgstr "前刷り" +msgstr "前刷り番号" #: lib/layouts/jasatex.layout:216 -#, fuzzy msgid "Preprint number:" -msgstr "前刷り" +msgstr "前刷り番号:" #: lib/layouts/jasatex.layout:236 lib/layouts/jasatex.layout:240 -#, fuzzy msgid "Online citation" -msgstr "参考文献を挿入" +msgstr "オンライン文献" #: lib/layouts/kluwer.layout:198 msgid "AddressForOffprints" @@ -10316,24 +10288,20 @@ msgid "Claim \\thetheorem." msgstr "主張 \\thetheorem." #: lib/layouts/theorems-case.inc:12 -#, fuzzy msgid "Case \\arabic{casei}." -msgstr "ケース \\arabic{case}" +msgstr "ケース \\arabic{casei}." #: lib/layouts/theorems-case.inc:16 -#, fuzzy msgid "Case \\roman{caseii}." -msgstr "ケース \\arabic{case}" +msgstr "ケース \\roman{caseii}" #: lib/layouts/theorems-case.inc:20 -#, fuzzy msgid "Case \\alph{caseiii}." -msgstr "ケース \\thecase." +msgstr "ケース \\alph{caseiii}." #: lib/layouts/theorems-case.inc:24 -#, fuzzy msgid "Case \\arabic{caseiv}." -msgstr "ケース \\arabic{case}" +msgstr "ケース \\arabic{caseiv}." #: lib/layouts/theorems-order.inc:46 lib/layouts/theorems-starred.inc:173 msgid "Example*" @@ -10396,9 +10364,8 @@ msgid "# [number of Prob]" msgstr "# [Prob番号]" #: lib/layouts/theorems-without-preamble.inc:358 -#, fuzzy msgid "Property \\theproperty." -msgstr "性質 \\theproperty" +msgstr "性質 \\theproperty." #: lib/layouts/theorems-without-preamble.inc:392 #: lib/layouts/theorems-ams-extended-bytype.module:202 @@ -10406,15 +10373,13 @@ msgid "Note \\thenote." msgstr "注釈 \\thenote." #: lib/layouts/basic.module:2 -#, fuzzy msgid "Default (basic)" -msgstr "既定値のスキップ" +msgstr "既定値(basic)" #: lib/layouts/basic.module:6 lib/layouts/jurabib.module:8 #: lib/layouts/natbib.module:9 -#, fuzzy msgid "Citation engine" -msgstr "文献引用" +msgstr "引用エンジン" #: lib/layouts/basic.module:22 lib/layouts/jurabib.module:49 #: lib/layouts/natbib.module:44 @@ -10427,38 +10392,32 @@ msgid "Add to bibliography only." msgstr "書誌情報にのみ追加する。" #: lib/layouts/bicaption.module:2 -#, fuzzy msgid "Multilingual captions" -msgstr "追加オプション(&P)" +msgstr "多言語キャプション" #: lib/layouts/bicaption.module:6 -#, fuzzy msgid "" "Provides two styles to typeset multilingual captions. For a description see " "the file MultilingualCaptions.lyx in LyX's examples folder." msgstr "" -"化学物質のリスクと安全性に関する表示の番号と説明文を組版するための、2つの差込" -"枠と1つの環境を提供します。詳細については、LyX用例フォルダ中のR-S-statements." -"lyxをご覧ください。" +"多言語のキャプションを組むための様式を2つ提供します。詳細については、 " +"LyX用例フォルダ中のMultilingualCaptions.lyxをご覧ください。" #: lib/layouts/bicaption.module:10 -#, fuzzy msgid "Caption setup" -msgstr "キャプション" +msgstr "キャプション設定" #: lib/layouts/bicaption.module:25 -#, fuzzy msgid "Caption setup:" -msgstr "キャプション:" +msgstr "キャプション設定:" #: lib/layouts/bicaption.module:34 -#, fuzzy msgid "Bicaption" -msgstr "キャプション" +msgstr "複言語キャプション" #: lib/layouts/bicaption.module:42 msgid "Multilingual caption:" -msgstr "" +msgstr "多言語キャプション:" #: lib/layouts/braille.module:2 msgid "Braille" @@ -10701,32 +10660,28 @@ msgid "Initial" msgstr "イニシャル" #: lib/layouts/jurabib.module:2 -#, fuzzy msgid "Jurabib" -msgstr "&Jurabib" +msgstr "Jurabib" #: lib/layouts/jurabib.module:51 -#, fuzzy msgid "bibliography entry" -msgstr "書誌情報項目" +msgstr "文献項目" #: lib/layouts/jurabib.module:52 -#, fuzzy msgid "Bibliography entry." -msgstr "書誌情報項目" +msgstr "文献項目" #: lib/layouts/jurabib.module:53 msgid "before" msgstr "前置テキスト" #: lib/layouts/jurabib.module:54 -#, fuzzy msgid "short title" -msgstr "短縮タイトル:" +msgstr "短縮タイトル" #: lib/layouts/knitr.module:2 lib/configure.py:536 msgid "Rnw (knitr)" -msgstr "" +msgstr "Rnw (knitr)" #: lib/layouts/knitr.module:6 msgid "" @@ -10734,6 +10689,10 @@ msgid "" "has to be installed for this module to work: install.packages('knitr'). Note " "it depends on R >= 2.14.1. For more info see http://yihui.github.com/knitr" msgstr "" +"動的レポート生成用にRでknitrパッケージを使用します。このモジュールを機能させ" +"るには、install.packages('knitr') のようにして、Rパッケージを導入してくださ" +"い。これは、R >= 2.14.1 に依存します。詳細については http://yihui.github.com/knitr " +"をご覧ください。" #: lib/layouts/knitr.module:6 lib/layouts/noweb.module:5 #: lib/layouts/sweave.module:6 @@ -10939,9 +10898,8 @@ msgid "---End Multiple Columns---" msgstr "―――多段組終わり―――" #: lib/layouts/natbib.module:2 -#, fuzzy msgid "Natbib" -msgstr "&NatBib" +msgstr "NatBib" #: lib/layouts/noweb.module:2 msgid "Noweb" @@ -11426,9 +11384,8 @@ msgid "Armenian" msgstr "アルメニア語" #: lib/languages:138 -#, fuzzy msgid "English (Australia)" -msgstr "英語(アメリカ)" +msgstr "英語(オーストラリア)" #: lib/languages:147 msgid "German (Austria, old spelling)" @@ -11616,9 +11573,8 @@ msgid "Mongolian" msgstr "モンゴル語" #: lib/languages:610 -#, fuzzy msgid "English (New Zealand)" -msgstr "英語(カナダ)" +msgstr "英語(ニュージーランド)" #: lib/languages:619 msgid "Norwegian (Bokmaal)" @@ -12932,12 +12888,11 @@ msgstr "選択(行を連結して)(I)|I" #: lib/ui/stdmenus.inc:160 msgid "Unformatted Text|U" -msgstr "" +msgstr "書式なし平文(U)|U" #: lib/ui/stdmenus.inc:161 -#, fuzzy msgid "Unformatted, Join Lines|o" -msgstr "平文(行を連結して)(J)|J" +msgstr "書式なし平文(行を連結して)(O)|O" #: lib/ui/stdmenus.inc:163 msgid "Paste as LinkBack PDF" @@ -13644,18 +13599,16 @@ msgid "Linguistics Manual|L" msgstr "言語学向け説明書(L)|L" #: lib/ui/stdmenus.inc:594 -#, fuzzy msgid "Multilingual Captions Manual|C" -msgstr "言語学向け説明書(L)|L" +msgstr "多言語キャプション説明書(C)|C" #: lib/ui/stdmenus.inc:595 msgid "Risk and safety statements Manual|R" msgstr "リスクと安全性に関する表示(R)|R" #: lib/ui/stdmenus.inc:596 -#, fuzzy msgid "Sweave Manual|S" -msgstr "Sweave|S" +msgstr "Sweave説明書|S" #: lib/ui/stdmenus.inc:597 msgid "XY-pic Manual|X" @@ -13930,12 +13883,12 @@ msgid "Align bottom" msgstr "下に揃える" #: lib/ui/stdtoolbars.inc:165 -msgid "Rotate cell" -msgstr "セルを回転" +msgid "Rotate cell by 90 degrees or unset rotation" +msgstr "セルを90度回転させるか回転を解除する" #: lib/ui/stdtoolbars.inc:166 -msgid "Rotate table" -msgstr "表を回転" +msgid "Rotate table by 90 degrees or unset rotation" +msgstr "表を90度回転させるか回転を解除する" #: lib/ui/stdtoolbars.inc:167 msgid "Set multi-column" @@ -14397,19 +14350,19 @@ msgstr "垂直方向の埋め草\t\\vphantom" #: lib/ui/stdtoolbars.inc:339 msgid "Smash \\smash" -msgstr "" +msgstr "無高化(smash) \\smash" #: lib/ui/stdtoolbars.inc:340 msgid "Left overlap \\mathllap" -msgstr "" +msgstr "左オーバーラップ \\mathllap" #: lib/ui/stdtoolbars.inc:341 msgid "Center overlap \\mathclap" -msgstr "" +msgstr "中央オーバーラップ \\mathclap" #: lib/ui/stdtoolbars.inc:342 msgid "Right overlap \\mathrlap" -msgstr "" +msgstr "右オーバーラップ \\mathrlap" #: lib/ui/stdtoolbars.inc:345 msgid "Roots" @@ -14672,24 +14625,20 @@ msgid "underset" msgstr "underset" #: lib/ui/stdtoolbars.inc:424 -#, fuzzy msgid "cancel" -msgstr "取り消し" +msgstr "cancel" #: lib/ui/stdtoolbars.inc:425 -#, fuzzy msgid "bcancel" -msgstr "取り消し" +msgstr "bcancel" #: lib/ui/stdtoolbars.inc:426 -#, fuzzy msgid "xcancel" -msgstr "取り消し" +msgstr "xcancel" #: lib/ui/stdtoolbars.inc:427 -#, fuzzy msgid "cancelto" -msgstr "取り消し" +msgstr "cancelto" #: lib/ui/stdtoolbars.inc:431 msgid "leftarrow" @@ -16444,7 +16393,6 @@ msgid "Spreadsheet" msgstr "表計算表" #: lib/external_templates:39 -#, fuzzy msgid "" "A spreadsheet made with Gnumeric, LibreOffice, OpenOffice or Excel.\n" "It imports as a long table, so any length\n" @@ -16452,7 +16400,7 @@ msgid "" "The gnumeric software is necessary for conversion,\n" "both for gnumeric and excel files.\n" msgstr "" -"GnumericやOpenOfficeやExcelで作成された表計算表。\n" +"GnumericやLibreOffice、OpenOffice、Excelで作成された表計算表。\n" "長尺表として読み込まれるので、どのような大きさでも大丈夫です。\n" "あまりにも大きいと問題が発生します。Gnumericファイル・\n" "Excelファイルとも変換にはGnumericが必要です。\n" @@ -16550,7 +16498,6 @@ msgid "PDF pages" msgstr "PDFページ" #: lib/external_templates:303 -#, fuzzy msgid "" "Includes PDF documents, using the 'pdfpages' package.\n" "To include multiple pages, use the 'pages'-option,\n" @@ -16566,12 +16513,15 @@ msgid "" "for further options and details.\n" msgstr "" "PDF文書を「pdfpages」パッケージを使って挿入します。\n" -"複数のページを挿入するには、pagesオプションを使用してください。\n" +"複数のページを挿入するには、「pages」オプションを使用してください。\n" "これは「オプション」タグ内で指定しなくてはなりません。\n" "用例：\n" "* pages={x-y} (ページ範囲の指定)\n" "* pages={x,y,z}(特定ページの指定)\n" "* pages=- (全ページを含めるとき)\n" +"* pages=last- (全ページを逆順で含めるとき)\n" +"「noautoscale」オプションを用いると、PDFページが\n" +"元々の大きさで挿入されます。" "他のオプションや詳細については、pdfpagesパッケージの\n" "取扱説明書をお読みください。\n" @@ -16596,14 +16546,12 @@ msgid "Dia diagram.\n" msgstr "Dia ダイアグラム\n" #: lib/configure.py:487 -#, fuzzy msgid "tgo" -msgstr "top" +msgstr "tgo" #: lib/configure.py:487 -#, fuzzy msgid "tgo|Tgif" -msgstr "Tgif" +msgstr "tgo|Tgif" #: lib/configure.py:490 msgid "FIG" @@ -16710,9 +16658,8 @@ msgid "Graphviz Dot" msgstr "Graphviz Dot" #: lib/configure.py:531 -#, fuzzy msgid "LaTeX (dviluatex)" -msgstr "LaTeX (pdflatex)" +msgstr "LaTeX (dviluatex)" #: lib/configure.py:532 msgid "LaTeX (pLaTeX)" @@ -16816,7 +16763,7 @@ msgstr "EPS" #: lib/configure.py:568 msgid "EPS (uncropped)" -msgstr "" +msgstr "EPS (切り落としなし)" #: lib/configure.py:569 msgid "Postscript" @@ -17019,9 +16966,8 @@ msgid "No year" msgstr "年がありません" #: src/BiblioInfo.cpp:745 -#, fuzzy msgid "Bibliography entry not found!" -msgstr "書誌情報の生成" +msgstr "文献項目が見当たりません！" #: src/Buffer.cpp:136 #, c-format @@ -17184,16 +17130,14 @@ msgstr "変換スクリプトが失敗しました" msgid "" "%1$s is from an older version of LyX and the lyx2lyx script failed to " "convert it." -msgstr "" -"%1$s は旧版のLyXで作成されており，スクリプトlyx2lyxは変換に失敗 しました。" +msgstr "%1$s は旧版のLyXで作成されており，スクリプトlyx2lyxは変換に失敗 しました。" #: src/Buffer.cpp:1128 #, c-format msgid "" "%1$s is from a newer version of LyX and the lyx2lyx script failed to convert " "it." -msgstr "" -"%1$s は新版のLyXファイルなので，スクリプトlyx2lyxが変換に失敗しました。" +msgstr "%1$s は新版のLyXファイルなので，スクリプトlyx2lyxが変換に失敗しました。" #: src/Buffer.cpp:1149 src/Buffer.cpp:3942 src/Buffer.cpp:4004 msgid "File is read-only" @@ -17310,9 +17254,8 @@ msgid "conversion failed" msgstr "変換に失敗しました" #: src/Buffer.cpp:1525 -#, fuzzy msgid "Uncodable character in file path" -msgstr "著者名にコード化できない文字があります" +msgstr "ファイルパスにコード化できない文字があります" #: src/Buffer.cpp:1527 #, c-format @@ -17327,6 +17270,15 @@ msgid "" "In case of problems, choose an appropriate document encoding\n" "(such as utf8) or change the file path name." msgstr "" +"お使いの文書のパス\n" +"(%1$s)\n" +"には、現在の文書エンコーディング(%2$s)では使われていないグリフが含まれています。 " +"TEXINPUTSに文書ディレクトリが含まれていて、プリアンブルやTeXコードで、明示的に " +"相対パスを使っていない限りは(即ち「./」や「../」で始まるパスを使っていない限りは)、 " +"これは不完全な出力をもたらします。\n" +"\n" +"問題が生じる場合には、(utf8などの)適切な文書エンコーディングを用いるか、\n" +"ファイルパス名を変更してください。" #: src/Buffer.cpp:1879 msgid "Running chktex..." @@ -17403,14 +17355,12 @@ msgid "Preview source code" msgstr "ソースコードをプレビューする" #: src/Buffer.cpp:3328 -#, fuzzy msgid "Preview preamble" -msgstr "プレビューの準備ができました" +msgstr "プリアンブルをプレビューする" #: src/Buffer.cpp:3330 -#, fuzzy msgid "Preview body" -msgstr "プレビューの準備ができました" +msgstr "本文をプレビューする" #: src/Buffer.cpp:3432 #, c-format @@ -18338,8 +18288,7 @@ msgstr "レイアウトが見つかりません" #: src/CutAndPaste.cpp:696 #, c-format msgid "Flex inset %1$s is undefined after reloading `%2$s' layout." -msgstr "" -"「%2$s」レイアウトを読み込み直したため自由差込枠%1$sは未定義になりました。" +msgstr "「%2$s」レイアウトを読み込み直したため自由差込枠%1$sは未定義になりました。" #: src/CutAndPaste.cpp:699 #, c-format @@ -18922,8 +18871,7 @@ msgstr "" #: src/LyXRC.cpp:3098 msgid "Define the options of the bibtex program for PLaTeX (Japanese LaTeX)." -msgstr "" -"pLaTeX(日本語LaTeX)用のbibtexプログラムのオプションを定義してください。" +msgstr "pLaTeX(日本語LaTeX)用のbibtexプログラムのオプションを定義してください。" #: src/LyXRC.cpp:3102 msgid "" @@ -18935,8 +18883,7 @@ msgstr "" #: src/LyXRC.cpp:3106 msgid "Select to check whether the lastfiles still exist." -msgstr "" -"最後のファイルがまだ存在するかどうかをチェックするときには選んでください。" +msgstr "最後のファイルがまだ存在するかどうかをチェックするときには選んでください。" #: src/LyXRC.cpp:3110 msgid "" @@ -18965,8 +18912,7 @@ msgstr "" #: src/LyXRC.cpp:3132 msgid "Make Apple key act as Meta and Control key as Ctrl." -msgstr "" -"アップルキーをMetaキーとして、コントロールキーをCtrlキーとして動作させます。" +msgstr "アップルキーをMetaキーとして、コントロールキーをCtrlキーとして動作させます。" #: src/LyXRC.cpp:3136 msgid "Use the Mac OS X conventions for the word-level cursor movement" @@ -18976,8 +18922,7 @@ msgstr "単語間のカーソル移動にMac OS X式の方法を使う。" msgid "" "Show a small box around a Math Macro with the macro name when the cursor is " "inside." -msgstr "" -"カーソルが内部にある時に、数式マクロをマクロ名のついた小さなボックスで囲む。" +msgstr "カーソルが内部にある時に、数式マクロをマクロ名のついた小さなボックスで囲む。" #: src/LyXRC.cpp:3145 #, no-c-format @@ -19020,8 +18965,7 @@ msgstr "LyX が画像をどのように表示するかを選びます。" msgid "" "The default path for your documents. An empty value selects the directory " "LyX was started from." -msgstr "" -"文書への既定パス。空の値は，LyX を開始したディレクトリを選ぶことになります。" +msgstr "文書への既定パス。空の値は，LyX を開始したディレクトリを選ぶことになります。" #: src/LyXRC.cpp:3173 msgid "Specify additional chars that can be part of a word." @@ -19132,8 +19076,7 @@ msgstr "" #: src/LyXRC.cpp:3245 msgid "De-select if you do not want LyX to scroll to saved position." -msgstr "" -"LyXが保存位置までスクロールしないようにしたいときは，非選択にしてください。" +msgstr "LyXが保存位置までスクロールしないようにしたいときは，非選択にしてください。" #: src/LyXRC.cpp:3249 msgid "De-select to prevent loading files opened from the last LyX session." @@ -19180,8 +19123,7 @@ msgstr "複数の補完候補がある際、遅延なしに補完ポップアッ msgid "" "Show a small triangle on the cursor to indicate that a completion is " "available." -msgstr "" -"補完が利用可能であることを示すためにカーソル上に小さな三角形を表示します。" +msgstr "補完が利用可能であることを示すためにカーソル上に小さな三角形を表示します。" #: src/LyXRC.cpp:3286 msgid "The inline completion delay." @@ -19206,8 +19148,7 @@ msgstr "=>を\\Rightarrowに変換するなどのTeXMacs用簡略記法を許可 #: src/LyXRC.cpp:3306 #, c-format msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu." -msgstr "" -"最後に使ったファイルの最大表示数。%1$d までファイルメニューに表示できます。" +msgstr "最後に使ったファイルの最大表示数。%1$d までファイルメニューに表示できます。" #: src/LyXRC.cpp:3317 msgid "Shows a typeset preview of things such as math" @@ -19532,8 +19473,7 @@ msgstr "未知のトークン" msgid "" "You cannot insert a space at the beginning of a paragraph. Please read the " "Tutorial." -msgstr "" -"空白を段落の先頭に挿入することはできません。LyX入門篇を読んでください。" +msgstr "空白を段落の先頭に挿入することはできません。LyX入門篇を読んでください。" #: src/Text.cpp:980 msgid "You cannot type two spaces this way. Please read the Tutorial." @@ -19665,8 +19605,7 @@ msgstr "破損ファイル" #: src/TextClass.cpp:809 msgid "Could not read stdinsets.inc! This may lead to data loss!" -msgstr "" -"stdinsets.incを読むことができません！データ喪失につながる可能性があります！" +msgstr "stdinsets.incを読むことができません！データ喪失につながる可能性があります！" #: src/TextClass.cpp:1473 #, c-format @@ -20084,11 +20023,11 @@ msgstr "" #: src/frontends/qt4/FindAndReplace.cpp:297 msgid "Advanced search in progress (press ESC to cancel) . . ." -msgstr "" +msgstr "詳細検索中です(取り消すにはESCを押してください) . . ." #: src/frontends/qt4/FindAndReplace.cpp:341 msgid "Advanced search cancelled by user" -msgstr "" +msgstr "ユーザが詳細検索を取り消しました" #: src/frontends/qt4/FindAndReplace.cpp:359 msgid "Wrap search?" @@ -20866,26 +20805,21 @@ msgstr "mathdo&tsパッケージを使う" msgid "" "The LaTeX package mathdots is only used if the command \\iddots is inserted " "into formulas" -msgstr "" -"数式に\\iddotsが挿入されたときに限り、LaTeXパッケージmathdotsが読み込まれます" +msgstr "数式に\\iddotsが挿入されたときに限り、LaTeXパッケージmathdotsが読み込まれます" #: src/frontends/qt4/GuiDocument.cpp:190 -#, fuzzy msgid "Use mathtools package automatically" -msgstr "math&dotsパッケージを自動的に使う(&U)" +msgstr "自動的にmathtoolsパッケージを使う" #: src/frontends/qt4/GuiDocument.cpp:191 -#, fuzzy msgid "Use mathtools package" -msgstr "mathdo&tsパッケージを使う" +msgstr "mathtoolsパッケージを使う" #: src/frontends/qt4/GuiDocument.cpp:192 -#, fuzzy msgid "" "The LaTeX package mathtools is only used if some mathematical relations are " "inserted into formulas" -msgstr "" -"数式に\\iddotsが挿入されたときに限り、LaTeXパッケージmathdotsが読み込まれます" +msgstr "数式に何らかの数学関係式が挿入されたときに限り、LaTeXパッケージmathtoolsが読み込まれます" #: src/frontends/qt4/GuiDocument.cpp:194 msgid "Use mhchem &package automatically" @@ -21174,9 +21108,9 @@ msgid "The AMS LaTeX packages are always used" msgstr "AMS LaTeXパッケージをつねに使用します" #: src/frontends/qt4/GuiDocument.cpp:1221 -#, fuzzy, c-format +#, c-format msgid "The LaTeX package %1$s is always used" -msgstr "LaTeXパッケージesintをつねに使用します" +msgstr "LaTeXパッケージ%1$sを常に使用します" #: src/frontends/qt4/GuiDocument.cpp:1290 #, c-format @@ -21354,9 +21288,9 @@ msgid "Module provided by document class." msgstr "文書クラスの提供するモジュールです。" #: src/frontends/qt4/GuiDocument.cpp:2237 -#, fuzzy, c-format +#, c-format msgid "Category: %1$s." -msgstr "カテゴリ(&T):" +msgstr "カテゴリ: %1$s" #: src/frontends/qt4/GuiDocument.cpp:2245 #, c-format @@ -21387,12 +21321,11 @@ msgstr "[事前定義されたオプションがありません]" #: src/frontends/qt4/GuiDocument.cpp:3202 msgid "C&ustomize Hyperref Options" -msgstr "" +msgstr "Hyperrefオプションを設定する(&U)" #: src/frontends/qt4/GuiDocument.cpp:3204 -#, fuzzy msgid "&Use Hyperref Support" -msgstr "hyperrefサポートを使う(&U)" +msgstr "Hyperrefサポートを使う(&U)" #: src/frontends/qt4/GuiDocument.cpp:3353 msgid "Can't set layout!" @@ -22156,9 +22089,8 @@ msgid "" msgstr "文末に到達しました。文頭から続きを行いますか?" #: src/frontends/qt4/GuiSpellchecker.cpp:530 -#, fuzzy msgid "Spell checker has no dictionaries." -msgstr "綴り検証エンジン(&S):" +msgstr "スペルチェッカの辞書がありません。" #: src/frontends/qt4/GuiSymbols.cpp:54 msgid "Basic Latin" @@ -22760,10 +22692,15 @@ msgid "" "Please close it before attempting to overwrite it.\n" "Do you want to choose a new filename?" msgstr "" +"ファイル\n" +"%1$s\n" +"は、ご使用中のセッションに既に開かれています。\n" +"上書きする前にそちらを閉じてください。\n" +"新しいファイル名を付けますか？" #: src/frontends/qt4/GuiView.cpp:2295 msgid "Chosen File Already Open" -msgstr "" +msgstr "選択したファイルは開き済みです" #: src/frontends/qt4/GuiView.cpp:2296 src/frontends/qt4/GuiView.cpp:2311 #: src/frontends/qt4/GuiView.cpp:2386 src/frontends/qt4/GuiView.cpp:2434 @@ -22881,14 +22818,12 @@ msgid "No buffer for file: %1$s." msgstr "ファイル%1$sのバッファがありません。" #: src/frontends/qt4/GuiView.cpp:3117 -#, fuzzy msgid "Export Error" -msgstr "書き出し(E)|E" +msgstr "書き出しエラー" #: src/frontends/qt4/GuiView.cpp:3118 -#, fuzzy msgid "Error cloning the Buffer." -msgstr "読み込み可能な形式に変換するのに失敗しました" +msgstr "バッファの複製時にエラー発生" #: src/frontends/qt4/GuiView.cpp:3226 #, c-format @@ -24275,9 +24210,9 @@ msgid "Match found!" msgstr "一致箇所が見つかりました！" #: src/mathed/InsetFormulaMacro.cpp:122 -#, fuzzy, c-format +#, c-format msgid " Macro: %1$s: " -msgstr "パラメーター%1$s：" +msgstr "マクロ: %1$s：" #: src/mathed/InsetMathAMSArray.cpp:119 src/mathed/InsetMathHull.cpp:1700 #: src/mathed/InsetMathSplit.cpp:82 src/mathed/InsetMathSubstack.cpp:76 @@ -24429,8 +24364,7 @@ msgstr "LyXバイナリが見つかりません！" #, c-format msgid "" "Unable to determine the path to the LyX binary from the command line %1$s" -msgstr "" -"コマンドライン %1$s からは、LyXバイナリへのパスを特定することができません。" +msgstr "コマンドライン %1$s からは、LyXバイナリへのパスを特定することができません。" #: src/support/Package.cpp:590 #, c-format @@ -24482,7 +24416,7 @@ msgid "Directory not found" msgstr "ディレクトリが見つかりません" #: src/support/Systemcall.cpp:382 -#, fuzzy, c-format +#, c-format msgid "" "The command\n" "%1$s\n" @@ -24490,23 +24424,23 @@ msgid "" "\n" "Do you want to stop it?" msgstr "" -"文書「%1$s」はまだ保存されていません。\n" +"コマンド\n" +"%1$s\n" +"は、まだ終了していません。\n" "\n" -"この文書を保存しますか？" +"コマンドを停止しますか？" #: src/support/Systemcall.cpp:384 -#, fuzzy msgid "Stop command?" -msgstr "dateコマンド" +msgstr "コマンドを停止しますか？" #: src/support/Systemcall.cpp:385 -#, fuzzy msgid "&Stop it" -msgstr "上罫線を描画" +msgstr "停止する(&S)" #: src/support/Systemcall.cpp:385 msgid "Let it &run" -msgstr "" +msgstr "実行させたままにする(&R)" #: src/support/debug.cpp:41 msgid "No debugging messages" @@ -24681,6 +24615,12 @@ msgstr "" msgid "Unknown user" msgstr "未知の" +#~ msgid "Rotate cell" +#~ msgstr "セルを回転" + +#~ msgid "Rotate table" +#~ msgstr "表を回転" + #~ msgid "&New:" #~ msgstr "新規(&N):" From 856320f8eb36831584b4f976f8c830c34de91e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 14 Nov 2012 23:27:49 +0100 Subject: [PATCH 72/93] installer: 2 bugbixes - avoid doubled semicolon in LaTeX editor path list - correct path to the JabRef installation folder in LyX's PATH - updated to JabRef 2.8.1 - rename the installer executables from LyX-205-x-Bundle.exe --- .../Win32/packaging/installer/ChangeLog.txt | 6 +++++- .../packaging/installer/include/detection.nsh | 8 +++++--- .../Win32/packaging/installer/settings.nsh | 18 +++++++++--------- .../packaging/installer/setup/install.nsh | 1 + 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 58fd866958..dc45c745a5 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,8 @@ -Changelog for LyX-205-2: +Changelog for LyX-205-3: +- updated to JabRef 2.8.1 + + +Changelog for LyX-205-2: - the installer detects now existing spell-checker and thesaurus dictionaries of existing LyX installations - fixed un/installation of Jabref if bundle installer is executed without having admin privileges diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index a27e5bbf78..7019666a7a 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -235,8 +235,10 @@ Function EditorCheck ${else} SetRegView 32 ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "InstallLocation" - StrCpy $0 $0 -1 # remove the "\" - StrCpy $EditorPath "$EditorPath;$0" + ${if} $0 != "" + StrCpy $0 $0 -1 # remove the "\" + StrCpy $EditorPath "$EditorPath;$0" + ${endif} ${endif} SetRegView 32 @@ -244,7 +246,7 @@ Function EditorCheck StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation" ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;$0" + StrCpy $EditorPath "$EditorPath;f$0" ${endif} FunctionEnd diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index b2d70b199e..840b37d59a 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -12,7 +12,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 0 !define APP_VERSION_REVISION 5 -!define APP_VERSION_BUILD 2 # Start with 1 for the installer releases of each version +!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display @@ -22,10 +22,10 @@ These typically need to be modified for each LyX release # Typical names for the release are "LyX-201-1-Installer.exe" etc. !ifndef ExeFile - !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Installer.exe" + !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-Installer-${APP_VERSION_BUILD}.exe" !endif !ifndef BundleExeFile - !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-${APP_VERSION_BUILD}-Bundle.exe" + !define BundleExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}-Bundle-${APP_VERSION_BUILD}.exe" !endif !ifndef MinimalExeFile !define /date MinimalExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}svn-%Y%m%d-Installer-Minimal.exe" @@ -35,10 +35,10 @@ These typically need to be modified for each LyX release # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_LYX "C:\LyX\lyx-20-install" -!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20" -!define FILES_BUNDLE "C:\LyX\depsbundle" -!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3" +!define FILES_LYX "D:\LyXPackage2.0\LyX" +!define FILES_DEPS "D:\LyXGit\2.0.x\lyx-windows-deps-msvc2008" +!define FILES_BUNDLE "D:\LyX\depsbundle" +!define FILES_QT "D:\Qt" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" @@ -48,13 +48,13 @@ 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 JabRefVersion "2.8" +!define JabRefVersion "2.8.1" !define MiKTeXDeliveredVersion "2.9" !define ImageMagickVersion "6.8.0" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define JabRefInstall "external\JabRef-2.8-setup.exe" + !define JabRefInstall "external\JabRef-2.8.1-setup.exe" !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4521.exe" !define SIZE_DOWNLOAD_LATEX 162476 !define SIZE_LATEX 380000 diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 68e553177e..c0dd5901d0 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -111,6 +111,7 @@ Section -ProgramFiles SecProgramFiles ${if} $MultiUser.Privileges == "Admin" ${orif} $MultiUser.Privileges == "Power" ReadRegStr $PathBibTeXEditor HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" + StrCpy $PathBibTeXEditor $PathBibTeXEditor -14 # remove "\uninstall.exe" ${else} # for non-admin users we can only check if it is in the start menu ReadRegStr $PathBibTeXEditor HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "StartMenu" From 4dd05e1f3530d35616dc01e825f72700f50e43d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 14 Nov 2012 23:32:20 +0100 Subject: [PATCH 73/93] installer: partyl revert last commit - my changes were accidentally pushed before I even finished to write the commit message, sorry --- .../Win32/packaging/installer/include/detection.nsh | 2 +- development/Win32/packaging/installer/settings.nsh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 7019666a7a..11489d66d8 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -246,7 +246,7 @@ Function EditorCheck StrCpy $0 "" ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt 7" "InstallLocation" ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;f$0" + StrCpy $EditorPath "$EditorPath;$0" ${endif} FunctionEnd diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 840b37d59a..f84137aaba 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -35,10 +35,10 @@ These typically need to be modified for each LyX release # File locations # !!! you need to adjust them to the folders in your Windows system !!! -!define FILES_LYX "D:\LyXPackage2.0\LyX" -!define FILES_DEPS "D:\LyXGit\2.0.x\lyx-windows-deps-msvc2008" -!define FILES_BUNDLE "D:\LyX\depsbundle" -!define FILES_QT "D:\Qt" +!define FILES_LYX "C:\LyX\lyx-20-install" +!define FILES_DEPS "C:\LyX\lyx-20-build\msvc2010-deps\deps20" +!define FILES_BUNDLE "C:\LyX\depsbundle" +!define FILES_QT "C:\Qt\qt-everywhere-opensource-src-4.8.3" !define ClassFileDir "${FILES_LYX}\Resources\tex" !define DVIPostFileDir "${FILES_DEPS}\tex" From fac3217c4614ef4133eaf82442d2c58b250674cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 15 Nov 2012 01:24:52 +0100 Subject: [PATCH 74/93] installer: fix infinite loop (fixes bug #8417) --- development/Win32/packaging/installer/include/detection.nsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 11489d66d8..6ebf133871 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -73,7 +73,11 @@ Function MissingPrograms ${if} ${RunningX64} ${andif} $GhostscriptPath == "" StrCpy $3 0 - goto GSloop + # we have to assure that we only repeat once and not forever + ${if} $4 != "32" + StrCpy $4 "32" + goto GSloop + ${endif} ${endif} # test if Python is installed From 6c87c3626b98127b8d13f0f87cfcad60e3072b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 15 Nov 2012 01:37:59 +0100 Subject: [PATCH 75/93] installer: some further updates - updated translations - better check if MiKTeX was installed without admin privileges - remove support for the outdated MiKTeX 2.7 --- .../Win32/packaging/installer/ChangeLog.txt | 3 ++ .../packaging/installer/include/LaTeX.nsh | 28 ++++--------- .../Win32/packaging/installer/lang/french.nsh | 42 +++++++++---------- .../packaging/installer/lang/spanish.nsh | 33 +++++++-------- 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index dc45c745a5..7509feb4d7 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,5 +1,8 @@ Changelog for LyX-205-3: +- fixed infinite loop when starting the installer and not having Ghostscript previously installed (LyX bug #8417) - updated to JabRef 2.8.1 +- updated French and Spanish translation of the installer messages +- removed support for old installations of MiKTeX version 2.7 and older Changelog for LyX-205-2: diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh index d47dabcd7e..d88026ac14 100644 --- a/development/Win32/packaging/installer/include/LaTeX.nsh +++ b/development/Win32/packaging/installer/include/LaTeX.nsh @@ -31,7 +31,7 @@ Function LaTeXActions Call LaTeXCheck # sets the path to the latex.exe to $PathLaTeX # Function from LyXUtils.nsh ${if} $PathLaTeX != "" - # check if MiKTeX 2.7 or newer is installed + # check if MiKTeX 2.8 or newer is installed StrCpy $0 0 loopA: EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey @@ -40,10 +40,6 @@ Function LaTeXActions IntOp $0 $0 + 1 Goto loopA doneA: - ${if} $String == "2.7" - StrCpy $MiKTeXVersion "2.7" - StrCpy $LaTeXName "MiKTeX 2.7" - ${endif} ${if} $String == "2.8" StrCpy $MiKTeXVersion "2.8" StrCpy $LaTeXName "MiKTeX 2.8" @@ -73,10 +69,6 @@ Function LaTeXActions IntOp $0 $0 + 1 Goto loopB doneB: - ${if} $String == "2.7" - StrCpy $MiKTeXVersion "2.7" - StrCpy $LaTeXName "MiKTeX 2.7" - ${endif} ${if} $String == "2.8" StrCpy $MiKTeXVersion "2.8" StrCpy $LaTeXName "MiKTeX 2.8" @@ -119,7 +111,6 @@ Function LaTeXActions ${endif} ${endif} ${if} $PathLaTeX != "" - ${andif} $LaTeXName != "MiKTeX 2.7" ${andif} $LaTeXName != "MiKTeX 2.8" ${andif} $LaTeXName != "MiKTeX 2.9" StrCpy $LaTeXName "TeXLive" @@ -200,10 +191,11 @@ Function ConfigureMiKTeX ${endif} # only install a Perl interpreter if it is not already installed - # this is only possible if miktex and LyX is installed with the same privileges + # this is only possible if MikTeX _and_ LyX is installed with the same privileges + ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX $MiKTeXVersion" "DisplayVersion" ${if} $MultiUser.Privileges != "Admin" ${andif} $MultiUser.Privileges != "Power" - ${if} $PathLaTeX != "$LOCALAPPDATA\MiKTeX\$MiKTeXVersion\miktex\bin" + ${if} $0 == "" ${ifnot} ${FileExists} "$PathLaTeX\perl.exe" MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)" ${endif} @@ -265,20 +257,16 @@ Function UpdateMiKTeX MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater UpdateNow: StrCpy $0 $PathLaTeX -4 # remove "\bin" - # the update wizard is either started by the copystart_admin.exe - # or the miktex-update.exe (since MiKTeX 2.8) + # the update wizard is started by the miktex-update.exe ${if} $MultiUser.Privileges != "Admin" ${andif} $MultiUser.Privileges != "Power" # call the non-admin version - ExecWait '"$PathLaTeX\copystart.exe" "$0\config\update.dat"' - ExecWait '"$PathLaTeX\internal\miktex-update.exe"' + ExecWait '"$PathLaTeX\internal\miktex-update.exe"' ${else} ${if} $MiKTeXUser != "HKCU" # call the admin version - ExecWait '"$PathLaTeX\copystart_admin.exe" "$0\config\update.dat"' - ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"' # run MiKTeX's update wizard + ExecWait '"$PathLaTeX\internal\miktex-update_admin.exe"' ${else} - ExecWait '"$PathLaTeX\copystart.exe" "$0\config\update.dat"' - ExecWait '"$PathLaTeX\internal\miktex-update.exe"' + ExecWait '"$PathLaTeX\internal\miktex-update.exe"' ${endif} ${endif} UpdateLater: diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 6d787aece9..5fed2aa654 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -16,7 +16,7 @@ ${LangFileString} TEXT_WELCOME "Cet assistant va vous guider tout au long de l'i ${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Mise jour de la base de donnes MiKTeX..." ${LangFileString} TEXT_CONFIGURE_LYX "Configuration de LyX (MiKTeX peut tlcharger les paquetages manquants, ceci peut prendre du temps) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_PYTHON "Compilation des scripts Python..." ${LangFileString} TEXT_FINISH_DESKTOP "Crer un raccourci sur le bureau" ${LangFileString} TEXT_FINISH_WEBSITE "Consulter les dernires nouvelles, trucs et astuces sur le site lyx.org" @@ -29,12 +29,12 @@ ${LangFileString} SecFileAssocTitle "Associations de fichiers" ${LangFileString} SecDesktopTitle "Icne du bureau" ${LangFileString} SecCoreDescription "Les fichiers LyX" -${LangFileString} SecInstJabRefDescription "Gestionnaire de rfrences bibliographiques et diteur de ficjiers BibTeX." -${LangFileString} SecAllUsersDescription "Installer LyX pour tous les utilisateurs, ou seulement pour l'utilisateur courant ?." +${LangFileString} SecInstJabRefDescription "Gestionnaire de rfrences bibliographiques et diteur de fichiers BibTeX." +${LangFileString} SecAllUsersDescription "Installer LyX pour tous les utilisateurs, ou seulement pour l$\'utilisateur courant ?" ${LangFileString} SecFileAssocDescription "Les fichiers de suffixe .lyx seront automatiquement ouverts dans LyX." ${LangFileString} SecDesktopDescription "Une icne LyX sur le bureau." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDictionariesDescription "Les dictionnaires pour correcteur orthographique qui peuvent tre tlchargs et installs." +${LangFileString} SecThesaurusDescription "Les dictionnaires de synonymes qui peuvent tre tlchargs et installs." ${LangFileString} EnterLaTeXHeader1 'Distribution LaTeX' ${LangFileString} EnterLaTeXHeader2 'Choisir la distribution LaTeX que LyX devra utiliser.' @@ -61,8 +61,8 @@ ${LangFileString} LatexError1 'Distribution LaTeX introuvable !$\r$\n\ LyX ne peut tre utilis sans distribution LaTeX, comme par exemple $\"MiKTeX$\" !$\r$\n\ L$\'installation de LyX va donc tre abandonne.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Le chargement du dictionnaire pour la langue $\"$R3$\" a chou.' +${LangFileString} ThesaurusFailed 'Le chargement du dictionnaire de synonymes pour la langue $\"$R3$\" a chou.' ${LangFileString} JabRefInfo 'Lancement de l$\'installation de l$\'application $\"JabRef$\".$\r$\n\ Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.' @@ -81,34 +81,34 @@ ${LangFileString} MiKTeXInfo 'La distribution LaTeX $\"MiKTeX$\" sera utilis avant d$\'utiliser LyX pour la premire fois.$\r$\n\ Voulez-vous vrifier maintenant les mises jour de MiKTeX ?' -${LangFileString} ModifyingConfigureFailed "chec de l'allocation 'path_prefix' lors de la configuration." +${LangFileString} ModifyingConfigureFailed "chec de l$\'allocation 'path_prefix' lors de la configuration." ${LangFileString} RunConfigureFailed "chec de la tentative de configuration initiale de LyX." -${LangFileString} NotAdmin "Vous devez avoir les droits d'administration pour installer LyX !" -${LangFileString} InstallRunning "Le programme d'installation est toujours en cours !" +${LangFileString} NotAdmin "Vous devez avoir les droits d$\'administration pour installer LyX !" +${LangFileString} InstallRunning "Le programme d$\'installation est toujours en cours !" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} est dj install ! Le dsinstaller d'abord." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NewerInstalled "Vous essayez d$\'installer une version de LyX plus ancienne que celle qui est dj installe.$\r$\n\ + Si c$\'est ce qu vous voulez, vous devez d$\'abord dsinstaller LyX $OldVersionNumber." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "La possibilit d$\'utiliser plusieurs indexes dans un mme document ne sera pas disponible car$\r$\n\ + MiKTeX a t install avec des privilges d$\'administrateur et LyX a t istall sans." +${LangFileString} MetafileNotAvailable "La prise en compte par LyX d$\'images au format EMF ou WMF ne sera pas disponible$\r$\n\ + car elle necessite l$\'installation dans Windows d$\'une imprimante logicielle, $\r$\n\ + ce qui n$\'est possible qu$\'avec des privilges d$\'administrateur." ${LangFileString} FinishPageMessage "Flicitations ! LyX est install avec succs.$\r$\n\ $\r$\n\ (Le premier dmarrage de LyX peut demander quelques secondes.)" ${LangFileString} FinishPageRun "Dmarrer LyX" -${LangFileString} UnNotInRegistryLabel "LyX introuvable dans le base des registres.$\r$\n\ +${LangFileString} UnNotInRegistryLabel "LyX introuvable dans la base des registres.$\r$\n\ Les raccourcis sur le bureau et dans le menu de dmarrage ne seront pas supprims." -${LangFileString} UnInstallRunning "Vous devez fermer LyX d'abord !" -${LangFileString} UnNotAdminLabel "Vous devez avoir les droits d'administration pour dsinstaller LyX !" +${LangFileString} UnInstallRunning "Vous devez fermer LyX d$\'abord !" +${LangFileString} UnNotAdminLabel "Vous devez avoir les droits d$\'administration pour dsinstaller LyX !" ${LangFileString} UnReallyRemoveLabel "tes vous sr(e) de vouloir supprimer compltement LyX et tous ses composants ?" ${LangFileString} UnLyXPreferencesTitle 'Prfrences utilisateurs de LyX' ${LangFileString} SecUnMiKTeXDescription "Dsinstalle la distribution LaTeX MiKTeX." -${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." +${LangFileString} SecUnJabRefDescription "Dsinstalle le gestionnaire de bibliographie JabRef." ${LangFileString} SecUnPreferencesDescription 'Supprime le rpertoire de configuration de LyX$\r$\n\ $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ pour tous les utilisateurs.' diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index c02a2ce7ff..0ce59382b6 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -1,17 +1,17 @@ !insertmacro LANGFILE_EXT "Spanish" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "(Instalado para el actual usuario)" ${LangFileString} TEXT_WELCOME "Este programa instalar LyX en su ordenador.$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Actualizando la base de datos de nombre de archivo MiKTeX..." +${LangFileString} TEXT_CONFIGURE_LYX "Configurando LyX (MiKTeX podra descargar paquetes faltantes, lo que puede tardar un tiempo) ..." +${LangFileString} TEXT_CONFIGURE_PYTHON "Compilando guiones Python..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP "Crear acceso directo en el escritorio" +${LangFileString} TEXT_FINISH_WEBSITE "Visite lyx.org para ltimas noticias, ayuda y consejos" ${LangFileString} FileTypeTitle "Documento LyX" @@ -25,8 +25,8 @@ ${LangFileString} SecInstJabRefDescription "Administrador de referencias bibliog ${LangFileString} SecAllUsersDescription "Instalar LyX para todos los usuarios o slo para el usuario actual." ${LangFileString} SecFileAssocDescription "Asociar la extensin .lyx con LyX." ${LangFileString} SecDesktopDescription "Crear un icono de LyX en el escritorio." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDictionariesDescription "Diccionarios de revisin ortogrfica que se pueden descargar e instalar." +${LangFileString} SecThesaurusDescription "Diccionarios de sinnimos que se pueden descargar e instalar." ${LangFileString} EnterLaTeXHeader1 'Distribucin LaTeX' ${LangFileString} EnterLaTeXHeader2 'Elija la distribucin de LaTeX que debera emplear LyX.' @@ -53,8 +53,8 @@ ${LangFileString} LatexError1 ' LyX no funciona sin una distribucin de LaTeX como $\"MiKTeX$\"!$\r$\n\ Por lo tanto la instalacin se abortar.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'La descarga del diccionario para el idioma $\"$R3$\" ha fallado.' +${LangFileString} ThesaurusFailed 'La descarga del diccionario de sinnimos para el idioma $\"$R3$\" ha fallado.' ${LangFileString} JabRefInfo 'Ahora se lanzar el instalador del programa $\"JabRef$\".$\r$\n\ Puede utilizar todas las opciones por defecto del instaldor de JabRef.' @@ -78,14 +78,13 @@ ${LangFileString} RunConfigureFailed "Error al intentar ejecutar el programa de ${LangFileString} NotAdmin "Necesita privilegios de administrador para instalar LyX!" ${LangFileString} InstallRunning "El instalador ya esta siendo ejecutado!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ya esta instalado! Antes desinstale LyX." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NewerInstalled "Est tratando de instalar una versin de LyX ms antigua que la que tiene instalada.$\r$\n\ + Si realmente lo desea, debe desinstalar antes la versin de LyX instalada $OldVersionNumber." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "El soporte para el uso de varios ndices en un documento no estar disponible porque$\r$\n\ + MiKTeX se instal con privilegios de administrador pero LyX se est instalando ahora sin ellos." +${LangFileString} MetafileNotAvailable "El soporte de LyX para imgenes en formato EMF o WMF no estar$\r$\n\ + disponible, ya que requiere la instalacin de un software de impresora$\r$\n\ para Windows que slo es posible con privilegios de administrador." ${LangFileString} FinishPageMessage "Enhorabuena! LyX ha sido instalado con xito.$\r$\n\ $\r$\n\ From 9d99d3dbea13bde365273a6c36e087573f66a02b Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 15 Nov 2012 22:01:19 +0100 Subject: [PATCH 76/93] Implement extractFromVC() for CVS and SVN. Both cvs and svn are able to retrieve non-existing files from repository, but this was only implemented for rcs. This is a prerequisite for the planned move and copy VCV operations. I also improved error schecking and used extractFromVC() also for files specified on the command line if they do not exist (in GUI mode, it was already the case in non-GUI mode). --- src/Buffer.h | 3 +-- src/LyXVC.cpp | 35 +++++++++++++++++++++++++++-------- src/LyXVC.h | 4 +++- src/VCBackend.cpp | 25 ++++++++++++++++++++++--- src/VCBackend.h | 6 +++++- src/buffer_funcs.cpp | 9 ++++++--- src/frontends/qt4/GuiView.cpp | 3 ++- 7 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/Buffer.h b/src/Buffer.h index 246e1ced0f..3ed3a95c40 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -246,8 +246,7 @@ private: /// \return \c true if file is not completely read. bool readDocument(Lexer &); /// Try to extract the file from a version control container - /// before reading if the file cannot be found. This is only - /// implemented for RCS. + /// before reading if the file cannot be found. /// \sa LyXVC::file_not_found_hook ReadStatus extractFromVC(); /// Reads the first tag of a LyX File and diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 449e24d1a8..192b70b8f9 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -45,6 +45,18 @@ LyXVC::~LyXVC() {} +bool LyXVC::fileInVC(FileName const & fn) +{ + if (!RCS::findFile(fn).empty()) + return true; + if (!CVS::findFile(fn).empty()) + return true; + if (!SVN::findFile(fn).empty()) + return true; + return false; +} + + bool LyXVC::file_found_hook(FileName const & fn) { FileName found_file; @@ -75,9 +87,10 @@ bool LyXVC::file_not_found_hook(FileName const & fn) // Check if file is under RCS. // This happens if we are trying to load non existent // file on disk, but existent in ,v version. - // Seems there is no reasonable scenario for adding implementation - // of retrieve for cvs or svn. - if (!RCS::findFile(fn).empty()) { + bool foundRCS = !RCS::findFile(fn).empty(); + bool foundCVS = foundRCS ? false : !CVS::findFile(fn).empty(); + bool foundSVN = (foundRCS || foundCVS) ? false : !SVN::findFile(fn).empty(); + if (foundRCS || foundCVS || foundSVN) { docstring const file = makeDisplayPath(fn.absFileName(), 20); docstring const text = bformat(_("Do you want to retrieve the document" @@ -86,11 +99,17 @@ bool LyXVC::file_not_found_hook(FileName const & fn) text, 0, 1, _("&Retrieve"), _("&Cancel")); if (ret == 0) { - // How can we know _how_ to do the checkout? - // With the current VC support it has to be an RCS - // file since CVS and SVN do not have special ,v files. - RCS::retrieve(fn); - return true; + // Since the retrieve commands are implemented using + // more general update commands we need to ensure that + // we do not change an existing file by accident. + if (fn.exists()) + return false; + if (foundRCS) + return RCS::retrieve(fn); + else if (foundCVS) + return CVS::retrieve(fn); + else + return SVN::retrieve(fn); } } return false; diff --git a/src/LyXVC.h b/src/LyXVC.h index df6f273ffc..a860bda8ec 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -43,6 +43,8 @@ public: LyXVC(); /// ~LyXVC(); + /// Is \p fn under version control? + static bool fileInVC(support::FileName const & fn); /** Not a good name perhaps. This function should be called whenever LyX loads a file. This function then checks for a master VC file (for RCS this is *,v or RCS/ *,v ; for CVS this is CVS/Entries and .svn/entries @@ -52,7 +54,7 @@ public: */ bool file_found_hook(support::FileName const & fn); - /** Is \p fn in under version control? + /** Is \p fn under version control? This function should be run when a file is requested for loading, but it does not exist. This function will then check for a VC master file with the same name (see above function). If this exists the diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 31a8eb32e5..98417074a1 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -151,11 +151,12 @@ FileName const RCS::findFile(FileName const & file) } -void RCS::retrieve(FileName const & file) +bool RCS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); - doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), - FileName()); + // The caller ensures that file does not exists, so no need to check that. + return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), + FileName()) == 0; } @@ -553,6 +554,15 @@ void CVS::scanMaster() } +bool CVS::retrieve(FileName const & file) +{ + LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file); + // The caller ensures that file does not exists, so no need to check that. + return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()), + file.onlyPath()) == 0; +} + + string const CVS::getTarget(OperationMode opmode) const { switch(opmode) { @@ -1132,6 +1142,15 @@ bool SVN::isLocked() const } +bool SVN::retrieve(FileName const & file) +{ + LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file); + // The caller ensures that file does not exists, so no need to check that. + return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()), + file.onlyPath()) == 0; +} + + void SVN::registrer(string const & /*msg*/) { doVCCommand("svn add -q " + quoteName(onlyFileName(owner_->absFileName())), diff --git a/src/VCBackend.h b/src/VCBackend.h index 3b48f206e3..8f2ad4103b 100644 --- a/src/VCBackend.h +++ b/src/VCBackend.h @@ -136,7 +136,7 @@ public: /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); - static void retrieve(support::FileName const & file); + static bool retrieve(support::FileName const & file); virtual void registrer(std::string const & msg); @@ -210,6 +210,8 @@ public: /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); + static bool retrieve(support::FileName const & file); + virtual void registrer(std::string const & msg); virtual std::string checkIn(std::string const & msg); @@ -337,6 +339,8 @@ public: /// return the revision file for the given file, if found static support::FileName const findFile(support::FileName const & file); + static bool retrieve(support::FileName const & file); + virtual void registrer(std::string const & msg); virtual std::string checkIn(std::string const & msg); diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp index 073ddcb6f4..85a22ebff7 100644 --- a/src/buffer_funcs.cpp +++ b/src/buffer_funcs.cpp @@ -26,6 +26,7 @@ #include "LaTeX.h" #include "Layout.h" #include "LyX.h" +#include "LyXVC.h" #include "TextClass.h" #include "Paragraph.h" #include "ParagraphList.h" @@ -81,8 +82,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty) return checkBuffer; } - if (filename.exists()) { - if (!filename.isReadableFile()) { + bool const exists = filename.exists(); + bool const tryVC = exists ? false : LyXVC::fileInVC(filename); + if (exists || tryVC) { + if (exists && !filename.isReadableFile()) { docstring text = bformat(_("The file %1$s exists but is not " "readable by the current user."), from_utf8(filename.absFileName())); @@ -178,7 +181,7 @@ Buffer * loadIfNeeded(FileName const & fname) { Buffer * buffer = theBufferList().getBuffer(fname); if (!buffer) { - if (!fname.exists()) + if (!fname.exists() && !LyXVC::fileInVC(fname)) return 0; buffer = theBufferList().newBuffer(fname.absFileName()); diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 871a2d282d..d06dee9d98 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1956,7 +1956,8 @@ void GuiView::openDocument(string const & fname) // if the file doesn't exist and isn't already open (bug 6645), // let the user create one - if (!fullname.exists() && !theBufferList().exists(fullname)) { + if (!fullname.exists() && !theBufferList().exists(fullname) && + !LyXVC::file_not_found_hook(fullname)) { // the user specifically chose this name. Believe him. Buffer * const b = newFile(filename, string(), true); if (b) From 751bb129c8ee1f3970a73ef1a5644d084a924b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 15 Nov 2012 23:32:33 +0100 Subject: [PATCH 77/93] chkconfig.ltx: add check for files necessary for Greek, Russian and Ukrainian This should also go to branch. OK? --- lib/chkconfig.ltx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index 90d63b4754..6117839fc5 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -293,6 +293,7 @@ \TestPackage{color} % this one should be there if graphics.sty is there. \TestPackage{covington} \TestPackage{csquotes} +\TestPackage[koi8-r.def]{cyrillic} \TestPackage{dvipost} \TestPackage{endnotes} \TestPackage{enumitem} @@ -302,6 +303,7 @@ \TestPackage{hhline} \TestPackage{ifthen} \TestPackage{iftex} +\TestPackage[iso-8859-7.def]{greek-inputenc} \TestPackage{fancybox} \TestPackage{fancyhdr} \TestPackage{fixltx2e} @@ -390,6 +392,7 @@ \TestPackage{ae} \TestPackage{bera} \TestPackage{biolinum-type1} +\TestPackage{cbgreek}% for Greek \TestPackage{ccfonts} \TestPackage{cmbright} \TestPackage{eco} @@ -400,7 +403,7 @@ \TestPackage{libertine-type1} \TestPackage{lmodern} \TestPackage{luximono} -\TestPackage{mathdesign}% For Roman fonts +\TestPackage{mathdesign}% for Roman fonts \TestPackage{mdbch} \TestPackage{mdput} \TestPackage{mdugm} From af6d19176cb6a2d387b36299fa5b17a6f92db28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Fri, 16 Nov 2012 01:21:47 +0100 Subject: [PATCH 78/93] installer: fix 2 minor bugs - correct required space for German thesaurus - fix display problem of EPS and PDF images for a certain installation constellation --- .../Win32/packaging/installer/ChangeLog.txt | 8 ++++++- .../packaging/installer/include/init.nsh | 4 ++-- .../Win32/packaging/installer/settings.nsh | 2 +- .../packaging/installer/setup/install.nsh | 1 + .../packaging/installer/setup/uninstall.nsh | 24 ++++++------------- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 7509feb4d7..e3c82c3ec0 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,10 @@ -Changelog for LyX-205-3: +Changelog for LyX-205-4: +- fixed bug that EPS and PDF images were not be displayed if LyX was installed this time without admin privileges + but an older LyX version was once installed with admin privileges +- correct the required disk space for the German thesaurus dictionaries + + +Changelog for LyX-205-3: - fixed infinite loop when starting the installer and not having Ghostscript previously installed (LyX bug #8417) - updated to JabRef 2.8.1 - updated French and Spanish translation of the installer messages diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index d10d3f15c5..383c94d8ba 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -442,12 +442,12 @@ SectionEnd Section /o "Deutsch (D/A)" SecTGermanDA StrCpy $ThesCodes "de_DE$ThesCodes" - AddSize 5360 + AddSize 14600 SectionEnd Section /o "Deutsch (CH)" SecTGermanCH StrCpy $ThesCodes "de_CH$ThesCodes" - AddSize 5360 + AddSize 14600 SectionEnd Section /o "English (GB)" SecTEnglishGB diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index f84137aaba..b0ce50c29c 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -12,7 +12,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_MAJOR 2 !define APP_VERSION_MINOR 0 !define APP_VERSION_REVISION 5 -!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}" # Version to display diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index c0dd5901d0..9eb51e199f 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -88,6 +88,7 @@ Section -ProgramFiles SecProgramFiles WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "LibPath" "$INSTDIR\imagemagick" WriteRegDWORD SHCTX "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010 WriteRegStr SHCTX "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}" + WriteRegStr SHCTX "SOFTWARE\ImageMagick" "OnlyWithLyX" "Yes${APP_SERIES_KEY}" # Components of Ghostscript ${if} $GhostscriptPath == "" diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 0cf286ec07..ce1d49b02c 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -18,16 +18,6 @@ Section "un.LyX" un.SecUnProgramFiles # need them and these few files don't harm to stay in LaTeX # Binaries - #!insertmacro FileListLyXBin Delete "$INSTDIR\bin\" - #!insertmacro FileListQtBin Delete "$INSTDIR\bin\" - #!insertmacro FileListDll Delete "$INSTDIR\bin\" - #!insertmacro FileListMSVC Delete "$INSTDIR\bin\" - #!insertmacro FileListNetpbmBin Delete "$INSTDIR\bin\" - #!insertmacro FileListDTLBin Delete "$INSTDIR\bin\" - #!insertmacro FileListDvipostBin Delete "$INSTDIR\bin\" - #!insertmacro FileListPDFToolsBin Delete "$INSTDIR\bin\" - #!insertmacro FileListPDFViewBin Delete "$INSTDIR\bin\" - #!insertmacro FileListMetaFile2EPS Delete "$INSTDIR\bin\" RMDir /r "$INSTDIR\bin" # Resources @@ -36,25 +26,25 @@ Section "un.LyX" un.SecUnProgramFiles # Python RMDir /r "$INSTDIR\python" - # Components of ImageMagick - #!insertmacro FileListImageMagick Delete "$INSTDIR\imagemagick\" - #!insertmacro FileListMSVC Delete "$INSTDIR\imagemagick\" + # ImageMagick RMDir /r "$INSTDIR\imagemagick" + ReadRegStr $0 SHCTX "SOFTWARE\ImageMagick" "OnlyWithLyX" # test if it was installed together with this LyX version + ${if} $0 == "Yes${APP_SERIES_KEY}" + WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" "" + DeleteRegKey SHCTX "Software\ImageMagick" + ${endif} # Components of Ghostscript - #!insertmacro FileListGhostscript Delete "$INSTDIR\ghostscript\" - #!insertmacro FileListMSVC Delete "$INSTDIR\ghostscript\" RMDir /r "$INSTDIR\ghostscript" # delete start menu folder ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "StartMenu" RMDir /r "$0" - #Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk" # delete desktop icon Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" # remove file extension .lyx - ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # special entry to test if they were registered by this LyX version + ReadRegStr $0 SHCTX "${APP_DIR_REGKEY}" "OnlyWithLyX" # test if they were registered by this LyX version ${if} $0 == "Yes${APP_SERIES_KEY}" ReadRegStr $R0 SHCTX "Software\Classes\${APP_EXT}" "" ${if} $R0 == "${APP_REGNAME_DOC}" From 2760933bacb062eab65f51383b709ccf617be08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Fri, 16 Nov 2012 23:57:26 +0100 Subject: [PATCH 79/93] installer: updated Japanese translation by Koji --- .../Win32/packaging/installer/ChangeLog.txt | 3 +- .../packaging/installer/lang/japanese.nsh | 98 +++++++++---------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index e3c82c3ec0..04c84d7529 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,7 +1,8 @@ Changelog for LyX-205-4: -- fixed bug that EPS and PDF images were not be displayed if LyX was installed this time without admin privileges +- fixed bug that EPS and PDF images were not displayed if LyX was installed this time without admin privileges but an older LyX version was once installed with admin privileges - correct the required disk space for the German thesaurus dictionaries +- updated Japanese translation of the installer messages Changelog for LyX-205-3: diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh index 341964449b..60eaa6c6fd 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/lang/japanese.nsh @@ -1,93 +1,93 @@ !insertmacro LANGFILE_EXT "Japanese" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "([U[pɓs)" -${LangFileString} TEXT_WELCOME "̃EBU[hAȂLyXCXg[Ԃ̂ē܂B$\r$\n\ +${LangFileString} TEXT_WELCOME "̃EBU[hAȂLyXƒ̂ē܂B$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "MiKTeX̃t@Cf[^x[XXVĂ܂..." +${LangFileString} TEXT_CONFIGURE_LYX "LyX\Ă܂ (MiKTeXs̃pbP[W_E[h邩Ȃ̂ŁAԂ̂邱Ƃ܂) ..." +${LangFileString} TEXT_CONFIGURE_PYTHON "PythonXNvgRpCĂ܂..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP "fXNgbvɃV[gJbg쐬" +${LangFileString} TEXT_FINISH_WEBSITE "lyx.orgJčŐVj[XT|[gAqgȂǂ肷" ${LangFileString} FileTypeTitle "LyX" ${LangFileString} SecInstJabRefTitle "JabRef" -${LangFileString} SecAllUsersTitle "ׂẴ[U[pɃCXg[܂H" +${LangFileString} SecAllUsersTitle "ׂẴ[U[pɓs܂H" ${LangFileString} SecFileAssocTitle "t@C֘At" ${LangFileString} SecDesktopTitle "fXNgbvEACR" ${LangFileString} SecCoreDescription "LyX̃t@CB" ${LangFileString} SecInstJabRefDescription "QlǗBibTeXt@CGfB^B" -${LangFileString} SecAllUsersDescription "LyXׂẴ[U[pɑ邩Ã݂[U[ɑ邩B" +${LangFileString} SecAllUsersDescription "LyXׂẴ[U[pɓ邩Ã݂[U[ɓ邩B" ${LangFileString} SecFileAssocDescription "gq.lyx̃t@C͎ILyXŊJB" -${LangFileString} SecDesktopDescription "fXNgbvLyXACRB" -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDesktopDescription "fXNgbvLyXACR" +${LangFileString} SecDictionariesDescription "_E[hyѓ”\ȃXy`FbNp" +${LangFileString} SecThesaurusDescription "_E[hyѓ”\ȗދ`ꎫTp" -${LangFileString} EnterLaTeXHeader1 'LaTeXfBXgr[V' -${LangFileString} EnterLaTeXHeader2 'LyXgׂLaTeXfBXgr[Vw肵ĂB' +${LangFileString} EnterLaTeXHeader1 'LaTeXЕz' +${LangFileString} EnterLaTeXHeader2 'LyXgׂLaTeXЕzłw肵ĂB' ${LangFileString} EnterLaTeXFolder 'ł́A$\"latex.exe$\"t@Cւ̃pXw肷邱Ƃł܂B邱ƂɂāA\ - LyXgpׂLaTeXfBXgr[Vw肷邱Ƃł܂B$\r$\n\ + LyXgpׂLaTeXЕzłw肷邱Ƃł܂B$\r$\n\ LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ $\r$\n\ - CXg[[́AVXeLaTeXfBXgr[VƂ\ + vÓAVXeLaTeXЕzłƂ\ $\"$LaTeXName$\"邱Ƃo܂Bɂ͂̃pX\Ă܂B' ${LangFileString} EnterLaTeXFolderNone '$\"latex.exe$\"t@Cւ̃pXw肵ĂB邱ƂɂāA\ - LyXǂLaTeXfBXgr[Vgpׂw肷邱Ƃł܂B$\r$\n\ + LyXǂLaTeXЕzłgpׂw肷邱Ƃł܂B$\r$\n\ LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I$\r$\n\ $\r$\n\ - CXg[[́AVXeLaTeXfBXgr[V‚邱Ƃł܂łB' + vÓAVXeLaTeXЕzł‚邱Ƃł܂łB' ${LangFileString} PathName '$\"latex.exe$\"t@Cւ̃pX' ${LangFileString} DontUseLaTeX "LaTeXgpȂ" ${LangFileString} InvalidLaTeXFolder 'w肳ꂽpX$\"latex.exe$\"t@C‚܂B' -${LangFileString} LatexInfo 'ꂩLaTeXfBXgr[V$\"MiKTeX$\"̃CXg[[N܂B$\r$\n\ - vOCXg[ɂ́ACXg[n܂܂ŃCXg[[̃EBhEɂ$\"Next$\"{^ĂB$\r$\n\ +${LangFileString} LatexInfo 'ꂩLaTeXЕz$\"MiKTeX$\"̓vON܂B$\r$\n\ + vO𓱓ɂ́AƂn܂܂œvÕEBhEɂ$\"Next$\"{^ĂB$\r$\n\ $\r$\n\ - IIIׂMiKTeXCXg[[̃ftHgIvVɏ]ĂBIII' -${LangFileString} LatexError1 'LaTeXfBXgr[V𔭌邱Ƃł܂łI$\r$\n\ - LyX́A$\"MiKTeX$\"̂悤LaTeXfBXgr[VȂł͎gƂł܂I$\r$\n\ - ăCXg[͒~܂B' + IIIׂMiKTeXvO̊IvVɏ]ĂBIII' +${LangFileString} LatexError1 'LaTeXЕzł𔭌邱Ƃł܂łI$\r$\n\ + LyX́A$\"MiKTeX$\"̂悤LaTeXЕzłȂł͎gƂł܂I$\r$\n\ + ē𒆎~܂B' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed '$\"$R3$\"p̃_E[hɎs܂B' +${LangFileString} ThesaurusFailed '$\"$R3$\"pދ`ꎫT̃_E[hɎs܂B' -${LangFileString} JabRefInfo 'ꂩvO$\"JabRef$\"̃CXg[[N܂B$\r$\n\ - JabRefCXg[[̃ftHg̃IvVׂĎ󂯓Ă܂܂B' -${LangFileString} JabRefError 'vO$\"JabRef$\"͐CXg[܂łI$\r$\n\ - CXg[[́AƂ肠̂܂܃CXg[𑱂܂B$\r$\n\ - JabRef̃CXg[ēx݂ĂB' +${LangFileString} JabRefInfo 'ꂩvO$\"JabRef$\"̓vON܂B$\r$\n\ + JabRefvO̊IvVׂĎ󂯓Ă܂܂B' +${LangFileString} JabRefError 'vO$\"JabRef$\"͐ł܂łI$\r$\n\ + vÓAƂ肠̂܂ܓƂ𑱂܂B$\r$\n\ + JabRef̓ēx݂ĂB' ${LangFileString} LatexConfigInfo "ȉLyX̐ݒɂ͏XԂ܂B" ${LangFileString} MiKTeXPathInfo "ׂẴ[U[ŕKvɉMiKTeX$\r$\n\ - JX^}CYł悤ɁAMiKTeX̃CXg[tH_$\r$\n\ + JX^}CYł悤ɁAMiKTeX̓tH_$\r$\n\ $MiKTeXPath $\r$\n\ Ƃ̉ʃtH_̏݌AׂẴ[U[ɗ^Kv܂B" -${LangFileString} MiKTeXInfo 'LyXƂƂɁALaTeXfBXgr[V$\"MiKTeX$\"p܂B$\r$\n\ +${LangFileString} MiKTeXInfo 'LyXƂƂɁALaTeXЕz$\"MiKTeX$\"p܂B$\r$\n\ LyX߂ĎgOɁA$\"MiKTeXXVEBU[h$\"vOgāA$\r$\n\ - p”\MiKTeXXVCXg[Ƃ𐄏܂B$\r$\n\ + p”\MiKTeXXV𓱓邱Ƃ𐄏܂B$\r$\n\ MiKTeX̍XV邩ǂA܊mF܂H' ${LangFileString} ModifyingConfigureFailed "configureXNvg'path_prefix'ݒ肷邱Ƃł܂ł" ${LangFileString} RunConfigureFailed "configureXNvgs邱Ƃł܂ł" -${LangFileString} NotAdmin "LyXCXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" -${LangFileString} InstallRunning "CXg[[͊ɓĂ܂I" -${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}͊ɃCXg[Ă܂ILyXACXg[ĂB" -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NotAdmin "LyX𓱓ɂ́AǗҌĂȂĂ͂Ȃ܂I" +${LangFileString} InstallRunning "vO͊ɓ쒆łI" +${LangFileString} StillInstalled "LyX${APP_SERIES_KEY2}͊ɓς݂łILyX̓ĂB" +${LangFileString} NewerInstalled "Ȃ́Aɓς݂LyXÂł𓱓悤ƂĂ܂B$\r$\n\ + {ɂ̂ł΁A LyX $OldVersionNumber ܂ĂB" -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "MiKTeXǗҌœĂ̂ɁALyXMiKTeXȂœ悤ƂĂ邽߁A$\r$\n\ + ꕶł̍̎̕gp̓T|[g܂B" +${LangFileString} MetafileNotAvailable "LyXɂĉ摜`EMFWMFg@́A$\r$\n\ + WindowsɃ\tgEFAv^ǗҌœKv邽߁A$\r$\n\ + T|[gł܂B" -${LangFileString} FinishPageMessage "߂łƂ܂ILyX܂B$\r$\n\ +${LangFileString} FinishPageMessage "߂łƂ܂ILyX܂B$\r$\n\ $\r$\n\ LyX̋Nɂ͎Ԃ܂Bj" ${LangFileString} FinishPageRun "LyXN" @@ -95,14 +95,14 @@ ${LangFileString} FinishPageRun "LyX ${LangFileString} UnNotInRegistryLabel "WXgLyX܂B$\r$\n\ fXNgbvƃX^[gj[̃V[gJbg͍폜܂B" ${LangFileString} UnInstallRunning "܂LyX‚ĂI" -${LangFileString} UnNotAdminLabel "LyXACXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" +${LangFileString} UnNotAdminLabel "LyX̓sɂ́AǗҌĂȂĂ͂Ȃ܂I" ${LangFileString} UnReallyRemoveLabel "{ɁALyXƂׂĂ̕R|[lg폜Ă܂ςłH" ${LangFileString} UnLyXPreferencesTitle 'LyX̃[U[ݒ' -${LangFileString} SecUnMiKTeXDescription "LaTeXfBXgr[VMiKTeXE܂B" -${LangFileString} SecUnJabRefDescription "}l[W[JabRefE܂B" +${LangFileString} SecUnMiKTeXDescription "LaTeXЕzMiKTeX̓s܂B" +${LangFileString} SecUnJabRefDescription "ǗvOJabRef̓s܂B" ${LangFileString} SecUnPreferencesDescription '[U[ʂLyX̐ݒtH_$\r$\n\ $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ 폜܂B' -${LangFileString} SecUnProgramFilesDescription "LyXƂׂĂ̕R|[lgE܂B" +${LangFileString} SecUnProgramFilesDescription "LyXƂׂĂ̕R|[lg̓s܂B" From 1ca1ae03b0130492bddbc94397000ef79398bfc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 17 Nov 2012 02:00:18 +0100 Subject: [PATCH 80/93] FeynmanDiagrams.lyx: remove unused preamble code --- lib/examples/FeynmanDiagrams.lyx | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/examples/FeynmanDiagrams.lyx b/lib/examples/FeynmanDiagrams.lyx index 7280113853..95cc822c1f 100644 --- a/lib/examples/FeynmanDiagrams.lyx +++ b/lib/examples/FeynmanDiagrams.lyx @@ -23,19 +23,7 @@ \fi % end if pdflatex is used -% increase link area for cross-references and autoname them, -\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} -\newlength{\abc} -\settowidth{\abc}{\space} -\AtBeginDocument{% -\addto\extrasenglish{ - \renewcommand{\equationautorefname}{\hspace{-\abc}} - \renewcommand{\sectionautorefname}{sec.\negthinspace} - \renewcommand{\subsectionautorefname}{sec.\negthinspace} - \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}} -} - -% wird benutzt, um Tabellenzellen zu vergrößern +% used to have extra space in table cells \@ifundefined{extrarowheight} {\usepackage{array}}{} \setlength{\extrarowheight}{5pt} @@ -114,6 +102,19 @@ Feynman Diagrams \end_layout +\begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +authors: Uwe Stöhr and Ronen Abravanel +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard To be able to use \noun on From 27bfde3fbe3092cc9bf02c041fc1a1db9db55654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 17 Nov 2012 21:22:50 +0100 Subject: [PATCH 81/93] installer: updated Slovak translation by Kornel --- .../Win32/packaging/installer/ChangeLog.txt | 4 +- .../Win32/packaging/installer/lang/slovak.nsh | 146 +++++++++--------- 2 files changed, 79 insertions(+), 71 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 04c84d7529..139f28f5a5 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,8 @@ Changelog for LyX-205-4: - fixed bug that EPS and PDF images were not displayed if LyX was installed this time without admin privileges but an older LyX version was once installed with admin privileges -- correct the required disk space for the German thesaurus dictionaries -- updated Japanese translation of the installer messages +- correct the required disk space for the German thesaurus dictionaries +- updated Japanese and Slovak translation of the installer messages Changelog for LyX-205-3: diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh index 060084007c..714d6572ac 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/lang/slovak.nsh @@ -1,109 +1,117 @@ +/* + +LyX Installer Language File +Language: Slovak +Author: Kornel Benko + +*/ + !insertmacro LANGFILE_EXT "Slovak" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "(Intalovan pre sasnho uvatea)" ${LangFileString} TEXT_WELCOME "Tento sprievodca Vm pomha intalova LyX.$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualizcia MiKTeX-databzy sborovch mien..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurcia LyXu (MiKTeX me nata chbajce balky, to me trochu trva) ..." +${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilcia Python skriptov..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP "Vytvori skratku pre pracovn plochu" +${LangFileString} TEXT_FINISH_WEBSITE "Navtvte lyx.org pre posledn novinky, podporu a tipy" ${LangFileString} FileTypeTitle "LyX dokument" ${LangFileString} SecInstJabRefTitle "JabRef" ${LangFileString} SecAllUsersTitle "Intalova pre vetkch uvateov?" -${LangFileString} SecFileAssocTitle "Usporiadanie data" -${LangFileString} SecDesktopTitle "Symbol desktopu" +${LangFileString} SecFileAssocTitle "Asocicie sborov" +${LangFileString} SecDesktopTitle "Ikona pracovnej plochy" ${LangFileString} SecCoreDescription "Program LyX." -${LangFileString} SecInstJabRefDescription "Manager pre bibliografick odkaz a editor pre BibTeX files." -${LangFileString} SecAllUsersDescription "Intalova LyX pre vetkch uvatelov alebo len pre teraj uvate." -${LangFileString} SecFileAssocDescription "Data s lyx rozrenm sa automaticky otvraj v LyX." -${LangFileString} SecDesktopDescription "Symbol LyX na desktopu." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecInstJabRefDescription "Manar pre bibliografick odkazy a editor pre BibTeX sbory." +${LangFileString} SecAllUsersDescription "Intalova LyX pre vetkch uvateov alebo len pre sasnho uvatea." +${LangFileString} SecFileAssocDescription "Sbory s rozrenm .lyx sa automaticky otvraj v LyXe." +${LangFileString} SecDesktopDescription "Ikona LyXa na pracovnej ploche." +${LangFileString} SecDictionariesDescription "Slovnky pre kontrolu pravopisu ktor mono nata a intalova." +${LangFileString} SecThesaurusDescription "Slovnky tezaura ktor mono nata a intalova." ${LangFileString} EnterLaTeXHeader1 'LaTeX distribcia' -${LangFileString} EnterLaTeXHeader2 'Urcujte LaTeX distribciu, ktor m uva LyX.' -${LangFileString} EnterLaTeXFolder 'Tu mete pouva chod k $\"latex.exe$\" a tm pouva chod \ - LaTeX-distribciu, ktor by mohla by pouvan cestou LyXu.$\r$\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ +${LangFileString} EnterLaTeXHeader2 'Urite LaTeX distribciu, ktor m pouva LyX.' +${LangFileString} EnterLaTeXFolder 'Tu mte nastavi cestu k $\"latex.exe$\" a tm nastavi \ + LaTeX-distribciu, ktor by mala by pouvan LyXom.$\r$\n\ + Bez LaTeXu, LyX nedoke produkova dokumenty!$\r$\n\ $\r$\n\ - Intalatr detektoval LaTeX-distribciu \ - $\"$LaTeXName$\" na vaej sstave. Dolu vidte jeho chod.' -${LangFileString} EnterLaTeXFolderNone 'Pouvajte dolu chod k $\"latex.exe$\". Tm urcujete, ktor \ + Intalatr detegoval LaTeX-distribciu \ + $\"$LaTeXName$\" na vaom systme. Dolu je zobrazen jeho cesta.' +${LangFileString} EnterLaTeXFolderNone 'Nastavte dolu cestu k $\"latex.exe$\". Tm nastavte, ktor \ LaTeX-distribcia m by pouvan LyXom.$\r$\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!$\r$\n\ + Bez LaTeXu LyX nedoke produkova dokumenty!$\r$\n\ $\r$\n\ - Intalatr nemohol njst LaTeX-distribciu na vaej sstave.' -${LangFileString} PathName 'Chod k $\"latex.exe$\"' -${LangFileString} DontUseLaTeX "Neuvajte LaTeX" -${LangFileString} InvalidLaTeXFolder 'Mapa $\"latex.exe$\" nie je na pecifikovanej ceste.' + Intalatr nemohol njs LaTeX-distribciu na vaom systme.' +${LangFileString} PathName 'Cesta na sbor $\"latex.exe$\"' +${LangFileString} DontUseLaTeX "Nepoui LaTeX" +${LangFileString} InvalidLaTeXFolder 'Sbor $\"latex.exe$\" nie je na pecifikovanej ceste.' -${LangFileString} LatexInfo 'Teraz mete tartova LaTeX distribciu $\"MiKTeX$\".$\r$\n\ - Na intalovanie programu tlate gombk $\"Next$\" v intalovacch oknch a sa zana intalcia.$\r$\n\ +${LangFileString} LatexInfo 'Teraz tartuje intalatr LaTeX distribcie $\"MiKTeX$\".$\r$\n\ + Na intalovanie programu tlate $\"Next$\" v okne intaltora a intalcia zane.$\r$\n\ $\r$\n\ - !!! Prosm uvajte vetk obsiahnut nastavenia intalatra MiKTeX !!!' + !!! Prosm pouite vetky nepovinn monosti intalatra MiKTeX !!!' -${LangFileString} LatexError1 'LaTeX distribcia sa nemohla njst!$\r$\n\ - LyX sa neme uva bez LaTeX distribcie ako $\"MiKTeX$\"!$\r$\n\ - Preto sa intalcia zastavila.' +${LangFileString} LatexError1 'iadna LaTeX-distribcia sa nenala!$\r$\n\ + LyX sa neme uva bez LaTeX distribcie ako naprklad $\"MiKTeX$\"!$\r$\n\ + Intalcia sa preto zruuje.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Natanie slovnka pre jazyk $\"$R3$\" zlyhalo.' +${LangFileString} ThesaurusFailed 'Natanie tezaura pre jazyk $\"$R3$\" zlyhalo.' ${LangFileString} JabRefInfo 'Teraz sa tartuje intalatr programu $\"JabRef$\".$\r$\n\ - Mzete vetk obsiahnut nastavenia intalatra JabRef.' -${LangFileString} JabRefError 'Program $\"JabRef$\" sa nemohol intalova spene!$\r$\n\ + Mte poui vetky nepovinn monosti intalatra JabRef.' +${LangFileString} JabRefError 'Program $\"JabRef$\" nebol spene intalovan!$\r$\n\ Predsa intalcia pokrauje.$\r$\n\ - Skste intalova JabRef ete raz neskr.' + Skste intalova JabRef neskr ete raz.' -${LangFileString} LatexConfigInfo "Na nasledujcu konfigurciu LyXu treba poka chvu." +${LangFileString} LatexConfigInfo "Nasledujca konfigurcia LyXu trochu potrv." -${LangFileString} MiKTeXPathInfo "Aby kad pouvatel bol neskr schopn pouvat MiKTeX pre svoje potreby$\r$\n\ - je treba napsat povolenia pre vetkch pouvatelov do intalacnho papiera MiKTeX $\r$\n\ +${LangFileString} MiKTeXPathInfo "Aby kad pouvate bol neskr schopn pouva MiKTeX pre svoje potreby$\r$\n\ + je treba nastavi povolenia pre vetkch pouvateov do intalanho adresra MiKTeX $\r$\n\ $MiKTeXPath $\r$\n\ - aj do podriadench papierov." -${LangFileString} MiKTeXInfo 'LaTeX distribcia $\"MiKTeX$\" sa pouva spolu s LyXom.$\r$\n\ - Doporuuje sa intalovat platn MiKTeX aktualizcie pomocou programu $\"MiKTeX Update Wizard$\"$\r$\n\ - pred prvm pouvanm LyXu.$\r$\n\ - Chcete teraz testova MiKTeX aktualizcie?' + i podriadench adresrov." +${LangFileString} MiKTeXInfo 'LaTeX-distribcia $\"MiKTeX$\" sa bude pouva spolu s LyXom.$\r$\n\ + Doporuuje sa intalova dostupn MiKTeX aktualizcie pomocou programu $\"MiKTeX Update Wizard$\"$\r$\n\ + pred prvm pouitm LyXu.$\r$\n\ + Chcete teraz skontrolova MiKTeX aktualizcie?' -${LangFileString} ModifyingConfigureFailed "Nemohol uvies v platnost 'path_prefix' (zoznam s cestami programu) v konfiguranom skripte" -${LangFileString} RunConfigureFailed "Nemohol vykona konfiguran skript" -${LangFileString} NotAdmin "Pre intalciu LyX potrebujete administrtorsk prva!" -${LangFileString} InstallRunning "Intalatr u beh!" -${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u intalovan! Najprv treba odintalova LyX." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} ModifyingConfigureFailed "Nedal sa nastavi 'path_prefix' v konfiguranom skripte" +${LangFileString} RunConfigureFailed "Nedal sa spusti konfiguran skript" +${LangFileString} NotAdmin "Pre intalciu LyXu potrebujete administrtorsk prva!" +${LangFileString} InstallRunning "Intalatr u be!" +${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} je u intalovan! LyX treba najprv odintalova." +${LangFileString} NewerInstalled "Pokate sa intalova verziu LyXu ktor je staria ako t ktor je intalovan.$\r$\n\ + Ke to naozaj chcete, odintalujte najprv existujci LyX $OldVersionNumber." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "Podpora pouvania viacerch indexov v dokumente nebude dostupn, lebo\r$\n\ + MiKTeX bol intalovan pod administrtorskmi prvami a vy intalujete LyX bez nich." +${LangFileString} MetafileNotAvailable "Podpora obrzkov vo formte EMF alebo WMF nebude dostupn$\r$\n\ + lebo to vyaduje intalciu softvrovej tlaiarne pre Windows$\r$\n\ + o je mon len pod administrtorskmi prvami." ${LangFileString} FinishPageMessage "Gratulcia! LyX bol spene intalovan.$\r$\n\ $\r$\n\ - (Prv LyX tart me trva niekolko sekund.)" -${LangFileString} FinishPageRun "tartova LyX" + (Prv LyX tart me trva niekoko seknd.)" +${LangFileString} FinishPageRun "Spusti LyX" -${LangFileString} UnNotInRegistryLabel "Neme njs LyX v registre.$\r$\n\ - Symboly na desktope a v tartovacom Menu sa nedaj odstrani." -${LangFileString} UnInstallRunning "Najprv zavr LyX!" +${LangFileString} UnNotInRegistryLabel "Nemem njs LyX v registre.$\r$\n\ + Skratky na pracovnej ploche a v tartovacom Menu sa nedaj odstrni." +${LangFileString} UnInstallRunning "Najprv treba zavrie LyX!" ${LangFileString} UnNotAdminLabel "Pre odintalciu LyX potrebujete administrtorsk prva!" -${LangFileString} UnReallyRemoveLabel "Ste si ist, e chcete kompletne odintalova LyX a vetk jeho suiastky?" -${LangFileString} UnLyXPreferencesTitle 'LyX prednosti uvaea' +${LangFileString} UnReallyRemoveLabel "Ste si ist, e chcete kompletne odintalova LyX a vetky jeho siastky?" +${LangFileString} UnLyXPreferencesTitle 'LyXove uvatesk preferencie' -${LangFileString} SecUnMiKTeXDescription "Odintaluje LaTeX distribciu MiKTeX." -${LangFileString} SecUnJabRefDescription "Odintaluje bibliografick manager JabRef." -${LangFileString} SecUnPreferencesDescription 'Odstrni konfiguracn papiere LyXu $\r$\n\ +${LangFileString} SecUnMiKTeXDescription "Odintaluje LaTeX-distribciu MiKTeX." +${LangFileString} SecUnJabRefDescription "Odintaluje manara bibliografie JabRef." +${LangFileString} SecUnPreferencesDescription 'Odstrni konfiguran adresr LyXu $\r$\n\ $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - pre vetkch uivateov.' -${LangFileString} SecUnProgramFilesDescription "Odintaluj LyX a vetk jeho suiastky." + pre vetkch uvateov.' +${LangFileString} SecUnProgramFilesDescription "Odintaluj LyX a vetky jeho siastky." From 8fc88ecf1dd64d5df24e1d87e9cf726a79698ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Nov 2012 00:25:29 +0100 Subject: [PATCH 82/93] installer: updated translations - Norwegian translation by Ingar - Ukrainian translation by Yuri - add some author information --- .../Win32/packaging/installer/ChangeLog.txt | 2 +- .../packaging/installer/lang/english.nsh | 2 - .../Win32/packaging/installer/lang/french.nsh | 4 +- .../Win32/packaging/installer/lang/german.nsh | 2 - .../packaging/installer/lang/japanese.nsh | 6 + .../packaging/installer/lang/norwegian.nsh | 114 +++++++++--------- .../Win32/packaging/installer/lang/slovak.nsh | 2 - .../packaging/installer/lang/spanish.nsh | 6 + .../packaging/installer/lang/ukrainian.nsh | 40 +++--- 9 files changed, 97 insertions(+), 81 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 139f28f5a5..64b3542696 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -2,7 +2,7 @@ - fixed bug that EPS and PDF images were not displayed if LyX was installed this time without admin privileges but an older LyX version was once installed with admin privileges - correct the required disk space for the German thesaurus dictionaries -- updated Japanese and Slovak translation of the installer messages +- updated Japanese, Norwegian, Slovak and Ukrainian translation of the installer messages Changelog for LyX-205-3: diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh index 174e3aee98..74cb327c26 100644 --- a/development/Win32/packaging/installer/lang/english.nsh +++ b/development/Win32/packaging/installer/lang/english.nsh @@ -1,9 +1,7 @@ /* - LyX Installer Language File Language: English Author: Joost Verburg, Uwe Sthr - */ !insertmacro LANGFILE_EXT "English" diff --git a/development/Win32/packaging/installer/lang/french.nsh b/development/Win32/packaging/installer/lang/french.nsh index 5fed2aa654..9169dc09c0 100644 --- a/development/Win32/packaging/installer/lang/french.nsh +++ b/development/Win32/packaging/installer/lang/french.nsh @@ -1,9 +1,7 @@ /* - LyX Installer Language File Language: French -Author: Jean-Pierre Chrtien - +Authors: Jean-Pierre Chrtien and Siegfried Meunier-Guttin-Cluzel */ !insertmacro LANGFILE_EXT "French" diff --git a/development/Win32/packaging/installer/lang/german.nsh b/development/Win32/packaging/installer/lang/german.nsh index ad64b7510f..ff07b71ae7 100644 --- a/development/Win32/packaging/installer/lang/german.nsh +++ b/development/Win32/packaging/installer/lang/german.nsh @@ -1,9 +1,7 @@ /* - LyX Installer Language File Language: German Author: Uwe Sthr - */ !insertmacro LANGFILE_EXT "German" diff --git a/development/Win32/packaging/installer/lang/japanese.nsh b/development/Win32/packaging/installer/lang/japanese.nsh index 60eaa6c6fd..d44d1705de 100644 --- a/development/Win32/packaging/installer/lang/japanese.nsh +++ b/development/Win32/packaging/installer/lang/japanese.nsh @@ -1,3 +1,9 @@ +/* +LyX Installer Language File +Language: Japanese +Author: Koji Yokata +*/ + !insertmacro LANGFILE_EXT "Japanese" ${LangFileString} TEXT_INSTALL_CURRENTUSER "([U[pɓs)" diff --git a/development/Win32/packaging/installer/lang/norwegian.nsh b/development/Win32/packaging/installer/lang/norwegian.nsh index a084a00022..d0a9f417c1 100644 --- a/development/Win32/packaging/installer/lang/norwegian.nsh +++ b/development/Win32/packaging/installer/lang/norwegian.nsh @@ -1,91 +1,97 @@ +/* +LyX Installer Language File +Language: Norwegian +Author: Ingar Pareliussen +*/ + !insertmacro LANGFILE_EXT "Norwegian" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installer for denne brukeren)" ${LangFileString} TEXT_WELCOME "Denne veiviseren installerer LyX p datamaskinen din.$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Oppdaterer MiKTeX filenavn database..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurerer LyX (MiKTeX kan laste ned manglende pakker, s dette kan ta litt tid) ..." +${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilerer Python script..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP "Lager snarveg p skrivebordet" +${LangFileString} TEXT_FINISH_WEBSITE "Besk lyx.org for de seneste nyhetene, hjelp og sttte" -${LangFileString} FileTypeTitle "LyX-Document" +${LangFileString} FileTypeTitle "LyX-dokument" ${LangFileString} SecInstJabRefTitle "JabRef" -${LangFileString} SecAllUsersTitle "Installere for alle brukere?" +${LangFileString} SecAllUsersTitle "Installer for alle brukere?" ${LangFileString} SecFileAssocTitle "Fil-assosiasjoner" ${LangFileString} SecDesktopTitle "Skrivebordsikon" ${LangFileString} SecCoreDescription "LyX-filene." -${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files." -${LangFileString} SecAllUsersDescription "Installere LyX for alle brukere, eller kun den aktuelle brukeren." -${LangFileString} SecFileAssocDescription "Files med endelsen .lyx pnes automatisk i LyX." +${LangFileString} SecInstJabRefDescription "Bibliografi og referanse program for kunne editere BibTeX filer." +${LangFileString} SecAllUsersDescription "Installer LyX for alle brukere, eller kun for denne brukeren." +${LangFileString} SecFileAssocDescription "Filer med endelsen .lyx pnes automatisk i LyX." ${LangFileString} SecDesktopDescription "Et LyX-ikon p skrivebordet." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDictionariesDescription "Ordbker til rettskrivningsprogram som kan lastes ned og installeres." +${LangFileString} SecThesaurusDescription "Synonymordbker som kan lastes ned og installeres." ${LangFileString} EnterLaTeXHeader1 'LaTeX-distribusjon' ${LangFileString} EnterLaTeXHeader2 'Velg LaTeX-distribusjonen LyX skal bruke.' -${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ +${LangFileString} EnterLaTeXFolder 'Dersom du vil kan du sette stien til fila $\"latex.exe$\" og slik sette\ + LaTeX-distribusjonen som LyX bruker.$\r$\n\ + Om du ikke bruker LaTeX fr du ikke vist dokument!$\r$\n\ $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' -${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ - $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -${LangFileString} PathName 'Path to the file $\"latex.exe$\"' + Installasjonsprosessen har funne LaTeX-distribusjonen \ + $\"$LaTeXName$\" i systemet ditt. Stien str nedenfor.' +${LangFileString} EnterLaTeXFolderNone 'Dersom du vil kan du sette stien til fila $\"latex.exe$\" og slik sette\ + LaTeX-distribusjonen som LyX bruker.$\r$\n\ + Om du ikke bruker LaTeX fr du ikke vist dokument!$\r$\n\ + $\r$\n\ + Installasjonsprosessen har ikke funne noen LaTeX-distribusjon.' +${LangFileString} PathName 'Stien til filen $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Ikke bruk LaTeX" ${LangFileString} InvalidLaTeXFolder 'Filen $\"latex.exe$\" fins ikke i den oppgitte mappa.' ${LangFileString} LatexInfo 'N starter installasjon av LaTeX-distribusjonen $\"MiKTeX$\"$\r$\n\ For installere programmet, klikk $\"Neste$\"-knappen i installasjonsveiviseren til installasjonen begynner.$\r$\n\ $\r$\n\ - !!! Vennligst bruk standardopsjonene for MiKTeX-instasjonen !!!' + !!! Vennligst bruk standardopsjonene for MiKTeX-installasjonen !!!' ${LangFileString} LatexError1 'Fant ikke noen LaTeX-distribusjon!$\r$\n\ - LyX kan ikke brukes uten en LaTeX-distribusjion som $\"MiKTeX$\"!$\r$\n\ + LyX kan ikke brukes uten en LaTeX-distribusjon slik som $\"MiKTeX$\"!$\r$\n\ Derfor avbrytes installasjonen.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Nedlastingen av ordliste for sprket $\"$R3$\" feilet.' +${LangFileString} ThesaurusFailed 'Nedlastingen av synonymordliste for sprket $\"$R3$\" feilet.' -${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' +${LangFileString} JabRefInfo 'N vil installasjonen av programmet $\"JabRef$\" starte.$\r$\n\ + Du kan bruke alle de vanlige opsjonene i JabRef installasjonen.' +${LangFileString} JabRefError 'Installasjonen av $\"JabRef$\" feilet!$\r$\n\ + Installasjonen vil fortsette uansett.$\r$\n\ + Prv installere JabRef ved en senere anledning.' ${LangFileString} LatexConfigInfo "Konfigurasjon av LyX vil ta en stund." -${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ +${LangFileString} MiKTeXPathInfo "For at alle brukerne skal kunne endre innstillingene til MiKTeX til sitt bruk $\r$\n\ + m alle brukere ha skrivetilgang til MiKTeXs installasjon mapper$\r$\n\ $MiKTeXPath $\r$\n\ - and its subfolders." -${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + og undermapper." +${LangFileString} MiKTeXInfo 'LaTeX-distribusjonen $\"MiKTeX$\" vil bli brukt sammen med LyX.$\r$\n\ + Vi anbefaler at du oppdaterer MiKTeX med programmet $\"MiKTeX Update Wizard$\"$\r$\n\ + fr du bruker LyX for frste gang.$\r$\n\ + Vil du sj etter MiKTeX oppdateringer n?' ${LangFileString} ModifyingConfigureFailed "Forsket p stille inn 'path_prefix' i konfigurasjonsscriptet mislyktes" ${LangFileString} RunConfigureFailed "Fikk ikke kjrt konfigurasjonsscriptet" ${LangFileString} NotAdmin "Du trenger administratorrettigheter for installere LyX!" ${LangFileString} InstallRunning "Installasjonsprogrammet er allerede i gang!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} er allerede installert! Fjern LyX frst." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NewerInstalled "Du prver installere en eldre versjon av Lyx enn den du har installert fra fr.$\r$\n\ + Dersom du nsker dette m du avinstallere LyX $OldVersionNumber frst." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "Sttte for flere indekser vil ikke vre tilgjengelig fordi$\r$\n\ + MiKTeX er installert med administratorrettigheter og du installerer LyX uten." +${LangFileString} MetafileNotAvailable "Sttte i LyX for bilder i formatene EMF eller WMF vil ikke vre$\r$\n\ + tilgjengelig fordi man da m installere programvareskriver i $\r$\n\ + Windows som bare er mulig med administratorrettigheter." ${LangFileString} FinishPageMessage "Gratulerer!! LyX er installert.$\r$\n\ $\r$\n\ @@ -97,12 +103,12 @@ ${LangFileString} UnNotInRegistryLabel "Fant ikke LyX i registeret.$\r$\n\ ${LangFileString} UnInstallRunning "Du m avslutte LyX frst!" ${LangFileString} UnNotAdminLabel "Du m ha administratorrettigheter for fjerne LyX!" ${LangFileString} UnReallyRemoveLabel "Er du sikker p at du vil fjerne LyX og alle tilhrende komponenter?" -${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' +${LangFileString} UnLyXPreferencesTitle 'LyX sine bruker innstillinger' -${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." -${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." -${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ - $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for all users.' -${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." +${LangFileString} SecUnMiKTeXDescription "Avinstallerer LaTeX-distribusjonen MiKTeX." +${LangFileString} SecUnJabRefDescription "Avinstallerer bibliografiprogrammet JabRef." +${LangFileString} SecUnPreferencesDescription 'Sletter LyX sine konfigurasjonsmapper$\r$\n\ + $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ + for alle brukere.' +${LangFileString} SecUnProgramFilesDescription "Avinstallerer LyX og alle delkomponenter." diff --git a/development/Win32/packaging/installer/lang/slovak.nsh b/development/Win32/packaging/installer/lang/slovak.nsh index 714d6572ac..7b9ea0926c 100644 --- a/development/Win32/packaging/installer/lang/slovak.nsh +++ b/development/Win32/packaging/installer/lang/slovak.nsh @@ -1,9 +1,7 @@ /* - LyX Installer Language File Language: Slovak Author: Kornel Benko - */ !insertmacro LANGFILE_EXT "Slovak" diff --git a/development/Win32/packaging/installer/lang/spanish.nsh b/development/Win32/packaging/installer/lang/spanish.nsh index 0ce59382b6..6d75bbf0af 100644 --- a/development/Win32/packaging/installer/lang/spanish.nsh +++ b/development/Win32/packaging/installer/lang/spanish.nsh @@ -1,3 +1,9 @@ +/* +LyX Installer Language File +Language: Spanish +Author: Ignacio Garca +*/ + !insertmacro LANGFILE_EXT "Spanish" ${LangFileString} TEXT_INSTALL_CURRENTUSER "(Instalado para el actual usuario)" diff --git a/development/Win32/packaging/installer/lang/ukrainian.nsh b/development/Win32/packaging/installer/lang/ukrainian.nsh index e3514c609b..72800e6e74 100644 --- a/development/Win32/packaging/installer/lang/ukrainian.nsh +++ b/development/Win32/packaging/installer/lang/ukrainian.nsh @@ -1,17 +1,23 @@ +/* +LyX Installer Language File +Language: Ukrainian +Author: Yuri Chornoivan +*/ + !insertmacro LANGFILE_EXT "Ukrainian" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "( )" ${LangFileString} TEXT_WELCOME " LyX .$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB " MiKTeX..." +${LangFileString} TEXT_CONFIGURE_LYX " LyX ( MiKTeX , )..." +${LangFileString} TEXT_CONFIGURE_PYTHON " Python..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP " " +${LangFileString} TEXT_FINISH_WEBSITE "³ lyx.org, , " ${LangFileString} FileTypeTitle " LyX" @@ -25,8 +31,8 @@ ${LangFileString} SecInstJabRefDescription " ${LangFileString} SecAllUsersDescription ", LyX , ." ${LangFileString} SecFileAssocDescription " .lyx LyX." ${LangFileString} SecDesktopDescription "ϳ LyX ." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDictionariesDescription " , ." +${LangFileString} SecThesaurusDescription " , ." ${LangFileString} EnterLaTeXHeader1 ' LaTeX' ${LangFileString} EnterLaTeXHeader2 ' LaTeX, LyX.' @@ -53,8 +59,8 @@ ${LangFileString} LatexError1 ' LyX LaTeX $\"MiKTeX$\"!$\r$\n\ .' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed ' $\"$R3$\" .' +${LangFileString} ThesaurusFailed ' $\"$R3$\" .' ${LangFileString} JabRefInfo ' $\"JabRef$\".$\r$\n\ JabRef.' @@ -78,14 +84,14 @@ ${LangFileString} RunConfigureFailed " ${LangFileString} NotAdmin " LyX !" ${LangFileString} InstallRunning " !" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} ! LyX." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NewerInstalled " LyX, .$\r$\n\ + , LyX $OldVersionNumber." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable " , $\r$\n\ + MiKTeX , LyX - ." +${LangFileString} MetafileNotAvailable " EMF WMF,$\r$\n\ + $\r$\n\ + Windows, ." ${LangFileString} FinishPageMessage "³! LyX .$\r$\n\ $\r$\n\ From 8b85ff4da0f5741cd2802d0b1764cab57e2f813f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Nov 2012 00:29:52 +0100 Subject: [PATCH 83/93] installer: transfer some info from AltInstaller --- development/Win32/packaging/icons/Lydia.svg | 613 ++++++++++++++++++ .../installer/informations/ISO_3166.html | 260 ++++++++ .../informations/InstallerStructure.odg | Bin 0 -> 16706 bytes .../informations/InstallerStructure.pdf | Bin 0 -> 31690 bytes .../installer/informations/WinLangCode.htm | 580 +++++++++++++++++ .../informations/WindowsCodePages.txt | 1 + .../installer/informations/iso639.htm | 554 ++++++++++++++++ 7 files changed, 2008 insertions(+) create mode 100644 development/Win32/packaging/icons/Lydia.svg create mode 100644 development/Win32/packaging/installer/informations/ISO_3166.html create mode 100644 development/Win32/packaging/installer/informations/InstallerStructure.odg create mode 100644 development/Win32/packaging/installer/informations/InstallerStructure.pdf create mode 100644 development/Win32/packaging/installer/informations/WinLangCode.htm create mode 100644 development/Win32/packaging/installer/informations/WindowsCodePages.txt create mode 100644 development/Win32/packaging/installer/informations/iso639.htm diff --git a/development/Win32/packaging/icons/Lydia.svg b/development/Win32/packaging/icons/Lydia.svg new file mode 100644 index 0000000000..270a896f63 --- /dev/null +++ b/development/Win32/packaging/icons/Lydia.svg @@ -0,0 +1,613 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/development/Win32/packaging/installer/informations/ISO_3166.html b/development/Win32/packaging/installer/informations/ISO_3166.html new file mode 100644 index 0000000000..d43871987c --- /dev/null +++ b/development/Win32/packaging/installer/informations/ISO_3166.html @@ -0,0 +1,260 @@ +ISO 3166 Codes (Countries) + +

ISO 3166 Codes (Countries)

+ +Updated by the RIPE Network Coordination Centre, in coordination with +the ISO 3166 Maintenance Agency, Berlin +

+See also: + +

    +
  • ISO 3166 +Maintenance agency (ISO 3166/MA) +
  • Country codes in ISO 3166 + +

    + +

    Country                                         A 2     A 3     Number
+----------------------------------------------------------------------
+AFGHANISTAN                                     AF      AFG     004
+ALBANIA                                         AL      ALB     008
+ALGERIA                                         DZ      DZA     012
+AMERICAN SAMOA                                  AS      ASM     016
+ANDORRA                                         AD      AND     020
+ANGOLA                                          AO      AGO     024
+ANGUILLA                                        AI      AIA     660
+ANTARCTICA                                      AQ      ATA     010
+ANTIGUA AND BARBUDA                             AG      ATG     028
+ARGENTINA                                       AR      ARG     032
+ARMENIA                                         AM      ARM     051  
+ARUBA                                           AW      ABW     533
+AUSTRALIA                                       AU      AUS     036
+AUSTRIA                                         AT      AUT     040
+AZERBAIJAN                                      AZ      AZE     031  
+BAHAMAS                                         BS      BHS     044
+BAHRAIN                                         BH      BHR     048
+BANGLADESH                                      BD      BGD     050
+BARBADOS                                        BB      BRB     052
+BELARUS                                         BY      BLR     112  
+BELGIUM                                         BE      BEL     056
+BELIZE                                          BZ      BLZ     084
+BENIN                                           BJ      BEN     204
+BERMUDA                                         BM      BMU     060
+BHUTAN                                          BT      BTN     064
+BOLIVIA                                         BO      BOL     068
+BOSNIA AND HERZEGOWINA                          BA      BIH     070
+BOTSWANA                                        BW      BWA     072
+BOUVET ISLAND                                   BV      BVT     074
+BRAZIL                                          BR      BRA     076
+BRITISH INDIAN OCEAN TERRITORY                  IO      IOT     086
+BRUNEI DARUSSALAM                               BN      BRN     096
+BULGARIA                                        BG      BGR     100
+BURKINA FASO                                    BF      BFA     854
+BURUNDI                                         BI      BDI     108
+CAMBODIA                                        KH      KHM     116
+CAMEROON                                        CM      CMR     120
+CANADA                                          CA      CAN     124
+CAPE VERDE                                      CV      CPV     132
+CAYMAN ISLANDS                                  KY      CYM     136
+CENTRAL AFRICAN REPUBLIC                        CF      CAF     140
+CHAD                                            TD      TCD     148
+CHILE                                           CL      CHL     152
+CHINA                                           CN      CHN     156
+CHRISTMAS ISLAND                                CX      CXR     162
+COCOS (KEELING) ISLANDS                         CC      CCK     166
+COLOMBIA                                        CO      COL     170
+COMOROS                                         KM      COM     174
+CONGO, Democratic Republic of (was Zaire)       CD      COD     180
+CONGO, People's Republic of                     CG      COG     178
+COOK ISLANDS                                    CK      COK     184
+COSTA RICA                                      CR      CRI     188
+COTE D'IVOIRE                                   CI      CIV     384
+CROATIA (local name: Hrvatska)                  HR      HRV     191      
+CUBA                                            CU      CUB     192
+CYPRUS                                          CY      CYP     196
+CZECH REPUBLIC                                  CZ      CZE     203  
+DENMARK                                         DK      DNK     208
+DJIBOUTI                                        DJ      DJI     262
+DOMINICA                                        DM      DMA     212
+DOMINICAN REPUBLIC                              DO      DOM     214
+EAST TIMOR                                      TL      TLS     626
+ECUADOR                                         EC      ECU     218
+EGYPT                                           EG      EGY     818
+EL SALVADOR                                     SV      SLV     222
+EQUATORIAL GUINEA                               GQ      GNQ     226
+ERITREA                                         ER      ERI     232
+ESTONIA                                         EE      EST     233  
+ETHIOPIA                                        ET      ETH     231
+FALKLAND ISLANDS (MALVINAS)                     FK      FLK     238
+FAROE ISLANDS                                   FO      FRO     234
+FIJI                                            FJ      FJI     242
+FINLAND                                         FI      FIN     246
+FRANCE                                          FR      FRA     250
+FRANCE, METROPOLITAN                            FX      FXX     249  
+FRENCH GUIANA                                   GF      GUF     254
+FRENCH POLYNESIA                                PF      PYF     258
+FRENCH SOUTHERN TERRITORIES                     TF      ATF     260
+GABON                                           GA      GAB     266
+GAMBIA                                          GM      GMB     270
+GEORGIA                                         GE      GEO     268  
+GERMANY                                         DE      DEU     276
+GHANA                                           GH      GHA     288
+GIBRALTAR                                       GI      GIB     292
+GREECE                                          GR      GRC     300
+GREENLAND                                       GL      GRL     304
+GRENADA                                         GD      GRD     308
+GUADELOUPE                                      GP      GLP     312
+GUAM                                            GU      GUM     316
+GUATEMALA                                       GT      GTM     320
+GUINEA                                          GN      GIN     324
+GUINEA-BISSAU                                   GW      GNB     624
+GUYANA                                          GY      GUY     328
+HAITI                                           HT      HTI     332
+HEARD AND MC DONALD ISLANDS                     HM      HMD     334
+HONDURAS                                        HN      HND     340
+HONG KONG                                       HK      HKG     344
+HUNGARY                                         HU      HUN     348
+ICELAND                                         IS      ISL     352
+INDIA                                           IN      IND     356
+INDONESIA                                       ID      IDN     360
+IRAN (ISLAMIC REPUBLIC OF)                      IR      IRN     364
+IRAQ                                            IQ      IRQ     368
+IRELAND                                         IE      IRL     372
+ISRAEL                                          IL      ISR     376
+ITALY                                           IT      ITA     380
+JAMAICA                                         JM      JAM     388
+JAPAN                                           JP      JPN     392
+JORDAN                                          JO      JOR     400
+KAZAKHSTAN                                      KZ      KAZ     398  
+KENYA                                           KE      KEN     404
+KIRIBATI                                        KI      KIR     296
+KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF          KP      PRK     408
+KOREA, REPUBLIC OF                              KR      KOR     410
+KUWAIT                                          KW      KWT     414
+KYRGYZSTAN                                      KG      KGZ     417  
+LAO PEOPLE'S DEMOCRATIC REPUBLIC                LA      LAO     418
+LATVIA                                          LV      LVA     428  
+LEBANON                                         LB      LBN     422
+LESOTHO                                         LS      LSO     426
+LIBERIA                                         LR      LBR     430
+LIBYAN ARAB JAMAHIRIYA                          LY      LBY     434
+LIECHTENSTEIN                                   LI      LIE     438
+LITHUANIA                                       LT      LTU     440  
+LUXEMBOURG                                      LU      LUX     442
+MACAU                                           MO      MAC     446
+MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF      MK      MKD     807 
+MADAGASCAR                                      MG      MDG     450
+MALAWI                                          MW      MWI     454
+MALAYSIA                                        MY      MYS     458
+MALDIVES                                        MV      MDV     462
+MALI                                            ML      MLI     466
+MALTA                                           MT      MLT     470
+MARSHALL ISLANDS                                MH      MHL     584
+MARTINIQUE                                      MQ      MTQ     474
+MAURITANIA                                      MR      MRT     478
+MAURITIUS                                       MU      MUS     480
+MAYOTTE                                         YT      MYT     175  
+MEXICO                                          MX      MEX     484
+MICRONESIA, FEDERATED STATES OF                 FM      FSM     583
+MOLDOVA, REPUBLIC OF                            MD      MDA     498  
+MONACO                                          MC      MCO     492
+MONGOLIA                                        MN      MNG     496
+MONTSERRAT                                      MS      MSR     500
+MOROCCO                                         MA      MAR     504
+MOZAMBIQUE                                      MZ      MOZ     508
+MYANMAR                                         MM      MMR     104
+NAMIBIA                                         NA      NAM     516
+NAURU                                           NR      NRU     520
+NEPAL                                           NP      NPL     524
+NETHERLANDS                                     NL      NLD     528
+NETHERLANDS ANTILLES                            AN      ANT     530
+NEW CALEDONIA                                   NC      NCL     540
+NEW ZEALAND                                     NZ      NZL     554
+NICARAGUA                                       NI      NIC     558
+NIGER                                           NE      NER     562
+NIGERIA                                         NG      NGA     566
+NIUE                                            NU      NIU     570
+NORFOLK ISLAND                                  NF      NFK     574
+NORTHERN MARIANA ISLANDS                        MP      MNP     580
+NORWAY                                          NO      NOR     578
+OMAN                                            OM      OMN     512
+PAKISTAN                                        PK      PAK     586
+PALAU                                           PW      PLW     585
+PALESTINIAN TERRITORY, Occupied                 PS      PSE     275
+PANAMA                                          PA      PAN     591
+PAPUA NEW GUINEA                                PG      PNG     598
+PARAGUAY                                        PY      PRY     600
+PERU                                            PE      PER     604
+PHILIPPINES                                     PH      PHL     608
+PITCAIRN                                        PN      PCN     612
+POLAND                                          PL      POL     616
+PORTUGAL                                        PT      PRT     620
+PUERTO RICO                                     PR      PRI     630
+QATAR                                           QA      QAT     634
+REUNION                                         RE      REU     638
+ROMANIA                                         RO      ROU     642
+RUSSIAN FEDERATION                              RU      RUS     643
+RWANDA                                          RW      RWA     646
+SAINT KITTS AND NEVIS                           KN      KNA     659
+SAINT LUCIA                                     LC      LCA     662
+SAINT VINCENT AND THE GRENADINES                VC      VCT     670
+SAMOA                                           WS      WSM     882
+SAN MARINO                                      SM      SMR     674
+SAO TOME AND PRINCIPE                           ST      STP     678
+SAUDI ARABIA                                    SA      SAU     682
+SENEGAL                                         SN      SEN     686
+SEYCHELLES                                      SC      SYC     690
+SIERRA LEONE                                    SL      SLE     694
+SINGAPORE                                       SG      SGP     702
+SLOVAKIA (Slovak Republic)                      SK      SVK     703  
+SLOVENIA                                        SI      SVN     705  
+SOLOMON ISLANDS                                 SB      SLB     090
+SOMALIA                                         SO      SOM     706
+SOUTH AFRICA                                    ZA      ZAF     710
+SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS    GS      SGS     239
+SPAIN                                           ES      ESP     724
+SRI LANKA                                       LK      LKA     144
+ST. HELENA                                      SH      SHN     654
+ST. PIERRE AND MIQUELON                         PM      SPM     666
+SUDAN                                           SD      SDN     736
+SURINAME                                        SR      SUR     740
+SVALBARD AND JAN MAYEN ISLANDS                  SJ      SJM     744
+SWAZILAND                                       SZ      SWZ     748
+SWEDEN                                          SE      SWE     752
+SWITZERLAND                                     CH      CHE     756
+SYRIAN ARAB REPUBLIC                            SY      SYR     760
+TAIWAN                                          TW      TWN     158
+TAJIKISTAN                                      TJ      TJK     762  
+TANZANIA, UNITED REPUBLIC OF                    TZ      TZA     834
+THAILAND                                        TH      THA     764
+TOGO                                            TG      TGO     768
+TOKELAU                                         TK      TKL     772
+TONGA                                           TO      TON     776
+TRINIDAD AND TOBAGO                             TT      TTO     780
+TUNISIA                                         TN      TUN     788
+TURKEY                                          TR      TUR     792
+TURKMENISTAN                                    TM      TKM     795  
+TURKS AND CAICOS ISLANDS                        TC      TCA     796
+TUVALU                                          TV      TUV     798
+UGANDA                                          UG      UGA     800
+UKRAINE                                         UA      UKR     804
+UNITED ARAB EMIRATES                            AE      ARE     784
+UNITED KINGDOM                                  GB      GBR     826
+UNITED STATES                                   US      USA     840
+UNITED STATES MINOR OUTLYING ISLANDS            UM      UMI     581
+URUGUAY                                         UY      URY     858
+UZBEKISTAN                                      UZ      UZB     860  
+VANUATU                                         VU      VUT     548
+VATICAN CITY STATE (HOLY SEE)                   VA      VAT     336
+VENEZUELA                                       VE      VEN     862
+VIET NAM                                        VN      VNM     704
+VIRGIN ISLANDS (BRITISH)                        VG      VGB     092
+VIRGIN ISLANDS (U.S.)                           VI      VIR     850
+WALLIS AND FUTUNA ISLANDS                       WF      WLF     876
+WESTERN SAHARA                                  EH      ESH     732
+YEMEN                                           YE      YEM     887
+YUGOSLAVIA                                      YU      YUG     891
+ZAMBIA                                          ZM      ZMB     894
+ZIMBABWE                                        ZW      ZWE     716
+
    +
\ No newline at end of file diff --git a/development/Win32/packaging/installer/informations/InstallerStructure.odg b/development/Win32/packaging/installer/informations/InstallerStructure.odg new file mode 100644 index 0000000000000000000000000000000000000000..89ecb8de414bc20c269c202ccf7e28034ec148db GIT binary patch literal 16706 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ξ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
cI6dt(a{+ZV$W&VO6Mt(7j#M}j?gL6 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 and Language Settings
Microsoft Office SharePoint Portal Server 2003
HomeBackForwardPrint

Regional and Language Settings

+ + + + + + +

This topic lists the regional and language settings you can specify +from the command line by using operations in Stsadm.exe and by using +HTML Administration pages. For more information about specifying +regional and language settings, see Language Considerations. For more information about the syntax for command-line operations, see Command-Line Operations. +

The following types of regional and language settings are used in Microsoft Windows SharePoint Services:

+ + +

Language IDs

The +Language ID determines the language used for text on pages in the Web +site (such as the text on the Site Settings page). The languages +available for site creation depend on the language template packs you +have installed to your server or server farm. Web sites based on +Windows SharePoint Services can be created in the following languages.

IDLanguage +IDLanguage +
1025Arabic +1041 +Japanese +
1028 +Chinese - Traditional +1042 +Korean
1029 +Czech1043Dutch +
1030 +Danish +1044 +Norwegian +
1031 +German +1045 +Polish +
1032 +Greek +1046 +Portuguese - Brazilian +
1033 +English +1049 +Russian +
1034 +Spanish +1053 +Swedish +
1035 +Finnish +1054 +Thai +
1036 +French +1055 +Turkish +
1037 +Hebrew +2052 +Chinese - Simplified +
1038 +Hungarian +2070 +Portuguese +
1040 +Italian +3076Chinese - Hong Kong

Windows SharePoint Services also supports input and display of text in the following languages, but not site creation.

IDLanguage +IDLanguage +
1026Bulgarian1048Romanian
1050Croatian +2074Serbian
1061Estonian +1051Slovak
1081Hindi with Indic PT1060Slovenian
1062Latvian1058Ukrainian
1063Lithuanian

Locale IDs

The +Locale ID controls the numbering, sorting, calendar, and time +formatting for the Web site. You can change the locale for a Web site +by using the Regional Settings page. Web sites based on Windows +SharePoint Services can be set to the following Locale IDs.

IDLocaleIDLocale
1078Afrikaans +1037 +Hebrew +
1052 +Albanian +1081 +Hindi +
5121 +Arabic (Algeria) +1038 +Hungarian +
15361 +Arabic (Bahrain) +1039 +Icelandic +
3073 +Arabic (Egypt) +1057 +Indonesian +
2049 +Arabic (Iraq) +1040 +Italian (Italy) +
11265 +Arabic (Jordan) +2064 +Italian (Switzerland) +
13313 +Arabic (Kuwait) +1041 +Japanese +
12289 +Arabic (Lebanon) +1099 +Kannada +
4097 +Arabic (Libya) +1087 +Kazakh +
6145 +Arabic (Morocco) +1111 +Konkani +
8193 +Arabic (Oman) +1042 +Korean +
16385 +Arabic (Qatar) +1088 +Kyrgyz (Cyrillic) +
1025 +Arabic (Saudi Arabia) +1062Latvian +
10241 +Arabic (Syria) +1063 +Lithuanian +
7169 +Arabic (Tunisia) +1071 +Macedonian (FYROM) +
14337 +Arabic (U.A.E.) +2110 +Malay (Brunei Darussalam) +
9217 +Arabic (Yemen) +1086 +Malay (Malaysia) +
1067 +Armenian +1102 +Marathi +
2092 +Azeri (Cyrillic) +1104 +Mongolian (Cyrillic) +
1068 +Azeri (Latin) +1044 +Norwegian (Bokmal) +
1069 +Basque +2068 +Norwegian (Nynorsk) +
1059 +Belarusian +1045 +Polish +
1026 +Bulgarian +1046 +Portuguese (Brazil) +
1027 +Catalan +2070 +Portuguese (Portugal) +
3076 +Chinese (Hong Kong) +1094 +Punjabi +
5124 +Chinese (Macau) +1048 +Romanian +
2052 +Chinese (PRC) +1049 +Russian +
4100 +Chinese (Singapore) +1103 +Sanskrit +
1028 +Chinese (Taiwan) +3098 +Serbian (Cyrillic) +
1050 +Croatian +2074 +Serbian (Latin) +
1029 +Czech +1051 +Slovak +
1030 +Danish +1060 +Slovenian +
1125 +Divehi +11274 +Spanish (Argentina) +
2067 +Dutch (Belgium) +16394 +Spanish (Bolivia) +
1043 +Dutch (Netherlands) +13322 +Spanish (Chile) +
3081 +English (Australia) +9226 +Spanish (Colombia) +
10249 +English (Belize) +5130 +Spanish (Costa Rica) +
4105 +English (Canada) +7178 +Spanish (Dominican Republic) +
9225 +English (Caribbean) +12298 +Spanish (Ecuador) +
6153 +English (Ireland) +17418 +Spanish (El Salvador) +
8201 +English (Jamaica) +4106Spanish (Guatemala) +
5129 +English (New Zealand) +18442 +Spanish (Honduras) +
13321 +English (Philippines) +2058 +Spanish (Mexico) +
7177 +English (South Africa) +19466 +Spanish (Nicaragua) +
11273 +English (Trinidad) +6154 +Spanish (Panama) +
2057 +English (United Kingdom) +15370 +Spanish (Paraguay) +
1033 +English (United States)   +10250 +Spanish (Peru) +
12297 +English (Zimbabwe) +20490 +Spanish (Puerto Rico) +
1061 +Estonian +3082 +Spanish (Spain) +
1080 +Faeroese +1034 +Spanish (Traditional) +
1065 +Farsi +14346 +Spanish (Uruguay) +
1035 +Finnish +8202 +Spanish (Venezuela) +
2060 +French (Belgium) +1089 +Swahili +
3084 +French (Canada) +1053 +Swedish +
1036 +French (France) +2077 +Swedish (Finland) +
5132 +French (Luxembourg) +1114 +Syriac +
6156 +French (Monaco) +1097 +Tamil +
4108 +French (Switzerland) +1092 +Tatar +
1110 +Galician +1098 +Telugu +
1079 +Georgian +1054 +Thai +
3079 +German (Austria) +1055 +Turkish +
1031 +German (Germany) +1058 +Ukrainian +
5127 +German (Liechtenstein) +1056 +Urdu +
4103 +German (Luxembourg) +2115 +Uzbek (Cyrillic) +
2055 +German (Switzerland) +1091 +Uzbek (Latin) +
1032 +Greek +1066 +Vietnamese +
1095 +Gujarati +

Time Zones

Web +sites based on Windows SharePoint Services can be set to any of the +time zones recognized by Microsoft Windows Server 2003.

Code +Time zoneCodeTime zone
39(GMT-12:00) Eniwetok, Kwajalein59(GMT+02:00) Helsinki, Riga, Tallinn +
16(GMT-11:00) Midway Island, Samoa +27(GMT+02:00) Jerusalem 26 (GMT+03:00) Baghdad +
15(GMT-10:00) Hawaii +74(GMT+03:00) Kuwait, Riyadh +
14(GMT-09:00) Alaska +51(GMT+03:00) Moscow, St. Petersburg, Volgograd +
13(GMT-08:00) Pacific Time (US and Canada); Tijuana +56(GMT+03:00) Nairobi +
38(GMT-07:00) Arizona +25(GMT+03:30) Tehran
12(GMT-07:00) Mountain Time (US and Canada) +24(GMT+04:00) Abu Dhabi, Muscat +
55(GMT-06:00) Central America +54(GMT+04:00) Baku, Tbilisi, Yerevan 48 (GMT+04:30) Kabul +
11(GMT-06:00) Central Time (US and Canada) +58(GMT+05:00) Ekaterinburg +
37(GMT-06:00) Mexico City +47 +(GMT+05:00) Islamabad, Karachi, Tashkent +
36(GMT-06:00) Saskatchewan +23(GMT+05:30) Calcutta, Chennai, Mumbai, New Delhi +
35(GMT-05:00) Bogota, Lima, Quito +62(GMT+05:45) Kathmandu 46 (GMT+06:00) Almaty, Novosibirsk +
10(GMT-05:00) Eastern Time (US and Canada) +71(GMT+06:00) Astana, Dhaka +
34 +(GMT-05:00) Indiana (East) +66(GMT+06:00) Sri Jayawardenepura +
9 +(GMT-04:00) Atlantic Time (Canada) +61(GMT+06:30) Rangoon +
33(GMT-04:00) Caracas, La Paz +22(GMT+07:00) Bangkok, Hanoi, Jakarta +
65(GMT-04:00) Santiago +64(GMT+07:00) Krasnoyarsk +
28(GMT-03:30) Newfoundland 8 (GMT-03:00) Brasilia +45(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi +
32(GMT-03:00) Buenos Aires, Georgetown +63(GMT+08:00) Irkutsk, Ulaan Bataar +
60(GMT-03:00) Greenland +21(GMT+08:00) Kuala Lumpur, Singapore +
30(GMT-02:00) Mid-Atlantic +73(GMT+08:00) Perth 75 (GMT+08:00) Taipei +
29(GMT-01:00) Azores +20(GMT+09:00) Osaka, Sapporo, Tokyo 72 (GMT+09:00) Seoul +
53(GMT-01:00) Cape Verde Is.70(GMT+09:00) Yakutsk 19 (GMT+09:30) Adelaide +
31(GMT) Casablanca, Monrovia +44(GMT+09:30) Darwin +
2(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London +18(GMT+10:00) Brisbane +
4(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna +76(GMT+10:00) Canberra, Melbourne, Sydney +
6(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague +43(GMT+10:00) Guam, Port Moresby +
3(GMT+01:00) Brussels, Copenhagen, Madrid, Paris +42(GMT+10:00) Hobart
57(GMT+01:00) Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb +68(GMT+10:00) Vladivostok +
69(GMT+01:00) West Central Africa +41(GMT+11:00) Magadan, Solomon Is., New Caledonia +
7(GMT+02:00) Athens, Istanbul, Minsk +17(GMT+12:00) Auckland, Wellington +
5(GMT+02:00) Bucharest40 +(GMT+12:00) Fiji, Kamchatka, Marshall Is. +
49 +(GMT+02:00) Cairo +67 +(GMT+13:00) Nuku'alofa +
50 +(GMT+02:00) Harare, Pretoria +

Currency IDs

Web sites based on Windows SharePoint Services can be set to use the following currencies. +

IDCurrency +IDCurrency +
51211,254 .ج.د (Arabic-Algeria) +4106 +Q1,254 (Guatemala) +
15361 +1,254 .ب.د (Arabic-Bahrain) +18442 +L. 1254 (Honduras) +
3073 +1,254 .م.ج (Arabic-Egypt)3076 +HK$1,254 (Hong Kong) +
2049 +1,254 .ع.د (Arabic-Iraq) +1038 +1 254 Ft (Hungary) +
11265 +1,254 .ا.د (Arabic-Jordan) +1081 +रु 1,254 (India) +
13313 +1,254 .ك.د (Arabic-Kuwait) +6153 +IR£1,254 (Ireland) +
12289 +1,254 .ل.ل (Arabic-Lebanon) +1037 +₪1,254 (Israel) +
4097 +1,254 .ل.د (Arabic-Libya) +1041 +¥1,254 (Japan) +
6145 +1,254 .م.د (Arabic-Morocco) +1042 +₩1,254 (Korea) +
8193 +1,254 .ع.ر (Arabic-Oman) +2058 +$1,254 (Mexico) +
16385 +1,254 .ق.ر (Arabic-Qatar) +5129 +$1,254 (New Zealand) +
1025 +1,254 .س.ر (Arabic-Saudi Arabia) +19466 +C$ 1254 (Nicaragua) +
10241 +1,254 .س.ل (Arabic-Syria) +1044 +kr 1 254 (Norway) +
7169 +1,254 .ت.د (Arabic-Tunisia) +1056 +Rs 1,254 (Pakistan) +
14337 +1,254 .إ.د (Arabic-U.A.E) +6154 +B/. 1,254 (Panama) +
9217 +1,254 .ي.ر (Arabic-Yemen) +15370 +Gs 1.254 (Paraguay) +
11274 +$ 1.254 (Argentina) +2052 +￥1,254 (People's Republic of China) +
3081 +$1,254 (Australia) +10250 +S/. 1,254 (Peru) +
3079 +öS 1.254 (Austria) +1045 +1 254 zł (Poland) +
16394 +$b 1.254 (Bolivia) +1049 +1 254р. (Russia) +
1046 +R$ 1.254 (Brazil) +4100 +$1,254 (Singapore) +
3084 +1 254 $ (Canada) +1051 +1 254 Sk (Slovakia) +
4105 +$1,254 (Canada) +1060 +1.254 SIT (Slovenia) +
13322 +$ 1.254 (Chile) +7177 +R 1,254 (South Africa) +
9226 +$ 1.254 (Colombia) +1053 +1.254 kr (Sweden) +
5130 +C1.254 (Costa Rica) +2055 +SFr. 1'254 (Switzerland) +
1029 +1 254 Kč (Czech Republic) +1028 +NT$1,254 (Taiwan) +
1030 +kr 1.254 (Denmark) +1054 +฿1,254 (Thai) +
7178 +RD$1,254 (Dominican Republic) +1055 +1.254 TL (Turkey) +
17418 +C1254 (El Salvador) +2057 +£1,254 (United Kingdom) +
-2 +1,254 € (European Union) +1033 +$1,254 (United States) +
-1 +€ 1,254 (European Union) +14346 +$U 1.254 (Uruguay) +
1065 +1,254 ريال (Farsi) +8202 +Bs 1.254 (Venezuela) +
1032 +1.254 Δρχ (Greece) +1066 +1,254 ₫ (Vietnamese) +
©2003 Microsoft Corporation. All rights reserved.
\ No newline at end of file diff --git a/development/Win32/packaging/installer/informations/WindowsCodePages.txt b/development/Win32/packaging/installer/informations/WindowsCodePages.txt new file mode 100644 index 0000000000..16d20d792a --- /dev/null +++ b/development/Win32/packaging/installer/informations/WindowsCodePages.txt @@ -0,0 +1 @@ +http://msdn.microsoft.com/en-en/goglobal/bb964654.aspx \ No newline at end of file diff --git a/development/Win32/packaging/installer/informations/iso639.htm b/development/Win32/packaging/installer/informations/iso639.htm new file mode 100644 index 0000000000..d44be797a2 --- /dev/null +++ b/development/Win32/packaging/installer/informations/iso639.htm @@ -0,0 +1,554 @@ + +ISO 639 Language Codes + + + + +

ISO 639 Language Codes

+

ISO 639: 3-letter codes

+
abk      ab    Abkhazian
+ace            Achinese
+ach            Acoli
+ada            Adangme
+aar      aa    Afar
+afh            Afrihili
+afr      af    Afrikaans
+afa            Afro-Asiatic (Other)
+aka            Akan
+akk            Akkadian
+alb/sqi  sq    Albanian
+ale            Aleut
+alg            Algonquian languages
+tut            Altaic (Other)
+amh      am    Amharic
+apa            Apache languages
+ara      ar    Arabic
+arc            Aramaic
+arp            Arapaho
+arn            Araucanian
+arw            Arawak
+arm/hye  hy    Armenian
+art            Artificial (Other)
+asm      as    Assamese
+ath            Athapascan languages
+map            Austronesian (Other)
+ava            Avaric
+ave            Avestan
+awa            Awadhi
+aym      ay    Aymara
+aze      az    Azerbaijani
+nah            Aztec
+ban            Balinese
+bat            Baltic (Other)
+bal            Baluchi
+bam            Bambara
+bai            Bamileke languages
+bad            Banda
+bnt            Bantu (Other)
+bas            Basa
+bak      ba    Bashkir
+baq/eus  eu    Basque
+bej            Beja
+bem            Bemba
+ben      bn    Bengali
+ber            Berber (Other)
+bho            Bhojpuri
+bih      bh    Bihari
+bik            Bikol
+bin            Bini
+bis      bi    Bislama
+bra            Braj
+bre      be    Breton
+bug            Buginese
+bul      bg    Bulgarian
+bua            Buriat
+bur/mya  my    Burmese
+bel      be    Byelorussian
+cad            Caddo
+car            Carib
+cat      ca    Catalan
+cau            Caucasian (Other)
+ceb            Cebuano
+cel            Celtic (Other)
+cai            Central American Indian (Other)
+chg            Chagatai
+cha            Chamorro
+che            Chechen
+chr            Cherokee
+chy            Cheyenne
+chb            Chibcha
+chi/zho  zh    Chinese
+chn            Chinook jargon
+cho            Choctaw
+chu            Church Slavic
+chv            Chuvash
+cop            Coptic
+cor            Cornish
+cos      co    Corsican
+cre            Cree
+mus            Creek
+crp            Creoles and Pidgins (Other)
+cpe            Creoles and Pidgins, English-based (Other)
+cpf            Creoles and Pidgins, French-based (Other)
+cpp            Creoles and Pidgins, Portuguese-based (Other)
+cus            Cushitic (Other)
+         hr    Croatian
+ces/cze  cs    Czech
+dak            Dakota
+dan      da    Danish
+del            Delaware
+din            Dinka
+div            Divehi
+doi            Dogri
+dra            Dravidian (Other)
+dua            Duala
+dut/nla  nl    Dutch
+dum            Dutch, Middle (ca. 1050-1350)
+dyu            Dyula
+dzo      dz    Dzongkha
+efi            Efik
+egy            Egyptian (Ancient)
+eka            Ekajuk
+elx            Elamite
+eng      en    English
+enm            English, Middle (ca. 1100-1500)
+ang            English, Old (ca. 450-1100)
+esk            Eskimo (Other)
+epo      eo    Esperanto
+est      et    Estonian
+ewe            Ewe
+ewo            Ewondo
+fan            Fang
+fat            Fanti
+fao      fo    Faroese
+fij      fj    Fijian
+fin      fi    Finnish
+fiu            Finno-Ugrian (Other)
+fon            Fon
+fra/fre  fr    French
+frm            French, Middle (ca. 1400-1600)
+fro            French, Old (842- ca. 1400)
+fry      fy    Frisian
+ful            Fulah
+gaa            Ga
+gae/gdh  Gaelic (Scots)
+glg      gl    Gallegan
+lug            Ganda
+gay            Gayo
+gez            Geez
+geo/kat  ka    Georgian
+deu/ger  de    German
+gmh            German, Middle High (ca. 1050-1500)
+goh            German, Old High (ca. 750-1050)
+gem            Germanic (Other)
+gil            Gilbertese
+gon            Gondi
+got            Gothic
+grb            Grebo
+grc            Greek, Ancient (to 1453)
+ell/gre  el    Greek, Modern (1453-)
+kal      kl    Greenlandic
+grn      gn    Guarani
+guj      gu    Gujarati
+hai            Haida
+hau      ha    Hausa
+haw            Hawaiian
+heb      he    Hebrew
+her            Herero
+hil            Hiligaynon
+him            Himachali
+hin      hi    Hindi
+hmo            Hiri Motu
+hun      hu    Hungarian
+hup            Hupa
+iba            Iban
+ice/isl  is    Icelandic
+ibo            Igbo
+ijo            Ijo
+ilo            Iloko
+inc            Indic (Other)
+ine            Indo-European (Other)
+ind      id    Indonesian
+ina      ia    Interlingua (International Auxiliary language Association)
+ine      -     Interlingue
+iku      iu    Inuktitut
+ipk      ik    Inupiak
+ira            Iranian (Other)
+gai/iri  ga    Irish
+sga            Irish, Old (to 900)
+mga            Irish, Middle (900 - 1200)
+iro            Iroquoian languages
+ita      it    Italian
+jpn      ja    Japanese
+jav/jaw  jv/jw Javanese
+jrb            Judeo-Arabic
+jpr            Judeo-Persian
+kab            Kabyle
+kac            Kachin
+kam            Kamba
+kan      kn    Kannada
+kau            Kanuri
+kaa            Kara-Kalpak
+kar            Karen
+kas      ks    Kashmiri
+kaw            Kawi
+kaz      kk    Kazakh
+kha            Khasi
+khm      km    Khmer
+khi            Khoisan (Other)
+kho            Khotanese
+kik            Kikuyu
+kin      rw    Kinyarwanda
+kir      ky    Kirghiz
+kom            Komi
+kon            Kongo
+kok            Konkani
+kor      ko    Korean
+kpe            Kpelle
+kro            Kru
+kua            Kuanyama
+kum            Kumyk
+kur      ku    Kurdish
+kru            Kurukh
+kus            Kusaie
+kut            Kutenai
+lad            Ladino
+lah            Lahnda
+lam            Lamba
+oci      oc    Langue d'Oc (post 1500)
+lao      lo    Lao
+lat      la    Latin
+lav      lv    Latvian
+ltz            Letzeburgesch
+lez            Lezghian
+lin      ln    Lingala
+lit      lt    Lithuanian
+loz            Lozi
+lub            Luba-Katanga
+lui            Luiseno
+lun            Lunda
+luo            Luo (Kenya and Tanzania)
+mac/mak  mk    Macedonian
+mad            Madurese
+mag            Magahi
+mai            Maithili
+mak            Makasar
+mlg      mg    Malagasy
+may/msa  ms    Malay
+mal            Malayalam
+mlt      ml    Maltese
+man            Mandingo
+mni            Manipuri
+mno            Manobo languages
+max            Manx
+mao/mri  mi    Maori
+mar      mr    Marathi
+chm            Mari
+mah            Marshall
+mwr            Marwari
+mas            Masai
+myn            Mayan languages
+men            Mende
+mic            Micmac
+min            Minangkabau
+mis            Miscellaneous (Other)
+moh            Mohawk
+mol      mo    Moldavian
+mkh            Mon-Kmer (Other)
+lol            Mongo
+mon      mn    Mongolian
+mos            Mossi
+mul            Multiple languages
+mun            Munda languages
+nau      na    Nauru
+nav            Navajo
+nde            Ndebele, North
+nbl            Ndebele, South
+ndo            Ndongo
+nep      ne    Nepali
+new            Newari
+nic            Niger-Kordofanian (Other)
+ssa            Nilo-Saharan (Other)
+niu            Niuean
+non            Norse, Old
+nai            North American Indian (Other)
+nor      no    Norwegian
+nno            Norwegian (Nynorsk)
+nub            Nubian languages
+nym            Nyamwezi
+nya            Nyanja
+nyn            Nyankole
+nyo            Nyoro
+nzi            Nzima
+oji            Ojibwa
+ori      or    Oriya
+orm      om    Oromo
+osa            Osage
+oss            Ossetic
+oto            Otomian languages
+pal            Pahlavi
+pau            Palauan
+pli            Pali
+pam            Pampanga
+pag            Pangasinan
+pan      pa    Panjabi
+pap            Papiamento
+paa            Papuan-Australian (Other)
+fas/per  fa    Persian
+peo            Persian, Old (ca 600 - 400 B.C.)
+phn            Phoenician
+pol      pl    Polish
+pon            Ponape
+por      pt    Portuguese
+pra            Prakrit languages
+pro            Provencal, Old (to 1500)
+pus      ps    Pushto
+que      qu    Quechua
+roh      rm    Rhaeto-Romance
+raj            Rajasthani
+rar            Rarotongan
+roa            Romance (Other)
+ron/rum  ro    Romanian
+rom            Romany
+run      rn    Rundi
+rus      ru    Russian
+sal            Salishan languages
+sam            Samaritan Aramaic
+smi            Sami languages
+smo      sm    Samoan
+sad            Sandawe
+sag      sg    Sango
+san      sa    Sanskrit
+srd            Sardinian
+sco            Scots
+sel            Selkup
+sem            Semitic (Other)
+         sr    Serbian
+scr      sh    Serbo-Croatian
+srr            Serer
+shn            Shan
+sna      sn    Shona
+sid            Sidamo
+bla            Siksika
+snd      sd    Sindhi
+sin      si    Singhalese
+sit      -     Sino-Tibetan (Other)
+sio            Siouan languages
+sla            Slavic (Other)
+ssw      ss    Siswant
+slk/slo  sk    Slovak
+slv      sl    Slovenian
+sog            Sogdian
+som      so    Somali
+son            Songhai
+wen            Sorbian languages
+nso            Sotho, Northern
+sot      st    Sotho, Southern
+sai            South American Indian (Other)
+esl/spa  es    Spanish
+suk            Sukuma
+sux            Sumerian
+sun      su    Sudanese
+sus            Susu
+swa      sw    Swahili
+ssw            Swazi
+sve/swe  sv    Swedish
+syr            Syriac
+tgl      tl    Tagalog
+tah            Tahitian
+tgk      tg    Tajik
+tmh            Tamashek
+tam      ta    Tamil
+tat      tt    Tatar
+tel      te    Telugu
+ter            Tereno
+tha      th    Thai
+bod/tib  bo    Tibetan
+tig            Tigre
+tir      ti    Tigrinya
+tem            Timne
+tiv            Tivi
+tli            Tlingit
+tog      to    Tonga (Nyasa)
+ton            Tonga (Tonga Islands)
+tru            Truk
+tsi            Tsimshian
+tso      ts    Tsonga
+tsn      tn    Tswana
+tum            Tumbuka
+tur      tr    Turkish
+ota            Turkish, Ottoman (1500 - 1928)
+tuk      tk    Turkmen
+tyv            Tuvinian
+twi      tw    Twi
+uga            Ugaritic
+uig      ug    Uighur
+ukr      uk    Ukrainian
+umb            Umbundu
+und            Undetermined
+urd      ur    Urdu
+uzb      uz    Uzbek
+vai            Vai
+ven            Venda
+vie      vi    Vietnamese
+vol      vo    Volapk
+vot            Votic
+wak            Wakashan languages
+wal            Walamo
+war            Waray
+was            Washo
+cym/wel  cy    Welsh
+wol      wo    Wolof
+xho      xh    Xhosa
+sah            Yakut
+yao            Yao
+yap            Yap
+yid      yi    Yiddish
+yor      yo    Yoruba
+zap            Zapotec
+zen            Zenaga
+zha      za    Zhuang
+zul      zu    Zulu
+zun            Zuni
+
+

ISO 639: 2-letter codes

+
AA "Afar"
+AB "Abkhazian"
+AF "Afrikaans"
+AM "Amharic"
+AR "Arabic"
+AS "Assamese"
+AY "Aymara"
+AZ "Azerbaijani"
+BA "Bashkir"
+BE "Byelorussian"
+BG "Bulgarian"
+BH "Bihari"
+BI "Bislama"
+BN "Bengali" "Bangla"
+BO "Tibetan"
+BR "Breton"
+CA "Catalan"
+CO "Corsican"
+CS "Czech"
+CY "Welsh"
+DA "Danish"
+DE "German"
+DZ "Bhutani"
+EL "Greek"
+EN "English" "American"
+EO "Esperanto"
+ES "Spanish"
+ET "Estonian"
+EU "Basque"
+FA "Persian"
+FI "Finnish"
+FJ "Fiji"
+FO "Faeroese"
+FR "French"
+FY "Frisian"
+GA "Irish"
+GD "Gaelic" "Scots Gaelic"
+GL "Galician"
+GN "Guarani"
+GU "Gujarati"
+HA "Hausa"
+HI "Hindi"
+HR "Croatian"
+HU "Hungarian"
+HY "Armenian"
+IA "Interlingua"
+IE "Interlingue"
+IK "Inupiak"
+IN "Indonesian"
+IS "Icelandic"
+IT "Italian"
+IW "Hebrew"
+JA "Japanese"
+JI "Yiddish"
+JW "Javanese"
+KA "Georgian"
+KK "Kazakh"
+KL "Greenlandic"
+KM "Cambodian"
+KN "Kannada"
+KO "Korean"
+KS "Kashmiri"
+KU "Kurdish"
+KY "Kirghiz"
+LA "Latin"
+LN "Lingala"
+LO "Laothian"
+LT "Lithuanian"
+LV "Latvian" "Lettish"
+MG "Malagasy"
+MI "Maori"
+MK "Macedonian"
+ML "Malayalam"
+MN "Mongolian"
+MO "Moldavian"
+MR "Marathi"
+MS "Malay"
+MT "Maltese"
+MY "Burmese"
+NA "Nauru"
+NE "Nepali"
+NL "Dutch"
+NO "Norwegian"
+OC "Occitan"
+OM "Oromo" "Afan"
+OR "Oriya"
+PA "Punjabi"
+PL "Polish"
+PS "Pashto" "Pushto"
+PT "Portuguese"
+QU "Quechua"
+RM "Rhaeto-Romance"
+RN "Kirundi"
+RO "Romanian"
+RU "Russian"
+RW "Kinyarwanda"
+SA "Sanskrit"
+SD "Sindhi"
+SG "Sangro"
+SH "Serbo-Croatian"
+SI "Singhalese"
+SK "Slovak"
+SL "Slovenian"
+SM "Samoan"
+SN "Shona"
+SO "Somali"
+SQ "Albanian"
+SR "Serbian"
+SS "Siswati"
+ST "Sesotho"
+SU "Sudanese"
+SV "Swedish"
+SW "Swahili"
+TA "Tamil"
+TE "Tegulu"
+TG "Tajik"
+TH "Thai"
+TI "Tigrinya"
+TK "Turkmen"
+TL "Tagalog"
+TN "Setswana"
+TO "Tonga"
+TR "Turkish"
+TS "Tsonga"
+TT "Tatar"
+TW "Twi"
+UK "Ukrainian"
+UR "Urdu"
+UZ "Uzbek"
+VI "Vietnamese"
+VO "Volapuk"
+WO "Wolof"
+XH "Xhosa"
+YO "Yoruba"
+ZH "Chinese"
+ZU "Zulu"
+
+
+

Document Modified August 9, 1999

+ \ No newline at end of file From dd64d415958f4cea8684c3ab1ecd08a579831696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Nov 2012 00:31:37 +0100 Subject: [PATCH 84/93] AltInstaller: remove this old installer We can now get rid of this for master. I would like to keep it in branch as archive. --- .../Win32/packaging/AltInstaller/Aspell.nsh | 372 --------- .../packaging/AltInstaller/Build-all.nsi | 23 - .../packaging/AltInstaller/ChangeLog.txt | 26 - .../packaging/AltInstaller/ConfigLyX.nsh | 147 ---- .../Win32/packaging/AltInstaller/Deleted.nsh | 8 - .../InstallActions-complete-small.nsh | 77 -- .../AltInstaller/InstallActions-update.nsh | 329 -------- .../AltInstaller/InstallThirdPartyProgs.nsh | 189 ----- .../Win32/packaging/AltInstaller/LaTeX.nsh | 236 ------ .../packaging/AltInstaller/LaTeXFolder.nsh | 39 - .../AltInstaller/LanguageSettings.nsh | 754 ----------------- .../Win32/packaging/AltInstaller/Launch.nsi | 45 -- .../Win32/packaging/AltInstaller/License.txt | 365 --------- .../AltInstaller/LyXInstaller-complete.nsi | 292 ------- .../AltInstaller/LyXInstaller-small.nsi | 276 ------- .../AltInstaller/LyXInstaller-update.nsi | 238 ------ .../Win32/packaging/AltInstaller/LyXUtils.nsh | 544 ------------- .../AltInstaller/MissingPrograms.nsh | 300 ------- .../AltInstaller/ReadmeComplete1.6.txt | 99 --- .../AltInstaller/ReadmePackage1.6.txt | 101 --- .../AltInstaller/ReadmeScripts1.6.txt | 42 - .../packaging/AltInstaller/ReadmeSmall1.6.txt | 101 --- .../AltInstaller/ReadmeUpdate1.6.txt | 34 - .../Win32/packaging/AltInstaller/Settings.nsh | 99 --- .../AltInstaller/TranslatedLanguages.nsh | 46 -- .../packaging/AltInstaller/Uninstall.nsh | 262 ------ .../Win32/packaging/AltInstaller/Updated.nsh | 19 - .../packaging/AltInstaller/Variables.nsh | 32 - .../packaging/AltInstaller/icons/Lydia.svg | 613 -------------- .../packaging/AltInstaller/icons/lyx.ico | Bin 3262 -> 0 bytes .../packaging/AltInstaller/icons/lyx.svg | 433 ---------- .../AltInstaller/icons/lyx_32x32.ico | Bin 10534 -> 0 bytes .../packaging/AltInstaller/icons/lyx_doc.svg | 761 ------------------ .../AltInstaller/icons/lyx_logo_hi.bmp | Bin 9744 -> 0 bytes .../icons/lyx_logo_vert20alpha2.bmp | Bin 103048 -> 0 bytes .../AltInstaller/informations/ISO_3166.html | 260 ------ .../informations/InstallerStructure.odg | Bin 16706 -> 0 bytes .../informations/InstallerStructure.pdf | Bin 31690 -> 0 bytes .../AltInstaller/informations/WinLangCode.htm | 580 ------------- .../informations/WindowsCodePages.txt | 1 - .../AltInstaller/informations/iso639.htm | 554 ------------- .../Win32/packaging/AltInstaller/io_latex.ini | 36 - .../AltInstaller/io_missing_progs.ini | 44 - .../packaging/AltInstaller/io_ui_language.ini | 19 - .../AltInstaller/lyx_languages/Encodings.txt | 9 - .../AltInstaller/lyx_languages/arabic.nsh | 149 ---- .../AltInstaller/lyx_languages/catalan.nsh | 149 ---- .../AltInstaller/lyx_languages/czech.nsh | 149 ---- .../AltInstaller/lyx_languages/danish.nsh | 150 ---- .../AltInstaller/lyx_languages/dutch.nsh | 149 ---- .../AltInstaller/lyx_languages/english.nsh | 149 ---- .../AltInstaller/lyx_languages/french.nsh | 149 ---- .../AltInstaller/lyx_languages/galician.nsh | 149 ---- .../AltInstaller/lyx_languages/german.nsh | 150 ---- .../AltInstaller/lyx_languages/hungarian.nsh | 149 ---- .../AltInstaller/lyx_languages/indonesian.nsh | 149 ---- .../AltInstaller/lyx_languages/italian.nsh | 149 ---- .../AltInstaller/lyx_languages/japanese.nsh | 149 ---- .../AltInstaller/lyx_languages/norwegian.nsh | 149 ---- .../AltInstaller/lyx_languages/polish.nsh | 164 ---- .../AltInstaller/lyx_languages/portuguese.nsh | 149 ---- .../AltInstaller/lyx_languages/romanian.nsh | 149 ---- .../AltInstaller/lyx_languages/slovak.nsh | 155 ---- .../AltInstaller/lyx_languages/spanish.nsh | 149 ---- .../AltInstaller/lyx_languages/swedish.nsh | 149 ---- .../AltInstaller/lyx_languages/turkish.nsh | 162 ---- .../AltInstaller/lyx_languages/ukrainian.nsh | 149 ---- .../Win32/packaging/AltInstaller/registry.nsh | 166 ---- .../specials/AspellDictionaryNames.txt | 26 - .../specials/AspellRepositories.txt | 3 - .../specials/Launcher/lyxLauncher.cfg | 38 - .../specials/Launcher/lyxLauncher.dof | 139 ---- .../specials/Launcher/lyxLauncher.dpr | 109 --- .../specials/Launcher/lyxLauncher.exe | Bin 406016 -> 0 bytes .../specials/Launcher/lyxLauncher.res | Bin 11488 -> 0 bytes .../specials/PDFViewWin/PDFViewWin.cfg | 38 - .../specials/PDFViewWin/PDFViewWin.dof | 139 ---- .../specials/PDFViewWin/PDFViewWin.dpr | 103 --- .../specials/PDFViewWin/PDFViewWin.exe | Bin 45568 -> 0 bytes .../specials/PDFViewWin/PDFViewWin.res | Bin 4144 -> 0 bytes .../specials/PDFViewWin/pdfclose.exe | Bin 73728 -> 0 bytes .../specials/PDFViewWin/pdfdde.exe | Bin 73728 -> 0 bytes .../specials/PDFViewWin/pdfopen.exe | Bin 73728 -> 0 bytes 83 files changed, 12480 deletions(-) delete mode 100644 development/Win32/packaging/AltInstaller/Aspell.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Build-all.nsi delete mode 100644 development/Win32/packaging/AltInstaller/ChangeLog.txt delete mode 100644 development/Win32/packaging/AltInstaller/ConfigLyX.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Deleted.nsh delete mode 100644 development/Win32/packaging/AltInstaller/InstallActions-complete-small.nsh delete mode 100644 development/Win32/packaging/AltInstaller/InstallActions-update.nsh delete mode 100644 development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh delete mode 100644 development/Win32/packaging/AltInstaller/LaTeX.nsh delete mode 100644 development/Win32/packaging/AltInstaller/LaTeXFolder.nsh delete mode 100644 development/Win32/packaging/AltInstaller/LanguageSettings.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Launch.nsi delete mode 100644 development/Win32/packaging/AltInstaller/License.txt delete mode 100644 development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi delete mode 100644 development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi delete mode 100644 development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi delete mode 100644 development/Win32/packaging/AltInstaller/LyXUtils.nsh delete mode 100644 development/Win32/packaging/AltInstaller/MissingPrograms.nsh delete mode 100644 development/Win32/packaging/AltInstaller/ReadmeComplete1.6.txt delete mode 100644 development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt delete mode 100644 development/Win32/packaging/AltInstaller/ReadmeScripts1.6.txt delete mode 100644 development/Win32/packaging/AltInstaller/ReadmeSmall1.6.txt delete mode 100644 development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt delete mode 100644 development/Win32/packaging/AltInstaller/Settings.nsh delete mode 100644 development/Win32/packaging/AltInstaller/TranslatedLanguages.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Uninstall.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Updated.nsh delete mode 100644 development/Win32/packaging/AltInstaller/Variables.nsh delete mode 100644 development/Win32/packaging/AltInstaller/icons/Lydia.svg delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx.ico delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx.svg delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx_32x32.ico delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx_doc.svg delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx_logo_hi.bmp delete mode 100644 development/Win32/packaging/AltInstaller/icons/lyx_logo_vert20alpha2.bmp delete mode 100644 development/Win32/packaging/AltInstaller/informations/ISO_3166.html delete mode 100644 development/Win32/packaging/AltInstaller/informations/InstallerStructure.odg delete mode 100644 development/Win32/packaging/AltInstaller/informations/InstallerStructure.pdf delete mode 100644 development/Win32/packaging/AltInstaller/informations/WinLangCode.htm delete mode 100644 development/Win32/packaging/AltInstaller/informations/WindowsCodePages.txt delete mode 100644 development/Win32/packaging/AltInstaller/informations/iso639.htm delete mode 100644 development/Win32/packaging/AltInstaller/io_latex.ini delete mode 100644 development/Win32/packaging/AltInstaller/io_missing_progs.ini delete mode 100644 development/Win32/packaging/AltInstaller/io_ui_language.ini delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/arabic.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/catalan.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/czech.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/danish.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/dutch.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/english.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/french.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/galician.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/german.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/hungarian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/indonesian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/italian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/norwegian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/polish.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/portuguese.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/romanian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/slovak.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/spanish.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/swedish.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/turkish.nsh delete mode 100644 development/Win32/packaging/AltInstaller/lyx_languages/ukrainian.nsh delete mode 100644 development/Win32/packaging/AltInstaller/registry.nsh delete mode 100644 development/Win32/packaging/AltInstaller/specials/AspellDictionaryNames.txt delete mode 100644 development/Win32/packaging/AltInstaller/specials/AspellRepositories.txt delete mode 100644 development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.cfg delete mode 100644 development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof delete mode 100644 development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr delete mode 100644 development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe delete mode 100644 development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.res delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.cfg delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/pdfclose.exe delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/pdfdde.exe delete mode 100644 development/Win32/packaging/AltInstaller/specials/PDFViewWin/pdfopen.exe diff --git a/development/Win32/packaging/AltInstaller/Aspell.nsh b/development/Win32/packaging/AltInstaller/Aspell.nsh deleted file mode 100644 index e9137ed038..0000000000 --- a/development/Win32/packaging/AltInstaller/Aspell.nsh +++ /dev/null @@ -1,372 +0,0 @@ -# Aspell dictionaries - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - -Function InstallAspell - # install Aspell when it is not already installed - - ${if} $AspellPath == "" - # extract Aspell's program files - SetOutPath "$INSTDIR\external" - File /r "${PRODUCT_SOURCEDIR}\${AspellInstall}" - # copy the files and register Aspell - CopyFiles "$INSTDIR\${AspellInstall}" "$APPDATA" - # finally copy the Aspell personal files to the Application folder of all users - # this assures that every user can have its own word list - StrCpy $AppSubfolder "Aspell" - StrCpy $AppFiles "$APPDATA\Aspell\Personal" - ${if} $ProductRootKey == "HKLM" # if install for all users - Call CreateAppPathSub # function from LyXUtils.nsh - ${else} - CreateDirectory "$APPDATA\$AppSubfolder" - CopyFiles "$AppFiles" "$APPDATA\$AppSubfolder" - ${endif} - - WriteRegStr HKLM "SOFTWARE\Aspell" "Base Path" "${AspellDir}" - WriteRegStr HKLM "SOFTWARE\Aspell" "Dictionary Path" "${AspellDictPath}" - WriteRegStr HKLM "SOFTWARE\Aspell" "Personal Path" "${AspellPersonalPath}" - - WriteRegStr HKLM "Software\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "DisplayName" "${AspellDisplay}" - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "NoModify" 0x00000001 - WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "NoRepair" 0x00000001 - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "UninstallString" "${AspellDir}\${AspellUninstall}" - ${endif} - -FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - -Function DownloadDictionary - # Downloads Aspell dictionaries from a location that is given in the file - # $INSTDIR\Resources\AspellDictionaryNames.txt - - # read out the locations from the file - FileOpen $R5 "$INSTDIR\Resources\AspellDictionaryNames.txt" r - ${Do} - FileRead $R5 $String # $String is now the dictionary name - StrCpy $R3 $String 2 # $R3 is now the dictionary language code - ${if} $R3 == "tr" - ${andif} $DictCode != "tr" # if nothing was found (the last line in the file starts with "tr") - FileClose $R5 - StrCpy $String "" - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - Goto abortinstall - ${endif} - ${LoopUntil} $DictCode == $R3 - FileClose $R5 - - StrCpy $String $String -2 # delete the linebreak characters at the end - - # Download aspell dictionaries, - # if first download repository is not available try the other ones listed in "AspellRepositories.txt" - FileOpen $R5 "$INSTDIR\Resources\AspellRepositories.txt" r - ${For} $4 1 4 - FileRead $R5 $Search # $Search is now the AspellLocation - StrCpy $Search $Search -2 # delete the linebreak characters at the end - Push $R0 - InetLoad::load /TIMEOUT=5000 "$Search/aspell6-$String.exe" "$INSTDIR\aspell6-$String.exe" /END - Pop $R0 - # test if the downloaded file is really the expected one, because if the file didn't exist on the download server, - # berlios.de downloads a text file with the name of the non-existing file that contains the line "File doesn't exist" - FileOpen $R4 "$INSTDIR\aspell6-$String.exe" r - FileRead $R4 $Search - FileClose $R4 - StrCpy $Search $Search -1 # delete the unix linebreak character at the end - ${if} $Search == "File doesn't exist" - StrCpy $R0 "" - ${endif} - ${if} $R0 == "OK" - ${ExitFor} - ${endif} - ${Next} - FileClose $R5 - - # Download failed - ${if} $R0 != "OK" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(AspellDownloadFailed) $R0" - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - Goto abortinstall - ${endif} - - # Download successful - ExecWait '"$INSTDIR\aspell6-$String.exe" /NoDirChange /AutoClose' - ${if} $AspellBaseReg == "HKLM" - ReadRegStr $R2 HKLM "Software\Aspell\Dictionaries" $DictCode - ${else} - ReadRegStr $R2 HKCU "Software\Aspell\Dictionaries" $DictCode - ${endif} - ${if} $R2 == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(AspellInstallFailed)" - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${endif} - - abortinstall: - Delete "$INSTDIR\aspell6-$String.exe" - -FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - -Function InstallAspellDictionary - # install Aspell dictionaries - - StrCpy $AspellInstallYes "" - - # install the english dictionary if not already installed - StrCpy $DictCode "en" - StrCpy $RunNumber "1" - ${if} $AspellBaseReg == "HKLM" # $AspellBaseReg is either "HKLM" or if Aspell is already installed only for the current user "HKCU" - ReadRegStr $R2 HKLM "Software\Aspell\Dictionaries" $DictCode - ${else} - ReadRegStr $R2 HKCU "Software\Aspell\Dictionaries" $DictCode - ${endif} - ${if} $R2 == "" - MessageBox MB_OK|MB_ICONINFORMATION "$(AspellInfo)" - StrCpy $AspellMessage "Yes" - Call DownloadDictionary - ${else} - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${endif} - - # install the dictionary corresponding to the system and the chosen menu language - # check if the system language and the chosen menu language are the same, if not install - # both dictionaries - StrCpy $DictCode $LangCode 2 - StrCpy $0 $DictCode # $0 is now the language code of the chosen LyX menu language - StrCpy $RunNumber "2" - ${if} $AspellInstallYes == "1" - ${andif} $DictCode == "en" - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${else} - ${if} $AspellBaseReg == "HKLM" - ReadRegStr $R2 HKLM "Software\Aspell\Dictionaries" $DictCode - ${else} - ReadRegStr $R2 HKCU "Software\Aspell\Dictionaries" $DictCode - ${endif} - ${if} $R2 == "" - ${if} $AspellMessage != "Yes" - MessageBox MB_OK|MB_ICONINFORMATION "$(AspellInfo)" - ${endif} - Call DownloadDictionary - ${else} - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${endif} - ${endif} # endif $AspellInstallYes == "1" - ${if} $LangCodeSys != $DictCode - StrCpy $RunNumber "3" - ${if} $LangCodeSys == "en" - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${else} - StrCpy $DictCode $LangCodeSys - ${if} $AspellBaseReg == "HKLM" - ReadRegStr $R2 HKLM "Software\Aspell\Dictionaries" $DictCode - ${else} - ReadRegStr $R2 HKCU "Software\Aspell\Dictionaries" $DictCode - ${endif} - ${if} $R2 == "" - ${if} $AspellMessage != "Yes" - MessageBox MB_OK|MB_ICONINFORMATION "$(AspellInfo)" - ${endif} - Call DownloadDictionary - ${else} - StrCpy $AspellInstallYes "$RunNumber$AspellInstallYes" - ${endif} - ${endif} # endif $LangCodeSys == "en" - ${else} # else ${if} $LangCodeSys != $DictCode - StrCpy $AspellInstallYes "4$AspellInstallYes" - ${endif} - - # check the registry to divide between nothing installed or all already installed - ${if} $AspellInstallYes == "321" - ${orif} $AspellInstallYes == "421" - ${if} $AspellBaseReg == "HKLM" - ReadRegStr $R2 HKLM "Software\Aspell\Dictionaries" "en" - ${else} - ReadRegStr $R2 HKCU "Software\Aspell\Dictionaries" "en" - ${endif} - ${if} $R2 != "" - ${if} $0 == "en" - ${andif} $LangCodeSys == "en" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellAll) English$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $0 == "en" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellAll) English$(AspellPartAnd)$LangNameSys$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $LangCodeSys == "en" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellAll) English$(AspellPartAnd)$LangName$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $LangCodeSys != $0 - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellAll) English$(AspellPartSep)$LangName$(AspellPartAnd)$LangNameSys$\r$\n$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $LangCodeSys == $0 - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellAll) English$(AspellPartAnd)$LangName$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${endif} - ${endif} - - Delete "$INSTDIR\Resources\AspellDictionaryNames.txt" - Delete "$INSTDIR\Resources\AspellRepositories.txt" - - # show message about Aspell dictionaries - # the code rule to display the correct message: - # - when the English dictionary is already installed or couldn't be installed -> set a "1" - # - when the dictionary of the chosen LyX menu language is already installed or couldn't be installed -> set a "2" - # - when the dictionary of the Windows system language is already installed or couldn't be installed -> set a "3" - # - when the dictionary of the chosen LyX menu language is equal to the dictionary of the Windows system language -> set a "4" - ${if} $AspellInstallYes == "32" - ${orif} $AspellInstallYes == "42" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart1)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "3" - ${orif} $AspellInstallYes == "4" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart1)$(AspellPartAnd)$(AspellPart2)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "2" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart1)$(AspellPartAnd)$(AspellPart3)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart1)$(AspellPartSep)$(AspellPart2)$(AspellPartAnd)$(AspellPart3)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "321" - ${orif} $AspellInstallYes == "421" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellNone)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "31" - ${orif} $AspellInstallYes == "41" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart2)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "21" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart3)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - ${if} $AspellInstallYes == "1" - MessageBox MB_ICONINFORMATION|MB_DEFBUTTON2|MB_YESNO "$(AspellPartStart)$(AspellPart2)$(AspellPartAnd)$(AspellPart3)$(AspellPart4)" IDYES DownloadNow IDNO DownloadLater - ${endif} - - DownloadNow: - ExecShell "open" "${AspellLocationExact}" - DownloadLater: - - # when something was installed, copy the Aspell dictionary files to the Application - # folder of all users this assures that every user can have its own word list - ${if} $AspellInstallYes != "321" - ${andif} $AspellInstallYes != "421" - StrCpy $AppSubfolder "Aspell" - StrCpy $AppFiles "$APPDATA\Aspell\Dictionaries" - Call CreateAppPathSub # function from LyXUtils.nsh - ${endif} - -FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - -#--------------------------- - - -Function un.UninstAspell - - ReadRegStr $1 SHCTX "Software\Aspell" "Base Path" - # delete Aspells' install folder - RMDir /r $1 - # remove LyX's config files - StrCpy $AppSubfolder "Aspell" - Call un.DelAppPathSub # function from LyXUtils.nsh - # unregister Aspell and its dictionaries - DeleteRegKey SHCTX "Software\Aspell" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-af" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-am" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ar" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-az" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-be" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-bg" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-bn" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-br" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ca" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-cs" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-csb" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-cy" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-da" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-de" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-en" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-el" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-eo" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-es" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-et" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-fa" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-fi" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-fo" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-fr" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-fy" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ga" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-gd" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-gl" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-gu" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-gv" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-he" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hi" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hil" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hr" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hsb" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hu" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-hy" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ia" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-id" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-is" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-it" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ku" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-la" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-lt" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-lv" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mg" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mi" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mk" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ml" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mn" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mr" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ms" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-mt" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-nb" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-nds" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-nl" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-nn" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-no" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ny" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-or" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-pa" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-pl" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-pt" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-qu" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ro" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ru" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-rw" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sc" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sk" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sl" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sr" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sv" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-sw" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-ta" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-te" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-tet" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-tl" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-tn" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-tr" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-uk" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-uz" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-vi" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-wa" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-yi" - DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell6-Dictionary-zu" - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/Build-all.nsi b/development/Win32/packaging/AltInstaller/Build-all.nsi deleted file mode 100644 index ee0cd2d1b0..0000000000 --- a/development/Win32/packaging/AltInstaller/Build-all.nsi +++ /dev/null @@ -1,23 +0,0 @@ -# this script compiles the three different installer variants at once -# this is necessary when the installer should e.g. be built by CMake - -SetCompressor /SOLID lzma - -#-------------------------------- -# The following commands use makensis to compile the three different installer variants. - -#-------------------------------- -#Compile the Update Installer - -!system '"${NSISDIR}\makensis.exe" "LyXInstaller-Update.nsi"' - -#-------------------------------- -#Compile the Small Installer - -!system '"${NSISDIR}\makensis.exe" "LyXInstaller-Small.nsi"' - -#-------------------------------- -#Compile the Complete Installer - -!system '"${NSISDIR}\makensis.exe" "LyXInstaller-Complete.nsi"' - diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt deleted file mode 100644 index 050fbef1c5..0000000000 --- a/development/Win32/packaging/AltInstaller/ChangeLog.txt +++ /dev/null @@ -1,26 +0,0 @@ -Version 5.9 -- LyX 2.0xxx -- updated to eLyXer 1.1.2 -- fix bug that a detected installed Python 3.x was used for LyX (LyX bug 7143) - LyX only works properly with Python 2.x - - -Version 5.8 -- LyX 2.0beta2 -- updated to eLyXer 1.1.0 - - -Version 5.7 -- LyX 2.0beta1 -- updated to eLyXer 1.0.4 -- updated to ImageMagick 6.6.5-8 -- updated to MiKTeX 2.9 (build 3972) -- support to set Serbian (Latin) as LyX menu language (new feature in LyX) - - -Version 5.6 -- LyX 2.0svn (October 3, 2010) -- updated to Python 2.6.6 -- updated to Ghostscript 9.00 -- updated to eLyXer 1.0.2 -- updated to ImageMagick 6.6.4-8 \ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh deleted file mode 100644 index 2c7faf9883..0000000000 --- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh +++ /dev/null @@ -1,147 +0,0 @@ -Function ConfigureLyX - # configures LyX - - # create the PathPrefix - StrCpy $PathPrefix "$INSTDIR\bin" - ${if} $PythonPath != "" - StrCpy $PathPrefix "$PathPrefix;$PythonPath" - ${endif} - ${if} $LatexPath != "" - StrCpy $PathPrefix "$PathPrefix;$LatexPath" - ${endif} - ${if} $GhostscriptPath != "" - StrCpy $PathPrefix "$PathPrefix;$GhostscriptPath" - ${endif} - ${if} $ImageMagickPath != "" - StrCpy $PathPrefix "$PathPrefix;$ImageMagickPath" - ${endif} - ${if} $PSVPath != "" - StrCpy $PathPrefix "$PathPrefix;$PSVPath" - ${endif} - ${if} $EditorPath != "" - StrCpy $PathPrefix "$PathPrefix;$EditorPath" - ${endif} - ${if} $ImageEditorPath != "" - StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath" - ${endif} - ${if} $SVGPath != "" - StrCpy $PathPrefix "$PathPrefix;$SVGPath" - ${endif} - ${if} $WMFPath != "" - StrCpy $PathPrefix "$PathPrefix;$WMFPath" - ${endif} - - # Set the path prefix in lyxrc.dist - ClearErrors - Delete "$INSTDIR\Resources\lyxrc.dist" - FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w - # set some general things - FileWrite $R1 '\screen_zoom "120"$\r$\n\ - \accept_compound true$\r$\n\ - \gui_language $LangNameLyX$\r$\n' - ${if} "$PathPrefix" != "" - FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n' - ${endif} - # if Acrobat or Adobe Reader is used - ${if} $Acrobat == "Yes" # used for Acrobat / Adobe Reader - FileWrite $R1 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\ - \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\ - \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n' - ${endif} - # if a SVG to PDF converter ws found (e.g. Inkscape) - ${if} $SVGPath != "" - FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\ - \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\ - \converter "svg" "pdf" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-pdf=$$$$p/$$$$o" ""$\r$\n\ - \converter "svg" "eps" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-eps=$$$$p/$$$$o" ""' - ${endif} - FileClose $R1 - IfErrors 0 +2 - MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)" - ClearErrors - - # register LyX - ${if} $CreateFileAssociations == "true" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "${PRODUCT_EXE}" - ${endif} - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "RootKey" "$ProductRootKey" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${PRODUCT_UNINSTALL_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "${PRODUCT_INFO_URL}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_ABOUT_URL}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "LyX Team" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "HelpLink" "${PRODUCT_HELP_LINK}" - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001 - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001 - - # create start menu entry - SetOutPath "$INSTDIR\bin" - CreateDirectory "$SMPROGRAMS\$StartmenuFolder" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" - SetOutPath "$INSTDIR" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall.lnk" "${PRODUCT_UNINSTALL_EXE}" - - # create desktop icon - ${if} $CreateDesktopIcon == "true" - SetOutPath "$INSTDIR\bin" - CreateShortCut "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" - ${endif} - - # register the extension .lyx - ${if} $CreateFileAssociations == "true" - WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to test if they were registered by this LyX version - # write informations about file type - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${PRODUCT_BAT}" "%1"' - # write informations about file extensions - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "" "${PRODUCT_REGNAME}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "Content Type" "${PRODUCT_MIME_TYPE}" - # .lyx13 - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}13" "" "${PRODUCT_REGNAME}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}13" "Content Type" "${PRODUCT_MIME_TYPE}" - # .lyx14 - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}14" "" "${PRODUCT_REGNAME}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}14" "Content Type" "${PRODUCT_MIME_TYPE}" - # .lyx15 don't set this, because this is designed to be opened with LyX 1.5.x - #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}15" "" "${PRODUCT_REGNAME}" - #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}15" "Content Type" "${PRODUCT_MIME_TYPE}" - # .lyx16 don't set this, because this is designed to be opened with LyX 1.6.x - #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "" "${PRODUCT_REGNAME}" - #WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}16" "Content Type" "${PRODUCT_MIME_TYPE}" - # refresh shell - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' - ${endif} - - # delete unnecessary files - ${if} $DelPythonFiles == "True" - Delete $INSTDIR\bin\python.exe - Delete $INSTDIR\bin\python26.dll - Delete $INSTDIR\bin\Python-License.txt - RMDir /r $INSTDIR\bin\Lib - RMDir /r $INSTDIR\bin\DLLs - ${endif} - RMDir /r $INSTDIR\external - - # create a bat-file to start configure in a console window so that the user see the progress - # of the configuration and to have a signal when the configuration is ready to start LyX - # this is important when LyX is installed together with MiKTeX or when LyX is installed for the first - # time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes - # a batch file is needed because simply calling - # ExecWait '"$PythonPath\python.exe" "$INSTDIR\Resources\configure.py"' - # creates the config files in $PythonPath - ${if} $PythonPath == "" - StrCpy $PythonPath "$INSTDIR\bin" - ${endif} - StrCpy $1 $INSTDIR 2 # get drive letter - FileOpen $R1 "$INSTDIR\Resources\configLyX.bat" w - FileWrite $R1 '$1$\r$\n\ - cd $INSTDIR\Resources\$\r$\n\ - "$PythonPath\python.exe" configure.py' - FileClose $R1 - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/Deleted.nsh b/development/Win32/packaging/AltInstaller/Deleted.nsh deleted file mode 100644 index 3cb0d0e1c4..0000000000 --- a/development/Win32/packaging/AltInstaller/Deleted.nsh +++ /dev/null @@ -1,8 +0,0 @@ -Function DeleteFiles - - # list with deleted files for LyX 1.6.1 - #RMDir /r "$INSTDIR\Resources\doc\es\biblio" - #Delete "$INSTDIR\Resources\examples\mathed.lyx" - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/InstallActions-complete-small.nsh b/development/Win32/packaging/AltInstaller/InstallActions-complete-small.nsh deleted file mode 100644 index 71fd485e47..0000000000 --- a/development/Win32/packaging/AltInstaller/InstallActions-complete-small.nsh +++ /dev/null @@ -1,77 +0,0 @@ -# this file contains the main installer section - - # The '-' makes the section invisible. - Section "-Installation actions" SecInstallation - - # dummy actions to avoid NSIS warnings - StrCpy $FileName "" - StrCpy $NewString "" - StrCpy $OldString "" - - # extract all files - SetOutPath "$INSTDIR" - File /r "${PRODUCT_SOURCEDIR}\bin" - File /r "${PRODUCT_SOURCEDIR}\etc" - File /r "${PRODUCT_SOURCEDIR}\Resources" - !if ${INSTALLER_VERSION} == "Complete" - File /r "${PRODUCT_SOURCEDIR}\external" - !endif - - !if ${INSTALLER_VERSION} == "Complete" - # install MiKTeX if not already installed - Call InstallMiKTeX # function from LaTeX.nsh - !endif - - # install Ghostscript if not already installed - Call Ghostscript # function from InstallThirdPartyProgs.nsh - - # install ImageMagick if not already installed - Call ImageMagick # function from InstallThirdPartyProgs.nsh - - # install Aspell if not already installed - Call InstallAspell # function from Aspell.nsh - - # install eLyXer as Python module - Call eLyXer # function from InstallThirdPartyProgs.nsh - - # install Aiksaurus if not already installed - Call Aiksaurus # function from InstallThirdPartyProgs.nsh - - # install Metafile2eps if not already installed - Call Metafile2eps # function from InstallThirdPartyProgs.nsh - - !if ${INSTALLER_VERSION} == "Complete" - # install GSview if not already installed and the user selected it - Call PostScript # function from InstallThirdPartyProgs.nsh - - # install JabRef if not already installed and the user selected it - Call BibTeX # function from InstallThirdPartyProgs.nsh - !endif - - # install the LaTeX class files that are delivered with LyX - # and enable MiKTeX's automatic package installation - Call ConfigureMiKTeX # Function from LaTeX.nsh - - # refresh shell, update the environment variables otherwise the first - # configure run will fail when MiKTeX was just installed - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' - - # install Aspell dictionaries - Call InstallAspellDictionary # function from Aspell.nsh - - # configure LyX - Call ConfigureLyX # Function from ConfigLyX.nsh - - # create Uninstaller - WriteUninstaller "${PRODUCT_UNINSTALL_EXE}" - - # run LyX's configure script - MessageBox MB_OK|MB_ICONINFORMATION "$(LatexConfigInfo)" - ExecWait '"$INSTDIR\Resources\configLyX.bat"' - Delete "$INSTDIR\Resources\configLyX.bat" - - # ask to update MiKTeX - Call UpdateMiKTeX # function from latex.nsh - - SectionEnd - diff --git a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh b/development/Win32/packaging/AltInstaller/InstallActions-update.nsh deleted file mode 100644 index 509c65d2b8..0000000000 --- a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh +++ /dev/null @@ -1,329 +0,0 @@ -# this file contains the main installer section - -# The '-' makes the section invisible. -Section "-Installation actions" SecInstallation - - # dummy actions to avoid NSIS warnings - StrCpy $AspellBaseReg "" - StrCpy $AspellMessage "" - StrCpy $DictCode "" - StrCpy $LangCode "" - StrCpy $LangCodeSys "" - StrCpy $LangName "" - StrCpy $LangNameSys "" - StrCpy $RunNumber "" - - # init, this variable is later only set to a value in function InstDirChange - # when the $INSTDIR is changed - StrCpy $INSTDIR_OLD "" - - # extract modified files - Call UpdateModifiedFiles # macro from Updated.nsh - - # delete files - Call DeleteFiles # macro from Deleted.nsh - - # delete old uninstaller - Delete "${PRODUCT_UNINSTALL_EXE}" - - # delete old start menu folder - ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY_OLD}" "StartMenu" - RMDir /r $0 - # delete desktop icon - Delete "$DESKTOP\${PRODUCT_VERSION_OLD}.lnk" - - # delete old registry entries - ${if} $CreateFileAssociations == "true" - DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" - # remove file extension .lyx - ReadRegStr $R0 SHCTX "Software\Classes\${PRODUCT_EXT}" "" - ${if} $R0 == "${PRODUCT_REGNAME}" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_REGNAME}" - ${endif} - ${endif} - DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY_OLD}" - DeleteRegKey HKCR "Applications\lyx.bat" - DeleteRegKey HKCR "${PRODUCT_NAME}" - - # determine the new name of the install location, - # Change the old install path to the new one (currently only when the user - # has used the default path settings of the previous LyX-version) - Call InstDirChange - - # Refresh registry setings for the uninstaller - Call RefreshRegUninst - - # register LyX - ${if} $CreateFileAssociations == "true" - WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "${PRODUCT_EXE}" - ${endif} - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "RootKey" "$ProductRootKey" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "LyX ${PRODUCT_VERSION}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "${PRODUCT_UNINSTALL_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "${PRODUCT_INFO_URL}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_ABOUT_URL}" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "LyX Team" - WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "HelpLink" "${PRODUCT_HELP_LINK}" - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001 - WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001 - - # create start menu entry - SetOutPath "$INSTDIR\bin" - CreateDirectory "$SMPROGRAMS\$StartmenuFolder" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" - SetOutPath "$INSTDIR" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall.lnk" "${PRODUCT_UNINSTALL_EXE}" - - # create desktop icon - ${if} $CreateDesktopIcon == "true" - SetOutPath "$INSTDIR\bin" - CreateShortCut "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" - ${endif} - - # register the extension .lyx - ${if} $CreateFileAssociations == "true" - # write informations about file type - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${PRODUCT_BAT}" "%1"' - # write informations about file extensions - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "" "${PRODUCT_REGNAME}" - WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "Content Type" "${PRODUCT_MIME_TYPE}" - # refresh shell - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' - ${endif} - - # create Uninstaller - WriteUninstaller "${PRODUCT_UNINSTALL_EXE}" - - # test if Python is installed - # only use an existing python when it is version 2.5 because some Compaq and Dell PC are delivered - # with outdated Python interpreters - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" - ${if} $PythonPath == "" - StrCpy $PythonPath "$INSTDIR\bin" - ${else} - StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end - ${endif} - - # run LyX's configure script - # create a bat-file to start configure in a console window so that the user see the progress - # of the configuration and to have a signal when the configuration is ready to start LyX - # this is important when LyX is installed together with MiKTeX or when LyX is installed for the first - # time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes - # a batch file is needed because simply calling ExecWait '"$PythonPath\python.exe" "$INSTDIR\Resources\configure.py"' - # creates the config files in $INSTDIR\bin - StrCpy $1 $INSTDIR 2 # get drive letter - FileOpen $R1 "$INSTDIR\Resources\configLyX.bat" w - FileWrite $R1 '$1$\r$\n\ - cd $INSTDIR\Resources\$\r$\n\ - "$PythonPath\python.exe" configure.py' - FileClose $R1 - MessageBox MB_OK|MB_ICONINFORMATION "$(LatexConfigInfo)" - ExecWait '"$INSTDIR\Resources\configLyX.bat"' - Delete "$INSTDIR\Resources\configLyX.bat" - - # there might be the case that python files need to be updated - # but this should only be done when Python is not installed - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" - ${endif} - ${if} $PythonPath != "" - RMDir /r $INSTDIR\bin\Lib - RMDir /r $INSTDIR\bin\DLLs - ${endif} - - # for some unknown odd reason the folder $INSTDIR_OLD\Resources\ui - # is not deleted in function InstDirChange, so the deletion has to be called - # again to make it work - ${if} $INSTDIR_OLD != "" - RMDir /r $INSTDIR_OLD - ${endif} - -SectionEnd - -# ------------------------------------------- - -Function InstDirChange - - # determine the new name of the install location, - # Change the old install path to the new one (only when the user - # has used the default path settings of the previous LyX-version, otherwise leave the path as is) - StrCpy $String $INSTDIR - StrCpy $Search "${PRODUCT_VERSION_OLD}" - StrLen $3 $String - Call StrPoint # search the $INSTDIR for the phrase in ${PRODUCT_VERSION_OLD} ; function from LyXUtils.nsh - ${if} $Pointer != "-1" # if something was found - - IntOp $Pointer $Pointer - 1 # jump before the first "\" of "\${PRODUCT_VERSION_OLD}" - StrCpy $String $String "$Pointer" # $String is now the part before "\${PRODUCT_VERSION_OLD}" - # rename the installation folder by copying LyX files - StrCpy $INSTDIR_NEW "$String\LyX ${PRODUCT_VERSION}" - CreateDirectory "$INSTDIR_NEW" - CopyFiles "$INSTDIR\*.*" "$INSTDIR_NEW" - # delete the old folder - RMDir /r $INSTDIR - StrCpy $INSTDIR_OLD $INSTDIR - StrCpy $INSTDIR $INSTDIR_NEW - - # set new path_prefix in the file lyxrc.dist - StrCpy $OldString "${PRODUCT_VERSION_OLD}" - StrCpy $NewString "LyX ${PRODUCT_VERSION}" - # following macro from TextFunc.nsh # calls Function ReplaceLineContent from LyXUtils.nsh - ${LineFind} "$INSTDIR\Resources\lyxrc.dist" "" "1:-1" "ReplaceLineContent" - - # set the new path to the preferences file for all users - StrCpy $FileName "preferences" - StrCpy $OldString "${PRODUCT_VERSION_OLD}" - StrCpy $NewString "LyX ${PRODUCT_VERSION}" - Call CheckAppPathPreferences # function from LyXUtils.nsh - - # set the new path to the session file for all users - StrCpy $FileName "session" - Call CheckAppPathPreferences # function from LyXUtils.nsh - - # set new path to ImageMagick - ReadRegStr $ImageMagickPath SHCTX "SOFTWARE\Classes\Applications" "AutoRun" - ${if} $ImageMagickPath != "" - ${WordReplace} $ImageMagickPath "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $ImageMagickPath # macro from WordFunc.nsh - WriteRegStr SHCTX "SOFTWARE\Classes\Applications" "AutoRun" "$ImageMagickPath" - ${endif} - - ${endif} # end ${if} $Pointer != "-1" (if the folder is renamed) - -FunctionEnd - -# ------------------------------------------- - -Function RefreshRegUninst - - # Refresh registry setings for the uninstaller - - # Aspell - ReadRegStr $0 SHCTX "Software\Aspell" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "SOFTWARE\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - ${endif} - - # eLyXer - # first test if Python is installed - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" - ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" "" - ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.1\InstallPath" "" - ${endif} - ${if} $PythonPath != "" - StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end - ${endif} - # now install eLyXer as Python module - ${if} $PythonPath != "" - # a Python module cannot simply started with - # ExecWait '$PythonPath\python.exe "$INSTDIR\bin\setup.py" install' - # therefore run a script - StrCpy $1 $INSTDIR 2 # get drive letter - FileOpen $R1 "$INSTDIR\bin\eLyXer.bat" w - FileWrite $R1 '$1$\r$\n\ - cd "$INSTDIR\bin"$\r$\n\ - "$PythonPath\python.exe" setup.py install' - FileClose $R1 - ExecWait '"$INSTDIR\bin\eLyXer.bat"' - Delete "$INSTDIR\bin\eLyXer.bat" - ${else} - ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\bin\setup.py" install' - ${endif} - - # Metafile2eps - Var /GLOBAL RegLocation - StrCpy $RegLocation "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Metafile to EPS Converter" - ReadRegStr $0 SHCTX "$RegLocation" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "$RegLocation" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - # set the new path - ReadRegStr $0 HKLM "SOFTWARE\InkNote Selector" "" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 # macro from WordFunc.nsh - WriteRegStr HKLM "SOFTWARE\InkNote Selector" "" "$0" - ReadRegStr $0 HKLM "$RegLocation" "InstallLocation" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "$RegLocation" "InstallLocation" "$0" - ${endif} - - # MiKTeX - ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - ${endif} - - # JabRef - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - ${endif} - - # Aiksaurus currently not needed - #ReadRegStr $0 SHCTX "Software\Aiksaurus" "OnlyWithLyX" - #${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - # WriteRegStr HKLM "SOFTWARE\Aiksaurus" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - #${endif} - - # ImageMagick - ReadRegStr $0 SHCTX "Software\ImageMagick" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "SOFTWARE\ImageMagick" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - # set the new path - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\Current" "BinPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 # macro from WordFunc.nsh - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "BinPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\Current" "CoderModulesPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "CoderModulesPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\Current" "ConfigurePath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "ConfigurePath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\Current" "FilterModulesPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "FilterModulesPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\Current" "LibPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "LibPath" "$0" - # set the new path - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "BinPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "BinPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "CoderModulesPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "CoderModulesPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "ConfigurePath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "ConfigurePath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "FilterModulesPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "FilterModulesPath" "$0" - ReadRegStr $0 HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "LibPath" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion_Old}\Q:16" "LibPath" "$0" - ${endif} - - # Ghostscript and GSview - ReadRegStr $0 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT_OLD}" - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" - # set the new path - ReadRegStr $0 HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion_Old}" "GS_DLL" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion_Old}" "GS_DLL" "$0" - ReadRegStr $0 HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion_Old}" "GS_LIB" - ${WordReplace} $0 "${PRODUCT_VERSION_OLD}" "LyX ${PRODUCT_VERSION}" "+" $0 - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion_Old}" "GS_LIB" "$0" - ${endif} - -FunctionEnd diff --git a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh b/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh deleted file mode 100644 index 23b21d64d1..0000000000 --- a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh +++ /dev/null @@ -1,189 +0,0 @@ -# this file contains the installation actions for the third-party programs - -Function Ghostscript - - # if GhostScript is not installed - ${if} $GhostscriptPath == "" - # register Ghostscript - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_DLL" "${GhostscriptDir}\bin\gsdll32.dll" - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_LIB" "${GhostscriptDir}\lib" - - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - StrCpy $GhostscriptPath "${GhostscriptDir}\bin" - ${else} - # delete unnecessary files - RMDir /r ${GhostscriptDir} - StrCpy $DelGSDir "Yes" # used later in function ImageMagick - ${endif} - -FunctionEnd - -# ------------------------------------------- - -Function ImageMagick - - # if ImageMagick is not installed - ${if} $ImageMagickPath == "" - # register ImageMagick - WriteRegStr HKLM "SOFTWARE\Classes\Applications" "AutoRun" "${ImageMagickDir}\convert.exe $$" - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "${ImageMagickDir}" - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "${ImageMagickDir}\modules\coders" - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "ConfigurePath" "${ImageMagickDir}\config" - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "FilterModulesPath" "${ImageMagickDir}\modules\filters" - WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "LibPath" "${ImageMagickDir}" - - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "BinPath" "${ImageMagickDir}" - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "CoderModulesPath" "${ImageMagickDir}\modules\coders" - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "ConfigurePath" "${ImageMagickDir}\config" - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "FilterModulesPath" "${ImageMagickDir}\modules\filters" - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "LibPath" "${ImageMagickDir}" - WriteRegDWORD HKLM "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010 - WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}" - - WriteRegStr HKLM "Software\ImageMagick" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - StrCpy $ImageMagickPath ${ImageMagickDir} - ${else} - # delete unnecessary files - RMDir /r ${ImageMagickDir} - # delete the "etc" folder when also the Ghostscript folder was deleted because it is then empty - ${if} $DelGSDir == "Yes" - ${andif} $DelWMFDir == "Yes" - RMDir /r "$INSTDIR\etc" - ${endif} - ${endif} - -FunctionEnd - -# ------------------------------------------- - -Function eLyXer - - # install eLyXer as Python module - ${if} $PythonPath != "" - # a Python module cannot simply started with - # ExecWait '$PythonPath\python.exe "$INSTDIR\bin\setup.py" install' - # therefore run a script - StrCpy $1 $INSTDIR 2 # get drive letter - FileOpen $R1 "$INSTDIR\bin\eLyXer.bat" w - FileWrite $R1 '$1$\r$\n\ - cd "$INSTDIR\bin"$\r$\n\ - "$PythonPath\python.exe" setup.py install' - FileClose $R1 - ExecWait '"$INSTDIR\bin\eLyXer.bat"' - Delete "$INSTDIR\bin\eLyXer.bat" - ${else} - ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\bin\setup.py" install' - ${endif} - -FunctionEnd - -# ------------------------------------------- - -Function Aiksaurus - - # if Aiksaurus is not installed - ${if} $AiksaurusPath == "" - # extract Aiksaurus' program files - SetOutPath "$INSTDIR\external" - File /r "${PRODUCT_SOURCEDIR}\${AiksaurusInstall}" - # copy the files and register Aiksaurus - CopyFiles "$INSTDIR\${AiksaurusInstall}" "$APPDATA" -# WriteRegStr HKLM "Software\Aiksaurus" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX -# WriteRegStr HKLM "Software\Aiksaurus" "Data Path" "${AiksaurusDir}" - ${endif} - -FunctionEnd - -# ------------------------------------------- - -!macro PrinterInit - - ${if} ${AtLeastWinVista} - StrCpy $PrinterConf "printui.exe" - ${else} - StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry" - ${endif} - -!macroend - -Function Metafile2eps - - # if Metafile2eps is not installed - ${if} $WMFPath == "" - # delete printer - ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' - # install printer and driver - ExecWait '$PrinterConf /if /f "$WINDIR\inf\ntprint.inf" /b "Metafile to EPS Converter" /r "FILE:" /m "MS Publisher Imagesetter"' - # restore DEVMODE with proper settings - ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a "$INSTDIR\metafile2eps.dat" g' - # register printer - WriteRegStr HKLM "SOFTWARE\InkNote Selector" "" ${Metafile2epsDir} - # register Metafile2eps - Var /GLOBAL RegLocation - StrCpy $RegLocation "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Metafile to EPS Converter" - WriteRegStr HKLM "$RegLocation" "InstallLocation" "${Metafile2epsDir}" - WriteRegStr HKLM "$RegLocation" "DisplayName" "Metafile to EPS Converter" - WriteRegStr HKLM "$RegLocation" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - StrCpy $WMFPath "${Metafile2epsDir}" - # delete temporary file - Delete "$INSTDIR\metafile2eps.dat" - ${else} - # delete unnecessary files - RMDir /r "${Metafile2epsDir}" - StrCpy $DelWMFDir "Yes" # used later in function ImageMagick - ${endif} - -FunctionEnd - -# ------------------------------------------- - -!if ${INSTALLER_VERSION} == "Complete" - - Function PostScript - - # if no PostScript viewer is installed - ${if} $PSVPath == "" - ${if} $InstallGSview == "true" - # launch installer - MessageBox MB_OK|MB_ICONINFORMATION "$(GSviewInfo)" - ExecWait "$INSTDIR\${GSviewInstall}" - # test if GSview is installed - StrCpy $PSVPath "" - ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" - ${if} $PSVPath == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(GSviewError)" - ${endif} - ${endif} - ${endif} - - FunctionEnd - -!endif # endif ${INSTALLER_VERSION} == "Complete" - -# ------------------------------------------- - -!if ${INSTALLER_VERSION} == "Complete" - - Function BibTeX - - # if no BibTeX editor is installed - ${if} $BibTeXEditorPath == "" - ${if} $InstallJabRef == "true" - # launch installer - MessageBox MB_OK|MB_ICONINFORMATION "$(JabRefInfo)" - ExecWait "$INSTDIR\${JabRefInstall}" - # test if JabRef is installed - StrCpy $BibTeXEditorPath "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" - ${if} $BibTeXEditorPath == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" - ${else} - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - ${endif} - ${endif} - ${endif} - - FunctionEnd - -!endif # endif ${INSTALLER_VERSION} == "Complete" - diff --git a/development/Win32/packaging/AltInstaller/LaTeX.nsh b/development/Win32/packaging/AltInstaller/LaTeX.nsh deleted file mode 100644 index 238e19e9ff..0000000000 --- a/development/Win32/packaging/AltInstaller/LaTeX.nsh +++ /dev/null @@ -1,236 +0,0 @@ -Function LaTeXActions - # check if MiKTeX or TeXLive is installed - - # test if MiKTeX is installed - # reads the PATH variable via the registry because NSIS' "$%Path%" variable is not updated when the PATH changes - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck # sets the path to the latex.exe to $LatexPath # Function from LyXUtils.nsh - - ${if} $LatexPath != "" - # check if MiKTeX 2.7 or newer is installed - StrCpy $0 0 - loopA: - EnumRegKey $1 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey - StrCmp $1 "" doneA - StrCpy $String $1 - IntOp $0 $0 + 1 - Goto loopA - doneA: - ${if} $String == "2.7" - StrCpy $MiKTeXVersion "2.7" - StrCpy $LaTeXName "MiKTeX 2.7" - ${endif} - ${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" - ${endif} - ${endif} - - ${if} $LatexPath == "" # check if MiKTeX is installed only for the current user - ReadRegStr $String HKCU "Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck # function from LyXUtils.nsh - ${if} $LatexPath != "" - StrCpy $MiKTeXUser "HKCU" # needed later to configure MiKTeX - ${endif} - ${endif} - ${if} $LaTeXName == "" # check for the MiKTeX version - StrCpy $0 0 - loopB: - EnumRegKey $1 HKCU "SOFTWARE\MiKTeX.org\MiKTeX" $0 # check the last subkey - StrCmp $1 "" doneB - StrCpy $String $1 - IntOp $0 $0 + 1 - Goto loopB - doneB: - ${if} $String == "2.7" - StrCpy $MiKTeXVersion "2.7" - StrCpy $LaTeXName "MiKTeX 2.7" - ${endif} - ${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" - ${endif} - ${endif} - - ${if} $LatexPath != "" - StrCpy $MiKTeXInstalled "yes" - ${endif} - - # test if TeXLive is installed - # as described at TeXLives' homepage there should be an entry in the PATH - ${if} $LatexPath == "" - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - StrCpy $Search "TeXLive" - Call LaTeXCheck # function from LyXUtils.nsh - ${endif} - # check for the current user Path variable (the case when it is a live CD/DVD) - ${if} $LatexPath == "" - ReadRegStr $String HKCU "Environment" "Path" - StrCpy $Search "texlive" - StrCpy $2 "TeXLive" - Call LaTeXCheck # function from LyXUtils.nsh - ${endif} - # check if the variable TLroot exists (the case when it is installed using the program "tlpmgui") - ${if} $LatexPath == "" - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "TLroot" - ${if} $String == "" - ReadRegStr $String HKCU "Environment" "TLroot" # the case when installed without admin permissions - ${endif} - StrCpy $LatexPath "$String\bin\win32" - # check if the latex.exe exists in the $LatexPath folder - !insertmacro FileCheck $5 "latex.exe" "$LatexPath" # macro from LyXUtils.nsh - ${if} $5 == "False" - StrCpy $LatexPath "" - ${endif} - ${endif} - ${if} $LatexPath != "" - ${andif} $LaTeXName != "MiKTeX 2.7" - ${andif} $LaTeXName != "MiKTeX 2.8" - ${andif} $LaTeXName != "MiKTeX 2.9" - StrCpy $LaTeXName "TeXLive" - ${endif} - - ${if} $LatexPath == "" - StrCpy $MissedProg "True" - ${endif} - -FunctionEnd - -# ------------------------------------------- - -!if ${INSTALLER_VERSION} == "Complete" - - Function InstallMiKTeX - # install MiKTeX if not already installed - - ${if} $LatexPath == "" - # launch MiKTeX's installer - MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" - ExecWait ${MiKTeXInstall} - # test if MiKTeX is installed - ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck - ${if} $LatexPath == "" - StrCpy $MiKTeXUser "HKCU" - ReadRegStr $String HKCU "Environment" "Path" - StrCpy $Search "miktex" - Call LaTeXCheck - ${endif} - ${if} $LatexPath != "" - # set package repository (MiKTeX's primary package repository) - WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" # special entry to tell the uninstaller that it was installed with LyX - StrCpy $MiKTeXInstalled "yes" - StrCpy $MiKTeXVersion ${MiKTeXDeliveredVersion} - ${if} $MiKTeXUser != "HKCU" - StrCpy $MiKTeXPath "$LatexPath" -11 # delete "\miktex\bin" - #MessageBox MB_OK|MB_ICONINFORMATION "$(MiKTeXPathInfo)" # info that MiKTeX's installation folder must have write permissions for all users to work properly - ${endif} - ${else} - MessageBox MB_OK|MB_ICONSTOP "$(LatexError1)" - SetOutPath $TEMP # to be able to delete the $INSTDIR - RMDir /r $INSTDIR - Abort - ${endif} # endif $LatexPath != "" - ${endif} - - FunctionEnd - -!endif # endif ${INSTALLER_VERSION} == "Complete" - -# ------------------------------ - -Function ConfigureMiKTeX - # installs the LaTeX class files that are delivered with LyX - # and enable MiKTeX's automatic package installation - - StrCpy $String $LatexPath - StrCpy $Search "miktex\bin" - StrLen $3 $String - Call StrPoint # search the LaTeXPath for the phrase "miktex\bin" (function from LyXUtils.nsh) - ${if} $Pointer != "-1" # if something was found - IntOp $Pointer $Pointer - 1 # jump before the first "\" of "\miktex\bin" - StrCpy $String $String "$Pointer" # $String is now the part before "\miktex\bin" - # install LyX's special LaTeX class files - CreateDirectory "$String\tex\latex\lyx" - SetOutPath "$String\tex\latex\lyx" - File "${ClassFileDir}\lyxchess.sty" - File "${ClassFileDir}\lyxskak.sty" - CreateDirectory "$String\tex\latex\revtex" - SetOutPath "$String\tex\latex\revtex" - File "${ClassFileDir}\revtex.cls" - CreateDirectory "$String\tex\latex\hollywood" - SetOutPath "$String\tex\latex\hollywood" - File "${ClassFileDir}\hollywood.cls" - CreateDirectory "$String\tex\latex\broadway" - SetOutPath "$String\tex\latex\broadway" - File "${ClassFileDir}\broadway.cls" - # install LaTeX-package dvipost (dvipost is not available for MiKTeX) - SetOutPath "$String\tex\latex" - File /r "${DVIPostFileDir}" - - # refresh MiKTeX's file name database - ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin - ExecWait "$LaTeXPath\initexmf --admin --update-fndb" - ${else} - ExecWait "$LaTeXPath\initexmf --update-fndb" - ${endif} - - # enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first) - WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user - ${if} $MiKTeXUser != "HKCU" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" - ${endif} - # set package repository (MiKTeX's primary package repository) - WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" # if only for current user - WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" # if only for current user - ${if} $MiKTeXUser != "HKCU" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" - WriteRegStr SHCTX "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" - ${endif} - - # enable MiKTeX's automatic package installation - ExecWait '$LaTeXPath\mpm.exe --update-fndb' - # the following feature is planned to be used for a possible CD-version - # copy LaTeX-packages needed by LyX - # SetOutPath "$INSTDIR" - # File /r "${LaTeXPackagesDir}" - ${endif} # end ${if} $Pointer - - # save MiKTeX's install path to be able to remove LyX's LaTeX-files in the uninstaller - FileOpen $R1 "$INSTDIR\Resources\uninstallPaths.dat" w - FileWrite $R1 '$LaTeXPath' - FileClose $R1 - -FunctionEnd - -Function UpdateMiKTeX - # ask to update MiKTeX - - ${if} $MiKTeXInstalled == "yes" - MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater - UpdateNow: - StrCpy $0 $LaTeXPath -4 # remove "\bin" - # the update wizard is either started by the copystart_admin.exe - # or the miktex-update.exe (since MiKTeX 2.8) - ExecWait '"$LaTeXPath\copystart_admin.exe" "$0\config\update.dat"' # run MiKTeX's update wizard - ${if} $MiKTeXUser != "HKCU" # call the admin version when the user is admin - ExecWait '"$LaTeXPath\internal\miktex-update_admin.exe"' # run MiKTeX's update wizard - ${else} - ExecWait '"$LaTeXPath\internal\miktex-update.exe"' # run MiKTeX's update wizard - ${endif} - UpdateLater: - ${endif} - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/LaTeXFolder.nsh b/development/Win32/packaging/AltInstaller/LaTeXFolder.nsh deleted file mode 100644 index 4f222df3c7..0000000000 --- a/development/Win32/packaging/AltInstaller/LaTeXFolder.nsh +++ /dev/null @@ -1,39 +0,0 @@ -Function LatexFolder - - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "io_latex.ini" - # generate the installer page - !insertmacro MUI_HEADER_TEXT "$(EnterLaTeXHeader1)" "$(EnterLaTeXHeader2)" - ${if} $LatexName != "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolder)" - ${else} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolderNone)" - ${endif} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 2" "Text" "$(PathName)" - ${if} $LatexPath == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "C:\" # Does \" quote a "? - ${else} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 3" "State" "$LatexPath" - ${endif} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "Text" "$(DontUseLaTeX)" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_latex.ini" "Field 4" "State" "$State" - AgainFolder: - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io_latex.ini" - !insertmacro MUI_INSTALLOPTIONS_READ "$State" "io_latex.ini" "Field 4" "State" # read checkbox if LaTeX should be used, "0" or not "1" - ${if} $State == "1" - StrCpy $LatexPath "" - Goto ReadyFolder - ${endif} - !insertmacro MUI_INSTALLOPTIONS_READ "$LatexPath" "io_latex.ini" "Field 3" "State" - # check if the latex.exe exists in the $LatexPath folder - !insertmacro FileCheck $5 "latex.exe" "$LatexPath" - ${if} $5 == "False" - MessageBox MB_RETRYCANCEL "$(InvalidLaTeXFolder)" IDRETRY AgainFolder - StrCpy $LatexPath "" - ${endif} - ReadyFolder: - -FunctionEnd - -Function LatexFolder_LeaveFunction - -FunctionEnd diff --git a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh b/development/Win32/packaging/AltInstaller/LanguageSettings.nsh deleted file mode 100644 index 6c4a536c18..0000000000 --- a/development/Win32/packaging/AltInstaller/LanguageSettings.nsh +++ /dev/null @@ -1,754 +0,0 @@ -# Language settings for the installer -# create language code for the Windows system language - -# LangNme is the language name when there exists a LyX translation for this language; used for the menu language dialog and for the Aspell installation -# LangNmeSys is the Windows system language; used for the Aspell installation -# LangCdeSys is the ISO 630 language code of the language; used for the Aspell installation -# LangSysEnc is the Windows codepage for the character encoding of the language; can be used in lyx.bat to assure that scripts are correctly executed -!macro TranslateLangCode LangNme LangNmeSys LangCdeSys LangISOCode LangSysEnc - - StrCpy ${LangCdeSys} "" - - ${if} ${LangISOCode} = 1025 - StrCpy ${LangNme} "Arabic" - StrCpy ${LangCdeSys} "ar" - StrCpy ${LangNmeSys} "Arabic" - StrCpy ${LangSysEnc} "1256" - ${endif} - - ${if} ${LangISOCode} = 1026 - StrCpy ${LangCdeSys} "bg" - StrCpy ${LangNmeSys} "Bulgarian" - StrCpy ${LangSysEnc} "1251" - ${endif} - - ${if} ${LangISOCode} = 1027 - StrCpy ${LangNme} "Catal" - StrCpy ${LangCdeSys} "ca" - StrCpy ${LangNmeSys} "Catal" - StrCpy ${LangSysEnc} "1252" - ${endif} - -# currently no dictionary available - ${if} ${LangISOCode} = 1028 - StrCpy ${LangNme} "Chinese (Taiwan)" - StrCpy ${LangCdeSys} "zh_TW" - StrCpy ${LangNmeSys} "Chinese" - StrCpy ${LangSysEnc} "936" - ${endif} - - ${if} ${LangISOCode} = 1029 - StrCpy ${LangNme} "Cetina" - StrCpy ${LangCdeSys} "cs" - StrCpy ${LangNmeSys} "Cetina" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1030 - StrCpy ${LangNme} "Dansk" - StrCpy ${LangCdeSys} "da" - StrCpy ${LangNmeSys} "Dansk" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1031 - StrCpy ${LangNme} "Deutsch" - StrCpy ${LangCdeSys} "de" - StrCpy ${LangNmeSys} "Deutsch" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1032 - StrCpy ${LangNme} "Greek" - StrCpy ${LangCdeSys} "el" - StrCpy ${LangNmeSys} "Greek" - StrCpy ${LangSysEnc} "1253" - ${endif} - - ${if} ${LangISOCode} = 1033 - StrCpy ${LangNme} "English" - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1034 - StrCpy ${LangNme} "Espaol" - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1035 - StrCpy ${LangNme} "Suomi" - StrCpy ${LangCdeSys} "fi" - StrCpy ${LangNmeSys} "Suomi" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1036 - StrCpy ${LangNme} "Franais" - StrCpy ${LangCdeSys} "fr" - StrCpy ${LangNmeSys} "Franais" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1037 - StrCpy ${LangNme} "Hebrew" - StrCpy ${LangCdeSys} "he" - StrCpy ${LangNmeSys} "Hebrew" - StrCpy ${LangSysEnc} "1255" - ${endif} - - ${if} ${LangISOCode} = 1038 - StrCpy ${LangNme} "Magyar" - StrCpy ${LangCdeSys} "hu" - StrCpy ${LangNmeSys} "Magyar" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1039 - StrCpy ${LangCdeSys} "is" - StrCpy ${LangNmeSys} "slenska" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1040 - StrCpy ${LangNme} "Italiano" - StrCpy ${LangCdeSys} "it" - StrCpy ${LangNmeSys} "Italiano" - StrCpy ${LangSysEnc} "1252" - ${endif} - - # currently no dictionary available - ${if} ${LangISOCode} = 1041 - StrCpy ${LangNme} "Japanese" - StrCpy ${LangCdeSys} "ja" - StrCpy ${LangNmeSys} "Japanese" - StrCpy ${LangSysEnc} "932" - ${endif} - - # currently no dictionary available - ${if} ${LangISOCode} = 1042 - StrCpy ${LangNme} "Korean" - StrCpy ${LangCdeSys} "ko" - StrCpy ${LangNmeSys} "Korean" - StrCpy ${LangSysEnc} "949" - ${endif} - - ${if} ${LangISOCode} = 1043 - StrCpy ${LangNme} "Nederlands" - StrCpy ${LangCdeSys} "nl" - StrCpy ${LangNmeSys} "Nederlands" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1044 - StrCpy ${LangNme} "Norsk" - StrCpy ${LangCdeSys} "no" - StrCpy ${LangNmeSys} "Norsk" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1045 - StrCpy ${LangNme} "Polski" - StrCpy ${LangCdeSys} "pl" - StrCpy ${LangNmeSys} "Polski" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1046 # for Portuguese (brasilian) - StrCpy ${LangNme} "Portugus" - StrCpy ${LangCdeSys} "pt" - StrCpy ${LangNmeSys} "Portugus" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1048 - StrCpy ${LangNme} "Romna" - StrCpy ${LangCdeSys} "ro" - StrCpy ${LangNmeSys} "Romna" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1049 - StrCpy ${LangNme} "Russian" - StrCpy ${LangCdeSys} "ru" - StrCpy ${LangNmeSys} "Russian" - StrCpy ${LangSysEnc} "1251" - ${endif} - - ${if} ${LangISOCode} = 1050 - StrCpy ${LangCdeSys} "hr" - StrCpy ${LangNmeSys} "Hrvatski" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1051 - StrCpy ${LangNme} "Slovensk" - StrCpy ${LangCdeSys} "sk" - StrCpy ${LangNmeSys} "Slovensk" - StrCpy ${LangSysEnc} "1250" - ${endif} - -# currently no dictionary available -# ${if} ${LangISOCode} = 1052 -# StrCpy ${LangCdeSys} "sq" -# StrCpy ${LangNmeSys} "Shqip" -# StrCpy ${LangSysEnc} "1252" -# ${endif} - - ${if} ${LangISOCode} = 1053 - StrCpy ${LangNme} "Svenska" - StrCpy ${LangCdeSys} "sv" - StrCpy ${LangNmeSys} "Svenska" - StrCpy ${LangSysEnc} "1252" - ${endif} - -# currently no dictionary available -# ${if} ${LangISOCode} = 1054 -# StrCpy ${LangCdeSys} "th" -# StrCpy ${LangNmeSys} "Thai" -# StrCpy ${LangSysEnc} "874" -# ${endif} - - ${if} ${LangISOCode} = 1055 - StrCpy ${LangNme} "Trke" - StrCpy ${LangCdeSys} "tr" - StrCpy ${LangNmeSys} "Trke" - StrCpy ${LangSysEnc} "1254" - ${endif} - - ${if} ${LangISOCode} = 1057 - StrCpy ${LangNme} "Bahasa Indonesia" - StrCpy ${LangCdeSys} "id" - StrCpy ${LangNmeSys} "Indonesia" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1058 - StrCpy ${LangNme} "Ukrainian" - StrCpy ${LangCdeSys} "uk" - StrCpy ${LangNmeSys} "Ukrainian" - StrCpy ${LangSysEnc} "1251" - ${endif} - - ${if} ${LangISOCode} = 1060 - StrCpy ${LangNme} "Slovencina" - StrCpy ${LangCdeSys} "sl" - StrCpy ${LangNmeSys} "Slovencina" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 1061 - StrCpy ${LangCdeSys} "et" - StrCpy ${LangNmeSys} "Eesti" - StrCpy ${LangSysEnc} "1257" - ${endif} - - ${if} ${LangISOCode} = 1062 - StrCpy ${LangCdeSys} "lv" - StrCpy ${LangNmeSys} "Latvieu" - StrCpy ${LangSysEnc} "1257" - ${endif} - - ${if} ${LangISOCode} = 1063 - StrCpy ${LangCdeSys} "lt" - StrCpy ${LangNmeSys} "Lietuva" - StrCpy ${LangSysEnc} "1257" - ${endif} - - ${if} ${LangISOCode} = 1065 - StrCpy ${LangCdeSys} "fa" - StrCpy ${LangNmeSys} "Farsi" - ${endif} - - ${if} ${LangISOCode} = 1067 - StrCpy ${LangCdeSys} "hy" - StrCpy ${LangNmeSys} "Armenian" - ${endif} - - # currently no dictionary available - ${if} ${LangISOCode} = 1069 - StrCpy ${LangNme} "Euskara" - StrCpy ${LangCdeSys} "eu" - StrCpy ${LangNmeSys} "Euskara" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1071 - StrCpy ${LangCdeSys} "mk" - StrCpy ${LangNmeSys} "Macedonian" - ${endif} - - ${if} ${LangISOCode} = 1078 - StrCpy ${LangCdeSys} "af" - StrCpy ${LangNmeSys} "Afrikaans" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 1081 - StrCpy ${LangCdeSys} "hi" - StrCpy ${LangNmeSys} "Hindi" - ${endif} - - ${if} ${LangISOCode} = 1086 - StrCpy ${LangCdeSys} "ms" - StrCpy ${LangNmeSys} "Malay" - ${endif} - - ${if} ${LangISOCode} = 1089 - StrCpy ${LangCdeSys} "sw" - StrCpy ${LangNmeSys} "Swahili" - ${endif} - - ${if} ${LangISOCode} = 1094 - StrCpy ${LangCdeSys} "pa" - StrCpy ${LangNmeSys} "Punjabi" - ${endif} - - ${if} ${LangISOCode} = 1095 - StrCpy ${LangCdeSys} "gu" - StrCpy ${LangNmeSys} "Gujarati" - ${endif} - - ${if} ${LangISOCode} = 1097 - StrCpy ${LangCdeSys} "ta" - StrCpy ${LangNmeSys} "Tamil" - ${endif} - - ${if} ${LangISOCode} = 1098 - StrCpy ${LangCdeSys} "te" - StrCpy ${LangNmeSys} "Telugu" - ${endif} - - ${if} ${LangISOCode} = 1102 - StrCpy ${LangCdeSys} "mr" - StrCpy ${LangNmeSys} "Marathi" - ${endif} - -# currently no dictionary available -# ${if} ${LangISOCode} = 1103 -# StrCpy ${LangCdeSys} "sa" -# StrCpy ${LangNmeSys} "Sanskrit" -# ${endif} - - ${if} ${LangISOCode} = 1110 - StrCpy ${LangNme} "Galego" - StrCpy ${LangCdeSys} "gl" - StrCpy ${LangNmeSys} "Galego" - StrCpy ${LangSysEnc} "1252" - ${endif} - -# currently no dictionary available - ${if} ${LangISOCode} = 2052 - StrCpy ${LangNme} "Chinese (China)" - StrCpy ${LangCdeSys} "zh_CN" - StrCpy ${LangNmeSys} "Chinese" - StrCpy ${LangSysEnc} "936" - ${endif} - - ${if} ${LangISOCode} = 2055 - StrCpy ${LangCdeSys} "de" - StrCpy ${LangNmeSys} "Deutsch" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2057 - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2058 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2060 - StrCpy ${LangCdeSys} "fr" - StrCpy ${LangNmeSys} "Franais" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2064 - StrCpy ${LangCdeSys} "it" - StrCpy ${LangNmeSys} "Italiano" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2067 - StrCpy ${LangCdeSys} "nl" - StrCpy ${LangNmeSys} "Nederlands" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2068 - StrCpy ${LangNme} "Nynorsk" - StrCpy ${LangCdeSys} "nn" - StrCpy ${LangNmeSys} "Nynorsk" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2070 # for Portuguese - StrCpy ${LangNme} "Portugus" - StrCpy ${LangCdeSys} "pt" - StrCpy ${LangNmeSys} "Portugus" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2074 - StrCpy ${LangNme} "Srpski (Latinica)" - StrCpy ${LangCdeSys} "sr" - StrCpy ${LangNmeSys} "Srpski (Latinica)" - StrCpy ${LangSysEnc} "1250" - ${endif} - - ${if} ${LangISOCode} = 2077 - StrCpy ${LangCdeSys} "sv" - StrCpy ${LangNmeSys} "Svenska" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 2110 - StrCpy ${LangCdeSys} "ms" - StrCpy ${LangNmeSys} "Malay" - ${endif} - -# currently no dictionary available - ${if} ${LangISOCode} = 3076 - StrCpy ${LangNme} "Chinese (China)" - StrCpy ${LangCdeSys} "zh_CN" - StrCpy ${LangNmeSys} "Chinese" - StrCpy ${LangSysEnc} "936" - ${endif} - - ${if} ${LangISOCode} = 3079 - StrCpy ${LangCdeSys} "de" - StrCpy ${LangNmeSys} "Deutsch" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 3081 - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 3082 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 3084 - StrCpy ${LangCdeSys} "fr" - StrCpy ${LangNmeSys} "Franais" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 4103 - StrCpy ${LangCdeSys} "de" - StrCpy ${LangNmeSys} "Deutsch" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 4105 - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 4108 - StrCpy ${LangCdeSys} "fr" - StrCpy ${LangNmeSys} "Franais" - StrCpy ${LangSysEnc} "1252" - ${endif} - -# currently no dictionary available - ${if} ${LangISOCode} = 5124 - StrCpy ${LangNme} "Chinese (China)" - StrCpy ${LangCdeSys} "zh_CN" - StrCpy ${LangNmeSys} "Chinese" - StrCpy ${LangSysEnc} "936" - ${endif} - - ${if} ${LangISOCode} = 5129 - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 5132 - StrCpy ${LangCdeSys} "fr" - StrCpy ${LangNmeSys} "Franais" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 7177 - StrCpy ${LangCdeSys} "en" - StrCpy ${LangNmeSys} "English" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 11274 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 13322 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 14346 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - - ${if} ${LangISOCode} = 20490 - StrCpy ${LangCdeSys} "es" - StrCpy ${LangNmeSys} "Espaol" - StrCpy ${LangSysEnc} "1252" - ${endif} - -!macroend - -#------------------------------------------ - -# To set later LyX's menu language -# therefore here are only declared the languages LyX is translated to - -!macro GetLangCode LangCde Name LangNmeLyX LangEnc - - ${if} ${Name} = "Arabic" - StrCpy ${LangCde} "ar_SA" - StrCpy ${LangNmeLyX} "arabic_arabi" - StrCpy ${LangEnc} "cp-1256" - ${endif} - - ${if} ${Name} == "Catal" - StrCpy ${LangCde} "ca_ES" - StrCpy ${LangNmeLyX} "catalan" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Cetina" - StrCpy ${LangCde} "cs_CZ" - StrCpy ${LangNmeLyX} "czech" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Chinese (China)" - StrCpy ${LangCde} "zh_CN" - StrCpy ${LangNmeLyX} "chinese-simplified" - StrCpy ${LangEnc} "cp-936" - ${endif} - - ${if} ${Name} == "Chinese (Taiwan)" - StrCpy ${LangCde} "zh_TW" - StrCpy ${LangNmeLyX} "chinese-traditional" - StrCpy ${LangEnc} "cp-936" - ${endif} - - ${if} ${Name} == "Dansk" - StrCpy ${LangCde} "da_DK" - StrCpy ${LangNmeLyX} "danish" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Deutsch" - StrCpy ${LangCde} "de_DE" - StrCpy ${LangNmeLyX} "ngerman" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "English" - StrCpy ${LangCde} "en_EN" - StrCpy ${LangNmeLyX} "english" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Espaol" - StrCpy ${LangCde} "es_ES" - StrCpy ${LangNmeLyX} "spanish" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Euskara" - StrCpy ${LangCde} "eu_EU" - StrCpy ${LangNmeLyX} "basque" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Franais" - StrCpy ${LangCde} "fr_FR" - StrCpy ${LangNmeLyX} "french" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Galego" - StrCpy ${LangCde} "gl_ES" - StrCpy ${LangNmeLyX} "galician" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Greek" - StrCpy ${LangCde} "el_GR" - StrCpy ${LangNmeLyX} "greek" - StrCpy ${LangEnc} "cp-1253" - ${endif} - - ${if} ${Name} == "Hebrew" - StrCpy ${LangCde} "he_IL" - StrCpy ${LangNmeLyX} "hebrew" - StrCpy ${LangEnc} "cp-1255" - ${endif} - - ${if} ${Name} == "Bahasa Indonesia" - StrCpy ${LangCde} "id_ID" - StrCpy ${LangNmeLyX} "bahasa" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Italiano" - StrCpy ${LangCde} "it_IT" - StrCpy ${LangNmeLyX} "italian" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Japanese" - StrCpy ${LangCde} "ja_JP" - StrCpy ${LangNmeLyX} "japanese" - StrCpy ${LangEnc} "cp-932" - ${endif} - - ${if} ${Name} == "Korean" - StrCpy ${LangCde} "ko" # no country code, see the definition in the file "SVN ~/lib/languages" - StrCpy ${LangNmeLyX} "korean" - StrCpy ${LangEnc} "cp-949" - ${endif} - - ${if} ${Name} == "Magyar" - StrCpy ${LangCde} "hu_HU" - StrCpy ${LangNmeLyX} "magyar" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Nederlands" - StrCpy ${LangCde} "nl_NL" - StrCpy ${LangNmeLyX} "dutch" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Norsk" - StrCpy ${LangCde} "nb_NO" - StrCpy ${LangNmeLyX} "norsk" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Nynorsk" - StrCpy ${LangCde} "nn_NO" - StrCpy ${LangNmeLyX} "nynorsk" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Polski" - StrCpy ${LangCde} "pl_PL" - StrCpy ${LangNmeLyX} "polish" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Portugus" - StrCpy ${LangCde} "pt_PT" - StrCpy ${LangNmeLyX} "portuguese" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Romna" - StrCpy ${LangCde} "ro_RO" - StrCpy ${LangNmeLyX} "romanian" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Russian" - StrCpy ${LangCde} "ru_RU" - StrCpy ${LangNmeLyX} "russian" - StrCpy ${LangEnc} "cp-1251" - ${endif} - - ${if} ${Name} == "Srpski (Latinica)" - StrCpy ${LangCde} "sr_RS" - StrCpy ${LangNmeLyX} "serbian-latin" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Slovensk" - StrCpy ${LangCde} "sk_SK" - StrCpy ${LangNmeLyX} "slovak" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Slovencina" - StrCpy ${LangCde} "sl_SI" - StrCpy ${LangNmeLyX} "slovene" - StrCpy ${LangEnc} "cp-1250" - ${endif} - - ${if} ${Name} == "Suomi" - StrCpy ${LangCde} "fi_FI" - StrCpy ${LangNmeLyX} "finnish" - StrCpy ${LangEnc} "cp-1252" - ${endif} - - ${if} ${Name} == "Trke" - StrCpy ${LangCde} "tr_TR" - StrCpy ${LangNmeLyX} "turkish" - StrCpy ${LangEnc} "cp-1254" - ${endif} - - ${if} ${Name} == "Ukrainian" - StrCpy ${LangCde} "uk_UA" - StrCpy ${LangNmeLyX} "ukrainian" - StrCpy ${LangEnc} "cp-1251" - ${endif} - -!macroend - -#-------------------- -# function that creates the installer page for the language setting -Function SelectMenuLanguage - - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "io_ui_language.ini" - - ${if} $LangName == "" - # translate NSIS's language code to the language name - !insertmacro TranslateLangCode $LangName $LangNameSys $LangCodeSys $Language $LangSysEncoding - ${endif} - - ${if} $LangName == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 2" "State" "English" - ${else} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 2" "State" "$LangName" - ${endif} - - !insertmacro MUI_HEADER_TEXT "$(LangSelectHeader)" "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_ui_language.ini" "Field 1" "Text" "$(AvailableLang)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io_ui_language.ini" - !insertmacro MUI_INSTALLOPTIONS_READ $LangName "io_ui_language.ini" "Field 2" "State" - -FunctionEnd - -Function SelectMenuLanguage_LeaveFunction - - !insertmacro MUI_INSTALLOPTIONS_READ $LangName "io_ui_language.ini" "Field 2" "State" - # Get the LyX GUI language name - StrCpy $LangNameLyX "" - !insertmacro GetLangCode $LangCode $LangName $LangNameLyX $LangEncoding - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/Launch.nsi b/development/Win32/packaging/AltInstaller/Launch.nsi deleted file mode 100644 index 857c812773..0000000000 --- a/development/Win32/packaging/AltInstaller/Launch.nsi +++ /dev/null @@ -1,45 +0,0 @@ -# LyX for Windows Launcher -# Author: Joost Verburg and Uwe Stöhr -# -# This application will start LyX without the console. - -!include "FileFunc.nsh" -!insertmacro GetParameters - -Var Parameters - -OutFile LyXLauncher.exe - -Icon "icons\lyx_32x32.ico" -LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" - -#-------------------------------- -#Version information - -VIProductVersion "1.0.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "LyXLauncher" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Launcher for LyX - The Document Processor" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "LyX is Copyright 1995-2007 by the LyX Team" - -#-------------------------------- -#Main application - -Section -Launch - - # hide the application window as only the window of the startet lyx.exe - # should be visible - HideWindow - - # get the parameters LyX is called with: LyX-document to be opened etc. - ${GetParameters} $Parameters # macro from FileFunc.nsh - - # start LyX and hide the command line window - Push '"$EXEDIR\lyx.exe" $Parameters' - CallInstDLL "$EXEDIR\Console.dll" ExecToLog - - # quit the application when LyX was closed by the user - Quit - -SectionEnd - diff --git a/development/Win32/packaging/AltInstaller/License.txt b/development/Win32/packaging/AltInstaller/License.txt deleted file mode 100644 index 288ac6991c..0000000000 --- a/development/Win32/packaging/AltInstaller/License.txt +++ /dev/null @@ -1,365 +0,0 @@ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - In addition, as a special exception, the LyX Team gives permission to - link the code of this program with the XForms library (or with modified - versions of XForms that use the same license as XForms), and distribute - linked combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than XForms. - If you modify this file, you may extend this exception to your version of - the file, but you are not obligated to do so. If you do not wish to do so, - delete this exception statement from your version. - - The GNU General Public License version 2 is included below for your reference. - ------------------------------------------------------------------------- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi deleted file mode 100644 index 05e77b3292..0000000000 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi +++ /dev/null @@ -1,292 +0,0 @@ -# Lyx for Windows, NSIS v2 series installer script - -# File LyXInstaller-complete.nsi -# This file is part of LyX, the document processor. -# http://www.lyx.org/ -# Licence details can be found in the file COPYING or copy at -# http://www.lyx.org/about/license.php3 - -# Author: Uwe Stöhr based on the work of Angus Leeming and ideas of Joost Verburg -# Full author contact details are available in file CREDITS or copy at -# http://www.lyx.org/about/credits.php - -# This script requires NSIS 2.45 or newer -# http://nsis.sourceforge.net/ -#-------------------------------- - -# Do a Cyclic Redundancy Check to make sure the installer -# was not corrupted by the download. -CRCCheck force - -# Make the installer as small as possible. -#SetCompressor lzma - -#-------------------------------- -# You should need to change only these macros... - -!define INSTALLER_VERSION "Complete" -!define INSTALLER2_VERSION "Small" -!define INSTALLER3_VERSION "Update" -!define INSTALLER_TYPE "NotUpdate" - -# load the settings -!include "Settings.nsh" - -#-------------------------------- -# variables only used in this installer version - -Var Acrobat -Var AiksaurusPath -Var AppFiles -Var AspellPath -Var BibTeXEditorPath -Var DelGSDir -Var DelPythonFiles -Var DelWMFDir -Var EditorPath -Var GhostscriptPath -Var ImageEditorPath -Var InstallGSview -Var InstallJabRef -Var LangEncoding -Var LangSysEncoding -Var LaTeXName -Var LangNameLyX -Var MiKTeXVersion -Var MiKTeXUser -Var MiKTeXPath -Var MissedProg -Var PathPrefix -Var PSVPath -Var SVGPath -Var WMFPath - -# Variables used by all installer versions -!include "Variables.nsh" - -#-------------------------------- -# load some NSIS libraries -!include "MUI.nsh" -!include "LogicLib.nsh" -!include "FileFunc.nsh" -!include "StrFunc.nsh" -!include "TextFunc.nsh" -!include "WinVer.nsh" - -# Set of various macros and functions -!include "LyXUtils.nsh" - -# Functions to check and configure the LaTeX-system -!include "LaTeX.nsh" - -# Function to check if needed programs are missing or not -!include "MissingPrograms.nsh" - -# Functions for page to set installer language -# and LyX's menu language -!include "LanguageSettings.nsh" - -# Function to configure LyX -!include "ConfigLyX.nsh" - -# Functions to configure needed third-party programs -!include "InstallThirdPartyProgs.nsh" - -# Function for page to install Aspell dictionaries -!include "Aspell.nsh" - -#-------------------------------- -# Remember the installer language -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_hi.bmp" -!define MUI_ICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_UNICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "${VERSION_BITMAP}" - -# Welcome page -!define MUI_WELCOMEPAGE_TEXT "$(WelcomePageText)" -!insertmacro MUI_PAGE_WELCOME - -# Show the license. -!insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE_FILE}" - -# Specify the installation directory. -!insertmacro MUI_PAGE_DIRECTORY - -# Specify LyX's menu language. -Page custom SelectMenuLanguage SelectMenuLanguage_LeaveFunction - -# Define which components to install. -!insertmacro MUI_PAGE_COMPONENTS - -# Specify where to install program shortcuts. -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_ROOT_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${PRODUCT_VERSION}" -!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} $StartmenuFolder - -# Check for needed programs -Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction - -# Watch the components being installed. -!insertmacro MUI_PAGE_INSTFILES - -# Finish page -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)" -!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)" -!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct" -!insertmacro MUI_PAGE_FINISH - -# The uninstaller. -!insertmacro MUI_UNPAGE_COMPONENTS -!insertmacro MUI_UNPAGE_INSTFILES - -#-------------------------------- -# List of languages the installers are translated to - -!include "TranslatedLanguages.nsh" - -LicenseData "$(LyXLicenseData)" - -#-------------------------------- -# Reserve Files - -# These files are inserted before other files in the data block -!insertmacro MUI_RESERVEFILE_LANGDLL -ReserveFile "io_ui_language.ini" -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -#-------------------------------- -# Installer sections - -Section "!${PRODUCT_NAME}" SecCore - SectionIn RO -SectionEnd -Section "$(SecAllUsersTitle)" SecAllUsers - SetShellVarContext all - StrCpy $ProductRootKey "HKLM" -SectionEnd -Section "$(SecFileAssocTitle)" SecFileAssoc - StrCpy $CreateFileAssociations "true" -SectionEnd -Section "$(SecDesktopTitle)" SecDesktop - StrCpy $CreateDesktopIcon "true" -SectionEnd -Section /o "$(SecInstGSviewTitle)" SecInstGSview - AddSize 4000 - StrCpy $InstallGSview "true" -SectionEnd -Section /o "$(SecInstJabRefTitle)" SecInstJabRef - AddSize 5000 - StrCpy $InstallJabRef "true" -SectionEnd - -# Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecAllUsers} "$(SecAllUsersDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecInstGSview} "$(SecInstGSviewDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecInstJabRef} "$(SecInstJabRefDescription)" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# the installation section -!include "InstallActions-complete-small.nsh" - -#-------------------------------- -# This hook function is called internally by NSIS on installer startup -Function .onInit - - # set the installer language to the Windows locale language - System::Call "kernel32::GetUserDefaultLangID()i.a" - - # check that the installer is not currently running - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${INSTALLER_EXE}.Instance") i .r1 ?e' - Pop $R0 - ${if} $R0 != "0" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - FindProcDLL::FindProc "${INSTALLER2_EXE}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - - # check if LyX is already installed - ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher" - ${if} $0 != "" - MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" - Abort - ${endif} - - # printer settings, needed to install the Metafile2eps printer - !insertmacro PrinterInit # macro from InstallThirdPartyProgs.nsh - - # default settings - # these can be reset to "all" in section SecAllUsers - SetShellVarContext current - StrCpy $ProductRootKey "HKCU" - - # this can be reset to "true" in section SecDesktop - StrCpy $CreateDesktopIcon "false" - StrCpy $CreateFileAssociations "false" - - # if the user does *not* have administrator privileges, abort - StrCpy $Answer "" - StrCpy $UserName "" - !insertmacro IsUserAdmin $Answer $UserName # macro from LyXUtils.nsh - ${if} $Answer == "yes" - !define ENABLE 0x00000001 - SectionGetFlags ${SecAllUsers} $0 - IntOp $0 $0 | ${ENABLE} - SectionSetFlags ${SecAllUsers} $0 - !undef ENABLE - ${else} - MessageBox MB_OK|MB_ICONSTOP "$(NotAdmin)" - Abort - ${endif} - - # check the LaTeX-system - Call LaTeXActions # Function from LaTeX.nsh - - # check which programs are installed or not - Call MissingPrograms # function from MissingPrograms.nsh - - # don't let the installer sections appear when the programs are already installed - ${if} $PSVPath != "" - SectionSetText 4 "" # hides the corresponding uninstaller section, ${SecInstGSview} - ${endif} - ${if} $BibTeXEditorPath != "" - SectionSetText 5 "" # hides the corresponding uninstaller section, ${SecInstJabRef} - ${endif} - - ClearErrors -FunctionEnd - -#-------------------------------- - -Function LaunchProduct - # call the lyx.exe and not the lyxLauncher.exe to show the console window. This is - # necessary because sometimes LyX's configure run that is started by the - # installer fails when MiKTeX was installed together with this installer. - # Showing the console gives the user feedback otherwise he would wonder why - # LyX won't start for minutes while it is downloading LaTeX-packages in the - # background - Exec ${PRODUCT_EXE} -FunctionEnd - -#-------------------------------- -# The Uninstaller - -!include "Uninstall.nsh" - -# eof diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi deleted file mode 100644 index 900e61e3bd..0000000000 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi +++ /dev/null @@ -1,276 +0,0 @@ -# Lyx for Windows, NSIS v2 series installer script - -# File LyXInstaller-small.nsi -# This file is part of LyX, the document processor. -# http://www.lyx.org/ -# Licence details can be found in the file COPYING or copy at -# http://www.lyx.org/about/license.php3 - -# Author: Uwe Stöhr based on the work of Angus Leeming and ideas of Joost Verburg -# Full author contact details are available in file CREDITS or copy at -# http://www.lyx.org/about/credits.php - -# This script requires NSIS 2.45 or newer -# http://nsis.sourceforge.net/ -#-------------------------------- - -# Do a Cyclic Redundancy Check to make sure the installer -# was not corrupted by the download. -CRCCheck force - -# Make the installer as small as possible. -SetCompressor lzma - -#-------------------------------- -# You should need to change only these macros... - -!define INSTALLER_VERSION "Small" -!define INSTALLER2_VERSION "Complete" -!define INSTALLER3_VERSION "Update" -!define INSTALLER_TYPE "NotUpdate" - -# load the settings -!include "Settings.nsh" - -#-------------------------------- -# variables only used in this installer version - -Var AppFiles -Var AiksaurusPath -Var AspellPath -Var Acrobat -Var BibTeXEditorPath -Var DelGSDir -Var DelPythonFiles -Var DelWMFDir -Var EditorPath -Var GhostscriptPath -Var ImageEditorPath -Var LangEncoding -Var LangSysEncoding -Var LaTeXName -Var LangNameLyX -Var MiKTeXVersion -Var MiKTeXUser -Var MissedProg -Var PathPrefix -Var PSVPath -Var State -Var SVGPath -Var WMFPath - -# Variables used by all installer versions -!include "Variables.nsh" - -#-------------------------------- -# load some NSIS libraries -!include "MUI.nsh" -!include "LogicLib.nsh" -!include "FileFunc.nsh" -!include "StrFunc.nsh" -!include "TextFunc.nsh" -!include "WinVer.nsh" - -# Set of various macros and functions -!include "LyXUtils.nsh" - -# Functions to check and configure the LaTeX-system -!include "LaTeX.nsh" - -# Function to check if needed programs are missing or not -!include "MissingPrograms.nsh" - -# Function for page to manually select LaTeX's installation folder -!include "LaTeXFolder.nsh" - -# Functions for page to set installer language -# and LyX's menu language -!include "LanguageSettings.nsh" - -# Function to configure LyX -!include "ConfigLyX.nsh" - -# Functions to configure needed third-party programs -!include "InstallThirdPartyProgs.nsh" - -# Function for page to install Aspell dictionaries -!include "Aspell.nsh" - -#-------------------------------- -# Remember the installer language -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_hi.bmp" -!define MUI_ICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_UNICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "${VERSION_BITMAP}" - -# Welcome page -!define MUI_WELCOMEPAGE_TEXT "$(WelcomePageText)" -!insertmacro MUI_PAGE_WELCOME - -# Show the license. -!insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE_FILE}" - -# Specify the installation directory. -!insertmacro MUI_PAGE_DIRECTORY - -# Specify LyX's menu language. -Page custom SelectMenuLanguage SelectMenuLanguage_LeaveFunction - -# Define which components to install. -!insertmacro MUI_PAGE_COMPONENTS - -# Specify where to install program shortcuts. -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_ROOT_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${PRODUCT_VERSION}" -!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} $StartmenuFolder - -# Select latex.exe manually -Page custom LatexFolder LatexFolder_LeaveFunction - -# Check for needed programs -Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction - -# Watch the components being installed. -!insertmacro MUI_PAGE_INSTFILES - -# Finish page -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)" -!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)" -!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct" -!insertmacro MUI_PAGE_FINISH - -# The uninstaller. -!insertmacro MUI_UNPAGE_COMPONENTS -!insertmacro MUI_UNPAGE_INSTFILES - -#-------------------------------- -# List of languages the installers are translated to - -!include "TranslatedLanguages.nsh" - -LicenseData "$(LyXLicenseData)" - -#-------------------------------- -# Reserve Files - -# These files are inserted before other files in the data block -!insertmacro MUI_RESERVEFILE_LANGDLL -ReserveFile "io_ui_language.ini" -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -#-------------------------------- -# Installer sections - -Section "!${PRODUCT_NAME}" SecCore - SectionIn RO -SectionEnd -Section "$(SecAllUsersTitle)" SecAllUsers - SetShellVarContext all - StrCpy $ProductRootKey "HKLM" -SectionEnd -# remove the /o for LyX 2.0 final! -Section /o "$(SecFileAssocTitle)" SecFileAssoc - StrCpy $CreateFileAssociations "true" -SectionEnd -Section /o "$(SecDesktopTitle)" SecDesktop - StrCpy $CreateDesktopIcon "true" -SectionEnd - -# Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecAllUsers} "$(SecAllUsersDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssoc} "$(SecFileAssocDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# the installation section -!include "InstallActions-complete-small.nsh" - -#-------------------------------- -# This hook function is called internally by NSIS on installer startup -Function .onInit - - # set the installer language to the Windows locale language - System::Call "kernel32::GetUserDefaultLangID()i.a" - - # check that the installer is not currently running - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${INSTALLER_EXE}.Instance") i .r1 ?e' - Pop $R0 - ${if} $R0 != "0" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - FindProcDLL::FindProc "${INSTALLER2_EXE}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - - # check if LyX is already installed - ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher" - ${if} $0 != "" - MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" - Abort - ${endif} - - # printer settings, needed to install the Metafile2eps printer - !insertmacro PrinterInit # macro from InstallThirdPartyProgs.nsh - - # default settings - # these can be reset to "all" in section SecAllUsers - SetShellVarContext current - StrCpy $ProductRootKey "HKCU" - - # this can be reset to "true" in section SecDesktop - StrCpy $CreateDesktopIcon "false" - StrCpy $CreateFileAssociations "false" - - # if the user does *not* have administrator privileges, abort - StrCpy $Answer "" - StrCpy $UserName "" - !insertmacro IsUserAdmin $Answer $UserName # macro from LyXUtils.nsh - ${if} $Answer == "yes" - !define ENABLE 0x00000001 - SectionGetFlags ${SecAllUsers} $0 - IntOp $0 $0 | ${ENABLE} - SectionSetFlags ${SecAllUsers} $0 - !undef ENABLE - ${else} - MessageBox MB_OK|MB_ICONSTOP "$(NotAdmin)" - Abort - ${endif} - - # check the LaTeX-system - Call LaTeXActions # Function from LaTeX.nsh - - # check which programs are installed or not - Call MissingPrograms # function from MissingPrograms.nsh - - # used later in the function LatexFolder - StrCpy $State "0" - - ClearErrors -FunctionEnd - -#-------------------------------- - -Function LaunchProduct - Exec ${PRODUCT_BAT} -FunctionEnd - -#-------------------------------- -# The Uninstaller - -!include "Uninstall.nsh" - -# eof diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi deleted file mode 100644 index 43602e5879..0000000000 --- a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi +++ /dev/null @@ -1,238 +0,0 @@ -# Lyx for Windows, NSIS v2 series installer script - -# File LyXInstaller-update.nsi -# This file is part of LyX, the document processor. -# http://www.lyx.org/ -# Licence details can be found in the file COPYING or copy at -# http://www.lyx.org/about/license.php3 - -# Author: Uwe Stöhr -# Full author contact details are available in file CREDITS or copy at -# http://www.lyx.org/about/credits.php - -# This script requires NSIS 2.45 or newer -# http://nsis.sourceforge.net/ -#-------------------------------- - -# Do a Cyclic Redundancy Check to make sure the installer -# was not corrupted by the download. -CRCCheck force - -# Make the installer as small as possible. -SetCompressor lzma - -#-------------------------------- -# You should need to change only these macros... - -!define INSTALLER_VERSION "Update" -!define INSTALLER2_VERSION "Small" -!define INSTALLER3_VERSION "Complete" -!define INSTALLER_TYPE "Update" - -# load the settings -!include "Settings.nsh" - -#-------------------------------- -# variables only used in this installer version - -Var INSTDIR_NEW -Var INSTDIR_OLD -Var AppPath -# Variables used by all installer versions -!include "Variables.nsh" - -#-------------------------------- -# load some NSIS libraries -!include "MUI.nsh" -!include "LogicLib.nsh" -!include "FileFunc.nsh" -!include "StrFunc.nsh" -!include "TextFunc.nsh" -!include "WinVer.nsh" -!insertmacro LineFind -!include "WordFunc.nsh" -!insertmacro WordReplace - -# Set of various macros and functions -!include "LyXUtils.nsh" - -# list with modified files -!include "Updated.nsh" - -# list with deleted files -!include "Deleted.nsh" - -# Function for page to install Aspell dictionaries -!include "Aspell.nsh" - -#-------------------------------- - -# Remember the installer language -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" - -!define MUI_ABORTWARNING -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_hi.bmp" -!define MUI_ICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_UNICON "${PRODUCT_DIR}\icons\lyx.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "${VERSION_BITMAP}" - -# Welcome page -!define MUI_WELCOMEPAGE_TEXT "$(WelcomePageText)" -!insertmacro MUI_PAGE_WELCOME - -# Show the license. -!insertmacro MUI_PAGE_LICENSE "${PRODUCT_LICENSE_FILE}" - -# Define which components to install. -!insertmacro MUI_PAGE_COMPONENTS - -# Specify where to install program shortcuts. -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "LyX ${PRODUCT_VERSION}" -!insertmacro MUI_PAGE_STARTMENU ${PRODUCT_NAME} $StartmenuFolder - -# Watch the components being installed. -!insertmacro MUI_PAGE_INSTFILES - -# Finish page -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)" -!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)" -!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchProduct" -!insertmacro MUI_PAGE_FINISH - -# The uninstaller. -!insertmacro MUI_UNPAGE_COMPONENTS -!insertmacro MUI_UNPAGE_INSTFILES - -#-------------------------------- -# List of languages the installers are translated to - -!include "TranslatedLanguages.nsh" - -LicenseData "$(LyXLicenseData)" - -#-------------------------------- -# Reserve Files - -# These files are inserted before other files in the data block -!insertmacro MUI_RESERVEFILE_LANGDLL -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - -#-------------------------------- -# Installer sections - -Section "!${PRODUCT_NAME}" SecCore - SectionIn RO -SectionEnd -Section "$(SecFileAssocTitle)" SecFileAssoc - StrCpy $CreateFileAssociations "true" -SectionEnd -Section "$(SecDesktopTitle)" SecDesktop - StrCpy $CreateDesktopIcon "true" -SectionEnd - -# Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "$(SecCoreDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(SecDesktopDescription)" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - -# the installation section -!include "InstallActions-update.nsh" - -#-------------------------------- -# This hook function is called internally by NSIS on installer startup -Function .onInit - - # Check that LyX is not currently running - FindProcDLL::FindProc "lyx.exe" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" - Abort - ${endif} - - # set the installer language to the Windows locale language - System::Call "kernel32::GetUserDefaultLangID()i.a" - - # Check that the installer is not currently running - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${INSTALLER_EXE}.Instance") i .r1 ?e' - Pop $R0 - ${if} $R0 != "0" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - FindProcDLL::FindProc "${INSTALLER2_EXE}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - FindProcDLL::FindProc "${INSTALLER3_EXE}" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" - Abort - ${endif} - - # printer settings, needed to install the Metafile2eps printer - ${if} ${AtLeastWinVista} - StrCpy $PrinterConf "printui.exe" - ${else} - StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry" - ${endif} - - # check where LyX is installed - ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY_OLD}" "DisplayIcon" - ${if} $0 != "" - SetShellVarContext all - StrCpy $ProductRootKey "HKLM" - ${endif} - ${if} $0 == "" - ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY_OLD}" "DisplayIcon" - ${if} $0 != "" - SetShellVarContext current - StrCpy $ProductRootKey "HKCU" - ${endif} - ${if} $0 == "" - MessageBox MB_OK|MB_ICONSTOP "$(UpdateNotAllowed)" - Abort - ${endif} - ${endif} # end if $0 == 0 - ${if} $0 != "" # if it is found - StrCpy $INSTDIR $0 - StrCpy $INSTDIR $INSTDIR -12 # delete the string "\bin\lyx.exe" or "\bin\lyx.bat" - ${endif} - - # abort if the user doesn't have administrator privileges but LyX was installed as admin - StrCpy $Answer "" - StrCpy $UserName "" - !insertmacro IsUserAdmin $Answer $UserName # macro from LyXUtils.nsh - ${if} $Answer != "yes" - ${andif} $ProductRootKey == "HKLM" - MessageBox MB_OK|MB_ICONSTOP "$(NotAdmin)" - Abort - ${endif} - - # This can be reset to "true" in section SecDesktop. - StrCpy $CreateDesktopIcon "false" - - ClearErrors -FunctionEnd - -#-------------------------------- - -Function LaunchProduct - Exec ${PRODUCT_BAT} -FunctionEnd - -#-------------------------------- -# The Uninstaller - - !include "Uninstall.nsh" - - -# eof diff --git a/development/Win32/packaging/AltInstaller/LyXUtils.nsh b/development/Win32/packaging/AltInstaller/LyXUtils.nsh deleted file mode 100644 index 5735b4bc4e..0000000000 --- a/development/Win32/packaging/AltInstaller/LyXUtils.nsh +++ /dev/null @@ -1,544 +0,0 @@ -# This script contains the following functions: -# -# - LaTeXCheck (check installed LaTeX-system), -# (only used by Small and Complete installer), uses: -# StrPointer -# StrPoint -# RevStrPointer -# RevStrPoint -# -# - un.DelAppPathSub and UnAppPreSuff, -# (delete the folder ~\Documents and Settings\username\Application Data\LyX for all users), uses: -# un.GetParentA -# un.GetUsers -# un.StrPoint -# StrPointer -# StrPoint -# UnAppPreSuff -# -# - CreateAppPathSub and AppPreSuff, -# (creates the folder ~\Documents and Settings\username\Application Data\LyX for all users), -# (only used by Small and Complete installer), uses: -# GetParentA -# GetUsers -# StrPointer -# 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) -# -#-------------------------- - -!macro StrPointer FindStr SearchStr Pointer - # searches for a string/character (SearchStr) in another string (FindStr) - # and returns the number of the character in the FindStr where the SearchStr was found (Pointer) - # if nothing was found or the search is impossible the Pointer is set to -1 - - StrLen $R2 ${SearchStr} - StrLen $R4 ${FindStr} - StrCpy $R5 0 - ${if} $R2 == 0 - ${orif} $R4 == 0 - Goto NotFound - ${endif} - IntCmp $R4 $R2 loopA NotFound - loopA: - StrCpy $R3 ${FindStr} $R2 $R5 - StrCmp $R3 ${SearchStr} Found - IntOp $R5 $R5 + 1 - IntCmp $R4 $R5 loopA NotFound - Goto loopA - Found: - StrCpy ${Pointer} $R5 - Goto done - NotFound: - StrCpy ${Pointer} "-1" - done: - -!macroend - -#-------------------------------- - -Function StrPoint - !insertmacro StrPointer $String $Search $Pointer -FunctionEnd - -#-------------------------------- - -!macro RevStrPointer FindStr SearchStr Pointer - # searches for a string/character (SearchStr) in another string (FindStr) in reverse order - # and returns the number of the character in the FindStr where the SearchStr was found (Pointer) - # if nothing was found or the search is impossible the Pointer is set to +1 - - StrLen $R2 ${SearchStr} - StrLen $R4 ${FindStr} - ${if} $R2 == 0 - ${orif} $R4 == 0 - Goto NotFound - ${endif} - IntCmp $R4 $R2 loopA NotFound - StrCpy $R5 "-$R2" - loopA: - StrCpy $R3 ${FindStr} $R2 $R5 - StrCmp $R3 ${SearchStr} Found - IntOp $R5 $R5 - 1 - IntCmp "$R5" "-$R4" loopA NotFound - Goto loopA - Found: - StrCpy ${Pointer} $R5 - Goto done - NotFound: - StrCpy ${Pointer} "+1" - done: - -!macroend - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - - Function RevStrPoint - !insertmacro RevStrPointer $String $Search $Pointer - FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - -#-------------------------------- - -!macro AppPreSuff AppPre AppSuff - # the APPDATA path for a local user has for WinXP and 2000 the following structure: - # C:\Documents and Settings\username\Application Data - # for Win Vista the structure is: - # C:\Users\username\AppData\Roaming - # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre" - # and the "Application Data" substring into the variable "AppSuff" - - # switch temporarily to local user because the all users application data path is in - # Vista only C:\ProgramData - SetShellVarContext current - StrCpy $String "$APPDATA" - Var /GLOBAL APPDATemp - StrCpy $APPDATemp "$APPDATA" - ${if} $ProductRootKey == "HKLM" - SetShellVarContext all # move back to all users - ${endif} - StrCpy $Search "\" - Call StrPoint # search for the first "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the first "\" - StrCpy $0 $Pointer - Call StrPoint # search for the second "\" - IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string - StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the second "\" - Call StrPoint # search for the third "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\" - -!macroend - -#-------------------------------- - -Function GetParentA - # deletes a subfolder of the APPDATA path for all users - # used by the function "un.getUsers" - - Exch $R0 - Push $R1 - Push $R2 - Push $R3 - StrCpy $R1 0 - StrLen $R2 $R0 - loop: - IntOp $R1 $R1 + 1 - IntCmp $R1 $R2 get 0 get - StrCpy $R3 $R0 1 -$R1 - StrCmp $R3 "\" get - Goto loop - get: - StrCpy $R0 $R0 -$R1 - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - -FunctionEnd - -#-------------------------------- - -Function GetUsers - # reads the subfolders of the "Documents and Settings" folder to get a list of the users - - StrCpy $R3 "" - Push "$PROFILE" - Call GetParentA - Pop $R2 - StrCpy $R2 "$R2" - FindFirst $R0 $R1 "$R2\*" - StrCmp $R1 "" findend 0 - findloop: - IfFileExists "$R2\$R1\*.*" 0 notDir - StrCmp $R1 "." notDir - StrCmp $R1 ".." notDir - StrCmp $R1 "All Users" notDir - StrCmp $R1 "Default User" notDir - StrCmp $R1 "All Users.WINNT" notDir - StrCmp $R1 "Default User.WINNT" notDir - StrCpy $R3 "$R3|$R1" - notDir: - FindNext $R0 $R1 - StrCmp $R1 "" findend 0 - Goto findloop - findend: - FindClose $R0 - -FunctionEnd - -#-------------------------------- - -Function un.GetParentA - # deletes a subfolder of the APPDATA path for all users - # used by the function "un.getUsers" - - Exch $R0 - Push $R1 - Push $R2 - Push $R3 - StrCpy $R1 0 - StrLen $R2 $R0 - loop: - IntOp $R1 $R1 + 1 - IntCmp $R1 $R2 get 0 get - StrCpy $R3 $R0 1 -$R1 - StrCmp $R3 "\" get - Goto loop - get: - StrCpy $R0 $R0 -$R1 - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - -FunctionEnd - -#-------------------------------- - -Function un.GetUsers - # reads the subfolders of the "Documents and Settings" folder to get a list of the users - - StrCpy $R3 "" - Push "$PROFILE" - Call un.GetParentA - Pop $R2 - StrCpy $R2 "$R2" - FindFirst $R0 $R1 "$R2\*" - StrCmp $R1 "" findend 0 - findloop: - IfFileExists "$R2\$R1\*.*" 0 notDir - StrCmp $R1 "." notDir - StrCmp $R1 ".." notDir - StrCmp $R1 "All Users" notDir - StrCmp $R1 "Default User" notDir - StrCmp $R1 "All Users.WINNT" notDir - StrCmp $R1 "Default User.WINNT" notDir - StrCpy $R3 "$R3|$R1" - notDir: - FindNext $R0 $R1 - StrCmp $R1 "" findend 0 - Goto findloop - findend: - FindClose $R0 - -FunctionEnd - -#-------------------------------- - -Function un.StrPoint - !insertmacro StrPointer $String $Search $Pointer -FunctionEnd - -#-------------------------------- - -!macro UnAppPreSuff AppPre AppSuff - # the APPDATA path for a local user has for WinXP and 2000 the following structure: - # C:\Documents and Settings\username\Application Data - # for Win Vista the structure is: - # C:\Users\username\AppData\Roaming - # this macro saves the "C:\Documents and Settings\" substring into the variable "AppPre" - # and the "Application Data" substring into the variable "AppSuff" - - SetShellVarContext current # switch temoprarily to local user - StrCpy $String "$APPDATA" - StrCpy $APPDATemp "$APPDATA" - ${if} $Answer == "yes" # then user has admin priviledges - SetShellVarContext all # move back to all users - ${endif} - StrCpy $Search "\" - Call un.StrPoint # search for the first "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the first "\" - StrCpy $0 $Pointer - Call un.StrPoint # search for the second "\" - IntOp $0 $0 + $Pointer # $0 is now the pointer to the second "\" in the APPDATA string - StrCpy ${AppPre} $APPDATemp $0 # save the part before the second "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy $String $String "" $Pointer # cut off the part before the second "\" - Call un.StrPoint # search for the third "\" - IntOp $Pointer $Pointer + 1 # jump after the "\" - StrCpy ${AppSuff} $String "" $Pointer # save the part after the third "\" - -!macroend - -#-------------------------------- - -Function un.DelAppPathSub - # deletes a subfolder of the APPDATA path for all users - - # get list of all users - Push $R0 - Push $R1 - Push $R2 - Push $R3 - Call un.GetUsers - StrCpy $UserList $R3 "" 1 # cut off the "|" at the end of the list - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - # the usernames in the list of all users is separated by "|" - loop: - StrCpy $String "$UserList" - StrCpy $Search "|" - Call un.StrPoint # search for the "|" - StrCmp $Pointer "-1" ready - StrCpy $0 $UserList $Pointer # $0 contains now the username - IntOp $Pointer $Pointer + 1 # jump after the "|" - StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list - # generate the string for the current user - # AppPre and AppSuff are generated in the macro "AppPreSuff" - RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder - Goto loop - ready: - StrCpy $0 $UserList - RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder - -FunctionEnd - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - - Function CreateAppPathSub - # creates a subfolder of the APPDATA path for all users - - # get folder names - !insertmacro AppPreSuff $AppPre $AppSuff - - # get list of all users - Push $R0 - Push $R1 - Push $R2 - Push $R3 - Call GetUsers - StrCpy $UserList $R3 "" 1 # cut off the "|" at the end of the list - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - # the usernames in the list of all users is separated by "|" - loop: - StrCpy $String "$UserList" - StrCpy $Search "|" - Call StrPoint # search for the "|" - StrCmp $Pointer "-1" ready # the loop is finished when no "|" could be found - StrCpy $0 $UserList $Pointer # $0 contains now the username - IntOp $Pointer $Pointer + 1 # jump after the "|" - StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list - # generate the string for the current user - # AppPre and AppSuff are generated in the macro "AppPreSuff" - CreateDirectory "$AppPre\$0\$AppSuff\$AppSubfolder" # create the folder - CopyFiles "$AppFiles" "$AppPre\$0\$AppSuff\$AppSubfolder" - Goto loop - ready: - # now do the same for the last user name - StrCpy $0 $UserList - CreateDirectory "$AppPre\$0\$AppSuff\$AppSubfolder" # create the folder - CopyFiles "$AppFiles" "$AppPre\$0\$AppSuff\$AppSubfolder" - - FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "Update" # only for Update installer - - Function ReplaceLineContent - # replaces "$OldString" with "LyX $NewString" - - ${WordReplace} '$R9' "$OldString" "$NewString" "+" '$R9' # macro from WordFunc.nsh - Push $0 - - FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "Update" - -#-------------------------------- - -!if ${INSTALLER_TYPE} == "Update" # only for Update installer - - Function CheckAppPathPreferences - # replaces a string "$OldString" with "$NewString" in a file "$FileName" - - # get folder names - !insertmacro AppPreSuff $AppPre $AppSuff - - # get list of all users - Push $R0 - Push $R1 - Push $R2 - Push $R3 - Call GetUsers - StrCpy $UserList $R3 "" 1 # cut off the "|" at the end of the list - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - # the usernames in the list of all users is separated by "|" - loopPrefs: - StrCpy $String "$UserList" - StrCpy $Search "|" - Call StrPoint # search for the "|" - StrCmp $Pointer "-1" ready # the loop is finished when no "|" could be found - StrCpy $0 $UserList $Pointer # $0 contains now the username - IntOp $Pointer $Pointer + 1 # jump after the "|" - StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list - # generate the string for the current user - # AppPre and AppSuff are generated in the macro "AppPreSuff" - StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder" - # read the preferences file to test if it exists - FileOpen $R1 "$AppPath\$FileName" r - IfErrors doneA - FileClose $R1 - # search for "$OldString" and replace it with "$NewString" - ${LineFind} "$AppPath\$FileName" "" "1:-1" "ReplaceLineContent" # macro from TextFunc.nsh # calls Function ReplaceLineContent - doneA: - Goto loopPrefs - ready: - # now do the same for the last user name - StrCpy $0 $UserList - StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder" - FileOpen $R1 "$AppPath\$FileName" r - IfErrors doneB - FileClose $R1 - ${LineFind} "$AppPath\$FileName" "" "1:-1" "ReplaceLineContent" - doneB: - - FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "Update" - -#-------------------------------- - -!macro IsUserAdmin Result Name - - ClearErrors - UserInfo::GetName - IfErrors Win9x - Pop $0 - StrCpy ${Name} $0 - UserInfo::GetAccountType - Pop $1 - ${if} $1 == "Admin" - StrCpy ${Result} "yes" - ${else} - StrCpy ${Result} "no" - ${endif} - Goto done - - Win9x: - StrCpy ${Result} "yes" - done: - -!macroend - -#-------------------------------- - -!macro FileCheck Result FileName FilePath - # checks if a file exists, returns "True" or "False" - - Push $0 - Push $1 - StrCpy $0 "" - StrCpy $1 "" - FileOpen $0 "${Filepath}\${FileName}" r - ${if} $0 = "" - StrCpy $1 "False" - ${Else} - StrCpy $1 "True" - ${endif} - FileClose $0 - StrCpy ${Result} $1 - Pop $1 - Pop $0 - -!macroend - -#------------------------------------------ - -!if ${INSTALLER_TYPE} == "NotUpdate" # only for Small and Complete installer - - Function LaTeXCheck - # searches the string "$Search" in the string "$String" and extracts the path around it - # the extracted path is checked if the file "latex.exe" is in it - - StartCheck: - StrLen $3 $String - Call StrPoint - ${if} $Pointer == "-1" # if nothing was found - StrCpy $LatexPath "" - Return - ${endif} - IntOp $3 $3 - $Pointer - StrCpy $4 $String $3 "-$3" # $4 is now the part behind the $Search string - StrCpy $String $String $Pointer # $String is now the part before the $Search string - StrCpy $Search ":" # search for the ":" after the first previous drive letter - Call RevStrPoint - IntOp $Pointer $Pointer - 1 # jump before the ":" to the drive letter - StrCpy $Pointer $Pointer "" 1 # cut of the "-" sign - StrCpy $LatexPath $String $Pointer "-$Pointer" - StrCpy $String $4 - StrCpy $Search ";" # search for the following ";" that separates the different paths - Call StrPoint - ${if} $Pointer != "-1" # if something was found - StrCpy $String $String $Pointer - ${endif} - StrCpy $LatexPath "$LatexPath$String" - # check if the latex.exe exists in the $LatexPath folder - !insertmacro FileCheck $5 "latex.exe" "$LatexPath" - ${if} $5 == "False" # delete the entry with the wrong path to the latex.exe and try again - StrCpy $LatexPath "" - StrLen $3 $String - StrCpy $String $4 "" $3 - ${if} $2 == "TeXLive" - StrCpy $Search "TeXLive" - ${else} - StrCpy $Search "miktex" - ${endif} - Goto StartCheck - ${endif} - - FunctionEnd - -!endif # endif ${INSTALLER_TYPE} == "NotUpdate" - diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh deleted file mode 100644 index 640fa1a1dc..0000000000 --- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh +++ /dev/null @@ -1,300 +0,0 @@ -# This script contains the following functions: -# -# - MissingPrograms, (check if third-party programs are installed), uses: -# EditorCheck -# FileCheck -# -# - MissingProgramsPage, -# (generate the page showing the missing programs that will be installed) -# -# - EditorCheck, -# (test if an editor with syntax-highlighting for LaTeX-files is installed) -# -#-------------------------- - -Function MissingPrograms - # check if third-party programs are installed - - # initialize variable, is later set to True when a program was not found - ${if} $MissedProg != "True" # is already True when LaTeX is missing - StrCpy $MissedProg "False" - ${endif} - - # test if Ghostscript is installed - GSloop: - EnumRegKey $1 HKLM "Software\AFPL Ghostscript" 0 - ${if} $1 == "" - EnumRegKey $1 HKLM "Software\GPL Ghostscript" 0 - ${if} $1 != "" - StrCpy $2 "True" - ${endif} - ${endif} - ${if} $1 != "" - ${if} $2 == "True" - ReadRegStr $3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript $1" "DisplayName" - StrCpy $0 "Software\GPL Ghostscript\$1" - ${else} - ReadRegStr $3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\AFPL Ghostscript $1" "DisplayName" - StrCpy $0 "Software\AFPL Ghostscript\$1" - ${endif} - ${if} $3 == "" # if nothing was found in the uninstall section - ReadRegStr $3 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" # check if Ghostscript was installed together with LyX - ${endif} - ${if} $3 == "" # if nothing was found in the uninstall section - DeleteRegKey HKLM "$0" - goto GSloop - ${else} - ReadRegStr $GhostscriptPath HKLM $0 "GS_DLL" - ${if} $GhostscriptPath != "" - StrCpy $GhostscriptPath "$GhostscriptPath" -12 # remove ending "gsdll32.dll" - ${else} - StrCpy $MissedProg "True" - ${endif} - ${endif} # if $3 - ${else} # if $1 - StrCpy $GhostscriptPath "" - StrCpy $MissedProg "True" - ${endif} - - # test if Imagemagick is installed - ReadRegStr $ImageMagickPath HKLM "Software\ImageMagick\Current" "BinPath" - ${if} $ImageMagickPath == "" - StrCpy $MissedProg "True" - ${endif} - - # test if Aiksaurus is installed - !insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" # macro from LyXUtils.nsh - ${if} $5 == "True" - StrCpy $AiksaurusPath "${AiksaurusDir}" - ${endif} -# ReadRegStr $AiksaurusPath HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "AIK_DATA_DIR" - - # test if Aspell is installed - StrCpy $5 "" - ReadRegStr $5 HKCU "SOFTWARE\Aspell" "Base Path" - ${if} $5 == "" - ReadRegStr $5 HKLM "SOFTWARE\Aspell" "Base Path" - StrCpy $AspellBaseReg "HKLM" # used in the aspell installation section - ${else} - StrCpy $AspellBaseReg "HKCU" - ${endif} - ${if} $5 == "" - StrCpy $MissedProg "True" - ${else} - StrCpy $AspellPath "$5" - ${endif} - - # test if Python is installed - # only use an existing python when it is version 2.5 or newer because some - # older Compaq and Dell PCs were delivered with outdated Python interpreters - # Python 3.x was reported not to work with LyX properly, see - # http://www.lyx.org/trac/ticket/7143 - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" "" - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" "" - ${endif} - ${if} $PythonPath == "" - ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" "" - ${endif} - ${if} $PythonPath != "" - StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end - StrCpy $DelPythonFiles "True" - ${endif} - - # test if Acrobat or Adobe Reader is used as PDF-viewer - ReadRegStr $String HKCR ".pdf" "" - ${if} $String != "AcroExch.Document" # this name is only used by Acrobat and Adobe Reader - StrCpy $Acrobat "None" - ${else} - StrCpy $Acrobat "Yes" - ${endif} - - # test if a PostScript-viewer is installed, only check for GSview32 - StrCpy $PSVPath "" - ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" - - # test if an editor with syntax-highlighting for LaTeX-files is installed - Call EditorCheck - - # test if an image editor is installed (due to LyX's bug 2654 first check for GIMP) - StrCpy $ImageEditorPath "" - ReadRegStr $ImageEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinGimp-2.0_is1" "DisplayIcon" - ${if} $ImageEditorPath != "" - StrCpy $ImageEditorPath "$ImageEditorPath" -13 # delete "\gimp-2.x.exe" - ${endif} - # check for Photoshop - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\Photoshop.exe" "Path" - ${if} $0 != "" - StrCpy $0 "$0" -1 # delete the last "\" - ${if} $ImageEditorPath != "" - StrCpy $ImageEditorPath "$ImageEditorPath;$0" - ${else} - StrCpy $ImageEditorPath $0 - ${endif} - ${endif} - - # test if the BibTeX-editor JabRef is installed - StrCpy $BibTeXEditorPath "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3" "UninstallString" - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.3.1" "UninstallString" - ${endif} - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4" "UninstallString" - ${endif} - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4.1" "UninstallString" - ${endif} - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4.2" "UninstallString" - ${endif} - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.5" "UninstallString" - ${endif} - ${if} $BibTeXEditorPath == "" - ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.6" "UninstallString" - ${endif} - - # test if Inkscape is installed - ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation" - - # test if metafile2eps is installed - ReadRegStr $WMFPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Metafile to EPS Converter" "InstallLocation" - -FunctionEnd - -# --------------------------------------- - -Function MissingProgramsPage - # generate the page showing the missing programs that will be installed - - StrCpy $0 "2" # start value for the dynamical item numbering - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "io_missing_progs.ini" - !insertmacro MUI_HEADER_TEXT "$(MissProgHeader)" "" - - ${if} $MissedProg == "False" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field 6" "Text" "$(MissProgMessage)" - ${else} - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field 1" "Text" "$(MissProgCap)" - ${if} ${INSTALLER_VERSION} == "Complete" - ${if} $LatexPath == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field $0" "Text" "$(MissProgLatex)" - IntOp $0 $0 + 1 - ${endif} - ${endif} - ${if} $GhostscriptPath == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field $0" "Text" "$(MissProgGhostscript)" - IntOp $0 $0 + 1 - ${endif} - ${if} $ImageMagickPath == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field $0" "Text" "$(MissProgImageMagick)" - IntOp $0 $0 + 1 - ${endif} - ${if} $AspellPath == "" - !insertmacro MUI_INSTALLOPTIONS_WRITE "io_missing_progs.ini" "Field $0" "Text" "$(MissProgAspell)" - ${endif} - ${endif} - - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "io_missing_progs.ini" - -FunctionEnd - -# --------------------------------------- - -Function MissingProgramsPage_LeaveFunction - - # this empty function is needed for the installer page - -FunctionEnd - -# --------------------------------------- - -Function EditorCheck - # test if an editor with syntax-highlighting for LaTeX-files is installed - - # (check for jEdit, PSPad, WinShell, ConTEXT, Crimson Editor, Vim, TeXnicCenter, LaTeXEditor, WinEdt, LEd, WinTeX) - StrCpy $EditorPath "" - StrCpy $0 "" - # check for jEdit - ReadRegStr $EditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\jEdit_is1" "InstallLocation" - ${if} $EditorPath != "" - StrCpy $EditorPath $EditorPath -1 # remove "\" from the end of the string - ${endif} - # check for PSPad - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\PSPad editor_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for WinShell - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinShell_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for ConTEXT - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ConTEXTEditor_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for Crimson Editor - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Crimson Editor" "UninstallString" - ${if} $0 != "" - StrCpy $0 $0 -14 # remove "\uninstall.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for Vim 6.x - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Classes\Applications\gvim.exe\shell\edit\command" "" - ${if} $0 != "" - StrCpy $0 $0 -13 # remove "gvim.exe "%1"" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for Vim 7.0 - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0" "UninstallString" - ${if} $0 != "" - StrCpy $0 $0 -18 # remove "\uninstall-gui.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for TeXnicCenter - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\TeXnicCenter_is1" "Inno Setup: App Path" - ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for LaTeXEditor - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LaTeX Editor" "InstallLocation" - ${if} $0 != "" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for WinEdt - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinEdt_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for LEd - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\LEd_is1" "InstallLocation" - ${if} $0 != "" - StrCpy $0 $0 -1 - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - # check for WinTeX - StrCpy $0 "" - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WinTeX XP" "DisplayIcon" - ${if} $0 != "" - StrCpy $0 $0 -11 # remove "\wintex.exe" - StrCpy $EditorPath "$EditorPath;$0" - ${endif} - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/ReadmeComplete1.6.txt b/development/Win32/packaging/AltInstaller/ReadmeComplete1.6.txt deleted file mode 100644 index d885b99797..0000000000 --- a/development/Win32/packaging/AltInstaller/ReadmeComplete1.6.txt +++ /dev/null @@ -1,99 +0,0 @@ -Description - -This is the readme of the variant "complete" of the LyXWinInstaller. Please read -this file carefully to prevent troubles with the installer. -The LyXWinInstaller installs a complete LaTeX-environment together with the -wordprocessor "LyX" (www.lyx.org) and needed programs on -Windows 2000/XP/XPx64/Vista/7. -! Win95, Win98, and WinME are NOT supported. ! - ---- -Prerequisites - -To use the installer you need administrator privileges. - -An open internet connection is recommended as several LaTeX-packages and -spellchecker dictionaris can than be downloaded and installed automatically. - -It is not essential but would be an advantage if you have the PDF-viewer -"Adobe Reader" installed before running the installer. - -If you want to use a LaTeX-distribution from a network drive or a live-CD/DVD -then use the installer version "small". - ---- -Installed Applications - -The variant "complete" of the LyXWinInstaller analyses your system and installs, -if needed, a fully functional version of: - -- MiKTeX, a LaTeX-distribution -- Aspell, a spellchecker -- Ghostscript, an interpreter for Postscript and PDF -- ImageMagick, an image converter -- eLyXer, a LyX to HTML converter -- (optional) GSview, a viewer for Postscript and PDF-documents -- (optional) JabRef, an editor for BibTeX database files - -ImageMagick and Ghostscript won't appear in the list of the installed programs -in Window's system control because they are installed in a special version to -use them with LyX. But if you decide to install another version of the programs -you can do this without problems and without uninstalling LyX. -If you want to install GSview manually later you can do this without a new -installation of Ghostscript. -If Python is installed on the system, elyXer is installed as Python module. - ---- -After the Installation - -To view/edit external files like images LyX uses the default program set in the registry -for a file extension. This installer checks for many programs so that you only need to type -the name of their executables in LyX's preferences to change this. -For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, -set e.g. "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. - ---- -Known Problems - -You can't install LyX to a folder that has accents or umlauts in its name. - -If you use LyX with a computer user account that has accents or umlauts in its name, -change LyX's paths in the menu Edit -> Preferences so that they don't contain accents -and restart LyX. - -The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript -and dv2dt/dt2dv versions. -TeX-Live will only work together with LyX when it is installed without Ghostscript. - ---- -The Uninstaller - -LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, -and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall -Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system -control. - ---- -Internationalization - -The installer language string files can be found in the subfolder -"lyx_languages" of the sourcecode package: -https://developer.berlios.de/project/showfiles.php?group_id=5117 - -If you want to help the project you can translate them or create a new language -string file based on the file "english.nsh". -Please send the modified files as patch to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts of the LyXWinInstaller are released under the GNU General Public -License (GPL). A package with the sourcecode can be found -in the section "LyxWinInstallerSource" of -http://developer.berlios.de/project/showfiles.php?group_id=5117 - -The license files of all used programs can be found in the subdirectory "bin" -of LyX's installation folder. diff --git a/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt b/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt deleted file mode 100644 index dadcea1ad4..0000000000 --- a/development/Win32/packaging/AltInstaller/ReadmePackage1.6.txt +++ /dev/null @@ -1,101 +0,0 @@ -Description - -This is the readme of the complete installer package. -The file LyXPackageComplete-x-x.rar contains the NSIS (Nullsoft Install System) scripts and -all used program files. It is needed if you want to build the LyXWinInstaller by yourself. -You can download the file for every release from: -http://developer.berlios.de/projects/lyxwininstall/ - ---- -General - -To compile the installer scripts you need at least NSIS version 2.45. - -The installer scripts needs the plugins "FindProc" and "InetLoad". -To use them, copy the files "FindProcDLL.dll" and "InetLoad.dll" from the -"LyXPackage" folder to NSIS'"Plugins" directory. - -Only when you have built your own file tree: -- Copy the files "preferencesxxx", "Aspellxxx.txt", and "session" from the - specials folder to the \Resources folder -- Copy the files "Console.dll" and "LyXLauncher.exe" from the specials folder - to the \bin folder where also the "lyx.exe" is. -- Copy all "*.exe" files from the specials\PDFViewWin folder to the \bin - folder where also the "lyx.exe" is. - ---- -Internationalization - -The subfolder "lyx_languages" -contains the language string files. If you want to help the project then -translate them or create a new language string file based on the file -"english.nsh". Please send the modified files as patch of the category -"Language" to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts are released under the GNU General Public License (GPL), -see the license file. -The licenses of all used programs can be found in the folder ~\LyX\bin of this package. - ---- -ImageMagick - -License: ImageMagick license - -The folder ~\LyX\etc\ImageMagick contains all used files from ImageMagick 6.5.5 - ---- -Ghostscript - -License: GPL - -The folder ~\LyX\etc\Ghostscript contains all used files from GPL Ghostscript 8.64 - ---- -Aspell - -License: GPL - -The files of Aspell 0.60-4 are in the folder ~\LyX\external\Aspell -Dictionaries will be downloaded at runtime, the different licenses of the dictionaries -will be displayed before they are installed. - ---- -Python - -License: Python license - -The following files from Python 2.6 are used: - -python.exe and python26.dll are in the folder ~\LyX\bin. - -The subfolders of ~\LyX\bin contain all other used python files. - ---- -MiKTeX - -License: GPL - -The small version of MiKTeX is included together with its installer. MiKTeX will be -installed and uninstalled using its own installer. - ---- -GSview - -License: AFPL - -GSview is included completely. It will be installed and uninstalled using its own -installer. - ---- -JabRef - -License: GPL - -GSview is included completely. It will be installed and uninstalled using its own -installer. diff --git a/development/Win32/packaging/AltInstaller/ReadmeScripts1.6.txt b/development/Win32/packaging/AltInstaller/ReadmeScripts1.6.txt deleted file mode 100644 index 300e7e31ac..0000000000 --- a/development/Win32/packaging/AltInstaller/ReadmeScripts1.6.txt +++ /dev/null @@ -1,42 +0,0 @@ -Description - -This is the readme of the script source code. -The file LyXPackageScripts-x-x.rar contains the NSIS (Nullsoft Install System) scripts and -used plugins. -You can download the file for every release from: -http://developer.berlios.de/projects/lyxwininstall/ - ---- -General - -To compile the installer scripts you need at least NSIS version 2.30. - -The installer scripts needs the plugins "FindProc" and "InetLoad". -To use them copy the files "FindProcDLL.dll" and "InetLoad.dll" from the -"LyXPackage" folder to NSIS'"Plugins" directory. - -Only when you have built your own file tree: -- Copy the files "preferencesxxx", "Aspellxxx.txt", and "session" from the - specials folder to the \Resources folder -- Copy the files "Console.dll" and "LyXLauncher.exe" from the specials folder - to the \bin folder where also the "lyx.exe" is. -- Copy all "*.exe" files from the specials\PDFViewWin folder to the \bin - folder where also the "lyx.exe" is. - ---- -Internationalization - -The subfolder "lyx_languages" -contains the language string files. If you want to help the project then -translate them or create a new language string file based on the file -"english.nsh". Please send the modified files as patch of the category -"Language" to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts are released under the GNU General Public License (GPL), -see the license file. diff --git a/development/Win32/packaging/AltInstaller/ReadmeSmall1.6.txt b/development/Win32/packaging/AltInstaller/ReadmeSmall1.6.txt deleted file mode 100644 index e620d05cc6..0000000000 --- a/development/Win32/packaging/AltInstaller/ReadmeSmall1.6.txt +++ /dev/null @@ -1,101 +0,0 @@ -Description - -This is the readme of the variant "small" of the LyXWinInstaller. Please read -this file carefully to prevent troubles with the installer. -The LyXWinInstaller installs the wordprocessor "LyX" (www.lyx.org) and some -needed programs on Windows 2000/XP/XPx64/Vista/7. -! Win95, Win98, and WinME are NOT supported. ! - ---- -General - -The installer variant "small" has the same functionality as the "complete" version -but doesn't include the LaTeX-distribution MiKTeX. It checks your system for an -installed version of MiKTeX (www.miktex.org) or TeXLive (http://www.tug.org/texlive/). - -The installer provides an option to to choose a LaTeX-distribution from a network -drive or a live-CD/DVD and an option to not use LyX with LaTeX. - ---- -Prerequisites - -To use the installer you need administrator privileges. -An open internet connection is recommended as several LaTeX-packages and -spellchecker dictionaris can than be downloaded and installed automatically. - -It is not essential but would be an advantage if you have the PDF-viewer -"Adobe Reader" installed before running the installer. - ---- -Installed Applications - -The variant "small" of the LyXWinInstaller analyses your system and installs, -if needed, a fully functional version of: - -- Aspell, a spellchecker -- Ghostscript, an interpreter for Postscript and PDF -- ImageMagick, an image converter -- eLyXer, a LyX to HTML converter - -ImageMagick and Ghostscript won't appear in the list of the installed programs -in Window's system control because they are installed in a special version to -use them with LyX. But if you decide to install another version of the programs -you can do this without problems and without uninstalling LyX. -If you want to install GSview manually later you can do this without a new -installation of Ghostscript. -If Python is installed on the system, elyXer is installed as Python module. - ---- -After the Installation - -To view/edit external files like images LyX uses the default program set in the registry -for a file extension. This installer checks for many programs so that you only need to type -the name of their executables in LyX's preferences to change this. -For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, -set e.g. "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. - ---- -Known Problems - -You can't install LyX to a folder that has accents or umlauts in its name. - -If you use LyX with a computer user account that has accents or umlauts in its name, -change LyX's paths in the menu Edit -> Preferences so that they don't contain accents -and restart LyX. - -The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript -and dv2dt/dt2dv versions. -TeX-Live will only work together with LyX when it is installed without Ghostscript. - ---- -The Uninstaller - -LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, -and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall -Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system -control. - ---- -Internationalization - -The installer language string files can be found in the subfolder -"lyx_languages" of the sourcecode package: -https://developer.berlios.de/project/showfiles.php?group_id=5117 - -If you want to help the project you can translate them or create a new language -string file based on the file "english.nsh". -Please send the modified files as patch to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts of the LyXWinInstaller are released under the GNU General Public -License (GPL). A package with the sourcecode can be found -in the section "LyxWinInstallerSource" of -http://developer.berlios.de/project/showfiles.php?group_id=5117 - -The license files of all used programs can be found in the subdirectory "bin" -of LyX's installation folder. diff --git a/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt b/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt deleted file mode 100644 index 686f3f12f2..0000000000 --- a/development/Win32/packaging/AltInstaller/ReadmeUpdate1.6.txt +++ /dev/null @@ -1,34 +0,0 @@ -Description - -This is the readme of the variant "update" of the LyXWinInstaller. Please read -this file carefully to prevent troubles with the installer. -The LyXWinInstaller installs the wordprocessor "LyX" (www.lyx.org) and some -needed programs on Windows 2000/XP/XPx64/Vista/7. -! Win95, Win98, and WinME are NOT supported. ! - ---- -General - -The installer variant "update" is designed to update existing an LyX installation. -It therefore only actualized some registry entries and updates the file that were -modified since the last LyX release. -Custom user settings and third party programs like ImageMagick are not touched. - ---- -Prerequisites - -You must have the last LyX-version installed, otherwise the update installer -quits with a varning about the wrong LyX version. -Note: The last LyX-version should have been installed using also LyXWinInstaller -to assure that the update works as expected. - ---- -License - -The scripts of the LyXWinInstaller are released under the GNU General Public -License (GPL). A package with the sourcecode can be found -in the section "LyxWinInstallerSource" of -http://developer.berlios.de/project/showfiles.php?group_id=5117 - -The license files of all used programs can be found in the subdirectory "bin" -of LyX's installation folder. diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh deleted file mode 100644 index 80a3f7b7e5..0000000000 --- a/development/Win32/packaging/AltInstaller/Settings.nsh +++ /dev/null @@ -1,99 +0,0 @@ -# installer settings -# You should need to change only these macros for new releases. - -!define INSTALLER_SUBVERSION "8" -!define PRODUCT_DIR "D:\LyXPackage2.0" -!define PRODUCT_NAME "LyX" -!define PRODUCT_VERSION "2.0beta2" -!define PRODUCT_VERSION_SHORT "20beta2" -!define PRODUCT_SUBFOLDER "lyx20" -!define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" -!define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX" -!define PRODUCT_EXE "$INSTDIR\bin\lyx.exe" -!define PRODUCT_BAT "$INSTDIR\bin\lyxLauncher.exe" -!define PRODUCT_EXT ".lyx" -!define PRODUCT_REGNAME "LyX.Document" -!define PRODUCT_MIME_TYPE "application/lyx" -!define PRODUCT_UNINSTALL_EXE "$INSTDIR\LyXWinUninstall.exe" -!define PRODUCT_HELP_LINK "http://www.lyx.org/internet/mailing.php" -!define PRODUCT_ABOUT_URL "http://www.lyx.org/about/" -!define PRODUCT_INFO_URL "http://www.lyx.org/" -!define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe" - -BrandingText "LyXWinInstaller v5.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}" - -# to check later if this installer version is running at the same time -!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-5-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER_VERSION}.exe" -!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-5-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER2_VERSION}.exe" -!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-5-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER3_VERSION}.exe" -!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp" - -# Replaced by HKLM or HKCU depending on SetShellVarContext. -!define PRODUCT_ROOT_KEY "SHCTX" - -; registry preparations -!define SHCNE_ASSOCCHANGED 0x08000000 -!define SHCNF_IDLIST 0 -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\lyx.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT}" -!define PRODUCT_DIR_REGKEY_2 "Software\LyX\LyX-${PRODUCT_VERSION}" - -# definitions for the Update installer -!if ${INSTALLER_VERSION} == "Update" - !define PRODUCT_VERSION_SHORT_OLD "166" - !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT_OLD}" - !define PRODUCT_VERSION_OLD "LyX 1.6.6" - !define JabRefVersion "2.5" # could be an older version - !define ImageMagickVersion_Old "6.5.8" # could be an older version - !define GhostscriptVersion_Old "8.64" # could be an older version - !define MiKTeXDeliveredVersion "2.8" # could be an older version -!endif - -# definitions for the Small installer -!if ${INSTALLER_VERSION} == "Small" - !define JabRefVersion "none" # dummy entry to avoid NSIS warnig - !define MiKTeXDeliveredVersion "none" # dummy entry to avoid NSIS warnig -!endif - -# definitions for the Complete installer -!if ${INSTALLER_VERSION} == "Complete" - !define GSviewInstall "external\gsv49w32.exe" - !define JabRefInstall "external\JabRef-2.6-setup.exe" - !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.3972.exe" - !define JabRefVersion "2.6" - !define MiKTeXDeliveredVersion "2.9" -!endif - -!define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex" - -!define ImageMagickVersion "6.6.5" -# for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin! -!define ImageMagickDir "$INSTDIR\etc\ImageMagick" -!define GhostscriptDir "$INSTDIR\etc\Ghostscript" -!define GhostscriptVersion "9.00" -!define Metafile2epsDir "$INSTDIR\etc\Metafile2eps" -!define AiksaurusDir "$APPDATA\Aiksaurus" -!define AiksaurusInstall "external\Aiksaurus" -!define AspellDir "$APPDATA\Aspell" -!define AspellDisplay "Aspell 0.60.4 Data" -!define AspellInstall "external\Aspell" -!define AspellUninstall "Uninstall-AspellData.exe" -!define AspellDictPath "${AspellDir}\Dictionaries" -!define AspellPersonalPath "${AspellDir}\Personal" -!define AspellLocationExact "http://developer.berlios.de/project/showfiles.php?group_id=5117&release_id=12973" -!define AspellLocation "http://developer.berlios.de/projects/lyxwininstall/" -!define DVIPostFileDir "${PRODUCT_SOURCEDIR}\external\dvipost" -# the following variable is needed for a possible CD-version -#!define LaTeXPackagesDir "${PRODUCT_SOURCEDIR}\latex" -!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/" - -#-------------------------------- -# make some of the information above available to NSIS. - -Name "${PRODUCT_NAME}" -OutFile "${INSTALLER_EXE}" -InstallDir "$PROGRAMFILES\${PRODUCT_NAME} ${PRODUCT_VERSION}" - -# set execution level for Windows Vista -RequestExecutionLevel admin - diff --git a/development/Win32/packaging/AltInstaller/TranslatedLanguages.nsh b/development/Win32/packaging/AltInstaller/TranslatedLanguages.nsh deleted file mode 100644 index 6a33bf1465..0000000000 --- a/development/Win32/packaging/AltInstaller/TranslatedLanguages.nsh +++ /dev/null @@ -1,46 +0,0 @@ -# list of all languages the installers are translated to -!insertmacro MUI_LANGUAGE "English" # first language is the default language -!insertmacro MUI_LANGUAGE "Arabic" -!insertmacro MUI_LANGUAGE "Catalan" -!insertmacro MUI_LANGUAGE "Czech" -!insertmacro MUI_LANGUAGE "Danish" -!insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "German" -!insertmacro MUI_LANGUAGE "Galician" -!insertmacro MUI_LANGUAGE "Hungarian" -!insertmacro MUI_LANGUAGE "Indonesian" -!insertmacro MUI_LANGUAGE "Italian" -!insertmacro MUI_LANGUAGE "Japanese" -!insertmacro MUI_LANGUAGE "Norwegian" -!insertmacro MUI_LANGUAGE "Polish" -!insertmacro MUI_LANGUAGE "Portuguese" -!insertmacro MUI_LANGUAGE "Romanian" -!insertmacro MUI_LANGUAGE "Slovak" -!insertmacro MUI_LANGUAGE "Spanish" -!insertmacro MUI_LANGUAGE "Swedish" -!insertmacro MUI_LANGUAGE "Turkish" -!insertmacro MUI_LANGUAGE "Ukrainian" - -!include "lyx_languages\english.nsh" -!include "lyx_languages\arabic.nsh" -!include "lyx_languages\catalan.nsh" -!include "lyx_languages\czech.nsh" -!include "lyx_languages\danish.nsh" -!include "lyx_languages\dutch.nsh" -!include "lyx_languages\french.nsh" -!include "lyx_languages\german.nsh" -!include "lyx_languages\galician.nsh" -!include "lyx_languages\hungarian.nsh" -!include "lyx_languages\indonesian.nsh" -!include "lyx_languages\italian.nsh" -!include "lyx_languages\japanese.nsh" -!include "lyx_languages\norwegian.nsh" -!include "lyx_languages\polish.nsh" -!include "lyx_languages\portuguese.nsh" -!include "lyx_languages\romanian.nsh" -!include "lyx_languages\slovak.nsh" -!include "lyx_languages\spanish.nsh" -!include "lyx_languages\swedish.nsh" -!include "lyx_languages\turkish.nsh" -!include "lyx_languages\ukrainian.nsh" diff --git a/development/Win32/packaging/AltInstaller/Uninstall.nsh b/development/Win32/packaging/AltInstaller/Uninstall.nsh deleted file mode 100644 index 3bccc2b9cf..0000000000 --- a/development/Win32/packaging/AltInstaller/Uninstall.nsh +++ /dev/null @@ -1,262 +0,0 @@ -# Uninstaller - -# this function is called at first after starting the uninstaller -Function un.onInit - - # set the uninstaller language to the Windows locale language - System::Call "kernel32::GetUserDefaultLangID()i.a" - - # Check that LyX is not currently running - FindProcDLL::FindProc "lyx.exe" - ${if} $R0 == "1" - MessageBox MB_OK|MB_ICONSTOP "$(UnInstallRunning)" - Abort - ${endif} - - # set registry root key - StrCpy $Answer "" - !insertmacro IsUserAdmin $Answer $UserName # macro from LyXUtils.nsh - ${if} $Answer == "yes" - SetShellVarContext all - ${else} - SetShellVarContext current - ${endif} - - # Ascertain whether the user has sufficient privileges to uninstall. - # abort when LyX was installed with admin permissions but the user doesn't have administrator privileges - ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "RootKey" - ${if} $0 != "" - ${andif} $Answer != "yes" - MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)" - Abort - ${endif} - # abort when LyX couldn't be found in the registry - ${if} $0 == "" # check in HKCU - ReadRegStr $0 HKCU "${PRODUCT_UNINST_KEY}" "RootKey" - ${if} $0 == "" - MessageBox MB_OK|MB_ICONEXCLAMATION "$(UnNotInRegistryLabel)" - ${endif} - ${endif} - - # printer settings, needed to uninstall the Metafile2eps printer - ${if} ${AtLeastWinVista} - StrCpy $PrinterConf "printui.exe" - ${else} - StrCpy $PrinterConf "rundll32.exe printui.dll,PrintUIEntry" - ${endif} - - # Macro to investigate name of LyX's preferences folders to be able remove them - !insertmacro UnAppPreSuff $AppPre $AppSuff # macro from LyXUtils.nsh - - # test if Aspell was installed together with LyX - ReadRegStr $0 SHCTX "Software\Aspell" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - SectionSetText 2 "Aspell" # names the corersponding uninstaller section (has the index "2" as it is the third section in Uninstall.nsh) - StrCpy $AspellInstallYes "Aspell" - DeleteRegValue SHCTX "Software\Aspell" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${else} - SectionSetText 2 "" # hides the corresponding uninstaller section - ${endif} - - # test if MiKTeX was installed together with LyX - ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - SectionSetText 3 "MiKTeX" # names the corersponding uninstaller section - StrCpy $MiKTeXInstalled "MiKTeX" - DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${else} - SectionSetText 3 "" # hides the corresponding uninstaller section - ${endif} - - # test if JabRef was installed together with LyX - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - SectionSetText 4 "JabRef" # names the corersponding uninstaller section - StrCpy $JabRefInstalled "JabRef" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "OnlyWithLyX" - ${else} - SectionSetText 4 "" # hides the corresponding uninstaller section - ${endif} - - # question message if the user really wants to uninstall LyX - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2 # continue if yes - Abort - -FunctionEnd - -# ---------------------------------- - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(UnRemoveSuccessLabel)" - -FunctionEnd - -# ---------------------------------- -# Uninstall sections - -Section "un.LyX" un.SecUnProgramFiles - - SectionIn RO - - # delete LaTeX class files that were installed together with LyX - FileOpen $R5 "$INSTDIR\Resources\uninstallPaths.dat" r - FileRead $R5 $LatexPath - FileClose $R5 - StrCpy $String $LatexPath - StrCpy $Search "miktex\bin" - StrLen $3 $String - Call un.StrPoint # search the LaTeXPath for the phrase "miktex\bin" (function from LyXUtils.nsh) - ${if} $Pointer != "-1" # if something was found - IntOp $Pointer $Pointer - 1 # jump before the first "\" of "\miktex\bin" - StrCpy $String $String "$Pointer" # $String is now the part before "\miktex\bin" - Delete "$String\tex\latex\cv.cls" - RMDir /r "$String\tex\latex\lyx" - RMDir /r "$String\tex\latex\revtex" - RMDir /r "$String\tex\latex\hollywood" - RMDir /r "$String\tex\latex\broadway" - ExecWait "$LatexPath\initexmf --update-fndb" - ${endif} - - # delete LyX's installation folder - RMDir /r $INSTDIR - # delete start menu folder - ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" - RMDir /r "$0" - # delete desktop icon - Delete "$DESKTOP\LyX ${PRODUCT_VERSION}.lnk" - - # Aiksaurus - !insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" # macro from LyXUtils.nsh - ${if} $5 == "True" - RMDir /r "${AiksaurusDir}" - ${endif} - ReadRegStr $0 SHCTX "Software\Aiksaurus" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - # unregister Aiksaurus - ReadRegStr $1 SHCTX "Software\Aiksaurus" "Data Path" - RMDir /r "$1" - DeleteRegKey SHCTX "SOFTWARE\Aiksaurus" - ${endif} - - # remove file extension .lyx - ReadRegStr $0 SHCTX "${PRODUCT_DIR_REGKEY}" "OnlyWithLyX" # special entry to test if they were registered by this LyX version - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - ReadRegStr $R0 SHCTX "Software\Classes\${PRODUCT_EXT}" "" - ${if} $R0 == "${PRODUCT_REGNAME}" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}13" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}14" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}15" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}" - DeleteRegKey SHCTX "Software\Classes\${PRODUCT_REGNAME}" - ${endif} - ${endif} - - # delete registry entries - DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" - DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}" - DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" - DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY_2}" - DeleteRegKey HKCR "Applications\lyx.exe" - DeleteRegKey HKCR "Applications\lyx.bat" - - # the following can only be done with admin permissions - ${if} $Answer == "yes" # if admin - - # ImageMagick - ReadRegStr $0 SHCTX "Software\ImageMagick" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - # unregister ImageMagick - DeleteRegValue SHCTX "SOFTWARE\Classes\Applications" "AutoRun" - DeleteRegKey SHCTX "SOFTWARE\ImageMagick" - ${endif} - - # Metafile2eps - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Metafile to EPS Converter" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - # Delete printer - ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' - # unregister Metafile2eps - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Metafile to EPS Converter" - DeleteRegKey HKLM "Software\InkNote Selector" - ${endif} - - # Ghostscript and GSview - ReadRegStr $0 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" # special entry to test if it was installed with LyX - ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" - # unregister Ghostscript - DeleteRegKey HKLM "SOFTWARE\GPL Ghostscript" - # test if GSview is installed - StrCpy $5 "" - EnumRegValue $5 HKLM "Software\Ghostgum\GSview" 0 - ${if} $5 != "" - # unregister GSview - MessageBox MB_ICONINFORMATION|MB_OK "$(UnGSview)" - ReadRegStr $3 HKLM "Software\Ghostgum\GSview" "$5" - ReadRegStr $4 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GSview $5" "UninstallString" - ExecWait "$4" - ${endif} - ${endif} - - # MiKTeX specific LyX setting !Can be deleted after LyX 1.5.0beta3! - DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_AUTOINSTALL" - DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_REPOSITORY" - - ${endif} # end if Answer (if admin) - - SetAutoClose true - -SectionEnd - -#--------------------------------- -# user preferences -Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences - - # remove LyX's config files - StrCpy $AppSubfolder ${PRODUCT_SUBFOLDER} - Call un.DelAppPathSub # function from LyXUtils.nsh - -SectionEnd - -#--------------------------------- -# Aspell -Section "un.Aspell" un.SecUnAspell - - ${if} $AspellInstallYes == "Aspell" # only uninstall Aspell when it was installed together with LyX - Call un.UninstAspell # Function from Aspell.nsh - ${endif} - -SectionEnd - -#--------------------------------- -# MiKTeX -Section "un.MiKTeX" un.SecUnMiKTeX - - ${if} $MiKTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX - ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString" - ExecWait $1 # run MiKTeX's uninstaller - ${endif} - -SectionEnd - -#--------------------------------- -# JabRef -Section "un.JabRef" un.SecUnJabRef - - ${if} $JabRefInstalled == "JabRef" # only uninstall JabRef when it was installed together with LyX - ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef ${JabRefVersion}" "UninstallString" - ExecWait "$1" # run JabRef's uninstaller - ${endif} - -SectionEnd - -#--------------------------------- -# Section descriptions -!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnAspell} "$(SecUnAspellDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnMiKTeX} "$(SecUnMiKTeXDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnJabRef} "$(SecUnJabRefDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnPreferences} "$(SecUnPreferencesDescription)" -!insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnProgramFiles} "$(SecUnProgramFilesDescription)" -!insertmacro MUI_UNFUNCTION_DESCRIPTION_END - diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh deleted file mode 100644 index 456b014fb9..0000000000 --- a/development/Win32/packaging/AltInstaller/Updated.nsh +++ /dev/null @@ -1,19 +0,0 @@ -Function UpdateModifiedFiles - - # list with modified files for LyX 1.6.1 - SetOutPath "$INSTDIR\bin" # always here - File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here - File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here - SetOutPath "$INSTDIR\Resources" # always here - File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here - File "${PRODUCT_SOURCEDIR}\Resources\configure.py" - SetOutPath "$INSTDIR\Resources\layouts" - File "${PRODUCT_SOURCEDIR}\Resources\layouts\amsbook.layout" - SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here - File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here - File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx_1_6.py" - SetOutPath "$INSTDIR\Resources\man\man1" - File "${PRODUCT_SOURCEDIR}\Resources\man\man1\lyx.1" - -FunctionEnd - diff --git a/development/Win32/packaging/AltInstaller/Variables.nsh b/development/Win32/packaging/AltInstaller/Variables.nsh deleted file mode 100644 index e31dd0c028..0000000000 --- a/development/Win32/packaging/AltInstaller/Variables.nsh +++ /dev/null @@ -1,32 +0,0 @@ -# Variables used by all installer versions -Var Answer -Var AppPre -Var AppSubfolder -Var AppSuff -Var AspellBaseReg -Var AspellInstallYes -Var AspellMessage -Var CreateDesktopIcon -Var CreateFileAssociations -Var DictCode -Var FileName -Var ImageMagickPath -Var JabRefInstalled -Var LangCode -Var LangCodeSys -Var LangName -Var LangNameSys -Var LatexPath -Var MiKTeXInstalled -Var NewString -Var OldString -Var Pointer -Var PrinterConf -Var ProductRootKey -Var PythonPath -Var RunNumber -Var StartmenuFolder -Var String -Var Search -Var UserList -Var UserName diff --git a/development/Win32/packaging/AltInstaller/icons/Lydia.svg b/development/Win32/packaging/AltInstaller/icons/Lydia.svg deleted file mode 100644 index 270a896f63..0000000000 --- a/development/Win32/packaging/AltInstaller/icons/Lydia.svg +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/development/Win32/packaging/AltInstaller/icons/lyx.ico b/development/Win32/packaging/AltInstaller/icons/lyx.ico deleted file mode 100644 index c6f647e413ed730704c3a395ef8490a5cd7e0d71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcmc&%Yiv_x82-A!1jVQXh7#1_ZoREtdwSM(?Yge_>$dLJO^ll(D6qiB#x}Nf>%D8c z4W|%HxEO*MAovF|@4`&HgNY$TP4thN=nwrP1dVd5&)L~dkKG^s7~Ai3@A)pzd;Q+` z9U%gIi;4(-A0?;P5K>485#qrVG2&t7mp%><%(L`~*d_nz7%_a2)2&~djMXvqdD(V)U)!mEt9*uv z>8?yPRwe3{QI`yK#90w@$)?-%40kMf72$g`Y}6^sktFV^gxFzMB|9IsNkUdJ>^5c= z?W-$i4VZHz=XJs=#u0WhU=af$Y+HQgc0yW~hUxlhN_(nHwrh*KtHoQqEkTEz+qRqt z*(5=m1gAnaanLGG`l=w&01Rl=tS zo-wAIHHgv)1l~e?@=pyJ%S%G%IB*c=JumS$84t=@bYxCn%fXCi?(Z@`gMB6mC%}a z{pL}V5CULz%q%o?j`8s~9=gh%;s{t{%p@ADEr-7l54-gxP@F|z_Y4}#k}Z#Aq9hX} zf2Rd+?O8iwE`^U^H;?Z*axrWFRj03o>=g(Phy?9elS1WPx)K|0*U+63RezCcvXDOF zGqkec2v@Am_df{m#StRErV9>tZiIjR78`jti%;Il?6lQD$Q|0^4z<#yYe8UuSEpK% zM}0`B%j^(PpA2}+EIvZCN4NQUGCzyI!02wAd@;Ian^7n@cROpM3mKDptB&?RsyZN` z<^|NJPuIGKjpYv7MyN|1{`#ud(@l*1VYFe zJo`Ndm_x{FQtTzdo!zM|{yMOl6CPeT^THF1UmWEppL@ifKDJ!=#hFt#i8kv{J`2BP zOT4ja+$Kc;4_TkMoy-dVXF5OOX6`TS)}<8{oW924-*@(U-rP;@l_C0n=En@nBA=Qc zu_}?)ka-Zsr(al`6+TG58he-#-X_^&D64Jl<=-rN-|@yGzVh_>zNOt(qG! zEfzT3ksrbZS^Nk&xvdEJxVc!`nEIGQ6TEY`r^&b5roHb>RwHILbu9-UujT3l$}}Q> z!n5gaB5Rx*=@l_2lXh@l{3fH|%{v_arh`{7kDG4ZIhFUu?X^dLEKPnW?>oA>{Sr}q zxs1iBky1*iVl@XB{>U47#V8876JO*k3# zaqGL(qI~M&GH@nEtfbz5-eh=hVErvF@}uN<_huF!saL7>m==Y@ zX9A$6RHo|V0Fm5kwcY%@fu#v6im!0oDmuP()A`*SpfWs*+{@xjwN}Sna?}en71OO+ z)KdTZGDR>`Q7c~fg zkO6mrUo0?*gxswW=TjG!&@NjHJvi8JrWLx7*R-w2>5Mg~ljzydL7}JeDwv+lA;m9_ zqco=)C>B5NRqSump@-yzXP8>V&3YHCkw;xDtU968g$ArlWoHLEz*xNs1E$CkjNK6P zQYgy62Rn40VW$in(I$luS{8A@Dn`G$x2e9%>K!!6N6jKWNWdyh`RGIgJ?X0o*eU`x z>5#Duy%`3ZQNaRe=;DB%tf$5-V(1lF==9KjOg3p!P3nMEGF&GFk@TrkjVexZ5X?cl zG~}p2S3KKMGuvTEH>;;xG*c~_7+TE*9np6oyDoG@(sWBTq>U{E5Bj>B`642RVEd3wwfBpRj&SGPG diff --git a/development/Win32/packaging/AltInstaller/icons/lyx.svg b/development/Win32/packaging/AltInstaller/icons/lyx.svg deleted file mode 100644 index 9d49776a98..0000000000 --- a/development/Win32/packaging/AltInstaller/icons/lyx.svg +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LyX - Created by Andrew Fitzsimontrace of the LyX Logo - diff --git a/development/Win32/packaging/AltInstaller/icons/lyx_32x32.ico b/development/Win32/packaging/AltInstaller/icons/lyx_32x32.ico deleted file mode 100644 index dc4132f4a65d95cee214b5da58e394f5ad08c2fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10534 zcmeI24_wXn{>R_tPyddb5<*iHl_jbCPeMq)MwH1GGReW=9vtM~oHz(kh-I=HntRZ$ zHX&ph+1hqy&9ZB|MVGD{W7@;^;LhfKU+?NPwcN$M_W1pNk9{7!obTt)_x*l<-k;C+ zd%n-FLu5ux$;Cxk^;uy~G@J-^Lfw)KmPFo7Om#;xD2TqWG1Xnjpd@{E*CK2d#hxv5uTs*Ssa?Tl|AFESOWE zWN0nSuY%4(_kQWB?moxGfugJ4?$z@$tNxIGaW(}61W-^=5XHyGQ)Xr+#m2^xhldA6 zM@N%Rrz0O9AJS^I51=j4;Y zV4%eOLNb<>QB-C&`K#2FeW`?$LHY1gNMV{H(xsJ9%(7xCFeFkr;)%g|3MVIO+O#Pt zUEC2$#gZyoML{82@(4;IrN4pP!t%+|EuI{7A>^`kIVmd2PEt|QvPiO2 z2jE7B9HnchZ>owsU?)WfKNypnq9#M47UMOPm!>5H+7$W_a!iXNue2EQM_rqfO3?;A zg{0^yGEqb7q!`jBMv)$$Y3R>Fyt;TjDMM1pF-lJX@fz~cMd92SipQ7;pCPPLjhSDip_e$wiw@F47-tfQ@t_OGk3(n@C>Ebg-XJ zPU!Q}=TqOL0&+s!3a>V)-j(~{B$*H~-@g(T&YQ)DJJbqt{ZeGc`F&n7p_(nkq3?k59w~zm^_a96O*IPL?hz*o(qvEUs!x8Zu-EEm^XJx^?SDlO|1~l`B`0 zudgpHT)2>oH@~4jm*4#PCh&j!sO;|7m_gC(?;D;+QP%A%SLk%sovhOh3@EF-daeBL z=dNG5@{fueH^oq$^0(8UUHH8C;yJqXdV z2I*I?S(~_S{f4BCo03!7ZQinV-?r_qJ$vHv88c@^2dHP)8xi5xYFyX;()3={%{{ch+0|N&I)g9pO;c4C7 z*2~qqhfj;Do}Rvs4zQ+B!o9(l}s{Gi{s=a)|oH7!s5oYDl( zDNUa8ImNMR_BuSf|6YF2z;BTOiwl-Cx}8G-8|Ob9iWYvSQP9zKv&mtC1U@Q@`o5Alr5Mal7FL z*oT!i{Wo~Oy3+m+yPRJ=(S2=x-;L*-qYhP1t?@o=JQlYIPHHiBhjPwacG_ch(~h<5 zy~oB)-P658r=cqEOx2)+3%YJgwqJh2e&%sJXtf@@{|StHF30m>i~g%@$M0?#m1V#9 zbj!hi@)^8(_o|ntu8wGz5Mq}+N|_enxi{8t&wRJl8|*{3+6Llz@Cizb0KLolNIcPY zU#YR1v$$={tdNzX+pZkhS|6s+4YSb=vrQh=GHopW+;&e1%$h&$s9yE%mPG}-^o4KY zIW{z7!LK^=Pnn@Tx^42o)g!m8j$A)?c5;k%-GsH9ro6so#-Z0Vs}`?r6_V;0wWk04 z#RHdUd=n=0-a2*M;Z^F>+m^q-d-!(suiD1|&_Tb~RGurQZ%&w&vtdfkhF6Ykj6Iq> zJ$LiW<6G5+4ca4H=bqZ3eRt=ggPUixSTnNy&Iw*=QyOErc1&wsXzLZjgI2vzWgjkn z{;Tp8cPwSb;Z3TI%g0;)VUW4!OSLC9{^0P2xRcxGp4_ha^w=M-{_U^Dr6pHBe?NcM z(l=Jb&YY|o8oH=k&_-o%gIUj$tp>m6_QDzKuJMgGj*&SV7KXboRpt?SjJ`Pr$?+_?gO5@81``3d$ryR+*b?ON8 zw0G^Y^L+7N&K&ymbK~2_Pu}~aXwcMiX1*ue2A_fbvGXrX*Z-ye#D*SYALFuMZ^E@} zrIU`G4GauCaNt0bCQUY+{m6LrTGX4_&%gL`FV&pGUtX?0RT*@~d;Eu^=6NPf4?a`wL+OJ-|c>MaUJzrftUvcwx#Wmem*S*F^&zm=|bLY;ZH*Np^`^P-^H)yeL zBVK8Y88ZfL7f$ZIa{k?G#RcV;KFYm*YkJ|u0rQs*Pu#p8?=Aj=(yLdmi4!MIn^xxw z1@BOdU*9=Y{`Chpzxicyp2(Y@pC9NhAt6Dy?im!|RY6C{1?pU*PWW_&o`c#!tsr~I6pze7;*fbYv__^pOYR=^D>lTZ z`0E07gL*)IP%o%A)TicH+I%1{$Q_c{B-XZfQ&9I}=&*GG%QW%4aKmfW_1WKLZn zZ%F(FK!c&-PzV%SqmlR=1`UDahAA=igghZv$O)1-Brg(&tc%RqR3tYNo8;T%+XcsR zzAt!dK7eZ0b1 zc4XD6Jy>oRVD2Z-90TVVJjVb!2GNQC`{tJIR{-knfa(}n$KW~!*fGeCfp(Iki?Ai% z%Cc6YAlWmrf1ZbAU&@}Ay&&r?b8ilbf2CCy&1kS51NIoS$G|-X?=gUnL3|A4I{@Ze z3Fs>X^)axI!F>$yV~`&M{TS@`J#2}8S%(*(AV~IPcS!c5tbxhD>_yWW*xGn5Uj!Cp zz#xML892z`K?V>qh_Dz)cmqtxfIaZjfAyvi5SFOU@<#rXn#|S$B`~0!-ckO)_wj z!IKQ2{1HUSKuQKvGN6({l?<$8a3upQ8Dz;o%ZFgg0>I@vpvybJO9o%w17I$OZMh$b zZ`u2%xy#;rw8(wILa7-t5VZLXaFfBCHvyas7KC15a3BLZ8Pv(ZP6l@}z>`6q4D@8M z=MBK;pFy9Mz|Z|{Bm5-ya^1^)+~iyCH{x67T)&v3p;`M`flk2DP2ka+0MZ)&5<^{8 z#}mgOQwEwc*z_9UbTjC57TFJ%`=Z=?#INjkQ_f}2i*H%`hKjUHE}DT?bpTcdu`-aA z!K@5uWl$>vTN&KS09OXNGSHR5uJ-`14?wRBe7ysHeFb*p-Xp$Eer1l0DQ4i=2mmdE zXcz%7Gr8TiTI+Xn#Lb#NwoU)KGJ%Aw>KC4l!K zh?jx94CZA(FN1m+*vsHv2KX|_mw~=Nfqh>G{C)`f{Ym_Te;EMGAmDe%qNBthd$6(d zuZk5wd;~ri;wT{XPhe^WR5PfWfz=GIW`H$= ztQly{U~2|kFaNh@{SM3Z*Qny`>^u^{%^>cbM>kLJ2If8u=)MQ)W?=V2a5n?I8RX4C zZw7lmgnz$A8E?cO%zqSsoI&IaB;O>b95^tp$zffbHGbz{4lZ8^Fn<6tXQ25H$o-5) zm~HeBS65dr06T-&8OY9H_C57azJ2?)E#~Zd^XAPbzP{?)YM^cgpf3l}GmxIa+zhDy zughA6yhIazu`*HW}-yo9TUHpH_0PCFb z+b%OM!*92A)z1m?Tq587kKJSW=q!UOq5By75a%&ISqD**RnP;78NU}}i)3aT*8cXZ I-iwic0nqT==l}o! diff --git a/development/Win32/packaging/AltInstaller/icons/lyx_doc.svg b/development/Win32/packaging/AltInstaller/icons/lyx_doc.svg deleted file mode 100644 index 8742d2338c..0000000000 --- a/development/Win32/packaging/AltInstaller/icons/lyx_doc.svg +++ /dev/null @@ -1,761 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LyX - Created by Andrew Fitzsimontrace of the LyX Logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Etiquette Icons - - - - hash - icons - computer - - - - - - Andy Fitzsimon - - - - - Andy Fitzsimon - - - - - Andy Fitzsimon - - - - image/svg+xml - - - - - en - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/development/Win32/packaging/AltInstaller/icons/lyx_logo_hi.bmp b/development/Win32/packaging/AltInstaller/icons/lyx_logo_hi.bmp deleted file mode 100644 index 3ec6d8a581f6eeebe7eef3b379e99a943c8bff2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9744 zcmd^_2~bp57KVTNHT259D?5!%vx981H;XjTfb1ZM0-}g0iVA{?8YMwR(6}$CxRk~i zH8D8i#4Rz2F%~99W5y&EO&pDyZALSxnsH>#Z5n0FR3(*k6RYM_b-&Ad_r3Go|D1Q< zxvz;&HyZ(sh4KMUYOSZwDEb&csM&wb6|j)>e>6MjtFNyQIrHd*kr$9s!-v7CKFy)N zg+M|%hoDp*qQ`Pbuj3;;o5PrTJ|dPyz^v8`$~Glj8r>kM79uq*1qRNIu%B&*YtzYR zU=KLoz3|DujC=L;_mO|0wE1%wi8y#C7^0z}0Y5DO_T}?%rkn@Il#6Iq8o=DQ2^n?Q zplDWL`m`EEM9>IkZa~b$PY@p;kB1K*!ZU&gsZT4WuegDxwO_*e^h0>O`v~HIjc|5% z#geTzu};lH@cWODot=%KpdfT+@z7n&Ls>-yii?Y28r=$E)CRbXnIz^!N9ErqKFG{pJj!P zJ-1=F{RS>y?u8_B9~`|nI7}9zO~v8HPM~dB3(BrOf!+PaOxUW44Rl5pxkp>8<79hHC59}80ha%@?C|Y)5%RC^)@zZn&cr%_wS!|tPt;T)X- z`J{Rnm?vP$3J;v_T8!LA6Bq{z@x^RwlrLS0x7JjkJV}mOZ(PB~IVH%g?t*KT42>`K zVCjXMkY}z*p+@p;l}k1F|k_*y6JLD5fn+3j=qi+y>@o_1(ZJXcgmcNI^Z4lQn zBL?Q{+rbiS1}VCS`r7b#yx2Lqd6Y|p4K}uZe)WG|ad0AO z!fCp(=&syMT=uRJ=VmajN|`N>_ZQ(r!s6*(E=nwlAfvJzlV46)!~IDD+mU{DMtVaIVMjfKw9* z%WpfS(9(6wF2%gcLMbNts|@RvMwiei4Hlno!$QbDF*@fWwMeXBqO!EiGwYnlTiO&xT3tR0U;sMPhL0CpLbhj>LaS0^NttPaU(=Mp7Cb~8F(r5TI$9d@2^@waHeY)DYu8oSFX zY;0{cP6ETi<`UNIxPmD%nTd&sx@F0cLx)Nda&lIXUhj-$Ty*nJW1Tz18o?_21zZ1k zmeUa)rL%IRt!;Ad+1#YLM~)o7G<$Y@LBZ6b$tG3=X0D$9;qfJ>=LVF~*zu{siJ;4+**NK}@7vh;M~T7E13l*_q7GiHp7 zz|7yEMQ#H<#;?}A($A$ml|38xFfPpm#?$eHPu0OV%W>+-YW3Z3+CFT#p)MT3>@gXE znNy}YvIn{7>al_0&{j+(P6J`ZB9>8!~LdtDa8$Y(uWM(~u=UWSVvMG|9P@0=q znTy-#v|LqB zaZQSuq~q`n9-&xZVrpv2*vuYYXGmIeUKS7#GJJU1HkTshYE>&S>urTTW$#fw8r#YQbQF=kw&vkA+dObd4Xy1livt4mRl z^6wKD{^{cFCq<&Zr5d>YfMinQh>VO(v9~v}x2L9yOGJ_T3sZM|v47(ZhaG>!s*&m) zGt&{)kuF8XHCt_%>35DP-8^K^;d}lb}CBl_@08)LGk# zzdV|f5*e|0@vK?1GVc*n-KW(ywzT!7ieLXMgFUc%)ZW^~{e{fkPEN&}K3H{h-@e8F zcBuQ*R`Z<6a&xomB`}9L{jGim<2-J&g4EizXlkbX{q*$o)a36n*0P6;*0QF%+1Yt{ zX~;y0dR#9)<{4GV#8tJ~fI90(kF*IDhq*(4GZ`(dS zD=SMAM3Re&?2wV{plCp5{cq|0(S}I(;zh~n%(0>2l=)6keF{Z-YEn?=t=@7LMSuT* zoSfQ&5@CUZ!;p~?m(ZnX(Wc~7!(dP1nzz@f?>WVzDQQ3QgYqz~{xvTq7jbp9CyHr( zq<^LQJ+LK@(q++$Ny(nYFNUWXPTEU%z!Z&g&)uijy<}V4%R*|qx;ndbT{ia<{O@ng zQp|nds=#6E!#8<5q}^OT=PX>YtLy#>J=Ql*TxnX2YrN29?Hzv5`lw)s zuaAH2l&(!RhoDu1J2zb`t1TP6L$7VdWikFi#M_4ggGye1Jt5;oO0`i=@_B}a!C`~+ z(n6fkE6kvav%I%R8^7mVUh|2Po!vg4=jA0OoovptFr4>hcYl5j>OFMLey-qf$W2GwZJy%g}UrX(nZtTz^rtvHH#97_!RhHxugV#Qy+^Ect=} diff --git a/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert20alpha2.bmp b/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert20alpha2.bmp deleted file mode 100644 index 894cf676cff4b4f9eeb7dbbd00da0807f64bc77c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103048 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 3166 Codes (Countries) - -

ISO 3166 Codes (Countries)

- -Updated by the RIPE Network Coordination Centre, in coordination with -the ISO 3166 Maintenance Agency, Berlin -

-See also: - -

    -
  • ISO 3166 -Maintenance agency (ISO 3166/MA) -
  • Country codes in ISO 3166 - -

    - -

    Country                                         A 2     A 3     Number
-----------------------------------------------------------------------
-AFGHANISTAN                                     AF      AFG     004
-ALBANIA                                         AL      ALB     008
-ALGERIA                                         DZ      DZA     012
-AMERICAN SAMOA                                  AS      ASM     016
-ANDORRA                                         AD      AND     020
-ANGOLA                                          AO      AGO     024
-ANGUILLA                                        AI      AIA     660
-ANTARCTICA                                      AQ      ATA     010
-ANTIGUA AND BARBUDA                             AG      ATG     028
-ARGENTINA                                       AR      ARG     032
-ARMENIA                                         AM      ARM     051  
-ARUBA                                           AW      ABW     533
-AUSTRALIA                                       AU      AUS     036
-AUSTRIA                                         AT      AUT     040
-AZERBAIJAN                                      AZ      AZE     031  
-BAHAMAS                                         BS      BHS     044
-BAHRAIN                                         BH      BHR     048
-BANGLADESH                                      BD      BGD     050
-BARBADOS                                        BB      BRB     052
-BELARUS                                         BY      BLR     112  
-BELGIUM                                         BE      BEL     056
-BELIZE                                          BZ      BLZ     084
-BENIN                                           BJ      BEN     204
-BERMUDA                                         BM      BMU     060
-BHUTAN                                          BT      BTN     064
-BOLIVIA                                         BO      BOL     068
-BOSNIA AND HERZEGOWINA                          BA      BIH     070
-BOTSWANA                                        BW      BWA     072
-BOUVET ISLAND                                   BV      BVT     074
-BRAZIL                                          BR      BRA     076
-BRITISH INDIAN OCEAN TERRITORY                  IO      IOT     086
-BRUNEI DARUSSALAM                               BN      BRN     096
-BULGARIA                                        BG      BGR     100
-BURKINA FASO                                    BF      BFA     854
-BURUNDI                                         BI      BDI     108
-CAMBODIA                                        KH      KHM     116
-CAMEROON                                        CM      CMR     120
-CANADA                                          CA      CAN     124
-CAPE VERDE                                      CV      CPV     132
-CAYMAN ISLANDS                                  KY      CYM     136
-CENTRAL AFRICAN REPUBLIC                        CF      CAF     140
-CHAD                                            TD      TCD     148
-CHILE                                           CL      CHL     152
-CHINA                                           CN      CHN     156
-CHRISTMAS ISLAND                                CX      CXR     162
-COCOS (KEELING) ISLANDS                         CC      CCK     166
-COLOMBIA                                        CO      COL     170
-COMOROS                                         KM      COM     174
-CONGO, Democratic Republic of (was Zaire)       CD      COD     180
-CONGO, People's Republic of                     CG      COG     178
-COOK ISLANDS                                    CK      COK     184
-COSTA RICA                                      CR      CRI     188
-COTE D'IVOIRE                                   CI      CIV     384
-CROATIA (local name: Hrvatska)                  HR      HRV     191      
-CUBA                                            CU      CUB     192
-CYPRUS                                          CY      CYP     196
-CZECH REPUBLIC                                  CZ      CZE     203  
-DENMARK                                         DK      DNK     208
-DJIBOUTI                                        DJ      DJI     262
-DOMINICA                                        DM      DMA     212
-DOMINICAN REPUBLIC                              DO      DOM     214
-EAST TIMOR                                      TL      TLS     626
-ECUADOR                                         EC      ECU     218
-EGYPT                                           EG      EGY     818
-EL SALVADOR                                     SV      SLV     222
-EQUATORIAL GUINEA                               GQ      GNQ     226
-ERITREA                                         ER      ERI     232
-ESTONIA                                         EE      EST     233  
-ETHIOPIA                                        ET      ETH     231
-FALKLAND ISLANDS (MALVINAS)                     FK      FLK     238
-FAROE ISLANDS                                   FO      FRO     234
-FIJI                                            FJ      FJI     242
-FINLAND                                         FI      FIN     246
-FRANCE                                          FR      FRA     250
-FRANCE, METROPOLITAN                            FX      FXX     249  
-FRENCH GUIANA                                   GF      GUF     254
-FRENCH POLYNESIA                                PF      PYF     258
-FRENCH SOUTHERN TERRITORIES                     TF      ATF     260
-GABON                                           GA      GAB     266
-GAMBIA                                          GM      GMB     270
-GEORGIA                                         GE      GEO     268  
-GERMANY                                         DE      DEU     276
-GHANA                                           GH      GHA     288
-GIBRALTAR                                       GI      GIB     292
-GREECE                                          GR      GRC     300
-GREENLAND                                       GL      GRL     304
-GRENADA                                         GD      GRD     308
-GUADELOUPE                                      GP      GLP     312
-GUAM                                            GU      GUM     316
-GUATEMALA                                       GT      GTM     320
-GUINEA                                          GN      GIN     324
-GUINEA-BISSAU                                   GW      GNB     624
-GUYANA                                          GY      GUY     328
-HAITI                                           HT      HTI     332
-HEARD AND MC DONALD ISLANDS                     HM      HMD     334
-HONDURAS                                        HN      HND     340
-HONG KONG                                       HK      HKG     344
-HUNGARY                                         HU      HUN     348
-ICELAND                                         IS      ISL     352
-INDIA                                           IN      IND     356
-INDONESIA                                       ID      IDN     360
-IRAN (ISLAMIC REPUBLIC OF)                      IR      IRN     364
-IRAQ                                            IQ      IRQ     368
-IRELAND                                         IE      IRL     372
-ISRAEL                                          IL      ISR     376
-ITALY                                           IT      ITA     380
-JAMAICA                                         JM      JAM     388
-JAPAN                                           JP      JPN     392
-JORDAN                                          JO      JOR     400
-KAZAKHSTAN                                      KZ      KAZ     398  
-KENYA                                           KE      KEN     404
-KIRIBATI                                        KI      KIR     296
-KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF          KP      PRK     408
-KOREA, REPUBLIC OF                              KR      KOR     410
-KUWAIT                                          KW      KWT     414
-KYRGYZSTAN                                      KG      KGZ     417  
-LAO PEOPLE'S DEMOCRATIC REPUBLIC                LA      LAO     418
-LATVIA                                          LV      LVA     428  
-LEBANON                                         LB      LBN     422
-LESOTHO                                         LS      LSO     426
-LIBERIA                                         LR      LBR     430
-LIBYAN ARAB JAMAHIRIYA                          LY      LBY     434
-LIECHTENSTEIN                                   LI      LIE     438
-LITHUANIA                                       LT      LTU     440  
-LUXEMBOURG                                      LU      LUX     442
-MACAU                                           MO      MAC     446
-MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF      MK      MKD     807 
-MADAGASCAR                                      MG      MDG     450
-MALAWI                                          MW      MWI     454
-MALAYSIA                                        MY      MYS     458
-MALDIVES                                        MV      MDV     462
-MALI                                            ML      MLI     466
-MALTA                                           MT      MLT     470
-MARSHALL ISLANDS                                MH      MHL     584
-MARTINIQUE                                      MQ      MTQ     474
-MAURITANIA                                      MR      MRT     478
-MAURITIUS                                       MU      MUS     480
-MAYOTTE                                         YT      MYT     175  
-MEXICO                                          MX      MEX     484
-MICRONESIA, FEDERATED STATES OF                 FM      FSM     583
-MOLDOVA, REPUBLIC OF                            MD      MDA     498  
-MONACO                                          MC      MCO     492
-MONGOLIA                                        MN      MNG     496
-MONTSERRAT                                      MS      MSR     500
-MOROCCO                                         MA      MAR     504
-MOZAMBIQUE                                      MZ      MOZ     508
-MYANMAR                                         MM      MMR     104
-NAMIBIA                                         NA      NAM     516
-NAURU                                           NR      NRU     520
-NEPAL                                           NP      NPL     524
-NETHERLANDS                                     NL      NLD     528
-NETHERLANDS ANTILLES                            AN      ANT     530
-NEW CALEDONIA                                   NC      NCL     540
-NEW ZEALAND                                     NZ      NZL     554
-NICARAGUA                                       NI      NIC     558
-NIGER                                           NE      NER     562
-NIGERIA                                         NG      NGA     566
-NIUE                                            NU      NIU     570
-NORFOLK ISLAND                                  NF      NFK     574
-NORTHERN MARIANA ISLANDS                        MP      MNP     580
-NORWAY                                          NO      NOR     578
-OMAN                                            OM      OMN     512
-PAKISTAN                                        PK      PAK     586
-PALAU                                           PW      PLW     585
-PALESTINIAN TERRITORY, Occupied                 PS      PSE     275
-PANAMA                                          PA      PAN     591
-PAPUA NEW GUINEA                                PG      PNG     598
-PARAGUAY                                        PY      PRY     600
-PERU                                            PE      PER     604
-PHILIPPINES                                     PH      PHL     608
-PITCAIRN                                        PN      PCN     612
-POLAND                                          PL      POL     616
-PORTUGAL                                        PT      PRT     620
-PUERTO RICO                                     PR      PRI     630
-QATAR                                           QA      QAT     634
-REUNION                                         RE      REU     638
-ROMANIA                                         RO      ROU     642
-RUSSIAN FEDERATION                              RU      RUS     643
-RWANDA                                          RW      RWA     646
-SAINT KITTS AND NEVIS                           KN      KNA     659
-SAINT LUCIA                                     LC      LCA     662
-SAINT VINCENT AND THE GRENADINES                VC      VCT     670
-SAMOA                                           WS      WSM     882
-SAN MARINO                                      SM      SMR     674
-SAO TOME AND PRINCIPE                           ST      STP     678
-SAUDI ARABIA                                    SA      SAU     682
-SENEGAL                                         SN      SEN     686
-SEYCHELLES                                      SC      SYC     690
-SIERRA LEONE                                    SL      SLE     694
-SINGAPORE                                       SG      SGP     702
-SLOVAKIA (Slovak Republic)                      SK      SVK     703  
-SLOVENIA                                        SI      SVN     705  
-SOLOMON ISLANDS                                 SB      SLB     090
-SOMALIA                                         SO      SOM     706
-SOUTH AFRICA                                    ZA      ZAF     710
-SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS    GS      SGS     239
-SPAIN                                           ES      ESP     724
-SRI LANKA                                       LK      LKA     144
-ST. HELENA                                      SH      SHN     654
-ST. PIERRE AND MIQUELON                         PM      SPM     666
-SUDAN                                           SD      SDN     736
-SURINAME                                        SR      SUR     740
-SVALBARD AND JAN MAYEN ISLANDS                  SJ      SJM     744
-SWAZILAND                                       SZ      SWZ     748
-SWEDEN                                          SE      SWE     752
-SWITZERLAND                                     CH      CHE     756
-SYRIAN ARAB REPUBLIC                            SY      SYR     760
-TAIWAN                                          TW      TWN     158
-TAJIKISTAN                                      TJ      TJK     762  
-TANZANIA, UNITED REPUBLIC OF                    TZ      TZA     834
-THAILAND                                        TH      THA     764
-TOGO                                            TG      TGO     768
-TOKELAU                                         TK      TKL     772
-TONGA                                           TO      TON     776
-TRINIDAD AND TOBAGO                             TT      TTO     780
-TUNISIA                                         TN      TUN     788
-TURKEY                                          TR      TUR     792
-TURKMENISTAN                                    TM      TKM     795  
-TURKS AND CAICOS ISLANDS                        TC      TCA     796
-TUVALU                                          TV      TUV     798
-UGANDA                                          UG      UGA     800
-UKRAINE                                         UA      UKR     804
-UNITED ARAB EMIRATES                            AE      ARE     784
-UNITED KINGDOM                                  GB      GBR     826
-UNITED STATES                                   US      USA     840
-UNITED STATES MINOR OUTLYING ISLANDS            UM      UMI     581
-URUGUAY                                         UY      URY     858
-UZBEKISTAN                                      UZ      UZB     860  
-VANUATU                                         VU      VUT     548
-VATICAN CITY STATE (HOLY SEE)                   VA      VAT     336
-VENEZUELA                                       VE      VEN     862
-VIET NAM                                        VN      VNM     704
-VIRGIN ISLANDS (BRITISH)                        VG      VGB     092
-VIRGIN ISLANDS (U.S.)                           VI      VIR     850
-WALLIS AND FUTUNA ISLANDS                       WF      WLF     876
-WESTERN SAHARA                                  EH      ESH     732
-YEMEN                                           YE      YEM     887
-YUGOSLAVIA                                      YU      YUG     891
-ZAMBIA                                          ZM      ZMB     894
-ZIMBABWE                                        ZW      ZWE     716
-
    -
\ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/informations/InstallerStructure.odg b/development/Win32/packaging/AltInstaller/informations/InstallerStructure.odg deleted file mode 100644 index 89ecb8de414bc20c269c202ccf7e28034ec148db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16706 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ξ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
cI6dt(a{+ZV$W&VO6Mt(7j#M}j?gL6 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 and Language Settings
Microsoft Office SharePoint Portal Server 2003
HomeBackForwardPrint

Regional and Language Settings

- - - - - - -

This topic lists the regional and language settings you can specify -from the command line by using operations in Stsadm.exe and by using -HTML Administration pages. For more information about specifying -regional and language settings, see Language Considerations. For more information about the syntax for command-line operations, see Command-Line Operations. -

The following types of regional and language settings are used in Microsoft Windows SharePoint Services:

- - -

Language IDs

The -Language ID determines the language used for text on pages in the Web -site (such as the text on the Site Settings page). The languages -available for site creation depend on the language template packs you -have installed to your server or server farm. Web sites based on -Windows SharePoint Services can be created in the following languages.

IDLanguage -IDLanguage -
1025Arabic -1041 -Japanese -
1028 -Chinese - Traditional -1042 -Korean
1029 -Czech1043Dutch -
1030 -Danish -1044 -Norwegian -
1031 -German -1045 -Polish -
1032 -Greek -1046 -Portuguese - Brazilian -
1033 -English -1049 -Russian -
1034 -Spanish -1053 -Swedish -
1035 -Finnish -1054 -Thai -
1036 -French -1055 -Turkish -
1037 -Hebrew -2052 -Chinese - Simplified -
1038 -Hungarian -2070 -Portuguese -
1040 -Italian -3076Chinese - Hong Kong

Windows SharePoint Services also supports input and display of text in the following languages, but not site creation.

IDLanguage -IDLanguage -
1026Bulgarian1048Romanian
1050Croatian -2074Serbian
1061Estonian -1051Slovak
1081Hindi with Indic PT1060Slovenian
1062Latvian1058Ukrainian
1063Lithuanian

Locale IDs

The -Locale ID controls the numbering, sorting, calendar, and time -formatting for the Web site. You can change the locale for a Web site -by using the Regional Settings page. Web sites based on Windows -SharePoint Services can be set to the following Locale IDs.

IDLocaleIDLocale
1078Afrikaans -1037 -Hebrew -
1052 -Albanian -1081 -Hindi -
5121 -Arabic (Algeria) -1038 -Hungarian -
15361 -Arabic (Bahrain) -1039 -Icelandic -
3073 -Arabic (Egypt) -1057 -Indonesian -
2049 -Arabic (Iraq) -1040 -Italian (Italy) -
11265 -Arabic (Jordan) -2064 -Italian (Switzerland) -
13313 -Arabic (Kuwait) -1041 -Japanese -
12289 -Arabic (Lebanon) -1099 -Kannada -
4097 -Arabic (Libya) -1087 -Kazakh -
6145 -Arabic (Morocco) -1111 -Konkani -
8193 -Arabic (Oman) -1042 -Korean -
16385 -Arabic (Qatar) -1088 -Kyrgyz (Cyrillic) -
1025 -Arabic (Saudi Arabia) -1062Latvian -
10241 -Arabic (Syria) -1063 -Lithuanian -
7169 -Arabic (Tunisia) -1071 -Macedonian (FYROM) -
14337 -Arabic (U.A.E.) -2110 -Malay (Brunei Darussalam) -
9217 -Arabic (Yemen) -1086 -Malay (Malaysia) -
1067 -Armenian -1102 -Marathi -
2092 -Azeri (Cyrillic) -1104 -Mongolian (Cyrillic) -
1068 -Azeri (Latin) -1044 -Norwegian (Bokmal) -
1069 -Basque -2068 -Norwegian (Nynorsk) -
1059 -Belarusian -1045 -Polish -
1026 -Bulgarian -1046 -Portuguese (Brazil) -
1027 -Catalan -2070 -Portuguese (Portugal) -
3076 -Chinese (Hong Kong) -1094 -Punjabi -
5124 -Chinese (Macau) -1048 -Romanian -
2052 -Chinese (PRC) -1049 -Russian -
4100 -Chinese (Singapore) -1103 -Sanskrit -
1028 -Chinese (Taiwan) -3098 -Serbian (Cyrillic) -
1050 -Croatian -2074 -Serbian (Latin) -
1029 -Czech -1051 -Slovak -
1030 -Danish -1060 -Slovenian -
1125 -Divehi -11274 -Spanish (Argentina) -
2067 -Dutch (Belgium) -16394 -Spanish (Bolivia) -
1043 -Dutch (Netherlands) -13322 -Spanish (Chile) -
3081 -English (Australia) -9226 -Spanish (Colombia) -
10249 -English (Belize) -5130 -Spanish (Costa Rica) -
4105 -English (Canada) -7178 -Spanish (Dominican Republic) -
9225 -English (Caribbean) -12298 -Spanish (Ecuador) -
6153 -English (Ireland) -17418 -Spanish (El Salvador) -
8201 -English (Jamaica) -4106Spanish (Guatemala) -
5129 -English (New Zealand) -18442 -Spanish (Honduras) -
13321 -English (Philippines) -2058 -Spanish (Mexico) -
7177 -English (South Africa) -19466 -Spanish (Nicaragua) -
11273 -English (Trinidad) -6154 -Spanish (Panama) -
2057 -English (United Kingdom) -15370 -Spanish (Paraguay) -
1033 -English (United States)   -10250 -Spanish (Peru) -
12297 -English (Zimbabwe) -20490 -Spanish (Puerto Rico) -
1061 -Estonian -3082 -Spanish (Spain) -
1080 -Faeroese -1034 -Spanish (Traditional) -
1065 -Farsi -14346 -Spanish (Uruguay) -
1035 -Finnish -8202 -Spanish (Venezuela) -
2060 -French (Belgium) -1089 -Swahili -
3084 -French (Canada) -1053 -Swedish -
1036 -French (France) -2077 -Swedish (Finland) -
5132 -French (Luxembourg) -1114 -Syriac -
6156 -French (Monaco) -1097 -Tamil -
4108 -French (Switzerland) -1092 -Tatar -
1110 -Galician -1098 -Telugu -
1079 -Georgian -1054 -Thai -
3079 -German (Austria) -1055 -Turkish -
1031 -German (Germany) -1058 -Ukrainian -
5127 -German (Liechtenstein) -1056 -Urdu -
4103 -German (Luxembourg) -2115 -Uzbek (Cyrillic) -
2055 -German (Switzerland) -1091 -Uzbek (Latin) -
1032 -Greek -1066 -Vietnamese -
1095 -Gujarati -

Time Zones

Web -sites based on Windows SharePoint Services can be set to any of the -time zones recognized by Microsoft Windows Server 2003.

Code -Time zoneCodeTime zone
39(GMT-12:00) Eniwetok, Kwajalein59(GMT+02:00) Helsinki, Riga, Tallinn -
16(GMT-11:00) Midway Island, Samoa -27(GMT+02:00) Jerusalem 26 (GMT+03:00) Baghdad -
15(GMT-10:00) Hawaii -74(GMT+03:00) Kuwait, Riyadh -
14(GMT-09:00) Alaska -51(GMT+03:00) Moscow, St. Petersburg, Volgograd -
13(GMT-08:00) Pacific Time (US and Canada); Tijuana -56(GMT+03:00) Nairobi -
38(GMT-07:00) Arizona -25(GMT+03:30) Tehran
12(GMT-07:00) Mountain Time (US and Canada) -24(GMT+04:00) Abu Dhabi, Muscat -
55(GMT-06:00) Central America -54(GMT+04:00) Baku, Tbilisi, Yerevan 48 (GMT+04:30) Kabul -
11(GMT-06:00) Central Time (US and Canada) -58(GMT+05:00) Ekaterinburg -
37(GMT-06:00) Mexico City -47 -(GMT+05:00) Islamabad, Karachi, Tashkent -
36(GMT-06:00) Saskatchewan -23(GMT+05:30) Calcutta, Chennai, Mumbai, New Delhi -
35(GMT-05:00) Bogota, Lima, Quito -62(GMT+05:45) Kathmandu 46 (GMT+06:00) Almaty, Novosibirsk -
10(GMT-05:00) Eastern Time (US and Canada) -71(GMT+06:00) Astana, Dhaka -
34 -(GMT-05:00) Indiana (East) -66(GMT+06:00) Sri Jayawardenepura -
9 -(GMT-04:00) Atlantic Time (Canada) -61(GMT+06:30) Rangoon -
33(GMT-04:00) Caracas, La Paz -22(GMT+07:00) Bangkok, Hanoi, Jakarta -
65(GMT-04:00) Santiago -64(GMT+07:00) Krasnoyarsk -
28(GMT-03:30) Newfoundland 8 (GMT-03:00) Brasilia -45(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi -
32(GMT-03:00) Buenos Aires, Georgetown -63(GMT+08:00) Irkutsk, Ulaan Bataar -
60(GMT-03:00) Greenland -21(GMT+08:00) Kuala Lumpur, Singapore -
30(GMT-02:00) Mid-Atlantic -73(GMT+08:00) Perth 75 (GMT+08:00) Taipei -
29(GMT-01:00) Azores -20(GMT+09:00) Osaka, Sapporo, Tokyo 72 (GMT+09:00) Seoul -
53(GMT-01:00) Cape Verde Is.70(GMT+09:00) Yakutsk 19 (GMT+09:30) Adelaide -
31(GMT) Casablanca, Monrovia -44(GMT+09:30) Darwin -
2(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London -18(GMT+10:00) Brisbane -
4(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna -76(GMT+10:00) Canberra, Melbourne, Sydney -
6(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague -43(GMT+10:00) Guam, Port Moresby -
3(GMT+01:00) Brussels, Copenhagen, Madrid, Paris -42(GMT+10:00) Hobart
57(GMT+01:00) Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb -68(GMT+10:00) Vladivostok -
69(GMT+01:00) West Central Africa -41(GMT+11:00) Magadan, Solomon Is., New Caledonia -
7(GMT+02:00) Athens, Istanbul, Minsk -17(GMT+12:00) Auckland, Wellington -
5(GMT+02:00) Bucharest40 -(GMT+12:00) Fiji, Kamchatka, Marshall Is. -
49 -(GMT+02:00) Cairo -67 -(GMT+13:00) Nuku'alofa -
50 -(GMT+02:00) Harare, Pretoria -

Currency IDs

Web sites based on Windows SharePoint Services can be set to use the following currencies. -

IDCurrency -IDCurrency -
51211,254 .ج.د (Arabic-Algeria) -4106 -Q1,254 (Guatemala) -
15361 -1,254 .ب.د (Arabic-Bahrain) -18442 -L. 1254 (Honduras) -
3073 -1,254 .م.ج (Arabic-Egypt)3076 -HK$1,254 (Hong Kong) -
2049 -1,254 .ع.د (Arabic-Iraq) -1038 -1 254 Ft (Hungary) -
11265 -1,254 .ا.د (Arabic-Jordan) -1081 -रु 1,254 (India) -
13313 -1,254 .ك.د (Arabic-Kuwait) -6153 -IR£1,254 (Ireland) -
12289 -1,254 .ل.ل (Arabic-Lebanon) -1037 -₪1,254 (Israel) -
4097 -1,254 .ل.د (Arabic-Libya) -1041 -¥1,254 (Japan) -
6145 -1,254 .م.د (Arabic-Morocco) -1042 -₩1,254 (Korea) -
8193 -1,254 .ع.ر (Arabic-Oman) -2058 -$1,254 (Mexico) -
16385 -1,254 .ق.ر (Arabic-Qatar) -5129 -$1,254 (New Zealand) -
1025 -1,254 .س.ر (Arabic-Saudi Arabia) -19466 -C$ 1254 (Nicaragua) -
10241 -1,254 .س.ل (Arabic-Syria) -1044 -kr 1 254 (Norway) -
7169 -1,254 .ت.د (Arabic-Tunisia) -1056 -Rs 1,254 (Pakistan) -
14337 -1,254 .إ.د (Arabic-U.A.E) -6154 -B/. 1,254 (Panama) -
9217 -1,254 .ي.ر (Arabic-Yemen) -15370 -Gs 1.254 (Paraguay) -
11274 -$ 1.254 (Argentina) -2052 -￥1,254 (People's Republic of China) -
3081 -$1,254 (Australia) -10250 -S/. 1,254 (Peru) -
3079 -öS 1.254 (Austria) -1045 -1 254 zł (Poland) -
16394 -$b 1.254 (Bolivia) -1049 -1 254р. (Russia) -
1046 -R$ 1.254 (Brazil) -4100 -$1,254 (Singapore) -
3084 -1 254 $ (Canada) -1051 -1 254 Sk (Slovakia) -
4105 -$1,254 (Canada) -1060 -1.254 SIT (Slovenia) -
13322 -$ 1.254 (Chile) -7177 -R 1,254 (South Africa) -
9226 -$ 1.254 (Colombia) -1053 -1.254 kr (Sweden) -
5130 -C1.254 (Costa Rica) -2055 -SFr. 1'254 (Switzerland) -
1029 -1 254 Kč (Czech Republic) -1028 -NT$1,254 (Taiwan) -
1030 -kr 1.254 (Denmark) -1054 -฿1,254 (Thai) -
7178 -RD$1,254 (Dominican Republic) -1055 -1.254 TL (Turkey) -
17418 -C1254 (El Salvador) -2057 -£1,254 (United Kingdom) -
-2 -1,254 € (European Union) -1033 -$1,254 (United States) -
-1 -€ 1,254 (European Union) -14346 -$U 1.254 (Uruguay) -
1065 -1,254 ريال (Farsi) -8202 -Bs 1.254 (Venezuela) -
1032 -1.254 Δρχ (Greece) -1066 -1,254 ₫ (Vietnamese) -
©2003 Microsoft Corporation. All rights reserved.
\ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/informations/WindowsCodePages.txt b/development/Win32/packaging/AltInstaller/informations/WindowsCodePages.txt deleted file mode 100644 index d48c881a44..0000000000 --- a/development/Win32/packaging/AltInstaller/informations/WindowsCodePages.txt +++ /dev/null @@ -1 +0,0 @@ -http://www.microsoft.com/globaldev/reference/wincp.mspx \ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/informations/iso639.htm b/development/Win32/packaging/AltInstaller/informations/iso639.htm deleted file mode 100644 index d44be797a2..0000000000 --- a/development/Win32/packaging/AltInstaller/informations/iso639.htm +++ /dev/null @@ -1,554 +0,0 @@ - -ISO 639 Language Codes - - - - -

ISO 639 Language Codes

-

ISO 639: 3-letter codes

-
abk      ab    Abkhazian
-ace            Achinese
-ach            Acoli
-ada            Adangme
-aar      aa    Afar
-afh            Afrihili
-afr      af    Afrikaans
-afa            Afro-Asiatic (Other)
-aka            Akan
-akk            Akkadian
-alb/sqi  sq    Albanian
-ale            Aleut
-alg            Algonquian languages
-tut            Altaic (Other)
-amh      am    Amharic
-apa            Apache languages
-ara      ar    Arabic
-arc            Aramaic
-arp            Arapaho
-arn            Araucanian
-arw            Arawak
-arm/hye  hy    Armenian
-art            Artificial (Other)
-asm      as    Assamese
-ath            Athapascan languages
-map            Austronesian (Other)
-ava            Avaric
-ave            Avestan
-awa            Awadhi
-aym      ay    Aymara
-aze      az    Azerbaijani
-nah            Aztec
-ban            Balinese
-bat            Baltic (Other)
-bal            Baluchi
-bam            Bambara
-bai            Bamileke languages
-bad            Banda
-bnt            Bantu (Other)
-bas            Basa
-bak      ba    Bashkir
-baq/eus  eu    Basque
-bej            Beja
-bem            Bemba
-ben      bn    Bengali
-ber            Berber (Other)
-bho            Bhojpuri
-bih      bh    Bihari
-bik            Bikol
-bin            Bini
-bis      bi    Bislama
-bra            Braj
-bre      be    Breton
-bug            Buginese
-bul      bg    Bulgarian
-bua            Buriat
-bur/mya  my    Burmese
-bel      be    Byelorussian
-cad            Caddo
-car            Carib
-cat      ca    Catalan
-cau            Caucasian (Other)
-ceb            Cebuano
-cel            Celtic (Other)
-cai            Central American Indian (Other)
-chg            Chagatai
-cha            Chamorro
-che            Chechen
-chr            Cherokee
-chy            Cheyenne
-chb            Chibcha
-chi/zho  zh    Chinese
-chn            Chinook jargon
-cho            Choctaw
-chu            Church Slavic
-chv            Chuvash
-cop            Coptic
-cor            Cornish
-cos      co    Corsican
-cre            Cree
-mus            Creek
-crp            Creoles and Pidgins (Other)
-cpe            Creoles and Pidgins, English-based (Other)
-cpf            Creoles and Pidgins, French-based (Other)
-cpp            Creoles and Pidgins, Portuguese-based (Other)
-cus            Cushitic (Other)
-         hr    Croatian
-ces/cze  cs    Czech
-dak            Dakota
-dan      da    Danish
-del            Delaware
-din            Dinka
-div            Divehi
-doi            Dogri
-dra            Dravidian (Other)
-dua            Duala
-dut/nla  nl    Dutch
-dum            Dutch, Middle (ca. 1050-1350)
-dyu            Dyula
-dzo      dz    Dzongkha
-efi            Efik
-egy            Egyptian (Ancient)
-eka            Ekajuk
-elx            Elamite
-eng      en    English
-enm            English, Middle (ca. 1100-1500)
-ang            English, Old (ca. 450-1100)
-esk            Eskimo (Other)
-epo      eo    Esperanto
-est      et    Estonian
-ewe            Ewe
-ewo            Ewondo
-fan            Fang
-fat            Fanti
-fao      fo    Faroese
-fij      fj    Fijian
-fin      fi    Finnish
-fiu            Finno-Ugrian (Other)
-fon            Fon
-fra/fre  fr    French
-frm            French, Middle (ca. 1400-1600)
-fro            French, Old (842- ca. 1400)
-fry      fy    Frisian
-ful            Fulah
-gaa            Ga
-gae/gdh  Gaelic (Scots)
-glg      gl    Gallegan
-lug            Ganda
-gay            Gayo
-gez            Geez
-geo/kat  ka    Georgian
-deu/ger  de    German
-gmh            German, Middle High (ca. 1050-1500)
-goh            German, Old High (ca. 750-1050)
-gem            Germanic (Other)
-gil            Gilbertese
-gon            Gondi
-got            Gothic
-grb            Grebo
-grc            Greek, Ancient (to 1453)
-ell/gre  el    Greek, Modern (1453-)
-kal      kl    Greenlandic
-grn      gn    Guarani
-guj      gu    Gujarati
-hai            Haida
-hau      ha    Hausa
-haw            Hawaiian
-heb      he    Hebrew
-her            Herero
-hil            Hiligaynon
-him            Himachali
-hin      hi    Hindi
-hmo            Hiri Motu
-hun      hu    Hungarian
-hup            Hupa
-iba            Iban
-ice/isl  is    Icelandic
-ibo            Igbo
-ijo            Ijo
-ilo            Iloko
-inc            Indic (Other)
-ine            Indo-European (Other)
-ind      id    Indonesian
-ina      ia    Interlingua (International Auxiliary language Association)
-ine      -     Interlingue
-iku      iu    Inuktitut
-ipk      ik    Inupiak
-ira            Iranian (Other)
-gai/iri  ga    Irish
-sga            Irish, Old (to 900)
-mga            Irish, Middle (900 - 1200)
-iro            Iroquoian languages
-ita      it    Italian
-jpn      ja    Japanese
-jav/jaw  jv/jw Javanese
-jrb            Judeo-Arabic
-jpr            Judeo-Persian
-kab            Kabyle
-kac            Kachin
-kam            Kamba
-kan      kn    Kannada
-kau            Kanuri
-kaa            Kara-Kalpak
-kar            Karen
-kas      ks    Kashmiri
-kaw            Kawi
-kaz      kk    Kazakh
-kha            Khasi
-khm      km    Khmer
-khi            Khoisan (Other)
-kho            Khotanese
-kik            Kikuyu
-kin      rw    Kinyarwanda
-kir      ky    Kirghiz
-kom            Komi
-kon            Kongo
-kok            Konkani
-kor      ko    Korean
-kpe            Kpelle
-kro            Kru
-kua            Kuanyama
-kum            Kumyk
-kur      ku    Kurdish
-kru            Kurukh
-kus            Kusaie
-kut            Kutenai
-lad            Ladino
-lah            Lahnda
-lam            Lamba
-oci      oc    Langue d'Oc (post 1500)
-lao      lo    Lao
-lat      la    Latin
-lav      lv    Latvian
-ltz            Letzeburgesch
-lez            Lezghian
-lin      ln    Lingala
-lit      lt    Lithuanian
-loz            Lozi
-lub            Luba-Katanga
-lui            Luiseno
-lun            Lunda
-luo            Luo (Kenya and Tanzania)
-mac/mak  mk    Macedonian
-mad            Madurese
-mag            Magahi
-mai            Maithili
-mak            Makasar
-mlg      mg    Malagasy
-may/msa  ms    Malay
-mal            Malayalam
-mlt      ml    Maltese
-man            Mandingo
-mni            Manipuri
-mno            Manobo languages
-max            Manx
-mao/mri  mi    Maori
-mar      mr    Marathi
-chm            Mari
-mah            Marshall
-mwr            Marwari
-mas            Masai
-myn            Mayan languages
-men            Mende
-mic            Micmac
-min            Minangkabau
-mis            Miscellaneous (Other)
-moh            Mohawk
-mol      mo    Moldavian
-mkh            Mon-Kmer (Other)
-lol            Mongo
-mon      mn    Mongolian
-mos            Mossi
-mul            Multiple languages
-mun            Munda languages
-nau      na    Nauru
-nav            Navajo
-nde            Ndebele, North
-nbl            Ndebele, South
-ndo            Ndongo
-nep      ne    Nepali
-new            Newari
-nic            Niger-Kordofanian (Other)
-ssa            Nilo-Saharan (Other)
-niu            Niuean
-non            Norse, Old
-nai            North American Indian (Other)
-nor      no    Norwegian
-nno            Norwegian (Nynorsk)
-nub            Nubian languages
-nym            Nyamwezi
-nya            Nyanja
-nyn            Nyankole
-nyo            Nyoro
-nzi            Nzima
-oji            Ojibwa
-ori      or    Oriya
-orm      om    Oromo
-osa            Osage
-oss            Ossetic
-oto            Otomian languages
-pal            Pahlavi
-pau            Palauan
-pli            Pali
-pam            Pampanga
-pag            Pangasinan
-pan      pa    Panjabi
-pap            Papiamento
-paa            Papuan-Australian (Other)
-fas/per  fa    Persian
-peo            Persian, Old (ca 600 - 400 B.C.)
-phn            Phoenician
-pol      pl    Polish
-pon            Ponape
-por      pt    Portuguese
-pra            Prakrit languages
-pro            Provencal, Old (to 1500)
-pus      ps    Pushto
-que      qu    Quechua
-roh      rm    Rhaeto-Romance
-raj            Rajasthani
-rar            Rarotongan
-roa            Romance (Other)
-ron/rum  ro    Romanian
-rom            Romany
-run      rn    Rundi
-rus      ru    Russian
-sal            Salishan languages
-sam            Samaritan Aramaic
-smi            Sami languages
-smo      sm    Samoan
-sad            Sandawe
-sag      sg    Sango
-san      sa    Sanskrit
-srd            Sardinian
-sco            Scots
-sel            Selkup
-sem            Semitic (Other)
-         sr    Serbian
-scr      sh    Serbo-Croatian
-srr            Serer
-shn            Shan
-sna      sn    Shona
-sid            Sidamo
-bla            Siksika
-snd      sd    Sindhi
-sin      si    Singhalese
-sit      -     Sino-Tibetan (Other)
-sio            Siouan languages
-sla            Slavic (Other)
-ssw      ss    Siswant
-slk/slo  sk    Slovak
-slv      sl    Slovenian
-sog            Sogdian
-som      so    Somali
-son            Songhai
-wen            Sorbian languages
-nso            Sotho, Northern
-sot      st    Sotho, Southern
-sai            South American Indian (Other)
-esl/spa  es    Spanish
-suk            Sukuma
-sux            Sumerian
-sun      su    Sudanese
-sus            Susu
-swa      sw    Swahili
-ssw            Swazi
-sve/swe  sv    Swedish
-syr            Syriac
-tgl      tl    Tagalog
-tah            Tahitian
-tgk      tg    Tajik
-tmh            Tamashek
-tam      ta    Tamil
-tat      tt    Tatar
-tel      te    Telugu
-ter            Tereno
-tha      th    Thai
-bod/tib  bo    Tibetan
-tig            Tigre
-tir      ti    Tigrinya
-tem            Timne
-tiv            Tivi
-tli            Tlingit
-tog      to    Tonga (Nyasa)
-ton            Tonga (Tonga Islands)
-tru            Truk
-tsi            Tsimshian
-tso      ts    Tsonga
-tsn      tn    Tswana
-tum            Tumbuka
-tur      tr    Turkish
-ota            Turkish, Ottoman (1500 - 1928)
-tuk      tk    Turkmen
-tyv            Tuvinian
-twi      tw    Twi
-uga            Ugaritic
-uig      ug    Uighur
-ukr      uk    Ukrainian
-umb            Umbundu
-und            Undetermined
-urd      ur    Urdu
-uzb      uz    Uzbek
-vai            Vai
-ven            Venda
-vie      vi    Vietnamese
-vol      vo    Volapk
-vot            Votic
-wak            Wakashan languages
-wal            Walamo
-war            Waray
-was            Washo
-cym/wel  cy    Welsh
-wol      wo    Wolof
-xho      xh    Xhosa
-sah            Yakut
-yao            Yao
-yap            Yap
-yid      yi    Yiddish
-yor      yo    Yoruba
-zap            Zapotec
-zen            Zenaga
-zha      za    Zhuang
-zul      zu    Zulu
-zun            Zuni
-
-

ISO 639: 2-letter codes

-
AA "Afar"
-AB "Abkhazian"
-AF "Afrikaans"
-AM "Amharic"
-AR "Arabic"
-AS "Assamese"
-AY "Aymara"
-AZ "Azerbaijani"
-BA "Bashkir"
-BE "Byelorussian"
-BG "Bulgarian"
-BH "Bihari"
-BI "Bislama"
-BN "Bengali" "Bangla"
-BO "Tibetan"
-BR "Breton"
-CA "Catalan"
-CO "Corsican"
-CS "Czech"
-CY "Welsh"
-DA "Danish"
-DE "German"
-DZ "Bhutani"
-EL "Greek"
-EN "English" "American"
-EO "Esperanto"
-ES "Spanish"
-ET "Estonian"
-EU "Basque"
-FA "Persian"
-FI "Finnish"
-FJ "Fiji"
-FO "Faeroese"
-FR "French"
-FY "Frisian"
-GA "Irish"
-GD "Gaelic" "Scots Gaelic"
-GL "Galician"
-GN "Guarani"
-GU "Gujarati"
-HA "Hausa"
-HI "Hindi"
-HR "Croatian"
-HU "Hungarian"
-HY "Armenian"
-IA "Interlingua"
-IE "Interlingue"
-IK "Inupiak"
-IN "Indonesian"
-IS "Icelandic"
-IT "Italian"
-IW "Hebrew"
-JA "Japanese"
-JI "Yiddish"
-JW "Javanese"
-KA "Georgian"
-KK "Kazakh"
-KL "Greenlandic"
-KM "Cambodian"
-KN "Kannada"
-KO "Korean"
-KS "Kashmiri"
-KU "Kurdish"
-KY "Kirghiz"
-LA "Latin"
-LN "Lingala"
-LO "Laothian"
-LT "Lithuanian"
-LV "Latvian" "Lettish"
-MG "Malagasy"
-MI "Maori"
-MK "Macedonian"
-ML "Malayalam"
-MN "Mongolian"
-MO "Moldavian"
-MR "Marathi"
-MS "Malay"
-MT "Maltese"
-MY "Burmese"
-NA "Nauru"
-NE "Nepali"
-NL "Dutch"
-NO "Norwegian"
-OC "Occitan"
-OM "Oromo" "Afan"
-OR "Oriya"
-PA "Punjabi"
-PL "Polish"
-PS "Pashto" "Pushto"
-PT "Portuguese"
-QU "Quechua"
-RM "Rhaeto-Romance"
-RN "Kirundi"
-RO "Romanian"
-RU "Russian"
-RW "Kinyarwanda"
-SA "Sanskrit"
-SD "Sindhi"
-SG "Sangro"
-SH "Serbo-Croatian"
-SI "Singhalese"
-SK "Slovak"
-SL "Slovenian"
-SM "Samoan"
-SN "Shona"
-SO "Somali"
-SQ "Albanian"
-SR "Serbian"
-SS "Siswati"
-ST "Sesotho"
-SU "Sudanese"
-SV "Swedish"
-SW "Swahili"
-TA "Tamil"
-TE "Tegulu"
-TG "Tajik"
-TH "Thai"
-TI "Tigrinya"
-TK "Turkmen"
-TL "Tagalog"
-TN "Setswana"
-TO "Tonga"
-TR "Turkish"
-TS "Tsonga"
-TT "Tatar"
-TW "Twi"
-UK "Ukrainian"
-UR "Urdu"
-UZ "Uzbek"
-VI "Vietnamese"
-VO "Volapuk"
-WO "Wolof"
-XH "Xhosa"
-YO "Yoruba"
-ZH "Chinese"
-ZU "Zulu"
-
-
-

Document Modified August 9, 1999

- \ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/io_latex.ini b/development/Win32/packaging/AltInstaller/io_latex.ini deleted file mode 100644 index 10eafd44fc..0000000000 --- a/development/Win32/packaging/AltInstaller/io_latex.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Settings] -NumFields=4 - -[Field 1] -Type=Label -Left=20 -Right=280 -Top=3 -Bottom=60 -Text='You can optionally set here the path to the file "latex.exe" and therewith set the LaTeX-distribution that should be used by LyX.\r\nIf you don$\\'t use LaTeX, LyX cannot output documents!\r\n\r\nThe installer has detected the LaTeX-distribution "$LaTeXName" on your system. Displayed below is its path.' - -[Field 2] -Type=Groupbox -Left=5 -Right=-1 -Top=67 -Bottom=107 -Text= Path - -[Field 3] -Type=DirRequest -Left=20 -Right=270 -Top=83 -Bottom=94 -State=C:\ - -[Field 4] -Type=Checkbox -Text=Don't use LaTeX -Left=20 -Right=120 -Top=120 -Bottom=129 -State=0 - diff --git a/development/Win32/packaging/AltInstaller/io_missing_progs.ini b/development/Win32/packaging/AltInstaller/io_missing_progs.ini deleted file mode 100644 index 795b6a127b..0000000000 --- a/development/Win32/packaging/AltInstaller/io_missing_progs.ini +++ /dev/null @@ -1,44 +0,0 @@ -[Settings] -NumFields=6 - -[Field 1] -Type=Groupbox -Left=5 -Right=-1 -Top=0 -Bottom=-4 - -[Field 2] -Type=Label -Left=45 -Right=230 -Top=25 -Bottom=35 - -[Field 3] -Type=Label -Left=45 -Right=230 -Top=45 -Bottom=55 - -[Field 4] -Type=Label -Left=45 -Right=230 -Top=65 -Bottom=75 - -[Field 5] -Type=Label -Left=45 -Right=230 -Top=85 -Bottom=95 - -[Field 6] -Type=Label -Left=15 -Right=280 -Top=115 -Bottom=125 diff --git a/development/Win32/packaging/AltInstaller/io_ui_language.ini b/development/Win32/packaging/AltInstaller/io_ui_language.ini deleted file mode 100644 index 548b6b239f..0000000000 --- a/development/Win32/packaging/AltInstaller/io_ui_language.ini +++ /dev/null @@ -1,19 +0,0 @@ -[Settings] -NumFields=2 - -[Field 1] -Type=GroupBox -Left=0 -Right=160 -Top=0 -Bottom=-4 -Text=" Available Languages " - -[Field 2] -Type=Droplist -ListItems=Arabic|Bahasa Indonesia|Catal|Cetina|Chinese (China)|Chinese (Taiwan)|Dansk|Deutsch|English|Espaol|Euskara|Franais|Galego|Greek|Hebrew|Italiano|Japanese|Korean|Magyar|Nederlands|Norsk|Nynorsk|Polski|Portugus|Romna|Russian|Slovensk|Slovencina|Srpski (Latinica)|Suomi|Trke|Ukrainian -Left=20 -Right=130 -Top=15 -Bottom=130 - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt b/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt deleted file mode 100644 index a12d41ab22..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/Encodings.txt +++ /dev/null @@ -1,9 +0,0 @@ -Needed codepages: - -turkish.nsh: ISO-8859-9 -hungarian.nsh, slovak.nsh, polish.nsh, romanian.nsh: Windows cp-1250 -japanese.nsh: Shift_JIS -ukrainian.nsh: Windows cp-1251 -arabic.nsh: Windows cp-1256 - -all other files are in Windows cp-1252 \ No newline at end of file diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/arabic.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/arabic.nsh deleted file mode 100644 index 8a24f8ad4a..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/arabic.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_ARABIC_NSH_ -!define _LYX_LANGUAGES_ARABIC_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_ARABIC} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" " .\r\n\ - \r\n\ - .\r\n\ - \r\n\ - .\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "-" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" " " -LangString SecFileAssocTitle "${LYX_LANG}" " " -LangString SecDesktopTitle "${LYX_LANG}" " " - -LangString SecCoreDescription "${LYX_LANG}" " ." -LangString SecInstGSviewDescription "${LYX_LANG}" " PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" " BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" " ." -LangString SecFileAssocDescription "${LYX_LANG}" " .lyx ." -LangString SecDesktopDescription "${LYX_LANG}" " ." - -LangString LangSelectHeader "${LYX_LANG}" " " -LangString AvailableLang "${LYX_LANG}" " " - -LangString MissProgHeader "${LYX_LANG}" " " -LangString MissProgCap "${LYX_LANG}" " " -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, " -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, " -LangString MissProgAspell "${LYX_LANG}" "Aspell, " -LangString MissProgMessage "${LYX_LANG}" ' .' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" '-' -LangString EnterLaTeXHeader2 "${LYX_LANG}" ' - .' -LangString EnterLaTeXFolder "${LYX_LANG}" ' "latex.exe" \ - - .\r\n\ - !\r\n\ - \r\n\ - - \ - "$LaTeXName" .' -LangString EnterLaTeXFolderNone "${LYX_LANG}" ' "latex.exe". \ - - .\r\n\ - !\r\n\ - \r\n\ - - .' -LangString PathName "${LYX_LANG}" ' "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" " " -LangString InvalidLaTeXFolder "${LYX_LANG}" ' "latex.exe" .' - -LangString LatexInfo "${LYX_LANG}" ' - "MiKTeX".$\r$\n\ - .$\r$\n\ - $\r$\n\ - !!! MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" ' -!$\r$\n\ - MiKTeX!$\r$\n\ - .' - -LangString GSviewInfo "${LYX_LANG}" ' GSview.$\r$\n\ - ,$\r$\n\ - .$\r$\n\ - GSview.' -LangString GSviewError "${LYX_LANG}" ' GSview!$\r$\n\ - .$\r$\n\ - GSview .' - -LangString JabRefInfo "${LYX_LANG}" ' JabRef.$\r$\n\ - JabRef.' -LangString JabRefError "${LYX_LANG}" ' JabRef!$\r$\n\ - .$\r$\n\ - JabRef .' - -LangString LatexConfigInfo "${LYX_LANG}" " ." - -LangString AspellInfo "${LYX_LANG}" ' Aspell.$\r$\n\ - .' -LangString AspellDownloadFailed "${LYX_LANG}" " Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" " Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" ' ' -LangString AspellNone "${LYX_LANG}" ' Aspell.$\r$\n\ - $\r$\n\ - ${AspellLocation}$\r$\n\ - ' -LangString AspellPartStart "${LYX_LANG}" " " -LangString AspellPart1 "${LYX_LANG}" " " -LangString AspellPart2 "${LYX_LANG}" " $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' Aspell.$\r$\n\ - $\r$\n\ - ${AspellLocation}$\r$\n\ - ' - -LangString MiKTeXPathInfo "${LYX_LANG}" " miktex $\r$\n\ - MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - ." -LangString MiKTeXInfo "${LYX_LANG}" '- MiKTeX .$\r$\n\ - miktex - " miktex"$\r$\n\ - .$\r$\n\ - ' - -LangString UpdateNotAllowed "${LYX_LANG}" " ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Could not set 'path_prefix' in the configure script" -LangString CreateCmdFilesFailed "${LYX_LANG}" " lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" " configure script" -LangString NotAdmin "${LYX_LANG}" " !" -LangString InstallRunning "${LYX_LANG}" " !" -LangString StillInstalled "${LYX_LANG}" " ." - -LangString FinishPageMessage "${LYX_LANG}" "! .\r\n\ - \r\n\ - ( .)" -LangString FinishPageRun "${LYX_LANG}" " " - -LangString UnNotInRegistryLabel "${LYX_LANG}" " .$\r$\n\ - ." -LangString UnInstallRunning "${LYX_LANG}" " !" -LangString UnNotAdminLabel "${LYX_LANG}" " !" -LangString UnReallyRemoveLabel "${LYX_LANG}" " " -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s ' -LangString UnGSview "${LYX_LANG}" ' $\r$\n\ - GSview PDF.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" " ." - -LangString SecUnAspellDescription "${LYX_LANG}" ' Aspell .' -LangString SecUnMiKTeXDescription "${LYX_LANG}" " - MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" " JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" ' $\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - .' -LangString SecUnProgramFilesDescription "${LYX_LANG}" " ." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_ARABIC_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/catalan.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/catalan.nsh deleted file mode 100644 index a391c8f450..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/catalan.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_CATALAN_NSH_ -!define _LYX_LANGUAGES_CATALAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_CATALAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Aquest assistent us guiar en la installaci del LyX.\r\n\ - \r\n\ - Necessiteu drets d'administrador per installar el LyX.\r\n\ - \r\n\ - Abans de comenar la installaci, s recomenable tancar totes les altres aplicacions. Aix permet actualitzar alguns fitxerr del sistema sense haver de reiniciar l'ordinador.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Document LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Voleu installar-ho per a tots els usuaris?" -LangString SecFileAssocTitle "${LYX_LANG}" "Associaci de fitxers" -LangString SecDesktopTitle "${LYX_LANG}" "Icona a l'escriptori" - -LangString SecCoreDescription "${LYX_LANG}" "Els fitxers del LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programa per visualitzar documents en format Postscript i PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Gestor i editor de referncies bibliogrfiques per a fitxers BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Installa el LyX per a tots els usuaris o noms per a l'usuari actual." -LangString SecFileAssocDescription "${LYX_LANG}" "Els fitxers amb extensi .lyx s'obriran automticament amb el LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Una icona del LyX a l'escriptori." - -LangString LangSelectHeader "${LYX_LANG}" "Selecci de la llengua de mens del LyX" -LangString AvailableLang "${LYX_LANG}" " Llenges disponibles " - -LangString MissProgHeader "${LYX_LANG}" "Verificaci dels programes requerits" -LangString MissProgCap "${LYX_LANG}" "Addicionalment, s'installaran els programes segents" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, una distribuci de LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un intrpret per a documents PostScript i PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, un conversor d'imatges" -LangString MissProgAspell "${LYX_LANG}" "Aspell, un corrector ortogrfic" -LangString MissProgMessage "${LYX_LANG}" 'No s necessari installar cap programa addicional.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuci LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Establiu la distribuci LaTeX que ha de fer servir el LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Opcionalment podeu establir aqu el cam al fitxer "latex.exe" i posteriorment establir la \ - distribuci LaTeX que el LyX ha de fer servir.\r\n\ - Si no useu LaTeX, el LyX no podr generar documents!\r\n\ - \r\n\ - L$\'installador ha detectat la distribuci LaTeX \ - "$LaTeXName" al sistema, al cam que es mostra avall.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Indiqueu el cam al fitxer "latex.exe". Posteriorment establiu \ - quina distribuci LaTeX ha de fer servir el LyX.\r\n\ - Si no useu LaTeX, el LyX no podr generar documents!\r\n\ - \r\n\ - L$\'installador no ha trobat cap distribuci LaTeX al sistema.' -LangString PathName "${LYX_LANG}" 'Cam al fitxer "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "No usis LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'El fitxer "latex.exe" no es troba al cam indicat.' - -LangString LatexInfo "${LYX_LANG}" 'Ara s$\'executar l$\'installador de la distribuci LaTeX "MiKTeX".$\r$\n\ - Per installar el programa pitgeu el bot "Segent" a les finestres de l$\'installador fins que la installaci comenci.$\r$\n\ - $\r$\n\ - Si us plau, useu les opcions predeterminades de l$\'installador MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'No s$\'ha trobat cap distribuci LaTeX!$\r$\n\ - No podeu usar el LyX sense cap distribuci LaTeX, com ara "MiKTeX"!$\r$\n\ - Es cancellar la installaci.' - -LangString GSviewInfo "${LYX_LANG}" 'Ara s$\'executar l$\'installador del programa "GSview".$\r$\n\ - Per installar el programa pitgeu el bot "Setup" a la primera finestra de l$\'installador,$\r$\n\ - seleccioneu la llengua i pitgeu el bot "Segent" a la finstres segent de l$\'installador.$\r$\n\ - Podeu usar totes les opcions predeterminades de l$\'installador del GSview.' -LangString GSviewError "${LYX_LANG}" 'El programa "GSview" no s$\'ha installat correctament!$\r$\n\ - L$\'installador continuar igualment.$\r$\n\ - Intenteu installar el GSview altre cop ms tard.' - -LangString JabRefInfo "${LYX_LANG}" 'Ara s$\'executar l$\'installador del programa "JabRef".$\r$\n\ - Podeu usar totes les opcions predeterminades de l$\'installador del JabRef.' -LangString JabRefError "${LYX_LANG}" 'El programa "JabRef" no s$\'ha installat correctament!$\r$\n\ - L$\'installador continuar igualment.$\r$\n\ - Intenteu installar el JabRef altre cop ms tard.' - -LangString LatexConfigInfo "${LYX_LANG}" "La configuraci segent del LyX pot trigar una mica." - -LangString AspellInfo "${LYX_LANG}" 'Ara es descarregaran i installaran els diccionaris pel corrector ortogrfic "Aspell".$\r$\n\ - Cada diccionari t una llicncia diferent que es mostrar abans de la installaci.' -LangString AspellDownloadFailed "${LYX_LANG}" "No s$\'ha pogut descarregar cap diccionari de l$\'Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" "No s$\'ha pogut installar cap diccionari de l$\'Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " i " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Ja es troba installat un diccionari per a la llengua' -LangString AspellNone "${LYX_LANG}" 'No s$\'ha installat el diccionari de l$\'Aspell.$\r$\n\ - Podeu descarregar els diccionaris des de$\r$\n\ - ${AspellLocation}$\r$\n\ - Voleu descarregar els diccionaris ara?' -LangString AspellPartStart "${LYX_LANG}" "S'ha installat correctament " -LangString AspellPart1 "${LYX_LANG}" "un diccionari per a la llengua anglesa" -LangString AspellPart2 "${LYX_LANG}" "un diccionari per a la llengua $LangName" -LangString AspellPart3 "${LYX_LANG}" "un$\r$\n\ - diccionari per a la llengua $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' pel corrector ortogrfic "Aspell".$\r$\n\ - Podeu descarregar ms diccionaris des de$\r$\n\ - ${AspellLocation}$\r$\n\ - Voleu descarregar altres diccionaris ara?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Per a que cada usuari pugui personalitzar el MiKTeX segons les seves necessitats\r$\n\ - s necessari que la carpeta on es troba installat el MiKTeK$\r$\n\ - $MiKTeXPath $\r$\n\ - i a les seves subcarpetes tinguin permissos d'escriptura per a tots els usuaris." -LangString MiKTeXInfo "${LYX_LANG}" 'La distribuci LaTeX "MiKTeX" conjuntament amb el LyX.$\r$\n\ - s recomenable installar les actualitzacions MiKTeX fent servir el programa "MiKTeX Update Wizard"$\r$\n\ - abans d$\'executar el LyX per primer cop.$\r$\n\ - Voleu comprobar ara si hi ha actualitzacions del MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Aquest paquet d'actualitzaci noms actualitza ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "No es pot establir 'path_prefix' durant el programa de configuraci" -LangString CreateCmdFilesFailed "${LYX_LANG}" "No es pot crear el fitxer lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "No es pot executar el programa de configuraci" -LangString NotAdmin "${LYX_LANG}" "Necessiteu drets d'administrador per installar el LyX!" -LangString InstallRunning "${LYX_LANG}" "L'installador ja s'est executant!" -LangString StillInstalled "${LYX_LANG}" "El LyX ja es troba installat! Desinstalleu-lo primer." - -LangString FinishPageMessage "${LYX_LANG}" "Felicitats! Heu installat correctament el LyX.\r\n\ - \r\n\ - (La primera execuci del LyX pot trigar alguns segons.)" -LangString FinishPageRun "${LYX_LANG}" "Executa el LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "No es possible trobar el LyX al registre.$\r$\n\ - No se suprimiran les dreceres de l'escriptori i del men inici." -LangString UnInstallRunning "${LYX_LANG}" "Primer heu de tancar el LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" "Necessiteu drets d'administrador per desinstallar el LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Esteu segur de voler suprimir completament el LyX i tots els seus components?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferncies d$\'usuari del LyX' -LangString UnGSview "${LYX_LANG}" 'Pitgeu el bot "Uninstall" a la finestra segent per desinstallar\r$\n\ - el visor de fitxers Postscript i PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "El LyX s'ha desinstallat correctament de l'ordinador." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Desinstalla el corrector ortogrfic Aspell i tots els seus diccionaris.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Desintalla la distribuci de LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Desinstalla el gestor de bibliografia JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Suprimeix les carptes de configuraci del LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - de tots els usuaris.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Desinstalla el LyX i tots els seus components." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_CATALAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/czech.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/czech.nsh deleted file mode 100644 index 6a8ffead52..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/czech.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_CZECH_NSH_ -!define _LYX_LANGUAGES_CZECH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_CZECH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Tento pomocnk vs provede instalac LyXu.\r\n\ - \r\n\ - K instalaci LyXu budete potebovat administrtorsk prva.\r\n\ - \r\n\ - Je doporueno zavt vechny ostatn aplikace ped sputnm instalace. Umonte tm aktualizovat patin systmov soubory bez nutnosti restartovat pota.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-dokument" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instalovat pro vechny uivatele?" -LangString SecFileAssocTitle "${LYX_LANG}" "Asociovat soubory" -LangString SecDesktopTitle "${LYX_LANG}" "Ikonu na plochu" - -LangString SecCoreDescription "${LYX_LANG}" "Soubory LyXu." -LangString SecInstGSviewDescription "${LYX_LANG}" "Prohle Postscriptu and PDF-dokument." -LangString SecInstJabRefDescription "${LYX_LANG}" "Sprvce pro bibliografii a editor soubor BibTeXu." -LangString SecAllUsersDescription "${LYX_LANG}" "Instalovat LyX pro vechny uivatele nebo pouze pro souasnho uivatele." -LangString SecFileAssocDescription "${LYX_LANG}" "Soubory s pponou .lyx se automaticky otevou v LyXu." -LangString SecDesktopDescription "${LYX_LANG}" "Ikonu LyXu na plochu." - -LangString LangSelectHeader "${LYX_LANG}" "Vbr jazyka prosted LyXu" -LangString AvailableLang "${LYX_LANG}" " Dostupn jazyky " - -LangString MissProgHeader "${LYX_LANG}" "Kontrola potebnch program" -LangString MissProgCap "${LYX_LANG}" "Nsledujc programy budou piinstalovny" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, distribuce LaTeXu" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, interpretr PostScriptu a PDF soubor" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, konvertor obrzk" -LangString MissProgAspell "${LYX_LANG}" "Aspell, kontrola pravopisu" -LangString MissProgMessage "${LYX_LANG}" 'dn dal programy nen teba piinstalovat.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuce LaTeXu' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Nastavte distribuci LaTeXu, kterou m LyX pouvat.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Mete zde voliteln nastavit cestu k souboru "latex.exe" a tm urit \ - distribuci LaTeXu, kterou bude pouvat Lyx.\r\n\ - Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!\r\n\ - \r\n\ - Instaltor nalezl na vaem potai LaTeXovou distribuci \ - "$LaTeXName". Ne je uvedena jej cesta.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Ne nastavte cestu k souboru "latex.exe". Urte tm, kter \ - distribuce LaTeXu bude pouvna LyXem.\r\n\ - Pokud nepouijete LaTeX, LyX neme vyszet vsledn dokumenty!\r\n\ - \r\n\ - Instaltor nemohl nalzt distribuci LaTeXu na vaem potai.' -LangString PathName "${LYX_LANG}" 'Cesta k souboru "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Nepouvat LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Soubor "latex.exe" nen v zadan cest.' - -LangString LatexInfo "${LYX_LANG}" 'Nyn bude sputn instaltor LaTeXov-distribuce "MiKTeX".$\r$\n\ - V instaltoru pokraujte tlatkem "Next" dokud instalace nezane.$\r$\n\ - $\r$\n\ - !!! Uijte vechny pedvolby instaltoru MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'dn LaTeXov-distribuce nebyla nalezena!$\r$\n\ - Nemete pouvat LyX bez distribuce LaTeXu jako je nap. "MiKTeX"!$\r$\n\ - Instalace bude proto peruena.' - -LangString GSviewInfo "${LYX_LANG}" 'Nyn bude sputn instaltor programu "GSview".$\r$\n\ - K jeho instalaci zmknte nejprve tlatko "Setup" v prvnm okn,$\r$\n\ - vyberte jazyk a stisknt tlatko "Next" v nsledujcm okn.$\r$\n\ - Mete pout vechny pedvolby tohoto instaltoru.' -LangString GSviewError "${LYX_LANG}" 'Program "GSview" nebyl spn nainstalovn!$\r$\n\ - Instaltor bude navzdory tomu pokraovat.$\r$\n\ - Pokuste se nainstalovat GSview pozdji.' - -LangString JabRefInfo "${LYX_LANG}" 'Nyn bude sputn instaltor programu "JabRef".$\r$\n\ - Mete pout vechny pedvolby instaltoru JabRef.' -LangString JabRefError "${LYX_LANG}" 'Program "JabRef" nebyl spn nainstalovn.$\r$\n\ - Instaltor bude navzdory tomu pokraovat.$\r$\n\ - Pokuste se nainstalovat JabRef pozdji.' - -LangString LatexConfigInfo "${LYX_LANG}" "Nsledujc konfigurovn LyXu chvli potrv." - -LangString AspellInfo "${LYX_LANG}" 'Nyn budou staeny a nainstalovny slovnky pro kontrolu pravopisu programu "Aspell".$\r$\n\ - Kad slovnk m odlinou licenci, kter bude zobrazena ped instalac.' -LangString AspellDownloadFailed "${LYX_LANG}" "Nelze sthnout dn slovnku Aspellu!" -LangString AspellInstallFailed "${LYX_LANG}" "Nelze nainstalovat dn slovnk Aspellu!" -LangString AspellPartAnd "${LYX_LANG}" " a " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Slovnk jazyka je ji naistalovn' -LangString AspellNone "${LYX_LANG}" 'Nebyl nainstalovn dn slovnk pro Aspell.$\r$\n\ - Slovnky pro kontrolu pravopisu lze sthnout z$\r$\n\ - ${AspellLocation}$\r$\n\ - Chcete je sthnout nyn?' -LangString AspellPartStart "${LYX_LANG}" "Byl spn nainstalovn" -LangString AspellPart1 "${LYX_LANG}" "anglick slovnk" -LangString AspellPart2 "${LYX_LANG}" "slovnk jazyka: $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - slovnk jazyka: $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' pro kontrolu pravopisu programem "Aspell".$\r$\n\ - Vce slovnk me bt staeno z$\r$\n\ - ${AspellLocation}$\r$\n\ - Chcete nyn sthnout jin slovnk ?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Aby kad uivatel mohl pozdji pizpsobit MiKTeX pro sv poteby$\r$\n\ - je teba nastavit prva zpisu pro vechny uivatele do adrese MiKTeXu$\r$\n\ - $MiKTeXPath $\r$\n\ - a vech jeho podadres." -LangString MiKTeXInfo "${LYX_LANG}" 'LaTeXov distribuce "MiKTeX" bude pouita dohromady s LyXem.$\r$\n\ - Je doporueno nainstalovat dostupn aktualizace MiKTeXu pomoc programu "MiKTeX Update Wizard"$\r$\n\ - pedtm ne poprv spustte LyX.$\r$\n\ - Chcete zkontrolovat dostupn aktualizace MiKTeXu nyn?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Tento aktualizan balek me bt pout jen na ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Nelze nastavit 'path_prefix' v konfiguranm skriptu" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Nelze vytvoit lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Nelze spustit konfiguran skript" -LangString NotAdmin "${LYX_LANG}" "Potebujete administrtorsk prva pro nainstalovn LyXu!" -LangString InstallRunning "${LYX_LANG}" "Instaltor je ji sputn!" -LangString StillInstalled "${LYX_LANG}" "LyX je ji nainstalovn! Nejprve LyX odinstalujte." - -LangString FinishPageMessage "${LYX_LANG}" "Blahopejeme! LyX byl spn nainstalovn.\r\n\ - \r\n\ - (Prvn sputn LyXu me trvat del dobu.)" -LangString FinishPageRun "${LYX_LANG}" "Spustit LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Nelze nalzt LyX v registrech.$\r$\n\ - Zstupce na ploe a ve Start menu nebude smazn." -LangString UnInstallRunning "${LYX_LANG}" "Nejprve muste zavt LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" "Muste mt administrtorsk prva pro odinstalovn LyXu!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Chcete opravdu smazat LyX a vechny jeho komponenty?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Uivatelsk nastaven LyXu' -LangString UnGSview "${LYX_LANG}" 'Zvolte tlatko "Uninstall" v dalm okn pro odinstalovn$\r$\n\ - prohlee "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX byl spn odstrann z vaeho potae." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Odinstalovat program pro kontrolu pravopisu Aspell a vechny jeho slovnky.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Odinstalovat LaTeXovou-distribuci MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Odinstalovat manaer bibliografie JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Smazat konfiguran adres LyXu$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - pro vechny uivatele.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Odinstalovat LyX a vechny jeho komponenty." - -!undef LYX_LANG - -!endif ; _LYX_LANGUAGES_CZECH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/danish.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/danish.nsh deleted file mode 100644 index 14b5664200..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/danish.nsh +++ /dev/null @@ -1,150 +0,0 @@ -!ifndef _LYX_LANGUAGES_DANISH_NSH_ -!define _LYX_LANGUAGES_DANISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_DANISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Denne guide vil installere LyX p din computer.\r\n\ - \r\n\ - Du skal have administratorrettigheder for at installerer LyX.\r\n\ - \r\n\ - Det anbefales at du lukker alle krende programmer inden start af setup-guiden. Dette vil tillade guiden at opdatere de ndvendiget systemfiler uden at skulle genstarte computeren.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Dokument" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installer til alle brugere?" -LangString SecFileAssocTitle "${LYX_LANG}" "Fil-associationer" -LangString SecDesktopTitle "${LYX_LANG}" "Skrivebordsikon" - -LangString SecCoreDescription "${LYX_LANG}" "Filerne til LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program til gennemsyn af Postscript- og PDF-dokumenter." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Installer LyX til alle brugere, eller kun den aktuelle bruger." -LangString SecFileAssocDescription "${LYX_LANG}" "Opret association mellem LyX og .lyx filer." -LangString SecDesktopDescription "${LYX_LANG}" "Et LyX ikon p skrivebordet" - -LangString LangSelectHeader "${LYX_LANG}" "Valg af sprog i LyX's menuer" -LangString AvailableLang "${LYX_LANG}" " Tilgngelige Sprog " - -LangString MissProgHeader "${LYX_LANG}" "Tjek for ndvendige programmer" -LangString MissProgCap "${LYX_LANG}" "Flgende ndvendige program(mer) vil ogs blive installeret" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, en LaTeX distribution" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, en PostScript og PDF overstter" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, en billed-konverter" -LangString MissProgAspell "${LYX_LANG}" "Aspell, en stavekontrol" -LangString MissProgMessage "${LYX_LANG}" 'Ingen andre programmer behves.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-distribution' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Vlg den LaTeX-distribution som LyX skal bruge.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Du kan her vlge stien til filen "latex.exe" og derved vlge hvilken \ - LaTeX-distribution som bruges LyX.\r\n\ - Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!\r\n\ - \r\n\ - Installationsprogrammet har detekteret LaTeX-distributionen \ - "$LaTeXName" p din computer i nedenstende sti:' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Vlg nedenfor stien til filen "latex.exe". Herved kan du vlge hvilken \ - LaTeX-distribution LyX skal bruge.\r\n\ - Hvis du ikke vlger LaTeX, kan LyX ikke generere dokumenter!\r\n\ - \r\n\ - Installationsprogrammet kunne ikke finde nogen LaTeX-distribution.' -LangString PathName "${LYX_LANG}" 'Sti til filen "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Brug ikke LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Kunne ikke finde "latex.exe".' - -LangString LatexInfo "${LYX_LANG}" 'Installationen af LaTeX-distributionen "MiKTeX" startes.$\r$\n\ - For at installere programmet tryk p "Next"-knappen i installationsvinduet indtil installationen begynder.$\r$\n\ - $\r$\n\ - !!! Brug alle MiKTeX installationsprogrammets foreslde valg !!!' -LangString LatexError1 "${LYX_LANG}" 'Ingen LaTeX-distribution fundet!$\r$\n\ - LyX kan ikke bruges uden en LaTeX-distribution sasom "MiKTeX"!$\r$\n\ - Installationen afbrydes.' - -LangString GSviewInfo "${LYX_LANG}" 'Installationen af programmet "GSview" startes.$\r$\n\ - For at installere programmet tryk p "Setup"-knappen i det forste installationsvindue$\r$\n\ - vlg sprog og tryk p "Next"-knappen i det efterfolgende installationsvindue.$\r$\n\ - Du kan bruge alle GSview installationsprogrammets foreslede valg.' -LangString GSviewError "${LYX_LANG}" 'Programmet "GSview" kunne ikke installeres!$\r$\n\ - Installationen af LyX fortsttes alligevel.$\r$\n\ - Prov at installere GSview p et senere tidspunkt.' - -LangString JabRefInfo "${LYX_LANG}" 'Installationen af programmet "JabRef" startes.$\r$\n\ - Du kan roligt bruge alle "default" valgmuligheder ved JabRef-installationen.' -LangString JabRefError "${LYX_LANG}" 'Programmet "JabRef" kunne ikke installeres!$\r$\n\ - Installationen vil dog fortstte.$\r$\n\ - Prv at installere JabRef igen senere.' - -LangString LatexConfigInfo "${LYX_LANG}" "Den flgende konfiguration af LyX vil tage et stykke tid." - -LangString AspellInfo "${LYX_LANG}" 'Ordbger til stavekontrollen "Aspell" vil blive hentet og installeret.$\r$\n\ - Hvert sprog har sin egen licens, som vil blive vist fr installationen.' -LangString AspellDownloadFailed "${LYX_LANG}" "Ingen Aspell ordbog kunne hentes!" -LangString AspellInstallFailed "${LYX_LANG}" "Ingen Aspell ordbog kunne installeres!" -LangString AspellPartAnd "${LYX_LANG}" " og " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Der er allerede installeret en ordbog for dette sprog' -LangString AspellNone "${LYX_LANG}" 'Ingen ordbog for stavekontrollen "Aspell" blev installeret.$\r$\n\ - Ordbger kan hentes fra$\r$\n\ - ${AspellLocation}$\r$\n\ - Vil du hente ordbgerne nu?' -LangString AspellPartStart "${LYX_LANG}" "Succesfuld installation af " -LangString AspellPart1 "${LYX_LANG}" "en engelsk ordbog" -LangString AspellPart2 "${LYX_LANG}" "en $LangName ordbog" -LangString AspellPart3 "${LYX_LANG}" "en$\r$\n\ - $LangNameSys ordbog" -LangString AspellPart4 "${LYX_LANG}" ' for stavekontrollen "Aspell".$\r$\n\ - Flere ordbger kan hentes fra$\r$\n\ - ${AspellLocation}$\r$\n\ - Vil du hente flere ordbger nu?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "For at alle brugere senere kan konfigurere MiKTeX$\r$\n\ - er det ndvendigt at give skriverettigheder for alle MiKTeX brugere i installations mappen$\r$\n\ - $MiKTeXPath $\r$\n\ - og dennes undermapper." -LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX-distributionen "MiKTeX" vil blive brugt sammen med LyX.$\r$\n\ - Det anbefales at installere tilgngelige MiKTeX-opdateringer ved hjlp af programmet "MiKTeX Update Wizard"$\r$\n\ - fr LyX startes for frste gang.$\r$\n\ - Vil du tjekke om der findes MiKTeX opdateringer?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Forsoget p at indstille 'path_prefix' i konfigurationen mislykkedes" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Kunne ikke oprette lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Mislykket forsog p at afvikle konfigurations-scriptet" -LangString NotAdmin "${LYX_LANG}" "Du skal have administrator-rettigheder for at installere LyX!" -LangString InstallRunning "${LYX_LANG}" "Installationsprogrammet krer allerede!" -LangString StillInstalled "${LYX_LANG}" "LyX er allerede installeret! Afinstaller LyX frst." - -LangString FinishPageMessage "${LYX_LANG}" "Tillykke!! LyX er installeret.\r\n\ - \r\n\ - (Nr LyX startes frste gang, kan det tage noget tid.)" -LangString FinishPageRun "${LYX_LANG}" "Start LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Kunne ikke finde LyX i registreringsdatabsen.$\r$\n\ - Genvejene p skrivebordet og i Start-menuen bliver ikke fjernet" -LangString UnInstallRunning "${LYX_LANG}" "Du ma afslutte LyX forst!" -LangString UnNotAdminLabel "${LYX_LANG}" "Du skal have administrator-rettigheder for at afinstallere LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Er du sikker p, at du vil slette LyX og alle tilhrende komponenter?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Vr sa god at trykke p "Uninstall"-knappen i det nste vindue for at afinstallere$\r$\n\ - Postscript and PDF-programmet "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX er blevet fjernet fra din computer." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Afinstallerer stavekontrollen "Aspell" og alle dens mapper.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" 'Afinstallerer LaTeX-distributionen "MiKTeX".' -LangString SecUnJabRefDescription "${LYX_LANG}" 'Afinstallerer bibliografi programmet "JabRef".' -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Sletter LyX$\'s konfigurations mappe$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - for alle brugere.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Afinstallerer LyX og alle dets komponenter." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_DANISH_NSH_ - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/dutch.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/dutch.nsh deleted file mode 100644 index d78f8ca5f7..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/dutch.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_DUTCH_NSH_ -!define _LYX_LANGUAGES_DUTCH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_DUTCH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Dit installatie programma zal LyX op uw systeem installeren.\r\n\ - \r\n\ - U heeft systeem-beheerrechten nodig om LyX te installeren.\r\n\ - \r\n\ - Het is aanbevolen om alle andere programma's af te sluiten voordat u Setup start. Dit zorgt ervoor dat Setup bepaalde systeembestanden kan bijwerken zonder uw systeem opnieuw op te starten.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Document" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installeer voor alle gebruikers?" -LangString SecFileAssocTitle "${LYX_LANG}" "Bestand associaties" -LangString SecDesktopTitle "${LYX_LANG}" "Bureaublad pictogram" - -LangString SecCoreDescription "${LYX_LANG}" "De LyX bestanden." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programma dat gebruikt wordt om Postscript en PDF documenten te lezen." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Installeer LyX voor alle gebruikers of uitsluitend de huidige gebruiker?" -LangString SecFileAssocDescription "${LYX_LANG}" "Associeer het LyX programma met de .lyx extensie." -LangString SecDesktopDescription "${LYX_LANG}" "Een LyX pictogram op het Bureaublad." - -LangString LangSelectHeader "${LYX_LANG}" "Taalselectie voor LyX's menu" -LangString AvailableLang "${LYX_LANG}" " Beschikbare Talen " - -LangString MissProgHeader "${LYX_LANG}" "Controleer welke programma's nodig zijn" -LangString MissProgCap "${LYX_LANG}" "De volgende aanvullende programmma's zijn vereist, en zullen worden geinstalleerd" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, LaTeX software" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, een PostScript/PDF converteer programma" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, een programma om afbeeldingen te converteren" -LangString MissProgAspell "${LYX_LANG}" "Aspell, een programma voor spellingscontrole" -LangString MissProgMessage "${LYX_LANG}" 'Aanvullende programma$\'s zijn niet vereist.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX software' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Geef aan welke LaTeX-software LyX moet gebruiken.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'U kunt hier opgeven in welke map het programma "latex.exe" zich bevindt en op deze manier bepalen \ - welke LaTeX softare gebruikt wordt door LyX.\r\n\ - Zonder LaTeX kan LyX geen documenten generen!\r\n\ - \r\n\ - Het installatie programma heeft de LaTeX software \ - "$LaTeXName" op uw systeem gevonden in de volgende map.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'U kunt hier opgeven in welke map het programma "latex.exe" zich bevindt en op deze manier bepalen \ - welke LaTeX software gebruikt wordt door LyX.\r\n\ - Zonder LaTeX kan LyX geen documenten generen!\r\n\ - \r\n\ - Het installatie programma heeft geen LaTeX software op uw systeem gevonden.' -LangString PathName "${LYX_LANG}" 'Map met het programma "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Gebruik geen LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" '"latex.exe" is niet gevonden.' - -LangString LatexInfo "${LYX_LANG}" 'Het installatieprogramma van "MiKTeX" word gestart.$\r$\n\ - Om het programma te installeren klik op de "Next"-knop in het installatie venster totdat de installatie begint.$\r$\n\ - $\r$\n\ - !!! Gebruik de standaard opties tijdens de installatie van MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'Er is geen LaTeX software gevonden!$\r$\n\ - LyX kan niet worden gebruikt zonder LaTeX software zoals "MiKTeX"!$\r$\n\ - De installatie wordt daarom afgebroken.' - -LangString GSviewInfo "${LYX_LANG}" 'Het installatieprogramma van "GSview" wordt gestart.$\r$\n\ - Klik op de "Setup"-knop in het eerste venster van het installatie programma om de software te installeren$\r$\n\ - kies een taal, en klik daarna op de "Next"-knop in de volgende vensters van het installatie programma.$\r$\n\ - U kunt alle standaard opties van het GSview installatie programma gebruiken.' -LangString GSviewError "${LYX_LANG}" 'Het programma "GSview" kon niet worden geinstalleerd!$\r$\n\ - De installatie van LyX gaat echter door.$\r$\n\ - Probeer GSview later te installeren.' - -LangString JabRefInfo "${LYX_LANG}" 'Het installatie programma van "JabRef" wordt nu gestart.$\r$\n\ - U kunt de standaard opties gebruiken.' -LangString JabRefError "${LYX_LANG}" 'Het programma "JabRef" kon niet worden geinstalleerd!$\r$\n\ - De LyX installatie gaat desondanks verder.$\r$\n\ - Probeer JabRef later te installeren.' - -LangString LatexConfigInfo "${LYX_LANG}" "De volgende configuratie van LyX zal enige tijd duren." - -LangString AspellInfo "${LYX_LANG}" 'Er worden nu woordenlijst gedownload en geinstalleer voor het spellingscontrole programma "Aspell".$\r$\n\ - Elke woordenlijst heeft een eigen licensie die zal worden getoond voor installatie.' -LangString AspellDownloadFailed "${LYX_LANG}" "Er kon geen Aspell woordenlijst worden gedownload!" -LangString AspellInstallFailed "${LYX_LANG}" "Er kon geen Aspell woordenlijst worden geinstalleerd!" -LangString AspellPartAnd "${LYX_LANG}" " en " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Woordenlijst reeds geinstalleerd voor: ' -LangString AspellNone "${LYX_LANG}" 'Er is geen woordenlijst geinstalleerd voor het spellingscontrole programma "Aspell".$\r$\n\ - Woordenlijsten kunnen worden gedownload van$\r$\n\ - ${AspellLocation}$\r$\n\ - Wilt u de woordenlijsten nu downloaden?' -LangString AspellPartStart "${LYX_LANG}" "Succesvolle installatie van " -LangString AspellPart1 "${LYX_LANG}" "een engelse woordenlijst" -LangString AspellPart2 "${LYX_LANG}" "een woordenlijst voor $LangName" -LangString AspellPart3 "${LYX_LANG}" "een$\r$\n\ - woordenlijst voor $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' voor het spellingscontrole programma "Aspell".$\r$\n\ - Meer woordenlijsten kunnen worden gedownload van$\r$\n\ - ${AspellLocation}$\r$\n\ - Wilt u nu andere woordenlijsten downloaden?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Opdat elke gebruiker zijn MiKTeX configuratie kan aanpassen$\r$\n\ - is het noodzakelijk alle gebruikers schrijfpermissie te geven in MiKTeX's installatie map$\r$\n\ - $MiKTeXPath $\r$\n\ - en submappen." -LangString MiKTeXInfo "${LYX_LANG}" 'LyX gebruikt de LaTeX softare "MiKTeX".$\r$\n\ - Het is aanbevolen MiKTeX-updates te installeren via de "MiKTeX Update Wizard"$\r$\n\ - voordat u LyX voor de eerste keer gebruikt.$\r$\n\ - Wilt u controleren of er updates voor MiKTeX beschikbaar zijn?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Mislukte poging om 'path_prefix' te registreren tijdens de configuratie" -LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.bat kon niet worden aangemaakt" -LangString RunConfigureFailed "${LYX_LANG}" "Mislukte configuratie poging" -LangString NotAdmin "${LYX_LANG}" "U heeft systeem-beheerrechten nodig om LyX te installeren!" -LangString InstallRunning "${LYX_LANG}" "Het installatieprogramma is al gestart!" -LangString StillInstalled "${LYX_LANG}" "LyX is reeds geinstalleerd! Verwijder LyX eerst." - -LangString FinishPageMessage "${LYX_LANG}" "Gefeliciteerd! LyX is succesvol geinstalleerd.\r\n\ - \r\n\ - (De eerste keer dat u LyX start kan dit enige seconden duren.)" -LangString FinishPageRun "${LYX_LANG}" "Start LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "LyX is niet gevonden in het Windows register.$\r$\n\ - Snelkoppelingen op het Bureaublad en in het Start Menu worden niet verwijderd." -LangString UnInstallRunning "${LYX_LANG}" "U moet LyX eerst afsluiten!" -LangString UnNotAdminLabel "${LYX_LANG}" "U heeft systeem-beheerrechten nodig om LyX te verwijderen!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Weet u zeker dat u LyX en alle componenten volledig wil verwijderen van deze computer?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Klik op de "Uninstall" knop in het volgende venster om het$\r$\n\ - Postscript en PDF leesprogramma "GSview" te verwijderen.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX was successvol verwijderd van uw computer." - -LangString SecUnAspellDescription "${LYX_LANG}" "Verwijder het spellingscontrole programma Aspell en alle bijbehorende woordelijsten." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Verwijder de LaTeX software MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Verwijder de bibliografie manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Verwijder LyX$\'s configuratie map$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - voor alle gebruikers.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Verwijder LyX en alle bijbehorende onderdelen." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_DUTCH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/english.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/english.nsh deleted file mode 100644 index 5523b07ec6..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/english.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_ENGLISH_NSH_ -!define _LYX_LANGUAGES_ENGLISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_ENGLISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "This wizard will guide you through the installation of LyX.\r\n\ - \r\n\ - You need administrator privileges to install LyX.\r\n\ - \r\n\ - It is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Document" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Install for all users?" -LangString SecFileAssocTitle "${LYX_LANG}" "File associations" -LangString SecDesktopTitle "${LYX_LANG}" "Desktop icon" - -LangString SecCoreDescription "${LYX_LANG}" "The LyX files." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program to view Postscript- and PDF-documents." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Install LyX for all users or just the current user." -LangString SecFileAssocDescription "${LYX_LANG}" "Files with a .lyx extension will automatically open in LyX." -LangString SecDesktopDescription "${LYX_LANG}" "A LyX icon on the desktop." - -LangString LangSelectHeader "${LYX_LANG}" "Selection of LyX's menu language" -LangString AvailableLang "${LYX_LANG}" " Available Languages " - -LangString MissProgHeader "${LYX_LANG}" "Check for required programs" -LangString MissProgCap "${LYX_LANG}" "The following required program(s) will be installed additionally" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, a LaTeX distribution" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, an interpreter for PostScript and PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, an image converter" -LangString MissProgAspell "${LYX_LANG}" "Aspell, a spellchecker" -LangString MissProgMessage "${LYX_LANG}" 'No additional programs need to be installed.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-distribution' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Set the LaTeX-distribution that LyX should use.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'You can optionally set here the path to the file "latex.exe" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer has detected the LaTeX-distribution \ - "$LaTeXName" on your system. Displayed below is its path.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Set below the path to the file "latex.exe". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -LangString PathName "${LYX_LANG}" 'Path to the file "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Don't use LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'The file "latex.exe" is not in the specified path.' - -LangString LatexInfo "${LYX_LANG}" 'Now the installer of the LaTeX-distribution "MiKTeX" will be launched.$\r$\n\ - To install the program press the "Next"-button in the installer windows until the installation begins.$\r$\n\ - $\r$\n\ - !!! Please use all default options of the MiKTeX-installer !!!' -LangString LatexError1 "${LYX_LANG}" 'No LaTeX-distribution could be found!$\r$\n\ - LyX cannot be used without a LaTeX-distribution like "MiKTeX"!$\r$\n\ - The installation will therefore be aborted.' - -LangString GSviewInfo "${LYX_LANG}" 'Now the installer of the program "GSview" will be launched.$\r$\n\ - To install the program press the "Setup"-button in the first installer window,$\r$\n\ - choose a language and then press the "Next"-button in the following installer windows.$\r$\n\ - You can use all default options of the GSview-installer.' -LangString GSviewError "${LYX_LANG}" 'The program "GSview" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install GSview again later.' - -LangString JabRefInfo "${LYX_LANG}" 'Now the installer of the program "JabRef" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -LangString JabRefError "${LYX_LANG}" 'The program "JabRef" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' - -LangString LatexConfigInfo "${LYX_LANG}" "The following configuration of LyX will take a while." - -LangString AspellInfo "${LYX_LANG}" 'Now dictionaries for the spellchecker "Aspell" will be downloaded and installed.$\r$\n\ - Every dictionary has a different license that will be displayed before the installation.' -LangString AspellDownloadFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be downloaded!" -LangString AspellInstallFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be installed!" -LangString AspellPartAnd "${LYX_LANG}" " and " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'There is already installed a dictionary of the language' -LangString AspellNone "${LYX_LANG}" 'No dictionary for the spellchecker "Aspell" has been installed.$\r$\n\ - Dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download dictionaries now?' -LangString AspellPartStart "${LYX_LANG}" "There was successfully installed " -LangString AspellPart1 "${LYX_LANG}" "an english dictionary" -LangString AspellPart2 "${LYX_LANG}" "a dictionary of the language $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - dictionary of the language $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' for the spellchecker "Aspell".$\r$\n\ - More dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download other dictionaries now?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." -LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program "MiKTeX Update Wizard"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Could not set 'path_prefix' in the configure script" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Could not create lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Could not execute the configure script" -LangString NotAdmin "${LYX_LANG}" "You must have administrator privileges to install LyX!" -LangString InstallRunning "${LYX_LANG}" "The installer is already running!" -LangString StillInstalled "${LYX_LANG}" "LyX is already installed! Deinstall LyX first." - -LangString FinishPageMessage "${LYX_LANG}" "Congratulations! LyX has been installed successfully.\r\n\ - \r\n\ - (The first start of LyX might take some seconds.)" -LangString FinishPageRun "${LYX_LANG}" "Launch LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Unable to find LyX in the registry.$\r$\n\ - Shortcuts on the desktop and in the Start Menu will not be removed." -LangString UnInstallRunning "${LYX_LANG}" "You must close LyX at first!" -LangString UnNotAdminLabel "${LYX_LANG}" "You must have administrator privileges to uninstall LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Are you sure you want to completely remove LyX and all of its components?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Please press the "Uninstall" button in the next window to uninstall$\r$\n\ - the Postscript and PDF-viewer "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX was successfully removed from your computer." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Uninstalls the spellchecker Aspell and all of its dictionaries.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Uninstalls the LaTeX-distribution MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Uninstalls the bibliography manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Deletes LyX$\'s configuration folder$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - for all users.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Uninstall LyX and all of its components." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_ENGLISH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/french.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/french.nsh deleted file mode 100644 index 96c1daf207..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/french.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_FRENCH_NSH_ -!define _LYX_LANGUAGES_FRENCH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_FRENCH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Cet assistant vous guidera durant l'installation de LyX.\r\n\ - \r\n\ - Vous devez tre administrateur pour installer LyX.\r\n\ - \r\n\ - Avant de dbuter l'installation, il est recommand de fermer toutes les autres applications. Cela permettra de mettre jour certains fichiers systme sans redmarrer votre ordinateur.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Document LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installer pour tous les utilisateurs ?" -LangString SecFileAssocTitle "${LYX_LANG}" "Associations de fichiers" -LangString SecDesktopTitle "${LYX_LANG}" "Icne du bureau" - -LangString SecCoreDescription "${LYX_LANG}" "Les fichiers LyX" -LangString SecInstGSviewDescription "${LYX_LANG}" "Application permettant d'afficher les documents PostScript - et PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Gestionnaire de rfrences bibliographiques et diteur de ficjiers BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Installer LyX pour tous les utilisateurs, ou seulement pour l'utilisateur courant ?." -LangString SecFileAssocDescription "${LYX_LANG}" "Les fichiers de suffixe .lyx seront automatiquement ouverts dans LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Une icne LyX sur le bureau." - -LangString LangSelectHeader "${LYX_LANG}" "Slection de la langue pour les menus de LyX" -LangString AvailableLang "${LYX_LANG}" " Langues disponibles" - -LangString MissProgHeader "${LYX_LANG}" "Vrification de la prsence des applications requises." -LangString MissProgCap "${LYX_LANG}" "Le(s) application(s) requise(s) suivante(s) seront galement installes." -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, une distribution LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un interprteur pour PostScript and PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, un convertisseur graphique" -LangString MissProgAspell "${LYX_LANG}" "Aspell, un correcteur orthographique" -LangString MissProgMessage "${LYX_LANG}" 'Aucune application supplmentaire ne doit tre installe.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribution LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Choisir la distribution LaTeX que LyX devra utiliser.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'ventuellement, vous pouvez fixer ici le chemin d$\'accs au fichier "latex.exe" et de ce fait fixer \ - la distribution LaTeX utilise par Lyx.\r\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !\r\n\ - \r\n\ - L$\'assistant d$\'installation a dtect la distribution LaTeX \ - "$LaTeXName" sur votre systme. Le chemin d$\'accs est affich ci-dessous.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Fixez ci-dessous le chemin d$\'accs au fichier "latex.exe". De ce fait vous fixez la \ - distribution LaTeX utilise par Lyx.\r\n\ - Si vous n$\'utilisez pas LaTeX, LyX ne peut crer de documents !\r\n\ - \r\n\ - L$\'assistant d$\'installation n$\'a pas pu trouver de distribution LaTeX sur votre systme.' -LangString PathName "${LYX_LANG}" 'Chemin vers le fichier "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "N'utilisez pas LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" '"latex.exe" introuvable dans le chemin d$\'accs spcifi.' - -LangString LatexInfo "${LYX_LANG}" 'Lancement de l$\'installation de la distribution LaTeX "MiKTeX".$\r$\n\ - Pour installer l$\'application, appuyer sur le bouton "Next" de la fentre d$\'installation jusqu$\' ce que celle-ci commence.$\r$\n\ - $\r$\n\ - !!! Prenez garde utiliser toutes les options implicites du programme d$\'installation MikTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'Distribution LaTeX introuvable !$\r$\n\ - LyX ne peut tre utilis sans distribution LaTeX, comme par exemple "MiKTeX" !$\r$\n\ - L$\'installation de LyX va donc tre abandonne.' - -LangString GSviewInfo "${LYX_LANG}" 'Lancement de l$\'installation de l$\'application "GSview".$\r$\n\ - Pour installer l$\'application, appuyer sur le bouton "Setup" de la premire fentre d$\'installation$\r$\n\ - choisir une langue, puis appuyer sur le bouton "Next" de la fentre d$\'installation suivante.$\r$\n\ - Vous pouvez utiliser les options implicites du programme d$\'installation GSview.' -LangString GSviewError "${LYX_LANG}" 'L$\'application "GSview" n$\'a pas pu tre installe correctement !$\r$\n\ - L$\'installation de LyX va continuer.$\r$\n\ - Essayer d$\'installer GSview de nouveau plus tard.' - -LangString JabRefInfo "${LYX_LANG}" 'Lancement de l$\'installation de l$\'application "JabRef".$\r$\n\ - Vous pouvez utiliser les options implicites du programme d$\'installation JabRef.' -LangString JabRefError "${LYX_LANG}" 'L$\'application "JabRef" n$\'a pas pu tre installe correctement !$\r$\n\ - L$\'installation de LyX va continuer.$\r$\n\ - Essayer d$\'installer JabRef de nouveau plus tard.' - -LangString LatexConfigInfo "${LYX_LANG}" "La configuration de LyX qui va suivre prendra un moment." - -LangString AspellInfo "${LYX_LANG}" 'Maintenant les dictionnaires du correcteur orthographique "Aspell" vont tre tlchargs et installs.$\r$\n\ - Chaque dictionnaire est dot d$\'une licence diffrente qui sera affiche avant l$\'installation.' -LangString AspellDownloadFailed "${LYX_LANG}" "Aucun dictionnaire Aspell n$\'a pu tre tlcharg !" -LangString AspellInstallFailed "${LYX_LANG}" "Aucun dictionnaire Aspell n$\'a pu tre install !" -LangString AspellPartAnd "${LYX_LANG}" " et " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Un dictionnaire est dj install pour la langue' -LangString AspellNone "${LYX_LANG}" 'Aucun dictionnaire pour le correcteur orthographique Aspell n$\'a pu tre install.$\r$\n\ - Les dictionnaires peuvent tre tlchargs depuis$\r$\n\ - ${AspellLocation}$\r$\n\ - Voulez-vous tlcharger les dictionnaires maintenant ?' -LangString AspellPartStart "${LYX_LANG}" "Ont t installs avec succs " -LangString AspellPart1 "${LYX_LANG}" "un dictionnaire anglophone" -LangString AspellPart2 "${LYX_LANG}" "un dictionnaire pour la langue $LangName" -LangString AspellPart3 "${LYX_LANG}" "un$\r$\n\ - dictionnaire pour la langue $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' pour le correcteur orthographique "Aspell".$\r$\n\ - D$\'autres dictionnaires peuvent tre tlchargs depuis$\r$\n\ - ${AspellLocation}$\r$\n\ - Voulez-vous tlcharger d$\'autres dictionnaires maintenant ?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Pour que chaque utilisateur soit capable de personnaliser MiKTeX pour ses besoins$\r$\n\ - il est ncessaire de positionner les permissions en criture dans le rpertoire d$\'installation de MiKTeX pour tous les utilisateurs$\r$\n\ - ($MiKTeXPath) $\r$\n\ - et pour ses sous-rpertoires." -LangString MiKTeXInfo "${LYX_LANG}" 'La distribution LaTeX "MiKTeX" sera utilise par LyX.$\r$\n\ - Il est recommand d$\'installer les mises jour en utilisant l$\'application "MiKTeX Update Wizard"$\r$\n\ - avant d$\'utiliser LyX pour la premire fois.$\r$\n\ - Voulez-vous vrifier maintenant les mises jour de MiKTeX ?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Ce paquetage ne peut mettre jour que ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "chec de l'allocation 'path_prefix' lors de la configuration." -LangString CreateCmdFilesFailed "${LYX_LANG}" "Cration de lyx.bat impossible." -LangString RunConfigureFailed "${LYX_LANG}" "chec de la tentative de configuration initiale de LyX." -LangString NotAdmin "${LYX_LANG}" "Vous devez avoir les droits d'administration pour installer LyX !" -LangString InstallRunning "${LYX_LANG}" "Le programme d'installation est toujours en cours !" -LangString StillInstalled "${LYX_LANG}" "LyX est dj install ! Le dsinstaller d'abord." - -LangString FinishPageMessage "${LYX_LANG}" "Flicitations ! LyX est install avec succs.\r\n\ - \r\n\ - (Le premier dmarrage de LyX peut demander quelques secondes.)" -LangString FinishPageRun "${LYX_LANG}" "Dmarrer LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "LyX introuvable dans le base des registres.$\r$\n\ - Les raccourcis sur le bureau et dans le menu de dmarrage ne seront pas supprims." -LangString UnInstallRunning "${LYX_LANG}" "Vous devez fermer LyX d'abord !" -LangString UnNotAdminLabel "${LYX_LANG}" "Vous devez avoir les droits d'administration pour dsinstaller LyX !" -LangString UnReallyRemoveLabel "${LYX_LANG}" "tes vous sr(e) de vouloir supprimer compltement LyX et tous ses composants ?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Prfrences utilisateurs de LyX' -LangString UnGSview "${LYX_LANG}" 'Merci d$\'appuyer sur le bouton "Dsinstaller" de la prochaine fentre pour dsinstaller.$\r$\n\ - l$\'afficheur Postscript/PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX supprim de votre ordinateur avec succs." - -LangString SecUnAspellDescription "${LYX_LANG}" "Dsinstalle le correcteur orthographique Aspell et tous ses dictionnaires." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Dsinstalle la distribution LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Uninstalls the bibliography manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Supprime le rpertoire de configuration de LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - pour tous les utilisateurs.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Dsinstaller LyX et tous ses composants." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_FRENCH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/galician.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/galician.nsh deleted file mode 100644 index 3f6b13ca57..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/galician.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_GALICIAN_NSH_ -!define _LYX_LANGUAGES_GALICIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_GALICIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Este asistente vai-no guiar na instalacin do LyX no seu computador.\r\n\ - \r\n\ - Para poder instalar o LyX precisa de privilxios de administrador.\r\n\ - \r\n\ - Recomenda-se fechar todas as outras aplicacins antes de iniciar a instalacin. Isto posibilita actualizar os ficheiros do sistema relevantes sen ter que reiniciar o computador.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Documento LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instalar para todos os usurios?" -LangString SecFileAssocTitle "${LYX_LANG}" "Asociacin dos ficheiros" -LangString SecDesktopTitle "${LYX_LANG}" "Icone do ambiente de traballo" - -LangString SecCoreDescription "${LYX_LANG}" "Os ficheiros LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programa para visualizar documentos en Postscript e PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Xestor de referncias bibliogrficas e editor de ficheiros BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Instalar o LyX monousurio ou multiusurio." -LangString SecFileAssocDescription "${LYX_LANG}" "Asociar a extensin .lyx co LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Cria un icone do LyX no ambiente de traballo." - -LangString LangSelectHeader "${LYX_LANG}" "Seleccin da lingua dos menus no LyX" -LangString AvailableLang "${LYX_LANG}" " Lnguas disponbeis " - -LangString MissProgHeader "${LYX_LANG}" "Verificacin dos programas necesrios" -LangString MissProgCap "${LYX_LANG}" "O(s) seguinte(s) programa(s) necesrio(s) van ser instalados adicionalmente" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, unha distribucin de LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un interprete de PostScript e PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, um conversor de imaxes" -LangString MissProgAspell "${LYX_LANG}" "Aspell, un corrector ortogrfico" -LangString MissProgMessage "${LYX_LANG}" 'Non necesrio instalar programas adicionais.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuicin de LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Escolha a distribucin de LaTeX que vai usar o LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Opcionalmente pode especificar o camio do ficheiro "latex.exe" e posteriormente \ - escoller a distribuicin de LaTeX que vai usar o LyX.\r\n\ - Sen LaTeX o LyX non pode (pr-)imprimir os documentos!\r\n\ - \r\n\ - O instalador detectou a distribucin de LaTeX "$LaTeXName"\ - no seu sistema, no camio que se mostra abaixo.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Especifique abaixo o camio ao ficheiro "latex.exe". Posteriormente escolla \ - a distribucin de LaTeX que debe usar o LyX.\r\n\ - Sem LaTeX o LyX non pode (pr-)imprimir os documentos!\r\n\ - \r\n\ - O instalador non pudo achar nengunha distribucin de LaTeX no seu sistema.' -LangString PathName "${LYX_LANG}" 'Camio ao ficheiro "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Non usar LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'O ficheiro "latex.exe" non est no camio especificado.' - -LangString LatexInfo "${LYX_LANG}" 'Agora lanzar-se o instalador da distribucin de LaTeX "MiKTeX".$\r$\n\ - Para instalar o programa prema no botn "Prximo" na xanela de instalacin at a instalacin comezar.$\r$\n\ - $\r$\n\ - !!! Por favor use todas as opcins por defeito do instalador do MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'Non se achou nengunha distribucin de LaTeX!$\r$\n\ - Non se pode usar o LyX sen unha distribucin de LaTeX como a "MiKTeX"!$\r$\n\ - Por iso a instalacin vai ser abortada.' - -LangString GSviewInfo "${LYX_LANG}" 'Agora lanzar-se o instalador do programa "GSview".$\r$\n\ - Para instalar prema no botn "Setup" na primeira xanela de instalacin$\r$\n\ - escolla a lngua e despois prema no botn "Prximo" na seguinte xanela do instalador.$\r$\n\ - Pode usar todas as opcins por defeito no instalador do GSview.' -LangString GSviewError "${LYX_LANG}" 'Non se deu instalado o programa "GSview"!$\r$\n\ - De todos os xeitos a instalacin do LyX continua.$\r$\n\ - Tente instalar mis adiante o GSview.' - -LangString JabRefInfo "${LYX_LANG}" 'Agora lanzar-se o instalador do programa "JabRef".$\r$\n\ - Pode usar todas as opcins por defeito no instalador do JabRef.' -LangString JabRefError "${LYX_LANG}" 'Non se deu instalado o programa "JabRef"!$\r$\n\ - De todos os xeitos a instalacin do LyX continua.$\r$\n\ - Tente instalar mais adiante o JabRef.' - -LangString LatexConfigInfo "${LYX_LANG}" "A configuracin seguinte do LyX ir demorar un pouco." - -LangString AspellInfo "${LYX_LANG}" 'Agora se van descarregar e instalar dicionrios do corrector ortogrfico "Aspell".$\r$\n\ - Cada dicionrio ten unha licenza diferente, que se mostrar antes da instalacin.' -LangString AspellDownloadFailed "${LYX_LANG}" "Non se deu descarregadao nengun dicionrio do Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" "Non se deu instalado nengun dicionrio do Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " e " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Xa ha instalado un dicionrio desta lngua' -LangString AspellNone "${LYX_LANG}" 'Non se instalou nengun dicionrio do "Aspell".$\r$\n\ - Os dicionrios poden descarregar-se de$\r$\n\ - ${AspellLocation}$\r$\n\ - Desexa descarregar dicionrios agora?' -LangString AspellPartStart "${LYX_LANG}" "Instalou-se con suceso " -LangString AspellPart1 "${LYX_LANG}" "un dicionrio de ingls" -LangString AspellPart2 "${LYX_LANG}" "un dicionrio de $LangName" -LangString AspellPart3 "${LYX_LANG}" "un$\r$\n\ - dicionrio de $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' para o corrector ortogrfico "Aspell".$\r$\n\ - posbel descarregar mis dicionrios de$\r$\n\ - ${AspellLocation}$\r$\n\ - Desexa descarregar outros dicionrios agora?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Para que cada usurio poda personalizar posteriormente o MiKTeX segundo as suas$\r$\n\ - necesidades, cumpre a pasta onde foi instalado o MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e as suas subpastas teren permiso de escritura para todos os usurios." -LangString MiKTeXInfo "${LYX_LANG}" 'Xunto co LyX vai-se empregar a distribucin de LaTeX "MiKTeX".$\r$\n\ - Antes de usar o LyX pola primeira vez, recomenda-se instalar as actualizacins disponbeis$\r$\n\ - do MiKTeX co instalador "MiKTeX Update Wizard"$\r$\n\ - Desexa comprovar agora se ha actualizacins do MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Non se puido engadir o 'path_prefix' no script de configuracin" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Non se deu criado o lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Non se deu executado o script de configuracin" -LangString NotAdmin "${LYX_LANG}" "Precisa de privilxios de administrador para instalar o LyX!" -LangString InstallRunning "${LYX_LANG}" "O instalador xa est a correr!" -LangString StillInstalled "${LYX_LANG}" "O LyX xa est instalado! Desinstale o LyX primeiro." - -LangString FinishPageMessage "${LYX_LANG}" "Parabns! O LyX foi instalado con suceso.\r\n\ - \r\n\ - (O primeiro incio do LyX pode levar alguns segundos.)" -LangString FinishPageRun "${LYX_LANG}" "Lanzar o LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Non se da achado o LyX no registo.$\r$\n\ - Non se eliminarn os atallos para o ambiente de traballo e no menu de Incio." -LangString UnInstallRunning "${LYX_LANG}" "Debe fechar o LyX en primeiro lugar!" -LangString UnNotAdminLabel "${LYX_LANG}" "Precisa de privilxios de administrador para desinstalar o LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Seguro que quer eliminar completamente o LyX e todos os seus componentes?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferncias de usurio do LyX' -LangString UnGSview "${LYX_LANG}" 'Por favor prema no botn "Desinstalar" na prxima xanela para desinstalar$\r$\n\ - o visualizador de Postscript e PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "Eliminou-se o LyX do seu computador." - -LangString SecUnAspellDescription "${LYX_LANG}" "Desinstala o corrector ortogrfico Aspell e todos os seus dicionrios." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Desinstala a distribucin de LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Desinstala o xestor de referncias bibliogrficas JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Elimina as pastas de configuracin do LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - de todos os usurios.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Desinstala LyX e todos os seus componentes." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_GALICIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/german.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/german.nsh deleted file mode 100644 index 9adb864d99..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/german.nsh +++ /dev/null @@ -1,150 +0,0 @@ -!ifndef _LYX_LANGUAGES_GERMAN_NSH_ -!define _LYX_LANGUAGES_GERMAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_GERMAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Dieser Assistent wird Sie durch die Installation von LyX begleiten.\r\n\ - \r\n\ - Sie bentigen Administratorrechte um LyX zu installieren.\r\n\ - \r\n\ - Es wird empfohlen vor der Installation alle anderen Programme zu schlieen, damit bestimmte Systemdateien ohne Neustart ersetzt werden knnen.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Dokument" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Fr alle Nutzer installieren?" -LangString SecFileAssocTitle "${LYX_LANG}" "Dateizuordnungen" -LangString SecDesktopTitle "${LYX_LANG}" "Desktopsymbol" - -LangString SecCoreDescription "${LYX_LANG}" "Das Programm LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programm zum Betrachten von Postscript- und PDF-Dokumenten." -LangString SecInstJabRefDescription "${LYX_LANG}" "Manager fr bibliografische Referenzen und Editor fr BibTeX-Dateien." -LangString SecAllUsersDescription "${LYX_LANG}" "LyX fr alle Nutzer oder nur fr den aktuellen Nutzer installieren." -LangString SecFileAssocDescription "${LYX_LANG}" "Vernpfung zwischen LyX und der .lyx Dateiendung." -LangString SecDesktopDescription "${LYX_LANG}" "Verknpfung zu LyX auf dem Desktop." - -LangString LangSelectHeader "${LYX_LANG}" "Wahl der Mensprache von LyX" -LangString AvailableLang "${LYX_LANG}" " Verfgbare Sprachen " - -LangString MissProgHeader "${LYX_LANG}" "Suche nach bentigten Programmen" -LangString MissProgCap "${LYX_LANG}" "Es werden folgende bentigte Programme zustzlich installiert" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, eine LaTeX-Distribution" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, ein Interpreter fr PostScript und PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, ein Bildkonverter" -LangString MissProgAspell "${LYX_LANG}" "Aspell, eine Rechtschreibprfung" -LangString MissProgMessage "${LYX_LANG}" 'Es mssen keine zustzlichen Programme installiert werden.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-Distribution' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Legen Sie die LaTeX-Distribution fest die LyX verwenden soll.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Optional knnen Sie hier den Pfad zur Datei "latex.exe" angeben und damit die \ - LaTeX-Distribution festlegen die LyX verwenden soll.\r\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!\r\n\ - \r\n\ - Der Installer hat auf Ihrem System die LaTeX-Distribution\r\n\ - "$LaTeXName" erkannt. Unten angegeben ist ihr Pfad.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Geben Sie unten den Pfad zur Datei "latex.exe" an. Damit legen Sie fest welche \ - LaTeX-Distribution LyX verwenden soll.\r\n\ - Wenn Sie kein LaTeX verwenden, kann LyX keine Dokumente ausgeben!\r\n\ - \r\n\ - Der Installer konnte auf Ihrem System keine LaTeX-Distribution finden.' -LangString PathName "${LYX_LANG}" 'Pfad zur Datei "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Kein LaTeX benutzen" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Kann die Datei "latex.exe" nicht finden.' - -LangString LatexInfo "${LYX_LANG}" 'Als Nchstes wird der Installer der LaTeX-Distribution "MiKTeX" gestartet.$\r$\n\ - Um das Programm zu installieren, drcken Sie den "Weiter"-Knopf in den Installerfenstern bis die Installation beginnt.$\r$\n\ - $\r$\n\ - !!! Bitte verwenden Sie alle voreingestellten Optionen des MiKTeX-Installers !!!' -LangString LatexError1 "${LYX_LANG}" 'Es konnte keine LaTeX-Distribution gefunden werden!$\r$\n\ - LyX kann ohne eine LaTeX-Distribution wie z.B. "MiKTeX" nicht benutzt werden!$\r$\n\ - Die Installation wird daher abgebrochen.' - -LangString GSviewInfo "${LYX_LANG}" 'Als Nchstes wird der Installer des Programms "GSview" gestartet.$\r$\n\ - Um das Programm zu installieren, drcken Sie den "Setup"-Knopf im ersten Installerfenster,$\r$\n\ - whlen eine Sprache und drcken dann den "Weiter"-Knopf in den folgenden Installerfenstern.$\r$\n\ - Sie knnen alle voreingestellten Optionen des GSview-Installers verwenden.' -LangString GSviewError "${LYX_LANG}" 'Das Programm "GSview" konnte nicht erfolgreich installiert werden!$\r$\n\ - Die Installation wird trotzdem fortgesetzt.$\r$\n\ - Versuchen Sie GSview spter noch einmal zu installieren.' - -LangString JabRefInfo "${LYX_LANG}" 'Als Nchstes wird der Installer des Programms "JabRef" gestartet.$\r$\n\ - Sie knnen alle voreingestellten Optionen des JabRef-Installers verwenden.' -LangString JabRefError "${LYX_LANG}" 'Das Programm "JabRef" konnte nicht erfolgreich installiert werden!$\r$\n\ - Der Installer wird trotzdem fortgesetzt.$\r$\n\ - Versuchen Sie JabRef spter noch einmal zu installieren.' - -LangString LatexConfigInfo "${LYX_LANG}" "Die folgende Konfiguration von LyX wird eine Weile dauern." - -LangString AspellInfo "${LYX_LANG}" 'Es werden nun Wrterbcher fr die Rechtschreibprfung "Aspell" heruntergeladen und installiert.$\r$\n\ - Jedes Wrterbuch hat andere Lizenzbedingungen die Sie vor der Installation angezeigt bekommen.' -LangString AspellDownloadFailed "${LYX_LANG}" "Das Wrterbuch konnte nicht heruntergeladen werden!" -LangString AspellInstallFailed "${LYX_LANG}" "Das Wrterbuch konnte nicht installiert werden!" -LangString AspellPartAnd "${LYX_LANG}" " und " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Es ist bereits ein Wrterbuch der Sprache' -LangString AspellNone "${LYX_LANG}" 'Es wurde kein Wrterbuch fr die Rechtschreibprfung "Aspell" installiert.$\r$\n\ - Wrterbcher knnen von$\r$\n\ - ${AspellLocation}$\r$\n\ - heruntergeladen werden. Wollen Sie jetzt Wrterbcher herunterladen?' -LangString AspellPartStart "${LYX_LANG}" "Es wurde erfolgreich " -LangString AspellPart1 "${LYX_LANG}" "ein englisches Wrterbuch" -LangString AspellPart2 "${LYX_LANG}" "ein Wrterbuch der Sprache $LangName" -LangString AspellPart3 "${LYX_LANG}" "ein$\r$\n\ - Wrterbuch der Sprache $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' fr die Rechtschreibprfung "Aspell" installiert.$\r$\n\ - Weitere Wrterbcher knnen von$\r$\n\ - ${AspellLocation}$\r$\n\ - heruntergeladen werden. Wollen Sie jetzt andere Wrterbcher herunterladen?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Damit jeder Benutzer spter MiKTeX fr seine Bedrfnisse anpassen kann,$\r$\n\ - ist es erforderlich fr MiKTeXs Installationsordner$\r$\n\ - $MiKTeXPath $\r$\n\ - und seine Unterordner Schreibrechte fr alle Benutzer zu setzen." -LangString MiKTeXInfo "${LYX_LANG}" 'Die LaTeX-Distribution "MiKTeX" wird zusammen mit LyX verwendet werden.$\r$\n\ - Es wird empfohlen dass Sie verfgbare MiKTeX-Updates mit Hilfe des Programms "MiKTeX Update Wizard"$\r$\n\ - installieren, bevor sie LyX das erste Mal benutzen.$\r$\n\ - Mchten Sie jetzt nach Updates fr MiKTeX suchen?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Dieses Update-Paket kann nur ${PRODUCT_VERSION_OLD} updaten!" -LangString ModifyingConfigureFailed "${LYX_LANG}" 'Der "PATH_prfix" (Liste mit Programmpfaden) konnte nicht im Konfigurationsskript gesetzt werden.' -LangString CreateCmdFilesFailed "${LYX_LANG}" "Konnte die Datei lyx.bat nicht erzeugen." -LangString RunConfigureFailed "${LYX_LANG}" "Konnte das Konfigurationsskript nicht ausfhren." -LangString NotAdmin "${LYX_LANG}" "Sie bentigen Administratorrechte um LyX zu installieren!" -LangString InstallRunning "${LYX_LANG}" "Der Installer luft bereits!" -LangString StillInstalled "${LYX_LANG}" "LyX ist bereits installiert! Deinstallieren Sie LyX zuerst." - -LangString FinishPageMessage "${LYX_LANG}" "Glckwunsch! LyX wurde erfolgreich installiert.\r\n\ - \r\n\ - (Der erste Start von LyX kann etwas lnger dauern.)" -LangString FinishPageRun "${LYX_LANG}" "LyX starten" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Kann LyX nicht in der Registry finden.$\r$\n\ - Desktopsymbole und Eintrge im Startmen knnen nicht entfernt werden." -LangString UnInstallRunning "${LYX_LANG}" "Sie mssen LyX zuerst beenden!" -LangString UnNotAdminLabel "${LYX_LANG}" "Sie bentigen Administratorrechte um LyX zu deinstallieren!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Sind Sie sicher, dass sie LyX und all seine Komponenten deinstallieren mchten?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyXs Benutzereinstellungen' -LangString UnGSview "${LYX_LANG}" 'Bitte drcken Sie im nchsten Fenster den Knopf "Uninstall" um das$\r$\n\ - Postscript und PDF-Betrachtungsprogramm "GSview" zu deinstallieren.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX wurde erfolgreich von ihrem Computer entfernt." - -LangString SecUnAspellDescription "${LYX_LANG}" "Deinstalliert die Rechtschreibprfung Aspell und all seine Wrterbcher." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Deinstalliert die LaTeX-Distribution MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Deinstalliert den Bibliografiemanager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Lscht LyXs Benutzereinstellungen,$\r$\n\ - (den Ornder:$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}")$\r$\n\ - fr alle Benutzer.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Deinstalliert LyX und all seine Komponenten." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_GERMAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/hungarian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/hungarian.nsh deleted file mode 100644 index b4c506bf2a..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/hungarian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_HUNGARIAN_NSH_ -!define _LYX_LANGUAGES_HUNGARIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_HUNGARIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "A varzsl segtsgvel tudja telepteni a LyX-et.\r\n\ - \r\n\ - A LyX teleptshez rendszergazdai jogra van szksge.\r\n\ - \r\n\ - A telepts megkezdse eltt, javasolt kilpni minden fut alkalmazsbl. Ez a lps teszi lehetv, hogy frisstsnk fontos rendszerfjlokat jraindts szksgessge nlkl.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-dokumentum" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Telepts minden felhasznlnak" -LangString SecFileAssocTitle "${LYX_LANG}" "Fjltrstsok" -LangString SecDesktopTitle "${LYX_LANG}" "Parancsikon asztalra" - -LangString SecCoreDescription "${LYX_LANG}" "A LyX futtatshoz szksges fjlok." -LangString SecInstGSviewDescription "${LYX_LANG}" "Alkalmazs Postscript- s PDF-fjlok megjelentshez." -LangString SecInstJabRefDescription "${LYX_LANG}" "Irodalomjegyzk-hivatkozs szerkeszt s kezel BibTeX fjlokhoz." -LangString SecAllUsersDescription "${LYX_LANG}" "Minden felhasznlnak teleptsem vagy csak az aktulisnak?" -LangString SecFileAssocDescription "${LYX_LANG}" "A .lyx kiterjesztssel rendelkez fjlok megnyitsa automatikusan a LyX-el trtnjen." -LangString SecDesktopDescription "${LYX_LANG}" "LyX-ikon elhelyezse az asztalon." - -LangString LangSelectHeader "${LYX_LANG}" "A LyX felhasznli fellet nyelvnek kivlasztsa" -LangString AvailableLang "${LYX_LANG}" " Vlaszthat nyelvek " - -LangString MissProgHeader "${LYX_LANG}" "Mkdshez szksges programok ellenrzse" -LangString MissProgCap "${LYX_LANG}" "A kvetkez program(ok) teleptse fog mg megtrtnni" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, LaTeX-disztribci" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, ami egy PostScript s PDF rtelmez" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, ami egy kptalakt" -LangString MissProgAspell "${LYX_LANG}" "Aspell, ami egy helyesrs ellenrz" -LangString MissProgMessage "${LYX_LANG}" 'Nem kell tovbbi programokat teleptenie.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-disztribci' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Adja meg a LaTeX-disztribcit, amit a LyX-nek hasznlnia kell.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Itt megadhatja az elrsi tvonalat a "latex.exe" fjlhoz s ezzel meg is adja \ - melyik LaTeX disztribcit fogja hasznlni a LyX.\r\n\ - Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!\r\n\ - \r\n\ - A telept megtallta az n szmtgpn a \ - "$LaTeXName" disztribcit. Lent lthatja az elrsi tvonalt.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Adja meg a hasznland "latex.exe" fjl elrsi tvonalt. Ezzel azt is megadja \ - melyik LaTeX disztribcit fogja hasznlni a LyX.\r\n\ - Amennyiben nem hasznl LaTeX-et, a LyX nem tud kimenetet kszteni!\r\n\ - \r\n\ - A telept nem tallt a szmtgpn LaTeX disztribcit!' -LangString PathName "${LYX_LANG}" 'A "latex.exe" fjl elrsi tja' -LangString DontUseLaTeX "${LYX_LANG}" "Ne hasznlja a LaTeX-et" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Nem tallom a "latex.exe" fjlt, a megadott helyen.' - -LangString LatexInfo "${LYX_LANG}" 'A "MiKteX" LaTeX-disztribci teleptjnek indtsa kvetkezik.$\r$\n\ - A program teleptshez addig nyomkodja a "Kvetkez" gombot a telept ablakban, amg a telepts el nem kezd?dik.$\r$\n\ - $\r$\n\ - !!! Krem hasznlja a MikTeX-telept alaprtelmezett opciit!!!' -LangString LatexError1 "${LYX_LANG}" 'Nem talltam LaTeX-disztribcit!$\r$\n\ - A LyX nem hasznlhat egy LaTeX-disztibci nlkl,(mint pldul a "MiKTeX")!$\r$\n\ - Ezrt a telepts nem folytathat!' - -LangString GSviewInfo "${LYX_LANG}" 'A "GSview" program teleptjnek indtsa kvetkezik.$\r$\n\ - A program teleptshez, nyomja meg a "Telept"-gombot a telept els ablakban,$\r$\n\ - azutn vlasszon nyelvet, majd nyomja meg a "Kvetkez"-gombot a kvetkez telept ablakokban.$\r$\n\ - Hasznlhatja a program ltal javasolt belltsokat.' -LangString GSviewError "${LYX_LANG}" 'A "GSview" programot nem sikerlt telepteni!$\r$\n\ - Azonban a telepts tovbb fog folytatdni.$\r$\n\ - Ksbb prblja meg jra a GSview teleptst.' - -LangString JabRefInfo "${LYX_LANG}" 'A "JabRef" teleptjnek elindtsa kvetkezik.$\r$\n\ - Hasznlhatja az alaprtelmezett opcikat.' -LangString JabRefError "${LYX_LANG}" 'Nem tudom telepteni a "JabRef" programot!$\r$\n\ - Azonban a telepts tovbb fog folytatdni.$\r$\n\ - Ksbb prblja meg jra telepteni a JabRef-et.' - -LangString LatexConfigInfo "${LYX_LANG}" "A LyX telepts utni belltsa hossz idt vehet ignybe." - -LangString AspellInfo "${LYX_LANG}" 'Az "Aspell" helyesrs-ellenrzhz hasznlhat sztrak letltse s teleptse kvetkezik.$\r$\n\ - Minden egyes sztrnak klnbz licence lehet, ezrt a licenc minden telepts eltt meg lesz jelentve.' -LangString AspellDownloadFailed "${LYX_LANG}" "Nem tudtam Aspell sztrat letlteni!" -LangString AspellInstallFailed "${LYX_LANG}" "Nincs teleptend Aspell sztr!" -LangString AspellPartAnd "${LYX_LANG}" " s " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Mr van teleptve helyesrs-ellenrz sztr a kvetkez nyelvhez' -LangString AspellNone "${LYX_LANG}" 'Nem lett sztr teleptve az "Aspell" helyesrs-ellenrzhz.$\r$\n\ - A szksges sztrakat letltheti a kvetkez cmrl:$\r$\n\ - ${AspellLocation}$\r$\n\ - Szeretne most sztrakat letlteni?' -LangString AspellPartStart "${LYX_LANG}" "Sikeresen teleplt " -LangString AspellPart1 "${LYX_LANG}" "az angol sztr" -LangString AspellPart2 "${LYX_LANG}" "a(z) $LangName nyelv sztra" -LangString AspellPart3 "${LYX_LANG}" "a(z)$\r$\n\ - $LangNameSys nyelv sztra" -LangString AspellPart4 "${LYX_LANG}" ' az "Aspell" helyesrs-ellenrzhz.$\r$\n\ - Sztrat egyb nyelvekhez a ${AspellLocation}$\r$\n\ - cmrl tlthet le.$\r$\n\ - Szeretne letlteni egyb sztrakat?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Ahhoz, hogy a tbbi felhasznl is testre tudja hasznlni a MiKTeX-et$\r$\n\ - rs jogot kell adni minden felhasznl rszre a MiKTeX alknyvtrhoz.$\r$\n\ - A $MiKTeXPath $\r$\n\ - valamint alknyvtraihoz." -LangString MiKTeXInfo "${LYX_LANG}" 'A "MiKTeX" LaTeX-disztibci lesz hasznlva a LyX ltal.$\r$\n\ - Javasolt telepteni a MiKTeX frisstseket a "MiKTeX Update Wizard" segtsgvel,$\r$\n\ - a LyX els indtsa eltt.$\r$\n\ - Szeretn ellenrizni a frisstseket most?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Ez a frisst csomag csak a ${PRODUCT_VERSION_OLD} verzit tudja frissteni!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Nem tudom belltani a 'path_prefix'-et a configure parancsfjlban!" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Nem tudom ltrehozni a lyx.bat fjlt." -LangString RunConfigureFailed "${LYX_LANG}" "Nem tudom vgrehajtani a configure parancsfjlt!" -LangString NotAdmin "${LYX_LANG}" "A LyX teleptshez rendszergazdai jogok szksgesek!" -LangString InstallRunning "${LYX_LANG}" "A telept mr fut!" -LangString StillInstalled "${LYX_LANG}" "A LyX mr teleptve van! Elszr tvoltsa el a rgit." - -LangString FinishPageMessage "${LYX_LANG}" "Gratullok! Sikeresen teleptette a LyX-et.\r\n\ - \r\n\ - (Az program els indtsa egy kis idt vehet ignybe...)" -LangString FinishPageRun "${LYX_LANG}" "LyX indtsa" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Nem tallom a LyX-et a regisztriben.$\r$\n\ - Az Asztalon s a Start Menben tallhat parancsikonok nem lesznek eltvoltva!." -LangString UnInstallRunning "${LYX_LANG}" "Elszr be kell zrnia a LyX-et!" -LangString UnNotAdminLabel "${LYX_LANG}" "A LyX eltvoltshoz rendszergazdai jogokkal kell rendelkeznie!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Biztosan abban, hogy el akarja tvoltani a LyX-t, minden tartozkval egytt?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX felhasznli belltsok' -LangString UnGSview "${LYX_LANG}" 'Krem nyomja meg az "Eltvolts" gombot, a PostScript s a\r$\n\ - PDF megjelent "GSview" eltvoltshoz a kvetkez ablakban.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX eltvoltsa a szmtgprl zkkenmentesen befejezdtt." - -LangString SecUnAspellDescription "${LYX_LANG}" "Aspell s minden sztrnak eltvoltsa." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "MikTeX LaTeX-disztibci eltvoltsa." -LangString SecUnJabRefDescription "${LYX_LANG}" "JabRef irodalomjegyzk kezel eltvoltsa." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'A LyX belltsok mappa trlse$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - minden felhasznlnl.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "A LyX s minden komponensnek eltvoltsa." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_HUNGARIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/indonesian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/indonesian.nsh deleted file mode 100644 index 198a79c736..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/indonesian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_INDONESIAN_NSH_ -!define _LYX_LANGUAGES_INDONESIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_INDONESIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Program ini akan memandu anda dalam melakukan instalasi LyX.\r\n\ - \r\n\ - Anda harus bertindak dan mempunyai hak sebagai administrator untuk instalasi LyX.\r\n\ - \r\n\ - Sangat disarankan anda menutup semua aplikasi sebelum memulai. Hal ini akan memungkinkan memperbarui berkas sistem yang relevan tanpa melakukan booting ulang komputer anda.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Dokumen-LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instal untuk semua pengguna?" -LangString SecFileAssocTitle "${LYX_LANG}" "Berkas yang terkait" -LangString SecDesktopTitle "${LYX_LANG}" "Ikon Desktop" - -LangString SecCoreDescription "${LYX_LANG}" "Berkas-berkas LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program untuk melihat dokumen Postscript dan PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Program manajemen acuan bibliografi dan penyunting berkas BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Instal LyX untuk semua pengguna atau hanya untuk pengguna ini saja." -LangString SecFileAssocDescription "${LYX_LANG}" "Berkas dengan ekstensi .lyx akan otomatis dibuka menggunakan LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Ikon LyX muncul di desktop." - -LangString LangSelectHeader "${LYX_LANG}" "Pilihan bahasa untuk menu LyX" -LangString AvailableLang "${LYX_LANG}" " Bahasa yang tersedia " - -LangString MissProgHeader "${LYX_LANG}" "Pengecekan program yang diperlukan" -LangString MissProgCap "${LYX_LANG}" "Berikut ini adalah program yang diperlukan dan akan diinstal sebagai tambahan" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, salah satu program distribusi LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, suatu penafsir PostScript and PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, salah satu pengkonversi gambar" -LangString MissProgAspell "${LYX_LANG}" "Aspell, salah satu program pemeriksa ejaan" -LangString MissProgMessage "${LYX_LANG}" 'Tidak ada program tambahan yang perlu diinstal.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribusi LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Pengaturan distribusi LaTeX yang akan digunakan dalam LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Anda dapat mengatur sendiri lokasi tempat berkas "latex.exe" berada dan mengatur lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.\r\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!\r\n\ - \r\n\ - Program instalasi ini mendeteksi adanya distribusi LaTeX \ - "$LaTeXName" dalam sistem anda. Dibawah ini adalah lokasi keberadaannya.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Aturlah lokasi tempat berkas "latex.exe" berada. Atur dan nyatakanlah lokasi \ - tempat distribusi LaTeX yang akan digunakan oleh LyX.\r\n\ - Apabila anda tidak menggunakan LaTeX, LyX tidak akan menampilkan output dokumen!\r\n\ - \r\n\ - Program instalasi ini tidak menemukan adanya distribusi LaTeX di sistem anda.' -LangString PathName "${LYX_LANG}" 'Lokasi tempat berkas "latex.exe" berada' -LangString DontUseLaTeX "${LYX_LANG}" "Tidak menggunakan LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Berkas "latex.exe" tidak berada di lokasi tempat yang dinyatakan.' - -LangString LatexInfo "${LYX_LANG}" 'Sekarang instalasi program distribusi LaTeX "MiKTeX" akan dijalankan.$\r$\n\ - Untuk meneruskan tekanlah tombol "Lanjut" yang ada di jendela dan tunggu sampai instalasi dimulai.$\r$\n\ - $\r$\n\ - !!! Gunakan semua pilihan default pada program instalasi MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'Distribusi LaTeX tidak ditemukan!$\r$\n\ - LyX tidak bisa digunakan tanpa menggunakan salah satu distribusi LaTeX seperti "MiKTeX"!$\r$\n\ - Oleh karena itu proses instalasi dibatalkan.' - -LangString GSviewInfo "${LYX_LANG}" 'Sekarang instalasi program "GSview" akan dijalankan.$\r$\n\ - Untuk memulainya tekanlah tombol "Mulai" pada jendela instalasi yang pertama,$\r$\n\ - pilihlah bahasa yang anda inginkan kemudian tekan tombol "Lanjut" pada jendela berikutnya.$\r$\n\ - Anda boleh memilih semua pilihan default yang ada di program instalasi GSview.' -LangString GSviewError "${LYX_LANG}" 'Program "GSview" tidak berhasil diinstal secara keseluruhan!$\r$\n\ - Namun proses instalasi dapat diteruskan.$\r$\n\ - Anda dapat mengulangi instalasi GSview nanti.' - -LangString JabRefInfo "${LYX_LANG}" 'Sekarang instalasi program "JabRef" akan dijalankan.$\r$\n\ - Anda boleh memilih semua pilihan default yang ada di program instalasi JabRef.' -LangString JabRefError "${LYX_LANG}" 'Program "JabRef" tidak berhasil diinstal secara keseluruhan!$\r$\n\ - Namun proses instalasi dapat diteruskan.$\r$\n\ - Anda dapat mengulang instalasi JabRef nanti.' - -LangString LatexConfigInfo "${LYX_LANG}" "Proses konfigurasi LyX selanjutnya akan memerlukan waktu beberapa saat." - -LangString AspellInfo "${LYX_LANG}" 'Sekarang kamus untuk pemeriksa ejaan "Aspell" akan dimuat turun kemudian diinstal.$\r$\n\ - Setiap lisensi kamus yang berbeda akan ditampilkan sebelum instalasi dimulai.' -LangString AspellDownloadFailed "${LYX_LANG}" "Kamus pemeriksa ejaan Aspell tidak bisa dimuat turun!" -LangString AspellInstallFailed "${LYX_LANG}" "Kamus pemeriksa ejaan Aspell tidak bisa diinstal!" -LangString AspellPartAnd "${LYX_LANG}" " dan " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Kamus bahasa sudah diinstal' -LangString AspellNone "${LYX_LANG}" 'Kamus untuk pemeriksa ejaan "Aspell" belum diinstal.$\r$\n\ - Berbagai kamus dapat dimuat turun dari$\r$\n\ - ${AspellLocation}$\r$\n\ - Apakah anda menginginkan memuat turun berbagai kamus sekarang?' -LangString AspellPartStart "${LYX_LANG}" "Sudah berhasil diinstal " -LangString AspellPart1 "${LYX_LANG}" "kamus bahasa inggris" -LangString AspellPart2 "${LYX_LANG}" "Kamus untuk bahasa $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - kamus dari bahasa $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' untuk pemeriksa ejaan "Aspell".$\r$\n\ - Berbagai kamus dapat dimuat turun dari$\r$\n\ - ${AspellLocation}$\r$\n\ - Apakah anda menginginkan memuat turun berbagai kamus yang lain sekarang?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Agar memungkinkan semua pengguna dapat mengatur MiKTeX sesuai keinginannya$\r$\n\ - anda perlu memberikan hak merubah untuk semua pengguna pada lokasi instalasi MiKTeX yaitu folder$\r$\n\ - $MiKTeXPath $\r$\n\ - serta di semua subfoldernya." -LangString MiKTeXInfo "${LYX_LANG}" 'Distribusi LaTeX "MiKTeX" akan digunakan dengan LyX.$\r$\n\ - Sangat disarankan memperbarui program yang ada di MiKTeX menggunakan "MiKTeX Update Wizard"$\r$\n\ - sebelum anda menggunakan LyX untuk yang pertama kali.$\r$\n\ - Apakah anda akan memeriksa perlunya memperbarui MikTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Program update ini hanya hanya dapat memperbarui ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Tidak bisa menyatakan 'path_prefix' pada skrip configure" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Tidak bisa membuat berkas lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Tidak bisa menjalankan skrip configure" -LangString NotAdmin "${LYX_LANG}" "Anda harus berlaku dan mempunyai hak sebagai administrator untuk instalasi LyX!" -LangString InstallRunning "${LYX_LANG}" "Program instalasi sedang berjalan!" -LangString StillInstalled "${LYX_LANG}" "LyX sudah pernah diinstal! Perlu menghapus LyX yang ada terlebih dahulu." - -LangString FinishPageMessage "${LYX_LANG}" "Selamat! LyX berhasil diinstal dengan sukses.\r\n\ - \r\n\ - (Menjalankan LyX untuk pertama kali memerlukan waktu beberapa detik.)" -LangString FinishPageRun "${LYX_LANG}" "Menjalankan LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Tidak bisa menemukan LyX di catatan registry.$\r$\n\ - Shortcuts pada desktop dan yang ada di Menu Start tidak dihapus." -LangString UnInstallRunning "${LYX_LANG}" "Anda harus menutup LyX terlebih dahulu!" -LangString UnNotAdminLabel "${LYX_LANG}" "Anda harus berlaku dan mempunyai hak sebagai administrator untuk menghapus LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Apakah anda yakin akan menghapus LyX secara menyeluruh termasuk semua komponen yang ada?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferensi pengguna LyX' -LangString UnGSview "${LYX_LANG}" 'Silahkan tekan tombol "Hapus" pada jendela berikutnya untuk memulai penghapusan$\r$\n\ - Postscript dan penampil PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX telah dihapus dengan sukses dari komputer anda." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Penghapusan pemeriksa ejaan Aspell serta kamus yang ada.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Penghapusan distribusi LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Penghapusan program manajemen bibliografi JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Menghapus berkas konfigurasi LyX pada folder$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - untuk semua pengguna.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Penghapusan LyX serta semua komponen yang ada." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_INDONESIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/italian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/italian.nsh deleted file mode 100644 index c4418bd3c8..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/italian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_ITALIAN_NSH_ -!define _LYX_LANGUAGES_ITALIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_ITALIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Questo programma installer LyX nel vostro computer.\r\n\ - \r\n\ - Per installare LyX sono necessari i privilegi di amministratore.\r\n\ - \r\n\ - Si raccomanda di chiudere tutte le altre applicazioni prima di iniziare l'installazione. Questo permetter al programma di installazione di aggiornare i file di sistema senza dover riavviare il computer.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Documento di LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installare per tutti gli utenti?" -LangString SecFileAssocTitle "${LYX_LANG}" "Associazioni dei file" -LangString SecDesktopTitle "${LYX_LANG}" "Icona sul Desktop" - -LangString SecCoreDescription "${LYX_LANG}" "I file di LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programma per visualizzare documenti in formato Postscript e PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Gestore dei riferimenti bibliografici ed editor per i files di BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Installazione LyX per tutti gli utenti o solo per l'utente attuale." -LangString SecFileAssocDescription "${LYX_LANG}" "Associa i files con estensione .lyx al programma LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Icona LyX sul desktop." - -LangString LangSelectHeader "${LYX_LANG}" "Scelta della lingua del menu di LyX" -LangString AvailableLang "${LYX_LANG}" " Lingue disponibili " - -LangString MissProgHeader "${LYX_LANG}" "Controllo dei programmi da installare" -LangString MissProgCap "${LYX_LANG}" "I seguenti programmi aggiuntivi sono necessari e verranno installati" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, una distribuzione di LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un interprete per documenti PostScript PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, un convertitore di immagini" -LangString MissProgAspell "${LYX_LANG}" "Aspell, un correttore ortografico" -LangString MissProgMessage "${LYX_LANG}" 'Nessun programma aggiuntivo deve essere installato.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuzione di LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Scegliere la distribuzione di LaTeX che LyX dovr usare.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Puoi impostare qui il percorso del file "latex.exe" e impostare di conseguenza \ - la distribuzione di LaTeX che LyX dovr usare.\r\n\ - Senza LaTeX, LyX non pu generare documenti!\r\n\ - \r\n\ - Il programma di installazione ha rilevato la distribuzione di LaTeX \ - "$LaTeXName" sul tuo sistema. Il suo percorso riportato sotto.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Imposta qui sotto il percorso del file "latex.exe". Con questo imposti quale \ - distribuzione di LaTeX dovr essere usata da LyX.\r\n\ - Senza LaTeX, LyX non pu generare documenti!\r\n\ - \r\n\ - Il programma di installazione non ha trovato una distribuzione di LaTeX sul tuo sistema.' -LangString PathName "${LYX_LANG}" 'Percorso del file "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Non usare LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Il file "latex.exe" non nel percorso indicato.' - -LangString LatexInfo "${LYX_LANG}" 'Verr adesso lanciato il programma di installazione della distribuzione di LateX "MiKTeX".$\r$\n\ - Per installare il programma premere "Next" nelle finestre di installazione fino all$\'avvio dell$\'installazione.$\r$\n\ - $\r$\n\ - !!! Lasciare le impostazioni di default suggerite dal programma di installazione di "MiKTeX" !!!' -LangString LatexError1 "${LYX_LANG}" 'Il programma non ha rilevato la presenza di alcuna distribuzione valida di LaTeX!$\r$\n\ - LyX non pu funzionare senza una distribuzione LaTeX (ad es. "MiKTeX")!$\r$\n\ - Il processo di installazione verr quindi terminato.' - -LangString GSviewInfo "${LYX_LANG}" 'Verr adesso lanciato il programma di installazione di "GSview".$\r$\n\ - Per proseguire premere il pulsante "Setup" che appare nella prima finestra di installazione,$\r$\n\ - scegliere la lingua e premere il pulsante "Next" nella finestra di installazione successiva.$\r$\n\ - Per comodit si consiglia di accettare le impostazioni di default suggerite dal programma di installazione di GSview.' -LangString GSviewError "${LYX_LANG}" 'Il programma "GSview" non stato installato correttamente!$\r$\n\ - L$\'installazione pu comunque proseguire.$\r$\n\ - Si consiglia di tentare nuovamente l$\'installazione di GSView al termine.' - -LangString JabRefInfo "${LYX_LANG}" 'Verr adesso lanciato il programma di installazione di "JabRef".$\r$\n\ - Puoi usare tutte le opzioni predefinite per il programma di installazione di JabRef.' -LangString JabRefError "${LYX_LANG}" 'Il programma "JabRef" non stato installato correttamente!$\r$\n\ - L$\'installazione pu comunque proseguire.$\r$\n\ - Si consiglia di tentare nuovamente l$\'installazione di JabRef al termine.' - -LangString LatexConfigInfo "${LYX_LANG}" "La seguente configurazione di LyX richieder un po' di tempo." - -LangString AspellInfo "${LYX_LANG}" 'Adesso verranno scaricati ed installati i dizionari per il correttore ortografico "Aspell".$\r$\n\ - Ogni dizionario ha la propria licenza che verr mostrata prima dell$\'installazione.' -LangString AspellDownloadFailed "${LYX_LANG}" "Impossibile scaricare i dizionari di Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" "Impossibile installare i dizionari di Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " e " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Un dizionario gi installato per la lingua' -LangString AspellNone "${LYX_LANG}" 'Nessun dizionario per il correttore ortografico "Aspell" stato installato.$\r$\n\ - I dizionari possono essere installati da$\r$\n\ - ${AspellLocation}$\r$\n\ - Vuoi scaricare i dizionari ora?' -LangString AspellPartStart "${LYX_LANG}" " stato installato con successo " -LangString AspellPart1 "${LYX_LANG}" "un dizionario inglese" -LangString AspellPart2 "${LYX_LANG}" "un dizionario per la lingua $LangName" -LangString AspellPart3 "${LYX_LANG}" "un$\r$\n\ - dizionario per la lingua $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' per il correttore ortografico "Aspell".$\r$\n\ - Ulteriori dizionari possono essere installati da$\r$\n\ - ${AspellLocation}$\r$\n\ - Vuoi scaricare altri dizionari ora?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Per permettere a tutti gli utenti di personalizzare successivamente MiKTeX in base alle loro esigenze$\r$\n\ - necessario impostare i permessi di scrittura per tutti gli utenti alla cartella di installazione di MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e alle sue sottocartelle." -LangString MiKTeXInfo "${LYX_LANG}" 'La distribuzione di LaTeX "MiKTeX" verr usata insieme a LyX.$\r$\n\ - Si raccomanda di installare gli aggiornamenti disponibili per MiKTeX utilizzando il programma "MiKTeX Update Wizard"$\r$\n\ - prima di usare LyX per la prima volta.$\r$\n\ - Vuoi controllare ora la presenza di aggiornamenti per MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Fallito tentativo di aggiornare 'path_prefix' nello script di configurazione" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Non possibile creare lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Fallito tentativo di eseguire lo script di configurazione" -LangString NotAdmin "${LYX_LANG}" "Occorrono i privilegi da amministratore per installare LyX!" -LangString InstallRunning "${LYX_LANG}" "Il programma di installazione gi in esecuzione!" -LangString StillInstalled "${LYX_LANG}" "LyX gi installato! Occorre rimuoverlo per poter procedere." - -LangString FinishPageMessage "${LYX_LANG}" "Congratulazioni! LyX stato installato con successo.\r\n\ - \r\n\ - (Il primo avvio di LyX potrebbe richiedere qualche secondo in pi.)" -LangString FinishPageRun "${LYX_LANG}" "Lancia LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Non riesco a trovare LyX nel registro.$\r$\n\ - I collegamenti sul desktop e nel menu Start non saranno rimossi." -LangString UnInstallRunning "${LYX_LANG}" " necessario chiudere LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" "Occorrono i privilegi da amministratore per rimuovere LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Siete sicuri di voler rimuovere completamente LyX e tutti i suoi componenti?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Impostazioni personali di LyX' -LangString UnGSview "${LYX_LANG}" 'Per rimuovere "GSview" (un visualizzatore di file Postscript e PDF) $\r$\n\ - necessario premere il pulsante "Uninstall" che apparir nella finestra successiva.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX stato rimosso dal sistema con successo." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Rimuove il correttore ortografico "Aspell" e tutti i suoi dizionari.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" 'Rimuove la distribuzione di LaTeX "MiKTeX".' -LangString SecUnJabRefDescription "${LYX_LANG}" "Rimuove il gestore della bibliografia JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Elimina la cartella con la configurazione di LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - per tutti gli utenti.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Rimuove LyX e tutti i suoi componenti." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_ITALIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh deleted file mode 100644 index 63928ab636..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/japanese.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_JAPANESE_NSH_ -!define _LYX_LANGUAGES_JAPANESE_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_JAPANESE} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "̃EBU[hAȂLyXCXg[Ԃ̂ē܂B\r\n\ - \r\n\ - LyXCXg[ɂ́AǗҌKvłB\r\n\ - \r\n\ - ZbgAbvJnOɁÂׂẴAvP[VI邱Ƃ߂܂B邱ƂɂāÃRs[^[ċN邱ƂȂA֘AVXet@CXV邱Ƃł悤ɂȂ܂B\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "ׂẴ[U[pɃCXg[܂H" -LangString SecFileAssocTitle "${LYX_LANG}" "t@C֘At" -LangString SecDesktopTitle "${LYX_LANG}" "fXNgbvEACR" - -LangString SecCoreDescription "${LYX_LANG}" "LyX̃t@CB" -LangString SecInstGSviewDescription "${LYX_LANG}" "|XgXNvgPDF{邽߂̃vOB" -LangString SecInstJabRefDescription "${LYX_LANG}" "QlǗBibTeXt@CGfB^B" -LangString SecAllUsersDescription "${LYX_LANG}" "LyXׂẴ[U[pɑ邩Ã݂[U[ɑ邩B" -LangString SecFileAssocDescription "${LYX_LANG}" "gq.lyx̃t@C͎ILyXŊJB" -LangString SecDesktopDescription "${LYX_LANG}" "fXNgbvLyXACRB" - -LangString LangSelectHeader "${LYX_LANG}" "LyX̃j[̑I" -LangString AvailableLang "${LYX_LANG}" " I”\Ȍ " - -LangString MissProgHeader "${LYX_LANG}" "KvȃvOmF" -LangString MissProgCap "${LYX_LANG}" "ȉ̕KvȃvOljIɃCXg[܂" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX: LaTeXfBXgr[V̈" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript: |XgXNvgPDF̃C^[v^" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick: 摜ϊq" -LangString MissProgAspell "${LYX_LANG}" "Aspell: Xy`FbJ[" -LangString MissProgMessage "${LYX_LANG}" 'ljvOCXg[Kv͂܂B' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeXfBXgr[V' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'LyXgׂLaTeXfBXgr[Vw肵ĂB' -LangString EnterLaTeXFolder "${LYX_LANG}" 'ł́A"latex.exe"t@Cւ̃pXw肷邱Ƃł܂B邱ƂɂāA\ - LyXgpׂLaTeXfBXgr[Vw肷邱Ƃł܂B\r\n\ - LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I\r\n\ - \r\n\ - CXg[[́AVXeLaTeXfBXgr[VƂ\ - "$LaTeXName"邱Ƃo܂Bɂ͂̃pX\Ă܂B' -LangString EnterLaTeXFolderNone "${LYX_LANG}" '"latex.exe"t@Cւ̃pXw肵ĂB邱ƂɂāA\ - LyXǂLaTeXfBXgr[Vgpׂw肷邱Ƃł܂B\r\n\ - LaTeXgȂ΁ALyX͕o͂邱Ƃł܂I\r\n\ - \r\n\ - CXg[[́AVXeLaTeXfBXgr[V‚邱Ƃł܂łB' -LangString PathName "${LYX_LANG}" '"latex.exe"t@Cւ̃pX' -LangString DontUseLaTeX "${LYX_LANG}" "LaTeXgpȂ" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'w肳ꂽpX"latex.exe"t@C‚܂B' - -LangString LatexInfo "${LYX_LANG}" 'ꂩLaTeXfBXgr[V"MiKTeX"̃CXg[[N܂B$\r$\n\ - vOCXg[ɂ́ACXg[n܂܂ŃCXg[[̃EBhEɂ"Next"{^ĂB$\r$\n\ - $\r$\n\ - IIIׂMiKTeXCXg[[̃ftHgIvVɏ]ĂBIII' -LangString LatexError1 "${LYX_LANG}" 'LaTeXfBXgr[V𔭌邱Ƃł܂łI$\r$\n\ - LyX́A"MiKTeX"̂悤LaTeXfBXgr[VȂł͎gƂł܂I$\r$\n\ - ăCXg[͒~܂B' - -LangString GSviewInfo "${LYX_LANG}" 'ꂩvO"GSview"̃CXg[[N܂B$\r$\n\ - vOCXg[ɂ́ACXg[[̍ŏ̃EBhEŢSetup{^A$\r$\n\ - IāACXg[[̎̃EBhEŁuNextv{^ĂB$\r$\n\ - GSviewCXg[[̃ftHg̃IvVׂĎ󂯓Ă܂܂B' -LangString GSviewError "${LYX_LANG}" 'vO"GSview"͐CXg[܂łI$\r$\n\ - CXg[[́AƂ肠̂܂܃CXg[𑱂܂B$\r$\n\ - GSview̃CXg[ēx݂ĂB' - -LangString JabRefInfo "${LYX_LANG}" 'ꂩvO"JabRef"̃CXg[[N܂B$\r$\n\ - JabRefCXg[[̃ftHg̃IvVׂĎ󂯓Ă܂܂B' -LangString JabRefError "${LYX_LANG}" 'vO"JabRef"͐CXg[܂łI$\r$\n\ - CXg[[́AƂ肠̂܂܃CXg[𑱂܂B$\r$\n\ - JabRef̃CXg[ēx݂ĂB' - -LangString LatexConfigInfo "${LYX_LANG}" "ȉLyX̐ݒɂ͏XԂ܂B" - -LangString AspellInfo "${LYX_LANG}" 'ꂩXy`FbJ["Aspell"̎_E[hăCXg[܂B$\r$\n\ - e͈قȂ郉CZXĂ̂ŁACXg[̑OɊeX\܂B' -LangString AspellDownloadFailed "${LYX_LANG}" "Xy`FbJ[Aspell̎_E[h邱Ƃł܂łI" -LangString AspellInstallFailed "${LYX_LANG}" "Xy`FbJ[Aspell̎CXg[邱Ƃł܂łI" -LangString AspellPartAnd "${LYX_LANG}" "y" -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'ȉ̌̎͊ɃCXg[Ă܂:' -LangString AspellNone "${LYX_LANG}" 'Xy`FbJ["Aspell"p̎CXg[Ă܂B$\r$\n\ - ${AspellLocation}$\r$\n\ - _E[h邱Ƃł܂B$\r$\n\ - ܃_E[h܂H' -LangString AspellPartStart "${LYX_LANG}" 'Xy`FbJ["Aspell"p"' -LangString AspellPart1 "${LYX_LANG}" "pꎫ" -LangString AspellPart2 "${LYX_LANG}" "u$LangNamev̎" -LangString AspellPart3 "${LYX_LANG}" "$\r$\n\ - u$LangNameSysv̎" -LangString AspellPart4 "${LYX_LANG}" 'CXg[Ă܂Blj̎$\r$\n\ - ${AspellLocation}$\r$\n\ - _E[h邱Ƃł܂B$\r$\n\ - ̎܃_E[h܂H' - -LangString MiKTeXPathInfo "${LYX_LANG}" "ׂẴ[U[ŕKvɉMiKTeX$\r$\n\ - JX^}CYł悤ɁAMiKTeX̃CXg[tH_$\r$\n\ - $MiKTeXPath $\r$\n\ - Ƃ̉ʃtH_̏݌AׂẴ[U[ɗ^Kv܂B" -LangString MiKTeXInfo "${LYX_LANG}" 'LyXƂƂɁALaTeXfBXgr[V"MiKTeX"p܂B$\r$\n\ - LyX߂ĎgOɁA"MiKTeXXVEBU[h"vOgāA$\r$\n\ - p”\MiKTeXXVCXg[Ƃ𐄏܂B$\r$\n\ - MiKTeX̍XV邩ǂA܊mF܂H' - -LangString UpdateNotAllowed "${LYX_LANG}" "̃Abvf[gpbP[W${PRODUCT_VERSION_OLD}Abvf[g邱Ƃł܂I" -LangString ModifyingConfigureFailed "${LYX_LANG}" "configureXNvg'path_prefix'ݒ肷邱Ƃł܂ł" -LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.bat𐶐邱Ƃł܂ł" -LangString RunConfigureFailed "${LYX_LANG}" "configureXNvgs邱Ƃł܂ł" -LangString NotAdmin "${LYX_LANG}" "LyXCXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" -LangString InstallRunning "${LYX_LANG}" "CXg[[͊ɓĂ܂I" -LangString StillInstalled "${LYX_LANG}" "LyX͊ɃCXg[Ă܂ILyXACXg[ĂB" - -LangString FinishPageMessage "${LYX_LANG}" "߂łƂ܂ILyX܂B\r\n\ - \r\n\ - iLyX̋Nɂ͎Ԃ܂Bj" -LangString FinishPageRun "${LYX_LANG}" "LyXN" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "WXgLyX܂B$\r$\n\ - fXNgbvƃX^[gj[̃V[gJbg͍폜܂B" -LangString UnInstallRunning "${LYX_LANG}" "܂LyX‚ĂI" -LangString UnNotAdminLabel "${LYX_LANG}" "LyXACXg[ɂ́AǗҌĂȂĂ͂Ȃ܂I" -LangString UnReallyRemoveLabel "${LYX_LANG}" "{ɁALyXƂׂĂ̕R|[lg폜Ă܂ςłH" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX̃[U[ݒ' -LangString UnGSview "${LYX_LANG}" 'PostscriptEPDFr[A"GSview"Eɂ́A$\r$\n\ - ̃EBhE"Uninstall"{^ĂB' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX͂g̃Rs[^[菜܂B" - -LangString SecUnAspellDescription "${LYX_LANG}" 'Xy`FbJ[AspellƕE܂B' -LangString SecUnMiKTeXDescription "${LYX_LANG}" "LaTeXfBXgr[VMiKTeXE܂B" -LangString SecUnJabRefDescription "${LYX_LANG}" "}l[W[JabRefE܂B" -LangString SecUnPreferencesDescription "${LYX_LANG}" '[U[ʂLyX̐ݒtH_$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - 폜܂B' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "LyXƂׂĂ̕R|[lgE܂B" - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_JAPANESE_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/norwegian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/norwegian.nsh deleted file mode 100644 index d58446fa1e..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/norwegian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_NORWEGIAN_NSH_ -!define _LYX_LANGUAGES_NORWEGIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_NORWEGIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Denne veiviseren installerer LyX p datamaskinen din.\r\n\ - \r\n\ - Du trenger administratorprivilegier for installere LyX.\r\n\ - \r\n\ - Du br lukke alle andre programmer frst, dermed kan installasjonsprogrammet oppdatere relevante systemfiler uten mtte restarte maskinen.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Document" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installere for alle brukere?" -LangString SecFileAssocTitle "${LYX_LANG}" "Fil-assosiasjoner" -LangString SecDesktopTitle "${LYX_LANG}" "Skrivebordsikon" - -LangString SecCoreDescription "${LYX_LANG}" "LyX-filene." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program for vise Postscript- og PDF-dokumenter." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Installere LyX for alle brukere, eller kun den aktuelle brukeren." -LangString SecFileAssocDescription "${LYX_LANG}" "Files med endelsen .lyx pnes automatisk i LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Et LyX-ikon p skrivebordet." - -LangString LangSelectHeader "${LYX_LANG}" "Utvalg av LyX's menysprk" -LangString AvailableLang "${LYX_LANG}" " Tilgjengelige Sprk " - -LangString MissProgHeader "${LYX_LANG}" "Kryss av for ndvendige programmer" -LangString MissProgCap "${LYX_LANG}" "Flgende programmer installeres i tillegg" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, en LaTeX-distribusjon" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, en interpreter for PostScript og PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, konverterer bilder" -LangString MissProgAspell "${LYX_LANG}" "Aspell, stavesjekking" -LangString MissProgMessage "${LYX_LANG}" 'Ingen ekstra programmer trenger installeres' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-distribusjon' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Velg LaTeX-distribusjonen LyX skal bruke.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'You can optionally set here the path to the file "latex.exe" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer has detected the LaTeX-distribution \ - "$LaTeXName" on your system. Displayed below is its path.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Set below the path to the file "latex.exe". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -LangString PathName "${LYX_LANG}" 'Path to the file "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Ikke bruk LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Filen "latex.exe" fins ikke i den oppgitte mappa.' - -LangString LatexInfo "${LYX_LANG}" 'N starter installasjon av LaTeX-distribusjonen "MiKTeX"$\r$\n\ - For installere programmet, klikk "Neste"-knappen i installasjonsveiviseren til installasjonen begynner.$\r$\n\ - $\r$\n\ - !!! Vennligst bruk standardopsjonene for MiKTeX-instasjonen !!!' -LangString LatexError1 "${LYX_LANG}" 'Fant ikke noen LaTeX-distribusjon!$\r$\n\ - LyX kan ikke brukes uten en LaTeX-distribusjion som "MiKTeX"!$\r$\n\ - Derfor avbrytes installasjonen.' - -LangString GSviewInfo "${LYX_LANG}" 'Installasjonsveiviser for programmet "GSview" kjres i gang.$\r$\n\ - For installere programmet, klikk "Setup"-knappen i det frste installasjonsvinduet$\r$\n\ - velg et sprk, og klikk deretter "Neste"-knappen i det flgende installasjonsvinduet.$\r$\n\ - Du kan bruke alle standardvalg for GSview-veiviseren.' -LangString GSviewError "${LYX_LANG}" 'Programmet "GSview" kunne ikke installeres!$\r$\n\ - Installasjonen fortsetter likevel.$\r$\n\ - Prv installere GSview omigjen senere.' - -LangString JabRefInfo "${LYX_LANG}" 'Now the installer of the program "JabRef" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -LangString JabRefError "${LYX_LANG}" 'The program "JabRef" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' - -LangString LatexConfigInfo "${LYX_LANG}" "Konfigurasjon av LyX vil ta en stund." - -LangString AspellInfo "${LYX_LANG}" 'Now dictionaries for the spellchecker "Aspell" will be downloaded and installed.$\r$\n\ - Every dictionary has a different license that will be displayed before the installation.' -LangString AspellDownloadFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be downloaded!" -LangString AspellInstallFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be installed!" -LangString AspellPartAnd "${LYX_LANG}" " and " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'There is already installed a dictionary of the language' -LangString AspellNone "${LYX_LANG}" 'No dictionary for the spellchecker "Aspell" has been installed.$\r$\n\ - Dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download dictionaries now?' -LangString AspellPartStart "${LYX_LANG}" "There was successfully installed " -LangString AspellPart1 "${LYX_LANG}" "an english dictionary" -LangString AspellPart2 "${LYX_LANG}" "a dictionary of the language $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - dictionary of the language $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' for the spellchecker "Aspell".$\r$\n\ - More dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download other dictionaries now?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." -LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program "MiKTeX Update Wizard"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update LyX ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Forsket p stille inn 'path_prefix' i konfigurasjonsscriptet mislyktes" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Fikk ikke opprettet lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Fikk ikke kjrt konfigurasjonsscriptet" -LangString NotAdmin "${LYX_LANG}" "Du trenger administratorrettigheter for installere LyX!" -LangString InstallRunning "${LYX_LANG}" "Installasjonsprogrammet er allerede i gang!" -LangString StillInstalled "${LYX_LANG}" "LyX er allerede installert! Fjern LyX frst." - -LangString FinishPageMessage "${LYX_LANG}" "Gratulerer!! LyX er installert.\r\n\ - \r\n\ - (Frste gangs oppstart av LyX kan ta noen sekunder.)" -LangString FinishPageRun "${LYX_LANG}" "Start LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Fant ikke LyX i registeret.$\r$\n\ - Snarveier p skrivebordet og i startmenyen fjernes ikke." -LangString UnInstallRunning "${LYX_LANG}" "Du m avslutte LyX frst!" -LangString UnNotAdminLabel "${LYX_LANG}" "Du m ha administratorrettigheter for fjerne LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Er du sikker p at du vil fjerne LyX og alle tilhrende komponenter?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Vennligst klikk "Uninstall"-knappen i neste vindu for fjerne$\r$\n\ - Postscript and PDF-leseren "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX ble fjernet fra din datamaskin." - -LangString SecUnAspellDescription "${LYX_LANG}" "Uninstalls the spellchecker Aspell and all of its dictionaries." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Uninstalls the LaTeX-distribution MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Uninstalls the bibliography manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Deletes LyX$\'s configuration folder$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - for all users.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Uninstall LyX and all of its components." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_NORWEGIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/polish.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/polish.nsh deleted file mode 100644 index 18ffd0ddb6..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/polish.nsh +++ /dev/null @@ -1,164 +0,0 @@ -!ifndef _LYX_LANGUAGES_POLISH_NSH_ -!define _LYX_LANGUAGES_POLISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_POLISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Kreator przeprowadzi Ciebie przez proces instalacji LyX-a.\r\n\ - \r\n\ - Wymagane s prawa administratora aby zainstalowa LyX-a.\r\n\ - \r\n\ - Zalecane jest pozamykanie wszystkich innych aplikacji przed uruchomieniem programu instalacyjnego. Pozwoli to zaktualizowa pliki systemowe bez wymagania restartu komputera.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Document" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instalacja dla wszystkich uytkownikw?" -LangString SecFileAssocTitle "${LYX_LANG}" "Skojarzenie plikw .lyx" -LangString SecDesktopTitle "${LYX_LANG}" "Ikona na pulpicie" - -LangString SecCoreDescription "${LYX_LANG}" "Pliki LyX-a." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program do podgldu dokumentw Postscript i PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Instalacja dla wszystkich uytkownikw lub tylko dla biecego uytkownika." -LangString SecFileAssocDescription "${LYX_LANG}" "Skojarzenie LyX-a z plikami o rozszerzeniu .lyx." -LangString SecDesktopDescription "${LYX_LANG}" "Ikona LyX-a na pulpicie." - -LangString LangSelectHeader "${LYX_LANG}" "Wybr jzyka menu LyX-a" -LangString AvailableLang "${LYX_LANG}" " Dostpne jzyki " - -LangString MissProgHeader "${LYX_LANG}" "Sprawdzenie zainstalowania wymaganych programw" -LangString MissProgCap "${LYX_LANG}" "Zostan dodatkowo zainstalowane nastpujce wymagane programy" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, dystrybucja LaTeX-a" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, interpreter PostScript i PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, konwerter rysunkw" -LangString MissProgAspell "${LYX_LANG}" "Aspell, kontrola pisowni" -LangString MissProgMessage "${LYX_LANG}" 'Brak dodatkowych programw do instalacji.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Dystrybucja LaTeX-a' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Wybierz dystrybucj LaTeX-a, ktr chcesz uywa z LyX-em.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'You can optionally set here the path to the file "latex.exe" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer has detected the LaTeX-distribution \ - "$LaTeXName" on your system. Displayed below is its path.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Set below the path to the file "latex.exe". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -LangString PathName "${LYX_LANG}" 'Path to the file "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Nie uywaj LaTeX-a" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Plik "latex.exe" nie znajduje si w podanej ciece.' - -LangString LatexInfo "${LYX_LANG}" 'Teraz zostanie uruchomiony instalator dystrybucji LaTeX-a "MiKTeX".$\r$\n\ - Aby zainstalowa ten program nacinij przycisk "Dalej" w oknie instalatora.$\r$\n\ - $\r$\n\ - !!! Prosz uy wszystkich domylnych opcji instalatora MiKTeX-a !!!' -LangString LatexError1 "${LYX_LANG}" 'Nie znaleziono dystrybucji LaTeX-a!$\r$\n\ - LyX nie moe by uyty bez dystrybucji LaTeX-a takiej jak "MiKTeX"!$\r$\n\ - Z tego powodu instalacja zostanie przerwana.' - -LangString GSviewInfo "${LYX_LANG}" 'Teraz zostanie uruchomiony program instalacyjny "GSview".$\r$\n\ - Aby go zainstalowa nacinij przycisk "Setup" w pierwszym oknie instalatora,$\r$\n\ - w kolejnym oknie wybierz jzyk i przycinij przycisk "Next".$\r$\n\ - Moesz uy wszystkich domylnych opcji instalacji.' -LangString GSviewError "${LYX_LANG}" 'Program "GSview" nie zosta pomylnie zainstalowany!$\r$\n\ - Mimo to instalacja bdzie kontynuowana.$\r$\n\ - Sprbuj pniej zainstalowa program GSview.' - -LangString JabRefInfo "${LYX_LANG}" 'Now the installer of the program "JabRef" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -LangString JabRefError "${LYX_LANG}" 'The program "JabRef" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' - -LangString LatexConfigInfo "${LYX_LANG}" "Dalsza konfiguracja LyX-a chwil potrwa." - -LangString AspellInfo "${LYX_LANG}" 'Now dictionaries for the spellchecker "Aspell" will be downloaded and installed.$\r$\n\ - Every dictionary has a different license that will be displayed before the installation.' -LangString AspellDownloadFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be downloaded!" -LangString AspellInstallFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be installed!" -LangString AspellPartAnd "${LYX_LANG}" " and " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'There is already installed a dictionary of the language' -LangString AspellNone "${LYX_LANG}" 'No dictionary for the spellchecker "Aspell" has been installed.$\r$\n\ - Dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download dictionaries now?' -LangString AspellPartStart "${LYX_LANG}" "There was successfully installed " -LangString AspellPart1 "${LYX_LANG}" "an english dictionary" -LangString AspellPart2 "${LYX_LANG}" "a dictionary of the language $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - dictionary of the language $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' for the spellchecker "Aspell".$\r$\n\ - More dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download other dictionaries now?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." -LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program "MiKTeX Update Wizard"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Nieudana prba ustawienia zmiennej 'path_prefix' w pliku skryptu konfigracyjnego" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Niedana prba utworzenia plikw lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Niedana prba wykonania skryptu konfiguracyjnego" -LangString NotAdmin "${LYX_LANG}" "Musisz mie prawa administratora aby zainstalowa LyX-a!" -LangString InstallRunning "${LYX_LANG}" "Instalator jest ju uruchomiony!" -LangString StillInstalled "${LYX_LANG}" "LyX jest ju zainstalowany! Aby kontynowa musisz go najpierw usun." - -LangString FinishPageMessage "${LYX_LANG}" "Gratulacje! LyX zosta pomylnie zainstalowany.\r\n\ - \r\n\ - (Pierwsze uruchomienie moe potrwa kilka sekund.)" -LangString FinishPageRun "${LYX_LANG}" "Uruchom LyX-a" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Nie mona znale LyX-a w rejestrze.$\r$\n\ - Skrty na pulpicie i w menu Start nie zostan usunite." -LangString UnInstallRunning "${LYX_LANG}" "Musisz najpierw zamkn LyX-a!" -LangString UnNotAdminLabel "${LYX_LANG}" "Musisz posiada prawa administratora do deinstalacji programu LyX." -LangString UnReallyRemoveLabel "${LYX_LANG}" "Czy na pewno chcesz usun LyX-a i wszystkie jego komponenty?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Nacinij przycisk "Odinstaluj" w nastpnym oknie aby odinstalowa$\r$\n\ - przegldark Postscript i PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX zosta pomylnie usunity z Twojego komputera." - -LangString SecUnAspellDescription "${LYX_LANG}" "Uninstalls the spellchecker Aspell and all of its dictionaries." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Uninstalls the LaTeX-distribution MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Uninstalls the bibliography manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Deletes LyX$\'s configuration folder$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - for all users.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Uninstall LyX and all of its components." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_POLISH_NSH_ - - - - - - - - - - - - - - - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/portuguese.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/portuguese.nsh deleted file mode 100644 index c878d574be..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/portuguese.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_PORTUGUESE_NSH_ -!define _LYX_LANGUAGES_PORTUGUESE_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_PORTUGUESE} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Este assistente de instalao ir gui-lo atravs da instalao do LyX.\r\n\ - \r\n\ - Precisa de privilgios de administrador para instalar o LyX.\r\n\ - \r\n\ - Recomenda-se fechar todas as outras aplicaes antes de iniciar o programa de configurao. Isto torna possivel actualizar os ficheiros de sistema relevantes sem ter que reiniciar o computador.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Documento LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instalar para todos os utilizadores?" -LangString SecFileAssocTitle "${LYX_LANG}" "Associao dos ficheiros" -LangString SecDesktopTitle "${LYX_LANG}" "Icone do ambiente de trabalho" - -LangString SecCoreDescription "${LYX_LANG}" "Os ficheiros LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programa para ver documentos em Postscript e PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Gestor de referncias bibliogrficas e editor de ficheiros BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Instalar o LyX para todos os utilizadores ou apenas para o presente utilizador." -LangString SecFileAssocDescription "${LYX_LANG}" "Os ficheiros com a extenso .lyx iro abrir automaticamente no LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Um icone do LyX no ambiente de trabalho." - -LangString LangSelectHeader "${LYX_LANG}" "Seleco da linguagem dos menus no LyX" -LangString AvailableLang "${LYX_LANG}" " Lnguas disponveis " - -LangString MissProgHeader "${LYX_LANG}" "Verificao para os programas exigidos" -LangString MissProgCap "${LYX_LANG}" "O(s) seguinte(s) programa(s) exigidos sero instalados adicionalmente" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, uma distribuio de LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, um interpretador para PostScript e PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, um conversor de imagens" -LangString MissProgAspell "${LYX_LANG}" "Aspell, um corrector ortogrfico" -LangString MissProgMessage "${LYX_LANG}" 'No ser instalado nenhum programa adicional.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuio de LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Escolher a distribuio de LaTeX que o LyX dever usar.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Opcionalmente pode especificar o caminho do ficheiro "latex.exe" e posteriormente \ - escolher a distribuio de LaTeX que vai usar o LyX.\r\n\ - Sem LaTeX o LyX no pode (pr-)imprimir os documentos!\r\n\ - \r\n\ - O instalador detectou a distribuio de LaTeX "$LaTeXName"\ - no seu sistema, no caminho que se mostra abaixo.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Especifique abaixo o caminho ao ficheiro "latex.exe". Posteriormente escolha \ - a distribuio de LaTeX que deve usar o LyX.\r\n\ - Sem LaTeX o LyX no pode (pr-)imprimir os documentos!\r\n\ - \r\n\ - O instalador no pudo achar nenhuma distribuio de LaTeX no seu sistema.' -LangString PathName "${LYX_LANG}" 'Caminho ao ficheiro "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "No usar LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'O ficheiro "latex.exe" no est no caminho especificado.' - -LangString LatexInfo "${LYX_LANG}" 'Agora lanar-se- o instalador da distribuio de LaTeX "MiKTeX".$\r$\n\ - Para instalar o programa carregue no boto "Prximo" na janela de instalao at a instalao comear.$\r$\n\ - $\r$\n\ - !!! Por favor use todas as opes por defeito do instalador do MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'No foi encontrada nenhuma distribuio de LaTeX!$\r$\n\ - O LyX no pode ser usado sem uma distribuio de LaTeX como o "MiKTeX"!$\r$\n\ - A instalao ser por isso abortada.' - -LangString GSviewInfo "${LYX_LANG}" 'Agora lanar-se- o instalador do programa "GSview".$\r$\n\ - Para instalar carregue no boto "Setup" na primeira janela de instalao$\r$\n\ - escolha a lngua e depois carregue no boto "Prximo" na janela seguinte do instalador.$\r$\n\ - Pode usar todas as opes por defeito no instalador do GSview.' -LangString GSviewError "${LYX_LANG}" 'No se conseguiu instalar o programa "GSview"!$\r$\n\ - A instalao ir continuar na mesma.$\r$\n\ - Tente instalar o GSview outra vez mais tarde.' - -LangString JabRefInfo "${LYX_LANG}" 'Agora lanar-se- o instalador do programa "JabRef".$\r$\n\ - Pode usar todas as opes por defeito no instalador do JabRef.' -LangString JabRefError "${LYX_LANG}" 'No se conseguiu instalar o programa "JabRef"!$\r$\n\ - A instalao ir continuar na mesma.$\r$\n\ - Tente instalar o JabRef outra vez mais tarde.' - -LangString LatexConfigInfo "${LYX_LANG}" "A configurao seguinte do LyX ir demorar um bocado." - -LangString AspellInfo "${LYX_LANG}" 'Agora se vo descarregar e instalar dicionrios do corrector ortogrfico "Aspell".$\r$\n\ - Cada dicionrio tem uma licena diferente, que se mostrar antes da instalao.' -LangString AspellDownloadFailed "${LYX_LANG}" "No foi possvel descarregar nenhum dicionrio do Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" "No foi possvel instalar nenhum dicionrio do Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " e " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'J h instalado um dicionrio desta lngua' -LangString AspellNone "${LYX_LANG}" 'No se instalou nenhum dicionrio do "Aspell".$\r$\n\ - Os dicionrios podem descarregar-se de$\r$\n\ - ${AspellLocation}$\r$\n\ - Deseja descarregar dicionrios agora?' -LangString AspellPartStart "${LYX_LANG}" "Instalou-se com sucesso " -LangString AspellPart1 "${LYX_LANG}" "um dicionrio de ingls" -LangString AspellPart2 "${LYX_LANG}" "um dicionrio de $LangName" -LangString AspellPart3 "${LYX_LANG}" "um$\r$\n\ - dicionrio de $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' para o corrector ortogrfico "Aspell".$\r$\n\ - posvel descarregar mais dicionrios de$\r$\n\ - ${AspellLocation}$\r$\n\ - Deseja descarregar outros dicionrios agora?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Para que cada utilizador possa customizar posteriormente o MiKTeX segundo as suas$\r$\n\ - necesidades, preciso a pasta onde foi instalado o MiKTeX$\r$\n\ - $MiKTeXPath $\r$\n\ - e as suas subpastas terem permisso de escritura para todos os utilizadores." -LangString MiKTeXInfo "${LYX_LANG}" 'Junto com o LyX vai-se utilizar a distribuio de LaTeX "MiKTeX".$\r$\n\ - Antes de usar o LyX pela primeira vez, recomenda-se instalar as actualizaes disponveis$\r$\n\ - do MiKTeX com o instalador "MiKTeX Update Wizard"$\r$\n\ - Deseja comprovar agora se h actualizaes do MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "No conseguimos establecer o 'path_prefix' no script de configurao" -LangString CreateCmdFilesFailed "${LYX_LANG}" "No foi possvel criar o lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "No foi possvel executar o script de configurao" -LangString NotAdmin "${LYX_LANG}" "Precisa de privilgios de administrador para instalar o LyX!" -LangString InstallRunning "${LYX_LANG}" "O instalador j est a correr!" -LangString StillInstalled "${LYX_LANG}" "O LyX j est instalado! Desinstale o LyX primeiro." - -LangString FinishPageMessage "${LYX_LANG}" "Parabns! O LyX foi instalado com sucesso.\r\n\ - \r\n\ - (O primeiro incio do LyX pode levar alguns segundos.)" -LangString FinishPageRun "${LYX_LANG}" "Lanar o LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Incapaz de encontrar o LyX no registry.$\r$\n\ - Os atalhos para o ambiente de trabalho no menu Start no sero removidos." -LangString UnInstallRunning "${LYX_LANG}" "Deve fechar o LyX em primeiro lugar!" -LangString UnNotAdminLabel "${LYX_LANG}" "Precisa de privilgios de administrador para desinstalar o LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Tem a certeza que quer remover completamente o LyX e todas as suas componentes?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferncias de utilizador do LyX' -LangString UnGSview "${LYX_LANG}" 'Por favor carregue no boto "Desinstalar" na prxima janela para desinstalar$\r$\n\ - o visualisador de Postscript e PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX foi removido com sucesso do seu computador." - -LangString SecUnAspellDescription "${LYX_LANG}" "Desinstala o corrector ortogrfico Aspell e todos os seus dicionrios." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Desinstala a distribuio de LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Desinstala o gestor de referncias bibliogrficas JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Apaga as pastas de configurao do LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - de todos os utilizadores.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Desinstala LyX e todas as suas componentes." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_PORTUGUESE_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/romanian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/romanian.nsh deleted file mode 100644 index 3a4cfcc0e1..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/romanian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_ROMANIAN_NSH_ -!define _LYX_LANGUAGES_ROMANIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_ROMANIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Acest asistent v va ghida n procesul de instalare a programului LyX. \r\n\ - \r\n\ - Trebuie s avei drepturi de administrator ca s putei instala LyX. \r\n\ - \r\n\ - Este recomandat ca s nchidei celelalte aplicaii nainte de nceperea instalrii. Acest lucru va permite upgradarea fiierelor de sistem relevante fr s fii nevoii s repornii calculatorul. \r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Document LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Dorii s instalai pentru toi utilizatorii?" -LangString SecFileAssocTitle "${LYX_LANG}" "Asocierea fiierelor" -LangString SecDesktopTitle "${LYX_LANG}" "Iconi pe desktop" - -LangString SecCoreDescription "${LYX_LANG}" "Fiierele LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program de vizualizat documente tip Postscript i PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Gestionarul de Bibliografie i editorul de fiiere tip BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Instaleaz LyX pentru toi utilizatorii sau doar pentru utilizatorul curent." -LangString SecFileAssocDescription "${LYX_LANG}" "Fiierele cu extensia .lyx vor fi deschise automat cu LyX." -LangString SecDesktopDescription "${LYX_LANG}" "A iconi LyX pe desktop." - -LangString LangSelectHeader "${LYX_LANG}" "Selecia de limbaj pentru meniurile LyX." -LangString AvailableLang "${LYX_LANG}" "Limbajele disponibile." - -LangString MissProgHeader "${LYX_LANG}" "Verific pentru programele necesare." -LangString MissProgCap "${LYX_LANG}" "Urmtoarele programe necesare vor fi instalate adiional." -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, o distribuie LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un vizualizator de documente tip PostScript i PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, un convertor de imagini" -LangString MissProgAspell "${LYX_LANG}" "Aspell, un corector ortografic" -LangString MissProgMessage "${LYX_LANG}" 'Toate programele necesare sunt deja instalate.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribuia LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Seteaz distribuia LaTeX pe care s o foloseasc LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Opional putei seta calea ctre fiierul "latex.exe" i, implicit, seta distribuia \ LaTeX pe care s o foloseasc LyX. \r\n\ - Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!\r\n\ - \r\n\ - Programul de instalare a detectat distribuia LaTeX \ - "$LaTeXName" instalat pe calculatorul dumneavoastr. Dedesupt este afiat calea acestei distribuii.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Setai calea ctre fiierul "latex.exe" i, implicit, seta distribuia \ LaTeX pe care s o foloseasc LyX. \r\n\ - Dac nu folosii LaTeX, LyX nu va putea s produc fiiere!\r\n\ - \r\n\ - Programul de instalare nu a detectat nici o distribuia LaTeX instalat pe calculatorul dumneavoastr.' - -LangString PathName "${LYX_LANG}" 'Calea ctre fiierul "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Nu folosi LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Fiierul "latex.exe" nu se afl n calea specificat.' - -LangString LatexInfo "${LYX_LANG}" 'Programul de instalare al distribuiei LaTeX "MiKTeX" va fi lansat. $\r$\n\ - Pentru instalare apsai butonul "Next" n fereastra prgramului de instalare pn cnd instalarea nncepe. $\r$\n\ - $\r$\n\ - !!! V rugm s folosii setrile implicite ale programului de instalat MiKTex !!!' -LangString LatexError1 "${LYX_LANG}" 'Nu am detectat nici o distribuia LaTeX instalat pe calculatorul dumneavoastr!$\r$\n\ - LyX nu poate fi folosit fr o distribuia LaTeX ca "MiKTeX"!$\r$\n\ - Instalarea va fi abandonat.' - -LangString GSviewInfo "${LYX_LANG}" 'Acum va fi lansat programul de instalare al aplicaiei "GSview".$\r$\n\ - Pentru instalare apsai butonul "Setup" n fereastra prgramului de instalare,$\r$\n\ - alegei un limbaj i apsai butonul "Next" n urmatoarea fereastr$\r$\n\ - Este indicat s folosii setrile implicite ale programului de instalat GSview.' -LangString GSviewError "${LYX_LANG}" 'Programul "GSview" nu a putut fi instalat!$\r$\n\ - Programul de instalare LyX va continua totui.$\r$\n\ - ncercai s instalai GSview mai trziu.' - -LangString JabRefInfo "${LYX_LANG}" 'Acum va fi lansat programul de instalare al aplicaiei "JabRef".$\r$\n\ - Este indicat s folosii setrile implicite ale programului de instalat JabRef.' -LangString JabRefError "${LYX_LANG}" 'Programul "JabRef" nu a putut fi instalat!$\r$\n\ - Programul de instalare LyX va continua totui.$\r$\n\ - ncercai s instalai JabRef mai trziu.' - -LangString LatexConfigInfo "${LYX_LANG}" "Configurarea programului LyX va dura o perioad de timp." - -LangString AspellInfo "${LYX_LANG}" 'Acum vor fi descrcate i instalate dicionarele corectorului ortografic "Aspell".$\r$\n\ - Fiecare dicionar are o licen diferit ce va fi afiat naintea instalrii.' -LangString AspellDownloadFailed "${LYX_LANG}" 'Nu au putut fi descrcate dicionarele corectorului ortografic "Aspell"!' -LangString AspellInstallFailed "${LYX_LANG}" 'Nu au putut fi instalate dicionarele corectorului ortografic "Aspell"!' -LangString AspellPartAnd "${LYX_LANG}" " i " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Exist deja un dicionar instalat.' -LangString AspellNone "${LYX_LANG}" 'Nu au putut fi instalate dicionarele corectorului ortografic "Aspell".$\r$\n\ - Dicionarele pot fi descrcate de la$\r$\n\ - ${AspellLocation}$\r$\n\ - Dorii s descrcai dicionarele acum?' -LangString AspellPartStart "${LYX_LANG}" "A fost instalat cu succes " -LangString AspellPart1 "${LYX_LANG}" "Un dicionar englezesc" -LangString AspellPart2 "${LYX_LANG}" "Un dicionar pentru limba $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - dicionarul pentru limba $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" 'pentru corectorul ortografic "Aspell".$\r$\n\ - Mai multe dicionare pot fi descrcate de la$\r$\n\ - ${AspellLocation}$\r$\n\ - Dorii s descrcai dicionarele acum?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Pentru ca utilizatorii s poat modifica setrile MiKTeX$\r$\n\ - este necesar s setai dreptul de scriere la directorul$\r$\n\ - $MiKTeXPath $\r$\n\ - unde a fost instalat MiKTex i toate subdirectoarele pentru toi utilizatorii." -LangString MiKTeXInfo "${LYX_LANG}" 'Distribuia LaTeX "MiKTeX" va fi folosit cu LyX.$\r$\n\ - Este recomandat s instalai actualizri ale programului MiKTex folosind programul "MiKTeX Update Wizard"$\r$\n\ - nainte de a folosi LyX pentru prima oar.$\r$\n\ - Dorii s verificai dac sunt disponibile actualizri pentru MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "Acest program de actualizare poate actualiza numai ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Nu am putut seta 'path_prefix' n procesul de configurare" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Nu am putut crea lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Nu am putut executa scriptul de configurare" -LangString NotAdmin "${LYX_LANG}" "Trebuie s avei drepturi de administrator pentru instalarea programului LyX!" -LangString InstallRunning "${LYX_LANG}" "Programul de instalare este deja pornit!" -LangString StillInstalled "${LYX_LANG}" "LyX este deja instalat! Dezinstalai LyX prima oar." - -LangString FinishPageMessage "${LYX_LANG}" "Felicitri! LyX a fost instalat cu succes.\r\n\ - \r\n\ - (Prima oar cnd pornii LyX s-ar putea s dureze cteva secunde.)" -LangString FinishPageRun "${LYX_LANG}" "Lanseaz LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Nu am gsit LyX n registri.$\r$\n\ - Scurtturile de pe desktop i Start Menu nu vor fi terse." -LangString UnInstallRunning "${LYX_LANG}" "Trebuie s inchidei LyX prima oar!" -LangString UnNotAdminLabel "${LYX_LANG}" "Trebuie s avei drepturi de administrator pentru dezinstalarea programului LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Suntei sigur c dorii s dezinstalai programul LyX i toate componentele lui?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferinele utilizatorului pentru LyX' -LangString UnGSview "${LYX_LANG}" 'Apsai butonul "Uninstall" n urmatoarea fereastr pentru a dezinstala $\r$\n\ - vizualizatorul de documente tip Postscript i PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX a fost dezinstalat cu succes de pe calculatorul dumneavoastr." - -LangString SecUnAspellDescription "${LYX_LANG}" 'Dezinstaleaz corectorul ortografic "Aspell" i toate componentele lui.' -LangString SecUnMiKTeXDescription "${LYX_LANG}" 'Dezinstaleaz Distribuia LaTeX "MiKTeX".' -LangString SecUnJabRefDescription "${LYX_LANG}" "Dezinstaleaz gestionarul de bibliografie JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'terge directorul cu setrile LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - pentru toi utilizatorii.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" " Dezinstalai programul LyX i toate componentele lui." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_ROMANIAN_NSH_ - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/slovak.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/slovak.nsh deleted file mode 100644 index c166c636e2..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/slovak.nsh +++ /dev/null @@ -1,155 +0,0 @@ -!ifndef _LYX_LANGUAGES_SLOVAK_NSH_ -!define _LYX_LANGUAGES_SLOVAK_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_SLOVAK} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Tento sprievodca Vm pomha intalova LyX.\r\n\ - \r\n\ - Pre intalciu LyX potrebujete administrtorsk prva.\r\n\ - \r\n\ - Odporuje sa zavrie vetk ostatn aplikcie pred tartom Setup. Tm sa umouje nahradi relevantn dta sstavy bez novho tartu poitae.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX dokument" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Intalova pre vetkch uvateov?" -LangString SecFileAssocTitle "${LYX_LANG}" "Usporiadanie data" -LangString SecDesktopTitle "${LYX_LANG}" "Symbol desktopu" - -LangString SecCoreDescription "${LYX_LANG}" "Program LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program na pozeranie dokumentov Postscript a PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Manager pre bibliografick odkaz a editor pre BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "Intalova LyX pre vetkch uvatelov alebo len pre teraj uvate." -LangString SecFileAssocDescription "${LYX_LANG}" "Data s lyx rozrenm sa automaticky otvraj v LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Symbol LyX na desktopu." - -LangString LangSelectHeader "${LYX_LANG}" "Vyber jazyka pre LyX" -LangString AvailableLang "${LYX_LANG}" " Pohotov jazyky " - -LangString MissProgHeader "${LYX_LANG}" "Hladajte vyadovan programy" -LangString MissProgCap "${LYX_LANG}" "Nasledujce vyadovan programy sa intaluj dodatocne" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, je LaTeX distribcia" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, je interprettor pre PostScript a PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, konvertuje obrazy" -LangString MissProgAspell "${LYX_LANG}" "Aspell, je overovanie pravopisu" -LangString MissProgMessage "${LYX_LANG}" 'Netreba intalova alie programy.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX distribcia' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Urcujte LaTeX distribciu, ktor m uva LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Tu mete pouva chod k "latex.exe" a tm pouva chod \ - LaTeX-distribciu, ktor by mohla by pouvan cestou LyXu.\r\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!\r\n\ - \r\n\ - Intalatr detektoval LaTeX-distribciu \ - "$LaTeXName" na vaej sstave. Dolu vidte jeho chod.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Pouvajte dolu chod k "latex.exe". Tm urcujete, ktor \ - LaTeX-distribcia m by pouvan LyXom.\r\n\ - Ak nepouvate LaTeX, LyX neme produkova dokumenty!\r\n\ - \r\n\ - Intalatr nemohol njst LaTeX-distribciu na vaej sstave.' -LangString PathName "${LYX_LANG}" 'Chod k "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Neuvajte LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Mapa "latex.exe" nie je na pecifikovanej ceste.' - -LangString LatexInfo "${LYX_LANG}" 'Teraz mete tartova LaTeX distribciu "MiKTeX".$\r$\n\ - Na intalovanie programu tlate gombk "Next" v intalovacch oknch a sa zana intalcia.$\r$\n\ - $\r$\n\ - !!! Prosm uvajte vetk obsiahnut nastavenia intalatra MiKTeX !!!' - -LangString LatexError1 "${LYX_LANG}" 'LaTeX distribcia sa nemohla njst!$\r$\n\ - LyX sa neme uva bez LaTeX distribcie ako "MiKTeX"!$\r$\n\ - Preto sa intalcia zastavila.' - -LangString GSviewInfo "${LYX_LANG}" 'Teraz tartuje intalatr programu "GSview" .$\r$\n\ - Na intalciu programu tlate gombk "Setup" v prvom intalanom okne$\r$\n\ - Vyberajte jazyk a tlate gombk "Next" v nasledujcich intalanch oknch.$\r$\n\ - Mete uvat vetk obsiahnut nastavenia intalatra GSview.' -LangString GSviewError "${LYX_LANG}" 'Program "GSview" sa nemohol intalova spene!$\r$\n\ - Predsa intalcia pokrauje.$\r$\n\ - Skste intalova GSview ete raz neskr.' - -LangString JabRefInfo "${LYX_LANG}" 'Teraz sa tartuje intalatr programu "JabRef".$\r$\n\ - Mzete vetk obsiahnut nastavenia intalatra JabRef.' -LangString JabRefError "${LYX_LANG}" 'Program "JabRef" sa nemohol intalova spene!$\r$\n\ - Predsa intalcia pokrauje.$\r$\n\ - Skste intalova JabRef ete raz neskr.' - -LangString LatexConfigInfo "${LYX_LANG}" "Na nasledujcu konfigurciu LyXu treba poka chvu." - -LangString AspellInfo "${LYX_LANG}" 'Teraz sa intaluj slovnky pre skobn program "Aspell".$\r$\n\ - Kad slovnk m in licensiu, ktor sa predstavuje pred downloadom a intalciou.' -LangString AspellDownloadFailed "${LYX_LANG}" "Aspell slovnk sa nemohol downloadova!" -LangString AspellInstallFailed "${LYX_LANG}" "Aspell slovnk sa nemohol intalova!" -LangString AspellPartAnd "${LYX_LANG}" " a " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'U je intalovan slovnk jazyku' -LangString AspellNone "${LYX_LANG}" 'Slovnk pre "Aspell" nebol intalovan.$\r$\n\ - Slovnky je mon downloadova od$\r$\n\ - ${AspellLocation}$\r$\n\ - Chcete teraz downloadova slovnky?' -LangString AspellPartStart "${LYX_LANG}" "Teraz je spene intalovan " -LangString AspellPart1 "${LYX_LANG}" "anglick slovnk" -LangString AspellPart2 "${LYX_LANG}" "slovnk jazyku $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - slovnk jazyku $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' pre "Aspell".$\r$\n\ - Viac slovnkov je mono downloadova od$\r$\n\ - ${AspellLocation}$\r$\n\ - Chcete teraz downloadova in slovnky?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Aby kad pouvatel bol neskr schopn pouvat MiKTeX pre svoje potreby$\r$\n\ - je treba napsat povolenia pre vetkch pouvatelov do intalacnho papiera MiKTeX $\r$\n\ - $MiKTeXPath $\r$\n\ - aj do podriadench papierov." -LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX distribcia "MiKTeX" sa pouva spolu s LyXom.$\r$\n\ - Doporuuje sa intalovat platn MiKTeX aktualizcie pomocou programu "MiKTeX Update Wizard"$\r$\n\ - pred prvm pouvanm LyXu.$\r$\n\ - Chcete teraz testova MiKTeX aktualizcie?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Nemohol uvies v platnost 'path_prefix' (zoznam s cestami programu) v konfiguranom skripte" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Nemohol prpravi lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Nemohol vykona konfiguran skript" -LangString NotAdmin "${LYX_LANG}" "Pre intalciu LyX potrebujete administrtorsk prva!" -LangString InstallRunning "${LYX_LANG}" "Intalatr u beh!" -LangString StillInstalled "${LYX_LANG}" "LyX je u intalovan! Najprv treba odintalova LyX." - -LangString FinishPageMessage "${LYX_LANG}" "Gratulcia! LyX bol spene intalovan.\r\n\ - \r\n\ - (Prv LyX tart me trva niekolko sekund.)" -LangString FinishPageRun "${LYX_LANG}" "tartova LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Neme njs LyX v registre.$\r$\n\ - Symboly na desktope a v tartovacom Menu sa nedaj odstrani." -LangString UnInstallRunning "${LYX_LANG}" "Najprv zavr LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" "Pre odintalciu LyX potrebujete administrtorsk prva!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Ste si ist, e chcete kompletne odintalova LyX a vetk jeho suiastky?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX prednosti uvaea' -LangString UnGSview "${LYX_LANG}" 'Prosm tlate gombk "Uninstall" v nasledujcom okne aby Ste intalovali $\r$\n\ - Postscript a PDF-viewer "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX je spene odstrnen od Vho poitaa." - -LangString SecUnAspellDescription "${LYX_LANG}" "Odintaluje Aspell a vetk jeho slovnky." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Odintaluje LaTeX distribciu MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Odintaluje bibliografick manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Odstrni konfiguracn papiere LyXu $\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - pre vetkch uivateov.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Odintaluj LyX a vetk jeho suiastky." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_SLOVAK_NSH_ - - - - - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/spanish.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/spanish.nsh deleted file mode 100644 index afa9e7171d..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/spanish.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_SPANISH_NSH_ -!define _LYX_LANGUAGES_SPANISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_SPANISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Este programa instalar LyX en su ordenador.\r\n\ - \r\n\ - Usted necesita privilegios de administrador para instalar LyX.\r\n\ - \r\n\ - Se recomienda que cierre todas las dems aplicaciones antes de iniciar la instalacin. Esto har posible actualizar archivos relacionados con el sistema sin tener que reiniciar su ordenador.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "Documento LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Instalar para todos los usuarios" -LangString SecFileAssocTitle "${LYX_LANG}" "Asociar ficheros" -LangString SecDesktopTitle "${LYX_LANG}" "Icono de escritorio" - -LangString SecCoreDescription "${LYX_LANG}" "Los ficheros de LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" "Programa para ver documentos Postscript y PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" "Administrador de referencias bibliograficas e editor de ficheros BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" "Instalar LyX para todos los usuarios o slo para el usuario actual." -LangString SecFileAssocDescription "${LYX_LANG}" "Asociar la extensin .lyx con LyX." -LangString SecDesktopDescription "${LYX_LANG}" "Crear un icono de LyX en el escritorio." - -LangString LangSelectHeader "${LYX_LANG}" "Seleccin del idioma del menu de LyX " -LangString AvailableLang "${LYX_LANG}" " Idiomas disponibles " - -LangString MissProgHeader "${LYX_LANG}" "Verificacin de programas necesarios " -LangString MissProgCap "${LYX_LANG}" "Los siguientes programas necesarios sern tambin instalados " -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, una distribucin de LaTeX " -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, un interprete para PostScript y PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, un conversor de imgenes " -LangString MissProgAspell "${LYX_LANG}" "Aspell, un corrector ortogrfico" -LangString MissProgMessage "${LYX_LANG}" 'No es necesario instalar programas adicionales.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'Distribucin LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Elija la distribucin de LaTeX que debera emplear LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Opcionalmente puede especificar el camino del fichero "latex.exe" y posteriormente \ - elegir la distribucin de LaTeX que va usar LyX.\r\n\ - Sin LaTeX LyX no puede (pre)imprimir documentos!\r\n\ - \r\n\ - El instalador ha detectado la distribucin de LaTeX "$LaTeXName" \ - en su sistema, en el camino que se muestra abajo.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Especifique abajo el camino al fichero "latex.exe". Posteriormente elija \ - la distribucin de LaTeX que debe usar LyX.\r\n\ - Sin LaTeX LyX no puede (pre)imprimir documentos!\r\n\ - \r\n\ - El instalador non pudo encontrar ninguna distribucin LaTeX en su sistema.' -LangString PathName "${LYX_LANG}" 'Camino al fichero "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "No usar LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Imposible encontrar "latex.exe".' - -LangString LatexInfo "${LYX_LANG}" 'Ahora se lanzar el instalador de "MiKTeX", la distribucin de LaTeX.$\r$\n\ - Para instalar el programa presione el botn "Next" en la ventana del instalador hasta que la aplicacin arranque.$\r$\n\ - $\r$\n\ - Por favor use todas las opciones por defecto del instalador de MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'No se ha encontrado ninguna distribucin de LaTeX!$\r$\n\ - LyX no funciona sin una distribucin de LaTeX como "MiKTeX"!$\r$\n\ - Por lo tanto la instalacin se abortar.' - -LangString GSviewInfo "${LYX_LANG}" 'Ahora se lanzar el instalador del programa "GSview".$\r$\n\ - Para instalar el programa presione el botn "Setup" en la primera ventana del instalador$\r$\n\ - elija un idioma y luego presione el botn "Next" en la siguiente ventana del instalador.$\r$\n\ - Puede utilizar todas las opciones por defecto del instalador de GSview.' -LangString GSviewError "${LYX_LANG}" 'El programa "GSview" no pudo instalarse con xito!$\r$\n\ - La instalacin se continuar de toda forma.$\r$\n\ - Intente instalar otra vez GSview ms tarde.' - -LangString JabRefInfo "${LYX_LANG}" 'Ahora se lanzar el instalador del programa "JabRef".$\r$\n\ - Puede utilizar todas las opciones por defecto del instaldor de JabRef.' -LangString JabRefError "${LYX_LANG}" 'El programa "JabRef" no pudo instalarse con xito!$\r$\n\ - La instalacin se continuar de toda forma.$\r$\n\ - Intente instalar otra vez JabRef ms tarde.' - -LangString LatexConfigInfo "${LYX_LANG}" "La siguiente configuracin de LyX va a tardar un poco." - -LangString AspellInfo "${LYX_LANG}" 'Ahora se van a descargar e instalar diccionarios del corrector ortogrfico "Aspell".$\r$\n\ - Cada diccionario tiene una licencia diferente, que se mostrar antes da instalacin.' -LangString AspellDownloadFailed "${LYX_LANG}" "No se pudo descargar ningn diccionario para Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" "No se pudo instalar ningn diccionario para Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " y " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Ya hay instalado un diccionario de esta lengua' -LangString AspellNone "${LYX_LANG}" 'No se ha instalado ningn diccionario para "Aspell".$\r$\n\ - Los diccionarios puede descargarse de$\r$\n\ - ${AspellLocation}$\r$\n\ - Desea descargar diccionarios ahora?' -LangString AspellPartStart "${LYX_LANG}" "Se ha instalado con xito " -LangString AspellPart1 "${LYX_LANG}" "un diccionario de ingls" -LangString AspellPart2 "${LYX_LANG}" "un diccionario de $LangName" -LangString AspellPart3 "${LYX_LANG}" "un$\r$\n\ - diccionario de $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' para el corrector ortogrfico "Aspell".$\r$\n\ - Es posible descargar mas diccionarios de$\r$\n\ - ${AspellLocation}$\r$\n\ - Desea descargar otros diccionarios ahora?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Para que cada usuario pueda personalizar posteriormente MiKTeX acorde sus$\r$\n\ - necesidades, es necesario que la carpeta donde fue instalado MiKTeX's $\r$\n\ - $MiKTeXPath $\r$\n\ - y sus subcarpetas tengan permiso de escritura para todos los usuarios." -LangString MiKTeXInfo "${LYX_LANG}" 'Junto con LyX se va usar la distribucin de LaTeX "MiKTeX".$\r$\n\ - Antes de usar LyX por primera vez, se recomienda instalar las actualizaciones disponibles$\r$\n\ - de MiKTeX con el instalador "MiKTeX Update Wizard"$\r$\n\ - Desea comprobar ahora si hay actualizaciones de MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Error al intentar aadir 'path_prefix' durante la ejecucin del programa de configuracin" -LangString CreateCmdFilesFailed "${LYX_LANG}" "No se pudo crear lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Error al intentar ejecutar el programa de configuracin" -LangString NotAdmin "${LYX_LANG}" "Necesita privilegios de administrador para instalar LyX!" -LangString InstallRunning "${LYX_LANG}" "El instalador ya esta siendo ejecutado!" -LangString StillInstalled "${LYX_LANG}" "LyX ya esta instalado! Antes desinstale LyX." - -LangString FinishPageMessage "${LYX_LANG}" "Enhorabuena! LyX ha sido instalado con xito.\r\n\ - \r\n\ - (El primer arranque de LyX puede tardar algunos segundos.)" -LangString FinishPageRun "${LYX_LANG}" "Ejecutar LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Imposible encontrar LyX en el registro.$\r$\n\ - Los accesos rpidos del escritorio y del Men de Inicio no sern eliminados." -LangString UnInstallRunning "${LYX_LANG}" "Antes cierre LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" "Necesita privilegios de administrador para desinstalar LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "Est seguro de que desea eliminar completamente LyX y todos sus componentes?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'Preferencias de usuario de LyX' -LangString UnGSview "${LYX_LANG}" 'Por favor, haga clic sobre el botn "Uninstall" en la siguiente ventana para de-instalar$\r$\n\ - el programa "GSview" (Postscript y PDF-viewer).' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX fue eliminado con xito de su ordenador." - -LangString SecUnAspellDescription "${LYX_LANG}" "Desinstala el corrector ortogrfico Aspell y todos sus diccionarios." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Desinstala a distribucin de LaTeX MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Desinstala el administrador de referencias bibliograficas JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Elimina las carpetas de configuracin de LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - de todos los usuarios.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Desinstala LyX y todos sus componentes." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_SPANISH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/swedish.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/swedish.nsh deleted file mode 100644 index b9e03696e4..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/swedish.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_SWEDISH_NSH_ -!define _LYX_LANGUAGES_SWEDISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_SWEDISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Denna guide tar dig igenom installationen av LyX.\r\n\ - \r\n\ - Du behver administratrsrttigheter fr att installera LyX.\r\n\ - \r\n\ - Det rekommenderas att du avslutar alla andra program innan du fortstter installationen. Detta tillter att installationen uppdaterar ndvndiga systemfiler utan att behva starta om din dator.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-dokument" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Installera fr alla anvndare?" -LangString SecFileAssocTitle "${LYX_LANG}" "Filassociationer" -LangString SecDesktopTitle "${LYX_LANG}" "Skrivbordsikon" - -LangString SecCoreDescription "${LYX_LANG}" "LyX-filer." -LangString SecInstGSviewDescription "${LYX_LANG}" "Program fr att visa Postscript- och PDF-dokument." -LangString SecInstJabRefDescription "${LYX_LANG}" "Program fr att hantera bibliografiska referenser och redigera BibTeX-filer." -LangString SecAllUsersDescription "${LYX_LANG}" "Installera LyX fr alla anvndare, eller enbart fr den aktuella anvndare." -LangString SecFileAssocDescription "${LYX_LANG}" "Skapa en association mellan programmet och filtillget .lyx." -LangString SecDesktopDescription "${LYX_LANG}" "En LyXikon p skrivbordet." - -LangString LangSelectHeader "${LYX_LANG}" "Val av sprk i LyXs menyer" -LangString AvailableLang "${LYX_LANG}" " Tillgngliga sprk " - -LangString MissProgHeader "${LYX_LANG}" "Leta efter ndvndiga program" -LangString MissProgCap "${LYX_LANG}" "Fljande ndvndiga program kommer dessutom att installeras" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, en LaTeX-distribution" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, ett konverteringsprogram mm fr PostScript och PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, ett konverteringsprogram fr bilder" -LangString MissProgAspell "${LYX_LANG}" "Aspell, ett rttstavningsprogram" -LangString MissProgMessage "${LYX_LANG}" 'Inga ytterligare program behver installeras.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-distribution' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'Stll in LaTeX-distributionen som LyX skall anvnda.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'Alternativt kan du hr stlla in skvgen till filen "latex.exe" och drmed manuellt bestmma vilken \ - LaTeX-distribution som skall anvndas av LyX.\r\n\ - Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!\r\n\ - \r\n\ - Installationsprogrammet har upptckt LaTeX-distributionen \ - "$LaTeXName" i ditt system. Nedan visas dess skvg.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Stt nedan skvgen till filen "latex.exe". Drmed vljer du vilken \ - LaTeX-distribution som skall anvndas av LyX.\r\n\ - Utan LaTeX kan LyX bara redigera LyX-filer, inte producera t.ex. PDF-dokument!\r\n\ - \r\n\ - Installationsprogrammetn kunde inte hitta LaTeX-distributionen i ditt system.' -LangString PathName "${LYX_LANG}" 'Skvg till filen "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "Anvnd inte LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" 'Kan inte hitta "latex.exe"' - -LangString LatexInfo "${LYX_LANG}" 'Nu kommer installationsprogrammet fr LaTeX-distribution "MiKTeX" att kras.$\r$\n\ - Fr att installera programmet, klicka p knappen "Next" i installationsfnstret tills installation brjar.$\r$\n\ - $\r$\n\ - !!! Var snll och anvnd standardinstllningarna i installationsprogrammet fr MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" 'Kan inte hitta ngon LaTeX-distribution!$\r$\n\ - LyX kan inte anvndas utan en LaTeX-distribution som tex "MiKTeX"!$\r$\n\ - Installation avbryts drfr nu.' - -LangString GSviewInfo "${LYX_LANG}" 'Nu kommer installationsprogrammet fr "GSview" att kras.$\r$\n\ - Fr att installera programmet, klicka p knappen "Setup" i den frsta dialogrutan i installationsprogrammet\r$\n\ - vlj ett sprk och klicka sedan p knappen "Next" i det nstkommande installationsfnstret.$\r$\n\ - Du kan anvnda alla standardalternativ i installationsprogrammet fr GSview.' -LangString GSviewError "${LYX_LANG}" 'Programmet "GSview" kunde inte installeras ordentligt!$\r$\n\ - Installationen av LyX kommer att fortstta nd.$\r$\n\ - Frsk installera GSview igen senare.' - -LangString JabRefInfo "${LYX_LANG}" 'Nu kommer installationsprogrammet fr "JabRef" att kras.$\r$\n\ - Du kan anvnda alla standardalternativ i installationsprogrammet fr JabRef.' -LangString JabRefError "${LYX_LANG}" 'Programmet "JabRef" kunde inte installeras ordentligt!$\r$\n\ - Installationen av LyX kommer att fortstta nd.$\r$\n\ - Frsk installera GSview igen senare.' - -LangString LatexConfigInfo "${LYX_LANG}" "Fljande konfigurering av LyX kommer att ta ett tag." - -LangString AspellInfo "${LYX_LANG}" 'Nu kommer ordlistor fr stavningsprogrammet "Aspell" att laddas ner och installeras.$\r$\n\ - Varje ordlista har en egen licens vilken kommer att visas fre installationen.' -LangString AspellDownloadFailed "${LYX_LANG}" "Ingen ordlista fr stavningsprogrammet Aspell kunde laddas ner!" -LangString AspellInstallFailed "${LYX_LANG}" "Ingen ordlista fr stavningsprogrammet Aspell kunde installeras!" -LangString AspellPartAnd "${LYX_LANG}" " and " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'Det finns redan en installerad ordlista fr sprket' -LangString AspellNone "${LYX_LANG}" 'Ingen ordlista fr stavningsprogrammet "Aspell" har blivit installerad.$\r$\n\ - Ordlistor kan laddas ner frn\r$\n\ - ${AspellLocation}$\r$\n\ - Vill du ladda ner ordlistor nu?' -LangString AspellPartStart "${LYX_LANG}" "Det installerades framgngsrikt " -LangString AspellPart1 "${LYX_LANG}" "en engelsk ordlista" -LangString AspellPart2 "${LYX_LANG}" "en ordlista fr sprket $LangName" -LangString AspellPart3 "${LYX_LANG}" "en$\r$\n\ - ordlista fr sprket $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' fr stavningsprogrammet "Aspell".$\r$\n\ - Ytterligare ordlistor kan laddas ner frn\r$\n\ - ${AspellLocation}$\r$\n\ - Vill du ladda ner ytterligare ordlistor nu?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "Fr att varje anvndare senare skall kunna anpassa MiKTeX fr sina behov$\r$\n\ - r det ndvndigt att ge skrivrttigheter till alla anvndare fr MiKTeX's installationskatalog$\r$\n\ - $MiKTeXPath $\r$\n\ - och dess underkataloger." -LangString MiKTeXInfo "${LYX_LANG}" 'LaTeX-distributionen "MiKTeX" kommer att anvndas tillsammans med LyX.$\r$\n\ - Det rekommenderas att installera tillgngliga uppdateringar av MiKTeX med hjlp av programmet "MiKTeX Update Wizard".$\r$\n\ - innan du anvnder LyX fr frsta gngen.$\r$\n\ - Vill du kontrollera om det finns uppdateringar tillgngliga fr MiKTeX nu?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Misslyckades med att stta 'path_prefix' i konfigurationsskriptet" -LangString CreateCmdFilesFailed "${LYX_LANG}" "Kunde inte skapa filen (kommandoskriptet) lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" "Misslyckades med att kra konfigurationsskriptet" -LangString NotAdmin "${LYX_LANG}" "Du mste ha administratrsrttigheter fr att installera LyX!" -LangString InstallRunning "${LYX_LANG}" "Installationsprogrammet krs readan!" -LangString StillInstalled "${LYX_LANG}" "LyX r redan installerat! Avinstallera LyX frst." - -LangString FinishPageMessage "${LYX_LANG}" "Gratulerar! LyX har installerats framgngsrikt.\r\n\ - \r\n\ - (Frsta gngen LyX startas tar det litet lngre tid d programmet konfigurerar sig sjlv automatiskt.)" -LangString FinishPageRun "${LYX_LANG}" "Kr LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Kan inte hitta LyX i registret\r$\n\ - Genvgar p skrivbordet och i startmeny kommer inte att tas bort." -LangString UnInstallRunning "${LYX_LANG}" "Du mste stnga LyX frst!" -LangString UnNotAdminLabel "${LYX_LANG}" "Du mste ha administratrsrttigheter fr att avinstallera LyX!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "r du sker p att du verkligen vill fullstndigt avinstallera LyX och alla dess komponenter?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s anvndarinstllningar' -LangString UnGSview "${LYX_LANG}" 'Var god tryck p knappen "Avinstallera" i fljande fnster fr att avinstallera$\r$\n\ - "GSview" som visar Postscript och PDF.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX har framgngsrikt avinstallerats frn din dator." - -LangString SecUnAspellDescription "${LYX_LANG}" "Avinstallerar stavningsprogrammet Aspell och alla dess kataloger." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Avinstallerar LaTeX-distributionen MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Avinstallerar programmet JabRef som anvnds fr att hantera bibliografiska referenser." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Raderar LyX$\'s konfigurationskatalog$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - fr alla anvndare.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Avinstallera LyX och alla dess komponenter." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_SWEDISH_NSH_ diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/turkish.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/turkish.nsh deleted file mode 100644 index 0a50dbca51..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/turkish.nsh +++ /dev/null @@ -1,162 +0,0 @@ -!ifndef _LYX_LANGUAGES_TURKISH_NSH_ -!define _LYX_LANGUAGES_TURKISH_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_TURKISH} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" "Bu sihirbaz size LyX programn kuracak.\r\n\ - \r\n\ - LyX kurabilmek iin ynetici yetkilerine ihtiyacnz var.\r\n\ - \r\n\ - Kuruluma balamadan nce dier programlar kapatmanz tavsiye edilir. Bylece bilgisayarnz yeniden balatmanza gerek kalmadan ilgili sistem dosyalar gncellenebilir.\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" "LyX-Document" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" "Tm kullanclar iin kur?" -LangString SecFileAssocTitle "${LYX_LANG}" "Dosya elemeleri" -LangString SecDesktopTitle "${LYX_LANG}" "Masast ikonu" - -LangString SecCoreDescription "${LYX_LANG}" "LyX dosyalar." -LangString SecInstGSviewDescription "${LYX_LANG}" "Postscript ve PDF gsterici program." -LangString SecInstJabRefDescription "${LYX_LANG}" "Bibliography reference manager and editor for BibTeX files." -LangString SecAllUsersDescription "${LYX_LANG}" "LyX tm kullanclar iin mi yoksa yalnzca bu kullancya m kurulacak." -LangString SecFileAssocDescription "${LYX_LANG}" "Uzants .lyx olan dosyalar otomatik olarak LyX ile alsn." -LangString SecDesktopDescription "${LYX_LANG}" "Masastne bir LyX ikonu koy." - -LangString LangSelectHeader "${LYX_LANG}" "LyX arabirim dili seimi" -LangString AvailableLang "${LYX_LANG}" " Mevcut Diller " - -LangString MissProgHeader "${LYX_LANG}" "Gerekli programlarn kontrol" -LangString MissProgCap "${LYX_LANG}" "Aadaki gerekli programlar da otomatik olarak kurulacak" -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, bir LaTeX datm" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, bir PostScript ve PDF yorumlayc" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, bir resim dntrc" -LangString MissProgAspell "${LYX_LANG}" "Aspell, bir yazm denetleyici" -LangString MissProgMessage "${LYX_LANG}" 'Ek bir program kurmaya gerek bulunmuyor.' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" 'LaTeX-datm' -LangString EnterLaTeXHeader2 "${LYX_LANG}" 'LyX in kullanaca LaTeX datmn sein.' -LangString EnterLaTeXFolder "${LYX_LANG}" 'You can optionally set here the path to the file "latex.exe" and therewith set the \ - LaTeX-distribution that should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer has detected the LaTeX-distribution \ - "$LaTeXName" on your system. Displayed below is its path.' -LangString EnterLaTeXFolderNone "${LYX_LANG}" 'Set below the path to the file "latex.exe". Therewith you set which \ - LaTeX-distribution should be used by LyX.\r\n\ - If you don$\'t use LaTeX, LyX cannot output documents!\r\n\ - \r\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -LangString PathName "${LYX_LANG}" 'Path to the file "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" "LaTeX kullanma" -LangString InvalidLaTeXFolder "${LYX_LANG}" '"latex.exe" dosyas belirttiiniz dizinde bulunamad.' - -LangString LatexInfo "${LYX_LANG}" 'imdi LaTeX datm "MiKTeX" kurulumu balatlacak.$\r$\n\ - Program kurmak iin kurulum balayana kadar "Devam" tuuyla ilerleyin.$\r$\n\ - $\r$\n\ - !!! Ltfen MiKTeX kurucusunun ntanml ayarlarn deitirmeyin !!!' -LangString LatexError1 "${LYX_LANG}" 'Hi bir LaTeX datm bulunamad!$\r$\n\ - LyX "MiKTeX" gibi bir LaTeX datm olmadan kullanlamaz!$\r$\n\ - Bu nedenle kurulum iptal edilecek.' - -LangString GSviewInfo "${LYX_LANG}" 'imdi "GSview" kurulum program balatlacak.$\r$\n\ - Program kurmak iin ile kurulum penceresinde "Setup" tuuna basp$\r$\n\ - bir dil sein, ve sonraki pencerelerde "Devam" tuuyla ilerleyin.$\r$\n\ - GSview kurulumunun tm ntanml seeneklerini kullanabilirsiniz.' -LangString GSviewError "${LYX_LANG}" '"GSview" kurulumu baarsz oldu!$\r$\n\ - Kurulum gene de devam edecek.$\r$\n\ - Daha sonra GSview kurmay tekrar deneyin.' - -LangString JabRefInfo "${LYX_LANG}" 'Now the installer of the program "JabRef" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -LangString JabRefError "${LYX_LANG}" 'The program "JabRef" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' - -LangString LatexConfigInfo "${LYX_LANG}" "Sradaki LyX yaplandrmas biraz zaman alacak." - -LangString AspellInfo "${LYX_LANG}" 'Now dictionaries for the spellchecker "Aspell" will be downloaded and installed.$\r$\n\ - Every dictionary has a different license that will be displayed before the installation.' -LangString AspellDownloadFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be downloaded!" -LangString AspellInstallFailed "${LYX_LANG}" "No Aspell spellchecker dictionary could be installed!" -LangString AspellPartAnd "${LYX_LANG}" " and " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" 'There is already installed a dictionary of the language' -LangString AspellNone "${LYX_LANG}" 'No dictionary for the spellchecker "Aspell" has been installed.$\r$\n\ - Dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download dictionaries now?' -LangString AspellPartStart "${LYX_LANG}" "There was successfully installed " -LangString AspellPart1 "${LYX_LANG}" "an english dictionary" -LangString AspellPart2 "${LYX_LANG}" "a dictionary of the language $LangName" -LangString AspellPart3 "${LYX_LANG}" "a$\r$\n\ - dictionary of the language $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' for the spellchecker "Aspell".$\r$\n\ - More dictionaries can be downloaded from$\r$\n\ - ${AspellLocation}$\r$\n\ - Do you want to download other dictionaries now?' - -LangString MiKTeXPathInfo "${LYX_LANG}" "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ - $MiKTeXPath $\r$\n\ - and its subfolders." -LangString MiKTeXInfo "${LYX_LANG}" 'The LaTeX-distribution "MiKTeX" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program "MiKTeX Update Wizard"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' - -LangString UpdateNotAllowed "${LYX_LANG}" "This update package can only update ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" "Yaplandrma programnda 'path_prefix' ayarlanamad" -LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.bat oluturulamad" -LangString RunConfigureFailed "${LYX_LANG}" "Yaplandrma program altrlamad" -LangString NotAdmin "${LYX_LANG}" "LyX kurabilmek iin ynetici yetkileri gerekiyor!" -LangString InstallRunning "${LYX_LANG}" "Kurulum program zaten alyor!" -LangString StillInstalled "${LYX_LANG}" "LyX kurulu zaten! nce onu kaldrn." - -LangString FinishPageMessage "${LYX_LANG}" "Tebrikler! LyX baaryla kuruldu.\r\n\ - \r\n\ - (LyX in ilk al birka saniye alabilir.)" -LangString FinishPageRun "${LYX_LANG}" "LyX Balat" - -LangString UnNotInRegistryLabel "${LYX_LANG}" "Sistem ktnde LyX bulunamad.$\r$\n\ - Balat mens ve masastnzdeki ksayollar silinemeyecek." -LangString UnInstallRunning "${LYX_LANG}" "nce LyX i kapatmalsnz!" -LangString UnNotAdminLabel "${LYX_LANG}" "LyX kaldrabilmek iin ynetici yetkileri gerekiyor!" -LangString UnReallyRemoveLabel "${LYX_LANG}" "LyX ve tm bileenlerini kaldrmak istediinize emin misiniz?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" 'LyX$\'s user preferences' -LangString UnGSview "${LYX_LANG}" 'Ltfen bir sonraki pencerede "Kaldr" dmesine basarak$\r$\n\ - "GSview" postscript ve pdf gstericisini kaldrn.' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX bilgisayarnzdan baaryla kaldrld." - -LangString SecUnAspellDescription "${LYX_LANG}" "Uninstalls the spellchecker Aspell and all of its dictionaries." -LangString SecUnMiKTeXDescription "${LYX_LANG}" "Uninstalls the LaTeX-distribution MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" "Uninstalls the bibliography manager JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" 'Deletes LyX$\'s configuration folder$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - for all users.' -LangString SecUnProgramFilesDescription "${LYX_LANG}" "Uninstall LyX and all of its components." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_TURKISH_NSH_ - - - - - - - - - - - - - diff --git a/development/Win32/packaging/AltInstaller/lyx_languages/ukrainian.nsh b/development/Win32/packaging/AltInstaller/lyx_languages/ukrainian.nsh deleted file mode 100644 index 2274b5e946..0000000000 --- a/development/Win32/packaging/AltInstaller/lyx_languages/ukrainian.nsh +++ /dev/null @@ -1,149 +0,0 @@ -!ifndef _LYX_LANGUAGES_UKRAINIAN_NSH_ -!define _LYX_LANGUAGES_UKRAINIAN_NSH_ - -!ifdef LYX_LANG - !undef LYX_LANG -!endif -!define LYX_LANG ${LANG_UKRAINIAN} - -LicenseLangString LyXLicenseData ${LYX_LANG} "${PRODUCT_LICENSE_FILE}" - -LangString WelcomePageText "${LYX_LANG}" " LyX .\r\n\ - \r\n\ - , LyX .\r\n\ - \r\n\ - . .\r\n\ - \r\n\ - $_CLICK" - -LangString FileTypeTitle "${LYX_LANG}" " LyX" - -LangString SecInstGSviewTitle "${LYX_LANG}" "GSview" -LangString SecInstJabRefTitle "${LYX_LANG}" "JabRef" -LangString SecAllUsersTitle "${LYX_LANG}" " ?" -LangString SecFileAssocTitle "${LYX_LANG}" " " -LangString SecDesktopTitle "${LYX_LANG}" "ϳ " - -LangString SecCoreDescription "${LYX_LANG}" " LyX." -LangString SecInstGSviewDescription "${LYX_LANG}" " Postscript PDF." -LangString SecInstJabRefDescription "${LYX_LANG}" " BibTeX." -LangString SecAllUsersDescription "${LYX_LANG}" ", LyX , ." -LangString SecFileAssocDescription "${LYX_LANG}" " .lyx LyX." -LangString SecDesktopDescription "${LYX_LANG}" "ϳ LyX ." - -LangString LangSelectHeader "${LYX_LANG}" " LyX" -LangString AvailableLang "${LYX_LANG}" " " - -LangString MissProgHeader "${LYX_LANG}" " " -LangString MissProgCap "${LYX_LANG}" " , " -LangString MissProgLatex "${LYX_LANG}" "MiKTeX, LaTeX" -LangString MissProgGhostscript "${LYX_LANG}" "Ghostscript, PostScript PDF" -LangString MissProgImageMagick "${LYX_LANG}" "ImageMagick, " -LangString MissProgAspell "${LYX_LANG}" "Aspell, " -LangString MissProgMessage "${LYX_LANG}" ' .' - -LangString EnterLaTeXHeader1 "${LYX_LANG}" ' LaTeX' -LangString EnterLaTeXHeader2 "${LYX_LANG}" ' LaTeX, LyX.' -LangString EnterLaTeXFolder "${LYX_LANG}" ' , "latex.exe" \ - LaTeX, LyX.\r\n\ - LaTeX, LyX !\r\n\ - \r\n\ - LaTeX \ - "$LaTeXName" . .' -LangString EnterLaTeXFolderNone "${LYX_LANG}" ' "latex.exe". , \ - LaTeX, LyX.\r\n\ - LaTeX, LyX !\r\n\ - \r\n\ - LaTeX .' -LangString PathName "${LYX_LANG}" ' "latex.exe"' -LangString DontUseLaTeX "${LYX_LANG}" " LaTeX" -LangString InvalidLaTeXFolder "${LYX_LANG}" ' "latex.exe".' - -LangString LatexInfo "${LYX_LANG}" ' LaTeX "MiKTeX".$\r$\n\ - , "Next" , .$\r$\n\ - $\r$\n\ - !!! , MiKTeX !!!' -LangString LatexError1 "${LYX_LANG}" ' LaTeX !$\r$\n\ - LyX LaTeX "MiKTeX"!$\r$\n\ - .' - -LangString GSviewInfo "${LYX_LANG}" ' "GSview".$\r$\n\ - , "Setup" ,$\r$\n\ - , "Next" .$\r$\n\ - GSview.' -LangString GSviewError "${LYX_LANG}" ' "GSview"!$\r$\n\ - LyX .$\r$\n\ - GSview .' - -LangString JabRefInfo "${LYX_LANG}" ' "JabRef".$\r$\n\ - JabRef.' -LangString JabRefError "${LYX_LANG}" ' "JabRef"!$\r$\n\ - LyX .$\r$\n\ - JabRef .' - -LangString LatexConfigInfo "${LYX_LANG}" " LyX ." - -LangString AspellInfo "${LYX_LANG}" ' "Aspell".$\r$\n\ - , .' -LangString AspellDownloadFailed "${LYX_LANG}" " Aspell!" -LangString AspellInstallFailed "${LYX_LANG}" " Aspell!" -LangString AspellPartAnd "${LYX_LANG}" " " -LangString AspellPartSep "${LYX_LANG}" ", " -LangString AspellAll "${LYX_LANG}" ' ' -LangString AspellNone "${LYX_LANG}" ' "Aspell".$\r$\n\ - $\r$\n\ - ${AspellLocation}$\r$\n\ - ?' -LangString AspellPartStart "${LYX_LANG}" " " -LangString AspellPart1 "${LYX_LANG}" " " -LangString AspellPart2 "${LYX_LANG}" " $LangName" -LangString AspellPart3 "${LYX_LANG}" "$\r$\n\ - $LangNameSys" -LangString AspellPart4 "${LYX_LANG}" ' "Aspell".$\r$\n\ - $\r$\n\ - ${AspellLocation}$\r$\n\ - ?' - -LangString MiKTeXPathInfo "${LYX_LANG}" " MiKTeX ,$\r$\n\ - MiKTeX , :$\r$\n\ - $MiKTeXPath $\r$\n\ - ." -LangString MiKTeXInfo "${LYX_LANG}" ' LyX LaTeX "MiKTeX".$\r$\n\ - MiKTeX "MiKTeX Update Wizard"$\r$\n\ - , LyX.$\r$\n\ - MiKTeX?' - -LangString UpdateNotAllowed "${LYX_LANG}" " ${PRODUCT_VERSION_OLD}!" -LangString ModifyingConfigureFailed "${LYX_LANG}" " 'path_prefix' " -LangString CreateCmdFilesFailed "${LYX_LANG}" " lyx.bat" -LangString RunConfigureFailed "${LYX_LANG}" " " -LangString NotAdmin "${LYX_LANG}" " LyX !" -LangString InstallRunning "${LYX_LANG}" " !" -LangString StillInstalled "${LYX_LANG}" "LyX ! LyX." - -LangString FinishPageMessage "${LYX_LANG}" "³! LyX .\r\n\ - \r\n\ - ( LyX .)" -LangString FinishPageRun "${LYX_LANG}" " LyX" - -LangString UnNotInRegistryLabel "${LYX_LANG}" " LyX .$\r$\n\ - ." -LangString UnInstallRunning "${LYX_LANG}" " LyX!" -LangString UnNotAdminLabel "${LYX_LANG}" " LyX !" -LangString UnReallyRemoveLabel "${LYX_LANG}" " LyX ?" -LangString UnLyXPreferencesTitle "${LYX_LANG}" ' LyX, ' -LangString UnGSview "${LYX_LANG}" ' , "Uninstall" , $\r$\n\ - Postscript PDF "GSview".' -LangString UnRemoveSuccessLabel "${LYX_LANG}" "LyX ." - -LangString SecUnAspellDescription "${LYX_LANG}" ' Aspell .' -LangString SecUnMiKTeXDescription "${LYX_LANG}" " LaTeX - MiKTeX." -LangString SecUnJabRefDescription "${LYX_LANG}" " JabRef." -LangString SecUnPreferencesDescription "${LYX_LANG}" ' LyX$\r$\n\ - "$AppPre\username\$AppSuff\${PRODUCT_SUBFOLDER}"$\r$\n\ - .' -LangString SecUnProgramFilesDescription "${LYX_LANG}" " LyX ." - -!undef LYX_LANG - -!endif # _LYX_LANGUAGES_UKRAINIAN_NSH_ diff --git a/development/Win32/packaging/AltInstaller/registry.nsh b/development/Win32/packaging/AltInstaller/registry.nsh deleted file mode 100644 index a49b48a8fe..0000000000 --- a/development/Win32/packaging/AltInstaller/registry.nsh +++ /dev/null @@ -1,166 +0,0 @@ -!ifndef REGISTRY_NSH -!define REGISTRY_NSH -!include "${NSISDIR}\Examples\System\system.nsh" - -!define HKEY_CLASSES_ROOT_ENUM 0x80000000 -!define HKEY_CURRENT_USER_ENUM 0x80000001 -!define HKEY_LOCAL_MACHINE_ENUM 0x80000002 -!define HKEY_USERS_ENUM 0x80000003 -!define HKEY_PERFORMANCE_DATA_ENUM 0x80000004 -!define HKEY_CURRENT_CONFIG_ENUM 0x80000005 -!define HKEY_DYN_DATA_ENUM 0x80000006 - -!define KEY_ALL_ACCESS 0x0002003F - -!define RegCreateKeyEx 'advapi32::RegCreateKeyEx(i, t, i, t, i, i, i, *i, *i) i' -!define RegOpenKeyEx 'advapi32::RegOpenKeyEx(i, t, i, i, *i) i' -!define RegCloseKey 'advapi32::RegCloseKey(i) i' -!define SHCopyKey 'shlwapi::SHCopyKey(i, t, i, i) i' - -#################################################################################################### -!macro SET_HKEY_ENUM HKEY_NAME HKEY_ENUM LABEL - StrCmp ${HKEY_NAME} HKCR 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_CLASSES_ROOT 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CLASSES_ROOT_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKCU 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_CURRENT_USER 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_USER_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKLM 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_LOCAL_MACHINE 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_LOCAL_MACHINE_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKU 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_USERS 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_USERS_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKPD 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_PERFORMANCE_DATA 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_PERFORMANCE_DATA_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKCC 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_CURRENT_CONFIG 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_CURRENT_CONFIG_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKDD 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM} - GoTo ${LABEL} - StrCmp ${HKEY_NAME} HKEY_DYN_DATA 0 +3 - StrCpy ${HKEY_ENUM} ${HKEY_DYN_DATA_ENUM} -${LABEL}: -!macroend -#################################################################################################### -!macro COPY_REGISTRY_KEY_BASE TYPE -!ifndef ${TYPE}COPY_REGISTRY_KEY_DEFINE -!define ${TYPE}COPY_REGISTRY_KEY_DEFINE -Function ${TYPE}CopyRegistryKey - Exch $1 ;Target subkey - Exch - Exch $2 ;Target key name - Exch - Exch 2 - Exch $3 ;Source subkey - Exch - Exch 2 - Exch 3 - Exch $4 ;Source key name - Push $5 ;Source key handle - Push $6 ;Target key handle - Push $7 ;return value - Push $8 ;HKEY enum for target key - Push $9 ;HKEY enum for source key - -!insertmacro SET_HKEY_ENUM $2 $8 next -!insertmacro SET_HKEY_ENUM $4 $9 next2 - - SetPluginUnload alwaysoff - - StrCpy $5 0 - System::Call '${RegOpenKeyEx}(i r9, t r3, 0, ${KEY_ALL_ACCESS}, .r5) .r7' - StrCmp $7 0 continue - DetailPrint "Registry key $4\$3 not found." - StrCpy $1 $7 - GoTo done - -continue: - StrCpy $6 0 - System::Call '${RegCreateKeyEx}(i r8, t r1, 0, 0, 0, ${KEY_ALL_ACCESS}, 0, .r6, 0) .r7' - StrCmp $7 0 copy - MessageBox MB_OK|MB_ICONSTOP "Error $7 opening registry key $2\$1." - StrCpy $1 $7 - GoTo done - -copy: - System::Call '${SHCopyKey}(i r5, "", i r6, 0) .r7' - StrCmp $7 0 +2 - MessageBox MB_OK|MB_ICONSTOP "Error $7 copying registry key." - StrCpy $1 $7 - -done: - System::Call '${RegCloseKey}(i r5) .r7' - System::Call '${RegCloseKey}(i r6) .r7' - SetPluginUnload manual - System::Free 0 - - Pop $9 - Pop $8 - Pop $7 - Pop $6 - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Exch $1 -FunctionEnd -!endif -!macroend -#################################################################################################### -!macro COPY_REGISTRY_KEY -!insertmacro COPY_REGISTRY_KEY_BASE "" -!macroend -#################################################################################################### -!macro UN.COPY_REGISTRY_KEY -!insertmacro COPY_REGISTRY_KEY_BASE "Un." -!macroend -#################################################################################################### -!macro CALL_COPY_REGISTRY_KEY_BASE TYPE SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY -!ifdef ${TYPE}COPY_REGISTRY_KEY_DEFINE - Push $R1 - ReadRegStr $R1 "${TARGETROOTKEY}" "${TARGETSUBKEY}" "" - IfErrors 0 +2 - WriteRegStr "${TARGETROOTKEY}" "${TARGETSUBKEY}" "" "" - Pop $R1 - Push "${SOURCEROOTKEY}" - Push "${SOURCESUBKEY}" - Push "${TARGETROOTKEY}" - Push "${TARGETSUBKEY}" - Call ${TYPE}CopyRegistryKey -!else -!error "Macro ${TYPE}COPY_REGISTRY_KEY not inserted" -!endif -!macroend -#################################################################################################### -!macro CALL_COPY_REGISTRY_KEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY -!insertmacro CALL_COPY_REGISTRY_KEY_BASE "" "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}" -!macroend -#################################################################################################### -!macro CALL_UN.COPY_REGISTRY_KEY SOURCEROOTKEY SOURCESUBKEY TARGETROOTKEY TARGETSUBKEY -!insertmacro CALL_COPY_REGISTRY_KEY_BASE "Un." "${SOURCEROOTKEY}" "${SOURCESUBKEY}" "${TARGETROOTKEY}" "${TARGETSUBKEY}" -!macroend -#################################################################################################### -!define COPY_REGISTRY_KEY "!insertmacro CALL_COPY_REGISTRY_KEY" -!define UN.COPY_REGISTRY_KEY "!insertmacro UN.CALL_COPY_REGISTRY_KEY" -!endif diff --git a/development/Win32/packaging/AltInstaller/specials/AspellDictionaryNames.txt b/development/Win32/packaging/AltInstaller/specials/AspellDictionaryNames.txt deleted file mode 100644 index 89768a3a5e..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/AspellDictionaryNames.txt +++ /dev/null @@ -1,26 +0,0 @@ -ar-1.2-0 -cs-20040614-1 -da-1.4.42-1 -de-20030222-1 -el-0.50-3 -en-6.0-0 -es-0.50-2 -fi-0.7-0 -fr-0.50-3 -gl-0.50-0 -he-1.0-0 -hu-0.99.4.2-0 -id-1.2-0 -it-2.2_20050523-0 -nl-opentaal200711 -nb-0.50.1-0 -nn-0.50.1-1 -pl-6.0_20061121-0 -pt-0.50-2 -ro-0.50-2 -ru-0.99f7-1 -sk-0.52-0 -sl-0.50-0 -sr-0.02 -sv-0.51-0 -tr-0.50-0 diff --git a/development/Win32/packaging/AltInstaller/specials/AspellRepositories.txt b/development/Win32/packaging/AltInstaller/specials/AspellRepositories.txt deleted file mode 100644 index 2bb850103a..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/AspellRepositories.txt +++ /dev/null @@ -1,3 +0,0 @@ -http://download2.berlios.de/lyxwininstall -http://download.berlios.de/lyxwininstall -ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.cfg b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.cfg deleted file mode 100644 index e9c1cc14ee..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.cfg +++ /dev/null @@ -1,38 +0,0 @@ --$A8 --$B- --$C+ --$D+ --$E- --$F- --$G+ --$H+ --$I+ --$J- --$K- --$L+ --$M- --$N+ --$O+ --$P+ --$Q- --$R- --$S- --$T- --$U- --$V+ --$W- --$X+ --$YD --$Z1 --cg --AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; --H+ --W+ --M --$M16384,1048576 --K$00400000 --LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" --LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" --w-UNSAFE_TYPE --w-UNSAFE_CODE --w-UNSAFE_CAST diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof deleted file mode 100644 index c59ac4ca8f..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof +++ /dev/null @@ -1,139 +0,0 @@ -[FileVersion] -Version=7.0 -[Compiler] -A=8 -B=0 -C=1 -D=1 -E=0 -F=0 -G=1 -H=1 -I=1 -J=0 -K=0 -L=1 -M=0 -N=1 -O=1 -P=1 -Q=0 -R=0 -S=0 -T=0 -U=0 -V=1 -W=0 -X=1 -Y=1 -Z=1 -ShowHints=1 -ShowWarnings=1 -UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -NamespacePrefix= -SymbolDeprecated=1 -SymbolLibrary=1 -SymbolPlatform=1 -UnitLibrary=1 -UnitPlatform=1 -UnitDeprecated=1 -HResultCompat=1 -HidingMember=1 -HiddenVirtual=1 -Garbage=1 -BoundsError=1 -ZeroNilCompat=1 -StringConstTruncated=1 -ForLoopVarVarPar=1 -TypedConstVarPar=1 -AsgToTypedConst=1 -CaseLabelRange=1 -ForVariable=1 -ConstructingAbstract=1 -ComparisonFalse=1 -ComparisonTrue=1 -ComparingSignedUnsigned=1 -CombiningSignedUnsigned=1 -UnsupportedConstruct=1 -FileOpen=1 -FileOpenUnitSrc=1 -BadGlobalSymbol=1 -DuplicateConstructorDestructor=1 -InvalidDirective=1 -PackageNoLink=1 -PackageThreadVar=1 -ImplicitImport=1 -HPPEMITIgnored=1 -NoRetVal=1 -UseBeforeDef=1 -ForLoopVarUndef=1 -UnitNameMismatch=1 -NoCFGFileFound=1 -MessageDirective=1 -ImplicitVariants=1 -UnicodeToLocale=1 -LocaleToUnicode=1 -ImagebaseMultiple=1 -SuspiciousTypecast=1 -PrivatePropAccessor=1 -UnsafeType=0 -UnsafeCode=0 -UnsafeCast=0 -[Linker] -MapFile=0 -OutputObjs=0 -ConsoleApp=1 -DebugInfo=0 -RemoteSymbols=0 -MinStackSize=16384 -MaxStackSize=1048576 -ImageBase=4194304 -ExeDescription= -[Directories] -OutputDir= -UnitOutputDir= -PackageDLLOutputDir= -PackageDCPOutputDir= -SearchPath= -Packages=vcl;rtl;vclx;vclshlctrls;vclactnband;dbrtl;adortl;vcldb;bdertl;vcldbx;VclSmp;visualclx;visualdbclx;dsnap;inet;inetdb;ibxpress;indy;vclie;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;teeui;teedb;tee;xmlrtl;soaprtl;dbexpress;dbxcds -Conditionals= -DebugSourceDirs= -UsePackages=0 -[Parameters] -RunParams= -HostApplication= -Launcher= -UseLauncher=0 -DebugCWD= -[Language] -ActiveLang= -ProjectLang= -RootDir= -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1031 -CodePage=1252 -[Version Info Keys] -CompanyName=LyX Team -FileDescription=Launcher for LyX -FileVersion=1.0.0.0 -InternalName= -LegalCopyright=Uwe Sthr -LegalTrademarks= -OriginalFilename=lyxLauncher.exe -ProductName= -ProductVersion=1.0.0.0 -Comments= -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr deleted file mode 100644 index d38706cfd1..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr +++ /dev/null @@ -1,109 +0,0 @@ -program lyxLauncher; -// this program opens LyX and hides its console window -// author: Uwe Sthr - -{The problematic is the following: - When the lyx.exe is started, also a console window is shown. - But closing the console window, also closes LyX, - therefore the console will be hidden by this program.} - -{$APPTYPE CONSOLE} - -uses - Windows, SysUtils, ShellApi, Dialogs; - -{$R *.res} - -var Path,FileName : string; - hConsole : THandle; - - -procedure StartLyX(hConsole: THandle; FileName,Path: string); -// starts LyX - -var Params : PChar; - hLyX : THandle; - Folder : string; -begin - - // if a filename is given, quote it to avoid the path with spaces problem - if FileName <> '' then - Params:= PChar('"' + FileName + '"') - else - Params:= nil; - - // get folder of the lyx.exe - Folder:= StringReplace(Path,'\lyx.exe','',[rfIgnoreCase]); - // quote path to avoid the path with spaces problem - Folder:= '"' + Folder + '"'; - - // start LyX - hLyX:= ShellExecute(hConsole,PChar('open'),PChar(Path), - Params,PChar(Folder),SW_SHOWNORMAL); - if hLyX = ERROR_FILE_NOT_FOUND then - begin - MessageDLG('The file'#13#10 + Path + #13#10 - + 'could not be found!',mtError,[mbOK],0); - exit; - end; - if hLyX = SE_ERR_ACCESSDENIED then - begin - MessageDLG('Windows denied access on the file'#13#10 + Path, - mtError,[mbOK],0); - exit; - end; - -end; // end procedure - - -procedure HideWindow(ProgWin: string); -// hides a given program window - -var Handle : THandle; -begin - - // find handle of the program window - // Repeat until the handle is available - // because Lyx needs some time to start - Repeat - Sleep(1000); // wait 1 second to give LyX time to open - Handle := FindWindow(nil,Pchar(ProgWin)); - Until Handle <> 0; - - // hide the window from taskbar - ShowWindow(Handle, SW_HIDE); - -end; //end procedure - - -begin //begin program - - //Read path to this application - Path:= ParamStr(0); - - //get handle of this console window - // This application is called by the lyx.bat with the name "LyX" - hConsole := FindWindow(nil,Pchar('LyX')); - // hide the window of this console application - ShowWindow(hConsole,SW_HIDE); - - // do the same for the real name of this console application - // because it depends on the computer speed if the "LyX" console window - // was closed before it could be processed - hConsole := FindWindow(nil,Pchar(Path)); - ShowWindow(hConsole,SW_HIDE); - - // replace in the path "lyxLauncher.exe" by "lyx.exe" - Path:= StringReplace(Path, 'lyxLauncher', 'lyx', [rfIgnoreCase]); - - // read given filename of a LyX-document - FileName:= ParamStr(1); - - // start LyX - StartLyX(hConsole,FileName,Path); - - // hide console window of lyx.exe - HideWindow(Path); - -end. //end program - diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe deleted file mode 100644 index 46791d0c5ff16c3d59a9abe8b915bf860debced7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406016 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 O20h!ZtF={w)&ByTfnn(Y diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.cfg b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.cfg deleted file mode 100644 index e9c1cc14ee..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.cfg +++ /dev/null @@ -1,38 +0,0 @@ --$A8 --$B- --$C+ --$D+ --$E- --$F- --$G+ --$H+ --$I+ --$J- --$K- --$L+ --$M- --$N+ --$O+ --$P+ --$Q- --$R- --$S- --$T- --$U- --$V+ --$W- --$X+ --$YD --$Z1 --cg --AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; --H+ --W+ --M --$M16384,1048576 --K$00400000 --LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" --LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" --w-UNSAFE_TYPE --w-UNSAFE_CODE --w-UNSAFE_CAST diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof deleted file mode 100644 index 1b696f5b45..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof +++ /dev/null @@ -1,139 +0,0 @@ -[FileVersion] -Version=7.0 -[Compiler] -A=8 -B=0 -C=1 -D=1 -E=0 -F=0 -G=1 -H=1 -I=1 -J=0 -K=0 -L=1 -M=0 -N=1 -O=1 -P=1 -Q=0 -R=0 -S=0 -T=0 -U=0 -V=1 -W=0 -X=1 -Y=1 -Z=1 -ShowHints=1 -ShowWarnings=1 -UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -NamespacePrefix= -SymbolDeprecated=1 -SymbolLibrary=1 -SymbolPlatform=1 -UnitLibrary=1 -UnitPlatform=1 -UnitDeprecated=1 -HResultCompat=1 -HidingMember=1 -HiddenVirtual=1 -Garbage=1 -BoundsError=1 -ZeroNilCompat=1 -StringConstTruncated=1 -ForLoopVarVarPar=1 -TypedConstVarPar=1 -AsgToTypedConst=1 -CaseLabelRange=1 -ForVariable=1 -ConstructingAbstract=1 -ComparisonFalse=1 -ComparisonTrue=1 -ComparingSignedUnsigned=1 -CombiningSignedUnsigned=1 -UnsupportedConstruct=1 -FileOpen=1 -FileOpenUnitSrc=1 -BadGlobalSymbol=1 -DuplicateConstructorDestructor=1 -InvalidDirective=1 -PackageNoLink=1 -PackageThreadVar=1 -ImplicitImport=1 -HPPEMITIgnored=1 -NoRetVal=1 -UseBeforeDef=1 -ForLoopVarUndef=1 -UnitNameMismatch=1 -NoCFGFileFound=1 -MessageDirective=1 -ImplicitVariants=1 -UnicodeToLocale=1 -LocaleToUnicode=1 -ImagebaseMultiple=1 -SuspiciousTypecast=1 -PrivatePropAccessor=1 -UnsafeType=0 -UnsafeCode=0 -UnsafeCast=0 -[Linker] -MapFile=0 -OutputObjs=0 -ConsoleApp=1 -DebugInfo=0 -RemoteSymbols=0 -MinStackSize=16384 -MaxStackSize=1048576 -ImageBase=4194304 -ExeDescription= -[Directories] -OutputDir= -UnitOutputDir= -PackageDLLOutputDir= -PackageDCPOutputDir= -SearchPath= -Packages=vcl;rtl;vclx;vcldb;dbrtl;bdertl;vclshlctrls;vclactnband;adortl;vcldbx;VclSmp;visualclx;visualdbclx;dbexpress;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;teeui;teedb;tee;Rave50CLX;Rave50VCL;IntrawebDB_50_70;Intraweb_50_70;indy;ibxpress;dsnap;soaprtl;dbxcds;inetdb -Conditionals= -DebugSourceDirs= -UsePackages=0 -[Parameters] -RunParams= -HostApplication= -Launcher= -UseLauncher=0 -DebugCWD= -[Language] -ActiveLang= -ProjectLang= -RootDir= -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1031 -CodePage=1252 -[Version Info Keys] -CompanyName=LyX Team -FileDescription=PDF viewing program for LyX -FileVersion=1.0.0.0 -InternalName= -LegalCopyright=Uwe Sthr -LegalTrademarks= -OriginalFilename=PDFViewWin.exe -ProductName= -ProductVersion=1.0.0.0 -Comments= -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr deleted file mode 100644 index 413bfad8cf..0000000000 --- a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr +++ /dev/null @@ -1,103 +0,0 @@ -program PDFViewWin; -// this program opens and closes PDF-files with Acrobat or Adobe Reader -// author: Uwe Sthr - -{The problematic is the following: - A PDF-file should be modified while it is opened with Acrobat. - This is not possible because Acrobat understands itself as editor, not as - reader and therefore opens PDFs always with write access, so that other - programs cannot modifiy them. - The idea to solve the problem is the following: - The file that should be shown in Acrobat is copied and then renamed - - the suffix "-preview" is attached. The renamed copy is opened by Acrobat - while the unrenamed version can be modified. When the modified version should - be displayed, the eventually opened renamed version is closed in Acrobat and - the modified version is copied, renamed and opened in Acrobat.} - -{$APPTYPE CONSOLE} - -uses - Windows, SysUtils, ShellApi; - -{$R *.res} - -var Input,InputNew : string; - FileTest : boolean; - hConsole : THandle; - - -function ExecWait(const CommandLine: string; - const Visible: boolean = false; - const MaxSeconds: integer = 60): boolean; -//Executes programs and waits until they are terminated -var -SI: TStartupInfo; -PI: TProcessInformation; -ExitCode: DWORD; -begin - result := false; - GetStartupInfo(SI); - if not Visible then - begin - SI.dwFlags := STARTF_USESHOWWINDOW; - SI.wShowWindow := SW_HIDE; - end; - if (CreateProcess(nil, pchar(CommandLine), nil, nil, False, 0, nil, nil, SI, PI)) then - begin - case WaitForSingleObject(PI.hProcess, MaxSeconds * 1000) of - WAIT_OBJECT_0: GetExitCodeProcess(PI.hProcess, ExitCode); - WAIT_ABANDONED: TerminateProcess(PI.hProcess, ExitCode); - WAIT_TIMEOUT: TerminateProcess(PI.hProcess, ExitCode); - end; - result := ExitCode = 0; - CloseHandle(PI.hProcess); - CloseHandle(PI.hThread); - end; -end; // end function - - -function RenameFile(const OldName,NewName: string; hConsole: THandle): boolean; -//renames files, taken from -//http://www.dsdt.info/tipps/?id=128&search=RenameFile -var - sh: TSHFileOpStruct; -begin - sh.Wnd:= hConsole; - sh.wFunc:= fo_Rename; - //terminate with null byte to set list ending - sh.pFrom:= PChar(OldName + #0); - sh.pTo:= PChar(NewName + #0); - sh.fFlags:= fof_Silent or fof_MultiDestFiles; - Result:= ShFileOperation(sh)=0; -end; //end function - - -begin //begin program - - //Read path to this application - Input:= ParamStr(0); - - //get handle of this console window - hConsole := FindWindow(nil,Pchar(Input)); - // hide the window of this console application - ShowWindow(hConsole,SW_HIDE); - - //Read given filename - Input:= ParamStr(1); - //InputNew = original filename with ending "-preview" (e.g. test-preview.pdf) - InputNew:= copy(Input,1,Length(Input)-4); //remove ".pdf" - InputNew:= InputNew+'-preview.pdf'; - //check if renamed file exists - FileTest:= FileExists(InputNew); - if FileTest = true then - begin - //close old file - ExecWait('pdfclose --file "'+InputNew+'"'); - //delete old file - DeleteFile(InputNew); - end; - //rename file - RenameFile(Input,InputNew,hConsole); - ExecWait('pdfopen --file "'+InputNew+'" --back'); - -end. //end program diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe deleted file mode 100644 index abe71bce13920abdd72046a6dacdfe6f9e6b3ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45568 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 UC)2{NhFmoaSmgi9|0@>wPvJU26951J diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res deleted file mode 100644 index 1c6b321a25723c41ecbfbdb589a49853b62b9979..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4144 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 diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/pdfclose.exe b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/pdfclose.exe deleted file mode 100644 index 70bc4e09e04d970b7826b38530034f1b22da892d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73728 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 Date: Sun, 18 Nov 2012 01:46:02 +0100 Subject: [PATCH 85/93] installer: update structure for new installer --- .../informations/InstallerStructure.odg | Bin 16706 -> 17038 bytes .../informations/InstallerStructure.pdf | Bin 31690 -> 27492 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/development/Win32/packaging/installer/informations/InstallerStructure.odg b/development/Win32/packaging/installer/informations/InstallerStructure.odg index 89ecb8de414bc20c269c202ccf7e28034ec148db..301cd7643f04419a7b68ae8fd808f2f1c0ea4286 100644 GIT binary patch literal 17038 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 delta 14867 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
cI6dt(a{+ZV$W&VO6Mt(7j#M}j?gL6 zVf*BOaT#PYuin9%5@t!vUEnV=IURg(=LwnG4b#VGJ*c-q2guDG@ppR~W|R;!0r<|o zI7hGf{_3iVT)<8$BqK?Tw~y2Ywf>xTVFq|T>R5h@2XCD*Ie-`-9l)8ima?eUDG@iz z3L|mK*m+98w8haT%T&0x!*|KT9ntz#y50zO7E>v<^!7J_5%xGcAqh=@5rBWfZFk|&=CODXuFX$E>tQ6o`e(kmoUWx=^Q zQ{^ECi&bTj4l#9=TY0k)>xb)%srFx(Sp*Sp0oxHMFRe+j#qO7Z*-4yoE6Q56T99tL zEo1M@P{nq>aw*B&BPi33i{&T>N3br?cIsuUY^h(YPNkcn<~k8-x_rl+0p}NQF;3j6 zP|t3Qwj8-#%Fmo=6Ji@Ok#BKM=0T5o;*FJ762}h2$k@3_-->NRW6j>UwM2LcZ`e9j zTT!=wds2?6H;0l{s=zLa{Uvt?)^ZY~c4E~CRHVrSV|h{@h!{t%AQr=KSa(5op}Ku# ztXO$o0E@xG!K0Ge3PV#9kAH7Ur=`9wT7y0%=aEeHWbCDe)@In56o zhHoU}8|VnTpN+Q0R8?8_#@Qi6>q}JiAXD>#D^T_~nbl&8EQNAt_Xmyt+JxicZG5Io zdo=0L4z&f{C`1ZNU|9_s6BDr{Zll{&Nvhs(vHnAg$K6G8uo7w}ZkDPCNK1i0@uHvB z4sL3&*Z^~c*dtTpl?WpN*54HL(M!eaVTse=S+4wIeg(MDI&dwu=Kb|SG@JlShp}X% zba4lf~F>ZG%jMph$^H8|dnzaj2(;aVZZ(A3L#v!5tnlpW_a( z31&dx1TkrBGn!|0Sf%Q>n|VF)72*#@c`c_%Lrzs^x&yrXz;e(9ba;9C=Whe~uYX$m zYaNJ^$~+;QL2ZbHEnU%KAS)7w^p#Akb*)4tt+_`H6-1*<6cEEUN_=^Bq{=`L%B!aA zf;!__62urXMd0?Eyz-;DaicV|^;PA~)i&(?YJN9-bXl1*T=GrLx6T$U@O=8NZ!qptx&IK-OP%-q-R^+eIc`x(Z2Xa;6&rTZ% zr`0@aT9p}kbz0Csz+S~y>NdE|&)qm|os3~yOl#XK1`oq^92!@KO5vk-xGOIE?b{Dr zADa7Z(s3v`MD6ck=ZM9gq}g+9h4twwKuD3U?2q~;Ydx_jj4)ePVyl9J{@9nO;5=xD z7%hVV6Ed()d!}q0S3L_>kA^ht$2+`IY6q@>wwYEt2Ft zTfvXl=N5G*+y;GN3x%`k6A>^Bzj&FdT9;MFX>!gq=4%*Kr1Hucpkmw1CkGId+8VHe7q zs~5D@7GmnXtY`#R5gYAaMN1bVqa#wcS_*Tmv+Kk$b<Ygc`!k?tK?3r<%#L zG%8Hj$;sp|$qhb6mUZY3gQ_1QC)-BD2r&4)uTJm?=vjUD(6oLHd?oll@g(qccM3Rc z7Vl@Rf^N?ZztR;W{PQ)9);dRyF00J&)Z+lrbQJE7v<_HC*2DjLjxo88knfWbCGBYj z991^ZpqYy<=Q80#ZeQZ1BGCOMw_yK`&t{R&iZJNN@9~>sdVKG9wnonne|&wt0a5J) zODYPzQgvL!joz10TiUn5-L+=y@6x$nONSvy)}bzlRk7!)(xk}H!C;8Y7v4ubdP03- zw9j72my(&YQAQYf^|ePgTfSBO$@j1%Ov_&Om}D3NAvXR}KI-l{x8b^I7`9Pfo)tmD zi`+DTn#`N~2WrzfbOUW_Yw~|V&wttf*bwypkkJ1URyGdS|F!?0A{*EL2OY69{{OI} z|I3z`2w7OzSQ-D{BOUQpBC5-5Y#l1c;yYu;CEX`@Hkto>tIWjs=2Lv2G>JJEf%dzL{O ze$#gM_4V`MyBn9W?KQV^$9J~vG}rMazqqo1CnCNa#EDvA7t#9fbY8(X1kn?V$hvB8 znQZSN?70%fhC8F5aORQExd}XNgbGukUyj zH>g7g+a_|>S5uJ=VkhJ$%)io}nkFlbNjbvi57rsGyYLnQzVD48NSgp|Pe}<({^v2s ze95EWqd!VTD;IF$NgKpkHm(wpODC`HKEKP&{@J-m)6>ue|J?k7i^f4`X?O#9y&*f0 zq`e_;NwDEL$oLCCSV{c?2Y)I>%n3X}I0`7{nVwc!L^=?7@95ur>9E-er* zhuV%}kaaFlKg0XMQHx;|s4vHQA+JQ}Ah%KA3k!%#v>T9x#shmO@p;Em{8E3r9U@Q? zSZ)X0ir?*Txr8Z#d0qr03JBw!d_)|LL-|+-sNaeAoHKfVF3inmty5-8@g{Qy z@lqnp1bsXg7#soHx|?s={}E#~w7{hf%4UByI8Qq#g+I(oVjrMHg+e-L9IhGag?MLiMDwma%{>E9m=UtK>pxn8J05N4(|=s9lVXpHfCtd1v?L;Ez=}j2m}ujJ77svya&pzXg25 zzSExYd{_lvh2V_Dg;s^-;r!0r10o8CU(A{AhuATH@XqavB)P}U9zh>P96|Ug zCJe?gvZJQ<2e(CQv#Sm^4OO=~^zONad#1cTP`p9zbxE($Um?GO$3g(XEQLx>d~}Pw z-!DNT9U^uJMF)68U145fU&wcbsQCpL^@xHejGvU=tDrq@pkp@@b%rGSvr$eDtlmh5 zW^DR#9EWuN6IKs=?_<{20wW5bsrqAi{poVUbECYuvZO5I!tc7$#wH{iVzv}M$83*e zWe2d?Auf|Q$BEcV0CAp-rxj>L*KZ*YD)>kPkgEK)3TO_EKTDpeh7PMS}Zt?=znTF#JsT&^=mD%#ChT3%TY*FLHvFLXpcs>WY6Sp@T>Q4MSD-4 z*MmXFNVZ7!19R^d!feuKzTv);Hp3c)BE`t0uNs?K{&5)lV}kUwLt^hv^Z}fWK<(wp zUI=9#w4l{lql`ag6@xM$}5+plr>n7i9jU(+}h9 z1~Gjo6YSI*Kzq1A)Q3|xMH_D(s_%>o#7&=_2}9+upB3xJm=Y4+2F>ddl)vv6lB*wO z0H=DjTBe{U`7zHi93^x?JT$=84^$_|7k8srEm$4Cp(HpScpXNYKjeSr??k&9T7xr) z-BiM^&Te}U8?<&5PR|*q;F-WNq1y1F_W|D0T95e!%gYls$-GD1oal>9EsPwNi`WBp zJM$0j!Ko3#C|qKk>JvtA>Ht>d?e@o&oIc$&>b=V!iI6}Bu9k?2Fl$ESi}9^SQdC8W zo!0HO_AEBu{BxpGmMlk~qp7URT2OE3?W@n}rYrACNyCz!Ko7B~{KH>2cH>yedCgvB z!ju&a-XmXy^e2}D^F$3Cur~3asF#iK=WKSS?7AafwfTj*AT{#uK4;9)hc6CfdN z6j`-68h+bNbYn*t2!`AfW&0i;< z?OAEJB-tV!H`}x$FAR;i8M!iFIk;wE7pc|j&YY%#t1O@hH5t?M7+nn&ys*|h}lO1 z`}`c4R{UpClerGA4-W{^s=#$nvnXgxxxWGHlK4TI4$x|JSOc`BB+#>%{~T?lRppSH ziv5V8mHDxZ*v1tGAM81Evt+bHSy0TO|7MRKqC7pZza$yf>m?EaJr{`iZ<)^|g9!S0 za+BT1{2(=h6F=mRtVrvMTY2|TDkIiLBynf5#7|3U$vb%_a*?cD1@=$)$o|MhSc#DI zp-))US!W}U&H5$bsXSJtf>)u}Rj1OptyZ+xXuHbGPUP_>mI*t2OZVa%EQU? zl>g2?z;bhBG+YO-O0C)MQ1O$;ug_dO;AI1fm6)nrI>~To##J{%|9+(aCs)xpijn{_ zWw8L>7a)_0$yJ#z8)Ul|>0lACV~6a_;Q>ILZ17yUihrT-Sp_ztZhHjtisWu==xe2! zWd9B?;P^ajaI65;Vn3j2qJqtEA`bJQ6NK;M$!Mq(0RNTRZK&={Gh}YE6`u)^9k1di zCP6i-2rgX|#ZIsQQ!`38VOVH<>?J`8_SB@GL)Pr>B_K&Hl`Az;-BU`pKm>tUudN&|Z z-^`9HoB4Qd=90vV#WV-yC$YgiG-wL-Y38FK9vPtZMn2FpXCMYv1@7VqGtW`oWKNVN zzg&7vNNA18ZnhECDVPDhw-^?}5%=7rW?rg|r(mffu;WVS2PE*|>fc*%eyDUc6nX#7 zTUf|W?o;B{;%O^lWxWiH!mBFj>+35i@f%<#gV)qDTeqZaOp>F{Zeugy;JwBVnZFoi zQH_KtVTKKD+0#{qe2%OhCQBtnMrG4qmS_g8CMr^<6Hy}q0onBRogchp-NNd=9QwrJ z!PaK3{s#44hDNo@9f-KmYW9?Vp8pPsY#d9>RF!Q%%+Kc(yG^Bvy=}8UgWIEbGCm;P zLHJGxm5>S~ma$wo@{!x!a;n(cW>_doSJ+A4c5iE|*xY)msMzWq$S=Jd-8$@E`79?V zf+pVyDv+DdM7Y;MZtj3HiY zsrBc{PSa5yO*@%6Iy|^vnYE4Z|XJSAzNo|i@#JgQN+8j-A z_yuta`A~ntcN(OGd`UbpAKV`WP!^9Frb@=11KzE~`Dg4jnu z0==P6a!JlOo|yJ^lp4;)6C$D_4TBc>5)sA4{n7)Ts!3}9|- zgH7u=UoTxk*VDR<4xIjb2$cXf44n{e#;vj-IY!cX;VwElwv3S$6|E;0;Yu%`PMd>w zur#0mF{FGmdcWbM+3ZdE{rgpJTz}}?Zft-4-_u2?@moB+pTSfO!=CzRjBytdcr%?W za^Sz)Gf^r@dIMlA#eO0#_sR<5eF-+gF>>JiM&o8YB(|!pbabbN!fyRxomlE@(tYzz`$>1JvM{xD6hgRSjW+M+-36wV&OTjkcbeA6 z>h}*D&JK=Ub)+Z*Zr{nY#+n`@R$t0dn&TJ;_`w9<-Kz^YV;b|X9h({jO5N#^5`^T`;1&Lc=Xr|ZRy^#XHz-jmoK_7k5(WkY|ISb-dZiCU407hDkz;%-lUag7@TL1&`Kv}?g;q-vyOhUoIke+am>CS zWhd5r(Q+Yq1CCIVK#iXB+M#MlH>fq-J?eD}PKBtAk!A#~=Qfq)vwyUDkbrN}tJORF zqVsou1>baB-WU>}eL8SXUHJ#YZnq6K`1{T$3*;Srtfro~4DdZOl^cj3klcXEHOD)M z)1I(mqp3P!T$-3QOoo|j=XVOb*q@BPjy&e<$#bTzT+!4|dQOqOO}L1Zkyg7jEHp0E zFEp^!u{1JPt=6tquhwu@an`avg?%aEII zIi|}``drC_IHP5rLZ9NyydKG+zzQLN0zeC(?<`oN*&QU8eU1m8f4^fzgjWC*xvU@k z1#?hP7J`oc0FoS;KLTnHnH;m+d;Wm7z(|x?M}`rdFduoWZa!l&%4!B^qYGOL1 zGVI%w!pVXDCS-NIWQ*7)6u222$d6l==EPG=<6@(O%tZ`TthlheEF4t|^GNns-5Ghb zyD`wTF&o$!2sPaOobXsSN)%vfG}JWSoE}mOobhVGv;;Zh6l3@M})hJnJXY}hXv*nf?kQaJD0{H9hzOIcC$xiVXd~MA zv=kUf!eEkOov3#>44ZT<(uo^`0Q0e5!bO;A3;(GoK5w!dyYyu*-zv`#>OlZ4S>cQp zLZ;~y8D{a;abUC6TEN7Op5ou~s!XvXaju@km)pOq!Y!p`i)~uMrCa}~Yf-;bKT}b- z<~VesVV#lw@^f~l&*|fMYa>(ly&-M2y}sc*;#teaboJ&+Cy3i=yz82PfQ_86%bjkctRZUpIK4ZWFA)HlD<$!d{f{V zrAGXYhhk8xF^1{_aC|1I#QJh&T`sHTtCR)cDhO4$TMVNK{-QQ!SD{(DOu;eP2F;g7 zVKq~!2B})-4_}NULzjG3fGw9UN9zcIAdJkmZ$*wF2k`$e^r zozQY!r5bj%rR&y;&2j^}lAJ#2x{7;{6G(T@)~x20#2lGfDUlQ9)1PmF6E6Ih(Z;MV{3CfSitslcFdILhFL88YhBC-2{0S(C&5hkapV614FA=vUH zD$|zf?3E8J;%q9kR^QQN8OzJ=i>gA!#w@U|OCV6}drj7$xdM>eoM6{(oyLg4@-`py zqmHFu8|l!)%L?5Mpk3#e;_6Un7(`VfNwdKq@(4_SlDnSGcMamadB34tzYpBjqx*g( z_q_Ce2M9{IUw zJ%}0FhGWQaLEcaTNd}X3CtdDJfR)Q;?xdYc79#m5IA2Rjk{)_M8oCvW2~TShY}H^f z(nS{aIA-rRuQA?G8u8JT6Rje}lI41&xb|oPjI~oPkA@bQJ}=#h@1_GbW}+pHsd{O3 zS_;uc$jvEDUJ1&f(%&vL?O*zF#t+a$?`6ZIu` zsD8=S8ocH?lD-hVb!0J@^ZFsxJ*p>huIpUSC_yGZn?+A4uF5vc{sEtJA=j>;RORY0 z7M(AjJdsgY&KVGu7w&pOy@b04dK{-Ck9z7Yn9D`zPe7s`q!+RET1+}6J1#5_7waEW z#_!{X9He2x;eN&w#g$$GGNu1mvw=H(uUCk)&$O_SHO=a%L znPgOIJg>Lw2Cupe=LPD$<3h3~`Rx7M4vVAE#0`us-{L&Iw$swOH4u3>lHs#JSyV-t z;c%$A5-3TUr}R6DI8j>c!3oV!wiF{5@+lM@zQ0_$vboLdx629V<_`tpZCVMb>5I34*&>AKKIDtOFZ=1{trI%EOW#g zq%1LZ(dfny3sJ%E`Zv0|ul6;P1%D=-t#2O)I$!I8Nd2fj+OdYgMuRyqStOW-ajpt*?_fx9ERCfYS^&M1J% z`=oJw%1UF&epIqHt@wmx(*@F*!}^UDdk-ivdeMmGH1l~t!LzF;rxBtB=s3fNRKUOV zy!S7u5h9p<;=^-_DdJFQondkHt=Nt58iF}a>jA9t#j-LjSRJGdO>pC556GX?QnRIHQt&j(!o0LT- z#LgizAjD~tE-h+?HGT~=4u+b@E{wWrUuY~80wR$^5?&8SIk@ogjH=2wLW#qhp%T;2 z=tX80N{}$+$!aVr(_}i!@{FK<&#@M^SL+eNFa-Km9=#;#n-NS>P{`FPJe8-(v(9Rw z0mkjeX`O>;!S|ltgVT$Q5RGa|Ed96gk4wT}a<=7) zg4A3jHqibhW!x9`qZx4I!!Zj-*pAb98)N}7o)JNv>?*y{HOv2mRA$=7>H%h-e%HXf zN$f`F$5gWpTv`VE7W-D+nVY5S<=y^Qi^68^nZbPT?7y~GxF@Stgpaspf((KBlL$gp zVs(=A+{C0$aJmLvCD zbUwO8L(hkCERu;k#_SpOq#4!hT{}RWB;=rg<|{bOR@Ci~JuCRsi z3m5KKl3`nBtQbk1_&^n1`a0`qMt+^2;_AH;f_bM;-)%p0wha+TV9G*_FXBbwi{N1? zMasgogt3H2S;9i}d~dpN^%|Vj)+?M;j#vuVg2I@*rkq16X0Bh8)`U!+KBlf@KttC>L%qy4 zp>@%f3q8NgrG8-Frmx|B(Vzfk9=#LStR#4ugKKOhiWV8U&MJ(RKU zAgDr7^E~qZbY$Y0Ev|Gnp;vossBRmmJ~oT`Or4az69~UW;uF|FW9h)A1ow2 zKUBV%aD-g?yf|~b&LX=qV$OX_aU}&a&4i!|x;UHg;m%LQ86K`-9tMKn`(svlpHrK{ zFZkyPLWlsEcZ;I5OqSxvUk5=+7VnQ84>x>`iP&~AZu0lzN;#Zf%qxj6!|~n8U0)P@ zU2E!P7-Mk62$e(}fq?uKy|ni*Twv?z2+c}P^{_WvxE^R}xJ4MdN7i1xL(pi{3>7vV zOUe2`#pt-Inwgx{dc@g-Mqb(KeEzep4U$WJkJ#yXH0OSvMc#$BrNL!o(^|(Z*_-2A zI({PlBX$dUoG+in;VR6|sH;lch0zhwj?oWM(Sk+y?mPa$G*%UzO=^{q-Qe^5Un`;_ zbv)RpUD<4q%8U3BW5J@o&qMPpGqPJOfcNqm3rGk-8;}}4VW|)j)r$eAi`TfGX3X3( zg$dq*0aZAP%E=jeDc0*_IhFy9#APg_DkXE>tpa^kyaM#W^->;44PU~Sq`Y3PZ>_O04&H~be&4wj8aLk8`IalYfwhiY z-T;+`Uy5|=Ex$fHk*B7*?$_zJavxTh>muv?3@DHL&><>YZaA++vlhjS&52n}%}}|b zH_Wqerxu!F>>KU|sVcgJ()ChKicXpmYMqp(#U5$R5*^}|P0JjaZ93toS|Q7Z7EYY) zEQd&WRM|B9sbJGjndli^+3<_37|*o4HO(LJAd)4Fg6RFfV>#I5-x(7#v&O2UKuei; zcP#!JjHrgK?0;09yaI(2TV4@( zfW1bG_nm?xzh8X$q0%%1&kv41_X{!1`PTz-emqKZ5es*@WAvhA20cPGDen;6G$}!R z0Bk9G32Mo#q)nRJ#3ofORWFPl#;0X-8m2~v`iG$tJG&HJEnF|~2ilmIoBp6lWi{84vY^04AB%EP4%-x8CH~15< zZU9DLfusW1Iu(eSTUa`j!ZasX6Ay;0i(@ORg_2o^k?TT;jdg-2h?De=`|=}P)mrG{ zd|6pZ!2)SMaeRWdBfIOKa2)2mxYr}}e8wT+vmyD`WK6;CYgp;_Zu`;k=dByPfyb5m z)lgO|@2{lBS-=7L0e}aCp_j^GEojJK$9*BWpsqbER^V;%PT%vv#Z?$I@d?%EE)oM@ zNZ<0VtX(?X+AUS{+(WrxMhUs~NVaCjV%U{}a>cVMk0sw2kh&!n_tbM;+dpCprOO_P zyEaai5rx%KoA3pU(M4dd9$69$gV0`Y6_A#5K3@fVhs9v=cKb5g z1I2L1W_BSyZGl%V+jv`in;g4FHe<09&Q3TJ9lyowm|uuS?kyaJxSRb48`?b_ON; zypUJdZwThN33}BRs&?}}#^>Ib(yByQq)Mfqr=Rzw(=IVM(7x1>zzNH0+?78efa#<8 z0{o_)dVhSzC~5_~b`|*0B*C%+1lM(LY2Va6wm`c;G9O5nSa-QXWLeb`q?fG6c>j%j zqLsRozKtN{7#u3hAj=<2gHHr{*Ar+Z@c*H_r5~l7vYbdPPEx1UB3b3Oic3MLN5e3r znYH|T2fQxE;Dtii_y%PCqLpzls}GXCAp_J2nPdk<%(4!wnMU`Nej0p=Cnr2ap^&sV znoV9pwZ(=qbZxFPWNUq4u~^tp_McA*0X{~#-t}(>DsDsoaXMH*#A z4sJYXteVQ!@w%hRZ>{Hd#p==(0~a^ZZ?WfM?2CTS@!!ka&htu;7h{{#gR}9kBYQ*7 z_u*Wg-_yyNp@9r+z>5kf>k=W0z8hv1oj;oJoSmAW$CDsst|g`bwgkg4OtG*L_V73J#?d_CF^jBALc)!&oC^^Y>o%B+59yqUOU!|mO^k@>wvXL z@pZrT41ckO8&+`$6QtN83o6!_B#$Cc%Zo)Yp)7JoV*!h}^Z3jtmIN;EYa7f-)CJ zblK`otPbD>!)HkcW#Dess%^c5=9fbBIZb6wsyb(q4|b9-I&la)UjK03?cC;O?=e)= z&;7d?F=h`b98C!{s z<@?7EF<9Y)@WGI~7MBlz@mw2Q_DvoY$BqkPcQP- zYp7-frq}-lBti3GpoPt{$S>Y*Uq$nv$nQ$w{`>TPFwo7g>~k=^#C0;2P97Rbw%Zk5 z3bLif8sjxn8YVNof=XQ)zbV&ZwQ8I$TnLlXmU#q*fnF1qgabFd!~QZXxvLD26R5eo z+O0o7bv!tq-?OXpIS&)5n)umbFz}p85m6Y(zE$w1G*QGZ;2{2tFUhQ1?ae>IlFoij zPDJ*tL}vxNA)gu=lt7O`Lb4L@s8m?y5+=2HKqU931cuydfGVNz*=){Uo|LEM!Qg`8 zPiKd59X%oVo$R7w4Sg#!3YXyWv-nOw$xTd(PL zweMBc=}It4#dFX|Zqh+V6s;FPiymJTVAJJ^P&gC&kS8JaIrjCT4idMK)|-Xs-9 zO96**`6C#)4okk^gC3#OSYrM1c{IO|6-T_gJVrBl@PW`-BJAEew2589f)6AB#vOG{ z%ALbIRTV6AiH^r%QnARn=vk*-tLIg5u;C0Y|795C6HHI#qGzZ2D81Hp_jqJVT_laF z9nY{&%h%zy(fVw(lgs&d{?=XP^62}u95x=*sMnxZOwP6GAe^6d)U&`*RNFHF@y z!1iw`47kw6qC)=mjp}6{vRmd+iEN5|(XxG$!bsIc(#WYA8#x26n0VxEo#|O-35$HRCe!7)z|b2bKvjB}xyy-W@(P zUF*QQ=1y}c_l%fw<&L7rUQ5wue%-;^x#q`9?rqqE%i)({c$Qz%NnT<#iEc%j=EUg1 zGNtg{sJ}rnU2~EHEB(t+@;4@+G9k{+Ky-M{bQ)Ul53Jy=|?kBzgulI;%a2cmy~ z12k1hW#Ww&UB0~umj`e4SJB#OfuyXm4$2m0Mj9vASLIsqChC{NY@F*;!V}S#ffNuE zvH(Toad{A-R_c^N==c;cVJX5a>8%aaNv05HDe|-&wh3kA>=ZSvdS!hi-P{#xO}kA) z{j2bf3$6pxRGO08>DlV5j+{^&SspqLnKe`WB$qCWHd8n0Oi!TnJp9HFVSPPwTzDeZ zS*xQc@?b?+%U`y{ zDQK|N1O}u6G)vaZkQcwptOV5n%~j&r$!UL9CCR4~FOp;(+ZW@ze3X->DLx#zg!*WV z1MY2j^yu&}2VUd3GQGuGqhX9oVRKx3i8^`8yVxQTmIcqFZZSp*+(xAVsU~YF4*-r5 zh4obV{=IB@pQwiv<3Cmw5eN)L2Su3-B`zMUO4B*8!MsH*ExpMnCLpVIi$TgR5S>k# zB}kPR8R6#u>2N;suTdBNyFzhtNwGSs7pM9C-h_)hZX|2Mh#sLBnKx0C?{789(ixA#MT#=%8sT%iMSaF zb9lJ~8^&UliO@b&XJO3OJ#xmqV?TJG{+wD}xMG-W;i#l?xw=VC7j>5Img8%B=Xzs& zdyoni#QVoI?y4Ibb1D$T4HRr9#R6okEnAunDL${Tm~T4 zj|nLY)wm|8MUVA;dD}Xr?@aspoZ9%7F_1e}@F5Ed??PaWCDNoKKNjyv=uUSD3R0C) zi0H}SsSJsT2prtYY1DO+kBFX(XwS=W49uoR>T{_o ztd=d7nNR*TFV(IojgO9$eaW|XE_uzjQgJKr3Lfhq$cnZ1DK*HHFI=klC)tu|Q?a_N zO0O~9aQb=DkGljtHbOk-N&*egz_p4KQV>kX_Kfj zdhF{fkClFv{n)vel{cD~p--bG}FiQ%G(WYXGXaB687X`5Fb zSPfgs#oS8!R@t}RdOWm!TOC?F{G9eiU6CvRu)rV?of-HO*sgW|D>~dZOQjP}?rdw*;aBDknuYE4-eE^w3Jqj-Uy`!9)GXcIoX=^rvON?K>)Y1fTmrv~Ygs zdy9j&5M{5p@{^|285o^*m)z&><#|3O6qtA~er0E9i1bUJ`91Z|gQ6afPbz3O#CW_C z`eaWL*XUlxBz8l|i{8NZV&%DU>EMIR`ZZ#?{&e0_+EAKLs)Dw@P)xS=U21~m`1aPA zkwo14P)-K_*9;xRsZ4qYldn6pQ`VNc>TN!rU_U87+f{GWVWr0z0;}G&xO$}d;X$7{ zWApjaCr(^!^NLSSzP`q%ex+?@SpLw*Q!mgWXPvSSEwVg8apZ}2nl5!+W^SQXyh?vD zCx)t^H64!Ny6~ALB&Q-HHPgKsU&2x8w6smAeEJ0=|Hpx@iot6`QJ0eV(pj=uB|rCa zKYJFUcs)KEnK<|1iqw(-hThtd!g~%QdGW}1nuQ<2wSn|p8bq$WYCg#Zr*oMujwjuQ z@Jyc5Fm`wsHe`8@#b}t%gwWMA+ZmW!M7NXjz5nRZ>&^RIBfUk-g=&W*c;53}c3j#Y zR9xi=Kb@2g*NvTh?lnG(kT|(~vl3BZd)~(;13q4lC4VkofBkKZCMIyuy9dzg9Qp6lj5oF{U)wL9xo0zS(4 zSl#p!fS#Jl^FN<;mmIFAF-_Pm%VyNaEAxo;uj#E zdWI`}X@YV^a^_zX<|T9Iy=S-k7wJ7o(f7M6d!IVDWZP>#Nh-EQ$plkoW|nx_*Lj<^?Uo_c-hW!R}R^uD^U^-)ivy|f}y!XMcPv73AK6K-K&gGkOm31tgbZ=`;rOZB()NgLp5-L6< zBO!2KRMmIXhQ@&E?GAB|w-e8KoJ-z3nnap%o8tBq#ECV>#l?=Qc8pII7xwnLez=`4 zNl75+Cwp9ZKCHMPlN{~GaiwqS8rO>0t;q3l)t>zvQq*_Kvfp`n77#*Jf5 zDrzesQJ=m+G?!vkqK&L@{ca&b_>5gAH+o-Ckl z7<=15>?ZFgr+wXDwLf-yyzTRGef`>*?T6%3i=JWHOzR7?PlpCRM5@S%7^oY0zEFFn zu~W(Z)^j1hQtZljya&w$kBdrHbJ3TNMK@RMa_X?&&!&!=9Mfby>-U~pQaW2GJlL1( z>zQiX1|}XzM4;y0t2D~c+e5;OuRpcL(z*u6nd3}{E9y-$vr&2`c5zWYZ|!5%Zbs_c zWO_kAUH+{0Ha1?Wd+q)5^^Ye!zYc|7+O86iq?wj0fAPA&^@~L{vFU5WmEkwEgJW2B z&9zL*`vng;xY)!aEgJT~+gW|+D!4r8r+Tb*l-Sk9;i+Ipa)Rg^j>~UThlk|~KV!-j zt|VI8=lM)!oMTUke#tf5Gs}GC&aC?#mK$|&mK(+HLIsIjQ9E)Ghdlw0muVZUTuGis+9nH#v6=eOFo*W60{Ngd@Ixy?^3K zK)67qW1GhL-Y4V7YFZL6^p}0=WD&n2#d>~P>Fn3M5e(;r@!>BoI!Y`G0?K?O)FNJ? zDYyj-=;n8}^H4A*4rYI7HF=R;TdONp@OgkV$6eGPmjYM-(vDESZOHP&ziFa>6ps2teSymR|IUvUPuF-m^B zSw{(au^k>xC%YD&#LJZAf5~JyIDcL)Z~UM|$pROxZNY`fjxHE|)fDx0pSj_N4DTq) zS|0cphCJaD1$V>^@1e$%oWtsYFL12xKP@VGJ2b@E=lmEetkry$Fpz)gkkaY+wwzt= zJ4Ym!oNDbmtYDvOy~LdB9Fd5- zEy+=nbh~)xoOR3cplw`NP4M$QH)$*7zkZobl=Zifexmngz-&)H&A5GHKSTGSs;?9d z0rP#DGd|stt4}4HkClsFTcP>7dnoG6&84!@++x+0cp;_ASD#WpbKzn?TepdQF;#gq zLOaepDcOVfOnTDqdh%4S-uQBa_^9aMw|Bk;&LJ1%CK{16v3}^gs;(z1{pjb?w`Kc3 zzB|85nfo?6)+Aw&?fm7K*YK=yqZ_!QSB9B22g{hm^`fsVyh*9q?)D*5*YM(8xt?KA z{IlKZx%)3ECqX9PsJmT=@BDe*eZBGhX#Sa%lgwz>;~e)Ou`Op=`YPcXc}~Q>dW!(<=N`v`6e54@3_=O4 zLW7Fv&PP^(vR&r1b0(dl=G zkD2C&z}_+B3a&)adFCRVVc1JWUnGO#1Xl0UExsuejjon7=22ob;TOEaXyM{tZMnlH ze=dct8Sip5=*xIxz0oO4LH0`EYdmiHI`7hwoh@LoD$Uk~bdCzsyq7y4@Mc`mR166; zxy;5Yai}O!-^I+1k2P7BePUbmvX-**nWI+9gv-kxDDKv_CaoPZ;Xl9{b0bn#U1Wlj zuWc9M3siSG*1vI3=jxnZ+SL^GD{M`BgaX7SE$Ga$I``S;Fq+bIQ=O*_pYZ?A8=fpW znGj-q)#Dzfn-6!Yae!BxI+@Wi&)sTAEi6!Wsh*d{*e=l3Q(FC4Y0;barEtg9%)3cP zM=3cKaZ>mLDNA<#cLlT7=x-~U{E&K4M3+ufRD*>Hp}B(DS>G3`Ms-iPB?R5rpSO&F z(p;fAopFj`|0}!J&bkXPqnVbAWh#lP)0&=>l>*GTa|$mVt&@x~ ztg z3B!TwbSV$`ck|zCf9^6+g}pv!e0eE2XqRoZdm-xwPtjW*kJQHQB*7bJECo%THQ7z@n#bx+6{m|3&Ww~BIfQ4# z-B5|`8haXdEDTZPZY6}wxm1Md-Vs61-rl09_x-I1;aFxS@>;=;&aYyT8SM{`XPr#3 zu4))(jym>qR zxdUb;_Fe<)BYcIR2~d`>N6~v_Yb<}FL>6;3935r zyglThX@mMqVado_gWk&;GKXKXV^l zTbs5N`EVe`!9i7+R=QO*l*bDu2P}B_#4#bt z52MT8pW&A1s~%R0DvN)c@qNj0>C_|H;JkOy`icghzpbLu#GxZqC{+Z1l6jJLs-EMw z9^UXKYY(ARrfcUU4ekxNYZq(r?Z=DRGWj^_=k=vG-oDU*sr})m%osqR%()g?v4`s++np}EcAx)He=gkh=E%%`y$AeD2KsvC zjfaxLzM66_dx@}(gm^p5eAE$2_iZ_GEY;4o(SgY?Ctj;)fgL%vwBxCg$&6Jue}^(# zyPqv%+f8&*UU$cu>Z+A5N5+r0$=zZDskLz$O4KGvZ1yMYzkK(&muxuCUTVHliR#u8 zxIggh@yhCB?%;G|2bQT54g1sl5FC7w(hOstj;1j=2(o_PwdW;GX2!)X{rPYU(F|>s z{rQz9X4?-@3sJLYg?HS&$P*|i&EdFu!8vC|YJl~QH}ybOfBpGV2YX)!$3jUSDSl!5 z8x3E2jC;zUC*!+1TYv~KZD(g6(GxrQ;$^`DvzE0)O$tX<^X|@GH65`L?`%zHStBD$ z$+HR{M#h_(=E71vZkol-g&Epp;dHVreUx+xy-zxrdAS#IcTF)x@@A&%=sy<|Bhb`- zprswT_f2hq!!gd$zPv6^8z*8^^Bphn?wIi8RrGV?2OR9f#YJnL?QTjAW;!+oS=^ma zOi`nmCh?oLw^pGFkjof-N&EH@hp>_f`>>(Aje|Qk6T4LFzE>rVW=e%mTqoZpM@wXK zmpxAR;K=TwN^6RWD$EW@WkGgeicw19Uu-8i)E3mVya|QnMHHjkZ10*P3$lxjcgnu# z%+s5>v3&={Nj3YC%Z4^>Wt|d6)hZ{#gV8e9Dke&*PE$_TifcZNEZ5m86>_Fhgr+X5 zM=KTTU9QL`{!sIu^NhC0lI-m2+R@jtOCfP}W?Av^NylLIr{yRfXQv4}D_dKFy?sIv zAKkN=z<_p2ZSgws zX-(9Mz1!32iNR3T*FpM93T2L|Wz+Y?nK@*{nVH1maBvyXqC1QGCT$6J_@iRoXz2p2 z0~h=-#N<7>iF{>`ZjL%TQQdoaGjG(hN;$UT5kcn$vxUH+h*$~^Hx)XUx81tCYm=s@ z;nFyJKRPk3H+}M1@R9IHm7^wy0GLwk!KM>wuFtl{fV%5fFH3nXKIocGDabM2& zre&$8wRy?X6l?U@f{-HN*BsW^_$`7qGG?ARR<36BkhyY^9*Trb@jhma0T zz#GvEqX>(<2v_!Oc1K&=2ND#fUDZe2IMrq>O7WR1>_K);c7z9vf$D~jn;bdV#h7{U z-|P4Fpo65R&D(n0yOdV~ikXNd+mdRQ0(7TM@Rz*x=;C_zK6_D7lyoPl)gI@Sb;pC! zEl0AmC8Ie(jstVNx9eSJU+*@1TOA#T0V96!9*)_lXEp6nwV2xyTr&7 z9`1kI*pxp?{jMQ8?^W^|OXkdgkRsc0%_}cD4@YM>zN$|;C5mb(KEvqneNu*EDLS3L zp&~_<{(&NwUN>8*Zz*N(>r&j{Ef=N7_s@AHul0pWF3%{hm2MpRRg>7uSVA5Yckj5zfQPn>V^8GqGmi0==wJ(J4R8NENKRdnce3$46P1f%@#zs}0 zbP*>Sr`TN&4!k~GEcC-8&iRT`|J(z4^lEYaHz}G(qf{Fgq4`~=SUP3;BRjCY_WAqO-rk}5M%AV1|2=|^U)1VTLYHx&&GMz; z5L+ogeb_mrr3#gP1%o>}JGpm#hq(AwaZq|~?>#ms?*@^at@`LVht9uUqDfH-amlQn zrtqQzP9cW{KOLQ;Sw0y3jp@-grTRlvQT4Ny#+5V!vi($JYI8hv(-Hlx`4711cCw^N zLsh6vC7E+YuP-+^`&J%c89O%15&kUTNgHiLCNIM+X`39`4>??{y<9FHgWc8FwmsSL z#y*XvSIEV;y0-e7=0{Z87q)iqy}d67&E+l)at-beXbZdZxzo61cx4Q?ecS%+TeYeQ6yA60 z7KP9DK^Fhazs$tg01s>F*^?{7t&zx5wDZ*BgAk)7n2+>zu1U(!H>!j17@tHwmTgr1 zoZcE&rfFY_+Qmh>|0S&)6(PX)Y3IZ|HrNgP$%rX}2-%L$#hr2l9KAh`5$+xDFM zy9Nbck7`czxM+yZJZAcO(KY1I*W{u2oipALjUBr4gUSPBVi1P2ZLP3WDr0SwqT zD9;;5L0K8`ZT~0QDm_3vW9M?;pRvnDl0r!{R_ytzg9Y_O0!!-w@BNbVr*}NOGq0R6 z997e5I-@UDoIG@ia1E&)d~beo7do@EJ4Ee@l!)Jtm|f$kll6kb`r(j^?@}(8ES?W# z8++lka5)~Ls!{Fr0LfX(5S6&6InV_$VfFc1eNKwyuDLre4hu{y} zuTY*|(x8!C{K~jZYEFvztl7**SLZ>m+jC1pRhd87w+l1P+aDeo*Oae;43RwKDDAm3Q@M?vX+SjHNqv$2FT`skF9y7)_$#&=1 zu5_kG6k2C%Wxlm5dJy?`pJ1!l*rB_SHfIB@{Iwli8h-KB`w}I!o?6T0Mkdf|^)~B; zW~7L?=$%X8)XNV2U=y`tCGY&_#?n3a0zMS;>lQgEo^vbBIDN-(pD?{aE$X^Zx}^VS zLDX%wW8%wjWBtAmM&!8Ip;hOHN_*-$C!H2sU?0n3?d@*&JWj7Mvy8PCj6E@FQX$rH z=*!!uy&tR6KlkaWWPS)q>3n{j_qK9&dhmt&Kg8R)mu8n#N3yt=oRMkik~M12F65ZX zwml{k*x6+)e}?EYG%Pu5GGIrYv+kkk8wwAG6%kH7_6>J4(md3NZ{5~7PUO8F@v?Q? zP?WRHjYdr5xD7}BD=WNdf^R+|PRQFKhNU1uRe%5S4^uM2`3PY#U)z`^r2g~SD_n&0 z`c%H5_nANAgpcQ+DO3(H9=;sPg~^S_N*LGWgu~-bMZ)6(5kqV9$I#pd>u4T!w&y%p zJ5?-X$VzFzQt7IbB;H@37`eOsZQ2?Rty_}%H1u+dVFk~DSmvDF&0)J$%@zc^GHn;z z2eT+`^+xh1C^Nb8jGpLl>l_biF+$ON6yWDO@i2#7ahcy}Uht;igPRd=o{ol}SMlU) zikDmAPw|UreL5;Xn)`ImhtCQfG=;W`O|SG$oxOcvzADG#>HJ+*^>jZrTz~rbOy)Ty znZsRI=!Wi=!m->=+m#CD9)8q#Xq2038yWMX(gO9;ucMtfpjDyK6b9{LyBAPn))&`T zZ`OrW`8Iv=kn+St>Q002E*~qG11cKN9udndpiRs;JJXtRw)TBQ2Mv-*5;F?{YiV;xCS!yYnd1Qz>Xwdp zVObgQ@3@Q`!O}rZ7Xt30ZQ~9_0v~`Hva-%+O$5Y>&d%bC;r~xweZ-?Avwt=n-Xs zWzDwp+X4%9SteebSQ$ml?AYo~)=coIKz71$xfi{>vGI&n{!B$0c?QU7xOESmxoBY`o5X zdZzAN^-iC?TAEA`g8HYwv`2rmzIZzW?eQ`43cjy2tg>pwPMViZMW67H!Md%`g556& z8uCDPSWk~Cq5Oh<4@Z>g%3?vD5Wg8RxK(G!5Uw&T_=Qu{T9W(NbADO%YXyRCbqBd; zv8TCaV;F}iZJ6dlKk5vJVN<_f6CuvTV7m?*+^hCx&7%}kSu_~qc_Ou}JbU_Z!G+7s zVXGqZp;PxC6j-ets5JArAYqVyLDqXwgLigS#A;Dv%ycoNp=qV0++*kqiO9en_P{2V+sG4rhI2}CEL>SmSUsxA^mT2}X zE_q1Mw6wtsYg)R2&Wgf<2*TQUcV`bb9Nry@2K&$!R>NBnEWs!MZkL8dg3gLE1H9PH z14mqM>JA!4$<5ir1+cIVU{OmacNY*8=PfL!14IK)0uHaOBrALp3bX>Y<`hvg(HPQbK>Ppv{Og60&TeQ26V@dV9qM$X|>@V(z*w z6ddr5Ky(w&XaYQ(|$NWESjUj{iWjgy`E(%KqLmo;0 zpQ8~agV~zEiUb=EH~jBd3@CP^hPLMMKY)?38NM~0{{f7Q)bKxKHJpsr@IT}=oQ&A; zKV&wXjM|7lq&A@34VFXvA-4g&Zp8URasztZi1UZ+2K2fSXKQ-@Ha-J--H5X_vwx36 zMry>?r2ah)8J`h<$Y%r@pAmn^XJGliQ9oPrd244ykdazsYf}FM7#Xugwr2J}fRWK# zWNUi=0~i^{fmP#H)6zeHkr7>FYoc!r1}J=kHAS{&`#*q@QC?(g%Krlx8Sh25=KVi_ zk&$0yYx4gC7?}r%{2LDd6u!X#$baJjfWkL|{TmMe6uuGc-*^C^@Qq+wd%$m_A)xDx zIRA$HfUY-!{TuQl$;glVH{=KIuQrZsYx4hAT}U$CBmWKWkz~9_Zq57O4~mTPz;WNb%m&Gz5pkP#iVHPL^ML&kB`A95Vf>jvYa{td?gS-Ai3{XjR7^n4YC}PlXhXpZ z(uRV=(T0L0USWv0*7?~U~Nt+twWIRIDm8OAf)xaHiWcX z*9LN-q?$mA2y6hX$w-HF6kst#Dy^fC)_Fjcbri(-NUI5;w2nfW z!L=czxfc+wUk_=%14`>Cq&Y?#3PdchKOokS4(nq9oSalz9}6jn0aeyfNYMi*t)r0K z7Em4u1wwKfptO!cqAXBaM*)&xASTJw+GJ(}v3{CO-NVt{1OkJaK-b5x-uMs90{MTN z1;}KRhW2-6fdDIAaM=IOERYRmf&QUcAb)5U=mxVuwl<5|FBuO~8t_+l0&|4!kWG0( z$bS=qfU?$eW?*&@NO-CctlWWTy(Aq1#h-b+U;4n1$9*|V;9-KZ4dALkUq3UE5Md1$ zyps%$NN{#q&(1+f={YA42L~wW4F-T~cn}>3PGGi@L>KV!0+^Wm%lrS6h*Pt4vp?x% z?F{4o~Pz*E&9)4gjz-b^sYvqB%|K~iAl*9muNU%8?fJTBzN-$XozQ9DK2=D@v zmB2YLfl0yw8jzBgz#AwRLH^Y(pelLbCs29i#eh>-7zStzhapAK$6<(LFxWA^UuD-Ch61Ms zav2tgm1MHN(F+O#Mgp>WSQrrO$z|BheTafyy|Eq|21YA#ndqiI&~R{~B&&x2Cj>H? z2sqJ^%dngKK!U-YtR4!Sw8&&=7!c0MW!TMqV8DlfWc9F{b%hoMXJE2=qN1Cw0|Nt} z32dx~frHVMOojlb0CJh=rt83nU^ZO`2D#ZD7}RFoW6-coy279_oBP0k^CsC?u;64* zCKKK43m8%Crt84Mz-Yd)Efx+gCCFq5*rq_9ePm0uRaEz(-;_1Rp#QvW3BgEtE8i0*hI2 zT7#12F0ddEtfD03WRW5=Sfrw?92zB~2+RbsaCuo7n7kqit)PI$q9q~!Tm_uT<(+YI zws@SqyN4rGSX4v-Ehnk~lT&~z!bLA1( Date: Sun, 18 Nov 2012 01:46:54 +0100 Subject: [PATCH 86/93] rename a folder ("informations" is invalid English) --- .../{informations => information}/ISO_3166.html | 0 .../InstallerStructure.odg | Bin .../InstallerStructure.pdf | Bin .../{informations => information}/WinLangCode.htm | 0 .../WindowsCodePages.txt | 0 .../{informations => information}/iso639.htm | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename development/Win32/packaging/installer/{informations => information}/ISO_3166.html (100%) rename development/Win32/packaging/installer/{informations => information}/InstallerStructure.odg (100%) rename development/Win32/packaging/installer/{informations => information}/InstallerStructure.pdf (100%) rename development/Win32/packaging/installer/{informations => information}/WinLangCode.htm (100%) rename development/Win32/packaging/installer/{informations => information}/WindowsCodePages.txt (100%) rename development/Win32/packaging/installer/{informations => information}/iso639.htm (100%) diff --git a/development/Win32/packaging/installer/informations/ISO_3166.html b/development/Win32/packaging/installer/information/ISO_3166.html similarity index 100% rename from development/Win32/packaging/installer/informations/ISO_3166.html rename to development/Win32/packaging/installer/information/ISO_3166.html diff --git a/development/Win32/packaging/installer/informations/InstallerStructure.odg b/development/Win32/packaging/installer/information/InstallerStructure.odg similarity index 100% rename from development/Win32/packaging/installer/informations/InstallerStructure.odg rename to development/Win32/packaging/installer/information/InstallerStructure.odg diff --git a/development/Win32/packaging/installer/informations/InstallerStructure.pdf b/development/Win32/packaging/installer/information/InstallerStructure.pdf similarity index 100% rename from development/Win32/packaging/installer/informations/InstallerStructure.pdf rename to development/Win32/packaging/installer/information/InstallerStructure.pdf diff --git a/development/Win32/packaging/installer/informations/WinLangCode.htm b/development/Win32/packaging/installer/information/WinLangCode.htm similarity index 100% rename from development/Win32/packaging/installer/informations/WinLangCode.htm rename to development/Win32/packaging/installer/information/WinLangCode.htm diff --git a/development/Win32/packaging/installer/informations/WindowsCodePages.txt b/development/Win32/packaging/installer/information/WindowsCodePages.txt similarity index 100% rename from development/Win32/packaging/installer/informations/WindowsCodePages.txt rename to development/Win32/packaging/installer/information/WindowsCodePages.txt diff --git a/development/Win32/packaging/installer/informations/iso639.htm b/development/Win32/packaging/installer/information/iso639.htm similarity index 100% rename from development/Win32/packaging/installer/informations/iso639.htm rename to development/Win32/packaging/installer/information/iso639.htm From baf48453e7bacf128521f377390a51097321c680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 18 Nov 2012 15:54:13 +0100 Subject: [PATCH 87/93] thesis template: add check for babel (as discussed in bug #8423) --- lib/templates/thesis/Appendix.lyx | 3 +++ lib/templates/thesis/chapter-1.lyx | 3 +++ lib/templates/thesis/chapter-2.lyx | 3 +++ lib/templates/thesis/thesis.lyx | 3 +++ 4 files changed, 12 insertions(+) diff --git a/lib/templates/thesis/Appendix.lyx b/lib/templates/thesis/Appendix.lyx index 6016557c33..7e535e097e 100644 --- a/lib/templates/thesis/Appendix.lyx +++ b/lib/templates/thesis/Appendix.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % increases link area for cross-references and autoname them +% if you change the document language to e.g. French +% you must change "extrasenglish" to "extrasfrench" \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} +\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} \addto\extrasenglish{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/templates/thesis/chapter-1.lyx index 52248f95b4..5421e22c5a 100644 --- a/lib/templates/thesis/chapter-1.lyx +++ b/lib/templates/thesis/chapter-1.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % increases link area for cross-references and autoname them +% if you change the document language to e.g. French +% you must change "extrasenglish" to "extrasfrench" \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} +\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} \addto\extrasenglish{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/templates/thesis/chapter-2.lyx index b52f714609..c810a153b7 100644 --- a/lib/templates/thesis/chapter-2.lyx +++ b/lib/templates/thesis/chapter-2.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % increases link area for cross-references and autoname them +% if you change the document language to e.g. French +% you must change "extrasenglish" to "extrasfrench" \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} +\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} \addto\extrasenglish{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} diff --git a/lib/templates/thesis/thesis.lyx b/lib/templates/thesis/thesis.lyx index 580f94e8a1..82f26ac799 100644 --- a/lib/templates/thesis/thesis.lyx +++ b/lib/templates/thesis/thesis.lyx @@ -5,7 +5,10 @@ \textclass scrbook \begin_preamble % increases link area for cross-references and autoname them +% if you change the document language to e.g. French +% you must change "extrasenglish" to "extrasfrench" \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} +\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} \addto\extrasenglish{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} From 4375b44dd68dab06d6494b70e041fa7c7b9711e5 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 18 Nov 2012 17:42:02 +0100 Subject: [PATCH 88/93] Comment some headers before I ditch them again. --- src/support/convert.cpp | 1 + src/support/docstring.cpp | 1 + src/support/socktools.cpp | 1 + src/support/unicode.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/src/support/convert.cpp b/src/support/convert.cpp index 9c69abbce6..70cd91eeba 100644 --- a/src/support/convert.cpp +++ b/src/support/convert.cpp @@ -17,6 +17,7 @@ #include #include +//needed for Mac OSX 10.5.2 Leopard #include using namespace std; diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index 9883425ab2..dfbaab7bd5 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -19,6 +19,7 @@ #include +//Needed in Ubuntu #include #if ! defined(USE_WCHAR_T) && defined(__GNUC__) #include diff --git a/src/support/socktools.cpp b/src/support/socktools.cpp index 0b20940afe..d4aab38f5f 100644 --- a/src/support/socktools.cpp +++ b/src/support/socktools.cpp @@ -51,6 +51,7 @@ int accept(int) #include #include +//needed for Mac OSX 10.5.2 Leopard #include using namespace std; diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp index 8b0f9cb0db..36cb1800f2 100644 --- a/src/support/unicode.cpp +++ b/src/support/unicode.cpp @@ -23,6 +23,7 @@ #include #include #include +//Needed in MSVC #include From 6bdc561714ef3360cfc5ee0efe4853945296ba9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Mon, 19 Nov 2012 00:14:28 +0100 Subject: [PATCH 89/93] Math.lyx: add check for babel (bug #8423) and translate a comment (the other language variants of this manual are not affected) --- lib/doc/Math.lyx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 36dd725bf7..a6502634eb 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -23,12 +23,10 @@ \fi % end if pdflatex is used -% Folgendes Problem lösen: -% Besteht die Kapitelnummer aus zu vielen Ziffern, wird die -% Kapitelüberschrift im Inhaltsverzeichnis direkt an oder über -% die Kapitelnummer geschrieben. -% Als Lösung wird mehr Platz zwischen Nummer und -% Überschrift eingefügt. +% solves the following problem: +% If the dection number consits of too many numerals the section heading +% will be printed in the TOC without a space between it and the section number. +% As solution more space between the number and the heading is inserted: \renewcommand{\l@subsection}{\@dottedtocline{2}{1.5em}{2.8em}} \renewcommand{\l@subsubsection}{\@dottedtocline{3}{4.3em}{3.6em}} @@ -39,6 +37,7 @@ % increase link area for cross-references and autoname them, \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} +\@ifundefined{extrasenglish}{\usepackage[english]{babel}}{} \addto\extrasenglish{% \renewcommand*{\equationautorefname}[1]{} \renewcommand{\sectionautorefname}{sec.\negthinspace} From 63295f9dc54267dcfe4f55b33303f366ec7a84e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Mon, 19 Nov 2012 01:13:37 +0100 Subject: [PATCH 90/93] Font.cpp: fix bug #8424 We must group the content which should be changed in size wit a pair of braces because the LaTeX size commands are otherwise switches. We already do so for many case, but not for the case that a size command is inside another command. This patch adds now always a brace pair around the selected text which is the safest method. --- src/Font.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Font.cpp b/src/Font.cpp index 08501759c7..6e7ab34733 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -332,7 +332,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, } } - // When the current language is Hebrew, Arabic, or Farsi + // If the current language is Hebrew, Arabic, or Farsi // the numbers are written Left-to-Right. ArabTeX package // reorders the number automatically but the packages used // for Hebrew and Farsi (Arabi) do not. @@ -428,7 +428,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, } os << '\\' << LaTeXSizeNames[f.size()] - << ' '; + << '{'; count += strlen(LaTeXSizeNames[f.size()]) + 2; } return count; @@ -513,6 +513,8 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams, os << '}'; ++count; } + os << '}'; + ++count; } // When the current language is Hebrew, Arabic, or Farsi From bd504c09de1c3f33ab8e7bc81132f00883d73927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 20 Nov 2012 01:07:08 +0100 Subject: [PATCH 91/93] LyX for Windows: update pdfview for Acrobat XI and fix longstanding bug - to be able to support Adobe Reader/Acrobat XI I had to use new binaries for opening/closing PDFs. That way I found the solution for a long standing and super annoying PDF viewing bug (not 100% perfect but works for more than 95% of the cases, while formerly the view failed for all cases where LaTeX run more than once when updating a PDF view) --- .../Win32/packaging/installer/ChangeLog.txt | 3 + development/Win32/pdfview/pdfview.nsi | 166 ++++++++++++------ 2 files changed, 114 insertions(+), 55 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 64b3542696..d5253ad1ab 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,4 +1,7 @@ Changelog for LyX-205-4: +- support to update the view as PDF if Adobe Reader XI is used +- fix longstanding bug that updating a PDF view failed for larger + LyX documents if Adobe Reader or Acrobat was used as PDF viewer - fixed bug that EPS and PDF images were not displayed if LyX was installed this time without admin privileges but an older LyX version was once installed with admin privileges - correct the required disk space for the German thesaurus dictionaries diff --git a/development/Win32/pdfview/pdfview.nsi b/development/Win32/pdfview/pdfview.nsi index 8bbdd470a7..7798dbaa96 100644 --- a/development/Win32/pdfview/pdfview.nsi +++ b/development/Win32/pdfview/pdfview.nsi @@ -1,15 +1,15 @@ /* Windows PDF view helper -Author: Joost Verburg +Author: Joost Verburg and Uwe Stöhr This will be installed as pdfview.exe. The application will launch the default PDF viewer to display the PDF file, -but works around the file locking problems of Adobe Reader. +but works around the file locking problems of Adobe Reader and Acrobat. -Source code of pdfopen/pdfclose is available at: -http://magic.aladdin.cs.cmu.edu/2005/07/15/pdfopen-and-pdfclose/ +The files pdfopen/pdfclose are part of this archive: +http://www.tex.ac.uk/tex-archive/systems/win32/w32tex/pdftex-w32.tar.xz */ @@ -25,7 +25,7 @@ Icon "..\packaging\icons\lyx.ico" SilentInstall silent #-------------------------------- -# Windows Vista settings +# Windows Vista (and later) settings RequestExecutionLevel user @@ -35,7 +35,9 @@ RequestExecutionLevel user !define FALSE 0 !define TRUE 1 +# http://msdn.microsoft.com/en-us/library/windows/desktop/aa364417%28v=vs.85%29.aspx !define FILE_NOTIFY_CHANGE_LAST_WRITE 0x00000010 +# http://msdn.microsoft.com/en-us/library/windows/desktop/ms687032%28v=vs.85%29.aspx !define WAIT_TIMEOUT 0x00000102 #-------------------------------- @@ -51,17 +53,12 @@ Var OriginalDir Var PDFFile Var ViewerFileName Var Viewer -Var ViewerVersion -Var DDEName Var ChangeNotification Var WaitReturn Var LockedFile -Var OriginalTimeHigh -Var OriginalTimeLow -Var CurrentTimeHigh -Var CurrentTimeLow +Var TimeDiff #-------------------------------- # Macros @@ -89,6 +86,76 @@ Var CurrentTimeLow !macroend +# all following macros and functions are from +# http://nsis.sourceforge.net/FileTimeDiff +!define GetFileTimeS "!insertmacro _GetFileTimeS" + +!macro _GetFileTimeS _Time_ _File_ + + Push "${_File_}" + Call GetFileTimeS + Pop ${_Time_} + +!macroend + +Function GetFileTimeS + + Exch $0 ;; File / hi + Push $1 ;; lo + + ClearErrors + GetFileTime "$0" $0 $1 + IfErrors err + System::Call '*(i r1, i r0) i .r0' + System::Call '*$0(l .r0)' + System::Int64Op $0 / 10000000 ;; Conversion From '100 ns' to '1 sec' unit + Goto end + + err: + Push "" + SetErrors + Goto +3 + end: + System::Free $0 + Exch 2 + Pop $0 + Pop $1 + +FunctionEnd + +!define FileTimeDiff "!insertmacro _FileTimeDiff" + +!macro _FileTimeDiff _RetVal_ _FileA_ _FileB_ + + Push "${_FileB_}" + Push "${_FileA_}" + Call FileTimeDiff + Pop ${_RetVal_} + +!macroend + +Function FileTimeDiff + Exch $0 ;; FileA + Exch + Exch $1 ;; FileB + + ${GetFileTimeS} $0 "$0" + IfErrors err + ${GetFileTimeS} $1 "$1" + IfErrors err + System::Int64Op $0 - $1 + Goto end + + err: + Push "" + SetErrors + end: + Exch 2 + Pop $0 + Pop $1 + +FunctionEnd + #-------------------------------- # PDF viewing @@ -130,55 +197,33 @@ Section "View PDF file" ${EndIf} ${If} $Viewer == "AcroRd32.exe" - ${OrIf} $Viewer == "Acrobat.exe" + ${OrIf} $Viewer == "Acrobat.exe" - # Using Adobe viewer - - GetDLLVersion $ViewerFileName $R0 $R1 - IntOp $R2 $R0 >> 16 - IntOp $R2 $R2 & 0x0000FFFF ; $R2 now contains major version - IntOp $R3 $R0 & 0x0000FFFF ; $R3 now contains minor version - IntOp $R4 $R1 >> 16 - IntOp $R4 $R4 & 0x0000FFFF ; $R4 now contains release - IntOp $R5 $R1 & 0x0000FFFF ; $R5 now contains build - StrCpy $ViewerVersion "$R2" - - ${If} $ViewerVersion < 10 - StrCpy $DDEName "AcroView" - ${Else} - ${If} $Viewer == "AcroRd32.exe" - StrCpy $DDEName "AcroViewR$ViewerVersion" - ${ElseIf} $Viewer == "Acrobat.exe" - StrCpy $DDEName "AcroViewA$ViewerVersion" - ${EndIf} - ${EndIf} - # Close existing view ${If} ${FileExists} $PDFFile - !insertmacro HideConsole '"$EXEDIR\pdfclose.exe" --reader "$ViewerFileName" --ddename "$DDEName" --file "$PDFFile"' + !insertmacro HideConsole '"$EXEDIR\pdfclose.exe" --file "$PDFFile"' ${EndIf} # Copy PDF to temporary file to allow LyX to overwrite the original CopyFiles /SILENT $OriginalFile $PDFFile # Open a new view - !insertmacro HideConsole '"$EXEDIR\pdfopen.exe" --reader "$ViewerFileName" --ddename "$DDEName" --back --file "$PDFFile"' - - # Monitor for updates of the original file - GetFileTime $OriginalFile $OriginalTimeHigh $OriginalTimeLow + !insertmacro HideConsole '"$EXEDIR\pdfopen.exe" --file "$PDFFile"' + + # check if a file in LyX's temp folder has been changed !insertmacro SystemCall "kernel32::FindFirstChangeNotification(t '$OriginalDir', \ i 1, i ${FILE_NOTIFY_CHANGE_LAST_WRITE}) i.s" Pop $ChangeNotification ${Do} + # wait until the folder is not changed anymore, if so a "0" is returned + # otherwise a "258" (0x00000102) is returned !insertmacro SystemCall "kernel32::WaitForSingleObject(i $ChangeNotification, i 10000) i.s" Pop $WaitReturn - - # Check whether the lock is still active (if not, Adobe Reader is closed) + # Check whether the lock of the PDF file is still active (if not, Adobe Reader is closed) FileOpen $LockedFile $PDFFile a - ${If} $LockedFile != "" # Quit this application FileClose $LockedFile @@ -187,29 +232,40 @@ Section "View PDF file" Quit ${EndIf} + # if the folder is (for now) not changed anymore ${IfNot} $WaitReturn = ${WAIT_TIMEOUT} + + # check if the PDF-file in our temp directory is older than the one + # in LyX's temp folder because then it has been changed by LaTeX + ${FileTimeDiff} $TimeDiff "$PDFFile" "$OriginalFile" - # The LyX temporary directory has been updated - # Check whether it's the PDF file that has been updated + # if the file is older than 1 second + ${If} $TimeDiff < -1 + # close the PDF + !insertmacro HideConsole '"$EXEDIR\pdfclose.exe" --file "$PDFFile"' - GetFileTime $OriginalFile $CurrentTimeHigh $CurrentTimeLow - - ${If} $OriginalTimeHigh != $CurrentTimeHigh - ${OrIf} $OriginalTimeLow != $CurrentTimeLow - # PDF has been modified, update view - !insertmacro HideConsole '"$EXEDIR\pdfclose.exe" --reader "$ViewerFileName" --ddename "$DDEName" --file "$PDFFile"' - CopyFiles /SILENT $OriginalFile $PDFFile - !insertmacro HideConsole '"$EXEDIR\pdfopen.exe" --reader "$ViewerFileName" --ddename "$DDEName" --back --file "$PDFFile"' + # The problem is now that LaTeX might need several runs and therefore the PDF can + # also be rewritten consecutively several times. + # If we would directly open the file we will get in troubles as the PDF can be + # unreadable. We also don't know the time of a LaTeX run. + # (As example take UserGuide.lyx, view it, then remove a letter in a section heading + # and finally update the view.) + # We therefore loop until the PDF is no longer changed and wait some time in each loop. + ${Do} + CopyFiles /SILENT $OriginalFile $PDFFile + # wait 1.666 seconds (is empirically enough time that the PDF can be changed) + Sleep 1666 + ${FileTimeDiff} $TimeDiff "$PDFFile" "$OriginalFile" + ${LoopUntil} $TimeDiff = 0 - # Time of new file - StrCpy $OriginalTimeHigh $CurrentTimeHigh - StrCpy $OriginalTimeLow $CurrentTimeLow + # open the new file + !insertmacro HideConsole '"$EXEDIR\pdfopen.exe" --file "$PDFFile"' ${EndIf} #Monitor again !insertmacro SystemCall "kernel32::FindNextChangeNotification(i $ChangeNotification)" - ${EndIf} + ${EndIf} # end ifnot ${Loop} From 2036d88488d811907ecd5620dc742aededa74e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Tue, 20 Nov 2012 01:12:35 +0100 Subject: [PATCH 92/93] =?UTF-8?q?installer:=20updated=20Polish=20translati?= =?UTF-8?q?on=20my=20Micha=C5=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Win32/packaging/installer/ChangeLog.txt | 8 +- .../Win32/packaging/installer/lang/polish.nsh | 122 +++++++++--------- 2 files changed, 66 insertions(+), 64 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index d5253ad1ab..2f17750bc8 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,11 +1,13 @@ Changelog for LyX-205-4: - support to update the view as PDF if Adobe Reader XI is used -- fix longstanding bug that updating a PDF view failed for larger +- fix long standing bug that updating a PDF view failed for larger LyX documents if Adobe Reader or Acrobat was used as PDF viewer -- fixed bug that EPS and PDF images were not displayed if LyX was installed this time without admin privileges +- fixed bug that EPS and PDF images were not displayed if LyX was installed + this time without admin privileges but an older LyX version was once installed with admin privileges - correct the required disk space for the German thesaurus dictionaries -- updated Japanese, Norwegian, Slovak and Ukrainian translation of the installer messages +- updated Japanese, Norwegian, Polish, Slovak and Ukrainian translation of + the installer messages Changelog for LyX-205-3: diff --git a/development/Win32/packaging/installer/lang/polish.nsh b/development/Win32/packaging/installer/lang/polish.nsh index 39c1b3161f..cd37841765 100644 --- a/development/Win32/packaging/installer/lang/polish.nsh +++ b/development/Win32/packaging/installer/lang/polish.nsh @@ -1,108 +1,108 @@ !insertmacro LANGFILE_EXT "Polish" -${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)" +${LangFileString} TEXT_INSTALL_CURRENTUSER "(Zainstalowane dla biecego uytkownika)" -${LangFileString} TEXT_WELCOME "Kreator przeprowadzi Ciebie przez proces instalacji LyX-a.$\r$\n\ +${LangFileString} TEXT_WELCOME "Kreator przeprowadzi Ciebie przez proces instalacji LyX$\'a.$\r$\n\ $\r$\n\ $_CLICK" -${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..." -${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..." -${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..." +${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Aktualizacja bazy danych nazw plikw MikTeX..." +${LangFileString} TEXT_CONFIGURE_LYX "Konfigurowanie LyX (MiKTeX moe pobra brakujce pakiety, co moe zaj troch czasu)..." +${LangFileString} TEXT_CONFIGURE_PYTHON "Kompilowanie skryptw Python..." -${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut" -${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips" +${LangFileString} TEXT_FINISH_DESKTOP "Utwrz skrt na pulpicie" +${LangFileString} TEXT_FINISH_WEBSITE "Odwied lyx.org by pozna wiadomoci i wskazwki lub skorzysta ze wsparcia" -${LangFileString} FileTypeTitle "LyX-Document" +${LangFileString} FileTypeTitle "Dokument LyX" ${LangFileString} SecInstJabRefTitle "JabRef" ${LangFileString} SecAllUsersTitle "Instalacja dla wszystkich uytkownikw?" ${LangFileString} SecFileAssocTitle "Skojarzenie plikw .lyx" ${LangFileString} SecDesktopTitle "Ikona na pulpicie" -${LangFileString} SecCoreDescription "Pliki LyX-a." -${LangFileString} SecInstJabRefDescription "Bibliography reference manager and editor for BibTeX files." +${LangFileString} SecCoreDescription "Pliki LyX$\'a." +${LangFileString} SecInstJabRefDescription "Aplikacja do zarzdzania i edycji odnonikw bibliografii w plikach BibTeX." ${LangFileString} SecAllUsersDescription "Instalacja dla wszystkich uytkownikw lub tylko dla biecego uytkownika." ${LangFileString} SecFileAssocDescription "Skojarzenie LyX-a z plikami o rozszerzeniu .lyx." -${LangFileString} SecDesktopDescription "Ikona LyX-a na pulpicie." -${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that can be downloaded and installed." -${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be downloaded and installed." +${LangFileString} SecDesktopDescription "Ikona LyX$\'a na pulpicie." +${LangFileString} SecDictionariesDescription "Sowniki sprawdzania pisowni, ktre mog zosta pobrane i zainstalowane." +${LangFileString} SecThesaurusDescription "Sowniki tezaurusa, ktre mog zosta pobrane i zainstalowane." -${LangFileString} EnterLaTeXHeader1 'Dystrybucja LaTeX-a' -${LangFileString} EnterLaTeXHeader2 'Wybierz dystrybucj LaTeX-a, ktr chcesz uywa z LyX-em.' -${LangFileString} EnterLaTeXFolder 'You can optionally set here the path to the file $\"latex.exe$\" and therewith set the \ - LaTeX-distribution that should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ +${LangFileString} EnterLaTeXHeader1 'Dystrybucja LaTeX' +${LangFileString} EnterLaTeXHeader2 'Wybierz dystrybucj LaTeX, ktr chcesz uywa z LyX.' +${LangFileString} EnterLaTeXFolder 'Moesz opcjonalnie okreli ciek do pliku $\"latex.exe$\" i w zwizku z tym ustawi, \ + ktra dystrybucja LaTeX ma by uywana przez LyX.$\r$\n\ + Jeeli nie uyjesz LaTeX, LyX bdzie niezdolny do wyprodukowania dokumentw!$\r$\n\ $\r$\n\ - The installer has detected the LaTeX-distribution \ - $\"$LaTeXName$\" on your system. Displayed below is its path.' -${LangFileString} EnterLaTeXFolderNone 'Set below the path to the file $\"latex.exe$\". Therewith you set which \ - LaTeX-distribution should be used by LyX.$\r$\n\ - If you don$\'t use LaTeX, LyX cannot output documents!$\r$\n\ + Instalator wykry dystrybucj LaTeX \ + $\"$LaTeXName$\" w twoim systemie. Poniej wywietlono jego ciek.' +${LangFileString} EnterLaTeXFolderNone 'Poniej podaj ciek do pliku $\"latex.exe$\". W zwizku z tym od Ciebie \ + zaley, ktra dystrybucja LaTeX zostanie uyta przez LyX.$\r$\n\ + Jeeli nie uyjesz LaTeX, LyX bdzie niezdolny do wyprodukowania dokumentw!$\r$\n\ $\r$\n\ - The installer couldn$\'t find a LaTeX-distribution on your system.' -${LangFileString} PathName 'Path to the file $\"latex.exe$\"' + Instalator nie moe odnale dystrybucji LaTeX w twoim systemie.' +${LangFileString} PathName 'cieka do pliku $\"latex.exe$\"' ${LangFileString} DontUseLaTeX "Nie uywaj LaTeX-a" ${LangFileString} InvalidLaTeXFolder 'Plik $\"latex.exe$\" nie znajduje si w podanej ciece.' -${LangFileString} LatexInfo 'Teraz zostanie uruchomiony instalator dystrybucji LaTeX-a $\"MiKTeX$\".$\r$\n\ +${LangFileString} LatexInfo 'Teraz zostanie uruchomiony instalator dystrybucji LaTeX $\"MiKTeX$\".$\r$\n\ Aby zainstalowa ten program nacinij przycisk $\"Dalej$\" w oknie instalatora.$\r$\n\ $\r$\n\ !!! Prosz uy wszystkich domylnych opcji instalatora MiKTeX-a !!!' -${LangFileString} LatexError1 'Nie znaleziono dystrybucji LaTeX-a!$\r$\n\ +${LangFileString} LatexError1 'Nie znaleziono dystrybucji LaTeX$\'a!$\r$\n\ LyX nie moe by uyty bez dystrybucji LaTeX-a takiej jak $\"MiKTeX$\"!$\r$\n\ Z tego powodu instalacja zostanie przerwana.' -${LangFileString} HunspellFailed 'Download of dictionary for language $\"$R3$\" failed.' -${LangFileString} ThesaurusFailed 'Download of thesaurus for language $\"$R3$\" failed.' +${LangFileString} HunspellFailed 'Pobranie sownika dla jzyka $\"$R3$\" nie powiodo si.' +${LangFileString} ThesaurusFailed 'Pobranie tezaurusa dla jzyka $\"$R3$\" nie powiodo si.' -${LangFileString} JabRefInfo 'Now the installer of the program $\"JabRef$\" will be launched.$\r$\n\ - You can use all default options of the JabRef-installer.' -${LangFileString} JabRefError 'The program $\"JabRef$\" could not successfully be installed!$\r$\n\ - The installer will continue anyway.$\r$\n\ - Try to install JabRef again later.' +${LangFileString} JabRefInfo 'Teraz zostanie uruchomiony instalator aplikacji $\"JabRef$\".$\r$\n\ + Moesz uy wszystkich domylnych opcji instalatora JabRef.' +${LangFileString} JabRefError 'Aplikacja $\"JabRef$\" nie moe by z powodzeniem zainstalowana!$\r$\n\ + Instalator jednake bdzie kontynuowa dalsze dziaanie..$\r$\n\ + Sprbuj ponownie pniej zainstalowa JabRef.' -${LangFileString} LatexConfigInfo "Dalsza konfiguracja LyX-a chwil potrwa." +${LangFileString} LatexConfigInfo "Dalsza konfiguracja LyX$\'a chwil potrwa." -${LangFileString} MiKTeXPathInfo "In order that every user is later able to customize MiKTeX for his needs$\r$\n\ - it is necessary to set write permissions for all users to MiKTeX's installation folder$\r$\n\ +${LangFileString} MiKTeXPathInfo "Aby umoliwi kademu z uytkownikw pniejsze dostosowanie MikTeX do ich potrzeb$\r$\n\ + niezbdne jest nadanie praw zapisu wszystkim uytkownikom od folderu instalacji MikTeX$\r$\n\ $MiKTeXPath $\r$\n\ - and its subfolders." -${LangFileString} MiKTeXInfo 'The LaTeX-distribution $\"MiKTeX$\" will be used together with LyX.$\r$\n\ - It is recommended to install available MiKTeX-updates using the program $\"MiKTeX Update Wizard$\"$\r$\n\ - before you use LyX for the first time.$\r$\n\ - Would you now check for MiKTeX updates?' + i jego podfolderom." +${LangFileString} MiKTeXInfo 'Dystrybucja LaTeX $\"MikTeX$\" bdzie uywana razem z LyX.$\r$\n\ + Zaleca si instalacj dostpnych aktualizacji MikTeX z uyciem aplikacji $\"MikTeX update wizard$\"$\r$\n\ + przed uyciem LyX po raz pierwszy.$\r$\n\ + Czy yczysz sobie sprawdzenia tych aktualizacji dla MikTeX teraz?' -${LangFileString} ModifyingConfigureFailed "Nieudana prba ustawienia zmiennej 'path_prefix' w pliku skryptu konfigracyjnego" +${LangFileString} ModifyingConfigureFailed "Nieudana prba ustawienia zmiennej 'path_prefix' w pliku skryptu konfiguracyjnego" ${LangFileString} RunConfigureFailed "Niedana prba wykonania skryptu konfiguracyjnego" -${LangFileString} NotAdmin "Musisz mie prawa administratora aby zainstalowa LyX-a!" +${LangFileString} NotAdmin "Musisz mie prawa administratora aby zainstalowa LyX$\'a!" ${LangFileString} InstallRunning "Instalator jest ju uruchomiony!" ${LangFileString} StillInstalled "LyX ${APP_SERIES_KEY2} jest ju zainstalowany! Aby kontynowa musisz go najpierw usun." -${LangFileString} NewerInstalled "You are trying to install an older version of LyX than what you have installed.$\r$\n\ - If you really want this, you must uninstall the existing LyX $OldVersionNumber before." +${LangFileString} NewerInstalled "Prbujesz zainstalowa starsz wersj LyX, ni ta ktra jest ju zainstalowana.$\r$\n\ + Jeeli naprawd chcesz tego dokona, musisz wpierw odinstalowa LyX $OldVersionNumber." -${LangFileString} MultipleIndexesNotAvailable "The support for using several indexes in a document will not be available because$\r$\n\ - MiKTeX was installed with administrator privileges but you are installing LyX without them." -${LangFileString} MetafileNotAvailable "The LyX support for images in the format EMF or WMF will not be$\r$\n\ - available because that requires to install a software printer to$\r$\n\ - Windows which is only possible with administrator privileges." +${LangFileString} MultipleIndexesNotAvailable "Wsparcie dla uywania wielu indeksw w dokumencie nie bdzie dostpne, poniewa$\r$\n\ + MiKTeX zosta zainstalowany z uprawnieniami administratora, natomiast instalujesz LyX bez nich." +${LangFileString} MetafileNotAvailable "Wsparcie LyX dla formatw graficznych EMF i WMF nie bdzie$\r$\n\ + dostpne, poniewa wymaga to instalacji drukarki programowej dla$\r$\n\ + Windows co jest moliwe tylko z uprawnieniami administratora." ${LangFileString} FinishPageMessage "Gratulacje! LyX zosta pomylnie zainstalowany.$\r$\n\ $\r$\n\ (Pierwsze uruchomienie moe potrwa kilka sekund.)" -${LangFileString} FinishPageRun "Uruchom LyX-a" +${LangFileString} FinishPageRun "Uruchom LyX" -${LangFileString} UnNotInRegistryLabel "Nie mona znale LyX-a w rejestrze.$\r$\n\ +${LangFileString} UnNotInRegistryLabel "Nie mona znale LyX$\'a w rejestrze.$\r$\n\ Skrty na pulpicie i w menu Start nie zostan usunite." -${LangFileString} UnInstallRunning "Musisz najpierw zamkn LyX-a!" +${LangFileString} UnInstallRunning "Musisz najpierw zamkn LyX$\'a!" ${LangFileString} UnNotAdminLabel "Musisz posiada prawa administratora do deinstalacji programu LyX." -${LangFileString} UnReallyRemoveLabel "Czy na pewno chcesz usun LyX-a i wszystkie jego komponenty?" -${LangFileString} UnLyXPreferencesTitle 'LyX$\'s user preferences' +${LangFileString} UnReallyRemoveLabel "Czy na pewno chcesz usun LyX$\'a i wszystkie jego komponenty?" +${LangFileString} UnLyXPreferencesTitle 'Preferencje uytkownika LyX$\'a' -${LangFileString} SecUnMiKTeXDescription "Uninstalls the LaTeX-distribution MiKTeX." -${LangFileString} SecUnJabRefDescription "Uninstalls the bibliography manager JabRef." -${LangFileString} SecUnPreferencesDescription 'Deletes LyX$\'s configuration folder$\r$\n\ +${LangFileString} SecUnMiKTeXDescription "Deinstalacja MikTeX, dystrybucji LaTeX." +${LangFileString} SecUnJabRefDescription "Deinstalacja zarzdcy bibliografii JabRef." +${LangFileString} SecUnPreferencesDescription 'Usuwa folder konfiguracji LyX$\'a$\r$\n\ $\"$AppPre\username\$AppSuff\${APP_DIR_USERDATA}$\"$\r$\n\ - for all users.' -${LangFileString} SecUnProgramFilesDescription "Uninstall LyX and all of its components." + wszystkim uytkownikom.' +${LangFileString} SecUnProgramFilesDescription "Deinstalacja LyX i wszystkich jego komponentw." From d1e364606bc1e8227174141969cb8f4af3ad3b20 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Tue, 20 Nov 2012 13:10:18 +0100 Subject: [PATCH 93/93] * sk.po --- po/sk.po | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/po/sk.po b/po/sk.po index 42040b68ca..ad4a0288b1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.1\n" "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n" -"POT-Creation-Date: 2012-10-31 08:57+0100\n" +"POT-Creation-Date: 2012-11-08 10:16+0100\n" "PO-Revision-Date: 2012-10-19 09:05+0200\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" @@ -4964,11 +4964,11 @@ msgstr "Zväčšiť hĺbku zanorenia označeného člena" #: src/frontends/qt4/ui/TocUi.ui:160 msgid "Move selected item down by one" -msgstr "Presuň označenú položku nadol" +msgstr "Presuň označený prvok nadol" #: src/frontends/qt4/ui/TocUi.ui:179 msgid "Move selected item up by one" -msgstr "Presuň označenú položku nahor" +msgstr "Presuň označený prvok nahor" #: src/frontends/qt4/ui/TocUi.ui:225 msgid "Sort" @@ -6004,13 +6004,13 @@ msgstr "Podpodsekcia" msgid "Itemize" msgstr "Položky" -#: lib/layouts/aa.layout:57 lib/layouts/aapaper.layout:51 -#: lib/layouts/aastex.layout:86 lib/layouts/apa.layout:379 -#: lib/layouts/beamer.layout:64 lib/layouts/egs.layout:149 -#: lib/layouts/powerdot.layout:261 lib/layouts/agu_stdlists.inc:21 +#: lib/layouts/aa.layout:58 lib/layouts/aapaper.layout:52 +#: lib/layouts/aastex.layout:87 lib/layouts/apa.layout:357 +#: lib/layouts/beamer.layout:67 lib/layouts/egs.layout:150 +#: lib/layouts/powerdot.layout:262 lib/layouts/agu_stdlists.inc:21 #: lib/layouts/db_stdlists.inc:19 lib/layouts/stdlists.inc:34 msgid "Enumerate" -msgstr "Výpočet" +msgstr "Číslovanie" #: lib/layouts/aa.layout:60 lib/layouts/aapaper.layout:54 #: lib/layouts/aastex.layout:89 lib/layouts/beamer.layout:84 @@ -9467,11 +9467,11 @@ msgstr "KOMA-Script kniha" msgid "KOMA-Script Letter (V. 1, Obsolete)" msgstr "KOMA-Script list (V. 1, zastaralý)" -#: lib/layouts/scrlettr.layout:24 lib/layouts/scrlttr2.layout:28 +#: lib/layouts/scrlettr.layout:25 lib/layouts/scrlttr2.layout:29 #: lib/layouts/scrclass.inc:42 lib/layouts/stdlyxlist.inc:6 #: lib/layouts/enumitem.module:73 msgid "Labeling" -msgstr "Označovanie" +msgstr "Etiketovanie" #: lib/layouts/scrlettr.layout:50 msgid "L" @@ -11118,7 +11118,7 @@ msgstr "" #: lib/layouts/enumitem.module:93 msgid "Enumerate-Resume" -msgstr "Výpočet-Pokračovať" +msgstr "Číslovanie-Pokračovať" #: lib/layouts/eqs-within-sections.module:2 msgid "Number Equations by Section" @@ -12649,6 +12649,10 @@ msgstr "Japonsky (non-CJK) (JIS)" msgid "Japanese (non-CJK) (SJIS)" msgstr "Japonsky (non-CJK) (SJIS)" +#: lib/encodings:186 +msgid "Japanese (non-CJK) (utf8)" +msgstr "Japonsky (non-CJK) (utf8)" + #: lib/encodings:191 msgid "Thai (TIS 620-0)" msgstr "Thajsky (TIS 620-0)" @@ -13977,6 +13981,10 @@ msgstr "Políčko zdrojový text" msgid "Messages Pane|g" msgstr "Políčko hlásenia" +#: lib/ui/stdmenus.inc:335 +msgid "Toolbars|b" +msgstr "Lišty nástrojov" + #: lib/ui/stdmenus.inc:331 msgid "Split View Into Left and Right Half|i" msgstr "Pohľad rozdeliť na ľavú a pravú polovičku" @@ -13993,10 +14001,6 @@ msgstr "Zavri aktuálny náhľad" msgid "Fullscreen|l" msgstr "Celoobrazovkový mód" -#: lib/ui/stdmenus.inc:335 -msgid "Toolbars|b" -msgstr "Lišty nástrojov" - #: lib/ui/stdmenus.inc:350 msgid "Math|h" msgstr "Matematika|M" @@ -14563,11 +14567,11 @@ msgstr "Položková listina" #: lib/ui/stdtoolbars.inc:117 msgid "Increase depth" -msgstr "Zväčšiť hĺbku" +msgstr "Zväčšiť odsadenie" #: lib/ui/stdtoolbars.inc:118 msgid "Decrease depth" -msgstr "Zmenšiť hĺbku" +msgstr "Zmenšiť odsadenie" #: lib/ui/stdtoolbars.inc:120 msgid "Insert figure float" @@ -24397,11 +24401,6 @@ msgstr "Chyba pri Exporte" msgid "Error cloning the Buffer." msgstr "Chyba pri klonovaní Zásobníka." -#: src/frontends/qt4/GuiView.cpp:3226 -#, c-format -msgid "Error exporting to format: %1$s" -msgstr "Chyba pri exporte na formát: %1$s" - #: src/frontends/qt4/GuiView.cpp:3234 src/frontends/qt4/GuiView.cpp:3251 msgid "Exporting ..." msgstr "Exportujem ..." @@ -26212,6 +26211,9 @@ msgstr "" msgid "Unknown user" msgstr "Neznámy používateľ" +#~ msgid "Error exporting to format: %1$s" +#~ msgstr "Chyba pri exporte na formát: %1$s" + #~ msgid "Braille Manual|B" #~ msgstr "Braille: Manuál"