Git September 2010

git@phpmyadmin.net

5 participants
126 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10324-g8c7d339
by Marc Delisle 21 Sep '10

21 Sep '10

The branch, master has been updated via 8c7d339e04d4380ad13ae83f4367f87f06d3b7d2 (commit) from 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 (commit) - Log ----------------------------------------------------------------- commit 8c7d339e04d4380ad13ae83f4367f87f06d3b7d2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 21 08:04:25 2010 -0400 These are not translatable ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index ba62028..1511158 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -347,11 +347,11 @@ class PMA_User_Schema ?>: </legend> <select name="export_type" id="export_type"> - <option value="pdf" selected="selected"><?php echo __('PDF');?></option> - <option value="svg"><?php echo __('SVG');?></option> - <option value="dia"><?php echo __('DIA');?></option> - <option value="visio"><?php echo __('VISIO');?></option> - <option value="eps"><?php echo __('EPS');?></option> + <option value="pdf" selected="selected">PDF</option> + <option value="svg">SVG</option> + <option value="dia">DIA</option> + <option value="visio">Visio</option> + <option value="eps">EPS</option> </select> <label><?php echo __('Select Export Relational Type');?></label><br /> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10323-g1d8c5cb
by Piotr Przybylski 21 Sep '10

21 Sep '10

The branch, master has been updated via 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 (commit) via 6a4766f60c83a990f291e82bc52ff66fd55eab49 (commit) via 2524b2588d0fa7cc5bf0759c3eb8dc7d44885791 (commit) via 3a5f08f32d256cae9e12e9edd9171f0edea959f7 (commit) from 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd (commit) - Log ----------------------------------------------------------------- commit 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:43:56 2010 +0200 fix docs commit 6a4766f60c83a990f291e82bc52ff66fd55eab49 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:42:37 2010 +0200 Add setup script warning for when LoginCookieStore < LoginCookieValidity commit 2524b2588d0fa7cc5bf0759c3eb8dc7d44885791 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:24:42 2010 +0200 Setup script front page messages: - removed URLs from translatable strings and fixed tab links - added warning when LoginCookieValidity > 1440 - added error when LoginCookieValidity > session.gc_maxlifetime commit 3a5f08f32d256cae9e12e9edd9171f0edea959f7 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:10:59 2010 +0200 load LoginCookieValidity from user prefereces cache to make it usable in auth plugins ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- libraries/common.inc.php | 14 +++++++++- setup/lib/index.lib.php | 68 +++++++++++++++++++++++++++++++++++---------- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5b75982..71cd175 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1382,7 +1382,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ee20145..e4ce8c8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -801,7 +801,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { require_once './libraries/logging.lib.php'; - // Gets the authentication library that fits the $cfg['Server'] settings + // get LoginCookieValidity from preferences cache + // no generic solution for loading preferences from cache as some settings need to be kept + // for processing in PMA_Config::loadUserPreferences() + $cache_key = 'server_' . $GLOBALS['server']; + if (isset($_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity'])) { + $value = $_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity']; + $GLOBALS['PMA_Config']->set('LoginCookieValidity', $value); + $GLOBALS['cfg']['LoginCookieValidity'] = $value; + unset($value); + } + unset($cache_key); + + // Gets the authentication library that fits the $cfg['Server'] settings // and run authentication // to allow HTTP or http diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 17c9cf6..b5df478 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -247,17 +247,30 @@ function perform_config_checks() $blowfish_secret_set = false; $cookie_auth_used = false; - $strAllowArbitraryServerWarning = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strAllowArbitraryServerWarning = __('This %soption%s should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strAllowArbitraryServerWarning = sprintf($strAllowArbitraryServerWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'); - $strBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); + $strBZipDumpWarning = __('%sBzip2 compression and decompression%s requires functions (%s) which are unavailable on this system.'); + $strBZipDumpWarning = sprintf($strBZipDumpWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); $strDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.'); - $strForceSSLNotice = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it'); - $strGZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); - $strLoginCookieValidityWarning = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'); - $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strServerAuthConfigMsg = __('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. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); - $strZipDumpExportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.'); - $strZipDumpImportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'); + $strForceSSLNotice = __('This %soption%s should be enabled if your web server supports it.'); + $strForceSSLNotice = sprintf($strForceSSLNotice, '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strGZipDumpWarning = __('%sGZip compression and decompression%s requires functions (%s) which are unavailable on this system.'); + $strGZipDumpWarning = sprintf($strGZipDumpWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); + $strLoginCookieValidityWarning = __('%sLogin cookie validity%s greater than 1440 seconds may cause random session invalidation if %ssession.gc_maxlifetime%s is lower than its value (currently %d).'); + $strLoginCookieValidityWarning = sprintf($strLoginCookieValidityWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime]', '[/a]', ini_get('session.gc_maxlifetime')); + $strLoginCookieValidityWarning2 = __('%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.'); + $strLoginCookieValidityWarning2 = sprintf($strLoginCookieValidityWarning2, '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strLoginCookieValidityWarning3 = __('%sLogin cookie validity%s must be set to a value less or equal to %sLogin cookie store%s.'); + $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strServerAuthConfigMsg = __('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. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); + $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); + $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); + $strZipDumpExportWarning = sprintf($strZipDumpExportWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); + $strZipDumpImportWarning = __('%sZip decompression%s requires functions (%s) which are unavailable on this system.'); + $strZipDumpImportWarning = sprintf($strZipDumpImportWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); for ($i = 1, $server_cnt = $cf->getServerCount(); $i <= $server_cnt; $i++) { $cookie_auth_server = ($cf->getValue("Servers/$i/auth_type") == 'cookie'); @@ -280,7 +293,7 @@ function perform_config_checks() if (!$cf->getValue("Servers/$i/ssl")) { $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)"; messages_set('notice', "Servers/$i/ssl", $title, - __('You should use SSL connections if your web server supports it')); + __('You should use SSL connections if your web server supports it.')); } // @@ -290,7 +303,7 @@ function perform_config_checks() if ($cf->getValue("Servers/$i/extension") == 'mysql') { $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)"; messages_set('notice', "Servers/$i/extension", $title, - __('You should use mysqli for performance reasons')); + __('You should use mysqli for performance reasons.')); } // @@ -335,19 +348,19 @@ function perform_config_checks() // check length if (strlen($blowfish_secret) < 8) { // too short key - $blowfish_warnings[] = __('Key is too short, it should have at least 8 characters'); + $blowfish_warnings[] = __('Key is too short, it should have at least 8 characters.'); } // check used characters $has_digits = (bool) preg_match('/\d/', $blowfish_secret); $has_chars = (bool) preg_match('/\S/', $blowfish_secret); $has_nonword = (bool) preg_match('/\W/', $blowfish_secret); if (!$has_digits || !$has_chars || !$has_nonword) { - $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters')); + $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), PMA_lang(PMA_lang_name('blowfish_secret')), - implode("<br />", $blowfish_warnings)); + implode('<br />', $blowfish_warnings)); } } } @@ -374,12 +387,37 @@ function perform_config_checks() // // $cfg['LoginCookieValidity'] + // value greater than session.gc_maxlifetime will cause random session invalidation after that time + // + if ($cf->getValue('LoginCookieValidity') > 1440 + || $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')) { + $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime') + ? 'error' + : 'warning'; + messages_set($message_type, 'LoginCookieValidity', + PMA_lang(PMA_lang_name('LoginCookieValidity')), + PMA_lang($strLoginCookieValidityWarning)); + } + + // + // $cfg['LoginCookieValidity'] // should be at most 1800 (30 min) // if ($cf->getValue('LoginCookieValidity') > 1800) { messages_set('warning', 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), - PMA_lang($strLoginCookieValidityWarning)); + PMA_lang($strLoginCookieValidityWarning2)); + } + + // + // $cfg['LoginCookieValidity'] + // $cfg['LoginCookieStore'] + // LoginCookieValidity must be less or equal to LoginCookieStore + // + if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) { + messages_set('error', 'LoginCookieValidity', + PMA_lang(PMA_lang_name('LoginCookieValidity')), + PMA_lang($strLoginCookieValidityWarning3)); } // hooks/post-receive -- phpMyAdmin

1 0

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

21 Sep '10

The branch, master has been updated via 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd (commit) via 010d01f0a2d8e4be9dca11be606bdbbb090f818a (commit) via 07f12c70511e6cb8248842ff909d8706e0f132db (commit) via bac0dcb5a6844f9c3815ab3ef63684b18341491a (commit) via 0a8929570d9c96e1aeb77ec42cc5d66f211f4658 (commit) via 110cd7951be0f34fcee29e8bb2ea8aa7f7643f26 (commit) via 37eb1cf5e6b99de36ec1aeaf4142e386a2a456b6 (commit) via a05bc36c3225f62fa1bcb32e5cf8c6644b7baf28 (commit) via c877d5f447214db668d82b2d2595b106d7f4b896 (commit) via 3563bd4beb5d27e15907745b7a41e6c0ad8bbbdc (commit) via e24c0595032cf1e1bbe307c1472aadfbba7d89e8 (commit) via d20f3b9c6d0af63e2b928000b71923f52ab8e22c (commit) via 58fdd36058781d82a773a53da4df42b9dbefca3b (commit) via 7bfb4f33301ac7b37d8f46d14ad3e0906e5dada8 (commit) via 1653602c39f239e069d00dd9a04f1f0ef956152b (commit) via 36f48c204d3b9c628cef23daeec9f4bbe1ddef7b (commit) via 1ca7d0b081311a4c53576b25fcafa08b48a9c54f (commit) via 691662876561307c8579443d94d99024102cc23a (commit) via e2ba95a90426dc430243dba67e42ed5e7d567146 (commit) via f0138961bd2fbcc4fa0b99f891529506c98037f3 (commit) via f18843c5e1a2c700e57f05fe6ed3b2ddeb69ad30 (commit) via fa9befb52779664175b5d5f61af5edbe26f3dc8a (commit) via 173c919679e40aed3fb6adda52118ea7f1247279 (commit) via c8fc3dee15d2a0bbd1598004c221ff42cb630a0d (commit) via 088676653dd3bcad8ece6f7d8098f69761f85b66 (commit) via c00ee704c4d8a69d1267d89e6f63132c9c424231 (commit) via 02437e8c2f863587208f850108e0827e28f0fa72 (commit) via 50a38093b065e1116b163b3ca0db0fddce7b9ab5 (commit) via 3d5daf553bf4e8ba18011cb755534f358aa6a19a (commit) via 6aec7817a0e98f831e51eba92fccb3a4c5a1ee1d (commit) via dbb755f40b7bb06ce8ad0457fa3a843b308decb0 (commit) via 26b41e762245a7f8115dacc717db102108323b36 (commit) via 6489b30e539e09c565d5288827e1fdbb8a95e355 (commit) via 4d79e45a35124d4f5233a5be0f992378992db59c (commit) via 64932323e58dc99c1c581004a9341d3ac53d2ed0 (commit) via 7c9803d8f1999571fab1460e1d2a082cefd6365c (commit) via 213678986dd34516520bb97f7fb0e2a2bc31d260 (commit) via 55f8350dd644b753979a46ab753c4f1fe556b4ae (commit) via e2ce0d4a65e0d7f203ac1645cfa5299dd7220a0f (commit) via c6f337da8cc41ee4c5619fb0f8bb5ae8631001c9 (commit) via 4cac4b24c7e3f0766977620dca4a6e5307f6f0cf (commit) via 30ce734c3acd6798f0034e639e9581b9efdb9c46 (commit) via 2101d958dfd3fa01fac86e7bc50ccf9abbef6349 (commit) via 1279008b35e05ca86000aff202546d970bd11032 (commit) via c3c17e8cb9922d7cf28618a255d7ade9c5e89150 (commit) via b44c7608e8771f1d7e5e2cc708b7749004c45199 (commit) via dd8989f021501222178ca2eb7f84b288b4d579c8 (commit) via 843927111efea0cff8d1c5b71093bb83efb92f7c (commit) via 29e224c18c305829e0e2375f74e336aad2be1de3 (commit) via faf6bb1a165d0cc34463d3c49ecc233d4ae1c24b (commit) via bece88ce187fc84b697ab17a135205a846cf0792 (commit) via 7584f95d21af260071d4dfb3e9c4108eda043e20 (commit) via 74c5a6c14d7cf3778deef48f85272d1e4b5d2b39 (commit) via dad20040ed959cd2c28976a4f64c362105005389 (commit) via e62f0e38a8630eae9d39e1f5291561a4feb93bf6 (commit) via d6ba6e21c26facb9aabc54719373073de8ff0179 (commit) via a336a80886986de1da0f7e0c697d0e253428023a (commit) via b4cc90a79c2b8e72bb1e67d4b272a3dfc741ca9b (commit) via e6a04238ffb42b8f555ca730cca8fcaa56f6e0e3 (commit) via 8de2a6c4a63b3c564fd9f2db7550871b0607c3e1 (commit) via 741a7f921999d7f62e0a33eeb620dd8ab759ceed (commit) via db95ace15c5092b2652c1e1d67982b997b771ded (commit) via 6bbd91f3b0497a7e4f58945bdce5c44ba0fa9143 (commit) via 99b3b565f307ea4c5fd556871f11a34ea074cf20 (commit) via 7bdd2e4ddd5959a7327d33d20ca6f969ed389298 (commit) via 90d0079511c2e20924d618b4e4a92a83f1a0e3f6 (commit) via 990c11e8c7e244ea5ca9255f1356408784d1b490 (commit) via 5299ebb21d1d388e3830923ad7d31c33da539335 (commit) via 6a690addaec97521dd91bfe25ca640d7bb63c6da (commit) via 9813be99d5e8aacb0de12e07720882891a9e49f4 (commit) via d06c2933d1aeeb5ea53971e2df45a1757a4a817f (commit) via 2b3065ee286cd7eb461aa1f2bc69955be8a0fa26 (commit) via 4110849fed046a9db6958d635863a6e509a5f1fe (commit) via 577b26088016f8a5544c3603f6c3a82b09db67fd (commit) via 9134f9965efffb6a064daf1fba45c2184d37a632 (commit) via 61bc6c69f7533415595db4ad04dae892ed97dc9c (commit) via c19a7e26b9b257c4721371b6be5e6014f62549cc (commit) via f8efa655ee99dd4a1bcc8019f93dca386bcf9b5c (commit) via f5e7134d04f0d6122ca6f44db308d19f70a70a3a (commit) via d04eaf067d75c20d495963eee12c2ab66ea8279b (commit) via a3706fd78b83187eaf963b66617386e17d2dcc7b (commit) via 02db79828159fa5ef99d26c44746017cde14efcd (commit) via 14e1a01aae4bd7313eee8b687d39a404a89627cc (commit) via e88d7f983694f6bd029718b306bb2bc9864d0435 (commit) via 3ebd9371f3d32794761626b937a25db9f91ebe87 (commit) via 1cfb2c07dc6df12d5bc730986174528a1df3b855 (commit) via cca2381db52258574d58da29120456c77ea04fdc (commit) via 7ece295e7b2b85d9701602501ca717408ecd7fa2 (commit) via 8c3a102c9e05743a29012556f1d8b51aa25b098e (commit) via fff791d793e9937bae0207db43372b5392b57b8f (commit) via ab52b8857226c94357b35ec0f2f22f48d151e5f9 (commit) via 71d4ed5839dde6952c151e638d52df06c836fa18 (commit) via 4e50a436786d7479097a943449c003f9437cbd9a (commit) from 35cf83bc12805c230f71c31653fd50c8751e32d7 (commit) - Log ----------------------------------------------------------------- commit 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd Merge: 35cf83bc12805c230f71c31653fd50c8751e32d7 010d01f0a2d8e4be9dca11be606bdbbb090f818a Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Sep 21 10:31:59 2010 +0200 Merge remote branch 'pootle/master' commit 010d01f0a2d8e4be9dca11be606bdbbb090f818a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 22:00:14 2010 +0200 Translation update done using Pootle. commit 07f12c70511e6cb8248842ff909d8706e0f132db Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:39 2010 +0200 Translation update done using Pootle. commit bac0dcb5a6844f9c3815ab3ef63684b18341491a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:18 2010 +0200 Translation update done using Pootle. commit 0a8929570d9c96e1aeb77ec42cc5d66f211f4658 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:04 2010 +0200 Translation update done using Pootle. commit 110cd7951be0f34fcee29e8bb2ea8aa7f7643f26 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:58:19 2010 +0200 Translation update done using Pootle. commit 37eb1cf5e6b99de36ec1aeaf4142e386a2a456b6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:52 2010 +0200 Translation update done using Pootle. commit a05bc36c3225f62fa1bcb32e5cf8c6644b7baf28 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:35 2010 +0200 Translation update done using Pootle. commit c877d5f447214db668d82b2d2595b106d7f4b896 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:08 2010 +0200 Translation update done using Pootle. commit 3563bd4beb5d27e15907745b7a41e6c0ad8bbbdc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:47 2010 +0200 Translation update done using Pootle. commit e24c0595032cf1e1bbe307c1472aadfbba7d89e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:36 2010 +0200 Translation update done using Pootle. commit d20f3b9c6d0af63e2b928000b71923f52ab8e22c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:20 2010 +0200 Translation update done using Pootle. commit 58fdd36058781d82a773a53da4df42b9dbefca3b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:13 2010 +0200 Translation update done using Pootle. commit 7bfb4f33301ac7b37d8f46d14ad3e0906e5dada8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:02 2010 +0200 Translation update done using Pootle. commit 1653602c39f239e069d00dd9a04f1f0ef956152b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:55:25 2010 +0200 Translation update done using Pootle. commit 36f48c204d3b9c628cef23daeec9f4bbe1ddef7b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:55:12 2010 +0200 Translation update done using Pootle. commit 1ca7d0b081311a4c53576b25fcafa08b48a9c54f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:54:36 2010 +0200 Translation update done using Pootle. commit 691662876561307c8579443d94d99024102cc23a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:54:25 2010 +0200 Translation update done using Pootle. commit e2ba95a90426dc430243dba67e42ed5e7d567146 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:45 2010 +0200 Translation update done using Pootle. commit f0138961bd2fbcc4fa0b99f891529506c98037f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:29 2010 +0200 Translation update done using Pootle. commit f18843c5e1a2c700e57f05fe6ed3b2ddeb69ad30 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:06 2010 +0200 Translation update done using Pootle. commit fa9befb52779664175b5d5f61af5edbe26f3dc8a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:47:15 2010 +0200 Translation update done using Pootle. commit 173c919679e40aed3fb6adda52118ea7f1247279 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:46:47 2010 +0200 Translation update done using Pootle. commit c8fc3dee15d2a0bbd1598004c221ff42cb630a0d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:28 2010 +0200 Translation update done using Pootle. commit 088676653dd3bcad8ece6f7d8098f69761f85b66 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:23 2010 +0200 Translation update done using Pootle. commit c00ee704c4d8a69d1267d89e6f63132c9c424231 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:19 2010 +0200 Translation update done using Pootle. commit 02437e8c2f863587208f850108e0827e28f0fa72 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:09 2010 +0200 Translation update done using Pootle. commit 50a38093b065e1116b163b3ca0db0fddce7b9ab5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:43:01 2010 +0200 Translation update done using Pootle. commit 3d5daf553bf4e8ba18011cb755534f358aa6a19a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:55 2010 +0200 Translation update done using Pootle. commit 6aec7817a0e98f831e51eba92fccb3a4c5a1ee1d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:50 2010 +0200 Translation update done using Pootle. commit dbb755f40b7bb06ce8ad0457fa3a843b308decb0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:46 2010 +0200 Translation update done using Pootle. commit 26b41e762245a7f8115dacc717db102108323b36 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:41 2010 +0200 Translation update done using Pootle. commit 6489b30e539e09c565d5288827e1fdbb8a95e355 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:33 2010 +0200 Translation update done using Pootle. commit 4d79e45a35124d4f5233a5be0f992378992db59c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:24 2010 +0200 Translation update done using Pootle. commit 64932323e58dc99c1c581004a9341d3ac53d2ed0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:13 2010 +0200 Translation update done using Pootle. commit 7c9803d8f1999571fab1460e1d2a082cefd6365c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:59 2010 +0200 Translation update done using Pootle. commit 213678986dd34516520bb97f7fb0e2a2bc31d260 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:46 2010 +0200 Translation update done using Pootle. commit 55f8350dd644b753979a46ab753c4f1fe556b4ae Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:42 2010 +0200 Translation update done using Pootle. commit e2ce0d4a65e0d7f203ac1645cfa5299dd7220a0f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:28 2010 +0200 Translation update done using Pootle. commit c6f337da8cc41ee4c5619fb0f8bb5ae8631001c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:22 2010 +0200 Translation update done using Pootle. commit 4cac4b24c7e3f0766977620dca4a6e5307f6f0cf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:11 2010 +0200 Translation update done using Pootle. commit 30ce734c3acd6798f0034e639e9581b9efdb9c46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:40:55 2010 +0200 Translation update done using Pootle. commit 2101d958dfd3fa01fac86e7bc50ccf9abbef6349 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:39:51 2010 +0200 Translation update done using Pootle. commit 1279008b35e05ca86000aff202546d970bd11032 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:39:43 2010 +0200 Translation update done using Pootle. commit c3c17e8cb9922d7cf28618a255d7ade9c5e89150 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:38:18 2010 +0200 Translation update done using Pootle. commit b44c7608e8771f1d7e5e2cc708b7749004c45199 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:36 2010 +0200 Translation update done using Pootle. commit dd8989f021501222178ca2eb7f84b288b4d579c8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:32 2010 +0200 Translation update done using Pootle. commit 843927111efea0cff8d1c5b71093bb83efb92f7c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:01 2010 +0200 Translation update done using Pootle. commit 29e224c18c305829e0e2375f74e336aad2be1de3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:36:39 2010 +0200 Translation update done using Pootle. commit faf6bb1a165d0cc34463d3c49ecc233d4ae1c24b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:27:06 2010 +0200 Translation update done using Pootle. commit bece88ce187fc84b697ab17a135205a846cf0792 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:26:03 2010 +0200 Translation update done using Pootle. commit 7584f95d21af260071d4dfb3e9c4108eda043e20 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:25:39 2010 +0200 Translation update done using Pootle. commit 74c5a6c14d7cf3778deef48f85272d1e4b5d2b39 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:25:05 2010 +0200 Translation update done using Pootle. commit dad20040ed959cd2c28976a4f64c362105005389 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:24:52 2010 +0200 Translation update done using Pootle. commit e62f0e38a8630eae9d39e1f5291561a4feb93bf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:24:40 2010 +0200 Translation update done using Pootle. commit d6ba6e21c26facb9aabc54719373073de8ff0179 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:23:35 2010 +0200 Translation update done using Pootle. commit a336a80886986de1da0f7e0c697d0e253428023a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:20:35 2010 +0200 Translation update done using Pootle. commit b4cc90a79c2b8e72bb1e67d4b272a3dfc741ca9b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:20:17 2010 +0200 Translation update done using Pootle. commit e6a04238ffb42b8f555ca730cca8fcaa56f6e0e3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:53 2010 +0200 Translation update done using Pootle. commit 8de2a6c4a63b3c564fd9f2db7550871b0607c3e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:36 2010 +0200 Translation update done using Pootle. commit 741a7f921999d7f62e0a33eeb620dd8ab759ceed Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:13 2010 +0200 Translation update done using Pootle. commit db95ace15c5092b2652c1e1d67982b997b771ded Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:18:45 2010 +0200 Translation update done using Pootle. commit 6bbd91f3b0497a7e4f58945bdce5c44ba0fa9143 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:14:25 2010 +0200 Translation update done using Pootle. commit 99b3b565f307ea4c5fd556871f11a34ea074cf20 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:56 2010 +0200 Translation update done using Pootle. commit 7bdd2e4ddd5959a7327d33d20ca6f969ed389298 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:45 2010 +0200 Translation update done using Pootle. commit 90d0079511c2e20924d618b4e4a92a83f1a0e3f6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:30 2010 +0200 Translation update done using Pootle. commit 990c11e8c7e244ea5ca9255f1356408784d1b490 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:12:44 2010 +0200 Translation update done using Pootle. commit 5299ebb21d1d388e3830923ad7d31c33da539335 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:12:06 2010 +0200 Translation update done using Pootle. commit 6a690addaec97521dd91bfe25ca640d7bb63c6da Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:11:50 2010 +0200 Translation update done using Pootle. commit 9813be99d5e8aacb0de12e07720882891a9e49f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:11:03 2010 +0200 Translation update done using Pootle. commit d06c2933d1aeeb5ea53971e2df45a1757a4a817f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:57 2010 +0200 Translation update done using Pootle. commit 2b3065ee286cd7eb461aa1f2bc69955be8a0fa26 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:44 2010 +0200 Translation update done using Pootle. commit 4110849fed046a9db6958d635863a6e509a5f1fe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:32 2010 +0200 Translation update done using Pootle. commit 577b26088016f8a5544c3603f6c3a82b09db67fd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:58 2010 +0200 Translation update done using Pootle. commit 9134f9965efffb6a064daf1fba45c2184d37a632 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:48 2010 +0200 Translation update done using Pootle. commit 61bc6c69f7533415595db4ad04dae892ed97dc9c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:31 2010 +0200 Translation update done using Pootle. commit c19a7e26b9b257c4721371b6be5e6014f62549cc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:08:07 2010 +0200 Translation update done using Pootle. commit f8efa655ee99dd4a1bcc8019f93dca386bcf9b5c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:53 2010 +0200 Translation update done using Pootle. commit f5e7134d04f0d6122ca6f44db308d19f70a70a3a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:44 2010 +0200 Translation update done using Pootle. commit d04eaf067d75c20d495963eee12c2ab66ea8279b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:36 2010 +0200 Translation update done using Pootle. commit a3706fd78b83187eaf963b66617386e17d2dcc7b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:31 2010 +0200 Translation update done using Pootle. commit 02db79828159fa5ef99d26c44746017cde14efcd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:23 2010 +0200 Translation update done using Pootle. commit 14e1a01aae4bd7313eee8b687d39a404a89627cc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:15 2010 +0200 Translation update done using Pootle. commit e88d7f983694f6bd029718b306bb2bc9864d0435 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:00 2010 +0200 Translation update done using Pootle. commit 3ebd9371f3d32794761626b937a25db9f91ebe87 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:56:59 2010 +0200 Translation update done using Pootle. commit 1cfb2c07dc6df12d5bc730986174528a1df3b855 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:56:37 2010 +0200 Translation update done using Pootle. commit cca2381db52258574d58da29120456c77ea04fdc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:54:59 2010 +0200 Translation update done using Pootle. commit 7ece295e7b2b85d9701602501ca717408ecd7fa2 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:54:45 2010 +0200 Translation update done using Pootle. commit 8c3a102c9e05743a29012556f1d8b51aa25b098e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:53:42 2010 +0200 Translation update done using Pootle. commit fff791d793e9937bae0207db43372b5392b57b8f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:53:23 2010 +0200 Translation update done using Pootle. commit ab52b8857226c94357b35ec0f2f22f48d151e5f9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:52:18 2010 +0200 Translation update done using Pootle. commit 71d4ed5839dde6952c151e638d52df06c836fa18 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:52:07 2010 +0200 Translation update done using Pootle. commit 4e50a436786d7479097a943449c003f9437cbd9a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:51:51 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 293 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 124 insertions(+), 169 deletions(-) diff --git a/po/fr.po b/po/fr.po index 67f846c..85bab34 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-15 15:08+0200\n" -"PO-Revision-Date: 2010-09-05 15:34+0200\n" +"PO-Revision-Date: 2010-09-20 22:00+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -817,7 +817,7 @@ msgstr "Valeurs pour la colonne «%s»" #: enum_editor.php:22 libraries/tbl_properties.inc.php:799 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Saisir chaque valeur dans un champ séparé." #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -3092,10 +3092,9 @@ msgid "Display servers selection" msgstr "Affiche la liste des serveurs" #: libraries/config/messages.inc.php:268 -#, fuzzy #| msgid "Display databases in a tree" msgid "Display table filter" -msgstr "Montre les bases de données dans une arborescence" +msgstr "Montrer le filtre de table" #: libraries/config/messages.inc.php:269 msgid "String that separates databases into different tree levels" @@ -3234,7 +3233,6 @@ msgid "Login cookie validity" msgstr "Durée de validité de la connexion (mode cookie)" #: libraries/config/messages.inc.php:296 -#, fuzzy #| msgid "Double size of textarea for LONGTEXT fields" msgid "Double size of textarea for LONGTEXT columns" msgstr "Doubler la taille de la zone de texte pour les colonnes LONGTEXT" @@ -5056,12 +5054,14 @@ msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Le délai d'expiration, en secondes, pour les BLOBs temporaires. Les données " +"du BLOB téléversé sont effacées après ce délai, à moins qu'elles ne soient " +"référencées par un enregistrement de la base de données." #: libraries/engines/pbms.lib.php:50 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Seuil du fichier journal" +msgstr "Seuil du journal temporaire" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -5069,26 +5069,35 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"La taille maximum d'un fichier journal BLOB temporaire. Vous pouvez utiliser " +"Kb, MB ou GB pour indiquer l'unité de valeur. Une valeur en octets est " +"assumée si aucune unité n'est spécifiée." #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" -msgstr "" +msgstr "Durée de vie maximum" #: libraries/engines/pbms.lib.php:56 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Le délai d'expiration pour une connexion inactive comportant le réglage " +"keep-alive actif. Après ce délai la connexion sera fermée. Le délai est en " +"millisecondes (1/1000)." #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "En-têtes de méta-données" #: libraries/engines/pbms.lib.php:61 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"Une liste d'en-têtes de méta-données délimitée par des «.», qui servira à " +"initialiser la table pbms_metadata_header quand une base de données est " +"créée." #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5243,57 +5252,49 @@ msgstr "" "plus anciens sont détruits, sinon ils sont renommés." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Columns terminated by" msgid "Columns separated with:" -msgstr "Colonnes terminées par" +msgstr "Colonnes séparées par :" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Columns enclosed by" msgid "Columns enclosed with:" -msgstr "Colonnes entourées par" +msgstr "Colonnes entourées par :" #: libraries/export/csv.php:23 libraries/import/csv.php:29 -#, fuzzy #| msgid "Columns escaped by" msgid "Columns escaped with:" -msgstr "Caractère d'échappement" +msgstr "Caractère d'échappement :" #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Lignes terminées par" +msgstr "Lignes terminées par :" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Remplacer NULL par" +msgstr "Remplacer NULL par :" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within columns" msgid "Remove carriage return/line feed characters within columns" msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel en version" +msgstr "Version d'Excel :" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Options d'affichage des bases de données" +msgstr "Options d'exportation" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:929 libraries/export/texytext.php:123 @@ -5319,36 +5320,31 @@ msgstr "Structure de la table @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Options de transformation" +msgstr "Options de création d'objets" #: libraries/export/latex.php:51 libraries/export/latex.php:75 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Sous-titre de la table" +msgstr "Sous-titre de la table (suite)" #: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "Désactiver la vérification des clés étrangères" +msgstr "Afficher les relations de clés étrangères" #: libraries/export/latex.php:59 libraries/export/odt.php:45 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Commentaires de colonnes" +msgstr "Afficher les commentaires" #: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Types MIME disponibles" +msgstr "Afficher les types MIME" #: libraries/export/latex.php:139 libraries/export/sql.php:281 #: libraries/export/xml.php:105 libraries/header_printview.inc.php:56 @@ -5389,10 +5385,9 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Génère un rapport contenant les données d'une seule table)" #: libraries/export/pdf.php:24 -#, fuzzy #| msgid "Report title" msgid "Report title:" -msgstr "Titre du rapport" +msgstr "Titre du rapport :" #: libraries/export/php_array.php:16 msgid "PHP array" @@ -5403,72 +5398,76 @@ msgid "" "Display comments <i>(includes info such as export timestamp, PHP version, " "and server version)</i>" msgstr "" +"Afficher les commentaires <i>(incluant les informations telles que " +"l'horodatage d'exportation, la version de PHP et la version du serveur)</i>" #: libraries/export/sql.php:35 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Commentaires mis en en-tête (\\n sépare les lignes)" +msgstr "" +"Commentaires mis en en-tête (\n" +" sépare les lignes) :" #: libraries/export/sql.php:37 msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Inclut un horodatage de création, mise à jour et dernière vérification des " +"bases de données" #: libraries/export/sql.php:65 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Maximiser la compatibilité avec un système de base de données ou un ancien " +"serveur MySQL:" #: 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 "Information" +msgstr "Ajouter un énoncé %s" #: libraries/export/sql.php:91 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Information" +msgstr "Ajouter les énoncés :" #: libraries/export/sql.php:111 -#, fuzzy #| msgid "<code>@TABLE@</code>" msgid "<code>CREATE TABLE</code> options:" -msgstr "<code>@TABLE@</code>" +msgstr "Options pour <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 -#, fuzzy msgid "" "Enclose table and field names with backquotes <i>(Protects field and table " "names formed with special characters or keywords)</i>" msgstr "" -"« Protéger les noms des tables et des champs par des " -"\"`\" » assure que les noms de champ et de table contenant des " -"caractères spéciaux sont protégés." +"Entourer les noms des tables et des colonnes par des guillemets obliques " +"<i>(Protège les noms de tables et de colonnes comportant des caractères " +"spéciaux ou des mots réservés)</i>" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Au lieu d'énoncés <code>INSERT</code>, utiliser :" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "Énoncés <code>INSERT DELAYED</code>" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "Énoncés <code>INSERT IGNORE</code>" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" -msgstr "" +msgstr "Fonction à utiliser lors de l'exportation des données :" #: libraries/export/sql.php:151 msgid "Syntax to use when inserting data:" -msgstr "" +msgstr "Syntaxe à utiliser lors de l'insertion de données :" #: libraries/export/sql.php:154 msgid "" @@ -5476,6 +5475,9 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" +"inclure les noms de colonnes dans chaque énoncé <code>INSERT</code><br /> " +"      Par exemple: <code>INSERT INTO tbl_name " +"(col_A,col_B,col_C) VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5483,30 +5485,43 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" +"insérer des lignes multiples avec chaque énoncé <code>INSERT</code><br /> " +"      Par exemple : <code>INSERT INTO tbl_name VALUES " +"(1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:156 msgid "" "both of the above<br />       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" +"les deux modes ci-dessus<br />       Par exemple : " +"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above<br />       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" +"aucun des modes ci-dessus <br />       Par exemple : " +"<code>INSERT INTO tbl_name VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes " "0x616263)</i>" msgstr "" +"Exporter les colonnes binaires en format hexadécimal <i>(par exemple, «abc» " +"devient 0x616263)</i>" #: libraries/export/sql.php:171 msgid "" "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)</i>" msgstr "" +"Exporter les colonnes TIMESTAMP en UTC <i>(permet les colonnes TIMESTAMP " +"d'être exportées et importées entre des serveurs de zones horaires " +"différentes)</i>" #: libraries/export/sql.php:435 libraries/export/xml.php:34 msgid "Procedures" @@ -5551,13 +5566,12 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Options de création d'objets (toutes sont recommandées)" #: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Vue" +msgstr "Vues" #: libraries/export/xml.php:47 msgid "Export contents" @@ -5622,6 +5636,8 @@ msgid "" "The first line of the file contains the table column names <i>(if this is " "unchecked, the first line will become part of the data)</i>" msgstr "" +"La première ligne du fichier contient le nom des colonnes de la table <i>(si " +"ceci n'est pas coché, la première ligne fait partie des données)</i>" #: libraries/import/csv.php:39 msgid "" @@ -5629,12 +5645,15 @@ msgid "" "database, list the corresponding column names here. Column names must be " "separated by commas and not enclosed in quotations." msgstr "" +"Si les données de chaque ligne du fichier ne sont pas dans le même ordre que " +"dans la base de données, listez ici les noms de colonnes correspondantes. " +"Les noms de colonnes doivent être séparées par une virgule et non entourées " +"de guillemets." #: libraries/import/csv.php:41 -#, fuzzy #| msgid "Column names" msgid "Column names: " -msgstr "Nom des colonnes" +msgstr "Nom des colonnes :" #: libraries/import/csv.php:60 libraries/import/csv.php:72 #: libraries/import/csv.php:76 libraries/import/csv.php:80 @@ -5648,6 +5667,9 @@ msgid "" "Invalid column (%s) specified! Ensure that columns names are spelled " "correctly, separated by commas, and not enclosed in quotes." msgstr "" +"Colonne %s invalide! Assurez-vous que les noms de colonnes sont " +"orthographiés correctement, séparés par des virgules et non entourés de " +"guillemets. " #: libraries/import/csv.php:179 libraries/import/csv.php:426 #, php-format @@ -5678,28 +5700,25 @@ msgid "This plugin does not support compressed imports!" msgstr "Ce greffon ne supporte pas les importations en format comprimé !" #: libraries/import/ods.php:28 -#, fuzzy #| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" -msgstr "Importer les pourcentages en tant que décimales (12.00% devient .12)" +msgstr "" +"Importer les pourcentages en tant que décimales <i>(12.00% devient .12)</i>" #: libraries/import/ods.php:29 -#, fuzzy #| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" -msgstr "Importer les valeurs de monnaie ($5.00 devient 5.00)" +msgstr "Importer les valeurs de monnaie <i>($5.00 devient 5.00)</i>" #: libraries/import/sql.php:32 -#, fuzzy #| msgid "SQL compatibility mode" msgid "SQL compatibility mode:" -msgstr "Mode de compatibilité SQL" +msgstr "Mode de compatibilité SQL :" #: libraries/import/sql.php:42 -#, fuzzy #| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" -msgstr "Ne pas utiliser AUTO_INCREMENT pour la valeur zéro" +msgstr "Ne pas utiliser <code>AUTO_INCREMENT</code> pour la valeur zéro" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" @@ -5947,7 +5966,6 @@ msgid "Log out" msgstr "Quitter" #: libraries/plugin_interface.lib.php:336 -#, fuzzy #| msgid "This format has no options" msgid "This format has no options" msgstr "Ce format ne comporte pas d'options" @@ -5988,7 +6006,7 @@ msgstr "Historique SQL" #: libraries/relation.lib.php:141 msgid "User preferences" -msgstr "" +msgstr "Préférences de l'utilisateur" #: libraries/relation.lib.php:145 msgid "Quick steps to setup advanced features:" @@ -6154,7 +6172,7 @@ msgstr "Pas de table" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "Erreur de schéma : " #: libraries/schema/Pdf_Relation_Schema.class.php:891 #: libraries/schema/Pdf_Relation_Schema.class.php:1119 @@ -6196,49 +6214,46 @@ msgstr "Relations internes" #: libraries/schema/User_Schema.class.php:116 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY" #: libraries/schema/User_Schema.class.php:148 msgid "Please choose a page to edit" msgstr "Page à éditer" #: libraries/schema/User_Schema.class.php:153 -#, fuzzy #| msgid "Select Tables" msgid "Select page" -msgstr "Choisissez les tables" +msgstr "Choisissez la page" #: libraries/schema/User_Schema.class.php:211 msgid "Select Tables" msgstr "Choisissez les tables" #: libraries/schema/User_Schema.class.php:346 -#, fuzzy #| msgid "Relational schema" msgid "Display relational schema" -msgstr "Schéma relationnel" +msgstr "Afficher le schéma relationnel" #: libraries/schema/User_Schema.class.php:351 -#, fuzzy #| msgid "CSV" msgid "SVG" -msgstr "CSV" +msgstr "SVG" #: libraries/schema/User_Schema.class.php:352 msgid "DIA" -msgstr "" +msgstr "DIA" #: libraries/schema/User_Schema.class.php:353 msgid "VISIO" -msgstr "" +msgstr "VISIO" #: libraries/schema/User_Schema.class.php:354 msgid "EPS" -msgstr "" +msgstr "EPS" #: libraries/schema/User_Schema.class.php:356 msgid "Select Export Relational Type" -msgstr "" +msgstr "Choisissez le type d'exportation des relations" #: libraries/schema/User_Schema.class.php:377 msgid "Show grid" @@ -6269,10 +6284,9 @@ msgid "Portrait" msgstr "Portrait" #: libraries/schema/User_Schema.class.php:394 -#, fuzzy #| msgid "Creation" msgid "Orientation" -msgstr "Création" +msgstr "Orientation" #: libraries/schema/User_Schema.class.php:407 msgid "Paper size" @@ -6302,7 +6316,6 @@ msgid "Unknown language: %1$s." msgstr "Langue inconnue: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 -#, fuzzy #| msgid "Current server" msgid "Current Server" msgstr "Serveur actuel" @@ -6335,10 +6348,9 @@ msgid "Synchronize" msgstr "Synchroniser" #: libraries/server_links.inc.php:99 -#, fuzzy #| msgid "settings" msgid "Settings" -msgstr "réglages" +msgstr "Réglages" #: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1108 msgid "Source database" @@ -6464,7 +6476,7 @@ msgstr "Fin des informations sur l'anomalie" #: libraries/sqlparser.lib.php:367 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Un guillemet oblique a été ajouté à la fin de la requête!" #: libraries/sqlparser.lib.php:370 msgid "Unclosed quote" @@ -6547,11 +6559,11 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "Données trop longues pour ENUM ou SET?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Obtenir plus d'espace d'édition" #: libraries/tbl_properties.inc.php:396 msgctxt "for default" @@ -6728,16 +6740,14 @@ msgstr "" "du texte (par défaut: «...»)." #: libraries/user_preferences.inc.php:32 -#, fuzzy #| msgid "Other core settings" msgid "Manage your settings" -msgstr "Autres réglages de base" +msgstr "Gérer vos paramètres" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#, fuzzy #| msgid "Modifications have been saved" msgid "Configuration has been saved" -msgstr "Les modifications ont été sauvegardées" +msgstr "La configuration a été sauvegardée" #: libraries/user_preferences.inc.php:68 #, php-format @@ -6745,18 +6755,22 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vos préférences seront sauvegardées pour la session courante seulement. Un " +"stockage permanent requiert l'installation de %sstockage de configuration " +"phpMyAdmin%s." #: libraries/user_preferences.lib.php:141 -#, fuzzy #| msgid "Cannot load or save configuration" msgid "Could not save configuration" -msgstr "Impossible de charger ou sauvegarder la configuration" +msgstr "Impossible de sauvegarder la configuration" #: libraries/user_preferences.lib.php:308 msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Votre navigateur contient une configuration phpMyAdmin pour ce domaine. " +"Voulez-vous l'importer dans la session courante?" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -6768,34 +6782,31 @@ msgid "Error in ZIP archive:" msgstr "Erreur rencontrée dans l'archive ZIP :" #: main.php:67 -#, fuzzy #| msgid "General relation features" msgid "General Settings" -msgstr "Fonctions relationnelles" +msgstr "Paramètres généraux" #: main.php:98 msgid "MySQL connection collation" msgstr "Interclassement pour la connexion MySQL" #: main.php:113 -#, fuzzy #| msgid "Other core settings" msgid "Appearance Settings" -msgstr "Autres réglages de base" +msgstr "Paramètres d'affichage" #: main.php:133 msgid "Background color" -msgstr "" +msgstr "Couleur d'arrière-plan" #: main.php:134 msgid "Choose..." -msgstr "" +msgstr "Choisissez..." #: main.php:151 prefs_manage.php:274 -#, fuzzy #| msgid "settings" msgid "More settings" -msgstr "réglages" +msgstr "Plus de paramètres" #: main.php:168 msgid "Protocol version" @@ -6837,7 +6848,7 @@ msgstr "Site officiel" #: main.php:221 msgid "Mailing lists" -msgstr "" +msgstr "Listes de courriel" #: main.php:247 msgid "" @@ -7065,42 +7076,42 @@ msgid "to/from page" msgstr "de/vers la page" #: prefs_forms.php:78 -#, fuzzy #| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" -msgstr "Le formulaire soumis contient des erreurs" +msgstr "" +"Le formulaire soumis contient des erreurs, impossible de sauvegarder les " +"paramètres" #: prefs_manage.php:80 -#, fuzzy #| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" -msgstr "Chargement de la configuration par défaut impossible depuis %1$s" +msgstr "Erreur d'importation de la configuration" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "La configuration contient des valeurs incorrectes pour certains champs." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Voulez-vous importer les autres paramètres?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Sauvegardé le : @DATE@" #: prefs_manage.php:239 -#, fuzzy #| msgid "Import files" msgid "Import from file" -msgstr "Importe les fichiers" +msgstr "Importer depuis le fichier" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Importer depuis le stockage du navigateur" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." msgstr "" +"Les paramètres seront importés depuis le stockage local de votre navigateur." #: prefs_manage.php:254 #, fuzzy @@ -9902,59 +9913,3 @@ msgstr "Changer le nom de la vue pour" #~ "d'apostrophes. Si vous devez entrer un caractère (\"\\\") ou une " #~ "apostrophe (\"'\") parmi ces valeurs, faites-le précéder du caractère " #~ "d'échappement, par exemple '\\\\xyz' or 'a\\'b')." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Veuillez entrer les valeurs des options de transformation en suivant ce " -#~ "format: 'a', 100, b,'c'...<br />Si vous devez entrer un caractère (\"\\" -#~ "\") ou une apostrophe (\"'\") parmi ces valeurs, faites-le précéder du " -#~ "caractère d'échappement, par exemple '\\\\xyz' or 'a\\'b')." - -#~ msgid "New table" -#~ msgstr "Nouvelle table" - -#~ msgid "server name" -#~ msgstr "nom de serveur" - -#~ msgid "database name" -#~ msgstr "nom de base de données" - -#~ msgid "table name" -#~ msgstr "nom de table" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Préparer le schéma en PDF" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Orientation du dictionnaire" - -#~ msgid "no" -#~ msgstr "non" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "Entrez les options pour l'authentification signon" - -#~ msgid "Signon login options" -#~ msgstr "Option de connexion signon" - -#~ msgid "PMA database" -#~ msgstr "Base de données PMA" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "Réglages pour requêtes SQL, voir [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a]" - -#~ msgid "yes" -#~ msgstr "oui" hooks/post-receive -- phpMyAdmin

1 0

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

21 Sep '10

The branch, master has been updated via 35cf83bc12805c230f71c31653fd50c8751e32d7 (commit) via 4b313daa7a9c70c64a50a1786a5350876cb48c49 (commit) from 8f2546271cff3a91434cefbc77f9cf56d5e42168 (commit) - Log ----------------------------------------------------------------- commit 35cf83bc12805c230f71c31653fd50c8751e32d7 Merge: 8f2546271cff3a91434cefbc77f9cf56d5e42168 4b313daa7a9c70c64a50a1786a5350876cb48c49 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Sep 21 10:30:19 2010 +0200 Merge remote branch 'knittl/inline-edit-xss' commit 4b313daa7a9c70c64a50a1786a5350876cb48c49 Author: Daniel Knittl-Frank <knittl89+git(a)googlemail.com> Date: Mon Sep 20 18:12:05 2010 +0200 Fix persistent XSS in table browsing mode $where_clause was used instead of escaped $where_clause_html. This would only come into play when a string field was contained in the index (and thus used in the where clause). Signed-off-by: Daniel Knittl-Frank <knittl89+git(a)googlemail.com> ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- libraries/display_tbl_links.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a57c909..3520257 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1457,7 +1457,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if( !empty($where_clause) ) { - $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; + $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } else { unset($vertical_display['where_clause'][$row_no]); diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index a8511fe..d261fd0 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -61,6 +61,6 @@ if ($doWriteModifyAt == 'left') { * Used by jQuery scripts for handling inline editing */ if( !empty($where_clause)) { - echo '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; + echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac
by Michal Čihař 20 Sep '10

20 Sep '10

The branch, master has been updated via 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac (commit) via fd062afe0f560a0b0c46f18ab7fd99e3dd7f8f4e (commit) via c6763fbdd51da3b004c4ace48ec132b25d04c576 (commit) from 283456c54ecc92672220117886b5ef0e68ec067a (commit) - Log ----------------------------------------------------------------- commit 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Sep 20 12:02:43 2010 +0200 Add missing screenshot. commit fd062afe0f560a0b0c46f18ab7fd99e3dd7f8f4e Merge: c6763fbdd51da3b004c4ace48ec132b25d04c576 283456c54ecc92672220117886b5ef0e68ec067a Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 11:12:14 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit c6763fbdd51da3b004c4ace48ec132b25d04c576 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 11:04:25 2010 +0200 Drop Subversion mentions, we're using Git for some time. ----------------------------------------------------------------------- Summary of changes: images/themes/smooth_yellow.png | Bin 0 -> 61831 bytes templates/downloads.tpl | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/themes/smooth_yellow.png diff --git a/images/themes/smooth_yellow.png b/images/themes/smooth_yellow.png new file mode 100644 index 0000000..ed413af Binary files /dev/null and b/images/themes/smooth_yellow.png differ diff --git a/templates/downloads.tpl b/templates/downloads.tpl index 1c0b330..3bf7f5e 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -64,7 +64,7 @@ </table> <p> - More information about using subversion is available on <a + More information about using Git is available on <a href="${base_url}improve.${file_ext}#devel">development page</a>. </p> @@ -74,7 +74,7 @@ href="https://sourceforge.net/projects/phpmyadmin/files/">SourceForge files page</a>. Releases which had security issues are removed from this download location, if you want to see them, you need to get them from our - Subversion repository (check <a href="${base_url}improve.${file_ext}#devel">developer information</a> for instructions). + Git repository (check <a href="${base_url}improve.${file_ext}#devel">developer information</a> for instructions). </p> <py:for each="release in releases_older"> <h3>${release.fullname}</h3> hooks/post-receive -- phpMyAdmin website

1 0

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

20 Sep '10

The branch, master has been updated via 746e280345d27ff8cecdbfb4ba301fab8df414e0 (commit) via 9ad89c4629e367634eee900fbace58141d4fd8e4 (commit) via 24d0030e576573a1ab17a62720be57b814d75ccd (commit) via 94cec75900d634a60e5867fbce07fdf910898c98 (commit) via a306dd2bc25470ead636db0a3cf8ed9fdff2d542 (commit) via 31d4afa20b401bb3f562717c507c7edf5e4ec996 (commit) via bd12c9c8211f060f011b8840e4eba2fc4324de43 (commit) via 2e0f308c07d9bbd729b4b171ddff641406d852bc (commit) via 05df8f35c0ae57f5dcc24564d6e12c62aab996be (commit) via 5ea61d7355fcb9cd37dc82a2f4f765dbf1164a48 (commit) via 3390fad86808b8535771652ec45c74ad5691f0be (commit) via daf1caaf880935e92336b6a21e433e0f295a14c7 (commit) via 5417cfae041c5c0a3b37385134b0a0acd9c03681 (commit) via 08945d3fbbc0ff80b1e1f7e925f169d0a3e31daf (commit) via 5a0e758e17389c9c083313ba70a5239e4cb8790d (commit) via d4092790b724b572c781ec3413413c8b40f17edb (commit) via 43312581752ec6d13f702dca42f97b12508aad63 (commit) via 0358dc4f56f34e077152ba1e8e5ceac02e061ade (commit) via 6044eaa10a02a1394d377cf6a1f6badb7745904b (commit) via 0df9c049518da7c6f0c9f417da61556c8007caef (commit) via f680eda3a24f23285b23563ba4641cd813e7720b (commit) via 18addb469a196e6faff680a98e79cc778575633c (commit) via 81ee0c2d352167f95cc4fda0827ea10057099bfd (commit) via 132c140bc9c90fa637e16dfc3782737670d134c5 (commit) via 310270c7a5c10e65b0a714b31d8a2fc62d33c514 (commit) via 53befe26221f7ff7cc706de731c7b652bec379a3 (commit) via 3de30b00845aa5d1738cdce21ce9818b45c3d22a (commit) via bc19116a78561fc8b0cd927cfc62d5a5bc7f411e (commit) via f3f6ea898e70aaf66d3102f2b699c2bd5391fef1 (commit) via e9a4bf42f1e35e7c395b5fdca3e6ecd2e1fa2f25 (commit) via 0e532bee919b88db3a8042b142015650797aab25 (commit) via 115f6ad6ba75aa9108617d5d21ff28ffc577efe1 (commit) via 49f62620c57bfca0a23a268735f91575c3748cd2 (commit) via cabb66b3bad7e8f9e122856edbec691d44993c55 (commit) via 6b1d335b0836f7274b408a58c6a6d5fd0fe45186 (commit) via 7c261f2a8cd516e45d40f5d76a3d7bfdd64dd309 (commit) via fc0a9f8d8b960360622cb6b972507b0b7d7796aa (commit) via 658b2ca4847fa75ebc0e86d74f258a9c75b67ba9 (commit) via 658f2b07dacfe083288672b27dd85bbbd267471f (commit) via 828b417e08cfc9edaa55008f753ca70272db5e4d (commit) via f535e8f25c7b63203c68cd4bdd1bb29570c02b78 (commit) via 2085f7f51138699e5e710cc69183f3915aefb793 (commit) via deeef18154b9244740c5d31925d774b2932dd79a (commit) via 272ba7035a5622bb82e91d11ef080b58a86e1f17 (commit) via fee57abfa194e6974b40df3fb8aa0b1f7bf52f71 (commit) via 47d7769c111c29dd8b5eeb55a094ea2695fc860e (commit) via 2dfbfaaf4e82a0b5d95fcd230ad1c11d531152c3 (commit) via 9f6d41db65c9d8e4d50ca7b7bac78031379603b1 (commit) via 4091da57234f9cd0069275115179c0d9f80e4aac (commit) via 9c5b9fa7dda72275298417e41f29f12da7793283 (commit) via a8d63a050d7917359b7b3c43b31ebdc829ec5699 (commit) via 215f3d39a44285220f75be05f9b4c1b722cfecd8 (commit) via c291f9f75fce8e5d2d652ef210f8e9aab9a91025 (commit) via f71b6bcdb171b7bbf203fdb333cf281c8220b4ad (commit) via fbda021ed55aa9b0d43f8b0c44c072973453e743 (commit) via ec5a2d5b68495d4ad15e6e8dba5e21d46df6084b (commit) via e3de36da4eecdabc787fb0a5dad5312c6a84a223 (commit) via ad22379fbd588e695f88b714b9db81809606149b (commit) via 7648fe84a074f701160d49ee15e94cbfa9b16c9f (commit) via f5833c6d6a8fc07b2011799781bffa0c6024c998 (commit) via 74966398c5df3ad73bbdf338b4cc86dc9b450532 (commit) via 6c9527d39c3ec18bd1e007effd34680aad646207 (commit) via a65214f22c44098f77553e2b95dd8844695d2dc4 (commit) via 9bbf26c449f2a3224521306921f7d24f5f13e17d (commit) from 5f53d04eeaacc20bc2aeb382ce2dfebb3378eddd (commit) - Log ----------------------------------------------------------------- commit 746e280345d27ff8cecdbfb4ba301fab8df414e0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Sep 20 11:41:03 2010 +0200 Regenerate docs. commit 9ad89c4629e367634eee900fbace58141d4fd8e4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 14:44:34 2010 +0200 Translation update done using Pootle. commit 24d0030e576573a1ab17a62720be57b814d75ccd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 14:44:00 2010 +0200 Translation update done using Pootle. commit 94cec75900d634a60e5867fbce07fdf910898c98 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 14:40:59 2010 +0200 Translation update done using Pootle. commit a306dd2bc25470ead636db0a3cf8ed9fdff2d542 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 14:40:49 2010 +0200 Translation update done using Pootle. commit 31d4afa20b401bb3f562717c507c7edf5e4ec996 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:53:44 2010 +0200 Translation update done using Pootle. commit bd12c9c8211f060f011b8840e4eba2fc4324de43 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:52:55 2010 +0200 Translation update done using Pootle. commit 2e0f308c07d9bbd729b4b171ddff641406d852bc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:52:21 2010 +0200 Translation update done using Pootle. commit 05df8f35c0ae57f5dcc24564d6e12c62aab996be Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:51:54 2010 +0200 Translation update done using Pootle. commit 5ea61d7355fcb9cd37dc82a2f4f765dbf1164a48 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:50:54 2010 +0200 Translation update done using Pootle. commit 3390fad86808b8535771652ec45c74ad5691f0be Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:49:25 2010 +0200 Translation update done using Pootle. commit daf1caaf880935e92336b6a21e433e0f295a14c7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:48:04 2010 +0200 Translation update done using Pootle. commit 5417cfae041c5c0a3b37385134b0a0acd9c03681 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:47:06 2010 +0200 Translation update done using Pootle. commit 08945d3fbbc0ff80b1e1f7e925f169d0a3e31daf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:47:01 2010 +0200 Translation update done using Pootle. commit 5a0e758e17389c9c083313ba70a5239e4cb8790d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:46:57 2010 +0200 Translation update done using Pootle. commit d4092790b724b572c781ec3413413c8b40f17edb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:46:34 2010 +0200 Translation update done using Pootle. commit 43312581752ec6d13f702dca42f97b12508aad63 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:46:20 2010 +0200 Translation update done using Pootle. commit 0358dc4f56f34e077152ba1e8e5ceac02e061ade Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:45:56 2010 +0200 Translation update done using Pootle. commit 6044eaa10a02a1394d377cf6a1f6badb7745904b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:45:50 2010 +0200 Translation update done using Pootle. commit 0df9c049518da7c6f0c9f417da61556c8007caef Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:45:15 2010 +0200 Translation update done using Pootle. commit f680eda3a24f23285b23563ba4641cd813e7720b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:45:04 2010 +0200 Translation update done using Pootle. commit 18addb469a196e6faff680a98e79cc778575633c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:44:49 2010 +0200 Translation update done using Pootle. commit 81ee0c2d352167f95cc4fda0827ea10057099bfd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:44:34 2010 +0200 Translation update done using Pootle. commit 132c140bc9c90fa637e16dfc3782737670d134c5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:44:25 2010 +0200 Translation update done using Pootle. commit 310270c7a5c10e65b0a714b31d8a2fc62d33c514 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:44:15 2010 +0200 Translation update done using Pootle. commit 53befe26221f7ff7cc706de731c7b652bec379a3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:44:11 2010 +0200 Translation update done using Pootle. commit 3de30b00845aa5d1738cdce21ce9818b45c3d22a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:43:52 2010 +0200 Translation update done using Pootle. commit bc19116a78561fc8b0cd927cfc62d5a5bc7f411e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:43:03 2010 +0200 Translation update done using Pootle. commit f3f6ea898e70aaf66d3102f2b699c2bd5391fef1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:42:43 2010 +0200 Translation update done using Pootle. commit e9a4bf42f1e35e7c395b5fdca3e6ecd2e1fa2f25 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:41:41 2010 +0200 Translation update done using Pootle. commit 0e532bee919b88db3a8042b142015650797aab25 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:41:37 2010 +0200 Translation update done using Pootle. commit 115f6ad6ba75aa9108617d5d21ff28ffc577efe1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:41:33 2010 +0200 Translation update done using Pootle. commit 49f62620c57bfca0a23a268735f91575c3748cd2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:41:10 2010 +0200 Translation update done using Pootle. commit cabb66b3bad7e8f9e122856edbec691d44993c55 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:40:30 2010 +0200 Translation update done using Pootle. commit 6b1d335b0836f7274b408a58c6a6d5fd0fe45186 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:40:18 2010 +0200 Translation update done using Pootle. commit 7c261f2a8cd516e45d40f5d76a3d7bfdd64dd309 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:37:17 2010 +0200 Translation update done using Pootle. commit fc0a9f8d8b960360622cb6b972507b0b7d7796aa Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:37:11 2010 +0200 Translation update done using Pootle. commit 658b2ca4847fa75ebc0e86d74f258a9c75b67ba9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:37:01 2010 +0200 Translation update done using Pootle. commit 658f2b07dacfe083288672b27dd85bbbd267471f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:36:36 2010 +0200 Translation update done using Pootle. commit 828b417e08cfc9edaa55008f753ca70272db5e4d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:34:32 2010 +0200 Translation update done using Pootle. commit f535e8f25c7b63203c68cd4bdd1bb29570c02b78 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:32:21 2010 +0200 Translation update done using Pootle. commit 2085f7f51138699e5e710cc69183f3915aefb793 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:32:07 2010 +0200 Translation update done using Pootle. commit deeef18154b9244740c5d31925d774b2932dd79a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:31:36 2010 +0200 Translation update done using Pootle. commit 272ba7035a5622bb82e91d11ef080b58a86e1f17 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:30:07 2010 +0200 Translation update done using Pootle. commit fee57abfa194e6974b40df3fb8aa0b1f7bf52f71 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:26:34 2010 +0200 Translation update done using Pootle. commit 47d7769c111c29dd8b5eeb55a094ea2695fc860e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:21:33 2010 +0200 Translation update done using Pootle. commit 2dfbfaaf4e82a0b5d95fcd230ad1c11d531152c3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:20:59 2010 +0200 Translation update done using Pootle. commit 9f6d41db65c9d8e4d50ca7b7bac78031379603b1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:20:13 2010 +0200 Translation update done using Pootle. commit 4091da57234f9cd0069275115179c0d9f80e4aac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:13:42 2010 +0200 Translation update done using Pootle. commit 9c5b9fa7dda72275298417e41f29f12da7793283 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:11:20 2010 +0200 Translation update done using Pootle. commit a8d63a050d7917359b7b3c43b31ebdc829ec5699 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:08:34 2010 +0200 Translation update done using Pootle. commit 215f3d39a44285220f75be05f9b4c1b722cfecd8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 10:01:30 2010 +0200 Translation update done using Pootle. commit c291f9f75fce8e5d2d652ef210f8e9aab9a91025 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:58:51 2010 +0200 Translation update done using Pootle. commit f71b6bcdb171b7bbf203fdb333cf281c8220b4ad Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:56:10 2010 +0200 Translation update done using Pootle. commit fbda021ed55aa9b0d43f8b0c44c072973453e743 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:51:18 2010 +0200 Translation update done using Pootle. commit ec5a2d5b68495d4ad15e6e8dba5e21d46df6084b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:50:06 2010 +0200 Translation update done using Pootle. commit e3de36da4eecdabc787fb0a5dad5312c6a84a223 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:48:00 2010 +0200 Translation update done using Pootle. commit ad22379fbd588e695f88b714b9db81809606149b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:31:00 2010 +0200 Translation update done using Pootle. commit 7648fe84a074f701160d49ee15e94cbfa9b16c9f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 09:28:47 2010 +0200 Translation update done using Pootle. commit f5833c6d6a8fc07b2011799781bffa0c6024c998 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 08:37:19 2010 +0200 Translation update done using Pootle. commit 74966398c5df3ad73bbdf338b4cc86dc9b450532 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 08:37:09 2010 +0200 Translation update done using Pootle. commit 6c9527d39c3ec18bd1e007effd34680aad646207 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 08:36:55 2010 +0200 Translation update done using Pootle. commit a65214f22c44098f77553e2b95dd8844695d2dc4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 08:36:45 2010 +0200 Translation update done using Pootle. commit 9bbf26c449f2a3224521306921f7d24f5f13e17d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 19 08:36:29 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/en_GB/index.html | 1 + output/fr/index.html | 1 + output/tr/index.html | 1 + output/zh_CN/Documentation.html | 182 ++++++++++++++------------------------ po/zh_CN.po | 126 +++++++++++++++------------ 5 files changed, 140 insertions(+), 171 deletions(-) diff --git a/output/en_GB/index.html b/output/en_GB/index.html index efafd83..8b2a40a 100644 --- a/output/en_GB/index.html +++ b/output/en_GB/index.html @@ -12,6 +12,7 @@ <ul> <li><a href="Documentation.html">Main documentation</a></li> <li><a href="INSTALL">INSTALL</a></li> +<li><a href="README">README</a></li> <li><a href="TODO">TODO</a></li> <li><a href="translators.html">Translators</a></li> </ul> diff --git a/output/fr/index.html b/output/fr/index.html index 5496577..2532717 100644 --- a/output/fr/index.html +++ b/output/fr/index.html @@ -12,6 +12,7 @@ <ul> <li><a href="Documentation.html">Documentation principale</a></li> <li><a href="INSTALL">INSTALL</a></li> +<li><a href="README">LISEZMOI</a></li> <li><a href="TODO">TODO</a></li> <li><a href="translators.html">Traducteurs</a></li> </ul> diff --git a/output/tr/index.html b/output/tr/index.html index 2fea568..8c05717 100644 --- a/output/tr/index.html +++ b/output/tr/index.html @@ -10,6 +10,7 @@ <h1>phpMyAdmin Turkish Documentation</h1> <p>Documents translated to Turkish:</p> <ul> +<li><a href="README">README</a></li> <li><a href="translators.html">Çevirmenler</a></li> </ul> </body> diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index 34d0c7b..a945e63 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -2100,72 +2100,45 @@ null.</dd>  -<h2 id="transformations">Transformations</h2> +<h2 id="transformations">转换</h2> -<ol><li><a href="#transformationsintro">Introduction</a></li> - <li><a href="#transformationshowto">Usage</a></li> - <li><a href="#transformationsfiles">File structure</a></li> +<ol><li><a href="#transformationsintro">介绍</a></li> + <li><a href="#transformationshowto">使用</a></li> + <li><a href="#transformationsfiles">文件结构</a></li> </ol> -<h3 id="transformationsintro">1. Introduction</h3> +<h3 id="transformationsintro">1. 介绍</h3> -<p> To enable transformations, you have to setup the <tt>column_info</tt> table -and the proper directives. Please see the <a href="#config">Configuration -section</a> on how to do so.</p> +<p> 要开启转换功能，你必须设置好 <tt>column_info</tt> 表以及正确的指令。具体设置请见<a +href="#config">设置</a>一节。</p> -<p> You can apply different transformations to the contents of each column. The -transformation will take the content of each column and transform it with -certain rules defined in the selected transformation.</p> +<p> 你可以对每个字段的内容使用不同的转换。每个字段中的内容将被预定义的规则所转换。</p> -<p> Say you have a column 'filename' which contains a filename. Normally you -would see in phpMyAdmin only this filename. Using transformations you can -transform that filename into a HTML link, so you can click inside of the -phpMyAdmin structure on the column's link and will see the file displayed in -a new browser window. Using transformation options you can also specify -strings to append/prepend to a string or the format you want the output -stored in.</p> +<p> 假设你有一个存有文件名的字段 '文件名' 。正常情况下你只能在 phpMyAdmin 中看到文件名。通过转换你可以将它们转换成一个 HTML +链接，你就能直接在 phpMyAdmin 中点击并在浏览器的新窗口中看到这个文件。你还可以通过转换选项来设置转换所需要的参数。</p> -<p> For a general overview of all available transformations and their options, -you can consult your -<i><www.your-host.com>/<your-install-dir>/transformation_overview.php</i> -installation.</p> +<p> 要想查看所有可用的转换以及它们的选项，你可以在 +<i><www.你的域名.com>/<你的安装目录>/transformation_overview.php</i> 找到。</p> <p> For a tutorial on how to effectively use transformations, see our <a href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the official phpMyAdmin homepage.</p> -<h3 id="transformationshowto">2. Usage</h3> +<h3 id="transformationshowto">2. 使用</h3> -<p> Go to your <i>tbl_structure.php</i> page (i.e. reached through clicking on -the 'Structure' link for a table). There click on "Change" (or -change icon) and there you will see three new fields at the end of the -line. They are called 'MIME-type', 'Browser transformation' and -'Transformation options'.</p> +<p> 打开到你的 <i>tbl_structure.php</i> 页面 (如：通过点击一张表的 '结构' 链接) 。点击 "修改" +(或修改图标) 后你就能看到在最下方多出三栏。它们分别叫 'MIME 类型'、'浏览器转换' 和 '转换选项' 。</p> - <ul><li>The field 'MIME-type' is a drop-down field. Select the MIME-type that -corresponds to the column's contents. Please note that transformations are -inactive as long as no MIME-type is selected.</li> + <ul><li>'MIME 类型' 是一个下拉框。选择与字段内容一致的 MIME 类型。请注意如果没有选择任何 MIME 类型转换功能是不起作用的。</li> - <li>The field 'Browser transformation' is a drop-down field. You can choose from -a hopefully growing amount of pre-defined transformations. See below for -information on how to build your own transformation.<br /> + <li>'浏览器转换' 是一个下拉框。你可以从预定义好的转换中选择一个你想要的转换。后面会介绍如何编写你自己的转换。<br /> - There are global transformations and mimetype-bound transformations. Global -transformations can be used for any mimetype. They will take the mimetype, -if necessary, into regard. Mimetype-bound transformations usually only -operate on a certain mimetype. There are transformations which operate on -the main mimetype (like 'image'), which will most likely take the subtype -into regard, and those who only operate on a specific subtype (like -'image/jpeg').<br /> + 转换分为全局转换和固定类型转换。全局转换可用于任何类型。在必要的时候，它们会注意类型。固定类型转换通常只针对特定的类型。它们喜欢将一个大类 (如 +'图像') 转换成一个小类 (如 'JPEG 图像') 。<br /> - You can use transformations on mimetypes for which the function was not -defined for. There is no security check for you selected the right -transformation, so take care of what the output will be like.</li> + 你可以转换一个未定义的类型。程序没有检查你是否选择了正确的转换，请小心使用。</li> - <li>The field 'Transformation options' is a free-type textfield. You have to -enter transform-function specific options here. Usually the transforms can -operate with default options, but it is generally a good idea to look up the -overview to see which options are necessary.<br /> + <li>'转换选项' 是一个输入框。在这里你要输入转换函数所需的选项。虽然它们通常可以使用默认选项，但最好还是看看有哪些是必选项。<br /> Much like the ENUM/SET-Fields, you have to split up several options using the format 'a','b','c',...(NOTE THE MISSING BLANKS). This is because @@ -2181,124 +2154,102 @@ parameter','second parameter','charset=us-ascii'". You can, however use the defaults for the parameters: "'','','charset=us-ascii'".</li> </ul> -<h3 id="transformationsfiles">3. File structure</h3> +<h3 id="transformationsfiles">3. 文件结构</h3> -<p> All mimetypes and their transformations are defined through single files in -the directory 'libraries/transformations/'.</p> +<p> 所有类型和转换是都通过 'libraries/transformations/' 中的文件定义的。</p> -<p> They are stored in files to ease up customization and easy adding of new -transformations.</p> +<p> 用文件保存易于定制和添加新的转换。</p> -<p> Because the user cannot enter own mimetypes, it is kept sure that -transformations always work. It makes no sense to apply a transformation to -a mimetype the transform-function doesn't know to handle.</p> +<p> 因为用户不能输入他们的类型，这将保证转换可以正常工作。但这不能避免设置一个转换函数无法处理的类型的问题。</p> <p> One can, however, use empty mime-types and global transformations which should work for many mimetypes. You can also use transforms on a different mimetype than what they where built for, but pay attention to option usage as well as what the transformation does to your column.</p> -<p> There is a basic file called '<i>global.inc.php</i>'. This function can be -included by any other transform function and provides some basic functions.</p> +<p> 有一个叫 '<i>global.inc.php</i>' 的文件。它可以被任何其它转换函数包含并提供一些基本函数。</p> -<p> There are 5 possible file names:</p> +<p> 5 种可能的文件名:</p> -<ol><li>A mimetype+subtype transform:<br /><br /> +<ol><li>一个类型与子类型的转换:<br /><br /> - <tt>[mimetype]_[subtype]__[transform].inc.php</tt><br /><br /> + <tt>[类型]_[子类型]__[转换].inc.php</tt><br /><br /> - Please not that mimetype and subtype are separated via '_', which shall not -be contained in their names. The transform function/filename may contain -only characters which cause no problems in the file system as well as the -PHP function naming convention.<br /><br /> + 请注意类型和子类型通过 '_' 分隔，且不包含它们的名字。转换函数/文件名只能使用字符，这样不会导致文件系统和 PHP 函数名转换的问题。<br /><br /> - The transform function will the be called -'<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>'.<br /><br /> + 转换函数则为 '<tt>PMA_transform_[类型]_[子类型]__[转换]()</tt>' 。<br /><br /> - <b>Example:</b><br /><br /> + <b>例:</b><br /><br /> <tt>text_html__formatted.inc.php</tt><br /> <tt>PMA_transform_text_html__formatted()</tt></li> - <li>A mimetype (w/o subtype) transform:<br /><br /> + <li>一个类型 (没有子类型) 转换:<br /><br /> - <tt>[mimetype]__[transform].inc.php</tt><br /><br /> + <tt>[类型]__[转换].inc.php</tt><br /><br /> - Please note that there are no single '_' characters. The transform -function/filename may contain only characters which cause no problems in the -file system as well as the PHP function naming convention.<br /><br /> + 请注意是两个 '_' 符号。转换函数/文件名只能使用字符，这样不会导致文件系统和 PHP 函数名转换的问题。<br /><br /> - The transform function will the be called -'<tt>PMA_transform_[mimetype]__[transform]()</tt>'.<br /><br /> + 转换函数则为 '<tt>PMA_transform_[类型]__[转换]()</tt>' 。<br /><br /> - <b>Example:</b><br /><br /> + <b>例:</b><br /><br /> <tt>text__formatted.inc.php</tt><br /> <tt>PMA_transform_text__formatted()</tt></li> - <li>A mimetype+subtype without specific transform function<br /><br /> + <li>一个类型与子类型但没有转换函数<br /><br /> - <tt>[mimetype]_[subtype].inc.php</tt><br /><br /> + <tt>[类型]_[子类型].inc.php</tt><br /><br /> - Please note that there are no '__' characters in the filename. Do not use -special characters in the filename causing problems with the file system.<br /><br /> + 请注意文件名中没有 '__' 符号。请勿在文件名中使用可能导致文件系统问题的特殊字符。<br /><br /> - No transformation function is defined in the file itself.<br /><br /> + 文件中不定义转换函数。<br /><br /> - <b>Example:</b><br /><br /> + <b>例:</b><br /><br /> <tt>text_plain.inc.php</tt><br /> - (No function)</li> + (无函数)</li> - <li>A mimetype (w/o subtype) without specific transform function<br /><br /> + <li>一个类型 (没有子类型) 但没有转换函数<br /><br /> - <tt>[mimetype].inc.php</tt><br /><br /> + <tt>[类型].inc.php</tt><br /><br /> - Please note that there are no '_' characters in the filename. Do not use -special characters in the filename causing problems with the file system. + 请注意文件名中没有 '_' 符号。请勿在文件名中使用可能导致文件系统问题的特殊字符。 <br /><br /> - No transformation function is defined in the file itself.<br /><br /> + 文件中不定义转换函数。<br /><br /> - <b>Example:</b><br /><br /> + <b>例:</b><br /><br /> <tt>text.inc.php</tt><br /> - (No function)</li> + (无函数)</li> - <li>A global transform function with no specific mimetype<br /><br /> + <li>一个不带类型的全局转换函数<br /><br /> - <tt>global__[transform].inc.php</tt><br /><br /> + <tt>global__[转换].inc.php</tt><br /><br /> - The transform function will the be called -'<tt>PMA_transform_global__[transform]()</tt>'.<br /><br /> + 转换函数则为 '<tt>PMA_transform_global__[转换]()</tt>' 。<br /><br /> - <b>Example:</b><br /><br /> + <b>例:</b><br /><br /> <tt>global__formatted</tt><br /> <tt>PMA_transform_global__formatted()</tt></li> </ol> -<p> So generally use '_' to split up mimetype and subtype, and '__' to provide a -transform function.</p> +<p> 所以 '_' 通常用来分割类型和子类型，而 '__' 来提供转换函数。</p> -<p> All filenames containing no '__' in themselves are not shown as valid -transform functions in the dropdown.</p> +<p> 所有文件名中不包含 '__' 的文件将被认为是无效的转换函数而不显示在下拉框中。</p> -<p> Please see the libraries/transformations/TEMPLATE file for adding your own -transform function. See the libraries/transformations/TEMPLATE_MIMETYPE for -adding a mimetype without a transform function.</p> +<p> 参见 libraries/transformations/TEMPLATE 文件来添加你自己的转换函数。参见 +libraries/transformations/TEMPLATE_MIMETYPE 来添加一个不带转换函数的类型。</p> -<p> To create a new transform function please see -<tt>libraries/transformations/template_generator.sh</tt>. To create a new, -empty mimetype please see -<tt>libraries/transformations/template_generator_mimetype.sh</tt>.</p> +<p> 参见 <tt>libraries/transformations/template_generator.sh</tt> 创建新的转换函数。参见 +<tt>libraries/transformations/template_generator_mimetype.sh</tt> 创建新的类型。</p> -<p> A transform function always gets passed three variables:</p> +<p> 一个转换函数将被传入三个参数:</p> -<ol><li><b>$buffer</b> - Contains the text inside of the column. This is the text, -you want to transform.</li> - <li><b>$options</b> - Contains any user-passed options to a transform function -as an array.</li> +<ol><li><b>$buffer</b> - 包含字段中的内容。也是你将要转换的内容。</li> + <li><b>$options</b> - 以数组形式保存的用户输入的转换选项。</li> <li><b>$meta</b> - Contains an object with information about your column. The data is drawn from the output of the <a href="http://www.php.net/mysql_fetch_field">mysql_fetch_field()</a> @@ -2323,13 +2274,14 @@ information about the transformation. Currently following keys can be used:  -<h2 id="faq">常见问题</h2> +<h2 id="faq">FAQ - 常见问题</h2> -<ol><li><a href="#faqserver">Server</a></li> +<ol><li><a href="#faqserver">服务器</a></li> <li><a href="#faqconfig">设置</a></li> <li><a href="#faqlimitations">已知问题</a></li> - <li><a href="#faqmultiuser">ISPs, multi-user installations</a></li> - <li><a href="#faqbrowsers">浏览器和客户端<abbr title="operating system">操作系统</abbr></a></li> + <li><a href="#faqmultiuser">互联网服务提供商、多用户安装</a></li> + <li><a href="#faqbrowsers">浏览器和客户端<abbr title="操作系统 (operating +system)">操作系统</abbr></a></li> <li><a href="#faqusing">使用 phpMyAdmin</a></li> <li><a href="#faqproject">phpMyAdmin 项目</a></li> <li><a href="#faqsecurity">安全</a></li> diff --git a/po/zh_CN.po b/po/zh_CN.po index 1100660..01eb1dc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-08 13:44+0300\n" -"PO-Revision-Date: 2010-09-15 11:19+0200\n" +"PO-Revision-Date: 2010-09-19 14:44+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -5825,27 +5825,27 @@ msgstr "" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:2326 msgid "Transformations" -msgstr "" +msgstr "转换" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2328 msgid "<a href=\"#transformationsintro\">Introduction</a>" -msgstr "" +msgstr "<a href=\"#transformationsintro\">介绍</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2329 msgid "<a href=\"#transformationshowto\">Usage</a>" -msgstr "" +msgstr "<a href=\"#transformationshowto\">使用</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2330 msgid "<a href=\"#transformationsfiles\">File structure</a>" -msgstr "" +msgstr "<a href=\"#transformationsfiles\">文件结构</a>" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:2333 msgid "1. Introduction" -msgstr "" +msgstr "1. 介绍" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2335 @@ -5854,6 +5854,8 @@ msgid "" "and the proper directives. Please see the <a href=\"#config\">Configuration " "section</a> on how to do so." msgstr "" +"要开启转换功能，你必须设置好 <tt>column_info</tt> 表以及正确的指令。具体设置请见<a " +"href=\"#config\">设置</a>一节。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2339 @@ -5861,7 +5863,7 @@ msgid "" "You can apply different transformations to the contents of each column. The " "transformation will take the content of each column and transform it with " "certain rules defined in the selected transformation." -msgstr "" +msgstr "你可以对每个字段的内容使用不同的转换。每个字段中的内容将被预定义的规则所转换。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2343 @@ -5874,6 +5876,8 @@ msgid "" "strings to append/prepend to a string or the format you want the output " "stored in." msgstr "" +"假设你有一个存有文件名的字段 '文件名' 。正常情况下你只能在 phpMyAdmin 中看到文件名。通过转换你可以将它们转换成一个 HTML " +"链接，你就能直接在 phpMyAdmin 中点击并在浏览器的新窗口中看到这个文件。你还可以通过转换选项来设置转换所需要的参数。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2350 @@ -5882,6 +5886,8 @@ msgid "" "you can consult your <i><www.your-host.com>/<your-install-dir>/" "transformation_overview.php</i> installation." msgstr "" +"要想查看所有可用的转换以及它们的选项，你可以在 " +"<i><www.你的域名.com>/<你的安装目录>/transformation_overview.php</i> 找到。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2355 @@ -5894,7 +5900,7 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:2359 msgid "2. Usage" -msgstr "" +msgstr "2. 使用" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2361 @@ -5905,6 +5911,8 @@ msgid "" "They are called 'MIME-type', 'Browser transformation' and 'Transformation " "options'." msgstr "" +"打开到你的 <i>tbl_structure.php</i> 页面 (如：通过点击一张表的 '结构' 链接) 。点击 "修改" " +"(或修改图标) 后你就能看到在最下方多出三栏。它们分别叫 'MIME 类型'、'浏览器转换' 和 '转换选项' 。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2368 @@ -5912,7 +5920,7 @@ msgid "" "The field 'MIME-type' is a drop-down field. Select the MIME-type that " "corresponds to the column's contents. Please note that transformations are " "inactive as long as no MIME-type is selected." -msgstr "" +msgstr "'MIME 类型' 是一个下拉框。选择与字段内容一致的 MIME 类型。请注意如果没有选择任何 MIME 类型转换功能是不起作用的。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2372 @@ -5920,7 +5928,7 @@ msgid "" "The field 'Browser transformation' is a drop-down field. You can choose from " "a hopefully growing amount of pre-defined transformations. See below for " "information on how to build your own transformation." -msgstr "" +msgstr "'浏览器转换' 是一个下拉框。你可以从预定义好的转换中选择一个你想要的转换。后面会介绍如何编写你自己的转换。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2376 @@ -5933,6 +5941,8 @@ msgid "" "into regard, and those who only operate on a specific subtype (like 'image/" "jpeg')." msgstr "" +"转换分为全局转换和固定类型转换。全局转换可用于任何类型。在必要的时候，它们会注意类型。固定类型转换通常只针对特定的类型。它们喜欢将一个大类 (如 " +"'图像') 转换成一个小类 (如 'JPEG 图像') 。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2383 @@ -5940,7 +5950,7 @@ msgid "" "You can use transformations on mimetypes for which the function was not " "defined for. There is no security check for you selected the right " "transformation, so take care of what the output will be like." -msgstr "" +msgstr "你可以转换一个未定义的类型。程序没有检查你是否选择了正确的转换，请小心使用。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2387 @@ -5949,7 +5959,7 @@ msgid "" "enter transform-function specific options here. Usually the transforms can " "operate with default options, but it is generally a good idea to look up the " "overview to see which options are necessary." -msgstr "" +msgstr "'转换选项' 是一个输入框。在这里你要输入转换函数所需的选项。虽然它们通常可以使用默认选项，但最好还是看看有哪些是必选项。" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:2392 @@ -5975,21 +5985,21 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:2405 msgid "3. File structure" -msgstr "" +msgstr "3. 文件结构" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2407 msgid "" "All mimetypes and their transformations are defined through single files in " "the directory 'libraries/transformations/'." -msgstr "" +msgstr "所有类型和转换是都通过 'libraries/transformations/' 中的文件定义的。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2410 msgid "" "They are stored in files to ease up customization and easy adding of new " "transformations." -msgstr "" +msgstr "用文件保存易于定制和添加新的转换。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2413 @@ -5997,7 +6007,7 @@ msgid "" "Because the user cannot enter own mimetypes, it is kept sure that " "transformations always work. It makes no sense to apply a transformation to " "a mimetype the transform-function doesn't know to handle." -msgstr "" +msgstr "因为用户不能输入他们的类型，这将保证转换可以正常工作。但这不能避免设置一个转换函数无法处理的类型的问题。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2417 @@ -6013,22 +6023,22 @@ msgstr "" msgid "" "There is a basic file called '<i>global.inc.php</i>'. This function can be " "included by any other transform function and provides some basic functions." -msgstr "" +msgstr "有一个叫 '<i>global.inc.php</i>' 的文件。它可以被任何其它转换函数包含并提供一些基本函数。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2425 msgid "There are 5 possible file names:" -msgstr "" +msgstr "5 种可能的文件名:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2427 msgid "A mimetype+subtype transform:" -msgstr "" +msgstr "一个类型与子类型的转换:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2429 msgid "<tt>[mimetype]_[subtype]__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>[类型]_[子类型]__[转换].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2431 @@ -6037,41 +6047,41 @@ msgid "" "be contained in their names. The transform function/filename may contain " "only characters which cause no problems in the file system as well as the " "PHP function naming convention." -msgstr "" +msgstr "请注意类型和子类型通过 '_' 分隔，且不包含它们的名字。转换函数/文件名只能使用字符，这样不会导致文件系统和 PHP 函数名转换的问题。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2436 msgid "" "The transform function will the be called '<tt>PMA_transform_[mimetype]_" "[subtype]__[transform]()</tt>'." -msgstr "" +msgstr "转换函数则为 '<tt>PMA_transform_[类型]_[子类型]__[转换]()</tt>' 。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2439 ../phpmyadmin/Documentation.html:2456 #: ../phpmyadmin/Documentation.html:2471 ../phpmyadmin/Documentation.html:2486 #: ../phpmyadmin/Documentation.html:2498 msgid "<b>Example:</b>" -msgstr "" +msgstr "<b>例:</b>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2441 msgid "<tt>text_html__formatted.inc.php</tt>" -msgstr "" +msgstr "<tt>text_html__formatted.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2442 msgid "<tt>PMA_transform_text_html__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_text_html__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2444 msgid "A mimetype (w/o subtype) transform:" -msgstr "" +msgstr "一个类型 (没有子类型) 转换:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2446 msgid "<tt>[mimetype]__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>[类型]__[转换].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2448 @@ -6079,119 +6089,119 @@ msgid "" "Please note that there are no single '_' characters. The transform function/" "filename may contain only characters which cause no problems in the file " "system as well as the PHP function naming convention." -msgstr "" +msgstr "请注意是两个 '_' 符号。转换函数/文件名只能使用字符，这样不会导致文件系统和 PHP 函数名转换的问题。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2453 msgid "" "The transform function will the be called '<tt>PMA_transform_[mimetype]__" "[transform]()</tt>'." -msgstr "" +msgstr "转换函数则为 '<tt>PMA_transform_[类型]__[转换]()</tt>' 。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2458 msgid "<tt>text__formatted.inc.php</tt>" -msgstr "" +msgstr "<tt>text__formatted.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2459 msgid "<tt>PMA_transform_text__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_text__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2461 msgid "A mimetype+subtype without specific transform function" -msgstr "" +msgstr "一个类型与子类型但没有转换函数" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2463 msgid "<tt>[mimetype]_[subtype].inc.php</tt>" -msgstr "" +msgstr "<tt>[类型]_[子类型].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2465 msgid "" "Please note that there are no '__' characters in the filename. Do not use " "special characters in the filename causing problems with the file system." -msgstr "" +msgstr "请注意文件名中没有 '__' 符号。请勿在文件名中使用可能导致文件系统问题的特殊字符。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2469 ../phpmyadmin/Documentation.html:2484 msgid "No transformation function is defined in the file itself." -msgstr "" +msgstr "文件中不定义转换函数。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2473 msgid "<tt>text_plain.inc.php</tt>" -msgstr "" +msgstr "<tt>text_plain.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2474 ../phpmyadmin/Documentation.html:2489 msgid "(No function)" -msgstr "" +msgstr "(无函数)" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2476 msgid "A mimetype (w/o subtype) without specific transform function" -msgstr "" +msgstr "一个类型 (没有子类型) 但没有转换函数" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2478 msgid "<tt>[mimetype].inc.php</tt>" -msgstr "" +msgstr "<tt>[类型].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2480 msgid "" "Please note that there are no '_' characters in the filename. Do not use " "special characters in the filename causing problems with the file system." -msgstr "" +msgstr "请注意文件名中没有 '_' 符号。请勿在文件名中使用可能导致文件系统问题的特殊字符。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2488 msgid "<tt>text.inc.php</tt>" -msgstr "" +msgstr "<tt>text.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2491 msgid "A global transform function with no specific mimetype" -msgstr "" +msgstr "一个不带类型的全局转换函数" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2493 msgid "<tt>global__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>global__[转换].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2495 msgid "" "The transform function will the be called '<tt>PMA_transform_global__" "[transform]()</tt>'." -msgstr "" +msgstr "转换函数则为 '<tt>PMA_transform_global__[转换]()</tt>' 。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2500 msgid "<tt>global__formatted</tt>" -msgstr "" +msgstr "<tt>global__formatted</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2501 msgid "<tt>PMA_transform_global__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_global__formatted()</tt>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2504 msgid "" "So generally use '_' to split up mimetype and subtype, and '__' to provide a " "transform function." -msgstr "" +msgstr "所以 '_' 通常用来分割类型和子类型，而 '__' 来提供转换函数。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2507 msgid "" "All filenames containing no '__' in themselves are not shown as valid " "transform functions in the dropdown." -msgstr "" +msgstr "所有文件名中不包含 '__' 的文件将被认为是无效的转换函数而不显示在下拉框中。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2510 @@ -6200,6 +6210,8 @@ msgid "" "transform function. See the libraries/transformations/TEMPLATE_MIMETYPE for " "adding a mimetype without a transform function." msgstr "" +"参见 libraries/transformations/TEMPLATE 文件来添加你自己的转换函数。参见 " +"libraries/transformations/TEMPLATE_MIMETYPE 来添加一个不带转换函数的类型。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2514 @@ -6208,25 +6220,27 @@ msgid "" "template_generator.sh</tt>. To create a new, empty mimetype please see " "<tt>libraries/transformations/template_generator_mimetype.sh</tt>." msgstr "" +"参见 <tt>libraries/transformations/template_generator.sh</tt> 创建新的转换函数。参见 " +"<tt>libraries/transformations/template_generator_mimetype.sh</tt> 创建新的类型。" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2519 msgid "A transform function always gets passed three variables:" -msgstr "" +msgstr "一个转换函数将被传入三个参数:" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2521 msgid "" "<b>$buffer</b> - Contains the text inside of the column. This is the text, " "you want to transform." -msgstr "" +msgstr "<b>$buffer</b> - 包含字段中的内容。也是你将要转换的内容。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2523 msgid "" "<b>$options</b> - Contains any user-passed options to a transform function " "as an array." -msgstr "" +msgstr "<b>$options</b> - 以数组形式保存的用户输入的转换选项。" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2525 @@ -6269,12 +6283,12 @@ msgstr "" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:2549 msgid "FAQ - Frequently Asked Questions" -msgstr "常见问题" +msgstr "FAQ - 常见问题" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2551 msgid "<a href=\"#faqserver\">Server</a>" -msgstr "<a href=\"#faqserver\">Server</a>" +msgstr "<a href=\"#faqserver\">服务器</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2552 @@ -6289,7 +6303,7 @@ msgstr "<a href=\"#faqlimitations\">已知问题</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2554 msgid "<a href=\"#faqmultiuser\">ISPs, multi-user installations</a>" -msgstr "" +msgstr "<a href=\"#faqmultiuser\">互联网服务提供商、多用户安装</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2555 @@ -6297,8 +6311,8 @@ msgid "" "<a href=\"#faqbrowsers\">Browsers or client <abbr title=\"operating system" "\">OS</abbr></a>" msgstr "" -"<a href=\"#faqbrowsers\">浏览器和客户端<abbr title=\"operating system\">操作" -"系统</abbr></a>" +"<a href=\"#faqbrowsers\">浏览器和客户端<abbr title=\"操作系统 (operating " +"system)\">操作系统</abbr></a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:2556 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10224-g8f25462
by Marc Delisle 19 Sep '10

19 Sep '10

The branch, master has been updated via 8f2546271cff3a91434cefbc77f9cf56d5e42168 (commit) from 3159d9086707b9a84fe706b3a411deec8ce67bf2 (commit) - Log ----------------------------------------------------------------- commit 8f2546271cff3a91434cefbc77f9cf56d5e42168 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 19 12:28:14 2010 -0400 display message when search returns zero rows ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index 95c60a8..f7bd272 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @fileoverview JavaScript functions used on tbl_select.php * @@ -27,17 +28,25 @@ $(document).ready(function() { * @uses PMA_ajaxShowMessage() */ $("#tbl_search_form").live('submit', function(event) { + // jQuery object to reuse + $search_form = $(this); event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strSearching']); - // add this hidden field just once - if (! $(this).find('input:hidden').is('#ajax_request_hidden')) { - $(this).append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } + // add this hidden field just once + if (! $search_form.find('input:hidden').is('#ajax_request_hidden')) { + $search_form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } - $.post($(this).attr('action'), $(this).serialize(), function(data) { - $("#searchresults").html(data); + $.post($search_form.attr('action'), $search_form.serialize(), function(response) { + if (typeof response == 'string') { + // found results + $("#searchresults").html(response); + } else { + // error message (zero rows) + $("#searchresults").html(response['message']); + } }) }) }, 'top.frame_content'); // end $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10223-g3159d90
by Marc Delisle 19 Sep '10

19 Sep '10

The branch, master has been updated via 3159d9086707b9a84fe706b3a411deec8ce67bf2 (commit) from 316ea9f006d1409103e81f3f7f23c137ddf49f85 (commit) - Log ----------------------------------------------------------------- commit 3159d9086707b9a84fe706b3a411deec8ce67bf2 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 19 11:16:52 2010 -0400 hidden field should just be added once ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index 97de181..95c60a8 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -31,10 +31,13 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strSearching']); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + // add this hidden field just once + if (! $(this).find('input:hidden').is('#ajax_request_hidden')) { + $(this).append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } $.post($(this).attr('action'), $(this).serialize(), function(data) { $("#searchresults").html(data); }) }) -}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); // end $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10222-g316ea9f
by Marc Delisle 19 Sep '10

19 Sep '10

The branch, master has been updated via 316ea9f006d1409103e81f3f7f23c137ddf49f85 (commit) from 598d3b898d6be009a1827a08b5705e15d30e90f0 (commit) - Log ----------------------------------------------------------------- commit 316ea9f006d1409103e81f3f7f23c137ddf49f85 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 19 09:26:49 2010 -0400 prevent a call with incorrect parameter value ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7dd39f9..b1da1de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2931,7 +2931,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } // If extra_data has been provided, append it to the response array - if( count($extra_data) > 0 ) { + if( ! empty($extra_data) && count($extra_data) > 0 ) { $response = array_merge($response, $extra_data); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10221-g598d3b8
by Marc Delisle 19 Sep '10

19 Sep '10

The branch, master has been updated via 598d3b898d6be009a1827a08b5705e15d30e90f0 (commit) from 83649e0af2fd7a29ec542a4b36fcc4f893099124 (commit) - Log ----------------------------------------------------------------- commit 598d3b898d6be009a1827a08b5705e15d30e90f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 19 08:55:54 2010 -0400 functions, procedures and events are missing from the export ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index a1074cd..2cb48ec 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -411,7 +411,7 @@ function PMA_exportDBFooter($db) unset($GLOBALS['sql_constraints']); } - if (isset($GLOBALS['sql_structure']) && isset($GLOBALS['sql_procedure_function'])) { + if (($GLOBALS['sql_structure_or_data'] == 'structure' || $GLOBALS['sql_structure_or_data'] == 'structure_and_data') && isset($GLOBALS['sql_procedure_function'])) { $text = ''; $delimiter = '$$'; hooks/post-receive -- phpMyAdmin

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git September 2010