diff options
| author | Chris Aniszczyk | 2010-05-24 13:57:02 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2010-05-24 13:57:02 +0000 |
| commit | 567f2c0ef7e710482fe8d3e2bd2bd0079c1d6132 (patch) | |
| tree | 96acecaff7a8bf19bfca20659dea70cb6561cefe | |
| parent | 8ada6f7964642ea8ce50c42eaa5ecc1e234e36f6 (diff) | |
| download | egit-567f2c0ef7e710482fe8d3e2bd2bd0079c1d6132.tar.gz egit-567f2c0ef7e710482fe8d3e2bd2bd0079c1d6132.tar.xz egit-567f2c0ef7e710482fe8d3e2bd2bd0079c1d6132.zip | |
'Label Decorations' preference page has conflicting mnemonics
Bug: 309609
Change-Id: I003fa85ecf1934a02e4b14ff6f788dd69cb11d24
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
3 files changed, 10 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 572989811c..8c5c3324bb 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -1417,6 +1417,12 @@ public class UIText extends NLS { public static String DecoratorPreferencesPage_addVariablesAction; /** */ + public static String DecoratorPreferencesPage_addVariablesAction2; + + /** */ + public static String DecoratorPreferencesPage_addVariablesAction3; + + /** */ public static String DecoratorPreferencesPage_recomputeAncestorDecorations; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java index 908cd25499..a4b64e6965 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java @@ -364,12 +364,12 @@ public class GitDecoratorPreferencePage extends PreferencePage implements UIPreferences.DECORATOR_FILETEXT_DECORATION); folderTextFormat = new FormatEditor(composite, UIText.DecoratorPreferencesPage_folderFormatLabel, - UIText.DecoratorPreferencesPage_addVariablesAction, + UIText.DecoratorPreferencesPage_addVariablesAction2, FILE_AND_FOLDER_BINDINGS, UIPreferences.DECORATOR_FOLDERTEXT_DECORATION); projectTextFormat = new FormatEditor(composite, UIText.DecoratorPreferencesPage_projectFormatLabel, - UIText.DecoratorPreferencesPage_addVariablesAction, + UIText.DecoratorPreferencesPage_addVariablesAction3, PROJECT_BINDINGS, UIPreferences.DECORATOR_PROJECTTEXT_DECORATION); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index 92a05ac153..0aadbcc311 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -518,6 +518,8 @@ MergeTargetSelectionDialog_TitleMerge=Merge: {0} DecoratorPreferencesPage_addVariablesTitle=Add Variables DecoratorPreferencesPage_addVariablesAction=Add &Variables... +DecoratorPreferencesPage_addVariablesAction2=Add Va&riables... +DecoratorPreferencesPage_addVariablesAction3=Add Var&iables... DecoratorPreferencesPage_recomputeAncestorDecorations=Re-decorate &ancestors when decorating changed resources DecoratorPreferencesPage_recomputeAncestorDecorationsTooltip=Enabling this option will cause the ancestor-tree of any updated resources to also be re-decorated (minor performance impact). DecoratorPreferencesPage_computeRecursiveLimit=Maximum number of levels to recurse for container decoration: |