diff --git a/migration/i2.0/oracle/201403072215_IDEMPIERE-85.sql b/migration/i2.0/oracle/201403072215_IDEMPIERE-85.sql
new file mode 100644
index 0000000000..42a721e3e8
--- /dev/null
+++ b/migration/i2.0/oracle/201403072215_IDEMPIERE-85.sql
@@ -0,0 +1,23 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Mar 7, 2014 10:13:16 PM COT
+-- IDEMPIERE-85 Add confirmation on TreeMaintenance when moving all nodes
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Add to Tree',200255,'D','0f54ecd3-b5ea-47de-8ff9-a3a7ffe0826f','AddToTree','Y',TO_DATE('2014-03-07 22:13:15','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2014-03-07 22:13:15','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:32 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Add ALL to Tree',200256,'D','b544cbd4-9d28-401d-93a5-6351b6480108','AddAllToTree','Y',TO_DATE('2014-03-07 22:13:32','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2014-03-07 22:13:32','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:44 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Delete from Tree',200257,'D','27c456c5-4044-4502-8e7b-f42e1097f25b','DeleteFromTree','Y',TO_DATE('2014-03-07 22:13:43','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2014-03-07 22:13:43','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:54 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Delete ALL from Tree',200258,'D','ed972baa-3e1b-4819-b62a-fbf8047cd62d','DeleteAllFromTree','Y',TO_DATE('2014-03-07 22:13:53','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2014-03-07 22:13:53','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+SELECT register_migration_script('201403072215_IDEMPIERE-85.sql') FROM dual
+;
+
diff --git a/migration/i2.0/postgresql/201403072215_IDEMPIERE-85.sql b/migration/i2.0/postgresql/201403072215_IDEMPIERE-85.sql
new file mode 100644
index 0000000000..a7076898a5
--- /dev/null
+++ b/migration/i2.0/postgresql/201403072215_IDEMPIERE-85.sql
@@ -0,0 +1,20 @@
+-- Mar 7, 2014 10:13:16 PM COT
+-- IDEMPIERE-85 Add confirmation on TreeMaintenance when moving all nodes
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Add to Tree',200255,'D','0f54ecd3-b5ea-47de-8ff9-a3a7ffe0826f','AddToTree','Y',TO_TIMESTAMP('2014-03-07 22:13:15','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2014-03-07 22:13:15','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:32 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Add ALL to Tree',200256,'D','b544cbd4-9d28-401d-93a5-6351b6480108','AddAllToTree','Y',TO_TIMESTAMP('2014-03-07 22:13:32','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2014-03-07 22:13:32','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:44 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Delete from Tree',200257,'D','27c456c5-4044-4502-8e7b-f42e1097f25b','DeleteFromTree','Y',TO_TIMESTAMP('2014-03-07 22:13:43','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2014-03-07 22:13:43','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+-- Mar 7, 2014 10:13:54 PM COT
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Client_ID,AD_Org_ID) VALUES ('I','Delete ALL from Tree',200258,'D','ed972baa-3e1b-4819-b62a-fbf8047cd62d','DeleteAllFromTree','Y',TO_TIMESTAMP('2014-03-07 22:13:53','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2014-03-07 22:13:53','YYYY-MM-DD HH24:MI:SS'),0,0)
+;
+
+SELECT register_migration_script('201403072215_IDEMPIERE-85.sql') FROM dual
+;
+
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java
index b3738aa3a8..4c39b65cbc 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeMaintenance.java
@@ -125,10 +125,10 @@ public class VTreeMaintenance extends TreeMaintenance
 		cbAllNodes.setEnabled (false);
 		cbAllNodes.setText (Msg.translate(Env.getCtx(), "IsAllNodes"));
 		treeInfo.setText (" ");
-		bAdd.setToolTipText("Add to Tree");
-		bAddAll.setToolTipText("Add ALL to Tree");
-		bDelete.setToolTipText("Delete from Tree");
-		bDeleteAll.setToolTipText("Delete ALL from Tree");
+		bAdd.setToolTipText(Msg.getMsg(Env.getCtx(), "AddToTree"));
+		bAddAll.setToolTipText(Msg.getMsg(Env.getCtx(), "AddAllToTree"));
+		bDelete.setToolTipText(Msg.getMsg(Env.getCtx(), "DeleteFromTree"));
+		bDeleteAll.setToolTipText(Msg.getMsg(Env.getCtx(), "DeleteAllFromTree"));
 		bAdd.addActionListener(this);
 		bAddAll.addActionListener(this);
 		bDelete.addActionListener(this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
index 31b22cc166..d2320afacd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
@@ -144,10 +144,10 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
 		cbAllNodes.setEnabled (false);
 		cbAllNodes.setText (Msg.translate(Env.getCtx(), "IsAllNodes"));
 		treeInfo.setText (" ");
-		bAdd.setTooltiptext("Add to Tree");
-		bAddAll.setTooltiptext("Add ALL to Tree");
-		bDelete.setTooltiptext("Delete from Tree");
-		bDeleteAll.setTooltiptext("Delete ALL from Tree");
+		bAdd.setTooltiptext(Msg.getMsg(Env.getCtx(), "AddToTree"));
+		bAddAll.setTooltiptext(Msg.getMsg(Env.getCtx(), "AddAllToTree"));
+		bDelete.setTooltiptext(Msg.getMsg(Env.getCtx(), "DeleteFromTree"));
+		bDeleteAll.setTooltiptext(Msg.getMsg(Env.getCtx(), "DeleteAllFromTree"));
 		bAdd.addActionListener(this);
 		bAddAll.addActionListener(this);
 		bDelete.addActionListener(this);