[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 60b063: 4.1.2-dev

Mon Dec 23 14:28:02 CET 2013

  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 60b063116a5353788123b63151d2af2634ba9291
      https://github.com/phpmyadmin/phpmyadmin/commit/60b063116a5353788123b63151d2af2634ba9291
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.1.2-dev

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: ae3c650f3eb7312f54abdc4e9cf2fc90bc1c6269
      https://github.com/phpmyadmin/phpmyadmin/commit/ae3c650f3eb7312f54abdc4e9cf2fc90bc1c6269
  Author: Aputsiaq Niels Janussen <aj at isit.gl>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M po/da.po

  Log Message:
  -----------
  Translated using Weblate (Danish)

Currently translated at 99.8% (2746 of 2749)

  Commit: beb2a844a15c75c1e342ecafbcd194e9f8261ee9
      https://github.com/phpmyadmin/phpmyadmin/commit/beb2a844a15c75c1e342ecafbcd194e9f8261ee9
  Author: Balázs Úr <urbalazs at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M po/hu.po

  Log Message:
  -----------
  Translated using Weblate (Hungarian)

Currently translated at 98.3% (2704 of 2749)

  Commit: 4149aacf323f79584532ed6bce87d8127bd1edf5
      https://github.com/phpmyadmin/phpmyadmin/commit/4149aacf323f79584532ed6bce87d8127bd1edf5
  Author: Weblate <noreply at weblate.org>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php
    M libraries/Table.class.php
    M libraries/rte/rte_list.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

  Commit: ef7906b3e070d34e3f69b5b5daf64aba921b2d4d
      https://github.com/phpmyadmin/phpmyadmin/commit/ef7906b3e070d34e3f69b5b5daf64aba921b2d4d
  Author: Abhishek Kandoi <abhikandoi2000 at gmail.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Fixes bug #4178: Quick edit for BIT type doesn't work

Signed-off-by: Abhishek Kandoi <abhikandoi2000 at gmail.com>
Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 3459c38bf012e06b03c697da249a0555683834c7
      https://github.com/phpmyadmin/phpmyadmin/commit/3459c38bf012e06b03c697da249a0555683834c7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Fix redisplay of bit value after grid editing

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: a88e8fa460639eb764be4e5d4e94e82802f90fad
      https://github.com/phpmyadmin/phpmyadmin/commit/a88e8fa460639eb764be4e5d4e94e82802f90fad
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  bug #4178 Quick edit for BIT type does not work

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 675e457f50953cb0b00e9cf2940ab6a71d6f10d3
      https://github.com/phpmyadmin/phpmyadmin/commit/675e457f50953cb0b00e9cf2940ab6a71d6f10d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M export.php
    M js/export.js
    M js/messages.php
    M libraries/display_export.lib.php

  Log Message:
  -----------
  bug fix #2760

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>

  Commit: 9876aeb550766e7774460a2e4e65bef619d07261
      https://github.com/phpmyadmin/phpmyadmin/commit/9876aeb550766e7774460a2e4e65bef619d07261
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php

  Log Message:
  -----------
  Finish removing the gather suboption of the error handler

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 7ff18f07bc508c36d1dceec294e86824213defa6
      https://github.com/phpmyadmin/phpmyadmin/commit/7ff18f07bc508c36d1dceec294e86824213defa6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M export.php
    M js/export.js
    M js/messages.php
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Merge pull request #795 from smita786/QA_4_1

bug fix #2760

  Commit: d3fc01713120fa1875c447daff94f2afc404dd3d
      https://github.com/phpmyadmin/phpmyadmin/commit/d3fc01713120fa1875c447daff94f2afc404dd3d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M export.php
    M js/export.js
    M js/messages.php

  Log Message:
  -----------
  Code cleanup

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 7cfc60323d41dd878f4f69b0d48533bd19cd8397
      https://github.com/phpmyadmin/phpmyadmin/commit/7cfc60323d41dd878f4f69b0d48533bd19cd8397
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #2760

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: aad949191a5a5206d1cc29f92576469d99a18c7d
      https://github.com/phpmyadmin/phpmyadmin/commit/aad949191a5a5206d1cc29f92576469d99a18c7d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.po
    M po/ko.po
    M po/ky.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files

  Commit: a7e316d7991c4ea173898dd930280bd11b010b20
      https://github.com/phpmyadmin/phpmyadmin/commit/a7e316d7991c4ea173898dd930280bd11b010b20
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  bug #4190 Fractional seconds cause row update even if the value is not changed

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 3d7643f6ebcf7735fdac03c3b4501e4f07918735
      https://github.com/phpmyadmin/phpmyadmin/commit/3d7643f6ebcf7735fdac03c3b4501e4f07918735
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M po/el.po

  Log Message:
  -----------
  Translated using Weblate (Greek)

Currently translated at 100.0% (2749 of 2749)

  Commit: 00b48015d6ffca16fdf3a372cf268f01c86d9a6b
      https://github.com/phpmyadmin/phpmyadmin/commit/00b48015d6ffca16fdf3a372cf268f01c86d9a6b
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate (Dutch)

Currently translated at 100.0% (2749 of 2749)

  Commit: 286d94d424afb1c25b487bb0563764a1487faaed
      https://github.com/phpmyadmin/phpmyadmin/commit/286d94d424afb1c25b487bb0563764a1487faaed
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M js/makegrid.js
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Revert previous fix for bug#4096

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>

  Commit: 4c1951a06ec8c2ef9d290c1de1387f04c11dc885
      https://github.com/phpmyadmin/phpmyadmin/commit/4c1951a06ec8c2ef9d290c1de1387f04c11dc885
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  fix navigation resizing with window scroll

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>

  Commit: bad4e440ec13bdeb3c7362191c5a57a84dcccfc3
      https://github.com/phpmyadmin/phpmyadmin/commit/bad4e440ec13bdeb3c7362191c5a57a84dcccfc3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M js/makegrid.js
    M js/navigation.js
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge pull request #798 from zixtor/QA_4_1

Revert 4096 and fix nav resize

  Commit: 04126fec24eea34182761026c39871d85e24381d
      https://github.com/phpmyadmin/phpmyadmin/commit/04126fec24eea34182761026c39871d85e24381d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M po/cs.po

  Log Message:
  -----------
  Translated using Weblate (Czech)

Currently translated at 100.0% (2749 of 2749)

  Commit: d08768bbb07d87bd1530c7610ffc1c8e43ecf0fa
      https://github.com/phpmyadmin/phpmyadmin/commit/d08768bbb07d87bd1530c7610ffc1c8e43ecf0fa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  Translated using Weblate (French)

Currently translated at 100.0% (2749 of 2749)

  Commit: d838baeee320ca6e3852ce219cd8d3b26d239d14
      https://github.com/phpmyadmin/phpmyadmin/commit/d838baeee320ca6e3852ce219cd8d3b26d239d14
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M po/es.po

  Log Message:
  -----------
  Translated using Weblate (Spanish)

Currently translated at 100.0% (2749 of 2749)

  Commit: 33f8aa43ff79af2d64a12a92691b214bfac8fb2a
      https://github.com/phpmyadmin/phpmyadmin/commit/33f8aa43ff79af2d64a12a92691b214bfac8fb2a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M ChangeLog
    M themes/original/css/common.css.php

  Log Message:
  -----------
  Revert overflow scroll for original theme; add ChangeLog entry for fix of bug #4170

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 1bdb6a3524b650ec0d459d0ed816f63e7e4290bf
      https://github.com/phpmyadmin/phpmyadmin/commit/1bdb6a3524b650ec0d459d0ed816f63e7e4290bf
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Translated using Weblate (Turkish)

Currently translated at 100.0% (2749 of 2749)

  Commit: 320705ae7b34182be5c5694cafec3cc22d6169e9
      https://github.com/phpmyadmin/phpmyadmin/commit/320705ae7b34182be5c5694cafec3cc22d6169e9
  Author: Weblate <noreply at weblate.org>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M ChangeLog
    M js/makegrid.js
    M js/navigation.js
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

  Commit: 1cc3e273086d6ecadfd33073b3a345ce6ff4126d
      https://github.com/phpmyadmin/phpmyadmin/commit/1cc3e273086d6ecadfd33073b3a345ce6ff4126d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  bug #2961 Relations settings not updated on config change

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 0b616a76dfbf60dbc220b8079c00d8d4b3d4dc9d
      https://github.com/phpmyadmin/phpmyadmin/commit/0b616a76dfbf60dbc220b8079c00d8d4b3d4dc9d
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (2749 of 2749)

  Commit: 4e56bde3bd24c215b9b3886e88c012f45adea020
      https://github.com/phpmyadmin/phpmyadmin/commit/4e56bde3bd24c215b9b3886e88c012f45adea020
  Author: Tony Nascimento <gtonynasc at gmail.com>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M po/pt.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese)

Currently translated at 55.2% (1519 of 2749)

  Commit: 941aba2308f75d66ad479896cd846a3723c3a829
      https://github.com/phpmyadmin/phpmyadmin/commit/941aba2308f75d66ad479896cd846a3723c3a829
  Author: Domen <mitenem at outlook.com>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M po/sl.po

  Log Message:
  -----------
  Translated using Weblate (Slovenian)

Currently translated at 100.0% (2749 of 2749)

  Commit: 11ec79aedfa13f35e7224e2724999224aa76d8e4
      https://github.com/phpmyadmin/phpmyadmin/commit/11ec79aedfa13f35e7224e2724999224aa76d8e4
  Author: Weblate <noreply at weblate.org>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

  Commit: 0d7eeadba721c1249aa43f220705cf13e6cdee5e
      https://github.com/phpmyadmin/phpmyadmin/commit/0d7eeadba721c1249aa43f220705cf13e6cdee5e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Revert "bug #2961 Relations settings not updated on config change"

This reverts commit 1cc3e273086d6ecadfd33073b3a345ce6ff4126d.

  Commit: 054614ff2bdc474b93b314b293d3163604f89be2
      https://github.com/phpmyadmin/phpmyadmin/commit/054614ff2bdc474b93b314b293d3163604f89be2
  Author: Weblate <noreply at weblate.org>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

  Commit: 5360a84a556eaa53897b515eeba6b421e2b1ee4e
      https://github.com/phpmyadmin/phpmyadmin/commit/5360a84a556eaa53897b515eeba6b421e2b1ee4e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  bug #2961 Relations settings not updated on config change

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 491059843f6c64965efe637e80711a38fa59f00d
      https://github.com/phpmyadmin/phpmyadmin/commit/491059843f6c64965efe637e80711a38fa59f00d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/sql.js
    M js/tbl_chart.js

  Log Message:
  -----------
  bug #4187 SQL query inline edit doesn't post changes on the first run

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 33aaca7bc82f53136c0a6bcd6ff6c05aa6a95839
      https://github.com/phpmyadmin/phpmyadmin/commit/33aaca7bc82f53136c0a6bcd6ff6c05aa6a95839
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M doc/faq.rst

  Log Message:
  -----------
  New FAQ entry, see bug #4174

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 165bf9325af23e4439e1a16c1d17f97b734bb0d9
      https://github.com/phpmyadmin/phpmyadmin/commit/165bf9325af23e4439e1a16c1d17f97b734bb0d9
  Author: J.M <me at mynetx.net>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M ChangeLog
    M doc/config.rst

  Log Message:
  -----------
  rfe #1465 Docs for connecting IPv6 only instances

Signed-off-by: J.M <me at mynetx.net>

  Commit: bf381c202affb4a500bd795464626ffbb85b080c
      https://github.com/phpmyadmin/phpmyadmin/commit/bf381c202affb4a500bd795464626ffbb85b080c
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 57.2% (1574 of 2749)

  Commit: 93f530e26be7480bbf1876084019e2052995b08b
      https://github.com/phpmyadmin/phpmyadmin/commit/93f530e26be7480bbf1876084019e2052995b08b
  Author: Weblate <noreply at weblate.org>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M ChangeLog
    M doc/config.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

  Commit: 7f41de6452788520843bf0111abb6881a996225f
      https://github.com/phpmyadmin/phpmyadmin/commit/7f41de6452788520843bf0111abb6881a996225f
  Author: J.M <me at mynetx.net>
  Date:   2013-12-22 (Sun, 22 Dec 2013)

  Changed paths:
    M ChangeLog
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  rfe #1468 No floating for server breadcrumb menu

Signed-off-by: J.M <me at mynetx.net>

  Commit: 61bb7e3317bc6a5644abcf52f0329b8aab69f7e2
      https://github.com/phpmyadmin/phpmyadmin/commit/61bb7e3317bc6a5644abcf52f0329b8aab69f7e2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-12-23 (Mon, 23 Dec 2013)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 57.3% (1576 of 2749)

  Commit: e3b524d28da95e02ac5f809b0529e4113a21b52c
      https://github.com/phpmyadmin/phpmyadmin/commit/e3b524d28da95e02ac5f809b0529e4113a21b52c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-23 (Mon, 23 Dec 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.1.2 release

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: f8414a4cefb233cc36318cf637087e995123ca34
      https://github.com/phpmyadmin/phpmyadmin/commit/f8414a4cefb233cc36318cf637087e995123ca34
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-23 (Mon, 23 Dec 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M doc/config.rst
    M doc/faq.rst
    M export.php
    M js/export.js
    M js/functions.js
    M js/makegrid.js
    M js/messages.php
    M js/navigation.js
    M js/sql.js
    M js/tbl_chart.js
    M libraries/Config.class.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_export.lib.php
    M libraries/insert_edit.lib.php
    M libraries/relation.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.po
    M po/ko.po
    M po/ky.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_1_2' into STABLE

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3d22f82ab84e...f8414a4cefb2