./packages/openofficeorg/3.2/experimental r1685: temporarily back out debconf nnote for binfilter removal; merge
------------------------------------------------------------
revno: 1685 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-10-30 10:01:02 +0100
message:
temporarily back out debconf nnote for binfilter removal; merge
removed:
openoffice.org-filter-binfilter.templates.in
added:
po/pt.po
modified:
changelog
openoffice.org-filter-binfilter.postinst.in
po/POTFILES.in
po/eu.po
=== modified file 'changelog'
--- a/changelog 2009-10-29 10:23:21 +0000
+++ b/changelog 2009-10-30 09:01:02 +0000
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (4b6df02a650f42f62a60f1c8bb03f57d52e63942)
+ - update (812388f3e353454f4c61b31e127bd8b9124d1763)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -46,19 +46,18 @@
* debian/control.in, debian/rules:
- remove hardcoded libldap2-dev builddep and add ENABLE_LDAP conditional.
Only suggest it because it's now dlopen()'ed anyway.
- * debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- - warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <rene@debian.org> Sun, 25 Oct 2009 23:41:29 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Oct 2009 09:57:37 +0100
openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
[ Rene Engelhard ]
* ooo-build:
- - update (7011943819078d380d4a92b64a967c2e645587f8)
+ - update (8c34432a931671efb7e2271205c3dafade1c5682)
- fixes wrong filter texts in KDE4 fpicker (closes: #551774)
- Correct fix for the mirrored range selection bug in RTL mode.
(closes: #548767)
+
* debian/templates: apply changes from debian-l10n-english review
(closes: #552370)
* debian/po:
@@ -70,6 +69,7 @@
- ja.po (thanks Hideki Yamane, closes: #552460)
- eu.po (thanks Piarres Beobide, closes: #552703)
- sv.po (thanks Martin Bagge, closes: #552740)
+ - pt.po (thanks Pedro Ribeiro, closes: #553284)
* debian/rules:
- add conflict against (<< <minor version of lucene OOo was built with)
for -help-en-us as newer versions necessarily don't create indexes a old
@@ -77,11 +77,11 @@
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
- [ Rail Aliev ]
- * debian/po:
- - update ru.po, tr.po
+ [ Rail Aliev ]
+ * debian/po:
+ - update ru.po, tr.po
- -- Rene Engelhard <rene@debian.org> Sun, 25 Oct 2009 23:40:05 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 29 Oct 2009 20:47:58 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'openoffice.org-filter-binfilter.postinst.in'
--- a/openoffice.org-filter-binfilter.postinst.in 2009-10-07 23:29:10 +0000
+++ b/openoffice.org-filter-binfilter.postinst.in 2009-10-30 09:01:02 +0000
@@ -8,8 +8,6 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- db_input high openoffice.org-filter-binfilter/so5x-filters-going-away || true
- db_go || true
register_to_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
fi
=== removed file 'openoffice.org-filter-binfilter.templates.in'
--- a/openoffice.org-filter-binfilter.templates.in 2009-10-01 16:02:24 +0000
+++ b/openoffice.org-filter-binfilter.templates.in 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-Template: openoffice.org-filter-binfilter/so5x-filters-going-away
-Type: note
-_Description: StarOffice 5.x filters going away soon
- The old StarOffice binary filters (*.sdw, *.sdc, *.sdd) are scheduled to
- go away with OpenOffice.org 3.4.
- .
- Please migrate your documents away from this long-obsolete format.
-
=== modified file 'po/POTFILES.in'
--- a/po/POTFILES.in 2009-10-01 16:02:24 +0000
+++ b/po/POTFILES.in 2009-10-30 09:01:02 +0000
@@ -1,2 +1,1 @@
[type: gettext/rfc822deb] templates
-[type: gettext/rfc822deb] openoffice.org-filter-binfilter.templates.in
=== modified file 'po/eu.po'
--- a/po/eu.po 2009-10-29 09:50:27 +0000
+++ b/po/eu.po 2009-10-29 13:21:41 +0000
@@ -1,45 +1,46 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres Beobide <pi@beobide.net>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice.org-debconf\n"
-"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-25 20:40+0100\n"
-"PO-Revision-Date: 2009-10-29 08:48+0200\n"
-"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: Euskara <debian-1l0n-basque@lists.debian.org>\n"
-"Language: eu\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.2.1\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "OpenOffice.org running"
-msgstr "OpenOffice.org martxan"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"OpenOffice.org is running right now. This can cause problems with (de-)"
-"registration of components and extensions."
-msgstr ""
-"OpenOffice.org orain martxan dago. Honek arazoak sor ditzake osagai eta "
-"hedapenak (des)erregistratzean."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"You should close all running instances of OpenOffice.org (including any "
-"currently running Quickstarter) before proceeding with the package upgrade."
-msgstr ""
-"OpenOffice.org-ren martxan dituzun instantzia guztiak itxi beharko zenituzke "
-"(baita martxan dagoen abiarazle-azkarra) pakete eguneraketa egin baino "
-"lehen."
+# translation of eu.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Piarres Beobide <pi@beobide.net>, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"PO-Revision-Date: 2009-10-29 12:28+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.4.1\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org exekutatzen"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with "
+"(de-)regstration of components and extensions."
+msgstr ""
+"OpenOffice.org orain exekutatzen ari da. Honek arazoak sor ditzake osagai eta "
+"hedapenak (des)erregistratzean."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"OpenOffice.org-en exekuzioaren instantzia guztiak itxi beharko zenituzke "
+"(baita abiarazle-azkarra ere exekutatzen egonez gero) pakete eguneraketa egin baino "
+"lehen."
=== added file 'po/pt.po'
--- a/po/pt.po 1970-01-01 00:00:00 +0000
+++ b/po/pt.po 2009-10-30 08:16:07 +0000
@@ -0,0 +1,43 @@
+# Portuguese translation for openoffice.org debconf messages.
+# Copyright (C) 2009 The openoffice.org authors
+# This file is distributed under the same license as the openoffice.org package.
+# Pedro Ribeiro <p.m42.ribeiro@gmail.com>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org_1:3.1.1-5\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-25 20:40+0100\n"
+"PO-Revision-Date: 2009-10-25 20:45+0000\n"
+"Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
+"Language-Team: Portuguese<traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid "OpenOffice.org running"
+msgstr "O OpenOffice.org está a ser executado"
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"O OpenOffice.org está neste momento a ser executado. Isto pode causar "
+"problemas com o (des-)registo de componentes e extensões."
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Deve encerrar todas as cópias em execução do OpenOffice.org (incluindo "
+"qualquer cópia do Quickstarter) antes de continuar com a actualização do "
+"pacote."
Reply to: