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@novell.com Date: Tue Mar 2 11:06:09 2010 +0100

Update generated files.

commit 01acdf0a8335bb6972b7cfb6c90beab032991857 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 08:32:30 2010 +0200

Translation update done using Pootle.

commit 4d98c2d6324119594bf2e06bdb6cda4d1ce55787 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 06:05:02 2010 +0200

Translation update done using Pootle.

commit b1f3a1c03a1df8f4fb05895b46e0333dd50611a9 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 06:02:29 2010 +0200

Translation update done using Pootle.

commit 2031b85a4c3701227328d51011f2f4a10f977579 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 05:49:58 2010 +0200

Translation update done using Pootle.

commit 4aa68778020c71979d748f0c3663571ed47c1f24 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 05:42:15 2010 +0200

Translation update done using Pootle.

commit 6ecab7e7364c930f3d43c8411c02f7eff69629e2 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 05:41:37 2010 +0200

Translation update done using Pootle.

commit 8105d7e1f68cfa7f051f67af98ac3fa990c53be3 Author: shanyan baishui Siramizu@gmail.com Date: Tue Mar 2 05:40:50 2010 +0200

Translation update done using Pootle.

commit 99f78fed156d1cfaa8447abce5e28ebf59e64519 Author: shanyan baishui Siramizu@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">¹</a>、读取数据表的转储 </li> - <li>导出<a href="#footnote_1">¹</a>数据为多种格式: <abbr title="逗号分隔文件 (Comma + <li>导出<a href="#footnote_1">¹</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^AT_<big>E</big>X 格式 +Electrotechnical Commission)">IEC</abbr> 26300 - 开放文档文本和表格，<abbr title="微软 +Word 2000">Word</abbr>，<abbr title="微软 Excel 97-2003 和 Excel +2007">Excel</abbr> 和 L^AT_<big>E</big>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"> ¹⁾ 若 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 -(&quot;<tt>\r</tt>&quot;).</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> 式的换行符 +(&quot;<tt>\r</tt>&quot;)，所以在上传到服务器之前，你必须把所有 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@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@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@gmail.com\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -333,14 +333,14 @@ msgid "" "and L^AT_<big>E</big>X formats" msgstr "" "导出<a href="#footnote_1">¹</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_<big>E</big>X 格式" +"档文本和表格，<abbr title="微软 Word 2000">Word</abbr>，<abbr title="微软 " +"Excel 97-2003 和 Excel 2007">Excel</abbr> 和 L^AT_{<big>E</" +"big>}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 "" "¹⁾ 若 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 (&quot;" "<tt>\r</tt>&quot;)." msgstr "" +"因为 PHP 好像不支持 <acronym title="苹果麦金塔 (Apple Macintosh)">Mac</" +"acronym> 式的换行符 (&quot;<tt>\r</tt>&quot;)，所以在上传到服务器之前，你必须" +"把所有 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@users.sourceforge.net)" msgid "Shanyan Baishui (rimyxp@users.sourceforge.net)" -msgstr "Orzu Samarqandiy (orzu@users.sourceforge.net)" +msgstr "Shanyan Baishui (rimyxp@users.sourceforge.net)"

#. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:159

hooks/post-receive