./packages/openofficeorg/3.2/experimental r1687: merge
------------------------------------------------------------
revno: 1687 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sat 2009-10-31 18:05:15 +0100
message:
merge
renamed:
templates => openoffice.org-common.templates.in
modified:
changelog
po/POTFILES.in
po/ar.po
po/cs.po
po/de.po
po/eu.po
po/ja.po
po/pt.po
po/ru.po
po/sv.po
po/templates.pot
po/tr.po
po/zh_CN.po
rules
=== modified file 'changelog'
--- a/changelog 2009-10-30 18:47:33 +0000
+++ b/changelog 2009-10-31 17:05:15 +0000
@@ -53,7 +53,7 @@
[ Rene Engelhard ]
* ooo-build:
- - update (8c34432a931671efb7e2271205c3dafade1c5682)
+ - update (390b0ce544dfca09e36d6cf4f03f7d12b988af87)
- fixes wrong filter texts in KDE4 fpicker (closes: #551774)
- Correct fix for the mirrored range selection bug in RTL mode.
(closes: #548767)
@@ -78,12 +78,15 @@
(closes: #553370)
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
+ * debian/templates, debian/openoffice.org-common.templates.in
+ debian/rules: move templates to openoffice.org-common so that they get
+ installed into openoffice.org-common per default, not openoffice.org...
[ Rail Aliev ]
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <rene@debian.org> Fri, 30 Oct 2009 12:48:32 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2009 09:56:17 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== renamed file 'templates' => 'openoffice.org-common.templates.in'
=== modified file 'po/POTFILES.in'
--- a/po/POTFILES.in 2009-10-30 09:01:02 +0000
+++ b/po/POTFILES.in 2009-10-31 17:05:15 +0000
@@ -1,1 +1,1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] openoffice.org-common.templates.in
=== modified file 'po/ar.po'
--- a/po/ar.po 2009-10-27 19:20:03 +0000
+++ b/po/ar.po 2009-10-31 12:05:40 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-25 20:40+0100\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-26 00:06+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -19,27 +19,26 @@
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "أوبن أوفيس يعمل حالياً"
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
msgstr ""
-"أوبن أوفيس يعمل حالياً. وقد يتسبب هذا بمشاكل أثناء "
-"تسجيل أو إزالة تسجيل المكوّنات والإضافات."
+"أوبن أوفيس يعمل حالياً. وقد يتسبب هذا بمشاكل أثناء تسجيل أو إزالة تسجيل "
+"المكوّنات والإضافات."
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
msgstr ""
-"يجب أن تغلق جميع برامج أوبن أوفيس (بما في ذلك أي "
-"برنامج تشغيل سريع يعمل حالياً) قد الاستمرار بترقية الحزمة."
-
+"يجب أن تغلق جميع برامج أوبن أوفيس (بما في ذلك أي برنامج تشغيل سريع يعمل "
+"حالياً) قد الاستمرار بترقية الحزمة."
=== modified file 'po/cs.po'
--- a/po/cs.po 2009-10-25 16:22:51 +0000
+++ b/po/cs.po 2009-10-31 12:05:40 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openoffice.org 1:3.1.1-6\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-25 16:04+0100\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -17,13 +17,13 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "OpenOffice.org je spuštěn"
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
@@ -33,7 +33,7 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
=== modified file 'po/de.po'
--- a/po/de.po 2009-10-29 10:23:21 +0000
+++ b/po/de.po 2009-10-31 17:05:15 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openoffice.org 1:3.1.1-6\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-24 12:42+0200\n"
"Last-Translator: Rene Engelhard <rene@debian.org>\n"
"Language-Team: GERMAN <debian-l10n-german@lists.debian.org>\n"
@@ -17,13 +17,13 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "OpenOffice.org läuft"
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
@@ -33,12 +33,10 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
msgstr ""
"Sie sollten alle laufenden Instanzen von OpenOffice.org (inkl. einem "
-"laufenden Quickstarter) beenden bevor Sie mit dem Paket-Upgrade "
-"fortfahren"
-
+"laufenden Quickstarter) beenden bevor Sie mit dem Paket-Upgrade fortfahren"
=== modified file 'po/eu.po'
--- a/po/eu.po 2009-10-29 13:21:41 +0000
+++ b/po/eu.po 2009-10-31 12:05:40 +0000
@@ -1,46 +1,50 @@
-# 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."
+# 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-31 13:04+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.4.1\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org exekutatzen"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. This can cause problems with (de-)"
+#| "regstration of components and extensions."
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org orain exekutatzen ari da. Honek arazoak sor ditzake osagai "
+"eta hedapenak (des)erregistratzean."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in: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-en exekuzioaren instantzia guztiak itxi beharko zenituzke "
+"(baita abiarazle-azkarra ere exekutatzen egonez gero) pakete eguneraketa "
+"egin baino lehen."
=== modified file 'po/ja.po'
--- a/po/ja.po 2009-10-27 19:39:12 +0000
+++ b/po/ja.po 2009-10-31 12:05:40 +0000
@@ -1,42 +1,41 @@
-# Japanese translation of openoffice.org debconf templates.
-# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
-# This file is distributed under the same license as openoffice.org package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice.org 1:3.1.1-6\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 06:52+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.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 "OpenOffice.org が動作しています"
-
-#. 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 が動作しています。このためコンポーネントや拡張機能の登"
-"録・解除に問題が生じる可能性があります。"
-
-#. 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 プログラムを全て終了してください。"
-
+# Japanese translation of openoffice.org debconf templates.
+# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
+# This file is distributed under the same license as openoffice.org package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org 1:3.1.1-6\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-10-25 06:52+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org が動作しています"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"今現在 OpenOffice.org が動作しています。このためコンポーネントや拡張機能の登"
+"録・解除に問題が生じる可能性があります。"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in: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 プログラムを全て終了してください。"
=== modified file 'po/pt.po'
--- a/po/pt.po 2009-10-30 08:16:07 +0000
+++ b/po/pt.po 2009-10-31 12:05:40 +0000
@@ -7,7 +7,7 @@
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"
+"POT-Creation-Date: 2009-10-31 13:04+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"
@@ -17,13 +17,13 @@
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "O OpenOffice.org está a ser executado"
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
@@ -33,7 +33,7 @@
#. Type: error
#. Description
-#: ../templates:2001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
=== modified file 'po/ru.po'
--- a/po/ru.po 2009-10-26 08:57:23 +0000
+++ b/po/ru.po 2009-10-31 12:05:40 +0000
@@ -6,34 +6,29 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-26 11:54+0400\n"
"Last-Translator: Rail Aliev <rail@i-rs.ru>\n"
-"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.4.1\n"
#. Type: error
#. Description
-#: ../templates:1001
-#| msgid "OpenOffice.org running!"
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "OpenOffice.org запущен"
#. Type: error
#. Description
-#: ../templates:1001
-#| msgid ""
-#| "OpenOffice.org is running right now. A running OpenOffice.org makes "
-#| "extension (de-)registration not possible and it causes problems with (de-)"
-#| "registering components."
+#: ../openoffice.org-common.templates.in:2001
msgid ""
-"OpenOffice.org is running right now. This can cause problems with "
-"(de-)registration of components and extensions."
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
msgstr ""
"OpenOffice.org в данный момент запущен. Установка и удаление расширений при "
"работающем OpenOffice.org невозможна, а регистрация компонентов может "
@@ -41,7 +36,7 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
=== modified file 'po/sv.po'
--- a/po/sv.po 2009-10-29 08:31:47 +0000
+++ b/po/sv.po 2009-10-31 12:05:40 +0000
@@ -1,37 +1,44 @@
-# Translation of openoffice.org debconf template to Swedish
-# Copyright © 2009 Martin Bagge <brother@bsnet.se>
-# This file is distributed under the same license as the openoffice.org package.
-#
-# Martin Bagge <brother@bsnet.se>, 2009
-msgid ""
-msgstr ""
-"Project-Id-Version: openoffice.org\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-26 00:31+0100\n"
-"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Swedish\n"
-"X-Poedit-Country: Sweden\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "OpenOffice.org running"
-msgstr "OpenOffice.org körs"
-
-#. 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 kärs just nu. Detta kan ställa till problem med (av-)registreringen av komponenter och utökningar."
-
-#. 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 "Stäng alla instanser av OpenOffice.org som körs (inklusive alla Quickstarter som körs) innan du går vidare med paketuppdateringen."
-
+# Translation of openoffice.org debconf template to Swedish
+# Copyright © 2009 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the openoffice.org package.
+#
+# Martin Bagge <brother@bsnet.se>, 2009
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-10-26 00:31+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org körs"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org kärs just nu. Detta kan ställa till problem med (av-)"
+"registreringen av komponenter och utökningar."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Stäng alla instanser av OpenOffice.org som körs (inklusive alla Quickstarter "
+"som körs) innan du går vidare med paketuppdateringen."
=== modified file 'po/templates.pot'
--- a/po/templates.pot 2009-10-24 22:11:56 +0000
+++ b/po/templates.pot 2009-10-31 17:05:15 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\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"
@@ -18,13 +18,13 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr ""
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
@@ -32,7 +32,7 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
=== modified file 'po/tr.po'
--- a/po/tr.po 2009-10-26 08:57:23 +0000
+++ b/po/tr.po 2009-10-31 12:05:40 +0000
@@ -6,33 +6,28 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-26 11:51+0400\n"
"Last-Translator: Rail Aliev <rail@i-rs.ru>\n"
-"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Virtaal 0.4.1\n"
#. Type: error
#. Description
-#: ../templates:1001
-#| msgid "OpenOffice.org running!"
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "OpenOffice.org çalışıyor"
#. Type: error
#. Description
-#: ../templates:1001
-#| msgid ""
-#| "OpenOffice.org is running right now. A running OpenOffice.org makes "
-#| "extension (de-)registration not possible and it causes problems with (de-)"
-#| "registering components."
+#: ../openoffice.org-common.templates.in:2001
msgid ""
-"OpenOffice.org is running right now. This can cause problems with "
-"(de-)registration of components and extensions."
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
msgstr ""
"OpenOffice.org şu anda çalışıyor. Çalışan OpenOffice.org eklentilerin "
"kurulum ve kaldırmasını imkansız kılıyor ve bileşenlerin kaydı sırasında "
@@ -40,7 +35,7 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
=== modified file 'po/zh_CN.po'
--- a/po/zh_CN.po 2009-10-25 12:53:18 +0000
+++ b/po/zh_CN.po 2009-10-31 12:05:40 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openoffice debconf\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
"PO-Revision-Date: 2009-10-25 13:20+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -17,24 +17,24 @@
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid "OpenOffice.org running"
msgstr "OpenOffice.org 正在运行"
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in:2001
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
-msgstr ""
-"OpenOffice.org 正在运行。此时重新注册或者卸载组建和扩展会导致问题。"
+msgstr "OpenOffice.org 正在运行。此时重新注册或者卸载组建和扩展会导致问题。"
#. Type: error
#. Description
-#: ../templates:1001
+#: ../openoffice.org-common.templates.in: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 实例(包括快速启动)，然后再进行软件包升级。"
+"您应当关闭所有正在运行的 OpenOffice.org 实例(包括快速启动)，然后再进行软件包"
+"升级。"
=== modified file 'rules'
--- a/rules 2009-10-30 18:47:33 +0000
+++ b/rules 2009-10-31 17:05:15 +0000
@@ -3194,11 +3194,7 @@
dh_installdocs -plibmythes-dev debian/copyright
for p in pdfimport presenter-console mysql-connector filter-binfilter \
evolution kab sdbc-postgresql presentation-minimizer; do \
- cat debian/templates > debian/openoffice.org-$$p.templates; \
- if [ -e debian/openoffice.org-$$p.templates.in ]; then \
- cat debian/openoffice.org-$$p.templates.in \
- >> debian/openoffice.org-$$p.templates; \
- fi; \
+ cat debian/openoffice.org-common.templates.in > debian/openoffice.org-$$p.templates; \
done
dh_installdebconf -s
dh_installman -s
@@ -3436,12 +3432,8 @@
dh_installdocs -i -A debian/README.Debian \
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
ooo-build/NEWS
- for p in emailmerge wiki-publisher report-builder; do \
- cat debian/templates > debian/openoffice.org-$$p.templates; \
- if [ -e debian/debian/openoffice.org-$$p.templates.in ]; then \
- cat debian/debian/openoffice.org-$$p.templates.in \
- >> debian/debian/openoffice.org-$$p.templates; \
- fi; \
+ for p in common emailmerge wiki-publisher report-builder; do \
+ cat debian/openoffice.org-common.templates.in > debian/openoffice.org-$$p.templates; \
done
dh_installdebconf -i
dh_installman -i
Reply to: