March 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 0abbe4c021cd6249b3e75e39b6947a58079b6945
by Michal Čihař 08 Mar '10

08 Mar '10

The branch, master has been updated via 0abbe4c021cd6249b3e75e39b6947a58079b6945 (commit) via dd03187e277e55327a7185e0c2050578fc556169 (commit) from 1766a7959a86046d141426c215bdb8116a3d9aee (commit) - Log ----------------------------------------------------------------- commit 0abbe4c021cd6249b3e75e39b6947a58079b6945 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 8 15:19:48 2010 +0100 Regenerate. commit dd03187e277e55327a7185e0c2050578fc556169 Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: Fri Mar 5 18:17:07 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 013b6b0..5ada0d6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-01 08:21+0100\n" -"PO-Revision-Date: 2010-03-01 08:48+0200\n" +"PO-Revision-Date: 2010-03-05 18:17+0200\n" "Last-Translator: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -11423,10 +11423,8 @@ msgstr "Chinês Simplificado (GB)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:154 -#, fuzzy -#| msgid "Orzu Samarqandiy (orzu(a)users.sourceforge.net)" 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 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 1766a7959a86046d141426c215bdb8116a3d9aee
by Michal Čihař 05 Mar '10

05 Mar '10

The branch, master has been updated via 1766a7959a86046d141426c215bdb8116a3d9aee (commit) via 027ff5f51b5953823933fd821cdf2731a9c82c4d (commit) from 24401dd7d736b8406cc83b34440b855a1fa40a2b (commit) - Log ----------------------------------------------------------------- commit 1766a7959a86046d141426c215bdb8116a3d9aee Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 5 11:07:44 2010 +0100 Regenerate chinese docs. commit 027ff5f51b5953823933fd821cdf2731a9c82c4d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Mar 5 11:05:25 2010 +0100 Updated po file. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 124 +++++++++++++++++---------------------- po/zh_CN.po | 80 ++++++++++++++++++++----- 2 files changed, 117 insertions(+), 87 deletions(-) diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 78f8c2d..7a0e4ce 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -2325,103 +2325,85 @@ unsigned/zerofill/not_null/... properties.<br />  -<h2 id="faq">FAQ - Frequently Asked Questions</h2> +<h2 id="faq">常见问题</h2> <ol><li><a href="#faqserver">Server</a></li> - <li><a href="#faqconfig">Configuration</a></li> - <li><a href="#faqlimitations">Known limitations</a></li> + <li><a href="#faqconfig">设置</a></li> + <li><a href="#faqlimitations">已知问题</a></li> <li><a href="#faqmultiuser">ISPs, multi-user installations</a></li> - <li><a href="#faqbrowsers">Browsers or client <abbr title="operating -system">OS</abbr></a></li> - <li><a href="#faqusing">Using phpMyAdmin</a></li> - <li><a href="#faqproject">phpMyAdmin project</a></li> - <li><a href="#faqsecurity">Security</a></li> - <li><a href="#faqsynchronization">Synchronization</a></li> + <li><a href="#faqbrowsers">浏览器和客户端<abbr title="operating system">操作系统</abbr></a></li> + <li><a href="#faqusing">使用 phpMyAdmin</a></li> + <li><a href="#faqproject">phpMyAdmin 项目</a></li> + <li><a href="#faqsecurity">安全</a></li> + <li><a href="#faqsynchronization">同步</a></li> </ol> -<p> Please have a look at our <a -href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the -official phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features -and or interface.</p> +<p> 请到我们的<a href="http://www.phpmyadmin.net/home_page/docs.php">官方网站</a>上查看更多有关 +phpMyAdmin 的特性和接口方面的信息。</p> -<h3 id="faqserver">Server</h3> +<h3 id="faqserver">服务器</h3> <h4 id="faq1_1"> - <a href="#faq1_1">1.1 I'm running PHP 4+ and my server is crashing each time -a specific action is required or phpMyAdmin sends a blank page or a page -full of cryptic characters to my browser, what can I do?</a></h4> - -<p> There are some known PHP bugs with output buffering and compression.<br /> - Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a> -directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the -<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php -configuration file.<br /> - Furthermore, we know about such problems connected to the release candidates -of PHP 4.2.0 (tested with PHP 4.2.0 RC1 to RC4) together with MS Internet -Explorer. Please upgrade to the release version PHP 4.2.0.</p> + <a href="#faq1_1">1.1 我正在使用 PHP 4+ 版本，在我执行某些特性操作的时候服务器总是会发生一些错误，如 phpMyAdmin +返回空页面，或者显示乱码，我该怎么办？</a></h4> + +<p> PHP 在输出缓冲和压缩上有一些 Bug。<br /> + 在 <i>config.inc.php</i> 文件中将 <a href="#cfg_OBGzip" +class="configurule">$cfg['OBGzip']</a> 显式地设为 <tt>FALSE</tt>，同时将 PHP 配置文件中的 +<tt>zlib.output_compression</tt> 显式地设置为 <tt>Off</tt>。<br /> + 我们发现这样的问题与 PHP 4.2.0 发布候选版本（PHP 4.2.0 RC1 到 RC4）及 Internet Explorer 有关，请升级你的 +PHP 到 4.2.0 版本。</p> <h4 id="faq1_2"> - <a href="#faq1_2">1.2 My Apache server crashes when using phpMyAdmin.</a></h4> + <a href="#faq1_2">1.2 使用 phpMyAdmin 时，我的 Apache 服务器崩溃了。</a></h4> -<p> You should first try the latest versions of Apache (and possibly MySQL).<br /> - See also the <a href="#faq1_1"><abbr title="Frequently Asked -Questions">FAQ</abbr> 1.1</a> entry about PHP bugs with output buffering.<br /> - If your server keeps crashing, please ask for help in the various Apache -support groups.</p> +<p> 请将 Apache 更新到最新版本（如果可能的话，请将 MySQL 也更新到最新版本）。<br /> + 参考 <a href="#faq1_1"><abbr title="常见问题">常见问题</abbr> 1.1</a> 中有关 PHP 输出缓冲的问题。<br /> + 如果你的服务器依旧崩溃，请向 Apache 技术支持小组寻求帮助。</p> <h4 id="faq1_3"> - <a href="#faq1_3">1.3 I'm running phpMyAdmin with "cookie" authentication -mode under PHP 4.2.0 or 4.2.1 loaded as an Apache 2 module but can't enter -the script: I'm always displayed the login screen.</a></h4> + <a href="#faq1_3">1.3 我无法登录 phpMyAdmin，phpMyAdmin 总是显示登录页面。 phpMyAdmin +的认证方式设置为 cookie 认证，PHP 版本是 4.2.0（或 4.2.1），以 Apache 模块方式运行。</a></h4> -<p> This is a known PHP bug (see this <a -href="http://bugs.php.net/bug.php?id=16626">bug report</a>) from the -official PHP bug database. It means there is and won't be any phpMyAdmin fix -against it because there is no way to code a fix.</p> +<p> 这是一个 PHP 的 Bug（参考 PHP 官方错误数据库上的<a +href="http://bugs.php.net/bug.php?id=16626">错误反馈</a>），因此，phpMyAdmin +不会也无法对此错误进行修复。</p> <h4 id="faq1_4"> - <a href="#faq1_4">1.4 Using phpMyAdmin on <abbr title="Internet Information -Services">IIS</abbr>, I'm displayed the error message: "The specified -<abbr title="Common Gateway Interface">CGI</abbr> application misbehaved by -not returning a complete set of <abbr title="HyperText Transfer -Protocol">HTTP</abbr> headers ...".</a> + <a href="#faq1_4">1.4 我在 <abbr title="Internet Information +Services">IIS</abbr> 上使用 phpMyAdmin，网页显示了这样一段错误信息："<abbr title="Common +Gateway Interface">CGI</abbr> 应用程序错误，返回了不完整的<abbr title="HyperText Transfer +Protocol">HTTP</abbr> 头 ..."。</a> </h4> -<p> You just forgot to read the <i>install.txt</i> file from the php -distribution. Have a look at the last message in this <a -href="http://bugs.php.net/bug.php?id=12061">bug report</a> from the official -PHP bug database.</p> +<p> 您是不是忘记阅读 PHP 发行版中的 <i>install.txt</i> 了？请参考 PHP 官方错误数据库中的<a +href="http://bugs.php.net/bug.php?id=12061">这个错误反馈</a>。</p> <h4 id="faq1_5"> - <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information -Services">IIS</abbr>, I'm facing crashes and/or many error messages with the -<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced -authentication mode.</a></h4> - -<p> This is a known problem with the PHP <abbr title="Internet Server -Application Programming Interface">ISAPI</abbr> filter: it's not so -stable. Please use instead the cookie authentication mode. + <a href="#faq1_5">1.5 phpMyAdmin 运行在 <abbr title="Internet Information +Services">IIS</abbr> 上，使用<abbr title="HyperText Transfer +Protocol">HTTP</abbr> 认证。我的服务器总是崩溃（有时还伴随着大量的错误信息）。</a></h4> + +<p> 这是一个已知的 PHP <abbr title="Internet Server Application Programming +Interface">ISAPI</abbr> 过滤器错误：PHP 的 ISAPI 过滤器不是很稳定，建议使用 cookie 认证方式。 </p> <h4 id="faq1_6"> - <a href="#faq1_6">1.6 I can't use phpMyAdmin on PWS: nothing is -displayed!</a></h4> + <a href="#faq1_6">1.6 我无法在 PWS 上使用 phpMyAdmin，网页显示一片空白。</a></h4> -<p> This seems to be a PWS bug. Filippo Simoncini found a workaround (at this -time there is no better fix): remove or comment the <tt>DOCTYPE</tt> -declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>, -<i>libraries/header_printview.inc.php</i>, <i>index.php</i>, -<i>navigation.php</i> and <i>libraries/common.lib.php</i>.</p> +<p> 这看上去像是 PWS 的 Bug。Filippo Simoncini 找到了一个解决方法，这是目前最好的解决方法：从 +<i>libraries/header.inc.php</i>, <i>libraries/header_printview.inc.php</i>, +<i>index.php</i>, <i>navigation.php</i> 和 <i>libraries/common.lib.php</i> +这几个文件中删除 <tt>DOCTYPE</tt>（共2行）。</p> <h4 id="faq1_7"> - <a href="#faq1_7">1.7 How can I GZip or Bzip a dump or a <abbr title="comma -separated values">CSV</abbr> export? It does not seem to work.</a></h4> - -<p> These features are based on the <tt>gzencode()</tt> and -<tt>bzcompress()</tt> PHP functions to be more independent of the platform -(Unix/Windows, Safe Mode or not, and so on). So, you must have -PHP4 >= 4.0.4 and Zlib/Bzip2 support (<tt>--with-zlib</tt> and -<tt>--with-bz2</tt>).<br /> + <a href="#faq1_7">1.7 如何使用 Gzip 或 Bzip 压缩 <abbr title="comma separated +values">CSV</abbr> 和其他类型的导出文件？我设置了相关选项但是似乎不起作用。</a></h4> + +<p> 为了获得更高的平台兼容性（如运行于 Unix 和 Windows，使用安全模式和不使用安全模式），该功能需要使用 PHP +的<tt>gzencode()</tt> 和 <tt>bzcompress()</tt> 函数。因此，你需要将 PHP4 升级到 +>= 4.0.4 版本，并打开 Zlib/Bzip2 支持（编译选项：<tt>--with-zlib</tt> and +<tt>--with-bz2</tt>）。<br /> We faced PHP crashes when trying to download a dump with MS Internet Explorer when phpMyAdmin is run with a release candidate of PHP 4.2.0. In this case you should switch to the release version of PHP 4.2.0.</p> diff --git a/po/zh_CN.po b/po/zh_CN.po index bb6564f..0faea19 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2010-03-04 14:08+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -1455,10 +1455,11 @@ msgid "" "of line character ("<tt>\\n</tt>") in your text editor before " "saving a script you have modified." msgstr "" -"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple " -"Macintosh)\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 " -"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r" -"</tt>")。所以在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("<tt>\n" +"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple Macintosh)" +"\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 " +"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r</tt>")。所以" +"在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("" +"<tt>\n" "</tt>")。" #. type: Content of: <html><body><div><p> @@ -6367,22 +6368,22 @@ msgstr "" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:2562 msgid "FAQ - Frequently Asked Questions" -msgstr "" +msgstr "常见问题" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2564 msgid "<a href=\"#faqserver\">Server</a>" -msgstr "" +msgstr "<a href=\"#faqserver\">Server</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2565 msgid "<a href=\"#faqconfig\">Configuration</a>" -msgstr "" +msgstr "<a href=\"#faqconfig\">设置</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2566 msgid "<a href=\"#faqlimitations\">Known limitations</a>" -msgstr "" +msgstr "<a href=\"#faqlimitations\">已知问题</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2567 @@ -6395,26 +6396,28 @@ msgid "" "<a href=\"#faqbrowsers\">Browsers or client <abbr title=\"operating system" "\">OS</abbr></a>" msgstr "" +"<a href=\"#faqbrowsers\">浏览器和客户端<abbr title=\"operating system\">操作" +"系统</abbr></a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2569 msgid "<a href=\"#faqusing\">Using phpMyAdmin</a>" -msgstr "" +msgstr "<a href=\"#faqusing\">使用 phpMyAdmin</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2570 msgid "<a href=\"#faqproject\">phpMyAdmin project</a>" -msgstr "" +msgstr "<a href=\"#faqproject\">phpMyAdmin 项目</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2571 msgid "<a href=\"#faqsecurity\">Security</a>" -msgstr "" +msgstr "<a href=\"#faqsecurity\">安全</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2572 msgid "<a href=\"#faqsynchronization\">Synchronization</a>" -msgstr "" +msgstr "<a href=\"#faqsynchronization\">同步</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2575 @@ -6423,11 +6426,13 @@ msgid "" "php\">Link section</a> on the official phpMyAdmin homepage for in-depth " "coverage of phpMyAdmin's features and or interface." msgstr "" +"请到我们的<a href=\"http://www.phpmyadmin.net/home_page/docs.php\">官方网站</" +"a>上查看更多有关 phpMyAdmin 的特性和接口方面的信息。" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:2580 msgid "Server" -msgstr "" +msgstr "服务器" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2583 @@ -6436,11 +6441,14 @@ msgid "" "time a specific action is required or phpMyAdmin sends a blank page or a " "page full of cryptic characters to my browser, what can I do?</a>" msgstr "" +"<a href=\"#faq1_1\">1.1 我正在使用 PHP 4+ 版本，在我执行某些特性操作的时候服" +"务器总是会发生一些错误，如 phpMyAdmin 返回空页面，或者显示乱码，我该怎么办？" +"</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2587 msgid "There are some known PHP bugs with output buffering and compression." -msgstr "" +msgstr "PHP 在输出缓冲和压缩上有一些 Bug。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2588 @@ -6450,6 +6458,9 @@ msgid "" "<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php " "configuration file." msgstr "" +"在 <i>config.inc.php</i> 文件中将 <a href=\"#cfg_OBGzip\" class=\"configurule" +"\">$cfg['OBGzip']</a> 显式地设为 <tt>FALSE</tt>，同时将 PHP 配置文件中的 " +"<tt>zlib.output_compression</tt> 显式地设置为 <tt>Off</tt>。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2592 @@ -6458,18 +6469,22 @@ msgid "" "of PHP 4.2.0 (tested with PHP 4.2.0 RC1 to RC4) together with MS Internet " "Explorer. Please upgrade to the release version PHP 4.2.0." msgstr "" +"我们发现这样的问题与 PHP 4.2.0 发布候选版本（PHP 4.2.0 RC1 到 RC4）及 " +"Internet Explorer 有关，请升级你的 PHP 到 4.2.0 版本。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2597 msgid "" "<a href=\"#faq1_2\">1.2 My Apache server crashes when using phpMyAdmin.</a>" msgstr "" +"<a href=\"#faq1_2\">1.2 使用 phpMyAdmin 时，我的 Apache 服务器崩溃了。</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2599 msgid "" "You should first try the latest versions of Apache (and possibly MySQL)." msgstr "" +"请将 Apache 更新到最新版本（如果可能的话，请将 MySQL 也更新到最新版本）。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2600 @@ -6477,13 +6492,15 @@ msgid "" "See also the <a href=\"#faq1_1\"><abbr title=\"Frequently Asked Questions" "\">FAQ</abbr> 1.1</a> entry about PHP bugs with output buffering." msgstr "" +"参考 <a href=\"#faq1_1\"><abbr title=\"常见问题\">常见问题</abbr> 1.1</a> 中" +"有关 PHP 输出缓冲的问题。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2603 msgid "" "If your server keeps crashing, please ask for help in the various Apache " "support groups." -msgstr "" +msgstr "如果你的服务器依旧崩溃，请向 Apache 技术支持小组寻求帮助。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2607 @@ -6492,6 +6509,9 @@ msgid "" "authentication mode under PHP 4.2.0 or 4.2.1 loaded as an Apache 2 module " "but can't enter the script: I'm always displayed the login screen.</a>" msgstr "" +"<a href=\"#faq1_3\">1.3 我无法登录 phpMyAdmin，phpMyAdmin 总是显示登录页面。 " +"phpMyAdmin 的认证方式设置为 cookie 认证，PHP 版本是 4.2.0（或 4.2.1），以 " +"Apache 模块方式运行。</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2611 @@ -6501,6 +6521,9 @@ msgid "" "there is and won't be any phpMyAdmin fix against it because there is no way " "to code a fix." msgstr "" +"这是一个 PHP 的 Bug（参考 PHP 官方错误数据库上的<a href=\"http://bugs.php." +"net/bug.php?id=16626\">错误反馈</a>），因此，phpMyAdmin 不会也无法对此错误进" +"行修复。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2617 @@ -6511,6 +6534,10 @@ msgid "" "application misbehaved by not returning a complete set of <abbr title=" "\"HyperText Transfer Protocol\">HTTP</abbr> headers ...".</a>" msgstr "" +"<a href=\"#faq1_4\">1.4 我在 <abbr title=\"Internet Information Services" +"\">IIS</abbr> 上使用 phpMyAdmin，网页显示了这样一段错误信息："<abbr " +"title=\"Common Gateway Interface\">CGI</abbr> 应用程序错误，返回了不完整的" +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> 头 ..."。</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2624 @@ -6519,6 +6546,8 @@ msgid "" "distribution. Have a look at the last message in this <a href=\"http://bugs." "php.net/bug.php?id=12061\">bug report</a> from the official PHP bug database." msgstr "" +"您是不是忘记阅读 PHP 发行版中的 <i>install.txt</i> 了？请参考 PHP 官方错误数" +"据库中的<a href=\"http://bugs.php.net/bug.php?id=12061\">这个错误反馈</a>。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2630 @@ -6528,6 +6557,9 @@ msgid "" "messages with the <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or " "advanced authentication mode.</a>" msgstr "" +"<a href=\"#faq1_5\">1.5 phpMyAdmin 运行在 <abbr title=\"Internet Information " +"Services\">IIS</abbr> 上，使用<abbr title=\"HyperText Transfer Protocol" +"\">HTTP</abbr> 认证。我的服务器总是崩溃（有时还伴随着大量的错误信息）。</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2636 @@ -6536,6 +6568,9 @@ msgid "" "Application Programming Interface\">ISAPI</abbr> filter: it's not so stable. " "Please use instead the cookie authentication mode." msgstr "" +"这是一个已知的 PHP <abbr title=\"Internet Server Application Programming " +"Interface\">ISAPI</abbr> 过滤器错误：PHP 的 ISAPI 过滤器不是很稳定，建议使用 " +"cookie 认证方式。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2642 @@ -6543,6 +6578,8 @@ msgid "" "<a href=\"#faq1_6\">1.6 I can't use phpMyAdmin on PWS: nothing is displayed!" "</a>" msgstr "" +"<a href=\"#faq1_6\">1.6 我无法在 PWS 上使用 phpMyAdmin，网页显示一片空白。</" +"a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2644 @@ -6553,6 +6590,10 @@ msgid "" "<i>libraries/header_printview.inc.php</i>, <i>index.php</i>, <i>navigation." "php</i> and <i>libraries/common.lib.php</i>." msgstr "" +"这看上去像是 PWS 的 Bug。Filippo Simoncini 找到了一个解决方法，这是目前最好的" +"解决方法：从 <i>libraries/header.inc.php</i>, <i>libraries/header_printview." +"inc.php</i>, <i>index.php</i>, <i>navigation.php</i> 和 <i>libraries/common." +"lib.php</i> 这几个文件中删除 <tt>DOCTYPE</tt>（共2行）。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2651 @@ -6560,6 +6601,9 @@ msgid "" "<a href=\"#faq1_7\">1.7 How can I GZip or Bzip a dump or a <abbr title=" "\"comma separated values\">CSV</abbr> export? It does not seem to work.</a>" msgstr "" +"<a href=\"#faq1_7\">1.7 如何使用 Gzip 或 Bzip 压缩 <abbr title=\"comma " +"separated values\">CSV</abbr> 和其他类型的导出文件？我设置了相关选项但是似乎" +"不起作用。</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2655 @@ -6569,6 +6613,10 @@ msgid "" "Mode or not, and so on). So, you must have PHP4 >= 4.0.4 and " "Zlib/Bzip2 support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>)." msgstr "" +"为了获得更高的平台兼容性（如运行于 Unix 和 Windows，使用安全模式和不使用安全" +"模式），该功能需要使用 PHP 的<tt>gzencode()</tt> 和 <tt>bzcompress()</tt> 函" +"数。因此，你需要将 PHP4 升级到 >= 4.0.4 版本，并打开 Zlib/Bzip2 支持" +"（编译选项：<tt>--with-zlib</tt> and <tt>--with-bz2</tt>）。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2659 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, marctest, deleted. RELEASE_3_3_0RC1-168-gf9920e3
by Marc Delisle 04 Mar '10

04 Mar '10

The branch, marctest has been deleted was f9920e329110ce763e04d389bc5682bda1af0fa8 ----------------------------------------------------------------------- f9920e329110ce763e04d389bc5682bda1af0fa8 Merge branch 'MAINT_3_3_0' ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, marctest, created. RELEASE_3_3_0RC1-168-gf9920e3
by Marc Delisle 04 Mar '10

04 Mar '10

The branch, marctest has been created at f9920e329110ce763e04d389bc5682bda1af0fa8 (commit) - Log ----------------------------------------------------------------- commit f9920e329110ce763e04d389bc5682bda1af0fa8 Merge: c48b786632ae0b786cc8fde8b2419d927a3baf1e 2e3bbfa8b9a24880b04cae45aeaf2e46e0b9308c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 4 16:46:31 2010 -0500 Merge branch 'MAINT_3_3_0' commit 2e3bbfa8b9a24880b04cae45aeaf2e46e0b9308c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 4 16:43:27 2010 -0500 test ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 24401dd7d736b8406cc83b34440b855a1fa40a2b
by Michal Čihař 04 Mar '10

04 Mar '10

The branch, master has been updated via 24401dd7d736b8406cc83b34440b855a1fa40a2b (commit) from aa0115b794e10a72b76f8dbbee64bc67fe0efa7a (commit) - Log ----------------------------------------------------------------- commit 24401dd7d736b8406cc83b34440b855a1fa40a2b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Mar 4 14:08:24 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index cc04521..bb6564f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-01 08:21+0100\n" -"PO-Revision-Date: 2010-03-03 07:17+0200\n" +"PO-Revision-Date: 2010-03-04 14:08+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -1455,11 +1455,10 @@ msgid "" "of line character ("<tt>\\n</tt>") in your text editor before " "saving a script you have modified." msgstr "" -"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple Macintosh)" -"\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 " -"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r</tt>")。所以" -"在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("" -"<tt>\n" +"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple " +"Macintosh)\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 " +"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r" +"</tt>")。所以在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("<tt>\n" "</tt>")。" #. type: Content of: <html><body><div><p> hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. aa0115b794e10a72b76f8dbbee64bc67fe0efa7a
by Michal Čihař 03 Mar '10

03 Mar '10

The branch, master has been updated via aa0115b794e10a72b76f8dbbee64bc67fe0efa7a (commit) via 83f4be2047a940a722ff9c0f1e323db4dc4371ba (commit) via 638544ca5def04ed5b95f40dc1faa48c0057a677 (commit) via 2043ba7dc6463d4ca3f47e8c8b3e03c892cdf76e (commit) via c662b26629457d44fe1cd235be6cde411ca14ebd (commit) via eee45ea7c078cb91405db6d0ca30912fd7d71e01 (commit) via 1e38031f370876bf0b5acc0269baf387b83121f8 (commit) via ce2bb76155c27393f328c055f7171898c6f75553 (commit) via d33f2e87068a2008be19d1f340c5419c23040a9e (commit) via 4a041061567a4fb347e1b9b59e03858ebaa3225c (commit) via 44604c6f19ff05f7983a6744dd8087b7cb7d3df5 (commit) via 3aea79a39bde967fb672a4ffdd95ab60336d6c83 (commit) via f69fea9195e09ee57b63c647db3e5b87926f445a (commit) via fe5b8d51be0b7261eace16751145120a65232d2c (commit) via 3e77869afbd59902ddfd1e8dc91bc87bfc28e8ef (commit) via b40d789e126e803d378c7ac84f47d36ea52831aa (commit) via b45580d92534b6606b90cb4aa07bffc01281896a (commit) via 39475ce30d6eed805b9af7a4b72c0714c02e904b (commit) via 50007ca06f54f5daa246926a29cb6a295137beba (commit) via 91f61b5a7db9e6a309795aeb39d4d9f69b7e4250 (commit) via f072bb8fe77c051e0f15aff7969a9b47457150ba (commit) via 0cb425935e1a206ad6b5b70b63db226885b69f52 (commit) via f97eeed5f76e698ec9de94d45f3718014a42ecf4 (commit) via 642b95a55b784c0775065bc308df2718f15b3d6f (commit) via 5801bc041d7ef8ed2f3ac712e9a723399a5b3013 (commit) via 02b6f27a7f2b8401fc5a900bb7cfa15f9ec9165f (commit) via 1e34b6fce6ea516b5c42c4469a774eed9cbab7e4 (commit) via a5ec242268d23d98484e7b5922412b3626d9c842 (commit) via bd18a9e2c23bca500cdb5fd77ea6803af1e738da (commit) via 4637ae76679859178a296ba07a015fcd5d5dbdc7 (commit) via 04a445575a28221c6bc21ce7d061e544e734d017 (commit) via 76877bc3ea919e012af7d205c0dc0c246826a4de (commit) via d32c10c52d89e2a7a27bd494e80f4d597ec71782 (commit) via c014eca967ea08f0912604458c4bb661a8a5c551 (commit) via cc3a271c153985cdc1a353d6352981c40568f1d5 (commit) via e02aa8d04c82ac1d19647fae71ffb9cf43905d6b (commit) via 01795f223633f79ec17a8e3b8a542b2c39e2a54c (commit) via f6a2707a3ed97886df122dcae6dfe00d6c0eb97e (commit) via 9c4226c62b502e8e03e3c9320f4dc58c4326a4a9 (commit) via b3a5bf22f17aa5e716662633172bc3d9a521b283 (commit) via f4cd8705f2c8822c7ba9da1651e645bec19ffe7a (commit) via c260009302e2dda7bb55d5df146c6c712ef32492 (commit) via d097a88f04f160fa09c726c553ee5612a896aefc (commit) via 93ddfd65c90476a04eca357634dbc87ab5f8618d (commit) via 542c1397e575a6694727396a51e35e2c1a0aa083 (commit) via d9c7668167adfcb227826394ff8f93597956307f (commit) via f8c21cbfe0c393dcc80a0b1ffa81464def8e4fbc (commit) via 4ddc586d42d8c28e4adc6993135fdefdc3d1a31e (commit) via ac5dc1e00a747411b40f74f7a7e2da7922890eec (commit) via 918ef7d3ec6a1b90b958ca7613fcb1175e842a88 (commit) via 0a4f0b15e1a722cd4fbaadc29c0a6d923754edaf (commit) via 0fffdeed855a1e831a4d40cdeee176e75cf39c6a (commit) via fbf46166f7601b10c4c6b83046f7cdf0daad261e (commit) via fb1a2e689570c5124126e1dbb9f5c16d9a5fe0be (commit) via f9f7cb3ed0ed11fc6af1d89846edae53e00e3792 (commit) via 2880ae3caab49e4ec7bb5e712355c5d57cee8c80 (commit) via 1bd3713d7ee94a1419d5220064afd9c7cefa51a3 (commit) via c3ef84e3dc7c623a498d5489884160f78e905c00 (commit) via 4e19c1898cad9d35d55d8ec857d46eb7da8ff1d8 (commit) via 407a18e2114300fb7afd616478f79b6bd6da73f7 (commit) via 4ad09849738a1ff9023256cb8f8ef9b81a3d47fc (commit) via 73a72b43559bfa54d6d4fe9d9705487c5aadf61a (commit) via 72c935c0e9646a6fcb56bf4e83263810a56258ab (commit) via 8464050ab42b339096f743e55b60dad1cdea90f3 (commit) via 6f901462d2bac6a636a239da8d190961076723e3 (commit) via c2fe88eb6e3ca35e904c1e67954f506a33373902 (commit) via 15a020bf707e1534fa87ea9605efa9d122aca2d7 (commit) via 74095f6efcbd26d897284db3929a5def0af3cee9 (commit) via 6ab284d66788898a56c195310293a88bd722df47 (commit) via 90395d4a04b38a87c3095bbee354b13d6dc48be1 (commit) via 116622b1a2be6a3f7422ac97a6a59df5320da105 (commit) via 89adf03b70b841a2da775e45a0a67638bb32f6d4 (commit) from b9c3d1e18b943bf468f13c131d8abb70a3ed396d (commit) - Log ----------------------------------------------------------------- commit aa0115b794e10a72b76f8dbbee64bc67fe0efa7a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 3 10:06:52 2010 +0100 Regenerated translated docs. commit 83f4be2047a940a722ff9c0f1e323db4dc4371ba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 07:17:24 2010 +0200 Translation update done using Pootle. commit 638544ca5def04ed5b95f40dc1faa48c0057a677 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 07:16:50 2010 +0200 Translation update done using Pootle. commit 2043ba7dc6463d4ca3f47e8c8b3e03c892cdf76e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 07:16:37 2010 +0200 Translation update done using Pootle. commit c662b26629457d44fe1cd235be6cde411ca14ebd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 07:13:30 2010 +0200 Translation update done using Pootle. commit eee45ea7c078cb91405db6d0ca30912fd7d71e01 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:21:15 2010 +0200 Translation update done using Pootle. commit 1e38031f370876bf0b5acc0269baf387b83121f8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:21:01 2010 +0200 Translation update done using Pootle. commit ce2bb76155c27393f328c055f7171898c6f75553 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:20:42 2010 +0200 Translation update done using Pootle. commit d33f2e87068a2008be19d1f340c5419c23040a9e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:20:21 2010 +0200 Translation update done using Pootle. commit 4a041061567a4fb347e1b9b59e03858ebaa3225c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:17:42 2010 +0200 Translation update done using Pootle. commit 44604c6f19ff05f7983a6744dd8087b7cb7d3df5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:16:59 2010 +0200 Translation update done using Pootle. commit 3aea79a39bde967fb672a4ffdd95ab60336d6c83 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:16:48 2010 +0200 Translation update done using Pootle. commit f69fea9195e09ee57b63c647db3e5b87926f445a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:16:15 2010 +0200 Translation update done using Pootle. commit fe5b8d51be0b7261eace16751145120a65232d2c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:15:28 2010 +0200 Translation update done using Pootle. commit 3e77869afbd59902ddfd1e8dc91bc87bfc28e8ef Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:15:10 2010 +0200 Translation update done using Pootle. commit b40d789e126e803d378c7ac84f47d36ea52831aa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:14:53 2010 +0200 Translation update done using Pootle. commit b45580d92534b6606b90cb4aa07bffc01281896a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:14:40 2010 +0200 Translation update done using Pootle. commit 39475ce30d6eed805b9af7a4b72c0714c02e904b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 06:10:40 2010 +0200 Translation update done using Pootle. commit 50007ca06f54f5daa246926a29cb6a295137beba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:52:12 2010 +0200 Translation update done using Pootle. commit 91f61b5a7db9e6a309795aeb39d4d9f69b7e4250 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:51:45 2010 +0200 Translation update done using Pootle. commit f072bb8fe77c051e0f15aff7969a9b47457150ba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:49:32 2010 +0200 Translation update done using Pootle. commit 0cb425935e1a206ad6b5b70b63db226885b69f52 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:47:08 2010 +0200 Translation update done using Pootle. commit f97eeed5f76e698ec9de94d45f3718014a42ecf4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:45:20 2010 +0200 Translation update done using Pootle. commit 642b95a55b784c0775065bc308df2718f15b3d6f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:44:04 2010 +0200 Translation update done using Pootle. commit 5801bc041d7ef8ed2f3ac712e9a723399a5b3013 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:41:06 2010 +0200 Translation update done using Pootle. commit 02b6f27a7f2b8401fc5a900bb7cfa15f9ec9165f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:39:39 2010 +0200 Translation update done using Pootle. commit 1e34b6fce6ea516b5c42c4469a774eed9cbab7e4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:37:08 2010 +0200 Translation update done using Pootle. commit a5ec242268d23d98484e7b5922412b3626d9c842 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:35:25 2010 +0200 Translation update done using Pootle. commit bd18a9e2c23bca500cdb5fd77ea6803af1e738da Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:31:53 2010 +0200 Translation update done using Pootle. commit 4637ae76679859178a296ba07a015fcd5d5dbdc7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:31:12 2010 +0200 Translation update done using Pootle. commit 04a445575a28221c6bc21ce7d061e544e734d017 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:28:34 2010 +0200 Translation update done using Pootle. commit 76877bc3ea919e012af7d205c0dc0c246826a4de Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:23:33 2010 +0200 Translation update done using Pootle. commit d32c10c52d89e2a7a27bd494e80f4d597ec71782 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:23:10 2010 +0200 Translation update done using Pootle. commit c014eca967ea08f0912604458c4bb661a8a5c551 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:21:41 2010 +0200 Translation update done using Pootle. commit cc3a271c153985cdc1a353d6352981c40568f1d5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:18:48 2010 +0200 Translation update done using Pootle. commit e02aa8d04c82ac1d19647fae71ffb9cf43905d6b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:18:11 2010 +0200 Translation update done using Pootle. commit 01795f223633f79ec17a8e3b8a542b2c39e2a54c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:17:48 2010 +0200 Translation update done using Pootle. commit f6a2707a3ed97886df122dcae6dfe00d6c0eb97e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:15:26 2010 +0200 Translation update done using Pootle. commit 9c4226c62b502e8e03e3c9320f4dc58c4326a4a9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:15:04 2010 +0200 Translation update done using Pootle. commit b3a5bf22f17aa5e716662633172bc3d9a521b283 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:14:04 2010 +0200 Translation update done using Pootle. commit f4cd8705f2c8822c7ba9da1651e645bec19ffe7a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:12:39 2010 +0200 Translation update done using Pootle. commit c260009302e2dda7bb55d5df146c6c712ef32492 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:12:13 2010 +0200 Translation update done using Pootle. commit d097a88f04f160fa09c726c553ee5612a896aefc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:11:29 2010 +0200 Translation update done using Pootle. commit 93ddfd65c90476a04eca357634dbc87ab5f8618d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:11:09 2010 +0200 Translation update done using Pootle. commit 542c1397e575a6694727396a51e35e2c1a0aa083 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:11:02 2010 +0200 Translation update done using Pootle. commit d9c7668167adfcb227826394ff8f93597956307f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:10:07 2010 +0200 Translation update done using Pootle. commit f8c21cbfe0c393dcc80a0b1ffa81464def8e4fbc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:09:52 2010 +0200 Translation update done using Pootle. commit 4ddc586d42d8c28e4adc6993135fdefdc3d1a31e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:05:47 2010 +0200 Translation update done using Pootle. commit ac5dc1e00a747411b40f74f7a7e2da7922890eec Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:04:28 2010 +0200 Translation update done using Pootle. commit 918ef7d3ec6a1b90b958ca7613fcb1175e842a88 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 05:04:05 2010 +0200 Translation update done using Pootle. commit 0a4f0b15e1a722cd4fbaadc29c0a6d923754edaf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:59:02 2010 +0200 Translation update done using Pootle. commit 0fffdeed855a1e831a4d40cdeee176e75cf39c6a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:58:49 2010 +0200 Translation update done using Pootle. commit fbf46166f7601b10c4c6b83046f7cdf0daad261e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:53:11 2010 +0200 Translation update done using Pootle. commit fb1a2e689570c5124126e1dbb9f5c16d9a5fe0be Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:53:00 2010 +0200 Translation update done using Pootle. commit f9f7cb3ed0ed11fc6af1d89846edae53e00e3792 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:52:46 2010 +0200 Translation update done using Pootle. commit 2880ae3caab49e4ec7bb5e712355c5d57cee8c80 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:52:02 2010 +0200 Translation update done using Pootle. commit 1bd3713d7ee94a1419d5220064afd9c7cefa51a3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:51:49 2010 +0200 Translation update done using Pootle. commit c3ef84e3dc7c623a498d5489884160f78e905c00 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:51:15 2010 +0200 Translation update done using Pootle. commit 4e19c1898cad9d35d55d8ec857d46eb7da8ff1d8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:47:13 2010 +0200 Translation update done using Pootle. commit 407a18e2114300fb7afd616478f79b6bd6da73f7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:46:40 2010 +0200 Translation update done using Pootle. commit 4ad09849738a1ff9023256cb8f8ef9b81a3d47fc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:45:14 2010 +0200 Translation update done using Pootle. commit 73a72b43559bfa54d6d4fe9d9705487c5aadf61a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:45:04 2010 +0200 Translation update done using Pootle. commit 72c935c0e9646a6fcb56bf4e83263810a56258ab Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:44:35 2010 +0200 Translation update done using Pootle. commit 8464050ab42b339096f743e55b60dad1cdea90f3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:42:57 2010 +0200 Translation update done using Pootle. commit 6f901462d2bac6a636a239da8d190961076723e3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:40:14 2010 +0200 Translation update done using Pootle. commit c2fe88eb6e3ca35e904c1e67954f506a33373902 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:39:45 2010 +0200 Translation update done using Pootle. commit 15a020bf707e1534fa87ea9605efa9d122aca2d7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:39:30 2010 +0200 Translation update done using Pootle. commit 74095f6efcbd26d897284db3929a5def0af3cee9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:37:59 2010 +0200 Translation update done using Pootle. commit 6ab284d66788898a56c195310293a88bd722df47 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:37:44 2010 +0200 Translation update done using Pootle. commit 90395d4a04b38a87c3095bbee354b13d6dc48be1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:36:02 2010 +0200 Translation update done using Pootle. commit 116622b1a2be6a3f7422ac97a6a59df5320da105 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:35:11 2010 +0200 Translation update done using Pootle. commit 89adf03b70b841a2da775e45a0a67638bb32f6d4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Mar 3 04:21:23 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 243 ++++++++++++++++----------------------- po/zh_CN.po | 145 +++++++++++++++++------ 2 files changed, 206 insertions(+), 182 deletions(-) diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 9eaca89..78f8c2d 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -457,12 +457,11 @@ href="http://phpmyadmin.net/auth_key">http://phpmyadmin.net/auth_key  <h2 id="config">设置</h2> -<p> <span class="important">Warning for <acronym title="Apple -Macintosh">Mac</acronym> users:</span> PHP does not seem to like <acronym -title="Apple Macintosh">Mac</acronym> end of lines character -("<tt>\r</tt>"). So ensure you choose the option that allows to -use the *nix end of line character ("<tt>\n</tt>") in your text -editor before saving a script you have modified.</p> +<p> <span class="important"><acronym title="苹果麦金塔 (Apple +Macintosh)">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title="苹果麦金塔 +(Apple Macintosh)">Mac</acronym> 式的换行符 +("<tt>\r</tt>")。所以在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("<tt> +</tt>")。</p> <p> <span class="important">注意:</span> 几乎所有设置都在 <tt>config.inc.php</tt> 文件中定义。如果此文件不存在，请参考<a href="#setup">快速安装</a>一节创建该文件。你只需要设置不同于 @@ -1015,99 +1014,73 @@ Protocol)">IP</abbr> 地址范围)<br /> 也不支持互联网协议第六版 (IPv6) 的地址。 </dd> <dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span> 布尔</dt> - <dd>Disable using <tt>INFORMATION_SCHEMA</tt> to retrieve information (use -<tt>SHOW</tt> commands instead), because of speed issues when many databases -are present. Currently used in some parts of the code, more to come. + <dd>设置是否禁止通过 <tt>INFORMATION_SCHEMA</tt> 来获取信息 (用 <tt>SHOW</tt> +命令代替)，若不禁止且数据库很多时可能会造成性能下降。目前仅部分代码实现此功能，持续增加中。 </dd> <dt><span id="cfg_Servers_ShowDatabasesCommand">$cfg['Servers'][$i]['ShowDatabasesCommand']</span> -string</dt> - <dd>On a server with a huge number of databases, the default <tt>SHOW -DATABASES</tt> command used to fetch the name of available databases will -probably be too slow, so it can be replaced by faster commands (see -<tt>libraries/config.default.php</tt> for examples). +字符串</dt> + <dd>在有相当数量数据库的服务器上，通过默认的 <tt>SHOW DATABASES</tt> +命令来查询可用数据库的名字可能会很慢，你可以用更快的命令来代替它 (参见 <tt>libraries/config.default.php</tt> +文件中的例子)。 </dd> <dt><span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span> -boolean</dt> - <dd>Whether to count the number of tables for each database when preparing the -list of databases for the navigation frame. +布尔</dt> + <dd>设置是否在导航框架的数据库列表中显示每个数据库中数据表的总数。 </dd> <dt><span id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> -string</dt> - <dd>Name of session which will be used for signon authentication method. +字符串</dt> + <dd>signon 认证所用的会话名。 </dd> - <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> -string</dt> - <dd>URL where user will be redirected to log in for signon authentication -method. Should be absolute including protocol. + <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> 字符串</dt> + <dd>使用 signon 认证时用户将转到登录的 URL 。应为包含协议的绝对地址。 </dd> - <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span> -string</dt> - <dd>URL where user will be redirected after logout (doesn't affect config -authentication method). Should be absolute including protocol. + <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span> 字符串</dt> + <dd>使用 signon 认证时用户退出后将转到的 URL (config 认证无效)。应为包含协议的绝对地址。 </dd> - <dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt> - <dd>If you have more than one server configured, you can set -<tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to that -server when phpMyAdmin is started, or set it to 0 to be given a list of -servers without logging in.<br /> - If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST -be set to that server.</dd> - - <dt id="cfg_MaxDbList">$cfg['MaxDbList'] integer</dt> - <dd>The maximum number of database names to be displayed in the navigation frame -and the database list.</dd> - - <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt> - <dd>The maximum number of table names to be displayed in the main panel's list -(except on the Export page). This limit is also enforced in the navigation -panel when in Light mode.</dd> - - <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] integer</dt> - <dd>The maximum number of characters when a SQL query is displayed. The default -limit of 1000 should be correct to avoid the display of tons of hexadecimal -codes that represent BLOBs, but some users have real SQL queries that are -longer than 1000 characters. Also, if a query's length exceeds this limit, -this query is not saved in the history.</dd> - - <dt id="cfg_OBGzip">$cfg['OBGzip'] string/boolean</dt> - <dd>Defines whether to use GZip output buffering for increased speed in <abbr -title="HyperText Transfer Protocol">HTTP</abbr> transfers.<br /> - Set to true/false for enabling/disabling. When set to 'auto' (string), -phpMyAdmin tries to enable output buffering and will automatically disable -it if your browser has some problems with buffering. IE6 with a certain -patch is known to cause data corruption when having enabled buffering.</dd> - - <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] boolean</dt> - <dd>Whether persistent connections should be used or not (mysql_connect or -mysql_pconnect).</dd> - - <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt> - <dd>Whether to force using https while accessing phpMyAdmin.</dd> - - <dt id="cfg_ExecTimeLimit">$cfg['ExecTimeLimit'] integer [number of seconds]</dt> - <dd>Set the number of seconds a script is allowed to run. If seconds is set to -zero, no time limit is imposed.<br /> - This setting is used while importing/exporting dump files and in the -Synchronize feature but has no effect when PHP is running in safe mode.</dd> - - <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] string</dt> - <dd>Path for storing session data (<a -href="http://php.net/session_save_path">session_save_path PHP -parameter</a>).</dd> - - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt> - <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no -limit is imposed.<br /> - This setting is used while importing/exporting dump files and at some other -places in phpMyAdmin so you definitely don't want to put here a too low -value. It has no effect when PHP is running in safe mode.<br /> - You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit -the suffix (16 means 16 bytes!)</dd> - - <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] boolean</dt> + <dt id="cfg_ServerDefault">$cfg['ServerDefault'] 整数</dt> + <dd>如果有多个服务器设置，你可以设置 <tt>$cfg['ServerDefault']</tt> 为其中之一，phpMyAdmin 将会自动连接，若设为 +0 则将在登录页面显示服务器列表。<br /> + 如果只有一个服务器设置，<tt>$cfg['ServerDefault']</tt> 必须设为那台服务器。</dd> + + <dt id="cfg_MaxDbList">$cfg['MaxDbList'] 整数</dt> + <dd>导航框架和数据库列表中所显示数据库的最大数量。</dd> + + <dt id="cfg_MaxTableList">$cfg['MaxTableList'] 整数</dt> + <dd>轻量级模式导航框架和主框架列表 (除导出页) 中所显示数据表的最大数量。</dd> + + <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] 整数</dt> + <dd>显示 SQL 查询的最大字数。默认值 1000 通常可以避免 BLOB 字段中十六进制内容的显示，但有些用户确实有超过 1000 字的 SQL +查询。另外，如果一个查询超过了这个限制，也将不会保存在查询历史中。</dd> + + <dt id="cfg_OBGzip">$cfg['OBGzip'] 字符串/布尔</dt> + <dd>设置是否使用 GZip 压缩输出缓冲来加速 <abbr title="超文本转移协议 (HyperText Transfer +Protocol)">HTTP</abbr> 传输。<br /> + 设为 true/false 以启/禁用。当设为 'auto' (字符串) 时，phpMyAdmin +将尝试启用输出缓冲并在浏览器对缓冲支持有问题时自动禁用。已知具有特定补丁的 IE6 会在启用缓冲时导致数据损坏。</dd> + + <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] 布尔</dt> + <dd>设置是否使用持久连接 (mysql_connect 还是 mysql_pconnect) 。</dd> + + <dt id="cfg_ForceSSL">$cfg['ForceSSL'] 布尔</dt> + <dd>设置在访问 phpMyAdmin 时是否强制使用 https 安全连接。</dd> + + <dt id="cfg_ExecTimeLimit">$cfg['ExecTimeLimit'] 整数 [单位: 秒]</dt> + <dd>设置脚本可以运行的时间。若设为 0 则无限制。<br /> + 本设置用于导入/导出转储文件以及同步功能中，若 PHP 运行于安全模式则无效。</dd> + + <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] 字符串</dt> + <dd>保存会话数据的路径 (<a href="http://php.net/session_save_path">PHP 参数 +session_save_path (外链，英语)</a>)。</dd> + + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] 整数 [单位: 字节]</dt> + <dd>设置脚本运行的可使用的内存。若设为 0 则无限制。<br /> + 本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能，所以显然不要设置一个很小的值。若 PHP 运行于安全模式则无效。<br /> + 同样可以设置为 php.ini 中可以识别的字符串，如 '16M' 。请确保没有丢掉后缀 (16 表示 16 字节！)</dd> + + <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] 布尔</dt> <dd>Mark used tables and make it possible to show databases with locked tables (since MySQL 3.23.30).</dd> @@ -4275,45 +4248,30 @@ synchronize</a>  -<h2 id="developers">Developers Information</h2> - -<p> phpMyAdmin is Open Source, so you're invited to contribute to it. Many great -features have been written by other people and you too can help to make -phpMyAdmin a useful tool.</p> - -<p> If you're planning to contribute source, please read the following -information:</p> - -<ul><li>All files include <i>libraries/header.inc.php</i> (layout),. -<i>libraries/common.lib.php</i> (common functions) and -<i>config.inc.php</i>.<br /> - Only configuration data should go in <i>config.inc.php</i>. Please keep it -free from other code.<br /> - Commonly used functions should be added to <i>libraries/common.lib.php</i> -and more specific ones may be added within a library stored into the -<i>libraries</i> sub-directory.</li> - <li>Obviously, you're free to use whatever coding style you want. But please try -to keep your code as simple as possible: beginners are using phpMyAdmin as -an example application.<br /> - As far as possible, we want the scripts to be XHTML1.0 and CSS2 compliant on -one hand, they fit the <a href="http://pear.php.net/"> <abbr title="PHP -Extension and Application Repository">PEAR</abbr> coding standards</a> on -the other hand. Please pay attention to this.</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>If you want to be really helpful, write an entry for the ChangeLog.</li> +<h2 id="developers">开发信息</h2> + +<p> phpMyAdmin 是开源的，我们欢迎您的参与。很多优秀的功能都不是我们写的，你同样可以帮助 phpMyAdmin 变成更加实用的工具。</p> + +<p> 如果您正打算贡献源代码，请阅读以下信息:</p> + +<ul><li>所有文件包括 <i>libraries/header.inc.php</i> (布局)、<i>libraries/common.lib.php</i> +(公共函数) 以及 <i>config.inc.php</i> 。<br /> + <i>config.inc.php</i> 中应只存放设置。请勿在其中加入其他代码。<br /> + 公共函数应添加在 <i>libraries/common.lib.php</i> 中，特定功能的函数可以单独的函数库文件形式放在 +<i>libraries</i> 子目录中。</li> + <li>您可以使用任何喜欢的格式书写代码。但请尽量保持代码简洁: 初学者经常使用 phpMyAdmin 作为范例来学习。<br /> + 此外，我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href="http://pear.php.net/"> <abbr +title="PHP 扩展和应用程序库 (PHP Extension and Application Repository)">PEAR</abbr> +代码标准</a>。请尽量注意。</li> + <li>请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>，数据库相关的用 <i>db_*.php</i>，服务器相关的用 +<i>server_*.php</i> 等。</li> + <li>请将消息字符串 (至少) 放在<i>english-utf-8.inc.php</i> 中然后用 print() 函数输出，而不是直接写在代码中。</li> + <li>如果您写一份更新记录，这将会更加有帮助。</li> <li id="developersdbg"> - The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP Debugger DBG</a>) is -now supported by phpMyAdmin for developers to better debug and profile their -code.<br /> - Please see the <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a> -configuration options for more information.<br /> - This is in memoriam of the Space Shuttle Columbia (STS-107) which was lost -during its re-entry into Earth's atmosphere and in memory of the brave men -and women who gave their lives for the people of Earth.</li> + phpMyAdmin 现在已经支持 DBG 扩展 (<a href="http://dd.cron.ru/dbg/">PHP 调试器 DBG +(外链，英语)</a>) 以便开发者能更好地调试以及测试他们的代码。<br /> + 更多信息请参见 <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a> 设置选项。<br /> + 纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人民牺牲的勇敢的人们。</li> </ul> <h2 id="copyright">版权</h2> @@ -4355,34 +4313,33 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>Tobias Ratschiller <tobias_at_ratschiller.com> <ul> <li>phpmyadmin 项目创始人</li> - <li>maintainer from 1998 to summer 2000</li> + <li>1998 至 2000 年夏季的主要维护人</li> </ul></li> <li>Marc Delisle <marc_at_infomarc.info> <ul> - <li>multi-language version</li> - <li>various fixes and improvements</li> - <li><abbr title="structured query language">SQL</abbr> analyser (most of it)</li> - <li>current project maintainer</li> + <li>多语言版本</li> + <li>许多修正和改进</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 分析器 (大部分)</li> + <li>目前的主要维护人</li> </ul></li> <li>Olivier Müller <om_at_omnis.ch> <ul> - <li>started SourceForge phpMyAdmin project in March 2001</li> - <li>sync'ed different existing CVS trees with new features and bugfixes</li> - <li>multi-language improvements, dynamic language selection</li> - <li>current project maintainer</li> - <li>many bugfixes and improvements</li> + <li>于 2001 年 3 月在 SourceForge 启动 phpMyAdmin 项目</li> + <li>同步新功能和缺陷修正到不同的 CVS</li> + <li>改进多语言，动态语言选择</li> + <li>目前的主要维护人</li> + <li>许多缺陷修正和改进</li> </ul></li> <li>Loïc Chapeaux <lolo_at_phpheaven.net> <ul> - <li>rewrote and optimized javascript, DHTML and DOM stuff</li> - <li>rewrote the scripts so they fit the <abbr title="PHP Extension and -Application Repository">PEAR</abbr> coding standards and generate XHTML1.0 -and CSS2 compliant codes</li> - <li>improved the language detection system</li> - <li>many bugfixes and improvements</li> + <li>重写并优化 javascript、DHTML 和 DOM</li> + <li>重写脚本使其符合 <abbr title="PHP 扩展和应用程序库 (PHP Extension and Application +Repository)">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范</li> + <li>改进语言识别系统</li> + <li>许多缺陷修正和改进</li> </ul></li> <li>Robin Johnson <robbat2_at_users.sourceforge.net> @@ -4393,7 +4350,7 @@ and CSS2 compliant codes</li> <li>DB-based configuration (Not completed)</li> <li><abbr title="structured query language">SQL</abbr> parser and pretty-printer</li> <li><abbr title="structured query language">SQL</abbr> validator</li> - <li>many bugfixes and improvements</li> + <li>许多缺陷修正和改进</li> </ul></li> <li>Armel Fauveau <armel.fauveau_at_globalis-ms.com> @@ -4525,7 +4482,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Marcel Tschopp <ne0x_at_users.sourceforge.net> <ul> <li>mysqli support</li> - <li>many bugfixes and improvements</li> + <li>许多缺陷修正和改进</li> </ul></li> <li>Michael Keck <mkkeck_at_users.sourceforge.net> diff --git a/po/zh_CN.po b/po/zh_CN.po index ba4e31f..cc04521 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-01 08:21+0100\n" -"PO-Revision-Date: 2010-03-02 08:32+0200\n" +"PO-Revision-Date: 2010-03-03 07:17+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -1455,6 +1455,12 @@ msgid "" "of line character ("<tt>\\n</tt>") in your text editor before " "saving a script you have modified." msgstr "" +"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple Macintosh)" +"\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 " +"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r</tt>")。所以" +"在保存你所修改的文件之前，请确保你的文本编辑器使用 *nix 式的换行符 ("" +"<tt>\n" +"</tt>")。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:577 @@ -3073,6 +3079,9 @@ msgid "" "<tt>SHOW</tt> commands instead), because of speed issues when many databases " "are present. Currently used in some parts of the code, more to come." msgstr "" +"设置是否禁止通过 <tt>INFORMATION_SCHEMA</tt> 来获取信息 (用 <tt>SHOW</tt> 命" +"令代替)，若不禁止且数据库很多时可能会造成性能下降。目前仅部分代码实现此功能，" +"持续增加中。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1248 @@ -3080,6 +3089,8 @@ msgid "" "<span id=\"cfg_Servers_ShowDatabasesCommand\">$cfg['Servers'][$i]" "['ShowDatabasesCommand']</span> string" msgstr "" +"<span id=\"cfg_Servers_ShowDatabasesCommand\">$cfg['Servers'][$i]" +"['ShowDatabasesCommand']</span> 字符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1249 @@ -3089,6 +3100,9 @@ msgid "" "too slow, so it can be replaced by faster commands (see <tt>libraries/config." "default.php</tt> for examples)." msgstr "" +"在有相当数量数据库的服务器上，通过默认的 <tt>SHOW DATABASES</tt> 命令来查询可" +"用数据库的名字可能会很慢，你可以用更快的命令来代替它 (参见 <tt>libraries/" +"config.default.php</tt> 文件中的例子)。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1254 @@ -3096,13 +3110,15 @@ msgid "" "<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</" "span> boolean" msgstr "" +"<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</" +"span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1255 msgid "" "Whether to count the number of tables for each database when preparing the " "list of databases for the navigation frame." -msgstr "" +msgstr "设置是否在导航框架的数据库列表中显示每个数据库中数据表的总数。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1257 @@ -3110,11 +3126,13 @@ msgid "" "<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</" "span> string" msgstr "" +"<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</" +"span> 字符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1258 msgid "Name of session which will be used for signon authentication method." -msgstr "" +msgstr "signon 认证所用的会话名。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1260 @@ -3122,13 +3140,15 @@ msgid "" "<span id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span> " "string" msgstr "" +"<span id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span> 字" +"符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1261 msgid "" "URL where user will be redirected to log in for signon authentication " "method. Should be absolute including protocol." -msgstr "" +msgstr "使用 signon 认证时用户将转到登录的 URL 。应为包含协议的绝对地址。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1263 @@ -3136,6 +3156,8 @@ msgid "" "<span id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span> " "string" msgstr "" +"<span id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span> 字" +"符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1264 @@ -3143,11 +3165,13 @@ msgid "" "URL where user will be redirected after logout (doesn't affect config " "authentication method). Should be absolute including protocol." msgstr "" +"使用 signon 认证时用户退出后将转到的 URL (config 认证无效)。应为包含协议的绝" +"对地址。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1267 msgid "$cfg['ServerDefault'] integer" -msgstr "" +msgstr "$cfg['ServerDefault'] 整数" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1268 @@ -3157,6 +3181,8 @@ msgid "" "phpMyAdmin is started, or set it to 0 to be given a list of servers without " "logging in." msgstr "" +"如果有多个服务器设置，你可以设置 <tt>$cfg['ServerDefault']</tt> 为其中之一，" +"phpMyAdmin 将会自动连接，若设为 0 则将在登录页面显示服务器列表。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1272 @@ -3164,23 +3190,24 @@ msgid "" "If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST " "be set to that server." msgstr "" +"如果只有一个服务器设置，<tt>$cfg['ServerDefault']</tt> 必须设为那台服务器。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1275 msgid "$cfg['MaxDbList'] integer" -msgstr "" +msgstr "$cfg['MaxDbList'] 整数" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1276 msgid "" "The maximum number of database names to be displayed in the navigation frame " "and the database list." -msgstr "" +msgstr "导航框架和数据库列表中所显示数据库的最大数量。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1279 msgid "$cfg['MaxTableList'] integer" -msgstr "" +msgstr "$cfg['MaxTableList'] 整数" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1280 @@ -3188,12 +3215,12 @@ msgid "" "The maximum number of table names to be displayed in the main panel's list " "(except on the Export page). This limit is also enforced in the navigation " "panel when in Light mode." -msgstr "" +msgstr "轻量级模式导航框架和主框架列表 (除导出页) 中所显示数据表的最大数量。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1284 msgid "$cfg['MaxCharactersInDisplayedSQL'] integer" -msgstr "" +msgstr "$cfg['MaxCharactersInDisplayedSQL'] 整数" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1285 @@ -3204,11 +3231,14 @@ msgid "" "longer than 1000 characters. Also, if a query's length exceeds this limit, " "this query is not saved in the history." msgstr "" +"显示 SQL 查询的最大字数。默认值 1000 通常可以避免 BLOB 字段中十六进制内容的显" +"示，但有些用户确实有超过 1000 字的 SQL 查询。另外，如果一个查询超过了这个限" +"制，也将不会保存在查询历史中。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1291 msgid "$cfg['OBGzip'] string/boolean" -msgstr "" +msgstr "$cfg['OBGzip'] 字符串/布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1292 @@ -3216,6 +3246,8 @@ msgid "" "Defines whether to use GZip output buffering for increased speed in <abbr " "title=\"HyperText Transfer Protocol\">HTTP</abbr> transfers." msgstr "" +"设置是否使用 GZip 压缩输出缓冲来加速 <abbr title=\"超文本转移协议 (HyperText " +"Transfer Protocol)\">HTTP</abbr> 传输。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1294 @@ -3225,40 +3257,43 @@ msgid "" "it if your browser has some problems with buffering. IE6 with a certain " "patch is known to cause data corruption when having enabled buffering." msgstr "" +"设为 true/false 以启/禁用。当设为 'auto' (字符串) 时，phpMyAdmin 将尝试启用输" +"出缓冲并在浏览器对缓冲支持有问题时自动禁用。已知具有特定补丁的 IE6 会在启用缓" +"冲时导致数据损坏。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1299 msgid "$cfg['PersistentConnections'] boolean" -msgstr "" +msgstr "$cfg['PersistentConnections'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1300 msgid "" "Whether persistent connections should be used or not (mysql_connect or " "mysql_pconnect)." -msgstr "" +msgstr "设置是否使用持久连接 (mysql_connect 还是 mysql_pconnect) 。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1303 msgid "$cfg['ForceSSL'] boolean" -msgstr "" +msgstr "$cfg['ForceSSL'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1304 msgid "Whether to force using https while accessing phpMyAdmin." -msgstr "" +msgstr "设置在访问 phpMyAdmin 时是否强制使用 https 安全连接。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1306 msgid "$cfg['ExecTimeLimit'] integer [number of seconds]" -msgstr "" +msgstr "$cfg['ExecTimeLimit'] 整数 [单位: 秒]" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1307 msgid "" "Set the number of seconds a script is allowed to run. If seconds is set to " "zero, no time limit is imposed." -msgstr "" +msgstr "设置脚本可以运行的时间。若设为 0 则无限制。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1309 @@ -3266,11 +3301,12 @@ msgid "" "This setting is used while importing/exporting dump files and in the " "Synchronize feature but has no effect when PHP is running in safe mode." msgstr "" +"本设置用于导入/导出转储文件以及同步功能中，若 PHP 运行于安全模式则无效。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1312 msgid "$cfg['SessionSavePath'] string" -msgstr "" +msgstr "$cfg['SessionSavePath'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1313 @@ -3278,18 +3314,20 @@ msgid "" "Path for storing session data (<a href=\"http://php.net/session_save_path" "\">session_save_path PHP parameter</a>)." msgstr "" +"保存会话数据的路径 (<a href=\"http://php.net/session_save_path\">PHP 参数 " +"session_save_path (外链，英语)</a>)。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1316 msgid "$cfg['MemoryLimit'] integer [number of bytes]" -msgstr "" +msgstr "$cfg['MemoryLimit'] 整数 [单位: 字节]" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1317 msgid "" "Set the number of bytes a script is allowed to allocate. If set to zero, no " "limit is imposed." -msgstr "" +msgstr "设置脚本运行的可使用的内存。若设为 0 则无限制。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1319 @@ -3298,6 +3336,8 @@ msgid "" "places in phpMyAdmin so you definitely don't want to put here a too low " "value. It has no effect when PHP is running in safe mode." msgstr "" +"本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能，所以显然不要设置一个很" +"小的值。若 PHP 运行于安全模式则无效。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1322 @@ -3305,11 +3345,13 @@ msgid "" "You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit " "the suffix (16 means 16 bytes!)" msgstr "" +"同样可以设置为 php.ini 中可以识别的字符串，如 '16M' 。请确保没有丢掉后缀 (16 " +"表示 16 字节！)" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1325 msgid "$cfg['SkipLockedTables'] boolean" -msgstr "" +msgstr "$cfg['SkipLockedTables'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1326 @@ -9929,7 +9971,7 @@ msgstr "" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:4415 msgid "Developers Information" -msgstr "" +msgstr "开发信息" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4417 @@ -9938,13 +9980,15 @@ msgid "" "features have been written by other people and you too can help to make " "phpMyAdmin a useful tool." msgstr "" +"phpMyAdmin 是开源的，我们欢迎您的参与。很多优秀的功能都不是我们写的，你同样可" +"以帮助 phpMyAdmin 变成更加实用的工具。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4421 msgid "" "If you're planning to contribute source, please read the following " "information:" -msgstr "" +msgstr "如果您正打算贡献源代码，请阅读以下信息:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4424 @@ -9952,13 +9996,15 @@ msgid "" "All files include <i>libraries/header.inc.php</i> (layout),. <i>libraries/" "common.lib.php</i> (common functions) and <i>config.inc.php</i>." msgstr "" +"所有文件包括 <i>libraries/header.inc.php</i> (布局)、<i>libraries/common.lib." +"php</i> (公共函数) 以及 <i>config.inc.php</i> 。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4427 msgid "" "Only configuration data should go in <i>config.inc.php</i>. Please keep it " "free from other code." -msgstr "" +msgstr "<i>config.inc.php</i> 中应只存放设置。请勿在其中加入其他代码。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4429 @@ -9967,6 +10013,8 @@ msgid "" "and more specific ones may be added within a library stored into the " "<i>libraries</i> sub-directory." msgstr "" +"公共函数应添加在 <i>libraries/common.lib.php</i> 中，特定功能的函数可以单独的" +"函数库文件形式放在 <i>libraries</i> 子目录中。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4432 @@ -9975,6 +10023,8 @@ msgid "" "to keep your code as simple as possible: beginners are using phpMyAdmin as " "an example application." msgstr "" +"您可以使用任何喜欢的格式书写代码。但请尽量保持代码简洁: 初学者经常使用 " +"phpMyAdmin 作为范例来学习。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4435 @@ -9984,6 +10034,9 @@ msgid "" "Extension and Application Repository\">PEAR</abbr> coding standards</a> on " "the other hand. Please pay attention to this." msgstr "" +"此外，我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href=\"http://pear.php.net/" +"\"> <abbr title=\"PHP 扩展和应用程序库 (PHP Extension and Application " +"Repository)\">PEAR</abbr> 代码标准</a>。请尽量注意。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4441 @@ -9992,6 +10045,8 @@ msgid "" "to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related " "tools to <i>server_*.php</i> and so on." msgstr "" +"请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>，数据库相关的用 " +"<i>db_*.php</i>，服务器相关的用 <i>server_*.php</i> 等。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4444 @@ -9999,11 +10054,13 @@ msgid "" "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." msgstr "" +"请将消息字符串 (至少) 放在<i>english-utf-8.inc.php</i> 中然后用 print() 函数" +"输出，而不是直接写在代码中。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4446 msgid "If you want to be really helpful, write an entry for the ChangeLog." -msgstr "" +msgstr "如果您写一份更新记录，这将会更加有帮助。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4448 @@ -10012,6 +10069,8 @@ msgid "" "is now supported by phpMyAdmin for developers to better debug and profile " "their code." msgstr "" +"phpMyAdmin 现在已经支持 DBG 扩展 (<a href=\"http://dd.cron.ru/dbg/\">PHP 调试" +"器 DBG (外链，英语)</a>) 以便开发者能更好地调试以及测试他们的代码。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4451 @@ -10019,6 +10078,8 @@ msgid "" "Please see the <a href=\"#cfg_DBG\" class=\"configrule\">$cfg['DBG']*</a> " "configuration options for more information." msgstr "" +"更多信息请参见 <a href=\"#cfg_DBG\" class=\"configrule\">$cfg['DBG']*</a> 设" +"置选项。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4454 @@ -10027,6 +10088,8 @@ msgid "" "during its re-entry into Earth's atmosphere and in memory of the brave men " "and women who gave their lives for the people of Earth." msgstr "" +"纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人" +"民牺牲的勇敢的人们。" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:4459 @@ -10114,69 +10177,71 @@ msgstr "phpmyadmin 项目创始人" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4503 msgid "maintainer from 1998 to summer 2000" -msgstr "" +msgstr "1998 至 2000 年夏季的主要维护人" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4506 msgid "Marc Delisle <marc_at_infomarc.info>" -msgstr "" +msgstr "Marc Delisle <marc_at_infomarc.info>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4508 msgid "multi-language version" -msgstr "" +msgstr "多语言版本" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4509 msgid "various fixes and improvements" -msgstr "" +msgstr "许多修正和改进" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4510 msgid "" "<abbr title=\"structured query language\">SQL</abbr> analyser (most of it)" msgstr "" +"<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> 分析器 " +"(大部分)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4511 ../phpmyadmin/Documentation.html:4519 msgid "current project maintainer" -msgstr "" +msgstr "目前的主要维护人" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4514 msgid "Olivier Müller <om_at_omnis.ch>" -msgstr "" +msgstr "Olivier Müller <om_at_omnis.ch>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4516 msgid "started SourceForge phpMyAdmin project in March 2001" -msgstr "" +msgstr "于 2001 年 3 月在 SourceForge 启动 phpMyAdmin 项目" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4517 msgid "sync'ed different existing CVS trees with new features and bugfixes" -msgstr "" +msgstr "同步新功能和缺陷修正到不同的 CVS" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4518 msgid "multi-language improvements, dynamic language selection" -msgstr "" +msgstr "改进多语言，动态语言选择" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4520 ../phpmyadmin/Documentation.html:4529 #: ../phpmyadmin/Documentation.html:4540 ../phpmyadmin/Documentation.html:4667 msgid "many bugfixes and improvements" -msgstr "" +msgstr "许多缺陷修正和改进" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4523 msgid "Loïc Chapeaux <lolo_at_phpheaven.net>" -msgstr "" +msgstr "Loïc Chapeaux <lolo_at_phpheaven.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4525 msgid "rewrote and optimized javascript, DHTML and DOM stuff" -msgstr "" +msgstr "重写并优化 javascript、DHTML 和 DOM" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4526 @@ -10185,16 +10250,18 @@ msgid "" "Application Repository\">PEAR</abbr> coding standards and generate XHTML1.0 " "and CSS2 compliant codes" msgstr "" +"重写脚本使其符合 <abbr title=\"PHP 扩展和应用程序库 (PHP Extension and " +"Application Repository)\">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4528 msgid "improved the language detection system" -msgstr "" +msgstr "改进语言识别系统" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4532 msgid "Robin Johnson <robbat2_at_users.sourceforge.net>" -msgstr "" +msgstr "Robin Johnson <robbat2_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4534 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. b9c3d1e18b943bf468f13c131d8abb70a3ed396d
by Michal Čihař 02 Mar '10

02 Mar '10

The branch, master has been updated via b9c3d1e18b943bf468f13c131d8abb70a3ed396d (commit) via 01acdf0a8335bb6972b7cfb6c90beab032991857 (commit) via 4d98c2d6324119594bf2e06bdb6cda4d1ce55787 (commit) via b1f3a1c03a1df8f4fb05895b46e0333dd50611a9 (commit) via 2031b85a4c3701227328d51011f2f4a10f977579 (commit) via 4aa68778020c71979d748f0c3663571ed47c1f24 (commit) via 6ecab7e7364c930f3d43c8411c02f7eff69629e2 (commit) via 8105d7e1f68cfa7f051f67af98ac3fa990c53be3 (commit) via 99f78fed156d1cfaa8447abce5e28ebf59e64519 (commit) from c064462e37bdb4021972b78a9ef6b83bda6e78ab (commit) - Log ----------------------------------------------------------------- commit b9c3d1e18b943bf468f13c131d8abb70a3ed396d Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 2 11:06:09 2010 +0100 Update generated files. commit 01acdf0a8335bb6972b7cfb6c90beab032991857 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 08:32:30 2010 +0200 Translation update done using Pootle. commit 4d98c2d6324119594bf2e06bdb6cda4d1ce55787 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 06:05:02 2010 +0200 Translation update done using Pootle. commit b1f3a1c03a1df8f4fb05895b46e0333dd50611a9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 06:02:29 2010 +0200 Translation update done using Pootle. commit 2031b85a4c3701227328d51011f2f4a10f977579 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 05:49:58 2010 +0200 Translation update done using Pootle. commit 4aa68778020c71979d748f0c3663571ed47c1f24 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 05:42:15 2010 +0200 Translation update done using Pootle. commit 6ecab7e7364c930f3d43c8411c02f7eff69629e2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 05:41:37 2010 +0200 Translation update done using Pootle. commit 8105d7e1f68cfa7f051f67af98ac3fa990c53be3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 05:40:50 2010 +0200 Translation update done using Pootle. commit 99f78fed156d1cfaa8447abce5e28ebf59e64519 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Mar 2 04:30:21 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 50 ++++++++++++++++++-------------------- po/ro.po | 2 +- po/zh_CN.po | 47 ++++++++++++++++++++++++------------ 3 files changed, 56 insertions(+), 43 deletions(-) diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index f1aae65..9eaca89 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -116,19 +116,18 @@ Questions)">FAQ</abbr> 2.9</a>。</li> <li>将文本文件载入数据表</li> <li>创建<a href="#footnote_1"><sup>1</sup></a>、读取数据表的转储 </li> - <li>导出<a href="#footnote_1"><sup>1</sup></a>数据为多种格式: <abbr title="逗号分隔文件 (Comma + <li>导出<a href="#footnote_1"><sup>1</sup></a>数据为多种格式: <abbr title="逗号分隔型取值 (Comma Separated Values)">CSV</abbr>，<abbr title="可扩展标记语言 (Extensible Markup Language)">XML</abbr>，<abbr title="便携式文档格式 (Portable Document Format)">PDF</abbr>，<abbr title="国际标准化组织 (International Standards Organisation)">ISO</abbr>/<abbr title="国际电工委员会 (International -Electrotechnical Commission)">IEC</abbr> 26300 - 开放文本文档和表格，<abbr -title="Microsoft Word 2000">Word</abbr>，<abbr title="Microsoft Excel 97-2003 -和 Excel 2007">Excel</abbr> 和 L<sup>A</sup>T<sub><big>E</big></sub>X 格式 +Electrotechnical Commission)">IEC</abbr> 26300 - 开放文档文本和表格，<abbr title="微软 +Word 2000">Word</abbr>，<abbr title="微软 Excel 97-2003 和 Excel +2007">Excel</abbr> 和 L<sup>A</sup>T<sub><big>E</big></sub>X 格式 </li> - <li>从 <abbr title="Microsoft Excel 97-2003 和 Excel 2007">Microsoft -Excel</abbr>，开放表格，<abbr title="可扩展标记语言 (Extensible Markup -Language)">XML</abbr>，<abbr title="逗号分隔文件 (Comma Separated -Values)">CSV</abbr> 和 <abbr title="服务器查询语言 (Server Query + <li>从 <abbr title="微软 Excel 97-2003 和 Excel 2007">微软 Excel</abbr>，开放表格，<abbr +title="可扩展标记语言 (Extensible Markup Language)">XML</abbr>，<abbr title="逗号分隔型取值 +(Comma Separated Values)">CSV</abbr> 和 <abbr title="服务器查询语言 (Server Query Language)">SQL</abbr> 文件中导入数据和 MySQL 结构</li> <li>管理多个服务器</li> <li>管理 MySQL 用户和权限</li> @@ -159,7 +158,7 @@ Asked Questions)">FAQ</abbr> 9.1)</a> <p class="footnote" id="footnote_1"> <sup>1)</sup> 若 PHP 有 zlib (<tt>--with-zlib</tt>) 和/或 bzip2 (<tt>--with-bz2</tt>) 扩展 (可能还需要修改 <tt>php.ini</tt>)。phpMyAdmin 在转储和导出 <abbr -title="逗号分隔文件 (comma separated values)">CSV</abbr> 时可压缩成 (zip、gzip -RFC +title="逗号分隔型取值 (comma separated values)">CSV</abbr> 时可压缩成 (zip、gzip -RFC 1952- 或 bzip2 格式)。</p> @@ -179,15 +178,14 @@ title="逗号分隔文件 (comma separated values)">CSV</abbr> 时可压缩成 ( </p> <p class="important"> - Warning for <acronym title="Apple Macintosh">Mac</acronym> users:<br /> - if you are on a <acronym title="Apple Macintosh">Mac</acronym> <abbr -title="operating system">OS</abbr> version before <abbr title="operating -system">OS</abbr> X, StuffIt unstuffs with <acronym title="Apple -Macintosh">Mac</acronym> formats.<br /> - So you'll have to resave as in BBEdit to Unix style ALL phpMyAdmin scripts -before uploading them to your server, as PHP seems not to like <acronym -title="Apple Macintosh">Mac</acronym>-style end of lines character -("<tt>\r</tt>").</p> + <acronym title="苹果麦金塔 (Apple Macintosh)">Mac</acronym> 用户注意:<br /> + 如果你使用的 <acronym title="苹果麦金塔 (Apple Macintosh)">Mac</acronym> <abbr +title="操作系统 (operating system)">OS</abbr> 版本低于 <abbr title="操作系统 (operating +system)">OS</abbr> X，StuffIt 会把文件解压成 <acronym title="苹果麦金塔 (Apple +Macintosh)">Mac</acronym> 格式。<br /> + 因为 PHP 好像不支持 <acronym title="苹果麦金塔 (Apple Macintosh)">Mac</acronym> 式的换行符 +("<tt>\r</tt>")，所以在上传到服务器之前，你必须把所有 phpMyAdmin 脚本用 BBEdit 重新保存为 +Unix 格式。</p> <h3 id="quick_install">快速安装</h3> <ol><li>从 phpmyadmin.net 下载页选择一个合适的版本。有些版本只有英语，有些只使用 UTF-8 编码且包含了所有语言 @@ -385,14 +383,14 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real <ul><li>通过 <abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 基本认证可以使用任何合法的 MySQL 用户登录。</li> - <li>Is supported with most PHP configurations. For <abbr title="Internet -Information Services">IIS</abbr> (<abbr title="Internet Server Application -Programming Interface">ISAPI</abbr>) support using <abbr title="Common -Gateway Interface">CGI</abbr> PHP see <a href="#faq1_32"><abbr -title="Frequently Asked Questions">FAQ</abbr> 1.32</a>, for using with -Apache <abbr title="Common Gateway Interface">CGI</abbr> see <a -href="#faq1_35"><abbr title="Frequently Asked Questions">FAQ</abbr> -1.35</a>.</li> + <li>大部分 PHP 设置都支持。参见 <a href="#faq1_32"><abbr title="常见问题 (Frequently Asked +Questions)">FAQ</abbr> 1.32</a> 了解如何设置在 <abbr title="Internet 信息服务 (Internet +Information Services)">IIS</abbr> 中以 (<abbr title="互联网服务器应用程序接口 (Internet +Server Application Programming Interface)">ISAPI</abbr>) 和 <abbr +title="通用网关接口 (Common Gateway Interface)">CGI</abbr> 方式使用的 PHP，参见 <a +href="#faq1_35"><abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> +1.35</a> 了解如何设置在 Apache 中以 <abbr title="通用网关接口 (Common Gateway +Interface)">CGI</abbr> 方式使用的 PHP 。</li> <li>参见 <a href="#faq4_4"> <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 4.4</a> 关于不要同时使用 <i>.htaccess</i> 和 '<abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr>' 认证的问题。</li> diff --git a/po/ro.po b/po/ro.po index 77a9861..667b6f7 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2010-03-01 12:14+0200\n" "Last-Translator: <the_sky_dreamer2003(a)yahoo.com>\n" "Language-Team: none\n" -"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.0.1\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5ac8bad..ba4e31f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-01 08:21+0100\n" -"PO-Revision-Date: 2010-02-26 12:49+0200\n" +"PO-Revision-Date: 2010-03-02 08:32+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -333,14 +333,14 @@ msgid "" "and L<sup>A</sup>T<sub><big>E</big></sub>X formats" msgstr "" "导出<a href=\"#footnote_1\"><sup>1</sup></a>数据为多种格式: <abbr title=\"逗" -"号分隔文件 (Comma Separated Values)\">CSV</abbr>，<abbr title=\"可扩展标记语" -"言 (Extensible Markup Language)\">XML</abbr>，<abbr title=\"便携式文档格式 " +"号分隔型取值 (Comma Separated Values)\">CSV</abbr>，<abbr title=\"可扩展标记" +"语言 (Extensible Markup Language)\">XML</abbr>，<abbr title=\"便携式文档格式 " "(Portable Document Format)\">PDF</abbr>，<abbr title=\"国际标准化组织 " "(International Standards Organisation)\">ISO</abbr>/<abbr title=\"国际电工委" "员会 (International Electrotechnical Commission)\">IEC</abbr> 26300 - 开放文" -"本文档和表格，<abbr title=\"Microsoft Word 2000\">Word</abbr>，<abbr title=" -"\"Microsoft Excel 97-2003 和 Excel 2007\">Excel</abbr> 和 L<sup>A</" -"sup>T<sub><big>E</big></sub>X 格式" +"档文本和表格，<abbr title=\"微软 Word 2000\">Word</abbr>，<abbr title=\"微软 " +"Excel 97-2003 和 Excel 2007\">Excel</abbr> 和 L<sup>A</sup>T<sub><big>E</" +"big></sub>X 格式" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:125 @@ -351,11 +351,11 @@ msgid "" "\"Comma Separated Values\">CSV</abbr>, and <abbr title=\"Server Query " "Language\">SQL</abbr> files" msgstr "" -"从 <abbr title=\"Microsoft Excel 97-2003 和 Excel 2007\">Microsoft Excel</" -"abbr>，开放表格，<abbr title=\"可扩展标记语言 (Extensible Markup Language)" -"\">XML</abbr>，<abbr title=\"逗号分隔文件 (Comma Separated Values)\">CSV</" -"abbr> 和 <abbr title=\"服务器查询语言 (Server Query Language)\">SQL</abbr> 文" -"件中导入数据和 MySQL 结构" +"从 <abbr title=\"微软 Excel 97-2003 和 Excel 2007\">微软 Excel</abbr>，开放表" +"格，<abbr title=\"可扩展标记语言 (Extensible Markup Language)\">XML</abbr>，" +"<abbr title=\"逗号分隔型取值 (Comma Separated Values)\">CSV</abbr> 和 <abbr " +"title=\"服务器查询语言 (Server Query Language)\">SQL</abbr> 文件中导入数据和 " +"MySQL 结构" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:126 @@ -473,8 +473,8 @@ msgid "" msgstr "" "<sup>1)</sup> 若 PHP 有 zlib (<tt>--with-zlib</tt>) 和/或 bzip2 (<tt>--with-" "bz2</tt>) 扩展 (可能还需要修改 <tt>php.ini</tt>)。phpMyAdmin 在转储和导出 " -"<abbr title=\"逗号分隔文件 (comma separated values)\">CSV</abbr> 时可压缩成 " -"(zip、gzip -RFC 1952- 或 bzip2 格式)。" +"<abbr title=\"逗号分隔型取值 (comma separated values)\">CSV</abbr> 时可压缩" +"成 (zip、gzip -RFC 1952- 或 bzip2 格式)。" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:166 @@ -522,6 +522,7 @@ msgstr "" #: ../phpmyadmin/Documentation.html:183 msgid "Warning for <acronym title=\"Apple Macintosh\">Mac</acronym> users:" msgstr "" +"<acronym title=\"苹果麦金塔 (Apple Macintosh)\">Mac</acronym> 用户注意:" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:184 @@ -531,6 +532,10 @@ msgid "" "\">OS</abbr> X, StuffIt unstuffs with <acronym title=\"Apple Macintosh" "\">Mac</acronym> formats." msgstr "" +"如果你使用的 <acronym title=\"苹果麦金塔 (Apple Macintosh)\">Mac</acronym> " +"<abbr title=\"操作系统 (operating system)\">OS</abbr> 版本低于 <abbr title=" +"\"操作系统 (operating system)\">OS</abbr> X，StuffIt 会把文件解压成 <acronym " +"title=\"苹果麦金塔 (Apple Macintosh)\">Mac</acronym> 格式。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:188 @@ -540,6 +545,9 @@ msgid "" "title=\"Apple Macintosh\">Mac</acronym>-style end of lines character ("" "<tt>\\r</tt>")." msgstr "" +"因为 PHP 好像不支持 <acronym title=\"苹果麦金塔 (Apple Macintosh)\">Mac</" +"acronym> 式的换行符 ("<tt>\r</tt>")，所以在上传到服务器之前，你必须" +"把所有 phpMyAdmin 脚本用 BBEdit 重新保存为 Unix 格式。" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:193 @@ -1207,6 +1215,15 @@ msgid "" "<abbr title=\"Common Gateway Interface\">CGI</abbr> see <a href=\"#faq1_35" "\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.35</a>." msgstr "" +"大部分 PHP 设置都支持。参见 <a href=\"#faq1_32\"><abbr title=\"常见问题 " +"(Frequently Asked Questions)\">FAQ</abbr> 1.32</a> 了解如何设置在 <abbr " +"title=\"Internet 信息服务 (Internet Information Services)\">IIS</abbr> 中以 " +"(<abbr title=\"互联网服务器应用程序接口 (Internet Server Application " +"Programming Interface)\">ISAPI</abbr>) 和 <abbr title=\"通用网关接口 (Common " +"Gateway Interface)\">CGI</abbr> 方式使用的 PHP，参见 <a href=\"#faq1_35" +"\"><abbr title=\"常见问题 (Frequently Asked Questions)\">FAQ</abbr> 1.35</a> " +"了解如何设置在 Apache 中以 <abbr title=\"通用网关接口 (Common Gateway " +"Interface)\">CGI</abbr> 方式使用的 PHP 。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:479 @@ -11629,10 +11646,8 @@ msgstr "汉语 (简体)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:154 -#, fuzzy -#| msgid "Orzu Samarqandiy (orzu(a)users.sourceforge.net)" 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 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_0RC1-166-gc48b786
by Herman van Rink 02 Mar '10

02 Mar '10

The branch, master has been updated via c48b786632ae0b786cc8fde8b2419d927a3baf1e (commit) from 195a084f38bd051ab8de3d19f7fa07d62d810263 (commit) - Log ----------------------------------------------------------------- commit c48b786632ae0b786cc8fde8b2419d927a3baf1e Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Mar 2 11:01:56 2010 +0100 uploadprogress: cleanup + added documentation link ----------------------------------------------------------------------- Summary of changes: libraries/display_import.lib.php | 4 ++-- libraries/display_import_ajax.lib.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index c24ff99..b99a8e2 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -26,7 +26,7 @@ if (empty($import_list)) { } ?> -<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none" src="import.php?<?php echo PMA_generate_common_url(); ?>"></iframe> +<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none"></iframe> <div id="import_form_status" style="display: none;"></div> <div id="importmain"> <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> @@ -98,7 +98,7 @@ window.addEvent('domready', function() { <?php } else { ?> - $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable; ?>'); + $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>'); $('upload_form_status').setStyle("display", "none"); <?php } // else diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index cf75da3..c05cd4d 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -31,7 +31,7 @@ $plugins = array( "uploadprogress", "apc", "noplugin" - ); // available plugins. Each plugin has own checkfunction in upload_functions.php and own file with functions in upload_#KEY#.php + ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php // select available plugin foreach ($plugins as $plugin) { @@ -40,8 +40,8 @@ foreach ($plugins as $plugin) { if ($check()) { $_SESSION[$SESSION_KEY]["handler"] = $plugin; include_once("import/upload/" . $plugin . ".php"); - break; - } + break; + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_0RC1-165-g195a084
by Michal Čihař 01 Mar '10

01 Mar '10

The branch, master has been updated via 195a084f38bd051ab8de3d19f7fa07d62d810263 (commit) via 23ea1c404217fa96e7c6127e8b81d405469f19bd (commit) via bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 (commit) via 0a681c84a551b2cdd3283b2a608375bfc0143b64 (commit) via a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 (commit) via 2fada4e4a3dd405e0549bbe5ce20e2a46ced453f (commit) via 9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit) via d000a74d09a2f1cd6645df64b1bfa0c55257f9f5 (commit) via f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit) via 0b7a3f716ad59c1b6db88cc721b6d158cf4833a6 (commit) via d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit) via 1f5a19b69cc303728417c13dbb23f7fd9fc89a97 (commit) via bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit) via 063058741bc37974e06b7d7db6fc74ce620bf649 (commit) via b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit) via c896fb50ad9ac9dc73bd83a99b01f3a440c753f1 (commit) via f900210a0f05511658a8d64d8876b935ab7a5972 (commit) via 0645a4f1190588403093d7824bfbe28f39972a29 (commit) via 66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit) via 92f1160b2a23f14a966fab1ef2ff2620f363a570 (commit) via 548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit) via ee70c958d8df15848cf2f3ef6ed1fe7c75cc28bc (commit) via cbe8f389821d2fb0a107478e73b654309566380d (commit) via b2673cf501e1c25bb185f002b687f70951fceda9 (commit) via 326deca827d87eb148afb96fa6ec7ce29644cb93 (commit) via fd4ded141021d2d496c7095f375aefb10b590c16 (commit) via a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit) via 3287ca0e4b40b5c501c1aeab6c0eb90eaa7c3674 (commit) via b1c1640dc92238b0fafb3c0c2f9c4350a05571d0 (commit) via 5fd02248cd4f410d963daf55150c33e8d4e01850 (commit) via fd739840cdb07739c8b971363291c9d0534764ec (commit) via a91fa294db2116ade8f0995b251e9b44b70bc13f (commit) via 624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit) via f2f0e9bb47fb2b238f7c53dff83b72fb3b1a1866 (commit) via 644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit) via 91dee4238c0e584afa470287b2c69127d54f8998 (commit) via e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit) via eacec1d091c07a785b63a092e9d5c294f574c107 (commit) via 0a6badd2d60b6cc216f714ea777905566de14e60 (commit) via 1ad5d85666f1c10c7c3da5900fb5fbdcd690499c (commit) via f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit) via 6d9b602b8741a253fcfcf7e4c8e14fbe23f35f85 (commit) via aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit) via a04da7df128258ce493ff4e6b8f91bece9d48886 (commit) via c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit) via a3d022b7caaeecfe6baf28216302ebadac06190d (commit) via fe5e8999b42b98873a032a937cb873f2d47a1826 (commit) via 2e60e8710e129e6f8942a726f52a2ffdea9d4c25 (commit) via 182ca44769a3940616e42de5b90ad97693dec362 (commit) via cf3f73f5d0f549c7833da0483a168effe627ca16 (commit) via 8adc82666bca869bdf73f2b92d40df532fe10f57 (commit) via bf7b74e941bc012c85e4523b219a1027cbf01de2 (commit) via e16be872b64cab229784a0700a329871454f8baf (commit) via afb6f77d8d2ec4d7ba92ca8279b736e4f5bf7729 (commit) via 4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit) via d0e2fc83f37283eb33c9ad422e938d709a84d98b (commit) via 079cb404c776821bc9b161bd297b956a6e6418a4 (commit) via 891c5780feafe82e1f363f45a23c1067943ce47a (commit) via 6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit) via 01a70cca07878bb83112352b43e3a6bc67a5e224 (commit) via cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit) via 902e07df774c602e2f63838ae1c57adb88092ddd (commit) via 867782d82ffe888feb40091aa417818e115090b8 (commit) via 6045e72cd355133eb49da59150846c4acbc8103e (commit) via 994381d3c827271b61ccd203f5c953b434a6b772 (commit) via e596726312e3fbd3638e23a536933f22135320d7 (commit) via b10d8c63abb010c9917f3a20b192b22da62bf478 (commit) via 34e8c15a64c656d2f6c40fcc2ba9f8e2f0d8e635 (commit) via db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit) via d2880858cb57e4d0289188c60552f726f17b0435 (commit) via 34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit) via 2e4ce6afa754bb9ff65b624e9f407451da1cdcdf (commit) via f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit) via 512975e91cfbb603952690ac2e1926d031174b6c (commit) via 1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit) via 294d699e8475cb3ab171441d429e7715beaf3c67 (commit) via 78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit) via c67ceaa83b6107a6e0d8e4e1ef1ff26e37e08f1d (commit) via c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit) via 4e4e40188f7d6a0a49e9471da97942c9fbc17797 (commit) via 93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit) via 73275fc4deff9ea416589d9a0928e0e90d4607dc (commit) via a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit) via 526dce65cb41e64c40df2939d5a5bc3db7a683d1 (commit) via f3833884e430cf9104114f391e71925c5f6bd5fa (commit) from 1283f4a5f62af79338cf74ec4f4171d8684a1ddd (commit) - Log ----------------------------------------------------------------- commit 195a084f38bd051ab8de3d19f7fa07d62d810263 Merge: 23ea1c404217fa96e7c6127e8b81d405469f19bd 1283f4a5f62af79338cf74ec4f4171d8684a1ddd Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 1 13:27:43 2010 +0100 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 23ea1c404217fa96e7c6127e8b81d405469f19bd Merge: 0a681c84a551b2cdd3283b2a608375bfc0143b64 bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 1 13:23:44 2010 +0100 Merge branch 'QA_3_3' commit 0a681c84a551b2cdd3283b2a608375bfc0143b64 Merge: 4cff76ec9b240625db52b6747d6f841335ae6b75 a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 1 13:20:19 2010 +0100 Merge remote branch 'origin/QA_3_3' Conflicts: ChangeLog Documentation.html README lang/afrikaans-utf-8.inc.php lang/albanian-utf-8.inc.php lang/arabic-utf-8.inc.php lang/azerbaijani-utf-8.inc.php lang/bangla-utf-8.inc.php lang/basque-utf-8.inc.php lang/belarusian_cyrillic-utf-8.inc.php lang/belarusian_latin-utf-8.inc.php lang/bosnian-utf-8.inc.php lang/brazilian_portuguese-utf-8.inc.php lang/bulgarian-utf-8.inc.php lang/catalan-utf-8.inc.php lang/chinese_simplified-utf-8.inc.php lang/chinese_traditional-utf-8.inc.php lang/croatian-utf-8.inc.php lang/czech-utf-8.inc.php lang/danish-utf-8.inc.php lang/dutch-utf-8.inc.php lang/estonian-utf-8.inc.php lang/finnish-utf-8.inc.php lang/french-utf-8.inc.php lang/galician-utf-8.inc.php lang/georgian-utf-8.inc.php lang/german-utf-8.inc.php lang/greek-utf-8.inc.php lang/hebrew-utf-8.inc.php lang/hindi-utf-8.inc.php lang/hungarian-utf-8.inc.php lang/indonesian-utf-8.inc.php lang/italian-utf-8.inc.php lang/japanese-utf-8.inc.php lang/korean-utf-8.inc.php lang/latvian-utf-8.inc.php lang/lithuanian-utf-8.inc.php lang/macedonian_cyrillic-utf-8.inc.php lang/malay-utf-8.inc.php lang/mongolian-utf-8.inc.php lang/norwegian-utf-8.inc.php lang/persian-utf-8.inc.php lang/polish-utf-8.inc.php lang/portuguese-utf-8.inc.php lang/romanian-utf-8.inc.php lang/russian-utf-8.inc.php lang/serbian_cyrillic-utf-8.inc.php lang/serbian_latin-utf-8.inc.php lang/sinhala-utf-8.inc.php lang/slovak-utf-8.inc.php lang/slovenian-utf-8.inc.php lang/spanish-utf-8.inc.php lang/swedish-utf-8.inc.php lang/tatarish-utf-8.inc.php lang/thai-utf-8.inc.php lang/turkish-utf-8.inc.php lang/ukrainian-utf-8.inc.php lang/uzbek_cyrillic-utf-8.inc.php lang/uzbek_latin-utf-8.inc.php libraries/Config.class.php libraries/display_tbl.lib.php server_privileges.php server_replication.php translators.html ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++-- lang/dutch-utf-8.inc.php | 1 + lang/english-utf-8.inc.php | 1 + lang/french-utf-8.inc.php | 4 ++-- server_privileges.php | 4 ++-- tbl_select.php | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b441d9..52a8c1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,7 +43,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly -- Foo +- bug #2948492 [interface] Slide effect masks some fields on search page +- Test 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, @@ -123,7 +124,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -- [privileges] Improve escaping of hostname +- [privileges] Improve Proper escaping of hostname 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 3e1d079..f3d9e0e 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strShowInsert = 'Toon insert query'; $strPDFPageCreated = 'Pagina is aangemaakt'; $strPDFPageCreateFailed = 'Het aanmaken van de pagina is mislukt'; $strPmadbReLoginToEnable = 'Log opnieuw in om de gewijzigde instellingen te gebruiken.'; + ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 69684b7..c557ab7 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; + ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index e280837..88dd503 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1611,8 +1611,6 @@ $strXML = 'XML'; $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; -$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to translate -$strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate $strZip = '"zippé"'; $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate @@ -1628,4 +1626,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (<code>c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to translate +$strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate ?> diff --git a/server_privileges.php b/server_privileges.php index a41fde8..28c2a3e 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1780,7 +1780,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if (in_array($table_search_in, $tables)) { $db_rights_sqls[] = ' SELECT DISTINCT `Table_name` - FROM `mysql`.' . PMA_backquote($table_search_in) + FROM `mysql`.' . PMA_backquote($table_search_in) . $user_host_condition; } } @@ -1891,7 +1891,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $current_db = PMA_escape_mysql_wildcards($current_db); // cannot use array_diff() once, outside of the loop, // because the list of databases has special characters - // already escaped in $found_rows, + // already escaped in $found_rows, // contrary to the output of SHOW DATABASES if (empty($found_rows) || ! in_array($current_db, $found_rows)) { echo ' <option value="' . htmlspecialchars($current_db) . '">' diff --git a/tbl_select.php b/tbl_select.php index 06433ca..78b749d 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -308,6 +308,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { unset($choices); ?> </fieldset> +<br style="clear: both;"/> </div> </fieldset> <fieldset class="tblFooters"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_0RC1-42-gbf4a7ee
by Michal Čihař 01 Mar '10

