./packages/openofficeorg/3.2/experimental r1805: merge
------------------------------------------------------------
revno: 1805 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2010-02-08 15:13:16 +0100
message:
merge
added:
po/ro.po
modified:
changelog
po/fr.po
po/ja.po
=== modified file 'changelog'
--- a/changelog 2010-02-08 14:08:49 +0000
+++ b/changelog 2010-02-08 14:13:16 +0000
@@ -3,11 +3,14 @@
* OpenOffice.org 3.2.0 final (same as RC5)
* ooo-build:
- - update (9458f3d988dbe801fea678f4bb71a5a9eb627b66 - 3.0.99.5)
+ - update (8bb140f15a2cf2ff62fb094957b64788408ae502)
+ - fix logic for nfs/smb detection to actually work; also export
+ STAR_PROFILE_LOCKING_DISABLED=1 when on nfs*|smb/FILE_LOCKING=no
+ (closes: #568672) and also copy it over to unopkg (closes: #568036)
* debian/control.ure.in: fix uno-libs3*'s ure replaces
- -- Rene Engelhard <rene@debian.org> Mon, 08 Feb 2010 13:20:58 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 08 Feb 2010 15:11:30 +0100
openoffice.org (1:3.2.0~rc5-2) experimental; urgency=low
=== modified file 'po/fr.po'
--- a/po/fr.po 2010-01-31 23:10:11 +0000
+++ b/po/fr.po 2010-02-06 09:52:04 +0000
@@ -1,16 +1,17 @@
# French Translation of openoffice.org debconf template
-# Copyright (C) 2009 Debian French l10n Team <debian-l10n-french@lists.debian.org>
+# Copyright (C) 2010 Debian French l10n Team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the openoffice.org package.
# Translator:
-# L.F. Templeton <f.templeton@gmail.com>, 2009.
+# L.F. Templeton <f.templeton@gmail.com>, 2010.
+# Bruno Travouillon <debian@travouillon.fr>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openoffice.org_3.1.1-2\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
"POT-Creation-Date: 2010-02-01 00:04+0100\n"
-"PO-Revision-Date: 2009-10-30 21:05+0100\n"
-"Last-Translator: L.F.Templeton <f.templeton@gmail.com>\n"
+"PO-Revision-Date: 2010-02-06 02:15+0100\n"
+"Last-Translator: L.F. Templeton <f.templeton@gmail.com>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@
#. Description
#: ../ure.templates.in:2001
msgid "Component registries might be corrupted"
-msgstr ""
+msgstr "Les registres de composants sont peut-être corrompus"
#. Type: note
#. Description
@@ -57,6 +58,10 @@
"program/services.rdb and the rdb files in /var/spool/openoffice/uno_packages/"
"cache for installed extensions."
msgstr ""
+"Vous mettez à jour depuis une version qui peut avoir des fichiers de "
+"registre de composants ou de services (*.rdb) corrompus, particulièrement /var/"
+"lib/openoffice/basis3.1/program/services.rdb et les fichiers rdb de /var/"
+"spool/openoffice/uno_packages/cache contenant les extensions installées."
#. Type: note
#. Description
@@ -67,3 +72,7 @@
"files. Try cleanly reinstalling the packages and/or using a clean user "
"profile."
msgstr ""
+"Si vous rencontrez des problèmes avec le gestionnaire de composants ou des "
+"erreurs de segmentation impliquant « libstore » dans « unopkg » ou OpenOffice."
+"org, vérifiez ces fichiers. Essayez de réinstaller les paquets proprement et "
+"d'utiliser un profil utilisateur vierge."
=== modified file 'po/ja.po'
--- a/po/ja.po 2010-01-31 23:10:11 +0000
+++ b/po/ja.po 2010-02-06 09:52:04 +0000
@@ -1,13 +1,13 @@
# Japanese translation of openoffice.org debconf templates.
-# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
+# Copyright (C) 2009-2010 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"
+"Project-Id-Version: openoffice.org 1:3.1.1-15\n"
"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
"POT-Creation-Date: 2010-02-01 00:04+0100\n"
-"PO-Revision-Date: 2009-10-25 06:52+0900\n"
+"PO-Revision-Date: 2010-02-06 11:02+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"
@@ -44,7 +44,7 @@
#. Description
#: ../ure.templates.in:2001
msgid "Component registries might be corrupted"
-msgstr ""
+msgstr "コンポーネントのレジストリが破損している可能性があります"
#. Type: note
#. Description
@@ -55,6 +55,10 @@
"program/services.rdb and the rdb files in /var/spool/openoffice/uno_packages/"
"cache for installed extensions."
msgstr ""
+"壊れているサービス／コンポーネントレジストリファイル (*.rdb)、特に /var/lib/"
+"openoffice/basis3.1/program/services.rdb やインストール済み拡張機能用の "
+"/var/spool/openoffice/uno_packages/cache 内の rdb ファイルが壊れているかも"
+"しれないバージョンからアップグレードしようとしています。"
#. Type: note
#. Description
@@ -65,3 +69,8 @@
"files. Try cleanly reinstalling the packages and/or using a clean user "
"profile."
msgstr ""
+"コンポーネントマネージャで問題が起こる、あるいは unopkg や Openoffice.org で "
+"libstore に関連したセグメンテーションフォルトが起こる場合は、これらのファイルを"
+"確認してください。まっさらな状態にパッケージを再インストールするか、新たなユーザ"
+"プロファイルを使ってください。"
+
=== added file 'po/ro.po'
--- a/po/ro.po 1970-01-01 00:00:00 +0000
+++ b/po/ro.po 2010-02-05 22:10:55 +0000
@@ -0,0 +1,77 @@
+# Romanian translations
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2010-02-01 00:04+0100\n"
+"PO-Revision-Date: 2010-02-05 15:55+0100\n"
+"Last-Translator: Ionel Mugurel Ciobîcă <I.M.Ciobica@gmail.com>\n"
+"Language-Team: Romanian (Română) <debian-l10n-romanian@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 rulează"
+
+#. 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 rulează acum. Aceasta poate cauza probleme cu (de-)"
+"înregistrarea componentelor sau extensiilor."
+
+#. 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 ""
+"Ar trebui să opriți toate instanțele OpenOffice.org (inclusiv orice "
+"Quickstarter care rulează acum) înainte de a continua cu actualizarea"
+"pachetului."
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid "Component registries might be corrupted"
+msgstr "Registrele component ar putea fi corupte"
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid ""
+"You are upgrading from a version which might have corrupted service/"
+"component registry files (*.rdb), especially /var/lib/openoffice/basis3.1/"
+"program/services.rdb and the rdb files in /var/spool/openoffice/uno_packages/"
+"cache for installed extensions."
+msgstr ""
+"Efectuați actualizare de la o versiune care ar putea avea servicii corupte/"
+"fișiere de registrele component (*.rdb), în special "
+"/var/lib/openoffice/basis3.1/program/services.rdb și fișierele rdb din"
+"/var/spool/openoffice/uno_packages/cache pentru extensiile instalate."
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid ""
+"If you experience problems with the component manager or segmentation faults "
+"involving libstore in either unopkg or OpenOffice.org, please check these "
+"files. Try cleanly reinstalling the packages and/or using a clean user "
+"profile."
+msgstr ""
+"Dacă aveți probleme cu administartorul de componente sau probleme grave"
+"(segmentation faults) implicînd libstore fie în unopkg sau OpenOffice.org, "
+"vă rugăm să verificați aceste fișiere. Încercați să reinstalați curat"
+"pachetele și/sau folosind un profil a unui utilizator curat."
Reply to: