From: Alan Knowles <alan@roojs.com>
Date: Thu, 30 Aug 2018 07:05:40 +0000 (+0800)
Subject: Pman.Dialog.CoreEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=5c0998a240fb0e4b24f44c93c6d30dbd29373834

Pman.Dialog.CoreEnumMerge.bjs
Pman.Dialog.CoreEnumMerge.js
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index d690d452..9bc8b6b7 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -6,10 +6,10 @@
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
+  "6fd3ea70e4ce522aad292a75f2e16886" : "And replace with:",
   "8324cdec05065c4bd7d8c5effdf43edf" : "Delete this",
   "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
-  "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
@@ -18,7 +18,7 @@
   "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
   "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
   "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
-  "_merge_id_name_fieldLabel" : "03e956f1dca2b4d525df03cb1899cb6f"
+  "_merge_id_name_fieldLabel" : "6fd3ea70e4ce522aad292a75f2e16886"
  },
  "items" : [
   {
@@ -33,7 +33,7 @@
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
-   "height" : 120,
+   "height" : 160,
    "items" : [
     {
      "xtype" : "LayoutRegion",
@@ -66,7 +66,7 @@
          "alwaysQuery" : true,
          "listWidth" : 400,
          "triggerAction" : "all",
-         "fieldLabel" : "Merge with",
+         "fieldLabel" : "And replace with:",
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 03192dcf..d9e72160 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,10 +7,10 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
+  '6fd3ea70e4ce522aad292a75f2e16886' :"And replace with:",
   '8324cdec05065c4bd7d8c5effdf43edf' :"Delete this",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
-  '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
@@ -19,7 +19,7 @@ Pman.Dialog.CoreEnumMerge = {
   '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
   '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
-  '_merge_id_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */ 
+  '_merge_id_name_fieldLabel' : '6fd3ea70e4ce522aad292a75f2e16886' /* And replace with: */ 
  },
 
  dialog : false,
@@ -49,7 +49,7 @@ Pman.Dialog.CoreEnumMerge = {
     xtype : 'LayoutDialog',
     closable : false,
     collapsible : false,
-    height : 120,
+    height : 160,
     modal : true,
     resizable : false,
     title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
@@ -157,7 +157,7 @@ Pman.Dialog.CoreEnumMerge = {
           alwaysQuery : true,
           displayField : 'name',
           emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
+          fieldLabel : _this._strings['6fd3ea70e4ce522aad292a75f2e16886'] /* And replace with: */,
           forceSelection : true,
           hiddenName : '_merge_id',
           listWidth : 400,