Merge pull request #9027 from bansan85/9013-CloseCleanWorkingDirector…

…yForm
gitextensions · Apr 14, 2021 · 187395a · 187395a
2 parents 435504a + 358d243
commit 187395a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 54 deletions.
diff --git a/GitUI/CommandsDialogs/FormCleanupRepository.Designer.cs b/GitUI/CommandsDialogs/FormCleanupRepository.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormCleanupRepository.cs b/GitUI/CommandsDialogs/FormCleanupRepository.cs
@@ -96,7 +96,7 @@ private CleanMode GetCleanMode()
             return string.Join(" ", textBoxPaths.Lines.Where(a => !string.IsNullOrEmpty(a)).Select(a => string.Format("\"{0}\"", a)));
         }
 
-        private void Cancel_Click(object sender, EventArgs e)
+        private void Close_Click(object sender, EventArgs e)
         {
             Close();
         }

diff --git a/GitUI/CommandsDialogs/RepoHosting/ForkAndCloneForm.Designer.cs b/GitUI/CommandsDialogs/RepoHosting/ForkAndCloneForm.Designer.cs
diff --git a/GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs b/GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.Designer.cs
diff --git a/GitUI/TranslatedStrings.cs b/GitUI/TranslatedStrings.cs
@@ -12,6 +12,7 @@ internal sealed class TranslatedStrings : Translate
         private readonly TranslationString _no = new("No");
         private readonly TranslationString _okText = new("OK");
         private readonly TranslationString _cancelText = new("Cancel");
+        private readonly TranslationString _closeText = new("Close");
 
         private readonly TranslationString _buttonCheckoutBranch = new("Checkout branch");
         private readonly TranslationString _buttonContinue = new("Continue");
@@ -128,6 +129,7 @@ public static void Reinitialize()
         public static string No => _instance.Value._no.Text;
         public static string OK => _instance.Value._okText.Text;
         public static string Cancel => _instance.Value._cancelText.Text;
+        public static string Close => _instance.Value._closeText.Text;
 
         public static string ButtonContinue => _instance.Value._buttonContinue.Text;
         public static string ButtonCheckoutBranch => _instance.Value._buttonCheckoutBranch.Text;

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -1680,10 +1680,6 @@ You will have push access. {2}</source>
         <source>Clone</source>
         <target />
       </trans-unit>
-      <trans-unit id="closeBtn.Text">
-        <source>Close</source>
-        <target />
-      </trans-unit>
       <trans-unit id="columnHeaderMyReposForks.Text">
         <source># Forks</source>
         <target />
@@ -3014,10 +3010,6 @@ revision:</source>
         <source>Add a path...</source>
         <target />
       </trans-unit>
-      <trans-unit id="Cancel.Text">
-        <source>Cancel</source>
-        <target />
-      </trans-unit>
       <trans-unit id="Cleanup.Text">
         <source>Cleanup</source>
         <target />
@@ -4967,10 +4959,6 @@ command "git help shortlog"</source>
         <source>Open a worktree</source>
         <target />
       </trans-unit>
-      <trans-unit id="buttonClose.Text">
-        <source>Close</source>
-        <target />
-      </trans-unit>
       <trans-unit id="buttonPruneWorktrees.Text">
         <source>Prune the deleted worktrees</source>
         <target />
@@ -9589,6 +9577,10 @@ Select this commit to populate the full message.</source>
         <source>{0:Child|Children}</source>
         <target />
       </trans-unit>
+      <trans-unit id="_closeText.Text">
+        <source>Close</source>
+        <target />
+      </trans-unit>
       <trans-unit id="_combinedDiff.Text">
         <source>Combined diff</source>
         <target />