The branch, master has been updated via 20e460fc50adeaa3da3da28b54b2361c577f11c6 (commit) via 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 (commit) via 2654d7f1a2f39f834f6829a5bad32fd2a69a00d1 (commit) via 975ba03fae234fbd89d9e74bcda1bd9334a64cbb (commit) via 8eb41622cb78597e022e1f55db332a263b1a3903 (commit) via 982dc588de5ecab0db3b2a69278bc8573a74f980 (commit) via e4f5d6486acb4f46cfc7ae36db2c4f14b63e19f5 (commit) via 9ed3c0f6ca5ba9aa95b6e344c2b6d3855938a8cb (commit) via 624de955775dbf46633c2106f3c285d70cbcec20 (commit) via 8b83240d35c7231ceabf6337dd6bbe779a1f56a1 (commit) from 265f4a74f34128a3942874e3e3a1a98a802284db (commit)
- Log ----------------------------------------------------------------- commit 20e460fc50adeaa3da3da28b54b2361c577f11c6 Merge: 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 265f4a74f34128a3942874e3e3a1a98a802284db Author: Pootle server pootle@cihar.com Date: Fri Nov 19 12:40:16 2010 +0100
Merge remote branch 'origin/master'
commit 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:06:38 2010 +0200
Translation update done using Pootle.
commit 2654d7f1a2f39f834f6829a5bad32fd2a69a00d1 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:05:14 2010 +0200
Translation update done using Pootle.
commit 975ba03fae234fbd89d9e74bcda1bd9334a64cbb Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:04:37 2010 +0200
Translation update done using Pootle.
commit 8eb41622cb78597e022e1f55db332a263b1a3903 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:04:19 2010 +0200
Translation update done using Pootle.
commit 982dc588de5ecab0db3b2a69278bc8573a74f980 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:02:44 2010 +0200
Translation update done using Pootle.
commit e4f5d6486acb4f46cfc7ae36db2c4f14b63e19f5 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:02:29 2010 +0200
Translation update done using Pootle.
commit 9ed3c0f6ca5ba9aa95b6e344c2b6d3855938a8cb Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:02:01 2010 +0200
Translation update done using Pootle.
commit 624de955775dbf46633c2106f3c285d70cbcec20 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:01:51 2010 +0200
Translation update done using Pootle.
commit 8b83240d35c7231ceabf6337dd6bbe779a1f56a1 Author: Marc Delisle marc@infomarc.info Date: Fri Nov 19 13:01:45 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 14 +++++++------- po/fr.po | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index b94346a..70f19f5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -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-18 06:21-0500\n" -"PO-Revision-Date: 2010-11-12 12:41+0200\n" +"PO-Revision-Date: 2010-11-19 13:06+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"
@@ -2848,14 +2848,14 @@ msgid "Changes tracking" msgstr "Changes tracking"
#: libraries/config/messages.inc.php:202 -#, fuzzy #| msgid "" #| "Tracking of changes made in database. Requires configured PMA database." msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Tracking of changes made in database. Requires configured PMA database." +"Tracking of changes made in database. Requires the phpMyAdmin configuration " +"storage."
#: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -6773,7 +6773,7 @@ msgstr "" "has been configured."
#: main.php:304 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." @@ -6781,8 +6781,8 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"The phpMyAdmin configuration storage has been deactivated. To find out why " -"click %shere%s." +"The phpMyAdmin configuration storage is not completely configured, some " +"extended features have been deactivated. To find out why click %shere%s."
#: main.php:319 msgid "" diff --git a/po/fr.po b/po/fr.po index 81cccc4..95c3110 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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-18 06:21-0500\n" -"PO-Revision-Date: 2010-11-18 01:15+0200\n" +"PO-Revision-Date: 2010-11-19 13:02+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"
@@ -567,7 +567,7 @@ msgstr "Dans la(les) table(s) :"
#: db_search.php:352 msgid "Inside column:" -msgstr "Dans la colonne: " +msgstr "Dans la colonne : "
#: db_structure.php:59 msgid "No tables found in database" @@ -1620,7 +1620,7 @@ msgstr ""
#: libraries/auth/cookie.auth.lib.php:245 msgid "Server:" -msgstr "Serveur: " +msgstr "Serveur : "
#: libraries/auth/cookie.auth.lib.php:250 msgid "Username:" @@ -4553,7 +4553,7 @@ msgstr "utiliser ceci pour les futures exportations" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:512 msgid "Character set of the file:" -msgstr "Jeu de caractères du fichier: " +msgstr "Jeu de caractères du fichier : "
#: libraries/display_export.lib.php:309 msgid "Compression:" @@ -6399,7 +6399,7 @@ msgstr "" "essayer votre requête. Le message d'erreur présenté plus bas pourrait vous " "indiquer la source du problème. En dernier recours, veuillez trouver la plus " "courte requête possible qui cause le problème, et soumettre un rapport " -"d'anomalie en incluant la section à couper: " +"d'anomalie en incluant la section à couper : "
#: libraries/sqlparser.lib.php:175 msgid "BEGIN CUT" @@ -7807,7 +7807,7 @@ msgstr "Synchroniser les bases de données avec le serveur maître"
#: server_replication.php:320 msgid "Control slave:" -msgstr "Contrôler le serveur esclave: " +msgstr "Contrôler le serveur esclave : "
#: server_replication.php:323 msgid "Full start"
hooks/post-receive
-
Michal Čihař