Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Madhura Jayaratne
commit
d3e642ca20
@ -577,24 +577,27 @@ class DisplayResults
|
||||
|
||||
/**
|
||||
* Defines the parts to display for the results of a SQL query
|
||||
* and the total number of rows
|
||||
*
|
||||
* @param array $displayParts the parts to display (see a few
|
||||
* lines above for explanations)
|
||||
* @param integer &$the_total the total number of rows returned by the SQL
|
||||
* query without any programmatically appended
|
||||
* LIMIT clause
|
||||
* (just a copy of $unlim_num_rows if it exists,
|
||||
* elsecomputed inside this function)
|
||||
* @param array $displayParts the parts to display (see a few
|
||||
* lines above for explanations)
|
||||
*
|
||||
* @return array the first element is an array with explicit indexes
|
||||
* for all the display elements
|
||||
* the second element is the total number of rows returned
|
||||
* by the SQL query without any programmatically appended
|
||||
* LIMIT clause (just a copy of $unlim_num_rows if it exists,
|
||||
* else computed inside this function)
|
||||
*
|
||||
* @return array an array with explicit indexes for all the display
|
||||
* elements
|
||||
*
|
||||
* @access private
|
||||
*
|
||||
* @see getTable()
|
||||
*/
|
||||
private function _setDisplayParts($displayParts, &$the_total)
|
||||
private function _setDisplayPartsAndTotal($displayParts)
|
||||
{
|
||||
$the_total = 0;
|
||||
|
||||
// 1. Following variables are needed for use in isset/empty or
|
||||
// use with array indexes or safe use in foreach
|
||||
$db = $this->__get('db');
|
||||
@ -653,9 +656,9 @@ class DisplayResults
|
||||
}
|
||||
} // end if (3)
|
||||
|
||||
return $displayParts;
|
||||
return array($displayParts, $the_total);
|
||||
|
||||
} // end of the 'setDisplayParts()' function
|
||||
} // end of the 'setDisplayPartsAndTotal()' function
|
||||
|
||||
|
||||
/**
|
||||
@ -4254,8 +4257,11 @@ class DisplayResults
|
||||
|
||||
// 1.1 Gets the information about which functionalities should be
|
||||
// displayed
|
||||
$total = '';
|
||||
$displayParts = $this->_setDisplayParts($displayParts, $total);
|
||||
|
||||
list(
|
||||
$displayParts,
|
||||
$total
|
||||
) = $this->_setDisplayPartsAndTotal($displayParts);
|
||||
|
||||
// 1.2 Defines offsets for the next and previous pages
|
||||
if ($displayParts['nav_bar'] == '1') {
|
||||
|
||||
18
po/ia.po
18
po/ia.po
@ -8,10 +8,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2015-10-26 20:01-0400\n"
|
||||
"PO-Revision-Date: 2015-10-23 17:02+0200\n"
|
||||
"PO-Revision-Date: 2015-11-02 15:02+0200\n"
|
||||
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
|
||||
"Language-Team: Interlingua <https://hosted.weblate.org/projects/phpmyadmin/"
|
||||
"master/ia/>\n"
|
||||
"Language-Team: Interlingua "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/ia/>\n"
|
||||
"Language: ia\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -9111,14 +9111,13 @@ msgid "Edit next row"
|
||||
msgstr "Modifica nove rango"
|
||||
|
||||
#: libraries/insert_edit.lib.php:1541
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
|
||||
msgid ""
|
||||
"Use TAB key to move from value to value, or CTRL+arrows to move anywhere."
|
||||
msgstr ""
|
||||
"Usa le clave TAB pro mover de valor a valor, o CTRL+flechas pro mover lo "
|
||||
"ubique"
|
||||
"ubique."
|
||||
|
||||
#: libraries/insert_edit.lib.php:1578 libraries/replication_gui.lib.php:546
|
||||
#: libraries/rte/rte_routines.lib.php:1585
|
||||
@ -9467,10 +9466,10 @@ msgid "Invalid class name \"%1$s\", using default of \"Node\""
|
||||
msgstr "Invalide nomine de classe \"%1$s\", on usa le predefinite per \"Node\""
|
||||
|
||||
#: libraries/navigation/NodeFactory.php:63
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid "Could not add columns!"
|
||||
msgid "Could not load class \"%1$s\""
|
||||
msgstr "Il non pote adder columnas!"
|
||||
msgstr "Il non pote adder classe \"%1$s\""
|
||||
|
||||
#: libraries/navigation/nodes/Node.php:803
|
||||
msgid "Expand/Collapse"
|
||||
@ -9588,7 +9587,6 @@ msgstr ""
|
||||
"Monstra a me le lista central de columnas que non es preste in iste tabella"
|
||||
|
||||
#: libraries/normalization.lib.php:151
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Select a column which can be split into more than one. (on select of 'no "
|
||||
#| "such column', it'll move to next step)"
|
||||
@ -9596,8 +9594,8 @@ msgid ""
|
||||
"Select a column which can be split into more than one (on select of 'no such "
|
||||
"column', it'll move to next step)."
|
||||
msgstr ""
|
||||
"Selige un columna que pote esser dividite in plus que un. (si on selige "
|
||||
"'necun tal columna', on movera al proxime passo)"
|
||||
"Selige un columna que pote esser dividite in plus que un (si on selige "
|
||||
"'necun tal columna', on movera al proxime passo)."
|
||||
|
||||
#: libraries/normalization.lib.php:158 normalization.php:17
|
||||
msgid "Select one…"
|
||||
|
||||
14
po/zh_CN.po
14
po/zh_CN.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2015-10-26 20:01-0400\n"
|
||||
"PO-Revision-Date: 2015-10-30 08:36+0200\n"
|
||||
"Last-Translator: disorderman <disorderman@qq.com>\n"
|
||||
"PO-Revision-Date: 2015-11-02 02:33+0200\n"
|
||||
"Last-Translator: San <zhujunsan@gmail.com>\n"
|
||||
"Language-Team: Chinese (China) "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/zh_CN/>\n"
|
||||
"Language: zh_CN\n"
|
||||
@ -7269,7 +7269,6 @@ msgid "Show field types"
|
||||
msgstr "显示字段类型"
|
||||
|
||||
#: libraries/config/messages.inc.php:868
|
||||
#, fuzzy
|
||||
#| msgid "Display the function fields in edit/insert mode"
|
||||
msgid "Display the function fields in edit/insert mode."
|
||||
msgstr "在编辑/插入模式中显示函数列."
|
||||
@ -7488,9 +7487,8 @@ msgid "Proxy username"
|
||||
msgstr "代理用户名"
|
||||
|
||||
#: libraries/config/messages.inc.php:973
|
||||
#, fuzzy
|
||||
msgid "The password for authenticating with the proxy."
|
||||
msgstr "代理密码。"
|
||||
msgstr "代理服务的密码."
|
||||
|
||||
#: libraries/config/messages.inc.php:974
|
||||
msgid "Proxy password"
|
||||
@ -16466,7 +16464,6 @@ msgid "Too many connections are aborted."
|
||||
msgstr "太多连接已中止。"
|
||||
|
||||
#: libraries/advisory_rules.txt:396 libraries/advisory_rules.txt:403
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Connections are usually aborted when they cannot be authorized. <a href="
|
||||
#| "\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-"
|
||||
@ -16477,9 +16474,8 @@ msgid ""
|
||||
"\"http://www.percona.com/blog/2008/08/23/how-to-track-down-the-source-of-"
|
||||
"aborted_connects/\">This article</a> might help you track down the source."
|
||||
msgstr ""
|
||||
"连接通常因为无法被授权而中止。<a href=\"http://www.mysqlperformanceblog."
|
||||
"com/2008/08/23/how-to-track-down-the-source-of-aborted_connects/\">这篇文章</"
|
||||
"a>对您追踪来源可能有所帮助。"
|
||||
"连接通常因为无法被授权而中止。<a href=\"http://www.percona.com/blog/2008/08/23/how-to-track-"
|
||||
"down-the-source-of-aborted_connects/\">这篇文章</a>对您追踪来源可能有所帮助。"
|
||||
|
||||
#: libraries/advisory_rules.txt:397
|
||||
#, php-format
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
