[Pkg-mysql-commits] [mariadb-5.5] 01/01: Updated debconf translations and fixed bugs
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Mon Feb 3 18:32:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit 306320c7299929efe7db32e79774cebedf820b87
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date: Mon Feb 3 20:22:38 2014 +0200
Updated debconf translations and fixed bugs
---
debian/changelog | 5 +++++
debian/po/fr.po | 27 +++++++++++++++++----------
debian/po/ja.po | 27 +++++++++------------------
debian/po/ru.po | 38 ++++++++++++++++----------------------
4 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1d37f1..377cd33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ mariadb-5.5 (5.5.35-1) unstable; urgency=low
* Remade Debian packaging to with pristine-tar etc best practises
* New package based directly on .35 to avoid big merge with .32 and .35
* Contents from Debian unstable accepted .32 moved here
+ * Upstream https://mariadb.atlassian.net/browse/MDEV-4902
+ fixes compatibility with Bison 3.0 (Closes: #733002)
+ * Updated Russian debconf translation (Closes: #734426)
+ * Updated Japanese debconf translation (Closes: #735284)
+ * Updated French debconf translation (Closes: #736480)
-- Otto Kekäläinen <otto at seravo.fi> Wed, 29 Jan 2014 21:09:51 +0300
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f60840e..bb545f9 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the mysql-dfsg-* packages.
#
# Translators:
-# Christian Perrier <bubulle at debian.org>, 2004, 2006, 2007, 2009.
+# Christian Perrier <bubulle at debian.org>, 2004, 2006, 2007, 2009, 2013.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
"POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2009-08-08 14:56+0200\n"
+"PO-Revision-Date: 2013-12-25 12:47+0100\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"Language: fr\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"debian.org>\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#. Type: boolean
@@ -48,7 +48,8 @@ msgstr ""
msgid ""
"There is no guarantee that the version you're currently installing will be "
"able to use the current databases."
-msgstr "Il n'est pas garanti que cette version puisse en utiliser les données."
+msgstr "Il n'est pas garanti que cette version puisse en utiliser les bases "
+"de données."
#. Type: note
#. Description
@@ -100,8 +101,9 @@ msgid ""
"recent version or if a different mariadb-server package is already using it, "
"the data should be kept."
msgstr ""
-"Si vous prévoyez d'installer une version plus récente de MariaDB ou si un "
-"autre paquet mariadb-server les utilise déjà, vous devriez les conserver."
+"Si vous retirez le paquet MariaDB en vue d'en installer une version plus "
+"récente ou si un autre paquet mariadb-server les utilise déjà, vous devriez "
+"les conserver."
#. Type: password
#. Description
@@ -161,7 +163,6 @@ msgstr ""
#. Type: error
#. Description
#: ../mariadb-server-5.5.templates:7001
-#, fuzzy
#| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
#| "more information."
@@ -169,8 +170,8 @@ msgid ""
"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
"more information."
msgstr ""
-"Veuillez consulter le fichier /usr/share/doc/mysql-server-5.5/README.Debian "
-"pour plus d'informations."
+"Veuillez consulter le fichier /usr/share/doc/mariadb-server-5.5/README."
+"Debian pour plus d'informations."
#. Type: error
#. Description
@@ -208,7 +209,7 @@ msgstr ""
#. Description
#: ../mariadb-server-5.5.templates:10001
msgid "Really migrate to MariaDB?"
-msgstr ""
+msgstr "Souhaitez-vous migrer vers MariaDB ?"
#. Type: boolean
#. Description
@@ -217,6 +218,8 @@ msgid ""
"MariaDB is a drop-in replacement for MySQL. It will use your current "
"configuration file (my.cnf) and current databases."
msgstr ""
+"MariaDB remplace à l'identique MySQL. Le fichier de configuration actuel (my."
+"cnf) ainsi que les bases de données existantes seront utilisés."
#. Type: boolean
#. Description
@@ -226,6 +229,10 @@ msgid ""
"and thus migration back to MySQL might not always work, at least not as "
"automatically as migrating from MySQL to MariaDB."
msgstr ""
+"Veuillez noter que MariaDB fournit des fonctionnalités améliorées qui "
+"n'existent pas dans MySQL ce qui peut interdire un retour ultérieur à "
+"MySQL, tout au moins de manière moins automatique que la migration de MySQL "
+"vers MariaDB."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Faut-il lancer MariaDB au démarrage ?"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index eea6b37..fed7c69 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,10 +14,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
+"Project-Id-Version: mariadb-5.5 5.5.32-1\n"
"Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
"POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2009-09-01 08:25+0900\n"
+"PO-Revision-Date: 2013-09-09 18:48+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
"Language: ja\n"
@@ -167,10 +167,6 @@ msgstr ""
#. Type: error
#. Description
#: ../mariadb-server-5.5.templates:7001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
-#| "more information."
msgid ""
"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
"more information."
@@ -203,7 +199,7 @@ msgid ""
"mysql-cluster package and remove all lines starting with \"ndb\" from all "
"config files below /etc/mysql/."
msgstr ""
-"MySQL-5.1 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-"
+"MySQL-5.1 で NDB クラスタのサポートを提供しなくなりました。新たな mysql-"
"cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」"
"で始まる行を削除してください。"
@@ -211,7 +207,7 @@ msgstr ""
#. Description
#: ../mariadb-server-5.5.templates:10001
msgid "Really migrate to MariaDB?"
-msgstr ""
+msgstr "本当に MariaDB に移行しますか?"
#. Type: boolean
#. Description
@@ -220,6 +216,8 @@ msgid ""
"MariaDB is a drop-in replacement for MySQL. It will use your current "
"configuration file (my.cnf) and current databases."
msgstr ""
+"MariaDB は MySQL をそのまま置き換えられる代替です。現在の設定ファイル (my."
+"cnf) と現在のデータベースを利用します。"
#. Type: boolean
#. Description
@@ -229,13 +227,6 @@ msgid ""
"and thus migration back to MySQL might not always work, at least not as "
"automatically as migrating from MySQL to MariaDB."
msgstr ""
-
-#~ msgid "Start the MariaDB server on boot?"
-#~ msgstr "MariaDB をシステム起動時に開始しますか?"
-
-#~ msgid ""
-#~ "The MariaDB server can be launched automatically at boot time or manually "
-#~ "with the '/etc/init.d/mysql start' command."
-#~ msgstr ""
-#~ "MariaDB の起動方法について、システム起動時に自動的に開始するか、あるいは "
-#~ "'/etc/init.d/mysql start' と手で入力して起動するかを選べます。"
+"MariaDB には MySQL に存在していない機能の拡張がいくらか存在し、そのため MySQL "
+"に再び移行する場合は、MySQL から MariaDB への移行のような自動での移行が常にで"
+"きるとは限りません。"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c62a7f6..3dcd9e3 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -1,32 +1,22 @@
# translation of ru.po to Russian
-# Russian messages:
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
#
# Ilgiz Kalmetev <translator at ilgiz.pp.ru>, 2003.
# Yuriy Talakan' <yt at amur.elektra.ru>, 2005, 2006.
# Yuriy Talakan' <yt at drsk.ru>, 2007.
-# Yuri Kozlov <yuray at komyakino.ru>, 2009.
+# Yuri Kozlov <yuray at komyakino.ru>, 2009, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
+"Project-Id-Version: mariadb 5.5_5.5.32-1\n"
"Report-Msgid-Bugs-To: mariadb-5.5 at packages.debian.org\n"
"POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2009-08-06 20:27+0400\n"
+"PO-Revision-Date: 2014-01-07 07:18+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.4\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"
@@ -117,7 +107,7 @@ msgstr ""
#. Description
#: ../mariadb-server-5.5.templates:5001
msgid "New password for the MariaDB \"root\" user:"
-msgstr "Новый пароль для MariaDB пользователя \"root\":"
+msgstr "Новый пароль для MariaDB пользователя «root»:"
#. Type: password
#. Description
@@ -127,7 +117,7 @@ msgid ""
"the MariaDB administrative \"root\" user."
msgstr ""
"Хотя и необязательно, но настоятельно рекомендуется установить пароль для "
-"административного пользователя MariaDB \"root\"."
+"административного пользователя MariaDB «root»."
#. Type: password
#. Description
@@ -139,13 +129,13 @@ msgstr "Если оставить поле пустым, то пароль из
#. Description
#: ../mariadb-server-5.5.templates:6001
msgid "Repeat password for the MariaDB \"root\" user:"
-msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":"
+msgstr "Повторите ввод пароля для MariaDB пользователя «root»:"
#. Type: error
#. Description
#: ../mariadb-server-5.5.templates:7001
msgid "Unable to set password for the MariaDB \"root\" user"
-msgstr "Невозможно задать пароль MariaDB пользователю \"root\""
+msgstr "Невозможно задать пароль MariaDB пользователю «root»"
#. Type: error
#. Description
@@ -168,7 +158,6 @@ msgstr "Проверьте пароль учётной записи после
#. Type: error
#. Description
#: ../mariadb-server-5.5.templates:7001
-#, fuzzy
#| msgid ""
#| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
#| "more information."
@@ -176,7 +165,7 @@ msgid ""
"Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
"more information."
msgstr ""
-"Подробности см. в файле /usr/share/doc/mariadb-server-5.5/README.Debian."
+"Подробности смотрите в файле /usr/share/doc/mariadb-server-5.5/README.Debian."
#. Type: error
#. Description
@@ -205,14 +194,14 @@ msgid ""
"config files below /etc/mysql/."
msgstr ""
"MySQL-5.1 больше не поддерживает NDB Cluster. Переходите на новый пакет "
-"mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов "
+"mysql-cluster и удалите все строки, начинающиеся с «ndb», из всех файлов "
"настройки в каталоге /etc/mysql/."
#. Type: boolean
#. Description
#: ../mariadb-server-5.5.templates:10001
msgid "Really migrate to MariaDB?"
-msgstr ""
+msgstr "Хотите перейти на MariaDB?"
#. Type: boolean
#. Description
@@ -221,6 +210,8 @@ msgid ""
"MariaDB is a drop-in replacement for MySQL. It will use your current "
"configuration file (my.cnf) and current databases."
msgstr ""
+"MariaDB — современная замена MySQL. Будет использован ваш файл настроек "
+"(my.cnf) и имеющиеся базы данных."
#. Type: boolean
#. Description
@@ -230,6 +221,9 @@ msgid ""
"and thus migration back to MySQL might not always work, at least not as "
"automatically as migrating from MySQL to MariaDB."
msgstr ""
+"Заметим, что MariaDB имеет дополнительные возможности, которые отсутствуют "
+"в MySQL, и поэтому обратный переход на MySQL не всегда может быть выполнен, "
+"по крайней мере, не в автоматическом режиме как с MySQL на MariaDB."
#~ msgid "Start the MariaDB server on boot?"
#~ msgstr "Запускать MariaDB при загрузке системы?"
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list