| commit | b88ae3aee1543a3ba0a51901998999ed47f44852 | [log] [tgz] |
|---|---|---|
| author | Matt Casters <mattcasters@gmail.com> | Fri Apr 10 12:00:46 2020 +0200 |
| committer | Matt Casters <mattcasters@gmail.com> | Fri Apr 10 12:00:46 2020 +0200 |
| tree | 56d778ca5d3095f01bb2fd0282c8a8bf0338bc27 | |
| parent | 47bc02712fc373d73fed57b101873ab591e05bc1 [diff] | |
| parent | d9fb84fa660e7c15a4cfa8fbd8cc2077e3fa34bd [diff] |
Merge branch 'master' of github.com:project-hop/hop
diff --git a/plugins/transforms/fieldschangesequence/src/main/resources/org/apache/hop/pipeline/transforms/fieldschangesequence/messages/messages_en_US.properties b/plugins/transforms/fieldschangesequence/src/main/resources/org/apache/hop/pipeline/transforms/fieldschangesequence/messages/messages_en_US.properties index 2d881c8..8b474c7 100644 --- a/plugins/transforms/fieldschangesequence/src/main/resources/org/apache/hop/pipeline/transforms/fieldschangesequence/messages/messages_en_US.properties +++ b/plugins/transforms/fieldschangesequence/src/main/resources/org/apache/hop/pipeline/transforms/fieldschangesequence/messages/messages_en_US.properties
@@ -1,5 +1,5 @@ BaseTransform.TypeLongDesc.FieldsChangeSequence=Add value fields changing sequence -BaseTransform.TypeTooltipDesc.FieldsChangeSequence=Add sequence depending of fields value change.\nEach time value of at least one field change, PDI will reset sequence. +BaseTransform.TypeTooltipDesc.FieldsChangeSequence=Add sequence depending of fields value change.\nEach time value of at least one field change, transform will reset sequence. ##################################################################### ##
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java index 126a7e6..e11a45a 100644 --- a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java +++ b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
@@ -629,7 +629,6 @@ } @GuiMenuElement( id = ID_MAIN_MENU_TOOLS_OPTIONS, type = GuiElementType.MENU_ITEM, label = "Options...", parentId = ID_MAIN_MENU_TOOLS_PARENT_ID ) - @GuiKeyboardShortcut( key = SWT.F8 ) public void menuToolsOptions() { if (new EnterOptionsDialog( hopGui.getShell() ).open()!=null) { props.saveProps();