The branch, master has been updated via 3439abf8eb19c89107c98a72ee28878393012fc9 (commit) via ab29c8a34c3b0160f788d772d03de61895b45af4 (commit) via 0e794f100c828a9eae6920e1cb873010ec72cd91 (commit) via a842615d62fc9ec3780744532e24af9140c23e76 (commit) via c00d0f748aac05fd0ac3e814d48e0fafc53fd3c5 (commit) via e2a1f67e3e6ee3a7222d4735f4a1c5fe520ef1b4 (commit) via 5184188042ad10c2ec929dd936be816dc0730599 (commit) via 90cc1d827adfe07cb6c7b2013c2c66ca3820154c (commit) via a79c5fa74c2fb54913b6bf92e00676671f0eea1b (commit) via 32e353a44ce3978bd9589a5765e8b14f5d67dd5c (commit) via b67e04a581ec942db3ec97b7b20058f5713ee68a (commit) from 7185d34aaa2b56be7308de2366eea3203c111cf5 (commit)
- Log ----------------------------------------------------------------- commit 3439abf8eb19c89107c98a72ee28878393012fc9 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:48:07 2010 +0200
Translation update done using Pootle.
commit ab29c8a34c3b0160f788d772d03de61895b45af4 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:47:53 2010 +0200
Translation update done using Pootle.
commit 0e794f100c828a9eae6920e1cb873010ec72cd91 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:47:42 2010 +0200
Translation update done using Pootle.
commit a842615d62fc9ec3780744532e24af9140c23e76 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:47:28 2010 +0200
Translation update done using Pootle.
commit c00d0f748aac05fd0ac3e814d48e0fafc53fd3c5 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:47:14 2010 +0200
Translation update done using Pootle.
commit e2a1f67e3e6ee3a7222d4735f4a1c5fe520ef1b4 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:47:06 2010 +0200
Translation update done using Pootle.
commit 5184188042ad10c2ec929dd936be816dc0730599 Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:46:39 2010 +0200
Translation update done using Pootle.
commit 90cc1d827adfe07cb6c7b2013c2c66ca3820154c Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:46:24 2010 +0200
Translation update done using Pootle.
commit a79c5fa74c2fb54913b6bf92e00676671f0eea1b Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:46:16 2010 +0200
Translation update done using Pootle.
commit 32e353a44ce3978bd9589a5765e8b14f5d67dd5c Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:42:46 2010 +0200
Translation update done using Pootle.
commit b67e04a581ec942db3ec97b7b20058f5713ee68a Author: Robert Readman robert_readman@hotmail.com Date: Wed Jul 21 19:41:55 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 68 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index ddb4e1a..50389d4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,13 +8,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-21 13:51+0300\n" -"PO-Revision-Date: 2010-01-25 13:26+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-07-21 19:48+0200\n" +"Last-Translator: Robert Readman robert_readman@hotmail.com\n" "Language-Team: none\n" -"Language: \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n"
#. type: Content of: <html><head><title> #: ../phpmyadmin/Documentation.html:13 @@ -884,14 +886,14 @@ msgstr ""
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:342 -#, fuzzy msgid "" "If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, " "please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create " "new tables by importing <i>./scripts/create_tables.sql</i>." msgstr "" "If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, " -"please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>." +"please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create " +"new tables by importing <i>./scripts/create_tables.sql</i>."
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:346 @@ -4672,9 +4674,8 @@ msgstr "recode - use recode_string function"
#. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1694 -#, fuzzy msgid "none - disable encoding conversion" -msgstr "Encoding conversion" +msgstr "none - disable encoding conversion"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1696 ../phpmyadmin/Documentation.html:1742 @@ -4683,16 +4684,15 @@ msgstr "Default is auto."
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1698 -#, fuzzy msgid "" "Enabled charset conversion activates a pull-down menu in the Export and " "Import pages, to choose the character set when exporting a file. The default " "value in this menu comes from <tt>$cfg['Export']['charset']</tt> and <tt>$cfg" "['Import']['charset']</tt>." msgstr "" -"Setting this to <tt>TRUE</tt> also activates a pull-down menu in the Export " -"and Import pages, to choose the character set when exporting a file. The " -"default value in this menu comes from <tt>$cfg['Export']['charset']</tt> and " +"Enabled charset conversion activates a pull-down menu in the Export and " +"Import pages, to choose the character set when exporting a file. The default " +"value in this menu comes from <tt>$cfg['Export']['charset']</tt> and " "<tt>$cfg['Import']['charset']</tt>."
#. type: Content of: <html><body><div><dl><dt> @@ -5210,13 +5210,12 @@ msgstr "$cfg['LimitChars'] integer"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1857 -#, fuzzy msgid "" "Maximum number of characters shown in any non-numeric field on browse view. " "Can be turned off by a toggle button on the browse page." msgstr "" -"Maximum number of characters showen in any non-numeric column on browse " -"view. Can be turned off by a toggle button on the browse page." +"Maximum number of characters shown in any non-numeric field on browse view. " +"Can be turned off by a toggle button on the browse page."
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1860 @@ -5960,13 +5959,12 @@ msgstr "$cfg['TitleDefault'] string"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:2153 -#, fuzzy msgid "" "Allows you to specify window's title bar. You can use <a href=" ""#faq6_27">format string expansion</a>." msgstr "" -"Allows you to specify window's title bar. Following magic string can be used " -"to get special values:" +"Allows you to specify window's title bar. You can use <a " +"href="#faq6_27">format string expansion</a>."
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:2157 @@ -11155,7 +11153,6 @@ msgstr ""
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4112 -#, fuzzy msgid "" "To use SQL Validator, you need PHP with <abbr title="Extensible Markup " "Language">XML</abbr>, <abbr title="Perl Compatible Regular Expressions" @@ -11164,17 +11161,15 @@ msgid "" "Access Protocol">SOAP</abbr> support, either as a PHP extension or as a " "PEAR SOAP module." msgstr "" -"To use it, you need a very recent version of PHP, 4.3.0 recommended, with " -"<abbr title="Extensible Markup Language">XML</abbr>, <abbr title="Perl " -"Compatible Regular Expressions">PCRE</abbr> and <abbr title="PHP Extension " -"and Application Repository">PEAR</abbr> support. On your system command " -"line, run <tt>"pear install Net_Socket Net_URL HTTP_Request Mail_Mime " -"Net_DIME SOAP"</tt> to get the necessary <abbr title="PHP Extension and " -"Application Repository">PEAR</abbr> modules for usage." +"To use SQL Validator, you need PHP with <abbr title="Extensible Markup " +"Language">XML</abbr>, <abbr title="Perl Compatible Regular " +"Expressions">PCRE</abbr> and <abbr title="PHP Extension and Application " +"Repository">PEAR</abbr> support. In addition you need a <abbr title="Simple " +"Object Access Protocol">SOAP</abbr> support, either as a PHP extension or " +"as a PEAR SOAP module."
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4122 -#, fuzzy msgid "" "To install <abbr title="PHP Extension and Application Repository">PEAR</" "abbr> <abbr title="Simple Object Access Protocol">SOAP</abbr> module, run " @@ -11182,13 +11177,12 @@ msgid "" ""</tt> to get the necessary <abbr title="PHP Extension and Application " "Repository">PEAR</abbr> modules for usage." msgstr "" -"To use it, you need a very recent version of PHP, 4.3.0 recommended, with " -"<abbr title="Extensible Markup Language">XML</abbr>, <abbr title="Perl " -"Compatible Regular Expressions">PCRE</abbr> and <abbr title="PHP Extension " -"and Application Repository">PEAR</abbr> support. On your system command " -"line, run <tt>"pear install Net_Socket Net_URL HTTP_Request Mail_Mime " -"Net_DIME SOAP"</tt> to get the necessary <abbr title="PHP Extension and " -"Application Repository">PEAR</abbr> modules for usage." +"To install <abbr title="PHP Extension and Application " +"Repository">PEAR</abbr> <abbr title="Simple Object Access " +"Protocol">SOAP</abbr> module, run <tt>"pear install Net_Socket Net_URL " +"HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr " +"title="PHP Extension and Application Repository">PEAR</abbr> modules for " +"usage."
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4131 @@ -11730,9 +11724,8 @@ msgstr ""
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4327 -#, fuzzy msgid "<a href="#faq6_27">6.27 What format strings can I use?</a>" -msgstr "<a href="#faq6_26">6.26 How can I select a range of rows?</a>" +msgstr "<a href="#faq6_27">6.27 What format strings can I use?</a>"
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4330 @@ -11743,6 +11736,11 @@ msgid "" "(eg. if you don't have chosen table, you can not get table name), but " "following variables can be used:" msgstr "" +"In all places where phpMyAdmin accepts format strings, you can use " +"<code>@VARIABLE@</code> expansion and <a " +"href="http://php.net/strftime%5C%22%3Estrftime</a> format strings. The expanded " +"variables depend on a context (e.g. if you don't have chosen table, you can " +"not get table name), but following variables can be used:"
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:4337
hooks/post-receive