Merge branch 'develop' into unify_derivative_views

diff --cc eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index 8247b5d6c70d0e34a7581e3cc808932ae08c8a4c,55c9c006b7565d7affc579117b18ac9f03a0db96..d6cc82eab6afb4ebd88098025c85e00b3b2df4ea
--- 1/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
--- 2/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@@ -160,4 -161,5 +160,5 @@@ commandParameter.name = taxonUUI
  Bundle-Name = Editor Bundle\r
  command.name.48 = delete\r
  command.name.49 = delete\r
- command.name.50 = delete
+ command.name.50 = delete\r
 -command.name.51 = delete
++command.name.51 = delete

diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
Simple merge

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
Simple merge