Merge branch 'master' into master-security

ChangeLog

@@ -37,6 +37,7 @@ phpMyAdmin - ChangeLog
 - issue #12303 Avoid typecasting to float when not needed
 - issue #12425 Duplicate message variable names in messages.inc.php
 - issue #12399 Adding index to table shows wrong top navigation
+- issue #12424 Fixed password change on MariaDB without auth plugin
 
 4.6.3 (2016-06-23)
 - issue #12249 Fixed cookie path on Windows

doc/config.rst

@@ -1585,7 +1585,7 @@ Generic settings
 
         This is not a security measure as there will be always ways to
         circumvent this. If you want to prohibit users from dropping databases,
-        revoke them corresponding DROP privilege.
+        revoke their corresponding DROP privilege.
 
     Defines whether normal users (non-administrator) are allowed to delete
     their own database or not. If set as false, the link :guilabel:`Drop
@@ -2764,7 +2764,7 @@ webserver. If you cannot avoid having this directory published by webserver,
 limit access to it either by web server configuration (for example using
 .htaccess or web.config files) or place at least an empty :file:`index.html`
 file there, so that directory listing is not possible. However as long as the
-directory is accessible by web server, attacker can guess filenames to download
+directory is accessible by web server, an attacker can guess filenames to download
 the files.
 
 .. config:option:: $cfg['UploadDir']
@@ -2792,7 +2792,7 @@ the files.
     .. warning::
 
         Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make it's usage secure.
+        to setup this directory and how to make its usage secure.
 
     .. seealso::
 
@@ -2814,7 +2814,7 @@ the files.
     .. warning::
 
         Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make it's usage secure.
+        to setup this directory and how to make its usage secure.
 
 .. config:option:: $cfg['TempDir']
 
@@ -2853,7 +2853,7 @@ the files.
     .. warning::
 
         Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make it's usage secure.
+        to setup this directory and how to make its usage secure.
 
 Various display setting
 -----------------------

doc/privileges.rst

@@ -60,15 +60,15 @@ will see in the phpMyAdmin navigation.
 
 .. warning::
 
-    This feature only limits what user sees, he is still able to use all the
+    This feature only limits what a user sees, he is still able to use all the
     functions. So this can not be considered as a security limitation. Should
     you want to limit what users can do, use MySQL privileges to achieve that.
 
 With this feature enabled, the :guilabel:`User accounts` management interface gains 
-second tab for managing :guilabel:`User groups`, where you can define what each
+a second tab for managing :guilabel:`User groups`, where you can define what each
 group will view (see image below) and you can then assign each user to one of
-groups. Users will be presented by simplified user interface, what might be
-useful for inexperienced users who could be overwhelmed by all features
+these groups. Users will be presented with a simplified user interface, which might be
+useful for inexperienced users who could be overwhelmed by all the features
 phpMyAdmin provides.
 
 .. image:: images/usergroups.png

libraries/LanguageManager.php

@@ -314,6 +314,13 @@ class LanguageManager
             'ka|georgian',
             '',
         ),
+        'kab' => array(
+            'kab',
+            'Kabylian',
+            'Taqbaylit',
+            'kab|kabylian',
+            '',
+        ),
         'kk' => array(
             'kk',
             'Kazakh',

libraries/plugins/auth/AuthenticationCookie.php

@@ -470,7 +470,11 @@ public function storeUserCredentials()
         $this->storeUsernameCookie($cfg['Server']['user']);
 
         // Duration = as configured
-        $this->storePasswordCookie($cfg['Server']['password']);
+        // Do not store password cookie on password change as we will
+        // set the cookie again after password has been changed
+        if (! isset($_POST['change_pw'])) {
+            $this->storePasswordCookie($cfg['Server']['password']);
+        }
 
         // Set server cookies if required (once per session) and, in this case,
         // force reload to ensure the client accepts cookies

po/et.po

@@ -6,16 +6,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-08-01 11:05+0200\n"
-"PO-Revision-Date: 2016-05-23 12:58+0000\n"
+"PO-Revision-Date: 2016-08-01 11:04+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/et/>\n"
+"Language-Team: Estonian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: changelog.php:37 license.php:33
 #, php-format
@@ -837,6 +837,7 @@ msgstr "Oled KUSTUTAMAS kogu andmebaasi!"
 #: js/messages.php:53
 msgid "Cannot rename database to the same name. Change the name and try again"
 msgstr ""
+"Andmebaasi uus nimi ei saa olla ta vana nimi. Muuda uut nime ja proovi uuesti"
 
 #: js/messages.php:55
 msgid "You are about to DESTROY a complete table!"
@@ -3229,10 +3230,9 @@ msgid "Details…"
 msgstr "Detailid…"
 
 #: libraries/DatabaseInterface.php:2325
-#, fuzzy
 #| msgid "Missing parameter:"
 msgid "Missing connection parameters!"
-msgstr "Puudulik parameeter:"
+msgstr "Puuduvad ühenduse parameetrid!"
 
 #: libraries/DatabaseInterface.php:2358
 msgid "Connection for controluser as defined in your configuration failed."
@@ -5339,10 +5339,9 @@ msgid "Could not connect to the database server!"
 msgstr "Ei saa ühenduda andmebaasi serveriga!"
 
 #: libraries/config/Validator.php:286
-#, fuzzy
 #| msgid "Authentication type"
 msgid "Invalid authentication type!"
-msgstr "Autentimise tüüp"
+msgstr "Vigane autentimise tüüp!"
 
 #: libraries/config/Validator.php:293
 msgid "Empty username while using [kbd]config[/kbd] authentication method!"
@@ -9070,10 +9069,9 @@ msgid "Log out"
 msgstr "Logi välja"
 
 #: libraries/navigation/NavigationHeader.php:173
-#, fuzzy
 #| msgid "Dumping data"
 msgid "Empty session data"
-msgstr "Andmete tõmmistamine"
+msgstr "Seansiandmed puuduvad"
 
 #: libraries/navigation/NavigationHeader.php:189
 msgid "phpMyAdmin documentation"
@@ -10247,10 +10245,10 @@ msgid "Last check:"
 msgstr "Viimane kontroll:"
 
 #: libraries/plugins/export/ExportSql.php:1479
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table structure for table"
 msgid "Error reading structure for table %s:"
-msgstr "Tabeli struktuur tabelile"
+msgstr "Viga tabeli %s struktuuri lugemisel:"
 
 #: libraries/plugins/export/ExportSql.php:1533
 msgid "It appears your database uses views;"
@@ -10302,10 +10300,10 @@ msgid "(See below for the actual view)"
 msgstr "(Tegelik vaade on allpool)"
 
 #: libraries/plugins/export/ExportSql.php:2195
-#, fuzzy, php-format
+#, php-format
 #| msgid "Error reading data:"
 msgid "Error reading data for table %s:"
-msgstr "Andmete lugemisel esines viga:"
+msgstr "Viga tabeli %s andmete lugemisel:"
 
 #: libraries/plugins/export/ExportXml.php:97
 msgid "Object creation options (all are recommended)"
@@ -13781,14 +13779,13 @@ msgid "Cannot save settings, submitted form contains errors!"
 msgstr "Sätteid ei salvestatud; saadetud vorm sisaldab vigu!"
 
 #: prefs_manage.php:50
-#, fuzzy
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "phpMyAdmin configuration snippet"
-msgstr "Puudulikud phpMyAdmini seadistuse salvestuse tabelid"
+msgstr "phpMyAdmini seadistuse jupp"
 
 #: prefs_manage.php:51
 msgid "Paste it to your config.inc.php"
-msgstr ""
+msgstr "Kleebi see oma config.inc.php"
 
 #: prefs_manage.php:105
 msgid "Could not import configuration"
@@ -13840,10 +13837,9 @@ msgstr ""
 "näiteks %sPaigaldaja skripti%s."
 
 #: prefs_manage.php:342
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save as PHP file"
-msgstr "Salvesta failina"
+msgstr "Salvesta PHP failina"
 
 #: prefs_manage.php:347
 msgid "Save to browser's storage"
@@ -13965,10 +13961,9 @@ msgstr ""
 "'config' kataloog."
 
 #: setup/frames/index.inc.php:134
-#, fuzzy
 #| msgid "Configuration saved."
 msgid "Configuration not saved!"
-msgstr "Seadistus on salvestatud."
+msgstr "Seadistust ei salvestatud!"
 
 #: setup/frames/index.inc.php:149 setup/frames/menu.inc.php:20
 msgid "Overview"
@@ -14090,7 +14085,7 @@ msgstr "Valed andmed"
 #: setup/validate.php:30
 #, php-format
 msgid "Wrong data or no validation for %s"
-msgstr ""
+msgstr "Valed andmed või puudub %s valideerimine"
 
 #: tbl_create.php:31 tbl_get_field.php:26
 #, php-format
@@ -15501,7 +15496,7 @@ msgstr "otsene viga"
 
 #: view_create.php:45
 msgid "View name can not be empty"
-msgstr ""
+msgstr "Vaate nimi ei saa olla tühi"
 
 #: view_create.php:248
 msgid "VIEW name"

po/ia.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-08-01 11:05+0200\n"
-"PO-Revision-Date: 2016-05-23 13:14+0000\n"
+"PO-Revision-Date: 2016-08-01 13:13+0000\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 2.8-dev\n"
 
 #: changelog.php:37 license.php:33
 #, php-format
@@ -5435,10 +5435,9 @@ msgid "Could not connect to the database server!"
 msgstr "Il non pote connecter a servitor de base de datos!"
 
 #: libraries/config/Validator.php:286
-#, fuzzy
 #| msgid "Authentication type"
 msgid "Invalid authentication type!"
-msgstr "Typo de authentication"
+msgstr "Typo de authentication invalide!"
 
 #: libraries/config/Validator.php:293
 msgid "Empty username while using [kbd]config[/kbd] authentication method!"
@@ -7063,8 +7062,8 @@ msgid ""
 "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: "
 "[kbd]pma__bookmark[/kbd]"
 msgstr ""
-"Lassa vacue pro necun supporto de [doc@bookmarks@] bookmark[/doc] 2 , "
-"suggerite: [kbd] 3 pma__bookmark[/kbd] 4"
+"Lassa vacue pro nulle [doc@bookmarks@]bookmark[/doc] supporto, suggerite: "
+"[kbd]pma__bookmark[/kbd]"
 
 #: libraries/config/messages.inc.php:643
 msgid "Bookmark table"
@@ -7108,7 +7107,7 @@ msgid ""
 "available on [doc@linked-tables]documentation[/doc]."
 msgstr ""
 "Un usator special de MySQL configurate con permissiones limitate, ulterior "
-"information disponibile sur [doc@linked-tables] documentation[/doc]."
+"information disponibile sur [doc@linked-tables] 1documentation[/doc] 2."
 
 #: libraries/config/messages.inc.php:659
 msgid "Control user"
@@ -7280,8 +7279,8 @@ msgid ""
 "Suggested: [kbd]phpmyadmin[/kbd]."
 msgstr ""
 "Base de datos usate pro relationes, marcatores de libro, e characteristicas "
-"de PDF. Vide [doc@linked-tables]pmadb[/doc]pro le information complete. "
-"Lassa vacue pro nulle supporto. Suggerite: [kbd]phpmyadmin[/kbd]."
+"de PDF. Vide [doc@linked-tables] 1pmadb[/doc] 2 pro le information complete. "
+"Lassa vacue pro nulle supporto. Suggerite:  [kbd] 3phpmyadmin[/kbd] 4."
 
 #: libraries/config/messages.inc.php:727
 #: templates/server/databases/create.phtml:20
@@ -7327,8 +7326,8 @@ msgid ""
 "Leave blank for no [doc@relations@]relation-links[/doc] support, suggested: "
 "[kbd]pma__relation[/kbd]."
 msgstr ""
-"Lassa vacue pro nulle[doc@relations@]relation-links[/doc] supporto, "
-"suggerite: [kbd]pma__relation[/kbd]."
+"Lassa vacue pro nulle supporto  [doc@relations@] 1relation-links[/doc] 2 , "
+"suggerite: [kbd] 3pma__relation[/kbd] 4."
 
 #: libraries/config/messages.inc.php:746
 msgid "Relation table"
@@ -7338,7 +7337,8 @@ msgstr "Tabella de relation"
 msgid ""
 "See [doc@authentication-modes]authentication types[/doc] for an example."
 msgstr ""
-"Vide [doc@authentication-modes] typos de authentication[/doc] pro un exemplo."
+"Vide [doc@authentication-modes] typos de authentication [/doc] pro un "
+"exemplo."
 
 #: libraries/config/messages.inc.php:751
 msgid "Signon session name"
@@ -7870,7 +7870,7 @@ msgstr "Contrasigno de proxy"
 #: libraries/config/messages.inc.php:974
 msgid "Enable ZIP compression for import and export operations."
 msgstr ""
-"Il habilita le compressionZIP per operationes de importation e exportation."
+"Il habilita le compression ZIP per operationes de importation e exportation."
 
 #: libraries/config/messages.inc.php:977
 msgid "ZIP"
@@ -9257,10 +9257,9 @@ msgid "Log out"
 msgstr "Claude session"
 
 #: libraries/navigation/NavigationHeader.php:173
-#, fuzzy
 #| msgid "Dumping data"
 msgid "Empty session data"
-msgstr "Dump (discargamento) de datos"
+msgstr "Datos de session vacue"
 
 #: libraries/navigation/NavigationHeader.php:189
 msgid "phpMyAdmin documentation"
@@ -13877,10 +13876,9 @@ msgid ""
 msgstr ""
 
 #: setup/frames/index.inc.php:134
-#, fuzzy
 #| msgid "Configuration saved."
 msgid "Configuration not saved!"
-msgstr "Configuration salveguardate."
+msgstr "Configuration non salveguardate!"
 
 #: setup/frames/index.inc.php:149 setup/frames/menu.inc.php:20
 msgid "Overview"
@@ -14676,9 +14674,9 @@ msgid ""
 "about relevant configuration settings. It will be sent to the phpMyAdmin "
 "team for debugging the error."
 msgstr ""
-"Iste reporto automaticamente include datos re le error e informationes re "
-"preferentias de configuration relevante. Illo essera inviate al equipa de "
-"phpMyAdmin pro analysar le error."
+"Iste reporto includeva automaticamente datos re le error e re le information "
+"super fixationes de configuration relevante. Illo essera inviata al equipa "
+"de phpMtAdmin pro analysar le error."
 
 #: templates/error/report_form.phtml:14
 msgid ""