May 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-673-g082d410
by Marc Delisle 04 May '11

04 May '11

The branch, master has been updated via 082d410d253dd9ccdc90870d9acdd29e6a6cc30d (commit) from baf339f802ae65d3776e40bdb9291d4efe13b0e1 (commit) - Log ----------------------------------------------------------------- commit 082d410d253dd9ccdc90870d9acdd29e6a6cc30d Author: Marc Delisle <marc(a)infomarc.info> Date: Wed May 4 06:31:26 2011 -0400 Continue to replace warning level with error level ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 28 +------------------------- themes/original/img/s_warn.png | Bin 201 -> 0 bytes themes/pmahomme/css/theme_right.css.php | 33 +------------------------------ themes/pmahomme/img/s_warn.png | Bin 701 -> 0 bytes themes/pmahomme/img/tab_warning_bg.png | Bin 1697 -> 0 bytes 5 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 themes/original/img/s_warn.png delete mode 100644 themes/pmahomme/img/s_warn.png delete mode 100644 themes/pmahomme/img/tab_warning_bg.png diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 5b12292..431adbc 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -396,10 +396,9 @@ td .icon { margin-<?php echo $left; ?>: 0.6em; } -/* message boxes: warning, error, confirmation */ +/* message boxes: error, confirmation */ .success h1, .notice h1, -.warning h1, div.error h1 { border-bottom: 2px solid; font-weight: bold; @@ -409,7 +408,6 @@ div.error h1 { div.success, div.notice, -div.warning, div.error, div.footnotes { margin: 0.3em 0 0 0; @@ -475,30 +473,6 @@ div.footnotes { border-color: #FFD700; } -.warning { - color: #CC0000; - background-color: #FFFFCC; -} -p.warning, -h1.warning, -div.warning { - border-color: #CC0000; - <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> - background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); - background-repeat: no-repeat; - <?php if ($GLOBALS['text_dir'] === 'ltr') { ?> - background-position: 5px 50%; - padding: 0.2em 0.2em 0.2em 25px; - <?php } else { ?> - background-position: 97% 50%; - padding: 0.2em 25px 0.2em 0.2em; - <?php } ?> - <?php } ?> -} -.warning h1 { - border-color: #cc0000; -} - .error { background-color: #FFFFCC; color: #ff0000; diff --git a/themes/original/img/s_warn.png b/themes/original/img/s_warn.png deleted file mode 100644 index 26e0348..0000000 Binary files a/themes/original/img/s_warn.png and /dev/null differ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 9654cd9..80ac42d 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -569,10 +569,9 @@ td .icon { margin-<?php echo $left; ?>: 0.6em; } -/* message boxes: warning, error, confirmation */ +/* message boxes: error, confirmation */ .success h1, .notice h1, -.warning h1, div.error h1 { border-bottom: 2px solid; font-weight: bold; @@ -582,7 +581,6 @@ div.error h1 { div.success, div.notice, -div.warning, div.error, div.footnotes { margin: 0.5em 0 1.3em 0; @@ -611,7 +609,6 @@ div.footnotes { .success a{text-decoration:underline;} .notice a{text-decoration:underline;} -.warning a{text-decoration:underline;} .error a{text-decoration:underline;} .footnotes a{text-decoration:underline;} @@ -658,30 +655,6 @@ div.footnotes { border-color: #ffb10a; } -.warning { - color: #000; - background:url(./themes/pmahomme/img/tab_warning_bg.png) 50% 0% #f2baba; -} - - -p.warning, -h1.warning, -div.warning { - border-color: #e0a1a1; - <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?> - background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); - background-repeat: no-repeat; - <?php if ($GLOBALS['text_dir'] === 'ltr') { ?> - background-position: 5px 50%; - <?php } else { ?> - background-position: 97% 50%; - <?php } ?> - <?php } ?> -} -.warning h1 { - border-color: #cc0000; -} - .error { border:1px solid maroon !important; color: #000; @@ -957,9 +930,6 @@ ul#topmenu ul { padding: 0.1em 0.3em 0.1em 0.3em; } -#topmenu .warning {font-size:1em !important; background:#f3f3f3; } -#topmenu .warning a span{color:#ddd !important;} - ul#topmenu ul { -moz-box-shadow: 1px 1px 6px #ddd; -webkit-box-shadow: 2px 2px 3px #666; @@ -1022,7 +992,6 @@ ul#topmenu > li.active { /* disabled drop/empty tabs */ ul#topmenu span.tab, -a.warning, ul#topmenu span.tabcaution { cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default; color:#ccc; diff --git a/themes/pmahomme/img/s_warn.png b/themes/pmahomme/img/s_warn.png deleted file mode 100644 index c37bd06..0000000 Binary files a/themes/pmahomme/img/s_warn.png and /dev/null differ diff --git a/themes/pmahomme/img/tab_warning_bg.png b/themes/pmahomme/img/tab_warning_bg.png deleted file mode 100644 index bf45105..0000000 Binary files a/themes/pmahomme/img/tab_warning_bg.png and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-672-gbaf339f
by Marc Delisle 04 May '11

04 May '11

The branch, master has been updated via baf339f802ae65d3776e40bdb9291d4efe13b0e1 (commit) from 0bb27cc5fb23279a154d760ace3cd77a9abaaf1a (commit) - Log ----------------------------------------------------------------- commit baf339f802ae65d3776e40bdb9291d4efe13b0e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed May 4 06:14:28 2011 -0400 Continue to replace warning level with error level ----------------------------------------------------------------------- Summary of changes: libraries/Message.class.php | 37 ------------------------------------- libraries/sqlparser.lib.php | 4 ++-- setup/frames/index.inc.php | 2 +- setup/lib/form_processing.lib.php | 2 +- setup/lib/index.lib.php | 24 ++++++++++++------------ test/PMA_Message_test.php | 11 ----------- test/theme.php | 9 --------- 7 files changed, 16 insertions(+), 73 deletions(-) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 3064868..3b0d0c5 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -19,9 +19,6 @@ * * // get special notice 'Some locale notice' * $message = PMA_Message::notice('strSomeLocaleNotice'); - * - * // display raw warning message 'This is a warning!' - * PMA_Message::rawWarning('This is a warning!')->display(); * </code> * * more advanced usage example: @@ -63,7 +60,6 @@ class PMA_Message { const SUCCESS = 1; // 0001 const NOTICE = 2; // 0010 - const WARNING = 4; // 0100 const ERROR = 8; // 1000 const SANITIZE_NONE = 0; // 0000 0000 @@ -79,7 +75,6 @@ class PMA_Message static public $level = array ( PMA_Message::SUCCESS => 'success', PMA_Message::NOTICE => 'notice', - PMA_Message::WARNING => 'warning', PMA_Message::ERROR => 'error', ); @@ -214,22 +209,6 @@ class PMA_Message } /** - * get PMA_Message of type warning - * - * shorthand for getting a simple warning message - * - * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::WARNING - * @param string $string a localized string e.g. 'strSetupWarning' - * @return PMA_Message - */ - static public function warning($string) - { - return new PMA_Message($string, PMA_Message::WARNING); - } - - /** * get PMA_Message of type notice * * shorthand for getting a simple notice message @@ -338,22 +317,6 @@ class PMA_Message } /** - * get PMA_Message of type warning with custom content - * - * shorthand for getting a customized warning message - * - * @static - * @uses PMA_Message::raw() - * @uses PMA_Message::WARNING - * @param string $message - * @return PMA_Message - */ - static public function rawWarning($message) - { - return PMA_Message::raw($message, PMA_Message::WARNING); - } - - /** * get PMA_Message of type notice with custom content * * shorthand for getting a customized notice message diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 893aef0..cbad1d6 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -360,7 +360,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $pos = $pos_quote_separator; } if (class_exists('PMA_Message')) { - PMA_Message::warning(__('Automatically appended backtick to the end of query!'))->display(); + PMA_Message::notice(__('Automatically appended backtick to the end of query!'))->display(); } } else { $debugstr = __('Unclosed quote') . ' @ ' . $startquotepos. "\n" @@ -1960,7 +1960,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($seen_create_table && $in_create_table_fields) { $current_identifier = $identifier; - // warning: we set this one even for non TIMESTAMP type + // we set this one even for non TIMESTAMP type $create_table_fields[$current_identifier]['timestamp_not_null'] = FALSE; } diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 00723cd..9103606 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -61,7 +61,7 @@ if (!$is_https) { $text .= ' ' . PMA_lang($strInsecureConnectionMsg2, 'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'])); } - messages_set('warning', 'no_https', __('Insecure connection'), $text); + messages_set('notice', 'no_https', __('Insecure connection'), $text); } ?> diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 7bad38c..17f58a6 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -38,7 +38,7 @@ function process_formset(FormDisplay $form_display) { } $id = $id ? "{$separator}id=$id" : ''; ?> - <div class="warning"> + <div class="error"> <h4><?php echo __('Warning') ?></h4> <?php echo __('Submitted form contains errors') ?><br /> <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo __('Try to revert erroneous fields to their default values') ?></a> diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 5d42910..aa0d044 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -19,7 +19,7 @@ if (!defined('PHPMYADMIN')) { function messages_begin() { if (!isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) { - $_SESSION['messages'] = array('error' => array(), 'warning' => array(), 'notice' => array()); + $_SESSION['messages'] = array('error' => array(), 'notice' => array()); } else { // reset message states foreach ($_SESSION['messages'] as &$messages) { @@ -35,7 +35,7 @@ function messages_begin() * Adds a new message to message list * * @param string $id unique message identifier - * @param string $type one of: notice, warning, error + * @param string $type one of: notice, error * @param string $title language string id (in $str array) * @param string $message message text */ @@ -314,7 +314,7 @@ function perform_config_checks() && $cf->getValue("Servers/$i/user") != '' && $cf->getValue("Servers/$i/password") != '') { $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)"; - messages_set('warning', "Servers/$i/auth_type", $title, + messages_set('notice', "Servers/$i/auth_type", $title, PMA_lang($strServerAuthConfigMsg, $i) . ' ' . PMA_lang($strSecurityInfoMsg, $i)); } @@ -327,7 +327,7 @@ function perform_config_checks() if ($cf->getValue("Servers/$i/AllowRoot") && $cf->getValue("Servers/$i/AllowNoPassword")) { $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)"; - messages_set('warning', "Servers/$i/AllowNoPassword", $title, + messages_set('notice', "Servers/$i/AllowNoPassword", $title, __('You allow for connecting to the server without a password.') . ' ' . PMA_lang($strSecurityInfoMsg, $i)); } @@ -358,7 +358,7 @@ function perform_config_checks() $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.')); } if (!empty($blowfish_warnings)) { - messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings), + messages_set('error', 'blowfish_warnings' . count($blowfish_warnings), PMA_lang(PMA_lang_name('blowfish_secret')), implode('<br />', $blowfish_warnings)); } @@ -380,7 +380,7 @@ function perform_config_checks() // should be disabled // if ($cf->getValue('AllowArbitraryServer')) { - messages_set('warning', 'AllowArbitraryServer', + messages_set('notice', 'AllowArbitraryServer', PMA_lang(PMA_lang_name('AllowArbitraryServer')), PMA_lang($strAllowArbitraryServerWarning)); } @@ -393,7 +393,7 @@ function perform_config_checks() || $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')) { $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime') ? 'error' - : 'warning'; + : 'notice'; messages_set($message_type, 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning)); @@ -404,7 +404,7 @@ function perform_config_checks() // should be at most 1800 (30 min) // if ($cf->getValue('LoginCookieValidity') > 1800) { - messages_set('warning', 'LoginCookieValidity', + messages_set('notice', 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning2)); } @@ -446,7 +446,7 @@ function perform_config_checks() // if ($cf->getValue('GZipDump') && (@!function_exists('gzopen') || @!function_exists('gzencode'))) { - messages_set('warning', 'GZipDump', + messages_set('error', 'GZipDump', PMA_lang(PMA_lang_name('GZipDump')), PMA_lang($strGZipDumpWarning, 'gzencode')); } @@ -463,7 +463,7 @@ function perform_config_checks() $functions .= @function_exists('bzcompress') ? '' : ($functions ? ', ' : '') . 'bzcompress'; - messages_set('warning', 'BZipDump', + messages_set('error', 'BZipDump', PMA_lang(PMA_lang_name('BZipDump')), PMA_lang($strBZipDumpWarning, $functions)); } @@ -473,7 +473,7 @@ function perform_config_checks() // requires zip_open in import // if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) { - messages_set('warning', 'ZipDump_import', + messages_set('error', 'ZipDump_import', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpImportWarning, 'zip_open')); } @@ -483,7 +483,7 @@ function perform_config_checks() // requires gzcompress in export // if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) { - messages_set('warning', 'ZipDump_export', + messages_set('error', 'ZipDump_export', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpExportWarning, 'gzcompress')); } diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php index 27e4b7f..ed7694e 100644 --- a/test/PMA_Message_test.php +++ b/test/PMA_Message_test.php @@ -80,15 +80,6 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase } /** - * test warning method - */ - public function testWarning() - { - $this->object = new PMA_Message('test<&>', PMA_Message::WARNING); - $this->assertEquals($this->object, PMA_Message::warning('test<&>')); - } - - /** * test notice method */ public function testNotice() @@ -359,8 +350,6 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase $this->assertEquals('success', $this->object->getLevel()); $this->object->setNumber(PMA_Message::ERROR); $this->assertEquals('error', $this->object->getLevel()); - $this->object->setNumber(PMA_Message::WARNING); - $this->assertEquals('warning', $this->object->getLevel()); } /** diff --git a/test/theme.php b/test/theme.php index 098feed..d49a577 100644 --- a/test/theme.php +++ b/test/theme.php @@ -187,15 +187,6 @@ echo sprintf(__('Welcome to %s'), <h1>Notice message box header!</h1> notice message box content! </div> - -<div class="warning"> - warning message box content! -</div> -<div class="warning"> - <h1>Warning message box header!</h1> - warning message box content! -</div> - <div class="error"> error message box content! </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-671-g0bb27cc
by Michal Čihař 04 May '11

04 May '11

The branch, master has been updated via 0bb27cc5fb23279a154d760ace3cd77a9abaaf1a (commit) via ba820895f40bfbd50bc5ed688a27b9c49a718db8 (commit) via 8d26b396d7ed740ee34b9facf998fed823cb85f9 (commit) via 8ddb96dd67ae48687b0a704a6baadbafd7b9f602 (commit) via eb721b497ff1f1cde41b3112628f6bb3cdd7066a (commit) via e63a28ad8b419a2fbea6e6d74fc639f30fbbbfd1 (commit) via aa3422e7c67cefad5e625beaf331616a0ae7e675 (commit) via 89f58c57b8201ad84f992fc4049f6b6d96e097dc (commit) via 6c7c9a041c266a03a797a1c093621b8c93c79a31 (commit) via 46bb0dbd50c28a658f2b0f0e23af480a4aa28bb4 (commit) via 9b14f8d85642b10a4f227ae667e3b0b846ca564c (commit) via 2a232f84dc8f82b3a16a94e35eacc30223cea9ed (commit) via 8f0f5022e11fb56bac7416d72a475ae8077c9237 (commit) via 7c015b18c78f7841dd3be94b481758b72840aa19 (commit) via ab2ab71513408cd8b33d09a5070a4f216bec4e05 (commit) from 8262e36f3d5bdf3252aa28c8660f545c3e1071f2 (commit) - Log ----------------------------------------------------------------- commit 0bb27cc5fb23279a154d760ace3cd77a9abaaf1a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 4 12:02:25 2011 +0200 Fix format string commit ba820895f40bfbd50bc5ed688a27b9c49a718db8 Merge: 8d26b396d7ed740ee34b9facf998fed823cb85f9 8262e36f3d5bdf3252aa28c8660f545c3e1071f2 Author: Pootle server <pootle(a)cihar.com> Date: Wed May 4 10:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 8d26b396d7ed740ee34b9facf998fed823cb85f9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:27:17 2011 +0200 Translation update done using Pootle. commit 8ddb96dd67ae48687b0a704a6baadbafd7b9f602 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:22:40 2011 +0200 Translation update done using Pootle. commit eb721b497ff1f1cde41b3112628f6bb3cdd7066a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:22:25 2011 +0200 Translation update done using Pootle. commit e63a28ad8b419a2fbea6e6d74fc639f30fbbbfd1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:21:39 2011 +0200 Translation update done using Pootle. commit aa3422e7c67cefad5e625beaf331616a0ae7e675 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:21:00 2011 +0200 Translation update done using Pootle. commit 89f58c57b8201ad84f992fc4049f6b6d96e097dc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:20:17 2011 +0200 Translation update done using Pootle. commit 6c7c9a041c266a03a797a1c093621b8c93c79a31 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:18:51 2011 +0200 Translation update done using Pootle. commit 46bb0dbd50c28a658f2b0f0e23af480a4aa28bb4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:18:13 2011 +0200 Translation update done using Pootle. commit 9b14f8d85642b10a4f227ae667e3b0b846ca564c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:17:41 2011 +0200 Translation update done using Pootle. commit 2a232f84dc8f82b3a16a94e35eacc30223cea9ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:15:26 2011 +0200 Translation update done using Pootle. commit 8f0f5022e11fb56bac7416d72a475ae8077c9237 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:14:43 2011 +0200 Translation update done using Pootle. commit 7c015b18c78f7841dd3be94b481758b72840aa19 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:14:20 2011 +0200 Translation update done using Pootle. commit ab2ab71513408cd8b33d09a5070a4f216bec4e05 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 4 10:13:58 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/po/ja.po b/po/ja.po index c0c1c04..0524c6d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-03 15:26+0200\n" +"PO-Revision-Date: 2011-05-04 10:27+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -3262,7 +3262,7 @@ msgstr "" #: libraries/config/messages.inc.php:294 msgid "Login cookie store" -msgstr "ログインクッキーの保存" +msgstr "ログインクッキーの保存期間" #: libraries/config/messages.inc.php:295 msgid "Define how long (in seconds) a login cookie is valid" @@ -6841,12 +6841,18 @@ msgid "" "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" +"お使いの PHP のパラメータ " +"[a@http://php.net/manual/ja/session.configuration.php#ini.session.gc-" +"maxlifetime(a)]session.gc_maxlifetime[/a] が、phpMyAdmin " +"に設定されているクッキーの有効期間より短くなっています。このため、phpMyAdmin に設定されているよりも早くログインの期限が切れます。" #: main.php:288 msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" +"ログインクッキーの保存期間が、phpMyAdmin に設定されているクッキーの有効期間よりも短くなっています。このため、phpMyAdmin " +"に設定されているよりも早くログインの期限が切れます。" #: main.php:296 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." @@ -6860,6 +6866,8 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"セットアップスクリプトで使用される [code]config[/code] ディレクトリが、まだ phpMyAdmin " +"ディレクトリに存在しています。phpMyAdmin を設定し終えたら、それは削除するべきです。" #: main.php:313 #, php-format @@ -6878,6 +6886,8 @@ msgid "" "functionality will be missing. For example navigation frame will not refresh " "automatically." msgstr "" +"お使いのブラウザでは Javascript のサポートが不足しているか無効になっているので、phpMyAdmin " +"のいくつかの機能が失われます。例えば、ナビゲーションフレームが自動的に更新されません。" #: main.php:343 #, php-format @@ -8706,7 +8716,7 @@ msgstr "データの同期" #: server_synchronize.php:399 server_synchronize.php:838 msgid "not present" -msgstr "" +msgstr "存在しません" #: server_synchronize.php:423 server_synchronize.php:866 msgid "Structure Difference" @@ -8746,11 +8756,11 @@ msgstr "行の挿入" #: server_synchronize.php:445 server_synchronize.php:889 msgid "Would you like to delete all the previous rows from target tables?" -msgstr "" +msgstr "対象先のテーブルから古い行を全て削除しますか？" #: server_synchronize.php:448 server_synchronize.php:893 msgid "Apply Selected Changes" -msgstr "" +msgstr "選択された変更を適用する" #: server_synchronize.php:450 server_synchronize.php:895 msgid "Synchronize Databases" @@ -9011,6 +9021,8 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"%sログインクッキーの有効期間%sが 1440 秒を超えています。%ssession.gc_maxlifetime%s がその値 (現在 %d) " +"より低い場合、セッションがランダムに無効化される原因となります。" #: setup/lib/index.lib.php:262 #, php-format @@ -9018,6 +9030,8 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" +"%sログインクッキーの有効期間%sは最大で 1800 秒 (30 分) に設定する必要があります。1800 " +"より大きい値は、偽装などのセキュリティリスクを引き起こす可能性があります。" #: setup/lib/index.lib.php:264 #, php-format @@ -9025,6 +9039,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" +"cookie 認証を使用していて且つ%sログインクッキーの保存期間%sを 0 にしていない場合、%sログインクッキーの有効期間%" +"sは保存期間の値以下に設定する必要があります。" #: setup/lib/index.lib.php:266 #, php-format @@ -9057,14 +9073,14 @@ msgstr "" msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." -msgstr "" +msgstr "%sZip 圧縮%sには関数 (%s) が必要ですが、このシステムで使用できません。" #: setup/lib/index.lib.php:272 #, php-format msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." -msgstr "" +msgstr "%sZip 解凍%sには関数 (%s) が必要ですが、このシステムで使用できません。" #: setup/lib/index.lib.php:296 msgid "You should use SSL connections if your web server supports it." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-656-g8262e36
by Michal Čihař 04 May '11

04 May '11

The branch, master has been updated via 8262e36f3d5bdf3252aa28c8660f545c3e1071f2 (commit) from 73c57b099e8b2d2c99fcb4d0888dcc40f4dd366a (commit) - Log ----------------------------------------------------------------- commit 8262e36f3d5bdf3252aa28c8660f545c3e1071f2 Author: Martín Palombo <martin-palombo@launchpad> Date: Wed May 4 10:05:15 2011 +0200 Do not load all tables into memory, we need only slice. Reported with patch at https://bugs.launchpad.net/ubuntu/+source/phpmyadmin/+bug/754647 ----------------------------------------------------------------------- Summary of changes: navigation.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/navigation.php b/navigation.php index 167c060..ea77489 100644 --- a/navigation.php +++ b/navigation.php @@ -246,8 +246,8 @@ $element_counter = 0; if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { - $table_list = PMA_getTableList($GLOBALS['db']); - $table_count = count($table_list); + $table_list = PMA_getTableList($GLOBALS['db'], null, $tpos, $cfg['MaxTableList']); + $table_count = PMA_getTableCount($GLOBALS['db']); // show selected databasename as link to DefaultTabDatabase-page // with table count in () @@ -284,7 +284,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * user can find a navigator to page thru all tables. * */ - $table_list = array_slice($table_list, $tpos, $cfg['MaxTableList']); if (! empty($table_list)) { // upper table list paginator if (count($table_list) <= $GLOBALS['cfg']['MaxTableList'] && $table_count > $GLOBALS['cfg']['MaxTableList']) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2b7a3813a2801f5047081c5725d3b7df74ab8e72
by Michal Čihař 04 May '11

04 May '11

The branch, master has been updated via 2b7a3813a2801f5047081c5725d3b7df74ab8e72 (commit) via 74ebe2ff21504e574c74423f2a882e68b8d72f03 (commit) via 7a4ff035e0e569eb9eb058ea3678cdbeb98efc5a (commit) via 2ebc71b3739bcc43660fcaefe0be1194989824e2 (commit) via 238c420c5c7b0d5c845862ae2fda4bf74b16cab0 (commit) via 5406c906eb4e28021d63b1eccf3fd88822dbbda4 (commit) via 33ffaf6064d67da49735645a83f18170c9f98785 (commit) via 4ecfd39ca551ee057f1236315ea7bf52a59e6f72 (commit) via caa47c08ffe35ffd4cb55aba33360d66ae040ce5 (commit) via 54523bb381620743f588a793fcf3f3bce11da5ce (commit) via 9721227c8a837825e178a4035fc8fcb2c6b3ddcc (commit) via 32cb0de0d4d4ecb7298e960aef2c55072b28a1bd (commit) via 5cb4d3042801387a2dd9a86a7b299318ed8c80dd (commit) via 3e0e3e5f3b75af3e8b97d177ff9655008d8470da (commit) via bffee8cdd68cd6b3f17e10b39f1aed1d86115553 (commit) via becbdc21388efdcb99ef108a750f4c6930f41bcb (commit) via 07849a137428f7faa47486205169ff7eaf5672ea (commit) via c2b3d66a43a56edd231603c7fd3cdf2664490805 (commit) via 27a504aa4e31d82e846e98ec1324d00b5a6852a5 (commit) via 552d58b710ccd6b04c8282ffffb769ab366d6acf (commit) via 91be0a0757d1bd3440682e95751b608274bc0e8b (commit) via ea1d04a938dfaf7c97a4db280931ce19744c47ed (commit) via 4082318f60d00f5eea1b3cb38a8a75e0fab858bb (commit) via 750ab157249799e5c3bb623e4da31918e780dce4 (commit) via bd9c78778ff4b3dee67b62e0de857a66a4729315 (commit) via 7f8763d28b5f25483c9900819297d4713a393c74 (commit) via 5b2b83c94924a79fb597a7d2fe09ce667b1e2568 (commit) via 61829c1e72416d28c1f9c9c9f203509c15fe52f9 (commit) via f5d9b4f9695b6fb3d5df86d1e44b8762e6eba509 (commit) via f44365aa0f4c5d4d65c9338a46839c7ba1ef969c (commit) via f1a7b027be6c328945cdd38fdeda32a30665b929 (commit) via a47eb19862789192a8dd3b661c89b000dc2256da (commit) via 19f6de959ba23db797419aac833da174c1fff688 (commit) via 448ff9160e75d935d335e14cea45711901374f19 (commit) via 0a2103e5071c0296a04c9f8fbf3acb06fae23ec5 (commit) via 74d54a82c431dcb7dafd309cb5c68b009a732a3e (commit) via 80167aea7449d559643f050cb99a65a8637e3d76 (commit) via b546a69a9f885398f624aaca5406f98b33bf6846 (commit) via 37f089a2363249813e2d48bed99574fab40b80c1 (commit) via 0133218e1f47bae0c551fd62ccadf4c444e8bbd0 (commit) via 561fc62c7fa6e1814c418f77d1662854f4cf2a0c (commit) via d1f00d794b2215d65125e04b5a78601127239acd (commit) via 723744a021c78c2db087f84f50d048cbb6c3d8ad (commit) via 8703a97f0802b64409ac3cef06ee4122a608ffb2 (commit) via a26199948bcc29583914e5459bcd94c9f617783f (commit) via 482ae17275e8bfb0fba85deb84cf6aebf97be6b4 (commit) via 7d2a481680748792720cbe632f0c15a1bbba40d5 (commit) via db706c1cfa7f238c3c4d54f79c2430d5551d7de1 (commit) via 034fdaf01705250d1fa0a13ad10ebcd4884c2fac (commit) via a520a33d05d89d586f80a091bb409db3c1949534 (commit) via 52d3cc7ce7fb9048bffe823cd7a8c9472535cc9f (commit) via 592e4be1b2dcabec2f52c28849080cbeb724ee9f (commit) via 72fbab14ddd490b13f565518addc3d57c483c45f (commit) via e949eec8522d15eb9497a016f484bfecc9504571 (commit) via 72250e4fe24b1148b26398faf001726ed14da024 (commit) via 426274d074215a65e3b7f5b522ce0cccfbe102ce (commit) via 380e24719621937dc9de93589c13177406d158cb (commit) via 06bcef54c0045cd74fcc09889a17436ed7e8afda (commit) via dc3f74ac411e6f7dbc11f391a14761d57272f352 (commit) via 39255add7de64893135c236f188137f3bb3b5a38 (commit) via 4a284e054044efb6461cb3e8cb2fe4eb3e1398a3 (commit) via 211587838b12c90676b117687fc6294776f863f9 (commit) via 6e777cf5902cbfd099d0835df6195965a2785860 (commit) via de8c45c13c913a626addde9159a0e4aad8ecff7d (commit) via a195eebf589ab3f39059eaa75428a2e41f6e18e7 (commit) via ae1eafbc71324a7c2232cc531937849271e91596 (commit) from 2cc74d228db1c42481b01df58ddbc4be61d84105 (commit) - Log ----------------------------------------------------------------- commit 2b7a3813a2801f5047081c5725d3b7df74ab8e72 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 4 09:47:18 2011 +0200 Generate docs commit 74ebe2ff21504e574c74423f2a882e68b8d72f03 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:45:44 2011 +0200 Translation update done using Pootle. commit 7a4ff035e0e569eb9eb058ea3678cdbeb98efc5a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:41:04 2011 +0200 Translation update done using Pootle. commit 2ebc71b3739bcc43660fcaefe0be1194989824e2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:40:17 2011 +0200 Translation update done using Pootle. commit 238c420c5c7b0d5c845862ae2fda4bf74b16cab0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:39:51 2011 +0200 Translation update done using Pootle. commit 5406c906eb4e28021d63b1eccf3fd88822dbbda4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:39:23 2011 +0200 Translation update done using Pootle. commit 33ffaf6064d67da49735645a83f18170c9f98785 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:39:04 2011 +0200 Translation update done using Pootle. commit 4ecfd39ca551ee057f1236315ea7bf52a59e6f72 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:38:45 2011 +0200 Translation update done using Pootle. commit caa47c08ffe35ffd4cb55aba33360d66ae040ce5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:38:30 2011 +0200 Translation update done using Pootle. commit 54523bb381620743f588a793fcf3f3bce11da5ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:38:06 2011 +0200 Translation update done using Pootle. commit 9721227c8a837825e178a4035fc8fcb2c6b3ddcc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:34:42 2011 +0200 Translation update done using Pootle. commit 32cb0de0d4d4ecb7298e960aef2c55072b28a1bd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:34:41 2011 +0200 Translation update done using Pootle. commit 5cb4d3042801387a2dd9a86a7b299318ed8c80dd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:33:58 2011 +0200 Translation update done using Pootle. commit 3e0e3e5f3b75af3e8b97d177ff9655008d8470da Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:33:43 2011 +0200 Translation update done using Pootle. commit bffee8cdd68cd6b3f17e10b39f1aed1d86115553 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:33:22 2011 +0200 Translation update done using Pootle. commit becbdc21388efdcb99ef108a750f4c6930f41bcb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:33:09 2011 +0200 Translation update done using Pootle. commit 07849a137428f7faa47486205169ff7eaf5672ea Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:32:07 2011 +0200 Translation update done using Pootle. commit c2b3d66a43a56edd231603c7fd3cdf2664490805 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:29:05 2011 +0200 Translation update done using Pootle. commit 27a504aa4e31d82e846e98ec1324d00b5a6852a5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:26:33 2011 +0200 Translation update done using Pootle. commit 552d58b710ccd6b04c8282ffffb769ab366d6acf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:26:29 2011 +0200 Translation update done using Pootle. commit 91be0a0757d1bd3440682e95751b608274bc0e8b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:26:22 2011 +0200 Translation update done using Pootle. commit ea1d04a938dfaf7c97a4db280931ce19744c47ed Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:26:17 2011 +0200 Translation update done using Pootle. commit 4082318f60d00f5eea1b3cb38a8a75e0fab858bb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:25:05 2011 +0200 Translation update done using Pootle. commit 750ab157249799e5c3bb623e4da31918e780dce4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:24:56 2011 +0200 Translation update done using Pootle. commit bd9c78778ff4b3dee67b62e0de857a66a4729315 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:24:40 2011 +0200 Translation update done using Pootle. commit 7f8763d28b5f25483c9900819297d4713a393c74 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:24:31 2011 +0200 Translation update done using Pootle. commit 5b2b83c94924a79fb597a7d2fe09ce667b1e2568 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:23:55 2011 +0200 Translation update done using Pootle. commit 61829c1e72416d28c1f9c9c9f203509c15fe52f9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:23:48 2011 +0200 Translation update done using Pootle. commit f5d9b4f9695b6fb3d5df86d1e44b8762e6eba509 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:23:12 2011 +0200 Translation update done using Pootle. commit f44365aa0f4c5d4d65c9338a46839c7ba1ef969c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:22:35 2011 +0200 Translation update done using Pootle. commit f1a7b027be6c328945cdd38fdeda32a30665b929 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:22:03 2011 +0200 Translation update done using Pootle. commit a47eb19862789192a8dd3b661c89b000dc2256da Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:21:41 2011 +0200 Translation update done using Pootle. commit 19f6de959ba23db797419aac833da174c1fff688 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:21:24 2011 +0200 Translation update done using Pootle. commit 448ff9160e75d935d335e14cea45711901374f19 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:20:31 2011 +0200 Translation update done using Pootle. commit 0a2103e5071c0296a04c9f8fbf3acb06fae23ec5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:18:58 2011 +0200 Translation update done using Pootle. commit 74d54a82c431dcb7dafd309cb5c68b009a732a3e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:18:09 2011 +0200 Translation update done using Pootle. commit 80167aea7449d559643f050cb99a65a8637e3d76 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:17:42 2011 +0200 Translation update done using Pootle. commit b546a69a9f885398f624aaca5406f98b33bf6846 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:17:29 2011 +0200 Translation update done using Pootle. commit 37f089a2363249813e2d48bed99574fab40b80c1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:17:03 2011 +0200 Translation update done using Pootle. commit 0133218e1f47bae0c551fd62ccadf4c444e8bbd0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:15:19 2011 +0200 Translation update done using Pootle. commit 561fc62c7fa6e1814c418f77d1662854f4cf2a0c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 08:12:58 2011 +0200 Translation update done using Pootle. commit d1f00d794b2215d65125e04b5a78601127239acd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 07:46:49 2011 +0200 Translation update done using Pootle. commit 723744a021c78c2db087f84f50d048cbb6c3d8ad Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 07:46:06 2011 +0200 Translation update done using Pootle. commit 8703a97f0802b64409ac3cef06ee4122a608ffb2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 07:45:46 2011 +0200 Translation update done using Pootle. commit a26199948bcc29583914e5459bcd94c9f617783f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 07:43:31 2011 +0200 Translation update done using Pootle. commit 482ae17275e8bfb0fba85deb84cf6aebf97be6b4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 07:40:57 2011 +0200 Translation update done using Pootle. commit 7d2a481680748792720cbe632f0c15a1bbba40d5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:59:02 2011 +0200 Translation update done using Pootle. commit db706c1cfa7f238c3c4d54f79c2430d5551d7de1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:58:36 2011 +0200 Translation update done using Pootle. commit 034fdaf01705250d1fa0a13ad10ebcd4884c2fac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:56:08 2011 +0200 Translation update done using Pootle. commit a520a33d05d89d586f80a091bb409db3c1949534 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:22:01 2011 +0200 Translation update done using Pootle. commit 52d3cc7ce7fb9048bffe823cd7a8c9472535cc9f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:16:28 2011 +0200 Translation update done using Pootle. commit 592e4be1b2dcabec2f52c28849080cbeb724ee9f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:15:55 2011 +0200 Translation update done using Pootle. commit 72fbab14ddd490b13f565518addc3d57c483c45f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:12:19 2011 +0200 Translation update done using Pootle. commit e949eec8522d15eb9497a016f484bfecc9504571 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:12:06 2011 +0200 Translation update done using Pootle. commit 72250e4fe24b1148b26398faf001726ed14da024 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:11:35 2011 +0200 Translation update done using Pootle. commit 426274d074215a65e3b7f5b522ce0cccfbe102ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:08:55 2011 +0200 Translation update done using Pootle. commit 380e24719621937dc9de93589c13177406d158cb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:08:32 2011 +0200 Translation update done using Pootle. commit 06bcef54c0045cd74fcc09889a17436ed7e8afda Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:07:48 2011 +0200 Translation update done using Pootle. commit dc3f74ac411e6f7dbc11f391a14761d57272f352 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:02:58 2011 +0200 Translation update done using Pootle. commit 39255add7de64893135c236f188137f3bb3b5a38 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 05:02:28 2011 +0200 Translation update done using Pootle. commit 4a284e054044efb6461cb3e8cb2fe4eb3e1398a3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:58:33 2011 +0200 Translation update done using Pootle. commit 211587838b12c90676b117687fc6294776f863f9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:57:38 2011 +0200 Translation update done using Pootle. commit 6e777cf5902cbfd099d0835df6195965a2785860 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:52:51 2011 +0200 Translation update done using Pootle. commit de8c45c13c913a626addde9159a0e4aad8ecff7d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:46:54 2011 +0200 Translation update done using Pootle. commit a195eebf589ab3f39059eaa75428a2e41f6e18e7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:46:36 2011 +0200 Translation update done using Pootle. commit ae1eafbc71324a7c2232cc531937849271e91596 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed May 4 04:44:29 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/zh_CN/Documentation.html | 187 +++++++++++++++++---------------------- po/zh_CN.po | 163 +++++++++++++++++----------------- 2 files changed, 165 insertions(+), 185 deletions(-) diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index fd9552a..27f991e 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -1110,78 +1110,65 @@ session_save_path (外链，英语)</a>)。</dd> <dd>标记正在使用的表以使得可以显示含有已锁定表的数据库 (自 MySQL 3.23.30 起) 。</dd> <dt id="cfg_ShowSQL">$cfg['ShowSQL'] 布尔</dt> - <dd>Defines whether <abbr title="structured query language">SQL</abbr> queries -generated by phpMyAdmin should be displayed or not.</dd> - - <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] boolean</dt> - <dd>Defines whether normal users (non-administrator) are allowed to delete their -own database or not. If set as FALSE, the link "Drop Database" -will not be shown, and even a "DROP DATABASE mydatabase" will be -rejected. Quite practical for <abbr title="Internet service -provider">ISP</abbr>'s with many customers.<br /> - Please note that this limitation of SQL queries is not as strict as when -using MySQL privileges. This is due to nature of SQL queries which might be -quite complicated. So this choice should be viewed as help to avoid -accidental dropping rather than strict privilege limitation.</dd> - - <dt id="cfg_Confirm">$cfg['Confirm'] boolean</dt> - <dd>Whether a warning ("Are your really sure...") should be displayed -when you're about to lose data.</dd> - - <dt id="cfg_LoginCookieRecall">$cfg['LoginCookieRecall'] boolean</dt> - <dd>Define whether the previous login should be recalled or not in cookie -authentication mode.<br /><br /> - - This is automatically disabled if you do not have configured <tt><a -href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>. + <dd>设置是否显示 phpMyAdmin 生成的 <abbr title="结构化查询语言 (structured query +language)">SQL</abbr> 查询语句。</dd> + + <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] 布尔</dt> + <dd>设置普通用户 (非管理员) 是否可以删除他们自己的数据库。若设为 FALSE，链接 "删除数据库" +将不会显示出来，"DROP DATABASE 我的数据库名" 语句也会被忽略。该功能对于有很多客户的 <abbr +title="互联网服务提供商 (Internet service provider)">ISP</abbr> 相当有用。<br /> + 请注意这里对 SQL 查询的限制并不能像使用 MySQL 权限限制那样严格。因为 SQL +查询可以非常复杂。所以该功能应作为避免误删除数据库而不是严格的权限限制来使用。</dd> + + <dt id="cfg_Confirm">$cfg['Confirm'] 布尔</dt> + <dd>设置当查询可能丢失数据时是否显示警告 ("您真的要 ...") 。</dd> + + <dt id="cfg_LoginCookieRecall">$cfg['LoginCookieRecall'] 布尔</dt> + <dd>设置在 cookie 认证下是否能自动重复上次登录。<br /><br /> + + 如果没有设置 <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt> +该功能将自动禁用。 </dd> - <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] integer [number of seconds]</dt> - <dd>Define how long is login cookie valid. Please note that php configuration -option <a + <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] 整数 [单位: 秒]</dt> + <dd>设置登录 cookie 的有效期。请注意 PHP 配置选项的 <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifeti…">session.gc_maxlifetime</a> -might limit session validity and if session is lost, login cookie is also -invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> -not lower than the value of $cfg['LoginCookieValidity'].</dd> +可能会限制会话有效期，若会话失效 cookie 同样会失效。所以最好将 <code>session.gc_maxlifetime</code> +设置为不小于 $cfg['LoginCookieValidity'] 的值。</dd> - <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> + <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] 整数 [单位: 秒]</dt> <dd>设置登录 cookie 应在浏览器中保存多长时间。默认值 0 表示当前会话。建议在公共环境下使用。</dd> - <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] boolean</dt> - <dd>If enabled (default), logout deletes cookies for all servers, otherwise only -for current one. Setting this to false makes it easy to forget to log out -from other server, when you are using more of them.</dd> + <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] 布尔</dt> + <dd>若启用 (默认值)，退出时将会删除所有服务器的 cookies，否则仅删除当前服务器的 cookies 。若设为 +false，当你访问多台服务器时可能会容易忘记退出其它服务器。</dd> - <dt id="cfg_UseDbSearch">$cfg['UseDbSearch'] boolean</dt> - <dd>Define whether the "search string inside database" is enabled or not.</dd> + <dt id="cfg_UseDbSearch">$cfg['UseDbSearch'] 布尔</dt> + <dd>设置是否允许使用 "数据库搜索" 。</dd> - <dt id="cfg_IgnoreMultiSubmitErrors">$cfg['IgnoreMultiSubmitErrors'] boolean</dt> - <dd>Define whether phpMyAdmin will continue executing a multi-query statement if -one of the queries fails. Default is to abort execution.</dd> + <dt id="cfg_IgnoreMultiSubmitErrors">$cfg['IgnoreMultiSubmitErrors'] 布尔</dt> + <dd>设置 phpMyAdmin 是否在执行多语句查询出错的时候继续执行。默认为中断执行。</dd> - <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt> + <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] 布尔</dt> <dd>Define whether phpMyAdmin will output the results of each query of a multi-query statement embedded into the <abbr title="structured query language">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>.</dd> <dt id="AllowArbitraryServer"> - <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> -boolean</dt> - <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and -permits to specify servers of your choice in the Synchronize dialog. + <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> 布尔</dt> + <dd>若启用，将允许通过 cookie 认证登录到任意服务器并允许在同步对话框中指定服务器。 <br /><br /> - <b>NOTE:</b> Please use this carefully, as this may allow users access to -MySQL servers behind the firewall where your <abbr title="HyperText Transfer -Protocol">HTTP</abbr> server is placed. + <b>注意:</b> 请谨慎使用该功能，这将可能导致用户访问到位于 <abbr title="超文本转移协议 (HyperText Transfer +Protocol)">HTTP</abbr> 服务器防火墙后面的 MySQL 服务器。 </dd> <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] 布尔</dt> - <dd>Whether to display errors from PHP or not.</dd> + <dd>设置是否显示 PHP 错误。</dd> <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] 布尔</dt> - <dd>Whether to gather errors from PHP or not.</dd> + <dd>设置是否收集 PHP 错误。</dd> - <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] 布尔</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can use the feature to display nested folders using <a @@ -1341,22 +1328,19 @@ in edit/insert mode. Since version 2.10, the user can toggle this setting from the interface. </dd> - <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] boolean</dt> + <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] 布尔</dt> <dd>Defines whether or not type fields should be initially displayed in edit/insert mode. The user can toggle this setting from the interface. </dd> <dt id="cfg_CharEditing">$cfg['CharEditing'] string</dt> - <dd>Defines which type of editing controls should be used for CHAR and VARCHAR -columns. Possible values are: - <ul><li>input - this allows to limit size of text to size of columns in MySQL, but -has problems with newlines in columns</li> - <li>textarea - no problems with newlines in columns, but also no length -limitations</li> + <dd>设置编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件。可选值为: + <ul><li>输入框 (input) - 允许限制输入字数使其不超过 MySQL 字段限制，但无法换行</li> + <li>文本框 (textarea) - 可以换行，但没有字数限制</li> </ul> - Default is old behavior so input.</dd> + 默认为输入框 (input) 。</dd> - <dt id="cfg_InsertRows">$cfg['InsertRows'] integer</dt> + <dt id="cfg_InsertRows">$cfg['InsertRows'] 整数</dt> <dd>Defines the maximum number of concurrent entries for the Insert page.</dd> <dt id="cfg_ForeignKeyMaxLimit">$cfg['ForeignKeyMaxLimit'] integer</dt> @@ -1371,14 +1355,13 @@ offering both the key and value data. The contents of the array should be one or both of the following strings: <i>'content-id'</i>, <i>'id-content'</i>.</dd> - <dt><span id="cfg_ZipDump">$cfg['ZipDump'] </span>boolean<br /> - <span id="cfg_GZipDump">$cfg['GZipDump'] </span>boolean<br /> - <span id="cfg_BZipDump">$cfg['BZipDump'] </span>boolean + <dt><span id="cfg_ZipDump">$cfg['ZipDump'] </span>布尔<br /> + <span id="cfg_GZipDump">$cfg['GZipDump'] </span>布尔<br /> + <span id="cfg_BZipDump">$cfg['BZipDump'] </span>布尔 </dt> - <dd>Defines whether to allow the use of zip/GZip/BZip2 compression when creating -a dump file</dd> + <dd>设置在创建转储文件时是否允许使用 zip/GZip/BZip2 压缩</dd> - <dt><span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>boolean<br /> + <dt><span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>布尔<br /> </dt> <dd>Defines whether to allow on the fly compression for GZip/BZip2 compressed exports. This doesn't affect smaller dumps and allows users to create larger @@ -1449,24 +1432,21 @@ locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. href="http://dev.mysql.com/doc/mysql/en/charset-charsets.html">MySQL documentation</a> for list of possible values.</dd> - <dt id="cfg_Lang">$cfg['Lang'] string</dt> - <dd>Force language to use.<br /> + <dt id="cfg_Lang">$cfg['Lang'] 字符串</dt> + <dd>强制使用的语言。<br /> The corresponding language file needs to be in locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. </dd> - <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] string</dt> - <dd>Limit list of available languages to those matching the given regular -expression. For example if you want only Czech and English, you should set -filter to <code>'^(cs|en)'</code>.</dd> - - <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] string</dt> - <dd>You can select here which functions will be used for character set -conversion. Possible values are: - <ul><li>auto - automatically use available one (first is tested iconv, then recode)</li> - <li>iconv - use iconv or libiconv functions</li> - <li>recode - use recode_string function</li> - <li>none - disable encoding conversion</li> + <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] 字符串</dt> + <dd>通过正则表达式限制可用语言列表。例如只允许使用简体中文和英语，可以设置为 <code>'^(zh_CN|en)'</code>。</dd> + + <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] 字符串</dt> + <dd>你可以在这里选择使用哪个函数来转换字符集。可选值为: + <ul><li>自动 (auto) - 自动选择可用的函数 (首先尝试 iconv，然后 recode)</li> + <li>iconv - 使用 iconv 或 libiconv 函数</li> + <li>recode - 使用 recode_string 函数</li> + <li>无 (none) - 禁止编码转换</li> </ul> Default is auto.</dd> <dd> @@ -1538,17 +1518,17 @@ have problems with long URLs. Default is <code>1000</code>. <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS -color for background]<br /> - <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS -color for background] + <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> 字符串 [格式: CSS +背景色]<br /> + <span id="cfg_MainBackground">$cfg['MainBackground']</span> 字符串 [格式: CSS +背景色] </dt> <dd>The background styles used for both the frames. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br /> - <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS -color]</dt> + <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] 字符串 [格式: CSS 背景色]<br /> + <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> 字符串 [格式: CSS +颜色]</dt> <dd>The style used for the pointer in the navi frame. See <tt>themes/themename/layout.inc.php</tt>.</dd> @@ -1560,29 +1540,29 @@ color]</dt> <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br /> - <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt> + <dt id="cfg_ThBackground">$cfg['ThBackground'] 字符串 [格式: CSS 背景色]<br /> + <span id="cfg_ThColor">$cfg['ThColor']</span> 字符串 [格式: CSS 颜色]</dt> <dd>The style used for table headers. See <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt> + <dt id="cfg_BgcolorOne">$cfg['BgOne'] 字符串 [格式: CSS 颜色]</dt> <dd>The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt> + <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] 字符串 [格式: CSS 颜色]</dt> <dd>The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</tt>. </dd> <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string -[CSS color]<br /> +</span>字符串 [格式: CSS 颜色]<br /> + <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>字符串 [格式: +CSS 颜色]<br /> <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string -[CSS color] +</span>字符串 [格式: CSS 颜色]<br /> + <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>字符串 [格式: +CSS 颜色] </dt> <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br /> The former feature highlights the row over which your mouse is passing and @@ -1643,7 +1623,7 @@ both at the left and at the right). "Left" and "right" are parsed as "top" and "bottom" with vertical display mode.</dd> - <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string</dt> + <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] 字符串</dt> <dd>There are 3 display modes: horizontal, horizontalflipped and vertical. Define which one is displayed by default. The first mode displays each row on a horizontal line, the second rotates the headers by 90 degrees, so you @@ -1652,7 +1632,7 @@ and still print them out. The vertical mode sorts each row on a vertical lineup. </dd> - <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt> + <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] 字符串</dt> <dd> The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using 'css' the rotation of the header for horizontalflipped is done via CSS. The CSS @@ -1795,7 +1775,7 @@ similar to texts seen on export page, so you can easily identify what they mean. </dd> - <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt> + <dt id="cfg_Export_method">$cfg['Export']['method'] 字符串</dt> <dd> Defines how the export form is displayed when it loads. Valid values are: <ul> @@ -1902,7 +1882,7 @@ Database view, for the table list.</dd> state. A value of <tt>'open'</tt> does the reverse. To completely disable all visual sliders, use <tt>'disabled'</tt>.</dd> - <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] array</dt> + <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] 数组</dt> <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array) that users can't set through user preferences. For possible values, refer to <tt>libraries/config/user_preferences.forms.php</tt>.</dd> @@ -2278,9 +2258,8 @@ phpMyAdmin 的特性和接口方面的信息。</p> <h3 id="faqserver">服务器</h3> <h4 id="faq1_1"> - <a href="#faq1_1">1.1 My server is crashing each time a specific action is -required or phpMyAdmin sends a blank page or a page full of cryptic -characters to my browser, what can I do?</a></h4> + <a href="#faq1_1">1.1 我的服务器不是在处理特定请求时崩溃就是 phpMyAdmin +发送空白页面或者都是乱码的页面，我该怎么办？</a></h4> <p> 在 <i>config.inc.php</i> 文件中将 <a href="#cfg_OBGzip" class="configurule">$cfg['OBGzip']</a> 显式地设为 <tt>FALSE</tt>，同时将 PHP 配置文件中的 diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f93d3e..1dc8b69 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: 2011-04-21 14:32+0300\n" -"PO-Revision-Date: 2011-05-03 08:22+0200\n" +"PO-Revision-Date: 2011-05-04 08:45+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -3418,11 +3418,13 @@ msgid "" "Defines whether <abbr title=\"structured query language\">SQL</abbr> queries " "generated by phpMyAdmin should be displayed or not." msgstr "" +"设置是否显示 phpMyAdmin 生成的 <abbr title=\"结构化查询语言 (structured query " +"language)\">SQL</abbr> 查询语句。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1367 msgid "$cfg['AllowUserDropDatabase'] boolean" -msgstr "" +msgstr "$cfg['AllowUserDropDatabase'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1368 @@ -3433,6 +3435,9 @@ msgid "" "rejected. Quite practical for <abbr title=\"Internet service provider\">ISP</" "abbr>'s with many customers." msgstr "" +"设置普通用户 (非管理员) 是否可以删除他们自己的数据库。若设为 FALSE，链接 "删除数据库" " +"将不会显示出来，"DROP DATABASE 我的数据库名" 语句也会被忽略。该功能对于有很多客户的 <abbr " +"title=\"互联网服务提供商 (Internet service provider)\">ISP</abbr> 相当有用。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1374 @@ -3442,30 +3447,32 @@ msgid "" "quite complicated. So this choice should be viewed as help to avoid " "accidental dropping rather than strict privilege limitation." msgstr "" +"请注意这里对 SQL 查询的限制并不能像使用 MySQL 权限限制那样严格。因为 SQL " +"查询可以非常复杂。所以该功能应作为避免误删除数据库而不是严格的权限限制来使用。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1380 msgid "$cfg['Confirm'] boolean" -msgstr "" +msgstr "$cfg['Confirm'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1381 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data." -msgstr "" +msgstr "设置当查询可能丢失数据时是否显示警告 ("您真的要 ...") 。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1384 msgid "$cfg['LoginCookieRecall'] boolean" -msgstr "" +msgstr "$cfg['LoginCookieRecall'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1385 msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode." -msgstr "" +msgstr "设置在 cookie 认证下是否能自动重复上次登录。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1388 @@ -3473,11 +3480,13 @@ msgid "" "This is automatically disabled if you do not have configured <tt><a href=" "\"#cfg_blowfish_secret\">$cfg['blowfish_secret']</a></tt>." msgstr "" +"如果没有设置 <tt><a href=\"#cfg_blowfish_secret\">$cfg['blowfish_secret']</a></tt> " +"该功能将自动禁用。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1392 msgid "$cfg['LoginCookieValidity'] integer [number of seconds]" -msgstr "" +msgstr "$cfg['LoginCookieValidity'] 整数 [单位: 秒]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1393 @@ -3489,11 +3498,15 @@ msgid "" "a good idea to set <code>session.gc_maxlifetime</code> not lower than the " "value of $cfg['LoginCookieValidity']." msgstr "" +"设置登录 cookie 的有效期。请注意 PHP 配置选项的 <a " +"href=\"http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime\">session.gc_maxlifetime</a> 可能会限制会话有效期，若会话失效 cookie 同样会失效。所以最好将 " +"<code>session.gc_maxlifetime</code> 设置为不小于 $cfg['LoginCookieValidity'] 的值。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1399 msgid "$cfg['LoginCookieStore'] integer [number of seconds]" -msgstr "" +msgstr "$cfg['LoginCookieStore'] 整数 [单位: 秒]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1400 @@ -3506,7 +3519,7 @@ msgstr "设置登录 cookie 应在浏览器中保存多长时间。默认值 0 #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1404 msgid "$cfg['LoginCookieDeleteAll'] boolean" -msgstr "" +msgstr "$cfg['LoginCookieDeleteAll'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1405 @@ -3515,33 +3528,35 @@ msgid "" "for current one. Setting this to false makes it easy to forget to log out " "from other server, when you are using more of them." msgstr "" +"若启用 (默认值)，退出时将会删除所有服务器的 cookies，否则仅删除当前服务器的 cookies 。若设为 " +"false，当你访问多台服务器时可能会容易忘记退出其它服务器。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1410 msgid "$cfg['UseDbSearch'] boolean" -msgstr "" +msgstr "$cfg['UseDbSearch'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1411 msgid "Define whether the \"search string inside database\" is enabled or not." -msgstr "" +msgstr "设置是否允许使用 \"数据库搜索\" 。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1413 msgid "$cfg['IgnoreMultiSubmitErrors'] boolean" -msgstr "" +msgstr "$cfg['IgnoreMultiSubmitErrors'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1414 msgid "" "Define whether phpMyAdmin will continue executing a multi-query statement if " "one of the queries fails. Default is to abort execution." -msgstr "" +msgstr "设置 phpMyAdmin 是否在执行多语句查询出错的时候继续执行。默认为中断执行。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1417 msgid "$cfg['VerboseMultiSubmit'] boolean" -msgstr "" +msgstr "$cfg['VerboseMultiSubmit'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1418 @@ -3557,13 +3572,14 @@ msgid "" "<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> " "boolean" msgstr "" +"<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1424 msgid "" "If enabled, allows you to log in to arbitrary servers using cookie auth and " "permits to specify servers of your choice in the Synchronize dialog." -msgstr "" +msgstr "若启用，将允许通过 cookie 认证登录到任意服务器并允许在同步对话框中指定服务器。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1427 @@ -3572,6 +3588,8 @@ msgid "" "MySQL servers behind the firewall where your <abbr title=\"HyperText " "Transfer Protocol\">HTTP</abbr> server is placed." msgstr "" +"<b>注意:</b> 请谨慎使用该功能，这将可能导致用户访问到位于 <abbr title=\"超文本转移协议 (HyperText Transfer " +"Protocol)\">HTTP</abbr> 服务器防火墙后面的 MySQL 服务器。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1432 @@ -3581,7 +3599,7 @@ msgstr "$cfg['Error_Handler']['display'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1433 msgid "Whether to display errors from PHP or not." -msgstr "" +msgstr "设置是否显示 PHP 错误。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1435 @@ -3591,12 +3609,12 @@ msgstr "$cfg['Error_Handler']['gather'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1436 msgid "Whether to gather errors from PHP or not." -msgstr "" +msgstr "设置是否收集 PHP 错误。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1438 msgid "$cfg['LeftFrameLight'] boolean" -msgstr "" +msgstr "$cfg['LeftFrameLight'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1439 @@ -4007,9 +4025,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1602 -#, fuzzy msgid "$cfg['ShowFieldTypesInDataEditView'] boolean" -msgstr "$cfg['SuhosinDisableWarning'] 布尔" +msgstr "$cfg['ShowFieldTypesInDataEditView'] 布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1603 @@ -4025,37 +4042,34 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1609 -#, fuzzy msgid "" "Defines which type of editing controls should be used for CHAR and VARCHAR " "columns. Possible values are:" -msgstr "" -"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] " -"- 允许限制输入长度，[kbd]文本框 (textarea)[/kbd] - 允许输入多行数据" +msgstr "设置编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件。可选值为:" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1611 msgid "" "input - this allows to limit size of text to size of columns in MySQL, but " "has problems with newlines in columns" -msgstr "" +msgstr "输入框 (input) - 允许限制输入字数使其不超过 MySQL 字段限制，但无法换行" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1613 msgid "" "textarea - no problems with newlines in columns, but also no length " "limitations" -msgstr "" +msgstr "文本框 (textarea) - 可以换行，但没有字数限制" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1616 msgid "Default is old behavior so input." -msgstr "" +msgstr "默认为输入框 (input) 。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1618 msgid "$cfg['InsertRows'] integer" -msgstr "" +msgstr "$cfg['InsertRows'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1619 @@ -4093,29 +4107,29 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1633 msgid "<span id=\"cfg_ZipDump\">$cfg['ZipDump'] </span>boolean" -msgstr "" +msgstr "<span id=\"cfg_ZipDump\">$cfg['ZipDump'] </span>布尔" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1634 msgid "<span id=\"cfg_GZipDump\">$cfg['GZipDump'] </span>boolean" -msgstr "" +msgstr "<span id=\"cfg_GZipDump\">$cfg['GZipDump'] </span>布尔" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1635 msgid "<span id=\"cfg_BZipDump\">$cfg['BZipDump'] </span>boolean" -msgstr "" +msgstr "<span id=\"cfg_BZipDump\">$cfg['BZipDump'] </span>布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1637 msgid "" "Defines whether to allow the use of zip/GZip/BZip2 compression when creating " "a dump file" -msgstr "" +msgstr "设置在创建转储文件时是否允许使用 zip/GZip/BZip2 压缩" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1640 msgid "<span id=\"cfg_CompressOnFly\">$cfg['CompressOnFly'] </span>boolean" -msgstr "" +msgstr "<span id=\"cfg_CompressOnFly\">$cfg['CompressOnFly'] </span>布尔" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1642 @@ -4309,17 +4323,17 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1714 msgid "$cfg['Lang'] string" -msgstr "" +msgstr "$cfg['Lang'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1715 msgid "Force language to use." -msgstr "" +msgstr "强制使用的语言。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1720 msgid "$cfg['FilterLanguages'] string" -msgstr "" +msgstr "$cfg['FilterLanguages'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1721 @@ -4327,41 +4341,40 @@ msgid "" "Limit list of available languages to those matching the given regular " "expression. For example if you want only Czech and English, you should set " "filter to <code>'^(cs|en)'</code>." -msgstr "" +msgstr "通过正则表达式限制可用语言列表。例如只允许使用简体中文和英语，可以设置为 <code>'^(zh_CN|en)'</code>。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1725 msgid "$cfg['RecodingEngine'] string" -msgstr "" +msgstr "$cfg['RecodingEngine'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1726 msgid "" "You can select here which functions will be used for character set " "conversion. Possible values are:" -msgstr "" +msgstr "你可以在这里选择使用哪个函数来转换字符集。可选值为:" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1728 msgid "" "auto - automatically use available one (first is tested iconv, then recode)" -msgstr "" +msgstr "自动 (auto) - 自动选择可用的函数 (首先尝试 iconv，然后 recode)" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1730 msgid "iconv - use iconv or libiconv functions" -msgstr "" +msgstr "iconv - 使用 iconv 或 libiconv 函数" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1731 msgid "recode - use recode_string function" -msgstr "" +msgstr "recode - 使用 recode_string 函数" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1732 -#, fuzzy msgid "none - disable encoding conversion" -msgstr "编码转换" +msgstr "无 (none) - 禁止编码转换" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1734 orig-docs/Documentation.html:1780 @@ -4518,13 +4531,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1804 -#, fuzzy msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_Servers_only_db\">$cfg['Servers'][$i]['only_db']</span> 字符" -"串或数组" +"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> 字符串 [格式: CSS " +"背景色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1805 @@ -4532,6 +4544,8 @@ msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" +"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> 字符串 [格式: CSS " +"背景色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1807 @@ -4543,17 +4557,16 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1810 msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "" +msgstr "$cfg['NaviPointerBackground'] 字符串 [格式: CSS 背景色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1811 -#, fuzzy msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" -"<span id=\"cfg_Servers_controluser\">$cfg['Servers'][$i]['controluser']</" -"span> 字符串" +"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> 字符串 [格式: CSS " +"颜色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1812 @@ -4588,14 +4601,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1823 msgid "$cfg['ThBackground'] string [CSS color for background]" -msgstr "" +msgstr "$cfg['ThBackground'] 字符串 [格式: CSS 背景色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1824 -#, fuzzy msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" -"<span id=\"cfg_Servers_history\">$cfg['Servers'][$i]['history']</span> 字符串" +msgstr "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> 字符串 [格式: CSS 颜色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1825 @@ -4607,7 +4618,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1828 msgid "$cfg['BgOne'] string [CSS color]" -msgstr "" +msgstr "$cfg['BgOne'] 字符串 [格式: CSS 颜色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1829 @@ -4619,7 +4630,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1832 msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "" +msgstr "$cfg['BgTwo'] 字符串 [格式: CSS 颜色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1833 @@ -4630,43 +4641,39 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1836 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_Servers_tracking\">$cfg['Servers'][$i]['tracking']</span> 字符" -"串" +"<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] " +"</span>字符串 [格式: CSS 颜色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1837 -#, fuzzy msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" -"<span id=\"cfg_Servers_controluser\">$cfg['Servers'][$i]['controluser']</" -"span> 字符串" +"<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>字符串 [格式: " +"CSS 颜色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1838 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" -"<span id=\"cfg_Servers_tracking\">$cfg['Servers'][$i]['tracking']</span> 字符" -"串" +"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] " +"</span>字符串 [格式: CSS 颜色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1839 -#, fuzzy msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" -"<span id=\"cfg_Servers_only_db\">$cfg['Servers'][$i]['only_db']</span> 字符" -"串或数组" +"<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>字符串 [格式: " +"CSS 颜色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1841 @@ -4830,9 +4837,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1899 -#, fuzzy msgid "$cfg['DefaultDisplay'] string" -msgstr "$cfg['PmaAbsoluteUri'] 字符串" +msgstr "$cfg['DefaultDisplay'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1900 @@ -4847,9 +4853,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1908 -#, fuzzy msgid "$cfg['HeaderFlipType'] string" -msgstr "$cfg['PmaAbsoluteUri'] 字符串" +msgstr "$cfg['HeaderFlipType'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1910 @@ -5113,9 +5118,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2055 -#, fuzzy msgid "$cfg['Export']['method'] string" -msgstr "$cfg['Servers'][$i]['host'] 字符串" +msgstr "$cfg['Export']['method'] 字符串" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2057 @@ -5344,9 +5348,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2163 -#, fuzzy msgid "$cfg['UserprefsDisallow'] array" -msgstr "$cfg['Servers'] 数组" +msgstr "$cfg['UserprefsDisallow'] 数组" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2164 @@ -6425,15 +6428,13 @@ msgstr "服务器" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2579 -#, fuzzy msgid "" "<a href=\"#faq1_1\">1.1 My server is crashing each time a specific action is " "required or phpMyAdmin sends a blank page or a page full of cryptic " "characters to my browser, what can I do?</a>" msgstr "" -"<a href=\"#faq1_1\">1.1 我正在使用 PHP 4+ 版本，在我执行某些特性操作的时候服" -"务器总是会发生一些错误，如 phpMyAdmin 返回空页面，或者显示乱码，我该怎么办？" -"</a>" +"<a href=\"#faq1_1\">1.1 我的服务器不是在处理特定请求时崩溃就是 phpMyAdmin " +"发送空白页面或者都是乱码的页面，我该怎么办？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2583 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. darkblue_orange-2.9-8-gd5c6f3c
by Madhura Jayaratne 04 May '11

