[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5eeaac: Merge remote-tracking branch 'origin/master'

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5eeaac67c39ef7a8c7ab25c3d32d050dcc5040a0
      https://github.com/phpmyadmin/phpmyadmin/commit/5eeaac67c39ef7a8c7ab25c3d32d050dcc5040a0
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M libraries/auth/config.auth.lib.php
  M libraries/auth/cookie.auth.lib.php
  M libraries/auth/http.auth.lib.php
  M libraries/auth/signon.auth.lib.php
  M libraries/config/ConfigFile.class.php
  M libraries/config/Form.class.php
  M libraries/config/setup.forms.php
  M libraries/database_interface.lib.php
  M libraries/dbi/drizzle-wrappers.lib.php
  M libraries/dbi/drizzle.dbi.lib.php
  M libraries/dbi/mysql.dbi.lib.php
  M libraries/dbi/mysqli.dbi.lib.php
  M libraries/string.lib.php
  M libraries/string_mb.lib.php
  M libraries/string_native.lib.php
  M libraries/string_type_ctype.lib.php
  M libraries/string_type_native.lib.php
  M libraries/zip_extension.lib.php
  M setup/config.php
  M setup/frames/config.inc.php
  M setup/frames/form.inc.php
  M setup/frames/index.inc.php
  M setup/frames/menu.inc.php
  M setup/frames/servers.inc.php
  M setup/index.php
  M setup/lib/ConfigGenerator.class.php
  M setup/lib/common.inc.php
  M setup/lib/form_processing.lib.php
  M setup/lib/index.lib.php
  M setup/validate.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: a5b5c2e541c4ff5d3721f1870ae610f386530879
      https://github.com/phpmyadmin/phpmyadmin/commit/a5b5c2e541c4ff5d3721f1870ae610f386530879
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M js/functions.js
  M js/messages.php
  M js/server_privileges.js
  M js/tbl_structure.js
  M libraries/mult_submits.inc.php
  M sql.php

  Log Message:
  -----------
  Clearer confirmation of query


  Commit: dc5b5e7d9507edc88e7de4ad232791055633c315
      https://github.com/phpmyadmin/phpmyadmin/commit/dc5b5e7d9507edc88e7de4ad232791055633c315
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M po/tr.po
  M po/uz at latin.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/master'


  Commit: 23a0756d22c05beffb78d0e1c5d54c6aa7fccea7
      https://github.com/phpmyadmin/phpmyadmin/commit/23a0756d22c05beffb78d0e1c5d54c6aa7fccea7
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  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/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/id.po
  M po/it.po
  M po/ja.po
  M po/ka.po
  M po/ko.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/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/zh_CN.po
  M po/zh_TW.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ee4bf16...23a0756