From 8960f5857c32db608b63035a92a274a54695e33f Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 13:25:38 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

---
 Pman.Dialog.CoreEnumMerge.bjs | 4 ++--
 Pman.Dialog.CoreEnumMerge.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 2dea58ba..6285b5d4 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -7,11 +7,11 @@
  "modOrder" : "001",
  "strings" : {
   "99b344c8ae43e3e7213862b8f35c4e51" : "Select Company",
+  "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel",
-  "e26f3a67ad6487fd02ffcab189214302" : "Merge Supplier",
   "9675747b5ab12d05f18518761e68a533" : "Select Companies"
  },
  "items" : [
@@ -21,7 +21,7 @@
    },
    "modal" : true,
    "collapsible" : false,
-   "title" : "Merge Supplier",
+   "title" : "Merge Pulldown Option",
    "xtype" : "LayoutDialog",
    "width" : 400,
    "$ xns" : "Roo",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index b840dc5b..bd8c6167 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -8,11 +8,11 @@ Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
   '99b344c8ae43e3e7213862b8f35c4e51' :"Select Company",
+  '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
-  'e26f3a67ad6487fd02ffcab189214302' :"Merge Supplier",
   '9675747b5ab12d05f18518761e68a533' :"Select Companies"
  },
 
@@ -45,7 +45,7 @@ Pman.Dialog.CoreEnumMerge = {
     height : 120,
     modal : true,
     resizable : false,
-    title : _this._strings['e26f3a67ad6487fd02ffcab189214302'] /* Merge Supplier */,
+    title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
     width : 400,
     xns : Roo,
     '|xns' : 'Roo',
-- 
2.39.2