The branch, master has been updated via ae38d7acd5c13d62c1fa47916daebc4f76402dde (commit) via 8072bf74543aa4dd134c9317c46f065491d9d5a2 (commit) via 3c5a15fff0e6e5dd4c2051e5c09937409e9f9d4f (commit) via 728e29a4cbd32d8d523e59c03bc498e7b7002f7b (commit) via cb2f068030626a46d37992eb4476e09fda3d529f (commit) via 351fa7cf5c87e62f4c3292eb5784946580ec40bf (commit) via 71c813f395cad4d3cf09c1d1b856bce2c6a83f97 (commit) via 863027617a913949ea6543d4d15ca3caa308b7e1 (commit) via 8311d63096de2ef02ee4c7c27f2ab0262b8600b6 (commit) via a0babe4b12e1d2db5fee9408936eb1b66272351a (commit) via 9801ade988a1056aae005dff493a7a58ff43287f (commit) via 3b845d8a0c0f3e57b12843dde5883bdfd37e6979 (commit) via ae906296119c1da7c443e7755c59ba0c778fe827 (commit) via 13b82742881915978bf209298d72a3fecd521dd1 (commit) via 6c8e5d6794037d4446f6f252990c96661f91487f (commit) via 2c3c4db59e4e22afd202d71c0237a77f66221694 (commit) via 6c31bf3c69edf9a8018f722d4573484044202d0d (commit) via 418e75d9020700ef5c1f319d11e1de0ad1be7efd (commit) via 37ebf51e345fb80f916c4f7e3a985145a08fe784 (commit) via f5212843cbecfc7409c7cec90f26c2ce02ca84aa (commit) via eda94ec423349aaea5efbd6fc780b9fee5e47a2c (commit) via c1c0ed72e11e01513cc6e59c668ad79a26e20dcf (commit) via 07fe92d8509d9dc1dc37f0f0788d3fe6b5eaaca2 (commit) via 5b9f01befef770225c1399328dab497b52d75c14 (commit) via 0eb802b21db097c932127d4f39bb27286c71d012 (commit) via 9c37fdd20c252bbc876dcbdc86093b5c1f708373 (commit) via 299454e2d3c3f2b9f1b5c1c61a9bce4e9c80bc5d (commit) via 484c3ae57a3917cbb5f798a512470cf2de1c8194 (commit) via 10fc961643ab7a08be2c4994252148a6ba810b7e (commit) via 00ccb3dbc9609de7a78dd4965512900286102bf6 (commit) via 28c6f2df9d5183ee7b6e4bc4d1656f3633e468fc (commit) via 485c005eff89759a329f2020748e38c13ea651f1 (commit) via c97b228e46ed3278ede022fd69d87009223eb51b (commit) via 83e7bcbf4ab1c234b0f7b7db8525dd260fa113f5 (commit) via 0f748dbf8b40653466e1911c563d2e876e7a061e (commit) via 8283a5d05cfa339c8eea07c39472744cefc20c13 (commit) via 5beb9c69bc6198970f8fccbac512519d79fbbe14 (commit) via 2e9096d9b185fcc848271435b7e0f2dad5e996f1 (commit) via 80ba68252a39f106ad30bf553c855f383f6c8edf (commit) via b3e47be5a080d9ef1561929dfd57b9cbe6054c61 (commit) via b4944be5e03489f0083b45374645a08cb2f14b87 (commit) via f7e438056240e3a6fa854ecc708c9166be669e91 (commit) via e9224152822c99d5acfc447f74f5b21b75f6bb84 (commit) via d0e6030523b278ebaddf611c403cdb290a770991 (commit) via 7b2f8e6d9923fffa6951cdb9f9896195aa313bab (commit) via f9e0b57c3ce2cf4d711ca56c231685c050ec1121 (commit) via 7cfc5517c79f498114ab675414dbe073afa2bdb7 (commit) from 7067db1516b1abcfbfb8671794c7076b428de64b (commit) - Log ----------------------------------------------------------------- commit ae38d7acd5c13d62c1fa47916daebc4f76402dde Author: Michal Čihař <michal@cihar.com> Date: Sat Jan 1 15:32:33 2011 +0100 Generate docs commit 8072bf74543aa4dd134c9317c46f065491d9d5a2 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:52:10 2011 +0200 Translation update done using Pootle. commit 3c5a15fff0e6e5dd4c2051e5c09937409e9f9d4f Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:58 2011 +0200 Translation update done using Pootle. commit 728e29a4cbd32d8d523e59c03bc498e7b7002f7b Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:41 2011 +0200 Translation update done using Pootle. commit cb2f068030626a46d37992eb4476e09fda3d529f Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:38 2011 +0200 Translation update done using Pootle. commit 351fa7cf5c87e62f4c3292eb5784946580ec40bf Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:30 2011 +0200 Translation update done using Pootle. commit 71c813f395cad4d3cf09c1d1b856bce2c6a83f97 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:23 2011 +0200 Translation update done using Pootle. commit 863027617a913949ea6543d4d15ca3caa308b7e1 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:16 2011 +0200 Translation update done using Pootle. commit 8311d63096de2ef02ee4c7c27f2ab0262b8600b6 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:51:06 2011 +0200 Translation update done using Pootle. commit a0babe4b12e1d2db5fee9408936eb1b66272351a Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:58 2011 +0200 Translation update done using Pootle. commit 9801ade988a1056aae005dff493a7a58ff43287f Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:50 2011 +0200 Translation update done using Pootle. commit 3b845d8a0c0f3e57b12843dde5883bdfd37e6979 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:40 2011 +0200 Translation update done using Pootle. commit ae906296119c1da7c443e7755c59ba0c778fe827 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:31 2011 +0200 Translation update done using Pootle. commit 13b82742881915978bf209298d72a3fecd521dd1 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:25 2011 +0200 Translation update done using Pootle. commit 6c8e5d6794037d4446f6f252990c96661f91487f Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:22 2011 +0200 Translation update done using Pootle. commit 2c3c4db59e4e22afd202d71c0237a77f66221694 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:19 2011 +0200 Translation update done using Pootle. commit 6c31bf3c69edf9a8018f722d4573484044202d0d Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:16 2011 +0200 Translation update done using Pootle. commit 418e75d9020700ef5c1f319d11e1de0ad1be7efd Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:10 2011 +0200 Translation update done using Pootle. commit 37ebf51e345fb80f916c4f7e3a985145a08fe784 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:06 2011 +0200 Translation update done using Pootle. commit f5212843cbecfc7409c7cec90f26c2ce02ca84aa Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:50:02 2011 +0200 Translation update done using Pootle. commit eda94ec423349aaea5efbd6fc780b9fee5e47a2c Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:49:58 2011 +0200 Translation update done using Pootle. commit c1c0ed72e11e01513cc6e59c668ad79a26e20dcf Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:49:53 2011 +0200 Translation update done using Pootle. commit 07fe92d8509d9dc1dc37f0f0788d3fe6b5eaaca2 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:49:43 2011 +0200 Translation update done using Pootle. commit 5b9f01befef770225c1399328dab497b52d75c14 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:49:20 2011 +0200 Translation update done using Pootle. commit 0eb802b21db097c932127d4f39bb27286c71d012 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:49:13 2011 +0200 Translation update done using Pootle. commit 9c37fdd20c252bbc876dcbdc86093b5c1f708373 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:48:50 2011 +0200 Translation update done using Pootle. commit 299454e2d3c3f2b9f1b5c1c61a9bce4e9c80bc5d Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:55 2011 +0200 Translation update done using Pootle. commit 484c3ae57a3917cbb5f798a512470cf2de1c8194 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:47 2011 +0200 Translation update done using Pootle. commit 10fc961643ab7a08be2c4994252148a6ba810b7e Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:36 2011 +0200 Translation update done using Pootle. commit 00ccb3dbc9609de7a78dd4965512900286102bf6 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:28 2011 +0200 Translation update done using Pootle. commit 28c6f2df9d5183ee7b6e4bc4d1656f3633e468fc Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:21 2011 +0200 Translation update done using Pootle. commit 485c005eff89759a329f2020748e38c13ea651f1 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:12 2011 +0200 Translation update done using Pootle. commit c97b228e46ed3278ede022fd69d87009223eb51b Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:47:04 2011 +0200 Translation update done using Pootle. commit 83e7bcbf4ab1c234b0f7b7db8525dd260fa113f5 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:59 2011 +0200 Translation update done using Pootle. commit 0f748dbf8b40653466e1911c563d2e876e7a061e Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:52 2011 +0200 Translation update done using Pootle. commit 8283a5d05cfa339c8eea07c39472744cefc20c13 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:44 2011 +0200 Translation update done using Pootle. commit 5beb9c69bc6198970f8fccbac512519d79fbbe14 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:38 2011 +0200 Translation update done using Pootle. commit 2e9096d9b185fcc848271435b7e0f2dad5e996f1 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:31 2011 +0200 Translation update done using Pootle. commit 80ba68252a39f106ad30bf553c855f383f6c8edf Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:24 2011 +0200 Translation update done using Pootle. commit b3e47be5a080d9ef1561929dfd57b9cbe6054c61 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:18 2011 +0200 Translation update done using Pootle. commit b4944be5e03489f0083b45374645a08cb2f14b87 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:46:06 2011 +0200 Translation update done using Pootle. commit f7e438056240e3a6fa854ecc708c9166be669e91 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:45:48 2011 +0200 Translation update done using Pootle. commit e9224152822c99d5acfc447f74f5b21b75f6bb84 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:45:30 2011 +0200 Translation update done using Pootle. commit d0e6030523b278ebaddf611c403cdb290a770991 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:45:26 2011 +0200 Translation update done using Pootle. commit 7b2f8e6d9923fffa6951cdb9f9896195aa313bab Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:45:11 2011 +0200 Translation update done using Pootle. commit f9e0b57c3ce2cf4d711ca56c231685c050ec1121 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:44:54 2011 +0200 Translation update done using Pootle. commit 7cfc5517c79f498114ab675414dbe073afa2bdb7 Author: Robert Readman <robert_readman@hotmail.com> Date: Sat Jan 1 10:44:44 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/en_GB/Documentation.html | 26 +++--- output/en_GB/README | 2 +- po/en_GB.po | 225 ++++++++++++++++----------------------- 3 files changed, 104 insertions(+), 149 deletions(-) diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index 70706c3..eaf37ab 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -1822,20 +1822,20 @@ have problems with long URLs. Default is <code>1000</code>. </dd> <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS -color for background]<br /> +colour for background]<br /> <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS -color for background] +colour for background] </dt> <dd>The background styles used for both the frames. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br /> + <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS colour for background]<br /> <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS -color]</dt> +colour]</dt> <dd>The style used for the pointer in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS color]<br /> + <dt id="cfg_NaviDatabaseNameColor">$cfg['NaviDatabaseNameColor'] string [CSS colour]<br /> </dt> <dd>The colour used for the database name in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> @@ -1848,29 +1848,29 @@ color]</dt> <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br /> - <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt> + <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS colour for background]<br /> + <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS colour]</dt> <dd>The style used for table headers. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt> + <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS colour]</dt> <dd>The colour (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt> + <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS colour]</dt> <dd>The colour (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] -</span>string [CSS color]<br /> +</span>string [CSS colour]<br /> <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string -[CSS color]<br /> +[CSS colour]<br /> <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] -</span>string [CSS color]<br /> +</span>string [CSS colour]<br /> <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string -[CSS color] +[CSS colour] </dt> <dd>The colours (HTML) uses for the pointer and the marker in browse mode.<br /> The former feature highlights the row over which your mouse is passing and diff --git a/output/en_GB/README b/output/en_GB/README index 5901d75..83a4398 100644 --- a/output/en_GB/README +++ b/output/en_GB/README @@ -77,7 +77,7 @@ The phpMyAdmin Devel team PS: -Please, don't send us emails with question like "How do I compile PHP with +Please, don't send us e-mails with question like "How do I compile PHP with MySQL-support". We just don't have the time to be your free help desk. Please send your questions to the appropriate mailing lists / forums. diff --git a/po/en_GB.po b/po/en_GB.po index 55fd7c3..2b820fe 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-12-31 15:54+0100\n" -"PO-Revision-Date: 2010-10-22 10:25+0200\n" +"PO-Revision-Date: 2011-01-01 10:52+0200\n" "Last-Translator: Robert Readman <robert_readman@hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -20,19 +20,17 @@ msgstr "" #. type: Content of: <html><head><title> #: orig-docs/Documentation.html:12 -#, fuzzy msgid "phpMyAdmin @@VER@@ - Documentation" -msgstr "phpMyAdmin documentation" +msgstr "phpMyAdmin @@VER@@ - Documentation" #. type: Content of: <html><body><div><h1> #: orig-docs/Documentation.html:19 -#, fuzzy msgid "" "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" "span></a> @@VER@@ Documentation" msgstr "" -"<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" -"span></a> 3.4.0-dev Documentation" +"<a href=\"http://www.phpmyadmin.net/\">php<span " +"class=\"myadmin\">MyAdmin</span></a> @@VER@@ Documentation" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:27 @@ -397,12 +395,13 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:140 -#, fuzzy msgid "" "communicate in <a href=\"http://www.phpmyadmin.net/home_page/translations.php" "\">62 different languages</a>" msgstr "" -"communicate in <a href=\"./translators.html\">58 different languages</a>" +"communicate in <a " +"href=\"http://www.phpmyadmin.net/home_page/translations.php\">62 different " +"languages</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -2200,16 +2199,16 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:840 -#, fuzzy msgid "" "Regular expression for hiding some databases from unprivileged users. This " "only hides them from listing, but a user is still able to access them " "(using, for example, the SQL query area). To limit access, use the MySQL " "privilege system." msgstr "" -"Regular expression for hiding some databases. This only hides them from " -"listing, but a user is still able to access them (using, for example, the " -"SQL query area). To limit access, use the MySQL privilege system." +"Regular expression for hiding some databases from unprivileged users. This " +"only hides them from listing, but a user is still able to access them " +"(using, for example, the SQL query area). To limit access, use the MySQL " +"privilege system." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:845 @@ -4007,20 +4006,19 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1488 -#, fuzzy msgid "$cfg['LeftDisplayTableFilterMinimum'] integer" -msgstr "$cfg['LeftDisplayTableFilter'] boolean" +msgstr "$cfg['LeftDisplayTableFilterMinimum'] integer" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1490 -#, fuzzy msgid "" "Defines the minimum number of tables to display a JavaScript filter box " "above the list of tables in the left frame. Defaults to <tt>30</tt>. To " "disable the filter completely some high number can he used (e.g. 9999)" msgstr "" -"Defines whether or not to display a JavaScript filter box above the list of " -"tables in the left frame. Defaults to <tt>TRUE</tt>." +"Defines the minimum number of tables to display a JavaScript filter box " +"above the list of tables in the left frame. Defaults to <tt>30</tt>. To " +"disable the filter completely some high number can he used (e.g. 9999)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1495 @@ -4924,23 +4922,21 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1789 -#, fuzzy msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [valid " -"css code for background]" +"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " +"colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1790 -#, fuzzy msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [valid " -"css code for background]" +"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " +"colour for background]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1792 @@ -4953,19 +4949,17 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1795 -#, fuzzy msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "$cfg['NaviPointerBackground'] string [valid css code for background]" +msgstr "$cfg['NaviPointerBackground'] string [CSS colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1796 -#, fuzzy msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" -"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " -"[valid css color]" +"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string [CSS " +"colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1797 @@ -4978,9 +4972,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1800 -#, fuzzy msgid "$cfg['NaviDatabaseNameColor'] string [CSS color]" -msgstr "$cfg['NaviDatabaseNameColor'] string [valid css code]" +msgstr "$cfg['NaviDatabaseNameColor'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1802 @@ -5019,16 +5012,13 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1813 -#, fuzzy msgid "$cfg['ThBackground'] string [CSS color for background]" -msgstr "$cfg['ThBackground'] string [valid css code for background]" +msgstr "$cfg['ThBackground'] string [CSS colour for background]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1814 -#, fuzzy msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" -"<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [valid css color]" +msgstr "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1815 @@ -5041,9 +5031,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1818 -#, fuzzy msgid "$cfg['BgOne'] string [CSS color]" -msgstr "$cfg['BgOne'] string [HTML color]" +msgstr "$cfg['BgOne'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1819 @@ -5056,9 +5045,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1822 -#, fuzzy msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "$cfg['BgTwo'] string [HTML color]" +msgstr "$cfg['BgTwo'] string [CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1823 @@ -5071,43 +5059,39 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1826 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" -"span>string [HTML color]" +"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] " +"</span>string [CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1827 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " -"[HTML color]" +"[CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1828 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" -"span>string [HTML color]" +"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] " +"</span>string [CSS colour]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1829 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " -"[HTML color]" +"[CSS colour]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1831 @@ -5116,7 +5100,6 @@ msgstr "The colours (HTML) uses for the pointer and the marker in browse mode." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1832 -#, fuzzy msgid "" "The former feature highlights the row over which your mouse is passing and " "the latter lets you visually mark/unmark rows by clicking on them. " @@ -5124,7 +5107,9 @@ msgid "" "column's header (outside of the text)." msgstr "" "The former feature highlights the row over which your mouse is passing and " -"the latter lets you visually mark/unmark rows by clicking on them." +"the latter lets you visually mark/unmark rows by clicking on them. " +"Highlighting / marking a column is done by hovering over / clicking the " +"column's header (outside of the text)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1836 orig-docs/Documentation.html:1842 @@ -7461,13 +7446,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2679 -#, fuzzy msgid "" "The MySQL manual explains how to <a href=\"http://dev.mysql.com/doc/mysql/en/" "resetting-permissions.html\"> reset the permissions</a>." msgstr "" -"The MySQL manual explains how to <a href=\"http://www.mysql.com/doc/R/e/" -"Resetting_permissions.html\"> reset the permissions</a>." +"The MySQL manual explains how to <a href=\"http://dev.mysql.com/doc/mysql/en" +"/resetting-permissions.html\"> reset the permissions</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2684 @@ -7593,7 +7577,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2735 -#, fuzzy msgid "" "Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older " "MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can " @@ -7603,15 +7586,15 @@ msgid "" "latter one should be used unless you have good reason not to do so." msgstr "" "Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older " -"MySQL versions, you need to use 2.8.x branch. phpMyAdmin can connect to your " -"MySQL server using PHP's classic <a href=\"http://php.net/mysql\">MySQL " -"extension</a> as well as the <a href=\"http://php.net/mysqli\">improved " -"MySQL extension (MySQLi)</a> that is available in php 5.0. The latter one " -"should be used unless you have good reason not to do so." +"MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can " +"connect to your MySQL server using PHP's classic <a " +"href=\"http://php.net/mysql\">MySQL extension</a> as well as the <a " +"href=\"http://php.net/mysqli\">improved MySQL extension (MySQLi)</a> that is " +"available in php 5.0. The latter one should be used unless you have good " +"reason not to do so." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2742 -#, fuzzy msgid "" "When compiling php, we strongly recommend that you manually link the MySQL " "extension of your choice to a MySQL client library of at least the same " @@ -7622,12 +7605,8 @@ msgstr "" "When compiling php, we strongly recommend that you manually link the MySQL " "extension of your choice to a MySQL client library of at least the same " "minor version since the one that is bundled with some PHP distributions is " -"rather old and might cause problems <a href=\"#faq1_17a\"> (see <abbr title=" -"\"Frequently Asked Questions\">FAQ</abbr> 1.17a)</a>. If your webserver is " -"running on a windows system, you might want to try MySQL's <a href=\"http://" -"dev.mysql.com/downloads/connector/php/\">Connector/PHP</a> instead of the " -"MySQL / MySQLi extensions that are bundled with the official php Win32 " -"builds." +"rather old and might cause problems <a href=\"#faq1_17a\"> (see <abbr " +"title=\"Frequently Asked Questions\">FAQ</abbr> 1.17a)</a>." #. type: Content of: <html><body><div><h5> #: orig-docs/Documentation.html:2749 @@ -8667,14 +8646,13 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3138 -#, fuzzy msgid "" "Have also a look at the <a href=\"http://dev.mysql.com/doc/en/can-not-" "connect-to-server.html\"> corresponding section of the MySQL documentation</" "a>." msgstr "" -"Have also a look at the <a href=\"http://www.mysql.com/doc/C/a/" -"Can_not_connect_to_server.html\"> corresponding section of the MySQL " +"Have also a look at the <a href=\"http://dev.mysql.com/doc/en/can-not-" +"connect-to-server.html\"> corresponding section of the MySQL " "documentation</a>." #. type: Content of: <html><body><div><h4> @@ -9264,7 +9242,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3371 -#, fuzzy msgid "" "When MySQL is running in ANSI-compatibility mode, there are some major " "differences in how <abbr title=\"structured query language\">SQL</abbr> is " @@ -9280,15 +9257,14 @@ msgid "" msgstr "" "When MySQL is running in ANSI-compatibility mode, there are some major " "differences in how <abbr title=\"structured query language\">SQL</abbr> is " -"structured (see <a href=\"http://dev.mysql.com/doc/mysql/en/ANSI_mode.html" -"\"> http://dev.mysql.com/doc/mysql/en/ANSI_mode.html</a>). Most important of " -"all, the quote-character (\") is interpreted as an identifier quote " -"character and not as a string quote character, which makes many internal " -"phpMyAdmin operations into invalid <abbr title=\"structured query language" -"\">SQL</abbr> statements. There is no workaround to this behaviour. News to " -"this item will be posted in Bug report <a href=\"https://sourceforge.net/" -"tracker/index.php?func=detail&aid=816858&group_id=23067&" -"atid=377408\">#816858</a>" +"structured (see <a href=\"http://dev.mysql.com/doc/mysql/en/ansi-mode.html\"> " +"http://dev.mysql.com/doc/mysql/en/ansi-mode.html</a>). Most important of " +"all, the quote-character (\") is interpreted as an identifier quote character " +"and not as a string quote character, which makes many internal phpMyAdmin " +"operations into invalid <abbr title=\"structured query language\">SQL</abbr> " +"statements. There is no workaround to this behaviour. News to this item will " +"be posted in Bug report <a href=\"https://sourceforge.net/tracker/index.php?" +"func=detail&aid=816858&group_id=23067&atid=377408\">#816858</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3384 @@ -10755,13 +10731,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3960 -#, fuzzy msgid "" "No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" "column-changes.html\">silent column type changing</a>." msgstr "" -"No, it's MySQL that is doing <a href=\"http://www.mysql.com/doc/S/i/" -"Silent_column_changes.html\">silent column type changing</a>." +"No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" +"column-changes.html\">silent column type changing</a>." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3965 @@ -13023,14 +12998,13 @@ msgstr "BLOBstreaming support with PBMS PHP extension" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4839 -#, fuzzy msgid "Ankit Gupta (Google Summer of Code 2010)" -msgstr "Lori Lee (Google Summer of Code 2010)" +msgstr "Ankit Gupta (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4841 msgid "Visual query builder" -msgstr "" +msgstr "Visual query builder" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4848 @@ -13750,14 +13724,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5063 -#, fuzzy msgid "" "<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/en/storage-" "engines.html\">Storage Engines</a> - handlers for different table types" msgstr "" -"<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/refman/5.0/" -"en/storage-engines.html\">Storage Engines</a> - handlers for different table " -"types" +"<a id=\"glossar_storage_engine\" href=\"http://dev.mysql.com/doc/en/storage-" +"engines.html\">Storage Engines</a> - handlers for different table types" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5065 @@ -13999,24 +13971,22 @@ msgstr "-->" #. type: Title = #: orig-docs/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation" -msgstr "phpMyAdmin - Installation\n" +msgstr "phpMyAdmin - Installation" #. type: Plain text #: orig-docs/INSTALL:5 -#, fuzzy msgid "" "Please have a look to the Documentation.txt or Documentation.html files." msgstr "" -"\tPlease have a look to the Documentation.txt or \n" -"\tDocumentation.html files.\n" +"Please have a look to the Documentation.txt or Documentation.html files." #. type: Title = #: orig-docs/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo" -msgstr "phpMyAdmin - Todo\n" +msgstr "phpMyAdmin - Todo" #. type: Plain text #: orig-docs/TODO:5 @@ -14036,15 +14006,14 @@ msgstr "-- swix/20010704" #. type: Title = #: orig-docs/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme" -msgstr "phpMyAdmin - Readme\n" +msgstr "phpMyAdmin - Readme" #. type: Plain text #: orig-docs/README:5 -#, fuzzy msgid "Version @@VER@@" -msgstr "Version" +msgstr "Version @@VER@@" #. type: Plain text #: orig-docs/README:7 @@ -14053,21 +14022,22 @@ msgstr "A set of PHP-scripts to manage MySQL over the web." #. type: Plain text #: orig-docs/README:9 -#, fuzzy msgid "http://www.phpmyadmin.net/" msgstr "http://www.phpmyadmin.net/" #. type: Plain text #: orig-docs/README:15 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000\n" " Tobias Ratschiller <tobias_at_ratschiller.com>\n" -msgstr "Tobias Ratschiller <tobias_at_ratschiller.com>" +msgstr "" +"Copyright (C) 1998-2000\n" +" Tobias Ratschiller <tobias_at_ratschiller.com>\n" #. type: Plain text #: orig-docs/README:26 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 2001-2010\n" " Marc Delisle <marc_at_infomarc.info>\n" @@ -14080,9 +14050,7 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -"Copyright (C) 1998-2000 \n" -" Tobias Ratschiller <tobias_at_ratschiller.com>\n" -"Copyright (C) 2001-2010 \n" +"Copyright (C) 2001-2010\n" " Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" " Robin Johnson <robbat2_at_users.sourceforge.net>\n" @@ -14116,13 +14084,12 @@ msgstr "a web-browser (doh!)" #. type: Title - #: orig-docs/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Summary" -msgstr "Summary\n" +msgstr "Summary" #. type: Plain text #: orig-docs/README:55 -#, fuzzy msgid "" "phpMyAdmin is intended to handle the administration of MySQL over the web. " "For a summary of features, please see the Documentation.txt/.html file." @@ -14144,9 +14111,9 @@ msgstr "You can get the newest version at http://www.phpmyadmin.net/." #. type: Title - #: orig-docs/README:62 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information" -msgstr "Information" +msgstr "More Information" #. type: Plain text #: orig-docs/README:65 @@ -14156,9 +14123,9 @@ msgstr "Please see the Documentation.txt/.html file." #. type: Title - #: orig-docs/README:67 -#, fuzzy, no-wrap +#, no-wrap msgid "Support" -msgstr "Support\n" +msgstr "Support" #. type: Plain text #: orig-docs/README:70 @@ -14168,50 +14135,38 @@ msgstr "See reference about support forums under http://www.phpmyadmin.net/" #. type: Title - #: orig-docs/README:73 -#, fuzzy, no-wrap +#, no-wrap msgid "Enjoy!" -msgstr "Enjoy!\n" +msgstr "Enjoy!" #. type: Plain text #: orig-docs/README:76 -#, fuzzy msgid "The phpMyAdmin Devel team" msgstr "The phpMyAdmin Devel team" #. type: Plain text #: orig-docs/README:79 msgid "PS:" -msgstr "" +msgstr "PS:" #. type: Plain text #: orig-docs/README:82 -#, fuzzy msgid "" "Please, don't send us emails with question like \"How do I compile PHP with " "MySQL-support\". We just don't have the time to be your free help desk." msgstr "" -"PS: \n" -" Please, don't send us e-mails with question like \"How do I compile\n" -" PHP with MySQL-support\". We just don't have the time to be your\n" -" free helpdesk.\n" -" Please send your questions to the appropriate mailing-lists / forums.\n" -" Before contacting us, please read the Documentation.html (esp. the\n" -" FAQ part).\n" +"Please, don't send us e-mails with question like \"How do I compile PHP with " +"MySQL-support\". We just don't have the time to be your free help desk." #. type: Plain text #: orig-docs/README:85 -#, fuzzy msgid "" "Please send your questions to the appropriate mailing lists / forums. " "Before contacting us, please read the Documentation.html (esp. the FAQ part)." msgstr "" -"PS: \n" -" Please, don't send us e-mails with question like \"How do I compile\n" -" PHP with MySQL-support\". We just don't have the time to be your\n" -" free helpdesk.\n" -" Please send your questions to the appropriate mailing-lists / forums.\n" -" Before contacting us, please read the Documentation.html (esp. the\n" -" FAQ part).\n" +"Please send your questions to the appropriate mailing lists / forums. " +"Before contacting us, please read the Documentation.html (esp. the FAQ " +"part)." #~ msgid "<a href=\"translators.html\">Translators</a>" #~ msgstr "<a href=\"translators.html\">Translators</a>" hooks/post-receive -- phpMyAdmin localized documentation