From b2cbfb355b48d4e3c1d94053700b2a7d25cff24b Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 7 May 2012 22:17:30 +0200 Subject: [PATCH 001/102] Update setup design for pmahomme --- setup/styles.css | 401 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 300 insertions(+), 101 deletions(-) diff --git a/setup/styles.css b/setup/styles.css index 7616036405..6002b3cce2 100644 --- a/setup/styles.css +++ b/setup/styles.css @@ -2,23 +2,42 @@ body { padding-bottom: 1em; + color: #444; + font: .8em sans-serif; + background: url(../themes/pmahomme/img/left_nav_bg.png) repeat-y 80px 0 #f3f3f3; +} + +input, +button, +select, +textarea, +th, +td { + font: 1em sans-serif; } img { border: 0; } -a { - color: #004C96; +a, +a:link, +a:visited, +a:active { + text-decoration: none; + color: #235a81; + cursor: pointer; + outline: none; + } -a:hover, a:active { - color: #000; +a:hover { + text-decoration: underline; + color: #235a81; } h1 { font-size: 1.5em; - font-family: Verdana, Arial, Helvetica, sans-serif; } /* language selection box */ @@ -33,32 +52,33 @@ h1 { #menu { float: left; - width: 200px; + width: 220px; + font-size: 1.1em; } #menu ul { - margin: 1em 1em 1em 0.5em; - padding: 0 0.5em; + margin: 1em 1em 1em .5em; + padding: 0; list-style: none; } #menu li a { - padding: 3px; - font-weight: bold; + padding: .5em .6em; + margin-right: .6em; display: block; - color: #669; + color: #333; text-decoration: none; zoom: 1; /* IE fix */ } #menu li a:hover, #menu li a:active { - color: #C00; + background-color: #e4e4e4; } /* page contents and footer layout */ #page { - margin-left: 200px; + margin-left: 220px; } #footer { @@ -87,102 +107,158 @@ h1 { /* main page messages */ -div.notice, div.warning, div.error { - margin: 0.5em 0; - padding: 10px 10px 10px 36px; - border: 1px solid #000; - background: #FFD url(../themes/original/img/b_tipp.png) no-repeat 10px 0.8em; -} - -div.notice h4, div.warning h4, div.error h4 { +/* message boxes: error, confirmation */ +.success h4, +.notice h4, +div.error h4 { + border-bottom: 2px solid; font-weight: bold; - font-size: large; - margin: 0 0 0.2em 0; - border-bottom: 1px solid #000; + margin: 0 0 .2em 0; } -div.notice { - border-color: #FFD700; - background-color: #FFD; - background-image: url(../themes/original/img/s_notice.png); +div.success, +div.notice, +div.error, +div.footnotes { + margin: .5em 0 1.3em 0; + border: 1px solid; + background-repeat: no-repeat; + background-position: 10px 50%; + padding: 10px 10px 10px 25px; + + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + + -moz-box-shadow: 0 1px 1px #fff inset; + -webkit-box-shadow: 0 1px 1px #fff inset; + box-shadow: 0 1px 1px #fff inset; } -div.notice h4 { - border-color: #FFD700; +.success a, +.notice a, +.error a, +.footnotes a { + text-decoration: underline; +} + +.success { + color: #000; + background-color: #ebf8a4; +} + +h1.success, +div.success { + border-color: #a2d246; + background-image: url(../themes/pmahomme/img/s_success.png); + background-repeat: no-repeat; + background-position: 5px 50%; +} +.success h4 { + border-color: #00FF00; +} + +.notice, +.footnotes { + color: #000; + background-color: #e8eef1; +} + +h1.notice, +div.notice, +div.footnotes { + border-color: #3a6c7e; + background-image: url(../themes/pmahomme/img/s_notice.png); + background-repeat: no-repeat; + background-position: 5px 50%; +} + +.notice h4 { + border-color: #ffb10a; +} + +.error { + border: 1px solid maroon !important; + color: #000; + background: #fcf; +} + +h1.error, +div.error { + border-color: #333; + background-image: url(../themes/pmahomme/img/s_error.png); + background-repeat: no-repeat; + background-position: 5px 50%; +} + +div.error h4 { + border-color: #ff0000; } div.notice[id^=version_check] { border-color: #002DFF; - background-color: #EEF; + background-color: #EEF; } div.notice[id^=version_check] h4 { border-color: #002DFF; } -div.warning { - border-color: #C00; - background-color: #FFC; - background-image: url(../themes/original/img/s_notice.png); -} -div.warning h4 { - color: #C00; - border-color: #C00; -} - -div.error { - border-color: #D00; - background-color: #FFC; - background-image: url(../themes/original/img/s_error.png); -} - -div.error h4 { - color: #D00; - border-color: #D00; -} /* form tabs */ ul.tabs { - margin: 0; - padding: 0 0 7px 0; + margin: 1.1em .2em 0; + padding: 0 0 .3em 0; list-style: none; font-weight: bold; } ul.tabs li { float: left; + margin-bottom: -1px; } ul.tabs li a { display: block; - margin: 2px 2px 0; - padding: 2px 8px; - background: #DEE1FF; + margin: .1em .2em 0; white-space: nowrap; text-decoration: none; - border: 1px #9AA4FF solid; - border-bottom: none; + border: 1px solid #D5D5D5; + border-bottom: 1px solid #aaa; } -ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li.active a { - margin: 0; - padding: 2px 10px 4px; - background: #F7FBFF; +ul.tabs li a { + padding: 7px 10px; + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; + background: #f2f2f2; + color: #555; + text-shadow: 0 1px 0 #fff; } -ul.tabs li a:hover, ul.tabs li a:active { - color: #C00; +ul.tabs li a:hover, +ul.tabs li a:active { + background: #e5e5e5; +} + +ul.tabs li.active a { + background-color: #fff; + margin-top: 1px; + color: #000; + text-shadow: none; + border-color: #aaa; + border-bottom: 1px solid #fff; } .tabs_contents { - border-top: 2px #66B solid; + margin-top: 1em; } .tabs_contents fieldset { margin-top: 0; - border-top: none; } .tabs_contents legend { @@ -203,28 +279,54 @@ ul.tabs li a:hover, ul.tabs li a:active { /* forms */ fieldset { - padding: 0; margin-top: 1em; - border: 2px #DEE1FF solid; - background: #DEE1FF; + border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + border: #aaa solid 1px; + padding: 1.5em; + background: #eee; + text-shadow: 0 1px 0 #fff; + -moz-box-shadow: 1px 1px 2px #fff inset; + -webkit-box-shadow: 1px 1px 2px #fff inset; + box-shadow: 1px 1px 2px #fff inset; +} + +fieldset.optbox { + padding: 0; +} + +fieldset fieldset { + margin: .8em; + background: #fff; + border: 1px solid #aaa; + background: #E8E8E8; + +} + +fieldset legend { + font-weight: bold; + color: #444; + padding: 5px 10px; + border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border: 1px solid #aaa; + background-color: #fff; + -moz-box-shadow: 3px 3px 15px #bbb; + -webkit-box-shadow: 3px 3px 15px #bbb; + box-shadow: 3px 3px 15px #bbb; } .form { border: 2px #DEE1FF solid; } -fieldset legend { - margin-left: 1em; - padding: 2px 8px; - font-weight: bold; - background: #F7FBFF; - border: 1px #9AA4FF solid; -} - fieldset p { margin: 0; - padding: 0.5em; - background: #DEE1FF; + padding: .5em; + background: #fff; + border-top: 0; } fieldset .errors { /* form error list */ @@ -246,8 +348,8 @@ fieldset .inline_errors { /* field error list */ font-size: small; } -fieldset table { - background: #FFF; +table caption, table th, table td { + text-shadow: 0 1px 0 #FFFFFF; } fieldset th { @@ -255,6 +357,7 @@ fieldset th { min-width: 350px; padding: 0.3em 0.3em 0.3em 0.5em; text-align: left; + font-weight: bold; vertical-align: top; } @@ -288,7 +391,7 @@ fieldset th small { } fieldset th, fieldset td, .form .lastrow { - border-top: 1px #555 dotted; + border-top: 1px solid #D5D5D5; } fieldset .group-header th { @@ -296,11 +399,6 @@ fieldset .group-header th { border: none; } -fieldset .group-header + tr th, fieldset .group-header + tr td, -fieldset p + table tr:first-child td, fieldset p + table tr:first-child th { - border-top: none; -} - fieldset .group-field-1 th, fieldset .group-header-2 th { padding-left: 1em; } @@ -314,13 +412,123 @@ fieldset .group-field-3 th { } fieldset .lastrow, .form .lastrow { - background: #F7FBFF; - padding: 0.5em; + border-top: 1px #000 solid; + background: #D3DCE3; + padding: .5em; text-align: center; } -fieldset .lastrow input, .form .lastrow input { - font-weight: bold; +input[type=text] { + border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + + box-shadow: 0 1px 2px #ddd; + -moz-box-shadow: 0 1px 2px #ddd; + -webkit-box-shadow: 0 1px 2px #ddd; + + background: white; + border: 1px solid #aaa; + color: #555; + padding: 4px; + margin: 6px; + +} + +input[type=password] { + border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + + box-shadow: 0 1px 2px #ddd; + -moz-box-shadow: 0 1px 2px #ddd; + -webkit-box-shadow: 0 1px 2px #ddd; + + background: white; + border: 1px solid #aaa; + color: #555; + padding: 4px; + margin: 6px; + +} + +input[type=submit], +button[type=submit]:not(.mult_submit) { + font-weight: bold !important; +} + +input[type=submit], +button[type=submit]:not(.mult_submit), +input[type=reset], +input[name=submit_reset], +input.button { + margin-left: 14px; + border: 1px solid #aaa; + padding: 3px 7px; + color: #111; + text-decoration: none; + background: #ddd; + + border-radius: 12px; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + + text-shadow: 0 1px 0 #fff; + + background-image: url(../themes/svg_gradient.php?from=ffffff&to=cccccc); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc)); + background: -webkit-linear-gradient(top, #ffffff, #cccccc); + background: -moz-linear-gradient(top, #ffffff, #cccccc); + background: -ms-linear-gradient(top, #ffffff, #cccccc); + background: -o-linear-gradient(top, #ffffff, #cccccc); +} + +input[type=submit]:hover, +button[type=submit]:not(.mult_submit):hover, +input[type=reset]:hover, +input[name=submit_reset]:hover, +input.button:hover { + position: relative; + background-image: url(../themes/svg_gradient.php?from=cccccc&to=dddddd); + background-size: 100% 100%; + background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)); + background: -webkit-linear-gradient(top, #cccccc, #dddddd); + background: -moz-linear-gradient(top, #cccccc, #dddddd); + background: -ms-linear-gradient(top, #cccccc, #dddddd); + background: -o-linear-gradient(top, #cccccc, #dddddd); + cursor: pointer; +} + +input[type=submit]:active, +button[type=submit]:not(.mult_submit):active, +input[type=reset]:active, +input[name=submit_reset]:active, +input.button:active { + position: relative; + top: 1px; + left: 1px; +} + +input[type="checkbox"], +input[type="radio"] { + vertical-align: -11%; +} + + +select { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + + -moz-box-shadow: 0 1px 2px #ddd; + -webkit-box-shadow: 0 1px 2px #ddd; + box-shadow: 0 1px 2px #ddd; + + border: 1px solid #aaa; + color: #333; + padding: 3px; + background: white; } /* simple form, without header and legend */ @@ -362,15 +570,6 @@ span.checkbox { border-color: #C11 !important; } -input[type="text"], select, textarea { - border: 1px #A7A6AA solid; -} - -input[type="text"]:focus, select:focus, textarea:focus { - border: 1px #6676FF solid; - background: #F7FBFF; -} - .field-comment { position: relative; @@ -388,7 +587,7 @@ input[type="text"]:focus, select:focus, textarea:focus { } .green { /* default form button */ - color: #080; + color: #080 !important; } table.datatable { From e7cccad2c373523ece606ddbd85640a793698a5e Mon Sep 17 00:00:00 2001 From: Nico Kaiser Date: Thu, 10 May 2012 10:25:03 +0200 Subject: [PATCH 002/102] Add StatsCache* config options for caching TABLE STATUS output in APC (if available) --- Documentation.html | 10 +++++++++- libraries/config.default.php | 18 +++++++++++++++++ libraries/database_interface.lib.php | 30 +++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index ce08ff826e..307a24a41c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1349,7 +1349,15 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE redirected after logout (doesn't affect config authentication method). Should be absolute including protocol. - +
$cfg['Servers'][$i]['StatusCacheDatabases'] array of strings
+
Enables caching of TABLE STATUS outputs for specific databases on this server (in some cases TABLE STATUS can be very slow, so you may want to cache it). APC is used (if the PHP extension is available, if not, this setting is ignored silently). You have to provide StatusCacheLifetime.
+ Takes effect only if + DisableIS + is true. +
+
$cfg['Servers'][$i]['StatusCacheLifetime'] integer
+
Lifetime in seconds of the TABLE STATUS cache if StatusCacheDatabases is used. +
$cfg['ServerDefault'] integer
If you have more than one server configured, you can set $cfg['ServerDefault'] to any one of them to autoconnect to diff --git a/libraries/config.default.php b/libraries/config.default.php index b68c175ab8..b1dd816a8f 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -517,6 +517,24 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true; $cfg['Servers'][$i]['tracking_add_drop_database'] = true; +/** + * Enables caching of TABLE STATUS outputs for specific databases on this server + * (in some cases TABLE STATUS can be very slow, so you may want to cache it). + * APC is used (if the PHP extension is available, if not, this setting is ignored + * silently). You have to provide StatusCacheLifetime. + * Takes effect only if DisableIS is true. + * + * @global array $cfg['Servers'][$i]['StatusCacheDatabases'] + */ +$cfg['Servers'][$i]['StatusCacheDatabases'] = array(); + +/** + * Lifetime in seconds of the TABLE STATUS cache if StatusCacheDatabases is used + * + * @global integer $cfg['Servers'][$i]['StatusCacheLifetime'] + */ +$cfg['Servers'][$i]['StatusCacheLifetime'] = 0; + /** * Default server (0 = no default server) * diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c6ebbdce50..1fd4a19b0e 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -515,7 +515,35 @@ function PMA_DBI_get_tables_full($database, $table = false, . PMA_backquote($each_database); } - $each_tables = PMA_DBI_fetch_result($sql, 'Name', null, $link); + $useStatusCache = false; + + if (isset($GLOBALS['cfg']['Server']['StatusCacheDatabases'])) { + if (!empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) { + if (extension_loaded('apc')) { + $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases']; + + if (in_array($each_database, $statusCacheDatabases)) { + $useStatusCache = true; + } + } + } + } + + $each_tables = null; + + if ($useStatusCache) { + $cacheKey = 'phpMyAdmin_tableStatus_' . md5($GLOBALS['cfg']['Server']['host'] . '_' . $sql); + + $each_tables = apc_fetch($cacheKey); + } + + if (!$each_tables) { + $each_tables = PMA_DBI_fetch_result($sql, 'Name', null, $link); + } + + if ($useStatusCache) { + apc_store($cacheKey, $each_tables, $GLOBALS['cfg']['Server']['StatusCacheLifetime']); + } // Sort naturally if the config allows it and we're sorting // the Name column. From 9853c5dea8b12f0a2d159acc19d285e70cf6058d Mon Sep 17 00:00:00 2001 From: Nico Kaiser Date: Thu, 10 May 2012 14:48:35 +0200 Subject: [PATCH 003/102] Use sha1 instead of md5, reorder conditions for table status caching and avoid too many if's --- libraries/database_interface.lib.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 1fd4a19b0e..3cf4244ac3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -517,22 +517,19 @@ function PMA_DBI_get_tables_full($database, $table = false, $useStatusCache = false; - if (isset($GLOBALS['cfg']['Server']['StatusCacheDatabases'])) { - if (!empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) { - if (extension_loaded('apc')) { - $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases']; - - if (in_array($each_database, $statusCacheDatabases)) { - $useStatusCache = true; - } - } + if (extension_loaded('apc') + && isset($GLOBALS['cfg']['Server']['StatusCacheDatabases']) + && ! empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) { + $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases']; + if (in_array($each_database, $statusCacheDatabases)) { + $useStatusCache = true; } } $each_tables = null; if ($useStatusCache) { - $cacheKey = 'phpMyAdmin_tableStatus_' . md5($GLOBALS['cfg']['Server']['host'] . '_' . $sql); + $cacheKey = 'phpMyAdmin_tableStatus_' . sha1($GLOBALS['cfg']['Server']['host'] . '_' . $sql); $each_tables = apc_fetch($cacheKey); } From 93cf9861bcc95c8a6f668c4abd4bdf92c2fd698d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Martins?= Date: Tue, 15 May 2012 14:19:50 +0200 Subject: [PATCH 004/102] Translated using Weblate. --- po/pt.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/pt.po b/po/pt.po index 69942a1030..865982b3e8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-04-09 19:51+0200\n" -"PO-Revision-Date: 2012-05-14 13:56+0200\n" +"PO-Revision-Date: 2012-05-15 14:18+0200\n" "Last-Translator: Vítor Martins \n" "Language-Team: portuguese \n" "Language: pt\n" @@ -456,6 +456,7 @@ msgid "And" msgstr "E" #: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582 +#, fuzzy msgid "Del" msgstr "Elim." From d8bd23f443546a85cea1d604f8da5dac45c4cb71 Mon Sep 17 00:00:00 2001 From: Aso Naderi Date: Tue, 15 May 2012 14:21:15 +0200 Subject: [PATCH 005/102] Translated using Weblate. --- po/ckb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 29b8a5d4a5..bda4ff3e83 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-15 13:06+0200\n" +"PO-Revision-Date: 2012-05-15 13:43+0200\n" "Last-Translator: Aso Naderi \n" "Language-Team: none\n" "Language: ckb\n" @@ -266,36 +266,36 @@ msgstr "بنکەی دراوەی %1$s ڕوونووس کرا بۆ بنکەی در #: db_operations.php:443 msgid "Rename database to" -msgstr "" +msgstr "ناوی بنکەی دراوە بگۆڕە بۆ" #: db_operations.php:470 msgid "Remove database" -msgstr "" +msgstr "سڕینەوەی بنکەی دراوە" #: db_operations.php:482 #, php-format msgid "Database %s has been dropped." -msgstr "" +msgstr "بنکەی دراوەی %s سڕایەوە." #: db_operations.php:487 msgid "Drop the database (DROP)" -msgstr "" +msgstr "سڕینەوەی بنکەی دراوە (DROP)" #: db_operations.php:516 msgid "Copy database to" -msgstr "" +msgstr "لە ڕوونووسینەوەی بنکەی دراوە بۆ" #: db_operations.php:523 tbl_operations.php:561 tbl_tracking.php:482 msgid "Structure only" -msgstr "" +msgstr "تەنیا بنچینە" #: db_operations.php:524 tbl_operations.php:562 tbl_tracking.php:484 msgid "Structure and data" -msgstr "" +msgstr "بنچینە و زانیاری" #: db_operations.php:525 tbl_operations.php:563 tbl_tracking.php:483 msgid "Data only" -msgstr "" +msgstr "تەنیا زانیاری" #: db_operations.php:533 msgid "CREATE DATABASE before copying" From 09aea7a4336aba16a768dcac9b28c1e21b5408ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Martins?= Date: Tue, 15 May 2012 14:21:16 +0200 Subject: [PATCH 006/102] Translated using Weblate. --- po/pt.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/pt.po b/po/pt.po index c58cde9538..49d1ca1f19 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-14 13:56+0200\n" +"PO-Revision-Date: 2012-05-15 14:21+0200\n" "Last-Translator: Vítor Martins \n" "Language-Team: portuguese \n" "Language: pt\n" @@ -254,7 +254,7 @@ msgid "The database name is empty!" msgstr "O nome da base de dados está vazia!" #: db_operations.php:311 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been renamed to %s" msgid "Database %1$s has been renamed to %2$s" msgstr "O nome da base de dados %s foi alterado para %s" @@ -449,6 +449,7 @@ msgid "And" msgstr "E" #: db_qbe.php:393 db_qbe.php:474 db_qbe.php:556 db_qbe.php:587 +#, fuzzy msgid "Del" msgstr "Elim." From 087422388dd8efad4bb80762e80e68cf1d91467e Mon Sep 17 00:00:00 2001 From: Aso Naderi Date: Wed, 16 May 2012 11:31:19 +0200 Subject: [PATCH 007/102] Translated using Weblate. --- po/ckb.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index bda4ff3e83..4b60e975f1 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-15 13:43+0200\n" +"PO-Revision-Date: 2012-05-15 17:19+0200\n" "Last-Translator: Aso Naderi \n" "Language-Team: none\n" "Language: ckb\n" @@ -299,19 +299,19 @@ msgstr "تەنیا زانیاری" #: db_operations.php:533 msgid "CREATE DATABASE before copying" -msgstr "" +msgstr "بنکەی دراوە درووست بکە پێش ڕوونووسکردن" #: db_operations.php:536 libraries/config/messages.inc.php:130 #: libraries/config/messages.inc.php:131 libraries/config/messages.inc.php:133 #: libraries/config/messages.inc.php:139 tbl_operations.php:569 #, php-format msgid "Add %s" -msgstr "" +msgstr "زۆرکردن %s" #: db_operations.php:540 libraries/config/messages.inc.php:123 #: tbl_operations.php:321 tbl_operations.php:571 msgid "Add AUTO_INCREMENT value" -msgstr "" +msgstr "زۆرکردنی نرخی زۆربوونی خۆکارانە" #: db_operations.php:544 tbl_operations.php:578 msgid "Add constraints" @@ -319,7 +319,7 @@ msgstr "" #: db_operations.php:559 msgid "Switch to copied database" -msgstr "" +msgstr "بڕۆ بۆ بنکەی دراوەی ڕوونووس کراو" #: db_operations.php:582 libraries/Index.class.php:463 #: libraries/build_html_for_db.lib.php:20 libraries/db_structure.lib.php:48 @@ -351,7 +351,7 @@ msgstr "" #: server_privileges.php:2071 server_privileges.php:2340 #: server_synchronize.php:519 server_synchronize.php:1039 tbl_tracking.php:711 msgid "Table" -msgstr "" +msgstr "خشتە" #: db_printview.php:103 db_tables_search.php:24 db_tables_search.php:53 #: libraries/Table.class.php:314 libraries/build_html_for_db.lib.php:31 @@ -360,47 +360,47 @@ msgstr "" #: tbl_printview.php:378 tbl_structure.php:462 tbl_structure.php:536 #: tbl_structure.php:948 msgid "Rows" -msgstr "" +msgstr "خانە" #: db_printview.php:107 libraries/db_structure.lib.php:53 tbl_indexes.php:223 msgid "Size" -msgstr "" +msgstr "قەبارە" #: db_printview.php:161 db_structure.php:592 libraries/export/sql.php:977 msgid "in use" -msgstr "" +msgstr "بەکار دەبرێت" #: db_printview.php:187 libraries/db_info.inc.php:76 #: libraries/db_structure.lib.php:60 libraries/export/sql.php:911 #: libraries/schema/Pdf_Relation_Schema.class.php:1287 tbl_printview.php:423 #: tbl_structure.php:980 msgid "Creation" -msgstr "" +msgstr "درووستکردن" #: db_printview.php:196 libraries/db_info.inc.php:81 #: libraries/db_structure.lib.php:65 libraries/export/sql.php:922 #: libraries/schema/Pdf_Relation_Schema.class.php:1292 tbl_printview.php:434 #: tbl_structure.php:988 msgid "Last update" -msgstr "" +msgstr "دواترین نوێکردنەوە" #: db_printview.php:205 libraries/db_info.inc.php:86 #: libraries/db_structure.lib.php:70 libraries/export/sql.php:933 #: libraries/schema/Pdf_Relation_Schema.class.php:1297 tbl_printview.php:445 #: tbl_structure.php:996 msgid "Last check" -msgstr "" +msgstr "دواترین چێک" #: db_printview.php:222 db_structure.php:613 #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s خشتە" +msgstr[1] "%s خشتە" #: db_qbe.php:41 msgid "You have to choose at least one column to display" -msgstr "" +msgstr "دەبێت لانیکەم ١ خانە هەڵبژێریت بۆ پیشاندان" #: db_qbe.php:189 #, php-format @@ -410,7 +410,7 @@ msgstr "" #: db_qbe.php:225 libraries/db_structure.lib.php:106 #: libraries/display_tbl.lib.php:1196 msgid "Sort" -msgstr "" +msgstr "ڕیزکردن" #: db_qbe.php:234 db_qbe.php:269 libraries/db_structure.lib.php:113 #: libraries/db_structure.lib.php:122 libraries/display_tbl.lib.php:663 @@ -418,7 +418,7 @@ msgstr "" #: server_databases.php:187 server_databases.php:204 tbl_operations.php:282 #: tbl_select.php:223 msgid "Ascending" -msgstr "" +msgstr "لە سەرەتاوە بۆ کۆتایی" #: db_qbe.php:235 db_qbe.php:277 libraries/db_structure.lib.php:114 #: libraries/db_structure.lib.php:123 libraries/display_tbl.lib.php:674 @@ -426,12 +426,12 @@ msgstr "" #: server_databases.php:187 server_databases.php:204 tbl_operations.php:283 #: tbl_select.php:224 msgid "Descending" -msgstr "" +msgstr "لە کۆتایی بۆ سەرەتا" #: db_qbe.php:290 db_tracking.php:86 libraries/display_tbl.lib.php:482 #: tbl_change.php:286 tbl_tracking.php:716 msgid "Show" -msgstr "" +msgstr "پیشاندان" #: db_qbe.php:326 msgid "Criteria" @@ -443,21 +443,21 @@ msgstr "" #: db_qbe.php:384 db_qbe.php:466 db_qbe.php:551 db_qbe.php:582 msgid "And" -msgstr "" +msgstr "و" #: db_qbe.php:393 db_qbe.php:474 db_qbe.php:556 db_qbe.php:587 msgid "Del" -msgstr "" +msgstr "سڕینەوە" #: db_qbe.php:397 db_qbe.php:478 db_qbe.php:549 db_qbe.php:580 #: server_privileges.php:484 tbl_change.php:936 tbl_indexes.php:301 #: tbl_select.php:197 msgid "Or" -msgstr "" +msgstr "یان" #: db_qbe.php:534 msgid "Modify" -msgstr "" +msgstr "دەستکاری" #: db_qbe.php:609 msgid "Add/Delete criteria rows" From 904b2ad3ad268562086db335677d9dbc172c4783 Mon Sep 17 00:00:00 2001 From: gailan abdulla xdr Date: Wed, 16 May 2012 12:07:09 +0200 Subject: [PATCH 008/102] Translated using Weblate. --- po/ckb.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 4b60e975f1..bbe7995f88 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-15 17:19+0200\n" -"Last-Translator: Aso Naderi \n" +"PO-Revision-Date: 2012-05-16 11:44+0200\n" +"Last-Translator: gailan abdulla xdr \n" "Language-Team: none\n" "Language: ckb\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgstr ":تێبینی بنکەی دراوە" #: libraries/tbl_properties.inc.php:786 tbl_operations.php:369 #: tbl_printview.php:126 msgid "Table comments" -msgstr "تێبینی خشتە" +msgstr "تێبینیەکانی خشتە" #: db_datadict.php:163 db_qbe.php:199 libraries/Index.class.php:461 #: libraries/export/htmlword.php:245 libraries/export/htmlword.php:357 @@ -389,14 +389,14 @@ msgstr "دواترین نوێکردنەوە" #: libraries/schema/Pdf_Relation_Schema.class.php:1297 tbl_printview.php:445 #: tbl_structure.php:996 msgid "Last check" -msgstr "دواترین چێک" +msgstr "دواترین پشکنین" #: db_printview.php:222 db_structure.php:613 #, php-format msgid "%s table" msgid_plural "%s tables" msgstr[0] "%s خشتە" -msgstr[1] "%s خشتە" +msgstr[1] "%s خشتەکان" #: db_qbe.php:41 msgid "You have to choose at least one column to display" @@ -497,7 +497,7 @@ msgstr "" #: db_search.php:44 db_search.php:302 msgid "all words" -msgstr "" +msgstr "هەموو وشەکان" #: db_search.php:45 db_search.php:303 msgid "the exact phrase" @@ -540,7 +540,7 @@ msgstr "" #: setup/frames/index.inc.php:148 setup/frames/index.inc.php:251 #: tbl_tracking.php:499 tbl_tracking.php:520 tbl_tracking.php:579 msgid "Delete" -msgstr "" +msgstr "سڕینەوە" #: db_search.php:266 #, php-format @@ -551,7 +551,7 @@ msgstr[1] "" #: db_search.php:289 msgid "Search in database" -msgstr "" +msgstr "گەڕان لە بنکەی دراو" #: db_search.php:292 msgid "Words or values to search for (wildcard: \"%\"):" @@ -559,7 +559,7 @@ msgstr "" #: db_search.php:297 msgid "Find:" -msgstr "" +msgstr "دۆزنەوە:" #: db_search.php:301 db_search.php:302 msgid "Words are separated by a space character (\" \")." @@ -575,7 +575,7 @@ msgstr "" #: db_structure.php:84 msgid "No tables found in database" -msgstr "" +msgstr "هیچ خشتەیەک نەدۆزرایەوە لە بنکەی دراو" #: db_structure.php:242 libraries/mysql_charsets.lib.php:411 #: libraries/mysql_charsets.lib.php:418 @@ -615,7 +615,7 @@ msgstr "" #: db_structure.php:543 db_structure.php:577 libraries/Menu.class.php:194 #: libraries/tbl_info.inc.php:55 tbl_structure.php:208 msgid "View" -msgstr "" +msgstr "نیشاندان" #: db_structure.php:620 libraries/Menu.class.php:504 #: libraries/db_structure.lib.php:35 server_replication.php:31 @@ -644,13 +644,13 @@ msgstr "" #: server_databases.php:292 server_privileges.php:781 #: server_privileges.php:1923 tbl_structure.php:562 msgid "Check All" -msgstr "" +msgstr "پشکنینی هەموو" #: db_structure.php:686 libraries/display_tbl.lib.php:2992 #: libraries/replication_gui.lib.php:35 server_databases.php:294 #: server_privileges.php:784 server_privileges.php:1927 tbl_structure.php:566 msgid "Uncheck All" -msgstr "" +msgstr "نەپشکنینی هەموو" #: db_structure.php:691 msgid "Check tables having overhead" From ac7b40117fddfb226269c26ae32c6f61de033111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=BE=D1=8F=D0=BD=20=D0=94=D0=B8=D0=BC=D0=B8?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2?= Date: Wed, 16 May 2012 14:21:15 +0200 Subject: [PATCH 009/102] Translated using Weblate. --- po/bg.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index c8f6f1fe41..c36ddea51d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-04-09 19:51+0200\n" -"PO-Revision-Date: 2012-05-12 23:40+0200\n" +"PO-Revision-Date: 2012-05-15 20:20+0200\n" "Last-Translator: Стоян Димитров \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -5056,11 +5056,13 @@ msgstr "" #: libraries/config/messages.inc.php:474 libraries/sql_query_form.lib.php:352 #| msgid "Hide query box" msgid "Retain query box" -msgstr "Запазване на прозореца за заявки" +msgstr "Запазване отворен прозореца за заявки" #: libraries/config/messages.inc.php:475 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" +"Разрешаване показването на статистика за таблици и БД (напр. заемано " +"пространство)" #: libraries/config/messages.inc.php:476 msgid "Show statistics" From c7670eabb346280502275ff177a62791c94754dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Martins?= Date: Wed, 16 May 2012 14:21:16 +0200 Subject: [PATCH 010/102] Translated using Weblate. --- po/pt.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt.po b/po/pt.po index 865982b3e8..d7b0542640 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-04-09 19:51+0200\n" -"PO-Revision-Date: 2012-05-15 14:18+0200\n" +"PO-Revision-Date: 2012-05-15 14:21+0200\n" "Last-Translator: Vítor Martins \n" "Language-Team: portuguese \n" "Language: pt\n" @@ -456,9 +456,8 @@ msgid "And" msgstr "E" #: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582 -#, fuzzy msgid "Del" -msgstr "Elim." +msgstr "Elim" #: db_qbe.php:392 db_qbe.php:473 db_qbe.php:544 db_qbe.php:575 #: server_privileges.php:400 tbl_change.php:907 tbl_indexes.php:283 From bc26aec20c5c22a98d554c92e6e315f5dd003bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=BE=D1=8F=D0=BD=20=D0=94=D0=B8=D0=BC=D0=B8?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2?= Date: Wed, 16 May 2012 14:21:29 +0200 Subject: [PATCH 011/102] Translated using Weblate. --- po/bg.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 82763b595d..ddb19e8f92 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-12 23:40+0200\n" +"PO-Revision-Date: 2012-05-15 20:20+0200\n" "Last-Translator: Стоян Димитров \n" "Language-Team: bulgarian \n" "Language: bg\n" @@ -5462,11 +5462,13 @@ msgstr "" #: libraries/config/messages.inc.php:479 libraries/sql_query_form.lib.php:358 msgid "Retain query box" -msgstr "Запазване на прозореца за заявки" +msgstr "Запазване отворен прозореца за заявки" #: libraries/config/messages.inc.php:480 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" +"Разрешаване показването на статистика за таблици и БД (напр. заемано " +"пространство)" #: libraries/config/messages.inc.php:481 msgid "Show statistics" From 450b228b7a9fedb9c36ca72e9fe5803accef1b61 Mon Sep 17 00:00:00 2001 From: Aso Naderi Date: Wed, 16 May 2012 14:21:31 +0200 Subject: [PATCH 012/102] Translated using Weblate. --- po/ckb.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index bbe7995f88..85d1039ea5 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-16 11:44+0200\n" -"Last-Translator: gailan abdulla xdr \n" +"PO-Revision-Date: 2012-05-16 12:10+0200\n" +"Last-Translator: Aso Naderi \n" "Language-Team: none\n" "Language: ckb\n" "MIME-Version: 1.0\n" @@ -435,7 +435,7 @@ msgstr "پیشاندان" #: db_qbe.php:326 msgid "Criteria" -msgstr "" +msgstr "مەرج" #: db_qbe.php:380 db_qbe.php:462 db_qbe.php:554 db_qbe.php:585 msgid "Ins" @@ -461,39 +461,39 @@ msgstr "دەستکاری" #: db_qbe.php:609 msgid "Add/Delete criteria rows" -msgstr "" +msgstr "زۆرکردن/سڕینەوەی خانەی مەرج" #: db_qbe.php:621 msgid "Add/Delete columns" -msgstr "" +msgstr "زۆرکردن/سڕینەوەی خانە" #: db_qbe.php:634 db_qbe.php:657 msgid "Update Query" -msgstr "" +msgstr "نوێکردنەوەی پرس" #: db_qbe.php:640 msgid "Use Tables" -msgstr "" +msgstr "خشتە بەکار ببە" #: db_qbe.php:663 #, php-format msgid "SQL query on database %s:" -msgstr "" +msgstr "پرسی SQL لەسەر بنکەی دراوەی %s:" #: db_qbe.php:956 libraries/common.lib.php:1239 msgid "Submit Query" -msgstr "" +msgstr "ناردنی پرس" #: db_search.php:31 libraries/auth/config.auth.lib.php:78 #: libraries/auth/config.auth.lib.php:99 #: libraries/auth/cookie.auth.lib.php:620 libraries/auth/http.auth.lib.php:54 #: libraries/auth/signon.auth.lib.php:247 msgid "Access denied" -msgstr "" +msgstr "ڕێگەنەدرا بە بینین" #: db_search.php:43 db_search.php:301 msgid "at least one of the words" -msgstr "" +msgstr "لانیکەم یەکێک لە وشەکان" #: db_search.php:44 db_search.php:302 msgid "all words" @@ -501,7 +501,7 @@ msgstr "هەموو وشەکان" #: db_search.php:45 db_search.php:303 msgid "the exact phrase" -msgstr "" +msgstr "دەقاودەقی ڕستە" #: db_search.php:46 db_search.php:304 msgid "as regular expression" From 255dbf6a7bd77a6e5d6edc0c194c8decc0cbf048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Martins?= Date: Wed, 16 May 2012 14:21:33 +0200 Subject: [PATCH 013/102] Translated using Weblate. --- po/pt.po | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/po/pt.po b/po/pt.po index 49d1ca1f19..87c1419647 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-15 14:21+0200\n" +"PO-Revision-Date: 2012-05-15 14:27+0200\n" "Last-Translator: Vítor Martins \n" "Language-Team: portuguese \n" "Language: pt\n" @@ -257,13 +257,13 @@ msgstr "O nome da base de dados está vazia!" #, php-format #| msgid "Database %s has been renamed to %s" msgid "Database %1$s has been renamed to %2$s" -msgstr "O nome da base de dados %s foi alterado para %s" +msgstr "O nome da base de dados %1$s foi alterado para %2$s" #: db_operations.php:315 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been copied to %s" msgid "Database %1$s has been copied to %2$s" -msgstr "A base de dados %s foi copiada para %s." +msgstr "A base de dados %1$s foi copiada para %2$s" #: db_operations.php:443 msgid "Rename database to" @@ -449,9 +449,8 @@ msgid "And" msgstr "E" #: db_qbe.php:393 db_qbe.php:474 db_qbe.php:556 db_qbe.php:587 -#, fuzzy msgid "Del" -msgstr "Elim." +msgstr "Elim" #: db_qbe.php:397 db_qbe.php:478 db_qbe.php:549 db_qbe.php:580 #: server_privileges.php:484 tbl_change.php:936 tbl_indexes.php:301 @@ -517,13 +516,13 @@ msgid "Search results for \"%s\" %s:" msgstr "Procurar resultados para \"%s\" %s:" #: db_search.php:239 -#, fuzzy, php-format +#, php-format #| msgid "%s match inside table %s" #| msgid_plural "%s matches inside table %s" msgid "%1$s match inside table %2$s" msgid_plural "%1$s matches inside table %2$s" -msgstr[0] "%s resultado na tabela %s" -msgstr[1] "%s resultados na tabela %s" +msgstr[0] "%1$s resultado na tabela %2$s" +msgstr[1] "%1$s resultados na tabela %2$s" #: db_search.php:247 libraries/Menu.class.php:263 #: libraries/common.lib.php:3148 libraries/common.lib.php:3378 @@ -1036,10 +1035,10 @@ msgid "\"DROP DATABASE\" statements are disabled." msgstr "Os comandos \"DROP DATABASE\" estão inibidos." #: js/messages.php:30 -#, fuzzy, php-format +#, php-format #| msgid "Do you really want to " msgid "Do you really want to execute \"%s\"?" -msgstr "Confirma : " +msgstr "Você realmente deseja executar \"%s\"?" #: js/messages.php:31 libraries/mult_submits.inc.php:307 sql.php:390 msgid "You are about to DESTROY a complete database!" @@ -1506,10 +1505,9 @@ msgid "From general log" msgstr "Do registo geral" #: js/messages.php:172 -#, fuzzy #| msgid "Loading logs" msgid "Analysing logs" -msgstr "Carregando registos" +msgstr "Analisando os registos" #: js/messages.php:173 msgid "Analysing & loading logs. This may take a while." @@ -1550,10 +1548,9 @@ msgid "Jump to Log table" msgstr "Saltar para a tabela de registos" #: js/messages.php:180 -#, fuzzy #| msgid "No databases" msgid "No data found" -msgstr "Sem bases de dados" +msgstr "Sem dados" #: js/messages.php:181 msgid "Log analysed, but no data found in this time span." @@ -1594,14 +1591,13 @@ msgid "Chart" msgstr "Mapa de Resultados" #: js/messages.php:191 -#, fuzzy msgid "Edit chart" -msgstr "Adiciona novo campo" +msgstr "Editar gráfico" #: js/messages.php:192 #, fuzzy msgid "Series" -msgstr "Comando SQL" +msgstr "Series" #. l10n: A collection of available filters #: js/messages.php:195 @@ -1678,16 +1674,14 @@ msgid "Import" msgstr "Importar" #: js/messages.php:213 -#, fuzzy #| msgid "Local monitor configuration incompatible" msgid "Import monitor configuration" -msgstr "Configuração incompatível do monitor local" +msgstr "Importar configuração do monitor" #: js/messages.php:214 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the file you want to import" -msgstr "Por favor seleccione a chave primária ou a chave única " +msgstr "Por favor, selecione o ficheiro que deseja importar" #: js/messages.php:216 msgid "Analyse Query" @@ -1802,16 +1796,14 @@ msgid "Foreign key check:" msgstr "" #: js/messages.php:258 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Enabled" msgid "(Enabled)" -msgstr "Activado" +msgstr "(Ativado)" #: js/messages.php:259 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Disabled" msgid "(Disabled)" -msgstr "Desactidado" +msgstr "(Desativado)" #: js/messages.php:262 msgid "Searching" @@ -2058,20 +2050,18 @@ msgid "Go to link" msgstr "Ir para a hiperligação" #: js/messages.php:362 -#, fuzzy #| msgid "Column names" msgid "Copy column name" -msgstr "Nome dos Campos" +msgstr "Copiar nome da coluna" #: js/messages.php:363 msgid "Right-click the column name to copy it to your clipboard." msgstr "" #: js/messages.php:364 -#, fuzzy #| msgid "Showing rows" msgid "Show data row(s)" -msgstr "Mostrando registos " +msgstr "Mostrar registo(s)" #: js/messages.php:367 msgid "Generate password" From 89cc32cf04e371ab487683dd37d06d8b44631b82 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Wed, 16 May 2012 15:28:59 +0200 Subject: [PATCH 014/102] Translated using Weblate. --- po/en_GB.po | 227 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 136 insertions(+), 91 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index d99938c083..7a7ca5e53d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-04-12 15:12+0200\n" +"PO-Revision-Date: 2012-05-16 15:28+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.9\n" +"X-Generator: Weblate 1.0\n" #: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358 #: libraries/display_tbl.lib.php:399 server_privileges.php:1828 @@ -1490,10 +1490,9 @@ msgid "From general log" msgstr "From general log" #: js/messages.php:172 -#, fuzzy #| msgid "Loading logs" msgid "Analysing logs" -msgstr "Loading logs" +msgstr "Analysing logs" #: js/messages.php:173 msgid "Analysing & loading logs. This may take a while." @@ -1532,10 +1531,9 @@ msgid "Jump to Log table" msgstr "Jump to Log table" #: js/messages.php:180 -#, fuzzy #| msgid "No data" msgid "No data found" -msgstr "No data" +msgstr "No data found" #: js/messages.php:181 msgid "Log analysed, but no data found in this time span." @@ -1573,16 +1571,14 @@ msgid "Chart" msgstr "Chart" #: js/messages.php:191 -#, fuzzy #| msgid "Add chart" msgid "Edit chart" -msgstr "Add chart" +msgstr "Edit chart" #: js/messages.php:192 -#, fuzzy #| msgid "Series:" msgid "Series" -msgstr "Series:" +msgstr "Series" #. l10n: A collection of available filters #: js/messages.php:195 @@ -1656,16 +1652,14 @@ msgid "Import" msgstr "Import" #: js/messages.php:213 -#, fuzzy #| msgid "Could not import configuration" msgid "Import monitor configuration" -msgstr "Could not import configuration" +msgstr "Import monitor configuration" #: js/messages.php:214 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the file you want to import" -msgstr "Please select the primary key or a unique key" +msgstr "Please select the file you want to import" #: js/messages.php:216 msgid "Analyse Query" @@ -2329,51 +2323,52 @@ msgstr "Second" #: libraries/Advisor.class.php:67 #, php-format msgid "PHP threw following error: %s" -msgstr "" +msgstr "PHP threw following error: %s" #: libraries/Advisor.class.php:89 #, php-format msgid "Failed evaluating precondition for rule '%s'" -msgstr "" +msgstr "Failed evaluating precondition for rule '%s'" #: libraries/Advisor.class.php:106 #, php-format msgid "Failed calculating value for rule '%s'" -msgstr "" +msgstr "Failed calculating value for rule '%s'" #: libraries/Advisor.class.php:125 #, php-format msgid "Failed running test for rule '%s'" -msgstr "" +msgstr "Failed running test for rule '%s'" #: libraries/Advisor.class.php:207 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Failed formatting string for rule '%s'. PHP threw following error: %s" msgid "Failed formatting string for rule '%s'." -msgstr "Failed formatting string for rule '%s'. PHP threw following error: %s" +msgstr "Failed formatting string for rule '%s'." #: libraries/Advisor.class.php:361 #, php-format msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule" msgstr "" +"Invalid rule declaration on line %1$s, expected line %2$s of previous rule" #: libraries/Advisor.class.php:378 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid rule declaration on line %s" -msgstr "Invalid format of CSV input on line %d." +msgstr "Invalid rule declaration on line %s" #: libraries/Advisor.class.php:386 #, php-format msgid "Unexpected characters on line %s" -msgstr "" +msgstr "Unexpected characters on line %s" #: libraries/Advisor.class.php:400 #, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" -msgstr "" +msgstr "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" #: libraries/Advisor.class.php:425 server_status.php:956 msgid "per second" @@ -2698,16 +2693,16 @@ msgid "unknown table status: " msgstr "unknown table status: " #: libraries/Table.class.php:750 -#, fuzzy, php-format +#, php-format #| msgid "Source database" msgid "Source database `%s` was not found!" -msgstr "Source database" +msgstr "Source database `%s` was not found!" #: libraries/Table.class.php:756 -#, fuzzy, php-format +#, php-format #| msgid "Theme %s not found!" msgid "Target database `%s` was not found!" -msgstr "Theme %s not found!" +msgstr "Target database `%s` was not found!" #: libraries/Table.class.php:1174 msgid "Invalid database" @@ -2787,42 +2782,55 @@ msgstr "Theme" msgid "" "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" msgstr "" +"A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" #: libraries/Types.class.php:291 msgid "" "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " "65,535" msgstr "" +"A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " +"65,535" #: libraries/Types.class.php:293 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" msgstr "" +"A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " +"0 to 16,777,215" #: libraries/Types.class.php:295 msgid "" "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " "range is 0 to 4,294,967,295." msgstr "" +"A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " +"range is 0 to 4,294,967,295." #: libraries/Types.class.php:297 msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" +"An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " +"9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" #: libraries/Types.class.php:299 libraries/Types.class.php:707 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" msgstr "" +"A fixed-point number (M, D) - the maximum number of digits (M) is 65 " +"(default 10), the maximum number of decimals (D) is 30 (default 0)" #: libraries/Types.class.php:301 msgid "" "A small floating-point number, allowable values are -3.402823466E+38 to " "-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" msgstr "" +"A small floating-point number, allowable values are -3.402823466E+38 to " +"-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" #: libraries/Types.class.php:303 msgid "" @@ -2830,63 +2838,78 @@ msgid "" "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" +"A double-precision floating-point number, allowable values are " +"-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " +"2.2250738585072014E-308 to 1.7976931348623157E+308" #: libraries/Types.class.php:305 msgid "" "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " "FLOAT)" msgstr "" +"Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " +"FLOAT)" #: libraries/Types.class.php:307 msgid "" "A bit-field type (M), storing M of bits per value (default is 1, maximum is " "64)" msgstr "" +"A bit-field type (M), storing M of bits per value (default is 1, maximum is " +"64)" #: libraries/Types.class.php:309 msgid "" "A synonym for TINYINT(1), a value of zero is considered false, nonzero " "values are considered true" msgstr "" +"A synonym for TINYINT(1), a value of zero is considered false, nonzero " +"values are considered true" #: libraries/Types.class.php:311 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:313 libraries/Types.class.php:717 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "A date, supported range is %1$s to %2$s" -msgstr "Create version %1$s of %2$s" +msgstr "A date, supported range is %1$s to %2$s" #: libraries/Types.class.php:315 libraries/Types.class.php:719 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" -msgstr "" +msgstr "A date and time combination, supported range is %1$s to %2$s" #: libraries/Types.class.php:317 msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" +"A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " +"stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" #: libraries/Types.class.php:319 libraries/Types.class.php:723 -#, fuzzy, php-format +#, php-format #| msgid "Error renaming table %1$s to %2$s" msgid "A time, range is %1$s to %2$s" -msgstr "Error renaming table %1$s to %2$s" +msgstr "A time, range is %1$s to %2$s" #: libraries/Types.class.php:321 msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" msgstr "" +"A year in four-digit (4, default) or two-digit (2) format, the allowable " +"values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" #: libraries/Types.class.php:323 msgid "" "A fixed-length (0-255, default 1) string that is always right-padded with " "spaces to the specified length when stored" msgstr "" +"A fixed-length (0-255, default 1) string that is always right-padded with " +"spaces to the specified length when stored" #: libraries/Types.class.php:325 libraries/Types.class.php:725 #, php-format @@ -2894,24 +2917,32 @@ msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" msgstr "" +"A variable-length (%s) string, the effective maximum length is subject to " +"the maximum row size" #: libraries/Types.class.php:327 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" msgstr "" +"A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " +"a one-byte prefix indicating the length of the value in bytes" #: libraries/Types.class.php:329 libraries/Types.class.php:727 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" msgstr "" +"A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " +"with a two-byte prefix indicating the length of the value in bytes" #: libraries/Types.class.php:331 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" msgstr "" +"A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " +"stored with a three-byte prefix indicating the length of the value in bytes" #: libraries/Types.class.php:333 msgid "" @@ -2919,108 +2950,121 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" +"A TEXT column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " +"characters, stored with a four-byte prefix indicating the length of the " +"value in bytes" #: libraries/Types.class.php:335 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Similar to the CHAR type, but stores binary byte strings rather than non-" +"binary character strings" #: libraries/Types.class.php:337 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Similar to the VARCHAR type, but stores binary byte strings rather than non-" +"binary character strings" #: libraries/Types.class.php:339 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" msgstr "" +"A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " +"one-byte prefix indicating the length of the value" #: libraries/Types.class.php:341 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " +"with a three-byte prefix indicating the length of the value" #: libraries/Types.class.php:343 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" msgstr "" +"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " +"a two-byte prefix indicating the length of the value" #: libraries/Types.class.php:345 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" +"A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " +"bytes, stored with a four-byte prefix indicating the length of the value" #: libraries/Types.class.php:347 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" msgstr "" +"An enumeration, chosen from the list of up to 65,535 values or the special " +"'' error value" #: libraries/Types.class.php:349 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "A single value chosen from a set of up to 64 members" #: libraries/Types.class.php:351 msgid "A type that can store a geometry of any type" -msgstr "" +msgstr "A type that can store a geometry of any type" #: libraries/Types.class.php:353 msgid "A point in 2-dimensional space" -msgstr "" +msgstr "A point in 2-dimensional space" #: libraries/Types.class.php:355 msgid "A curve with linear interpolation between points" -msgstr "" +msgstr "A curve with linear interpolation between points" #: libraries/Types.class.php:357 -#, fuzzy #| msgid "Add a polygon" msgid "A polygon" -msgstr "Add a polygon" +msgstr "A polygon" #: libraries/Types.class.php:359 msgid "A collection of points" -msgstr "" +msgstr "A collection of points" #: libraries/Types.class.php:361 msgid "A collection of curves with linear interpolation between points" -msgstr "" +msgstr "A collection of curves with linear interpolation between points" #: libraries/Types.class.php:363 msgid "A collection of polygons" -msgstr "" +msgstr "A collection of polygons" #: libraries/Types.class.php:365 msgid "A collection of geometry objects of any type" -msgstr "" +msgstr "A collection of geometry objects of any type" #: libraries/Types.class.php:619 libraries/Types.class.php:971 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Numeric" #: libraries/Types.class.php:638 libraries/Types.class.php:974 -#, fuzzy #| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "Create an index" +msgstr "Date and time" #: libraries/Types.class.php:647 libraries/Types.class.php:977 -#, fuzzy #| msgid "Linestring" msgctxt "string types" msgid "String" -msgstr "Linestring" +msgstr "String" #: libraries/Types.class.php:668 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" @@ -3028,51 +3072,59 @@ msgstr "Spatial" #: libraries/Types.class.php:703 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" -msgstr "" +msgstr "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" #: libraries/Types.class.php:705 msgid "" "An 8-byte integer, range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807" msgstr "" +"An 8-byte integer, range is -9,223,372,036,854,775,808 to " +"9,223,372,036,854,775,807" #: libraries/Types.class.php:709 msgid "A system's default double-precision floating-point number" -msgstr "" +msgstr "A system's default double-precision floating-point number" #: libraries/Types.class.php:711 msgid "True or false" -msgstr "" +msgstr "True or false" #: libraries/Types.class.php:713 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:715 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "" +msgstr "Stores a Universally Unique Identifier (UUID)" #: libraries/Types.class.php:721 msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" +"A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " +"UTC; TIMESTAMP(6) can store microseconds" #: libraries/Types.class.php:729 msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" msgstr "" +"A variable-length (0-65,535) string, uses binary collation for all " +"comparisons" #: libraries/Types.class.php:731 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a four-byte prefix indicating the length of the value" msgstr "" +"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " +"a four-byte prefix indicating the length of the value" #: libraries/Types.class.php:733 msgid "An enumeration, chosen from the list of defined values" -msgstr "" +msgstr "An enumeration, chosen from the list of defined values" #: libraries/auth/config.auth.lib.php:72 msgid "Cannot connect: invalid settings." @@ -3739,10 +3791,13 @@ msgid "" "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]" "CodeMirror[/a]) with syntax highlighting and line numbers" msgstr "" +"Use user-friendly editor for editing SQL queries " +"([a@http://codemirror.net/]CodeMirror[/a]) with syntax highlighting and line " +"numbers" #: libraries/config/messages.inc.php:35 msgid "Enable CodeMirror" -msgstr "" +msgstr "Enable CodeMirror" #: libraries/config/messages.inc.php:36 msgid "" @@ -3851,13 +3906,12 @@ msgstr "Default table tab" #: libraries/config/messages.inc.php:58 msgid "Whether the table structure actions should be hidden" -msgstr "" +msgstr "Whether the table structure actions should be hidden" #: libraries/config/messages.inc.php:59 -#, fuzzy #| msgid "Propose table structure" msgid "Hide table structure actions" -msgstr "Propose table structure" +msgstr "Hide table structure actions" #: libraries/config/messages.inc.php:60 msgid "Show binary contents as HEX by default" @@ -4420,18 +4474,15 @@ msgstr "" "Choose which details to show in the database structure (list of tables)" #: libraries/config/messages.inc.php:230 -#, fuzzy #| msgid "Database structure" msgid "Table structure" -msgstr "Database structure" +msgstr "Table structure" #: libraries/config/messages.inc.php:231 -#, fuzzy #| msgid "" #| "Choose which details to show in the database structure (list of tables)" msgid "Settings for the table structure (list of columns)" -msgstr "" -"Choose which details to show in the database structure (list of tables)" +msgstr "Settings for the table structure (list of columns)" #: libraries/config/messages.inc.php:232 msgid "Tabs" @@ -6129,27 +6180,27 @@ msgstr "Encoding Conversion:" #: libraries/display_git_revision.lib.php:48 #, php-format msgid "%1$s from %2$s branch" -msgstr "" +msgstr "%1$s from %2$s branch" #: libraries/display_git_revision.lib.php:50 msgid "no branch" -msgstr "" +msgstr "no branch" #: libraries/display_git_revision.lib.php:57 msgid "Git revision" -msgstr "" +msgstr "Git revision" #: libraries/display_git_revision.lib.php:60 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "committed on %1$s by %2$s" -msgstr "Create version %1$s of %2$s" +msgstr "committed on %1$s by %2$s" #: libraries/display_git_revision.lib.php:68 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "authored on %1$s by %2$s" -msgstr "Create version %1$s of %2$s" +msgstr "authored on %1$s by %2$s" #: libraries/display_import.lib.php:61 msgid "" @@ -6893,16 +6944,14 @@ msgid "MediaWiki Table" msgstr "MediaWiki Table" #: libraries/export/mediawiki.php:53 -#, fuzzy #| msgid "Export contents" msgid "Export table names" -msgstr "Export contents" +msgstr "Export table names" #: libraries/export/mediawiki.php:60 -#, fuzzy #| msgid "horizontal (rotated headers)" msgid "Export table headers" -msgstr "horizontal (rotated headers)" +msgstr "Export table headers" #: libraries/export/pdf.php:18 msgid "PDF" @@ -7221,10 +7270,10 @@ msgid "This plugin does not support compressed imports!" msgstr "This plug-in does not support compressed imports!" #: libraries/import/mediawiki.php:246 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid format of mediawiki input on line:
%s." -msgstr "Invalid format of CSV input on line %d." +msgstr "Invalid format of mediawiki input on line:
%s." #: libraries/import/ods.php:49 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" @@ -7250,7 +7299,7 @@ msgstr "ESRI Shape File" #: libraries/import/shp.php:199 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "Geometry type '%s' is not supported by MySQL." #: libraries/import/shp.php:360 #, php-format @@ -8468,10 +8517,9 @@ msgid "Index" msgstr "Index" #: libraries/tbl_properties.inc.php:120 -#, fuzzy #| msgid "Remove column(s)" msgid "Move column" -msgstr "Remove column(s)" +msgstr "Move column" #: libraries/tbl_properties.inc.php:129 #, php-format @@ -8527,13 +8575,13 @@ msgstr "Fulltext" #: libraries/tbl_properties.inc.php:570 msgid "first" -msgstr "" +msgstr "first" #: libraries/tbl_properties.inc.php:579 -#, fuzzy, php-format +#, php-format #| msgid "After %s" msgid "after %s" -msgstr "After %s" +msgstr "after %s" #: libraries/tbl_properties.inc.php:691 tbl_structure.php:697 #, php-format @@ -11547,10 +11595,9 @@ msgid "Table %1$s has been altered successfully" msgstr "Table %1$s has been altered successfully" #: tbl_alter.php:131 -#, fuzzy #| msgid "The selected users have been deleted successfully." msgid "The columns have been moved successfully." -msgstr "The selected users have been deleted successfully." +msgstr "The columns have been moved successfully." #: tbl_change.php:745 msgid "Because of its length,
this column might not be editable" @@ -11951,10 +11998,9 @@ msgid "Spatial" msgstr "Spatial" #: tbl_structure.php:158 tbl_structure.php:162 -#, fuzzy #| msgid "Browse distinct values" msgid "Distinct values" -msgstr "Browse distinct values" +msgstr "Distinct values" #: tbl_structure.php:163 tbl_structure.php:164 msgid "Add primary key" @@ -11999,14 +12045,13 @@ msgid "Show more actions" msgstr "Show more actions" #: tbl_structure.php:621 tbl_structure.php:686 -#, fuzzy #| msgid "Remove column(s)" msgid "Move columns" -msgstr "Remove column(s)" +msgstr "Move columns" #: tbl_structure.php:622 msgid "Move the columns by dragging them up and down." -msgstr "" +msgstr "Move the columns by dragging them up and down." #: tbl_structure.php:648 msgid "Edit view" From 3467896efd32ff560cfd3442c7d6c60a60ce88bf Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 20:35:27 +0530 Subject: [PATCH 015/102] These have been missed when functions were renamed --- tbl_zoom_select.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index f3b3495310..aa20d599a8 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -65,7 +65,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { $i = 0; foreach ($row as $col => $val) { if ($fields_meta[$i]->type == 'bit') { - $row[$col] = PMA_printable_bit_value($val, $fields_meta[$i]->length); + $row[$col] = PMA_printableBitValue($val, $fields_meta[$i]->length); } $i++; } @@ -175,7 +175,7 @@ if (! isset($zoom_submit) && ! isset($inputs)) { $url_params = array(); $url_params['db'] = $db; $url_params['table'] = $table; -echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, 'topmenu2'); +echo PMA_generateHtmlTabs(PMA_tbl_getSubTabs(), $url_params, 'topmenu2'); /** * Set the field name,type,collation and whether null on select of a coulmn From 0335bbae9d1a63adc42db770743d6f8532011677 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 20:36:14 +0530 Subject: [PATCH 016/102] Add missing package tag --- tbl_zoom_select.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index aa20d599a8..f3062eedd0 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -5,6 +5,7 @@ * * display table zoom search form, create SQL queries from form data * + * @package PhpMyAdmin */ /** From 59f4ab5280791655a0d096b9f145557bffde4726 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 20:46:03 +0530 Subject: [PATCH 017/102] Fix docs --- libraries/common.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6c53abf628..5ffca0375a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3091,7 +3091,7 @@ function PMA_replaceBinaryContents($content) * @param binary $data GIS data * @param bool $includeSRID Add SRID to the WKT * - * @return GIS data in Well Know Text format + * @return string GIS data in Well Know Text format */ function PMA_asWKT($data, $includeSRID = false) { @@ -3516,7 +3516,7 @@ function PMA_getGISDatatypes($upper_case = false) * * @param string $gis_string GIS string * - * @return GIS data enclosed in 'GeomFromText' function + * @return string GIS data enclosed in 'GeomFromText' function */ function PMA_createGISData($gis_string) { From 1b7f991c9b745c9307461960dd5162e3705ee5e4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:44:58 +0530 Subject: [PATCH 018/102] Prefix private instance variables with underscore --- libraries/config/ConfigFile.class.php | 102 +++++++++++++------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 64bc72d7f4..50809fcf1c 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -18,45 +18,45 @@ class ConfigFile * Stores default PMA config from config.default.php * @var array */ - private $cfg; + private $_cfg; /** * Stores original PMA_Config object, not modified by user preferences * @var PMA_Config */ - private $orgCfgObject; + private $_orgCfgObject; /** * Stores allowed values for non-standard fields * @var array */ - private $cfgDb; + private $_cfgDb; /** * Keys which will be always written to config file * @var array */ - private $persistKeys = array(); + private $_persistKeys = array(); /** * Changes keys while updating config in {@link updateWithGlobalConfig()} * or reading by {@link getConfig()} or {@link getConfigArray()} * @var array */ - private $cfgUpdateReadMapping = array(); + private $_cfgUpdateReadMapping = array(); /** * Key filter for {@link set()} * @var array|null */ - private $setFilter; + private $_setFilter; /** * Instance id (key in $_SESSION array, separate for each server - * ConfigFile{server id}) * @var string */ - private $id; + private $_id; /** * Result for {@link _flattenArray()} @@ -77,15 +77,15 @@ class ConfigFile private function __construct() { // load default config values - $cfg = &$this->cfg; + $cfg = &$this->_cfg; include './libraries/config.default.php'; $cfg['fontsize'] = '82%'; // create PMA_Config to read config.inc.php values - $this->orgCfgObject = new PMA_Config(CONFIG_FILE); + $this->_orgCfgObject = new PMA_Config(CONFIG_FILE); // load additional config information - $cfg_db = &$this->cfgDb; + $cfg_db = &$this->_cfgDb; include './libraries/config.values.php'; // apply default values overrides @@ -95,9 +95,9 @@ class ConfigFile } } - $this->id = 'ConfigFile' . $GLOBALS['server']; - if (!isset($_SESSION[$this->id])) { - $_SESSION[$this->id] = array(); + $this->_id = 'ConfigFile' . $GLOBALS['server']; + if (!isset($_SESSION[$this->_id])) { + $_SESSION[$this->_id] = array(); } } @@ -121,7 +121,7 @@ class ConfigFile */ public function getOrgConfigObj() { - return $this->orgCfgObject; + return $this->_orgCfgObject; } /** @@ -134,7 +134,7 @@ class ConfigFile { // checking key presence is much faster than searching so move values // to keys - $this->persistKeys = array_flip($keys); + $this->_persistKeys = array_flip($keys); } /** @@ -144,7 +144,7 @@ class ConfigFile */ public function getPersistKeysMap() { - return $this->persistKeys; + return $this->_persistKeys; } /** @@ -156,12 +156,12 @@ class ConfigFile public function setAllowedKeys($keys) { if ($keys === null) { - $this->setFilter = null; + $this->_setFilter = null; return; } // checking key presence is much faster than searching so move values // to keys - $this->setFilter = array_flip($keys); + $this->_setFilter = array_flip($keys); } /** @@ -172,7 +172,7 @@ class ConfigFile */ public function setCfgUpdateReadMapping(array $mapping) { - $this->cfgUpdateReadMapping = $mapping; + $this->_cfgUpdateReadMapping = $mapping; } /** @@ -180,7 +180,7 @@ class ConfigFile */ public function resetConfigData() { - $_SESSION[$this->id] = array(); + $_SESSION[$this->_id] = array(); } /** @@ -190,7 +190,7 @@ class ConfigFile */ public function setConfigData(array $cfg) { - $_SESSION[$this->id] = $cfg; + $_SESSION[$this->_id] = $cfg; } /** @@ -206,30 +206,30 @@ class ConfigFile $canonical_path = $this->getCanonicalPath($path); } // apply key whitelist - if ($this->setFilter !== null && !isset($this->setFilter[$canonical_path])) { + if ($this->_setFilter !== null && !isset($this->_setFilter[$canonical_path])) { return; } // remove if the path isn't protected and it's empty or has a default // value - if (!isset($this->persistKeys[$canonical_path])) { + if (!isset($this->_persistKeys[$canonical_path])) { $default_value = $this->getDefault($canonical_path); // we need original config values not overwritten by user // preferences to allow for overwriting options set in // config.inc.php with default values $instance_default_value = PMA_array_read( $canonical_path, - $this->orgCfgObject->settings + $this->_orgCfgObject->settings ); if (($value === $default_value && (defined('PMA_SETUP') || $instance_default_value === $default_value)) || (empty($value) && empty($default_value) && (defined('PMA_SETUP') || empty($current_global))) ) { - PMA_array_remove($path, $_SESSION[$this->id]); + PMA_array_remove($path, $_SESSION[$this->_id]); return; } } - PMA_array_write($path, $_SESSION[$this->id], $value); + PMA_array_write($path, $_SESSION[$this->_id], $value); } /** @@ -260,7 +260,7 @@ class ConfigFile public function getFlatDefaultConfig() { $this->_flattenArrayResult = array(); - array_walk($this->cfg, array($this, '_flattenArray'), ''); + array_walk($this->_cfg, array($this, '_flattenArray'), ''); $flat_cfg = $this->_flattenArrayResult; $this->_flattenArrayResult = null; return $flat_cfg; @@ -284,8 +284,8 @@ class ConfigFile // should be complemented by code reading from generated config // to perform inverse mapping foreach ($flat_cfg as $path => $value) { - if (isset($this->cfgUpdateReadMapping[$path])) { - $path = $this->cfgUpdateReadMapping[$path]; + if (isset($this->_cfgUpdateReadMapping[$path])) { + $path = $this->_cfgUpdateReadMapping[$path]; } $this->set($path, $value, $path); } @@ -301,7 +301,7 @@ class ConfigFile */ public function get($path, $default = null) { - return PMA_array_read($path, $_SESSION[$this->id], $default); + return PMA_array_read($path, $_SESSION[$this->_id], $default); } /** @@ -316,7 +316,7 @@ class ConfigFile */ public function getDefault($canonical_path, $default = null) { - return PMA_array_read($canonical_path, $this->cfg, $default); + return PMA_array_read($canonical_path, $this->_cfg, $default); } /** @@ -330,7 +330,7 @@ class ConfigFile */ public function getValue($path, $default = null) { - $v = PMA_array_read($path, $_SESSION[$this->id], null); + $v = PMA_array_read($path, $_SESSION[$this->_id], null); if ($v !== null) { return $v; } @@ -360,7 +360,7 @@ class ConfigFile */ public function getDbEntry($path, $default = null) { - return PMA_array_read($path, $this->cfgDb, $default); + return PMA_array_read($path, $this->_cfgDb, $default); } /** @@ -370,8 +370,8 @@ class ConfigFile */ public function getServerCount() { - return isset($_SESSION[$this->id]['Servers']) - ? count($_SESSION[$this->id]['Servers']) + return isset($_SESSION[$this->_id]['Servers']) + ? count($_SESSION[$this->_id]['Servers']) : 0; } @@ -382,8 +382,8 @@ class ConfigFile */ public function getServers() { - return isset($_SESSION[$this->id]['Servers']) - ? $_SESSION[$this->id]['Servers'] + return isset($_SESSION[$this->_id]['Servers']) + ? $_SESSION[$this->_id]['Servers'] : null; } @@ -396,7 +396,7 @@ class ConfigFile */ function getServerDSN($server) { - if (!isset($_SESSION[$this->id]['Servers'][$server])) { + if (!isset($_SESSION[$this->_id]['Servers'][$server])) { return ''; } @@ -430,7 +430,7 @@ class ConfigFile */ public function getServerName($id) { - if (!isset($_SESSION[$this->id]['Servers'][$id])) { + if (!isset($_SESSION[$this->_id]['Servers'][$id])) { return ''; } $verbose = $this->get("Servers/$id/verbose"); @@ -448,21 +448,21 @@ class ConfigFile */ public function removeServer($server) { - if (!isset($_SESSION[$this->id]['Servers'][$server])) { + if (!isset($_SESSION[$this->_id]['Servers'][$server])) { return; } $last_server = $this->getServerCount(); for ($i = $server; $i < $last_server; $i++) { - $_SESSION[$this->id]['Servers'][$i] - = $_SESSION[$this->id]['Servers'][$i + 1]; + $_SESSION[$this->_id]['Servers'][$i] + = $_SESSION[$this->_id]['Servers'][$i + 1]; } - unset($_SESSION[$this->id]['Servers'][$last_server]); + unset($_SESSION[$this->_id]['Servers'][$last_server]); - if (isset($_SESSION[$this->id]['ServerDefault']) - && $_SESSION[$this->id]['ServerDefault'] >= 0 + if (isset($_SESSION[$this->_id]['ServerDefault']) + && $_SESSION[$this->_id]['ServerDefault'] >= 0 ) { - unset($_SESSION[$this->id]['ServerDefault']); + unset($_SESSION[$this->_id]['ServerDefault']); } } @@ -488,8 +488,8 @@ class ConfigFile */ public function getConfig() { - $c = $_SESSION[$this->id]; - foreach ($this->cfgUpdateReadMapping as $map_to => $map_from) { + $c = $_SESSION[$this->_id]; + foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) { PMA_array_write($map_to, $c, PMA_array_read($map_from, $c)); PMA_array_remove($map_from, $c); } @@ -504,19 +504,19 @@ class ConfigFile public function getConfigArray() { $this->_flattenArrayResult = array(); - array_walk($_SESSION[$this->id], array($this, '_flattenArray'), ''); + array_walk($_SESSION[$this->_id], array($this, '_flattenArray'), ''); $c = $this->_flattenArrayResult; $this->_flattenArrayResult = null; $persistKeys = array_diff( - array_keys($this->persistKeys), + array_keys($this->_persistKeys), array_keys($c) ); foreach ($persistKeys as $k) { $c[$k] = $this->getDefault($k); } - foreach ($this->cfgUpdateReadMapping as $map_to => $map_from) { + foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) { if (!isset($c[$map_from])) { continue; } From 9dab21d83583c351b3787f6d813ca72bab57f6c3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:51:21 +0530 Subject: [PATCH 019/102] Add missing @return tags --- libraries/config/ConfigFile.class.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 50809fcf1c..e1245f28c8 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -129,6 +129,8 @@ class ConfigFile * they are set to their default values (use only full paths) * * @param array $keys + * + * @return void */ public function setPersistKeys($keys) { @@ -152,6 +154,8 @@ class ConfigFile * this method to set up a filter on {@link set()} method * * @param array|null $keys array of allowed keys or null to remove filter + * + * @return void */ public function setAllowedKeys($keys) { @@ -168,7 +172,10 @@ class ConfigFile * Sets path mapping for updating config in * {@link updateWithGlobalConfig()} or reading * by {@link getConfig()} or {@link getConfigArray()} - * @var array + * + * @param array + * + * @return void */ public function setCfgUpdateReadMapping(array $mapping) { @@ -177,6 +184,8 @@ class ConfigFile /** * Resets configuration data + * + * @return void */ public function resetConfigData() { @@ -187,6 +196,8 @@ class ConfigFile * Sets configuration data (overrides old data) * * @param array $cfg + * + * @return void */ public function setConfigData(array $cfg) { @@ -199,6 +210,8 @@ class ConfigFile * @param string $path * @param mixed $value * @param string $canonical_path + * + * @return void */ public function set($path, $value, $canonical_path = null) { @@ -240,6 +253,8 @@ class ConfigFile * @param mixed $value * @param mixed $key * @param mixed $prefix + * + * @return void */ private function _flattenArray($value, $key, $prefix) { @@ -271,6 +286,8 @@ class ConfigFile * (config will contain differences to defaults from config.defaults.php). * * @param array $cfg + * + * @return void */ public function updateWithGlobalConfig(array $cfg) { @@ -445,6 +462,8 @@ class ConfigFile * Removes server * * @param int $server + * + * @return void */ public function removeServer($server) { From 42f8613c0c4680976909de3b25192643b5072322 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:52:52 +0530 Subject: [PATCH 020/102] Wrap a long line --- libraries/config/ConfigFile.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index e1245f28c8..d3b2eeadbe 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -219,7 +219,9 @@ class ConfigFile $canonical_path = $this->getCanonicalPath($path); } // apply key whitelist - if ($this->_setFilter !== null && !isset($this->_setFilter[$canonical_path])) { + if ($this->_setFilter !== null + && ! isset($this->_setFilter[$canonical_path]) + ) { return; } // remove if the path isn't protected and it's empty or has a default From 3b7de22bdd7657908d0dd71fd488caed583305df Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:54:25 +0530 Subject: [PATCH 021/102] Fix indentation --- libraries/config/ConfigFile.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index d3b2eeadbe..887440b455 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -401,9 +401,9 @@ class ConfigFile */ public function getServers() { - return isset($_SESSION[$this->_id]['Servers']) - ? $_SESSION[$this->_id]['Servers'] - : null; + return isset($_SESSION[$this->_id]['Servers']) + ? $_SESSION[$this->_id]['Servers'] + : null; } /** From 9341f92d33e246ea5f9561cbc43c0b1399c080ba Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:56:36 +0530 Subject: [PATCH 022/102] Add param name in docs --- libraries/config/ConfigFile.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 887440b455..ea19fbd5b0 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -173,7 +173,7 @@ class ConfigFile * {@link updateWithGlobalConfig()} or reading * by {@link getConfig()} or {@link getConfigArray()} * - * @param array + * @param array $mapping * * @return void */ From 3957c093a4b83730491177b6c7f94af4cb4fee05 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 21:59:28 +0530 Subject: [PATCH 023/102] Prefix private instance variable with underscore --- libraries/config/Form.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php index f17c747e30..d82e66b69e 100644 --- a/libraries/config/Form.class.php +++ b/libraries/config/Form.class.php @@ -42,7 +42,7 @@ class Form * Caches field types, indexed by field names * @var array */ - private $fieldsTypes; + private $_fieldsTypes; /** * Constructor, reads default config values @@ -67,8 +67,8 @@ class Form public function getOptionType($option_name) { $key = ltrim(substr($option_name, strrpos($option_name, '/')), '/'); - return isset($this->fieldsTypes[$key]) - ? $this->fieldsTypes[$key] + return isset($this->_fieldsTypes[$key]) + ? $this->_fieldsTypes[$key] : null; } @@ -169,7 +169,7 @@ class Form } /** - * Reads fields' types to $this->fieldsTypes + * Reads fields' types to $this->_fieldsTypes * * @return void */ @@ -178,7 +178,7 @@ class Form $cf = ConfigFile::getInstance(); foreach ($this->fields as $name => $path) { if (strpos($name, ':group:') === 0) { - $this->fieldsTypes[$name] = 'group'; + $this->_fieldsTypes[$name] = 'group'; continue; } $v = $cf->getDbEntry($path); @@ -187,7 +187,7 @@ class Form } else { $type = gettype($cf->getDefault($path)); } - $this->fieldsTypes[$name] = $type; + $this->_fieldsTypes[$name] = $type; } } From 8b7318f0dbeb2175eac06c6a40835ad04bdb2820 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 22:08:59 +0530 Subject: [PATCH 024/102] Prefix private instance variable with underscore - more --- libraries/config/FormDisplay.class.php | 122 ++++++++++++------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index 6902dc235b..d61aab7e2b 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -29,7 +29,7 @@ class FormDisplay * Form list * @var Form[] */ - private $forms = array(); + private $_forms = array(); /** * Stores validation errors, indexed by paths @@ -37,49 +37,49 @@ class FormDisplay * [path] is a string storing error associated with single field * @var array */ - private $errors = array(); + private $_errors = array(); /** * Paths changed so that they can be used as HTML ids, indexed by paths * @var array */ - private $translated_paths = array(); + private $_translated_paths = array(); /** * Server paths change indexes so we define maps from current server * path to the first one, indexed by work path * @var array */ - private $system_paths = array(); + private $_system_paths = array(); /** * Language strings which will be sent to PMA_messages JS variable * Will be looked up in $GLOBALS: str{value} or strSetup{value} * @var array */ - private $js_lang_strings = array(); + private $_js_lang_strings = array(); /** * Tells whether forms have been validated * @var bool */ - private $is_validated = true; + private $_is_validated = true; /** * Dictionary with user preferences keys * @var array */ - private $userprefs_keys; + private $_userprefs_keys; /** * Dictionary with disallowed user preferences keys * @var array */ - private $userprefs_disallow; + private $_userprefs_disallow; public function __construct() { - $this->js_lang_strings = array( + $this->_js_lang_strings = array( 'error_nan_p' => __('Not a positive number'), 'error_nan_nneg' => __('Not a non-negative number'), 'error_incorrect_port' => __('Not a valid port number'), @@ -98,14 +98,14 @@ class FormDisplay */ public function registerForm($form_name, array $form, $server_id = null) { - $this->forms[$form_name] = new Form($form_name, $form, $server_id); - $this->is_validated = false; - foreach ($this->forms[$form_name]->fields as $path) { + $this->_forms[$form_name] = new Form($form_name, $form, $server_id); + $this->_is_validated = false; + foreach ($this->_forms[$form_name]->fields as $path) { $work_path = $server_id === null ? $path : str_replace('Servers/1/', "Servers/$server_id/", $path); - $this->system_paths[$work_path] = $path; - $this->translated_paths[$work_path] = str_replace('/', '-', $work_path); + $this->_system_paths[$work_path] = $path; + $this->_translated_paths[$work_path] = str_replace('/', '-', $work_path); } } @@ -125,8 +125,8 @@ class FormDisplay } // save forms - if (count($this->forms) > 0) { - return $this->save(array_keys($this->forms), $allow_partial_save); + if (count($this->_forms) > 0) { + return $this->save(array_keys($this->_forms), $allow_partial_save); } return false; } @@ -138,19 +138,19 @@ class FormDisplay */ private function _validate() { - if ($this->is_validated) { + if ($this->_is_validated) { return; } $cf = ConfigFile::getInstance(); $paths = array(); $values = array(); - foreach ($this->forms as $form) { + foreach ($this->_forms as $form) { /* @var $form Form */ $paths[] = $form->name; // collect values and paths foreach ($form->fields as $path) { - $work_path = array_search($path, $this->system_paths); + $work_path = array_search($path, $this->_system_paths); $values[$path] = $cf->getValue($work_path); $paths[] = $path; } @@ -161,18 +161,18 @@ class FormDisplay // change error keys from canonical paths to work paths if (is_array($errors) && count($errors) > 0) { - $this->errors = array(); + $this->_errors = array(); foreach ($errors as $path => $error_list) { - $work_path = array_search($path, $this->system_paths); + $work_path = array_search($path, $this->_system_paths); // field error if (!$work_path) { // form error, fix path $work_path = $path; } - $this->errors[$work_path] = $error_list; + $this->_errors[$work_path] = $error_list; } } - $this->is_validated = true; + $this->_is_validated = true; } /** @@ -189,14 +189,14 @@ class FormDisplay $js = array(); $js_default = array(); - $tabbed_form = $tabbed_form && (count($this->forms) > 1); + $tabbed_form = $tabbed_form && (count($this->_forms) > 1); $validators = PMA_config_get_validators(); display_form_top(); if ($tabbed_form) { $tabs = array(); - foreach ($this->forms as $form) { + foreach ($this->_forms as $form) { $tabs[$form->name] = PMA_lang("Form_$form->name"); } display_tabs_top($tabs); @@ -204,7 +204,7 @@ class FormDisplay // valdiate only when we aren't displaying a "new server" form $is_new_server = false; - foreach ($this->forms as $form) { + foreach ($this->_forms as $form) { /* @var $form Form */ if ($form->index === 0) { $is_new_server = true; @@ -219,13 +219,13 @@ class FormDisplay $this->_loadUserprefsInfo(); // display forms - foreach ($this->forms as $form) { + foreach ($this->_forms as $form) { /* @var $form Form */ $form_desc = isset($GLOBALS["strConfigForm_{$form->name}_desc"]) ? PMA_lang("Form_{$form->name}_desc") : ''; - $form_errors = isset($this->errors[$form->name]) - ? $this->errors[$form->name] : null; + $form_errors = isset($this->_errors[$form->name]) + ? $this->_errors[$form->name] : null; display_fieldset_top( PMA_lang("Form_$form->name"), $form_desc, @@ -234,12 +234,12 @@ class FormDisplay ); foreach ($form->fields as $field => $path) { - $work_path = array_search($path, $this->system_paths); - $translated_path = $this->translated_paths[$work_path]; + $work_path = array_search($path, $this->_system_paths); + $translated_path = $this->_translated_paths[$work_path]; // always true/false for user preferences display // otherwise null - $userprefs_allow = isset($this->userprefs_keys[$path]) - ? !isset($this->userprefs_disallow[$path]) + $userprefs_allow = isset($this->_userprefs_keys[$path]) + ? !isset($this->_userprefs_disallow[$path]) : null; // display input $this->_displayFieldInput( @@ -269,7 +269,7 @@ class FormDisplay if (!$js_lang_sent) { $js_lang_sent = true; $js_lang = array(); - foreach ($this->js_lang_strings as $strName => $strValue) { + foreach ($this->_js_lang_strings as $strName => $strValue) { $js_lang[] = "'$strName': '" . PMA_jsFormat($strValue, false) . '\''; } $js[] = "$.extend(PMA_messages, {\n\t" . implode(",\n\t", $js_lang) . '})'; @@ -324,8 +324,8 @@ class FormDisplay $opts['setvalue'] = $form->default[$system_path]; } - if (isset($this->errors[$work_path])) { - $opts['errors'] = $this->errors[$work_path]; + if (isset($this->_errors[$work_path])) { + $opts['errors'] = $this->_errors[$work_path]; } switch ($form->getOptionType($field)) { case 'string': @@ -411,13 +411,13 @@ class FormDisplay public function displayErrors() { $this->_validate(); - if (count($this->errors) == 0) { + if (count($this->_errors) == 0) { return; } - foreach ($this->errors as $system_path => $error_list) { - if (isset($this->system_paths[$system_path])) { - $path = $this->system_paths[$system_path]; + foreach ($this->_errors as $system_path => $error_list) { + if (isset($this->_system_paths[$system_path])) { + $path = $this->_system_paths[$system_path]; $name = PMA_lang_name($path); } else { $name = $GLOBALS["strConfigForm_$system_path"]; @@ -434,16 +434,16 @@ class FormDisplay public function fixErrors() { $this->_validate(); - if (count($this->errors) == 0) { + if (count($this->_errors) == 0) { return; } $cf = ConfigFile::getInstance(); - foreach (array_keys($this->errors) as $work_path) { - if (!isset($this->system_paths[$work_path])) { + foreach (array_keys($this->_errors) as $work_path) { + if (!isset($this->_system_paths[$work_path])) { continue; } - $canonical_path = $this->system_paths[$work_path]; + $canonical_path = $this->_system_paths[$work_path]; $cf->set($work_path, $cf->getDefault($canonical_path)); } } @@ -500,11 +500,11 @@ class FormDisplay $this->_loadUserprefsInfo(); } - $this->errors = array(); + $this->_errors = array(); foreach ($forms as $form_name) { /* @var $form Form */ - if (isset($this->forms[$form_name])) { - $form = $this->forms[$form_name]; + if (isset($this->_forms[$form_name])) { + $form = $this->_forms[$form_name]; } else { continue; } @@ -514,8 +514,8 @@ class FormDisplay : false; // grab POST values foreach ($form->fields as $field => $system_path) { - $work_path = array_search($system_path, $this->system_paths); - $key = $this->translated_paths[$work_path]; + $work_path = array_search($system_path, $this->_system_paths); + $key = $this->_translated_paths[$work_path]; $type = $form->getOptionType($field); // skip groups @@ -529,7 +529,7 @@ class FormDisplay if ($type == 'boolean') { $_POST[$key] = false; } else { - $this->errors[$form->name][] = sprintf( + $this->_errors[$form->name][] = sprintf( __('Missing data for %s'), '' . PMA_lang_name($system_path) . '' ); @@ -539,13 +539,13 @@ class FormDisplay } // user preferences allow/disallow - if ($is_setup_script && isset($this->userprefs_keys[$system_path])) { - if (isset($this->userprefs_disallow[$system_path]) + if ($is_setup_script && isset($this->_userprefs_keys[$system_path])) { + if (isset($this->_userprefs_disallow[$system_path]) && isset($_POST[$key . '-userprefs-allow']) ) { - unset($this->userprefs_disallow[$system_path]); + unset($this->_userprefs_disallow[$system_path]); } else if (!isset($_POST[$key . '-userprefs-allow'])) { - $this->userprefs_disallow[$system_path] = true; + $this->_userprefs_disallow[$system_path] = true; } } @@ -574,7 +574,7 @@ class FormDisplay $form->getOptionValueList($system_path) ); if (! $successfully_validated) { - $this->errors[$work_path][] = __('Incorrect value'); + $this->_errors[$work_path][] = __('Incorrect value'); $result = false; continue; } @@ -611,7 +611,7 @@ class FormDisplay } // save forms - if ($allow_partial_save || empty($this->errors)) { + if ($allow_partial_save || empty($this->_errors)) { foreach ($to_save as $work_path => $path) { // TrustedProxies requires changes before saving if ($path == 'TrustedProxies') { @@ -637,7 +637,7 @@ class FormDisplay $cf->set($work_path, $values[$path], $path); } if ($is_setup_script) { - $cf->set('UserprefsDisallow', array_keys($this->userprefs_disallow)); + $cf->set('UserprefsDisallow', array_keys($this->_userprefs_disallow)); } } @@ -654,7 +654,7 @@ class FormDisplay */ public function hasErrors() { - return count($this->errors) > 0; + return count($this->_errors) > 0; } @@ -722,13 +722,13 @@ class FormDisplay */ private function _loadUserprefsInfo() { - if ($this->userprefs_keys === null) { - $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames()); + if ($this->_userprefs_keys === null) { + $this->_userprefs_keys = array_flip(PMA_read_userprefs_fieldnames()); // read real config for user preferences display $userprefs_disallow = defined('PMA_SETUP') ? ConfigFile::getInstance()->get('UserprefsDisallow', array()) : $GLOBALS['cfg']['UserprefsDisallow']; - $this->userprefs_disallow = array_flip($userprefs_disallow); + $this->_userprefs_disallow = array_flip($userprefs_disallow); } } From ad3e021958d5a5f8a9c926e81a763f8c1d5f0b91 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 16 May 2012 22:13:37 +0530 Subject: [PATCH 025/102] Various CheckStyle fixes --- libraries/config/FormDisplay.class.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index d61aab7e2b..09bfd753f0 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -22,6 +22,8 @@ require_once './libraries/js_escape.lib.php'; /** * Form management class, displays and processes forms + * + * @package PhpMyAdmin */ class FormDisplay { @@ -77,6 +79,9 @@ class FormDisplay */ private $_userprefs_disallow; + /** + * Constructor + */ public function __construct() { $this->_js_lang_strings = array( @@ -95,6 +100,8 @@ class FormDisplay * @param string $form_name * @param array $form * @param int $server_id 0 if new server, validation; >= 1 if editing a server + * + * @return void */ public function registerForm($form_name, array $form, $server_id = null) { @@ -539,7 +546,9 @@ class FormDisplay } // user preferences allow/disallow - if ($is_setup_script && isset($this->_userprefs_keys[$system_path])) { + if ($is_setup_script + && isset($this->_userprefs_keys[$system_path]) + ) { if (isset($this->_userprefs_disallow[$system_path]) && isset($_POST[$key . '-userprefs-allow']) ) { @@ -637,7 +646,10 @@ class FormDisplay $cf->set($work_path, $values[$path], $path); } if ($is_setup_script) { - $cf->set('UserprefsDisallow', array_keys($this->_userprefs_disallow)); + $cf->set( + 'UserprefsDisallow', + array_keys($this->_userprefs_disallow) + ); } } From 6130edd505e76cc515a1d2afe16bf7e7350e0ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Lewandowski?= Date: Wed, 16 May 2012 21:31:59 +0200 Subject: [PATCH 026/102] Feature Requests item #3300418: Fast database search. --- js/navigation.js | 57 +++++++++++++++++++++ libraries/config.default.php | 8 +++ libraries/config/messages.inc.php | 1 + libraries/config/user_preferences.forms.php | 1 + navigation.php | 11 ++++ themes/original/css/theme_left.css.php | 12 +++-- themes/pmahomme/css/theme_left.css.php | 9 ++-- 7 files changed, 92 insertions(+), 7 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 843a998675..cd65e595d8 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -202,6 +202,37 @@ function clear_fast_filter() fast_filter(''); } +/** + * hide all LI elements with second A tag which doesn`t contain requested value + * + * @param string value requested value + * + */ +function fast_db_filter(value) +{ + var lowercase_value = value.toLowerCase(); + + $('#databaseList li a').each(function(idx, elem) { + var $elem = $(elem); + if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) { + $elem.parent().hide(); + } else { + $elem.parents('li').show(); + } + }); + +} + +/** + * Clears fast database filter. + */ +function clear_fast_db_filter() +{ + var $elm = $('#fast_db_filter'); + $elm.val(''); + fast_db_filter(''); +} + /** * Reloads the recent tables list. */ @@ -251,6 +282,32 @@ $(function(){ } }); + /* Fast database filter */ + var txtDb = $('#fast_db_filter').val(); + + $('#fast_db_filter.gray').live('focus', function() { + $(this).removeClass('gray'); + clear_fast_db_filter(); + }); + + $('#fast_db_filter:not(.gray)').live('focusout', function() { + var $input = $(this); + if ($input.val() == '') { + $input + .addClass('gray') + .val(txtDb); + } + }); + + $('#clear_fast_db_filter').click(function() { + clear_fast_db_filter(); + $('#fast_db_filter').focus(); + }); + + $('#fast_db_filter').keyup(function(evt) { + fast_db_filter($(this).val()); + }); + /* Jump to recent table */ $('#recentTable').change(function() { if (this.value != '') { diff --git a/libraries/config.default.php b/libraries/config.default.php index b68c175ab8..1f7bf196f6 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -883,6 +883,14 @@ $cfg['DisplayServersList'] = false; */ $cfg['DisplayDatabasesList'] = 'auto'; +/** + * display a JavaScript database filter in the left frame + * when more then x databases are present + * + * @global boolean $cfg['LeftDisplayDatabaseFilterMinimum'] + */ +$cfg['LeftDisplayDatabaseFilterMinimum'] = 30; + /** * target of the navigation panel quick access icon * diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 61d1698bea..8f3a7df878 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -278,6 +278,7 @@ $strConfigLeftDisplayLogo_name = __('Display logo'); $strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame'); $strConfigLeftDisplayServers_name = __('Display servers selection'); $strConfigLeftDisplayTableFilterMinimum_name = __('Minimum number of tables to display the table filter box'); +$strConfigLeftDisplayDatabaseFilterMinimum_name = __('Minimum number of databases to display the database filter box'); $strConfigLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels'); $strConfigLeftFrameDBSeparator_name = __('Database tree separator'); $strConfigLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)'); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 600099cf4b..308a222c73 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -84,6 +84,7 @@ $forms['Left_frame']['Left_frame'] = array( 'LeftPointerEnable', 'LeftRecentTable'); $forms['Left_frame']['Left_databases'] = array( + 'LeftDisplayDatabaseFilterMinimum', 'DisplayDatabasesList', 'LeftFrameDBTree', 'LeftFrameDBSeparator', diff --git a/navigation.php b/navigation.php index 46f68af7da..7694ae5d2a 100644 --- a/navigation.php +++ b/navigation.php @@ -201,8 +201,19 @@ if (! $GLOBALS['server']) { .'' . "\n" . '' . "\n"; } else { + + if (count($GLOBALS['pma']->databases) >= $GLOBALS['cfg']['LeftDisplayDatabaseFilterMinimum']) { + ?> + + X + + + databases->getHtmlListGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n"; } + $_url_params = array('pos' => $pos); PMA_listNavigator(count($GLOBALS['pma']->databases), $pos, $_url_params, 'navigation.php', 'frame_navigation', $GLOBALS['cfg']['MaxDbList']); } diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 6591139871..4a593e2cb1 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -232,7 +232,8 @@ div#left_tableList ul ul { display: none; } -#clear_fast_filter { +#clear_fast_filter, +#clear_fast_db_filter { background: white; color: black; cursor: pointer; @@ -242,13 +243,16 @@ div#left_tableList ul ul { float: right; } -#fast_filter { +#fast_filter, +#fast_db_filter { width: 100%; padding: 2px 0; margin: 0; border: 0; } -#fast_filter.gray { +#fast_filter.gray, +#fast_db_fiter.gray { color: gray; -} \ No newline at end of file +} + diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 6873681895..92f64b0c9a 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -292,7 +292,8 @@ div#left_tableList ul ul { display: none; } -#clear_fast_filter { +#clear_fast_filter, +#clear_fast_db_filter { background: white; color: black; cursor: pointer; @@ -302,11 +303,13 @@ div#left_tableList ul ul { right: 3ex; } -#fast_filter { +#fast_filter, +#fast_db_filter { width: 85%; padding: .1em; } -#fast_filter.gray { +#fast_filter.gray, +#fast_db_filter.gray { color: gray; } From 37820c842f4e6316f6bd2e941f14ff1310e021de Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 May 2012 06:27:08 +0530 Subject: [PATCH 027/102] Adjust docs to match their new return types --- libraries/common.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5ffca0375a..1584dadceb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1370,11 +1370,11 @@ function PMA_profilingSupported() } /** - * Displays a form with the Profiling checkbox + * Returns HTML for the form with the Profiling checkbox * * @param string $sql_query sql query * - * @return void + * @return string HTML for the form with the Profiling checkbox * * @access public */ @@ -2599,14 +2599,14 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) } /** - * Generates and echoes an HTML checkbox + * Returns an HTML checkbox * * @param string $html_field_name the checkbox HTML field * @param string $label label for checkbox * @param boolean $checked is it initially checked? * @param boolean $onclick should it submit the form on click? * - * @return void + * @return string HTML for the checkbox */ function PMA_getCheckbox($html_field_name, $label, $checked, $onclick) { From 76cde00adcfe5f62db9129a8414d26190851b538 Mon Sep 17 00:00:00 2001 From: Frman Husein Date: Thu, 17 May 2012 02:58:25 +0200 Subject: [PATCH 028/102] Translated using Weblate. --- po/ckb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 85d1039ea5..c25069116f 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-16 12:10+0200\n" -"Last-Translator: Aso Naderi \n" +"PO-Revision-Date: 2012-05-16 23:18+0200\n" +"Last-Translator: Frman Husein \n" "Language-Team: none\n" "Language: ckb\n" "MIME-Version: 1.0\n" @@ -130,7 +130,7 @@ msgstr "تێبینیەکانی خشتە" #: tbl_relation.php:401 tbl_tracking.php:303 tbl_tracking.php:369 #: tbl_zoom_select.php:428 msgid "Column" -msgstr "خانە" +msgstr "ستون" #: db_datadict.php:164 db_printview.php:104 libraries/Index.class.php:458 #: libraries/db_structure.lib.php:46 libraries/export/htmlword.php:248 @@ -235,7 +235,7 @@ msgstr "بەڵێ" #: db_export.php:26 msgid "View dump (schema) of database" -msgstr "" +msgstr "نیشاندانى بۆشایى (هێڵکارى) لە بنکەى دراوە" #: db_export.php:30 db_printview.php:95 db_qbe.php:104 db_tracking.php:47 #: export.php:374 navigation.php:287 From 056eaed7b9ff552031f459206bb1f5fb4c3e3191 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 17 May 2012 06:36:09 +0530 Subject: [PATCH 029/102] Add spaces after exclamation marks --- libraries/common.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1584dadceb..d9de2abee9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -953,7 +953,7 @@ function PMA_reloadNavigation($jsonly = false) '', '&' ); - if (!$jsonly) { + if (! $jsonly) { echo '' . PHP_EOL; } @@ -1869,7 +1869,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $displayed_message = ''; // Add text if not already added if (stristr($message, ''; } else { echo '