[Pkg-mysql-commits] r1644 - mysql-dfsg-5.1/branches/experimental/debian/po

Wed Jul 22 07:07:21 UTC 2009

Author: ch
Date: 2009-07-22 07:07:19 +0000 (Wed, 22 Jul 2009)
New Revision: 1644

Modified:
   mysql-dfsg-5.1/branches/experimental/debian/po/ar.po
   mysql-dfsg-5.1/branches/experimental/debian/po/ca.po
   mysql-dfsg-5.1/branches/experimental/debian/po/cs.po
   mysql-dfsg-5.1/branches/experimental/debian/po/da.po
   mysql-dfsg-5.1/branches/experimental/debian/po/de.po
   mysql-dfsg-5.1/branches/experimental/debian/po/es.po
   mysql-dfsg-5.1/branches/experimental/debian/po/eu.po
   mysql-dfsg-5.1/branches/experimental/debian/po/fr.po
   mysql-dfsg-5.1/branches/experimental/debian/po/gl.po
   mysql-dfsg-5.1/branches/experimental/debian/po/it.po
   mysql-dfsg-5.1/branches/experimental/debian/po/ja.po
   mysql-dfsg-5.1/branches/experimental/debian/po/nb.po
   mysql-dfsg-5.1/branches/experimental/debian/po/nl.po
   mysql-dfsg-5.1/branches/experimental/debian/po/pt.po
   mysql-dfsg-5.1/branches/experimental/debian/po/pt_BR.po
   mysql-dfsg-5.1/branches/experimental/debian/po/ro.po
   mysql-dfsg-5.1/branches/experimental/debian/po/ru.po
   mysql-dfsg-5.1/branches/experimental/debian/po/sv.po
   mysql-dfsg-5.1/branches/experimental/debian/po/tr.po
Log:
wasn't me.. they somehow changed from alone...


Modified: mysql-dfsg-5.1/branches/experimental/debian/po/ar.po
===================================================================

--- mysql-dfsg-5.1/branches/experimental/debian/po/ar.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/ar.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: templates\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-01 13:04+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -120,33 +120,15 @@
 "ÙŠÙ…ÙƒÙ† ØªØ´ØºÙŠÙ„ Ø®Ø§Ø¯Ù… MySQL Ø¢Ù„ÙŠØ§Ù‹ ÙˆÙ‚Øª Ø§Ù„Ø¥Ù‚Ù„Ø§Ø¹ Ø£Ùˆ ÙŠØ¯ÙˆÙŠØ§Ù‹ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ø£Ù…Ø± '/etc/init.d/"
 "mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ù„Ù…Ø³ØªØ®Ø¯ \"root\" Ø§Ù„Ø®Ø§Øµ Ø¨Ù€MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -156,10 +138,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "Ø¥Ù† ØªØ±Ùƒ Ø§Ù„ØÙ‚Ù„ ÙØ§Ø±ØºØ§Ù‹ØŒ ÙÙ„Ù† ÙŠØªÙ… ØªØºÙŠÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ù„Ù…Ø³ØªØ®Ø¯ \"root\" Ø§Ù„Ø®Ø§Øµ Ø¨Ù€MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -201,6 +191,33 @@
 "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù‚Ø±Ø§Ø¡Ø© Ø§Ù„Ù…Ù„Ù /usr/share/doc/mysql-server-5.1/README.Debian Ù„Ù„Ù…Ø²ÙŠØ¯ Ù…Ù† "
 "Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/ca.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/ca.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/ca.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2004-01-31 19:20GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia at ica.es>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -109,44 +109,32 @@
 "init.d/mysql start'. Seleccioneu 'sí' si voleu que s'inicialitzi "
 "automàticament."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
+msgid "New password for the MySQL \"root\" user:"
 msgstr ""
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
 msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
