Merge remote-tracking branch 'origin/master' into aris

This commit is contained in:
Aris Feryanto 2011-06-28 17:52:27 +08:00
commit 5184256f10
2 changed files with 5 additions and 9 deletions

View File

@ -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 ""

View File

@ -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"