* Updated Portuguese translation (Closes: #674953)

* Updated Swedish translation (Closes: #675108)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2128 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

4 files changed, 178 insertions, 104 deletions

diff --git a/debian/changelog b/debian/changelog
index b254c00..7b6adb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
   * Updated French translation (Closes: #674025)
   * Updated Dutch translation (Closes: #674124)
   * Updated Russian translation (Closes: #674189)
+  * Updated Portuguese translation (Closes: #674953)
+  * Updated Swedish translation (Closes: #675108)
   * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
     and mysql-server-5.5 off dh_movefiles
   * Removed dh_movefiles override
diff --git a/debian/patches/kfreebsd_fails.patch b/debian/patches/kfreebsd_fails.patch
new file mode 100644
index 0000000..9035f0d
--- /dev/null
+++ b/debian/patches/kfreebsd_fails.patch
@@ -0,0 +1,74 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: Skipping certain tests on kfreebsd
+Last-Update: 2012-05-29
+Forwarded: no
+--- /dev/null
++++ b/mysql-test/include/debian-fail-kfreebsd.inc
+@@ -0,0 +1,5 @@
++if (`select @@version_compile_os in ('debian-kfreebsd-gnu')`)
++{
++  skip Dont run certain tests on Debian kfreebsd pending investigation;
++}
++
+--- a/mysql-test/t/log_state.test
++++ b/mysql-test/t/log_state.test
+@@ -1,6 +1,7 @@
+ ### t/log_state.test ###
+ #
+ 
++--source include/debian-fail-kfreebsd.inc
+ --source include/not_embedded.inc
+ --source include/have_csv.inc
+ 
+--- a/mysql-test/t/func_encrypt.test
++++ b/mysql-test/t/func_encrypt.test
+@@ -1,3 +1,5 @@
++
++--source include/debian-fail-kfreebsd.inc
+ -- source include/have_ssl_crypto_functs.inc
+ 
+ --disable_warnings
+--- a/mysql-test/t/func_des_encrypt.test
++++ b/mysql-test/t/func_des_encrypt.test
+@@ -1,3 +1,5 @@
++
++--source include/debian-fail-kfreebsd.inc
+ -- source include/have_ssl_crypto_functs.inc
+ 
+ # This test can't be in func_encrypt.test, because it requires
+--- a/mysql-test/t/func_encrypt_ucs2.test
++++ b/mysql-test/t/func_encrypt_ucs2.test
+@@ -1,3 +1,5 @@
++
++--source include/debian-fail-kfreebsd.inc
+ -- source include/have_ssl_crypto_functs.inc
+ -- source include/have_ucs2.inc
+ 
+--- a/mysql-test/t/func_misc.test
++++ b/mysql-test/t/func_misc.test
+@@ -2,6 +2,7 @@
+ # Testing of misc functions
+ #
+ 
++--source include/debian-fail-kfreebsd.inc
+ --disable_warnings
+ DROP TABLE IF EXISTS t1, t2;
+ --enable_warnings
+--- a/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
++++ b/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
+@@ -4,6 +4,7 @@
+ # Purpose: Testing heartbeat for schema
+ # 1 master and 2 slaves
+ #############################################################
++--source include/debian-fail-kfreebsd.inc
+ --let $rpl_topology= 1->2,1->3
+ --source include/rpl_init.inc
+ 
+--- a/mysql-test/t/events_logs_tests.test
++++ b/mysql-test/t/events_logs_tests.test
+@@ -1,3 +1,5 @@
++--source include/debian-fail-kfreebsd.inc
++
+ # Can't test with embedded server that doesn't support grants
+ -- source include/not_embedded.inc
+ 
diff --git a/debian/po/pt.po b/debian/po/pt.po
index b83aa6f..8b8d575 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,14 +1,14 @@
 # Portuguese translation for mysql-dfsg-5.5's debconf messages
 # Copyright (C) 2006 Miguel Figueiredo <elmig@debianpt.org>
 # This file is distributed under the same license as the mysql-dfsg-5.5 package.
-# Miguel Figueiredo <elmig@debianpt.org>
+# Miguel Figueiredo <elmig@debianpt.org>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.5\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2007-05-05 21:01+0100\n"
+"PO-Revision-Date: 2012-05-28 22:40+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -26,12 +26,11 @@ msgstr "Deseja mesmo fazer downgrade?"
 #. Description
 #: ../mysql-server-5.5.templates:2001
 msgid "A file named /var/lib/mysql/debian-*.flag exists on this system."
-msgstr "Existe um ficheiro chamado /var/lib/mysql/debian-*.flag neste sistema."
+msgstr "Existe, neste sistema, um ficheiro chamado /var/lib/mysql/debian-*.flag."
 
 #. Type: boolean
 #. Description
 #: ../mysql-server-5.5.templates:2001
-#, fuzzy
 #| msgid ""
 #| "Such file is an indication that a mysql-server package with a higher "
 #| "version has been installed earlier."
@@ -39,8 +38,8 @@ msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
 msgstr ""
-"Tal ficheiro significa que anteriormente foi instalado um pacote mysql-"
-"server com um número de versão superior."
+"A existência de tal ficheiro é um indicador que anteriormente foi instalado "
+"um pacote mysql-server com um número de versão superior."
 
 #. Type: boolean
 #. Description
@@ -65,11 +64,12 @@ msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
+"Utilizar MySQL com NIS/YP necessita que seja adicionada uma conta de "
+"utilizador de mysql ao sistema local com:"
 
 #. Type: note
 #. Description
 #: ../mysql-server-5.5.templates:3001
-#, fuzzy
 #| msgid ""
 #| "You should also check the permissions and the owner of the /var/lib/mysql "
 #| "directory:"
@@ -77,7 +77,7 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Deve também verificar as permissões e o dono do directório /var/lib/mysql :"
+"Deve também verificar as permissões e o dono do directório /var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -104,7 +104,7 @@ msgid ""
 "should be kept."
 msgstr ""
 "Se está a remover o pacote MySQL de modo a posteriormente instalar uma "
-"versão mais recente ou se um pacote mysq-server já está os está a utilizar, "
+"versão mais recente ou se um pacote mysql-server já está os está a utilizar, "
 "os dados devem ser mantidos."
 
 #. Type: boolean
@@ -136,25 +136,23 @@ msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
 msgstr ""
-"Embora não seja mandatório, É fortemente recomendado que defina uma palavra-"
+"Embora não seja obrigatório, é fortemente recomendado que defina uma palavra-"
 "passe para o utilizador administrativo \"root\" do MySQL."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.templates:6001
-#, 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 ""
-"Se esse campo for deixado em branco, a palavra-passe não irá ser alterada."
+"Se este campo for deixado em branco, a palavra-passe não irá ser alterada."
 
 #. Type: password
 #. Description
 #: ../mysql-server-5.5.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:"
+msgstr "Repita a palavra-passe para o utilizador \"root\" de MySQL:"
 
 #. Type: error
 #. Description
@@ -172,14 +170,13 @@ msgid ""
 "because of a communication problem with the MySQL server."
 msgstr ""
 "Ocorreu um erro enquanto era definida a palavra-passe para o utilizador "
-"administrativo do MySQL. Isto pode ter acontecido porque a cona já tem uma "
+"administrativo do MySQL. Isto pode ter acontecido porque a conta já tem uma "
 "palavra-passe, ou porque ocorreu um problema ao comunicação com o servidor "
 "MySQL."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
 #| msgid ""
 #| "You should check the account's password after tha package installation."
 msgid "You should check the account's password after the package installation."
@@ -189,7 +186,6 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:8001
-#, fuzzy
 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
 #| "more information."
@@ -197,26 +193,27 @@ msgid ""
 "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for more "
 "information."
 msgstr ""
-"Para mais informação por favor leia o ficheiro /usr/share/doc/mysql-"
-"server-5.5/README.Debian."
+"Para mais informações, por favor leia o ficheiro "
+"/usr/share/doc/mysql-server-5.5/README.Debian."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "Password input error"
-msgstr ""
+msgstr "Erro de entrada da palavra-passe"
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:9001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
+msgstr "As duas palavras-passe que introduziu não são as mesmas. Por favor "
+"tente novamente."
 
 #. Type: error
 #. Description
 #: ../mysql-server-5.5.templates:10001
 msgid "NDB Cluster seems to be in use"
-msgstr ""
+msgstr "NDB Cluster parece estar a ser utilizado"
 
 #. Type: error
 #. Description
@@ -226,6 +223,9 @@ msgid ""
 "mysql-cluster-server package and remove all lines starting with \"ndb\" from "
 "all config files below /etc/mysql/."
 msgstr ""
+"MySQL-5.5 já não disponibiliza suporte para NDB Cluster. Por favor migre "
+"para o novo pacote mysql-cluster-server e remova todas as linhas que "
+"comecem por \"ndb\" em todos os ficheiros de configuração em /etc/mysql/."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "
diff --git a/debian/po/sv.po b/debian/po/sv.po
index c4cd007..30e046b 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,16 +1,16 @@
-# Translation of mysql-dfsg-5.5 debconf template to Swedish

-# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>

-# This file is distributed under the same license as the mysql-dfsg-5.5 package.

+# Translation of mysql-5.5 debconf template to Swedish

+# Copyright (C) 2009, 2012 Martin Bagge <brother@bsnet.se>

+# This file is distributed under the same license as the mysql-5.5 package.

 # 

 # Andreas Henriksson <andreas@fatal.se>, 2007

-# Martin Bagge <brother@bsnet.se>, 2009

+# Martin Bagge <brother@bsnet.se>, 2009, 2012

 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.5 5.0.21-3\n"
 "Report-Msgid-Bugs-To: mysql-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2011-11-08 11:42-0800\n"
-"PO-Revision-Date: 2009-09-08 21:42+0100\n"
-"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"PO-Revision-Date: 2012-05-30 00:29+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -19,21 +19,21 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: Sweden\n"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:2001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:2001

 msgid "Really proceed with downgrade?"
 msgstr "Vill du verkligen genomföra nedgraderingen?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:2001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.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.5.templates:2001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:2001

 msgid ""
 "Such a file is an indication that a mysql-server package with a higher "
 "version has been installed previously."
@@ -41,9 +41,9 @@ msgstr ""
 "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.5.templates:2001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:2001

 msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
@@ -51,15 +51,15 @@ msgstr ""
 "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.5.templates:3001
+#. Type: note

+#. Description

+#: ../mysql-server-5.5.templates:3001

 msgid "Important note for NIS/YP users"
 msgstr "Viktig information för NIS/YP-användare"
 
-#. Type: note
-#. Description
-#: ../mysql-server-5.5.templates:3001
+#. Type: note

+#. Description

+#: ../mysql-server-5.5.templates:3001

 msgid ""
 "Using MySQL under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
@@ -67,9 +67,9 @@ msgstr ""
 "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.5.templates:3001
+#. Type: note

+#. Description

+#: ../mysql-server-5.5.templates:3001

 msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
@@ -77,24 +77,24 @@ msgstr ""
 "Du bör också kontrollera rättigheterna och ägaren av katalogen /var/lib/"
 "mysql."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:4001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:4001

 msgid "Remove all MySQL databases?"
 msgstr "Ta bort alla MySQL-databaser?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:4001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.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.5.templates:4001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.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 "
@@ -104,15 +104,15 @@ msgstr ""
 "nyare version eller om en annan MySQL-server redan använder filerna ska de "
 "inte raderas."
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:5001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:5001

 msgid "Start the MySQL server on boot?"
 msgstr "Ska MySQL startas vid systemets uppstart?"
 
-#. Type: boolean
-#. Description
-#: ../mysql-server-5.5.templates:5001
+#. Type: boolean

+#. Description

+#: ../mysql-server-5.5.templates:5001

 msgid ""
 "The MySQL server can be launched automatically at boot time or manually with "
 "the '/etc/init.d/mysql start' command."
@@ -120,15 +120,15 @@ msgstr ""
 "MySQL-servern kan startas vid systemets uppstart eller manuellt med "
 "kommandot \"/etc/init.d/mysql start\"."
 
-#. Type: password
-#. Description
-#: ../mysql-server-5.5.templates:6001
+#. Type: password

+#. Description

+#: ../mysql-server-5.5.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.5.templates:6001
+#. Type: password

+#. Description

+#: ../mysql-server-5.5.templates:6001

 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MySQL administrative \"root\" user."
@@ -136,27 +136,27 @@ msgstr ""
 "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.5.templates:6001
+#. Type: password

+#. Description

+#: ../mysql-server-5.5.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.5.templates:7001
+#. Type: password

+#. Description

+#: ../mysql-server-5.5.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.5.templates:8001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.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.5.templates:8001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.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 "
@@ -167,16 +167,15 @@ msgstr ""
 "lösenord satt, eller på grund av problem med att kommunicera med MySQL-"
 "servern."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.5.templates:8001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.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.5.templates:8001
-#, fuzzy
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.templates:8001

 #| msgid ""
 #| "Please read the /usr/share/doc/mysql-server-5.5/README.Debian file for "
 #| "more information."
@@ -186,28 +185,27 @@ msgid ""
 msgstr ""
 "Läs filen /usr/share/doc/mysql-server-5.5/README.Debian för mer information."
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.5.templates:9001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.templates:9001

 msgid "Password input error"
 msgstr "Fel vid inmatning av lösenord"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.5.templates:9001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.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.5.templates:10001
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.templates:10001

 msgid "NDB Cluster seems to be in use"
 msgstr "NDB-kluster används inte"
 
-#. Type: error
-#. Description
-#: ../mysql-server-5.5.templates:10001
-#, fuzzy
+#. Type: error

+#. Description

+#: ../mysql-server-5.5.templates:10001

 #| msgid ""
 #| "MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the "
 #| "new mysql-cluster package and remove all lines starting with \"ndb\" from "
@@ -218,8 +216,8 @@ msgid ""
 "all config files below /etc/mysql/."
 msgstr ""
 "Stödet för NDB-kluster har tagits bort i MySQL-5.5. Migrera till det nya "
-"paketet mysql-cluster och ta bort alla rader som inleds med \"ndb\" från "
-"alla inställlningsfiler i /etc/mysql/."
+"paketet mysql-cluster-server  och ta bort alla rader som inleds med \"ndb\" "
+"från alla inställlningsfiler i /etc/mysql/."
 
 #~ msgid ""
 #~ "To use MySQL, the following entries for users and groups should be added "