--- misc/libgsf-1.14.19/configure 2010-09-25 18:53:55.000000000 +0200 +++ misc/build/libgsf-1.14.19/configure 2011-03-03 12:42:21.000000000 +0100 @@ -11475,7 +11475,7 @@ - +if false; then case "$am__api_version" in 1.01234) as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 @@ -11650,7 +11650,7 @@ - +fi @@ -11963,7 +11963,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi -if test "x" != "xno-xml"; then +if test "xno-xml" != "xno-xml"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then @@ -12846,7 +12846,7 @@ fi fi -if test -n "$PKG_CONFIG"; then +if test "$PKG_CONFIG" != "no" ; then _pkg_min_version=0.9.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } --- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c +++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c @@ -30,6 +30,10 @@ #include #include + +#if defined(Z_PREFIX) && defined(crc32) +#undef crc32 +#endif #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "libgsf:zip" --- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c +++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c @@ -29,6 +29,11 @@ #include #include #include + +#if defined(Z_PREFIX) && defined(crc32) +#define CRC32_WAS_DEFINED_AS_Z_CRC32 +#undef crc32 +#endif #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "libgsf:zip" @@ -345,7 +345,11 @@ zip_header_write (zip); zip->writing = TRUE; zip->root->writing = TRUE; +#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32) + dirent->crc32 = z_crc32 (0L, Z_NULL, 0); +#else dirent->crc32 = crc32 (0L, Z_NULL, 0); +#endif if (zip->compression_method == GSF_ZIP_DEFLATED) { if (!zip->stream) { zip->stream = g_new0 (z_stream, 1); @@ -544,7 +544,11 @@ return FALSE; dirent->csize += num_bytes; } +#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32) + dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes); +#else dirent->crc32 = crc32 (dirent->crc32, data, num_bytes); +#endif dirent->usize += num_bytes; return TRUE; /libreoffice-7-5+backports'>distro/collabora/libreoffice-7-5+backports LibreOffice 界面翻译代码仓库文档基金会
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-10-11 21:38:52 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-10-11 23:12:26 +0200
commit4a45b12af9d0be41780e5a29b73e8e595f3f430f (patch)
tree5739ca1985e9f7a1bbcd22ebdf5aa90316b017e6 /source/ss/starmath
parent4eddabeb0f63e7eb0870de9f69e90efa4f744667 (diff)
update translations for 5.2.3 rc1
and force-fix errors using pocheck Change-Id: I3c922e1b91581f1b5cd6a5b8d0662a3e7aba0fae
Diffstat (limited to 'source/ss/starmath')
-rw-r--r--source/ss/starmath/source.po19
1 files changed, 4 insertions, 15 deletions
diff --git a/source/ss/starmath/source.po b/source/ss/starmath/source.po
index fad7239f51c..60937b4dd78 100644
--- a/source/ss/starmath/source.po
+++ b/source/ss/starmath/source.po
@@ -3,17 +3,15 @@ msgid ""
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: 2016-03-09 20:48+0100\n"
-"PO-Revision-Date: 2016-03-12 01:13+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
+"POT-Creation-Date: 2016-10-11 21:12+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: LibreOffice\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: Pootle 2.7\n"
-"X-POOTLE-MTIME: 1457745183.000000\n"
#: commands.src
msgctxt ""
@@ -3212,15 +3210,6 @@ msgstr "lokufananako"
msgctxt ""
"symbol.src\n"
"RID_UI_SYMBOL_NAMES\n"
-"tendto\n"
-"itemlist.text"
-msgid "tendto"
-msgstr "vama ku"
-
-#: symbol.src
-msgctxt ""
-"symbol.src\n"
-"RID_UI_SYMBOL_NAMES\n"
"infinite\n"
"itemlist.text"
msgid "infinite"