+"While not mandatory, it is highly recommended that you set a password for "
+"the MySQL administrative \"root\" user."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
-msgid "New password for the MySQL \"root\" user:"
+#: ../mysql-server-5.1.templates:6001
+msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-msgid ""
-"While not mandatory, it is highly recommended that you set a password for "
-"the MySQL administrative \"root\" user."
+msgid "Repeat password for the MySQL \"root\" user:"
 msgstr ""
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
-msgid "If that field is left blank, the password will not be changed."
-msgstr ""
-
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -176,6 +164,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/cs.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/cs.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/cs.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-01 13:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -121,39 +121,15 @@
 "MySQL se mÅ¯Å¾e spouÅ¡tÄ›t automaticky pÅ™i startu systÃ©mu, nebo ruÄnÄ› pÅ™Ãkazem '/"
 "etc/init.d/mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "Aktualizace nelze provÃ©st pokud jsou pÅ™Ãtomny tabulky ISAM!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"PoslednÃ verze MySQL jiÅ¾ nemohou pouÅ¾Ãvat starÃ½ formÃ¡t tabulek ISAM a pÅ™ed "
-"aktualizacÃ je nutnÃ© pÅ™evÃ©st tyto tabulky napÅ™. do formÃ¡tu MyISAM pomocÃ "
-"\"mysql_convert_table_format\" nebo \"ALTER TABLE x ENGINE=MyISAM\". "
-"Instalace mysql-server-5.1 se nynÃ pÅ™eruÅ¡Ã. V pÅ™ÃpadÄ›, Å¾e se mezitÃm "
-"odinstaloval pÅ¯vodnÃ mysql-server-4.1, jednoduÅ¡e jej znovu nainstalujte a "
-"tabulky pÅ™eveÄte."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "NovÃ© heslo MySQL uÅ¾ivatele \"root\":"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -163,10 +139,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "PonechÃ¡te-li pole prÃ¡zdnÃ©, heslo se nezmÄ›nÃ."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "NovÃ© heslo MySQL uÅ¾ivatele \"root\":"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -207,7 +191,52 @@
 msgstr ""
 "VÃce informacÃ naleznete v /usr/share/doc/mysql-server-5.1/README.Debian."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "Aktualizace nelze provÃ©st pokud jsou pÅ™Ãtomny tabulky ISAM!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "PoslednÃ verze MySQL jiÅ¾ nemohou pouÅ¾Ãvat starÃ½ formÃ¡t tabulek ISAM a "
+#~ "pÅ™ed aktualizacÃ je nutnÃ© pÅ™evÃ©st tyto tabulky napÅ™. do formÃ¡tu MyISAM "
+#~ "pomocÃ \"mysql_convert_table_format\" nebo \"ALTER TABLE x ENGINE=MyISAM"
+#~ "\". Instalace mysql-server-5.1 se nynÃ pÅ™eruÅ¡Ã. V pÅ™ÃpadÄ›, Å¾e se mezitÃm "
+#~ "odinstaloval pÅ¯vodnÃ mysql-server-4.1, jednoduÅ¡e jej znovu nainstalujte a "
+#~ "tabulky pÅ™eveÄte."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Podporovat MySQL pÅ™ipojenÃ z poÄÃtaÄÅ¯ pouÅ¾ÃvajÃcÃch Debian Sarge nebo "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/da.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/da.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/da.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-30 22:41+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -126,39 +126,15 @@
 "MySQL-serveren kan enten startes op automatisk under systemopstarten, eller "
 "manuelt med kommandoen '/etc/init.d/mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "Kan ikke opgradere hvis der er ISAM-tabeller!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"Nyere versioner af MySQL kan ikke længere benytte det gamle ISAM-"
-"tabelformat, og det er derfor nødvendigt at konvertere dine tabeller til f."
-"eks. MyISAM forud for opgraderingen med \"mysql_convert_table_format\" eller "
-"\"ALTER TABLE x ENGINE=MyISAM\". Installationen af mysql-server-5.1 afbrydes "
-"nu. Skulle din gamle mysql-server-4.1 alligevel bliver afinstalleret, så "
-"geninstallér den blot og konverter tabellerne."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Ny adgangskode for MySQL's \"root\"-bruger:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -168,10 +144,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "Hvis du lader dette felt stå tomt, vil adgangskoden ikke blive ændret."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Ny adgangskode for MySQL's \"root\"-bruger:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -211,7 +195,52 @@
 "Se filen /usr/share/doc/mysql-server-5.1/README.Debian for yderligere "
 "oplysninger."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "Kan ikke opgradere hvis der er ISAM-tabeller!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "Nyere versioner af MySQL kan ikke længere benytte det gamle ISAM-"
