OO-3846: wording of taxonomy merge / delete operations

src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java

@@ -92,9 +92,9 @@ public class MergeTaxonomyLevelController extends FormBasicController {
 		mergeToEl = uifactory.addDropdownSingleselect("mergeto", "merge.to", formLayout,
 				keyList.toArray(new String[keyList.size()]), valueList.toArray(new String[valueList.size()]), null);
 		mergeToEl.setEscapeHtml(false);
-
+		
 		uifactory.addFormCancelButton("cancel", formLayout, ureq, getWindowControl());
-		uifactory.addFormSubmitButton("delete", formLayout);
+		uifactory.addFormSubmitButton("merge.taxonomy.level", formLayout);
 	}
 	
 	private void buildMergeToSelection(TreeNode node, String identation, List<String> keys, List<String> values) {

src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html

@@ -23,10 +23,12 @@
 			</div>
 		</div>
 	#end
-	<div class="o_button_group">
+	<div class="form-group clearfix">
+		<div class="col-sm-offset-3 col-sm-9 ">
 		$r.render("cancel")
 		#if($r.available("delete"))
 			$r.render("delete")
 		#end
+		</div>
 	</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html

-<div class="o_form form-horizontal" role="form">
+<div class="o_form form-horizontal clearfix" role="form">
 	#if($r.isNotEmpty($errorMsg))
 		<div class="o_error">$errorMsg</div>
 	#else
@@ -11,10 +11,12 @@
 			</div>
 		</div>
 	#end
-	<div class="o_button_group">
-		$r.render("cancel")
-		#if($r.available("delete"))
-			$r.render("delete")
-		#end
+	<div class="form-group clearfix">
+		<div class="col-sm-offset-3 col-sm-9 ">
+			$r.render("cancel")
+			#if($r.available("merge.taxonomy.level"))
+				$r.render("merge.taxonomy.level")
+			#end
+		</div>
 	</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties

@@ -62,7 +62,7 @@ level.visible=Sichtbar
 level.types.to.assign=Ebenentypen
 manage=Verwalten
 merge.taxonomy.level=Zusammenf\u00FChren
-merge.to=Zusammenf\u00FChren
+merge.to=Zusammenf\u00FChren in
 move.taxonomy.level=Verschieben
 move.taxonomy.level.title="{0}" verschieben
 move.taxonomy.levels.title=Verschieben

src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties

@@ -62,7 +62,7 @@ level.types.to.assign=Level types
 level.visible=Visible
 manage=Manage
 merge.taxonomy.level=Merge
-merge.to=Merge
+merge.to=Merge in
 move.taxonomy.level=Move
 move.taxonomy.level.title=Move "{0}"
 move.taxonomy.levels.title=Move

src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties

@@ -62,7 +62,7 @@ level.types.to.assign=Types de niveaux
 level.visible=Visible
 manage=G\u00E9rer
 merge.taxonomy.level=Fusionner
-merge.to=Fusionner
+merge.to=Fusionner avec
 move.taxonomy.level=D\u00E9placer
 move.taxonomy.level.title=D\u00E9placer "{0}"
 move.taxonomy.levels.title=D\u00E9placer

src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties

@@ -62,7 +62,7 @@ level.types.to.assign=Tipos de n\u00EDvel
 level.visible=Vis\u00EDvel
 manage=Gerenciar
 merge.taxonomy.level=Mesclar
-merge.to=Mesclar
+merge.to=Mesclar em
 move.taxonomy.level=Mover
 move.taxonomy.level.title=Mover "{0}"
 move.taxonomy.levels.title=Mover