The branch, master has been updated via 0701779bf0d0f1febbbcee2d003f3b59598b8ae6 (commit) via 6f62e83813fecf1bd40a9e30312e3d253adc8398 (commit) via 89b8c50ad206678763f576466362ce4ebd76a30b (commit) via 3409a91faff6593867d18f294e7032a277df7b22 (commit) via 8ecfdfc0e0aded960031c6f6289734caa1b37b66 (commit) via eac35e94c626290aa1c395ba2eb4b87a9541bbd7 (commit) via f38805253247e83eeacbc36bb7700e9e2f7cccac (commit) via 478e831ab9e98e530ddcd2cc3a4a7e0556dd0d81 (commit) via 691cae63dfe0a52e071fd9c69dcb87fc208c6721 (commit) via 538337e7d3c6ab1aa79ba67ccd4406f91ef054d7 (commit) via 397fe346c892ce3391ec868b456e07eb2931fa96 (commit) via 5fd835f35a0ab1f47f9861c18affec4e807acbd7 (commit) via e06fb4817a172588b5790a7f4dc2c8a02c91be88 (commit) from 0dc2fb12d1ef5f97ae8ff8d45a6b712d2c16446e (commit)
- Log ----------------------------------------------------------------- commit 0701779bf0d0f1febbbcee2d003f3b59598b8ae6 Merge: 0dc2fb12d1ef5f97ae8ff8d45a6b712d2c16446e 6f62e83813fecf1bd40a9e30312e3d253adc8398 Author: Michal Čihař mcihar@suse.cz Date: Fri Jun 17 14:48:40 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/en_GB.po po/fr.po
commit 6f62e83813fecf1bd40a9e30312e3d253adc8398 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:22:33 2011 +0200
Translation update done using Pootle.
commit 89b8c50ad206678763f576466362ce4ebd76a30b Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:22:12 2011 +0200
Translation update done using Pootle.
commit 3409a91faff6593867d18f294e7032a277df7b22 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:21:56 2011 +0200
Translation update done using Pootle.
commit 8ecfdfc0e0aded960031c6f6289734caa1b37b66 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:21:47 2011 +0200
Translation update done using Pootle.
commit eac35e94c626290aa1c395ba2eb4b87a9541bbd7 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:21:14 2011 +0200
Translation update done using Pootle.
commit f38805253247e83eeacbc36bb7700e9e2f7cccac Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:21:03 2011 +0200
Translation update done using Pootle.
commit 478e831ab9e98e530ddcd2cc3a4a7e0556dd0d81 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:19:38 2011 +0200
Translation update done using Pootle.
commit 691cae63dfe0a52e071fd9c69dcb87fc208c6721 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:19:21 2011 +0200
Translation update done using Pootle.
commit 538337e7d3c6ab1aa79ba67ccd4406f91ef054d7 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:18:59 2011 +0200
Translation update done using Pootle.
commit 397fe346c892ce3391ec868b456e07eb2931fa96 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:18:48 2011 +0200
Translation update done using Pootle.
commit 5fd835f35a0ab1f47f9861c18affec4e807acbd7 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:18:30 2011 +0200
Translation update done using Pootle.
commit e06fb4817a172588b5790a7f4dc2c8a02c91be88 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 17 14:18:22 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 24 +++++++++++------------- po/fr.po | 24 +++++++++++------------- 2 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index c0dfb8d..d923632 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-17 08:16-0400\n" -"PO-Revision-Date: 2011-06-15 16:58+0200\n" +"PO-Revision-Date: 2011-06-17 14:19+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: english-gb en_GB@li.org\n" "MIME-Version: 1.0\n" @@ -1106,27 +1106,25 @@ msgstr "Server traffic"
#: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "Connections since last refresh"
#: js/messages.php:84 server_status.php:787 msgid "Processes" msgstr "Processes"
#: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Connections" +msgstr "Connections / Processes"
#: js/messages.php:86 msgid "Issued queries since last refresh" -msgstr "" +msgstr "Issued queries since last refresh"
#: js/messages.php:87 -#, fuzzy #| msgid "SQL queries" msgid "Issued queries" -msgstr "SQL queries" +msgstr "Issued queries"
#: js/messages.php:89 server_status.php:401 msgid "Query statistics" @@ -8196,20 +8194,20 @@ msgid "Refresh rate" msgstr "Refresh rate"
#: server_status.php:31 -#, fuzzy, php-format +#, php-format #| msgid "minutes" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "minutes" -msgstr[1] "minutes" +msgstr[0] "%d minute" +msgstr[1] "%d minutes"
#: server_status.php:33 -#, fuzzy, php-format +#, php-format #| msgid "second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "second" -msgstr[1] "second" +msgstr[0] "%d second" +msgstr[1] "%d seconds"
#: server_status.php:134 #, php-format diff --git a/po/fr.po b/po/fr.po index 13fc03e..fd51dc6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-17 08:16-0400\n" -"PO-Revision-Date: 2011-06-15 17:03+0200\n" +"PO-Revision-Date: 2011-06-17 14:22+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "MIME-Version: 1.0\n" @@ -1119,27 +1119,25 @@ msgstr "Trafic du serveur"
#: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "Connexions depuis le dernier rafraîchissement"
#: js/messages.php:84 server_status.php:787 msgid "Processes" msgstr "Processus"
#: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Connexions" +msgstr "Connexions / Processus"
#: js/messages.php:86 msgid "Issued queries since last refresh" -msgstr "" +msgstr "Requêtes reçues depuis le dernier rafraîchissement"
#: js/messages.php:87 -#, fuzzy #| msgid "SQL queries" msgid "Issued queries" -msgstr "Requêtes SQL" +msgstr "Requêtes reçues"
#: js/messages.php:89 server_status.php:401 msgid "Query statistics" @@ -8313,20 +8311,20 @@ msgid "Refresh rate" msgstr "Taux de rafraîchissement"
#: server_status.php:31 -#, fuzzy, php-format +#, php-format #| msgid "minutes" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "minutes" -msgstr[1] "minutes" +msgstr[0] "%d minute" +msgstr[1] "%d minutes"
#: server_status.php:33 -#, fuzzy, php-format +#, php-format #| msgid "second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "seconde" -msgstr[1] "seconde" +msgstr[0] "%d seconde" +msgstr[1] "%d secondes"
#: server_status.php:134 #, php-format
hooks/post-receive
-
Michal Čihař