Git

git@phpmyadmin.net

9 participants
38209 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10086-g77b6fb1
by Dieter Adriaenssens 10 Sep '10

10 Sep '10

The branch, master has been updated via 77b6fb172d3099c54335e05e12859b5d8ca42950 (commit) via 194e357a996310225364d311e6c27ed41db002bb (commit) from 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 (commit) - Log ----------------------------------------------------------------- commit 77b6fb172d3099c54335e05e12859b5d8ca42950 Merge: 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 194e357a996310225364d311e6c27ed41db002bb Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri Sep 10 17:34:52 2010 +0200 Merge branch 'QA_3_3' Conflicts: ChangeLog ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++ libraries/import.lib.php | 68 +++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad54bee..d15366e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,9 @@ - bug #3056610 [interface] Removed modification options for information_schema + patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau +3.3.8.0 (not yet released) +- bug #3059311 [import] BIGINT field type added to table analysis + 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 8ef38f6..bacc6a4 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -408,6 +408,7 @@ define("NONE", 0); define("VARCHAR", 1); define("INT", 2); define("DECIMAL", 3); +define("BIGINT", 4); /* Decimal size defs */ define("M", 0); @@ -489,6 +490,7 @@ function PMA_getDecimalSize(&$cell) { * @uses FULL * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses strcmp() @@ -497,8 +499,8 @@ function PMA_getDecimalSize(&$cell) { * @uses PMA_getD() * @uses PMA_getDecimalSize() * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT) + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ @@ -516,7 +518,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == VARCHAR) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -526,7 +528,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -538,9 +540,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -569,7 +571,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == DECIMAL) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ @@ -582,7 +584,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $size = PMA_getDecimalSize($cell); @@ -599,9 +601,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { /* Convert $last_cumulative_size from int to decimal format */ $size = PMA_getDecimalSize($cell); @@ -632,11 +634,11 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * What to do if the current cell is of type INT + * What to do if the current cell is of type BIGINT or INT */ - elseif ($curr_type == INT) { + elseif ($curr_type == BIGINT || $curr_type == INT) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -646,7 +648,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -664,9 +666,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -709,6 +711,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @access public * * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses VARCHAR * @uses NONE @@ -716,13 +719,13 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @uses strcmp() * @uses strpos() * @uses substr_count() - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or DECIMAL or NONE) + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) * @param string &$cell String representation of the cell for which a best-fit type is to be determined - * @return int The MySQL type representation (VARCHAR or INT or DECIMAL or NONE) + * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { /** - * If numeric, determine if decimal or int + * If numeric, determine if decimal, int or bigint * Else, we call it varchar for simplicity */ @@ -736,7 +739,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - return INT; + if ($cell > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -758,6 +765,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @uses ROWS * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses count() @@ -802,21 +810,25 @@ function PMA_analyzeTable(&$table) { $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); /** - * If a type for this column has alreday been delcared, + * If a type for this column has already been declared, * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { + */ + if ($curr_type != NONE) { if ($curr_type == VARCHAR) { $types[$i] = VARCHAR; } else if ($curr_type == DECIMAL) { if ($types[$i] != VARCHAR) { $types[$i] = DECIMAL; } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = INT; - } - } + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } } } } @@ -945,7 +957,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } if ($analyses != NULL) { - $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); + $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ if (count($tables) != count($analyses)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-7-g194e357
by Dieter Adriaenssens 10 Sep '10

10 Sep '10

The branch, QA_3_3 has been updated via 194e357a996310225364d311e6c27ed41db002bb (commit) from 5d136abd8bf9f85336f52332470acf9e52448b20 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import.lib.php | 68 +++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 523f015..42030ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.8.0 (not yet released) +- bug #3059311 [import] BIGINT field type added to table analysis 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 6c039bd..278028b 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -408,6 +408,7 @@ define("NONE", 0); define("VARCHAR", 1); define("INT", 2); define("DECIMAL", 3); +define("BIGINT", 4); /* Decimal size defs */ define("M", 0); @@ -493,6 +494,7 @@ function PMA_getDecimalSize(&$cell) { * @uses FULL * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses strcmp() @@ -501,8 +503,8 @@ function PMA_getDecimalSize(&$cell) { * @uses PMA_getD() * @uses PMA_getDecimalSize() * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT) + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ @@ -520,7 +522,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == VARCHAR) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -530,7 +532,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -542,9 +544,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -573,7 +575,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($curr_type == DECIMAL) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ @@ -586,7 +588,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $size = PMA_getDecimalSize($cell); @@ -603,9 +605,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { /* Convert $last_cumulative_size from int to decimal format */ $size = PMA_getDecimalSize($cell); @@ -636,11 +638,11 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * What to do if the current cell is of type INT + * What to do if the current cell is of type BIGINT or INT */ - elseif ($curr_type == INT) { + elseif ($curr_type == BIGINT || $curr_type == INT) { /** - * The last cumlative type was VARCHAR + * The last cumulative type was VARCHAR */ if ($last_cumulative_type == VARCHAR) { if ($curr_size >= $last_cumulative_size) { @@ -650,7 +652,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was DECIMAL + * The last cumulative type was DECIMAL */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); @@ -668,9 +670,9 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type } } /** - * The last cumlative type was INT + * The last cumulative type was BIGINT or INT */ - elseif ($last_cumulative_type == INT) { + elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { if ($curr_size >= $last_cumulative_size) { return $curr_size; } else { @@ -714,6 +716,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @access public * * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses VARCHAR * @uses NONE @@ -721,13 +724,13 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * @uses strcmp() * @uses strpos() * @uses substr_count() - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or DECIMAL or NONE) + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) * @param string &$cell String representation of the cell for which a best-fit type is to be determined - * @return int The MySQL type representation (VARCHAR or INT or DECIMAL or NONE) + * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { /** - * If numeric, determine if decimal or int + * If numeric, determine if decimal, int or bigint * Else, we call it varchar for simplicity */ @@ -741,7 +744,11 @@ function PMA_detectType($last_cumulative_type, &$cell) { if ($cell == (string)(float)$cell && strpos($cell, ".") !== false && substr_count($cell, ".") == 1) { return DECIMAL; } else { - return INT; + if ($cell > 2147483647) { + return BIGINT; + } else { + return INT; + } } } else { return VARCHAR; @@ -764,6 +771,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * @uses ROWS * @uses VARCHAR * @uses DECIMAL + * @uses BIGINT * @uses INT * @uses NONE * @uses count() @@ -808,21 +816,25 @@ function PMA_analyzeTable(&$table) { $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); /** - * If a type for this column has alreday been delcared, + * If a type for this column has already been declared, * only alter it if it was a number and a varchar was found - */ - if ($curr_type != NONE) { + */ + if ($curr_type != NONE) { if ($curr_type == VARCHAR) { $types[$i] = VARCHAR; } else if ($curr_type == DECIMAL) { if ($types[$i] != VARCHAR) { $types[$i] = DECIMAL; } + } else if ($curr_type == BIGINT) { + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { + $types[$i] = BIGINT; + } } else if ($curr_type == INT) { - if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) { - $types[$i] = INT; - } - } + if ($types[$i] != VARCHAR && $types[$i] != DECIMAL && $types[$i] != BIGINT) { + $types[$i] = INT; + } + } } } } @@ -952,7 +964,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } if ($analyses != NULL) { - $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); + $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ if (count($tables) != count($analyses)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2f9c367a74b99ad6a77af141f523a973e473b600
by Michal Čihař 10 Sep '10

10 Sep '10

The branch, master has been updated via 2f9c367a74b99ad6a77af141f523a973e473b600 (commit) from eaba78b3a838b9c98dede9c9e01be0fc07fefa18 (commit) - Log ----------------------------------------------------------------- commit 2f9c367a74b99ad6a77af141f523a973e473b600 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 08:29:13 2010 +0200 Regenerate translations. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 638 ++++++++++++++++----------------------- output/zh_CN/INSTALL | 4 +- output/zh_CN/README | 71 +++++ output/zh_CN/TODO | 4 +- output/zh_CN/index.html | 12 +- output/zh_CN/translators.html | 7 +- 6 files changed, 352 insertions(+), 384 deletions(-) create mode 100644 output/zh_CN/README diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 1820cd6..69909c7 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -78,8 +78,7 @@ SourceForge.net 的项目页 (英语)</a></li> 5.2.0 或更高版本。 </li> <li>要支持上传 zip 文件，需要 <tt>zip</tt> 扩展。</li> - <li>For proper support of multibyte strings (eg. UTF-8, which is currently the -default), you should install the mbstring and ctype extensions. + <li>为了更好的支持多字节字符串 (如 UTF-8 编码的文字, 当前默认编码)，你应该安装 mbstring 和 ctype 扩展。 </li> <li>要支持内联 JPEG 图像的等比缩略图 ("image/jpeg: inline")，需要 GD2 扩展</li> <li>当使用 "cookie" <a href="#authentication_modes">认证</a>时，我们强烈建议大部分用户使用 @@ -88,9 +87,8 @@ default), you should install the mbstring and ctype extensions. </li> <li>要支持上传进度条，参见 <a href="#faq2_9"> <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 2.9</a>。</li> - <li>To support BLOB streaming, see PHP and MySQL requirements in <a -href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr> -6.25</a>.</li> + <li>要支持 BLOB 流，参见 <a href="#faq6_25"> <abbr title="常见问题 (Frequently Asked +Questions)">FAQ</abbr> 6.25</a> 中所述的 PHP 和 MySQL 需求。</li> </ul> </li> <li><b>MySQL</b> 5.0 或更高版本 (<a href="#faq1_17">查看详细说明</a>);</li> @@ -107,8 +105,8 @@ href="#faq6_25"> <abbr title="Frequently Asked Questions">FAQ</abbr> <h3>目前 phpMyAdmin 具有的功能有:</h3> -<ul><li>browse and drop databases, tables, views, columns and indexes</li> - <li>create, copy, drop, rename and alter databases, tables, columns and indexes</li> +<ul><li>浏览、删除数据库、数据表、视图、字段和索引</li> + <li>创建、复制、删除、改名以及修改数据库、数据表、字段和索引</li> <li>用服务器中设置好的计划维护服务器、数据库、数据表</li> <li>运行、编辑一条或多条任意 <abbr title="结构化查询语言 (structured query language)">SQL</abbr> 语句，并加入书签</li> @@ -141,7 +139,7 @@ Language)">SQL</abbr> 文件中导入数据和 MySQL 结构</li> Questions)">FAQ</abbr> 3.6)</a></li> <li>支持改进的 MySQL 扩展 mysqli <a href="#faq1_17"> (参见 <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 1.17)</a></li> - <li>communicate in <a href="./translators.html">58 different languages</a> + <li>支持 <a href="./translators.html">58 种不同的语言</a> </li> <li>同步当前或远程服务器上的任意两个数据库 <a href="#faq9_1">(参见 <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 9.1)</a> @@ -166,7 +164,7 @@ title="逗号分隔型取值 (comma separated values)">CSV</abbr> 时可压缩 <ol><li><a href="#quick_install">快速安装</a></li> <li><a href="#setup_script">使用安装脚本</a></li> - <li><a href="#linked-tables">phpMyAdmin configuration storage</a></li> + <li><a href="#linked-tables">phpMyAdmin 高级功能</a></li> <li><a href="#upgrading">从旧版本升级</a></li> <li><a href="#authentication_modes">使用认证</a></li> </ol> @@ -272,23 +270,21 @@ Apache 中你可以通过 .htaccess 文件设置，其他网站服务器请自 </li> </ol> -<h3 id="linked-tables">phpMyAdmin configuration storage</h3> +<h3 id="linked-tables">phpMyAdmin 高级功能</h3> -<p> For a whole set of new features (bookmarks, comments, <abbr -title="structured query language">SQL</abbr>-history, tracking mechanism, -<abbr title="Portable Document Format">PDF</abbr>-generation, column -contents transformation, etc.) you need to create a set of special -tables. Those tables can be located in your own database, or in a central -database for a multi-user installation (this database would then be accessed -by the controluser, so no other user should have rights to it).</p> +<p> 若要使用一些高级功能 (如: 书签、注释、<abbr title="结构化查询语言 (structured query +language)">SQL</abbr> 查询历史、结构追踪、生成 <abbr title="便携式文档格式 (Portable Document +Format)">PDF</abbr> +、内容转换等)，你需要创建一些特殊的数据表。这些表可以放在你自己的数据库里，也可以在一个多用户的服务器上创建一个独立的数据库 +(这个数据库将通过其对应的帐号访问，所以不应该给其他用户访问这个数据库的权限)。</p> <p> 你可以在 <tt>./scripts/</tt> 目录下找到 <i>create_tables.sql</i> 文件 (如果你使用的是 Windows 服务器，请特别注意在 <a href="#faq1_23"> <abbr title="常见问题 (Frequently Asked Questions)">FAQ</abbr> 1.23</a> 中所提到的问题)。</p> -<p> If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, -please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create -new tables by importing <i>./scripts/create_tables.sql</i>.</p> +<p> 如果你以前就使用过该功能并升级过 MySQL 到 4.1.2 或更高版本，请使用 +<i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> 然后通过导入 +<i>./scripts/create_tables.sql</i> 来创建新的数据表。</p> <p> 你可以使用 phpMyAdmin 来创建这些数据表。但请注意，你可能需要特殊 (管理员) 权限来创建数据库和数据表，而且可能还需要根据实际所使用的数据修改这个脚本中数据库的名字。</p> @@ -307,10 +303,8 @@ href="#authentication_modes">使用认证</a> 一节)。</p> <p> <strong>请勿</strong>复制 <tt>libraries/config.default.php</tt> 为 <tt>config.inc.php</tt> 因为默认配置是仅对当前版本有效的。</p> -<p> If you have upgraded your MySQL server from a version previous to 4.1.2 to -version 5.x or newer and if you use the phpMyAdmin configuration storage, -you should run the SQL script found in -<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p> +<p> 如果你把 MySQL 服务器从 4.1.2 之前的版本升级到了 5.x 或更高版本，并且使用 phpMyAdmin 高级功能，你还要运行 SQL 脚本 +<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt> 。</p> <h3 id="authentication_modes">使用认证</h3> @@ -328,8 +322,7 @@ Protocol)">HTTP</abbr> 或 cookie 认证，用户名和密码也不会被保存不论如何，如果你不使用 HTTPS 协议，密码将总是以明文传输。<br /> 当使用 cookie 认证时，密码将经过 blowfish 算法加密并保存在一个临时 cookie 中。</li> - <li id="pmausr">Note: this section is only applicable if your MySQL server is running with -<tt>--skip-show-database</tt>.<br /><br /> + <li id="pmausr">注意: 本节仅适用于运行在 <tt>--skip-show-database</tt> 模式下的 MySQL 服务器。<br /><br /> 当使用 '<abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr>' 和 'cookie' 认证时，phpMyAdmin 需要一个在 <i>`mysql`.`user` (除 `Password` @@ -365,8 +358,7 @@ GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv) GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; </pre> - (this of course requires that your <a href="#linked-tables">phpMyAdmin -configuration storage</a> be set up). + (需要设置好 <a href="#linked-tables">phpMyAdmin 高级功能</a>)。 <br /></li> <li>每一个<i>真实的</i>用户应在特定的数据库上具有一定的权限。除非你很明白这些权限的作用 @@ -563,12 +555,10 @@ class="configrule">$cfg['Servers'][$i]['host']</a> 设为 "127.0.0.1" <span id="cfg_Servers_controlpass">$cfg['Servers'][$i]['controlpass']</span> 字符串 </dt> - <dd>This special account is used for 2 distinct purposes: to make possible all -relational features (see <a href="#pmadb" -class="configrule">$cfg['Servers'][$i]['pmadb']</a>) and, for a MySQL -server running with <tt>--skip-show-database</tt>, to enable a multi-user -installation (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or -cookie authentication mode).<br /><br /> + <dd>这个特殊的帐号有两种不同的用途: 1、为 phpMyAdmin 高级功能提供支持 (参见 <a href="#pmadb" +class="configrule">$cfg['Servers'][$i]['pmadb']</a>)。2、在运行于 +<tt>--skip-show-database</tt> 模式的 MySQL 服务器上使用多用户安装提供支持 (<abbr +title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 或 cookie 认证)。<br /><br /> 当使用 <abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 或 cookie 认证时 (自 2.2.1 起也包括 'config' 认证)，你需要提供一个在 <i>mysql.user (除了 @@ -668,7 +658,7 @@ array('要置顶的数据库1', '要置顶的数据库2', '*');</tt> 即可，ph 例如，要隐藏所有以字母 "a" 开头的数据库，用<br /> <pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre> 要隐藏数据库 "数据库1" 和 "数据库2" ，用 <br /> - <pre>$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';</pre> + <pre>$cfg['Servers'][$i]['hide_db'] = '^(数据库1|数据库2)$';// 译者注: 上例中也可使用中文，需注意配置文件编码应为 UTF-8</pre> 可以在 PHP 手册的 <a href="http://php.net/manual/en/reference.pcre.pattern.syntax.php">Perl 兼容正则表达式的语法 (外链，英语)</a> 一节中找到更多关于正则表达式的信息。 @@ -681,19 +671,15 @@ href="http://php.net/manual/en/reference.pcre.pattern.syntax.php">Perl <dt id="pmadb"> <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> 字符串 </dt> - <dd>The name of the database containing the phpMyAdmin configuration storage. + <dd>包含 phpMyAdmin 高级功能数据的数据库名。 <br /><br /> - See the <a href="#linked-tables">phpMyAdmin configuration storage</a> -section in this document to see the benefits of this feature, and for a -quick way of creating this database and the needed tables. + 参见 <a href="#linked-tables">phpMyAdmin 高级功能</a>一节了解其好处以及如何快速创建该数据库和需要的数据表。 <br /><br /> - If you are the only user of this phpMyAdmin installation, you can use your -current database to store those special tables; in this case, just put your -current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a -multi-user installation, set this parameter to the name of your central -database containing the phpMyAdmin configuration storage.</dd> + 如果此 phpMyAdmin 只有你自己使用，你可以用你当前的数据库来保存这些特殊的数据表，这种情况下，你可以在 +<tt>$cfg['Servers'][$i]['pmadb']</tt> 中填写当前数据库的名字。若此 phpMyAdmin +作为多用户使用，请设为包含 phpMyAdmin 高级功能数据表的专用数据库。</dd> <dt id="bookmark"> <span @@ -703,7 +689,7 @@ id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> <dd>自 2.2.0 起 phpMyAdmin 允许用户将查询加入书签。你可以将经常要执行的语句加入书签。<br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['bookmarktable']</tt> 中设置要使用的数据表名</li> </ul> </dd> @@ -711,9 +697,7 @@ id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> <dt id="relation"> <span id="cfg_Servers_relation">$cfg['Servers'][$i]['relation']</span> 字符串 </dt> - <dd>Since release 2.2.4 you can describe, in a special 'relation' table, which -column is a key in another table (a foreign key). phpMyAdmin currently uses -this to + <dd>自 2.2.4 起你可以在 'relation' 表的支持下定义一张表中的一个字段与另一张表的关系 (外键)。目前 phpMyAdmin 用它来 <ul><li>使外键数据可点击，浏览主表时可通过点击数据值转到外表;</li> <li>display in an optional tool-tip the "display column" when browsing the master table, if you move the mouse to a column containing a foreign key @@ -737,7 +721,7 @@ Questions)">FAQ</abbr> 6.6</a>)</li> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['relation']</tt> 中设置要使用的数据表名</li> <li>now as normal user open phpMyAdmin and for each one of your tables where you want to use this feature, click "Structure/Relation view/" and @@ -745,9 +729,8 @@ choose foreign columns. </li> </ul> - Please note that in the current version, <tt>master_db</tt> must be the same -as <tt>foreign_db</tt>. Those columns have been put in future development of -the cross-db relations. + 请注意在当前版本中 <tt>master_db</tt> 必须和 <tt>foreign_db</tt> +一致。这两个字段是为后期跨数据库关系开发预留的。 </dd> <dt id="table_info"> @@ -759,14 +742,12 @@ the cross-db relations. column is to be displayed as a tool-tip when moving the cursor over the corresponding key.<br /> 这张表的名字将被保存在此变量中。要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. -'pma_table_info')</li> - <li>then for each table where you want to use this feature, click -"Structure/Relation view/Choose column to display" to choose the -column.</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['table_info']</tt> 中设置要使用的数据表名 +(如：'pma_table_info')</li> + <li>对每一张你要使用此功能的数据表，点击"结构/关系查看/选择要显示的字段"设置好显示的字段。</li> </ul> - Usage tip: <a href="#faqdisplay">Display column</a>. + 使用技巧: <a href="#faqdisplay">显示字段</a>。 </dd> <dt id="table_coords"> <span @@ -783,7 +764,7 @@ Format)">PDF</abbr> 大纲输出中的坐标)。<br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> <li>在 <tt>$cfg['Servers'][$i]['table_coords']</tt> 和 <tt>$cfg['Servers'][$i]['pdf_pages']</tt> 中设置要使用的数据表名</li> </ul> @@ -815,9 +796,9 @@ system, your column_info table has to have the three new columns 'mimetype', <br /><br /> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. -'pma_column_info')</li> + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['column_info']</tt> 中设置要使用的数据表名 +(如：'pma_column_info')</li> <li>要从 2.5.0 之前的 Column_comments 表升级可执行: <pre> @@ -848,9 +829,8 @@ class="configrule">$cfg['QueryHistoryMax']</a> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> -(e.g. 'pma_history') + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['history']</tt> 中设置要使用的数据表名 (如：'pma_history') </li> </ul> </dd> @@ -876,16 +856,15 @@ class="configrule">$cfg['QueryHistoryMax']</a> 要启用此功能: <ul> - <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> -(e.g. 'pma_tracking')</li> + <li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['tracking']</tt> 中设置要使用的数据表名 (如：'pma_tracking')</li> </ul> </dd> <dt id="tracking2"> <span id="cfg_Servers_tracking_version_auto_create">$cfg['Servers'][$i]['tracking_version_auto_create']</span> -boolean +布尔 </dt> <dd> 设置追踪系统是否自动为数据表和视图创建版本。默认为 false 。 @@ -919,11 +898,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt id="tracking4"> <span id="cfg_Servers_tracking_add_drop_view">$cfg['Servers'][$i]['tracking_add_drop_view']</span> -boolean +布尔 </dt> <dd> - Whether a DROP VIEW IF EXISTS statement will be added as first line to the -log when creating a view. Default value is true. + 设置当记录视图创建时，是否在日志首行加上 DROP VIEW IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> @@ -931,28 +909,26 @@ log when creating a view. Default value is true. <dt id="tracking5"> <span id="cfg_Servers_tracking_add_drop_table">$cfg['Servers'][$i]['tracking_add_drop_table']</span> -boolean +布尔 </dt> <dd> - Whether a DROP TABLE IF EXISTS statement will be added as first line to the -log when creating a table. Default value is true. + 设置当记录数据表创建时，是否在日志首行加上 DROP TABLE IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> <dt id="tracking6"> <span id="cfg_Servers_tracking_add_drop_database">$cfg['Servers'][$i]['tracking_add_drop_database']</span> -boolean +布尔 </dt> <dd> - Whether a DROP DATABASE IF EXISTS statement will be added as first line to -the log when creating a database. Default value is true. + 设置当记录数据库创建时，是否在日志首行加上 DROP DATABASE IF EXISTS 语句。默认为 true 。 <br/><br/> </dd> <dt id="userconfig"> <span id="cfg_Servers_userconfig">$cfg['Servers'][$i]['userconfig']</span> -string +字符串 </dt> <dd> Since release 3.4.x phpMyAdmin allows users to set most preferences by @@ -967,8 +943,8 @@ browser's local storage, or, it is is unavailable, until the end of session. 要启用此功能: <ul> - <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li> + <li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['userconfig']</tt> 中设置要使用的数据表名</li> </ul> </dd> @@ -982,9 +958,9 @@ id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> 要启用此功能: - <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> - <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> -(e.g. 'pma_designer_coords') + <ul><li>设置好 <a href="#pmadb">pmadb</a> 和 phpMyAdmin 高级功能</li> + <li>在 <tt>$cfg['Servers'][$i]['designer_coords']</tt> 中设置要使用的数据表名 +(如：'pma_designer_coords') </li> </ul> </dd> @@ -1016,8 +992,7 @@ id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span> id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> 字符串 </dt> - <dd>If your rule order is empty, then <abbr title="Internet Protocol">IP</abbr> -authorization is disabled.<br /><br /> + <dd>若不指定规则顺序，<abbr title="互联网协议 (Internet Protocol)">IP</abbr> 认证将不可用。<br /><br /> 若将规则顺序设为 <tt>'deny,allow'</tt>，系统将首先应用所有的允许 (allow) 规则，然后再应用禁止规则 (deny) 。默认允许访问。任何没有被 Deny (禁止) 命令匹配的客户端或者被 Allow (允许) 命令匹配的客户端将被允许访问服务器。 <br /><br /> @@ -1134,7 +1109,7 @@ Protocol)">HTTP</abbr> 传输。<br /> <dd>保存会话数据的路径 (<a href="http://php.net/session_save_path">PHP 参数 session_save_path (外链，英语)</a>)。</dd> - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] 字符串 [单位: 字节]</dt> <dd>设置脚本运行的可使用的内存。若设为 0 则无限制。<br /> 本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能，所以显然不要设置一个很小的值。若 PHP 运行于安全模式则无效。<br /> 同样可以设置为 php.ini 中可以识别的字符串，如 '16M' 。请确保没有丢掉后缀 (16 表示 16 字节！)</dd> @@ -3509,89 +3484,68 @@ clause is generated when I browse a table.</a></h4> <tt>On</tt> on the server. It seems to be a browser-specific problem; meanwhile use the <tt>cookie</tt> authentication mode.</p> -<h3 id="faqusing">Using phpMyAdmin</h3> +<h3 id="faqusing">使用 phpMyAdmin</h3> <h4 id="faq6_1"> - <a href="#faq6_1">6.1 I can't insert new rows into a table / I can't create -a table - MySQL brings up a <abbr title="structured query -language">SQL</abbr>-error. </a></h4> + <a href="#faq6_1">6.1 我插入不了数据到表中 / 我创建不了数据表 - MySQL 提示 <abbr title="结构化查询语言 +(structured query language)">SQL</abbr> 错误。 </a></h4> <p> - Examine the <abbr title="structured query language">SQL</abbr> error with -care. Often the problem is caused by specifying a wrong column-type.<br /> - Common errors include: + 仔细检查 <abbr title="结构化查询语言 (structured query language)">SQL</abbr> +错误。这个问题通常是因为指定了错误的字段类型。<br /> + 常见错误有: </p> <ul> - <li>Using <tt>VARCHAR</tt> without a size argument</li> - <li>Using <tt>TEXT</tt> or <tt>BLOB</tt> with a size argument</li> + <li>不给 <tt>VARCHAR</tt> 设置大小参数</li> + <li>给 <tt>TEXT</tt> 或 <tt>BLOB</tt> 设置大小参数</li> </ul> <p> - Also, look at the syntax chapter in the MySQL manual to confirm that your -syntax is correct. + 同时，请参考 MySQL 手册中语法一章确定你的语法都正确。 </p> <h4 id="faq6_2"> - <a href="#faq6_2">6.2 When I create a table, I set an index for two columns -and phpMyAdmin generates only one index with those two columns. </a></h4> + <a href="#faq6_2">6.2 建表时，我给两个字段设置了索引，但 phpMyAdmin 却创建了一个包含这两个字段的索引。 </a></h4> <p> - This is the way to create a multi-columns index. If you want two indexes, -create the first one when creating the table, save, then display the table -properties and click the Index link to create the other index. + 这是一种创建多字段索引的方法。如果你需要两个索引，在建表时先设置一个，保存，然后显示数据表属性并点击索引链接来创建另一个索引。 </p> <h4 id="faq6_3"> - <a href="#faq6_3">6.3 How can I insert a null value into my table?</a></h4> + <a href="#faq6_3">6.3 怎样向我的表中插入一个空 (null) 值？</a></h4> <p> - Since version 2.2.3, you have a checkbox for each column that can be null. -Before 2.2.3, you had to enter "null", without the quotes, as the -column's value. Since version 2.5.5, you have to use the checkbox to get a -real NULL value, so if you enter "NULL" this means you want a -literal NULL in the column, and not a NULL value (this works in PHP4). + 自 2.2.3 版起，每个字段都有一个复选框来设置字段是否为空。 2.2.3 之前，你只能输入 +"null"，不包括引号来作为字段的值。自 2.5.5 版起，你可以使用复选框来获得一个真正的空 (NULL) 值，如果你输入 +"NULL" 将表示文字 NULL，而不是空 (NULL) 值 (对 PHP4 同样有效)。 </p> <h4 id="faq6_4"> - <a href="#faq6_4">6.4 How can I backup my database or table?</a></h4> + <a href="#faq6_4">6.4 怎样备份我的数据库或数据表？</a></h4> -<p> Click on a database or table name in the left frame, the properties will be -displayed. Then on the menu, click "Export", you can dump the -structure, the data, or both. This will generate standard <abbr -title="structured query language">SQL</abbr> statements that can be used to -recreate your database/table. +<p> 在左侧框架中点击数据库或表名，将会显示它们的属性。然后在菜单上点击 "导出"，你可以转储结构和/或数据。该功能将生成标准 +<abbr title="结构化查询语言 (structured query language)">SQL</abbr> +语句以便重新创建你的数据库/表。 <br /><br /> - You will need to choose "Save as file", so that phpMyAdmin can -transmit the resulting dump to your station. Depending on your PHP -configuration, you will see options to compress the dump. See also the <a -href="#cfg_ExecTimeLimit" class="configrule">$cfg['ExecTimeLimit']</a> -configuration variable.<br /><br /> + 若选择 "保存为文件"，phpMyAdmin 即可将转储结果直接提供下载。取决于 PHP 的配置，你还能看见压缩选项。同时请参见 +<a href="#cfg_ExecTimeLimit" class="configrule">$cfg['ExecTimeLimit']</a> +配置变量。<br /><br /> - For additional help on this subject, look for the word "dump" in -this document.</p> + 要获得更多关于该主题的帮助，请在本文档中查找 "转储" 。</p> <h4 id="faq6_5"> - <a href="#faq6_5">6.5 How can I restore (upload) my database or table using -a dump? How can I run a ".sql" file? </a></h4> - -<p> Click on a database name in the left frame, the properties will be -displayed. Select "Import" from the list of tabs in the -right–hand frame (or "<abbr title="structured query -language">SQL</abbr>" if your phpMyAdmin version is previous to -2.7.0). In the "Location of the text file" section, type in the -path to your dump filename, or use the Browse button. Then click Go. + <a href="#faq6_5">6.5 怎样通过转储恢复 (上传) 我的数据库或表？怎样运行一个 ".sql" 文件？</a></h4> + +<p> 在左侧框架中点击数据库或表名，将会显示它们的属性。在右手边框架中的标签列表中选择 "导入" (或 "<abbr +title="结构化查询语言 (structured query language)">SQL</abbr>" 如果你的 phpMyAdmin +版本低于 2.7.0)。在 "文本文件的位置" 中输入你的转储文件名，或使用浏览按钮。然后点击执行。 <br /><br /> - With version 2.7.0, the import engine has been re–written, if possible -it is suggested that you upgrade to take advantage of the new features. + 2.7.0 版的导入功能已经重写了，建议尽可能升级以使用新功能。 <br /><br /> - For additional help on this subject, look for the word "upload" in -this document. + 要获得更多关于该主题的帮助，请在本文档中查找 "上传" 。 </p> <h4 id="faq6_6"> - <a href="#faq6_6">6.6 How can I use the relation table in -Query-by-example?</a></h4> + <a href="#faq6_6">6.6 怎样在依例查询 (Query-by-example) 中使用关系表？</a></h4> -<p> Here is an example with the tables persons, towns and countries, all located -in the database mydb. If you don't have a <tt>pma_relation</tt> table, -create it as explained in the configuration section. Then create the example -tables:</p> +<p> 下面用数据库 mydb 中的数据表 persons、towns 和 countries 来举例。如果你没有 <tt>pma_relation</tt> +表，请先根据设置一节中的说明创建。然后创建示范表:</p> <pre> CREATE TABLE REL_countries ( @@ -3623,30 +3577,26 @@ INSERT INTO REL_towns VALUES ('S', 'Sherbrooke'); INSERT INTO REL_towns VALUES ('M', 'Montréal'); </pre> -<p> To setup appropriate links and display information:</p> +<p> 设置对应连接并显示信息:</p> -<ul><li>on table "REL_persons" click Structure, then Relation view</li> - <li>in Links, for "town_code" choose "REL_towns->code"</li> - <li>in Links, for "country_code" choose -"REL_countries->country_code"</li> - <li>on table "REL_towns" click Structure, then Relation view</li> - <li>in "Choose column to display", choose "description"</li> - <li>repeat the two previous steps for table "REL_countries"</li> +<ul><li>在表 "REL_persons" 上点击结构、关系查看</li> + <li>在关系中，"town_code" 选择 "REL_towns->code"</li> + <li>在关系中，"country_code" 选择 "REL_countries->country_code"</li> + <li>在表 "REL_towns" 上点击结构、关系查看</li> + <li>在 "选择要显示的字段" 上选择 "description"</li> + <li>在表 "REL_countries" 中重复以上两步</li> </ul> -<p> Then test like this:</p> - -<ul><li>Click on your db name in the left frame</li> - <li>Choose "Query"</li> - <li>Use tables: persons, towns, countries</li> - <li>Click "Update query"</li> - <li>In the columns row, choose persons.person_name and click the -"Show" tickbox </li> - <li>Do the same for towns.description and countries.descriptions in the other 2 -columns</li> - <li>Click "Update query" and you will see in the query box that the -correct joins have been generated</li> - <li>Click "Submit query"</li> +<p> 测试步骤如下:</p> + +<ul><li>在左侧框架中点击你的数据库名</li> + <li>选择 "查询"</li> + <li>使用表: persons、towns、countries</li> + <li>点击 "更新查询"</li> + <li>在字段行中，选择 persons.person_name 并选中 "显示" 复选框 </li> + <li>为 towns.description 和 countries.descriptions 在另两列中重复上一步</li> + <li>点击 "更新查询" 你就能在查询框中看到已生成的 join 语句</li> + <li>点击 "提交查询"</li> </ul> <h4 id="faqdisplay"> @@ -4078,195 +4028,147 @@ special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_…">wiki</a>.</p> -<h3 id="faqproject">phpMyAdmin project</h3> +<h3 id="faqproject">phpMyAdmin 项目</h3> <h4 id="faq7_1"> - <a href="#faq7_1">7.1 I have found a bug. How do I inform developers?</a></h4> + <a href="#faq7_1">7.1 我发现了一个缺陷。怎样向开发者报告？</a></h4> -<p> Our Bug Tracker is located at <a +<p> 我们的缺陷追踪器位于 <a href="http://sf.net/projects/phpmyadmin/">http://sf.net/projects/phpmyadmin/</a> -under the Bugs section.<br /><br /> +的 Bugs 功能块。<br /><br /> - But please first discuss your bug with other users:<br /> + 但请先和其他用户讨论你发现的问题:<br /> <a href="https://sourceforge.net/projects/phpmyadmin/forums"> -https://sourceforge.net/projects/phpmyadmin/forums</a>. +https://sourceforge.net/projects/phpmyadmin/forums</a>。 </p> <h4 id="faq7_2"> - <a href="#faq7_2">7.2 I want to translate the messages to a new language or -upgrade an existing language, where do I start?</a></h4> - -<p> Always use latest Git version of the po file to translate. You can -optionally translate online at our <a -href="http://l10n.cihar.com/">translation server</a> where you can also get -the latest po files and merge them with your translations. For creating a -new translation simply use <code>po/phpmyadmin.pot</code> and generate -<code>po/LANG_CODE.po</code> for your language (you can use <code>msginit -i -po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> to -do this) or ask on the mailing list to add the translation to the web -interface. More details are available on <a -href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our -wiki</a>. + <a href="#faq7_2">7.2 怎样开始翻译一个新的语言或更新现有的语言？</a></h4> + +<p> 永远使用最新的 Git 版本的 po 文件来翻译。你也可以选择在我们的<a +href="http://l10n.cihar.com/">翻译服务器</a>在线翻译，也可在此获得最新的 po 文件并与你的翻译合并。使用 +<code>po/phpmyadmin.pot</code> 生成 <code>po/语言代码.po</code> 即可为你的语言创建新的翻译 +(可以使用 <code>msginit -i po/phpmyadmin.pot -l 语言代码 --no-translator -o +po/语言代码.po</code>) 或通过邮件列表寻求在 web 界面上添加翻译。更多详细信息请见<a +href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">我们的维基</a>。 </p> <p> - Please note that we try not to use HTML entities like &eacute; in the -translations, since we define the right character set in the file. With -HTML entities, the text on JavaScript messages would not display correctly. -However there are some entities that need to be there: quotes, non-breakable -spaces, ampersands, less than, greater than. + 请注意自从我们对文件定义了正确的编码后，我们尝试不在翻译中使用诸如 &eacute; 的 HTML 实体。若使用 HTML +实体，JavaScript 消息中的文本将可能不能正确显示。不论怎样有些实体还是必需的: 引号、不可分空格、& 符号、小于号、大于号。 </p> <p> - You can then put your translations, as a zip file to avoid losing special -characters, on the sourceforge.net <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation -tracker.</a> + 然后你可以将你的翻译，或者打包压缩成 zip 文件来避免丢失特殊字符，放在 sourceforge.net 的<a +href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻译追踪器</a>上。 </p> <p> - It would be a good idea to subscribe to the <a -href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmyadmin-translators</a> -mailing list, because this is where we ask for translations of new messages. + 你还可以订阅 <a +href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpMyAdmin +翻译</a> 邮件列表，当我们有新文本需要翻译时就会在那发出通知。 </p> <p> - Documentation is being translated using po4a and gettext (see <a -href="http://www.phpmyadmin.net/home_page/docs.php">documentation</a> for -existing translations). To start, checkout <a -href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"><code>localized_docs/po</code></a> -from Git, or just go to the <a -href="https://l10n.cihar.com/projects/pmadoc/">translation server</a> and -translate it online. If your language is missing, just contact <a -href="mailto:michal@cihar.com">Michal Čihař</a>; he will add -it. If you prefer to directly translate the po files, please put updated -ones into our <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation -tracker</a>. + 文档是通过 po4a 和 gettext 翻译的 (参见<a +href="http://www.phpmyadmin.net/home_page/docs.php">文档</a>查看现有的翻译) 。要开始翻译，先从 +Git 检出 <a +href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"><code>localized_docs/po</code></a>，或者直接到<a +href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>在线翻译。如果没有找到你的语言，请联系 +<a href="mailto:michal@cihar.com">Michal Čihař</a>; +他会加上。如果你更喜欢直接翻译 po 文件，请将翻译好的文件放在我们的<a +href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻译追踪器</a>上。 </p> <h4 id="faq7_3"> - <a href="#faq7_3">7.3 I would like to help out with the development of -phpMyAdmin. How should I proceed?</a></h4> + <a href="#faq7_3">7.3 怎样帮助开发 phpMyAdmin ？</a></h4> -<p> The following method is preferred for new developers:</p> +<p> 对新开发者推荐以下方式:</p> -<ol><li>fetch the current git repository over anonymous git:<br /> +<ol><li>通过匿名方式获取当前 git 库:<br /> <tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt><br /> </li> - <li>add your stuff</li> - <li>generate patch with your changes: <tt>git diff > xxx.diff</tt><br /> + <li>添加你的内容</li> + <li>生成你的补丁: <tt>git diff > xxx.diff</tt><br /> </li> - <li>submit your patch via the <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch -tracker of the phpMyAdmin project</a>. + <li>通过 <a +href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">phpMyAdmin +项目的补丁追踪器</a>提交你的补丁。 </li> </ol> -<p>More details on git are available on <a -href="http://wiki.phpmyadmin.net/pma/Devel:Git">our wiki</a>.</p> +<p>更多关于 git 的详细信息请见<a +href="http://wiki.phpmyadmin.net/pma/Devel:Git">我们的维基</a>。</p> -<p> Write access to the repository is granted only to experienced developers who -have already contributed something useful to phpMyAdmin.<br /> - Also, have a look at the <a href="#developers">Developers section</a>.</p> +<p> 库的写入权限仅授予给那些对 phpMyAdmin 作出大量贡献且富有经验的开发者。<br /> + 同时，请看一下<a href="#developers">开发</a>一节。</p> <h3 id="faqsecurity">安全</h3> <h4 id="faq8_1"> - <a href="#faq8_1">8.1 Where can I get information about the security alerts -issued for phpMyAdmin?</a></h4> + <a href="#faq8_1">8.1 哪里可以了获取 phpMyAdmin 的安全公告信息？</a></h4> -<p> Please refer to <a +<p> 请参见 <a href="http://www.phpmyadmin.net/home_page/security.php">http://www.phpmyadmin.net/home_page/security.php</a> </p> <h4 id="faq8_2"> - <a href="#faq8_2">8.2 How can I protect phpMyAdmin against brute force -attacks?</a></h4> + <a href="#faq8_2">8.2 怎样保护 phpMyAdmin 防止暴力破解？</a></h4> -<p> If you use Apache web server, phpMyAdmin exports information about -authentication to the Apache environment and it can be used in Apache logs. -Currently there are two variables available: +<p> 如果你使用 Apache 服务器，phpMyAdmin 会导出认证信息到 Apache 环境并可被 Apache 日志使用。目前有两个变量可用: </p> <dl> <dt><code>userID</code></dt> - <dd>User name of currently active user (he does not have to be logged in).</dd> + <dd>当前活动用户的用户名 (他不一定需要登录)。</dd> <dt><code>userStatus</code></dt> - <dd>Status of currently active user, one of <code>ok</code> (user is logged in), -<code>mysql-denied</code> (MySQL denied user login), -<code>allow-denied</code> (user denied by allow/deny rules), -<code>root-denied</code> (root is denied in configuration), -<code>empty-denied</code> (empty password is denied).</dd> + <dd>当前活动用户的状态，有 <code>ok</code> (用户已登录)、<code>mysql-denied</code> (MySQL +拒绝用户登录)、<code>allow-denied</code> (用户被允许/禁止规则禁止)、<code>root-denied</code> +(root 用户登录在配置文件中被禁止)、<code>empty-denied</code> (禁止空密码登录) 这几种状态。</dd> </dl> <p> - <code>LogFormat</code> directive for Apache can look like following: + 可以像这样设置 Apache 的 <code>LogFormat</code> 指令: </p> <pre> LogFormat "%h %l %u %t \"%r\" %>s %b \ \"%{Referer}i\" \"%{User-Agent}i\" %{userID}n %{userStatus}n" pma_combined </pre> <p> - You can then use any log analyzing tools to detect possible break-in -attempts. + 然后你可以使用任何日志分析工具来检测潜在的攻击。 </p> -<h3 id="faqsynchronization">Synchronization</h3> +<h3 id="faqsynchronization">同步</h3> <h4 id="faq9_1"> - <a href="#faq9_1">9.1 How can I synchronize two databases/tables in -phpMyAdmin?</a></h4> + <a href="#faq9_1">9.1 怎样在 phpMyAdmin 中同步两个数据库/表？</a></h4> -<p> You can now synchronize databases/tables in phpMyAdmin using the Synchronize -feature. It allows you to connect to local as well as remote servers. This -requires you to enter server host name, username, password, port and the -name of the database. Therefore you can now synchronize your databases -placed on the same server or some remote server. +<p> 你可以使用 phpMyAdmin +的同步功能同步数据库/表。该功能可以连接到本地或者远程服务器。但需要你输入服务器主机名、用户名、密码、端口和数据库名。然后你就可以在相同或不同的服务器间同步数据库了。 </p> <p> -This feature is helpful for developers who need to replicate their -database’s structure as well as data. Moreover, this feature not only -helps replication but also facilitates the user to keep his/her database in -sync with another database. Other than the full database, certain tables of -the databases can also be synchronized. +该功能对需要复制数据库结构和数据的开发者们是很有帮助的。此外，该功能并不仅限于复制，还能帮助用户保持他们的数据库和另一个数据库同步。除了可以同步整个数据库外，也可以只同步数据库的部分数据表。 </p> <p> -You need to fill in the host name of the server, the username and password -of an user account already there in MySQL. Port is by default populated with -3306 (MySQL default port). Then the name of the database should be mentioned -at the end. All the information other than the port needs to be filled -explicitly for the source as well as target servers. +你需要填写服务器的主机名、MySQL 中已存在的用户名和密码。端口默认是 3306 (MySQL +默认端口)。最后是数据库名。源数据库和目标数据库除了端口外的信息都要填写准确。 </p> <p> -After successfully passing through the authentication phase, the source and -target database table names will be displayed. It will be a tabular -representation. +在成功通过认证阶段后，将会以表格形式显示出源和目标数据库中的数据表名。 </p> <p> -On the left, are listed the source database table names. Some of the names -have a <code>+</code> plus sign preceding them. This shows that these tables -are only present in source database and they need to be added to the target -database in order to synchronize the target database. The tables whose names -are not preceded by a <code>+</code> sign are already present in the target -database. +在左侧会列出源数据库中的表。部分表的名字前会有一个 <code>+</code> +加号。表示这些表仅在源数据库中存在并且需要在同步到目标数据库时添加到目标数据库。名字前没有 <code>+</code> 加号的表已存在于目标数据库中。 </p> <p> -On the right, are listed the target database table names. There are few -table names that have <code>(not present)</code> appended after their -names. This means that these tables are to be created in target database in -order to synchronize target database with source database. Some table names -have a <code>-</code> minus sign preceding them. This shows that these -tables are only present in target database and they will remain unchanged in -the target database. The column in the middle shows the difference between -the source and target corresponding tables. +在左侧会列出目标数据库中的表。部分表的名字后会有 <code>(未找到)</code> +字样。表示这些表将在与源数据库同步时添加到目标数据库。部分表的名字前会有一个 <code>-</code> +减号。表示这些表仅在目标数据库中存在并且不会被修改。位于中间的一列表示源/目标对应表之间的区别。 </p> <p> -The difference is depicted by the red and green buttons with <tt>S</tt> and -<tt>D</tt> letters, indicating that either Structure or Data are not up to -date. By clicking on them, they will turn grey, what means that they will be -synchronized. +红色 <tt>S</tt> 和绿色 <tt>D</tt> 按钮表示结构 (S) 或数据 (D) +是否需要更新。当点击按钮时，它们将变成灰色，表示相应表将会被同步。 </p> @@ -4286,29 +4188,27 @@ synchronized. 此外，我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href="http://pear.php.net/"> <abbr title="PHP 扩展和应用程序库 (PHP Extension and Application Repository)">PEAR</abbr> 代码标准</a>。请尽量注意。</li> - <li>Please enable showing PHP errors and warnings by the <code><a + <li>请通过 <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> -configuration directive.</li> +指令开启显示 PHP 错误和警告。</li> <li>请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>，数据库相关的用 <i>db_*.php</i>，服务器相关的用 <i>server_*.php</i> 等。</li> - <li>Please use gettext wrappers around all messages (<code>__('Some -text')</code> or <code>_ngettext()</code> function). To translate them, you -need to call <code>scripts/update-po</code> script. To use translated -messages, call <code>scripts/generate-mo</code>, which generates binary -files read by Gettext.</li> + <li>请使用 gettext 调用所有文本 (<code>__('文本')</code> 或 <code>_ngettext()</code> 函数)。 +若需要翻译，运行 <code>scripts/update-po</code> 脚本。要使用已翻译的文本，运行 +<code>scripts/generate-mo</code>，即可生成 Gettext 所需的二进制文件。</li> <li>如果您写一份更新记录，这将会更加有帮助。</li> <li id="developersdbg"> 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> + 纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及为了地球人民牺牲的勇敢的人们。</li> </ul> <h2 id="copyright">版权</h2> <pre> -Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> +版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> +版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> @@ -4316,7 +4216,7 @@ Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Garvin Hicking <me_at_supergarv.de> Michael Keck <mkkeck_at_users.sourceforge.net> Sebastian Mendel <cybot_tm_at_users.sourceforge.net> - [check <a href="#credits">credits</a> for more details] + [更多信息请参见<a href="#credits">鸣谢</a>] </pre> <p> @@ -4374,115 +4274,115 @@ Repository)">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范</li> <li>Robin Johnson <robbat2_at_users.sourceforge.net> <ul> - <li>database maintenance controls</li> - <li>table type code</li> - <li>Host authentication <abbr title="Internet Protocol">IP</abbr> Allow/Deny</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>数据库维护功能</li> + <li>数据表类型代码</li> + <li>主机认证 <abbr title="互联网协议 (Internet Protocol)">IP</abbr> 允许/禁止</li> + <li>基于数据库的配置 (未完成)</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 解析器和语法高亮</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 校验器</li> <li>许多缺陷修正和改进</li> </ul></li> <li>Armel Fauveau <armel.fauveau_at_globalis-ms.com> <ul> - <li>bookmarks feature</li> - <li>multiple dump feature</li> - <li>gzip dump feature</li> - <li>zip dump feature</li> + <li>书签功能</li> + <li>多转储功能</li> + <li>gzip 转储功能</li> + <li>zip 转储功能</li> </ul></li> <li>Geert Lund <glund_at_silversoft.dk> <ul> - <li>various fixes</li> - <li>moderator of the phpMyAdmin former users forum at phpwizard.net</li> + <li>缺陷修正</li> + <li>phpMyAdmin 早期在 phpwizard.net 的用户论坛版主</li> </ul></li> <li>Korakot Chaovavanich <korakot_at_iname.com> <ul> - <li>"insert as new row" feature</li> + <li>"以新行插入" 功能</li> </ul></li> <li>Pete Kelly <webmaster_at_trafficg.com> <ul> - <li>rewrote and fix dump code</li> - <li>bugfixes</li> + <li>重写并修复转储代码</li> + <li>缺陷修正</li> </ul></li> <li>Steve Alberty <alberty_at_neptunlabs.de> <ul> - <li>rewrote dump code for PHP4</li> - <li>mySQL table statistics</li> - <li>bugfixes</li> + <li>重写 PHP4 的转储代码</li> + <li>MySQL 数据表统计</li> + <li>缺陷修正</li> </ul></li> <li>Benjamin Gandon <gandon_at_isia.cma.fr> <ul> - <li>main author of the version 2.1.0.1</li> - <li>bugfixes</li> + <li>2.1.0.1 版的主要作者</li> + <li>缺陷修正</li> </ul></li> <li>Alexander M. Turek <me_at_derrabus.de> <ul> - <li>MySQL 4.0 / 4.1 / 5.0 compatibility</li> - <li>abstract database interface (PMA_DBI) with MySQLi support</li> - <li>privileges administration</li> - <li><abbr title="Extensible Markup Language">XML</abbr> exports</li> - <li>various features and fixes</li> - <li>German language file updates</li> + <li>MySQL 4.0 / 4.1 / 5.0 兼容</li> + <li>抽象数据库接口 (PMA_DBI) 并支持 MySQLi</li> + <li>权限管理</li> + <li>导出为 <abbr title="可扩展标记语言 (Extensible Markup Language)">XML</abbr></li> + <li>许多缺陷修正和改进</li> + <li>德语语言文件更新</li> </ul></li> <li>Mike Beck <mike.beck_at_web.de> <ul> - <li>automatic joins in QBE</li> + <li>自动加入依例查询 (QBE)</li> <li>links column in printview</li> <li>关系查看</li> </ul></li> <li>Michal Čihař <michal_at_cihar.com> <ul> - <li>enhanced index creation/display feature</li> - <li>feature to use a different charset for HTML than for MySQL</li> - <li>improvements of export feature</li> - <li>various features and fixes</li> - <li>Czech language file updates</li> + <li>增强索引创建/显示功能</li> + <li>让 HTML 与 MySQL 使用不同的字符集</li> + <li>改进导出功能</li> + <li>许多缺陷修正和改进</li> + <li>捷克语语言文件更新</li> </ul></li> <li>Christophe Gesché from the "MySQL Form Generator for PHPMyAdmin" (http://sf.net/projects/phpmysqlformgen/) <ul> - <li>suggested the patch for multiple table printviews</li> + <li>多表打印预览补丁</li> </ul></li> <li>Garvin Hicking <me_at_supergarv.de> <ul> - <li>built the patch for vertical display of table rows</li> - <li>built the Javascript based Query window + <abbr title="structured query -language">SQL</abbr> history</li> - <li>Improvement of column/db comments</li> - <li>(MIME)-Transformations for columns</li> - <li>Use custom alias names for Databases in left frame</li> - <li>hierarchical/nested table display</li> + <li>垂直显示记录补丁</li> + <li>基于 Javascript 的查询窗口 + <abbr title="结构化查询语言 (structured query +language)">SQL</abbr> 历史功能</li> + <li>改进字段/数据库注释</li> + <li>类型转换</li> + <li>在左侧框架中使用自定义的数据库别名</li> + <li>数据表分层/分组显示</li> <li><abbr title="Portable Document Format">PDF</abbr>-scratchboard for WYSIWYG-distribution of <abbr title="Portable Document Format">PDF</abbr> relations</li> - <li>new icon sets</li> - <li>vertical display of column properties page</li> - <li>some bugfixes, features, support, German language additions</li> + <li>新图标集</li> + <li>字段属性页的垂直显示模式</li> + <li>一些缺陷修正、功能、支持、德语语言增加</li> </ul></li> <li>Yukihiro Kawada <kawada_at_den.fujifilm.co.jp> <ul> - <li>japanese kanji encoding conversion feature</li> + <li>日本汉字编码转换功能</li> </ul></li> -<li>Piotr Roszatycki <d3xter_at_users.sourceforge.net> and Dan Wilson +<li>Piotr Roszatycki <d3xter_at_users.sourceforge.net> 和 Dan Wilson <ul> - <li>the Cookie authentication mode</li> + <li>Cookie 认证功能</li> </ul></li> <li>Axel Sander <n8falke_at_users.sourceforge.net> <ul> - <li>table relation-links feature</li> + <li>数据表关系连接功能</li> </ul></li> <li>Maxime Delorme <delorme.maxime_at_free.fr> @@ -4496,29 +4396,29 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Olof Edlund <olof.edlund_at_upright.se> <ul> - <li><abbr title="structured query language">SQL</abbr> validator server</li> + <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 校验服务器</li> </ul></li> <li>Ivan R. Lanin <ivanlanin_at_users.sourceforge.net> <ul> - <li>phpMyAdmin logo (until June 2004)</li> + <li>phpMyAdmin logo (2004 年 6 月前)</li> </ul></li> <li>Mike Cochrane <mike_at_graftonhall.co.nz> <ul> - <li>blowfish library from the Horde project</li> + <li>Horde 项目的 blowfish 库</li> </ul></li> <li>Marcel Tschopp <ne0x_at_users.sourceforge.net> <ul> - <li>mysqli support</li> + <li>mysqli 支持</li> <li>许多缺陷修正和改进</li> </ul></li> <li>Michael Keck <mkkeck_at_users.sourceforge.net> <ul> - <li>redesign for 2.6.0</li> - <li>phpMyAdmin sailboat logo (June 2004)</li> + <li>重新设计 2.6.0</li> + <li>phpMyAdmin 帆船 logo (2004 年 6 月)</li> </ul></li> <li>Mathias Landhäußer @@ -4528,61 +4428,61 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Sebastian Mendel <cybot_tm_at_users.sourceforge.net> <ul> - <li>interface improvements</li> - <li>various bugfixes</li> + <li>界面改进</li> + <li>许多缺陷修正</li> </ul></li> <li>Ivan A Kirillov <ul> - <li>new relations Designer</li> + <li>新的关系设计器</li> </ul></li> -<li>Raj Kissu Rajandran (Google Summer of Code 2008) +<li>Raj Kissu Rajandran (Google 代码之夏 2008) <ul> - <li>BLOBstreaming support</li> + <li>BLOB 流支持</li> </ul></li> -<li>Piotr Przybylski (Google Summer of Code 2008 and 2010) +<li>Piotr Przybylski (Google 代码之夏 2008 和 2010) <ul> - <li>improved setup script</li> - <li>user preferences</li> + <li>改进安装脚本</li> + <li>用户偏好</li> </ul></li> -<li>Derek Schaefer (Google Summer of Code 2009) +<li>Derek Schaefer (Google 代码之夏 2009) <ul> - <li>Improved the import system</li> + <li>改进导入功能</li> </ul></li> -<li>Alexander Rutkowski (Google Summer of Code 2009) +<li>Alexander Rutkowski (Google 代码之夏 2009) <ul> - <li>Tracking mechanism</li> + <li>结构追踪</li> </ul></li> -<li>Zahra Naeem (Google Summer of Code 2009) +<li>Zahra Naeem (Google 代码之夏 2009) <ul> - <li>Synchronization feature</li> + <li>同步功能</li> </ul></li> -<li>Tomáš Srnka (Google Summer of Code 2009) +<li>Tomáš Srnka (Google 代码之夏 2009) <ul> - <li>Replication support</li> + <li>复制支持</li> </ul></li> -<li>Muhammad Adnan (Google Summer of Code 2010) +<li>Muhammad Adnan (Google 代码之夏 2010) <ul> - <li>Relation schema export to multiple formats</li> + <li>导出关系大纲为多种格式</li> </ul></li> -<li>Lori Lee (Google Summer of Code 2010) +<li>Lori Lee (Google 代码之夏 2010) <ul> - <li>User interface improvements</li> - <li>ENUM/SET editor</li> - <li>Simplified interface for export/import</li> + <li>用户界面改进</li> + <li>ENUM/SET 编辑器</li> + <li>简化导入/导出界面</li> </ul></li> -<li>Ninad Pundalik (Google Summer of Code 2010) +<li>Ninad Pundalik (Google 代码之夏 2010) <ul> - <li>AJAXifying the interface</li> + <li>界面 AJAX 化</li> </ul></li> <li>Barrie Leslie @@ -4593,8 +4493,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> </ul> <p> -And also to the following people who have contributed minor changes, -enhancements, bugfixes or support for a new language since version 2.1.0: +以及自 2.1.0 版以来对功能修改、增强、缺陷修正和新语言支持作出贡献的人们: </p> <p> @@ -4813,9 +4712,8 @@ Language))</a> - 一个 W3C 推荐用来创建可以描述不同类型数据的 </div> <ul id="footer"> - <li>Copyright © 2003 - 2010 <a -href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel -team</a></li> + <li>版权所有 © 2003 - 2010 <a +href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin 开发组</a></li> <li><a href="LICENSE">授权</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">捐助 (英语)</a></li> <li class="last">验证 <a href="http://validator.w3.org/check/referer">HTML</a> 和 <a diff --git a/output/zh_CN/INSTALL b/output/zh_CN/INSTALL index 3f125fd..e721825 100644 --- a/output/zh_CN/INSTALL +++ b/output/zh_CN/INSTALL @@ -1,5 +1,5 @@ -phpMyAdmin - Installation -------------------------- +phpMyAdmin - 安装 +------------------- 参见 Documentation.txt 或 Documentation.html 文件。 diff --git a/output/zh_CN/README b/output/zh_CN/README new file mode 100644 index 0000000..190c8a5 --- /dev/null +++ b/output/zh_CN/README @@ -0,0 +1,71 @@ +phpMyAdmin - 读我 +=================== + +使用 PHP 编写，通过 web 管理 MySQL 的工具。 + +版本 3.4.0-dev +---------------- + +http://www.phpmyadmin.net/ + +版权所有 (C) 1998-2000 + Tobias Ratschiller <tobias_at_ratschiller.com> +版权所有 (C) 2001-2010 + Marc Delisle <marc_at_infomarc.info> + Olivier Müller <om_at_omnis.ch> + Robin Johnson <robbat2_at_users.sourceforge.net> + Alexander M. Turek <me_at_derrabus.de> + Michal Čihař <michal_at_cihar.com> + Garvin Hicking <me_at_supergarv.de> + Michael Keck <mkkeck_at_users.sourceforge.net> + Sebastian Mendel <cybot_tm_at_users.sourceforge.net> + [详细信息请参见 Documentation.txt/.html 文件] + +本软件是自由软件，你可以在自由软件基金会发布的 GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。 + +本软件因希望能对大家有用而发布，但没有任何担保，也没有任何适销性或针对特定用途的隐含的担保。参见 GNU 通用公共许可协议获得详细信息。 + +你应该在获得此软件的同时收到一份 GNU 通用公共许可协议的副本如果没有，请致函 Free Software Foundation, Inc., 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +环境需求 +~~~~~~~~~~~~ + +* PHP 5.2 或更高版本 +* MySQL 5.0 或更高版本 +* a web-browser (doh!) + +概要 +~~~~~~ + +phpMyAdmin 旨在通过 web 管理 MySQL 。具体功能请参见 Documentation.txt/.html 文件。 + +下载 +~~~~~~ + +你可以在 http://www.phpmyadmin.net/ 获得最新版本。 + +更多信息 +~~~~~~~~~~~~ + +参见 Documentation.txt/.html 文件。 + +支持 +~~~~~~ + +参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息 + + +尽情享受吧！ +~~~~~~~~~~~~~~~~~~ + +phpMyAdmin 开发组 + + +附: + 请勿向我们发送邮件询问诸如 "怎样编译 + 支持 MySQL 的 PHP" 之类的问题。我们 + 没有时间为您做免费咨询。 + 请将您的问题发送到相应的邮件列表或论坛。 + 在联系我们之前，请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。 + diff --git a/output/zh_CN/TODO b/output/zh_CN/TODO index 072b518..2797f57 100644 --- a/output/zh_CN/TODO +++ b/output/zh_CN/TODO @@ -1,5 +1,5 @@ -phpMyAdmin - Todo -================= +phpMyAdmin - 计划 +=================== 目前我们将 Sourceforge 的追踪器作为计划表使用: diff --git a/output/zh_CN/index.html b/output/zh_CN/index.html index d10b80b..5ed0910 100644 --- a/output/zh_CN/index.html +++ b/output/zh_CN/index.html @@ -4,15 +4,15 @@ version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin Simplified Chinese Documentation</title> + <title>phpMyAdmin 简体中文文档</title> </head> <body> -<h1>phpMyAdmin Simplified Chinese Documentation</h1> -<p>Documents translated to Simplified Chinese:</p> +<h1>phpMyAdmin 简体中文文档</h1> +<p>已翻译为简体中文的文件:</p> <ul> -<li><a href="Documentation.html">Main documentation</a></li> -<li><a href="INSTALL">INSTALL</a></li> -<li><a href="TODO">TODO</a></li> +<li><a href="Documentation.html">主文档</a></li> +<li><a href="INSTALL">安装</a></li> +<li><a href="TODO">计划</a></li> <li><a href="translators.html">翻译</a></li> </ul> </body> diff --git a/output/zh_CN/translators.html b/output/zh_CN/translators.html index 8e34579..584fea6 100644 --- a/output/zh_CN/translators.html +++ b/output/zh_CN/translators.html @@ -434,7 +434,7 @@ href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我 </tr> <tr id="telugu"> - <td>Telugu</td> + <td>泰卢固语</td> <td> veeven (veeven(a)gmail.com) </td> @@ -471,9 +471,8 @@ href="https://l10n.cihar.com/projects/pmadoc/">翻译服务器</a>来帮助我 </div> <ul id="footer"> - <li>Copyright © 2003 - 2010 <a -href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel -team</a></li> + <li>版权所有 © 2003 - 2010 <a +href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin 开发组</a></li> <li><a href="LICENSE">授权</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">捐助 (英语)</a></li> <li class="last">验证 <a href="http://validator.w3.org/check/referer">HTML</a> 和 <a hooks/post-receive -- phpMyAdmin localized documentation

1 0

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

10 Sep '10

The branch, master has been updated via eaba78b3a838b9c98dede9c9e01be0fc07fefa18 (commit) via e4322098733507bb02b601d4fac13649cea87d4f (commit) via ce6274629a6898d04310cdb9e19d3a911f9b41b9 (commit) via babfdae50983b4f2f92acf060e877348b7b177a9 (commit) via a8c92ef45a67009a1064058c2cc7a57989f6ef41 (commit) via c651a84264886dba5feaaef9363cee94ec9194d7 (commit) via f4db24021148371bbfd5b32412bfdc8842d2692c (commit) via 3fae095efc93a93f6c7bac34735acd43cb9775db (commit) via a8f02c142b66575b37d0bae55da4734117295677 (commit) via 56c1322ae4fcd2e00f0bd0c5893f08d7302043fb (commit) via 00064baf7fe167dae0095d2d2f1d47df4297105c (commit) via 33184c1e9e87ee4d7283064316ecedfc770aa3b8 (commit) via 35c3e77c805d0d0b7a1c7d5d1f7adf6dd483a3eb (commit) via 9fd503cde1bc15c4e7254d2c3d4395f609593042 (commit) via 90c2579bac4ed84f105df475bdd39096c306c8b0 (commit) via a450dbd75f7cd85e75343196a9991dbf91a40187 (commit) via 95fb56dd5ad55294980029d46f89853eb618b91c (commit) via 24a1a999d117d76121576beacb7163cce8d3d6d5 (commit) via a0bb963d44ced5142c1a02d42fb671fb39cb9eab (commit) via de556f51e3aa678ab676e501a5b1a749b5e5d5f5 (commit) via 9cc49433e65f34d37aa9d0021137fb6262c860a7 (commit) via aacbd766bc95acaf0a0acf68f4e15d2d77d6d699 (commit) via ef475bc27b0de54329cb5993807df6d502df0c15 (commit) via 22bd1a4a5f45060089e974439ff9d2ad997112e6 (commit) via a47f8891d88bf0bd13ea243d116c73d0b21bdce2 (commit) via 886fedbe33c5c4d05d40381d55389d14345ba0ba (commit) via 8e83974abfc657b74213b7eb49b1b41f5c00cc09 (commit) via 90a2eb1408a81692bc8cb487794ec70765e2aa05 (commit) via 89d6479649f41199c8a14fd805027aa6cb777575 (commit) via aaa19aeaebc4f37c4e1f333445938487174d939c (commit) via c9e2501181d85cc1d13c5ee3520916a45f4e8561 (commit) via 454c6addf9fc6d644cc28143533fcbaac0c2b7dd (commit) via 1c6b94a1a4cbc1220789a9a67043b19d8c7898c4 (commit) via 9ca5f956784d43c7d54ccdf21ab0ca17507be40d (commit) via 4f3bec37ff58a2e08241602d6f64f4572a027093 (commit) via 633858c2542583f56a63e58f33e3852ee03bec3c (commit) via 6ee9723565bec49dfb9e2c0f89391d0f6a9a7893 (commit) via 28acb14fbe8203c73fdf3eb48c318dee390799bf (commit) via 1f474b3d2245d96a04b3db87d8275863f39fe1aa (commit) via e66377eac8944fa4f651e4c38268436212fa4f8a (commit) via e7acd66a6afa7420ed05db60a725ade6bfe8d976 (commit) via 1f7dd777e94194b6c93f72ce2c727f42e47de822 (commit) via 8d92d5af1f16f883459166d4c769701e762ea012 (commit) via 1b93d76d4b7ef252feee23ab630edbdc9142e390 (commit) via 4fb6721e5199e87686a5a1fee7fc0977a2069e48 (commit) via d14f364dcfdafd6e2865f69e1dc00164c12ab355 (commit) via 80df88c09b1a1215f8e17f31e3689218fef476ce (commit) via 04796a59dde8dde575099d5722d0e95e5a036194 (commit) via 0f3a525d305e963e1a2f55dc9327ba6165ebca5f (commit) via 1d931177eb121813249213fb9edcf715a8fbe7a2 (commit) via e854c24ba6886e629e1b93af47218cb41dcddba5 (commit) via d5bea47fb916df2494642007a9f7b1cbd59b1af3 (commit) via 073e7d9058d6a7a38c4a6ee78e09c4037a52bfd0 (commit) via d0e52660fbf2f3409a0f4b8b3eda35b7cbe40c5e (commit) via 14a5467c01bbcd8b04581709a23ae28b4dc2c92b (commit) via 4655b7c2a75582d95bed02245715304106a59956 (commit) via 1aeb12abc86a683de11a036544ba3ffb26280e5d (commit) via 2db02e8afb260edc0706ac094df11e665d41c993 (commit) via fb706ea7a9f8447ba22cdc4c124adebf8225db61 (commit) via 3f8783c139b391530e6e36cb9d5d5f0ef5b7b22d (commit) via 82228f6b948e71569d01398e5ba61229f0ff3a81 (commit) via 15be466701f15bff11ea662eca7f96a54e4d0940 (commit) via 121c2e260f410b82b16dfa1d3144451331c57507 (commit) via 4df258acb17dac936741e2c2ed82b233234dafba (commit) via f0fe004bc619eaf22a55d39acfe8f93634e5d408 (commit) via db0fdf3d24780b869c13e14debf11ac09e83ffc2 (commit) via 389f33e1d9e70f00c5802e9cf25f0b8417162577 (commit) via 2ef6ea2cd699c181a704db97aab58c6fc8b4f6d4 (commit) via a1c78d31aad25d43ed9f65ca45de2be0c986fd5e (commit) via 37ecedf326a215f4f1f0dd7a91d82c71aa235806 (commit) via 1939afc52b44f2618d39f9e18c57dafffb0e6fc9 (commit) via 53e2b34200a428328c4c9752c5dc7c88f3908a90 (commit) via ba5aa02af57cbd059b327f2cb48031c363c36e59 (commit) via 78f0f9d301dace81f10f19d5c7c6027695885af6 (commit) via 07309381491230863b0993305a8a933b19b56b19 (commit) via eadf8aa22a852799669e8a069d9fd6f67e7b13e7 (commit) via 779682e98d8ee835fb3f3ffa675a90aca9cf6131 (commit) via 9ba39e21162e89fb8cad7308950d074c39a647c6 (commit) via 7eb379696337dfe7b6148a1339c19ce6ed920c1d (commit) via da4d2251834a9821797d9cc90cd6785eb1070e76 (commit) via 79aa0992514a945e5c9e4cc8701dea43f2009051 (commit) via c1ef49f5bec463b6350e77ed6208b357bdae3082 (commit) via f40edda74c68ace754e8035f2f963b3565bf5fae (commit) via 0208fb3e14b38956dabdcd7f0c3d10b74bd82c29 (commit) via a7f9c2fa284c40e0993729de1c8edce7dccf9453 (commit) via afecbe151e1ea77802a9931277f04b8d5eb66a84 (commit) via 7df3000477be36baf006f76b174b6c5d426cd435 (commit) via a9c354f82132081e898dfc192e19217e1d162a26 (commit) via 86e0c28789f985e44f88d49ca493b609afbc67c9 (commit) via 8f0b705f21d2c432e45fa2ed8ed41ac862f115fb (commit) via 6a2e414636e22b0a7770d7a248a66e5e86f00369 (commit) via 2bcf9ac8bcc8aa30303d4d65c672be638f9e969d (commit) via 65e2bf097153cb4769596d2485e54d74d404ef5e (commit) via 8ba823ac3a3691a0030452c81232164331db4c71 (commit) via 3d333d0f2c927a7d3bcb28c94e0b22ca6e3a1301 (commit) via 8d6e42c8eab92245b862af8314eb11529b5bb7f4 (commit) via 19b1b52874df49ac1507bd67364eb7bd9c3df0ca (commit) via b5d8ffee3d02a36c6ea02aecb172f268a601fb35 (commit) via 80d998a5e89268583964806ac6e4efaf0a44fdb9 (commit) via 90bd8fd7f8fb802b6261c1d3a525c2982f0a06e0 (commit) via 576c010d9be597b77466ad633463ab44e393e782 (commit) via c473b4925e3f2318c6eab22c2ab532ffe0f0528e (commit) via 5a7585a91b2a7fd91a9e4d20f75002817b0143df (commit) via 28fca32344f5a56f74298d70ac2c3fa03e017c35 (commit) via 8d7f6276a3bfa7da7aeafb3396105f9c732d7a9f (commit) via 1480a0d4fdaff88ae91fffb0b8b78121ce2902e6 (commit) via 08f29475f65a4edf67098c0b54ba4a6fc73daae1 (commit) via 7d1cef803ffb46af6ed8b7b295c3029dbb4295f9 (commit) via cdc4abd04bab51cc5a91a68e192ace2026d4ec3c (commit) via d9382e844ee10a0546a61cbb82709d454994083a (commit) via 5571604593b0bb72dca830e8c6ec205d6874d098 (commit) via fadacfcdf3f208c16e128b19b96129ad02989607 (commit) via c707bcbbb977f3382085aa4156f8acb84dccaeae (commit) via 3758c9397cdb91835d52a3291f972c912e402693 (commit) via c4c7aee166b3aa1ffa70af9b616dd90f1e85187d (commit) via 53515e4356a6985ef450d15619ba30d5056bfcd5 (commit) via c73508f85b75ac9e6ca218d8712ba12402a32bbc (commit) via 135963063fe2227dd58488d503b4de4d999ed0a2 (commit) via 5c32c41b5736cc130a3d88f2b8de290119f9b91d (commit) via fe7a63b3027db943a22af51d90be0025e80b0a30 (commit) via 9f56e2fdf452cb491689992faec02a599795008d (commit) via 5803be99b167403d0fba6c55ce3899966280b3a6 (commit) via e72c4993a5c689b4dec7c4a16a45fd906ab2dabb (commit) via 59f0d891caf8268ad5ded5acc8b354294bc63b0f (commit) via 7fab7d17e87af919189ba55e017386418e3e6ac4 (commit) via 4a801e83cc37eb9fea9c673593a3d1c935f459ce (commit) via 06145dff51b791e6e61ec2f985251998fb4fbb39 (commit) via 0b10d78a8c6215cf829adc16e87a548a2ce0d9fa (commit) via a9bd74e7e88bbd06b77ee6472f1e7bd7455fc328 (commit) via 233cc33754cff5026f34b99efdfb10a09b8b3881 (commit) via 5ee939ae5d088b99eeb70baf2c2ed68a4bbb39db (commit) via c4c7f72ec79c2695172769674cbee0fa94761e1b (commit) via 4518c1d590d2f27d12a2e090324474307a551d53 (commit) via 53f74110ef9f9f188bccfabda74efc5625f0c701 (commit) via 7f82e7b5d347b3d5ed129c3c502a8f454152e845 (commit) via ab6436cdc9a199b8ebfd72f08ed4652b52d7dd8a (commit) via 958cc97efadf56c501ba44ebbdc582204ac280e3 (commit) via 8c719075dc77a53d4f731db11340e449e31efca6 (commit) via dc80be533a2783eec766936116ad6c1f25a93c5b (commit) via 7d31525e33312ced4f30930124a534ba355055b8 (commit) via 06167189b587dc5b417aa304387853dff6fac571 (commit) via eefb9b42401503e01583e40b2898de0c0410299f (commit) via b526202e5f5dd3b5e79cb700445eb8ed814e3627 (commit) via d1a80f73e1db5f8f74e0033f5a09f10ffc44da4c (commit) via 5c51ee7423f28a8d9afe5b81845dd8ff978c7d7d (commit) via 5dd340d91c054070af577f6ae379bebb2f06d9f3 (commit) via fcfb6eafb9f79441c9515939c53558c83877c146 (commit) via fe5de37584688623a1e42539e3c214be491fff49 (commit) via 920245670b3ab13f18408c43405f249652835ba6 (commit) via 1d8852087fab294cb76f218ae70d9f06b8b91178 (commit) via 689b46da39afd891d0bab8f8481f6feb2f20c3e4 (commit) via b160a1aca35d8a1f4c35e972230abfcfe49339e7 (commit) via e6f79423757014314f99d59d1e0d22b545740e43 (commit) via 94e6c8ef891eda0e1f58ff40cc7a78e0bd9c0936 (commit) via 74e4bc913a07641b5d8fd8462f3d359347913851 (commit) via 86b6e474a79a581cd82cbacc6eaa0e87036b24d0 (commit) via cc4bf7a0373abd320aacf1586a411db01db0e795 (commit) via 84a78b4bf7e81471511a569a7081335630442ccc (commit) via 7130e3f7ac6ff42845d66ea330c071d422f6cebd (commit) via e8652aa0301e9c2acb5a79f7359a4f26e30bfc9f (commit) via eb83939eb9d25c1d5ad8179eb3d1b25429050688 (commit) via 3fcc6c87ea6a3101a1242b16312610daee525779 (commit) via cbe9eab14de7292e9a83a126d1529bbb3a3bb4f6 (commit) via ef2d1f078d40a9ea3ceeed658ccf13fbd165caee (commit) via 5be2e71d5c77dffbf655c13fa770e8db6b0c5d0b (commit) via 15fd0ed5d00580bca36652a9557af2d9a0292b63 (commit) via dcd40e84c380cb06919fc794f65a4996615b7789 (commit) via a39e7151ecbdb573330d70df1661e6a2b0bf716b (commit) via aec77e37571b210758ccdaed6d2ab166f7a34c85 (commit) via af18c88995bfefb16aeefe015cf8600ff2e77c77 (commit) via bd3c2ff7d07dad720709daec488f162cc8dad0fb (commit) via 56f1fdd6c058405d65581cb7ff3fbbc2941864ec (commit) via b5ebab6ea9a434ef58db130f4f82c802ec414175 (commit) via 156d51bda0beaa61a8f1552223e0d5bc2a147893 (commit) via 78ec3fd1bf1f829eb1b26b356015e802c2a18657 (commit) via ef8060a3c050c80fdeb7cd60de86415dd88c4d60 (commit) via 1a4581a7adeba506e28a01a541bd4c9c5e30e264 (commit) via 79cbfa8a065cde134cccc70da62903bf2ab7613b (commit) via b94be4c2db5486d2b2e91d2d92615928123cc746 (commit) via 15da1888e72a75605663f5d6422261c891d73e9b (commit) via ebad3b6bb014a9233682361467d99437046c9ae7 (commit) via 7fcff89d944216ac78d7e2a80a5ef87e1abdd60c (commit) via 8a019f2b02236a68d4f78da6022f8deb4582c4c2 (commit) via beba7b41bfd676164f8c9582005eb6a1aa9e23df (commit) via 9ad83af6f77668c7db1e84450f1c0775f92c75b5 (commit) via e33811b4b514d15650282377ef206486b114a959 (commit) via d7188f70d5319150687e6022bb95046ed1fbf2a5 (commit) via da7f2f1eb888b0f5ec4a2c0f78173a9906b7d664 (commit) via 77de18e2d68b0a0695893e78701309d28051ec4f (commit) via d2007d277a241d51726e61301b8114a25d0fd461 (commit) via b9f9ddda5e39f2e8f4282702a18fd78269b9dd84 (commit) via ac399eef7bfcb7cfaf2c52a4b02f77a6e0adf15d (commit) via be6ce3b7718838592084ebc9f0dbd2b8f179b435 (commit) via f99457d01a588be8328b455c3feaee48e5041eee (commit) via 8ef01c75eda537bef89693931d5b046a811ade26 (commit) via e3294ff5ab6fb598d4a3360c21d9b5cb1c654e53 (commit) via d9b7e1a391b3b8db3b744af8eb217b5943878b03 (commit) via 2fc5fe5bdf58d4e34bb3fca265b8b94f32e9ce5a (commit) via fe26f5d1f873326dc2123911c9f7c3df803eb32e (commit) via 3dca31af7487c637a6e0ad132e6fb50c799c28a9 (commit) via 06dc48b69789af6b7c82e4881eb86370c5093029 (commit) via 01939bef98a9d174faff7bfeb52944c19736b6b1 (commit) via 851ae1ebf3c97d9a6a5154c5ad7e9c2cb510adb9 (commit) via 87cad35aa5398bf2e2872d942150bca56d232b45 (commit) via bf789c4061717fa69434fdf94598ffceb00e4747 (commit) via d80e5c8cbe8184037014d1268b68133c41bf4b89 (commit) via 622187beeb33ca1f7ea36f4bb708d0cb58434cd5 (commit) via c4ccb7b2e6a4098cb089fbe5cc4eaa39b5c924ce (commit) via 645561df9d19a501d119adf6890836d553615eea (commit) via 1fb2f4ab42c940fd98940e98ecdb025cb28d1347 (commit) via 5b7d9aa0c4038eff86e7286b94b976a9e1b5e157 (commit) via cfb9f40599a3e4cb8bce6f014c903fda49f933b0 (commit) via aebe39e47fdf1e21d4b6ced894257e555b0f5065 (commit) via a5f09f18b5e0d9a1c5754a0272cca97d9808ab68 (commit) via 83957ac2d7480eb2a0e4a155c2d8719be6129b55 (commit) via f78d779965f107ab4ad9c21a940c65b2a32fc09f (commit) via 40a7b3d31bc790d65ce548581a242737fabb03fe (commit) via 451372fe6b7956dcad8adc6f51fb0596aea742dc (commit) via 56d7970816bb86766d2e5120a0f1b6503d344ca2 (commit) via df6af287eb48d893f8215ae29539967ec70f75be (commit) via 9fc2795ac4c2072ef5dc26f3081e0fb8fd5aff35 (commit) via d54533279c52c12a29ca01a7eba300feb7d25b82 (commit) via 6f6f8be766f87352e04ea41395bb74a0494b3180 (commit) via 9a1ed0099a778912c8e705cbb8245082b20cefd2 (commit) via c6bc7595cc669e82aec21f18d3e21163d455b18f (commit) via c7c8618633196c37b5f0afc22567bc9007f4d348 (commit) via feea2bf35c2c4edf9f88d2a8ce2435c9f26138ff (commit) via 9b6d68ad7836d26dabf418b477c01f1e88c1aa96 (commit) via fa0998b097759c93fd2891cb49a4774eb8ec1bf3 (commit) via cbde4e9b8316bb5ff8077995d0bfb46a349a5967 (commit) via 4820570a94ab437a92d6dd7bfbde1df3fbdff326 (commit) via 6ad9bc9b557bb12fa854e6cb6052a49a7cf06689 (commit) via 12d0ec69e441a883320aa17faf3f83356d7b13a3 (commit) via 6c82b153a7357c6646854d55cdd9a71731a7b0e7 (commit) via 0e75843822e6c69e5795e03b3cb466e0ed7dbf8c (commit) via 0acef5b2c9c1dce30b0de677ab8516722dd76da4 (commit) via bf1798461e6d2d78eebbe77554f2867b7b59df85 (commit) via 27c2ae8c4007465c03b130b6c1bc0de682216d0d (commit) via f22aac34f5b4b21cb2d7120da0e25135b13d869a (commit) via 2844f2adc64f56aa0cfbb105122b68481a644e5c (commit) via 4e0ff189640160188fbb5f3bf49d387d9a214929 (commit) via 3d2c03126de75a812db8535fd7484abb0bc2bcde (commit) via cd8f341af937269f108c58e33a186e2ac7aebe1c (commit) via ec04a45b2ebd5f90938bdee968105621278900fa (commit) via 90c05ee7c51a8775bf1800486076a91e7aa4e435 (commit) via 12ba94b31acd3079a2c16fc4aad8cf2e443a3916 (commit) via becb11f66e7f47e5c65a1f420fd5f21ef68e1134 (commit) via 331dd47f2391b630309b9dd748a394d6bc53e247 (commit) via fb47b10fcce4d5a238774198c8857ef3a3a37a66 (commit) via 1332f6d08de9f45c2baebeb1421379c4a5539448 (commit) from 8b9313985eb2aa433c57d01570ca94009a64673a (commit) - Log ----------------------------------------------------------------- commit eaba78b3a838b9c98dede9c9e01be0fc07fefa18 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:24:19 2010 +0200 Translation update done using Pootle. commit e4322098733507bb02b601d4fac13649cea87d4f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:24:05 2010 +0200 Translation update done using Pootle. commit ce6274629a6898d04310cdb9e19d3a911f9b41b9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:22:34 2010 +0200 Translation update done using Pootle. commit babfdae50983b4f2f92acf060e877348b7b177a9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:21:42 2010 +0200 Translation update done using Pootle. commit a8c92ef45a67009a1064058c2cc7a57989f6ef41 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:20:58 2010 +0200 Translation update done using Pootle. commit c651a84264886dba5feaaef9363cee94ec9194d7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:20:43 2010 +0200 Translation update done using Pootle. commit f4db24021148371bbfd5b32412bfdc8842d2692c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:20:29 2010 +0200 Translation update done using Pootle. commit 3fae095efc93a93f6c7bac34735acd43cb9775db Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:20:14 2010 +0200 Translation update done using Pootle. commit a8f02c142b66575b37d0bae55da4734117295677 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:19:53 2010 +0200 Translation update done using Pootle. commit 56c1322ae4fcd2e00f0bd0c5893f08d7302043fb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:19:41 2010 +0200 Translation update done using Pootle. commit 00064baf7fe167dae0095d2d2f1d47df4297105c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:19:19 2010 +0200 Translation update done using Pootle. commit 33184c1e9e87ee4d7283064316ecedfc770aa3b8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:18:27 2010 +0200 Translation update done using Pootle. commit 35c3e77c805d0d0b7a1c7d5d1f7adf6dd483a3eb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:18:02 2010 +0200 Translation update done using Pootle. commit 9fd503cde1bc15c4e7254d2c3d4395f609593042 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:17:44 2010 +0200 Translation update done using Pootle. commit 90c2579bac4ed84f105df475bdd39096c306c8b0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:15:55 2010 +0200 Translation update done using Pootle. commit a450dbd75f7cd85e75343196a9991dbf91a40187 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:15:25 2010 +0200 Translation update done using Pootle. commit 95fb56dd5ad55294980029d46f89853eb618b91c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:14:41 2010 +0200 Translation update done using Pootle. commit 24a1a999d117d76121576beacb7163cce8d3d6d5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:14:31 2010 +0200 Translation update done using Pootle. commit a0bb963d44ced5142c1a02d42fb671fb39cb9eab Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:11:12 2010 +0200 Translation update done using Pootle. commit de556f51e3aa678ab676e501a5b1a749b5e5d5f5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:10:22 2010 +0200 Translation update done using Pootle. commit 9cc49433e65f34d37aa9d0021137fb6262c860a7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:09:54 2010 +0200 Translation update done using Pootle. commit aacbd766bc95acaf0a0acf68f4e15d2d77d6d699 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:08:21 2010 +0200 Translation update done using Pootle. commit ef475bc27b0de54329cb5993807df6d502df0c15 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:04:44 2010 +0200 Translation update done using Pootle. commit 22bd1a4a5f45060089e974439ff9d2ad997112e6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:03:39 2010 +0200 Translation update done using Pootle. commit a47f8891d88bf0bd13ea243d116c73d0b21bdce2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 06:02:40 2010 +0200 Translation update done using Pootle. commit 886fedbe33c5c4d05d40381d55389d14345ba0ba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:58:49 2010 +0200 Translation update done using Pootle. commit 8e83974abfc657b74213b7eb49b1b41f5c00cc09 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:56:27 2010 +0200 Translation update done using Pootle. commit 90a2eb1408a81692bc8cb487794ec70765e2aa05 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:56:10 2010 +0200 Translation update done using Pootle. commit 89d6479649f41199c8a14fd805027aa6cb777575 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:52:26 2010 +0200 Translation update done using Pootle. commit aaa19aeaebc4f37c4e1f333445938487174d939c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:51:58 2010 +0200 Translation update done using Pootle. commit c9e2501181d85cc1d13c5ee3520916a45f4e8561 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:50:24 2010 +0200 Translation update done using Pootle. commit 454c6addf9fc6d644cc28143533fcbaac0c2b7dd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:48:58 2010 +0200 Translation update done using Pootle. commit 1c6b94a1a4cbc1220789a9a67043b19d8c7898c4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:48:04 2010 +0200 Translation update done using Pootle. commit 9ca5f956784d43c7d54ccdf21ab0ca17507be40d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:47:42 2010 +0200 Translation update done using Pootle. commit 4f3bec37ff58a2e08241602d6f64f4572a027093 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:47:26 2010 +0200 Translation update done using Pootle. commit 633858c2542583f56a63e58f33e3852ee03bec3c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:47:13 2010 +0200 Translation update done using Pootle. commit 6ee9723565bec49dfb9e2c0f89391d0f6a9a7893 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:46:21 2010 +0200 Translation update done using Pootle. commit 28acb14fbe8203c73fdf3eb48c318dee390799bf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:44:28 2010 +0200 Translation update done using Pootle. commit 1f474b3d2245d96a04b3db87d8275863f39fe1aa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:43:04 2010 +0200 Translation update done using Pootle. commit e66377eac8944fa4f651e4c38268436212fa4f8a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:38:01 2010 +0200 Translation update done using Pootle. commit e7acd66a6afa7420ed05db60a725ade6bfe8d976 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:37:29 2010 +0200 Translation update done using Pootle. commit 1f7dd777e94194b6c93f72ce2c727f42e47de822 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:35:23 2010 +0200 Translation update done using Pootle. commit 8d92d5af1f16f883459166d4c769701e762ea012 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:34:41 2010 +0200 Translation update done using Pootle. commit 1b93d76d4b7ef252feee23ab630edbdc9142e390 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:34:02 2010 +0200 Translation update done using Pootle. commit 4fb6721e5199e87686a5a1fee7fc0977a2069e48 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:33:32 2010 +0200 Translation update done using Pootle. commit d14f364dcfdafd6e2865f69e1dc00164c12ab355 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:33:13 2010 +0200 Translation update done using Pootle. commit 80df88c09b1a1215f8e17f31e3689218fef476ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:33:08 2010 +0200 Translation update done using Pootle. commit 04796a59dde8dde575099d5722d0e95e5a036194 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:32:01 2010 +0200 Translation update done using Pootle. commit 0f3a525d305e963e1a2f55dc9327ba6165ebca5f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:31:26 2010 +0200 Translation update done using Pootle. commit 1d931177eb121813249213fb9edcf715a8fbe7a2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:30:37 2010 +0200 Translation update done using Pootle. commit e854c24ba6886e629e1b93af47218cb41dcddba5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:26:11 2010 +0200 Translation update done using Pootle. commit d5bea47fb916df2494642007a9f7b1cbd59b1af3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:23:09 2010 +0200 Translation update done using Pootle. commit 073e7d9058d6a7a38c4a6ee78e09c4037a52bfd0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:21:47 2010 +0200 Translation update done using Pootle. commit d0e52660fbf2f3409a0f4b8b3eda35b7cbe40c5e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:09:08 2010 +0200 Translation update done using Pootle. commit 14a5467c01bbcd8b04581709a23ae28b4dc2c92b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:01:58 2010 +0200 Translation update done using Pootle. commit 4655b7c2a75582d95bed02245715304106a59956 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:00:29 2010 +0200 Translation update done using Pootle. commit 1aeb12abc86a683de11a036544ba3ffb26280e5d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 05:00:13 2010 +0200 Translation update done using Pootle. commit 2db02e8afb260edc0706ac094df11e665d41c993 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:59:40 2010 +0200 Translation update done using Pootle. commit fb706ea7a9f8447ba22cdc4c124adebf8225db61 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:56:11 2010 +0200 Translation update done using Pootle. commit 3f8783c139b391530e6e36cb9d5d5f0ef5b7b22d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:55:46 2010 +0200 Translation update done using Pootle. commit 82228f6b948e71569d01398e5ba61229f0ff3a81 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:54:02 2010 +0200 Translation update done using Pootle. commit 15be466701f15bff11ea662eca7f96a54e4d0940 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:52:17 2010 +0200 Translation update done using Pootle. commit 121c2e260f410b82b16dfa1d3144451331c57507 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:52:10 2010 +0200 Translation update done using Pootle. commit 4df258acb17dac936741e2c2ed82b233234dafba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:51:15 2010 +0200 Translation update done using Pootle. commit f0fe004bc619eaf22a55d39acfe8f93634e5d408 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:41:14 2010 +0200 Translation update done using Pootle. commit db0fdf3d24780b869c13e14debf11ac09e83ffc2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:40:46 2010 +0200 Translation update done using Pootle. commit 389f33e1d9e70f00c5802e9cf25f0b8417162577 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:40:39 2010 +0200 Translation update done using Pootle. commit 2ef6ea2cd699c181a704db97aab58c6fc8b4f6d4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:40:00 2010 +0200 Translation update done using Pootle. commit a1c78d31aad25d43ed9f65ca45de2be0c986fd5e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:39:52 2010 +0200 Translation update done using Pootle. commit 37ecedf326a215f4f1f0dd7a91d82c71aa235806 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:37:40 2010 +0200 Translation update done using Pootle. commit 1939afc52b44f2618d39f9e18c57dafffb0e6fc9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:36:08 2010 +0200 Translation update done using Pootle. commit 53e2b34200a428328c4c9752c5dc7c88f3908a90 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:35:32 2010 +0200 Translation update done using Pootle. commit ba5aa02af57cbd059b327f2cb48031c363c36e59 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:33:28 2010 +0200 Translation update done using Pootle. commit 78f0f9d301dace81f10f19d5c7c6027695885af6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:31:32 2010 +0200 Translation update done using Pootle. commit 07309381491230863b0993305a8a933b19b56b19 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:27:39 2010 +0200 Translation update done using Pootle. commit eadf8aa22a852799669e8a069d9fd6f67e7b13e7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:23:11 2010 +0200 Translation update done using Pootle. commit 779682e98d8ee835fb3f3ffa675a90aca9cf6131 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:19:31 2010 +0200 Translation update done using Pootle. commit 9ba39e21162e89fb8cad7308950d074c39a647c6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:18:17 2010 +0200 Translation update done using Pootle. commit 7eb379696337dfe7b6148a1339c19ce6ed920c1d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:15:13 2010 +0200 Translation update done using Pootle. commit da4d2251834a9821797d9cc90cd6785eb1070e76 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:10:35 2010 +0200 Translation update done using Pootle. commit 79aa0992514a945e5c9e4cc8701dea43f2009051 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:07:18 2010 +0200 Translation update done using Pootle. commit c1ef49f5bec463b6350e77ed6208b357bdae3082 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:05:51 2010 +0200 Translation update done using Pootle. commit f40edda74c68ace754e8035f2f963b3565bf5fae Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:04:41 2010 +0200 Translation update done using Pootle. commit 0208fb3e14b38956dabdcd7f0c3d10b74bd82c29 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:00:44 2010 +0200 Translation update done using Pootle. commit a7f9c2fa284c40e0993729de1c8edce7dccf9453 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 04:00:00 2010 +0200 Translation update done using Pootle. commit afecbe151e1ea77802a9931277f04b8d5eb66a84 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:58:31 2010 +0200 Translation update done using Pootle. commit 7df3000477be36baf006f76b174b6c5d426cd435 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:48:05 2010 +0200 Translation update done using Pootle. commit a9c354f82132081e898dfc192e19217e1d162a26 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:47:33 2010 +0200 Translation update done using Pootle. commit 86e0c28789f985e44f88d49ca493b609afbc67c9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:47:29 2010 +0200 Translation update done using Pootle. commit 8f0b705f21d2c432e45fa2ed8ed41ac862f115fb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:47:10 2010 +0200 Translation update done using Pootle. commit 6a2e414636e22b0a7770d7a248a66e5e86f00369 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:46:58 2010 +0200 Translation update done using Pootle. commit 2bcf9ac8bcc8aa30303d4d65c672be638f9e969d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:46:31 2010 +0200 Translation update done using Pootle. commit 65e2bf097153cb4769596d2485e54d74d404ef5e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:46:27 2010 +0200 Translation update done using Pootle. commit 8ba823ac3a3691a0030452c81232164331db4c71 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:46:06 2010 +0200 Translation update done using Pootle. commit 3d333d0f2c927a7d3bcb28c94e0b22ca6e3a1301 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:45:54 2010 +0200 Translation update done using Pootle. commit 8d6e42c8eab92245b862af8314eb11529b5bb7f4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:45:50 2010 +0200 Translation update done using Pootle. commit 19b1b52874df49ac1507bd67364eb7bd9c3df0ca Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:45:41 2010 +0200 Translation update done using Pootle. commit b5d8ffee3d02a36c6ea02aecb172f268a601fb35 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:45:37 2010 +0200 Translation update done using Pootle. commit 80d998a5e89268583964806ac6e4efaf0a44fdb9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:45:02 2010 +0200 Translation update done using Pootle. commit 90bd8fd7f8fb802b6261c1d3a525c2982f0a06e0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:44:58 2010 +0200 Translation update done using Pootle. commit 576c010d9be597b77466ad633463ab44e393e782 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:40:56 2010 +0200 Translation update done using Pootle. commit c473b4925e3f2318c6eab22c2ab532ffe0f0528e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:40:52 2010 +0200 Translation update done using Pootle. commit 5a7585a91b2a7fd91a9e4d20f75002817b0143df Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:40:20 2010 +0200 Translation update done using Pootle. commit 28fca32344f5a56f74298d70ac2c3fa03e017c35 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:39:47 2010 +0200 Translation update done using Pootle. commit 8d7f6276a3bfa7da7aeafb3396105f9c732d7a9f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:39:44 2010 +0200 Translation update done using Pootle. commit 1480a0d4fdaff88ae91fffb0b8b78121ce2902e6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:39:23 2010 +0200 Translation update done using Pootle. commit 08f29475f65a4edf67098c0b54ba4a6fc73daae1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:39:19 2010 +0200 Translation update done using Pootle. commit 7d1cef803ffb46af6ed8b7b295c3029dbb4295f9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:39:06 2010 +0200 Translation update done using Pootle. commit cdc4abd04bab51cc5a91a68e192ace2026d4ec3c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:38:54 2010 +0200 Translation update done using Pootle. commit d9382e844ee10a0546a61cbb82709d454994083a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:36:39 2010 +0200 Translation update done using Pootle. commit 5571604593b0bb72dca830e8c6ec205d6874d098 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:36:36 2010 +0200 Translation update done using Pootle. commit fadacfcdf3f208c16e128b19b96129ad02989607 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:34:56 2010 +0200 Translation update done using Pootle. commit c707bcbbb977f3382085aa4156f8acb84dccaeae Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:34:34 2010 +0200 Translation update done using Pootle. commit 3758c9397cdb91835d52a3291f972c912e402693 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:34:10 2010 +0200 Translation update done using Pootle. commit c4c7aee166b3aa1ffa70af9b616dd90f1e85187d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:31:19 2010 +0200 Translation update done using Pootle. commit 53515e4356a6985ef450d15619ba30d5056bfcd5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:30:51 2010 +0200 Translation update done using Pootle. commit c73508f85b75ac9e6ca218d8712ba12402a32bbc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:29:55 2010 +0200 Translation update done using Pootle. commit 135963063fe2227dd58488d503b4de4d999ed0a2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:29:38 2010 +0200 Translation update done using Pootle. commit 5c32c41b5736cc130a3d88f2b8de290119f9b91d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:28:38 2010 +0200 Translation update done using Pootle. commit fe7a63b3027db943a22af51d90be0025e80b0a30 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:27:55 2010 +0200 Translation update done using Pootle. commit 9f56e2fdf452cb491689992faec02a599795008d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:23:54 2010 +0200 Translation update done using Pootle. commit 5803be99b167403d0fba6c55ce3899966280b3a6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:22:33 2010 +0200 Translation update done using Pootle. commit e72c4993a5c689b4dec7c4a16a45fd906ab2dabb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:21:32 2010 +0200 Translation update done using Pootle. commit 59f0d891caf8268ad5ded5acc8b354294bc63b0f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:18:16 2010 +0200 Translation update done using Pootle. commit 7fab7d17e87af919189ba55e017386418e3e6ac4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:15:20 2010 +0200 Translation update done using Pootle. commit 4a801e83cc37eb9fea9c673593a3d1c935f459ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:14:31 2010 +0200 Translation update done using Pootle. commit 06145dff51b791e6e61ec2f985251998fb4fbb39 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:12:49 2010 +0200 Translation update done using Pootle. commit 0b10d78a8c6215cf829adc16e87a548a2ce0d9fa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:12:33 2010 +0200 Translation update done using Pootle. commit a9bd74e7e88bbd06b77ee6472f1e7bd7455fc328 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:11:23 2010 +0200 Translation update done using Pootle. commit 233cc33754cff5026f34b99efdfb10a09b8b3881 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:10:55 2010 +0200 Translation update done using Pootle. commit 5ee939ae5d088b99eeb70baf2c2ed68a4bbb39db Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:09:25 2010 +0200 Translation update done using Pootle. commit c4c7f72ec79c2695172769674cbee0fa94761e1b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 03:09:04 2010 +0200 Translation update done using Pootle. commit 4518c1d590d2f27d12a2e090324474307a551d53 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:56:43 2010 +0200 Translation update done using Pootle. commit 53f74110ef9f9f188bccfabda74efc5625f0c701 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:53:01 2010 +0200 Translation update done using Pootle. commit 7f82e7b5d347b3d5ed129c3c502a8f454152e845 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:52:52 2010 +0200 Translation update done using Pootle. commit ab6436cdc9a199b8ebfd72f08ed4652b52d7dd8a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:52:43 2010 +0200 Translation update done using Pootle. commit 958cc97efadf56c501ba44ebbdc582204ac280e3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:52:25 2010 +0200 Translation update done using Pootle. commit 8c719075dc77a53d4f731db11340e449e31efca6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:52:15 2010 +0200 Translation update done using Pootle. commit dc80be533a2783eec766936116ad6c1f25a93c5b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:52:04 2010 +0200 Translation update done using Pootle. commit 7d31525e33312ced4f30930124a534ba355055b8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:51:54 2010 +0200 Translation update done using Pootle. commit 06167189b587dc5b417aa304387853dff6fac571 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:51:47 2010 +0200 Translation update done using Pootle. commit eefb9b42401503e01583e40b2898de0c0410299f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:51:34 2010 +0200 Translation update done using Pootle. commit b526202e5f5dd3b5e79cb700445eb8ed814e3627 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:51:27 2010 +0200 Translation update done using Pootle. commit d1a80f73e1db5f8f74e0033f5a09f10ffc44da4c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:51:11 2010 +0200 Translation update done using Pootle. commit 5c51ee7423f28a8d9afe5b81845dd8ff978c7d7d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:50:37 2010 +0200 Translation update done using Pootle. commit 5dd340d91c054070af577f6ae379bebb2f06d9f3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Sep 10 02:50:22 2010 +0200 Translation update done using Pootle. commit fcfb6eafb9f79441c9515939c53558c83877c146 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:37:23 2010 +0200 Translation update done using Pootle. commit fe5de37584688623a1e42539e3c214be491fff49 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:37:06 2010 +0200 Translation update done using Pootle. commit 920245670b3ab13f18408c43405f249652835ba6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:36:47 2010 +0200 Translation update done using Pootle. commit 1d8852087fab294cb76f218ae70d9f06b8b91178 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:36:18 2010 +0200 Translation update done using Pootle. commit 689b46da39afd891d0bab8f8481f6feb2f20c3e4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:35:30 2010 +0200 Translation update done using Pootle. commit b160a1aca35d8a1f4c35e972230abfcfe49339e7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:35:17 2010 +0200 Translation update done using Pootle. commit e6f79423757014314f99d59d1e0d22b545740e43 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:35:13 2010 +0200 Translation update done using Pootle. commit 94e6c8ef891eda0e1f58ff40cc7a78e0bd9c0936 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:34:42 2010 +0200 Translation update done using Pootle. commit 74e4bc913a07641b5d8fd8462f3d359347913851 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:34:17 2010 +0200 Translation update done using Pootle. commit 86b6e474a79a581cd82cbacc6eaa0e87036b24d0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:34:06 2010 +0200 Translation update done using Pootle. commit cc4bf7a0373abd320aacf1586a411db01db0e795 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:33:42 2010 +0200 Translation update done using Pootle. commit 84a78b4bf7e81471511a569a7081335630442ccc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:33:15 2010 +0200 Translation update done using Pootle. commit 7130e3f7ac6ff42845d66ea330c071d422f6cebd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:33:04 2010 +0200 Translation update done using Pootle. commit e8652aa0301e9c2acb5a79f7359a4f26e30bfc9f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:33:00 2010 +0200 Translation update done using Pootle. commit eb83939eb9d25c1d5ad8179eb3d1b25429050688 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:32:32 2010 +0200 Translation update done using Pootle. commit 3fcc6c87ea6a3101a1242b16312610daee525779 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:32:20 2010 +0200 Translation update done using Pootle. commit cbe9eab14de7292e9a83a126d1529bbb3a3bb4f6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:32:09 2010 +0200 Translation update done using Pootle. commit ef2d1f078d40a9ea3ceeed658ccf13fbd165caee Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:32:01 2010 +0200 Translation update done using Pootle. commit 5be2e71d5c77dffbf655c13fa770e8db6b0c5d0b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:31:47 2010 +0200 Translation update done using Pootle. commit 15fd0ed5d00580bca36652a9557af2d9a0292b63 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:31:43 2010 +0200 Translation update done using Pootle. commit dcd40e84c380cb06919fc794f65a4996615b7789 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:31:03 2010 +0200 Translation update done using Pootle. commit a39e7151ecbdb573330d70df1661e6a2b0bf716b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:53 2010 +0200 Translation update done using Pootle. commit aec77e37571b210758ccdaed6d2ab166f7a34c85 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:40 2010 +0200 Translation update done using Pootle. commit af18c88995bfefb16aeefe015cf8600ff2e77c77 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:36 2010 +0200 Translation update done using Pootle. commit bd3c2ff7d07dad720709daec488f162cc8dad0fb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:31 2010 +0200 Translation update done using Pootle. commit 56f1fdd6c058405d65581cb7ff3fbbc2941864ec Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:25 2010 +0200 Translation update done using Pootle. commit b5ebab6ea9a434ef58db130f4f82c802ec414175 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:30:08 2010 +0200 Translation update done using Pootle. commit 156d51bda0beaa61a8f1552223e0d5bc2a147893 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:29:41 2010 +0200 Translation update done using Pootle. commit 78ec3fd1bf1f829eb1b26b356015e802c2a18657 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:27:57 2010 +0200 Translation update done using Pootle. commit ef8060a3c050c80fdeb7cd60de86415dd88c4d60 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:27:32 2010 +0200 Translation update done using Pootle. commit 1a4581a7adeba506e28a01a541bd4c9c5e30e264 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:27:28 2010 +0200 Translation update done using Pootle. commit 79cbfa8a065cde134cccc70da62903bf2ab7613b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:27:15 2010 +0200 Translation update done using Pootle. commit b94be4c2db5486d2b2e91d2d92615928123cc746 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:26:51 2010 +0200 Translation update done using Pootle. commit 15da1888e72a75605663f5d6422261c891d73e9b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:26:45 2010 +0200 Translation update done using Pootle. commit ebad3b6bb014a9233682361467d99437046c9ae7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:26:26 2010 +0200 Translation update done using Pootle. commit 7fcff89d944216ac78d7e2a80a5ef87e1abdd60c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:26:18 2010 +0200 Translation update done using Pootle. commit 8a019f2b02236a68d4f78da6022f8deb4582c4c2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:26:07 2010 +0200 Translation update done using Pootle. commit beba7b41bfd676164f8c9582005eb6a1aa9e23df Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:25:42 2010 +0200 Translation update done using Pootle. commit 9ad83af6f77668c7db1e84450f1c0775f92c75b5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:25:05 2010 +0200 Translation update done using Pootle. commit e33811b4b514d15650282377ef206486b114a959 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:24:48 2010 +0200 Translation update done using Pootle. commit d7188f70d5319150687e6022bb95046ed1fbf2a5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:21:04 2010 +0200 Translation update done using Pootle. commit da7f2f1eb888b0f5ec4a2c0f78173a9906b7d664 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:20:49 2010 +0200 Translation update done using Pootle. commit 77de18e2d68b0a0695893e78701309d28051ec4f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:20:43 2010 +0200 Translation update done using Pootle. commit d2007d277a241d51726e61301b8114a25d0fd461 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:20:33 2010 +0200 Translation update done using Pootle. commit b9f9ddda5e39f2e8f4282702a18fd78269b9dd84 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:20:25 2010 +0200 Translation update done using Pootle. commit ac399eef7bfcb7cfaf2c52a4b02f77a6e0adf15d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:19:39 2010 +0200 Translation update done using Pootle. commit be6ce3b7718838592084ebc9f0dbd2b8f179b435 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:18:55 2010 +0200 Translation update done using Pootle. commit f99457d01a588be8328b455c3feaee48e5041eee Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:17:54 2010 +0200 Translation update done using Pootle. commit 8ef01c75eda537bef89693931d5b046a811ade26 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:15:31 2010 +0200 Translation update done using Pootle. commit e3294ff5ab6fb598d4a3360c21d9b5cb1c654e53 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:15:18 2010 +0200 Translation update done using Pootle. commit d9b7e1a391b3b8db3b744af8eb217b5943878b03 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:15:04 2010 +0200 Translation update done using Pootle. commit 2fc5fe5bdf58d4e34bb3fca265b8b94f32e9ce5a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:14:40 2010 +0200 Translation update done using Pootle. commit fe26f5d1f873326dc2123911c9f7c3df803eb32e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:14:32 2010 +0200 Translation update done using Pootle. commit 3dca31af7487c637a6e0ad132e6fb50c799c28a9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:14:19 2010 +0200 Translation update done using Pootle. commit 06dc48b69789af6b7c82e4881eb86370c5093029 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:14:06 2010 +0200 Translation update done using Pootle. commit 01939bef98a9d174faff7bfeb52944c19736b6b1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:13:43 2010 +0200 Translation update done using Pootle. commit 851ae1ebf3c97d9a6a5154c5ad7e9c2cb510adb9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:13:36 2010 +0200 Translation update done using Pootle. commit 87cad35aa5398bf2e2872d942150bca56d232b45 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:12:42 2010 +0200 Translation update done using Pootle. commit bf789c4061717fa69434fdf94598ffceb00e4747 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:12:05 2010 +0200 Translation update done using Pootle. commit d80e5c8cbe8184037014d1268b68133c41bf4b89 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:11:51 2010 +0200 Translation update done using Pootle. commit 622187beeb33ca1f7ea36f4bb708d0cb58434cd5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:11:42 2010 +0200 Translation update done using Pootle. commit c4ccb7b2e6a4098cb089fbe5cc4eaa39b5c924ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:11:14 2010 +0200 Translation update done using Pootle. commit 645561df9d19a501d119adf6890836d553615eea Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:10:55 2010 +0200 Translation update done using Pootle. commit 1fb2f4ab42c940fd98940e98ecdb025cb28d1347 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:10:22 2010 +0200 Translation update done using Pootle. commit 5b7d9aa0c4038eff86e7286b94b976a9e1b5e157 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:09:06 2010 +0200 Translation update done using Pootle. commit cfb9f40599a3e4cb8bce6f014c903fda49f933b0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:08:27 2010 +0200 Translation update done using Pootle. commit aebe39e47fdf1e21d4b6ced894257e555b0f5065 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:07:57 2010 +0200 Translation update done using Pootle. commit a5f09f18b5e0d9a1c5754a0272cca97d9808ab68 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:05:50 2010 +0200 Translation update done using Pootle. commit 83957ac2d7480eb2a0e4a155c2d8719be6129b55 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:03:29 2010 +0200 Translation update done using Pootle. commit f78d779965f107ab4ad9c21a940c65b2a32fc09f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:00:52 2010 +0200 Translation update done using Pootle. commit 40a7b3d31bc790d65ce548581a242737fabb03fe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 15:00:03 2010 +0200 Translation update done using Pootle. commit 451372fe6b7956dcad8adc6f51fb0596aea742dc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:59:32 2010 +0200 Translation update done using Pootle. commit 56d7970816bb86766d2e5120a0f1b6503d344ca2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:59:24 2010 +0200 Translation update done using Pootle. commit df6af287eb48d893f8215ae29539967ec70f75be Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:59:10 2010 +0200 Translation update done using Pootle. commit 9fc2795ac4c2072ef5dc26f3081e0fb8fd5aff35 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:59:04 2010 +0200 Translation update done using Pootle. commit d54533279c52c12a29ca01a7eba300feb7d25b82 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:58:48 2010 +0200 Translation update done using Pootle. commit 6f6f8be766f87352e04ea41395bb74a0494b3180 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:58:39 2010 +0200 Translation update done using Pootle. commit 9a1ed0099a778912c8e705cbb8245082b20cefd2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:57:41 2010 +0200 Translation update done using Pootle. commit c6bc7595cc669e82aec21f18d3e21163d455b18f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:57:30 2010 +0200 Translation update done using Pootle. commit c7c8618633196c37b5f0afc22567bc9007f4d348 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:56:57 2010 +0200 Translation update done using Pootle. commit feea2bf35c2c4edf9f88d2a8ce2435c9f26138ff Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:56:40 2010 +0200 Translation update done using Pootle. commit 9b6d68ad7836d26dabf418b477c01f1e88c1aa96 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:56:15 2010 +0200 Translation update done using Pootle. commit fa0998b097759c93fd2891cb49a4774eb8ec1bf3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:55:43 2010 +0200 Translation update done using Pootle. commit cbde4e9b8316bb5ff8077995d0bfb46a349a5967 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:55:15 2010 +0200 Translation update done using Pootle. commit 4820570a94ab437a92d6dd7bfbde1df3fbdff326 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:53:33 2010 +0200 Translation update done using Pootle. commit 6ad9bc9b557bb12fa854e6cb6052a49a7cf06689 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:51:42 2010 +0200 Translation update done using Pootle. commit 12d0ec69e441a883320aa17faf3f83356d7b13a3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:49:30 2010 +0200 Translation update done using Pootle. commit 6c82b153a7357c6646854d55cdd9a71731a7b0e7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:47:29 2010 +0200 Translation update done using Pootle. commit 0e75843822e6c69e5795e03b3cb466e0ed7dbf8c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:47:13 2010 +0200 Translation update done using Pootle. commit 0acef5b2c9c1dce30b0de677ab8516722dd76da4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:46:28 2010 +0200 Translation update done using Pootle. commit bf1798461e6d2d78eebbe77554f2867b7b59df85 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:46:00 2010 +0200 Translation update done using Pootle. commit 27c2ae8c4007465c03b130b6c1bc0de682216d0d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:44:01 2010 +0200 Translation update done using Pootle. commit f22aac34f5b4b21cb2d7120da0e25135b13d869a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:43:17 2010 +0200 Translation update done using Pootle. commit 2844f2adc64f56aa0cfbb105122b68481a644e5c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:38:12 2010 +0200 Translation update done using Pootle. commit 4e0ff189640160188fbb5f3bf49d387d9a214929 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:37:40 2010 +0200 Translation update done using Pootle. commit 3d2c03126de75a812db8535fd7484abb0bc2bcde Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:35:42 2010 +0200 Translation update done using Pootle. commit cd8f341af937269f108c58e33a186e2ac7aebe1c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:34:48 2010 +0200 Translation update done using Pootle. commit ec04a45b2ebd5f90938bdee968105621278900fa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:33:43 2010 +0200 Translation update done using Pootle. commit 90c05ee7c51a8775bf1800486076a91e7aa4e435 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:31:35 2010 +0200 Translation update done using Pootle. commit 12ba94b31acd3079a2c16fc4aad8cf2e443a3916 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:31:24 2010 +0200 Translation update done using Pootle. commit becb11f66e7f47e5c65a1f420fd5f21ef68e1134 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:31:08 2010 +0200 Translation update done using Pootle. commit 331dd47f2391b630309b9dd748a394d6bc53e247 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:30:38 2010 +0200 Translation update done using Pootle. commit fb47b10fcce4d5a238774198c8857ef3a3a37a66 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:30:20 2010 +0200 Translation update done using Pootle. commit 1332f6d08de9f45c2baebeb1421379c4a5539448 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:29:15 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 736 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 389 insertions(+), 347 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 48c1a4d..41269ec 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-09-08 13:44+0300\n" -"PO-Revision-Date: 2010-03-04 14:08+0200\n" +"PO-Revision-Date: 2010-09-10 06:24+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #. type: Content of: <html><head><title> #: ../phpmyadmin/Documentation.html:12 @@ -166,13 +166,10 @@ msgstr "要支持上传 zip 文件，需要 <tt>zip</tt> 扩展。" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:67 -#, fuzzy msgid "" "For proper support of multibyte strings (eg. UTF-8, which is currently the " "default), you should install the mbstring and ctype extensions." -msgstr "" -"要更好的支持多字节字符串 (如 UTF-8 编码的文字, 当前默认编码)，需要 mbstring " -"和 ctype 扩展。" +msgstr "为了更好的支持多字节字符串 (如 UTF-8 编码的文字, 当前默认编码)，你应该安装 mbstring 和 ctype 扩展。" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:71 @@ -208,13 +205,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:83 -#, fuzzy msgid "" "To support BLOB streaming, see PHP and MySQL requirements in <a href=" "\"#faq6_25\"> <abbr title=\"Frequently Asked Questions\">FAQ</abbr> 6.25</a>." msgstr "" -"支持改进的 MySQL 扩展 mysqli <a href=\"#faq1_17\"> (参见 <abbr title=\"常见问" -"题 (Frequently Asked Questions)\">FAQ</abbr> 1.17)</a>" +"要支持 BLOB 流，参见 <a href=\"#faq6_25\"> <abbr title=\"常见问题 (Frequently Asked " +"Questions)\">FAQ</abbr> 6.25</a> 中所述的 PHP 和 MySQL 需求。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:88 @@ -250,16 +246,14 @@ msgstr "目前 phpMyAdmin 具有的功能有:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:103 -#, fuzzy msgid "browse and drop databases, tables, views, columns and indexes" msgstr "浏览、删除数据库、数据表、视图、字段和索引" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:104 -#, fuzzy msgid "" "create, copy, drop, rename and alter databases, tables, columns and indexes" -msgstr "创建、复制、删除、改名、修改数据库、数据表、字段和索引" +msgstr "创建、复制、删除、改名以及修改数据库、数据表、字段和索引" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:106 @@ -394,12 +388,9 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:141 -#, fuzzy msgid "" "communicate in <a href=\"./translators.html\">58 different languages</a>" -msgstr "" -"支持 <a href=\"./translators.html\">57 种不同的语言 (链接到译者页面，英语)</" -"a>" +msgstr "支持 <a href=\"./translators.html\">58 种不同的语言</a>" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:143 @@ -461,9 +452,8 @@ msgstr "<a href=\"#setup_script\">使用安装脚本</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:169 -#, fuzzy msgid "<a href=\"#linked-tables\">phpMyAdmin configuration storage</a>" -msgstr "<a href=\"#linked-tables\">链接表的附加功能</a>" +msgstr "<a href=\"#linked-tables\">phpMyAdmin 高级功能</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:170 @@ -821,13 +811,11 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:325 -#, fuzzy msgid "phpMyAdmin configuration storage" -msgstr "phpMyAdmin 文档" +msgstr "phpMyAdmin 高级功能" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:327 -#, fuzzy msgid "" "For a whole set of new features (bookmarks, comments, <abbr title=" "\"structured query language\">SQL</abbr>-history, tracking mechanism, <abbr " @@ -837,12 +825,11 @@ msgid "" "multi-user installation (this database would then be accessed by the " "controluser, so no other user should have rights to it)." msgstr "" -"若要开启一些新功能 (如: 书签、注释、<abbr title=\"结构化查询语言 (structured " -"query language)\">SQL</abbr> 查询历史、结构追踪、生成 <abbr title=\"便携式文" -"档格式 (Portable Document Format)\">PDF</abbr> 、内容转换等)，你需要创建一些" -"特殊的数据表。这些表可以放在你自己的数据库里，也可以在一个多用户的服务器上创" -"建一个独立的数据库 (这个数据库将通过其对应的帐号访问，所以不应该给其他用户访" -"问这个数据库的权限)。" +"若要使用一些高级功能 (如: 书签、注释、<abbr title=\"结构化查询语言 (structured query " +"language)\">SQL</abbr> 查询历史、结构追踪、生成 <abbr title=\"便携式文档格式 (Portable Document " +"Format)\">PDF</abbr> " +"、内容转换等)，你需要创建一些特殊的数据表。这些表可以放在你自己的数据库里，也可以在一个多用户的服务器上创建一个独立的数据库 " +"(这个数据库将通过其对应的帐号访问，所以不应该给其他用户访问这个数据库的权限)。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:336 @@ -858,14 +845,14 @@ msgstr "" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:341 -#, fuzzy msgid "" "If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, " "please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create " "new tables by importing <i>./scripts/create_tables.sql</i>." msgstr "" -"如果以前就使用过该功能并升级过 MySQL 到 4.1.2 或更高版本，请使用 <i>./" -"scripts/upgrade_tables_mysql_4_1_2+.sql</i> 。" +"如果你以前就使用过该功能并升级过 MySQL 到 4.1.2 或更高版本，请使用 " +"<i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> 然后通过导入 " +"<i>./scripts/create_tables.sql</i> 来创建新的数据表。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:345 @@ -927,16 +914,14 @@ msgstr "" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:371 -#, fuzzy msgid "" "If you have upgraded your MySQL server from a version previous to 4.1.2 to " "version 5.x or newer and if you use the phpMyAdmin configuration storage, " "you should run the SQL script found in <tt>scripts/" "upgrade_tables_mysql_4_1_2+.sql</tt>." msgstr "" -"如果你把 MySQL 服务器从 4.1.2 之前的版本升级到了 4.1.2 或更高版本，并且使用了" -"链接表的附加功能，你还要运行 SQL 脚本 <tt>scripts/" -"upgrade_tables_mysql_4_1_2+.sql</tt> 。" +"如果你把 MySQL 服务器从 4.1.2 之前的版本升级到了 5.x 或更高版本，并且使用 phpMyAdmin 高级功能，你还要运行 SQL 脚本 " +"<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt> 。" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:376 @@ -1006,13 +991,10 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:398 -#, fuzzy msgid "" "Note: this section is only applicable if your MySQL server is running with " "<tt>--skip-show-database</tt>." -msgstr "" -"注意: 自 phpMyAdmin 2.6.1 起，本节仅适用于运行在 <tt>--skip-show-database</" -"tt> 模式下的 MySQL 服务器。" +msgstr "注意: 本节仅适用于运行在 <tt>--skip-show-database</tt> 模式下的 MySQL 服务器。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:401 @@ -1110,11 +1092,10 @@ msgstr "GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'local #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:441 -#, fuzzy msgid "" "(this of course requires that your <a href=\"#linked-tables\">phpMyAdmin " "configuration storage</a> be set up)." -msgstr "(需要设置好<a href=\"#linked-tables\">链接表的附加功能</a>)。" +msgstr "(需要设置好 <a href=\"#linked-tables\">phpMyAdmin 高级功能</a>)。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:445 @@ -1789,7 +1770,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:715 -#, fuzzy msgid "" "This special account is used for 2 distinct purposes: to make possible all " "relational features (see <a href=\"#pmadb\" class=\"configrule\">$cfg" @@ -1797,11 +1777,10 @@ msgid "" "skip-show-database</tt>, to enable a multi-user installation (<abbr title=" "\"HyperText Transfer Protocol\">HTTP</abbr> or cookie authentication mode)." msgstr "" -"这个特殊的帐号有两种不同的用途: 1、为链接表的附加功能提供支持 (参见 <a href=" -"\"#pmadb\" class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>)。2、在 " -"4.1.2 及更低版本或运行于 <tt>--skip-show-database</tt> 模式的 MySQL 服务器上" -"使用多用户安装提供支持 (<abbr title=\"超文本转移协议 (HyperText Transfer " -"Protocol)\">HTTP</abbr> 或 cookie 认证)。" +"这个特殊的帐号有两种不同的用途: 1、为 phpMyAdmin 高级功能提供支持 (参见 <a href=\"#pmadb\" " +"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>)。2、在运行于 <tt>--skip-show-" +"database</tt> 模式的 MySQL 服务器上使用多用户安装提供支持 (<abbr title=\"超文本转移协议 (HyperText " +"Transfer Protocol)\">HTTP</abbr> 或 cookie 认证)。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:723 @@ -2114,9 +2093,11 @@ msgstr "要隐藏数据库 "数据库1" 和 "数据库2" ，用" # using chinese as database name is ok, but should make sure config file encoding is utf-8 #. type: Content of: <html><body><div><dl><dd><pre> #: ../phpmyadmin/Documentation.html:848 -#, fuzzy, no-wrap +#, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" -msgstr "$cfg['Servers'][$i]['hide_db'] = '(数据库1|数据库2)';// 译者注: 上例中也可使用中文，需注意配置文件编码应为 UTF-8" +msgstr "" +"$cfg['Servers'][$i]['hide_db'] = '^(数据库1|数据库2)$';// 译者注: " +"上例中也可使用中文，需注意配置文件编码应为 UTF-8" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:849 @@ -2156,25 +2137,21 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:864 -#, fuzzy msgid "" "The name of the database containing the phpMyAdmin configuration storage." -msgstr "包含链接表的附加功能数据的数据库名。" +msgstr "包含 phpMyAdmin 高级功能数据的数据库名。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:867 -#, fuzzy msgid "" "See the <a href=\"#linked-tables\">phpMyAdmin configuration storage</a> " "section in this document to see the benefits of this feature, and for a " "quick way of creating this database and the needed tables." msgstr "" -"参见本文档中<a href=\"#linked-tables\">链接表的附加功能</a>一节了解其好处以及" -"如何快速创建该数据库和需要的数据表。" +"参见 <a href=\"#linked-tables\">phpMyAdmin 高级功能</a>一节了解其好处以及如何快速创建该数据库和需要的数据表。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:872 -#, fuzzy msgid "" "If you are the only user of this phpMyAdmin installation, you can use your " "current database to store those special tables; in this case, just put your " @@ -2182,10 +2159,9 @@ msgid "" "user installation, set this parameter to the name of your central database " "containing the phpMyAdmin configuration storage." msgstr "" -"如果此 phpMyAdmin 只有你自己使用，你可以用你当前的数据库来保存这些特殊的数据" -"表，这种情况下，你可以在 <tt>$cfg['Servers'][$i]['pmadb']</tt> 中填写当前数据" -"库的名字。若此 phpMyAdmin 作为多用户使用，请设为包含链接表的附加功能数据表的" -"专用数据库。" +"如果此 phpMyAdmin 只有你自己使用，你可以用你当前的数据库来保存这些特殊的数据表，这种情况下，你可以在 " +"<tt>$cfg['Servers'][$i]['pmadb']</tt> 中填写当前数据库的名字。若此 phpMyAdmin " +"作为多用户使用，请设为包含 phpMyAdmin 高级功能数据表的专用数据库。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:880 @@ -2219,10 +2195,9 @@ msgstr "要启用此功能:" #: ../phpmyadmin/Documentation.html:1005 ../phpmyadmin/Documentation.html:1045 #: ../phpmyadmin/Documentation.html:1077 ../phpmyadmin/Documentation.html:1154 #: ../phpmyadmin/Documentation.html:1169 -#, fuzzy msgid "" "set up <a href=\"#pmadb\">pmadb</a> and the phpMyAdmin configuration storage" -msgstr "设置好 <a href=\"#pmadb\">pmadb</a> 和链接表的附加功能" +msgstr "设置好 <a href=\"#pmadb\">pmadb</a> 和 phpMyAdmin 高级功能" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:887 @@ -2241,14 +2216,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:895 -#, fuzzy msgid "" "Since release 2.2.4 you can describe, in a special 'relation' table, which " "column is a key in another table (a foreign key). phpMyAdmin currently uses " "this to" msgstr "" -"自 2.2.4 起你可以在 'relation' 表的支持下定义一张表中的一个字段 (另一张表的外" -"键) 与另一张表的关系。目前 phpMyAdmin 用它来" +"自 2.2.4 起你可以在 'relation' 表的支持下定义一张表中的一个字段与另一张表的关系 (外键)。目前 phpMyAdmin 用它来" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:898 @@ -2343,14 +2316,13 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:933 -#, fuzzy msgid "" "Please note that in the current version, <tt>master_db</tt> must be the same " "as <tt>foreign_db</tt>. Those columns have been put in future development of " "the cross-db relations." msgstr "" -"请注意在当前版本中 <tt>master_db</tt> 必须和 <tt>foreign_db</tt> 一致。这两个" -"字段是为以后增加跨数据库关系预留的。" +"请注意在当前版本中 <tt>master_db</tt> 必须和 <tt>foreign_db</tt> " +"一致。这两个字段是为后期跨数据库关系开发预留的。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:939 @@ -2381,25 +2353,22 @@ msgstr "这张表的名字将被保存在此变量中。要启用此功能:" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:948 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. " "'pma_table_info')" -msgstr "在 <tt>$cfg['Servers'][$i]['table_info']</tt> 中设置要使用的数据表名" +msgstr "" +"在 <tt>$cfg['Servers'][$i]['table_info']</tt> 中设置要使用的数据表名 " +"(如：'pma_table_info')" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:951 -#, fuzzy msgid "" "then for each table where you want to use this feature, click "" "Structure/Relation view/Choose column to display" to choose the column." -msgstr "" -"对每一张你要使用这些功能的数据表，点击"结构/关系查看/选择要显示的字段" -""设置好显示的字段。" +msgstr "对每一张你要使用此功能的数据表，点击"结构/关系查看/选择要显示的字段"设置好显示的字段。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:955 -#, fuzzy msgid "Usage tip: <a href=\"#faqdisplay\">Display column</a>." msgstr "使用技巧: <a href=\"#faqdisplay\">显示字段</a>。" @@ -2507,11 +2476,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1006 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. " "'pma_column_info')" -msgstr "在 <tt>$cfg['Servers'][$i]['column_info']</tt> 中设置要使用的数据表名" +msgstr "" +"在 <tt>$cfg['Servers'][$i]['column_info']</tt> 中设置要使用的数据表名 " +"(如：'pma_column_info')" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1009 @@ -2587,11 +2557,10 @@ msgstr "查询历史仅在浏览器启用 JavaScript 时可用。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1046 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['history']</tt> (e.g. " "'pma_history')" -msgstr "在 <tt>$cfg['Servers'][$i]['history']</tt> 中设置要使用的数据表名" +msgstr "在 <tt>$cfg['Servers'][$i]['history']</tt> 中设置要使用的数据表名 (如：'pma_history')" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1053 @@ -2651,21 +2620,20 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1078 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. " "'pma_tracking')" -msgstr "在 <tt>$cfg['Servers'][$i]['tracking']</tt> 中设置要使用的数据表名" +msgstr "" +"在 <tt>$cfg['Servers'][$i]['tracking']</tt> 中设置要使用的数据表名 (如：'pma_tracking')" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1083 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]" "['tracking_version_auto_create']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_auto_create\">$cfg['Servers'][$i]" -"['tracking_version_auto_create']</span> 布尔" +"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]['tra" +"cking_version_auto_create']</span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1086 @@ -2731,71 +2699,60 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1114 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]" "['tracking_add_drop_view']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_view\">$cfg['Servers'][$i]" -"['tracking_version_drop_view']</span> 布尔" +"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]['tracking_" +"add_drop_view']</span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1117 -#, fuzzy msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view. Default value is true." -msgstr "" -"设置当记录视图创建时，是否在前面加上 DROP VIEW IF EXISTS 命令。默认为 true 。" +msgstr "设置当记录视图创建时，是否在日志首行加上 DROP VIEW IF EXISTS 语句。默认为 true 。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1123 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]" "['tracking_add_drop_table']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_table\">$cfg['Servers'][$i]" -"['tracking_version_drop_table']</span> 布尔" +"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]['tracking" +"_add_drop_table']</span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1126 -#, fuzzy msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table. Default value is true." -msgstr "" -"设置当记录数据表创建时，是否在前面加上 DROP TABLE IF EXISTS 命令。默认为 " -"true 。" +msgstr "设置当记录数据表创建时，是否在日志首行加上 DROP TABLE IF EXISTS 语句。默认为 true 。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1131 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]" "['tracking_add_drop_database']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_database\">$cfg['Servers'][$i]" -"['tracking_version_drop_database']</span> 布尔" +"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]['track" +"ing_add_drop_database']</span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1134 -#, fuzzy msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database. Default value is true." -msgstr "" -"设置当记录数据库创建时，是否在前面加上 DROP DATABASE IF EXISTS 命令。默认为 " -"true 。" +msgstr "设置当记录数据库创建时，是否在日志首行加上 DROP DATABASE IF EXISTS 语句。默认为 true 。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1139 -#, fuzzy msgid "" "<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " "string" msgstr "" -"<span id=\"cfg_Servers_user\">$cfg['Servers'][$i]['user']</span> 字符串" +"<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " +"字符串" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1142 @@ -2817,9 +2774,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1156 -#, fuzzy msgid "put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt>" -msgstr "在 <tt>$cfg['Servers'][$i]['relation']</tt> 中设置要使用的数据表名" +msgstr "在 <tt>$cfg['Servers'][$i]['userconfig']</tt> 中设置要使用的数据表名" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1161 @@ -2839,12 +2795,12 @@ msgstr "自 2.10.0 起可以通过设计器可视化地管理关系。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1170 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. " "'pma_designer_coords')" msgstr "" -"在 <tt>$cfg['Servers'][$i]['designer_coords']</tt> 中设置要使用的数据表名" +"在 <tt>$cfg['Servers'][$i]['designer_coords']</tt> 中设置要使用的数据表名 " +"(如：'pma_designer_coords')" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1175 @@ -2930,13 +2886,10 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1202 -#, fuzzy msgid "" "If your rule order is empty, then <abbr title=\"Internet Protocol\">IP</" "abbr> authorization is disabled." -msgstr "" -"若不指定规则顺序，<abbr title=\"互联网协议 (Internet Protocol)\">IP</abbr> 认" -"证将不可用。" +msgstr "若不指定规则顺序，<abbr title=\"互联网协议 (Internet Protocol)\">IP</abbr> 认证将不可用。" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1205 @@ -3363,9 +3316,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1335 -#, fuzzy msgid "$cfg['MemoryLimit'] string [number of bytes]" -msgstr "$cfg['MemoryLimit'] 整数 [单位: 字节]" +msgstr "$cfg['MemoryLimit'] 字符串 [单位: 字节]" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1336 @@ -9052,7 +9004,7 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:3772 msgid "Using phpMyAdmin" -msgstr "" +msgstr "使用 phpMyAdmin" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3775 @@ -9061,6 +9013,8 @@ msgid "" "create a table - MySQL brings up a <abbr title=\"structured query language" "\">SQL</abbr>-error. </a>" msgstr "" +"<a href=\"#faq6_1\">6.1 我插入不了数据到表中 / 我创建不了数据表 - MySQL 提示 <abbr title=\"结构化查询语言 " +"(structured query language)\">SQL</abbr> 错误。 </a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3779 @@ -9068,28 +9022,30 @@ msgid "" "Examine the <abbr title=\"structured query language\">SQL</abbr> error with " "care. Often the problem is caused by specifying a wrong column-type." msgstr "" +"仔细检查 <abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> " +"错误。这个问题通常是因为指定了错误的字段类型。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3781 msgid "Common errors include:" -msgstr "" +msgstr "常见错误有:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3784 msgid "Using <tt>VARCHAR</tt> without a size argument" -msgstr "" +msgstr "不给 <tt>VARCHAR</tt> 设置大小参数" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3785 msgid "Using <tt>TEXT</tt> or <tt>BLOB</tt> with a size argument" -msgstr "" +msgstr "给 <tt>TEXT</tt> 或 <tt>BLOB</tt> 设置大小参数" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3788 msgid "" "Also, look at the syntax chapter in the MySQL manual to confirm that your " "syntax is correct." -msgstr "" +msgstr "同时，请参考 MySQL 手册中语法一章确定你的语法都正确。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3793 @@ -9097,6 +9053,7 @@ msgid "" "<a href=\"#faq6_2\">6.2 When I create a table, I set an index for two " "columns and phpMyAdmin generates only one index with those two columns. </a>" msgstr "" +"<a href=\"#faq6_2\">6.2 建表时，我给两个字段设置了索引，但 phpMyAdmin 却创建了一个包含这两个字段的索引。 </a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3798 @@ -9104,13 +9061,13 @@ msgid "" "This is the way to create a multi-columns index. If you want two indexes, " "create the first one when creating the table, save, then display the table " "properties and click the Index link to create the other index." -msgstr "" +msgstr "这是一种创建多字段索引的方法。如果你需要两个索引，在建表时先设置一个，保存，然后显示数据表属性并点击索引链接来创建另一个索引。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3805 msgid "" "<a href=\"#faq6_3\">6.3 How can I insert a null value into my table?</a>" -msgstr "" +msgstr "<a href=\"#faq6_3\">6.3 怎样向我的表中插入一个空 (null) 值？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3807 @@ -9121,11 +9078,14 @@ msgid "" "real NULL value, so if you enter "NULL" this means you want a " "literal NULL in the column, and not a NULL value (this works in PHP4)." msgstr "" +"自 2.2.3 版起，每个字段都有一个复选框来设置字段是否为空。 2.2.3 之前，你只能输入 " +""null"，不包括引号来作为字段的值。自 2.5.5 版起，你可以使用复选框来获得一个真正的空 (NULL) 值，如果你输入 " +""NULL" 将表示文字 NULL，而不是空 (NULL) 值 (对 PHP4 同样有效)。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3815 msgid "<a href=\"#faq6_4\">6.4 How can I backup my database or table?</a>" -msgstr "" +msgstr "<a href=\"#faq6_4\">6.4 怎样备份我的数据库或数据表？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3817 @@ -9136,6 +9096,9 @@ msgid "" "\"structured query language\">SQL</abbr> statements that can be used to " "recreate your database/table." msgstr "" +"在左侧框架中点击数据库或表名，将会显示它们的属性。然后在菜单上点击 "导出"，你可以转储结构和/或数据。该功能将生成标准 " +"<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> " +"语句以便重新创建你的数据库/表。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3822 @@ -9146,13 +9109,16 @@ msgid "" "href=\"#cfg_ExecTimeLimit\" class=\"configrule\">$cfg['ExecTimeLimit']</a> " "configuration variable." msgstr "" +"若选择 "保存为文件"，phpMyAdmin 即可将转储结果直接提供下载。取决于 PHP 的配置，你还能看见压缩选项。同时请参见 " +"<a href=\"#cfg_ExecTimeLimit\" class=\"configrule\">$cfg['ExecTimeLimit']</a> " +"配置变量。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3828 msgid "" "For additional help on this subject, look for the word "dump" in " "this document." -msgstr "" +msgstr "要获得更多关于该主题的帮助，请在本文档中查找 "转储" 。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3832 @@ -9160,6 +9126,7 @@ msgid "" "<a href=\"#faq6_5\">6.5 How can I restore (upload) my database or table " "using a dump? How can I run a ".sql" file? </a>" msgstr "" +"<a href=\"#faq6_5\">6.5 怎样通过转储恢复 (上传) 我的数据库或表？怎样运行一个 ".sql" 文件？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3836 @@ -9171,27 +9138,30 @@ msgid "" ""Location of the text file" section, type in the path to your dump " "filename, or use the Browse button. Then click Go." msgstr "" +"在左侧框架中点击数据库或表名，将会显示它们的属性。在右手边框架中的标签列表中选择 "导入" (或 "<abbr " +"title=\"结构化查询语言 (structured query language)\">SQL</abbr>" 如果你的 phpMyAdmin " +"版本低于 2.7.0)。在 "文本文件的位置" 中输入你的转储文件名，或使用浏览按钮。然后点击执行。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3842 msgid "" "With version 2.7.0, the import engine has been re–written, if possible " "it is suggested that you upgrade to take advantage of the new features." -msgstr "" +msgstr "2.7.0 版的导入功能已经重写了，建议尽可能升级以使用新功能。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3845 msgid "" "For additional help on this subject, look for the word "upload" in " "this document." -msgstr "" +msgstr "要获得更多关于该主题的帮助，请在本文档中查找 "上传" 。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3850 msgid "" "<a href=\"#faq6_6\">6.6 How can I use the relation table in Query-by-example?" "</a>" -msgstr "" +msgstr "<a href=\"#faq6_6\">6.6 怎样在依例查询 (Query-by-example) 中使用关系表？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3852 @@ -9201,6 +9171,8 @@ msgid "" "create it as explained in the configuration section. Then create the example " "tables:" msgstr "" +"下面用数据库 mydb 中的数据表 persons、towns 和 countries 来举例。如果你没有 <tt>pma_relation</tt> " +"表，请先根据设置一节中的说明创建。然后创建示范表:" #. type: Content of: <html><body><div><pre> #: ../phpmyadmin/Documentation.html:3858 @@ -9234,22 +9206,49 @@ msgid "" "INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" "INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" msgstr "" +"CREATE TABLE REL_countries (\n" +" country_code char(1) NOT NULL default '',\n" +" description varchar(10) NOT NULL default '',\n" +" PRIMARY KEY (country_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_countries VALUES ('C', 'Canada');\n" +"\n" +"CREATE TABLE REL_persons (\n" +" id tinyint(4) NOT NULL auto_increment,\n" +" person_name varchar(32) NOT NULL default '',\n" +" town_code varchar(5) default '0',\n" +" country_code char(1) NOT NULL default '',\n" +" PRIMARY KEY (id)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');\n" +"INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');\n" +"\n" +"CREATE TABLE REL_towns (\n" +" town_code varchar(5) NOT NULL default '0',\n" +" description varchar(30) NOT NULL default '',\n" +" PRIMARY KEY (town_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" +"INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3887 msgid "To setup appropriate links and display information:" -msgstr "" +msgstr "设置对应连接并显示信息:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3889 msgid "on table "REL_persons" click Structure, then Relation view" -msgstr "" +msgstr "在表 "REL_persons" 上点击结构、关系查看" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3890 msgid "" "in Links, for "town_code" choose "REL_towns->code"" -msgstr "" +msgstr "在关系中，"town_code" 选择 "REL_towns->code"" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3891 @@ -9257,72 +9256,73 @@ msgid "" "in Links, for "country_code" choose "REL_countries->" "country_code"" msgstr "" +"在关系中，"country_code" 选择 "REL_countries->country_code"" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3892 msgid "on table "REL_towns" click Structure, then Relation view" -msgstr "" +msgstr "在表 "REL_towns" 上点击结构、关系查看" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3893 msgid "in "Choose column to display", choose "description"" -msgstr "" +msgstr "在 "选择要显示的字段" 上选择 "description"" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3894 msgid "repeat the two previous steps for table "REL_countries"" -msgstr "" +msgstr "在表 "REL_countries" 中重复以上两步" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3897 msgid "Then test like this:" -msgstr "" +msgstr "测试步骤如下:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3899 msgid "Click on your db name in the left frame" -msgstr "" +msgstr "在左侧框架中点击你的数据库名" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3900 msgid "Choose "Query"" -msgstr "" +msgstr "选择 "查询"" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3901 msgid "Use tables: persons, towns, countries" -msgstr "" +msgstr "使用表: persons、towns、countries" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3902 msgid "Click "Update query"" -msgstr "" +msgstr "点击 "更新查询"" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3903 msgid "" "In the columns row, choose persons.person_name and click the "" "Show" tickbox" -msgstr "" +msgstr "在字段行中，选择 persons.person_name 并选中 "显示" 复选框" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3905 msgid "" "Do the same for towns.description and countries.descriptions in the other 2 " "columns" -msgstr "" +msgstr "为 towns.description 和 countries.descriptions 在另两列中重复上一步" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3907 msgid "" "Click "Update query" and you will see in the query box that the " "correct joins have been generated" -msgstr "" +msgstr "点击 "更新查询" 你就能在查询框中看到已生成的 join 语句" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3909 msgid "Click "Submit query"" -msgstr "" +msgstr "点击 "提交查询"" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3913 @@ -10185,13 +10185,13 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4325 msgid "phpMyAdmin project" -msgstr "" +msgstr "phpMyAdmin 项目" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4328 msgid "" "<a href=\"#faq7_1\">7.1 I have found a bug. How do I inform developers?</a>" -msgstr "" +msgstr "<a href=\"#faq7_1\">7.1 我发现了一个缺陷。怎样向开发者报告？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4330 @@ -10199,28 +10199,29 @@ msgid "" "Our Bug Tracker is located at <a href=\"http://sf.net/projects/phpmyadmin/" "\">http://sf.net/projects/phpmyadmin/</a> under the Bugs section." msgstr "" +"我们的缺陷追踪器位于 <a href=\"http://sf.net/projects/phpmyadmin/\">http://sf.net/projec" +"ts/phpmyadmin/</a> 的 Bugs 功能块。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4334 msgid "But please first discuss your bug with other users:" -msgstr "" +msgstr "但请先和其他用户讨论你发现的问题:" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4335 -#, fuzzy msgid "" "<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> https://" "sourceforge.net/projects/phpmyadmin/forums</a>." msgstr "" -"<a href=\"https://sourceforge.net/projects/phpmyadmin/\"> phpMyAdmin 在 " -"SourceForge.net 的项目页 (英语)</a>" +"<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> " +"https://sourceforge.net/projects/phpmyadmin/forums</a>。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4340 msgid "" "<a href=\"#faq7_2\">7.2 I want to translate the messages to a new language " "or upgrade an existing language, where do I start?</a>" -msgstr "" +msgstr "<a href=\"#faq7_2\">7.2 怎样开始翻译一个新的语言或更新现有的语言？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4343 @@ -10236,6 +10237,12 @@ msgid "" "on <a href=\"http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators" "\">our wiki</a>." msgstr "" +"永远使用最新的 Git 版本的 po 文件来翻译。你也可以选择在我们的<a " +"href=\"http://l10n.cihar.com/\">翻译服务器</a>在线翻译，也可在此获得最新的 po 文件并与你的翻译合并。使用 " +"<code>po/phpmyadmin.pot</code> 生成 <code>po/语言代码.po</code> 即可为你的语言创建新的翻译 " +"(可以使用 <code>msginit -i po/phpmyadmin.pot -l 语言代码 --no-translator -o " +"po/语言代码.po</code>) 或通过邮件列表寻求在 web 界面上添加翻译。更多详细信息请见<a href=\"http://wiki.phpmy" +"admin.net/pma/Devel:Gettext_for_translators\">我们的维基</a>。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4354 @@ -10246,6 +10253,8 @@ msgid "" "However there are some entities that need to be there: quotes, non-breakable " "spaces, ampersands, less than, greater than." msgstr "" +"请注意自从我们对文件定义了正确的编码后，我们尝试不在翻译中使用诸如 &eacute; 的 HTML 实体。若使用 HTML " +"实体，JavaScript 消息中的文本将可能不能正确显示。不论怎样有些实体还是必需的: 引号、不可分空格、& 符号、小于号、大于号。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4362 @@ -10254,6 +10263,8 @@ msgid "" "characters, on the sourceforge.net <a href=\"https://sourceforge.net/" "tracker/?group_id=23067&atid=387645\">translation tracker.</a>" msgstr "" +"然后你可以将你的翻译，或者打包压缩成 zip 文件来避免丢失特殊字符，放在 sourceforge.net 的<a href=\"https://sour" +"ceforge.net/tracker/?group_id=23067&atid=387645\">翻译追踪器</a>上。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4366 @@ -10263,6 +10274,8 @@ msgid "" "translators</a> mailing list, because this is where we ask for translations " "of new messages." msgstr "" +"你还可以订阅 <a href=\"https://lists.sourceforge.net/lists/listinfo/phpmyadmin-" +"translators\">phpMyAdmin 翻译</a> 邮件列表，当我们有新文本需要翻译时就会在那发出通知。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4371 @@ -10279,23 +10292,32 @@ msgid "" "our <a href=\"https://sourceforge.net/tracker/?group_id=23067&" "atid=387645\">translation tracker</a>." msgstr "" +"文档是通过 po4a 和 gettext 翻译的 (参见<a " +"href=\"http://www.phpmyadmin.net/home_page/docs.php\">文档</a>查看现有的翻译) 。要开始翻译，先从 " +"Git 检出 <a href=\"http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpm" +"yadmin/localized_docs;a=tree;f=po\"><code>localized_docs/po</code></a>，或者直接到<" +"a " +"href=\"https://l10n.cihar.com/projects/pmadoc/\">翻译服务器</a>在线翻译。如果没有找到你的语言，请联系 " +"<a href=\"mailto:michal@cihar.com\">Michal Čihař</a>; " +"他会加上。如果你更喜欢直接翻译 po 文件，请将翻译好的文件放在我们的<a href=\"https://sourceforge.net/tracker/" +"?group_id=23067&atid=387645\">翻译追踪器</a>上。" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4383 msgid "" "<a href=\"#faq7_3\">7.3 I would like to help out with the development of " "phpMyAdmin. How should I proceed?</a>" -msgstr "" +msgstr "<a href=\"#faq7_3\">7.3 怎样帮助开发 phpMyAdmin ？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4386 msgid "The following method is preferred for new developers:" -msgstr "" +msgstr "对新开发者推荐以下方式:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4388 msgid "fetch the current git repository over anonymous git:" -msgstr "" +msgstr "通过匿名方式获取当前 git 库:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4389 @@ -10303,16 +10325,18 @@ msgid "" "<tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/" "phpmyadmin</tt>" msgstr "" +"<tt>git clone " +"git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4392 msgid "add your stuff" -msgstr "" +msgstr "添加你的内容" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4393 msgid "generate patch with your changes: <tt>git diff > xxx.diff</tt>" -msgstr "" +msgstr "生成你的补丁: <tt>git diff > xxx.diff</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4396 @@ -10320,6 +10344,8 @@ msgid "" "submit your patch via the <a href=\"https://sourceforge.net/tracker/?" "group_id=23067&atid=377410\">patch tracker of the phpMyAdmin project</a>." msgstr "" +"通过 <a href=\"https://sourceforge.net/tracker/?group_id=23067&atid=377410\"" +">phpMyAdmin 项目的补丁追踪器</a>提交你的补丁。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4402 @@ -10327,19 +10353,21 @@ msgid "" "More details on git are available on <a href=\"http://wiki.phpmyadmin.net/" "pma/Devel:Git\">our wiki</a>." msgstr "" +"更多关于 git 的详细信息请见<a " +"href=\"http://wiki.phpmyadmin.net/pma/Devel:Git\">我们的维基</a>。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4404 msgid "" "Write access to the repository is granted only to experienced developers who " "have already contributed something useful to phpMyAdmin." -msgstr "" +msgstr "库的写入权限仅授予给那些对 phpMyAdmin 作出大量贡献且富有经验的开发者。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4406 msgid "" "Also, have a look at the <a href=\"#developers\">Developers section</a>." -msgstr "" +msgstr "同时，请看一下<a href=\"#developers\">开发</a>一节。" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4408 @@ -10351,7 +10379,7 @@ msgstr "安全" msgid "" "<a href=\"#faq8_1\">8.1 Where can I get information about the security " "alerts issued for phpMyAdmin?</a>" -msgstr "" +msgstr "<a href=\"#faq8_1\">8.1 哪里可以了获取 phpMyAdmin 的安全公告信息？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4413 @@ -10359,13 +10387,15 @@ msgid "" "Please refer to <a href=\"http://www.phpmyadmin.net/home_page/security.php" "\">http://www.phpmyadmin.net/home_page/security.php</a>" msgstr "" +"请参见 <a href=\"http://www.phpmyadmin.net/home_page/security.php\">http://www.ph" +"pmyadmin.net/home_page/security.php</a>" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4418 msgid "" "<a href=\"#faq8_2\">8.2 How can I protect phpMyAdmin against brute force " "attacks?</a>" -msgstr "" +msgstr "<a href=\"#faq8_2\">8.2 怎样保护 phpMyAdmin 防止暴力破解？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4420 @@ -10374,21 +10404,22 @@ msgid "" "authentication to the Apache environment and it can be used in Apache logs. " "Currently there are two variables available:" msgstr "" +"如果你使用 Apache 服务器，phpMyAdmin 会导出认证信息到 Apache 环境并可被 Apache 日志使用。目前有两个变量可用:" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:4425 msgid "<code>userID</code>" -msgstr "" +msgstr "<code>userID</code>" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:4426 msgid "User name of currently active user (he does not have to be logged in)." -msgstr "" +msgstr "当前活动用户的用户名 (他不一定需要登录)。" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:4428 msgid "<code>userStatus</code>" -msgstr "" +msgstr "<code>userStatus</code>" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:4429 @@ -10399,11 +10430,14 @@ msgid "" "denied in configuration), <code>empty-denied</code> (empty password is " "denied)." msgstr "" +"当前活动用户的状态，有 <code>ok</code> (用户已登录)、<code>mysql-denied</code> (MySQL " +"拒绝用户登录)、<code>allow-denied</code> (用户被允许/禁止规则禁止)、<code>root-denied</code> " +"(root 用户登录在配置文件中被禁止)、<code>empty-denied</code> (禁止空密码登录) 这几种状态。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4436 msgid "<code>LogFormat</code> directive for Apache can look like following:" -msgstr "" +msgstr "可以像这样设置 Apache 的 <code>LogFormat</code> 指令:" #. type: Content of: <html><body><div><pre> #: ../phpmyadmin/Documentation.html:4439 @@ -10412,25 +10446,27 @@ msgid "" "LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b \\\n" "\\\"%{Referer}i\\\" \\\"%{User-Agent}i\\\" %{userID}n %{userStatus}n\" pma_combined\n" msgstr "" +"LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b \\\n" +"\\\"%{Referer}i\\\" \\\"%{User-Agent}i\\\" %{userID}n %{userStatus}n\" pma_combined\n" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4443 msgid "" "You can then use any log analyzing tools to detect possible break-in " "attempts." -msgstr "" +msgstr "然后你可以使用任何日志分析工具来检测潜在的攻击。" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4447 msgid "Synchronization" -msgstr "" +msgstr "同步" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4449 msgid "" "<a href=\"#faq9_1\">9.1 How can I synchronize two databases/tables in " "phpMyAdmin?</a>" -msgstr "" +msgstr "<a href=\"#faq9_1\">9.1 怎样在 phpMyAdmin 中同步两个数据库/表？</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4451 @@ -10441,6 +10477,8 @@ msgid "" "name of the database. Therefore you can now synchronize your databases " "placed on the same server or some remote server." msgstr "" +"你可以使用 phpMyAdmin 的同步功能同步数据库/表。该功能可以连接到本地或者远程服务器。但需要你输入服务器主机名、用户名、密码、端口和数据库名。" +"然后你就可以在相同或不同的服务器间同步数据库了。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4458 @@ -10451,6 +10489,8 @@ msgid "" "sync with another database. Other than the full database, certain tables of " "the databases can also be synchronized." msgstr "" +"该功能对需要复制数据库结构和数据的开发者们是很有帮助的。此外，该功能并不仅限于复制，还能帮助用户保持他们的数据库和另一个数据库同步。除了可以同步整个数据" +"库外，也可以只同步数据库的部分数据表。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4466 @@ -10461,6 +10501,8 @@ msgid "" "at the end. All the information other than the port needs to be filled " "explicitly for the source as well as target servers." msgstr "" +"你需要填写服务器的主机名、MySQL 中已存在的用户名和密码。端口默认是 3306 (MySQL " +"默认端口)。最后是数据库名。源数据库和目标数据库除了端口外的信息都要填写准确。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4474 @@ -10468,7 +10510,7 @@ msgid "" "After successfully passing through the authentication phase, the source and " "target database table names will be displayed. It will be a tabular " "representation." -msgstr "" +msgstr "在成功通过认证阶段后，将会以表格形式显示出源和目标数据库中的数据表名。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4480 @@ -10480,6 +10522,8 @@ msgid "" "are not preceded by a <code>+</code> sign are already present in the target " "database." msgstr "" +"在左侧会列出源数据库中的表。部分表的名字前会有一个 <code>+</code> " +"加号。表示这些表仅在源数据库中存在并且需要在同步到目标数据库时添加到目标数据库。名字前没有 <code>+</code> 加号的表已存在于目标数据库中。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4489 @@ -10493,6 +10537,9 @@ msgid "" "database. The column in the middle shows the difference between the source " "and target corresponding tables." msgstr "" +"在左侧会列出目标数据库中的表。部分表的名字后会有 <code>(未找到)</code> " +"字样。表示这些表将在与源数据库同步时添加到目标数据库。部分表的名字前会有一个 <code>-</code> " +"减号。表示这些表仅在目标数据库中存在并且不会被修改。位于中间的一列表示源/目标对应表之间的区别。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4500 @@ -10502,6 +10549,8 @@ msgid "" "date. By clicking on them, they will turn grey, what means that they will be " "synchronized." msgstr "" +"红色 <tt>S</tt> 和绿色 <tt>D</tt> 按钮表示结构 (S) 或数据 (D) " +"是否需要更新。当点击按钮时，它们将变成灰色，表示相应表将会被同步。" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:4506 @@ -10580,6 +10629,8 @@ msgid "" "\"#cfg_Error_Handler_display\">$cfg['Error_Handler']['display']</a></code> " "configuration directive." msgstr "" +"请通过 <code><a href=\"#cfg_Error_Handler_display\">$cfg['Error_Handler']['displa" +"y']</a></code> 指令开启显示 PHP 错误和警告。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4535 @@ -10600,6 +10651,9 @@ msgid "" "<code>scripts/generate-mo</code>, which generates binary files read by " "Gettext." msgstr "" +"请使用 gettext 调用所有文本 (<code>__('文本')</code> 或 <code>_ngettext()</code> 函数)。 " +"若需要翻译，运行 <code>scripts/update-po</code> 脚本。要使用已翻译的文本，运行 <code>scripts" +"/generate-mo</code>，即可生成 Gettext 所需的二进制文件。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4544 @@ -10631,9 +10685,7 @@ msgid "" "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." -msgstr "" -"纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人" -"民牺牲的勇敢的人们。" +msgstr "纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及为了地球人民牺牲的勇敢的人们。" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:4557 @@ -10642,7 +10694,7 @@ msgstr "版权" #. type: Content of: <html><body><div><pre> #: ../phpmyadmin/Documentation.html:4560 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" "Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" @@ -10656,14 +10708,16 @@ msgid "" " [check <a href=\"#credits\">credits</a> for more details]\n" msgstr "" "版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" -"版权所有 (C) 2001-2009 Marc Delisle <marc_at_infomarc.info>\n" +"版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" -" Robin Johnson <robbat2_at_users.sourceforge.net>\n" +" Robin Johnson " +"<robbat2_at_users.sourceforge.net>\n" " Alexander M. Turek <me_at_derrabus.de>\n" -" Michal Čihař <michal_at_cihar.com>\n" +" Michal Čihař <michal_at_cihar.com>\n" " Garvin Hicking <me_at_supergarv.de>\n" " Michael Keck <mkkeck_at_users.sourceforge.net>\n" -" Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" +" Sebastian Mendel " +"<cybot_tm_at_users.sourceforge.net>\n" " [更多信息请参见<a href=\"#credits\">鸣谢</a>]\n" #. #-#-#-#-# zh_CN-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-# @@ -10819,171 +10873,171 @@ msgstr "Robin Johnson <robbat2_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4632 msgid "database maintenance controls" -msgstr "" +msgstr "数据库维护功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4633 msgid "table type code" -msgstr "" +msgstr "数据表类型代码" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4634 msgid "" "Host authentication <abbr title=\"Internet Protocol\">IP</abbr> Allow/Deny" -msgstr "" +msgstr "主机认证 <abbr title=\"互联网协议 (Internet Protocol)\">IP</abbr> 允许/禁止" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4635 msgid "DB-based configuration (Not completed)" -msgstr "" +msgstr "基于数据库的配置 (未完成)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4636 msgid "" "<abbr title=\"structured query language\">SQL</abbr> parser and pretty-" "printer" -msgstr "" +msgstr "<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> 解析器和语法高亮" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4637 msgid "<abbr title=\"structured query language\">SQL</abbr> validator" -msgstr "" +msgstr "<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> 校验器" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4641 msgid "Armel Fauveau <armel.fauveau_at_globalis-ms.com>" -msgstr "" +msgstr "Armel Fauveau <armel.fauveau_at_globalis-ms.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4643 msgid "bookmarks feature" -msgstr "" +msgstr "书签功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4644 msgid "multiple dump feature" -msgstr "" +msgstr "多转储功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4645 msgid "gzip dump feature" -msgstr "" +msgstr "gzip 转储功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4646 msgid "zip dump feature" -msgstr "" +msgstr "zip 转储功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4649 msgid "Geert Lund <glund_at_silversoft.dk>" -msgstr "" +msgstr "Geert Lund <glund_at_silversoft.dk>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4651 msgid "various fixes" -msgstr "" +msgstr "缺陷修正" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4652 msgid "moderator of the phpMyAdmin former users forum at phpwizard.net" -msgstr "" +msgstr "phpMyAdmin 早期在 phpwizard.net 的用户论坛版主" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4655 msgid "Korakot Chaovavanich <korakot_at_iname.com>" -msgstr "" +msgstr "Korakot Chaovavanich <korakot_at_iname.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4657 msgid ""insert as new row" feature" -msgstr "" +msgstr ""以新行插入" 功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4660 msgid "Pete Kelly <webmaster_at_trafficg.com>" -msgstr "" +msgstr "Pete Kelly <webmaster_at_trafficg.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4662 msgid "rewrote and fix dump code" -msgstr "" +msgstr "重写并修复转储代码" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4663 ../phpmyadmin/Documentation.html:4670 #: ../phpmyadmin/Documentation.html:4676 msgid "bugfixes" -msgstr "" +msgstr "缺陷修正" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4666 msgid "Steve Alberty <alberty_at_neptunlabs.de>" -msgstr "" +msgstr "Steve Alberty <alberty_at_neptunlabs.de>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4668 msgid "rewrote dump code for PHP4" -msgstr "" +msgstr "重写 PHP4 的转储代码" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4669 msgid "mySQL table statistics" -msgstr "" +msgstr "MySQL 数据表统计" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4673 msgid "Benjamin Gandon <gandon_at_isia.cma.fr>" -msgstr "" +msgstr "Benjamin Gandon <gandon_at_isia.cma.fr>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4675 msgid "main author of the version 2.1.0.1" -msgstr "" +msgstr "2.1.0.1 版的主要作者" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4679 msgid "Alexander M. Turek <me_at_derrabus.de>" -msgstr "" +msgstr "Alexander M. Turek <me_at_derrabus.de>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4681 msgid "MySQL 4.0 / 4.1 / 5.0 compatibility" -msgstr "" +msgstr "MySQL 4.0 / 4.1 / 5.0 兼容" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4682 msgid "abstract database interface (PMA_DBI) with MySQLi support" -msgstr "" +msgstr "抽象数据库接口 (PMA_DBI) 并支持 MySQLi" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4683 msgid "privileges administration" -msgstr "" +msgstr "权限管理" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4684 msgid "<abbr title=\"Extensible Markup Language\">XML</abbr> exports" -msgstr "" +msgstr "导出为 <abbr title=\"可扩展标记语言 (Extensible Markup Language)\">XML</abbr>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4685 ../phpmyadmin/Documentation.html:4701 msgid "various features and fixes" -msgstr "" +msgstr "许多缺陷修正和改进" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4686 msgid "German language file updates" -msgstr "" +msgstr "德语语言文件更新" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4689 msgid "Mike Beck <mike.beck_at_web.de>" -msgstr "" +msgstr "Mike Beck <mike.beck_at_web.de>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4691 msgid "automatic joins in QBE" -msgstr "" +msgstr "自动加入依例查询 (QBE)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4692 @@ -10998,27 +11052,27 @@ msgstr "关系查看" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4696 msgid "Michal Čihař <michal_at_cihar.com>" -msgstr "" +msgstr "Michal Čihař <michal_at_cihar.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4698 msgid "enhanced index creation/display feature" -msgstr "" +msgstr "增强索引创建/显示功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4699 msgid "feature to use a different charset for HTML than for MySQL" -msgstr "" +msgstr "让 HTML 与 MySQL 使用不同的字符集" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4700 msgid "improvements of export feature" -msgstr "" +msgstr "改进导出功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4702 msgid "Czech language file updates" -msgstr "" +msgstr "捷克语语言文件更新" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4705 @@ -11030,17 +11084,17 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4708 msgid "suggested the patch for multiple table printviews" -msgstr "" +msgstr "多表打印预览补丁" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4711 msgid "Garvin Hicking <me_at_supergarv.de>" -msgstr "" +msgstr "Garvin Hicking <me_at_supergarv.de>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4713 msgid "built the patch for vertical display of table rows" -msgstr "" +msgstr "垂直显示记录补丁" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4714 @@ -11048,26 +11102,28 @@ msgid "" "built the Javascript based Query window + <abbr title=\"structured query " "language\">SQL</abbr> history" msgstr "" +"基于 Javascript 的查询窗口 + <abbr title=\"结构化查询语言 (structured query " +"language)\">SQL</abbr> 历史功能" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4715 msgid "Improvement of column/db comments" -msgstr "" +msgstr "改进字段/数据库注释" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4716 msgid "(MIME)-Transformations for columns" -msgstr "" +msgstr "类型转换" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4717 msgid "Use custom alias names for Databases in left frame" -msgstr "" +msgstr "在左侧框架中使用自定义的数据库别名" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4718 msgid "hierarchical/nested table display" -msgstr "" +msgstr "数据表分层/分组显示" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4719 @@ -11079,52 +11135,52 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4720 msgid "new icon sets" -msgstr "" +msgstr "新图标集" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4721 msgid "vertical display of column properties page" -msgstr "" +msgstr "字段属性页的垂直显示模式" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4722 msgid "some bugfixes, features, support, German language additions" -msgstr "" +msgstr "一些缺陷修正、功能、支持、德语语言增加" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4725 msgid "Yukihiro Kawada <kawada_at_den.fujifilm.co.jp>" -msgstr "" +msgstr "Yukihiro Kawada <kawada_at_den.fujifilm.co.jp>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4727 msgid "japanese kanji encoding conversion feature" -msgstr "" +msgstr "日本汉字编码转换功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4730 msgid "Piotr Roszatycki <d3xter_at_users.sourceforge.net> and Dan Wilson" -msgstr "" +msgstr "Piotr Roszatycki <d3xter_at_users.sourceforge.net> 和 Dan Wilson" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4732 msgid "the Cookie authentication mode" -msgstr "" +msgstr "Cookie 认证功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4735 msgid "Axel Sander <n8falke_at_users.sourceforge.net>" -msgstr "" +msgstr "Axel Sander <n8falke_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4737 msgid "table relation-links feature" -msgstr "" +msgstr "数据表关系连接功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4740 msgid "Maxime Delorme <delorme.maxime_at_free.fr>" -msgstr "" +msgstr "Maxime Delorme <delorme.maxime_at_free.fr>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4742 @@ -11139,62 +11195,62 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4747 msgid "Olof Edlund <olof.edlund_at_upright.se>" -msgstr "" +msgstr "Olof Edlund <olof.edlund_at_upright.se>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4749 msgid "<abbr title=\"structured query language\">SQL</abbr> validator server" -msgstr "" +msgstr "<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> 校验服务器" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4752 msgid "Ivan R. Lanin <ivanlanin_at_users.sourceforge.net>" -msgstr "" +msgstr "Ivan R. Lanin <ivanlanin_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4754 msgid "phpMyAdmin logo (until June 2004)" -msgstr "" +msgstr "phpMyAdmin logo (2004 年 6 月前)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4757 msgid "Mike Cochrane <mike_at_graftonhall.co.nz>" -msgstr "" +msgstr "Mike Cochrane <mike_at_graftonhall.co.nz>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4759 msgid "blowfish library from the Horde project" -msgstr "" +msgstr "Horde 项目的 blowfish 库" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4762 msgid "Marcel Tschopp <ne0x_at_users.sourceforge.net>" -msgstr "" +msgstr "Marcel Tschopp <ne0x_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4764 msgid "mysqli support" -msgstr "" +msgstr "mysqli 支持" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4768 msgid "Michael Keck <mkkeck_at_users.sourceforge.net>" -msgstr "" +msgstr "Michael Keck <mkkeck_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4770 msgid "redesign for 2.6.0" -msgstr "" +msgstr "重新设计 2.6.0" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4771 msgid "phpMyAdmin sailboat logo (June 2004)" -msgstr "" +msgstr "phpMyAdmin 帆船 logo (2004 年 6 月)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4774 msgid "Mathias Landhäußer" -msgstr "" +msgstr "Mathias Landhäußer" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4776 @@ -11204,138 +11260,137 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4779 msgid "Sebastian Mendel <cybot_tm_at_users.sourceforge.net>" -msgstr "" +msgstr "Sebastian Mendel <cybot_tm_at_users.sourceforge.net>" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4781 msgid "interface improvements" -msgstr "" +msgstr "界面改进" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4782 msgid "various bugfixes" -msgstr "" +msgstr "许多缺陷修正" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4785 msgid "Ivan A Kirillov" -msgstr "" +msgstr "Ivan A Kirillov" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4787 msgid "new relations Designer" -msgstr "" +msgstr "新的关系设计器" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4790 msgid "Raj Kissu Rajandran (Google Summer of Code 2008)" -msgstr "" +msgstr "Raj Kissu Rajandran (Google 代码之夏 2008)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4792 msgid "BLOBstreaming support" -msgstr "" +msgstr "BLOB 流支持" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4795 msgid "Piotr Przybylski (Google Summer of Code 2008 and 2010)" -msgstr "" +msgstr "Piotr Przybylski (Google 代码之夏 2008 和 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4797 msgid "improved setup script" -msgstr "" +msgstr "改进安装脚本" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4798 msgid "user preferences" -msgstr "" +msgstr "用户偏好" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4801 msgid "Derek Schaefer (Google Summer of Code 2009)" -msgstr "" +msgstr "Derek Schaefer (Google 代码之夏 2009)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4803 msgid "Improved the import system" -msgstr "" +msgstr "改进导入功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4806 msgid "Alexander Rutkowski (Google Summer of Code 2009)" -msgstr "" +msgstr "Alexander Rutkowski (Google 代码之夏 2009)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4808 msgid "Tracking mechanism" -msgstr "" +msgstr "结构追踪" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4811 msgid "Zahra Naeem (Google Summer of Code 2009)" -msgstr "" +msgstr "Zahra Naeem (Google 代码之夏 2009)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4813 msgid "Synchronization feature" -msgstr "" +msgstr "同步功能" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4816 msgid "Tomáš Srnka (Google Summer of Code 2009)" -msgstr "" +msgstr "Tomáš Srnka (Google 代码之夏 2009)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4818 msgid "Replication support" -msgstr "" +msgstr "复制支持" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4821 msgid "Muhammad Adnan (Google Summer of Code 2010)" -msgstr "" +msgstr "Muhammad Adnan (Google 代码之夏 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4823 msgid "Relation schema export to multiple formats" -msgstr "" +msgstr "导出关系大纲为多种格式" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4826 msgid "Lori Lee (Google Summer of Code 2010)" -msgstr "" +msgstr "Lori Lee (Google 代码之夏 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4828 -#, fuzzy msgid "User interface improvements" -msgstr "许多修正和改进" +msgstr "用户界面改进" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4829 msgid "ENUM/SET editor" -msgstr "" +msgstr "ENUM/SET 编辑器" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4830 msgid "Simplified interface for export/import" -msgstr "" +msgstr "简化导入/导出界面" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4833 msgid "Ninad Pundalik (Google Summer of Code 2010)" -msgstr "" +msgstr "Ninad Pundalik (Google 代码之夏 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4835 msgid "AJAXifying the interface" -msgstr "" +msgstr "界面 AJAX 化" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4838 msgid "Barrie Leslie" -msgstr "" +msgstr "Barrie Leslie" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4840 @@ -11347,7 +11402,7 @@ msgstr "" msgid "" "And also to the following people who have contributed minor changes, " "enhancements, bugfixes or support for a new language since version 2.1.0:" -msgstr "" +msgstr "以及自 2.1.0 版以来对功能修改、增强、缺陷修正和新语言支持作出贡献的人们:" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4851 @@ -11363,6 +11418,16 @@ msgid "" "Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, " ""Manuzhai"." msgstr "" +"Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita, " +"Péter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow, Mats " +"Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kläger, " +"Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg, Andreas " +"Pauley, Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval Sarna, " +"www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun, Peter Svec, " +"Michael Tacelosky, Rachim Tamsjadi, Kositer Uros, Luís V., Martijn W. " +"van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay, Ignacio Vazquez-" +"Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, " +""Manuzhai"." #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4864 @@ -12121,13 +12186,12 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: ../phpmyadmin/Documentation.html:5101 ../phpmyadmin/translators.html:462 -#, fuzzy msgid "" "Copyright © 2003 - 2010 <a href=\"http://www.phpmyadmin.net/home_page/" "team.php\">phpMyAdmin devel team</a>" msgstr "" -"版权所有 © 2003 - 2009 <a href=\"http://www.phpmyadmin.net/home_page/" -"team.php\">phpMyAdmin 开发组 (英语)</a>" +"版权所有 © 2003 - 2010 <a " +"href=\"http://www.phpmyadmin.net/home_page/team.php\">phpMyAdmin 开发组</a>" #. type: Content of: <html><body><ul><li> #: ../phpmyadmin/Documentation.html:5102 ../phpmyadmin/translators.html:463 @@ -12655,13 +12719,12 @@ msgstr "Albert Fazlí (amichauer(a)gmx.de)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:425 msgid "Telugu" -msgstr "" +msgstr "泰卢固语" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:427 -#, fuzzy msgid "veeven (veeven(a)gmail.com)" -msgstr "Sven-Erik Andersen (sven.erik.andersen(a)gmail.com)" +msgstr "veeven (veeven(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:432 @@ -12701,37 +12764,33 @@ msgstr "Abdurashid Muhitdinov (cool_zero(a)list.ru" #. type: Content of: <html><body><h1> #: output/zh_CN/index-full-template.html:7 #: output/zh_CN/index-full-template.html:10 -#, fuzzy msgid "phpMyAdmin Simplified Chinese Documentation" -msgstr "phpMyAdmin 3.4.0-dev - 文档" +msgstr "phpMyAdmin 简体中文文档" #. type: Content of: <html><body><p> #: output/zh_CN/index-full-template.html:11 msgid "Documents translated to Simplified Chinese:" -msgstr "" +msgstr "已翻译为简体中文的文件:" #. type: Content of: <html><body><ul><li> #: output/zh_CN/index-full-template.html:13 -#, fuzzy msgid "<a href=\"INSTALL\">INSTALL</a>" -msgstr "<a href=\"LICENSE\">授权</a>" +msgstr "<a href=\"INSTALL\">安装</a>" #. type: Content of: <html><body><ul><li> #: output/zh_CN/index-full-template.html:14 msgid "<a href=\"TODO\">TODO</a>" -msgstr "" +msgstr "<a href=\"TODO\">计划</a>" #. type: Content of: <html><body><ul><li> #: output/zh_CN/index-full-template.html:15 -#, fuzzy msgid "<a href=\"README\">README</a>" -msgstr "<a href=\"LICENSE\">授权</a>" +msgstr "<a href=\"README\">读我</a>" #. type: Content of: <html><body><ul><li> #: output/zh_CN/index-full-template.html:16 -#, fuzzy msgid "<a href=\"Documentation.html\">Main documentation</a>" -msgstr "<a href=\"Documentation.html#intro\">介绍</a>" +msgstr "<a href=\"Documentation.html\">主文档</a>" #. type: Content of: <p> #: addendum/head.html:2 @@ -12780,9 +12839,9 @@ msgstr "-->" #. type: Title - #: ../phpmyadmin/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation\n" -msgstr "phpMyAdmin 文档" +msgstr "phpMyAdmin - 安装\n" #. type: Plain text #: ../phpmyadmin/INSTALL:6 @@ -12796,11 +12855,9 @@ msgstr "" #. type: Title = #: ../phpmyadmin/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo\n" -msgstr "" -"phpMyAdmin - 计划\n" -"=================\n" +msgstr "phpMyAdmin - 计划\n" #. type: Plain text #: ../phpmyadmin/TODO:5 @@ -12820,30 +12877,29 @@ msgstr "-- swix/20010704" #. type: Title = #: ../phpmyadmin/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme\n" -msgstr "phpMyAdmin 主页 (外链，英文)" +msgstr "phpMyAdmin - 读我\n" #. type: Plain text #: ../phpmyadmin/README:5 -#, fuzzy msgid "A set of PHP-scripts to manage MySQL over the web." -msgstr " 使用 PHP 编写，通过 web 管理 MySQL 的工具。\n" +msgstr "使用 PHP 编写，通过 web 管理 MySQL 的工具。" #. type: Title - #: ../phpmyadmin/README:7 #, no-wrap msgid "Version 3.4.0-dev\n" -msgstr "" +msgstr "版本 3.4.0-dev\n" #. type: Plain text #: ../phpmyadmin/README:10 msgid "http://www.phpmyadmin.net/" -msgstr "" +msgstr "http://www.phpmyadmin.net/" #. type: Plain text #: ../phpmyadmin/README:23 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 1998-2000 \n" " Tobias Ratschiller <tobias_at_ratschiller.com>\n" @@ -12858,33 +12914,34 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -" 版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" -" 版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" -" Olivier Müller <om_at_omnis.ch>\n" -" Robin Johnson <robbat2_at_users.sourceforge.net>\n" -" Alexander M. Turek <me_at_derrabus.de>\n" -" Michal Čihař <michal_at_cihar.com>\n" -" Garvin Hicking <me_at_supergarv.de>\n" -" Michael Keck <mkkeck_at_users.sourceforge.net>\n" -" Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" -" [详细信息请参见 Documentation.txt/.html 文件]\n" +"版权所有 (C) 1998-2000 \n" +" Tobias Ratschiller <tobias_at_ratschiller.com>\n" +"版权所有 (C) 2001-2010 \n" +" Marc Delisle <marc_at_infomarc.info>\n" +" Olivier Müller <om_at_omnis.ch>\n" +" Robin Johnson <robbat2_at_users.sourceforge.net>\n" +" Alexander M. Turek <me_at_derrabus.de>\n" +" Michal Čihař <michal_at_cihar.com>\n" +" Garvin Hicking <me_at_supergarv.de>\n" +" Michael Keck <mkkeck_at_users.sourceforge.net>\n" +" Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" +" [详细信息请参见 Documentation.txt/.html 文件]\n" #. type: Title ~ #: ../phpmyadmin/README:38 -#, fuzzy, no-wrap +#, no-wrap msgid "Requirements\n" -msgstr "环境需求" +msgstr "环境需求\n" #. type: Plain text #: ../phpmyadmin/README:41 msgid "PHP 5.2 or later" -msgstr "" +msgstr "PHP 5.2 或更高版本" #. type: Plain text #: ../phpmyadmin/README:42 -#, fuzzy msgid "MySQL 5.0 or later" -msgstr "MySQL 4.0 兼容" +msgstr "MySQL 5.0 或更高版本" #. type: Plain text #: ../phpmyadmin/README:43 @@ -12895,78 +12952,62 @@ msgstr "" #: ../phpmyadmin/README:45 #, no-wrap msgid "Summary\n" -msgstr "" +msgstr "概要\n" #. type: Plain text #: ../phpmyadmin/README:49 -#, fuzzy msgid "" "phpMyAdmin is intended to handle the administration of MySQL over the web. " "For a summary of features, please see the Documentation.txt/.html file." -msgstr "" -" 概要:\n" -" phpMyAdmin 旨在通过 web 管理 MySQL 。\n" -" 具体功能请参见 Documentation.txt/.html 文件。\n" +msgstr "phpMyAdmin 旨在通过 web 管理 MySQL 。具体功能请参见 Documentation.txt/.html 文件。" #. type: Title ~ #: ../phpmyadmin/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Download\n" -msgstr "下载" +msgstr "下载\n" #. type: Plain text #: ../phpmyadmin/README:54 -#, fuzzy msgid "You can get the newest version at http://www.phpmyadmin.net/." -msgstr "" -" 下载:\n" -" 你可以在 http://www.phpmyadmin.net/ 获得最新版本。\n" +msgstr "你可以在 http://www.phpmyadmin.net/ 获得最新版本。" #. type: Title ~ #: ../phpmyadmin/README:56 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information\n" -msgstr "信息" +msgstr "更多信息\n" #. type: Plain text #: ../phpmyadmin/README:59 -#, fuzzy msgid "Please see the Documentation.txt/.html file." -msgstr "" -" 鸣谢:\n" -" 参见 Documentation.txt/.html 文件。\n" +msgstr "参见 Documentation.txt/.html 文件。" #. type: Title ~ #: ../phpmyadmin/README:61 #, no-wrap msgid "Support\n" -msgstr "" +msgstr "支持\n" #. type: Plain text #: ../phpmyadmin/README:64 -#, fuzzy msgid "See reference about support forums under http://www.phpmyadmin.net/" -msgstr "" -" 支持:\n" -" 参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息\n" +msgstr "参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息" #. type: Title ~ #: ../phpmyadmin/README:67 #, no-wrap msgid "Enjoy!\n" -msgstr "" +msgstr "尽情享受吧！\n" #. type: Plain text #: ../phpmyadmin/README:70 -#, fuzzy msgid "The phpMyAdmin Devel team" -msgstr "" -" 尽情享受吧！\n" -" phpMyAdmin 开发组\n" +msgstr "phpMyAdmin 开发组" #. type: Plain text #: ../phpmyadmin/README:79 -#, fuzzy, no-wrap +#, no-wrap msgid "" "PS: \n" " Please, don't send us emails with question like \"How do I compile\n" @@ -12976,11 +13017,12 @@ msgid "" " Before contacting us, please read the Documentation.html (esp. the\n" " FAQ part).\n" msgstr "" -" 附: 请勿向我们发送邮件询问诸如 \"怎样编译\n" -" 支持 MySQL 的 PHP\" 之类的问题。我们\n" -" 没有时间做您的免费咨询台。\n" -" 请将您的问题发送到相应的邮件列表或论坛。\n" -" 在联系我们之前，请阅读 Documentation.html (特别是 FAQ 部分)。\n" +"附: \n" +" 请勿向我们发送邮件询问诸如 \"怎样编译\n" +" 支持 MySQL 的 PHP\" 之类的问题。我们\n" +" 没有时间为您做免费咨询。\n" +" 请将您的问题发送到相应的邮件列表或论坛。\n" +" 在联系我们之前，请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。\n" #~ msgid "Documentation version:" #~ msgstr "文档版本:" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10084-g7f598f4
by Michal Čihař 10 Sep '10

