./packages/openofficeorg/3.2/experimental r1684: merge
------------------------------------------------------------
revno: 1684 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2009-10-29 11:23:21 +0100
message:
merge
added:
po/ar.po
po/cs.po
po/eu.po
po/ja.po
po/sv.po
po/zh_CN.po
modified:
changelog
po/de.po
po/ru.po
po/tr.po
templates
=== modified file 'changelog'
--- a/changelog 2009-10-24 22:02:42 +0000
+++ b/changelog 2009-10-29 10:23:21 +0000
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (0c75f4b45a2b543670f5f4553804c7f62dcac062)
+ - update (4b6df02a650f42f62a60f1c8bb03f57d52e63942)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -49,17 +49,27 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2009 22:55:49 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Oct 2009 23:41:29 +0100
openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
- * ooo-build
- - update (a26eafc29fa094e14110661bbb63fd7b6d3a88e5)
+ [ Rene Engelhard ]
+ * ooo-build:
+ - update (7011943819078d380d4a92b64a967c2e645587f8)
- 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
- * debian/po: debconf-updatepo; update de.po
+ (closes: #552370)
+ * debian/po:
+ - debconf-updatepo; update de.po
+ - add
+ - zh_CN.po (thanks Aron Xu)
+ - cs.po (thanks Michal Simunek, closes: #552327)
+ - ar.po (thanks Ossama Khayat, closes: #552381)
+ - ja.po (thanks Hideki Yamane, closes: #552460)
+ - eu.po (thanks Piarres Beobide, closes: #552703)
+ - sv.po (thanks Martin Bagge, closes: #552740)
* 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
@@ -67,7 +77,11 @@
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
- -- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2009 22:29:13 +0200
+ [ Rail Aliev ]
+ * debian/po:
+ - update ru.po, tr.po
+
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Oct 2009 23:40:05 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== added file 'po/ar.po'
--- a/po/ar.po 1970-01-01 00:00:00 +0000
+++ b/po/ar.po 2009-10-27 19:20:03 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Ossama M. Khayat <okhayat@yahoo.com>, 2009.
+msgid ""
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. Type: error
+#. Description
+#: ../templates:2001
+msgid "OpenOffice.org running"
+msgstr "أوبن أوفيس يعمل حالياً"
+
+#. Type: error
+#. Description
+#: ../templates: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
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"يجب أن تغلق جميع برامج أوبن أوفيس (بما في ذلك أي "
+"برنامج تشغيل سريع يعمل حالياً) قد الاستمرار بترقية الحزمة."
+
=== added file 'po/cs.po'
--- a/po/cs.po 1970-01-01 00:00:00 +0000
+++ b/po/cs.po 2009-10-25 16:22:51 +0000
@@ -0,0 +1,42 @@
+# Czech translation of PO debconf template for openoffice.org.
+# Copyright (C) 2009 Michal Simunek
+# This file is distributed under the same license as the openoffice.org package.
+# Michal Simunek <michal.simunek@gmail.com>, 2009.
+#
+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-24 12:39+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org je spuštěn"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org je nyní spuštěn. To může způsobit problémy při (od)registraci "
+"komponent a rozšíření."
+
+#. 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 ""
+"Před provedením aktualizaci balíčku by jste měli zavřít všechny spuštěné "
+"instance OpenOffice.org (včetně všech spuštěných instancí Rychlého spuštění)."
=== modified file 'po/de.po'
--- a/po/de.po 2009-10-24 22:11:56 +0000
+++ b/po/de.po 2009-10-29 10:23:21 +0000
@@ -1,17 +1,16 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2009 Rene Engelhard <rene«debian.org>
+# Copyright (C) 2009 Rene Engelhard <rene@debian.org>
# This file is distributed under the same license as the openoffice.org package.
-# Rene Engelhard <rene«debian.org>, 2009
+# Rene Engelhard <rene@debian.org>, 2009
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"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"
"PO-Revision-Date: 2009-10-24 12:42+0200\n"
"Last-Translator: Rene Engelhard <rene@debian.org>\n"
-"Language-Team: GERMAN <de@li.org>\n"
+"Language-Team: GERMAN <debian-l10n-german@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -40,6 +39,6 @@
"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 der Paket-Aktualisierung "
+"laufenden Quickstarter) beenden bevor Sie mit dem Paket-Upgrade "
"fortfahren"
=== added file 'po/eu.po'
--- a/po/eu.po 1970-01-01 00:00:00 +0000
+++ b/po/eu.po 2009-10-29 09:50:27 +0000
@@ -0,0 +1,45 @@
+# 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."
=== added file 'po/ja.po'
--- a/po/ja.po 1970-01-01 00:00:00 +0000
+++ b/po/ja.po 2009-10-27 19:39:12 +0000
@@ -0,0 +1,42 @@
+# 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 プログラムを全て終了してください。"
+
=== modified file 'po/ru.po'
--- a/po/ru.po 2009-10-24 22:10:57 +0000
+++ b/po/ru.po 2009-10-26 08:57:23 +0000
@@ -7,35 +7,33 @@
"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"
-"PO-Revision-Date: 2009-10-02 14:20+0400\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.0\n"
+"X-Generator: Virtaal 0.4.1\n"
#. Type: error
#. Description
#: ../templates:1001
-#, fuzzy
#| msgid "OpenOffice.org running!"
msgid "OpenOffice.org running"
-msgstr "OpenOffice.org запущен!"
+msgstr "OpenOffice.org запущен"
#. Type: error
#. Description
#: ../templates:1001
-#, fuzzy
#| 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."
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 невозможна, а регистрация компонентов может "
@@ -48,8 +46,5 @@
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
msgstr ""
-
-#~ msgid ""
-#~ "Please close OpenOffice.org (including an eventually running "
-#~ "Quickstarter)."
-#~ msgstr "Завершите работу OpenOffice.org (включая Быстрый запуск)."
+"Перед обновлением пакета завершите все запущенные копии OpenOffice.org "
+"(включая быстрый запуск)."
=== added file 'po/sv.po'
--- a/po/sv.po 1970-01-01 00:00:00 +0000
+++ b/po/sv.po 2009-10-29 08:31:47 +0000
@@ -0,0 +1,37 @@
+# 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."
+
=== modified file 'po/tr.po'
--- a/po/tr.po 2009-10-24 22:10:57 +0000
+++ b/po/tr.po 2009-10-26 08:57:23 +0000
@@ -7,34 +7,32 @@
"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"
-"PO-Revision-Date: 2009-10-02 14:11+0400\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.0\n"
+"X-Generator: Virtaal 0.4.1\n"
#. Type: error
#. Description
#: ../templates:1001
-#, fuzzy
#| msgid "OpenOffice.org running!"
msgid "OpenOffice.org running"
-msgstr "OpenOffice.org çalışıyor!"
+msgstr "OpenOffice.org çalışıyor"
#. Type: error
#. Description
#: ../templates:1001
-#, fuzzy
#| 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."
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 "
@@ -47,8 +45,5 @@
"You should close all running instances of OpenOffice.org (including any "
"currently running Quickstarter) before proceeding with the package upgrade."
msgstr ""
-
-#~ msgid ""
-#~ "Please close OpenOffice.org (including an eventually running "
-#~ "Quickstarter)."
-#~ msgstr "Lütfen OpenOffice.org uygulamasını kapatın (hızlı başlatıcı dahil)."
+"Paket yükseltme işleminden önce tüm çalışan OpenOffice.org süreçlerini "
+"(çalışan hızlı başlatıcı dahil) sonlandırmalısınız."
=== added file 'po/zh_CN.po'
--- a/po/zh_CN.po 1970-01-01 00:00:00 +0000
+++ b/po/zh_CN.po 2009-10-25 12:53:18 +0000
@@ -0,0 +1,40 @@
+# Simplified Chinese translations to openoffice-debconf
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the openoffice package.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
+#
+msgid ""
+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"
+"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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org 正在运行"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+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: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 实例(包括快速启动),然后再进行软件包升级。"
=== modified file 'templates'
--- a/templates 2009-10-24 22:11:56 +0000
+++ b/templates 2009-10-29 10:23:21 +0000
@@ -1,3 +1,12 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
Template: openoffice.org/running
Type: error
_Description: OpenOffice.org running
Reply to: