File tree Expand file tree Collapse file tree 16 files changed +92
-77
lines changed Expand file tree Collapse file tree 16 files changed +92
-77
lines changed Original file line number Diff line number Diff line change
1
+ using System . Collections . Generic ;
2
+
3
+ namespace SourceGit . Models
4
+ {
5
+ public class DealWithChangesAfterStashing
6
+ {
7
+ public string Label { get ; set ; }
8
+ public string Desc { get ; set ; }
9
+
10
+ public static readonly List < DealWithChangesAfterStashing > Supported = [
11
+ new ( "Discard" , "All (or selected) changes will be discarded" ) ,
12
+ new ( "Keep Index" , "Staged changes are left intact" ) ,
13
+ new ( "Keep All" , "All (or selected) changes are left intact" ) ,
14
+ ] ;
15
+
16
+ public DealWithChangesAfterStashing ( string label , string desc )
17
+ {
18
+ Label = label ;
19
+ Desc = desc ;
20
+ }
21
+ }
22
+ }
Original file line number Diff line number Diff line change @@ -176,17 +176,11 @@ public bool OnlyStagedWhenStash
176
176
set ;
177
177
} = false ;
178
178
179
- public bool KeepIndexWhenStash
179
+ public int ChangesAfterStashing
180
180
{
181
181
get ;
182
182
set ;
183
- } = false ;
184
-
185
- public bool AutoRestoreAfterStash
186
- {
187
- get ;
188
- set ;
189
- } = false ;
183
+ } = 0 ;
190
184
191
185
public string PreferredOpenAIService
192
186
{
Original file line number Diff line number Diff line change 669
669
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Pfad zum privaten SSH Schlüssel</x : String >
670
670
<x : String x : Key =" Text.Start" xml : space =" preserve" >START</x : String >
671
671
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stash</x : String >
672
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Automatisch wiederherstellen nach dem Stashen</x : String >
673
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >Die Arbeitsdateien bleiben unverändert, aber ein Stash wird gespeichert.</x : String >
674
672
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Inklusive nicht-verfolgter Dateien</x : String >
675
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Behalte gestagte Dateien</x : String >
676
673
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Name:</x : String >
677
674
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Optional. Name dieses Stashes</x : String >
678
675
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Nur gestagte Änderungen</x : String >
Original file line number Diff line number Diff line change 689
689
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Private SSH key store path</x : String >
690
690
<x : String x : Key =" Text.Start" xml : space =" preserve" >START</x : String >
691
691
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stash</x : String >
692
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Auto-restore after stashing</x : String >
693
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >Your working files remain unchanged, but a stash is saved.</x : String >
692
+ <x : String x : Key =" Text.Stash.Changes" xml : space =" preserve" >Selected Changes:</x : String >
694
693
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Include untracked files</x : String >
695
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Keep staged files</x : String >
696
694
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Message:</x : String >
697
695
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Optional. Name of this stash</x : String >
698
696
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Only staged changes</x : String >
Original file line number Diff line number Diff line change 692
692
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Ruta de almacenamiento de la clave privada SSH</x : String >
693
693
<x : String x : Key =" Text.Start" xml : space =" preserve" >INICIAR</x : String >
694
694
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stash</x : String >
695
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Restaurar automáticamente después del stashing</x : String >
696
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >Tus archivos de trabajo permanecen sin cambios, pero se guarda un stash.</x : String >
697
695
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Incluir archivos no rastreados</x : String >
698
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Mantener archivos staged</x : String >
699
696
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Mensaje:</x : String >
700
697
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Opcional. Nombre de este stash</x : String >
701
698
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Solo cambios staged</x : String >
Original file line number Diff line number Diff line change 645
645
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Chemin du magasin de clés privées SSH</x : String >
646
646
<x : String x : Key =" Text.Start" xml : space =" preserve" >START</x : String >
647
647
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stash</x : String >
648
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Auto-restauration après le stash</x : String >
649
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >Vos fichiers de travail restent inchangés, mais une sauvegarde est enregistrée.</x : String >
650
648
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Inclure les fichiers non-suivis</x : String >
651
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Garder les fichiers indexés</x : String >
652
649
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Message :</x : String >
653
650
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Optionnel. Nom de ce stash</x : String >
654
651
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Seulement les changements indexés</x : String >
Original file line number Diff line number Diff line change 673
673
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Percorso per la chiave SSH privata</x : String >
674
674
<x : String x : Key =" Text.Start" xml : space =" preserve" >AVVIA</x : String >
675
675
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stasha</x : String >
676
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Auto-ripristino dopo lo stash</x : String >
677
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >I tuoi file di lavoro rimangono inalterati, ma viene salvato uno stash.</x : String >
678
676
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Includi file non tracciati</x : String >
679
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Mantieni file in stage</x : String >
680
677
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Messaggio:</x : String >
681
678
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Opzionale. Nome di questo stash</x : String >
682
679
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Solo modifiche in stage</x : String >
Original file line number Diff line number Diff line change 643
643
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >プライベートSSHキーストアのパス</x : String >
644
644
<x : String x : Key =" Text.Start" xml : space =" preserve" >スタート</x : String >
645
645
<x : String x : Key =" Text.Stash" xml : space =" preserve" >スタッシュ</x : String >
646
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >スタッシュ後に自動で復元</x : String >
647
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >作業ファイルは変更されず、スタッシュが保存されます。</x : String >
648
646
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >追跡されていないファイルを含める</x : String >
649
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >ステージされたファイルを保持</x : String >
650
647
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >メッセージ:</x : String >
651
648
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >オプション. このスタッシュの名前を入力</x : String >
652
649
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >ステージされた変更のみ</x : String >
Original file line number Diff line number Diff line change 585
585
<x : String x : Key =" Text.Start" xml : space =" preserve" >INICIAR</x : String >
586
586
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Stash</x : String >
587
587
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Incluir arquivos não rastreados</x : String >
588
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Manter arquivos em stage</x : String >
589
588
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Mensagem:</x : String >
590
589
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Opcional. Nome deste stash</x : String >
591
590
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Apenas mudanças em stage</x : String >
Original file line number Diff line number Diff line change 690
690
<x : String x : Key =" Text.SSHKey.Placeholder" xml : space =" preserve" >Путь хранения приватного ключа SSH</x : String >
691
691
<x : String x : Key =" Text.Start" xml : space =" preserve" >ЗАПУСК</x : String >
692
692
<x : String x : Key =" Text.Stash" xml : space =" preserve" >Отложить</x : String >
693
- <x : String x : Key =" Text.Stash.AutoRestore" xml : space =" preserve" >Автоматически восстанавливать после откладывания</x : String >
694
- <x : String x : Key =" Text.Stash.AutoRestore.Tip" xml : space =" preserve" >Ваши рабочие файлы остаются неизменными, но отложенные сохранятся.</x : String >
695
693
<x : String x : Key =" Text.Stash.IncludeUntracked" xml : space =" preserve" >Включить неотслеживаемые файлы</x : String >
696
- <x : String x : Key =" Text.Stash.KeepIndex" xml : space =" preserve" >Хранить отложенные файлы</x : String >
697
694
<x : String x : Key =" Text.Stash.Message" xml : space =" preserve" >Сообщение:</x : String >
698
695
<x : String x : Key =" Text.Stash.Message.Placeholder" xml : space =" preserve" >Имя тайника (необязательно)</x : String >
699
696
<x : String x : Key =" Text.Stash.OnlyStagedChanges" xml : space =" preserve" >Только сформированные изменения</x : String >
You can’t perform that action at this time.
0 commit comments