- Remove duplicated attributes in `Models.ConflictRegion`
- Add `ViewModels.MergeConflictEditor.Resolve(object resolution)` to replace `AcceptOurs/AcceptTheirs/AcceptBothMineFirst/AcceptBothTheirsFirst/Undo`
- Use command-binding instead of listening `Click` event for command buttons
- Remove `IsOldSide` and `IsResult` properties since `PanelType` is enough
- Rewrite the way to calculate current hovered conflict chunk
Signed-off-by: leo <longshuang@msn.cn>
* Use proper UTF-8 horizontal ellipsis char instead of triple dots
* Fix and improve various compound hyphenations
* Use proper en dash instead of minus char
* Replace straight quotes with typographic ones in non-technical friendly strings
* Reduce deviations from original texts (content and formatting)
* Remove indentations from multiline strings because they are visible in UI
* Fix typos and missing or superfluous punctuation marks
* Add missing translations and improve existing ones
* Further improve existing translations
* Improve keywords: translations for 'prune' and 'theirs' are now disambiguated and clearer
* Add new keys and translate their texts
* Mark German translation as complete and remove list of missing keys
- `Commands.DiffConflictStage` and `Commands.QueryConflictContent` are never used
- Remove unnecessary attributes of `Views.MergeConflictEditor`
- New line-background render for conflict editor
Signed-off-by: leo <longshuang@msn.cn>
- Remove unused code
- Add translations for Chinese (Simplified & Traditional)
- UI/UX changes
- Fix sync-scroll function sometimes does not work
- Re-arrange context menu items for local change
Signed-off-by: leo <longshuang@msn.cn>
* feature: Translation helper script
A small python scritp that helps to translate between EN to a target language. It loads the target translation file and compares with the EN base file, showing which keys are missing and asking to translate.
* feature: Added code comments to translation utility script
* feature: Insert new keys in alphabetical order when translating
* feature: README for the translate_helper.py
* feature: Move translate helper script to root folder
* feature: Added traslation utility script documentation to README file
* feature: removed old docs for translation script
Since the file in `Parent Revision` may not be modified, and user can not notice this (also can not see the
differences between current and prev revision) in `FILES` page, the `Reset to Parent Revision` should not
be available here.
Signed-off-by: leo <longshuang@msn.cn>
