diff options
author | Simon Delisle | 2016-06-30 14:55:13 +0000 |
---|---|---|
committer | Laurent Delaigue | 2016-09-12 14:59:24 +0000 |
commit | 10679ac6b633f8877a0ed83c2cfd6d44ed791cbc (patch) | |
tree | 012bee52659adeec0701f5206e621a565cb5b75a /plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties | |
parent | ae818ac53b9dc7429ec5cc5f501d71abdfe0d430 (diff) | |
download | org.eclipse.emf.compare-10679ac6b633f8877a0ed83c2cfd6d44ed791cbc.tar.gz org.eclipse.emf.compare-10679ac6b633f8877a0ed83c2cfd6d44ed791cbc.tar.xz org.eclipse.emf.compare-10679ac6b633f8877a0ed83c2cfd6d44ed791cbc.zip |
[495753] Fix preference pages inconsistent layouts
Reworked the layout of all preference pages to be more consistent and
scalable.
Bug: 495753
Change-Id: I3257de5507df50de0b8c7f75a80b39871462e1ff
Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Signed-off-by: Simon Delisle <simon.delisle@ericsson.com>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties')
-rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties index b3a9e8014..fd77e3408 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2013, 2016 Obeo. +# Copyright (c) 2013, 2016 Obeo 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 @@ -8,6 +8,7 @@ # Contributors: # Obeo - initial API and implementation # Philip Langer - bug 493921 +# Simon Delisle - bug 495753 ################################################################################ ## note : apostrophes need to be doubled in these messages or they'll be ignored TableMergeViewer.directResourceContentsLabel = resource contents @@ -19,9 +20,9 @@ SynchronizerDialog.hyperlink.message = <a>See EMF Compare preferences</a> SynchronizerDialog.notAskAgain.label = Do not ask me again. FilterActionMenu.tooltip = Filters FilterAction.synchronization.dialog.title = Filters preference -FilterAction.synchronization.dialog.message = Would you like to remember the filters selection for next comparison? +FilterAction.synchronization.dialog.message = Would you like to remember the selected filters for next comparison? GroupAction.synchronization.dialog.title = Group preference -GroupAction.synchronization.dialog.message = Would you like to remember the group selection for next comparison? +GroupAction.synchronization.dialog.message = Would you like to remember the selected group for next comparison? GroupActionMenu.tooltip = Groups @@ -36,8 +37,8 @@ ThreeWayComparisonGroupProvider.right.label = Right Side BasicDifferenceGroup.name = Group -InteractiveFilterUIContent.sync.behavior.group.label = Automatic behavior -InteractiveFilterUIContent.sync.behavior.label = Synchronize current filter selection: +InteractiveFilterUIContent.sync.behavior.group.label = Remember selected filters +InteractiveFilterUIContent.sync.behavior.label = Remember user-selected filters in future comparisons: # Messages for preference pages. @@ -53,8 +54,8 @@ InteractiveUIContent.descriptionComposite.label = Description InteractiveUIContent.incorrectSelection.title = Incorrect selection InteractiveUIContent.incorrectSelection.message = At least one item has to be selected. -GroupsInteractiveContent.SYNC_BEHAVIOR_GROUP_LABEL = Automatic behavior -GroupsInteractiveContent.SYNC_BEHAVIOR_LABEL = Synchronize current group selection: +GroupsInteractiveContent.SYNC_BEHAVIOR_GROUP_LABEL = Remember selected groups +GroupsInteractiveContent.SYNC_BEHAVIOR_LABEL = Remember user-selected group in future comparisons: GroupsInteractiveContent.ALWAYS_COMBO_LABEL = Always GroupsInteractiveContent.NEVER_COMBO_LABEL = Never GroupsInteractiveContent.ASK_EACH_TIME_LABEL = Ask each time @@ -68,11 +69,11 @@ EditorPreferencePage.mainTab.label = Main EditorPreferencePage.mainTab.colorHyperLink.label = See <a>''Color and Fonts''</a> preferences for EMF Compare colors. FiltersPreferencePage.INTRO_SELECT_TEXT = Select the filters that should be enabled by default\: -FiltersPreferencePage.activateIntro.text = Deactivating filters entirely prevents them from being applied and hides them from the list of available\n filters in the drop-down filter menu in the compare editor. If a filter is deactivated below, but enabled\n in the Enabled/Disabled tab, the filter will be deactivated and hidden. +FiltersPreferencePage.activateIntro.text = Deactivating filters entirely prevents them from being applied and hides them from the list of available filters in the drop-down filter menu in the compare editor. If a filter is deactivated below, but enabled in the Enabled/Disabled tab, the filter will be deactivated and hidden. FiltersPreferencePage.INTRO_DEACTIVATE_TEXT = Select the filters that should be active (the others will be completely ignored)\: FiltersPreferencePage.activate.tab.label = Activate/Deactivate FiltersPreferencePage.select.tab.label = Enable/Disable -FiltersPreferencePage.selectIntro.text = You can configure whether filters should be enabled or disabled by default. You can still enable or\n disable them using the drop-down filter menu in the compare editor. Note that 'disabled' filters may\n still have an impact on the differences shown in the compare editor. +FiltersPreferencePage.selectIntro.text = You can configure whether filters should be enabled or disabled by default. You can still enable or disable them using the drop-down filter menu in the compare editor. Note that 'disabled' filters may still have an impact on the differences shown in the compare editor. EnginesPreferencePage.differenceEngine.tab.label = Difference EnginesPreferencePage.equivalenceEngine.tab.label = Equivalence @@ -85,8 +86,9 @@ EnginesPreferencePage.equiEngineIntro.text = Select the equivalence engine to us EnginesPreferencePage.reqEngineIntro.text = Select the requirement engine to use: EnginesPreferencePage.conflictDetectorIntro.text = Select the conflict detector to use: -AdapterFactoryPreferencePage.itemProviderGroup.text = Item providers +AdapterFactoryPreferencePage.itemProviderGroup.text = Item Providers AdapterFactoryPreferencePage.descriptionGroup.text = Description +AdapterFactoryPreferencePage.preferencePage.description = Select active item providers used in the comparison editor: LoggingPreferencePage.preferencePage.description = Logging in EMFCompare LoggingPreferencePage.log.level = Log level: |