Index: src/ictranslate/ictranslate.rc
===================================================================
diff -u -N -r50fea83cc4ee863edac0fd3960e2249f99c33b03 -r2ffaff594233ce671e00b842c718cca32f9498c5
--- src/ictranslate/ictranslate.rc	(.../ictranslate.rc)	(revision 50fea83cc4ee863edac0fd3960e2249f99c33b03)
+++ src/ictranslate/ictranslate.rc	(.../ictranslate.rc)	(revision 2ffaff594233ce671e00b842c718cca32f9498c5)
@@ -71,6 +71,10 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON                    "res\\ictranslate.ico"
+IDI_NONEXISTENT_ICON    ICON                    "res\\icon_nonexistent.ico"
+IDI_VALID_ICON          ICON                    "res\\icon_valid.ico"
+IDI_INVALID_ICON        ICON                    "res\\icon_invalid.ico"
+IDI_OVERFLUOUS_ICON     ICON                    "res\\icon_overfluous.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -87,6 +91,10 @@
         MENUITEM "&Save translation",           ID_FILE_SAVETRANSLATION
         MENUITEM "S&ave translation as...",     ID_FILE_SAVETRANSLATIONAS
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Cleanup translation",        ID_EDIT_CLEANUP_TRANSLATION
+    END
 END
 
 #endif    // Polish resources
@@ -118,19 +126,44 @@
     DEFPUSHBUTTON   "OK",IDOK,113,41,50,14,WS_GROUP
 END
 
-IDD_ICTRANSLATE_DIALOG DIALOGEX 0, 0, 419, 223
+IDD_ICTRANSLATE_DIALOG DIALOGEX 0, 0, 547, 335
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "ICTranslate"
 MENU IDR_MAIN_MENU
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_DSTDATA_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,212,18,200,151
-    CONTROL         "",IDC_SRCDATA_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,18,197,153
-    LTEXT           "Base translation:",IDC_STATIC,7,7,196,8
-    LTEXT           "Your translation:",IDC_STATIC,212,7,200,8
-    EDITTEXT        IDC_SRCDATA_EDIT,7,179,198,37,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_DSTDATA_EDIT,213,179,199,37,ES_AUTOHSCROLL
+    CONTROL         "",IDC_DSTDATA_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,277,114,263,151
+    CONTROL         "",IDC_SRCDATA_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,114,263,153
+    LTEXT           "Base translation:",IDC_STATIC,7,103,262,8
+    LTEXT           "Your translation:",IDC_STATIC,277,104,263,8
+    EDITTEXT        IDC_SRCDATA_EDIT,7,274,263,37,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_DSTDATA_EDIT,298,273,242,37,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL
+    PUSHBUTTON      "&Apply change",IDAPPLY,471,314,69,14
+    PUSHBUTTON      "&>\n>",IDC_COPY_BUTTON,277,273,15,37,BS_MULTILINE
+    LTEXT           "Author:",IDC_STATIC,7,25,58,8
+    EDITTEXT        IDC_SRC_AUTHOR_EDIT,69,22,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "File:",IDC_STATIC,7,10,58,8
+    CONTROL         "Right-to-left reading order",IDC_SRC_RTL_CHECK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,84,263,10
+    EDITTEXT        IDC_SRC_FILENAME_EDIT,69,7,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Language name:",IDC_STATIC,7,40,58,8
+    EDITTEXT        IDC_SRC_LANGUAGE_NAME_EDIT,69,37,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Font:",IDC_STATIC,7,70,58,8
+    EDITTEXT        IDC_SRC_FONT_EDIT,69,67,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Help file name:",IDC_STATIC,7,55,58,8
+    EDITTEXT        IDC_SRC_HELP_FILENAME_EDIT,69,52,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Author:",IDC_STATIC,277,25,58,8
+    EDITTEXT        IDC_DST_AUTHOR_EDIT,339,22,201,14,ES_AUTOHSCROLL
+    LTEXT           "File:",IDC_STATIC,277,10,58,8
+    CONTROL         "Right-to-left reading order",IDC_DST_RTL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,277,84,263,10
+    EDITTEXT        IDC_DST_FILENAME_EDIT,339,7,201,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Language name:",IDC_STATIC,277,40,58,8
+    EDITTEXT        IDC_DST_LANGUAGE_NAME_EDIT,339,37,201,14,ES_AUTOHSCROLL
+    LTEXT           "Font:",IDC_STATIC,277,70,58,8
+    EDITTEXT        IDC_DST_FONT_EDIT,339,67,184,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Help file name:",IDC_STATIC,277,55,58,8
+    EDITTEXT        IDC_DST_HELP_FILENAME_EDIT,339,52,201,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&...",IDC_CHOOSE_FONT_BUTTON,524,67,16,14
 END
 
 
@@ -192,9 +225,9 @@
     IDD_ICTRANSLATE_DIALOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 412
+        RIGHTMARGIN, 540
         TOPMARGIN, 7
-        BOTTOMMARGIN, 216
+        BOTTOMMARGIN, 328
     END
 END
 #endif    // APSTUDIO_INVOKED