aboutsummaryrefslogtreecommitdiff
path: root/source/nn/helpcontent2/source/text/shared/guide.po
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-06-18 12:22:25 +0200
committerAndras Timar <andras.timar@collabora.com>2015-06-18 12:22:25 +0200
commitb10b8beb952f7d94562320bbff08cebb88574368 (patch)
tree048de031f7997bb6aa53762c6818538625badb30 /source/nn/helpcontent2/source/text/shared/guide.po
parentb11e34f1d06f02a7f7d17f01ab9a9ea259c90e87 (diff)
sync with libreoffice-4-4-4 branch distro/collabora/lov-4.4
Change-Id: I1435c894e34b46567a1ef265a14b5e0f04474323
Diffstat (limited to 'source/nn/helpcontent2/source/text/shared/guide.po')
-rw-r--r--source/nn/helpcontent2/source/text/shared/guide.po6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/nn/helpcontent2/source/text/shared/guide.po b/source/nn/helpcontent2/source/text/shared/guide.po
index 7c04d61fd0c..f6210d8c94b 100644
--- a/source/nn/helpcontent2/source/text/shared/guide.po
+++ b/source/nn/helpcontent2/source/text/shared/guide.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2015-01-07 11:07+0100\n"
-"PO-Revision-Date: 2015-02-28 15:04+0000\n"
+"PO-Revision-Date: 2015-05-04 20:42+0000\n"
"Last-Translator: Kolbjørn <kolbjoern@stuestoel.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: nn\n"
@@ -14,7 +14,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.1\n"
"X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1425135858.000000\n"
+"X-POOTLE-MTIME: 1430772161.000000\n"
#: aaa_start.xhp
msgctxt ""
@@ -13234,7 +13234,7 @@ msgctxt ""
"bm_id3159201\n"
"help.text"
msgid "<bookmark_value>documents;measurement units in</bookmark_value><bookmark_value>measurement units;selecting</bookmark_value><bookmark_value>units;measurement units</bookmark_value><bookmark_value>centimeters</bookmark_value><bookmark_value>inches</bookmark_value><bookmark_value>distances</bookmark_value><bookmark_value>selecting;measurement units</bookmark_value>"
-msgstr "<bookmark_value>dokument;måleeiningar i</bookmark_value><bookmark_value>måleeiningar;velja</bookmark_value><bookmark_value>einingar;måleeiningar</bookmark_value><bookmark_value>centimeter</bookmark_value><bookmark_value>tommar</bookmark_value><bookmark_value>avstander</bookmark_value><bookmark_value>velja;måleeiningar</bookmark_value>"
+msgstr "<bookmark_value>dokument;måleeiningar i</bookmark_value><bookmark_value>måleeiningar;velja</bookmark_value><bookmark_value>einingar;måleeiningar</bookmark_value><bookmark_value>centimeter</bookmark_value><bookmark_value>tommar</bookmark_value><bookmark_value>avstandar</bookmark_value><bookmark_value>velja;måleeiningar</bookmark_value>"
#: measurement_units.xhp
msgctxt ""
ffice-5-0-1'>libreoffice-5-0-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/external/libwpd/Makefile
t'>makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
AgeCommit message (Collapse)Author
Christian Lohmaier
…by a simple/static $(gb_UnpackedTarball_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2024-04-26extracting tarballs that call helpers to uncompress require unix-style pathsChristian Lohmaier
Change-Id: I528e343fb5b22194b4639649fbfc04c0583f77c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166336 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26add MSYS_NO_PATHCONV=1 to prevent MSYS auto-magicChristian Lohmaier
git-bash/MSYS tries to resolve anything that looks like a path (i.e. anything starting with a /) - if the "target" doesn't exists, it just prepends the MSYS installation dir and breaks all kind of stuff. You could escape those with double-slash at the beginning, but that would mean lots of noise/unnecessary changes in pretty much every makefile, so just getting rid of that behavior is much better. ant and some externals however rely on MSYS path-conversion, so unset MSYS_NO_PATHCONV for those. Ant does its own checks whether it runs under cygwin or msys, and easier to please externals using the autoconversion than to add patches to force them into compliance… Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26Typo gb_Trace_ liblangtrag instead of liblangtagJulien Nabet
Change-Id: Ib4b66549725c6010b1c9b9baf11674f86ac5f1ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166652 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2024-04-22REAL_CC[_CFLAGS] are already set by gb_ExternalProject_runChristian Lohmaier
(and that also takes care of proper quoting) Change-Id: Ic8c29300a2e6d5381c0d8873572f7c076362c93d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166324 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2023-09-15A more principled suppression of -fsanitize=function in external C codeStephan Bergmann
...after <https://github.com/llvm/llvm-project/commit/279a4d0d67c874e80c171666822f2fabdd6fa926> "-fsanitize=function: support C". This includes reverts of 16af9e81863a80116f808ee3cfa4a1bab7c67ac5 "update clang asan suppressions" and 151a43f3d00f6523079c53d6c2d064f80b9a55d6 ""update clang asan suppressions". Change-Id: I49740f5f3a784af1d62b830b47bfdfa27fe3e471 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156935 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-04-12use gb_DEBUGINFO_FLAGS consistently in gbuild ExternalProject'sLuboš Luňák
A number of them didn't use it at all, others had it hand-written in various ways. Change-Id: Iaf86325f9cdc032926bac917dc3eef4e34661544 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132818 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-01-31externals: always provide platform configure flagsJan-Marek Glogowski
No idea why we just provided the platform flags when cross- compiling. In the curious case, where the host platform is detected as x86_64-pc-mingw32 per default and we actually want to override it with x86_64-pc-cygwin, we don't do a cross compile, but must override the host platform. But there is additional special handling needed for the omitted cross-platform build in the special case of --host=i686-pc-cygwin and --build=x86_64-pc-cygwin, where we deliberatly ignore cross building; Windows is already a slow build, so try to keep this optimization (AMD64 can execute x86 binaries). There is the theoretical case, where the externals config.guess would have detected something else and that "magically" even worked, while the LO detected triplet would fail, but this should be fixed in the external in any way. Change-Id: Ib7a9719e0e406fe90334b7611dc3f01b51692bfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129153 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-10-20upgrade liblangtag to 0.6.3Caolán McNamara
langtag-valencia.patch.0 merged as: https://bitbucket.org/tagoh/liblangtag/commits/fe35532a0b98d5a8179b9edee0d61ea8db9b5921 external/liblangtag/Wformat-overflow.patch redundant since: https://bitbucket.org/tagoh/liblangtag/commits/49135ef561f309078f0bfd6e1f15052769cf75b4 Change-Id: Ieeb19679837f03a6938c97f069d6fb1e6dd9a30d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123890 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>