From 99568de405c4a144ee3bf660e2b2b591e80e99cb Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 11 Nov 2003 21:47:37 +0000 Subject: [PATCH] PATCH: [ 838898 ] Cleanup Registry -optionpage --- Src/Languages/Brazilian/MergeBrazilian.rc | 216 +++++++++---------- Src/Languages/Catalan/MergeCatalan.rc | 238 ++++++++++----------- .../ChineseSimplified/MergeChineseSimplified.rc | 92 ++++---- .../ChineseTraditional/MergeChineseTraditional.rc | 132 ++++++------ Src/Languages/Czech/MergeCzech.rc | 84 ++++---- Src/Languages/Danish/MergeDanish.rc | 76 +++---- Src/Languages/Dutch/MergeDutch.rc | 80 +++---- Src/Languages/French/MergeFrench.rc | 74 +++---- Src/Languages/German/MergeGerman.rc | 80 +++---- Src/Languages/Italian/MergeItalian.rc | 78 +++---- Src/Languages/Korean/MergeKorean.rc | 84 ++++---- Src/Languages/Norwegian/MergeNorwegian.rc | 170 +++++++-------- Src/Languages/Slovak/MergeSlovak.rc | 74 +++---- Src/Languages/Spanish/MergeSpanish.rc | 80 +++---- Src/Languages/Swedish/MergeSwedish.rc | 16 +- Src/MainFrm.cpp | 1 + Src/Merge.rc | 27 ++- Src/PropRegistry.cpp | 5 +- Src/PropRegistry.h | 3 +- Src/readme.txt | 3 + 20 files changed, 804 insertions(+), 809 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index c3e4388ce..823b6f080 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -29,18 +29,18 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" @@ -75,16 +75,16 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Copiar para o outro lado", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Copiar do outro lado", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Copiar todos diferentes para o outro lado...", + MENUITEM "Copiar todos diferentes para o outro lado...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Copiar todos diferentes do outro lado...", + MENUITEM "Copiar todos diferentes do outro lado...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR MENUITEM "Desfazer", ID_UNDO @@ -93,7 +93,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Arquivo" BEGIN @@ -213,7 +213,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_ITEM_POPUP_" BEGIN @@ -257,7 +257,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -327,19 +327,19 @@ CAPTION "Selecione Arquivos ou Diret FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "&Esquerda:",IDC_STATIC,13,24,40,8 - COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "&Procurar...",IDC_LEFT_BUTTON,241,22,38,12 RTEXT "&Direita:",IDC_STATIC,13,40,40,8 - COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "Pro&curar...",IDC_RIGHT_BUTTON,241,38,38,12 RTEXT "E&xtensões:",IDC_STATIC,13,56,40,8 - COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Re&cursivo",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | + CONTROL "Re&cursivo",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,72,48,10 RTEXT "&Unpacker:",IDC_STATIC,13,88,40,8 EDITTEXT IDC_UNPACKER_EDIT,56,86,182,12,ES_AUTOHSCROLL | @@ -362,14 +362,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -386,7 +386,7 @@ BEGIN LTEXT "&Caminho para cleartool.exe:",IDC_VSS_L1,13,42,88,8 EDITTEXT IDC_PATH_EDIT,104,40,98,12,ES_AUTOHSCROLL PUSHBUTTON "&Procurar...",IDC_BROWSE_BUTTON,204,40,44,12 - COMBOBOX IDC_VER_SYS,104,20,142,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,104,20,142,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Sistema de &Versões:",IDC_STATIC,13,22,86,10 END @@ -416,7 +416,7 @@ BEGIN CONTROL "Comparar e&spaços em branco",IDC_WHITESPACE,"Button", BS_AUTORADIOBUTTON | WS_GROUP,135,41,110,10 CONTROL "&Ignorar moficações nos espaços em branco", - IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON | + IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE,135,52,115,19 CONTROL "Ignora t&odos espaços em branco",IDC_ALL_WHITE,"Button", BS_AUTORADIOBUTTON,135,71,119,10 @@ -439,7 +439,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Cancelar",IDCANCEL,154,33,52,14 - LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Idiomas disponíveis:",IDC_STATIC,7,7,65,8 END @@ -449,12 +449,12 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Localizar" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "Somente p&alavras iguais",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 CONTROL "&Diferenciar maiúsculas de minúsculas", - IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | + IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,40,132,12 CONTROL "&Expressão regular",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12 @@ -473,14 +473,14 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Localizar e Substituir" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,52,7,174,30,CBS_DROPDOWN | CBS_SORT | + COMBOBOX IDC_EDIT_FINDTEXT,52,7,174,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,173,30,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,173,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Somente p&alavras iguais",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,52,113,12 CONTROL "&Diferenciar maiúsculas de minúsculas", - IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | + IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,63,131,12 CONTROL "&Expressão regular",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,74,77,12 @@ -505,7 +505,7 @@ BEGIN DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14 PUSHBUTTON "Cancelar",IDCANCEL,194,90,50,14 PUSHBUTTON "Salvar como...",IDSAVEAS,114,90,50,14 - EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "Comentários",IDC_STATIC,18,7,34,10 END @@ -528,7 +528,7 @@ BEGIN IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 7,221,15 LTEXT "Expressões (uma por linha):",IDC_STATIC,7,28,221,8 - EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | + EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN LTEXT "Arquivo de Filtro:",IDC_STATIC,7,128,60,10 COMBOBOX IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST | @@ -542,34 +542,34 @@ CAPTION "Cores" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Diferença:",IDC_STATIC,13,29,75,8 - CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,94,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,94,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Diferença Selecionada:",IDC_STATIC,13,49,75,8 - CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,94,49,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,94,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,94,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,94,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,75,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -579,7 +579,7 @@ CAPTION "Di FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,106,136,50,14 - EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -589,13 +589,13 @@ CAPTION "Registro" FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -604,26 +604,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -646,11 +646,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -662,12 +662,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -681,16 +681,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -721,22 +721,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -794,7 +794,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -954,16 +954,16 @@ IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" IDD_PROP_VSS DLGINIT BEGIN IDC_VER_SYS, 0x403, 5, 0 -0x6f4e, 0x656e, "\000" +0x6f4e, 0x656e, "\000" IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, IDC_VER_SYS, 0x403, 19, 0 -0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, -"\000" +0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, +"\000" 0 END @@ -986,7 +986,7 @@ BEGIN AFX_IDS_IDLEMESSAGE "Pronto" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -997,7 +997,7 @@ BEGIN END // ID_FILE_NEW SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Criar um novo documento\nNovo" ID_FILE_OPEN "Abrir um documento existente\nAbrir" @@ -1011,13 +1011,13 @@ BEGIN END // ID_APP_ABOUT SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Exibe informações do programa, número da Versão e Copyright\nSobre" ID_APP_EXIT "Sair do programa; pede para salvar documentos\nSair" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Abrir este documento" ID_FILE_MRU_FILE2 "Abrir este documento" @@ -1038,13 +1038,13 @@ BEGIN END // ID_NEXT_PANE SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Ativa o próximo painel\nPróximo Painel" ID_PREV_PANE "Ativa o painel anterior\nPainel anterior" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Abre outra janela para o documento ativo\nNova Janela" ID_WINDOW_ARRANGE "Organiza os ícones no fundo da janela\nOrganiza os ícones" @@ -1055,7 +1055,7 @@ BEGIN END // ID_EDIT_CLEAR SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Apaga o texto selecionado\nApaga" ID_EDIT_CLEAR_ALL "Apaga tudo\nApaga tudo" @@ -1070,13 +1070,13 @@ BEGIN ID_EDIT_REDO "Refaz a última ação desfeita\nRefaz" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Exibe ou esconde a barra de ferramentas\nChavea Barra de Ferramentas" ID_VIEW_STATUS_BAR "Exibe ou esconde a barra de status\nChavea Barra de Status" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Altera o tamanho da janela" AFX_IDS_SCMOVE "Altera a posição da janela" @@ -1087,14 +1087,14 @@ BEGIN AFX_IDS_SCCLOSE "Fecha a janela ativa e pede para salvar os documentos" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Restaurar o tamanho normal da janela" AFX_IDS_SCTASKLIST "Ativar Lista de Tarefas" AFX_IDS_MDICHILD "Ativar esta janela" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Fechar a visualização de impressão\nCancelar Preview" END @@ -1106,7 +1106,7 @@ BEGIN IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "Versão" IDS_ALLFILES "Todos Arquivos (*.*)|*.*||" @@ -1125,11 +1125,11 @@ BEGIN END // IDS_SAVE_AS_TITLE SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Salvar Como" IDS_SELECT_FILES_OR_FOLDERS "Você deve selecionar arquivos ou diretórios" - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "Não foi possível fazer a cópia de segurança do arquivo original.\nContinuar assim mesmo?" IDS_OPTIONS_TITLE "Opções" IDS_OPEN_TITLE "Abrir" @@ -1146,7 +1146,7 @@ BEGIN IDS_NOPROJECT "Você precisa especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COLHDR_FILENAME "Nome de Arquivo" IDS_COLHDR_DIR "Diretório" @@ -1158,17 +1158,17 @@ BEGIN IDS_CC_CMD "Camin&ho para o cleartool.exe :" IDS_VSS_CMD "Ca&minho para o SS.EXE :" IDS_VSS_RUN_ERROR "Erro ao executar o comando do sistema de versões." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Alterações foram feitas no arquivo corrente nesta sessão de comparação. Alguns ajustes podem não acontecer até que a comparação ao atual arquivo seja reiniciada." IDS_COLHDR_LTIMEM "Data da Esquerda" IDS_COLHDR_RTIMEM "Data da Direita" IDS_COLHDR_EXTENSION "Extensão" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Você tem certeza que deseja excluir %1 de %2 do(s) objecto(s) selecionado(s)?" IDS_DEL_LEFT_FMT "Excluir a esquerda %1 de %2 objeto(s) selecionado(s)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Excluir a direita %1 de %2 objeto(s) selecionado(s)" IDS_DELETE_FILE_FAILED "A exclusão do arquivo %1 falhou: %2" @@ -1208,7 +1208,7 @@ BEGIN IDS_COLHDR_RVERSION "Right File Version" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" @@ -1232,7 +1232,7 @@ BEGIN IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unified" - IDS_FILEPACK_FAILED_LEFT + IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" @@ -1245,22 +1245,22 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Substituindo %1 texto(s)." IDS_EDIT_TEXT_NOT_FOUND "Não foi possível localizar""%s""" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1271,15 +1271,15 @@ BEGIN ID_OPTIONS_SHOWDIFFERENT "Exibe arquivos que contêm diferenças" ID_PREVDIFF "Posiciona na diferença anterior\nDiferença Anterior (Shift+Tab)" ID_NEXTDIFF "Posiciona na próxima diferença\nPróxima Diferença (Tab)" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Salva uma cópia do original como *.bak\nBackup" END STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Posiciona automaticamente na primeira diferença\nPosiciona na primeira" - ID_OPTIONS_IGNOREWHITESPACE + ID_OPTIONS_IGNOREWHITESPACE "Desconsidera espaços em branco ao comparar arquivos" ID_HIDE_BACKUP_FILES "Esconde os arquivos com extensão BAK" ID_HELP_GNULICENSE "Exibe a Licença Pública GNU" @@ -1289,13 +1289,13 @@ BEGIN ID_ALL_RIGHT "Copiar todas as diferenças para o arquivo da direita\nTodos para a Direita" ID_VIEW_SELECTFONT "Seleciona a fonte usada nos Arquivos Diferentes\nSeleciona Fonte" ID_VIEW_USEDEFAULTFONT "Volta a usar a fonte padrão nos Arquivos Diferentes\nFonte padrão" - ID_DIR_COPY_FILE_TO_LEFT + ID_DIR_COPY_FILE_TO_LEFT "Copiar os arquivos selecionados para o diretório especificado" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_DIR_COPY_FILE_TO_RIGHT + ID_DIR_COPY_FILE_TO_RIGHT "Copiar o arquivo selecionado para o diretório especificado" ID_VIEW_LANGUAGE "Seleciona o Idioma usado na interface\nLíngua" ID_HELP_CONTENTS "Exibe o Guia do Usuário do WinMerge\nAjuda" @@ -1308,7 +1308,7 @@ BEGIN ID_DIFFSTATUS "Status do Espaço Reservado" ID_OPTIONS_SHOWUNIQUELEFT "Exibir arquivos que existam apenas no lado esquerdo" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Exibir arquivos que existam apenas no lado direito" ID_DIR_DEL_BOTH "Excluir o(s) arquivo(s) selecionado(s) em ambos os lados" ID_DIR_OPEN_LEFT "Abrir arquivo a esquerda" @@ -1331,7 +1331,7 @@ BEGIN END // ID_EOL_TO_DOS SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EOL_TO_DOS "Convert EOL to DOS mode" ID_EOL_TO_UNIX "Convert EOL to UNIX mode" @@ -1354,7 +1354,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 5dda2d89f..586b0afba 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -29,18 +29,18 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" @@ -75,16 +75,16 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Copia &a l'altra banda", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Copia &de l'altra banda", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Copia &totes les diferències a l'altra banda...", + MENUITEM "Copia &totes les diferències a l'altra banda...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Copia t&otes les diferències de l'altra banda...", + MENUITEM "Copia t&otes les diferències de l'altra banda...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR MENUITEM "&Desfés", ID_UNDO @@ -93,7 +93,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Fitxer" BEGIN @@ -213,7 +213,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU +IDR_POPUP_DIRVIEW MENU BEGIN POPUP "_ITEM_POPUP_" BEGIN @@ -242,7 +242,7 @@ BEGIN END END -IDR_POPUP_EDITOR_HEADERBAR MENU +IDR_POPUP_EDITOR_HEADERBAR MENU BEGIN POPUP "_POPUP_" BEGIN @@ -257,7 +257,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -328,19 +328,19 @@ CAPTION "Tria de fitxers o directoris..." FONT 8, "MS Sans Serif" BEGIN RTEXT "&Esquerra:",IDC_STATIC,13,24,60,8 - COMBOBOX IDC_LEFT_COMBO,76,22,162,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,76,22,162,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,241,22,38,12 RTEXT "&Dreta:",IDC_STATIC,13,40,60,8 - COMBOBOX IDC_RIGHT_COMBO,76,38,162,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,76,38,162,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,241,38,38,12 RTEXT "E&xtensions:",IDC_STATIC,13,56,60,8 - COMBOBOX IDC_EXT_COMBO,76,54,131,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,76,54,131,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Re&cursiu",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | + CONTROL "Re&cursiu",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,72,48,10 RTEXT "Desem&paquetador:",IDC_STATIC,13,88,60,8 EDITTEXT IDC_UNPACKER_EDIT,76,86,140,12,ES_AUTOHSCROLL | @@ -363,14 +363,14 @@ BEGIN PUSHBUTTON "Anul·la",IDCANCEL,187,132,62,14 PUSHBUTTON "&Anomena i desa...",IDSAVEAS,116,132,62,14 LTEXT "&Projecte:",IDC_STATIC,9,81,27,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "&Usuari:",IDC_STATIC,9,99,27,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "&Contrasenya:",IDC_STATIC,117,99,42,8 EDITTEXT IDC_PASSWORD,162,96,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "&Base de dades:",IDC_STATIC,9,62,29,16 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Aplica a &tots els elements",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,48,117,95,8 @@ -387,7 +387,7 @@ BEGIN LTEXT "&Camí al cleartool.exe:",IDC_VSS_L1,16,42,68,8 EDITTEXT IDC_PATH_EDIT,85,40,116,12,ES_AUTOHSCROLL PUSHBUTTON "&Navega...",IDC_BROWSE_BUTTON,206,40,42,12 - COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,85,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Sistema de control de &versions",IDC_STATIC,16,19,60,16 END @@ -438,7 +438,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "D'acord",IDOK,154,16,52,14 PUSHBUTTON "Anul·la",IDCANCEL,154,33,52,14 - LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Idiomes disponibles:",IDC_STATIC,7,7,66,8 END @@ -448,7 +448,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION CAPTION "Cerca" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "N&omés paraules senceres",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -456,7 +456,7 @@ BEGIN BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,4,37,96,18 CONTROL "&Expressió regular",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12 - CONTROL "A&munt",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + CONTROL "A&munt",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,36,35,12 CONTROL "A&vall",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,111,48,35,12 @@ -471,9 +471,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION CAPTION "Substitueix" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | + COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "N&omés paraules senceres",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,96,12 @@ -502,7 +502,7 @@ BEGIN DEFPUSHBUTTON "&Extreu",IDOK,27,90,67,14 PUSHBUTTON "Anul·la",IDCANCEL,186,90,67,14 PUSHBUTTON "Anomena i &desa...",IDSAVEAS,106,90,67,14 - EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "Comentaris",IDC_STATIC,18,7,38,10 END @@ -526,10 +526,10 @@ BEGIN 7,221,15 LTEXT "Expressions ®ulars (una per línia):",IDC_STATIC,7,28, 221,8 - EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | + EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN LTEXT "&Filtre de fitxer:",IDC_STATIC,7,128,60,10 - COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Edita",IDC_EDIT_FILE_FILTER,194,126,34,13,WS_DISABLED END @@ -540,34 +540,34 @@ CAPTION "Colors" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Diferència:",IDC_STATIC,13,29,79,8 - CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Diferència seleccionada:",IDC_STATIC,13,49,79,8 - CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Fons",IDC_STATIC,81,15,50,8 CTEXT "Línia absent",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Diferència ignorada:",IDC_STATIC,13,69,79,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -577,23 +577,23 @@ CAPTION "Di FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "D'acord",IDOK,106,136,50,14 - EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registre" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Afegeix menú contextual a l'explorador del Windows",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,222,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Navega...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Desa el camí",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "&Editor extern:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "N&avega...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL + PUSHBUTTON "&Navega...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&Editor extern:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL + PUSHBUTTON "N&avega...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -602,26 +602,26 @@ CAPTION "Generador de fitxer de difer FONT 8, "MS Sans Serif" BEGIN LTEXT "Fitxer &1:",IDC_STATIC,7,10,26,8 - COMBOBOX IDC_DIFF_FILE1,37,7,158,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,37,7,158,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Navega...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "Fitxer &2:",IDC_STATIC,7,27,26,8 - COMBOBOX IDC_DIFF_FILE2,37,24,158,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,37,24,158,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "N&avega...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Inter&canvia",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "A&fegeix al final del fitxer existent",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,37,51,115,10 LTEXT "&Resultat:",IDC_STATIC,7,66,29,8 - COMBOBOX IDC_DIFF_FILERESULT,37,63,158,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,37,63,158,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Na&vega...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "E&stil:",IDC_STATIC,13,95,16,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "&Distingeix entre majúscules i minúscules",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,128,94,20 @@ -644,11 +644,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -660,12 +660,12 @@ BEGIN DEFPUSHBUTTON "D'acord",IDOK,141,119,50,14 PUSHBUTTON "Anul·la",IDCANCEL,81,119,50,14 GROUPBOX "Mostra les columnes",IDC_GROUP_SHOW,7,7,124,100 - LISTBOX IDC_LIST_SHOW,55,20,66,79,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,55,20,66,79,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "A&munt",IDC_UP,15,45,29,13 PUSHBUTTON "A&vall",IDC_DOWN,15,63,29,13 GROUPBOX "Amaga les columnes",IDC_GROUP_HIDE,181,7,85,103 - LISTBOX IDC_LIST_HIDE,192,20,66,79,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,192,20,66,79,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "<<",IDC_ADD,141,45,29,13 PUSHBUTTON ">>",IDC_REMOVE,141,63,29,13 @@ -679,16 +679,16 @@ BEGIN DEFPUSHBUTTON "D'acord",IDOK,87,99,50,14 PUSHBUTTON "Anul·la",IDCANCEL,156,99,50,14 LTEXT "&Desempaquetador de fitxer:",IDC_STATIC,7,18,88,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Visualitza tots els desempaquetadors sense verificar l'extensió", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,208,13 LTEXT "&Llistat d'extensions:",IDC_STATIC,7,36,88,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY LTEXT "&Descripció:",IDC_STATIC,7,52,47,10 - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -719,22 +719,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "&Atura",IDC_COMPARISON_STOP,317,14,60,14 END @@ -807,7 +807,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -972,16 +972,16 @@ IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" IDD_PROP_VSS DLGINIT BEGIN IDC_VER_SYS, 0x403, 5, 0 -0x6f4e, 0x656e, "\000" +0x6f4e, 0x656e, "\000" IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, IDC_VER_SYS, 0x403, 19, 0 -0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, -"\000" +0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, +"\000" 0 END @@ -1004,7 +1004,7 @@ BEGIN AFX_IDS_IDLEMESSAGE "Preparat" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -1014,7 +1014,7 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Crea un document nou\nNou" ID_FILE_OPEN "Obre un document existent\nObrir (Ctrl+O)" @@ -1027,13 +1027,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "Visualitza págines senceres\nVisualització prèvia de la impressió" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Visualitza informació del programa, número de versió i copyright\nQuant a" ID_APP_EXIT "Surt de l'aplicació i us demana que deseu els documents\nSurt" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Obre aquest document" ID_FILE_MRU_FILE2 "Obre aquest document" @@ -1053,13 +1053,13 @@ BEGIN ID_FILE_MRU_FILE16 "Obre aquest document" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Canvia a la següent subfinestra\nSunfinestra següent" ID_PREV_PANE "Canvia de nou a la subfinestra anterior\nSubfinestra prèvia" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Obre una altra finestra per al document actiu\nFinestra nova" ID_WINDOW_ARRANGE "Organitza les icones a la part inferior de la finestra\nOrganitza les icones" @@ -1069,7 +1069,7 @@ BEGIN ID_WINDOW_SPLIT "Divideix la finestra activa en subfinestres\nDivideix" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Suprimeix la selecció\nSuprimeix" ID_EDIT_CLEAR_ALL "Suprimeix-ho tot\nSuprimeix-ho tot" @@ -1084,7 +1084,7 @@ BEGIN ID_EDIT_REDO "Refà la darrera acció desfeta\nRefés" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Mostra o amaga la barra d'eines\nBarra d'eines" ID_VIEW_STATUS_BAR "Mostra o amaga la barra d'estat\nBarra d'estat" @@ -1101,14 +1101,14 @@ BEGIN AFX_IDS_SCCLOSE "Tanca la finestra activa i demana per desar el document" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Restaura la finestra a la mida normal" AFX_IDS_SCTASKLIST "Activa la llista de tasques" AFX_IDS_MDICHILD "Activa aquesta finestra" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Tanca el mode de visualització prèvia\nTanca" END @@ -1120,7 +1120,7 @@ BEGIN IDS_WINMERGE_THIS_DIRECTORY "WinMerge aquest directori" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "Versió %1 - Català" IDS_ALLFILES "Tots els fitxers (*.*)|*.*||" @@ -1141,9 +1141,9 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Anomena i desa" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "Seleccioneu o bé dos fitxers o bé dos directoris" - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "No es pot desar una còpia de seguretat del fitxer original.\nVoleu continuar en qualsevol cas?" IDS_OPTIONS_TITLE "Opcions" IDS_OPEN_TITLE "Obre" @@ -1160,7 +1160,7 @@ BEGIN IDS_NOPROJECT "Cal que especifiqueu el camí a un projecte del SourceSafe per tal de continuar (p.ex.: $/MyProject)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COLHDR_FILENAME "Nom" IDS_COLHDR_DIR "Directori" @@ -1172,17 +1172,17 @@ BEGIN IDS_CC_CMD "&Camí al cleartool.exe :" IDS_VSS_CMD "&Camí al SS.EXE :" IDS_VSS_RUN_ERROR "S'ha produït un error en executar una ordre del sistema de control de versions." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "S'han fet modificacions a la sessió de comparació de fitxers actual i alguns ajustos poden no entrar en vigor fins que no en sigui recomençada." IDS_COLHDR_LTIMEM "Data esquerra" IDS_COLHDR_RTIMEM "Data dreta" IDS_COLHDR_EXTENSION "Extensió" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Esteu segur que voleu suprimir %1 del(s) %2 element(s) seleccionat(s)?" IDS_DEL_LEFT_FMT "Suprimeix %1 del(s) %2 element(s) seleccionat(s) de l'esquerra" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Suprimeix %1 del(s) %2 element(s) seleccionat(s) de la dreta" IDS_DELETE_FILE_FAILED "Ha fallat la supressió del fitxer %1 failed: %2" @@ -1202,7 +1202,7 @@ BEGIN IDS_BIN_FILES_SAME "Els fitxers binaris són idèntics" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILESAVE_FAILED "Ha fallat el desat de %1. Voleu desar-lo amb un nom diferent?" IDS_ERROR_FILE_NOT_FOUND "El fitxer no s'ha trobat: %1" @@ -1222,7 +1222,7 @@ BEGIN IDS_COLHDR_RVERSION "Versió del fitxer dreta" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Només l'esquerre" IDS_RIGHTONLY "Només el dret" @@ -1246,14 +1246,14 @@ BEGIN IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unificat" - IDS_FILEPACK_FAILED_LEFT + IDS_FILEPACK_FAILED_LEFT "El Plugin '%2' no pot tornar a empaquetar els vostres canvis al fitxer de l'esquerra altre cop cap a '%1'.\n\nEl fitxer original no serà canviat.\n\nVoleu desar la versió desempaquetada a un altre fitxer?" - IDS_FILEPACK_FAILED_RIGHT + IDS_FILEPACK_FAILED_RIGHT "El Plugin '%2' no pot tornar a empaquetar els vostres canvis al fitxer de la dreta altre cop cap a '%1'.\n\nEl fitxer original no serà canviat.\n\nVoleu desar la versió desempaquetada a un altre fitxer?" IDS_QUICKHELP "Sintaxi : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/dl descesq] [/dr descdreta] camiesq camidreta [camisortida]\n\non:\n /? o -? mostra aquesta ajuda\n /r o -r diu al WinMerge que compari directoris recursivament\n /e o -e permet tancar el WinMerge amb una única polsació d'esc\n /ul o -ul diu al WinMerge que no afegeixi el camí de l'esquerra a la llista de recents (MRU)\n /ur o -ur diu al WinMerge que no afegeixi el camí de la dreta a la llista de recents (MRU)\n /ub o -ub diu al WinMerge que no afegeixi cap dels dos camins a la llista de recents (MRU)\n /dl o -dl afegeix una descripció per a mostrar a la banda esquerra enlloc del nom del directori/fitxer\n /dr o -dr afegeix una descripció per a mostrar a la banda dreta enlloc del nom del directori/fitxer\n camiesq és el directori o nom de fitxer per a ésser obert a la banda esquerra\n camidreta és el directori o nom de fitxer per a ésser obert a la banda dreta\n camisortida és un directori de sortida opcional on voleu que els fitxers fusionats siguin desats\n \n Nota: cal que camiesq i camidreta siguin ambdós directoris o fitxers\n" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_STATIC_TITLE_LEFT "Clica amb el botó principal al camí a copiar" IDC_STATIC_TITLE_RIGHT "Clica amb el botó principal al camí a copiar" @@ -1265,16 +1265,16 @@ BEGIN IDC_COMPARISON_CLOSE "Prem qualsevol tecla" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "S'ha substituït %1 cadena(s)." IDS_EDIT_TEXT_NOT_FOUND "No s'ha trobat la cadena ""%s""" IDS_LINE_STATUS_INFO_EOL "Línia: %s Columna: %d Caràcters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Línia: %s" IDS_LINE_STATUS_INFO "Línia: %s Columna: %d Caràcters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "La carpeta de treball del VSS i la ubicació del fitxer actual no concorden. Voleu continuar?" - IDS_CANNOT_EXECUTE_FILE "No es pot executar el %1" + IDS_CANNOT_EXECUTE_FILE "No es pot executar el %1" END STRINGTABLE DISCARDABLE @@ -1294,7 +1294,7 @@ BEGIN IDS_ARABIC_JORDAN "Arabic (Jordan)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_ARABIC_LEBANON "Arabic (Lebanon)" IDS_ARABIC_KUWAIT "Arabic (Kuwait)" @@ -1314,7 +1314,7 @@ BEGIN IDS_CHINESE_SINGAPORE "Chinese (Singapore)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_CHINESE_MACAU "Chinese (Macau SAR)" IDS_CROATIAN "Croatian" @@ -1334,7 +1334,7 @@ BEGIN IDS_ENGLISH_BELIZE "English (Belize)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_ENGLISH_TRINIDAD "English (Trinidad)" IDS_ENGLISH_ZIMBABWE "English (Zimbabwe)" @@ -1354,7 +1354,7 @@ BEGIN IDS_GERMAN_SWISS "Deutsch (Schweiz)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_GERMAN_AUSTRIAN "Deutsch (Österreich)" IDS_GERMAN_LUXEMBOURG "Deutsch (Luxemburg)" @@ -1374,7 +1374,7 @@ BEGIN IDS_KOREAN_JOHAB "Korean (Johab)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LATVIAN "Latvian" IDS_LITHUANIAN "Lithuanian" @@ -1394,7 +1394,7 @@ BEGIN IDS_SINDHI "Sindhi" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SLOVAK "Slovak" IDS_SLOVENIAN "Slovensko" @@ -1414,7 +1414,7 @@ BEGIN IDS_SPANISH_URUGUAY "Español (Uruguay)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SPANISH_PARAGUAY "Español (Paraguay)" IDS_SPANISH_BOLIVIA "Español (Bolivia)" @@ -1434,14 +1434,14 @@ BEGIN IDS_URDU_INDIA "Urdu (India)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_UZBEK_LATIN "Uzbek (Latin)" IDS_UZBEK_CYRILLIC "Uzbek (Cyrillic)" IDS_VIETNAMESE "Vietnamese" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_L2R "Copia el text seleccionat al fitxer de la dreta\nCopia al fitxer de la dreta (Alt Dreta)" ID_R2L "Copia el text seleccionat al fitxer de l'esquerra\nCopia al fitxer de l'esquerra (Alt Esquerra)" @@ -1449,13 +1449,13 @@ BEGIN ID_OPTIONS_SHOWDIFFERENT "Visualitza fitxers que tinguin diferències" ID_PREVDIFF "Desplaça fins a la diferència anterior\nDiferència anterior (Alt Amunt)" ID_NEXTDIFF "Desplaça fins a la següent diferència\nPropera diferència (Alt Avall)" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Desa una còpia de l'original com a *.bak\nCòpia de seguretat" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Desplaça automàticament a la primera diferència\nDesplaça a la primera" ID_OPTIONS_IGNOREWHITESPACE "Ignora els espais en comparar fitxers" ID_HIDE_BACKUP_FILES "Amaga fitxers amb extensió bak" @@ -1469,7 +1469,7 @@ BEGIN ID_DIR_COPY_FILE_TO_LEFT "Copia el fitxer seleccionat al directori indicat" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_COPY_FILE_TO_RIGHT "Copia el fitxer seleccionat al directori indicat" ID_VIEW_LANGUAGE "Selecciona l'idioma de l'interfície d'usuari\nIdioma" @@ -1482,7 +1482,7 @@ BEGIN ID_DIR_DEL_RIGHT "Suprimeix els elements seleccionats a la dreta" ID_DIFFSTATUS "Lloc per al compte d'estat" ID_OPTIONS_SHOWUNIQUELEFT "Visualualitza els fitxers existents únicament a l'esquerra" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Visualitza els fitxers existents únicament a la dreta" ID_DIR_DEL_BOTH "Suprimeix els element(s) seleccionat(s) a ambdues bandes" ID_DIR_OPEN_LEFT "Obre el fitxer de l'esquerra" @@ -1490,7 +1490,7 @@ BEGIN ID_DIR_OPEN_RIGHT "Obre el fitxer de la dreta" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "Obre el fitxer de la dreta amb..." ID_OPTIONS_SHOWBINARIES "Visualitza els fitxers binaris" @@ -1518,7 +1518,7 @@ BEGIN ID_L2RNEXT "Copia la diferència a la dreta i avança a al següent\nCopia a la dreta i avança (Ctrl Alt Right)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_MULTIPLE_RIGHT "Copia les diferències del text seleccionat a la subfinestra esquerra al fitxer de la dreta" ID_MULTIPLE_LEFT "Copia les diferències del text seleccionat a la subfinestra dreta al fitxer de l'esquerra" @@ -1527,7 +1527,7 @@ BEGIN ID_UNPACK_AUTO "El desempaquetador adaptat s'aplica a ambdós fitxers (només hi cal l'extensió a un fitxer)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "S'ha produït un error al plugin '%1' i l'operació actual s'avortarà." IDS_ERROR_FILE_NOT_UNPACKED "El fitxer not s'ha desempaquetat: %1" diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 326a22f7e..b22585ca4 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -352,14 +352,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -530,25 +530,25 @@ BEGIN 14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -567,13 +567,13 @@ CAPTION " FONT 9, "ËÎÌå", 0, 0, 0x1 BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -582,26 +582,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -624,11 +624,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -640,12 +640,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -659,16 +659,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -699,22 +699,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1076,7 +1076,7 @@ BEGIN IDS_COLHDR_RVERSION "Right File Version" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" @@ -1100,7 +1100,7 @@ BEGIN IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unified" - IDS_FILEPACK_FAILED_LEFT + IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" @@ -1113,22 +1113,22 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£" IDS_EDIT_TEXT_NOT_FOUND "ÎÞ·¨Ñ°ÕÒ×Ö·û´®¡¸%s¡¹" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE FIXED IMPURE @@ -1214,7 +1214,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 9d92ab72b..ed6ad4e54 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -255,7 +255,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -353,14 +353,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -531,25 +531,25 @@ BEGIN 14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -568,13 +568,13 @@ CAPTION " FONT 9, "·s²Ó©úÅé", 0, 0, 0x1 BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -583,26 +583,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -625,11 +625,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -641,12 +641,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -660,16 +660,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -700,22 +700,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -770,7 +770,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -963,7 +963,7 @@ BEGIN AFX_IDS_IDLEMESSAGE "´Nºü" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -974,7 +974,7 @@ BEGIN END // ID_FILE_NEW SYNCHRO -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN ID_FILE_NEW "«Ø¥ß¤@­Ó·s¤å¥ó\n·s¼W" ID_FILE_OPEN "¶}±Ò¤@­Ó²{¦s¤å¥ó\n¶}±Ò (Ctrl+O)" @@ -988,13 +988,13 @@ BEGIN END // ID_APP_ABOUT SYNCHRO -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN ID_APP_ABOUT "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©Mª©Åv\nÃö©ó" ID_APP_EXIT "Â÷¶}À³¥Îµ{¦¡¡F´£¥Ü­nÀx¦s¤å¥ó\nµ²§ô" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FIRST "¶}±Ò³o­Ó¤å¥ó" ID_FILE_MRU_FILE2 "¶}±Ò³o­Ó¤å¥ó" @@ -1015,13 +1015,13 @@ BEGIN END // ID_NEXT_PANE SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "¤Á´«¨ì¤U¤@­Óµøµ¡\n¤U¤@µøµ¡" ID_PREV_PANE "¤Á´«¦^¤W¤@­Óµøµ¡\n¤W¤@µøµ¡" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "¬°§@¥Î¤¤¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n·sµøµ¡" ID_WINDOW_ARRANGE "±Æ¦C¹Ï¥Ü¦bµøµ¡ªº©³³¡\n±Æ¦C¹Ï¥Ü" @@ -1032,7 +1032,7 @@ BEGIN END // ID_EDIT_CLEAR SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "²M°£¿ï¨úªº½d³ò\n§R°£" ID_EDIT_CLEAR_ALL "¥þ³¡§R°£\n¥þ³¡§R°£" @@ -1047,13 +1047,13 @@ BEGIN ID_EDIT_REDO "­«°µ¤§«e¥¼§¹¦¨ªº°Ê§@\n­«°µ" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Åã¥Ü©ÎÁôÂäu¨ã¦C\n¤Á´«¤u¨ã¦C" ID_VIEW_STATUS_BAR "Åã¥Ü©ÎÁôÂꬺA¦C\n¤Á´«ª¬ºA¦C" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "§ó§ïµøµ¡¤j¤p" AFX_IDS_SCMOVE "§ó§ïµøµ¡¦ì¸m" @@ -1064,14 +1064,14 @@ BEGIN AFX_IDS_SCCLOSE "Ãö³¬§@¥Î¤¤µøµ¡¨Ã´£¥Ü¨ìÀx¦s³o¤å¥ó" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "±Nµøµ¡Á٭즨¼Ð·Çªº¤j¤p" AFX_IDS_SCTASKLIST "±Ò¥Î¤u§@²M³æ" AFX_IDS_MDICHILD "±Ò¥Î³o­Óµøµ¡" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n¨ú®ø¹wÄý" END @@ -1083,7 +1083,7 @@ BEGIN IDD_OPEN "WinMerge ³o­Ó¸ê®Æ§¨" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "ª©¥» %1" IDS_ALLFILES "©Ò¦³ÀÉ®× (*.*)|*.*||" @@ -1102,7 +1102,7 @@ BEGIN END // IDS_SAVE_AS_TITLE SYNCHRO -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "¥t¦s·sÀÉ" IDS_SELECT_FILES_OR_FOLDERS "§Aªº¿ï¨ú¥²¶·¬O¨âªÌ³£¬OÀɮשΨâªÌ³£¬O¸ê®Æ§¨" @@ -1123,7 +1123,7 @@ BEGIN END // IDS_COLHDR_FILENAME SYNCHRO -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COLHDR_FILENAME "ÀɮצWºÙ" IDS_COLHDR_DIR "¸ê®Æ§¨" @@ -1143,7 +1143,7 @@ BEGIN IDS_DEL_LEFT_FMT "§R°£¥ªÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "§R°£¥kÃä %1 ¦b %2 ¿ï¨úªº¶µ¥Ø" IDS_DELETE_FAILED "§R°£ÀÉ®× %1 ¥¢±Ñ¡G %2" @@ -1183,7 +1183,7 @@ BEGIN IDS_COLHDR_RVERSION "Right File Version" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" @@ -1214,28 +1214,28 @@ BEGIN IDS_QUICKHELP "Syntax : WinMerge [/r] [/e] [/ul] [/ur] [/ub] [/dl leftdesc] [/dr rightdesc] leftpath rightpath [outputpath]\n\nwhere:\n /? or -? displays this help\n /r or -r tells winmerge to compare directories recursively\n /e or -e allows WinMerge to be closed with a single esc keypress\n /ul or -ul tells winmerge to not add left path to MRU\n /ur or -ur tells winmerge to not add right path to MRU\n /ub or -ub tells winmerge to not add both paths to MRU\n /dl or -dl adds a description for left side shown instead of directory/filename\n /dr or -dr adds a description for right side shown instead of directory/filename\n leftpath is the directory or filename to open on the left side\n rightpath is the directory or filename to open on the right side\n outputpath is an optional output directory where you want merged files to be \n saved\n \n Note: leftpath and rightpath both has to be files or both has to be \n directories\n" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_STATIC_TITLE_LEFT "Right click on the path to copy" IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" IDS_EDIT_TEXT_NOT_FOUND "µLªk´M§ä¦r¦ê¡u%s¡v" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1249,7 +1249,7 @@ BEGIN ID_OPTIONS_BACKUPORIGINALFILE "Àx¦sªº³o­ì©lªº¤@­Ó°Æ¥»¬° *.bak\n³Æ¥÷" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "¦Û°Ê¦a±²°Ê¨ì³o²Ä¤@­Ó¤£¦P\n±²°Ê¨ì²Ä¤@­Ó" ID_OPTIONS_IGNOREWHITESPACE "¤ñ¹ïÀɮ׮ɤ£ºÞªÅ¥Õ©M¸õ®æ" @@ -1264,7 +1264,7 @@ BEGIN ID_DIR_COPY_FILE_TO_LEFT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_COPY_FILE_TO_RIGHT "½Æ»s¿ï¨úªºÀɮרì¤w©R¦Wªº¸ê®Æ§¨" ID_VIEW_LANGUAGE "¿ï¨ú¥Ø«e¥Î¤á¤¶­±»y¨¥\n»y¨¥" @@ -1312,7 +1312,7 @@ BEGIN ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and advance (Ctrl Alt Right)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_MULTIPLE_RIGHT "Copy differences from the selected text in left panel to the right file" ID_MULTIPLE_LEFT "Copy differences from the selected text in right panel to the left file" @@ -1321,7 +1321,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index d9c41b2ef..8810e49ed 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -362,14 +362,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -560,12 +560,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -579,19 +579,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registry" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -600,26 +600,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -642,11 +642,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -658,12 +658,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -677,16 +677,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -717,22 +717,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1229,7 +1229,7 @@ BEGIN IDS_DIFF_NORMAL "Normal" IDS_DIFF_CONTEXT "Context" IDS_DIFF_UNIFIED "Unified" - IDS_FILEPACK_FAILED_LEFT + IDS_FILEPACK_FAILED_LEFT "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" @@ -1242,22 +1242,22 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Replaced %1 string(s)." IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s""" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1337,7 +1337,7 @@ BEGIN ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and advance (Ctrl Alt Right)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_MULTIPLE_RIGHT "Copy differences from the selected text in left panel to the right file" ID_MULTIPLE_LEFT "Copy differences from the selected text in right panel to the left file" @@ -1346,7 +1346,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 0344c74cc..b8447f52b 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -361,14 +361,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -558,12 +558,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -583,13 +583,13 @@ CAPTION "Registreringer" FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -598,26 +598,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -640,11 +640,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -656,12 +656,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -675,16 +675,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -715,22 +715,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1204,7 +1204,7 @@ BEGIN IDS_COLHDR_RVERSION "Right File Version" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_LEFTONLY "Left Only" IDS_RIGHTONLY "Right Only" @@ -1241,7 +1241,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1256,7 +1256,7 @@ BEGIN IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1336,7 +1336,7 @@ BEGIN ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and advance (Ctrl Alt Right)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_MULTIPLE_RIGHT "Copy differences from the selected text in left panel to the right file" ID_MULTIPLE_LEFT "Copy differences from the selected text in right panel to the left file" @@ -1345,7 +1345,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 457f69589..78fe47c5c 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -362,14 +362,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -562,12 +562,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -581,19 +581,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registry" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -602,26 +602,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -644,11 +644,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -660,12 +660,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -679,16 +679,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -719,22 +719,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1246,22 +1246,22 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Replaced %1 string(s)." IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s""" IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1353,7 +1353,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 384a0439e..5501c39d2 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -364,14 +364,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -563,12 +563,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Texte",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Différence ignorée:",IDC_STATIC,13,69,75,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -582,19 +582,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Base de registre" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "&Intégrer à l'explorateur Windows",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,130,10 - EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Parcourir...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14 - PUSHBUTTON "&Enregistrer le chemin",IDC_WINMERGE_PATH_SAVE,8,51,80,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL + PUSHBUTTON "&Parcourir...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -603,26 +603,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -645,11 +645,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -661,12 +661,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -680,16 +680,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -720,22 +720,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1247,7 +1247,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Click droit pour copier le chemin" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1262,7 +1262,7 @@ BEGIN IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1354,7 +1354,7 @@ BEGIN ID_UNPACK_AUTO "Détermination automatique de l'unpacker (grâce à l'extension d'au moins un des deux fichiers)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 597831ca1..dcb4bcada 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -365,14 +365,14 @@ BEGIN PUSHBUTTON "Abbrechen",IDCANCEL,193,132,50,14 PUSHBUTTON "Speichern unter...",IDSAVEAS,123,132,50,14 LTEXT "Projekt:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Nutzer:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Passwort:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Datenbank:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -531,7 +531,7 @@ BEGIN EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN LTEXT "Datei-Filter:",IDC_STATIC,7,128,60,10 - COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_FILE_FILTER,73,126,117,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Bearbeiten",IDC_EDIT_FILE_FILTER,194,126,40,13,WS_DISABLED END @@ -564,12 +564,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignorierter Unterschied:",IDC_STATIC,13,69,75,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -583,19 +583,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registrierung" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Zum Explorer-Kontextmenü &hinzufügen",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,145,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Suchen...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Pfad speichern",IDC_WINMERGE_PATH_SAVE,7,36,60,14 - LTEXT "Externer Editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Suchen...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL + PUSHBUTTON "&Suchen...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "Externer Editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL + PUSHBUTTON "Suchen...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -604,26 +604,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -646,11 +646,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -662,12 +662,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -681,16 +681,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -721,22 +721,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1248,22 +1248,22 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "%1 Vorkommen ersetzt." IDS_EDIT_TEXT_NOT_FOUND "Kann ""%s"" nicht finden" IDS_LINE_STATUS_INFO_EOL "Zeile: %s Spalte: %d Zeichen: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Zeile: %s" IDS_LINE_STATUS_INFO "Zeile: %s Spalte: %d Zeichen: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1358,7 +1358,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 5cc6a6fa7..fc31484dd 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -357,14 +357,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -557,12 +557,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -576,19 +576,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registry" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -597,26 +597,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -639,11 +639,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -655,12 +655,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -674,16 +674,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -714,22 +714,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1241,7 +1241,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1254,9 +1254,9 @@ BEGIN IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1345,7 +1345,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index dde99eb91..105010d79 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -327,14 +327,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -512,25 +512,25 @@ BEGIN WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -550,13 +550,13 @@ CAPTION " FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -565,26 +565,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -607,11 +607,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -623,12 +623,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -642,16 +642,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -682,22 +682,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1209,7 +1209,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1224,7 +1224,7 @@ BEGIN IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END // LANGUAGES SYNCHRO @@ -1479,7 +1479,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 4c7902768..7d756f708 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -29,18 +29,18 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" @@ -75,17 +75,17 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Kopier til den andre siden", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Kopier fra den andre siden", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Kopier alle forskjellene til den andre siden...", + MENUITEM "Kopier alle forskjellene til den andre siden...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Kopier alle forskjellene fra den andre siden...", + MENUITEM "Kopier alle forskjellene fra den andre siden...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR MENUITEM "Angre", ID_UNDO @@ -94,7 +94,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Filer" BEGIN @@ -214,7 +214,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_ITEM_POPUP_" BEGIN @@ -243,7 +243,7 @@ BEGIN END END -IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE +IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -258,7 +258,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE +IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -325,19 +325,19 @@ CAPTION "Velg filer eller mapper..." FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "&Venstre:",IDC_STATIC,13,24,40,8 - COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "&Åpne...",IDC_LEFT_BUTTON,241,22,38,12 RTEXT "&Høyre:",IDC_STATIC,13,40,40,8 - COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,56,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "Å&pne...",IDC_RIGHT_BUTTON,241,38,38,12 RTEXT "E&xtensions:",IDC_STATIC,13,56,40,8 - COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,56,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Re&kursivt",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | + CONTROL "Re&kursivt",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,72,46,10 RTEXT "&Unpacker:",IDC_STATIC,13,88,40,8 EDITTEXT IDC_UNPACKER_EDIT,56,86,182,12,ES_AUTOHSCROLL | @@ -360,14 +360,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -384,7 +384,7 @@ BEGIN LTEXT "&Sti til cleartool.exe:",IDC_VSS_L1,13,41,60,8 EDITTEXT IDC_PATH_EDIT,88,40,112,12,ES_AUTOHSCROLL PUSHBUTTON "&Åpne...",IDC_BROWSE_BUTTON,202,40,46,12 - COMBOBOX IDC_VER_SYS,88,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,88,20,157,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Versjonsstyringssystem",IDC_STATIC,13,22,75,10 END @@ -435,7 +435,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Avbryt",IDCANCEL,154,33,52,14 - LISTBOX IDC_LANGUAGE_LIST,5,16,141,141,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LANGUAGE_LIST,5,16,141,141,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Tilgjengelige språk:",IDC_STATIC,7,7,63,8 END @@ -445,7 +445,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Søk" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_EDIT_FINDTEXT,41,6,135,138,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "Sammenlign bare &hele ord",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -453,7 +453,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,40,121,12 CONTROL "Regulært &uttrykk",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,4,54,77,12 - CONTROL "&Opp",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Opp",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,135,34,25,12 CONTROL "&Ned",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,135,44,32,12 @@ -468,9 +468,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Erstatt" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | + COMBOBOX IDC_EDIT_FINDTEXT,52,7,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | + COMBOBOX IDC_EDIT_REPLACE_WITH,52,24,116,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Sammenlign bare &hele ord",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -499,7 +499,7 @@ BEGIN DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14 PUSHBUTTON "Avbryt",IDCANCEL,194,90,50,14 PUSHBUTTON "Skul som...",IDSAVEAS,114,90,50,14 - EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "Kommentarer",IDC_STATIC,18,7,47,10 END @@ -522,10 +522,10 @@ BEGIN IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 7,221,15 LTEXT "Regulære uttrykk (ett pr linje):",IDC_STATIC,7,28,221,8 - EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | + EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN LTEXT "Filfilter:",IDC_STATIC,7,128,60,10 - COMBOBOX IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_FILE_FILTER,81,126,136,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Edit",IDC_EDIT_FILE_FILTER,194,126,34,13,WS_DISABLED END @@ -536,34 +536,34 @@ CAPTION "Farger" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Forskjeller:",IDC_STATIC,13,29,66,8 - CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Valgte forskjeller:",IDC_STATIC,13,49,66,8 - CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Background",IDC_STATIC,81,15,50,8 CTEXT "Deleted",IDC_STATIC,130,15,38,8 - CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,184,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -573,7 +573,7 @@ CAPTION "Dialog" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,106,136,50,14 - EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | + EDITTEXT IDC_EDIT1,7,7,264,123,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -583,13 +583,13 @@ CAPTION "Registreringer" FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -598,26 +598,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -640,11 +640,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -656,12 +656,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -675,16 +675,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -715,22 +715,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -788,7 +788,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -948,16 +948,16 @@ IDB_FILESKIP BITMAP DISCARDABLE "res\\fileskip.bmp" IDD_PROP_VSS DLGINIT BEGIN IDC_VER_SYS, 0x403, 5, 0 -0x6f4e, 0x656e, "\000" +0x6f4e, 0x656e, "\000" IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029, IDC_VER_SYS, 0x403, 34, 0 -0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, -0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, +0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065, +0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029, IDC_VER_SYS, 0x403, 19, 0 -0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, -"\000" +0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573, +"\000" 0 END @@ -1122,9 +1122,9 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Lagre som" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "Du skal velge enten utelukkende filer, eller utelukkende mapper." - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "Kan ikke ta backup av den originale filen.\nVil du fortsette allikevel?" IDS_OPTIONS_TITLE "Egenskaper" IDS_OPEN_TITLE "Åpne" @@ -1154,7 +1154,7 @@ BEGIN IDS_CC_CMD "&Sti til cleartool.exe :" IDS_VSS_CMD "&Sti til SS.EXE :" IDS_VSS_RUN_ERROR "Feil under utførelse av versjonsstyringssystemkommando." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Det er gjort endringer i noen innstillinger, som kan ha innflytelse på allerede åpne vinduer. Noen av disse innstillinger virker muligens ikke før vinduene er gjenåpnet." IDS_COLHDR_LTIMEM "Venstre dato" IDS_COLHDR_RTIMEM "Høyre dato" @@ -1241,7 +1241,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1254,9 +1254,9 @@ BEGIN IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1267,15 +1267,15 @@ BEGIN ID_OPTIONS_SHOWDIFFERENT "Viser filer som har forskjeller" ID_PREVDIFF "Scroll til den forrige forskjellen\nForrige forskjell (Alt Opp)" ID_NEXTDIFF "Scroll til den neste forskjellen\nNeste forskjell (Alt Ned)" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Lagre en kopi av originalen som *.bak\nBackup" END STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Scroll automatisk til den første forskjellen\nScroll første" - ID_OPTIONS_IGNOREWHITESPACE + ID_OPTIONS_IGNOREWHITESPACE "Ignorerer mellomrom under sammenligning av filer" ID_HIDE_BACKUP_FILES "Skjul filer med extension BAK" ID_HELP_GNULICENSE "Vis GNU general public license" @@ -1345,7 +1345,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 1c43c0f4f..bbe31d180 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -361,14 +361,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -561,12 +561,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -586,13 +586,13 @@ CAPTION "Registre" FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -601,26 +601,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -643,11 +643,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -659,12 +659,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -678,16 +678,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -718,22 +718,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1244,7 +1244,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1257,9 +1257,9 @@ BEGIN IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1349,7 +1349,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 1ea74ff1b..2b4bdc41e 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -243,7 +243,7 @@ BEGIN END END -IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE +IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -359,14 +359,14 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,193,132,50,14 PUSHBUTTON "Save As...",IDSAVEAS,123,132,50,14 LTEXT "Project:",IDC_STATIC,9,81,25,8 - COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "User:",IDC_STATIC,10,99,18,8 EDITTEXT IDC_USER,48,96,58,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,127,99,34,8 EDITTEXT IDC_PASSWORD,162,97,70,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Database:",IDC_STATIC,9,64,33,13 - COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | + COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,117,65,8 @@ -400,7 +400,7 @@ BEGIN IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 17,30,175,10 CONTROL "Ignorar diferencias de lineas vacias", - IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | + IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,128,10 CONTROL "Ignorar diferencias may./min.",IDC_IGNCASE_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,52,121,10 @@ -559,12 +559,12 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CTEXT "Text",IDC_STATIC,178,15,29,8 - CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE RTEXT "Ignored Difference:",IDC_STATIC,13,69,66,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", - BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -578,19 +578,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registry" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 @@ -599,26 +599,26 @@ CAPTION "Patch Generator" FONT 8, "MS Sans Serif" BEGIN LTEXT "File1:",IDC_STATIC,7,10,18,8 - COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE1,33,7,162,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE1,202,7,50,14 LTEXT "File2:",IDC_STATIC,7,27,18,8 - COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILE2,33,24,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_FILE2,202,24,50,14 PUSHBUTTON "Swap",IDC_DIFF_SWAPFILES,202,41,50,14 CONTROL "Append to existing file",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,33,51,85,10 LTEXT "Result:",IDC_STATIC,7,66,23,8 - COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | + COMBOBOX IDC_DIFF_FILERESULT,33,63,162,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Browse...",IDC_DIFF_BROWSE_RESULT,202,63,50,14 GROUPBOX "Format",IDC_STATIC,7,81,94,46 LTEXT "Style:",IDC_STATIC,13,95,18,8 - COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_DIFF_STYLE,44,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Context:",IDC_STATIC,13,109,27,8 - COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | + COMBOBOX IDC_DIFF_CONTEXT,44,108,48,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "Case sensitive",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,132,61,10 @@ -641,11 +641,11 @@ IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | + EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | + ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END @@ -657,12 +657,12 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,89,122,50,14 PUSHBUTTON "Cancel",IDCANCEL,143,122,50,14 GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,129,109 - LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_SHOW,48,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Up",IDC_UP,14,45,27,14 PUSHBUTTON "&Down",IDC_DOWN,14,63,27,14 GROUPBOX "Hide columns",IDC_GROUP_HIDE,180,7,96,109 - LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | + LISTBOX IDC_LIST_HIDE,188,19,80,90,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "<==",IDC_ADD,143,45,29,14 PUSHBUTTON "==>",IDC_REMOVE,143,63,29,14 @@ -676,16 +676,16 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,87,99,50,14 PUSHBUTTON "Cancel",IDCANCEL,156,99,50,14 LTEXT "File unpacker:",IDC_STATIC,7,18,50,10 - COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | + COMBOBOX IDC_UNPACKER_NAME,98,16,188,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Display all unpackers, don't check the extension", - IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | + IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,202,13 LTEXT "Extensions list:",IDC_STATIC,7,36,49,10 LTEXT "Description:",IDC_STATIC,7,52,47,10 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,97,34,176,12, ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | + EDITTEXT IDC_UNPACKER_DESCRIPTION,58,50,228,12,ES_AUTOHSCROLL | ES_READONLY END @@ -716,22 +716,22 @@ BEGIN CONTROL 227,IDC_STATIC,"Static",SS_BITMAP,214,23,12,11, WS_EX_STATICEDGE RTEXT "",IDC_COUNT_LFOLDER,24,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_RFOLDER,24,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_EQUAL,77,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_NOTEQUAL,78,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYSAME,128,9,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_BINARYDIFF,127,25,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_LFILE,180,10,19,8,SS_REALSIZEIMAGE | 0x2000 RTEXT "",IDC_COUNT_RFILE,180,25,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FOLDERSKIP,230,10,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_FILESKIP,230,24,19,8,SS_REALSIZEIMAGE | 0x2000 - RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | + RTEXT "",IDC_COUNT_UNKNOWN,284,10,19,8,SS_REALSIZEIMAGE | 0x2000 PUSHBUTTON "Stop",IDC_COMPARISON_STOP,317,14,60,14 END @@ -1243,7 +1243,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Right click on the path to copy" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDC_COMPARISON_STOP "Stop" IDC_COMPARISON_CLOSE "Press any key" @@ -1256,9 +1256,9 @@ BEGIN IDS_LINE_STATUS_INFO_EOL "Line: %s Column: %d Characters: %d EOL: %s" IDS_EMPTY_LINE_STATUS_INFO "Line: %s" IDS_LINE_STATUS_INFO "Line: %s Column: %d Characters: %d" - IDS_VSSFOLDER_AND_FILE_NOMATCH + IDS_VSSFOLDER_AND_FILE_NOMATCH "The VSS Working Folder and the location of the current file do not match. Continue?" - IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" + IDS_CANNOT_EXECUTE_FILE "Cannot execute %1" END STRINGTABLE DISCARDABLE @@ -1349,7 +1349,7 @@ BEGIN ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_PLUGIN_FAILED "An error occurred in plugin '%1'. The current operation is aborted." IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1" diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index feaaecdd5..e43ddba71 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -83,10 +83,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopiera alla skillnader till den andra sidan...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Kopiera alla skillnader från den andra sidan...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE - MENUITEM SEPARATOR MENUITEM "Ångra", ID_UNDO MENUITEM SEPARATOR @@ -588,13 +586,13 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "Lägg till i Utforskarens popup-meny", IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,6,126,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Bläddra...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Spara sökväg",IDC_WINMERGE_PATH_SAVE,7,36,53,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,167,14,ES_AUTOHSCROLL + PUSHBUTTON "&Bläddra...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "External editor:",IDC_STATIC,7,50,48,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,167,14,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 162 diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index b6cc8c6fc..49fea703b 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -974,6 +974,7 @@ void CMainFrame::OnOptions() m_sPattern = filter.m_sPattern; theApp.SetFileFilterPath(filter.m_sFileFilterPath); + regpage.SaveMergePath(); m_sExtEditorPath = regpage.m_strEditorPath; m_sExtEditorPath.TrimLeft(); m_sExtEditorPath.TrimRight(); diff --git a/Src/Merge.rc b/Src/Merge.rc index 2c4ea169a..e2d358d25 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1,6 +1,7 @@ //Microsoft Developer Studio generated resource script. // // $Id$ + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -83,10 +84,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Copy all diffs to other side...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Copy all diffs from other side...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE - MENUITEM SEPARATOR MENUITEM "Undo", ID_UNDO MENUITEM SEPARATOR @@ -228,14 +227,12 @@ BEGIN BEGIN MENUITEM "with registered application", ID_DIR_OPEN_LEFT MENUITEM "with external editor", ID_DIR_OPEN_LEFT_WITHEDITOR - MENUITEM "with...", ID_DIR_OPEN_LEFT_WITH END POPUP "Open right" BEGIN MENUITEM "with registered application", ID_DIR_OPEN_RIGHT MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR - MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH END END @@ -328,7 +325,7 @@ END IDD_OPEN DIALOGEX 0, 0, 356, 115 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Select Files or Directories..." -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "&Left:",IDC_STATIC,13,24,40,8 COMBOBOX IDC_LEFT_COMBO,56,22,182,94,CBS_DROPDOWN | @@ -540,7 +537,7 @@ END IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Difference:",IDC_STATIC,13,29,66,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | @@ -584,19 +581,19 @@ BEGIN WS_VSCROLL END -IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_REGISTRY DIALOG DISCARDABLE 0, 0, 235, 156 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Registry" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10 - EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14 - PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14 - LTEXT "External editor:",IDC_STATIC,8,58,48,8 - EDITTEXT IDC_EXT_EDITOR_PATH,7,68,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_EXT_EDITOR_BROWSE,179,68,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,167,10 + LTEXT "&WinMerge executable:",IDC_STATIC,7,19,165,8 + EDITTEXT IDC_WINMERGE_PATH,7,29,166,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,178,29,50,14 + LTEXT "&External editor:",IDC_STATIC,7,50,164,8 + EDITTEXT IDC_EXT_EDITOR_PATH,7,60,166,14,ES_AUTOHSCROLL + PUSHBUTTON "B&rowse...",IDC_EXT_EDITOR_BROWSE,178,60,50,14 END IDD_GENERATE_PATCH DIALOG DISCARDABLE 0, 0, 259, 170 diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp index a9bffd3e0..6f43ed1e0 100644 --- a/Src/PropRegistry.cpp +++ b/Src/PropRegistry.cpp @@ -70,7 +70,6 @@ void CPropRegistry::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CPropRegistry, CDialog) //{{AFX_MSG_MAP(CPropRegistry) ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer) - ON_BN_CLICKED(IDC_WINMERGE_PATH_SAVE, OnSavePath) ON_BN_CLICKED(IDC_WINMERGE_PATH_BROWSE, OnBrowsePath) ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor) //}}AFX_MSG_MAP @@ -172,10 +171,8 @@ void CPropRegistry::OnAddToExplorer() } /// Saves given path to registry for ShellExtension -void CPropRegistry::OnSavePath() +void CPropRegistry::SaveMergePath() { - UpdateData(); - CRegKeyEx reg; if (reg.Open(HKEY_CURRENT_USER, f_RegDir) != ERROR_SUCCESS) return; diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h index e66856947..8ec6a2dd4 100644 --- a/Src/PropRegistry.h +++ b/Src/PropRegistry.h @@ -41,6 +41,7 @@ class CPropRegistry : public CPropertyPage public: CPropRegistry(); // standard constructor + void SaveMergePath(); // Dialog Data //{{AFX_DATA(CPropRegistry) @@ -60,7 +61,6 @@ public: // Implementation methods protected: bool IsRegisteredForDirectory() const; - void UpdateButton(); void EnableContextHandler(bool enabling); void GetContextRegValues(); @@ -68,7 +68,6 @@ protected: //{{AFX_MSG(CPropRegistry) virtual BOOL OnInitDialog(); afx_msg void OnAddToExplorer(); - afx_msg void OnSavePath(); afx_msg void OnBrowsePath(); afx_msg void OnBrowseEditor(); //}}AFX_MSG diff --git a/Src/readme.txt b/Src/readme.txt index a1047349f..b49c07913 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -11,6 +11,9 @@ Submitted by Perry WinMerge: ConfigLog.cpp WinMerge new file: winnt_supp.h + PATCH: [ 838898 ] Cleanup Registry -optionpage + WinMerge: MainFrm.cpp Merge.rc PropRegistry.h PropRegistry.cpp + Languages: *.rc 2003-11-11 Laoran PATCH: [ 839243 ] F4 should hilight diff in both files -- 2.11.0