[ooo-build-commit] .: 2 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Wed Apr 7 13:31:21 PDT 2010
patches/dev300/apply | 3 +++
patches/dev300/es-fix-buleano.diff | 12 ++++++++++++
patches/dev300/nsplugin-path.diff | 20 +++++++++++++++++++-
3 files changed, 34 insertions(+), 1 deletion(-)
New commits:
commit 60d37a0902786000081bf934cef08be87e2d7339
Author: Rene Engelhard <rene at debian.org>
Date: Wed Apr 7 22:27:24 2010 +0200
make nsplugin-path.diff handle relative symlinks
* patches/dev300/nsplugin-path.diff: add patch from mmeeks
diff --git a/patches/dev300/nsplugin-path.diff b/patches/dev300/nsplugin-path.diff
index da1d95b..3818604 100644
--- a/patches/dev300/nsplugin-path.diff
+++ b/patches/dev300/nsplugin-path.diff
@@ -8,7 +8,7 @@
#include <stdarg.h>
// For vsnprintf()
#define NSP_vsnprintf vsnprintf
-@@ -122,6 +123,96 @@ restoreUTF8(char *pPath)
+@@ -122,6 +123,114 @@ restoreUTF8(char *pPath)
return 0;
}
@@ -94,6 +94,24 @@
+ *clobber = '\0';
+ strcpy (realFileName, libFileName);
+ }
++
++ fprintf (stderr, "OpenOffice path before fixup is '%s'\n", realFileName);
++
++ if (realFileName[0] != '/') {
++ /* a relative sym-link and we need to get an absolute path */
++ char scratch[NPP_PATH_MAX] = {0};
++ if (strlen (realFileName) + strlen (libFileName) + 2 >= NPP_PATH_MAX - 1)
++ {
++ fprintf (stderr, "Paths too long to fix up.\n");
++ return 1;
++ }
++ strcpy (scratch, libFileName);
++ if (strrchr (scratch, '/')) /* remove the last element */
++ *(strrchr (scratch, '/') + 1) = '\0';
++ strcat (scratch, realFileName);
++ strcpy (realFileName, scratch);
++ }
++
+ *aResult = realFileName;
+
+ fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
commit 842900dc27815c2468963d42299ff660fb97c430
Author: Rene Engelhard <rene at debian.org>
Date: Wed Apr 7 21:19:59 2010 +0200
fix es "boolean value" translation
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c252182..fc01c51 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3094,6 +3094,9 @@ sc-autofilter-l10n-es.diff, i#103840, pmladek
# pack only selected languages in the l10n module
l10n-build-only-selected-langs.diff, i#106185, pmladek
+# fix "buleano"
+es-fix-buleano.diff, deb#576842, i#110674, rengelha
+
[ LocalizeFixes < ooo320-m13 ]
i109407_BUSCAR.diff
diff --git a/patches/dev300/es-fix-buleano.diff b/patches/dev300/es-fix-buleano.diff
new file mode 100644
index 0000000..a2edbf3
--- /dev/null
+++ b/patches/dev300/es-fix-buleano.diff
@@ -0,0 +1,12 @@
+diff --git a/l10n/source/es/localize.sdf b/l10n/source/es/localize.sdf
+--- l10n/source/es/localize.sdf
++++ l10n/source/es/localize.sdf
+@@ -21928,7 +21928,7 @@
+ svx source\cui\numfmt.src 0 imagebutton RID_SVXPAGE_NUMBERFORMAT IB_REMOVE HID_NUMBERFORMAT_TBI_REMOVE 14 es - Eliminar 2002-02-02 02:02:02
+ svx source\cui\numfmt.src 0 string RID_SVXPAGE_NUMBERFORMAT STR_AUTO_ENTRY 14 es Automático 2002-02-02 02:02:02
+ svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 1 0 es Todo 2002-02-02 02:02:02
+-svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 10 0 es Valor buleano 2002-02-02 02:02:02
++svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 10 0 es Valor booleano 2002-02-02 02:02:02
+ svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 11 0 es Texto 2002-02-02 02:02:02
+ svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 2 0 es Definido por el usuario 2002-02-02 02:02:02
+ svx source\cui\numfmt.src 0 stringlist RID_SVXPAGE_NUMBERFORMAT.LB_CATEGORY 3 0 es Número 2002-02-02 02:02:02
More information about the ooo-build-commit
mailing list