projects
/
Pman.Admin
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pman.Dialog.AdminEnumMerge.bjs
[Pman.Admin]
/
Pman.Dialog.AdminEnumMerge.js
diff --git
a/Pman.Dialog.AdminEnumMerge.js
b/Pman.Dialog.AdminEnumMerge.js
index
caf024c
..
81e07f4
100644
(file)
--- a/
Pman.Dialog.AdminEnumMerge.js
+++ b/
Pman.Dialog.AdminEnumMerge.js
@@
-12,6
+12,9
@@
Pman.Dialog.AdminEnumMerge = {
'ea4788705e6873b424c65e91c2846b19' :"Cancel",
'e0aa021e21dddbd6d8cecec71e9cf564' :"OK"
},
+ _named_strings : {
+ 'merge_display_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */
+ },
dialog : false,
callback: false,