The branch, master has been updated
via 2de185415f65d2c8415c1da93a7950da76b17841 (commit)
from 4a99e62d7a25e1b7e26c4ed9055868a266c19d04 (commit)
- Log -----------------------------------------------------------------
commit 2de185415f65d2c8415c1da93a7950da76b17841
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Apr 8 15:21:12 2010 +0200
Regenerate.
-----------------------------------------------------------------------
Summary of changes:
output/en_GB/Documentation.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html
index 7ef2695..f9cafe0 100644
--- a/output/en_GB/Documentation.html
+++ b/output/en_GB/Documentation.html
@@ -4591,7 +4591,7 @@ placed on the same server or some remote server.
<p>For more details see <a
href="./documentation-gsoc/Synchronization_User_Manual.htm">How to
-synchronize</a>
+synchronise</a>
</p>
hooks/post-receive
--
phpMyAdmin localized documentation
The branch, master has been updated
via 4a99e62d7a25e1b7e26c4ed9055868a266c19d04 (commit)
via 3fcf65032193dcbe573b48507914725493ed7fed (commit)
from e0a0e62420d0dbbe0717b59e1ac99615c07ced9c (commit)
- Log -----------------------------------------------------------------
commit 4a99e62d7a25e1b7e26c4ed9055868a266c19d04
Merge: 3fcf65032193dcbe573b48507914725493ed7fed e0a0e62420d0dbbe0717b59e1ac99615c07ced9c
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 8 15:17:33 2010 +0200
Merge branch 'origin/master'
Conflicts:
po/en_GB.po
commit 3fcf65032193dcbe573b48507914725493ed7fed
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 8 15:12:11 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/en_GB.po | 186 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 110 insertions(+), 76 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index b489753..8a53d65 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -395,11 +395,9 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:142
-#, fuzzy
msgid ""
"communicate in <a href=\"./translators.html\">58 different languages</a>"
-msgstr ""
-"communicate in <a href=\"./translators.html\">57 different languages</a>"
+msgstr "communicate in <a href=\"./translators.html\">58 different languages</a>"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:144
@@ -2016,12 +2014,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:773
-#, fuzzy
msgid ""
"<span id=\"cfg_Servers_auth_http_realm\">$cfg['Servers'][$i]"
"['auth_http_realm']</span> string"
msgstr ""
-"<span id=\"cfg_Servers_user\">$cfg['Servers'][$i]['user']</span> string"
+"<span id=\"cfg_Servers_auth_http_realm\">$cfg['Servers'][$i]['auth_http_realm'"
+"]</span> string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:776
@@ -2035,6 +2033,15 @@ msgid ""
"\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> "
"will be used."
msgstr ""
+"When using auth_type = '<abbr title=\"HyperText Transfer "
+"Protocol\">HTTP</abbr>', this field allows to define a custom <abbr "
+"title=\"HyperText Transfer Protocol\">HTTP</abbr> Basic Auth Realm which will "
+"be displayed to the user. If not explicitly specified in your configuration, "
+"a string combined of \"phpMyAdmin \" and either <a "
+"href=\"#cfg_Servers_verbose\" "
+"class=\"configrule\">$cfg['Servers'][$i]['verbose']</a> or <a "
+"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> "
+"will be used."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:783
@@ -2772,13 +2779,12 @@ msgstr "put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt>"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1082
-#, fuzzy
msgid ""
"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]"
"['tracking_version_auto_create']</span> boolean"
msgstr ""
-"<span id=\"cfg_Servers_tracking_auto_create\">$cfg['Servers'][$i]"
-"['tracking_version_auto_create']</span> boolean"
+"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]['tra"
+"cking_version_auto_create']</span> boolean"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1085
@@ -2849,63 +2855,57 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1113
-#, fuzzy
msgid ""
"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]"
"['tracking_add_drop_view']</span> boolean"
msgstr ""
-"<span id=\"cfg_Servers_tracking_drop_view\">$cfg['Servers'][$i]"
-"['tracking_version_drop_view']</span> boolean"
+"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]['tracking_"
+"add_drop_view']</span> boolean"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1116
-#, fuzzy
msgid ""
"Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
"log when creating a view. Default value is true."
msgstr ""
-"Whether a DROP VIEW IF EXISTS statement will added as first line to the log "
-"when creating a view. Default value is true."
+"Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
+"log when creating a view. Default value is true."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1122
-#, fuzzy
msgid ""
"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]"
"['tracking_add_drop_table']</span> boolean"
msgstr ""
-"<span id=\"cfg_Servers_tracking_drop_table\">$cfg['Servers'][$i]"
-"['tracking_version_drop_table']</span> boolean"
+"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]['tracking"
+"_add_drop_table']</span> boolean"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1125
-#, fuzzy
msgid ""
"Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
"log when creating a table. Default value is true."
msgstr ""
-"Whether a DROP TABLE IF EXISTS statement will added as first line to the log "
-"when creating a table. Default value is true."
+"Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
+"log when creating a table. Default value is true."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1130
-#, fuzzy
msgid ""
"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]"
"['tracking_add_drop_database']</span> boolean"
msgstr ""
-"<span id=\"cfg_Servers_tracking_drop_database\">$cfg['Servers'][$i]"
-"['tracking_version_drop_database']</span> boolean"
+"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]['track"
+"ing_add_drop_database']</span> boolean"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1133
-#, fuzzy
msgid ""
"Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
"the log when creating a database. Default value is true."
msgstr ""
-"Whether a DROP DATABASE IF EXISTS statement will added as first line to the "
-"log when creating a database. Default value is true."
+"Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
+"the log when creating a database. Default value is true."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1139
@@ -4248,21 +4248,18 @@ msgstr ""
"from the interface."
#. type: Content of: <html><body><div><dl><dt>
-#: ../phpmyadmin/Documentation.html:1559
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:1553
msgid "$cfg['ShowFieldTypesInDataEditView'] boolean"
-msgstr "$cfg['ShowStats'] boolean"
+msgstr "$cfg['ShowFieldTypesInDataEditView'] boolean"
#. type: Content of: <html><body><div><dl><dd>
-#: ../phpmyadmin/Documentation.html:1560
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:1554
msgid ""
"Defines whether or not type fields should be initially displayed in edit/"
"insert mode. The user can toggle this setting from the interface."
msgstr ""
-"Defines whether or not MySQL functions fields should be initially displayed "
-"in edit/insert mode. Since version 2.10, the user can toggle this setting "
-"from the interface."
+"Defines whether or not type fields should be initially displayed in "
+"edit/insert mode. The user can toggle this setting from the interface."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1565
@@ -4577,6 +4574,8 @@ msgid ""
"The corresponding language file needs to be in locale/<i>code</i>/"
"LC_MESSAGES/phpmyadmin.mo."
msgstr ""
+"The corresponding language file needs to be in "
+"locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1665
@@ -4605,7 +4604,7 @@ msgstr "$cfg['Lang'] string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1672
msgid "Force language to use."
-msgstr ""
+msgstr "Force language to use."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1677
@@ -8324,6 +8323,8 @@ msgid ""
"Since release 3.0 only PHP 5.2 and newer. For older PHP versions 2.9 branch "
"is still maintained."
msgstr ""
+"Since release 3.0 only PHP 5.2 and newer. For older PHP versions 2.9 branch "
+"is still maintained."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3006
@@ -8540,6 +8541,9 @@ msgid ""
"problems with some operations, for example editing a table with many columns "
"and no primary key or with textual primary key."
msgstr ""
+"Yes but the default configuration values of Suhosin are known to cause "
+"problems with some operations, for example editing a table with many columns "
+"and no primary key or with textual primary key."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3090
@@ -8553,6 +8557,14 @@ msgid ""
"error logs which limit did cause dropping of variable, so you can diagnose "
"the problem and adjust matching configuration variable."
msgstr ""
+"Suhosin configuration might lead to malfunction in some cases and it can not "
+"be fully avoided as phpMyAdmin is kind of application which needs to "
+"transfer big amounts of fields in single HTTP request, what is something "
+"what Suhosin tries to prevent. Generally all <code>suhosin.request.*</code>, "
+"<code>suhosin.post.*</code> and <code>suhosin.get.*</code> directives can "
+"have negative effect on phpMyAdmin usability. You can always find in your "
+"error logs which limit did cause dropping of variable, so you can diagnose "
+"the problem and adjust matching configuration variable."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3101
@@ -8560,6 +8572,8 @@ msgid ""
"The default values for most Suhosin configuration options will work in most "
"scenarios, however you might want to adjust at least following parameters:"
msgstr ""
+"The default values for most Suhosin configuration options will work in most "
+"scenarios, however you might want to adjust at least following parameters:"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3106
@@ -8568,6 +8582,8 @@ msgid ""
"request.max_vars\">suhosin.request.max_vars</a> should be increased (eg. "
"2048)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ"
+"est.max_vars\">suhosin.request.max_vars</a> should be increased (eg. 2048)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3107
@@ -8575,6 +8591,8 @@ msgid ""
"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin."
"post.max_vars\">suhosin.post.max_vars</a> should be increased (eg. 2048)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post"
+".max_vars\">suhosin.post.max_vars</a> should be increased (eg. 2048)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3108
@@ -8583,6 +8601,9 @@ msgid ""
"request.max_array_index_length\">suhosin.request.max_array_index_length</a> "
"should be increased (eg. 256)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ"
+"est.max_array_index_length\">suhosin.request.max_array_index_length</a> "
+"should be increased (eg. 256)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3109
@@ -8591,6 +8612,9 @@ msgid ""
"post.max_array_index_length\">suhosin.post.max_array_index_length</a> should "
"be increased (eg. 256)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post"
+".max_array_index_length\">suhosin.post.max_array_index_length</a> should be "
+"increased (eg. 256)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3110
@@ -8599,6 +8623,9 @@ msgid ""
"request.max_totalname_length\">suhosin.request.max_totalname_length</a> "
"should be increased (eg. 8192)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ"
+"est.max_totalname_length\">suhosin.request.max_totalname_length</a> should be "
+"increased (eg. 8192)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3111
@@ -8607,6 +8634,9 @@ msgid ""
"post.max_totalname_length\">suhosin.post.max_totalname_length</a> should be "
"increased (eg. 8192)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post"
+".max_totalname_length\">suhosin.post.max_totalname_length</a> should be "
+"increased (eg. 8192)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3112
@@ -8615,6 +8645,9 @@ msgid ""
"bailout_on_error\">suhosin.sql.bailout_on_error</a> needs to be disabled "
"(the default)"
msgstr ""
+"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql."
+"bailout_on_error\">suhosin.sql.bailout_on_error</a> needs to be disabled (the "
+"default)"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3113
@@ -8623,6 +8656,9 @@ msgid ""
"html#logging_configuration\">suhosin.log.*</a> should not include SQL, "
"otherwise you get big slowdown"
msgstr ""
+"<a href=\"http://www.hardened-"
+"php.net/suhosin/configuration.html#logging_configuration\">suhosin.log.*</a> "
+"should not include SQL, otherwise you get big slowdown"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3117
@@ -8630,6 +8666,9 @@ msgid ""
"You can also disable the warning using the <a href="
"\"#cfg_SuhosinDisableWarning\"> <tt>SuhosinDisableWarning</tt> directive</a>."
msgstr ""
+"You can also disable the warning using the <a "
+"href=\"#cfg_SuhosinDisableWarning\"> <tt>SuhosinDisableWarning</tt> "
+"directive</a>."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3122
@@ -11892,20 +11931,18 @@ msgid "The following method is preferred for new developers:"
msgstr "The following method is preferred for new developers:"
#. type: Content of: <html><body><div><ol><li>
-#: ../phpmyadmin/Documentation.html:4396
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4378
msgid "fetch the current git repository over anonymous git:"
-msgstr "fetch the current SVN tree over anonymous SVN:"
+msgstr "fetch the current git repository over anonymous git:"
#. type: Content of: <html><body><div><ol><li>
-#: ../phpmyadmin/Documentation.html:4397
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4379
msgid ""
"<tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/"
"phpmyadmin</tt>"
msgstr ""
-"<tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/"
-"phpMyAdmin</tt>"
+"<tt>git clone "
+"git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt>"
#. type: Content of: <html><body><div><ol><li>
#: ../phpmyadmin/Documentation.html:4400
@@ -11913,20 +11950,19 @@ msgid "add your stuff"
msgstr "add your stuff"
#. type: Content of: <html><body><div><ol><li>
-#: ../phpmyadmin/Documentation.html:4401
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4383
msgid "generate patch with your changes: <tt>git diff > xxx.diff</tt>"
-msgstr "generate patch with your changes: <tt>svn diff</tt>"
+msgstr "generate patch with your changes: <tt>git diff > xxx.diff</tt>"
#. type: Content of: <html><body><div><ol><li>
-#: ../phpmyadmin/Documentation.html:4404
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4386
msgid ""
"submit your patch via the <a href=\"https://sourceforge.net/tracker/?"
"group_id=23067&atid=377410\">patch tracker of the phpMyAdmin project</a>."
msgstr ""
-"put the patch inside the <a href=\"https://sourceforge.net/tracker/?"
-"group_id=23067&atid=377410\">patch tracker of the phpMyAdmin project</a>."
+"submit your patch via the <a "
+"href=\"https://sourceforge.net/tracker/?group_id=23067&atid=377410\">patch "
+"tracker of the phpMyAdmin project</a>."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4410
@@ -11934,15 +11970,16 @@ msgid ""
"More details on git are available on <a href=\"http://wiki.phpmyadmin.net/"
"pma/Devel:Git\">our wiki</a>."
msgstr ""
+"More details on git are available on <a "
+"href=\"http://wiki.phpmyadmin.net/pma/Devel:Git\">our wiki</a>."
#. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4412
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4394
msgid ""
"Write access to the repository is granted only to experienced developers who "
"have already contributed something useful to phpMyAdmin."
msgstr ""
-"Write access to the SVN tree is granted only to experienced developers who "
+"Write access to the repository is granted only to experienced developers who "
"have already contributed something useful to phpMyAdmin."
#. type: Content of: <html><body><div><p>
@@ -12079,14 +12116,13 @@ msgstr ""
"placed on the same server or some remote server."
#. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4465
-#, fuzzy
+#: ../phpmyadmin/Documentation.html:4447
msgid ""
"For more details see <a href=\"./documentation-gsoc/"
"Synchronization_User_Manual.htm\">How to synchronize</a>"
msgstr ""
-"For more details see <a href=\"./documentation-gsoc/Synchronization_User%"
-"20Manual.htm\">How to synchronise</a>"
+"For more details see <a href=\"./documentation-"
+"gsoc/Synchronization_User_Manual.htm\">How to synchronise</a>"
#. type: Content of: <html><body><div><h2>
#: ../phpmyadmin/Documentation.html:4469
@@ -13954,9 +13990,8 @@ msgstr "Chinese Simplified (GB)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:154
-#, fuzzy
msgid "Shanyan Baishui (rimyxp(a)users.sourceforge.net)"
-msgstr "Orzu Samarqandiy (orzu(a)users.sourceforge.net)"
+msgstr "Shanyan Baishui (rimyxp(a)users.sourceforge.net)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:159
@@ -14018,12 +14053,12 @@ msgstr ""
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:195
msgid "English (United Kingdom)"
-msgstr ""
+msgstr "English (United Kingdom)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:197
msgid "Robert Readman (robert_readman(a)hotmail.com)"
-msgstr ""
+msgstr "Robert Readman (robert_readman(a)hotmail.com)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:202
@@ -14288,13 +14323,12 @@ msgstr "Albert Fazlí (amichauer(a)gmx.de)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:426
msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:428
-#, fuzzy
msgid "veeven (veeven(a)gmail.com)"
-msgstr "Sven-Erik Andersen (sven.erik.andersen(a)gmail.com)"
+msgstr "veeven (veeven(a)gmail.com)"
#. type: Content of: <html><body><div><table><tr><td>
#: ../phpmyadmin/translators.html:433
@@ -14334,37 +14368,33 @@ msgstr "Abdurashid Muhitdinov (cool_zero(a)list.ru"
#. type: Content of: <html><body><h1>
#: output/en_GB/index-full-template.html:7
#: output/en_GB/index-full-template.html:10
-#, fuzzy
msgid "phpMyAdmin English (United Kingdom) Documentation"
-msgstr "phpMyAdmin 3.4.0-dev - Documentation"
+msgstr "phpMyAdmin English (United Kingdom) Documentation"
#. type: Content of: <html><body><p>
#: output/en_GB/index-full-template.html:11
msgid "Documents translated to English (United Kingdom):"
-msgstr ""
+msgstr "Documents translated to English (United Kingdom):"
#. type: Content of: <html><body><ul><li>
#: output/en_GB/index-full-template.html:13
-#, fuzzy
msgid "<a href=\"INSTALL\">INSTALL</a>"
-msgstr "<a href=\"LICENSE\">License</a>"
+msgstr "<a href=\"INSTALL\">INSTALL</a>"
#. type: Content of: <html><body><ul><li>
#: output/en_GB/index-full-template.html:14
msgid "<a href=\"TODO\">TODO</a>"
-msgstr ""
+msgstr "<a href=\"TODO\">TODO</a>"
#. type: Content of: <html><body><ul><li>
#: output/en_GB/index-full-template.html:15
-#, fuzzy
msgid "<a href=\"README\">README</a>"
-msgstr "<a href=\"LICENSE\">License</a>"
+msgstr "<a href=\"README\">README</a>"
#. type: Content of: <html><body><ul><li>
#: output/en_GB/index-full-template.html:16
-#, fuzzy
msgid "<a href=\"Documentation.html\">Main documentation</a>"
-msgstr "<a href=\"Documentation.html#intro\">Introduction</a>"
+msgstr "<a href=\"Documentation.html\">Main documentation</a>"
#. type: Content of: <p>
#: addendum/head.html:2
@@ -14374,6 +14404,10 @@ msgid ""
"our <a href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</"
"a>."
msgstr ""
+"This is translated version of a <a "
+"href=\"http://www.phpmyadmin.net/documentation/\">phpMyAdmin "
+"documentation</a>. You can contribute to it on our <a "
+"href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>."
#. type: Plain text
#: addendum/comment.html:2
@@ -14383,17 +14417,17 @@ msgstr "<!--"
#. type: Plain text
#: addendum/comment.html:4
msgid "This file is generated using po4a, do not edit!"
-msgstr ""
+msgstr "This file is generated using po4a, do not edit!"
#. type: Plain text
#: addendum/comment.html:6
msgid "You can edit po files to change the translation."
-msgstr ""
+msgstr "You can edit po files to change the translation."
#. type: Plain text
#: addendum/comment.html:8
msgid "Or you can edit them online at https://l10n.cihar.com/projects/pmadoc/."
-msgstr ""
+msgstr "Or you can edit them online at https://l10n.cihar.com/projects/pmadoc/."
#. type: Plain text
#: addendum/comment.html:9
hooks/post-receive
--
phpMyAdmin localized documentation
The branch, master has been updated
via 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 (commit)
via 6e056ffe05a2895e9f34da4062accc7ead4a82f3 (commit)
via d4d375a63b03abc1b7b5166cc213d1527d732a09 (commit)
via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit)
via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit)
via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit)
via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit)
from f73996ba01806c6162f2d3a998f9eca9983378ed (commit)
- Log -----------------------------------------------------------------
commit 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 8 12:41:01 2010 +0200
Update FAQ 7.2 to gettext.
commit 6e056ffe05a2895e9f34da4062accc7ead4a82f3
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 8 12:35:39 2010 +0200
Update devel section to mention Gettext.
commit d4d375a63b03abc1b7b5166cc213d1527d732a09
Merge: f73996ba01806c6162f2d3a998f9eca9983378ed a99858b16a40bcfceec01667eb2814a1acf45f6d
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Apr 8 12:33:42 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 53 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 467a599..5e07feb 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1393,6 +1393,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
</dd>
+ <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
+ <dd>Whether to display errors from PHP or not.</dd>
+
+ <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
+ <dd>Whether to gather errors from PHP or not.</dd>
+
<dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
<dd>Defines whether to use a select-based menu and display only the current
tables in the left frame (smaller page). Only in Non-Lightmode you can
@@ -1906,20 +1912,20 @@ $cfg['TrustedProxies'] =
name of the field. The comment is shown as a tool-tip for that field.
</dd>
- <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
<dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
<dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
+ <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
<dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
<dd>Whether to display a link to validate a query in any SQL Query box.
See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
- <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
<dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt>
@@ -4354,20 +4360,32 @@ chmod o+rwx tmp
<a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an
existing language, where do I start?</a></h4>
-<p> Always use the current SVN version of your language file.
- For a new language, start from <i>english-utf-8.inc.php</i>. If you
- don't know how to get the SVN version, please ask one of the developers.
- <br />
+<p> Always use latest Git versoin of po file to translate. You can optionally
+ translate online at our <a href="http://l10n.cihar.com/">translation
+ server</a> where you can also get latest po files and merge them
+ with your translations. For creating new translation simply use
+ <code>po/phpmyadmin.pot</code> and generate
+ <code>po/LANG_CODE.po</code> for your language (you can use
+ <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code>
+ to do this) or ask on mailing list to add the translation to the web
+ interface.
+</p>
+<p>
Please note that we try not to use HTML entities like &eacute; in
the translations, since we define the right character set in the file.
With HTML entities, the text on JavaScript messages would not
display correctly.
However there are some entities that need to be there, for quotes
- ,non-breakable spaces, ampersands, less than, greater than.<br />
+ ,non-breakable spaces, ampersands, less than, greater than.
+</p>
+<p>
You can then put your translations, as a zip file to avoid losing special
- characters, on the sourceforge.net translation tracker.<br />
+ characters, on the sourceforge.net translation tracker.
+</p>
+<p>
It would be a good idea to subscribe to the phpmyadmin-translators mailing
- list, because this is where we ask for translations of new messages.</p>
+ list, because this is where we ask for translations of new messages.
+</p>
<h4 id="faq7_3">
<a href="#faq7_3">7.3 I would like to help out with the development of
@@ -4474,11 +4492,18 @@ now synchronize your databases placed on the same server or some remote server.
<abbr title="PHP Extension and Application Repository">PEAR</abbr>
coding standards</a>
on the other hand. Please pay attention to this.</li>
+ <li>Please enable showing PHP errors and warnings by the
+ <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
+ configuration directive.</li>
<li>Please try to keep up the file-naming conventions. Table-related stuff
goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
server-related tools to <i>server_*.php</i> and so on.</li>
- <li>Please don't put message strings in your code, instead add the string
- (at least) to <i>english-utf-8.inc.php</i> and print() it out.</li>
+ <li>Please use gettext wrappers around all messages
+ (<code>__('Some text')</code> or <code>_ngettext()</code> function).
+ To translate them, you need to call <code>scripts/update-po</code>
+ script. To use translated messages, call
+ <code>scripts/generate-mo</code>, which generates binary files read by
+ Gettext.</li>
<li>If you want to be really helpful, write an entry for the ChangeLog.</li>
<li id="developersdbg">
The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit)
via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit)
via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit)
via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit)
from c9d7a662101b57abe754393ab6424b05ab0e685f (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 070b3e1..8848f90 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
</dd>
+ <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
+ <dd>Whether to display errors from PHP or not.</dd>
+
+ <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
+ <dd>Whether to gather errors from PHP or not.</dd>
+
<dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
<dd>Defines whether to use a select-based menu and display only the current
tables in the left frame (smaller page). Only in Non-Lightmode you can
@@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] =
name of the field. The comment is shown as a tool-tip for that field.
</dd>
- <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
<dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
<dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
+ <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
<dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
<dd>Whether to display a link to validate a query in any SQL Query box.
See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
- <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
<dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt>
@@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server.
<abbr title="PHP Extension and Application Repository">PEAR</abbr>
coding standards</a>
on the other hand. Please pay attention to this.</li>
+ <li>Please enable showing PHP errors and warnings by the
+ <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
+ configuration directive.</li>
<li>Please try to keep up the file-naming conventions. Table-related stuff
goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
server-related tools to <i>server_*.php</i> and so on.</li>
hooks/post-receive
--
phpMyAdmin
The branch, MAINT_3_3_2 has been updated
via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit)
via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit)
via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit)
from 7e40035275d28fa38fef7f7628bdda3a44d83de5 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index abe01c4..81e12b0 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
</dd>
+ <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
+ <dd>Whether to display errors from PHP or not.</dd>
+
+ <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
+ <dd>Whether to gather errors from PHP or not.</dd>
+
<dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
<dd>Defines whether to use a select-based menu and display only the current
tables in the left frame (smaller page). Only in Non-Lightmode you can
@@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] =
name of the field. The comment is shown as a tool-tip for that field.
</dd>
- <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
<dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
<dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
+ <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
<dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
- <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
<dd>Whether to display a link to validate a query in any SQL Query box.
See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
- <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
+ <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
<dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt>
@@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server.
<abbr title="PHP Extension and Application Repository">PEAR</abbr>
coding standards</a>
on the other hand. Please pay attention to this.</li>
+ <li>Please enable showing PHP errors and warnings by the
+ <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
+ configuration directive.</li>
<li>Please try to keep up the file-naming conventions. Table-related stuff
goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
server-related tools to <i>server_*.php</i> and so on.</li>
hooks/post-receive
--
phpMyAdmin