+#~ "tabelformat, og det er derfor nødvendigt at konvertere dine tabeller til "
+#~ "f.eks. MyISAM forud for opgraderingen med \"mysql_convert_table_format\" "
+#~ "eller \"ALTER TABLE x ENGINE=MyISAM\". Installationen af mysql-server-5.1 "
+#~ "afbrydes nu. Skulle din gamle mysql-server-4.1 alligevel bliver "
+#~ "afinstalleret, så geninstallér den blot og konverter tabellerne."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Understøt MySQL-forbindelser fra maskiner, der kører Debian \"Sarge\" "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/de.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/de.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/de.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.41-2_de\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-29 16:05+0200\n"
 "Last-Translator: Alwin Meschede <ameschede at gmx.de>\n"
 "Language-Team: german <debian-l10n-german at lists.debian.org>\n"
@@ -129,33 +129,15 @@
 "Der MySQL-Dienst kann entweder automatisch beim Systemstart oder manuell "
 "durch Eingabe des Befehls Â»/etc/init.d/mysql startÂ« gestartet werden."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Neues Passwort fÃ¼r den MySQL Â»rootÂ«-Benutzer:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -165,10 +147,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geÃ¤ndert."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Neues Passwort fÃ¼r den MySQL Â»rootÂ«-Benutzer:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -210,6 +200,33 @@
 "FÃ¼r weitere Informationen lesen Sie /usr/share/doc/mysql-server-5.1/README."
 "Debian"
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/es.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/es.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/es.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -40,8 +40,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-28 22:21+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"
@@ -152,39 +152,15 @@
 "El servidor MySQL puede iniciarse en el momento de arranque del sistema o "
 "manualmente si escribe la orden Â«/etc/init.d/mysql startÂ»."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "Â¡No se puede actualizar si ya hay tablas ISAM!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-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."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nueva contraseÃ±a para el usuario Â«rootÂ» de MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -194,10 +170,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "No se modificarÃ¡ la contraseÃ±a si deja el espacio en blanco."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nueva contraseÃ±a para el usuario Â«rootÂ» de MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -238,7 +222,52 @@
 msgstr ""
 "Consulte /usr/share/doc/mysql-server-5.1/README.Debian para mÃ¡s informaciÃ³n."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "Â¡No se puede actualizar si ya hay tablas ISAM!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ 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."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Â¿Soportar las conexiones MySQL establecidadas desde sistemas que ejecutan "
@@ -253,8 +282,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 ""
@@ -304,8 +333,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 "
@@ -323,17 +352,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-dfsg-5.1/branches/experimental/debian/po/eu.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/eu.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/eu.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.26-3-debconf_eu\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-02-19 09:33+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <Librezale at librezale.org>\n"
@@ -131,27 +131,9 @@
 "MySQL abiaraztean automatikoki abiarazi daiteke edo eskuz /etc/init.d/mysql "
 "start' eginaz."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -159,7 +141,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -173,10 +155,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "MySQL \"root\" erabiltzailearen pasahitz berria:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -217,6 +207,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/fr.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/fr.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/fr.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-04-19 22:43+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -126,33 +126,15 @@
 "MySQL peut Ãªtre lancÃ© soit au dÃ©marrage, soit en entrant la commande Â«Â /etc/"
 "init.d/mysql startÂ Â»."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nouveau mot de passe du superutilisateur de MySQLÂ :"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -162,10 +144,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "Si ce champ est laissÃ© vide, le mot de passe ne sera pas changÃ©."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nouveau mot de passe du superutilisateur de MySQLÂ :"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -207,6 +197,33 @@
 "Veuillez consulter le fichier /usr/share/doc/mysql-server-5.1/README.Debian "
 "pour plus d'informations."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/gl.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/gl.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/gl.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-04-20 09:44+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -116,33 +116,15 @@
 "PÃ³dese iniciar automaticamente o servidor MySQL ao iniciar o ordenador, ou "
 "manualmente coa orde \"/etc/init.d/mysql start\"."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Novo contrasinal para o usuario \"root\" de MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -152,10 +134,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Novo contrasinal para o usuario \"root\" de MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -197,6 +187,33 @@
 "Consulte o ficheiro /usr/share/doc/mysql-server-5.1/README.Debian para mÃ¡is "
 "informaciÃ³n."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/it.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/it.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/it.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.38 italian debconf templates\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-04-22 15:43+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -117,33 +117,15 @@
 "Il server MySQL puÃ² essere lanciato automaticamente all'avvio del sistema "
 "oppure manualmente con il comando Â«/etc/init.d/mysql startÂ»."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 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:7001