04 May '11

The branch, master has been updated via d5c6f3cfe14b7a5882fd02a71b34f49640c62594 (commit) from 288ae8dc8c25c9262af6b241433b69ca10d3608b (commit) - Log ----------------------------------------------------------------- commit d5c6f3cfe14b7a5882fd02a71b34f49640c62594 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon May 2 17:22:18 2011 +0530 Style changes for table/db operations pages ----------------------------------------------------------------------- Summary of changes: darkblue_orange/css/theme_right.css.php | 2 +- graphite/css/theme_right.css.php | 2 +- toba/css/theme_right.css.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/darkblue_orange/css/theme_right.css.php b/darkblue_orange/css/theme_right.css.php index 637b063..a285c47 100644 --- a/darkblue_orange/css/theme_right.css.php +++ b/darkblue_orange/css/theme_right.css.php @@ -1297,7 +1297,7 @@ li#li_user_preferences { } .operations_half_width { - min-width: 48%; + width: 48%; float: <?php echo $left; ?>; } diff --git a/graphite/css/theme_right.css.php b/graphite/css/theme_right.css.php index 80bb6a7..538aed5 100644 --- a/graphite/css/theme_right.css.php +++ b/graphite/css/theme_right.css.php @@ -1051,7 +1051,7 @@ li#li_select_fontsize { } .operations_half_width { - min-width: 48%; + width: 48%; float: <?php echo $left; ?>; } diff --git a/toba/css/theme_right.css.php b/toba/css/theme_right.css.php index b929b82..ed2f652 100644 --- a/toba/css/theme_right.css.php +++ b/toba/css/theme_right.css.php @@ -1256,7 +1256,7 @@ li#li_user_preferences { } .operations_half_width { - min-width: 48%; + width: 48%; float: <?php echo $left; ?>; } hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-655-g73c57b0
by Marc Delisle 04 May '11

