aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Megert2011-11-17 05:43:56 (EST)
committerDaniel Megert2011-11-17 05:43:56 (EST)
commite1b12f0a00d555b792dc5416d62c329007a57803 (patch)
treeea360fec7168beafc383384795a1655c86158f42
parentef5738cd348767a6d67a4296438f76f821d0252f (diff)
downloadegit-e1b12f0a00d555b792dc5416d62c329007a57803.zip
egit-e1b12f0a00d555b792dc5416d62c329007a57803.tar.gz
egit-e1b12f0a00d555b792dc5416d62c329007a57803.tar.bz2
Remove two duplicate keysrefs/changes/39/4639/1
Removes two property key definition duplicates. Bug 364013 Change-Id: I151a6ddf70de39e89ef914232552b8c927a52bf0 Signed-off-by: Daniel Megert <daniel_megert@ch.ibm.com>
-rw-r--r--org.eclipse.egit.ui/plugin.properties8
1 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index d9de1be..f0a81b9 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -1,9 +1,13 @@
###############################################################################
-# Copyright (c) 2005, 2009 Shawn Pearce and others.
+# Copyright (c) 2005, 2011 Shawn Pearce and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Shawn Pearce - initial implementation
+# Daniel Megert <daniel_megert@ch.ibm.com> - Removed two duplicate keys - http://bugs.eclipse.org/364013
###############################################################################
plugin_name=Git Team Provider UI
@@ -162,7 +166,6 @@ CreatePatchCommand.name = Create Patch
CreateBranchCommand.name = Create Branch
CreateTagCommand.name = Create Tag
ResetCommand.name = Reset
-RebaseCommand.name=Rebase
ResetModeCommandParameter.name = Reset mode
ResetQuickdiffCommand.name = Reset quickdiff baseline
ResetTargetCommandParameter.name = Reset target (HEAD, HEAD^1)
@@ -243,7 +246,6 @@ ConfigureTraceCommand.name = Configure Git Debug Trace
PullIntoCurrentBranchMenuLabel = P&ull
CherryPickCommand.name = CherryPick
RevertCommand.name = Revert Commit
-MergeCommand.name = Merge
RebaseCurrentCommand.name = Rebase
RepoViewPullMenu.label = P&ull