- rename c-style `file_arg` to `fileArg`
- add missing translations for zh_CN and zh_TW
- re-design conflict view and add tooltip for `USE THEIRS` and `USE MINE`
- re-order unstaged toolbar buttons
Signed-off-by: leo <longshuang@msn.cn>
* Make a few non-translated strings localizable (in Conflict view)
* Add button and wiring to run mergetool on all conflicts
* Corrected spelling and wording in related code and exception msg