04 May '11

The branch, master has been updated via 73c57b099e8b2d2c99fcb4d0888dcc40f4dd366a (commit) from b2b1953db11219b5ac801ab58c3ecff2cfbb7f29 (commit) - Log ----------------------------------------------------------------- commit 73c57b099e8b2d2c99fcb4d0888dcc40f4dd366a Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 3 19:05:24 2011 -0400 Continue to replace warning level with error level ----------------------------------------------------------------------- Summary of changes: libraries/Index.class.php | 4 ++-- libraries/Message.class.php | 19 ------------------- libraries/common.lib.php | 2 +- libraries/display_import.lib.php | 2 +- tbl_operations.php | 2 +- tbl_replace.php | 2 +- tbl_structure.php | 2 +- test/PMA_Message_test.php | 11 +---------- view_operations.php | 2 +- 9 files changed, 9 insertions(+), 37 deletions(-) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 6fc0bec..ee266aa 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -424,7 +424,7 @@ class PMA_Index $indexes = PMA_Index::getFromTable($table, $schema); if (count($indexes) < 1) { - return PMA_Message::warning(__('No index defined!'))->getDisplay(); + return PMA_Message::error(__('No index defined!'))->getDisplay(); } $r = ''; @@ -576,7 +576,7 @@ class PMA_Index // did not find any difference // so it makes no sense to have this two equal indexes - $message = PMA_Message::warning(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')); + $message = PMA_Message::error(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')); $message->addParam($each_index->getName()); $message->addParam($while_index->getName()); $output .= $message->getDisplay(); diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 5c46e86..3064868 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -424,25 +424,6 @@ class PMA_Message } /** - * returns whether this message is a warning message or not - * and optionally makes this message a warning message - * - * @uses PMA_Message::WARNING - * @uses PMA_Message::setNumber() - * @uses PMA_Message::getNumber() - * @param boolean $set - * @return boolean whether this is a warning message or not - */ - public function isWarning($set = false) - { - if ($set) { - $this->setNumber(PMA_Message::WARNING); - } - - return $this->getNumber() === PMA_Message::WARNING; - } - - /** * returns whether this message is an error message or not * and optionally makes this message an error message * diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3161132..4969463 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1674,7 +1674,7 @@ function PMA_generate_html_tab($tab, $url_params = array()) } if (!empty($tab['warning'])) { - $tab['class'] .= ' warning'; + $tab['class'] .= ' error'; $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"'; } diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 53a9351..3a9c2ea 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -175,7 +175,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { $uid = uniqid(""); PMA_browseUploadFile($max_upload_size); } else if (!$GLOBALS['is_upload']) { - PMA_Message::warning(__('File uploads are not allowed on this server.'))->display(); + PMA_Message::notice(__('File uploads are not allowed on this server.'))->display(); } else if (!empty($cfg['UploadDir'])) { PMA_selectUploadFile($import_list, $cfg['UploadDir']); } // end if (web-server upload directory) diff --git a/tbl_operations.php b/tbl_operations.php index 04f1165..28530da 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -228,7 +228,7 @@ if (isset($result) && empty($message_to_show)) { if (! empty($warning_messages)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); - $_message->isWarning(true); + $_message->isError(true); unset($warning_messages); } PMA_showMessage($_message, $sql_query, $_type); diff --git a/tbl_replace.php b/tbl_replace.php index 0abe124..40d0ad4 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -414,7 +414,7 @@ if (! empty($warning_messages)) { * the message */ $message->addMessages($warning_messages, '<br />'); - $message->isWarning(true); + $message->isError(true); } if (! empty($error_messages)) { $message->addMessages($error_messages); diff --git a/tbl_structure.php b/tbl_structure.php index fce4f39..99ec0e9 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -773,7 +773,7 @@ if ($cfg['ShowStats']) { } if (isset($free_size)) { ?> - <tr class="<?php echo ($odd_row = !$odd_row) ? 'odd' : 'even'; ?> warning"> + <tr class="<?php echo ($odd_row = !$odd_row) ? 'odd' : 'even'; ?> error"> <th class="name"><?php echo __('Overhead'); ?></th> <td class="value"><?php echo $free_size; ?></td> <td class="unit"><?php echo $free_unit; ?></td> diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php index e3a4492..27e4b7f 100644 --- a/test/PMA_Message_test.php +++ b/test/PMA_Message_test.php @@ -156,21 +156,12 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase public function testIsNotice() { $this->assertTrue($this->object->isNotice()); - $this->object->isWarning(true); + $this->object->isError(true); $this->assertFalse($this->object->isNotice()); $this->assertTrue($this->object->isNotice(true)); } /** - * testing isWarning method - */ - public function testIsWarning() - { - $this->assertFalse($this->object->isWarning()); - $this->assertTrue($this->object->isWarning(true)); - } - - /** * testing isError method */ public function testIsError() diff --git a/view_operations.php b/view_operations.php index 55d1c74..4a315d0 100644 --- a/view_operations.php +++ b/view_operations.php @@ -64,7 +64,7 @@ if (isset($result)) { if (! empty($warning_messages)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); - $_message->isWarning(true); + $_message->isError(true); unset($warning_messages); } PMA_showMessage($_message, $sql_query, $_type, $is_view = true); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-654-gb2b1953
by Marc Delisle 04 May '11