10 Sep '10

The branch, master has been updated via 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 (commit) via 036c4e7c665064ac8f610f736bf5299b1ab70767 (commit) via da2a372958780629eb8396043ed99e01ea5d6604 (commit) from 69e1c084b57e37de1edef98d3cfc238a63d4fc05 (commit) - Log ----------------------------------------------------------------- commit 7f598f4f4f562b392fe4a83d3e9fd9bf00379e37 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:28:16 2010 +0200 Translation update done using Pootle. commit 036c4e7c665064ac8f610f736bf5299b1ab70767 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:27:07 2010 +0200 Translation update done using Pootle. commit da2a372958780629eb8396043ed99e01ea5d6604 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:27:01 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 41bbd50..9a0a630 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-09 14:26+0200\n" +"PO-Revision-Date: 2010-09-09 14:28+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -3142,13 +3142,12 @@ msgid "Login cookie validity" msgstr "登录 cookie 有效期" #: libraries/config/messages.inc.php:296 -#, fuzzy msgid "Double size of textarea for LONGTEXT columns" -msgstr "放大一倍 LONGTEXT 字段的文本输入框" +msgstr "放大一倍 LONGTEXT 字段的输入框" #: libraries/config/messages.inc.php:297 msgid "Bigger textarea for LONGTEXT" -msgstr "放大 LONGTEXT 字段的文本输入框" +msgstr "放大 LONGTEXT 字段的输入框" #: libraries/config/messages.inc.php:298 msgid "Use icons on main page" @@ -3269,12 +3268,11 @@ msgid "Persistent connections" msgstr "持久连接" #: libraries/config/messages.inc.php:325 -#, fuzzy msgid "" "Disable the default warning that is displayed on the database details " "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" -msgstr "禁止在缺少关系功能所需数据表时在数据库结构页中显示默认警告" +msgstr "禁止在缺少 phpMyAdmin 高级功能所需数据表时在数据库结构页中显示默认警告" #: libraries/config/messages.inc.php:326 msgid "Missing phpMyAdmin configuration storage tables" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10081-g69e1c08
by Michal Čihař 09 Sep '10

