mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-22 20:54:59 +00:00
refactor: ux for in progress action (cherry-pick/rebase/revert/merge)
This commit is contained in:
parent
814af539cd
commit
53bcafa5ed
7 changed files with 243 additions and 123 deletions
45
src/SourceGit/Resources/Locales.Designer.cs
generated
45
src/SourceGit/Resources/Locales.Designer.cs
generated
|
@ -942,15 +942,6 @@ namespace SourceGit.Resources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Conflict detected! Press 'Abort' to restore original HEAD..
|
||||
/// </summary>
|
||||
public static string Text_Conflict_Tip {
|
||||
get {
|
||||
return ResourceManager.GetString("Text.Conflict.Tip", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Copy.
|
||||
/// </summary>
|
||||
|
@ -2049,6 +2040,42 @@ namespace SourceGit.Resources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Cherry-Pick in progress. Press 'Abort' to restore original HEAD..
|
||||
/// </summary>
|
||||
public static string Text_InProgress_CherryPick {
|
||||
get {
|
||||
return ResourceManager.GetString("Text.InProgress.CherryPick", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Merge request in progress. Press 'Abort' to restore original HEAD..
|
||||
/// </summary>
|
||||
public static string Text_InProgress_Merge {
|
||||
get {
|
||||
return ResourceManager.GetString("Text.InProgress.Merge", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Rebase in progress. Press 'Abort' to restore original HEAD..
|
||||
/// </summary>
|
||||
public static string Text_InProgress_Rebase {
|
||||
get {
|
||||
return ResourceManager.GetString("Text.InProgress.Rebase", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Revert in progress. Press 'Abort' to restore original HEAD..
|
||||
/// </summary>
|
||||
public static string Text_InProgress_Revert {
|
||||
get {
|
||||
return ResourceManager.GetString("Text.InProgress.Revert", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Source Git.
|
||||
/// </summary>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue