Rename "Commit Dialog" preference page to "Committing"

All but one of the preferences there also apply to committing via the
staging view.

Change-Id: I667ef6cb9ec1f061ec6de17df4710e1f0fc4d8a3
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

5 files changed, 38 insertions, 38 deletions

diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index 87dc362bad..f87e1dda6d 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -112,7 +112,7 @@ Theme_IgnoredResourceFont_description=The font used to display resources that ar
 GitPreferences_name=Git
 GitPreferences_WindowCachePreferencePage_name=Window Cache
 GitPreferences_DecoratorPreferencePage_name=Label Decorations
-GitPreferences_CommitDialogPreferencePage_name=Commit Dialog
+GitPreferences_CommittingPreferencePage_name=Committing
 GitPreferences_ProjectPreferencePage_name=Projects
 
 ShareProjectCommand_name=Share with Git
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 1daf5b183d..13f799cb09 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -410,9 +410,9 @@
       </page>
       <page
             category="org.eclipse.egit.ui.GitPreferences"
-            class="org.eclipse.egit.ui.internal.preferences.CommitDialogPreferencePage"
-            id="org.eclipse.egit.ui.internal.preferences.CommitDialogPreferencePage"
-            name="%GitPreferences_CommitDialogPreferencePage_name">
+            class="org.eclipse.egit.ui.internal.preferences.CommittingPreferencePage"
+            id="org.eclipse.egit.ui.internal.preferences.CommittingPreferencePage"
+            name="%GitPreferences_CommittingPreferencePage_name">
          <keywordReference
                id="org.eclipse.egit.ui.keyword.git">
          </keywordReference>
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index 19417e5c34..dcd4afda7f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -2974,34 +2974,34 @@ public class UIText extends NLS {
 	public static String BranchSelectionAndEditDialog_Delete;
 
 	/** */
-	public static String CommitDialogPreferencePage_commitMessageHistory;
+	public static String CommittingPreferencePage_commitMessageHistory;
 
 	/** */
-	public static String CommitDialogPreferencePage_title;
+	public static String CommittingPreferencePage_title;
 
 	/** */
-	public static String CommitDialogPreferencePage_hardWrapMessage;
+	public static String CommittingPreferencePage_hardWrapMessage;
 
 	/** */
-	public static String CommitDialogPreferencePage_hardWrapMessageTooltip;
+	public static String CommittingPreferencePage_hardWrapMessageTooltip;
 
 	/** */
-	public static String CommitDialogPreferencePage_footers;
+	public static String CommittingPreferencePage_footers;
 
 	/** */
-	public static String CommitDialogPreferencePage_formatting;
+	public static String CommittingPreferencePage_formatting;
 
 	/** */
-	public static String CommitDialogPreferencePage_includeUntrackedFiles;
+	public static String CommittingPreferencePage_includeUntrackedFiles;
 
 	/** */
-	public static String CommitDialogPreferencePage_includeUntrackedFilesTooltip;
+	public static String CommittingPreferencePage_includeUntrackedFilesTooltip;
 
 	/** */
-	public static String CommitDialogPreferencePage_signedOffBy;
+	public static String CommittingPreferencePage_signedOffBy;
 
 	/** */
-	public static String CommitDialogPreferencePage_signedOffByTooltip;
+	public static String CommittingPreferencePage_signedOffByTooltip;
 
 	/** */
 	public static String Decorator_exceptionMessage;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/CommitDialogPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/CommittingPreferencePage.java
index 5865f7fe12..08b2b3eccb 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/CommitDialogPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/CommittingPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2010, Robin Stocker <robin@nibor.org>
+ * Copyright (C) 2010, 2013 Robin Stocker <robin@nibor.org> and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -23,14 +23,14 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
-/** Preferences for commit dialog. */
-public class CommitDialogPreferencePage extends FieldEditorPreferencePage
+/** Preferences for committing with commit dialog/staging view. */
+public class CommittingPreferencePage extends FieldEditorPreferencePage
 		implements IWorkbenchPreferencePage {
 
 	/** */
-	public CommitDialogPreferencePage() {
+	public CommittingPreferencePage() {
 		super(GRID);
-		setTitle(UIText.CommitDialogPreferencePage_title);
+		setTitle(UIText.CommittingPreferencePage_title);
 	}
 
 	public void init(IWorkbench workbench) {
@@ -47,44 +47,44 @@ public class CommitDialogPreferencePage extends FieldEditorPreferencePage
 		Composite main = getFieldEditorParent();
 
 		Group formattingGroup = new Group(main, SWT.SHADOW_ETCHED_IN);
-		formattingGroup.setText(UIText.CommitDialogPreferencePage_formatting);
+		formattingGroup.setText(UIText.CommittingPreferencePage_formatting);
 		GridDataFactory.fillDefaults().grab(true, false).span(3, 1)
 				.applyTo(formattingGroup);
 
 		BooleanFieldEditor hardWrap = new BooleanFieldEditor(
 				UIPreferences.COMMIT_DIALOG_HARD_WRAP_MESSAGE,
-				UIText.CommitDialogPreferencePage_hardWrapMessage, formattingGroup);
+				UIText.CommittingPreferencePage_hardWrapMessage, formattingGroup);
 		hardWrap.getDescriptionControl(formattingGroup).setToolTipText(
-				UIText.CommitDialogPreferencePage_hardWrapMessageTooltip);
+				UIText.CommittingPreferencePage_hardWrapMessageTooltip);
 		addField(hardWrap);
 		updateMargins(formattingGroup);
 
 		Group footersGroup = new Group(main, SWT.SHADOW_ETCHED_IN);
-		footersGroup.setText(UIText.CommitDialogPreferencePage_footers);
+		footersGroup.setText(UIText.CommittingPreferencePage_footers);
 		GridDataFactory.fillDefaults().grab(true, false).span(3, 1)
 				.applyTo(footersGroup);
 
 		BooleanFieldEditor signedOffBy = new BooleanFieldEditor(
 				UIPreferences.COMMIT_DIALOG_SIGNED_OFF_BY,
-				UIText.CommitDialogPreferencePage_signedOffBy,
+				UIText.CommittingPreferencePage_signedOffBy,
 				footersGroup);
 		signedOffBy
 				.getDescriptionControl(footersGroup)
 				.setToolTipText(
-						UIText.CommitDialogPreferencePage_signedOffByTooltip);
+						UIText.CommittingPreferencePage_signedOffByTooltip);
 		addField(signedOffBy);
 		updateMargins(footersGroup);
 
 		IntegerFieldEditor historySize = new IntegerFieldEditor(
 				UIPreferences.COMMIT_DIALOG_HISTORY_SIZE,
-				UIText.CommitDialogPreferencePage_commitMessageHistory, main);
+				UIText.CommittingPreferencePage_commitMessageHistory, main);
 		addField(historySize);
 
 		BooleanFieldEditor includeUntracked = new BooleanFieldEditor(
 				UIPreferences.COMMIT_DIALOG_INCLUDE_UNTRACKED,
-				UIText.CommitDialogPreferencePage_includeUntrackedFiles, main);
+				UIText.CommittingPreferencePage_includeUntrackedFiles, main);
 		includeUntracked.getDescriptionControl(main).setToolTipText(
-				UIText.CommitDialogPreferencePage_includeUntrackedFilesTooltip);
+				UIText.CommittingPreferencePage_includeUntrackedFilesTooltip);
 		addField(includeUntracked);
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 5fa9e8274c..4538965f08 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -953,16 +953,16 @@ RefUpdateElement_CommitRangeDecoration=[{0}{1}{2}]
 RefUpdateElement_statusRejectedNonFastForward=[rejected - non-fast-forward]
 RefUpdateElement_UrisDecoration=({0})
 
-CommitDialogPreferencePage_commitMessageHistory=Maximum number of commit messages in history:
-CommitDialogPreferencePage_title=Commit Dialog
-CommitDialogPreferencePage_formatting=Formatting
-CommitDialogPreferencePage_hardWrapMessage=Hard-wrap commit message
-CommitDialogPreferencePage_hardWrapMessageTooltip=Wrap text in commit message editor while typing
-CommitDialogPreferencePage_footers=Footers
-CommitDialogPreferencePage_includeUntrackedFiles=Include selected untracked files
-CommitDialogPreferencePage_includeUntrackedFilesTooltip=Check selected untracked files by default
-CommitDialogPreferencePage_signedOffBy=Insert Signed-off-by
-CommitDialogPreferencePage_signedOffByTooltip=Insert "Signed-off-by:" footer by default
+CommittingPreferencePage_commitMessageHistory=Maximum number of commit messages in history:
+CommittingPreferencePage_title=Committing
+CommittingPreferencePage_formatting=Formatting
+CommittingPreferencePage_hardWrapMessage=Hard-wrap commit message
+CommittingPreferencePage_hardWrapMessageTooltip=Wrap text in commit message editor while typing
+CommittingPreferencePage_footers=Footers
+CommittingPreferencePage_includeUntrackedFiles=Include selected untracked files
+CommittingPreferencePage_includeUntrackedFilesTooltip=Check selected untracked files by default
+CommittingPreferencePage_signedOffBy=Insert Signed-off-by
+CommittingPreferencePage_signedOffByTooltip=Insert "Signed-off-by:" footer by default
 
 BasicConfigurationDialog_DialogMessage=Git needs your name and e-mail to correctly attribute your commits. Git uses name and e-mail to identify author and committer of a commit.
 BasicConfigurationDialog_DialogTitle=Please identify yourself