Merge remote branch 'pootle/master'

This commit is contained in:
Michal Čihař
2010-11-12 14:06:16 +01:00
2 changed files with 16 additions and 22 deletions

View File

@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-11-10 05:51-0500\n"
"PO-Revision-Date: 2010-10-04 13:11+0200\n"
"Last-Translator: Robert Readman <robert_readman@hotmail.com>\n"
"PO-Revision-Date: 2010-11-12 12:41+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: english-gb <en_GB@li.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -569,7 +569,6 @@ msgid "Inside column:"
msgstr "Inside column:"
#: db_structure.php:59
#, fuzzy
#| msgid "No tables found in database."
msgid "No tables found in database"
msgstr "No tables found in database."
@@ -2984,7 +2983,7 @@ msgstr "Partial import: allow interrupt"
#: libraries/config/messages.inc.php:238 libraries/config/messages.inc.php:245
#: libraries/import/csv.php:26 libraries/import/ldi.php:39
msgid "Do not abort on INSERT error"
msgstr ""
msgstr "Do not abort on INSERT error"
#: libraries/config/messages.inc.php:239 libraries/config/messages.inc.php:247
#: libraries/import/csv.php:25 libraries/import/ldi.php:38
@@ -4667,16 +4666,14 @@ msgid "Options"
msgstr "Options"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568
#, fuzzy
#| msgid "Partial Texts"
msgid "Partial texts"
msgstr "Partial Texts"
msgstr "Partial texts"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572
#, fuzzy
#| msgid "Full Texts"
msgid "Full texts"
msgstr "Full Texts"
msgstr "Full texts"
#: libraries/display_tbl.lib.php:585
msgid "Relational key"
@@ -6055,10 +6052,9 @@ msgid "Schema of the %s database - Page %s"
msgstr "Schema of the %s database - Page %s"
#: libraries/schema/Export_Relation_Schema.class.php:174
#, fuzzy
#| msgid "File %s does not contain any key id"
msgid "This page does not contain any tables!"
msgstr "File %s does not contain any key id"
msgstr "This page does not contain any tables!"
#: libraries/schema/Export_Relation_Schema.class.php:207
msgid "SCHEMA ERROR: "
@@ -6753,7 +6749,6 @@ msgstr ""
"sooner than configured in phpMyAdmin."
#: main.php:279
#, fuzzy
#| msgid ""
#| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
#| "php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that "
@@ -6763,10 +6758,9 @@ msgid ""
"Login cookie store is lower than cookie validity configured in phpMyAdmin, "
"because of this, your login will expire sooner than configured in phpMyAdmin."
msgstr ""
"Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
"validity configured in phpMyAdmin, because of this, your login will expire "
"sooner than configured in phpMyAdmin."
"Login cookie store is lower than cookie validity configured in phpMyAdmin, "
"because of this, your login will expire sooner than configured in "
"phpMyAdmin."
#: main.php:287
msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
@@ -8941,7 +8935,7 @@ msgstr ""
"most. Values larger than 1800 may pose a security risk such as impersonation."
#: setup/lib/index.lib.php:264
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "%sLogin cookie validity%s must be set to a value less or equal to %sLogin "
#| "cookie store%s."
@@ -8949,8 +8943,8 @@ msgid ""
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
"%sLogin cookie validity%s must be set to a value less or equal to %sLogin "
"cookie store%s."
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
#: setup/lib/index.lib.php:266
#, php-format

View File

@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-11-10 05:51-0500\n"
"PO-Revision-Date: 2010-11-08 13:29+0200\n"
"PO-Revision-Date: 2010-11-12 12:43+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: french <fr@li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -3014,7 +3014,7 @@ msgstr "Permettre l'interruption lors de l'importation"
#: libraries/config/messages.inc.php:238 libraries/config/messages.inc.php:245
#: libraries/import/csv.php:26 libraries/import/ldi.php:39
msgid "Do not abort on INSERT error"
msgstr ""
msgstr "Ne pas arrêter l'importation lors d'une erreur d'énoncé INSERT"
#: libraries/config/messages.inc.php:239 libraries/config/messages.inc.php:247
#: libraries/import/csv.php:25 libraries/import/ldi.php:38