Index: src/ch/ch.rc
===================================================================
diff -u -r25129f39720523eca2cb702242890a7862f70ec6 -rdcc6234ed612a75910b8900704c9d564096a037a
--- src/ch/ch.rc	(.../ch.rc)	(revision 25129f39720523eca2cb702242890a7862f70ec6)
+++ src/ch/ch.rc	(.../ch.rc)	(revision dcc6234ed612a75910b8900704c9d564096a037a)
@@ -31,15 +31,15 @@
 //
 
 IDD_MSGBOX_DIALOG DIALOGEX 0, 0, 177, 70
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
 CAPTION "Copy Handler"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Btn2",IDC_SECOND_BUTTON,63,49,50,14
-    PUSHBUTTON      "Btn3",IDC_THIRD_BUTTON,119,49,50,14
+    PUSHBUTTON      "",IDC_SECOND_BUTTON,63,49,50,14
+    PUSHBUTTON      "",IDC_THIRD_BUTTON,119,49,50,14
     ICON            "",IDC_IMAGE_STATIC,13,13,21,20,SS_REALSIZEIMAGE
     CONTROL         "Do not show this again",IDC_BASIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,163,10
-    PUSHBUTTON      "Btn1",IDC_FIRST_BUTTON,7,49,50,14
+    PUSHBUTTON      "",IDC_FIRST_BUTTON,7,49,50,14
     CONTROL         "",IDC_MSG_RICHEDIT,"RichEdit20W",WS_DISABLED | WS_TABSTOP | 0x804,43,13,127,20
     CONTROL         "",IDC_MEASURE_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP | 0x8c4,7,7,11,7
 END
@@ -306,7 +306,7 @@
 END
 
 IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 325, 206
-STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
 CAPTION "Shortcuts editing"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
@@ -329,7 +329,7 @@
 END
 
 IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 325, 190
-STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
 CAPTION "Recent paths"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
@@ -853,6 +853,9 @@
 	IDS_SECURE_CONNECTION_TYPES  "No!Yes!Auto"
 	IDS_BUFFER_QUEUE_DEPTH  "Buffer queue depth"
     IDS_FASTMOVEBEFOREBLOCK_STRING "Use fast move before blocking"
+	IDS_USECUSTOMNAMING             "Use custom naming"
+	IDS_CUSTOMNAME_FIRST            "Name format for first copy (use %name, %ext)"
+	IDS_CUSTOMNAME_SUBSEQUENT       "Name format for the subsequent copies (use %name, %ext, %count)"
 END
 
 STRINGTABLE
@@ -973,8 +976,8 @@
 
 STRINGTABLE
 BEGIN
-    IDS_FIRSTCOPY_STRING    "Copy of %name"
-    IDS_NEXTCOPY_STRING     "Copy (%count) of %name"
+    IDS_FIRSTCOPY_STRING    "%name - copy%ext"
+    IDS_NEXTCOPY_STRING     "%name - copy (%count)%ext"
     IDS_NOTFOUND_STRING     "File not found (doesn't exist)"
     IDS_BYTE_STRING         "B"
     IDS_KBYTE_STRING        "kB"