The branch, master has been updated via 500daacd24292fdf2524eb2a99bf86ccaf1d9e2e (commit) via 267d6b277280f5ca6bd4c28a761e3e81f4cdccf1 (commit) via 614639a5c5d94b9c693f7ec6e32c1a6e71a7e203 (commit) via 3a27183455786ee0094afdcf14f0db4b1b777cf8 (commit) via 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) via e9c3e1dc33bc58e683548883978472074d13c0d9 (commit) via b62b781df2bfc12f51cdaed900f2718478a7f0cc (commit) via 682533fca48249384564d3925824bb8ae0a6b161 (commit) via eb308e6a1323a389cd93670386e51849c7792d68 (commit) from 49a39787c3d44817c4c9056e0488d420a0e000ab (commit)
- Log ----------------------------------------------------------------- commit 500daacd24292fdf2524eb2a99bf86ccaf1d9e2e Merge: 267d6b277280f5ca6bd4c28a761e3e81f4cdccf1 3a27183455786ee0094afdcf14f0db4b1b777cf8 Author: Michal Čihař mcihar@suse.cz Date: Tue Jun 28 09:52:31 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit 267d6b277280f5ca6bd4c28a761e3e81f4cdccf1 Merge: 49a39787c3d44817c4c9056e0488d420a0e000ab 614639a5c5d94b9c693f7ec6e32c1a6e71a7e203 Author: Michal Čihař mcihar@suse.cz Date: Tue Jun 28 09:52:28 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit 3a27183455786ee0094afdcf14f0db4b1b777cf8 Merge: e9c3e1dc33bc58e683548883978472074d13c0d9 49a39787c3d44817c4c9056e0488d420a0e000ab Author: Pootle server pootle@cihar.com Date: Mon Jun 27 16:40:14 2011 +0200
Merge remote-tracking branch 'origin/master'
commit e9c3e1dc33bc58e683548883978472074d13c0d9 Author: Marc Delisle marc@infomarc.info Date: Mon Jun 27 15:26:01 2011 +0200
Translation update done using Pootle.
commit b62b781df2bfc12f51cdaed900f2718478a7f0cc Author: Marc Delisle marc@infomarc.info Date: Mon Jun 27 15:25:31 2011 +0200
Translation update done using Pootle.
commit 682533fca48249384564d3925824bb8ae0a6b161 Author: Marc Delisle marc@infomarc.info Date: Mon Jun 27 15:25:20 2011 +0200
Translation update done using Pootle.
commit eb308e6a1323a389cd93670386e51849c7792d68 Author: Marc Delisle marc@infomarc.info Date: Mon Jun 27 15:25:10 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 11 ++++------- po/fr.po | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index 32f2201..2b883de 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-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-26 13:27+0200\n" +"PO-Revision-Date: 2011-06-27 15:25+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: english-gb en_GB@li.org\n" "Language: en_GB\n" @@ -4727,10 +4727,9 @@ msgid "Turn it off" msgstr "Turn it off"
#: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new Event" msgid "Add an event" -msgstr "Add a new Event" +msgstr "Add an event"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 @@ -5386,10 +5385,9 @@ msgid "Event" msgstr "Event"
#: libraries/display_triggers.inc.php:120 -#, fuzzy #| msgid "Add a new Trigger" msgid "Add a trigger" -msgstr "Add a new Trigger" +msgstr "Add a trigger"
#: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" @@ -7152,10 +7150,9 @@ msgid "PARTITION definition" msgstr "PARTITION definition"
#: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ Add a new value" +msgstr "+ Add a value"
#: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" diff --git a/po/fr.po b/po/fr.po index a64cc20..16cbae3 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-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-26 13:35+0200\n" +"PO-Revision-Date: 2011-06-27 15:26+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "Language: fr\n" @@ -7232,7 +7232,6 @@ msgid "PARTITION definition" msgstr "Définition de PARTITION"
#: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" msgstr "+ Ajouter une valeur"
hooks/post-receive
-
Michal Čihař