- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 732765b13b7650061774213e2bdc8a962eced52d
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit 47dda91a6cc020c5fa052ed953012f1745acfc6b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Feb 23 07:09:26 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index ae1d2c3..878e7ec 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -605,6 +605,14 @@ msgid "" "$cfg['Servers'][$i]['auth_type'] = 'config';\n" "?>\n" msgstr "" +"<?php\n" +"\n" +"$i=0;\n" +"$i++;\n" +"$cfg['Servers'][$i]['user'] = 'root';\n" +"$cfg['Servers'][$i]['password'] = 'cbb74bc'; // 这里填写你的密码\n" +"$cfg['Servers'][$i]['auth_type'] = 'config';\n" +"?>\n" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpMyAdmin/Documentation.html:249 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 732765b13b7650061774213e2bdc8a962eced52d
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit 0f1f1cf4bc30606effe12f8892f2cd19995edbca Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Feb 23 07:09:02 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 13b4041..ae1d2c3 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-23 07:08+0200\n" +"PO-Revision-Date: 2010-02-23 07:09+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -590,7 +590,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpMyAdmin/Documentation.html:238 msgid "Or, if you prefer to not be prompted every time you log in:" -msgstr "" +msgstr "或者，如果你不想每次都登录:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpMyAdmin/Documentation.html:240 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 732765b13b7650061774213e2bdc8a962eced52d
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit 0776cb1a40873be40e1e998c8c82b790ec1758ba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Feb 23 07:08:30 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 250f988..13b4041 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-23 07:07+0200\n" +"PO-Revision-Date: 2010-02-23 07:08+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -579,6 +579,13 @@ msgid "" "$cfg['Servers'][$i]['auth_type'] = 'cookie';\n" "?>\n" msgstr "" +"<?php\n" +"$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // 此值可任意修改\n" +"\n" +"$i=0;\n" +"$i++;\n" +"$cfg['Servers'][$i]['auth_type'] = 'cookie';\n" +"?>\n" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpMyAdmin/Documentation.html:238 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 732765b13b7650061774213e2bdc8a962eced52d
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit 4b604cc617b80332a8cefaacc7a74fcbd4f4199f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Feb 23 07:07:51 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 6c55777..250f988 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-23 07:05+0200\n" +"PO-Revision-Date: 2010-02-23 07:07+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -561,6 +561,11 @@ msgid "" "tt>. You'll need a few directives to get going, a simple configuration may " "look like this:" msgstr "" +"要手动创建 <tt>config.inc.php</tt>，首先你要有一个文本编辑器 (你可以复制 phpMyAdmin 主目录 (顶层，包含 " +"<tt>index.php</tt> 的目录) 的 <tt>config.sample.inc.php</tt> " +"获得包含最小配置的配置文件。phpMyAdmin 首先会加载 <tt>libraries/config.default.php</tt> " +"中的默认设置，然后再用 <tt>config.inc.php</tt> 中的设置覆盖。如果默认值就是你所需要的，那就不用在 " +"<tt>config.inc.php</tt> 里面再写一遍了。一个简单的设置如下:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpMyAdmin/Documentation.html:230 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 732765b13b7650061774213e2bdc8a962eced52d
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit 33d4d32616a35d731f3a5c939244df3a036c79b5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Feb 23 07:05:10 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 9e3188a..6c55777 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-22 13:52+0200\n" +"PO-Revision-Date: 2010-02-23 07:05+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -544,6 +544,9 @@ msgid "" "graphical installation. Creating a <tt>config.inc.php</tt> is still a quick " "way to get started and needed for some advanced features." msgstr "" +"现在你需要做一些设置。通常我们会手动编辑一份 <tt>config.inc.php</tt> " +"的副本，但现在我们为那些喜欢使用图形界面安装的用户提供了一个向导式的安装脚本。手动创建 <tt>config.inc.php</tt> " +"仍然是一个快速安装的方法，而且一些高级功能也需要手动编辑。" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpMyAdmin/Documentation.html:218 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 8a62ef403067b455f5f893ef5aa2f4b02171eaab
by Michal Čihař 24 Feb '10

24 Feb '10