09 Sep '10

The branch, master has been updated via 69e1c084b57e37de1edef98d3cfc238a63d4fc05 (commit) via e40381eb14176c76349fab9fdbe295d6ca8c21ce (commit) via 2645ac6d68fdb849a6273d07e719ac9567b46a13 (commit) via 66b2eeae4392f3e5f89ed933c1c9fc7d0af8261f (commit) via 23dc1ea5090ae7fef4b4becd574c3cb76028c99d (commit) via e8ba6ae45583f1a6f76f17440c383792834b3a58 (commit) via ee4e8a96310617bec890a45c366e50e824565905 (commit) via 806778ea1fe19d8fbd3e4cb8b448e2f62fe788e9 (commit) via 410b31383c2db923c9256b22a5c892864141e49b (commit) via 257c5dbe0c20b9a9ffdc996481b433d1f767141e (commit) via cd51ae964f92d69c44fc10356500b7347fdecaac (commit) via c62fdbc1d02a3747ff7d96aa418d34509d375cdc (commit) via 9d5b831a6145ffee9fb0b4483ba3fbef13d7925c (commit) via e70a110b80f81e0932dc3f1240dfac15226bb25e (commit) via ab107b50360a004e1840517634b5b9d21a684831 (commit) via c3c870e7f2abb002e7ddad2f0955be37f511d9d7 (commit) via e6f3067cde55e99ba17e2d220d778728b80158a1 (commit) via a381176a4ea906b95e963990ede9f0f7657c1b04 (commit) via eb87797a5f60e970d136ba142dfa0b63682cfdb4 (commit) via 80cf7dec9cd2a05901981bdb551edf4b8ece0936 (commit) via 9cdc14380daaddfc4ba970f95de2277e5ed7601f (commit) via f86cf60b83d5aaaf4627b2242a005b9f9c08510d (commit) from 11192e847c68dab55e4924412e03d5004b9ef75b (commit) - Log ----------------------------------------------------------------- commit 69e1c084b57e37de1edef98d3cfc238a63d4fc05 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:26:40 2010 +0200 Translation update done using Pootle. commit e40381eb14176c76349fab9fdbe295d6ca8c21ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 9 14:10:13 2010 +0200 Translation update done using Pootle. commit 2645ac6d68fdb849a6273d07e719ac9567b46a13 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:40:04 2010 +0200 Translation update done using Pootle. commit 66b2eeae4392f3e5f89ed933c1c9fc7d0af8261f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:39:48 2010 +0200 Translation update done using Pootle. commit 23dc1ea5090ae7fef4b4becd574c3cb76028c99d Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:39:18 2010 +0200 Translation update done using Pootle. commit e8ba6ae45583f1a6f76f17440c383792834b3a58 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:38:56 2010 +0200 Translation update done using Pootle. commit ee4e8a96310617bec890a45c366e50e824565905 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:38:40 2010 +0200 Translation update done using Pootle. commit 806778ea1fe19d8fbd3e4cb8b448e2f62fe788e9 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:38:16 2010 +0200 Translation update done using Pootle. commit 410b31383c2db923c9256b22a5c892864141e49b Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Thu Sep 9 10:37:56 2010 +0200 Translation update done using Pootle. commit 257c5dbe0c20b9a9ffdc996481b433d1f767141e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:43:24 2010 +0200 Translation update done using Pootle. commit cd51ae964f92d69c44fc10356500b7347fdecaac Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:41:41 2010 +0200 Translation update done using Pootle. commit c62fdbc1d02a3747ff7d96aa418d34509d375cdc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:38:23 2010 +0200 Translation update done using Pootle. commit 9d5b831a6145ffee9fb0b4483ba3fbef13d7925c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:37:54 2010 +0200 Translation update done using Pootle. commit e70a110b80f81e0932dc3f1240dfac15226bb25e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:37:15 2010 +0200 Translation update done using Pootle. commit ab107b50360a004e1840517634b5b9d21a684831 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:36:18 2010 +0200 Translation update done using Pootle. commit c3c870e7f2abb002e7ddad2f0955be37f511d9d7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:35:05 2010 +0200 Translation update done using Pootle. commit e6f3067cde55e99ba17e2d220d778728b80158a1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:34:51 2010 +0200 Translation update done using Pootle. commit a381176a4ea906b95e963990ede9f0f7657c1b04 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:33:38 2010 +0200 Translation update done using Pootle. commit eb87797a5f60e970d136ba142dfa0b63682cfdb4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:33:21 2010 +0200 Translation update done using Pootle. commit 80cf7dec9cd2a05901981bdb551edf4b8ece0936 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:08:29 2010 +0200 Translation update done using Pootle. commit 9cdc14380daaddfc4ba970f95de2277e5ed7601f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:05:28 2010 +0200 Translation update done using Pootle. commit f86cf60b83d5aaaf4627b2242a005b9f9c08510d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Sep 8 22:01:15 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nb.po | 15 +++++------ po/tr.po | 34 ++++++++++++------------ po/zh_CN.po | 79 +++-------------------------------------------------------- 3 files changed, 28 insertions(+), 100 deletions(-) diff --git a/po/nb.po b/po/nb.po index 1395649..8b56563 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-08 13:12+0200\n" +"PO-Revision-Date: 2010-09-09 10:40+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" "Language: nb\n" @@ -2067,7 +2067,6 @@ msgid "complete inserts" msgstr "Komplette innlegg" #: libraries/config.values.php:120 -#, fuzzy #| msgid "Extended inserts" msgid "extended inserts" msgstr "Utvidete innlegg" @@ -2122,27 +2121,26 @@ msgstr "ikke tilgjengelig" #: libraries/config/FormDisplay.class.php:732 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" trenger %s tillegget" #: libraries/config/FormDisplay.class.php:746 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "import vil ikke fungere, mangler funksjon (%s)" #: libraries/config/FormDisplay.class.php:750 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "Eksport vil ikke fungere, mangler funksjon (%s)" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" msgstr "SQL Validator er avslått" #: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "PHP extension to use" msgid "SOAP extension not found" -msgstr "Bruk PHP modul" +msgstr "SOAP tillegg ble ikke funnet" #: libraries/config/FormDisplay.class.php:772 #, php-format @@ -2153,6 +2151,7 @@ msgstr "maksimum %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Denne innstillingen er avslått, den vil ikke bli lagt til din konfigurasjon" #: libraries/config/FormDisplay.tpl.php:248 #, php-format @@ -2317,7 +2316,7 @@ msgstr "" #: libraries/config/messages.inc.php:43 msgid "Debug SQL" -msgstr "" +msgstr "Debug SQL" #: libraries/config/messages.inc.php:44 #, fuzzy diff --git a/po/tr.po b/po/tr.po index 48603c3..04c2b3b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-08 05:30+0200\n" +"PO-Revision-Date: 2010-09-08 22:43+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -651,7 +651,7 @@ msgstr "Görünüm" #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:375 msgid "Replication" -msgstr "Kopya etme" +msgstr "Kopya Etme" #: db_structure.php:473 msgid "Sum" @@ -1619,7 +1619,7 @@ msgstr "Bağlanamıyor: geçersiz ayarlar." #: test/theme.php:151 #, php-format msgid "Welcome to %s" -msgstr "%s sürümüne Hoş Geldiniz" +msgstr "%s'e Hoş Geldiniz" #: libraries/auth/config.auth.lib.php:106 #, php-format @@ -4279,7 +4279,7 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:358 #: libraries/config/user_preferences.forms.php:260 libraries/export/odt.php:21 msgid "Open Document Text" -msgstr "Açık Belge Metini" +msgstr "Açık Belge Metni" #: libraries/config/validate.lib.php:198 libraries/config/validate.lib.php:205 msgid "Could not connect to MySQL server" @@ -5991,7 +5991,7 @@ msgstr "Slave yapılandırması" #: libraries/replication_gui.lib.php:53 server_replication.php:345 msgid "Change or reconfigure master server" -msgstr "Asıl sunucuyu değiştir veya yeniden yapılandır" +msgstr "Master sunucuyu değiştir veya yeniden yapılandır" #: libraries/replication_gui.lib.php:54 msgid "" @@ -7149,7 +7149,7 @@ msgstr "Veritabanı istatistikleri" #: server_databases.php:206 server_replication.php:179 #: server_replication.php:207 msgid "Master replication" -msgstr "Asılı kopya etme" +msgstr "Master kopya etme" #: server_databases.php:208 server_replication.php:246 msgid "Slave replication" @@ -7660,12 +7660,12 @@ msgstr "Master değiştirilemiyor" #: server_replication.php:72 #, php-format msgid "Master server changed succesfully to %s" -msgstr "Asıl sunucu %s 'na başarılı olarak değiştirildi" +msgstr "Master sunucu %s'na başarılı olarak değiştirildi" #: server_replication.php:180 msgid "This server is configured as master in a replication process." msgstr "" -"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırıldı." +"Bu sunucu kopya etme işlemi sırasında master sunucu olarak yapılandırıldı." #: server_replication.php:182 server_status.php:398 msgid "Show master status" @@ -7681,8 +7681,8 @@ msgid "" "This server is not configured as master in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" -"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırılmadı. " -"Bunu <a href=\"%s\">yapılandırmak</a> ister misiniz?" +"Bu sunucu, kopya etme işlemi sırasında master sunucu olarak yapılandırılmaz. " +"Bunu <a href=\"%s\">yapılandırmak</a> istiyor musunuz?" #: server_replication.php:215 msgid "Master configuration" @@ -7696,12 +7696,12 @@ msgid "" "ignore all databases by default and allow only certain databases to be " "replicated. Please select the mode:" msgstr "" -"Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırılmadı. " +"Bu sunucu, kopya etme işlemi sırasında master sunucu olarak yapılandırılmaz. " "Ya tüm veritabanlarının kopya etmeyi ve belirli olanı yok saymayı (eğer " "veritabanlarının çoğunluğunu kopya etmek isterseniz kullanışlıdır) " "seçebilirsiniz ya da varsayılan olarak tüm veritabanlarını yoksaymayı ve " "kopya etmek için sadece belirli veritabanlarına izin verebilirsiniz. Lütfen " -"modu seçin:" +"kipi seçin:" #: server_replication.php:219 msgid "Replicate all databases; Ignore:" @@ -7730,7 +7730,7 @@ msgid "" "master" msgstr "" "MySQL sunucusunu bir kez yeniden başlattığınızda, lütfen Git düğmesine " -"tıklayın. Ondan sonra bu sunucunun asıl olarak <b>yapılandırıldığını</b> " +"tıklayın. Ondan sonra bu sunucunun master olarak <b>yapılandırıldığını</b> " "gösteren, sizi uyaran bir mesaj görmelisiniz" #: server_replication.php:291 @@ -7745,7 +7745,7 @@ msgstr "Slave G/Ç işlemi çalışmıyor!" msgid "" "Server is configured as slave in a replication process. Would you like to:" msgstr "" -"Sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırıldı. Bunu " +"Sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırılır. Bunu " "istiyor musunuz:" #: server_replication.php:306 @@ -7754,7 +7754,7 @@ msgstr "Slave durum tablosuna bak" #: server_replication.php:309 msgid "Synchronize databases with master" -msgstr "Asılı ile veritabanlarını eşitle" +msgstr "Veritabanlarını master ile eşitle" #: server_replication.php:320 msgid "Control slave:" @@ -7816,8 +7816,8 @@ msgid "" "This server is not configured as slave in a replication process. Would you " "like to <a href=\"%s\">configure</a> it?" msgstr "" -"Bu sunucu kopya etme işlemi sırasında slave sunucu olarak yapılandırılmadı. " -"Bunu <a href=\"%s\">yapılandırmak</a> ister misiniz?" +"Bu sunucu, kopya etme işlemi sırasında slave sunucu olarak yapılandırılmaz. " +"Bunu <a href=\"%s\">yapılandırmak</a> istiyor musunuz?" #: server_status.php:46 msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 71f56dd..41bbd50 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-06 11:42+0200\n" -"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"PO-Revision-Date: 2010-09-09 14:26+0200\n" +"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -809,7 +809,7 @@ msgstr "字段“%s”的值" #: enum_editor.php:22 libraries/tbl_properties.inc.php:799 msgid "Enter each value in a separate field." -msgstr "" +msgstr "请将每个值分别输入在不同的输入框中。" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -3010,10 +3010,9 @@ msgid "Display servers selection" msgstr "显示服务器选择" #: libraries/config/messages.inc.php:268 -#, fuzzy #| msgid "Display databases in a tree" msgid "Display table filter" -msgstr "以树形显示数据库" +msgstr "显示数据表快速搜索框" #: libraries/config/messages.inc.php:269 msgid "String that separates databases into different tree levels" @@ -9372,73 +9371,3 @@ msgstr "视图名" #: view_operations.php:91 msgid "Rename view to" msgstr "将视图改名为" - -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "请在不同区域中分别输入每个值，并用单引号括起。如果需要在值中输入反斜杠 " -#~ "(“\\”)或单引号(“'”)，请在前面加上反斜杠 (如 '\\\\xyz' 或 'a\\'b')。" - -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "请将值分别输入。如果需要输入反斜杠 (“\\”) 或单引号 (“'”)，请在前面加上反斜" -#~ "杠 (如 '\\\\xyz' 或 'a\\'b')。" - -#~ msgid "New table" -#~ msgstr "新数据表" - -#~ msgid "server name" -#~ msgstr "服务器名" - -#~ msgid "database name" -#~ msgstr "数据库名" - -#~ msgid "table name" -#~ msgstr "数据表名" - -#~ msgid "Edit PDF Pages" -#~ msgstr "编辑 PDF 页" - -#~ msgid "Data Dictionary Format" -#~ msgstr "数据字典格式" - -#~ msgid "no" -#~ msgstr "否" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "设置 signon 认证方式选项" - -#~ msgid "Signon login options" -#~ msgstr "Signon 登录参数" - -#~ msgid "PMA database" -#~ msgstr "PMA 数据库" - -#~ msgid "Customization" -#~ msgstr "自定义" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "SQL 查询设置，要设置 SQL 查询框请到[a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]主框架[/a]设置中修改" - -#~ msgid "yes" -#~ msgstr "是" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 283456c54ecc92672220117886b5ef0e68ec067a
by Michal Čihař 08 Sep '10