01 Mar '10

The branch, QA_3_3 has been updated via bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 (commit) via 9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit) via f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit) via d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit) via bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit) via b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit) via f900210a0f05511658a8d64d8876b935ab7a5972 (commit) via 66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit) via 548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit) via cbe8f389821d2fb0a107478e73b654309566380d (commit) via 326deca827d87eb148afb96fa6ec7ce29644cb93 (commit) via a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit) via 5fd02248cd4f410d963daf55150c33e8d4e01850 (commit) via fd739840cdb07739c8b971363291c9d0534764ec (commit) via 624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit) via 644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit) via e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit) via 0a6badd2d60b6cc216f714ea777905566de14e60 (commit) via f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit) via aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit) via c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit) via fe5e8999b42b98873a032a937cb873f2d47a1826 (commit) via 182ca44769a3940616e42de5b90ad97693dec362 (commit) via 8adc82666bca869bdf73f2b92d40df532fe10f57 (commit) via e16be872b64cab229784a0700a329871454f8baf (commit) via 4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit) via 079cb404c776821bc9b161bd297b956a6e6418a4 (commit) via 6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit) via cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit) via 867782d82ffe888feb40091aa417818e115090b8 (commit) via 994381d3c827271b61ccd203f5c953b434a6b772 (commit) via b10d8c63abb010c9917f3a20b192b22da62bf478 (commit) via db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit) via 34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit) via f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit) via 1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit) via 78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit) via c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit) via 93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit) via a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit) from a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 (commit) - Log ----------------------------------------------------------------- commit bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 Merge: a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 9bcc37451d42dce0f522bf0d51462bb82abc14d8 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 1 13:23:28 2010 +0100 Merge branch 'MAINT_3_3_0' into QA_3_3 Conflicts: ChangeLog Documentation.html README libraries/Config.class.php translators.html ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea0acff..8b80ecd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,7 +88,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -- [privileges] Improve escaping of hostname +- [privileges] Improve Proper escaping of hostname 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status hooks/post-receive -- phpMyAdmin

1 0