The following commit has been merged in the master branch: commit c8505df68020798d7ba3cafe8dd7c7054e6c5d4f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Feb 24 09:40:14 2010 +0100 Add missing quotes. diff --git a/admin/locales-update b/admin/locales-update index e3d277a..65837ec 100755 --- a/admin/locales-update +++ b/admin/locales-update @@ -18,31 +18,31 @@ getname() { langname() { case $1 in fr) - echo French + echo "French" ;; cs) - echo Czech + echo "Czech" ;; pt_BR) - echo Brazilian Portuguese + echo "Brazilian Portuguese" ;; jp) - echo Japanese + echo "Japanese" ;; pl) - echo Polish + echo "Polish" ;; zh_TW) - echo Traditional Chinese + echo "Traditional Chinese" ;; zh_CN) - echo Simplified Chinese + echo "Simplified Chinese" ;; hy) - echo Armenian + echo "Armenian" ;; en_GB) - echo English (United Kingdom) + echo "English (United Kingdom)" ;; ### MARKER TO ADD NEW LANGUAGE NAMES ### *) diff --git a/admin/new-lang b/admin/new-lang index bf53efa..a3e8eb8 100755 --- a/admin/new-lang +++ b/admin/new-lang @@ -15,7 +15,7 @@ sed -i "s/$.*po4a_langs.*$/\1 $1/" po4a.conf sed -i "/### MARKER TO ADD NEW LANGUAGE NAMES ###/ i \\ $1) /### MARKER TO ADD NEW LANGUAGE NAMES ###/ i \\ - echo $2 + echo \"$2\" /### MARKER TO ADD NEW LANGUAGE NAMES ###/ i \\ ;;" admin/locales-update -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 930c06a7689d0beb144bf2125e326e90c2eb567b
by Michal Čihař 22 Feb '10

22 Feb '10

The following commit has been merged in the master branch: commit 930c06a7689d0beb144bf2125e326e90c2eb567b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon Feb 22 13:52:58 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 75e4351..9e3188a 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-22 13:17+0200\n" +"PO-Revision-Date: 2010-02-22 13:52+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -530,6 +530,10 @@ msgid "" "\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.26</a> for " "suggestions." msgstr "" +"确保所有的脚本都有正确的所有者 (如果 PHP 运行于安全模式，所有者的不同可能会导致问题)。参见 <a href=\"#faq4_2\"><abbr " +"title=\"常见问题 (Frequently Asked Questions)\">FAQ</abbr> 4.2</a> 和 <a " +"href=\"#faq1_26\"><abbr title=\"常见问题 (Frequently Asked Questions)\">FAQ</abbr> " +"1.26</a>。" #. type: Content of: <html><body><div><ol><li> #: ../phpMyAdmin/Documentation.html:213 -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 930c06a7689d0beb144bf2125e326e90c2eb567b
by Michal Čihař 22 Feb '10

22 Feb '10

The following commit has been merged in the master branch: commit 2c4f656a93169684008b5575f08acd25058ffcea Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon Feb 22 13:17:42 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index d2ac89d..75e4351 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-22 13:09+0200\n" +"PO-Revision-Date: 2010-02-22 13:17+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -422,7 +422,7 @@ 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 " +"title=\"逗号分隔文件 (comma separated values)\">CSV</abbr> 时可压缩成 (zip、gzip -RFC " "1952- 或 bzip2 格式)。" #. type: Content of: <html><body><div><h2> -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 930c06a7689d0beb144bf2125e326e90c2eb567b
by Michal Čihař 22 Feb '10

22 Feb '10

The following commit has been merged in the master branch: commit 7231543603d875933a0e5ccef4ebb816d100ccd8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon Feb 22 13:09:41 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 0e0be2f..d2ac89d 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-22 12:46+0200\n" +"PO-Revision-Date: 2010-02-22 13:09+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -263,7 +263,7 @@ msgid "" "execute, edit and bookmark any <abbr title=\"structured query language" "\">SQL</abbr>-statement, even batch-queries" msgstr "" -"运行、编辑一条或多条任意 <abbr title=\\\"结构化查询语言 (structured query language)\\\">SQL</abbr> " +"运行、编辑一条或多条任意 <abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> " "语句，并加入书签" #. type: Content of: <html><body><div><ul><li> -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 5c75aca5446d04f277c9aaf049ff4d37f8092ebf
by Michal Čihař 22 Feb '10

22 Feb '10

The following commit has been merged in the master branch: commit 5c75aca5446d04f277c9aaf049ff4d37f8092ebf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon Feb 22 12:46:28 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index c29eaac..0e0be2f 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-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-22 12:44+0200\n" +"PO-Revision-Date: 2010-02-22 12:46+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -516,6 +516,9 @@ msgid "" "the files in a directory on your local machine, and, after step 4, transfer " "the directory on your web server using, for example, ftp." msgstr "" +"解开这个压缩包 (连同子目录一起解压): 在你网站服务器的文档根目录执行 <tt>tar -xzvf phpMyAdmin_x.x.x-all-" +"languages.tar.gz</tt> 。如果你没有直接的访问服务器的权限，先把这些文件解压到你自己的电脑上，等完成第 4 步之后，再通过 ftp " +"等方式上传到你的网站服务器上。" #. type: Content of: <html><body><div><ol><li> #: ../phpMyAdmin/Documentation.html:206 -- phpMyAdmin localized documentation

1 0