04 May '11

The branch, master has been updated via b2b1953db11219b5ac801ab58c3ecff2cfbb7f29 (commit) from 90845aa8cbec8788c92e48090a214ff89a2309b3 (commit) - Log ----------------------------------------------------------------- commit b2b1953db11219b5ac801ab58c3ecff2cfbb7f29 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue May 3 18:52:37 2011 -0400 Start to replace warning level with error level ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 2 +- main.php | 2 +- prefs_forms.php | 4 ++-- prefs_manage.php | 2 +- server_privileges.php | 2 +- server_replication.php | 6 +++--- sql.php | 2 +- tbl_indexes.php | 2 +- tbl_relation.php | 2 +- tbl_replace.php | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 29b32f4..2319b82 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -35,7 +35,7 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) { if (isset($_REQUEST['submit_sql']) && ! preg_match('@^SELECT@i', $sql_query)) { - PMA_Message::warning(__('You have to choose at least one column to display'))->display(); + PMA_Message::error(__('You have to choose at least one column to display'))->display(); } diff --git a/main.php b/main.php index 96f3e01..c7c25bc 100644 --- a/main.php +++ b/main.php @@ -305,7 +305,7 @@ if ($server > 0) { } /** - * Show warning when javascript support is missing. + * Show notice when javascript support is missing. */ echo '<noscript>'; $message = PMA_Message::notice(__('Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.')); diff --git a/prefs_forms.php b/prefs_forms.php index 40ea171..22ffb4c 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -74,7 +74,7 @@ if ($error) { if ($form_display->hasErrors()) { // form has errors ?> - <div class="warning config-form"> + <div class="error config-form"> <b><?php echo __('Cannot save settings, submitted form contains errors') ?></b> <?php $form_display->displayErrors(); ?> </div> @@ -86,4 +86,4 @@ $form_display->display(true, true); * Displays the footer */ require './libraries/footer.inc.php'; -?> \ No newline at end of file +?> diff --git a/prefs_manage.php b/prefs_manage.php index 76ead89..e5dbe3f 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -109,7 +109,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == // mimic original form and post json in a hidden field require './libraries/header.inc.php'; require './libraries/user_preferences.inc.php'; - $msg = PMA_Message::warning(__('Configuration contains incorrect data for some fields.')); + $msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.')); $msg->display(); echo '<div class="config-form">'; $form_display->displayErrors(); diff --git a/server_privileges.php b/server_privileges.php index a9ebcd9..19f9dcb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1790,7 +1790,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql); unset($sql); if ($user_does_not_exists) { - PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display(); + PMA_Message::error(__('The selected user was not found in the privilege table.'))->display(); PMA_displayLoginInformationFields(); //require './libraries/footer.inc.php'; } diff --git a/server_replication.php b/server_replication.php index a25fe1d..9b7724d 100644 --- a/server_replication.php +++ b/server_replication.php @@ -288,10 +288,10 @@ if (! isset($GLOBALS['repl_clear_scr'])) { $slave_skip_error_link = PMA_generate_common_url($_url_params); if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') { - PMA_Message::warning(__('Slave SQL Thread not running!'))->display(); + PMA_Message::error(__('Slave SQL Thread not running!'))->display(); } if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') { - PMA_Message::warning(__('Slave IO Thread not running!'))->display(); + PMA_Message::error(__('Slave IO Thread not running!'))->display(); } $_url_params = $GLOBALS['url_params']; @@ -337,7 +337,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { echo ' </li>'; echo ' <li><a href="#" id="slave_errormanagement_href">' . __('Error management:') . '</a>'; echo ' <div id="slave_errormanagement_gui" style="display: none">'; - PMA_Message::warning(__('Skipping errors might lead into unsynchronized master and slave!'))->display(); + PMA_Message::error(__('Skipping errors might lead into unsynchronized master and slave!'))->display(); echo ' <ul>'; echo ' <li><a href="' . $slave_skip_error_link . '">' . __('Skip current error') . '</a></li>'; echo ' <li>' . __('Skip next'); diff --git a/sql.php b/sql.php index 9587d32..9b19174 100644 --- a/sql.php +++ b/sql.php @@ -275,7 +275,7 @@ if ($do_confirm) { $stripped_sql_query = $sql_query; require_once './libraries/header.inc.php'; if ($is_drop_database) { - echo '<h1 class="warning">' . __('You are about to DESTROY a complete database!') . '</h1>'; + echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>'; } echo '<form action="sql.php" method="post">' . "\n" .PMA_generate_common_hidden_inputs($db, $table); diff --git a/tbl_indexes.php b/tbl_indexes.php index 166c6aa..46e5e1c 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -179,7 +179,7 @@ if (isset($_REQUEST['create_index'])) { <br class="clearfloat" /> <?php -PMA_Message::warning(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); +PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); ?> <table> diff --git a/tbl_relation.php b/tbl_relation.php index 68288e1..400fc63 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -273,7 +273,7 @@ if (isset($_REQUEST['destination_foreign'])) { echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; } if (substr($tmp_error, 1, 4) == '1005') { - $message = PMA_Message::warning( __('Error creating foreign key on %1$s (check data types)')); + $message = PMA_Message::error( __('Error creating foreign key on %1$s (check data types)')); $message->addParam($master_field); $message->display(); echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; diff --git a/tbl_replace.php b/tbl_replace.php index ab8cd10..0abe124 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -410,7 +410,7 @@ $message->addMessages($last_messages, '<br />'); if (! empty($warning_messages)) { /** - * @todo use a <div class="warning"> in PMA_showMessage() for this part of + * @todo use a <div class="error"> in PMA_showMessage() for this part of * the message */ $message->addMessages($warning_messages, '<br />'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-653-g90845aa
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 90845aa8cbec8788c92e48090a214ff89a2309b3 (commit) via 41e70cdf33374f130e0402e91b28c048679fb01d (commit) via deb7ffd5c11842a9a841abbf3b333f45283dc911 (commit) via c15d9a0fd644317bf1b066fc11c7de19cccce904 (commit) via 60ecf708564824ba079d3a5152aacfe40504fdc5 (commit) via 105fb55adf22622b9049fc0a2151385946c43db4 (commit) via d14b0315f6d8f6c138892c3662c0f804f68d1f4f (commit) via 5a70742a1e47956fa789e706b54299617a22a289 (commit) via 78e20baa1618cbe4308da27f7bf070095c53a619 (commit) via 932807ab7f47bb518f9a346059974de9fd1f7e35 (commit) via d9366dfcf80f6c1a3476bb6639441d1bda91fe07 (commit) via 18e48ad071e7f57ec82e826ec187638db1625984 (commit) via 79b0ff4507791a5f593f35bb50be3be7a206889b (commit) via aeb845d73e88680c94457546e6f3f8855e98ad5b (commit) via f4f5e4e988bc1ae48b525b18deea69102d6534a3 (commit) via e5c21e58a6b676c3c41a29bbb5e037dcc7b8ce94 (commit) via 0c9b4ab6d071c3058a89f42aacdd72047dd6e1d7 (commit) via 98931f969ff8082902235d60d9fa05f53df59333 (commit) via a5f3b60398ec7c033d093b1d24ca1daaaaea3bb4 (commit) via 5d9d5f8e54d0b8b4273d06edbee820dbba278cfe (commit) via f037ba24edf6a2ccb0972c67730ec59a4d5dc770 (commit) via 3e386e94a9a29e81040748e578f38bc3552589d0 (commit) via 83594849e3e9c2161d177359458fd524f5784ccd (commit) from 33706c6e8f282f3dce0e38f979bd653ba8b9c902 (commit) - Log ----------------------------------------------------------------- commit 90845aa8cbec8788c92e48090a214ff89a2309b3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:29 2011 +0200 Translation update done using Pootle. commit 41e70cdf33374f130e0402e91b28c048679fb01d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:25 2011 +0200 Translation update done using Pootle. commit deb7ffd5c11842a9a841abbf3b333f45283dc911 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:14 2011 +0200 Translation update done using Pootle. commit c15d9a0fd644317bf1b066fc11c7de19cccce904 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:09 2011 +0200 Translation update done using Pootle. commit 60ecf708564824ba079d3a5152aacfe40504fdc5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:05 2011 +0200 Translation update done using Pootle. commit 105fb55adf22622b9049fc0a2151385946c43db4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:37:00 2011 +0200 Translation update done using Pootle. commit d14b0315f6d8f6c138892c3662c0f804f68d1f4f Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:36:50 2011 +0200 Translation update done using Pootle. commit 5a70742a1e47956fa789e706b54299617a22a289 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:35:51 2011 +0200 Translation update done using Pootle. commit 78e20baa1618cbe4308da27f7bf070095c53a619 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:34:58 2011 +0200 Translation update done using Pootle. commit 932807ab7f47bb518f9a346059974de9fd1f7e35 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:34:41 2011 +0200 Translation update done using Pootle. commit d9366dfcf80f6c1a3476bb6639441d1bda91fe07 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:34:28 2011 +0200 Translation update done using Pootle. commit 18e48ad071e7f57ec82e826ec187638db1625984 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:34:10 2011 +0200 Translation update done using Pootle. commit 79b0ff4507791a5f593f35bb50be3be7a206889b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:33:44 2011 +0200 Translation update done using Pootle. commit aeb845d73e88680c94457546e6f3f8855e98ad5b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:33:11 2011 +0200 Translation update done using Pootle. commit f4f5e4e988bc1ae48b525b18deea69102d6534a3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:32:38 2011 +0200 Translation update done using Pootle. commit e5c21e58a6b676c3c41a29bbb5e037dcc7b8ce94 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:32:11 2011 +0200 Translation update done using Pootle. commit 0c9b4ab6d071c3058a89f42aacdd72047dd6e1d7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:31:34 2011 +0200 Translation update done using Pootle. commit 98931f969ff8082902235d60d9fa05f53df59333 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:31:15 2011 +0200 Translation update done using Pootle. commit a5f3b60398ec7c033d093b1d24ca1daaaaea3bb4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:30:55 2011 +0200 Translation update done using Pootle. commit 5d9d5f8e54d0b8b4273d06edbee820dbba278cfe Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:30:41 2011 +0200 Translation update done using Pootle. commit f037ba24edf6a2ccb0972c67730ec59a4d5dc770 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:30:35 2011 +0200 Translation update done using Pootle. commit 3e386e94a9a29e81040748e578f38bc3552589d0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:30:29 2011 +0200 Translation update done using Pootle. commit 83594849e3e9c2161d177359458fd524f5784ccd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:29:53 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/si.po | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/po/si.po b/po/si.po index eb15615..788d67f 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-03 16:29+0200\n" +"PO-Revision-Date: 2011-05-03 16:37+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" "Language: si\n" @@ -942,7 +942,7 @@ msgstr "\"DROP DATABASE\" statements are disabled." #: js/messages.php:30 libraries/mult_submits.inc.php:242 sql.php:293 msgid "Do you really want to " -msgstr "ඔබට ඇත්තෙන්ම අවශ්‍යද" +msgstr "ඔබට ඇත්තෙන්ම අවශ්‍යද " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" @@ -1147,7 +1147,7 @@ msgstr "පෙන්වීම සඳහා තීරය ‍තෝරාගන් # අභිරුචිය = option. Source: Glossary of Information Technology Terms - ICTA #: js/messages.php:106 msgid "Add an option for column " -msgstr "ක්ෂේත්‍රයට අභිරුචියක් එක් කරන්න" +msgstr "ක්ෂේත්‍රයට අභිරුචියක් එක් කරන්න " #: js/messages.php:109 msgid "Generate password" @@ -2770,7 +2770,7 @@ msgstr "phpMyAdmin හි මෘදුකාංග සංවර්ධනය ක #: libraries/config/messages.inc.php:159 msgid "Edit mode" -msgstr " සංස්කරණ ප්‍රකාරය" +msgstr "සංස්කරණ ප්‍රකාරය" #: libraries/config/messages.inc.php:160 msgid "Customize edit mode" @@ -4512,7 +4512,7 @@ msgstr "ප්‍රතිදානය:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, php-format msgid "Save on server in the directory <b>%s</b>" -msgstr "සේවාදායකයේ %s ඩිරෙක්ටරියේ සුරකින්න" +msgstr "සේවාදායකයේ <b>%s</b> ඩිරෙක්ටරියේ සුරකින්න" #: libraries/display_export.lib.php:206 msgid "Save output to a file" @@ -4547,7 +4547,7 @@ msgid "" msgstr "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " "formatting strings. Additionally the following transformations will happen: " -"%3$s. Other text will be kept as is." +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." #: libraries/display_export.lib.php:275 msgid "use this for future exports" @@ -4638,7 +4638,7 @@ msgstr "\"%s\" දත්තගබඩාව තුළට ආනයනය කි #: libraries/display_import.lib.php:133 #, php-format msgid "Importing into the table \"%s\"" -msgstr " \"%s\" වගුව තුළට ආනයනය කිරීම" +msgstr "\"%s\" වගුව තුළට ආනයනය කිරීම" #: libraries/display_import.lib.php:139 msgid "File to Import:" @@ -4683,9 +4683,9 @@ msgid "" "to the PHP timeout limit. <i>(This might be good way to import large files, " "however it can break transactions.)</i>" msgstr "" -"Allow interrupt of import in case script detects it is close to time limit. " -"This might be good way to import large files, however it can break " -"transactions." +"Allow the interruption of an import in case the script detects it is close " +"to the PHP timeout limit. <i>(This might be good way to import large files, " +"however it can break transactions.)</i>" #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" @@ -5632,7 +5632,7 @@ msgstr "" #: libraries/import/csv.php:41 msgid "Column names: " -msgstr "තීර නම්:" +msgstr "තීර නම්: " #: libraries/import/csv.php:61 libraries/import/csv.php:74 #: libraries/import/csv.php:79 libraries/import/csv.php:84 @@ -6359,7 +6359,7 @@ msgstr "පරිසීමකය" #: libraries/sql_query_form.lib.php:381 msgid " Show this query here again " -msgstr "මෙම විමසුම මෙහි නැවත පෙන්වන්න " +msgstr " මෙම විමසුම මෙහි නැවත පෙන්වන්න " #: libraries/sql_query_form.lib.php:440 msgid "Submit" @@ -6850,7 +6850,7 @@ msgid "" msgstr "" "ඔබගේ සිටුවම් ගොනුවේ අඩංගු සිටුවම්, (භාවිත නාමය root වන හා මුරපදයක් නොමැති) " "පෙරනිමි MySQL වරප්‍රසාදැති ගිණුමට අදාළ වේ. මෙම පෙරනිමි අගයන් භාවිත කිරීම " -"අනවසර ඇතුල්වීම් වලට හේතු විය හැකි බැවින් ඔබ root භාවිතා කරන්නා සඳහා වෙනත් " +"අනවසර ඇතුල්වීම් වලට හේතු විය හැකි බැවින් ඔබ 'root' භාවිතා කරන්නා සඳහා වෙනත් " "මුරපදයක් ලබා දිය යුතුය." #: main.php:265 @@ -7123,7 +7123,7 @@ msgstr "පිටුවක් සාදා අපනයනය කරන්න" #: pmd_pdf.php:111 #| msgid "User name" msgid "New page name: " -msgstr "නව පිටු නාමය:" +msgstr "නව පිටු නාමය: " #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -7717,7 +7717,8 @@ msgstr "" msgid "" " ... delete the old one from the user tables and reload the privileges " "afterwards." -msgstr ".. භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කර වරප්‍රසාද නැවත අලුත් කරන්න." +msgstr "" +" ... භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කර වරප්‍රසාද නැවත අලුත් කරන්න." #: server_privileges.php:2140 msgid "Database for user" @@ -7859,7 +7860,7 @@ msgid "" "master" msgstr "" "සේවාදායකය නැවත පණගැන්වීමෙන් අනතුරුව යන්න බොත්තම ඔබන්න. ඉන් අනතුරුව මෙම " -"සේවාදායකය master ලෙස සකසා ඇති බවට පණිවිඩයක් දර්ශනයවනු ඇත" +"සේවාදායකය master ලෙස සකසා <b>ඇති</b> බවට පණිවිඩයක් දර්ශනයවනු ඇත" #: server_replication.php:291 msgid "Slave SQL Thread not running!" @@ -9210,7 +9211,7 @@ msgstr "ශ්‍රිතය" #: tbl_change.php:755 #| msgid " Because of its length,<br /> this field might not be editable " msgid " Because of its length,<br /> this column might not be editable " -msgstr "මෙහි දිග නිසා,<br /> මෙම තීරුව සංස්කරණය කල නොහැකි විය හැකිය" +msgstr " මෙහි දිග නිසා,<br /> මෙම තීරුව සංස්කරණය කල නොහැකි විය හැකිය " #: tbl_change.php:872 msgid "Remove BLOB Repository Reference" @@ -9368,7 +9369,7 @@ msgstr "නැවත අඳින්න" #: tbl_create.php:56 #, php-format msgid "Table %s already exists!" -msgstr " %s වගුව දැනටමත් පවතී!" +msgstr "%s වගුව දැනටමත් පවතී!" #: tbl_create.php:242 #, php-format @@ -9410,7 +9411,8 @@ msgstr "සූචි වර්ගය:" #: tbl_indexes.php:182 msgid "" "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)" -msgstr "(\"PRIMARY\" නාමය ප්‍රාථමික මූලය සඳහා <i>පමණක්</i> භාවිතා කල යුතුය!)" +msgstr "" +"(\"PRIMARY\" නාමය ප්‍රාථමික මූලය සඳහා <b>පමණක්</b> භාවිතා කල <b>යුතුය</b>!)" #: tbl_indexes.php:249 #, php-format @@ -9577,7 +9579,7 @@ msgstr "පේළියේ දිග" #: tbl_printview.php:411 tbl_structure.php:886 msgid " Row size " -msgstr "පේළියේ ප්‍රමාණය" +msgstr " පේළියේ ප්‍රමාණය " #: tbl_relation.php:276 #, php-format @@ -9704,7 +9706,7 @@ msgstr "කොටස් කරන ලද" #: tbl_tracking.php:109 #, php-format msgid "Tracking report for table `%s`" -msgstr " `%s` වගුව සඳහා අවධානය පිළිබඳ වාර්තාව" +msgstr "`%s` වගුව සඳහා අවධානය පිළිබඳ වාර්තාව" #: tbl_tracking.php:182 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-630-g33706c6
by Michal Čihař 03 May '11

03 May '11

The branch, master has been updated via 33706c6e8f282f3dce0e38f979bd653ba8b9c902 (commit) via 5bcd9dea7af547ee4275bed76ea9057209888981 (commit) via 211e6f98e5bd8de035f3a395828f140138ab2e96 (commit) via a1a33f4085f3696373b0ba667ab8067f43381331 (commit) via fe2322a2d419ab1288789b140ff09bc893a80f14 (commit) via 62cbcde9389f951adf7ee3e28be01e68609d9c31 (commit) via b96bf77456a64118255fd87d64c1b12ba2f1d43a (commit) via 4e7f8535b17c01c3439f5c343a0974a93761fa6a (commit) via 9e6d6df5c6c7500dafdd44672bece523d6b1c2ea (commit) from effbae03b0c5c55cb6770fe2e2341f7f058d2b3f (commit) - Log ----------------------------------------------------------------- commit 33706c6e8f282f3dce0e38f979bd653ba8b9c902 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:29:35 2011 +0200 Translation update done using Pootle. commit 5bcd9dea7af547ee4275bed76ea9057209888981 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:28:28 2011 +0200 Translation update done using Pootle. commit 211e6f98e5bd8de035f3a395828f140138ab2e96 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:26:01 2011 +0200 Translation update done using Pootle. commit a1a33f4085f3696373b0ba667ab8067f43381331 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:25:38 2011 +0200 Translation update done using Pootle. commit fe2322a2d419ab1288789b140ff09bc893a80f14 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:22:31 2011 +0200 Translation update done using Pootle. commit 62cbcde9389f951adf7ee3e28be01e68609d9c31 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:21:07 2011 +0200 Translation update done using Pootle. commit b96bf77456a64118255fd87d64c1b12ba2f1d43a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:20:37 2011 +0200 Translation update done using Pootle. commit 4e7f8535b17c01c3439f5c343a0974a93761fa6a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:19:06 2011 +0200 Translation update done using Pootle. commit 9e6d6df5c6c7500dafdd44672bece523d6b1c2ea Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue May 3 16:18:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/si.po | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/po/si.po b/po/si.po index 78ee2c8..eb15615 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-05-03 16:14+0200\n" +"PO-Revision-Date: 2011-05-03 16:29+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" "Language: si\n" @@ -571,7 +571,7 @@ msgstr "දත්තගබඩාවේ සොයන්න" #: db_search.php:298 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" -msgstr "සෙවීම සඳහා වචන(ය) හෝ අගය(න්). (wildcard: \"%\"):" +msgstr "සෙවීම සඳහා වචන(ය) හෝ අගය(න්) (wildcard: \"%\"):" #: db_search.php:303 msgid "Find:" @@ -1821,7 +1821,7 @@ msgstr "අනුරූ කරන ලද" #: libraries/build_html_for_db.lib.php:150 #, php-format msgid "Check privileges for database "%s"." -msgstr ""%s" දත්තගබඩාව සඳහා වරප්‍රසාද පරීක්ෂා කරන්න." +msgstr ""%s" දත්තගබඩාව සඳහා වරප්‍රසාද පරීක්ෂා කරන්න" #: libraries/build_html_for_db.lib.php:153 msgid "Check Privileges" @@ -2116,10 +2116,10 @@ msgid "Browse your computer:" msgstr "පරිගණකය තුළ පිරික්සන්න:" #: libraries/common.lib.php:2979 -#, fuzzy, php-format +#, php-format #| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "අන්තර්ජාල සර්වරයේ අප්ලෝඩ් ඩිරෙක්ටරිය" +msgstr "වෙබ් සේවාදායකයේ <b>%s</b> උඩුගත කිරීම් ඩිරෙක්ටරියෙන් තෝරන්න:" #: libraries/common.lib.php:2991 libraries/sql_query_form.lib.php:501 #: tbl_change.php:959 @@ -3150,7 +3150,7 @@ msgstr "ඇතුල් කල පේළි ගණන" #: libraries/config/messages.inc.php:264 msgid "Target for quick access icon" -msgstr "'ක්ෂණික ප්‍රවේශය' අයිකනය සඳහා ඉලක්කය" +msgstr "ක්ෂණික ප්‍රවේශය අයිකනය සඳහා ඉලක්කය" #: libraries/config/messages.inc.php:265 msgid "Show logo in left frame" @@ -4654,7 +4654,8 @@ msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" -"හැකිළූ ගොනුවක නම <b>.[ආකෘතිය ].[හැකිළීම]</b> ලෙස අවසන් විය යුතුයි. උදා: <b>.sql.zip</b>" +"හැකිළූ ගොනුවක නම <b>.[ආකෘතිය].[හැකිළීම]</b> ලෙස අවසන් විය යුතුයි. උදා: " +"<b>.sql.zip</b>" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -5424,10 +5425,10 @@ msgstr "" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "ප්‍රකාශය" +msgstr "%s ප්‍රකාශය එක්කරන්න" #: libraries/export/sql.php:91 msgid "Add statements:" @@ -6567,7 +6568,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:634 #, php-format msgid "Add %s column(s)" -msgstr "%s ක්ෂේත්‍ර(යක්) එක් කරන්න" +msgstr "%s ක්ෂේත්‍ර(ය) එක් කරන්න" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:628 msgid "You have to add at least one column." @@ -9114,7 +9115,7 @@ msgid "" msgstr "" #: setup/lib/index.lib.php:268 -#, fuzzy, php-format +#, php-format msgid "" "You set the [kbd]config[/kbd] authentication type and included username and " "password for auto-login, which is not a desirable option for live hosts. " @@ -9124,8 +9125,8 @@ msgid "" msgstr "" "ඔබ [kbd]config[/kbd] සත්‍යාපනය තෝරා ස්වයංක්‍රීය ඇතුල්වීම සඳහා භාවිත නාමය සහ " "මුරපදය සඳහන් කර ඇත. සජීවී සත්කාරකයන් සඳහා මෙය නුසුදුසුය. ඔබගේ phpMyAdmin " -"URLය දන්නා ඕනෑම අයෙකුට ඔබගේ phpMyAdmin පැනලය භාවිත කල හැකිය. සත්‍යාපනය ලෙස " -"[kbd]config[/kbd] හෝ [kbd]http[/kbd] තෝරන්න." +"URLය දන්නා ඕනෑම අයෙකුට ඔබගේ phpMyAdmin පැනලය භාවිත කල හැකිය. %sසත්‍යාපනය%s " +"ලෙස [kbd]config[/kbd] හෝ [kbd]http[/kbd] තෝරන්න." #: setup/lib/index.lib.php:270 #, php-format @@ -9209,7 +9210,7 @@ msgstr "ශ්‍රිතය" #: tbl_change.php:755 #| msgid " Because of its length,<br /> this field might not be editable " msgid " Because of its length,<br /> this column might not be editable " -msgstr "මෙහි දිග නිසා, <br /> මෙම තීරුව සංස්කරණය කල නොහැකි විය හැකිය" +msgstr "මෙහි දිග නිසා,<br /> මෙම තීරුව සංස්කරණය කල නොහැකි විය හැකිය" #: tbl_change.php:872 msgid "Remove BLOB Repository Reference" hooks/post-receive -- phpMyAdmin

1 0