[Pkg-mysql-commits] r2059 - in mysql-5.1/branches/unstable/debian: . patches po

Nicholas Bamber periapt at alioth.debian.org
Sat Mar 31 08:02:49 UTC 2012


Author: periapt
Date: 2012-03-31 08:02:47 +0000 (Sat, 31 Mar 2012)
New Revision: 2059

Added:
   mysql-5.1/branches/unstable/debian/patches/73_mysqlcheck_tests.dpatch
Modified:
   mysql-5.1/branches/unstable/debian/changelog
   mysql-5.1/branches/unstable/debian/patches/00list
   mysql-5.1/branches/unstable/debian/po/ar.po
   mysql-5.1/branches/unstable/debian/po/cs.po
   mysql-5.1/branches/unstable/debian/po/da.po
   mysql-5.1/branches/unstable/debian/po/de.po
   mysql-5.1/branches/unstable/debian/po/es.po
   mysql-5.1/branches/unstable/debian/po/eu.po
   mysql-5.1/branches/unstable/debian/po/fr.po
   mysql-5.1/branches/unstable/debian/po/gl.po
   mysql-5.1/branches/unstable/debian/po/it.po
   mysql-5.1/branches/unstable/debian/po/ja.po
   mysql-5.1/branches/unstable/debian/po/ko.po
   mysql-5.1/branches/unstable/debian/po/nb.po
   mysql-5.1/branches/unstable/debian/po/nl.po
   mysql-5.1/branches/unstable/debian/po/pl.po
   mysql-5.1/branches/unstable/debian/po/pt_BR.po
   mysql-5.1/branches/unstable/debian/po/ro.po
   mysql-5.1/branches/unstable/debian/po/ru.po
   mysql-5.1/branches/unstable/debian/po/sk.po
   mysql-5.1/branches/unstable/debian/po/sv.po
   mysql-5.1/branches/unstable/debian/po/tr.po
Log:
Added patch to disable certain failing tests

