Merge remote branch 'pootle/gettext' into gettext

Conflicts:
	po/pt_BR.po

po/pt_BR.po

@@ -3,13 +3,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:12+0100\n"
+"PO-Revision-Date: 2010-03-12 09:47+0200\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Maurício Meneghini Fauth <mauriciofauth@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
@@ -34,17 +36,15 @@ msgstr ""
 
 #. l10n: Language to use for MySQL 5.1 documentation
 #: libraries/common.lib.php:411
-#, fuzzy
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
-msgstr "pt"
+msgstr "en"
 
 #. l10n: Language to use for MySQL 5.0 documentation
 #: libraries/common.lib.php:415
-#, fuzzy
 msgctxt "$mysql_5_0_doc_lang"
 msgid "en"
-msgstr "pt"
+msgstr "en"
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:15
@@ -168,7 +168,7 @@ msgstr "Dez"
 #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string
 #: libraries/messages.inc.php:26
 msgid "%B %d, %Y at %I:%M %p"
-msgstr "%B %d, %Y as %I:%M %p"
+msgstr "%d/%m/%Y às %Hh%Mmin"
 
 #: libraries/messages.inc.php:27
 #, php-format
@@ -316,7 +316,7 @@ msgstr "E"
 #: libraries/messages.inc.php:61
 #, fuzzy
 msgid "and"
-msgstr "E"
+msgstr "e"
 
 #: libraries/messages.inc.php:62
 msgid "and then"
@@ -456,7 +456,6 @@ msgid "Are you sure you want to disable all BLOB references for database %s?"
 msgstr ""
 
 #: libraries/messages.inc.php:96
-#, fuzzy
 msgctxt "$strBLOBRepositoryDisabled"
 msgid "Disabled"
 msgstr "Desabilitado"
@@ -471,7 +470,6 @@ msgid "You are about to DISABLE a BLOB Repository!"
 msgstr ""
 
 #: libraries/messages.inc.php:99
-#, fuzzy
 msgctxt "$strBLOBRepositoryEnabled"
 msgid "Enabled"
 msgstr "Habilitado"
@@ -486,7 +484,6 @@ msgid "Remove BLOB Repository Reference"
 msgstr ""
 
 #: libraries/messages.inc.php:102
-#, fuzzy
 msgctxt "$strBLOBRepositoryRepair"
 msgid "Repair"
 msgstr "Reparar"
@@ -926,7 +923,6 @@ msgid "Create table"
 msgstr "Criar tabela"
 
 #: libraries/messages.inc.php:200
-#, fuzzy
 msgctxt "$strCreateTableShort"
 msgid "Create table"
 msgstr "Criar tabela"
@@ -940,7 +936,6 @@ msgid "Create database with same name and grant all privileges"
 msgstr "Criar Banco de Dados com o mesmo nome e conceder todos os privilégios"
 
 #: libraries/messages.inc.php:203
-#, fuzzy
 msgctxt "$strCreateUserDatabaseNone"
 msgid "None"
 msgstr "Nenhum"
@@ -967,9 +962,8 @@ msgid "Croatian"
 msgstr "Croata"
 
 #: libraries/messages.inc.php:209
-#, fuzzy
 msgid "CSV"
-msgstr "Dados CSV"
+msgstr "CSV"
 
 #: libraries/messages.inc.php:210
 msgid "Current server"
@@ -1189,7 +1183,6 @@ msgid "Descending"
 msgstr "Descendente"
 
 #: libraries/messages.inc.php:259
-#, fuzzy
 msgid "Description"
 msgstr "Descrição"
 
@@ -1838,9 +1831,8 @@ msgid "Import currencies ($5.00 to 5.00)"
 msgstr ""
 
 #: libraries/messages.inc.php:414 libraries/messages.inc.php:597
-#, fuzzy
 msgid "Open Document Spreadsheet"
-msgstr "Abrir Documento Planilha"
+msgstr "Planilha Open Document"
 
 #: libraries/messages.inc.php:415
 msgid "Import percentages as proper decimals (12.00% to .12)"
@@ -2574,7 +2566,6 @@ msgid "No change"
 msgstr "Sem Mudança"
 
 #: libraries/messages.inc.php:570
-#, fuzzy
 msgctxt "$strNoneDefault"
 msgid "None"
 msgstr "Nenhum"
@@ -3672,9 +3663,8 @@ msgid "Unknown error"
 msgstr ""
 
 #: libraries/messages.inc.php:819
-#, fuzzy
 msgid "Reset"
-msgstr "Resetar"
+msgstr "Restaurar"
 
 #: libraries/messages.inc.php:820
 msgid "Resource limits"
@@ -5437,7 +5427,6 @@ msgid "Skip locked tables"
 msgstr "Exibir tabelas abertas"
 
 #: libraries/messages.inc.php:1216 libraries/messages.inc.php:1596
-#, fuzzy
 msgid "Validate SQL"
 msgstr "Validar SQL"
 
@@ -5454,7 +5443,7 @@ msgstr ""
 #: libraries/messages.inc.php:1219
 #, fuzzy
 msgid "yes"
-msgstr "Sim"
+msgstr "sim"
 
 #: libraries/messages.inc.php:1220
 msgid ""