search

TGMPA / TGM-Plugin-Activation

TGM Plugin Activation is a PHP library that allows you to easily require or recommend plugins for your WordPress themes (and plugins). It allows your users to install, update and even automatically activate plugins in singular or bulk fashion using native WordPress classes, functions and interfaces. You can reference bundled plugins, plugins from the WordPress Plugin Repository or even plugins hosted elsewhere on the internet.
http://tgmpluginactivation.com/
GNU General Public License v2.0
1.75k stars 431 forks source link

Updated Traditional Chinese (Taiwan) Translations #696

Open alexclassroom opened 6 years ago

GaryJones commented 6 years ago

Thanks for the update.

There's a merge conflict which needs to be addressed.

alexclassroom commented 6 years ago

commit ba8bc06fc6a1db8ec33c052dd28d955f2ee9b3f5 is correct.

GaryJones commented 6 years ago

Check out develop, and ensure it is up to date with upstream/develop (the TGMPA repo should be upstream). Push to your origin. Then check out on your PR branch, and the rebase it onto develop. Fix the merge conflicts, finish the rebase, and then force push to your origin.

jrfnl commented 6 years ago

@alexclassroom Just checking in as we'd be happy to merge this, but can't as long as the branch is in conflict. Could you please rebase the branch on the current develop branch as described by @GaryJones in the previous comment ?

alexclassroom commented 6 years ago

Will try to resovle this tomorrow.

在 2018年3月13日 上午2:35 於 上午2:35，Juliette notifications@github.com曾寫：

@alexclassroom Just checking in as we'd be happy to merge this, but can't as long as the branch is in conflict. Could you please rebase the branch on the current develop branch as described by @GaryJones in the previous comment ?

-- You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub: https://github.com/TGMPA/TGM-Plugin-Activation/pull/696#issuecomment-372417867

jrfnl commented 6 years ago

@alexclassroom Appreciated!