Modified: mysql-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-5.1/branches/unstable/debian/changelog	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/changelog	2012-03-31 08:02:47 UTC (rev 2059)
@@ -5,6 +5,7 @@
   * Added Korean translation (Closes: #630949)
   * Updated Norwegian (Bokmal) translation (Closes: #653572)
   * Updated Turkish translation (Closes: #664778)
+  * Added patch to disable certain failing tests
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Thu, 15 Mar 2012 12:14:43 +0000
 

Modified: mysql-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-5.1/branches/unstable/debian/patches/00list	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/patches/00list	2012-03-31 08:02:47 UTC (rev 2059)
@@ -7,3 +7,4 @@
 41_scripts__mysql_install_db.sh__no_test.dpatch
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
+73_mysqlcheck_tests.dpatch

Added: mysql-5.1/branches/unstable/debian/patches/73_mysqlcheck_tests.dpatch
===================================================================
--- mysql-5.1/branches/unstable/debian/patches/73_mysqlcheck_tests.dpatch	                        (rev 0)
+++ mysql-5.1/branches/unstable/debian/patches/73_mysqlcheck_tests.dpatch	2012-03-31 08:02:47 UTC (rev 2059)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 73_mysqlcheck_tests.dpatch by Nicholas Bamber <nicholas at periapt.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' unstable~/mysql-test/suite/rpl/t/disabled.def unstable/mysql-test/suite/rpl/t/disabled.def
+--- unstable~/mysql-test/suite/rpl/t/disabled.def	2012-03-28 19:54:04.000000000 +0000
++++ unstable/mysql-test/suite/rpl/t/disabled.def	2012-03-29 22:48:03.000000000 +0000
+@@ -14,3 +14,4 @@
+ rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
+ rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+ rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
++rpl_mysql_upgrade: Bug#64773 Local Debain disable
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' unstable~/mysql-test/t/disabled.def unstable/mysql-test/t/disabled.def
+--- unstable~/mysql-test/t/disabled.def	2012-03-28 19:54:03.000000000 +0000
++++ unstable/mysql-test/t/disabled.def	2012-03-29 22:46:55.000000000 +0000
+@@ -13,3 +13,7 @@
+ read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists
+ main.log_tables-big      : Bug#11756699 2010-11-15 mattiasj report already exists
+ query_cache_28249        : Bug#12584161 2011-11-17 joh      fails sporadically in 5.1 only
++log_tables_upgrade      : Bug#64773 Local Debian disable
++mysql_upgrade           : Bug#64773 Local Debian disable
++mysqladmin              : Bug#64773 Local Debian disable
++


Property changes on: mysql-5.1/branches/unstable/debian/patches/73_mysqlcheck_tests.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: mysql-5.1/branches/unstable/debian/po/ar.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/ar.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/ar.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -40,15 +40,10 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid ""
-#| "Such file is an indication that a mysql-server package with a higher "
-#| "version has been installed earlier."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
-msgstr ""
-"وجود هذا الملف يعني أن حزمة mysql-server أحدث "
-"إصداراً تم تثبيتها مسبقاً."
+msgstr "وجود هذا الملف يعني أن حزمة mysql-server أحدث إصداراً تم تثبيتها مسبقاً."
 
 #. Type: boolean
 #. Description
@@ -73,21 +68,16 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"يتطلب استخدام MySQL ضمن NIS/YP إضافة حساب مستخدم mysql على"
-"النظام المحلي باستخدام:"
+"يتطلب استخدام MySQL ضمن NIS/YP إضافة حساب مستخدم mysql علىالنظام المحلي "
+"باستخدام:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid ""
-#| "You should also check the permissions and the owner of the /var/lib/mysql "
-#| "directory:"
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
-msgstr ""
-"يجب عليك كذلك أن تتحق من صلاحيات وملكية "
-"الدليل /var/lib/mysql:"
+msgstr "يجب عليك كذلك أن تتحق من صلاحيات وملكية الدليل /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -101,9 +91,7 @@
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
-msgstr ""
-"الدليل /var/lib/mysql الذي يحتوي قواعد بيانات MySQL "
-"ستتم إزالته."
+msgstr "الدليل /var/lib/mysql الذي يحتوي قواعد بيانات MySQL ستتم إزالته."
 
 #. Type: boolean
 #. Description
@@ -151,14 +139,12 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
 msgstr "إن تركت الحقل فارغاً، فلن يتم تغيير كلمة المرور."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-#| msgid "New password for the MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "كرّر كلمة المرور للمستخدم \"root\" التابع لخادم MySQL:"
 
@@ -183,23 +169,18 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid ""
-#| "You should check the account's password after tha package installation."
 msgid "You should check the account's password after the package installation."
 msgstr "يجب أن تتحق من كلمة مرور الحساب بعد تثبيت الحزمة."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid ""
-#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
 "information."
 msgstr ""
-"الرجاء قراءة الملف /usr/share/doc/mysql-server-5.1/README.Debian لمزيد من"
-"المعلومات."
+"الرجاء قراءة الملف /usr/share/doc/mysql-server-5.1/README.Debian لمزيد "
+"منالمعلومات."
 
 #. Type: error
 #. Description
@@ -227,9 +208,9 @@
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"لم يعد خادم MySQL-5.1 يوفّر دعم NDB Cluster. الرجاء الانتقال إلى حزمة"
-"mysql-cluster الجديدة وإزالة جميع الأسطر التي تبدأ بكلمة \"ndb\" من جميع"
-"ملفات التهيئة ضمن /etc/mysql/."
+"لم يعد خادم MySQL-5.1 يوفّر دعم NDB Cluster. الرجاء الانتقال إلى حزمةmysql-"
+"cluster الجديدة وإزالة جميع الأسطر التي تبدأ بكلمة \"ndb\" من جميعملفات "
+"التهيئة ضمن /etc/mysql/."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "

Modified: mysql-5.1/branches/unstable/debian/po/cs.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/cs.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/cs.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -19,10 +19,10 @@
 "PO-Revision-Date: 2010-09-28 13:02+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 
 #. Type: boolean
 #. Description
@@ -78,7 +78,8 @@
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Také byste měli zkontrolovat vlastnictví a oprávnění k adresáři /var/lib/mysql:"
+"Také byste měli zkontrolovat vlastnictví a oprávnění k adresáři /var/lib/"
+"mysql:"
 
 #. Type: boolean
 #. Description
@@ -210,9 +211,9 @@
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 již NDB Clustery nepodporuje. Přejděte prosím na balík "
-"mysql-cluster a z konfiguračních souborů v /etc/mysql/ odstraňte "
-"všechny řádky začínající „ndb“."
+"MySQL-5.1 již NDB Clustery nepodporuje. Přejděte prosím na balík mysql-"
+"cluster a z konfiguračních souborů v /etc/mysql/ odstraňte všechny řádky "
+"začínající „ndb“."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "

Modified: mysql-5.1/branches/unstable/debian/po/da.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/da.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/da.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2010-10-07 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -27,8 +27,7 @@
 #. Description
 #: ../mysql-server-5.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-"Der er en fil med navnet /var/lib/mysql/debian-*.flag på dette system."
+msgstr "Der er en fil med navnet /var/lib/mysql/debian-*.flag på dette system."
 
 #. Type: boolean
 #. Description
@@ -179,8 +178,8 @@
 "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
 "information."
 msgstr ""
-"Læs venligst filen /usr/share/doc/mysql-server-5.1/README.Debian for yderligere "
-"oplysninger."
+"Læs venligst filen /usr/share/doc/mysql-server-5.1/README.Debian for "
+"yderligere oplysninger."
 
 #. Type: error
 #. Description
@@ -192,7 +191,8 @@
 #. Description
 #: ../mysql-server-5.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De to adgangskoder du indtastede var ikke de samme. Forsøg venligst igen."
+msgstr ""
+"De to adgangskoder du indtastede var ikke de samme. Forsøg venligst igen."
 
 #. Type: error
 #. Description
@@ -208,8 +208,6 @@
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 tilbyder ikke længere NDB-clusterunderstøttelse. Migrer venligst til "
-"den nye pakke mysql-cluster og fjern alle linjer der starter med »ndb« fra alle "
-"konfigurationsfiler under /etc/mysql/."
-
-
+"MySQL-5.1 tilbyder ikke længere NDB-clusterunderstøttelse. Migrer venligst "
+"til den nye pakke mysql-cluster og fjern alle linjer der starter med »ndb« "
+"fra alle konfigurationsfiler under /etc/mysql/."

Modified: mysql-5.1/branches/unstable/debian/po/de.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/de.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/de.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -15,11 +15,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-08-04 19:28+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-08-27 22:41+0200\n"
 "Last-Translator: Thomas Mueller <thomas.mueller at tmit.eu>\n"
 "Language-Team: german <debian-l10n-german at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -224,6 +225,6 @@
 "config files below /etc/mysql/."
 msgstr ""
 "MySQL-5.1 bietet keine NDB-Clusterunterstützung mehr. Bitte migrieren Sie "
-"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, die "
-"mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/mysql/."
-
+"Ihr System zum neuen »mysql-cluster«-Paket und entfernen Sie alle Zeilen, "
+"die mit »ndb« beginnen aus allen Konfigurationsdateien im Verzeichnis /etc/"
+"mysql/."

Modified: mysql-5.1/branches/unstable/debian/po/es.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/es.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/es.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -45,10 +45,10 @@
 "PO-Revision-Date: 2010-08-08 01:18+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian l10 Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
@@ -69,7 +69,9 @@
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
-msgstr "Este fichero indica que se instaló previamente una versión superior del paquete mysql-server."
+msgstr ""
+"Este fichero indica que se instaló previamente una versión superior del "
+"paquete mysql-server."
 
 #. Type: boolean
 #. Description
@@ -93,7 +95,9 @@
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
-msgstr "La utilización de MySQL con NIS/YP requiere una cuenta de usuario de mysql que se debe agregar al sistema local con:"
+msgstr ""
+"La utilización de MySQL con NIS/YP requiere una cuenta de usuario de mysql "
+"que se debe agregar al sistema local con:"
 
 #. Type: note
 #. Description
@@ -101,7 +105,9 @@
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
-msgstr "También debería comprobar los permisos y el usuario propietario del directorio /var/lib/mysql:"
+msgstr ""
+"También debería comprobar los permisos y el usuario propietario del "
+"directorio /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -208,7 +214,8 @@
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
 "information."
-msgstr "Lea «/usr/share/doc/mysql-server-5.1/README.Debian» para más información."
+msgstr ""
+"Lea «/usr/share/doc/mysql-server-5.1/README.Debian» para más información."
 
 #. Type: error
 #. Description
@@ -220,7 +227,9 @@
 #. Description
 #: ../mysql-server-5.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Las contraseñas que introdujo no son las mismas. Por favor, inténtelo de nuevo."
+msgstr ""
+"Las contraseñas que introdujo no son las mismas. Por favor, inténtelo de "
+"nuevo."
 
 #. Type: error
 #. Description
@@ -235,7 +244,10 @@
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
-msgstr "MySQL-5.1 ya no ofrece soporte para el Clúster NDB. Por favor, mibre al nuevo paquete «mysql-cluster» y borre todas las líneas que empiecen por «nbd» de los ficheros de configuración en «/etc/mysql»."
+msgstr ""
+"MySQL-5.1 ya no ofrece soporte para el Clúster NDB. Por favor, mibre al "
+"nuevo paquete «mysql-cluster» y borre todas las líneas que empiecen por "
+"«nbd» de los ficheros de configuración en «/etc/mysql»."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
@@ -257,10 +269,10 @@
 #~ msgstr ""
 #~ "Las versiones recientes de MySQL ya no soportan el antiguo formato de "
 #~ "tabla ISAM. Antes de realizar la actualización es necesario convertir sus "
-#~ "tablas a por ejemplo, MyISAM, usando «mysql_convert_table_format» o «ALTER "
-#~ "TABLE x ENGINE=MyISAM». Se va a interrumpir ahora la instalación de mysql-"
-#~ "server-5.1. Si aún así su mysql-server-4.1 se elimina aún así, puede "
-#~ "reinstalarlo para convertir ese tipo de tablas."
+#~ "tablas a por ejemplo, MyISAM, usando «mysql_convert_table_format» o "
+#~ "«ALTER TABLE x ENGINE=MyISAM». Se va a interrumpir ahora la instalación "
+#~ "de mysql-server-5.1. Si aún así su mysql-server-4.1 se elimina aún así, "
+#~ "puede reinstalarlo para convertir ese tipo de tablas."
 
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
@@ -277,8 +289,8 @@
 #~ "No era muy segura la forma en la que se almacenaban las contraseñas en "
 #~ "versiones anteriores del cliente de MySQL en Debian. Este problema se ha "
 #~ "mejorado posteriormente con el inconveniente, sin embargo, de que "
-#~ "clientes (por ejemplo, PHP) en sistemas que ejecutan Debian 3.1 «Sarge» no "
-#~ "podrán conectarse a cuentas que son nuevas o a las que se le haya "
+#~ "clientes (por ejemplo, PHP) en sistemas que ejecutan Debian 3.1 «Sarge» "
+#~ "no podrán conectarse a cuentas que son nuevas o a las que se le haya "
 #~ "cambiado la contraseña."
 
 #~ msgid ""
@@ -328,8 +340,8 @@
 #~ "have manually be restored."
 #~ msgstr ""
 #~ "Al actualizar a la versión de MySQL 3.23, la vrsión proporcionada en "
-#~ "Debian Woody, se eliminan de manera accidental, los enlaces simbólicos a «/"
-#~ "var/lib/mysql» o «/var/log/mysql» y tienen que restaurarse manualmente."
+#~ "Debian Woody, se eliminan de manera accidental, los enlaces simbólicos a "
+#~ "«/var/lib/mysql» o «/var/log/mysql» y tienen que restaurarse manualmente."
 
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
@@ -347,17 +359,17 @@
 #~ "is used in the start/stop and cron scripts. Don't delete."
 #~ msgstr ""
 #~ "Se creará un nuevo usuario «debian-sys-maint». Esta cuenta de mysql se "
-#~ "utilizará en los scripts de inicio y parada y en los scripts «cron». No la "
-#~ "elimine."
+#~ "utilizará en los scripts de inicio y parada y en los scripts «cron». No "
+#~ "la elimine."
 
 #~ msgid ""
 #~ "Please remember to set a PASSWORD for the MySQL root user! If you use a /"
 #~ "root/.my.cnf, always write the \"user\" and the \"password\" lines in "
 #~ "there, never only the password!"
 #~ msgstr ""
-#~ "¡Por favor, recuerde crear una CONTRASEÑA para el usuario «root» de MySQL! "
-#~ "¡Si utiliza /root/.my.cnf debe escribir las líneas «user» y «password» en "
-#~ "dicho archivo, no incluya sólo la contraseña!"
+#~ "¡Por favor, recuerde crear una CONTRASEÑA para el usuario «root» de "
+#~ "MySQL! ¡Si utiliza /root/.my.cnf debe escribir las líneas «user» y "
+#~ "«password» en dicho archivo, no incluya sólo la contraseña!"
 
 #~ msgid ""
 #~ "Should I remove the complete /var/lib/mysql directory tree which is used "

Modified: mysql-5.1/branches/unstable/debian/po/eu.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/eu.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/eu.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-21 22:59+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-07-29 11:59+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
 msgstr "Benetan bertsio zaharragora itzuli nahi duzu?"
 
@@ -33,13 +33,13 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
+#, fuzzy
 #| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
+#| "Such file is an indication that a mysql-server package with a higher "
+#| "version has been installed earlier."
 msgid ""
-"Such file is an indication that a mysql-server package with a higher version "
-"has been installed earlier."
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
 msgstr ""
 "Fitxategi honek aurretik bertsio berriagoko mysql-zerbitzari pakete bat "
 "instalatu dela adierazten du."
@@ -57,7 +57,6 @@
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP erabiltzaileentzat ohar garrantzitsua"
 
@@ -65,17 +64,19 @@
 #. Description
 #: ../mysql-server-5.1.templates:3001
 msgid ""
-"To use MySQL, the following entries for users and groups should be added to "
-"the system:"
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
 msgstr ""
-"MySQL erabili ahal izateko, hurrengo erabiltzaile eta taldeak gehitu behar "
-"dira sisteman:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You should also check the permissions and the owner of the /var/lib/mysql "
+#| "directory:"
 msgid ""
-"You should also check the permissions and the owner of the /var/lib/mysql "
+"You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
 "Honetaz gain /var/lib/mysql direktorioaren jabea eta baimenak egiaztatu "
@@ -98,101 +99,85 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-#| msgid ""
-#| "The script is about to remove the data directory /var/lib/mysql. If it is "
-#| "planned to just install a higher MySQL version or if a different mysql-"
-#| "server package is already using it, the data should be kept."
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
 msgstr ""
-"MySQL paketea beranduago bertsio berriago bat instalatzeko kentzen ari bazara, edo "
-"beste mysql-server pakete bat berau erabiltzen ari bada, datuak mantendu "
-"egin beharko lirateke."
+"MySQL paketea beranduago bertsio berriago bat instalatzeko kentzen ari "
+"bazara, edo beste mysql-server pakete bat berau erabiltzen ari bada, datuak "
+"mantendu egin beharko lirateke."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
 msgstr "Abioan MySQL zerbitzaria abiarazi?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
 msgstr ""
-"Sistema abioan MySQL automatikoki abiarazi daiteke edo eskuz '/etc/init.d/mysql "
-"start' eginaz."
+"Sistema abioan MySQL automatikoki abiarazi daiteke edo eskuz '/etc/init.d/"
+"mysql start' eginaz."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
 msgstr "MySQL \"root\" erabiltzailearen pasahitz berria:"
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid ""
-#| "It is highly recommended that you set a password for the MySQL "
-#| "administrative \"root\" user."
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
 msgstr ""
-"Derrigorrezkoa ez denean, oso gomendagarria da MySQL administratzaile "
-"\"root\" erabiltzaileari pasahitz bat ezartzea."
+"Derrigorrezkoa ez denean, oso gomendagarria da MySQL administratzaile \"root"
+"\" erabiltzaileari pasahitz bat ezartzea."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "If that field is left blank, the password will not be changed."
+#, fuzzy
+#| msgid "If that field is left blank, the password will not be changed."
+msgid "If this field is left blank, the password will not be changed."
 msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Errepikatu MySQL \"root\" erabiltzailearen pasahitza:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Ezin da MySQL \"root\" erabiltzailearen pasahitza ezarri"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid ""
-#| "It seems an error occurred while setting the password for the MySQL "
-#| "administrative user.  This may have happened because the user already has "
-#| "a password, or because there was a problem communicating with the MySQL "
-#| "server."
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
-"Errore bat gertatu da MySQL administratzaile kontuaren pasahitza "
-"ezartzean.  Hau erabiltzaileak dagoeneko pasahitz bat duelako edo MySQL "
+"Errore bat gertatu da MySQL administratzaile kontuaren pasahitza ezartzean.  "
+"Hau erabiltzaileak dagoeneko pasahitz bat duelako edo MySQL "
 "zerbitzariarekiko konexioan erroreak daudelako gertatu daiteke."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
 msgid "You should check the account's password after the package installation."
-msgstr "Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."
+msgstr ""
+"Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik."
 
 #. Type: error
 #. Description
@@ -225,12 +210,23 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:10001
+#, fuzzy
+#| msgid ""
+#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new "
+#| "mysql-cluster package and remove all lines starting with \"ndb\" from all "
+#| "config files below /etc/mysql/."
 msgid ""
-"MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new mysql-"
-"cluster package and remove all lines starting with \"ndb\" from all config "
-"files below /etc/mysql/."
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
 msgstr ""
 "MySQL-5.1-ek NDB cluster euskarri umezurtz bat behar du. Mesedez migratu "
 "mysql-cluster pakete berrira eta /etc/mysql/ azpiko konfigurazio fitxategi "
 "guztietan \"ndb\"-ez hasten diren lerro guztiak ezabatu."
 
+#~ msgid ""
+#~ "To use MySQL, the following entries for users and groups should be added "
+#~ "to the system:"
+#~ msgstr ""
+#~ "MySQL erabili ahal izateko, hurrengo erabiltzaile eta taldeak gehitu "
+#~ "behar dira sisteman:"

Modified: mysql-5.1/branches/unstable/debian/po/fr.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/fr.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/fr.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-08-04 19:28+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-08-08 14:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,8 +63,8 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"L'utilisation de MySQL avec NIS/YP impose l'ajout d'un compte local « mysql » "
-"avec la commande :"
+"L'utilisation de MySQL avec NIS/YP impose l'ajout d'un compte local "
+"« mysql » avec la commande :"
 
 #. Type: note
 #. Description
@@ -212,8 +213,8 @@
 "config files below /etc/mysql/."
 msgstr ""
 "La version 5.1 de MySQL ne gère plus les grappes NDB. Vous devriez utiliser "
-"le paquet mysql-cluster et supprimer toutes les lignes commençant par « ndb » "
-"des fichiers de configuration situés dans /etc/mysql."
+"le paquet mysql-cluster et supprimer toutes les lignes commençant par "
+"« ndb » des fichiers de configuration situés dans /etc/mysql."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "

Modified: mysql-5.1/branches/unstable/debian/po/gl.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/gl.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/gl.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2010-08-13 02:32+0200\n"
 "Last-Translator: Jorge Barreiro <yortx.barry at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Type: boolean
@@ -37,8 +37,8 @@
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"Un ficheiro coma este indica que anteriormente se instalou un paquete "
-"mysql-server cunha versión superior."
+"Un ficheiro coma este indica que anteriormente se instalou un paquete mysql-"
+"server cunha versión superior."
 
 #. Type: boolean
 #. Description
@@ -63,8 +63,8 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"O uso de MySQL baixo NIS/YP require engadir unha conta de usuario de mysql no "
-"sistema local usando:"
+"O uso de MySQL baixo NIS/YP require engadir unha conta de usuario de mysql "
+"no sistema local usando:"
 
 #. Type: note
 #. Description
@@ -208,9 +208,9 @@
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 xa non da soporte para clústers NDB. Migre ó novo paquete mysql-cluster "
-"e elimine as liñas que comezan por «ndb» de todos os ficheiros de configuración "
-"baixo /etc/mysql/."
+"MySQL-5.1 xa non da soporte para clústers NDB. Migre ó novo paquete mysql-"
+"cluster e elimine as liñas que comezan por «ndb» de todos os ficheiros de "
+"configuración baixo /etc/mysql/."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
@@ -236,4 +236,3 @@
 #~ "os clientes (tales coma PHP) das máquinas que executen Debian 3.1 Sarge "
 #~ "non se han poder conectar a contas recentes ou a contas nas que se "
 #~ "cambiara o contrasinal."
-

Modified: mysql-5.1/branches/unstable/debian/po/it.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/it.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/it.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -2,212 +2,213 @@
 # Copyright (C) 2009 Software in the Public Interest
 # This file is distributed under the same license as the mysql-dfsg-5.1 package.
 # Luca Monducci <luca.mo at tiscali.it>, 2006 - 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-08-04 19:28+0200\n"
-"PO-Revision-Date: 2009-08-08 11:03+0200\n"
-"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
-"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
-msgid "Really proceed with downgrade?"
-msgstr "Procedere realmente con l'abbassamento di versione?"
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
-msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr ""
-"Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
-msgid ""
-"Such a file is an indication that a mysql-server package with a higher "
-"version has been installed previously."
-msgstr ""
-"Quel file indica che in precedenza è stata installata una versione superiore "
-"del pacchetto mysql-server."
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
-msgid ""
-"There is no guarantee that the version you're currently installing will be "
-"able to use the current databases."
-msgstr ""
-"Non è garantito che la versione che si sta installando sia in grado di usare "
-"i database presenti."
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
-msgid "Important note for NIS/YP users"
-msgstr "Nota importante per gli utenti NIS/YP"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
-msgid ""
-"Using MySQL under NIS/YP requires a mysql user account to be added on the "
-"local system with:"
-msgstr ""
-"Per usare MySQL con NIS/YP è necessario aggiungere al sistema locale un "
-"account utente per mysql con:"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
-msgid ""
-"You should also check the permissions and ownership of the /var/lib/mysql "
-"directory:"
-msgstr ""
-"Inoltre si devono verificare i permessi e la proprietà della directory /var/"
-"lib/mysql:"
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
-msgid "Remove all MySQL databases?"
-msgstr "Eliminare tutti i database MySQL?"
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
-msgid ""
-"The /var/lib/mysql directory which contains the MySQL databases is about to "
-"be removed."
-msgstr ""
-"La directory /var/lib/mysql contenente i database di MySQL sta per essere "
-"eliminata."
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
-msgid ""
-"If you're removing the MySQL package in order to later install a more recent "
-"version or if a different mysql-server package is already using it, the data "
-"should be kept."
-msgstr ""
-"Se si rimuove il pacchetto MySQL per poi installare una versione più recente "
-"oppure se sono già in uso da un altro pacchetto mysql-server, i dati non "
-"devono essere eliminati."
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:5001
-msgid "Start the MySQL server on boot?"
-msgstr "Lanciare il server MySQL all'avvio?"
-
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:5001
-msgid ""
-"The MySQL server can be launched automatically at boot time or manually with "
-"the '/etc/init.d/mysql start' command."
-msgstr ""
-"Il server MySQL può essere lanciato automaticamente all'avvio del sistema "
-"oppure manualmente con il comando «/etc/init.d/mysql start»."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid "New password for the MySQL \"root\" user:"
-msgstr "Nuova password per l'utente «root» di MySQL:"
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"While not mandatory, it is highly recommended that you set a password for "
-"the MySQL administrative \"root\" user."
-msgstr ""
-"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per "
-"l'utente d'amministrazione «root» di MySQL."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid "If this field is left blank, the password will not be changed."
-msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
-msgid "Repeat password for the MySQL \"root\" user:"
-msgstr "Ripetere la password per l'utente «root» di MySQL:"
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
-msgid "Unable to set password for the MySQL \"root\" user"
-msgstr "Impossibile impostare la password per l'utente «root» di MySQL"
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
-msgid ""
-"An error occurred while setting the password for the MySQL administrative "
-"user. This may have happened because the account already has a password, or "
-"because of a communication problem with the MySQL server."
-msgstr ""
-"Si è verificato un errore durante l'impostazione della password per l'utente "
-"d'amministrazione di MySQL. Questo può essere accaduto perché l'utente ha "
-"già una password oppure a causa di un problema di connessione con il server "
-"MySQL."
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
-msgid "You should check the account's password after the package installation."
-msgstr ""
-"Al termine dell'installazione si deve verificare la password dell'account."
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
-msgid ""
-"Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
-"information."
-msgstr ""
-"Per maggiori informazioni si consulti il file /usr/share/doc/mysql-server-"
-"5.1/README.Debian."
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:9001
-msgid "Password input error"
-msgstr "Errore di inserimento della password"
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:9001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr "Le due password inserite sono diverse. Riprovare."
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:10001
-msgid "NDB Cluster seems to be in use"
-msgstr "È in uso un cluster NDB"
-
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:10001
-msgid ""
-"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
-"mysql-cluster package and remove all lines starting with \"ndb\" from all "
-"config files below /etc/mysql/."
-msgstr ""
-"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
-"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
-"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
+"PO-Revision-Date: 2009-08-08 11:03+0200\n"
+"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
+msgid "Really proceed with downgrade?"
+msgstr "Procedere realmente con l'abbassamento di versione?"
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
+msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
+msgstr ""
+"Su questo sistema esiste un file con nome /var/lib/mysql/debian-*.flag."
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
+msgid ""
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
+msgstr ""
+"Quel file indica che in precedenza è stata installata una versione superiore "
+"del pacchetto mysql-server."
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
+msgid ""
+"There is no guarantee that the version you're currently installing will be "
+"able to use the current databases."
+msgstr ""
+"Non è garantito che la versione che si sta installando sia in grado di usare "
+"i database presenti."
+
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
+msgid "Important note for NIS/YP users"
+msgstr "Nota importante per gli utenti NIS/YP"
+
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
+msgid ""
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
+msgstr ""
+"Per usare MySQL con NIS/YP è necessario aggiungere al sistema locale un "
+"account utente per mysql con:"
+
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
+msgid ""
+"You should also check the permissions and ownership of the /var/lib/mysql "
+"directory:"
+msgstr ""
+"Inoltre si devono verificare i permessi e la proprietà della directory /var/"
+"lib/mysql:"
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
+msgid "Remove all MySQL databases?"
+msgstr "Eliminare tutti i database MySQL?"
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
+msgid ""
+"The /var/lib/mysql directory which contains the MySQL databases is about to "
+"be removed."
+msgstr ""
+"La directory /var/lib/mysql contenente i database di MySQL sta per essere "
+"eliminata."
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
+msgid ""
+"If you're removing the MySQL package in order to later install a more recent "
+"version or if a different mysql-server package is already using it, the data "
+"should be kept."
+msgstr ""
+"Se si rimuove il pacchetto MySQL per poi installare una versione più recente "
+"oppure se sono già in uso da un altro pacchetto mysql-server, i dati non "
+"devono essere eliminati."
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:5001
+msgid "Start the MySQL server on boot?"
+msgstr "Lanciare il server MySQL all'avvio?"
+
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:5001
+msgid ""
+"The MySQL server can be launched automatically at boot time or manually with "
+"the '/etc/init.d/mysql start' command."
+msgstr ""
+"Il server MySQL può essere lanciato automaticamente all'avvio del sistema "
+"oppure manualmente con il comando «/etc/init.d/mysql start»."
+
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
+msgid "New password for the MySQL \"root\" user:"
+msgstr "Nuova password per l'utente «root» di MySQL:"
+
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
+msgid ""
+"While not mandatory, it is highly recommended that you set a password for "
+"the MySQL administrative \"root\" user."
+msgstr ""
+"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per "
+"l'utente d'amministrazione «root» di MySQL."
+
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
+msgid "If this field is left blank, the password will not be changed."
+msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata."
+
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Ripetere la password per l'utente «root» di MySQL:"
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
+msgid "Unable to set password for the MySQL \"root\" user"
+msgstr "Impossibile impostare la password per l'utente «root» di MySQL"
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
+msgid ""
+"An error occurred while setting the password for the MySQL administrative "
+"user. This may have happened because the account already has a password, or "
+"because of a communication problem with the MySQL server."
+msgstr ""
+"Si è verificato un errore durante l'impostazione della password per l'utente "
+"d'amministrazione di MySQL. Questo può essere accaduto perché l'utente ha "
+"già una password oppure a causa di un problema di connessione con il server "
+"MySQL."
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
+msgid "You should check the account's password after the package installation."
+msgstr ""
+"Al termine dell'installazione si deve verificare la password dell'account."
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
+msgid ""
+"Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
+"information."
+msgstr ""
+"Per maggiori informazioni si consulti il file /usr/share/doc/mysql-"
+"server-5.1/README.Debian."
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr "Errore di inserimento della password"
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Le due password inserite sono diverse. Riprovare."
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr "È in uso un cluster NDB"
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid ""
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
+msgstr ""
+"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
+"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
+"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."

Modified: mysql-5.1/branches/unstable/debian/po/ja.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/ja.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/ja.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -15,11 +15,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-08-04 19:28+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-09-01 08:25+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,8 +35,9 @@
 #. Description
 #: ../mysql-server-5.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "このシステムには  /var/lib/mysql/debian-*.flag という名前のファイル"
-"が存在しています。"
+msgstr ""
+"このシステムには  /var/lib/mysql/debian-*.flag という名前のファイルが存在して"
+"います。"
 
 #. Type: boolean
 #. Description
@@ -44,8 +46,9 @@
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"このファイルが意味するのは、以前により新しいバージョンの mysql-server "
-"パッケージがインストールされていたことを示します。"
+"このファイルが意味するのは、以前により新しいバージョンの mysql-server パッ"
+"ケージがインストールされていたことを示します。"
+
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
@@ -69,8 +72,8 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"NIS/YP 配下で MySQL を使うにはローカルのシステムに mysql のユーザアカウント"
-"を追加するのが必要です。"
+"NIS/YP 配下で MySQL を使うにはローカルのシステムに mysql のユーザアカウントを"
+"追加するのが必要です。"
 
 #. Type: note
 #. Description
@@ -78,8 +81,7 @@
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
-msgstr ""
-"/var/lib/mysql の所有者権限をチェックする必要もあります。"
+msgstr "/var/lib/mysql の所有者権限をチェックする必要もあります。"
 
 #. Type: boolean
 #. Description
@@ -94,7 +96,8 @@
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
-"MySQL データベースを含んでいるディレクトリ /var/lib/mysql を削除しようとしています。"
+"MySQL データベースを含んでいるディレクトリ /var/lib/mysql を削除しようとして"
+"います。"
 
 #. Type: boolean
 #. Description
@@ -104,9 +107,9 @@
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
 msgstr ""
-"後でより新しいバージョンのものをインストールしようとするために MySQL パッケージ"
-"を削除しようとしている、あるいは別の mysql-server パッケージを既に使っている場合、"
-"データは保持する必要があります。"
+"後でより新しいバージョンのものをインストールしようとするために MySQL パッケー"
+"ジを削除しようとしている、あるいは別の mysql-server パッケージを既に使ってい"
+"る場合、データは保持する必要があります。"
 
 #. Type: boolean
 #. Description
@@ -166,15 +169,16 @@
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
-"MySQL の管理者ユーザに対してパスワードを設定しようとした際、エラーが発生しました。"
-"これは既に管理者ユーザにパスワードが設定されていたか、MySQL サーバとの接続に問題が"
-"あったためだと思われます。"
+"MySQL の管理者ユーザに対してパスワードを設定しようとした際、エラーが発生しま"
+"した。これは既に管理者ユーザにパスワードが設定されていたか、MySQL サーバとの"
+"接続に問題があったためだと思われます。"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
 msgid "You should check the account's password after the package installation."
-msgstr "パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
+msgstr ""
+"パッケージのインストール後、アカウントのパスワードを確認する必要があります。"
 
 #. Type: error
 #. Description
@@ -214,5 +218,3 @@
 "MySQL-5.1 では NDB クラスタのサポートを提供しなくなっています。新たな mysql-"
 "cluster パッケージに移行して、/etc/mysql 以下の設定ファイルすべてから「ndb」"
 "で始まる行を削除してください。"
-
-

Modified: mysql-5.1/branches/unstable/debian/po/ko.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/ko.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/ko.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2011-06-07 11:53+0900\n"
 "Last-Translator: si-cheol KO <kosicheol at gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,13 +34,19 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-msgid "Such a file is an indication that a mysql-server package with a higher version has been installed previously."
-msgstr "이 파일은 이미 더 높은 버전의 mysql-server 패키지가 설치되었다는 것을 나타냅니다."
+msgid ""
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
+msgstr ""
+"이 파일은 이미 더 높은 버전의 mysql-server 패키지가 설치되었다는 것을 나타냅"
+"니다."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-msgid "There is no guarantee that the version you're currently installing will be able to use the current databases."
+msgid ""
+"There is no guarantee that the version you're currently installing will be "
+"able to use the current databases."
 msgstr "설치 중인 이 버전은 최신 데이터베이스를 사용하지 못할 수도 있습니다."
 
 #. Type: note
@@ -51,13 +58,19 @@
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-msgid "Using MySQL under NIS/YP requires a mysql user account to be added on the local system with:"
-msgstr "NIS/YP에 MySQL을 사용하기 위해선 로컬 시스템에 mysql 사용자계정을 추가 해야 합니다."
+msgid ""
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
+msgstr ""
+"NIS/YP에 MySQL을 사용하기 위해선 로컬 시스템에 mysql 사용자계정을 추가 해야 "
+"합니다."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-msgid "You should also check the permissions and ownership of the /var/lib/mysql directory:"
+msgid ""
+"You should also check the permissions and ownership of the /var/lib/mysql "
+"directory:"
 msgstr "/var/lib/mysql에 소유자와 권한을 확인 해야합니다."
 
 #. Type: boolean
@@ -69,14 +82,21 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-msgid "The /var/lib/mysql directory which contains the MySQL databases is about to be removed."
+msgid ""
+"The /var/lib/mysql directory which contains the MySQL databases is about to "
+"be removed."
 msgstr "MySQL 데이터베이스를 포함하는 /var/lib/mysql 디렉터리가 삭제됩니다. "
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-msgid "If you're removing the MySQL package in order to later install a more recent version or if a different mysql-server package is already using it, the data should be kept."
-msgstr "나중에 최신 버전으로 설치 하기위해 MySQL 패키지를 지우거나, 이미 다른 mysql-server 패키지을 사용하고 있다면 데이터를 유지해야합니다."
+msgid ""
+"If you're removing the MySQL package in order to later install a more recent "
+"version or if a different mysql-server package is already using it, the data "
+"should be kept."
+msgstr ""
+"나중에 최신 버전으로 설치 하기위해 MySQL 패키지를 지우거나, 이미 다른 mysql-"
+"server 패키지을 사용하고 있다면 데이터를 유지해야합니다."
 
 #. Type: boolean
 #. Description
@@ -87,8 +107,12 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-msgid "The MySQL server can be launched automatically at boot time or manually with the '/etc/init.d/mysql start' command."
-msgstr "MySQL server는 부팅시 자동으로 또는 '/etc/init.d/mysql start' 명령으로 동작 시킬 수 있습니다."
+msgid ""
+"The MySQL server can be launched automatically at boot time or manually with "
+"the '/etc/init.d/mysql start' command."
+msgstr ""
+"MySQL server는 부팅시 자동으로 또는 '/etc/init.d/mysql start' 명령으로 동작 "
+"시킬 수 있습니다."
 
 #. Type: password
 #. Description
@@ -99,8 +123,12 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "While not mandatory, it is highly recommended that you set a password for the MySQL administrative \"root\" user."
-msgstr "강제는 아니지만 MySQL을 관리하기 위해 \"root\" 사용자를 위한 암호를 설정하는 것이 좋습니다."
+msgid ""
+"While not mandatory, it is highly recommended that you set a password for "
+"the MySQL administrative \"root\" user."
+msgstr ""
+"강제는 아니지만 MySQL을 관리하기 위해 \"root\" 사용자를 위한 암호를 설정하는 "
+"것이 좋습니다."
 
 #. Type: password
 #. Description
@@ -123,8 +151,14 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-msgid "An error occurred while setting the password for the MySQL administrative user. This may have happened because the account already has a password, or because of a communication problem with the MySQL server."
-msgstr "MySQL 관리 사용자를 위한 암호 설정 중 문제가 발생하였습니다. 이 문제는 계정에 이미 암호가 설정돼 있거나, MySQL server와의 연결 문제 때문에 발생 했을 수 있습니다."
+msgid ""
+"An error occurred while setting the password for the MySQL administrative "
+"user. This may have happened because the account already has a password, or "
+"because of a communication problem with the MySQL server."
+msgstr ""
+"MySQL 관리 사용자를 위한 암호 설정 중 문제가 발생하였습니다. 이 문제는 계정"
+"에 이미 암호가 설정돼 있거나, MySQL server와의 연결 문제 때문에 발생 했을 수 "
+"있습니다."
 
 #. Type: error
 #. Description
@@ -135,8 +169,11 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-msgid "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more information."
-msgstr "세부정보는 /usr/share/doc/mysql-server-5.1/README.Debian 파일을 참조하세요."
+msgid ""
+"Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
+"information."
+msgstr ""
+"세부정보는 /usr/share/doc/mysql-server-5.1/README.Debian 파일을 참조하세요."
 
 #. Type: error
 #. Description
@@ -159,6 +196,11 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:10001
-msgid "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new mysql-cluster package and remove all lines starting with \"ndb\" from all config files below /etc/mysql/."
-msgstr "MySQL-5.1은 더이상 NDB클러스터를 지원하지 않습니다. 새로운 mysql-클러스터 패키지로 바꾸세요. 그리고 /etc/mysql/ 에 모든 설정파일에서 \"ndb\"로 시작하는 행은 삭제하세요."
-
+msgid ""
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
+msgstr ""
+"MySQL-5.1은 더이상 NDB클러스터를 지원하지 않습니다. 새로운 mysql-클러스터 패"
+"키지로 바꾸세요. 그리고 /etc/mysql/ 에 모든 설정파일에서 \"ndb\"로 시작하는 "
+"행은 삭제하세요."

Modified: mysql-5.1/branches/unstable/debian/po/nb.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/nb.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/nb.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -22,7 +22,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
 msgstr "Er du sikker på at du vil fortsette med nedgradering?"
 
@@ -36,10 +35,6 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -54,13 +49,12 @@
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
-"Det kan ikke garanteres at den versjonen du nå installerer kan bruke data fra "
-"den høyere versjonen."
+"Det kan ikke garanteres at den versjonen du nå installerer kan bruke data "
+"fra den høyere versjonen."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
 msgstr "Viktig merknad for NIS/YP-brukere"
 
@@ -71,8 +65,8 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"For å bruke MySQL med NIS/YP må det legges til en brukerkonto som heter mysql "
-"på det lokale systemet, med:"
+"For å bruke MySQL med NIS/YP må det legges til en brukerkonto som heter "
+"mysql på det lokale systemet, med:"
 
 #. Type: note
 #. Description
@@ -102,31 +96,23 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-#| msgid ""
-#| "The script is about to remove the data directory /var/lib/mysql. If it is "
-#| "planned to just install a higher MySQL version or if a different mysql-"
-#| "server package is already using it, the data should be kept."
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
 msgstr ""
-"Denne mappa bør beholdes hvis det bare skal installeres en høyere "
-"MySQL-versjon, eller hvis en annen mysql-server-pakke allerede bruker den."
+"Denne mappa bør beholdes hvis det bare skal installeres en høyere MySQL-"
+"versjon, eller hvis en annen mysql-server-pakke allerede bruker den."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
 msgstr "Skal MySQL-tjeneren startes ved maskinoppstart?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -137,16 +123,12 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nytt passord for MySQLs «root»-bruker:"
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid ""
-#| "It is highly recommended that you set a password for the MySQL "
-#| "administrative \"root\" user."
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -163,33 +145,26 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Gjenta passordet for MySQLs «root»-bruker:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Klarer ikke angi passord for MySQLs «root»-bruker"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid ""
-#| "It seems an error occurred while setting the password for the MySQL "
-#| "administrative user.  This may have happened because the user already has "
-#| "a password, or because there was a problem communicating with the MySQL "
-#| "server."
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
-"Det oppsto en feil mens det ble satt et passord for MySQLs "
-"administrative bruker. Dette kan være fordi kontoen allerede har et "
-"passord, eller på grunn av et kommunikasjonsproblem med MySQL-tjeneren."
+"Det oppsto en feil mens det ble satt et passord for MySQLs administrative "
+"bruker. Dette kan være fordi kontoen allerede har et passord, eller på grunn "
+"av et kommunikasjonsproblem med MySQL-tjeneren."
 
 #. Type: error
 #. Description

Modified: mysql-5.1/branches/unstable/debian/po/nl.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/nl.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/nl.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -13,15 +13,14 @@
 "PO-Revision-Date: 2010-11-21 21:30+0100\n"
 "Last-Translator: Eric Spreen <erispre at gmail.com>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid "Do you really want to downgrade?"
 msgid "Really proceed with downgrade?"
 msgstr "Wilt u echt een oude versie herstellen?"
 
@@ -29,19 +28,18 @@
 #. Description
 #: ../mysql-server-5.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Er bestaat een bestand genaamd /var/lib/mysql/debian-*.flag op dit systeem."
+msgstr ""
+"Er bestaat een bestand genaamd /var/lib/mysql/debian-*.flag op dit systeem."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid ""
-#| "WARNING: The file /var/lib/mysql/debian-*.flag exists. This indicates "
-#| "that a mysql-server package with a higher version has been installed "
-#| "before. It can not be guaranteed that this version can use its data."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
-msgstr "Zulk een bestand geeft aan dat er eerder een pakket mysql-server met een hogere versie is geinstalleerd."
+msgstr ""
+"Zulk een bestand geeft aan dat er eerder een pakket mysql-server met een "
+"hogere versie is geinstalleerd."
 
 #. Type: boolean
 #. Description
@@ -49,12 +47,13 @@
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
-msgstr "Er is geen garantie dat de versie die u op dit moment installeert de huidige databases kan gebruiken."
+msgstr ""
+"Er is geen garantie dat de versie die u op dit moment installeert de huidige "
+"databases kan gebruiken."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
 msgstr "Belangrijke opmerking voor gebruikers van NIS/YP"
 
@@ -64,7 +63,9 @@
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
-msgstr "Het gebruik van MySQL onder NIS/YP vereist dat een MySQL gebruikersaccount wordt toegevoegd aan het lokale systeem met:"
+msgstr ""
+"Het gebruik van MySQL onder NIS/YP vereist dat een MySQL gebruikersaccount "
+"wordt toegevoegd aan het lokale systeem met:"
 
 #. Type: note
 #. Description
@@ -72,7 +73,9 @@
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
-msgstr "U dient ook de permissies en eigenaren van de map /var/lib/mysql te controleren:"
+msgstr ""
+"U dient ook de permissies en eigenaren van de map /var/lib/mysql te "
+"controleren:"
 
 #. Type: boolean
 #. Description
@@ -86,96 +89,93 @@
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
-msgstr "De map /var/lib/mysql die de MySQL-databases bevat staat op het punt om verwijderd te worden."
+msgstr ""
+"De map /var/lib/mysql die de MySQL-databases bevat staat op het punt om "
+"verwijderd te worden."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-#| msgid ""
-#| "The script is about to remove the data directory /var/lib/mysql. If it is "
-#| "planned to just install a higher MySQL version or if a different mysql-"
-#| "server package is already using it, the data should be kept."
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
 "should be kept."
-msgstr "Als u het MySQL-pakket verwijdert om later een meer recente versie te installeren of als een ander mysql-server pakket het al gebruikt, zou de data behouden moeten worden."
+msgstr ""
+"Als u het MySQL-pakket verwijdert om later een meer recente versie te "
+"installeren of als een ander mysql-server pakket het al gebruikt, zou de "
+"data behouden moeten worden."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
 msgstr "Moet MySQL starten als de computer start?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid ""
-#| "The MySQL can start automatically on boot time or only if you manually "
-#| "type '/etc/init.d/mysql start'."
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
-msgstr "De MySQL-server kan automatisch worden gestart bij het starten van de computer of slechts wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
+msgstr ""
+"De MySQL-server kan automatisch worden gestart bij het starten van de "
+"computer of slechts wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nieuw wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid ""
-#| "It is highly recommended that you set a password for the MySQL "
-#| "administrative \"root\" user."
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
-msgstr "Hoewel niet verplicht, wordt het sterk aangeraden een wachtwoord in te stellen voor de administratieve MySQL \"root\"-gebruiker."
+msgstr ""
+"Hoewel niet verplicht, wordt het sterk aangeraden een wachtwoord in te "
+"stellen voor de administratieve MySQL \"root\"-gebruiker."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
-msgstr "Als dit veld leeg wordt gelaten, zal het wachtwoord niet worden veranderd."
+msgstr ""
+"Als dit veld leeg wordt gelaten, zal het wachtwoord niet worden veranderd."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-#| msgid "New password for MySQL \"root\" user:"
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Herhaal het wachtwoord voor de MySQL \"root\"-gebruiker:"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid "Unable to set password for MySQL \"root\" user"
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kan het wachtwoord voor de MySQL \"root\"-gebruiker niet instellen"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-#| msgid ""
-#| "It seems an error occurred while setting the password for the MySQL "
-#| "administrative user.  This may have happened because the user already has "
-#| "a password, or because there was a problem communicating with the MySQL "
-#| "server."
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
-msgstr "Er is een fout opgetreden bij het instellen van het wachtwoord voor de MySQL administratieve gebruiker. Dat kan komen doordat de gebruiker al een wachtwoord heeft, of omdat er een probleem was bij het communiceren met de MySQL-server."
+msgstr ""
+"Er is een fout opgetreden bij het instellen van het wachtwoord voor de MySQL "
+"administratieve gebruiker. Dat kan komen doordat de gebruiker al een "
+"wachtwoord heeft, of omdat er een probleem was bij het communiceren met de "
+"MySQL-server."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
 msgid "You should check the account's password after the package installation."
-msgstr "U zou het wachtwoord van het account moeten controleren nadat het pakket is geïnstalleerd."
+msgstr ""
+"U zou het wachtwoord van het account moeten controleren nadat het pakket is "
+"geïnstalleerd."
 
 #. Type: error
 #. Description
@@ -183,7 +183,9 @@
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
 "information."
-msgstr "Leest u het bestand /usr/share/doc/mysql-server-5.1/README.Debian voor meer informatie."
+msgstr ""
+"Leest u het bestand /usr/share/doc/mysql-server-5.1/README.Debian voor meer "
+"informatie."
 
 #. Type: error
 #. Description
@@ -195,7 +197,9 @@
 #. Description
 #: ../mysql-server-5.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De twee wachtwoorden die u hebt ingevoerd zijn niet gelijk. Probeert u het opnieuw."
+msgstr ""
+"De twee wachtwoorden die u hebt ingevoerd zijn niet gelijk. Probeert u het "
+"opnieuw."
 
 #. Type: error
 #. Description
@@ -210,7 +214,10 @@
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
-msgstr "MySQL-5.1 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het nieuwe pakket mysql-cluster en verwijder alle regels die beginnen met \"ndb\" van alle configuratiebestanden onder /etc/mysql/."
+msgstr ""
+"MySQL-5.1 biedt niet langer ondersteuning voor NDB Cluster. Migreer naar het "
+"nieuwe pakket mysql-cluster en verwijder alle regels die beginnen met \"ndb"
+"\" van alle configuratiebestanden onder /etc/mysql/."
 
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"

Modified: mysql-5.1/branches/unstable/debian/po/pl.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/pl.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/pl.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2012-02-04 19:17+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
@@ -38,8 +38,8 @@
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"Jest to oznaka, że poprzednio była zainstalowana wyższa wersja pakietu "
-"mysql-server."
+"Jest to oznaka, że poprzednio była zainstalowana wyższa wersja pakietu mysql-"
+"server."
 
 #. Type: boolean
 #. Description
@@ -89,8 +89,8 @@
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
-"Katalog /var/lib/mysql, który zawiera bazy danych MySQL, jest przeznaczony do "
-"usunięcia."
+"Katalog /var/lib/mysql, który zawiera bazy danych MySQL, jest przeznaczony "
+"do usunięcia."
 
 #. Type: boolean
 #. Description
@@ -161,9 +161,9 @@
 "user. This may have happened because the account already has a password, or "
 "because of a communication problem with the MySQL server."
 msgstr ""
-"Podczas ustawiania hasła dla administratora MySQL wystąpił błąd. Powodem może "
-"być problem z komunikacją z serwerem MySQL lub to, że hasło dla konta zostało "
-"już ustawione wcześniej."
+"Podczas ustawiania hasła dla administratora MySQL wystąpił błąd. Powodem "
+"może być problem z komunikacją z serwerem MySQL lub to, że hasło dla konta "
+"zostało już ustawione wcześniej."
 
 #. Type: error
 #. Description
@@ -212,4 +212,3 @@
 "MySQL-5.1 nie obsługuje dłużej NDB Cluster. Proszę się przenieść do nowego "
 "pakietu mysql-cluster i usunąć wszystkie wiersze zaczynające się od \"ndb\" "
 "ze wszystkich plików konfiguracyjnych w /etc/mysql/."
-

Modified: mysql-5.1/branches/unstable/debian/po/pt_BR.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/pt_BR.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/pt_BR.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-21 22:59+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2007-04-21 15:59-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,9 +34,13 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Such file is an indication that a mysql-server package with a higher "
+#| "version has been installed earlier."
 msgid ""
-"Such file is an indication that a mysql-server package with a higher version "
-"has been installed earlier."
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
 msgstr ""
 "A presença de um arquivo como este é uma indicação de que um pacote mysql-"
 "server com um número de versão mais alto já foi instalado anteriormente."
@@ -60,17 +65,19 @@
 #. Description
 #: ../mysql-server-5.1.templates:3001
 msgid ""
-"To use MySQL, the following entries for users and groups should be added to "
-"the system:"
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
 msgstr ""
-"Para utilizar o MySQL, as seguintes entradas para usuários e grupos devem "
-"ser adicionadas ao sistema:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You should also check the permissions and the owner of the /var/lib/mysql "
+#| "directory:"
 msgid ""
-"You should also check the permissions and the owner of the /var/lib/mysql "
+"You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
 "Você deverá também checar as permissões e o dono do diretório /var/lib/mysql:"
@@ -138,7 +145,9 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "If that field is left blank, the password will not be changed."
+#, fuzzy
+#| msgid "If that field is left blank, the password will not be changed."
+msgid "If this field is left blank, the password will not be changed."
 msgstr "Caso este campo seja deixado em branco, a senha não sera mudada."
 
 #. Type: password
@@ -213,12 +222,19 @@
 #. Description
 #: ../mysql-server-5.1.templates:10001
 msgid ""
-"MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new mysql-"
-"cluster package and remove all lines starting with \"ndb\" from all config "
-"files below /etc/mysql/."
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
 msgstr ""
 
 #~ msgid ""
+#~ "To use MySQL, the following entries for users and groups should be added "
+#~ "to the system:"
+#~ msgstr ""
+#~ "Para utilizar o MySQL, as seguintes entradas para usuários e grupos devem "
+#~ "ser adicionadas ao sistema:"
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Suportar conexões MySQL originadas de hosts executando o Debian \"sarge\" "

Modified: mysql-5.1/branches/unstable/debian/po/ro.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/ro.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/ro.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-21 22:59+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2006-12-20 21:27+0200\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +40,8 @@
 #| "that a mysql-server package with a higher version has been installed "
 #| "before. It can not be guaranteed that this version can use its data."
 msgid ""
-"Such file is an indication that a mysql-server package with a higher version "
-"has been installed earlier."
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
 msgstr ""
 "AVERTISMENT: Fişierul /var/lib/mysql/debian-*.flag există. Acest lucru "
 "indică faptul că anterior a fost instalată o versiune nouă a pachetului "
@@ -67,15 +68,15 @@
 #. Description
 #: ../mysql-server-5.1.templates:3001
 msgid ""
-"To use MySQL, the following entries for users and groups should be added to "
-"the system:"
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
 msgid ""
-"You should also check the permissions and the owner of the /var/lib/mysql "
+"You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
 
@@ -157,7 +158,7 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "If that field is left blank, the password will not be changed."
+msgid "If this field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
@@ -230,9 +231,9 @@
 #. Description
 #: ../mysql-server-5.1.templates:10001
 msgid ""
-"MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new mysql-"
-"cluster package and remove all lines starting with \"ndb\" from all config "
-"files below /etc/mysql/."
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
 msgstr ""
 
 #~ msgid "Cannot upgrade if ISAM tables are present!"

Modified: mysql-5.1/branches/unstable/debian/po/ru.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/ru.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/ru.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -17,16 +17,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-08-04 19:28+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-08-06 20:27+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"
-"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"
+"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"
 
 #. Type: boolean
 #. Description
@@ -43,15 +45,12 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-#| msgid ""
-#| "Such file is an indication that a mysql-server package with a higher "
-#| "version has been installed earlier."
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"Это означает, что ранее уже был установлен пакет mysql-server "
-"более новой версии."
+"Это означает, что ранее уже был установлен пакет mysql-server более новой "
+"версии."
 
 #. Type: boolean
 #. Description
@@ -76,15 +75,12 @@
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"Использование MySQL в NIS/YP требует добавления учётной записи mysql "
-"в локальную систему с:"
+"Использование MySQL в NIS/YP требует добавления учётной записи mysql в "
+"локальную систему с:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid ""
-#| "You should also check the permissions and the owner of the /var/lib/mysql "
-#| "directory:"
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -102,7 +98,8 @@
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
-msgstr "Запрос на удаление каталога /var/lib/mysql, содержащий базы данных MySQL."
+msgstr ""
+"Запрос на удаление каталога /var/lib/mysql, содержащий базы данных MySQL."
 
 #. Type: boolean
 #. Description
@@ -151,7 +148,6 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-#| msgid "If that field is left blank, the password will not be changed."
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Если оставить поле пустым, то пароль изменён не будет."
 
@@ -214,10 +210,6 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:10001
-#| msgid ""
-#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new "
-#| "mysql-cluster package and remove all lines starting with \"ndb\" from all "
-#| "config files below /etc/mysql/."
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
@@ -226,4 +218,3 @@
 "MySQL-5.1 больше не поддерживает NDB Cluster. Переходите на новый пакет "
 "mysql-cluster и удалите все строки, начинающиеся с \"ndb\", из всех файлов "
 "настройки в каталоге /etc/mysql/."
-

Modified: mysql-5.1/branches/unstable/debian/po/sk.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/sk.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/sk.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -12,10 +12,10 @@
 "PO-Revision-Date: 2011-01-04 12:55+0100\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: Slovak <nomail>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. Type: boolean

Modified: mysql-5.1/branches/unstable/debian/po/sv.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/sv.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/sv.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -7,35 +7,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
-"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
-"POT-Creation-Date: 2009-09-02 21:56+0200\n"
+"Report-Msgid-Bugs-To: mysql-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-31 12:35+0200\n"
 "PO-Revision-Date: 2009-09-08 21:42+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\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: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen genomföra nedgraderingen?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
 msgstr "En fil med namnet /var/lib/mysql/debian-*.flag hittades i systemet."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
-#| msgid ""
-#| "Such file is an indication that a mysql-server package with a higher "
-#| "version has been installed earlier."
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -43,9 +41,9 @@
 "En sådan fil är en indikation på att paketet mysql-server med ett högre "
 "versionsnummer har installerats tidigare."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:2001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:2001
 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -53,15 +51,15 @@
 "Det finns ingen garanti för att den version som du håller på att installera "
 "kommer att kunna använda de aktuella databaserna."
 
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -69,12 +67,9 @@
 "För att kunna använda MySQL under NIS/YP måste ett användarkonto för MySQL "
 "läggas till i systemet."
 
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:3001
-#| msgid ""
-#| "You should also check the permissions and the owner of the /var/lib/mysql "
-#| "directory:"
+#. Type: note
+#. Description
+#: ../mysql-server-5.1.templates:3001
 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -82,24 +77,24 @@
 "Du bör också kontrollera rättigheterna och ägaren av katalogen /var/lib/"
 "mysql."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
 msgid "Remove all MySQL databases?"
 msgstr "Ta bort alla MySQL-databaser?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
 msgid ""
 "The /var/lib/mysql directory which contains the MySQL databases is about to "
 "be removed."
 msgstr ""
 "Katalogen /var/lib/mysql som innehåller MySQL-databaser kommer att tas bort."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:4001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:4001
 msgid ""
 "If you're removing the MySQL package in order to later install a more recent "
 "version or if a different mysql-server package is already using it, the data "
@@ -109,15 +104,15 @@
 "nyare version eller om en annan MySQL-server redan använder filerna ska de "
 "inte raderas."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:5001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:5001
 msgid "Start the MySQL server on boot?"
 msgstr "Ska MySQL startas vid systemets uppstart?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.1.templates:5001
+#. Type: boolean
+#. Description
+#: ../mysql-server-5.1.templates:5001
 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -125,15 +120,15 @@
 "MySQL-servern kan startas vid systemets uppstart eller manuellt med "
 "kommandot \"/etc/init.d/mysql start\"."
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -141,28 +136,27 @@
 "Det är inte obligatoriskt men starkt rekommenderat att du sätter ett "
 "lösenord för MySQLs administrativa \"root\"-användare."
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:6001
-#| msgid "If that field is left blank, the password will not be changed."
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:6001
 msgid "If this field is left blank, the password will not be changed."
 msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras."
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
 msgid "Repeat password for the MySQL \"root\" user:"
 msgstr "Repetera lösenordet för MySQLs \"root\"-användare:"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
 msgid "Unable to set password for the MySQL \"root\" user"
 msgstr "Kunde inte sätta lösenord för MySQLs \"root\"-användare"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
 msgid ""
 "An error occurred while setting the password for the MySQL administrative "
 "user. This may have happened because the account already has a password, or "
@@ -173,46 +167,42 @@
 "lösenord satt, eller på grund av problem med att kommunicera med MySQL-"
 "servern."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
 msgid "You should check the account's password after the package installation."
 msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:8001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:8001
 msgid ""
 "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
 "information."
 msgstr ""
 "Läs filen /usr/share/doc/mysql-server-5.1/README.Debian för mer information."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:9001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:9001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr "De två lösenorden du angav stämde inte överrens. Prova igen."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:10001
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-kluster används inte"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.1.templates:10001
-#| msgid ""
-#| "MySQL-5.1 has orphaned NDB Cluster support. Please migrate to the new "
-#| "mysql-cluster package and remove all lines starting with \"ndb\" from all "
-#| "config files below /etc/mysql/."
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
 msgid ""
 "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "

Modified: mysql-5.1/branches/unstable/debian/po/tr.po
===================================================================
--- mysql-5.1/branches/unstable/debian/po/tr.po	2012-03-28 10:58:32 UTC (rev 2058)
+++ mysql-5.1/branches/unstable/debian/po/tr.po	2012-03-31 08:02:47 UTC (rev 2059)
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2012-03-20 21:31+0200\n"
 "Last-Translator: Atila KOÇ <akoc at artielektronik.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,33 +31,48 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-msgid "Such a file is an indication that a mysql-server package with a higher version has been installed previously."
-msgstr "Böyle bir dosyanın varlığı daha yüksek sürümde bir mysql-server paketinin önceden kurulu olduğunu gösterir."
+msgid ""
+"Such a file is an indication that a mysql-server package with a higher "
+"version has been installed previously."
+msgstr ""
+"Böyle bir dosyanın varlığı daha yüksek sürümde bir mysql-server paketinin "
+"önceden kurulu olduğunu gösterir."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:2001
-msgid "There is no guarantee that the version you're currently installing will be able to use the current databases."
-msgstr "Kurmakta olduğunuz sürümün var olan veritabanlarını kullanabileceğinin garantisi yoktur."
+msgid ""
+"There is no guarantee that the version you're currently installing will be "
+"able to use the current databases."
+msgstr ""
+"Kurmakta olduğunuz sürümün var olan veritabanlarını kullanabileceğinin "
+"garantisi yoktur."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-#| msgid "Important note for NIS/YP users!"
 msgid "Important note for NIS/YP users"
 msgstr "NIS/YP kullanıcıları için önemli not"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-msgid "Using MySQL under NIS/YP requires a mysql user account to be added on the local system with:"
-msgstr "MySQL'in NIS/YP ile kullanılması için yerel sisteme bir mysql kullanıcı hesabının eklenmesi gereklidir."
+msgid ""
+"Using MySQL under NIS/YP requires a mysql user account to be added on the "
+"local system with:"
+msgstr ""
+"MySQL'in NIS/YP ile kullanılması için yerel sisteme bir mysql kullanıcı "
+"hesabının eklenmesi gereklidir."
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.1.templates:3001
-msgid "You should also check the permissions and ownership of the /var/lib/mysql directory:"
-msgstr "/var/lib/mysql dizininin sahiplik ayarlarını ve izin haklarını da gözden geçirmelisiniz."
+msgid ""
+"You should also check the permissions and ownership of the /var/lib/mysql "
+"directory:"
+msgstr ""
+"/var/lib/mysql dizininin sahiplik ayarlarını ve izin haklarını da gözden "
+"geçirmelisiniz."
 
 #. Type: boolean
 #. Description
@@ -67,27 +83,39 @@
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-msgid "The /var/lib/mysql directory which contains the MySQL databases is about to be removed."
-msgstr "MySQL veritabanlarını barındıran /var/lib/mysql dizini kaldırılmak üzere"
+msgid ""
+"The /var/lib/mysql directory which contains the MySQL databases is about to "
+"be removed."
+msgstr ""
+"MySQL veritabanlarını barındıran /var/lib/mysql dizini kaldırılmak üzere"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:4001
-msgid "If you're removing the MySQL package in order to later install a more recent version or if a different mysql-server package is already using it, the data should be kept."
-msgstr "Eğer MySQL paketini daha sonra güncel bir sürümünü kurmak üzere kaldırıyorsanız ya da veritabanlarınıza başka bir mysql-server paketi ile erişiyorsanız, veritabanlarınızı tutmalısınız."
+msgid ""
+"If you're removing the MySQL package in order to later install a more recent "
+"version or if a different mysql-server package is already using it, the data "
+"should be kept."
+msgstr ""
+"Eğer MySQL paketini daha sonra güncel bir sürümünü kurmak üzere "
+"kaldırıyorsanız ya da veritabanlarınıza başka bir mysql-server paketi ile "
+"erişiyorsanız, veritabanlarınızı tutmalısınız."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-#| msgid "Should MySQL start on boot?"
 msgid "Start the MySQL server on boot?"
 msgstr "MySQL sunucusu açılış sırasında başlatılsın mı?"
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.1.templates:5001
-msgid "The MySQL server can be launched automatically at boot time or manually with the '/etc/init.d/mysql start' command."
-msgstr "MySQL sunucusu açılış sırasında kendiliğinden ya da '/etc/init.d/mysql start' komutu çalıştırılarak elle başlatılabilir."
+msgid ""
+"The MySQL server can be launched automatically at boot time or manually with "
+"the '/etc/init.d/mysql start' command."
+msgstr ""
+"MySQL sunucusu açılış sırasında kendiliğinden ya da '/etc/init.d/mysql "
+"start' komutu çalıştırılarak elle başlatılabilir."
 
 #. Type: password
 #. Description
@@ -98,8 +126,12 @@
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "While not mandatory, it is highly recommended that you set a password for the MySQL administrative \"root\" user."
-msgstr "Zorunlu olmasa da MySQL yönetimsel \"root\" kullanıcısı için bir parola oluşturulması kuvvetle önerilir."
+msgid ""
+"While not mandatory, it is highly recommended that you set a password for "
+"the MySQL administrative \"root\" user."
+msgstr ""
+"Zorunlu olmasa da MySQL yönetimsel \"root\" kullanıcısı için bir parola "
+"oluşturulması kuvvetle önerilir."
 
 #. Type: password
 #. Description
@@ -122,8 +154,14 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-msgid "An error occurred while setting the password for the MySQL administrative user. This may have happened because the account already has a password, or because of a communication problem with the MySQL server."
-msgstr "MySQL yönetimsel kullanıcısı için parola oluşturulurken bir hata oluştu. Bu hataya ilgili hesabın zaten bir parolası olması ya da MySQL sunucusu ile yaşanan iletişim sorunları neden olmuş olabilir."
+msgid ""
+"An error occurred while setting the password for the MySQL administrative "
+"user. This may have happened because the account already has a password, or "
+"because of a communication problem with the MySQL server."
+msgstr ""
+"MySQL yönetimsel kullanıcısı için parola oluşturulurken bir hata oluştu. Bu "
+"hataya ilgili hesabın zaten bir parolası olması ya da MySQL sunucusu ile "
+"yaşanan iletişim sorunları neden olmuş olabilir."
 
 #. Type: error
 #. Description
@@ -134,8 +172,12 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
-msgid "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more information."
-msgstr "Daha fazla bilgi için /usr/share/doc/mysql-server-5.1/README.Debian dosyasını inceleyiniz."
+msgid ""
+"Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for more "
+"information."
+msgstr ""
+"Daha fazla bilgi için /usr/share/doc/mysql-server-5.1/README.Debian "
+"dosyasını inceleyiniz."
 
 #. Type: error
 #. Description
@@ -158,8 +200,14 @@
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:10001
-msgid "MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new mysql-cluster package and remove all lines starting with \"ndb\" from all config files below /etc/mysql/."
-msgstr "MySQL-5.1 artık NDB Kümesi desteği vermemektedir. Lütfen yeni mysql-cluster paketine geçiniz ve /etc/mysql/ dizinindeki tüm yapılandırma dosyalarından \"ndb\" ile başlayan satırları kaldırınız."
+msgid ""
+"MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new "
+"mysql-cluster package and remove all lines starting with \"ndb\" from all "
+"config files below /etc/mysql/."
+msgstr ""
+"MySQL-5.1 artık NDB Kümesi desteği vermemektedir. Lütfen yeni mysql-cluster "
+"paketine geçiniz ve /etc/mysql/ dizinindeki tüm yapılandırma dosyalarından "
+"\"ndb\" ile başlayan satırları kaldırınız."
 
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "




More information about the Pkg-mysql-commits mailing list