./packages/openofficeorg/3.2/experimental r1809: merge
------------------------------------------------------------
revno: 1809 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2010-02-11 18:39:54 +0100
message:
merge
modified:
changelog
po/ru.po
=== modified file 'changelog'
--- a/changelog 2010-02-11 12:50:24 +0000
+++ b/changelog 2010-02-11 17:39:54 +0000
@@ -6,9 +6,8 @@
- update (75bba533686ebd27905582e865d9a20343891d90)
- fix logic for nfs/smb detection to actually work; also export
STAR_PROFILE_LOCKING_DISABLED=1 when on nfs*|smb/FILE_LOCKING=no
- (closes: #210581, #568067, #568672, #568673) and also copy it over
- to unopkg (closes: #568036). Also split home on nfs and file on nfs
- tests, thanks Alex Bodnaru
+ (closes: #568672) and also copy it over to unopkg (closes: #568036).
+ Also split home on nfs and file on nfs tests, thanks Alex Bodnaru
- actually apply mysqlcppconn-mysqlclient-SONAME.diff (closes: #560788)
* debian/control.in:
=== modified file 'po/ru.po'
--- a/po/ru.po 2010-01-31 23:10:11 +0000
+++ b/po/ru.po 2010-02-11 17:38:00 +0000
@@ -1,21 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of ru.po to Russian
+#
+# Rail Aliev <rail@i-rs.ru>, 2009.
+# Yuri Kozlov <yuray@komyakino.ru>, 2010.
# Copyright (C) 2009 Rail Aliev <rail@i-rs.ru>
# This file is distributed under the same license as the openoffice.org package.
-# Rail Aliev <rail@i-rs.ru>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\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-26 11:54+0400\n"
-"Last-Translator: Rail Aliev <rail@i-rs.ru>\n"
+"PO-Revision-Date: 2010-02-11 18:59+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.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"
+"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: KBabel 1.11.4\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
#. Type: error
#. Description
@@ -48,7 +50,7 @@
#. Description
#: ../ure.templates.in:2001
msgid "Component registries might be corrupted"
-msgstr ""
+msgstr "Реестр компонентов может быть повреждён"
#. Type: note
#. Description
@@ -59,6 +61,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 и файлы rdb установленных расширений в "
+"/var/spool/openoffice/uno_packages/cache."
#. Type: note
#. Description
@@ -69,3 +75,8 @@
"files. Try cleanly reinstalling the packages and/or using a clean user "
"profile."
msgstr ""
+"Если у вас возникнут проблемы с менеджером компонентов или крах "
+"unopkg или OpenOffice.org из-за libstore, проверьте эти файлы. "
+"Попробуйте полностью переустановить пакеты и/или воспользоваться "
+"чистым пользовательским профилем."
+
Reply to: