The branch, master has been updated via 20619dd544b180f2040bb4068a2891e7fb8cc622 (commit) via 71a2f0fd2b45cbc102dd3595630e7ea61404bb88 (commit) via f5b5ec01b5c51074605b5e19d319e3a2bd2d567a (commit) via 1c63b1eb40a45c116dd24125778efdcbb961e750 (commit) via b9eb3a4f14d482e6724536642c2487e7d0f0ed6a (commit) via 7afe86c00da8218a292bb5f99b37572b61c72b91 (commit) via 9112f2406dab235d59fb15525eeed3aa9255f167 (commit) via 8f45948aae8f297ee00b2c5086837abaf86a2546 (commit) via a1eefd1d62f4bf807c36c2a981255fa323a6d53f (commit) from 70bc1761c35543d6f00bbf5d8df1b29d425997cc (commit)

- Log ----------------------------------------------------------------- commit 20619dd544b180f2040bb4068a2891e7fb8cc622 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:21:00 2011 +0200

Translation update done using Pootle.

commit 71a2f0fd2b45cbc102dd3595630e7ea61404bb88 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:20:18 2011 +0200

Translation update done using Pootle.

commit f5b5ec01b5c51074605b5e19d319e3a2bd2d567a Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:20:07 2011 +0200

Translation update done using Pootle.

commit 1c63b1eb40a45c116dd24125778efdcbb961e750 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:19:04 2011 +0200

Translation update done using Pootle.

commit b9eb3a4f14d482e6724536642c2487e7d0f0ed6a Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:19:00 2011 +0200

Translation update done using Pootle.

commit 7afe86c00da8218a292bb5f99b37572b61c72b91 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:18:18 2011 +0200

Translation update done using Pootle.

commit 9112f2406dab235d59fb15525eeed3aa9255f167 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:16:19 2011 +0200

Translation update done using Pootle.

commit 8f45948aae8f297ee00b2c5086837abaf86a2546 Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:15:20 2011 +0200

Translation update done using Pootle.

commit a1eefd1d62f4bf807c36c2a981255fa323a6d53f Author: Robert Readman robert_readman@hotmail.com Date: Sat Jan 1 10:15:07 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/en_GB.po | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po index 5914a92..d44ba48 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-29 08:42-0500\n" -"PO-Revision-Date: 2010-12-29 20:37+0200\n" -"Last-Translator: Marc Delisle marc@infomarc.info\n" +"PO-Revision-Date: 2011-01-01 10:21+0200\n" +"Last-Translator: Robert Readman robert_readman@hotmail.com\n" "Language-Team: english-gb en_GB@li.org\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -5073,7 +5073,7 @@ msgid "" "A ":" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" -"A ":" delimited list of metadata headers to be used to initialize the " +"A ":" delimited list of metadata headers to be used to initialise the " "pbms_metadata_header table when a database is created."

#: libraries/engines/pbxt.lib.php:22 @@ -5378,7 +5378,7 @@ msgstr "" msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" -"Database system or older MySQL server to maximize output compatibility with:" +"Database system or older MySQL server to maximise output compatibility with:"

#: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 @@ -6424,7 +6424,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "The SQL validator could not be initialised. Please check if you have " -"installed the necessary PHP extensions as described in the %sdocumentation%s." +"installed the necessary PHP extensions as described in the %sdocumentation%" +"s."

#: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6720,7 +6721,7 @@ msgstr "Appearance Settings"

#: main.php:135 msgid "Background color" -msgstr "Background color" +msgstr "Background colour"

#: main.php:136 msgid "Choose..." @@ -8297,7 +8298,8 @@ msgid "" msgstr "" "The total cost of the last compiled query as computed by the query " "optimiser. Useful for comparing the cost of different query plans for the " -"same query. The default value of 0 means that no query has been compiled yet." +"same query. The default value of 0 means that no query has been compiled " +"yet."

#: server_status.php:118 msgid "The number of rows waiting to be written in INSERT DELAYED queues."

hooks/post-receive