+#: ../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."
@@ -153,10 +135,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that 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
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nuova password per l'utente Â«rootÂ» di MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -200,6 +190,33 @@
 "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 ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/ja.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/ja.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/ja.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.32-6\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-02-18 22: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"
@@ -140,33 +140,9 @@
 "MySQL ã®èµ·å‹•æ–¹æ³•ã«ã¤ã„ã¦ã€ã‚·ã‚¹ãƒ†ãƒ èµ·å‹•æ™‚ã«è‡ªå‹•çš„ã«é–‹å§‹ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ '/etc/"
 "init.d/mysql start' ã¨æ‰‹ã§å…¥åŠ›ã—ãŸæ™‚ã®ã¿èµ·å‹•ã™ã‚‹ã‹ã‚’é¸ã¹ã¾ã™ã€‚"
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "ISAM ãƒ†ãƒ¼ãƒ–ãƒ«ãŒã‚ã‚‹å ´åˆã¯ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"MySQL ã®æœ€è¿‘ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ä»¥å‰ã® ISAM ãƒ†ãƒ¼ãƒ–ãƒ«å½¢å¼ã¯åˆ©ç”¨ã§ããªããªã£ã¦ã„ã¾"
-"ã™ã€‚ãã®ãŸã‚ã€ä¾‹ãˆã° \"mysql_convert_table_format\" ã‚ã‚‹ã„ã¯ \"ALTER TABLE x "
-"ENGINE=MyISAM\" ã¨ã—ã¦ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰å‰ã« MyISAM ã«ã‚³ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ãªã©ãŒå¿…"
-"è¦ã§ã™ã€‚mysql-server-5.1 ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ–ã—ã¾ã™ã€‚ä»¥å‰ã® mysql-server-4.1 "
-"ãŒå‰Šé™¤ã•ã‚Œã¦ã—ã¾ã£ãŸå ´åˆã§ã‚ã£ã¦ã‚‚ã€ãƒ†ãƒ¼ãƒ–ãƒ«ã‚’ã‚³ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã«å†ã‚¤ãƒ³ã‚¹"
-"ãƒˆãƒ¼ãƒ«ã‚’ã—ã¦ãã ã•ã„ã€‚"
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -174,7 +150,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -188,10 +164,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "MySQL ã® \"root\" ãƒ¦ãƒ¼ã‚¶ã«å¯¾ã™ã‚‹æ–°ã—ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -236,7 +220,52 @@
 msgstr ""
 "è©³ç´°ã¯ /usr/share/doc/mysql-server-5.1/README.Debian ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚"
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "ISAM ãƒ†ãƒ¼ãƒ–ãƒ«ãŒã‚ã‚‹å ´åˆã¯ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã§ãã¾ã›ã‚“!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "MySQL ã®æœ€è¿‘ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ä»¥å‰ã® ISAM ãƒ†ãƒ¼ãƒ–ãƒ«å½¢å¼ã¯åˆ©ç”¨ã§ããªããªã£ã¦ã„"
+#~ "ã¾ã™ã€‚ãã®ãŸã‚ã€ä¾‹ãˆã° \"mysql_convert_table_format\" ã‚ã‚‹ã„ã¯ \"ALTER "
+#~ "TABLE x ENGINE=MyISAM\" ã¨ã—ã¦ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰å‰ã« MyISAM ã«ã‚³ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ã“"
+#~ "ã¨ãªã©ãŒå¿…è¦ã§ã™ã€‚mysql-server-5.1 ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ–ã—ã¾ã™ã€‚ä»¥å‰ã® "
+#~ "mysql-server-4.1 ãŒå‰Šé™¤ã•ã‚Œã¦ã—ã¾ã£ãŸå ´åˆã§ã‚ã£ã¦ã‚‚ã€ãƒ†ãƒ¼ãƒ–ãƒ«ã‚’ã‚³ãƒ³ãƒãƒ¼ãƒˆ"
+#~ "ã™ã‚‹ãŸã‚ã«å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ã—ã¦ãã ã•ã„ã€‚"
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Debian \"Sarge\" ã‚ã‚‹ã„ã¯ãã‚Œã‚ˆã‚Šã‚‚å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç¨¼åƒã—ã¦ã„ã‚‹ãƒ›ã‚¹ãƒˆã‹ã‚‰"

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/nb.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/nb.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/nb.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql_nb\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-02-18 12:13+0100\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb at lister.ping.uio.no>\n"
@@ -131,27 +131,9 @@
 "MySQL kan startes automatisk nÃ¥r maskinen starter, eller bare hvis du "
 "skriver Â«/etc/init.d/mysql startÂ»."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -159,7 +141,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -173,10 +155,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nytt passord for MySQLs Â«rootÂ»-bruker:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -217,6 +207,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/nl.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/nl.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/nl.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2006-02-19 10:20+0100\n"
 "Last-Translator: Thijs Kinkhorst <thijs at debian.org>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -133,27 +133,9 @@
 "MySQL kan automatisch starten bij het starten van de computer, of slechts "
 "wanneer u '/etc/init.d/mysql start' handmatig uitvoert."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -161,7 +143,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -175,10 +157,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nieuw wachtwoord voor de MySQL \"root\"-gebruiker:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -220,6 +210,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/pt.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/pt.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/pt.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-05-05 21:01+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -116,39 +116,15 @@
 "O MySQL pode ser automaticamente lanÃ§ado no arranque ou manualmente atravÃ©s "
 "do comando '/etc/init.d/mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "NÃ£o Ã© possÃvel actualizar se estiverem presentes tabelas ISAM!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"As versÃµes recentes de MySQL jÃ¡ nÃ£o podem utilizar o antigo formato de "
