Pman.Dialog.CoreEnumMerge.bjs

[Pman.Core] / Pman.Dialog.CoreEnumMerge.bjs

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 89cafd5..ab7ca11 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -6,13 +6,12 @@
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "99b344c8ae43e3e7213862b8f35c4e51" : "Select Company",
+  "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
   "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
-  "ea4788705e6873b424c65e91c2846b19" : "Cancel",
-  "9675747b5ab12d05f18518761e68a533" : "Select Companies"
+  "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
  "items" : [
   {
@@ -60,8 +59,8 @@
          "selectOnFocus" : true,
          "pageSize" : 20,
          "displayField" : "name",
-         "emptyText" : "Select Company",
-         "hiddenName" : "_merge_with_id",
+         "emptyText" : "Select Item to Merge With",
+         "hiddenName" : "_merge_id",
          "minChars" : 2,
          "valueField" : "id",
          "xtype" : "ComboBox",
@@ -69,8 +68,8 @@
          "typeAhead" : true,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "_merge_with_id_name",
-         "qtip" : "Select Companies",
+         "name" : "_merge_id_name",
+         "qtip" : "Select Item to Merge With",
          "queryParam" : "query[name]",
          "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
          "loadingText" : "Searching...",