The branch, master has been updated via 92bedb7cc1a09cd9ead1b093bec01cec17d274b8 (commit) via cedaa951a9a8e48d2012db9420af8f616a2fc626 (commit) via 7dd2b3bea1305bd6c564c0c3318ed0192e8ac808 (commit) via 9c0cea25241cd741d7cae882d752ecbc28a8bf45 (commit) via 201ba1f93d51a0c6dcb244ebdb8243cf41ee541e (commit) via 27dbb8b0357f775a80c52484f3ad290da854542c (commit) via 24386f9fe341966eae9f737924d894ba14448fee (commit) via 61547d85ef6c9276bb7befca8fb702895122780e (commit) via ca22678721cb6869912fdb911a7cff917748a850 (commit) via 70402b4e799ce40d1d827c06ea1c9fecb9c8951f (commit) via d05405b367d42286b2b1a066c9f54aa90fad4847 (commit) via bcaab61722b7d3aea42ef22d43edf4579f770557 (commit) via 7ddebbf61eab15984272027468e85e4dc30eccf5 (commit) via cb7fb6d6b4937e7d6e98614d63f03852e1b9b3c0 (commit) via 3fde0f692b15ab367642f1a465006319576d3516 (commit) via 1105d59f948f4256b6776832d6c822608c0f0cfd (commit) via d48a080bbb8c41e34145e189fa028cc67644621b (commit) via f0cbf5c9fc492fbc3b710f5e3dff961f34d4955c (commit) via 091a9f1a2c5fe85ef5d3f0a8e52ce7242ece6682 (commit) via 3170ccf127280ab13221afa63972e8379a8010ec (commit) via 461cb7288dafd9577da3481a82b7c1cfdfe6796e (commit) via dad4e5ba0f7977cb9600c944bf53d3a72354816e (commit) via 8659ee84cf88ecb1f96ef24d439c02956fef0ddb (commit) via e42d99f0a6fc7562c0697a2e5c90e25fb67d4708 (commit) via 61e6064bef4d67bf89f07c9d5a900d5f38e6ba60 (commit) via b237e41b54cda9fcf4d7a2589852acc06c0f18dd (commit) via 96d5754f615b78ec7d0875271321ec45ff3e8d4a (commit) via 9e3d1e41ac508963210df131de8f942e93f04176 (commit) from cb0b12bf93f094906d90a0218f30e643ab471325 (commit)
- Log ----------------------------------------------------------------- commit 92bedb7cc1a09cd9ead1b093bec01cec17d274b8 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:31:10 2010 +0200
Translation update done using Pootle.
commit cedaa951a9a8e48d2012db9420af8f616a2fc626 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:31:06 2010 +0200
Translation update done using Pootle.
commit 7dd2b3bea1305bd6c564c0c3318ed0192e8ac808 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:31:02 2010 +0200
Translation update done using Pootle.
commit 9c0cea25241cd741d7cae882d752ecbc28a8bf45 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:30:16 2010 +0200
Translation update done using Pootle.
commit 201ba1f93d51a0c6dcb244ebdb8243cf41ee541e Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:30:11 2010 +0200
Translation update done using Pootle.
commit 27dbb8b0357f775a80c52484f3ad290da854542c Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:30:08 2010 +0200
Translation update done using Pootle.
commit 24386f9fe341966eae9f737924d894ba14448fee Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:30:03 2010 +0200
Translation update done using Pootle.
commit 61547d85ef6c9276bb7befca8fb702895122780e Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:29:58 2010 +0200
Translation update done using Pootle.
commit ca22678721cb6869912fdb911a7cff917748a850 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:29:42 2010 +0200
Translation update done using Pootle.
commit 70402b4e799ce40d1d827c06ea1c9fecb9c8951f Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:29:33 2010 +0200
Translation update done using Pootle.
commit d05405b367d42286b2b1a066c9f54aa90fad4847 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:29:08 2010 +0200
Translation update done using Pootle.
commit bcaab61722b7d3aea42ef22d43edf4579f770557 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:29:03 2010 +0200
Translation update done using Pootle.
commit 7ddebbf61eab15984272027468e85e4dc30eccf5 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:59 2010 +0200
Translation update done using Pootle.
commit cb7fb6d6b4937e7d6e98614d63f03852e1b9b3c0 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:49 2010 +0200
Translation update done using Pootle.
commit 3fde0f692b15ab367642f1a465006319576d3516 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:45 2010 +0200
Translation update done using Pootle.
commit 1105d59f948f4256b6776832d6c822608c0f0cfd Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:36 2010 +0200
Translation update done using Pootle.
commit d48a080bbb8c41e34145e189fa028cc67644621b Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:34 2010 +0200
Translation update done using Pootle.
commit f0cbf5c9fc492fbc3b710f5e3dff961f34d4955c Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:31 2010 +0200
Translation update done using Pootle.
commit 091a9f1a2c5fe85ef5d3f0a8e52ce7242ece6682 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:28 2010 +0200
Translation update done using Pootle.
commit 3170ccf127280ab13221afa63972e8379a8010ec Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:22 2010 +0200
Translation update done using Pootle.
commit 461cb7288dafd9577da3481a82b7c1cfdfe6796e Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:18 2010 +0200
Translation update done using Pootle.
commit dad4e5ba0f7977cb9600c944bf53d3a72354816e Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:15 2010 +0200
Translation update done using Pootle.
commit 8659ee84cf88ecb1f96ef24d439c02956fef0ddb Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:28:04 2010 +0200
Translation update done using Pootle.
commit e42d99f0a6fc7562c0697a2e5c90e25fb67d4708 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:27:56 2010 +0200
Translation update done using Pootle.
commit 61e6064bef4d67bf89f07c9d5a900d5f38e6ba60 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:27:53 2010 +0200
Translation update done using Pootle.
commit b237e41b54cda9fcf4d7a2589852acc06c0f18dd Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:27:45 2010 +0200
Translation update done using Pootle.
commit 96d5754f615b78ec7d0875271321ec45ff3e8d4a Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:27:40 2010 +0200
Translation update done using Pootle.
commit 9e3d1e41ac508963210df131de8f942e93f04176 Author: Robert Readman robert_readman@hotmail.com Date: Fri Sep 3 14:27:37 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 124 +++++++++++++++++++++++++++-------------------------------- 1 files changed, 57 insertions(+), 67 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index f67f9e7..966360c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-30 09:59+0300\n" -"PO-Revision-Date: 2010-08-24 14:20+0200\n" +"PO-Revision-Date: 2010-09-03 14:31+0200\n" "Last-Translator: Robert Readman robert_readman@hotmail.com\n" "Language-Team: none\n" "Language: en_GB\n" @@ -2237,9 +2237,9 @@ msgstr "and to hide both "db1" and "db2" use"
#. type: Content of: <html><body><div><dl><dd><pre> #: ../phpmyadmin/Documentation.html:852 -#, fuzzy, no-wrap +#, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" -msgstr "$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';" +msgstr "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:853 @@ -2938,22 +2938,21 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1143 -#, fuzzy msgid "" "<span id="cfg_Servers_userconfig">$cfg['Servers'][$i]['userconfig']</span> " "string" msgstr "" -"<span id="cfg_Servers_user">$cfg['Servers'][$i]['user']</span> string" +"<span id="cfg_Servers_userconfig">$cfg['Servers'][$i]['userconfig']</span> " +"string"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1146 -#, fuzzy msgid "" "Since release 3.4.x phpMyAdmin allows users to set most preferences by " "themselves and store them in the database." msgstr "" -"Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This can be " -"useful for queries you often run." +"Since release 3.4.x phpMyAdmin allows users to set most preferences by " +"themselves and store them in the database."
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1150 @@ -2962,13 +2961,14 @@ msgid "" "users can still personalize phpMyAdmin, but settings will be saved in " "browser's local storage, or, it is is unavailable, until the end of session." msgstr "" +"If you don't allow for storing preferences in <a href="#pmadb">pmadb</a>, " +"users can still personalise phpMyAdmin, but settings will be saved in " +"browser's local storage, or, it is is unavailable, until the end of session."
#. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1160 -#, fuzzy msgid "put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt>" -msgstr "" -"put the relation table name in <tt>$cfg['Servers'][$i]['relation']</tt>" +msgstr "put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt>"
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1165 @@ -3090,13 +3090,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1206 -#, fuzzy msgid "" "If your rule order is empty, then <abbr title="Internet Protocol">IP</" "abbr> authorization is disabled." msgstr "" -"If your rule order is empty, then <abbr title="Internet Protocol">IP</" -"abbr> authentication is disabled." +"If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr> " +"authorisation is disabled."
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1209 @@ -3126,7 +3125,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1219 -#, fuzzy msgid "" "If your rule order is set to 'explicit', authorization is performed in a " "similar fashion to rule order 'deny,allow', with the added restriction that " @@ -3135,10 +3133,10 @@ msgid "" "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order." msgstr "" -"If your rule order is set to 'explicit', the authentication is performed in " -"a similar fashion to rule order 'deny,allow', with the added restriction " -"that your host/username combination <b>must</b> be listed in the <i>allow</" -"i> rules, and not listed in the <i>deny</i> rules. This is the <b>most</b> " +"If your rule order is set to 'explicit', authorisation is performed in a " +"similar fashion to rule order 'deny,allow', with the added restriction that " +"your host/username combination <b>must</b> be listed in the <i>allow</i> " +"rules, and not listed in the <i>deny</i> rules. This is the <b>most</b> " "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order."
@@ -5946,9 +5944,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:2153 -#, fuzzy msgid "$cfg['UserprefsDisallow'] array" -msgstr "$cfg['Servers'] array" +msgstr "$cfg['UserprefsDisallow'] array"
#. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:2154 @@ -5957,6 +5954,9 @@ msgid "" "users can't set through user preferences. For possible values, refer to " "<tt>libraries/config/user_preferences.forms.php</tt>." msgstr "" +"Contains names of configuration options (keys in <tt>$cfg</tt> array) that " +"users can't set through user preferences. For possible values, refer to " +"<tt>libraries/config/user_preferences.forms.php</tt>."
#. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:2158 @@ -7326,17 +7326,15 @@ msgstr ""
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2629 -#, fuzzy msgid "" "<a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet " "Information Services">IIS</abbr>, I'm facing crashes and/or many error " "messages with the <abbr title="HyperText Transfer Protocol">HTTP</abbr>.</" "a>" msgstr "" -"<a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet " -"Information Services">IIS</abbr>, I'm facing crashes and/or many error " -"messages with the <abbr title="HyperText Transfer Protocol">HTTP</abbr> or " -"advanced authentication mode.</a>" +"<a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information " +"Services">IIS</abbr>, I'm facing crashes and/or many error messages with the " +"<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a>"
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2634 @@ -7455,9 +7453,8 @@ msgstr "restart Apache"
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2677 -#, fuzzy msgid "<a href="#faq1_9">1.9 (withdrawn).</a>" -msgstr "<a href="#faq1_3">1.3 (withdrawn).</a>" +msgstr "<a href="#faq1_9">1.9 (withdrawn).</a>"
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2680 @@ -7534,15 +7531,13 @@ msgstr ""
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2709 -#, fuzzy msgid "<a href="#faq1_13">1.13 (withdrawn).</a>" -msgstr "<a href="#faq1_3">1.3 (withdrawn).</a>" +msgstr "<a href="#faq1_13">1.13 (withdrawn).</a>"
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2712 -#, fuzzy msgid "<a href="#faq1_14">1.14 (withdrawn).</a>" -msgstr "<a href="#faq1_18">1.18 (withdrawn).</a>" +msgstr "<a href="#faq1_14">1.14 (withdrawn).</a>"
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2715 @@ -9474,17 +9469,16 @@ msgstr ""
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3461 -#, fuzzy msgid "" "phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/%5C%22%3EPHPExcel</" "a> library to parse Excel XLS and XLSX spreadsheets. Therefore, any " "limitations that are listed on their page regarding Excel calculations will " "also apply here." msgstr "" -"phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/%5C" target=" -""_blank">PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets. " -"Therefore, any limitations that are listed on their page regarding Excel " -"calculations will also apply here." +"phpMyAdmin uses the <a href="http://www.codeplex.com/PHPExcel/%5C%22%3EPHPExcel</a> " +"library to parse Excel XLS and XLSX spreadsheets. Therefore, any " +"limitations that are listed on their page regarding Excel calculations will " +"also apply here."
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3464 @@ -11693,17 +11687,15 @@ msgstr "phpMyAdmin with version"
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4315 -#, fuzzy msgid "" "<a href="#wysiwyg">6.28 How can I easily edit relational schema for export?" "</a>" msgstr "" -"<a href="#faq6_6">6.6 How can I use the relation table in Query-by-example?" -"</a>" +"<a href="#wysiwyg">6.28 How can I easily edit relational schema for " +"export?</a>"
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4318 -#, fuzzy msgid "" "By clicking on the button 'toggle scratchboard' on the page where you edit x/" "y coordinates of those elements you can activate a scratchboard where all " @@ -11713,14 +11705,13 @@ msgid "" "field, the new position in the scratchboard changes after your cursor leaves " "the input field." msgstr "" -"Utilises a WYSIWYG editing control to easily place elements of a <abbr title=" -""Portable Document Format">PDF</abbr> page. By clicking on the button " -"'toggle scratchboard' on the page where you edit x/y coordinates of those " -"elements you can activate a scratchboard where all your elements are placed. " -"By clicking on an element, you can move them around in the pre-defined area " -"and the x/y coordinates will get updated dynamically. Likewise, when " -"entering a new position directly into the input field, the new position in " -"the scratchboard changes after your cursor leaves the input field." +"By clicking on the button 'toggle scratchboard' on the page where you edit " +"x/y coordinates of those elements you can activate a scratchboard where all " +"your elements are placed. By clicking on an element, you can move them " +"around in the pre-defined area and the x/y coordinates will get updated " +"dynamically. Likewise, when entering a new position directly into the input " +"field, the new position in the scratchboard changes after your cursor leaves " +"the input field."
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4327 @@ -11757,12 +11748,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4344 -#, fuzzy msgid "" "<a href="#faq6_29">6.28 Why can't I get a chart from my query result table?" "</a>" msgstr "" -"<a href="#faq6_3">6.3 How can I insert a null value into my table?</a>" +"<a href="#faq6_29">6.28 Why can't I get a chart from my query result " +"table?</a>"
#. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4346 @@ -11773,6 +11764,11 @@ msgid "" "formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:" "Charts#Data_formats_for_query_results_chart">wiki</a>." msgstr "" +"Not every table can be put to the chart. Only tables with one, two or three " +"columns can be visualised as a chart. Moreover the table must be in a " +"special format for chart script to understand it. Currently supported " +"formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Ch" +"arts#Data_formats_for_query_results_chart">wiki</a>."
#. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4348 @@ -12962,9 +12958,8 @@ msgstr "BLOBstreaming support"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4818 -#, fuzzy msgid "Piotr Przybylski (Google Summer of Code 2008 and 2010)" -msgstr "Piotr Przybylski (Google Summer of Code 2008)" +msgstr "Piotr Przybylski (Google Summer of Code 2008 and 2010)"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4820 @@ -12973,9 +12968,8 @@ msgstr "improved setup script"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4821 -#, fuzzy msgid "user preferences" -msgstr "User preferences" +msgstr "user preferences"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4824 @@ -13019,47 +13013,43 @@ msgstr "Replication support"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4844 -#, fuzzy msgid "Muhammad Adnan (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Muhammad Adnan (Google Summer of Code 2010)"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4846 msgid "Relation schema export to multiple formats" -msgstr "" +msgstr "Relation schema export to multiple formats"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4849 -#, fuzzy msgid "Lori Lee (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Lori Lee (Google Summer of Code 2010)"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4851 -#, fuzzy msgid "User interface improvements" -msgstr "interface improvements" +msgstr "User interface improvements"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4852 msgid "ENUM/SET editor" -msgstr "" +msgstr "ENUM/SET editor"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4853 msgid "Simplified interface for export/import" -msgstr "" +msgstr "Simplified interface for export/import"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4856 -#, fuzzy msgid "Ninad Pundalik (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Ninad Pundalik (Google Summer of Code 2010)"
#. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4858 msgid "AJAXifying the interface" -msgstr "" +msgstr "AJAXifying the interface"
#. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4861
hooks/post-receive