-"tabelas ISAM e Ã© por isso necessÃ¡rio converter as suas tabelas pra e.g. "
-"MyISAM antes da actualizaÃ§Ã£o, utilizando \"mysql_convert_table_format\" ou "
-"\"ALTER TABLE x ENGINE=MyISAM\". A instalaÃ§Ã£o de mysql-server-5.1 irÃ¡ agora "
-"ser cancelada. Se o seu antigo mysql-server-4.1 for removido apenas "
-"reinstale para converter essas tabelas."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nova palavra-passe para o utilizador \"root\" do MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -158,11 +134,19 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 "Se esse campo for deixado em branco, a palavra-passe nÃ£o irÃ¡ ser alterada."
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nova palavra-passe para o utilizador \"root\" do MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -207,7 +191,52 @@
 "Para mais informaÃ§Ã£o por favor leia o ficheiro /usr/share/doc/mysql-server-"
 "5.1/README.Debian."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "NÃ£o Ã© possÃvel actualizar se estiverem presentes tabelas ISAM!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "As versÃµes recentes de MySQL jÃ¡ nÃ£o podem utilizar o antigo formato de "
+#~ "tabelas ISAM e Ã© por isso necessÃ¡rio converter as suas tabelas pra e.g. "
+#~ "MyISAM antes da actualizaÃ§Ã£o, utilizando \"mysql_convert_table_format\" "
+#~ "ou \"ALTER TABLE x ENGINE=MyISAM\". A instalaÃ§Ã£o de mysql-server-5.1 irÃ¡ "
+#~ "agora ser cancelada. Se o seu antigo mysql-server-4.1 for removido apenas "
+#~ "reinstale para converter essas tabelas."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Suportar ligaÃ§Ãµes MySQL de mÃ¡quinas que corram Debian \"sarge\" ou mais "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/pt_BR.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/pt_BR.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/pt_BR.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+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"
@@ -119,33 +119,15 @@
 "O servidor MySQL pode ser iniciado automaticamente junto a inicializaÃ§Ã£o da "
 "mÃ¡quina ou manualmente com o comando '/etc/init.d/mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 msgid "New password for the MySQL \"root\" user:"
 msgstr "Nova senha para o usuÃ¡rio \"root\" do MySQL:"
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../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."
@@ -155,10 +137,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that 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
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for the MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nova senha para o usuÃ¡rio \"root\" do MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -201,6 +191,33 @@
 "Por favor, leia o arquivo /usr/share/doc/mysql-server-5.1/README.Debian para "
 "maiores informaÃ§Ãµes."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/ro.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/ro.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/ro.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://mysql-dfsg\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+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"
@@ -132,33 +132,9 @@
 "MySQL poate porni automat la iniÅ£ializarea sistemului sau doar dacÄƒ rulaÅ£i "
 "comanda â€ž/etc/init.d/mysql startâ€."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "Nu se poate face actualizarea dacÄƒ sunt prezente tabele ISAM!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"Versiunile recente MySQL nu mai pot folosi vechiul format de tabele ISAM "
