|
110 | 110 | <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">Commit:</x:String> |
111 | 111 | <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">Warning: By doing a commit checkout, your Head will be detached</x:String> |
112 | 112 | <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes:</x:String> |
113 | | - <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String> |
114 | | - <x:String x:Key="Text.Checkout.LocalChanges.StashAndReapply" xml:space="preserve">Stash & Reapply</x:String> |
115 | 113 | <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch:</x:String> |
116 | 114 | <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">Your current HEAD contains commit(s) not connected to any branches/tags! Do you want to continue?</x:String> |
117 | 115 | <x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">The following submodules need to be updated:{0}Do you want to update them?</x:String> |
|
301 | 299 | <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Based On:</x:String> |
302 | 300 | <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Check out the created branch</x:String> |
303 | 301 | <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">Local Changes:</x:String> |
304 | | - <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">Discard</x:String> |
305 | | - <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReapply" xml:space="preserve">Stash & Reapply</x:String> |
306 | 302 | <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">New Branch Name:</x:String> |
307 | 303 | <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Enter branch name.</x:String> |
308 | 304 | <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Create Local Branch</x:String> |
|
321 | 317 | <x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">lightweight</x:String> |
322 | 318 | <x:String x:Key="Text.CtrlClickTip" xml:space="preserve">Hold Ctrl to start directly</x:String> |
323 | 319 | <x:String x:Key="Text.Cut" xml:space="preserve">Cut</x:String> |
| 320 | + <x:String x:Key="Text.DealWithLocalChanges.Discard" xml:space="preserve">Discard</x:String> |
| 321 | + <x:String x:Key="Text.DealWithLocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String> |
| 322 | + <x:String x:Key="Text.DealWithLocalChanges.StashAndReapply" xml:space="preserve">Stash & Reapply</x:String> |
324 | 323 | <x:String x:Key="Text.DeinitSubmodule" xml:space="preserve">De-initialize Submodule</x:String> |
325 | 324 | <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Force de-init even if it contains local changes.</x:String> |
326 | 325 | <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodule:</x:String> |
|
689 | 688 | <x:String x:Key="Text.Pull.Branch" xml:space="preserve">Remote Branch:</x:String> |
690 | 689 | <x:String x:Key="Text.Pull.Into" xml:space="preserve">Into:</x:String> |
691 | 690 | <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">Local Changes:</x:String> |
692 | | - <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">Discard</x:String> |
693 | | - <x:String x:Key="Text.Pull.LocalChanges.StashAndReapply" xml:space="preserve">Stash & Reapply</x:String> |
694 | 691 | <x:String x:Key="Text.Pull.Remote" xml:space="preserve">Remote:</x:String> |
695 | 692 | <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch & Merge)</x:String> |
696 | 693 | <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">Use rebase instead of merge</x:String> |
|
0 commit comments