diff options
author | Michael Valenta | 2007-05-07 15:51:31 +0000 |
---|---|---|
committer | Michael Valenta | 2007-05-07 15:51:31 +0000 |
commit | 219662caa577affdf5a27e5375df3ae25737846f (patch) | |
tree | 5256565a9f46c443a7b1f02017a8623655b7f9e7 /bundles/org.eclipse.team.cvs.ui | |
parent | f5af8de805bc9e9554c64bbaa7b80ec4c6406490 (diff) | |
download | eclipse.platform.team-219662caa577affdf5a27e5375df3ae25737846f.tar.gz eclipse.platform.team-219662caa577affdf5a27e5375df3ae25737846f.tar.xz eclipse.platform.team-219662caa577affdf5a27e5375df3ae25737846f.zip |
Bug 183951 Team > CVS preference page should include keywords 'timeout' and 'connection'
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/plugin.properties | 27 | ||||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/plugin.xml | 35 |
2 files changed, 40 insertions, 22 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties index a82d99bf2..5105cb122 100644 --- a/bundles/org.eclipse.team.cvs.ui/plugin.properties +++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties @@ -31,14 +31,15 @@ CVSMergeParticipant=CVS Merge CVSCompareParticipant=CVS Compare PreferencePage.name=CVS +AnnotatePreferencePage.name=Annotate +CommentTemplatesPreferencePage.name=Comment Templates ConsolePreferencePage.name=Console -DecoratorPreferencePage.name=Label Decorations ExtMethodPreferencePage.name=Ext Connection Method -ProxyPreferencePage.name=Proxy Settings -WatchEditPreferencePage.name=Watch/Edit +DecoratorPreferencePage.name=Label Decorations +PasswordManagementPreferencePage.name=Password Management ComparePreferencePage.name=Synchronize/Compare UpdateMergePreferencePage.name=Update/Merge -AnnotatePreferencePage.name=Annotate +WatchEditPreferencePage.name=Watch/Edit newWizardCategoryName=CVS newProjectCheckoutWizard=Projects from CVS @@ -242,7 +243,6 @@ ViewCommand.annotateView.description=Show the CVS Annotate view newProjectCheckoutWizardDescription=Checkout one or more projects from a CVS Repository. newProjectCheckoutWizardDescription2=Create a new project by checking out an existing project from a CVS repository. -PasswordManagement=Password Management OutgoingChangeForegroundColor.label=Outgoing Change (Foreground) OutgoingChangeForegroundColor.description=This color is used for the foreground color for resources that have outgoing changes. @@ -259,17 +259,20 @@ IgnoredResourceBackgroundColor.description=This color is used for the background CVSHistoryCategory.label=CVS History Page Categories (Foreground) CVSHistoryCategory.description=This color is used for the foreground color for all categories diplayed for CVS resources in the history view. -PreferenceKeywords.CVS=CVS Team -PreferenceKeywords.EXT=CVS Team ext connection method ssh -PreferenceKeywords.Console=CVS team console colors -PreferenceKeywords.Annotate=CVS Team Annotate -PreferenceKeywords.Compare=CVS Team compare model change set +PreferenceKeywords.CVS=cvs team share timeout connection +PreferenceKeywords.Annotate=cvs team annotate +PreferenceKeywords.Comment=cvs team comment templates +PreferenceKeywords.Console=cvs team console colors +PreferenceKeywords.EXT=cvs team ext connection method ssh ssh2 +PreferenceKeywords.Decorator=cvs team label decorations text icons flag +PreferenceKeywords.Password=cvs team password management username +PreferenceKeywords.Compare=cvs team compare synchronize model change set +PreferenceKeywords.Update=cvs team update merge conflict +PreferenceKeywords.Watch=cvs team watch editors notification RepoPreference.Name=CVS Repositories RepoPreference.Description=Preferences that contain the CVS repository connection information -CommentTemplatesPreferencePage.name=Comment Templates - FetchAllMembers.label=Expand All FetchAllMembers.tooltip=Expand the entire folder in a single round trip diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml index e8cb07f6e..89a792987 100644 --- a/bundles/org.eclipse.team.cvs.ui/plugin.xml +++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml @@ -800,17 +800,32 @@ label="%PreferenceKeywords.CVS" id="org.eclipse.team.cvs.ui.cvs"/> <keyword - label="%PreferenceKeywords.EXT" - id="org.eclipse.team.cvs.ui.cvs.ext"/> + id="org.eclipse.team.cvs.ui.cvs.annotate" + label="%PreferenceKeywords.Annotate"/> + <keyword + id="org.eclipse.team.cvs.ui.cvs.comment" + label="%PreferenceKeywords.Comment"/> <keyword label="%PreferenceKeywords.Console" id="org.eclipse.team.cvs.ui.cvs.console"/> <keyword - id="org.eclipse.team.cvs.ui.cvs.annotate" - label="%PreferenceKeywords.Annotate"/> + label="%PreferenceKeywords.EXT" + id="org.eclipse.team.cvs.ui.cvs.ext"/> + <keyword + id="org.eclipse.team.cvs.ui.cvs.decorator" + label="%PreferenceKeywords.Decorator"/> + <keyword + id="org.eclipse.team.cvs.ui.cvs.password" + label="%PreferenceKeywords.Password"/> <keyword id="org.eclipse.team.cvs.ui.cvs.compare" label="%PreferenceKeywords.Compare"/> + <keyword + id="org.eclipse.team.cvs.ui.cvs.update" + label="%PreferenceKeywords.Update"/> + <keyword + id="org.eclipse.team.cvs.ui.cvs.watch" + label="%PreferenceKeywords.Watch"/> </extension> <extension point="org.eclipse.ui.preferencePages"> @@ -839,7 +854,7 @@ category="org.eclipse.team.cvs.ui.CVSPreferences" class="org.eclipse.team.internal.ccvs.ui.CommentTemplatesPreferencePage" id="org.eclipse.team.cvs.ui.CommentTemplatesPreferences"> - <keywordReference id="org.eclipse.team.cvs.ui.cvs"/> + <keywordReference id="org.eclipse.team.cvs.ui.cvs.comment"/> </page> </extension> <extension @@ -859,7 +874,7 @@ category="org.eclipse.team.cvs.ui.CVSPreferences" class="org.eclipse.team.internal.ccvs.ui.CVSDecoratorPreferencesPage" id="org.eclipse.team.cvs.ui.CVSDecoratorPreferences"> - <keywordReference id="org.eclipse.team.cvs.ui.cvs"/> + <keywordReference id="org.eclipse.team.cvs.ui.cvs.decorator"/> </page> </extension> <extension @@ -879,17 +894,17 @@ category="org.eclipse.team.cvs.ui.CVSPreferences" class="org.eclipse.team.internal.ccvs.ui.WatchEditPreferencePage" id="org.eclipse.team.cvs.ui.WatchEditPreferencePage"> - <keywordReference id="org.eclipse.team.cvs.ui.cvs"/> + <keywordReference id="org.eclipse.team.cvs.ui.cvs.watch"/> </page> </extension> <extension point="org.eclipse.ui.preferencePages"> <page - name="%PasswordManagement" + name="%PasswordManagementPreferencePage.name" category="org.eclipse.team.cvs.ui.CVSPreferences" class="org.eclipse.team.internal.ccvs.ui.PasswordManagementPreferencePage" id="org.eclipse.team.cvs.ui.PasswordManagementPreferencePage"> - <keywordReference id="org.eclipse.team.cvs.ui.cvs.ext"/> + <keywordReference id="org.eclipse.team.cvs.ui.cvs.password"/> </page> </extension> <extension @@ -899,7 +914,7 @@ class="org.eclipse.team.internal.ccvs.ui.UpdateMergePreferencePage" id="org.eclipse.team.cvs.ui.UpdateMergePreferences" name="%UpdateMergePreferencePage.name"> - <keywordReference id="org.eclipse.team.cvs.ui.cvs"/> + <keywordReference id="org.eclipse.team.cvs.ui.cvs.update"/> </page> </extension> |