Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 37b8305afd611ea0eeaff765e479165fe9de59d9
https://github.com/phpmyadmin/phpmyadmin/commit/37b8305afd611ea0eeaff765e47…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-15 (Wed, 15 Jan 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/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(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
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 144e00e5da92712336cb7d1370ffe830ffe5c58f
https://github.com/phpmyadmin/phpmyadmin/commit/144e00e5da92712336cb7d1370f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-15 (Wed, 15 Jan 2014)
Changed paths:
M ChangeLog
M doc/faq.rst
M doc/intro.rst
M export.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/messages.inc.php
M libraries/display_export.lib.php
Log Message:
-----------
bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 379f8b6704154aaca0ad8768e6dfb7295fd81918
https://github.com/phpmyadmin/phpmyadmin/commit/379f8b6704154aaca0ad8768e6d…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-15 (Wed, 15 Jan 2014)
Changed paths:
M ChangeLog
M doc/faq.rst
M doc/intro.rst
M export.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/messages.inc.php
M libraries/display_export.lib.php
M libraries/export.lib.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f2a7359f1b8d...379f8b670415
Branch: refs/heads/QA_4_1
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: de019e8996aae14f676028cf1be16004259e447e
https://github.com/phpmyadmin/phpmyadmin/commit/de019e8996aae14f676028cf1be…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-15 (Wed, 15 Jan 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/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(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
Branch: refs/heads/QA_4_1
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 144e00e5da92712336cb7d1370ffe830ffe5c58f
https://github.com/phpmyadmin/phpmyadmin/commit/144e00e5da92712336cb7d1370f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-01-15 (Wed, 15 Jan 2014)
Changed paths:
M ChangeLog
M doc/faq.rst
M doc/intro.rst
M export.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/messages.inc.php
M libraries/display_export.lib.php
Log Message:
-----------
bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc(a)infomarc.info>