Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
This commit is contained in:
Madhura Jayaratne
commit
15c19a3b31
@ -66,6 +66,9 @@ explanation
|
||||
+ rfe #1441 Add regexp match when using AllowArbitraryServer
|
||||
|
||||
4.3.13.0 (not yet released)
|
||||
- bug #4803 "Show hidden items" is sometimes hidden
|
||||
- bug #4807 Breaks when sorting by multiple columns while using UNION
|
||||
- bug #4798 Missing column when exporting in sql
|
||||
|
||||
4.3.12.0 (2015-03-14)
|
||||
- bug #4746 Right-aligned columns have left-aligned header
|
||||
|
||||
@ -1981,7 +1981,10 @@ class PMA_DisplayResults
|
||||
if (/*overload*/mb_strpos($name_to_use_in_sort, '(') !== false) {
|
||||
$sort_order .= $query_head . $name_to_use_in_sort . ' ' ;
|
||||
} else {
|
||||
$sort_order .= $query_head . $sort_tbl_new . "."
|
||||
if (/*overload*/mb_strlen($sort_tbl_new) > 0) {
|
||||
$sort_tbl_new .= ".";
|
||||
}
|
||||
$sort_order .= $query_head . $sort_tbl_new
|
||||
. PMA_Util::backquote(
|
||||
$name_to_use_in_sort
|
||||
) . ' ' ;
|
||||
|
||||
@ -741,6 +741,13 @@ class PMA_NavigationTree
|
||||
$keySeparatorLength
|
||||
)
|
||||
);
|
||||
|
||||
if ($new_child instanceof Node_Database
|
||||
&& $child->getHiddenCount() > 0
|
||||
) {
|
||||
$new_child->setHiddenCount($child->getHiddenCount());
|
||||
}
|
||||
|
||||
$new_child->real_name = $child->real_name;
|
||||
$new_child->icon = $child->icon;
|
||||
$new_child->links = $child->links;
|
||||
|
||||
@ -648,6 +648,16 @@ class Node_Database extends Node
|
||||
{
|
||||
$this->_hiddenCount = $count;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of hidden items in this database
|
||||
*
|
||||
* @return int hidden item count
|
||||
*/
|
||||
public function getHiddenCount()
|
||||
{
|
||||
return $this->_hiddenCount;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
@ -1374,9 +1374,10 @@ class ExportSql extends ExportPlugin
|
||||
// lets find first line with constraints
|
||||
$first_occur = -1;
|
||||
for ($i = 0; $i < $sql_count; $i++) {
|
||||
$sql_line = current(explode(' COMMENT ', $sql_lines[$i], 2));
|
||||
if (preg_match(
|
||||
'@[\s]+(CONSTRAINT|KEY)@',
|
||||
$sql_lines[$i]
|
||||
$sql_line
|
||||
) && $first_occur == -1) {
|
||||
$first_occur = $i;
|
||||
}
|
||||
|
||||
41
po/da.po
41
po/da.po
@ -4,14 +4,14 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-03-06 08:15-0500\n"
|
||||
"PO-Revision-Date: 2015-02-25 06:28+0200\n"
|
||||
"Last-Translator: Aputsiaĸ Niels Janussen <aj@isit.gl>\n"
|
||||
"Language-Team: Danish <https://hosted.weblate.org/projects/phpmyadmin/master/"
|
||||
"da/>\n"
|
||||
"PO-Revision-Date: 2015-03-16 19:34+0200\n"
|
||||
"Last-Translator: Jonas <jonas.den.smarte@gmail.com>\n"
|
||||
"Language-Team: Danish "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/4-4/da/>\n"
|
||||
"Language: da\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: da\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 2.3-dev\n"
|
||||
|
||||
@ -820,7 +820,6 @@ msgid "List of changes"
|
||||
msgstr "Liste over ændringer"
|
||||
|
||||
#: index.php:447
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Your configuration file contains settings (root with no password) that "
|
||||
#| "correspond to the default MySQL privileged account. Your MySQL server is "
|
||||
@ -832,10 +831,11 @@ msgid ""
|
||||
"default, is open to intrusion, and you really should fix this security hole "
|
||||
"by setting a password for user 'root'."
|
||||
msgstr ""
|
||||
"Din konfigurationsfil indeholder indstillinger (root og ingen adgangskode) "
|
||||
"som svarer til en standard MySQL-priviligeret brugerkonto. Din MySQL server "
|
||||
"kører med denne standardindstilling, <u>er åben for indtrængen</u>, og du "
|
||||
"opfordres stærkt til at gøre noget ved dette sikkerhedshul."
|
||||
"Du er tilsluttet som \"root\" med intet kodeord, som svarer til en standard "
|
||||
"MySQL-priviligeret brugerkonto. Din MySQL server kører med denne "
|
||||
"standardindstilling, er åben for indtrængen, og du opfordres stærkt til at "
|
||||
"gøre noget ved dette sikkerhedshul, ved at sætte et kodeord til brugeren \""
|
||||
"root\"."
|
||||
|
||||
#: index.php:464
|
||||
msgid ""
|
||||
@ -1838,7 +1838,7 @@ msgstr "Bladre i fremmedværdier"
|
||||
|
||||
#: js/messages.php:308
|
||||
msgid "No auto-saved query"
|
||||
msgstr ""
|
||||
msgstr "Ingen automatisk gemt forespørgsel"
|
||||
|
||||
#: js/messages.php:311 libraries/normalization.lib.php:849
|
||||
msgid "Pick"
|
||||
@ -2118,6 +2118,8 @@ msgid ""
|
||||
"Indicates that you have made changes to this page; you will be prompted for "
|
||||
"confirmation before abandoning changes"
|
||||
msgstr ""
|
||||
"Indikerer at du har lavet ændringer ved denne side, du vil blive spurgt om "
|
||||
"godkendelse før ændringerne frafalder"
|
||||
|
||||
#: js/messages.php:409
|
||||
msgid "Select referenced key"
|
||||
@ -4768,10 +4770,9 @@ msgid "Length/Values"
|
||||
msgstr "Længde/Værdi*"
|
||||
|
||||
#: libraries/central_columns.lib.php:670
|
||||
#, fuzzy
|
||||
#| msgid "Attributes"
|
||||
msgid "Attribute"
|
||||
msgstr "Attributter"
|
||||
msgstr "Attribut"
|
||||
|
||||
#: libraries/central_columns.lib.php:674
|
||||
#: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:974
|
||||
@ -5112,7 +5113,7 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters."
|
||||
msgstr "Nøglen bør indeholde bogstaver, numre [em]og[/em] specialtegn."
|
||||
|
||||
#: libraries/config/ServerConfigChecks.class.php:371
|
||||
#, fuzzy, php-format
|
||||
#, php-format
|
||||
#| msgid ""
|
||||
#| "This %soption%s should be disabled as it allows attackers to bruteforce "
|
||||
#| "login to any MySQL server. If you feel this is necessary, use %strusted "
|
||||
@ -5128,7 +5129,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Denne %soption%s bør deaktiveres, da den tillader angribere at lave et "
|
||||
"bruteforce login til en vilkårlig MySQL server. Hvis du føler, at dette er "
|
||||
"nødvendigt, brug %strusted proxies list%s. IP-baseret beskyttelse er næppe "
|
||||
"nødvendigt, brug %srestrict login to MySQL server%s eller %strusted proxies "
|
||||
"list%s. IP-baseret beskyttelse med en tiltroet proxyliste er næppe "
|
||||
"pålidelig, hvis din IP-adresse hører til en udbyder med mange tusinde "
|
||||
"brugere."
|
||||
|
||||
@ -5318,10 +5320,9 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:25
|
||||
#, fuzzy
|
||||
#| msgid "Cannot log in to the MySQL server"
|
||||
msgid "Restrict login to MySQL server"
|
||||
msgstr "Kan ikke logge ind på MySQL-serveren"
|
||||
msgstr "Begræns login på MySQL-serveren"
|
||||
|
||||
#: libraries/config/messages.inc.php:27
|
||||
msgid ""
|
||||
@ -9735,10 +9736,9 @@ msgid "Please enter correct captcha!"
|
||||
msgstr "Angiv venligst korrekt captcha!"
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:422
|
||||
#, fuzzy
|
||||
#| msgid "Cannot log in to the MySQL server"
|
||||
msgid "You are not allowed to log in to this MySQL server!"
|
||||
msgstr "Kan ikke logge ind på MySQL-serveren"
|
||||
msgstr "Du har ikke tilladelse til at logge ind på denne MySQL server!"
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationHttp.class.php:91
|
||||
msgid "Wrong username/password. Access denied."
|
||||
@ -11754,10 +11754,9 @@ msgstr "Brugergruppe"
|
||||
|
||||
#: libraries/server_privileges.lib.php:726
|
||||
#: libraries/server_privileges.lib.php:837
|
||||
#, fuzzy
|
||||
#| msgid "Persistent connections"
|
||||
msgid "Requires SSL-encrypted connections."
|
||||
msgstr "Vedvarende forbindelser"
|
||||
msgstr "Kræver SSL-krypterede forbindelser."
|
||||
|
||||
#: libraries/server_privileges.lib.php:734
|
||||
msgid "Require SSL"
|
||||
|
||||
9
po/ia.po
9
po/ia.po
@ -8,7 +8,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-03-06 08:15-0500\n"
|
||||
"PO-Revision-Date: 2015-03-09 15:46+0200\n"
|
||||
"PO-Revision-Date: 2015-03-15 22:07+0200\n"
|
||||
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
|
||||
"Language-Team: Interlingua "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/4-4/ia/>\n"
|
||||
@ -4914,6 +4914,10 @@ msgid ""
|
||||
"setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is "
|
||||
"currently using the default time zone of the database server."
|
||||
msgstr ""
|
||||
"Incapace a usar fuso horari %1$s pro servitor %2$d. Pro verifica tu "
|
||||
"preferentias de configuration per "
|
||||
"[em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin es "
|
||||
"currentemente usante le fuso horari predefinite de servitor de base de datos."
|
||||
|
||||
#: libraries/common.inc.php:1020
|
||||
#, php-format
|
||||
@ -5378,6 +5382,9 @@ msgid ""
|
||||
"MySQL server is enabled by matching the IP or hostname of the MySQL server "
|
||||
"to the given regular expression."
|
||||
msgstr ""
|
||||
"Il restringe le servitores de MySQL que le usator pote insertar quando un "
|
||||
"accesso a un servitor MySQL arbitrari es habilitate per equalar le IP o le "
|
||||
"nomine de hospite del servitor MySQL a le date expression regular."
|
||||
|
||||
#: libraries/config/messages.inc.php:25
|
||||
msgid "Restrict login to MySQL server"
|
||||
|
||||
22
po/nl.po
22
po/nl.po
@ -4,14 +4,14 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-03-06 08:15-0500\n"
|
||||
"PO-Revision-Date: 2015-03-05 21:47+0200\n"
|
||||
"Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
|
||||
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/4-4/nl/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2015-03-16 17:37+0200\n"
|
||||
"Last-Translator: dingo thirteen <dingo13@gmail.com>\n"
|
||||
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/4-4/nl/>"
|
||||
"\n"
|
||||
"Language: nl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: nl\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 2.3-dev\n"
|
||||
|
||||
@ -826,7 +826,6 @@ msgid "List of changes"
|
||||
msgstr "Lijst met wijzigingen"
|
||||
|
||||
#: index.php:447
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Your configuration file contains settings (root with no password) that "
|
||||
#| "correspond to the default MySQL privileged account. Your MySQL server is "
|
||||
@ -838,10 +837,10 @@ msgid ""
|
||||
"default, is open to intrusion, and you really should fix this security hole "
|
||||
"by setting a password for user 'root'."
|
||||
msgstr ""
|
||||
"Uw configuratiebestand bevat instellingen (root zonder wachtwoord) die "
|
||||
"betrekking hebben tot het standaard MySQL-account. Uw MySQL-server draait "
|
||||
"met deze standaardwaarden, en is open voor ongewilde toegang. Het wordt "
|
||||
"aangeraden dit op te lossen."
|
||||
"U bent verbonden als 'root' zonder wachtwoord dit is het standaard MySQL "
|
||||
"beheerdersaccount. Uw MySQL-server draait met deze standaard instellingen en "
|
||||
"is open voor ongewilde toegang. U moet dit beveiligingslek echt dichten door "
|
||||
"een wachtwoord in te stellen voor gebruiker 'root'."
|
||||
|
||||
#: index.php:464
|
||||
msgid ""
|
||||
@ -11890,11 +11889,10 @@ msgstr "Vereist SSL"
|
||||
|
||||
#: libraries/server_privileges.lib.php:759
|
||||
#: libraries/server_privileges.lib.php:768
|
||||
#, fuzzy
|
||||
#| msgid "Requires that a specific cipher method be used for a connection."
|
||||
msgid "Requires that a specific cipher method be used for a connection."
|
||||
msgstr ""
|
||||
"Vereist dat een specifieke versleutel methode wordt gebruikt voor een "
|
||||
"Vereist dat een specifieke versleutelmethode wordt gebruikt voor een "
|
||||
"connectie."
|
||||
|
||||
#: libraries/server_privileges.lib.php:778
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