-"ÅŸieste necesar sÄƒ convertiÅ£i tabelele dumneavoastrÄƒ de ex. la formatul "
-"MyISAM Ã®nainte de a face actualizarea folosind comanda "
-"â€žmysql_convert_table_formatâ€ sau â€žALTER TABLE x ENGINE=MyISAMâ€. Instalarea "
-"mysql-server-5.1 va eÅŸua. ÃŽn caz cÄƒ ÅŸtergeÅ£iversiunea anterioarÄƒ mysql-"
-"server-4.1 va trebui reinstalatÄƒ pentru a converti tabelele."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -166,7 +142,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -180,10 +156,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Noua parolÄƒ pentru utilizatorul â€žrootâ€ al MySQL:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -224,7 +208,53 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "Nu se poate face actualizarea dacÄƒ sunt prezente tabele ISAM!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "Versiunile recente MySQL nu mai pot folosi vechiul format de tabele ISAM "
+#~ "ÅŸieste necesar sÄƒ convertiÅ£i tabelele dumneavoastrÄƒ de ex. la formatul "
+#~ "MyISAM Ã®nainte de a face actualizarea folosind comanda "
+#~ "â€žmysql_convert_table_formatâ€ sau â€žALTER TABLE x ENGINE=MyISAMâ€. "
+#~ "Instalarea mysql-server-5.1 va eÅŸua. ÃŽn caz cÄƒ ÅŸtergeÅ£iversiunea "
+#~ "anterioarÄƒ mysql-server-4.1 va trebui reinstalatÄƒ pentru a converti "
+#~ "tabelele."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "SuportaÅ£i conexiuni MySQL de la staÅ£ii ce ruleazÄƒ sistemul Debian â€žsargeâ€ "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/ru.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/ru.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/ru.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1_5.0.32-6_ru\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-02-19 11:28+0900\n"
 "Last-Translator: Yuriy Talakan' <yt at drsk.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -141,27 +141,9 @@
 "MySQL Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹, Ð»Ð¸Ð±Ð¾ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ "
 "Ð²Ð²ÐµÐ´ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ '/etc/init.d/mysql start'. "
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -169,7 +151,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -183,10 +165,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ MySQL Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ \"root\":"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -227,6 +217,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/sv.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/sv.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/sv.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2007-02-18 14:48+0100\n"
 "Last-Translator: Andreas Henriksson <andreas at fatal.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -139,33 +139,9 @@
 "MySQL kan startas när systemet startas upp eller endast om du manuellt "
 "skriver '/etc/init.d/mysql start'."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
-msgstr "Kan inte uppgradera om ISAM-tabeller finns!"
-
-#. Type: note
-#. Description
-#: ../mysql-server-5.1.templates:6001
-msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
-msgstr ""
-"Senaste versionerna av MySQL kan inte längre använda gamla ISAM-"
-"tabellformatet och det är nödvändigt att konvertera dina tabeller till "
-"exempelvis MyISAM före uppgradering med \"mysql_convert_table_format\" eller "
-"\"ALTER TABLE x ENGINE=MyISAM\". Installationen av mysql-server-5.1 kommer "
-"nu att avbrytas. Om ditt gamla mysql-server-4.1-paket tas bort är det bara "
-"att installera om det för att konvertera de tabellerna."
-
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
 #, fuzzy
 #| msgid "New password for MySQL \"root\" user:"
 msgid "New password for the MySQL \"root\" user:"
@@ -173,7 +149,7 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 #, fuzzy
 #| msgid ""
 #| "It is highly recommended that you set a password for the MySQL "
@@ -187,10 +163,18 @@
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
+#: ../mysql-server-5.1.templates:6001
 msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
+#. Type: password
+#. Description
+#: ../mysql-server-5.1.templates:7001
+#, fuzzy
+#| msgid "New password for MySQL \"root\" user:"
+msgid "Repeat password for the MySQL \"root\" user:"
+msgstr "Nytt lösenord för MySQLs \"root\"-användare:"
+
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -235,7 +219,52 @@
 "information."
 msgstr "Se /usr/share/doc/mysql-server-5.1/README.Debian för mer information."
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
+#~ msgid "Cannot upgrade if ISAM tables are present!"
+#~ msgstr "Kan inte uppgradera om ISAM-tabeller finns!"
+
 #~ msgid ""
