Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 60fca6363095bff9d4d9ae97c369ab2cfc24cdf8
https://github.com/phpmyadmin/phpmyadmin/commit/60fca6363095bff9d4d9ae97c36…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M libraries/config/messages.inc.php
Log Message:
-----------
Missing message for /setup
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 7b00947113ee8d04b1f66c7452e0253b5d76c830
https://github.com/phpmyadmin/phpmyadmin/commit/7b00947113ee8d04b1f66c7452e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)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/km.po
M po/kn.po
M po/ko.po
M po/ksh.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(a)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(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: 68eca169a8c155b26c125a8ded7333333527a49d
https://github.com/phpmyadmin/phpmyadmin/commit/68eca169a8c155b26c125a8ded7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M libraries/config/messages.inc.php
Log Message:
-----------
Merge commit '60fca63'
Commit: ee7d79359964a2192637100b7978fb04fd35d702
https://github.com/phpmyadmin/phpmyadmin/commit/ee7d79359964a2192637100b797…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Log Message:
-----------
Merge commit '7b00947'
Commit: 9c0a72d99672ae2a6c0e5ee682d79767eeeda41e
https://github.com/phpmyadmin/phpmyadmin/commit/9c0a72d99672ae2a6c0e5ee682d…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)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/km.po
M po/kn.po
M po/ko.po
M po/ksh.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(a)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(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/489826139efa...9c0a72d99672
Branch: refs/heads/QA_4_2
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 60fca6363095bff9d4d9ae97c369ab2cfc24cdf8
https://github.com/phpmyadmin/phpmyadmin/commit/60fca6363095bff9d4d9ae97c36…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M libraries/config/messages.inc.php
Log Message:
-----------
Missing message for /setup
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 7b00947113ee8d04b1f66c7452e0253b5d76c830
https://github.com/phpmyadmin/phpmyadmin/commit/7b00947113ee8d04b1f66c7452e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-24 (Sat, 24 May 2014)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)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/km.po
M po/kn.po
M po/ko.po
M po/ksh.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(a)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(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/16036ac14377...7b00947113ee
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ddbe5aed270142b478cf261283ae015da9bfece2
https://github.com/phpmyadmin/phpmyadmin/commit/ddbe5aed270142b478cf261283a…
Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M libraries/DBQbe.class.php
Log Message:
-----------
DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type
Commit: 5ddd0c1990ebd54722fb95c156866d0ef25eccfc
https://github.com/phpmyadmin/phpmyadmin/commit/5ddd0c1990ebd54722fb95c1568…
Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M libraries/Tracker.class.php
M libraries/Util.class.php
M libraries/tbl_tracking.lib.php
M libraries/url_generating.lib.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/config/PMA_FormDisplay_test.php
M test/libraries/PMA_insert_edit_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_server_status_test.php
Log Message:
-----------
Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Commit: 1acfaf4a7fe0fbfd1869748d6555ad0ece36e0cd
https://github.com/phpmyadmin/phpmyadmin/commit/1acfaf4a7fe0fbfd1869748d655…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M libraries/DBQbe.class.php
Log Message:
-----------
Merge commit 'ddbe5ae'
Commit: 9373e1b2041a21d51be6d5ecde5a96a6e228c238
https://github.com/phpmyadmin/phpmyadmin/commit/9373e1b2041a21d51be6d5ecde5…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M libraries/Tracker.class.php
M libraries/Util.class.php
M libraries/tbl_tracking.lib.php
M libraries/url_generating.lib.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/config/PMA_FormDisplay_test.php
M test/libraries/PMA_insert_edit_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_server_status_test.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e98a9a7bdb4e...9373e1b2041a