ux: add icons for external merge tools

2025-06-02 09:35:00 +00:00 · 2024-04-09 15:00:52 +08:00 · 2024-04-09 15:00:52 +08:00 · 17fc7ab994
commit 17fc7ab994
parent f0e0c90621
13 changed files with 68 additions and 31 deletions
--- a/src/Resources/ExternalToolIcons/beyond_compare.png
+++ b/src/Resources/ExternalToolIcons/beyond_compare.png
--- a/src/Resources/ExternalToolIcons/custom_diff.png
+++ b/src/Resources/ExternalToolIcons/custom_diff.png
--- a/src/Resources/ExternalToolIcons/kdiff3.png
+++ b/src/Resources/ExternalToolIcons/kdiff3.png
--- a/src/Resources/ExternalToolIcons/tortoise_merge.png
+++ b/src/Resources/ExternalToolIcons/tortoise_merge.png
--- a/src/Resources/ExternalToolIcons/vs.png
+++ b/src/Resources/ExternalToolIcons/vs.png
--- a/src/Resources/ExternalToolIcons/win_merge.png
+++ b/src/Resources/ExternalToolIcons/win_merge.png
--- a/src/Resources/ExternalToolIcons/xcode.png
+++ b/src/Resources/ExternalToolIcons/xcode.png
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@ -276,7 +276,7 @@
  <x:String x:Key="Text.Preference.GPG.Path.Placeholder" xml:space="preserve">Input path for installed gpg program</x:String>
  <x:String x:Key="Text.Preference.GPG.UserKey" xml:space="preserve">User Signing Key</x:String>
  <x:String x:Key="Text.Preference.GPG.UserKey.Placeholder" xml:space="preserve">User's gpg signing key</x:String>
-  <x:String x:Key="Text.Preference.Merger" xml:space="preserve">MERGE</x:String>
+  <x:String x:Key="Text.Preference.Merger" xml:space="preserve">EXTERNAL MERGE TOOL</x:String>
  <x:String x:Key="Text.Preference.Merger.CustomDiffCmd" xml:space="preserve">Diff Command</x:String>
  <x:String x:Key="Text.Preference.Merger.CustomMergeCmd" xml:space="preserve">Merge Command</x:String>
  <x:String x:Key="Text.Preference.Merger.Path" xml:space="preserve">Install Path</x:String>