08 Sep '10

The branch, master has been updated via 283456c54ecc92672220117886b5ef0e68ec067a (commit) from 7c290f83461799b801e255f82bffee0298d84bd4 (commit) - Log ----------------------------------------------------------------- commit 283456c54ecc92672220117886b5ef0e68ec067a Author: Michal Čihař <michal(a)cihar.com> Date: Wed Sep 8 23:34:11 2010 +0200 Fix CVE ID. ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2010-7 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/security/PMASA-2010-7 b/templates/security/PMASA-2010-7 index cd27dc8..105dcf5 100644 --- a/templates/security/PMASA-2010-7 +++ b/templates/security/PMASA-2010-7 @@ -36,7 +36,7 @@ Upgrade to phpMyAdmin 3.3.7 or newer or apply patch listed below. Thanks to <a href="http://tenable.com/">Tenable Network Security</a> for reporting this issue. </py:def> -<py:def function="announcement_cve">CVE-2010-2958</py:def> +<py:def function="announcement_cve">CVE-2010-3263</py:def> <py:def function="announcement_commits"> 73ce5705bd1e0b62060f75702d62f88247ce09dd hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10059-g11192e8
by Michal Čihař 08 Sep '10

08 Sep '10

The branch, master has been updated via 11192e847c68dab55e4924412e03d5004b9ef75b (commit) via 64bd569ab8c31316969cc237a1834640434fd0d5 (commit) via b4668d5dfcdc6a4ffb972bc0897bf39d03862c5f (commit) via e8406686cda30d09391ac3f1a3ba6e04d7b05a66 (commit) via 584cdd0337300df6fcceb3441e903bfc42f0b947 (commit) via cb8c9c75945449a1e35c322aa91e6a9fb7f2f88d (commit) via eaecc230633a050dd00dde79558cdc5e22930387 (commit) via 2dc9efb061bacf98d92813d294785236fa1efb8e (commit) via bb9164d1833506c846b855f48fd92ac7af738e55 (commit) via f1e6e79ec2bdceac267575fdee7cfd232171c64f (commit) from 5574307fd0c196663abdc405af5ddd05b180fb02 (commit) - Log ----------------------------------------------------------------- commit 11192e847c68dab55e4924412e03d5004b9ef75b Merge: 64bd569ab8c31316969cc237a1834640434fd0d5 5574307fd0c196663abdc405af5ddd05b180fb02 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Sep 8 13:33:01 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 64bd569ab8c31316969cc237a1834640434fd0d5 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:12:30 2010 +0200 Translation update done using Pootle. commit b4668d5dfcdc6a4ffb972bc0897bf39d03862c5f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:12:11 2010 +0200 Translation update done using Pootle. commit e8406686cda30d09391ac3f1a3ba6e04d7b05a66 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:11:52 2010 +0200 Translation update done using Pootle. commit 584cdd0337300df6fcceb3441e903bfc42f0b947 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:11:32 2010 +0200 Translation update done using Pootle. commit cb8c9c75945449a1e35c322aa91e6a9fb7f2f88d Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:11:24 2010 +0200 Translation update done using Pootle. commit eaecc230633a050dd00dde79558cdc5e22930387 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:11:08 2010 +0200 Translation update done using Pootle. commit 2dc9efb061bacf98d92813d294785236fa1efb8e Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:10:55 2010 +0200 Translation update done using Pootle. commit bb9164d1833506c846b855f48fd92ac7af738e55 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:10:29 2010 +0200 Translation update done using Pootle. commit f1e6e79ec2bdceac267575fdee7cfd232171c64f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Wed Sep 8 13:10:21 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nb.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/nb.po b/po/nb.po index 8d3922e..1395649 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-07 15:21+0200\n" -"PO-Revision-Date: 2010-09-08 09:08+0200\n" +"PO-Revision-Date: 2010-09-08 13:12+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" "Language: nb\n" @@ -2039,15 +2039,14 @@ msgstr "struktur" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "data" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" -msgstr "Struktur og data" +msgstr "struktur og data" #: libraries/config.values.php:99 libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options to configure" @@ -2075,11 +2074,11 @@ msgstr "Utvidete innlegg" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "begge ovenforstående" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "ingen av de overstående" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:416 @@ -2106,7 +2105,7 @@ msgstr "Ugyldig verdi" #: libraries/config/validate.lib.php:458 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Verdien må være lik eller mindre enn %s" #: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2115,10 +2114,9 @@ msgstr "Mangler data for %s" #: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "Variabler" +msgstr "ikke tilgjengelig" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 @@ -2138,7 +2136,7 @@ msgstr "" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL Validator er avslått" #: libraries/config/FormDisplay.class.php:764 #, fuzzy @@ -2147,10 +2145,10 @@ msgid "SOAP extension not found" msgstr "Bruk PHP modul" #: libraries/config/FormDisplay.class.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Maximum tables" msgid "maximum %s" -msgstr "Maks antall tabeller" +msgstr "maksimum %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" @@ -2168,7 +2166,7 @@ msgstr "Gjennopprett standard verdi" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Tillat brukere å endre denne verdien" #: libraries/config/FormDisplay.tpl.php:332 #: libraries/schema/User_Schema.class.php:317 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_11-5-g8b2f1bc
by Michal Čihař 08 Sep '10

