File tree Expand file tree Collapse file tree 8 files changed +16
-16
lines changed Expand file tree Collapse file tree 8 files changed +16
-16
lines changed Original file line number Diff line number Diff line change 623
623
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >COMMIT</x : String >
624
624
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >COMMIT & PUSH</x : String >
625
625
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >Template/Historie</x : String >
626
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >STRG + Enter</x : String >
627
626
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >KONFLIKTE ERKANNT</x : String >
628
627
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >DATEI KONFLIKTE GELÖST</x : String >
629
628
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >NICHT-VERFOLGTE DATEIEN INKLUDIEREN</x : String >
Original file line number Diff line number Diff line change 622
622
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >COMMIT</x : String >
623
623
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >COMMIT & PUSH</x : String >
624
624
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >Template/Histories</x : String >
625
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Enter </x : String >
626
- <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >Use 'Ctrl(⌘)+Shift+Enter' to stage all changes and commit</x : String >
625
+ <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >Trigger click event </x : String >
626
+ <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >Stage all changes and commit</x : String >
627
627
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >CONFLICTS DETECTED</x : String >
628
628
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >FILE CONFLICTS ARE RESOLVED</x : String >
629
629
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >INCLUDE UNTRACKED FILES</x : String >
Original file line number Diff line number Diff line change 597
597
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >COMMIT</x : String >
598
598
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >COMMIT & PUSH</x : String >
599
599
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >Modèles/Historiques</x : String >
600
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Entrée</x : String >
601
600
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >CONFLITS DÉTECTÉS</x : String >
602
601
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >LES CONFLITS DE FICHIER SONT RÉSOLUS</x : String >
603
602
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >INCLURE LES FICHIERS NON-SUIVIS</x : String >
Original file line number Diff line number Diff line change 589
589
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >COMMIT</x : String >
590
590
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >COMMIT & PUSH</x : String >
591
591
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >Template/Histories</x : String >
592
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Enter</x : String >
593
592
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >CONFLITOS DETECTADOS</x : String >
594
593
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >CONFLITOS DE ARQUIVOS RESOLVIDOS</x : String >
595
594
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >INCLUIR ARQUIVOS NÃO RASTREADOS</x : String >
Original file line number Diff line number Diff line change 621
621
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >ФИКСАЦИЯ</x : String >
622
622
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >ФИКСАЦИЯ и ОТПРАВКА</x : String >
623
623
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >Шаблон/Истории</x : String >
624
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Enter</x : String >
625
624
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >ОБНАРУЖЕНЫ КОНФЛИКТЫ</x : String >
626
625
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >КОНФЛИКТЫ ФАЙЛОВ РАЗРЕШЕНЫ</x : String >
627
626
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >ВКЛЮЧИТЬ НЕОТСЛЕЖИВАЕМЫЕ ФАЙЛЫ</x : String >
Original file line number Diff line number Diff line change 620
620
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >提交</x : String >
621
621
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >提交并推送</x : String >
622
622
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >历史输入/模板</x : String >
623
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Enter </x : String >
624
- <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >使用 Ctrl(⌘)+Shift+Enter 自动暂存所有变更并提交</x : String >
623
+ <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >触发点击事件 </x : String >
624
+ <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >自动暂存所有变更并提交</x : String >
625
625
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >检测到冲突</x : String >
626
626
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >文件冲突已解决</x : String >
627
627
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >显示未跟踪文件</x : String >
Original file line number Diff line number Diff line change 625
625
<x : String x : Key =" Text.WorkingCopy.Commit" xml : space =" preserve" >提 交</x : String >
626
626
<x : String x : Key =" Text.WorkingCopy.CommitAndPush" xml : space =" preserve" >提交並推送</x : String >
627
627
<x : String x : Key =" Text.WorkingCopy.CommitMessageHelper" xml : space =" preserve" >歷史輸入/範本</x : String >
628
- <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >CTRL + Enter </x : String >
629
- <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >使用 Ctrl(⌘)+Shift+Enter 自動暫存全部變更並提交</x : String >
628
+ <x : String x : Key =" Text.WorkingCopy.CommitTip" xml : space =" preserve" >觸發點擊事件 </x : String >
629
+ <x : String x : Key =" Text.WorkingCopy.CommitWithAutoStage" xml : space =" preserve" >自動暫存全部變更並提交</x : String >
630
630
<x : String x : Key =" Text.WorkingCopy.Conflicts" xml : space =" preserve" >檢測到衝突</x : String >
631
631
<x : String x : Key =" Text.WorkingCopy.Conflicts.Resolved" xml : space =" preserve" >檔案衝突已解決</x : String >
632
632
<x : String x : Key =" Text.WorkingCopy.IncludeUntracked" xml : space =" preserve" >顯示未追蹤檔案</x : String >
Original file line number Diff line number Diff line change 226
226
ToolTip.Placement=" Top"
227
227
ToolTip.VerticalOffset=" 0" >
228
228
<ToolTip .Tip>
229
- <TextBlock TextWrapping =" Wrap" TextAlignment =" Left" >
230
- <Run Text =" {OnPlatform Ctrl+Enter, macOS=⌘+Enter}" />
231
- <Run Foreground =" {DynamicResource Brush.FG2}"
232
- FontSize =" 12"
233
- Text =" {DynamicResource Text.WorkingCopy.CommitWithAutoStage}" />
234
- </TextBlock >
229
+ <StackPanel Orientation =" Vertical" >
230
+ <TextBlock TextAlignment =" Left" TextWrapping =" Wrap" >
231
+ <Run Text =" {OnPlatform Ctrl+Enter, macOS=⌘+Enter}" />
232
+ <Run Foreground =" {DynamicResource Brush.FG2}" Text =" {DynamicResource Text.WorkingCopy.CommitTip}" />
233
+ </TextBlock >
234
+ <TextBlock TextAlignment =" Left" TextWrapping =" Wrap" Margin =" 0,4,0,0" >
235
+ <Run Text =" {OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}" />
236
+ <Run Foreground =" {DynamicResource Brush.FG2}" Text =" {DynamicResource Text.WorkingCopy.CommitWithAutoStage}" />
237
+ </TextBlock >
238
+ </StackPanel >
235
239
</ToolTip .Tip>
236
240
</Button >
237
241
You can’t perform that action at this time.
0 commit comments