Re: [Phpmyadmin-devel] [Phpmyadmin-git] [phpmyadmin/phpmyadmin] f50b45: remove duplicates, remove some HTML tags and funct...
Hi
Dne Thu, 16 Aug 2012 03:39:02 -0700 Thilina Buddika thilinaabeyrathna@gmail.com napsal(a):
Commit: ecf1462c1d0cf6e4ecb955a47f8b28a7960f0114 https://github.com/phpmyadmin/phpmyadmin/commit/ecf1462c1d0cf6e4ecb955a47f8b... Author: Thilina Buddika thilinaabeyrathna@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M ChangeLog M js/db_structure.js M js/tbl_gis_visualization.js M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/rte/rte_triggers.lib.php M libraries/structure.lib.php M phpunit.xml.dist M po/th.po M po/zh_CN.po R po/zh_TW.po
Please check what changes are you actually pushing, deleting translation file was hardly intended here...
Michal Čihař a écrit :
Hi
Dne Thu, 16 Aug 2012 03:39:02 -0700 Thilina Buddika thilinaabeyrathna@gmail.com napsal(a):
Commit: ecf1462c1d0cf6e4ecb955a47f8b28a7960f0114 https://github.com/phpmyadmin/phpmyadmin/commit/ecf1462c1d0cf6e4ecb955a47f8b... Author: Thilina Buddika thilinaabeyrathna@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M ChangeLog M js/db_structure.js M js/tbl_gis_visualization.js M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/rte/rte_triggers.lib.php M libraries/structure.lib.php M phpunit.xml.dist M po/th.po M po/zh_CN.po R po/zh_TW.po
Please check what changes are you actually pushing, deleting translation file was hardly intended here...
Sorry, I was too fast to merge this.
Thilina, are you going to fix it?
On Thu, Aug 16, 2012 at 5:43 PM, Marc Delisle marc@infomarc.info wrote:
Michal Čihař a écrit :
Hi
Dne Thu, 16 Aug 2012 03:39:02 -0700 Thilina Buddika thilinaabeyrathna@gmail.com napsal(a):
Commit: ecf1462c1d0cf6e4ecb955a47f8b28a7960f0114
https://github.com/phpmyadmin/phpmyadmin/commit/ecf1462c1d0cf6e4ecb955a47f8b...
Author: Thilina Buddika thilinaabeyrathna@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M ChangeLog M js/db_structure.js M js/tbl_gis_visualization.js M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/rte/rte_triggers.lib.php M libraries/structure.lib.php M phpunit.xml.dist M po/th.po M po/zh_CN.po R po/zh_TW.po
Please check what changes are you actually pushing, deleting translation file was hardly intended here...
Sorry, I was too fast to merge this.
Thilina, are you going to fix it?
I'll look Marc.
On Thu, Aug 16, 2012 at 5:46 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna@gmail.com> wrote:
On Thu, Aug 16, 2012 at 5:43 PM, Marc Delisle marc@infomarc.info wrote:
Michal Čihař a écrit :
Hi
Dne Thu, 16 Aug 2012 03:39:02 -0700 Thilina Buddika thilinaabeyrathna@gmail.com napsal(a):
Commit: ecf1462c1d0cf6e4ecb955a47f8b28a7960f0114
https://github.com/phpmyadmin/phpmyadmin/commit/ecf1462c1d0cf6e4ecb955a47f8b...
Author: Thilina Buddika thilinaabeyrathna@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M ChangeLog M js/db_structure.js M js/tbl_gis_visualization.js M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/rte/rte_triggers.lib.php M libraries/structure.lib.php M phpunit.xml.dist M po/th.po M po/zh_CN.po R po/zh_TW.po
Please check what changes are you actually pushing, deleting translation file was hardly intended here...
Sorry, I was too fast to merge this.
Thilina, are you going to fix it?
I'll look Marc.
Hi Marc, I tried, "git revert ecf1462", But It doesn't work for me, Because this commit is a merge.
Thilina Buddika Abeyrathna a écrit :
On Thu, Aug 16, 2012 at 5:46 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna@gmail.com> wrote:
On Thu, Aug 16, 2012 at 5:43 PM, Marc Delisle marc@infomarc.info wrote:
Michal Čihař a écrit :
Hi
Dne Thu, 16 Aug 2012 03:39:02 -0700 Thilina Buddika thilinaabeyrathna@gmail.com napsal(a):
Commit: ecf1462c1d0cf6e4ecb955a47f8b28a7960f0114
https://github.com/phpmyadmin/phpmyadmin/commit/ecf1462c1d0cf6e4ecb955a47f8b...
Author: Thilina Buddika thilinaabeyrathna@gmail.com Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths: M ChangeLog M js/db_structure.js M js/tbl_gis_visualization.js M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportSql.class.php M libraries/rte/rte_triggers.lib.php M libraries/structure.lib.php M phpunit.xml.dist M po/th.po M po/zh_CN.po R po/zh_TW.po
Please check what changes are you actually pushing, deleting translation file was hardly intended here...
Sorry, I was too fast to merge this.
Thilina, are you going to fix it?
I'll look Marc.
Hi Marc, I tried, "git revert ecf1462", But It doesn't work for me, Because this commit is a merge.
You could go to a commit before you deleted this file, copy the file somewhere, then checkout to your current tree and put back the file.
Hi
Dne Thu, 16 Aug 2012 12:08:33 -0400 Marc Delisle marc@infomarc.info napsal(a):
You could go to a commit before you deleted this file, copy the file somewhere, then checkout to your current tree and put back the file.
Or just:
git checkout REVISION_BEFORE -- po/zh_TW.po
On Thu, Aug 16, 2012 at 10:57 PM, Michal Čihař michal@cihar.com wrote:
Hi
Dne Thu, 16 Aug 2012 12:08:33 -0400 Marc Delisle marc@infomarc.info napsal(a):
You could go to a commit before you deleted this file, copy the file somewhere, then checkout to your current tree and put back the file.
Or just:
git checkout REVISION_BEFORE -- po/zh_TW.po
-- Michal Čihař | http://cihar.com | http://phpmyadmin.cz
Done.
-
Marc Delisle -
Michal Čihař -
Thilina Buddika Abeyrathna