Undo function for phrase deletions and translation for undo function

[wcchang1115]

The undo function only supports reverting of phrase deletions. It supports multiple deletions but users have to revert them one by one.

I edited the translation file for the new feature, and updated several line numbers to match the changing of ui and cpp files.

Is there any missing place, please tell me and I will improve it. Thanks!

Resolves: #133

[jserv]

@wcchang1115 : You have to rebase to the latest upstream HEAD.

[wcchang1115]

I have tried "rebase upstream/master", but it showed merge conflict in zh_TW.ts file. Should I pull the latest version and rewrite it again? Thank you teacher!

[jserv]

@wcchang1115 : Use git rebase.

[wcchang1115]

I have some troubles in "git rebase ." Please give me some time to solve it. Thank you!

[jserv]

@wcchang1115 : Check the tip: http://fred-zone.blogspot.tw/2015/09/git-fork.html

[Chocobo1]

I have tried "rebase upstream/master", but it showed merge conflict in zh_TW.ts file. Should I pull the latest version and rewrite it again?

IMO drop the translation commit and rebase to latest version then redo the translation is easier.

[wcchang1115]

In my case, I should drop the second commit and do rebase first. Am I right? Thank for your suggestion!

[Chocobo1]

In my case, I should drop the second commit and do rebase first. Am I right?

yes

[PeterDaveHello]

You can also consider to create a new branch from the latest master branch, and redo all the works, so that you don't need to fight with the conflicts.

[wcchang1115]

Thanks for the suggestion! But I think I better try the Chocobo1's method first. Because it's painless than redo all the works. If that still not work, I will try the way you teach me! Thank you!

[jserv]

@wcchang1115 : We usually don't say "teach" since we participate in collaboration. Instead, you can say, "learn from somebody".

[wcchang1115]

@jserv : Ohh, that's a new concept for me! Thanks! I will remember that!

[wcchang1115]

Sorry all, I have two questions. I have reset my commit and rebase upstream successfully. Will a new push be harmful for this PR? And how should I update this PR? Thanks all !

[jserv]

@wcchang1115 : It is fine to do git push -f for your revised commits.

[wcchang1115]

@jserv : Thank you sir! But the part of translation I have not finished it!

[coveralls]

Coverage remained the same at 94.382% when pulling 6a95565e212079d777803cb02788934ecda40f25 on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[coveralls]

Coverage remained the same at 94.382% when pulling 8ca985ed733f53f1e154f54eede79cae45e16ecb on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[coveralls]

Coverage remained the same at 94.382% when pulling 1e4fc87866018ebffa945414f4968841ad83d36b on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[coveralls]

Coverage remained the same at 94.382% when pulling 0e776a40ccfc79f2fd51108a3265ae2bc3178e0d on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[jserv]

The Git commit messages should contain Close #133.

[wcchang1115]

@jserv : Every commits? or just the latest one?

[PeterDaveHello]

@wcchang1115 I'll respectfully suggest you to create one new branch for a new PR next time, some projects will reject PR from master branch, this is not the git flow working, and may cause problems when you try to rebase your branches or sync with upstream.

[wcchang1115]

@PeterDaveHello : Thanks for your kind suggestion! So I better have two branches, one for sync(my local master) and one for development, and always do PR with the sync one? Do I misunderstand your meaning?

[coveralls]

Coverage remained the same at 94.382% when pulling 0c9616d786975236888c64bb9db1ea03af560043 on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[jserv]

@wcchang1115 : You have to separate the translations and code implementation into two individual commits!

[wcchang1115]

@jserv : OK, I will remember for the next commit. Do I need to separate this commit into two part this time?

[jserv]

@wcchang1115 : I expect there are only two commits:

• C++ file modification
• Qt message translation

Use git rebase -i to rework your patches.

[coveralls]

Coverage decreased (-2.5%) to 91.892% when pulling 6bf189dfba0b235c472257bf2c740f9c2d010d16 on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[wcchang1115]

@jserv : I am not sure does the test file need a extra commit. Therefore I commit it first. If this is not necessary, I will squash it.

[coveralls]

Coverage remained the same at 94.382% when pulling a8ba7c2e214a35481df7409e9c8e537a03e561f0 on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[wcchang1115]

@jserv : I have separated the commit for the translation and code implementation. And also I change a little bit in undo implementation. Thanks you!

[coveralls]

Coverage remained the same at 94.382% when pulling 0fe1d5738a608526785daa37a928ef330d3add0e on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[jserv]

Fix the syntax error and typo "When undo complete, there will be a notification that which phrase being readd."

[coveralls]

Coverage remained the same at 94.382% when pulling 0e776a40ccfc79f2fd51108a3265ae2bc3178e0d on wcchang1115:master into 3bd4913706774bf289a7d274d44cfac453f338b6 on chewing:master.

[wcchang1115]

@jserv : I have fixed the points you mentioned. Thanks for your help!

[jserv]

@wcchang1115 : Merged. Thanks again for your contribution.

[wcchang1115]

Thank you all very much! Your suggestions are very helpful for me, and I learn a lot from this PR! Thanks for your patience and suggestions!