Index: src/ch/ch.rc
===================================================================
diff -u -N -re6f64ea0eecaf86dfa1a42c80604d227b69be768 -ref2f46d0fc21e0006c7d11b12f94049f4546476e
--- src/ch/ch.rc	(.../ch.rc)	(revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
+++ src/ch/ch.rc	(.../ch.rc)	(revision ef2f46d0fc21e0006c7d11b12f94049f4546476e)
@@ -87,17 +87,18 @@
     LTEXT           "Encountered an error while processing file.",IDC_HEADER_STATIC,7,7,261,8
     CONTROL         "C&ustom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,7,132,81,14
     CONTROL         "&Pause",IDC_PAUSE_BUTTON,"MfcButton",WS_TABSTOP,97,132,81,14
-    CONTROL         "&Cancel",IDC_CANCEL_BUTTON,"MfcButton",WS_TABSTOP,187,132,81,14
+    CONTROL         "&Cancel",IDCANCEL,"MfcButton",WS_TABSTOP,187,132,81,14
     CONTROL         "&Skip",IDC_SKIP_BUTTON,"MfcMenuButton",WS_TABSTOP,187,112,81,14
     CONTROL         "&Retry",IDC_RETRY_BUTTON,"MfcMenuButton",WS_TABSTOP,97,112,81,14
-    EDITTEXT        IDC_FILENAME_EDIT,92,40,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Names:",IDC_NAMES_STATIC,45,40,45,8
-    EDITTEXT        IDC_OPERATION_EDIT,92,65,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "Operation:",IDC_OPERATION_STATIC,45,65,45,8
-    EDITTEXT        IDC_SYSTEM_ERROR_EDIT,92,77,169,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,45,8
-    EDITTEXT        IDC_SECOND_FILENAME_EDIT,92,52,169,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    EDITTEXT        IDC_FILENAME_EDIT,103,40,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "File:",IDC_SRC_NAME_STATIC,45,40,54,8
+    EDITTEXT        IDC_OPERATION_EDIT,103,65,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "Operation:",IDC_OPERATION_STATIC,45,65,54,8
+    EDITTEXT        IDC_SYSTEM_ERROR_EDIT,103,77,158,24,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "System error:",IDC_SYSTEM_ERROR_STATIC,45,77,54,8
+    EDITTEXT        IDC_SECOND_FILENAME_EDIT,103,52,158,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
     GROUPBOX        "Error details",IDC_ERROR_DETAILS_STATIC,7,22,261,86
+    LTEXT           "Alternate file:",IDC_DST_NAME_STATIC,45,52,54,8
 END
 
 IDD_MINIVIEW_DIALOG DIALOGEX 0, 0, 91, 23
@@ -1333,7 +1334,7 @@
 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, 
 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 
 0x4f65, 0x526e, 0x6769, 0x7468, "\076" 
-    IDC_CANCEL_BUTTON, 0x37c, 369, 0
+    IDCANCEL, 0x37c, 369, 0
 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, 
 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, 
 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69,