+#~ "Recent versions of MySQL can no longer use the old ISAM table format and "
+#~ "it is necessary to convert your tables to e.g. MyISAM before upgrading by "
+#~ "using \"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". "
+#~ "The installation of mysql-server-5.1 will now abort. In case your old "
+#~ "mysql-server-4.1 gets removed nevertheless just reinstall it to convert "
+#~ "those tables."
+#~ msgstr ""
+#~ "Senaste versionerna av MySQL kan inte längre använda gamla ISAM-"
+#~ "tabellformatet och det är nödvändigt att konvertera dina tabeller till "
+#~ "exempelvis MyISAM före uppgradering med \"mysql_convert_table_format\" "
+#~ "eller \"ALTER TABLE x ENGINE=MyISAM\". Installationen av mysql-server-5.1 "
+#~ "kommer nu att avbrytas. Om ditt gamla mysql-server-4.1-paket tas bort är "
+#~ "det bara att installera om det för att konvertera de tabellerna."
+
+#~ msgid ""
 #~ "Support MySQL connections from hosts running Debian \"sarge\" or older?"
 #~ msgstr ""
 #~ "Behöver du MySQL-anslutningar från system som kör Debian \"Sarge\" eller "

Modified: mysql-dfsg-5.1/branches/experimental/debian/po/tr.po
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/po/tr.po	2009-07-22 07:05:30 UTC (rev 1643)
+++ mysql-dfsg-5.1/branches/experimental/debian/po/tr.po	2009-07-22 07:07:19 UTC (rev 1644)
@@ -1,12 +1,12 @@
 # Turkish translation of mysql-server.
 # This file is distributed under the same license as the mysql-server package.
 # GÃ¼rkan Aslan <gurkan at iaslan.com>, 2004
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-4.1\n"
-"Report-Msgid-Bugs-To: pkg-mysql-maint at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-08-29 01:58+0200\n"
+"Report-Msgid-Bugs-To: mysql-dfsg-5.1 at packages.debian.org\n"
+"POT-Creation-Date: 2009-07-21 22:59+0200\n"
 "PO-Revision-Date: 2004-06-05 08:53+0300\n"
 "Last-Translator: GÃ¼rkan Aslan <gurkan at iaslan.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -110,44 +110,32 @@
 "halinde elle baÅŸlatÄ±labilir. EÄŸer aÃ§Ä±lÄ±ÅŸta otomatik olarak baÅŸlatÄ±lmasÄ±nÄ± "
 "istiyorsanÄ±z burada 'evet'i seÃ§in."
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
-msgid "Cannot upgrade if ISAM tables are present!"
+msgid "New password for the MySQL \"root\" user:"
 msgstr ""
 
-#. Type: note
+#. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:6001
 msgid ""
-"Recent versions of MySQL can no longer use the old ISAM table format and it "
-"is necessary to convert your tables to e.g. MyISAM before upgrading by using "
-"\"mysql_convert_table_format\" or \"ALTER TABLE x ENGINE=MyISAM\". The "
-"installation of mysql-server-5.1 will now abort. In case your old mysql-"
-"server-4.1 gets removed nevertheless just reinstall it to convert those "
-"tables."
+"While not mandatory, it is highly recommended that you set a password for "
+"the MySQL administrative \"root\" user."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mysql-server-5.1.templates:7001
-msgid "New password for the MySQL \"root\" user:"
+#: ../mysql-server-5.1.templates:6001
+msgid "If that field is left blank, the password will not be changed."
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.1.templates:7001
-msgid ""
-"While not mandatory, it is highly recommended that you set a password for "
-"the MySQL administrative \"root\" user."
+msgid "Repeat password for the MySQL \"root\" user:"
 msgstr ""
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.1.templates:7001
-msgid "If that field is left blank, the password will not be changed."
-msgstr ""
-
 #. Type: error
 #. Description
 #: ../mysql-server-5.1.templates:8001
@@ -177,6 +165,33 @@
 "information."
 msgstr ""
 
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:9001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../mysql-server-5.1.templates:10001
+msgid "NDB Cluster seems to be in use"
+msgstr ""
+
+#. 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/."
+msgstr ""
+
 #~ msgid ""
 #~ "To use mysql you must install an equivalent user and group to the "
 #~ "following and ensure yourself that /var/lib/mysql has the right "