08 Sep '10

The branch, QA_2_11 has been updated via 8b2f1bc55dfe4599f30398205638326345878b8d (commit) via e6aeaf1925be0804e068d50b8c193d8b13f80ced (commit) from b073a5a10f60581083f1b37f86455b0be8cbdfd6 (commit) - Log ----------------------------------------------------------------- commit 8b2f1bc55dfe4599f30398205638326345878b8d Merge: b073a5a10f60581083f1b37f86455b0be8cbdfd6 e6aeaf1925be0804e068d50b8c193d8b13f80ced Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Sep 8 10:11:00 2010 +0200 Merge branch 'MAINT_2_11_11' into QA_2_11 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10049-g5574307
by Herman van Rink 08 Sep '10

08 Sep '10

The branch, master has been updated via 5574307fd0c196663abdc405af5ddd05b180fb02 (commit) from 05cc24c2bea9416d1c08b88c1c21e78f085a5475 (commit) - Log ----------------------------------------------------------------- commit 5574307fd0c196663abdc405af5ddd05b180fb02 Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Sep 8 10:39:16 2010 +0200 The tahoma.ttf file which is bundled with pChart 1.27d was replaced due to uncertainty with it's licence. ----------------------------------------------------------------------- Summary of changes: libraries/chart/pChart/fonts/DejaVuSans.ttf | Bin 0 -> 683528 bytes .../{tcpdf/font => chart/pChart/fonts}/LICENSE | 5 ++++- libraries/chart/pChart/fonts/README | 6 ++++++ libraries/chart/pChart/fonts/tahoma.ttf | Bin 383804 -> 0 bytes 4 files changed, 10 insertions(+), 1 deletions(-) create mode 100644 libraries/chart/pChart/fonts/DejaVuSans.ttf copy libraries/{tcpdf/font => chart/pChart/fonts}/LICENSE (97%) create mode 100644 libraries/chart/pChart/fonts/README delete mode 100644 libraries/chart/pChart/fonts/tahoma.ttf diff --git a/libraries/chart/pChart/fonts/DejaVuSans.ttf b/libraries/chart/pChart/fonts/DejaVuSans.ttf new file mode 100644 index 0000000..a99969e Binary files /dev/null and b/libraries/chart/pChart/fonts/DejaVuSans.ttf differ diff --git a/libraries/tcpdf/font/LICENSE b/libraries/chart/pChart/fonts/LICENSE similarity index 97% copy from libraries/tcpdf/font/LICENSE copy to libraries/chart/pChart/fonts/LICENSE index 7684811..254e2cc 100644 --- a/libraries/tcpdf/font/LICENSE +++ b/libraries/chart/pChart/fonts/LICENSE @@ -1,4 +1,5 @@ -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah (see below) +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) Bitstream Vera Fonts Copyright ------------------------------ @@ -94,3 +95,5 @@ be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. + +$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ diff --git a/libraries/chart/pChart/fonts/README b/libraries/chart/pChart/fonts/README new file mode 100644 index 0000000..554d017 --- /dev/null +++ b/libraries/chart/pChart/fonts/README @@ -0,0 +1,6 @@ + +The tahoma.ttf file which is bundled with pChart 1.27d was replaced due to uncertainty with it's licence. + +As a replacement the DejaVuSans.ttf font file was extracted from the DejaVu fonts 2.32 package available from dejavu-fonts.org + +For license information see LICENSE. diff --git a/libraries/chart/pChart/fonts/tahoma.ttf b/libraries/chart/pChart/fonts/tahoma.ttf deleted file mode 100644 index 59b14a2..0000000 Binary files a/libraries/chart/pChart/fonts/tahoma.ttf and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git