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@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@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%5C%22%3Epatc... " +"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%5C%22%3Eour 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@users.sourceforge.net)" -msgstr "Orzu Samarqandiy (orzu@users.sourceforge.net)" +msgstr "Shanyan Baishui (rimyxp@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@hotmail.com)" -msgstr "" +msgstr "Robert Readman (robert_readman@hotmail.com)"
#. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:202 @@ -14288,13 +14323,12 @@ msgstr "Albert Fazlí (amichauer@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@gmail.com)" -msgstr "Sven-Erik Andersen (sven.erik.andersen@gmail.com)" +msgstr "veeven (veeven@gmail.com)"
#. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:433 @@ -14334,37 +14368,33 @@ msgstr "Abdurashid Muhitdinov (cool_zero@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/%5C%22%3Etranslation server</" "a>." msgstr "" +"This is translated version of a <a " +"href="http://www.phpmyadmin.net/documentation/%5C%22%3EphpMyAdmin " +"documentation</a>. You can contribute to it on our <a " +"href="https://l10n.cihar.com/projects/pmadoc/%5C%22%3Etranslation 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