From 1362884261df4a5c5772efdbc3d666f49fe237dd Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 7 Aug 2003 18:19:12 +0000 Subject: [PATCH] PATCH: [ 783593 ] Add Merge-menu --- .../ChineseSimplified/MergeChineseSimplified.rc | 28 +-- .../ChineseTraditional/MergeChineseTraditional.rc | 28 +-- Src/Languages/Czech/MergeCzech.rc | 44 ++--- Src/Languages/Danish/MergeDanish.rc | 28 +-- Src/Languages/Dutch/MergeDutch.rc | 44 ++--- Src/Languages/French/MergeFrench.rc | 180 ++++++++++---------- Src/Languages/German/MergeGerman.rc | 188 +++++++++++---------- Src/Languages/Italian/MergeItalian.rc | 44 ++--- Src/Languages/Korean/MergeKorean.rc | 186 ++++++++++---------- Src/Languages/Slovak/MergeSlovak.rc | 164 +++++++++--------- Src/Languages/Spanish/MergeSpanish.rc | 40 ++--- Src/Merge.rc | 28 +-- Src/readme.txt | 3 + 13 files changed, 516 insertions(+), 489 deletions(-) diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index b94f069a6..473be9301 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -110,19 +110,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "ÏÂÒ»²»Í¬(&N)\tAlt+Down", ID_NEXTDIFF - MENUITEM "ÉÏÒ»²»Í¬(&P)\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "µÚÒ»¸ö²»Í¬(&F)\tAlt+Home", ID_FIRSTDIFF - MENUITEM "µ±Ç°²»Í¬(&C)\tAlt+Enter", ID_CURDIFF - MENUITEM "ÉϴεIJ»Í¬(&D)\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "¸´ÖƵ½ÓÒ±ß(&R)\tAlt+Right", ID_L2R - MENUITEM "¸´ÖƵ½×ó±ß(&L)\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "È«²¿¸´ÖƵ½ÓÒ±ß(&A)", ID_ALL_RIGHT - MENUITEM "È«²¿¸´ÖƵ½×ó±ß(&E)", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "Ñ°ÕÒ(&I)...\tCtrl+F", ID_EDIT_FIND MENUITEM "Ìæ»»(&C)...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -149,6 +136,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "ÓïÑÔ(&L)...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "ÏÂÒ»²»Í¬(&N)\tAlt+Down", ID_NEXTDIFF + MENUITEM "ÉÏÒ»²»Í¬(&P)\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "µÚÒ»¸ö²»Í¬(&F)\tAlt+Home", ID_FIRSTDIFF + MENUITEM "µ±Ç°²»Í¬(&C)\tAlt+Enter", ID_CURDIFF + MENUITEM "ÉϴεIJ»Í¬(&D)\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "¸´ÖƵ½ÓÒ±ß(&R)\tAlt+Right", ID_L2R + MENUITEM "¸´ÖƵ½×ó±ß(&L)\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "È«²¿¸´ÖƵ½ÓÒ±ß(&A)", ID_ALL_RIGHT + MENUITEM "È«²¿¸´ÖƵ½×ó±ß(&E)", ID_ALL_LEFT + END POPUP "´°¿Ú(&W)" BEGIN MENUITEM "¹Ø±Õ", ID_FILE_CLOSE diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 311c369af..75497f157 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -109,19 +109,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "¤U¤@¤£¦P(&N)\tAlt+Down", ID_NEXTDIFF - MENUITEM "¤W¤@¤£¦P(&P)\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "²Ä¤@­Ó¤£¦P(&F)\tAlt+Home", ID_FIRSTDIFF - MENUITEM "¥Ø«e¤£¦P(&C)\tAlt+Enter", ID_CURDIFF - MENUITEM "¤W¦¸ªº¤£¦P(&D)\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "½Æ»s¨ì¥kÃä(&R)\tAlt+Right", ID_L2R - MENUITEM "½Æ»s¨ì¥ªÃä(&L)\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "¥þ³¡½Æ»s¨ì¥kÃä(&A)", ID_ALL_RIGHT - MENUITEM "¥þ³¡½Æ»s¨ì¥ªÃä(&E)", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "´M§ä(&I)...\tCtrl+F", ID_EDIT_FIND MENUITEM "¨ú¥N(&C)...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -148,6 +135,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "»y¨¥(&L)...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "¤U¤@¤£¦P(&N)\tAlt+Down", ID_NEXTDIFF + MENUITEM "¤W¤@¤£¦P(&P)\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "²Ä¤@­Ó¤£¦P(&F)\tAlt+Home", ID_FIRSTDIFF + MENUITEM "¥Ø«e¤£¦P(&C)\tAlt+Enter", ID_CURDIFF + MENUITEM "¤W¦¸ªº¤£¦P(&D)\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "½Æ»s¨ì¥kÃä(&R)\tAlt+Right", ID_L2R + MENUITEM "½Æ»s¨ì¥ªÃä(&L)\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "¥þ³¡½Æ»s¨ì¥kÃä(&A)", ID_ALL_RIGHT + MENUITEM "¥þ³¡½Æ»s¨ì¥ªÃä(&E)", ID_ALL_LEFT + END POPUP "µøµ¡(&W)" BEGIN MENUITEM "Ãö³¬", ID_FILE_CLOSE diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index e23dabb1c..b2aff74ad 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Následující rozdíl\tTAlt+Down", ID_NEXTDIFF - MENUITEM "&Pøedchozí rozdíl\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF - MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Kopírovat vp&ravo\tŠipka vpravo", ID_L2R - MENUITEM "Kopírovat vl&evo\tŠipka vlevo", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Kopírovat vše vpravo", ID_ALL_RIGHT - MENUITEM "Kopírovat vše vlevo", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "F&ind...\tCtrl+F", ID_EDIT_FIND MENUITEM "Repla&ce...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Následující rozdíl\tTAlt+Down", ID_NEXTDIFF + MENUITEM "&Pøedchozí rozdíl\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF + MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Kopírovat vp&ravo\tŠipka vpravo", ID_L2R + MENUITEM "Kopírovat vl&evo\tŠipka vlevo", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Kopírovat vše vpravo", ID_ALL_RIGHT + MENUITEM "Kopírovat vše vlevo", ID_ALL_LEFT + END POPUP "&Okno" BEGIN MENUITEM "Zavøít", ID_FILE_CLOSE @@ -455,25 +457,25 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Difference:",IDC_STATIC,43,29,36,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Selected Difference:",IDC_STATIC,13,49,66,8 CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 LTEXT "Text",IDC_STATIC,184,15,15,8 END diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 5e2d6654d..727c62991 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -112,19 +112,6 @@ BEGIN MENUITEM "&Indsæt\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF - MENUITEM SEPARATOR - MENUITEM "&Næste forskel\tAlt+Ned", ID_NEXTDIFF - MENUITEM "Fo&rrige forskel\tAlt+Op", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "F&ørste forskel\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Aktuelle forskel\tAlt+Enter", ID_CURDIFF - MENUITEM "&Sidste forskel\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Kopier til &højre\tAlt+Højre", ID_L2R - MENUITEM "Kopier til &venstre\tAlt+Venstre", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Kopier alt &til højre", ID_ALL_RIGHT - MENUITEM "Kopier alt til ve&nstre", ID_ALL_LEFT MENUITEM SEPARATOR MENUITEM "Sø&g...\tCtrl+F", ID_EDIT_FIND MENUITEM "&Erstat...\tCtrl+H", ID_EDIT_REPLACE @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "S&prog...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Næste forskel\tAlt+Ned", ID_NEXTDIFF + MENUITEM "Fo&rrige forskel\tAlt+Op", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "F&ørste forskel\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Aktuelle forskel\tAlt+Enter", ID_CURDIFF + MENUITEM "&Sidste forskel\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Kopier til &højre\tAlt+Højre", ID_L2R + MENUITEM "Kopier til &venstre\tAlt+Venstre", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Kopier alt &til højre", ID_ALL_RIGHT + MENUITEM "Kopier alt til ve&nstre", ID_ALL_LEFT + END POPUP "&Vindue" BEGIN MENUITEM "Luk", ID_FILE_CLOSE diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 0abf93b58..73e4cc447 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Volgende verschil\tAlt+Down", ID_NEXTDIFF - MENUITEM "Vor&ige verschil\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF - MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Kopieer naar &Rechts\tAlt+Right", ID_L2R - MENUITEM "Kopieer naar &Links\tAlt+left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Kopieer alles naar rechts", ID_ALL_RIGHT - MENUITEM "Kopieer alles naar links", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "F&ind...\tCtrl+F", ID_EDIT_FIND MENUITEM "Repla&ce...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -153,6 +140,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Taal...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Volgende verschil\tAlt+Down", ID_NEXTDIFF + MENUITEM "Vor&ige verschil\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF + MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Kopieer naar &Rechts\tAlt+Right", ID_L2R + MENUITEM "Kopieer naar &Links\tAlt+left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Kopieer alles naar rechts", ID_ALL_RIGHT + MENUITEM "Kopieer alles naar links", ID_ALL_LEFT + END POPUP "&Venster" BEGIN MENUITEM "Sluiten", ID_FILE_CLOSE @@ -457,25 +459,25 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Difference:",IDC_STATIC,43,29,36,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Selected Difference:",IDC_STATIC,13,49,66,8 CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 LTEXT "Text",IDC_STATIC,184,15,15,8 END diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 6aa6e36e2..3faa6a858 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH // 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" @@ -73,17 +73,17 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Copier vers l'autre côté", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Copier depuis l'autre côté", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Copier toutes les différences vers l'autre côté...", + MENUITEM "Copier toutes les différences vers l'autre côté...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Copier toutes les différences depuis l'autre côté...", + MENUITEM "Copier toutes les différences depuis l'autre côté...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR @@ -93,7 +93,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Fichier" BEGIN @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Premier mot différent de la ligne\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "Différence &suivante\tAlt+Down", ID_NEXTDIFF - MENUITEM "Différence &précédente\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&Première Différence\tAlt+Home", ID_FIRSTDIFF - MENUITEM "Différence Courante\tAlt+Enter", ID_CURDIFF - MENUITEM "&Dernière Différence\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Copier vers la droite\tAlt+Right", ID_L2R - MENUITEM "Copier vers la gauche\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Tout copier vers la droite", ID_ALL_RIGHT - MENUITEM "Tout copier vers la gauche", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "&Trouver...\tCtrl+F", ID_EDIT_FIND MENUITEM "Rempla&cer...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Langue...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "Différence &suivante\tAlt+Down", ID_NEXTDIFF + MENUITEM "Différence &précédente\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&Première Différence\tAlt+Home", ID_FIRSTDIFF + MENUITEM "Différence Courante\tAlt+Enter", ID_CURDIFF + MENUITEM "&Dernière Différence\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Copier vers la droite\tAlt+Right", ID_L2R + MENUITEM "Copier vers la gauche\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Tout copier vers la droite", ID_ALL_RIGHT + MENUITEM "Tout copier vers la gauche", ID_ALL_LEFT + END POPUP "Fe&nêtres" BEGIN MENUITEM "Fermer", ID_FILE_CLOSE @@ -169,13 +171,13 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "Copier le fichier vers la gauche", + MENUITEM "Copier le fichier vers la gauche", ID_DIR_COPY_FILE_TO_LEFT - MENUITEM "Copier le fichier vers la droite", + MENUITEM "Copier le fichier vers la droite", ID_DIR_COPY_FILE_TO_RIGHT MENUITEM "Supprimer à gauche", ID_DIR_DEL_LEFT MENUITEM "Supprimer à droite", ID_DIR_DEL_RIGHT @@ -194,7 +196,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 @@ -258,19 +260,19 @@ CAPTION "S FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Gauche :",IDC_STATIC,13,24,30,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 "&Parcourir...",IDC_LEFT_BUTTON,241,22,38,12 LTEXT "&Droite :",IDC_STATIC,13,40,24,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 "P&arcourir...",IDC_RIGHT_BUTTON,241,38,38,12 LTEXT "E&xtensions :",IDC_STATIC,13,56,39,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 "Ré&cursif",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | + CONTROL "Ré&cursif",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,77,42,10 DEFPUSHBUTTON "OK",IDOK,294,11,50,14 PUSHBUTTON "Annuler",IDCANCEL,294,28,50,14 @@ -289,7 +291,7 @@ BEGIN PUSHBUTTON "Annuler",IDCANCEL,174,121,68,14 PUSHBUTTON "Sauvegarder sous...",IDSAVEAS,94,121,68,14 LTEXT "Projet :",IDC_STATIC,9,61,25,8 - COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Auteur:",IDC_STATIC,9,80,24,8 EDITTEXT IDC_USER,36,78,58,14,ES_AUTOHSCROLL @@ -306,7 +308,7 @@ BEGIN LTEXT "&Chemin vers cleartool.exe:",IDC_VSS_L1,16,42,88,8 EDITTEXT IDC_PATH_EDIT,104,40,94,12,ES_AUTOHSCROLL PUSHBUTTON "&Parcourir",IDC_BROWSE_BUTTON,206,40,42,12 - COMBOBOX IDC_VER_SYS,104,20,141,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,104,20,141,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Système utilisé:",IDC_STATIC,16,22,60,10 END @@ -356,7 +358,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Annuler",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 "Langues disponibles :",IDC_STATIC,7,7,69,8 END @@ -366,7 +368,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Rechercher" FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,46,6,130,138,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_EDIT_FINDTEXT,46,6,130,138,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "&Mot entier",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -389,9 +391,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remplacer" 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 "&Mot entier",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -420,7 +422,7 @@ BEGIN DEFPUSHBUTTON "Extraction",IDOK,18,90,68,14 PUSHBUTTON "Annuler",IDCANCEL,194,90,68,14 PUSHBUTTON "Sauvegarder Sous...",IDSAVEAS,106,90,68,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 "Commentaires",IDC_STATIC,18,7,56,10 END @@ -443,10 +445,10 @@ BEGIN IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 7,221,15 LTEXT "Expressions (une par ligne)",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 fichier:",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 END @@ -456,26 +458,26 @@ CAPTION "Couleurs" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Différence:",IDC_STATIC,43,29,36,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 LTEXT "Différence + Sélection:",IDC_STATIC,13,49,73,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 LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 | 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 LTEXT "Text",IDC_STATIC,184,15,15,8 END @@ -486,7 +488,7 @@ CAPTION "Dialogue" 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 @@ -557,7 +559,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -694,16 +696,16 @@ IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.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 @@ -720,14 +722,14 @@ IDR_MARGIN_CURSOR CURSOR DISCARDABLE "res\\mg_cur.cur" // String Table // -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDR_MAINFRAME "WinMerge" IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge" IDS_WINMERGE_THIS_DIRECTORY "WinMerge ce répertoire" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "Version %1 - Francais" IDS_ALLFILES "Tous les fichiers (*.*)|*.*||" @@ -745,13 +747,13 @@ BEGIN IDS_CANT_COMPARE_FILES "Impossible de comparer les fichiers" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN AFX_IDS_APP_TITLE "WinMerge" AFX_IDS_IDLEMESSAGE "Prêt" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -761,7 +763,7 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Crée un nouveau document\nNouveau" ID_FILE_OPEN "Ouvre un document existant\nOuvrir" @@ -774,13 +776,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "Affiche des pages entières\nAperçu avant impression" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Affiche des informations sur le programme, le numéro de version et le copyright\nA propos de" ID_APP_EXIT "Ferme l'application ; propose d'enregistrer les documents\nQuitter" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Ouvrir ce document" ID_FILE_MRU_FILE2 "Ouvrir ce document" @@ -800,13 +802,13 @@ BEGIN ID_FILE_MRU_FILE16 "Ouvrir ce document" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Passe au volet de fenêtre suivant\nVolet suivant" ID_PREV_PANE "Revient au volet précédent\nVolet précédent" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Ouvre une nouvelle fenêtre pour le document actif\nNouvelle fenêtre" ID_WINDOW_ARRANGE "Réorganise les icônes en bas de la fenêtre\nRéorganise les icônes" @@ -816,7 +818,7 @@ BEGIN ID_WINDOW_SPLIT "Fractionne la fenêtre active en deux volets\nFractionner" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Efface la sélection\nEffacer" ID_EDIT_CLEAR_ALL "Efface tout\nEffacer tout" @@ -831,13 +833,13 @@ BEGIN ID_EDIT_REDO "Rétablit l'action précédemment annulée\nRétablir" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Affiche ou masque la barre d'outils\nBarre d'outils" ID_VIEW_STATUS_BAR "Affiche ou masque la barre d'état\nBarre d'état" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Change la taille de la fenêtre" AFX_IDS_SCMOVE "Change la position de la fenêtre" @@ -848,19 +850,19 @@ BEGIN AFX_IDS_SCCLOSE "Ferme la fenêtre active et propose l'enregistrement des documents" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Restaure la fenêtre à sa taille d'origine" AFX_IDS_SCTASKLIST "Active la liste des tâches" AFX_IDS_MDICHILD "Active cette fenêtre" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Ferme le mode d'aperçu avant impression\nFermer l'aperçu" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_L2R "Copier le texte sélectionné vers le fichier de droite\nCopier à Droite (Alt Right)" ID_R2L "Copier le texte sélectionné vers le fichier de gauche\nCopier à Gauche (Alt Left)" @@ -868,13 +870,13 @@ BEGIN ID_OPTIONS_SHOWDIFFERENT "Afficher les fichiers différents" ID_PREVDIFF "Défiler jusqu'à la différence précédente\nDiff Précédente (Alt Up)" ID_NEXTDIFF "Défiler jusqu'à la différence suivante\nDiff Suivante (Alt Down)" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Sauver une copie de l'original avec extension .BAK\nCréer une Sauvegarde" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Défiler automatiquement jusqu'à la première différence\nPremière différence" ID_OPTIONS_IGNOREWHITESPACE "Ignorer les espaces lors de la comparaison" ID_HIDE_BACKUP_FILES "Cacher les fichiers avec l'extension .BAK" @@ -885,13 +887,13 @@ BEGIN ID_ALL_RIGHT "Copier toutes les différences vers le fichier de droite\nCopier Tout à Droite" ID_VIEW_SELECTFONT "Sélectionner la police utilisée pour l'affichage des différences\nSélection de la Police Diff" ID_VIEW_USEDEFAULTFONT "Revenir à la police par défaut pour l'affichage des différences\nPolice par Défaut" - ID_DIR_COPY_FILE_TO_LEFT + ID_DIR_COPY_FILE_TO_LEFT "Copier le fichier sélectionné vers le répertoire indiqué" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_DIR_COPY_FILE_TO_RIGHT + ID_DIR_COPY_FILE_TO_RIGHT "Copier le fichier sélectionné vers le répertoire indiqué" ID_VIEW_LANGUAGE "Sélectionner la langue de l'interface\nLangue" ID_HELP_CONTENTS "Affiche le guide de l'utilisateur de WinMerge\nAide" @@ -902,9 +904,9 @@ BEGIN ID_DIR_DEL_LEFT "Supprimer l'élément sélectionné à gauche" ID_DIR_DEL_RIGHT "Supprimer l'élément sélectionné à droite" ID_DIFFSTATUS "placeholder for status count" - ID_OPTIONS_SHOWUNIQUELEFT + ID_OPTIONS_SHOWUNIQUELEFT "Afficher les fichiers qui n'existent que dans le panneau gauche" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Afficher les fichiers qui n'existent que dans le panneau droit" ID_DIR_DEL_BOTH "Supprimer l'élément sélectionné de chaque côté" ID_DIR_OPEN_LEFT "Ouvrir le fichier de gauche" @@ -912,12 +914,12 @@ BEGIN ID_DIR_OPEN_RIGHT "Ouvrir le fichier de droite" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Enregistrer sous" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "Vous devez sélectionner deux fichiers ou deux répertoires" - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "Impossible de sauvegarder le fichier original.\nContinuer quand même ?" IDS_OPTIONS_TITLE "Options" IDS_OPEN_TITLE "Ouvrir" @@ -935,7 +937,7 @@ BEGIN END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILENAME_HEADER "Nom du fichier" IDS_DIR_HEADER "Répertoire" @@ -947,17 +949,17 @@ BEGIN IDS_CC_CMD "&Chemin vers cleartool.exe :" IDS_VSS_CMD "&Chemin vers SS.EXE :" IDS_VSS_RUN_ERROR "Erreur d'exécution de SourceSafe." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Certains fichiers de la session courante ont été modifiés. Les changements d'options ne seront appliqués que pour la prochaine session de comparaison." IDS_LTIME_HEADER "Date Gauche" IDS_RTIME_HEADER "Date Droite" IDS_EXTENSION_HEADER "Extension" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Voulez-vous vraiment supprimer %1 éléments sélectionnés parmi %2 ?" IDS_DEL_LEFT_FMT "Suppression de %1 éléments à gauche parmi %2" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Suppression de %1 éléments à droite parmi %2" IDS_DELETE_FILE_FAILED "Erreur lors de la suppression du fichier %1 : %2" @@ -969,7 +971,7 @@ BEGIN IDS_DELETE_DIR_FAILED "Erreur lors de la suppression du répertoire %1 : %2" IDS_COPY_FILE_FAILED "Erreur lors de la copie du fichier %1 : %2" IDS_COPY_DIR_FAILED "Erreur lors de la copie du répertoire %1 : %2" - IDS_ERROR_FILE_WRITEABLE + IDS_ERROR_FILE_WRITEABLE "Erreur en vérifiant les droits en écriture de la destination" IDS_ERROR_BACKUP "Erreur de création du backup" IDS_CONFIRM_COPY_SINGLE "Voulez-vous vraiment copier %1 vers %2 ?" @@ -977,7 +979,7 @@ BEGIN IDS_BIN_FILES_SAME "Les fichiers binaires sont identiques" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "Ouvrir le fichier de droite avec ..." ID_OPTIONS_SHOWBINARIES "Afficher les fichiers binaires" @@ -985,7 +987,7 @@ BEGIN ID_REFRESH "Actualiser l'affichage\nActualiser (F5)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILESAVE_FAILED "Erreur d'enregistrement de %1. Voulez-vous l'enregistrer sous un nouveau nom ?" IDS_ERROR_FILE_NOT_FOUND "Fichier %1 non trouvé" @@ -998,7 +1000,7 @@ BEGIN IDS_STATUS_COPYALL2R "Copie de tout vers la droite" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "%1 remplacements effectués." IDS_EDIT_TEXT_NOT_FOUND "texte non trouvé ""%s""" diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 5a3c911ba..6a3f642e8 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // 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" @@ -73,18 +73,18 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Zur anderen Seite kopieren", ID_POPUP_COPYTOOTHERSIDE - MENUITEM "Von der anderen Seite kopieren", + MENUITEM "Von der anderen Seite kopieren", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Alle Unterschiede zur anderen Seite kopieren...", + MENUITEM "Alle Unterschiede zur anderen Seite kopieren...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Alle Unterschiede von der anderen Seite kopieren...", + MENUITEM "Alle Unterschiede von der anderen Seite kopieren...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR @@ -94,7 +94,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Datei" BEGIN @@ -114,19 +114,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Nächster Unterschied\tAlt+Down", ID_NEXTDIFF - MENUITEM "&Voriger Unterschied\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "Erster &Unterschied\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Aktueller Unterschied\tAlt+Enter", ID_CURDIFF - MENUITEM "&Letzter Unterschied\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Nach rechts kopieren\tPfeil rechts", ID_L2R - MENUITEM "Nach links kopieren\tPfeil links", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Alles nach rechts kopieren", ID_ALL_RIGHT - MENUITEM "Alles nach links kopieren", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "&Suchen...\tCtrl+F", ID_EDIT_FIND MENUITEM "Erse&tzen...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -137,11 +124,11 @@ BEGIN POPUP "&Ansicht" BEGIN MENUITEM "&Identische Dateien anzeigen", ID_OPTIONS_SHOWIDENTICAL - MENUITEM "&Unterschiedliche Dateien anzeigen", + MENUITEM "&Unterschiedliche Dateien anzeigen", ID_OPTIONS_SHOWDIFFERENT - MENUITEM "Zeige eindeutige Dateien &links", + MENUITEM "Zeige eindeutige Dateien &links", ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "Zeige eindeutige Dateien &rechts", + MENUITEM "Zeige eindeutige Dateien &rechts", ID_OPTIONS_SHOWUNIQUERIGHT MENUITEM "Zeige Binär&dateien", ID_OPTIONS_SHOWBINARIES MENUITEM "*.&BAK-Dateien verstecken", ID_HIDE_BACKUP_FILES @@ -156,6 +143,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Spra&che...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Nächster Unterschied\tAlt+Down", ID_NEXTDIFF + MENUITEM "&Voriger Unterschied\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "Erster &Unterschied\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Aktueller Unterschied\tAlt+Enter", ID_CURDIFF + MENUITEM "&Letzter Unterschied\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Nach rechts kopieren\tPfeil rechts", ID_L2R + MENUITEM "Nach links kopieren\tPfeil links", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Alles nach rechts kopieren", ID_ALL_RIGHT + MENUITEM "Alles nach links kopieren", ID_ALL_LEFT + END POPUP "&Fenster" BEGIN MENUITEM "Schließen", ID_FILE_CLOSE @@ -173,7 +175,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -196,7 +198,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 @@ -261,17 +263,17 @@ CAPTION "Dateien oder Verzeichnisse ausw FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Links:",IDC_STATIC,40,24,20,8 - COMBOBOX IDC_LEFT_COMBO,63,22,182,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,63,22,182,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "&Suchen...",IDC_LEFT_BUTTON,248,22,38,12 LTEXT "&Rechts:",IDC_STATIC,34,40,26,8 - COMBOBOX IDC_RIGHT_COMBO,63,38,182,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,63,38,182,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES PUSHBUTTON "S&uchen...",IDC_RIGHT_BUTTON,248,38,38,12 LTEXT "&Erweiterungen:",IDC_STATIC,12,56,48,8 - COMBOBOX IDC_EXT_COMBO,63,54,151,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,63,54,151,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Unter&verzeichnisse durchsuchen",IDC_RECURS_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,74,119,10 @@ -292,7 +294,7 @@ BEGIN PUSHBUTTON "Abbrechen",IDCANCEL,176,121,65,14 PUSHBUTTON "Speichern unter...",IDSAVEAS,96,121,65,14 LTEXT "Projekt:",IDC_STATIC,9,61,25,8 - COMBOBOX IDC_PROJECT_COMBO,36,58,212,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,36,58,212,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP RTEXT "Nutzer:",IDC_STATIC,4,83,43,8 EDITTEXT IDC_USER,52,80,58,14,ES_AUTOHSCROLL @@ -309,7 +311,7 @@ BEGIN LTEXT "&Pfad zu cleartool.exe:",IDC_VSS_L1,16,55,176,8 EDITTEXT IDC_PATH_EDIT,16,65,176,12,ES_AUTOHSCROLL PUSHBUTTON "&Suchen...",IDC_BROWSE_BUTTON,194,65,38,12 - COMBOBOX IDC_VER_SYS,16,35,176,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,16,35,176,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Versionskontrollsystem",IDC_STATIC,16,24,176,10 END @@ -358,7 +360,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Abbrechen",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 "Verfügbare Sprachen:",IDC_STATIC,7,7,70,8 END @@ -368,7 +370,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Suchen" 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 "&nur ganze Wörter",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -391,9 +393,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ersetzen" 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 "&nur ganze Wörter",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -422,7 +424,7 @@ BEGIN DEFPUSHBUTTON "Auschecken",IDOK,35,90,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,194,90,50,14 PUSHBUTTON "Speichern unter...",IDSAVEAS,108,90,64,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 "Kommentar",IDC_STATIC,18,7,242,10 END @@ -446,10 +448,10 @@ BEGIN 7,221,15 LTEXT "Reguläre Ausdrücke (einer pro Zeile):",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 "File filter:",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 END @@ -459,23 +461,23 @@ CAPTION "Farben" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "selektierter Unterschied",IDC_STATIC,13,29,184,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 LTEXT "Unterschied",IDC_STATIC,13,49,184,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 LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 | @@ -489,7 +491,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 @@ -499,7 +501,7 @@ CAPTION "Registry" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "mit Verzeichnissen verknüpfen (Explorer-Kontextmenü)", - IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX | + IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15 CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10 @@ -561,7 +563,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -704,16 +706,16 @@ IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.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 @@ -730,14 +732,14 @@ IDR_MARGIN_CURSOR CURSOR DISCARDABLE "res\\mg_cur.cur" // String Table // -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDR_MAINFRAME "WinMerge" IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Dokument" IDS_WINMERGE_THIS_DIRECTORY "WinMerge dieses Verzeichnis" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "Version %1 - Deutsch" IDS_ALLFILES "Alle Dateien (*.*)|*.*||" @@ -755,13 +757,13 @@ BEGIN IDS_CANT_COMPARE_FILES "Dateien können nicht verglichen werden" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN AFX_IDS_APP_TITLE "WinMerge" AFX_IDS_IDLEMESSAGE "Bereit" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "ER" ID_INDICATOR_CAPS "UF" @@ -771,7 +773,7 @@ BEGIN ID_INDICATOR_REC "MA" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Erstellt ein neues Dokument.\nNeu" ID_FILE_OPEN "Öffnet ein bestehendes Dokument.\nÖffnen" @@ -784,13 +786,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "Zeigt die Druckvorschau an.\nDruckvorschau" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Zeigt Programm-Informationen, Versionsnummer und Copyright an.\nInfo" ID_APP_EXIT "Verläßt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\nBeenden" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Öffnet dieses Dokument." ID_FILE_MRU_FILE2 "Öffnet dieses Dokument." @@ -810,13 +812,13 @@ BEGIN ID_FILE_MRU_FILE16 "Öffnet dieses Dokument." END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Wechselt zum nächsten Fensterausschnitt.\nNächster Ausschnitt" ID_PREV_PANE "Springt zum vorherigen Fensterausschnitt zurück.\nVorheriger Ausschnitt" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Öffnet ein weiteres Fenster für das aktive Dokument.\nNeues Fenster" ID_WINDOW_ARRANGE "Ordnet die Symbole im unteren Bereich des Fensters an.\nSymbole anordnen" @@ -826,7 +828,7 @@ BEGIN ID_WINDOW_SPLIT "Teilt das aktive Fenster in Ausschnitte.\nTeilen" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Löscht die Markierung.\nLöschen" ID_EDIT_CLEAR_ALL "Löscht alles.\nAlles löschen" @@ -841,13 +843,13 @@ BEGIN ID_EDIT_REDO "Wiederholt die vorher rückgängig gemachte Aktion.\nWiederherstellen" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Blendet die Symbolleiste ein oder aus.\nSymbolleiste ein-/ausschalten" ID_VIEW_STATUS_BAR "Blendet die Statusleiste ein oder aus.\nStatusleiste ein-/ausschalten" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Ändert die Fenstergröße." AFX_IDS_SCMOVE "Ändert die Position des Fensters." @@ -858,36 +860,36 @@ BEGIN AFX_IDS_SCCLOSE "Schließt das aktive Fenster und fordert zur Dokumentspeicherung auf." END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Stellt das Fenster in seiner normalen Größe wieder her." AFX_IDS_SCTASKLIST "Aktiviert die Task-Liste." AFX_IDS_MDICHILD "Aktiviert dieses Fenster." END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Beendet die Seitenansicht.\nSeitenansicht beenden" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_L2R "Kopiert den ausgewählten Text in die rechte Datei.\nAuswahl nach rechts kopieren" ID_R2L "Kopiert den ausgewählten Text in die linke Datei.\nAuswahl nach links kopieren" ID_UNDO "Macht die letzte Aktion rückgängig.\nRückgängig" - ID_OPTIONS_SHOWIDENTICAL + ID_OPTIONS_SHOWIDENTICAL "Dateien anzeigen die exakt gleich sind.\nIdentische Dateien" - ID_OPTIONS_SHOWDIFFERENT + ID_OPTIONS_SHOWDIFFERENT "Dateien anzeigen die Unterschiede haben.\nUnterschiedliche Dateien anzeigen" ID_PREVDIFF "Bewegt die Anzeige zum vorigen Unterschied.\nVorheriger Unterschied" ID_NEXTDIFF "Bewegt die Anzeige zum nächsten Unterschied.\nNächster Unterschied" - ID_OPTIONS_BACKUPORIGINALFILE + ID_OPTIONS_BACKUPORIGINALFILE "Eine Sicherheitskopie der Originaldatei wird unter dem Namen *.bak angelegt." END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Positioniert die Anzeige automatisch auf den ersten Unterschied." ID_OPTIONS_IGNOREWHITESPACE "Ignoriert Leerzeichen beim Dateivergleich." ID_HIDE_BACKUP_FILES "Blendet Dateien mit der Erweiterung BAK aus." @@ -898,13 +900,13 @@ BEGIN ID_ALL_RIGHT "Kopiert alle Unterschiede in die rechte Datei." ID_VIEW_SELECTFONT "Wählt die Schrift für die Differenz-Anzeigen." ID_VIEW_USEDEFAULTFONT "Stellt die Schrift für die Differenz-Anzeigen zurück auf die Standard-Systemschrift." - ID_DIR_COPY_FILE_TO_LEFT + ID_DIR_COPY_FILE_TO_LEFT "Kopiert ausgewählte Datei in angegebenes Verzeichnis" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_DIR_COPY_FILE_TO_RIGHT + ID_DIR_COPY_FILE_TO_RIGHT "Kopiert ausgewählte Datei in angegebenes Verzeichnis" ID_VIEW_LANGUAGE "Wählt die Sprache der Benutzeroberfläche." ID_HELP_CONTENTS "Öffnet die WinMerge Benutzeranleitung" @@ -915,9 +917,9 @@ BEGIN ID_DIR_DEL_LEFT "Delete selected item on left" ID_DIR_DEL_RIGHT "Delete selected item on right" ID_DIFFSTATUS "placeholder for status count" - ID_OPTIONS_SHOWUNIQUELEFT + ID_OPTIONS_SHOWUNIQUELEFT "Zeigt eindeutige Dateien auf der linken Seite an.\nEindeutige Dateien links anzeigen" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Zeigt eindeutige Dateien auf der rechten Seite an.\nEindeutige Dateien rechts anzeigen" ID_DIR_DEL_BOTH "Delete selected item(s) on both sides" ID_DIR_OPEN_LEFT "Open left file" @@ -925,12 +927,12 @@ BEGIN ID_DIR_OPEN_RIGHT "Open right file" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Speichern unter" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "Ihre Auswahl muss entweder beide Dateien oder beide Verzeichnisse umfassen." - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "Es konnte keine Sicherheitskopie der Originaldatei erzeugt werden.\nWollen Sie trotzdem fortfahren?" IDS_OPTIONS_TITLE "Eigenschaften" IDS_OPEN_TITLE "Öffnen" @@ -947,7 +949,7 @@ BEGIN IDS_NOPROJECT "Sie müssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILENAME_HEADER "Dateiname" IDS_DIR_HEADER "Verzeichnis" @@ -959,17 +961,17 @@ BEGIN IDS_CC_CMD "&Pfad zu Cleartool.exe :" IDS_VSS_CMD "&Pfad zu SS.EXE :" IDS_VSS_RUN_ERROR "Fehler beim Versionieren." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Datei(en) dieses Vergleichs wurden geändert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde." IDS_LTIME_HEADER "Linkes Datum" IDS_RTIME_HEADER "Rechtes Datum" IDS_EXTENSION_HEADER "Erweiterung" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Wollen Sie wirklich %1 von %2 ausgewählten Einträgen löschen?" IDS_DEL_LEFT_FMT "Lösche auf der linken Seite %1 von %2 ausgewählten Einträgen" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Lösche auf der rechten Seite %1 von %2 ausgewählten Einträgen" IDS_DELETE_FILE_FAILED "Löschen von %1 fehlgeschlagen: %2" @@ -981,7 +983,7 @@ BEGIN IDS_DELETE_DIR_FAILED "Fehler beim Löschen von Verzeichnis %1: %s" IDS_COPY_FILE_FAILED "Fehler beim Kopieren von %1: %2" IDS_COPY_DIR_FAILED "Fehler beim Kopieren von Verzeichnis %1: %2" - IDS_ERROR_FILE_WRITEABLE + IDS_ERROR_FILE_WRITEABLE "Fehler beim Prüfen des Zielverzeichnisses auf Schreibschutz" IDS_ERROR_BACKUP "Fehler beim Erstellen einer Sicherheitskopie" IDS_CONFIRM_COPY_SINGLE "Wollen Sie wirklich %1 nach %2 kopieren?" @@ -989,7 +991,7 @@ BEGIN IDS_BIN_FILES_SAME "Binärdateien sind identisch" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "Öffne rechte Datei mit..." ID_OPTIONS_SHOWBINARIES "Zeigt Binärdateien an" @@ -997,7 +999,7 @@ BEGIN ID_REFRESH "Aktualisiert die Anzeige\nAktualisieren (F5)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILESAVE_FAILED "Fehler beim Speichern von %1. Wollen Sie die Datei unter einem anderen Namen speichern?" IDS_ERROR_FILE_NOT_FOUND "Datei nicht gefunden: %1" @@ -1010,7 +1012,7 @@ BEGIN IDS_STATUS_COPYALL2R "Kopiere alles nach rechts" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "%1 Vorkommen ersetzt." IDS_EDIT_TEXT_NOT_FOUND "Kann ""%s"" nicht finden" diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 179cf4321..72725db4f 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -112,19 +112,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Differenza successiva\tAlt+Down", ID_NEXTDIFF - MENUITEM "Di&fferenza precedente\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF - MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "&Copia a destra\tFreccia destra", ID_L2R - MENUITEM "Co&pia a sinistra\tFreccia sinistra", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Copia tutto a destra", ID_ALL_RIGHT - MENUITEM "Copia tutto a sinistra", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "F&ind...\tCtrl+F", ID_EDIT_FIND MENUITEM "Repla&ce...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -151,6 +138,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Lingua...", ID_VIEW_LANGUAGE END + POPUP "M&erge" + BEGIN + MENUITEM "&Differenza successiva\tAlt+Down", ID_NEXTDIFF + MENUITEM "Di&fferenza precedente\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF + MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "&Copia a destra\tFreccia destra", ID_L2R + MENUITEM "Co&pia a sinistra\tFreccia sinistra", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Copia tutto a destra", ID_ALL_RIGHT + MENUITEM "Copia tutto a sinistra", ID_ALL_LEFT + END POPUP "Fi&nestra" BEGIN MENUITEM "Chiudi", ID_FILE_CLOSE @@ -454,25 +456,25 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Difference:",IDC_STATIC,43,29,36,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Selected Difference:",IDC_STATIC,13,49,66,8 CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | + WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 LTEXT "Text",IDC_STATIC,184,15,15,8 END diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index b2b17e4ad..9f2a7cac1 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -36,17 +36,17 @@ IDR_MERGETYPE ICON "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU +IDR_POPUP_DIFFVIEW MENU BEGIN POPUP "_POPUP_" BEGIN MENUITEM "¹Ý´ë ÆíÀ¸·Î º¹»ç", ID_POPUP_COPYTOOTHERSIDE MENUITEM "¹Ý´ë ÆíÀ¸·ÎºÎÅÍ º¹»ç", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "¹Ý´ëÆíÀ¸·Î ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...", + MENUITEM "¹Ý´ëÆíÀ¸·Î ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "¹Ý´ëÆíÀ¸·ÎºÎÅÍ ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...", + MENUITEM "¹Ý´ëÆíÀ¸·ÎºÎÅÍ ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR @@ -56,7 +56,7 @@ BEGIN END END -IDR_MAINFRAME MENU +IDR_MAINFRAME MENU BEGIN POPUP "ÆÄÀÏ(&F)" BEGIN @@ -76,19 +76,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "´ÙÀ½ ´Ù¸¥ ºÎºÐ(&X)\tAlt+Down", ID_NEXTDIFF - MENUITEM "ÀÌÀü ´Ù¸¥ ºÎºÐ(&V)\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "óÀ½ ´Ù¸¥ ºÎºÐ(&F)\tAlt+Home", ID_FIRSTDIFF - MENUITEM "ÇöÀç ´Ù¸¥ ºÎºÐ(&N)\tAlt+Enter", ID_CURDIFF - MENUITEM "¸¶Áö¸· ´Ù¸¥ ºÎºÐ(&D)\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&G)\tAlt+Right", ID_L2R - MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&L)\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)", ID_ALL_RIGHT - MENUITEM "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "ã±â(&I)...\tCtrl+F", ID_EDIT_FIND MENUITEM "¹Ù²Ù±â(&C)...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -100,9 +87,9 @@ BEGIN BEGIN MENUITEM "µ¿ÀÏÇÑ ÆÄÀÏ º¸±â(&I)", ID_OPTIONS_SHOWIDENTICAL MENUITEM "´Ù¸¥ ÆÄÀÏ º¸±â(&D)", ID_OPTIONS_SHOWDIFFERENT - MENUITEM "ÁÂÃø À¯´ÏÅ©(unique)ÇÑ ÆÄÀÏ º¸±â(&F)", + MENUITEM "ÁÂÃø À¯´ÏÅ©(unique)ÇÑ ÆÄÀÏ º¸±â(&F)", ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "¿ìÃø À¯´ÏÅ©(unique)ÇÑ ÆÄÀÏ º¸±â(&G)", + MENUITEM "¿ìÃø À¯´ÏÅ©(unique)ÇÑ ÆÄÀÏ º¸±â(&G)", ID_OPTIONS_SHOWUNIQUERIGHT MENUITEM "¹ÙÀ̳ʸ® ÆÄÀÏ º¸±â(&H)", ID_OPTIONS_SHOWBINARIES MENUITEM "¹é¾÷(*.BAK) ÆÄÀÏ ¼û±â±â(&B)", ID_HIDE_BACKUP_FILES @@ -117,6 +104,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "¾ð¾î(&L)...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "´ÙÀ½ ´Ù¸¥ ºÎºÐ(&X)\tAlt+Down", ID_NEXTDIFF + MENUITEM "ÀÌÀü ´Ù¸¥ ºÎºÐ(&V)\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "óÀ½ ´Ù¸¥ ºÎºÐ(&F)\tAlt+Home", ID_FIRSTDIFF + MENUITEM "ÇöÀç ´Ù¸¥ ºÎºÐ(&N)\tAlt+Enter", ID_CURDIFF + MENUITEM "¸¶Áö¸· ´Ù¸¥ ºÎºÐ(&D)\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "¿À¸¥ÂÊÀ¸·Î º¹»ç(&G)\tAlt+Right", ID_L2R + MENUITEM "¿ÞÂÊÀ¸·Î º¹»ç(&L)\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)", ID_ALL_RIGHT + MENUITEM "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)", ID_ALL_LEFT + END POPUP "â(&W)" BEGIN MENUITEM "´Ý±â", ID_FILE_CLOSE @@ -134,7 +136,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU +IDR_POPUP_DIRVIEW MENU BEGIN POPUP "_POPUP_" BEGIN @@ -145,10 +147,10 @@ BEGIN MENUITEM "¸ðµÎ »èÁ¦", ID_DIR_DEL_BOTH MENUITEM SEPARATOR MENUITEM "¿ÞÂÊ ÆÄÀÏ ¿­±â", ID_DIR_OPEN_LEFT - MENUITEM "¿ÞÂÊ ÆÄÀÏ ¿­±â(¿¬°á ÇÁ·Î±×·¥ ¼±ÅÃ)...", + MENUITEM "¿ÞÂÊ ÆÄÀÏ ¿­±â(¿¬°á ÇÁ·Î±×·¥ ¼±ÅÃ)...", ID_DIR_OPEN_LEFT_WITH MENUITEM "¿À¸¥ÂÊ ÆÄÀÏ ¿­±â", ID_DIR_OPEN_RIGHT - MENUITEM "¿À¸¥ÂÊ ÆÄÀÏ ¿­±â(¿¬°á ÇÁ·Î±×·¥ ¼±ÅÃ)...", + MENUITEM "¿À¸¥ÂÊ ÆÄÀÏ ¿­±â(¿¬°á ÇÁ·Î±×·¥ ¼±ÅÃ)...", ID_DIR_OPEN_RIGHT_WITH END END @@ -159,7 +161,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS +IDR_MAINFRAME ACCELERATORS BEGIN "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT @@ -226,17 +228,17 @@ CAPTION " FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "ÁÂÃø(&L):",IDC_STATIC,30,24,23,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 "ã±â(&B)...",IDC_LEFT_BUTTON,241,22,38,12 LTEXT "¿ìÃø(&R):",IDC_STATIC,29,40,25,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 "ã±â(&W)...",IDC_RIGHT_BUTTON,241,38,38,12 LTEXT "È®ÀåÀÚ(&X):",IDC_STATIC,23,56,32,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 "ÇÏÀ§ µð·ºÅ丮 Æ÷ÇÔ(&C)",IDC_RECURS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,35,77,102,10 @@ -256,7 +258,7 @@ BEGIN PUSHBUTTON "Ãë¼Ò",IDCANCEL,173,121,65,14 PUSHBUTTON "´Ù¸¥ À̸§À¸·Î ÀúÀå...",IDSAVEAS,97,121,65,14 LTEXT "ÇÁ·ÎÁ§Æ®:",IDC_STATIC,9,61,30,8 - COMBOBOX IDC_PROJECT_COMBO,41,58,210,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,41,58,210,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "¾ÆÀ̵ð:",IDC_STATIC,16,80,22,8 EDITTEXT IDC_USER,41,78,58,14,ES_AUTOHSCROLL @@ -273,7 +275,7 @@ BEGIN LTEXT "cleartool.exe °æ·Î(&P) :",IDC_VSS_L1,16,42,69,8 EDITTEXT IDC_PATH_EDIT,92,40,109,12,ES_AUTOHSCROLL PUSHBUTTON "ã±â(&B)...",IDC_BROWSE_BUTTON,206,40,42,12 - COMBOBOX IDC_VER_SYS,92,20,150,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,92,20,150,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "¹öÀü °ü¸® ½Ã½ºÅÛ(&V) :",IDC_STATIC,16,22,69,10 END @@ -321,18 +323,18 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN PUSHBUTTON "È®ÀÎ",IDOK,154,16,52,14 PUSHBUTTON "Ãë¼Ò",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 "¼±Åà °¡´ÉÇÑ ¾ð¾î:",IDC_STATIC,7,7,66,8 END IDD_EDIT_FIND DIALOGEX 30, 73, 236, 68 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ã±â" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - COMBOBOX IDC_EDIT_FINDTEXT,59,6,117,138,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_EDIT_FINDTEXT,59,6,117,138,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "´Ü¾î ´ÜÀ§·Î(&W)",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -351,14 +353,14 @@ BEGIN END IDD_EDIT_REPLACE DIALOGEX 36, 44, 236, 90 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¹Ù²Ù±â" FONT 8, "MS Shell Dlg", 400, 0, 0x81 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 "´Ü¾î ´ÜÀ§·Î(&W)",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -387,7 +389,7 @@ BEGIN DEFPUSHBUTTON "üũ¾Æ¿ô",IDOK,35,90,50,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,194,90,50,14 PUSHBUTTON "´Ù¸¥ À̸§À¸·Î ÀúÀå...",IDSAVEAS,106,90,63,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 "ÄÚ¸àÆ®",IDC_STATIC,18,7,34,10 END @@ -409,10 +411,10 @@ BEGIN CONTROL "¾Æ·¡ ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¶óÀÎ ¹«½Ã",IDC_IGNOREREGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15 LTEXT "Á¤±Ô Ç¥Çö½Ä (¸Å1¶óÀθ¶´Ù Àû¿ë):",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 "ÆÄÀÏ ÇÊÅÍ :",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 END @@ -422,12 +424,12 @@ CAPTION " FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "´Ù¸¥ ºÎºÐ:",IDC_STATIC,15,18,50,8 - CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,15,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ:",IDC_STATIC,14,36,66,8 - CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | - WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT | + CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,33,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE END @@ -437,7 +439,7 @@ CAPTION " FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "È®ÀÎ",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 @@ -504,7 +506,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -649,16 +651,16 @@ IDB_BINARYDIFF BITMAP "res\\binarydiff.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 @@ -675,14 +677,14 @@ IDR_MARGIN_CURSOR CURSOR "res\\mg_cur.cur" // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDR_MAINFRAME "WinMerge" IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document" IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory" END -STRINGTABLE +STRINGTABLE BEGIN IDS_VERSION_FMT "¹öÀü %1" IDS_ALLFILES "¸ðµç ÆÄÀÏ (*.*)|*.*||" @@ -700,13 +702,13 @@ BEGIN IDS_CANT_COMPARE_FILES "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_APP_TITLE "WinMerge" AFX_IDS_IDLEMESSAGE "Áغñ" END -STRINGTABLE +STRINGTABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -716,7 +718,7 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_NEW "»õ ¹®¼­¸¦ ¸¸µì´Ï´Ù.\n»õ¹®¼­" ID_FILE_OPEN "±âÁ¸¿¡ ¸¸µé¾îÁø ¹®¼­¸¦ ¿±´Ï´Ù.\n¿­±â (Ctrl+O)" @@ -729,13 +731,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "¹Ì¸® º¸±â\n¹Ì¸® º¸±â" END -STRINGTABLE +STRINGTABLE BEGIN ID_APP_ABOUT "ÇÁ·Î±×·¥ Á¤º¸, ¹öÀü, Ä«ÇǶóÀÌÆ®¸¦ º¾´Ï´Ù.\nÁ¤º¸" ID_APP_EXIT "ÇÁ·Î±×·¥À» Á¾·áÇÕ´Ï´Ù.\nÁ¾·á" END -STRINGTABLE +STRINGTABLE BEGIN ID_FILE_MRU_FILE1 "¼±ÅÃÇÑ ¹®¼­ ¿­±â" ID_FILE_MRU_FILE2 "¼±ÅÃÇÑ ¹®¼­ ¿­±â" @@ -755,13 +757,13 @@ BEGIN ID_FILE_MRU_FILE16 "¼±ÅÃÇÑ ¹®¼­ ¿­±â" END -STRINGTABLE +STRINGTABLE BEGIN ID_NEXT_PANE "´ÙÀ½ â(pane)À¸·Î À̵¿ÇÕ´Ï´Ù.\n´ÙÀ½ â(pane)" ID_PREV_PANE "ÀÌÀü â(pane)À¸·Î À̵¿ÇÕ´Ï´Ù.\nÀÌÀü â(pane)" END -STRINGTABLE +STRINGTABLE BEGIN ID_WINDOW_NEW "»õ âÀ¸·Î ¹®¼­¸¦ ¿±´Ï´Ù.\n»õ âÀ¸·Î" ID_WINDOW_ARRANGE "À©µµ¿ì ¾Æ·¡¿¡ ¾ÆÀÌÄÜÀ» ¹è¿­ÇÕ´Ï´Ù.\n¾ÆÀÌÄÜ ¹è¿­" @@ -771,7 +773,7 @@ BEGIN ID_WINDOW_SPLIT "ÇöÀç âÀ» ºÐÇÒÇÕ´Ï´Ù.\nºÐÇÒ" END -STRINGTABLE +STRINGTABLE BEGIN ID_EDIT_CLEAR "¼±Åà ¿µ¿ªÀ» »èÁ¦ÇÕ´Ï´Ù.\n»èÁ¦" ID_EDIT_CLEAR_ALL "¸ðµÎ »èÁ¦ÇÕ´Ï´Ù.\n¸ðµÎ »èÁ¦" @@ -786,13 +788,13 @@ BEGIN ID_EDIT_REDO "´Ù½Ã ½ÇÇàÇÕ´Ï´Ù.\n´Ù½Ã ½ÇÇà" END -STRINGTABLE +STRINGTABLE BEGIN ID_VIEW_TOOLBAR "Åø¹Ù¸¦ º¸°Å³ª ¼û±é´Ï´Ù.\nÅø¹Ù º¸±â" ID_VIEW_STATUS_BAR "»óÅ ǥ½ÃÁÙÀ» º¸°Å³ª ¼û±é´Ï´Ù.\n»óÅÂÇ¥½ÃÁÙ º¸±â" END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCSIZE "âÀÇ Å©±â¸¦ Á¶Á¤ÇÕ´Ï´Ù." AFX_IDS_SCMOVE "âÀÇ À§Ä¡¸¦ À̵¿ÇÕ´Ï´Ù." @@ -803,19 +805,19 @@ BEGIN AFX_IDS_SCCLOSE "ÇöÀçâÀ» ´Ý½À´Ï´Ù." END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_SCRESTORE "âÀ» ÀÌÀü Å©±â·Î µÇµ¹¸³´Ï´Ù." AFX_IDS_SCTASKLIST "Task List¸¦ È°¼ºÈ­ÇÕ´Ï´Ù." AFX_IDS_MDICHILD "ÀÌ Ã¢À» È°¼ºÈ­ÇÕ´Ï´Ù." END -STRINGTABLE +STRINGTABLE BEGIN AFX_IDS_PREVIEW_CLOSE "¹Ì¸®º¸±â¸¦ Á¾·áÇÕ´Ï´Ù.\n¹Ì¸®º¸±â Á¾·á" END -STRINGTABLE +STRINGTABLE BEGIN ID_L2R "¼±Åà ¿µ¿ªÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n¿À¸¥ÂÊÀ¸·Î º¹»ç (Alt Right)" ID_R2L "¼±Åà ¿µ¿ªÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n¿ÞÂÊÀ¸·Î º¹»ç (Alt Left)" @@ -826,11 +828,11 @@ BEGIN ID_OPTIONS_BACKUPORIGINALFILE "¿øº» ÆÄÀÏÀ» ¹é¾÷ÇÕ´Ï´Ù.\n¹é¾÷" END -STRINGTABLE +STRINGTABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "ù¹ø° ´Ù¸¥ ºÎºÐÀ¸·Î ÀÚµ¿ À̵¿ÇÕ´Ï´Ù.\nù¹ø° ´Ù¸¥ºÎºÐÀ¸·Î À̵¿" - ID_OPTIONS_IGNOREWHITESPACE + ID_OPTIONS_IGNOREWHITESPACE "ÆÄÀÏÀ» ºñ±³ÇÒ ¶§ °ø¹é¹®ÀÚ(whitespace)¸¦ ¹«½ÃÇÕ´Ï´Ù." ID_HIDE_BACKUP_FILES "BAK È®ÀåÀÚ¸¦ °¡Áö´Â ÆÄÀÏÀ» ¼û±é´Ï´Ù." ID_HELP_GNULICENSE "GNU public license º¾´Ï´Ù." @@ -840,13 +842,13 @@ BEGIN ID_ALL_RIGHT "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n¸ðµÎ ¿À¸¥ÂÊÀ¸·Î" ID_VIEW_SELECTFONT "ÆÄÀÏ ºñ±³½Ã¿¡ º¼ ÆùÆ®¸¦ ¼±ÅÃÇÕ´Ï´Ù.\nÆùÆ® ¼±ÅÃ" ID_VIEW_USEDEFAULTFONT "±âº» ÆùÆ®·Î ¼³Á¤À» µÇµ¹¸³´Ï´Ù.\n±âº» ÆùÆ®" - ID_DIR_COPY_FILE_TO_LEFT + ID_DIR_COPY_FILE_TO_LEFT "¼±ÅÃÇϽŠÆÄÀÏÁß ¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù." END -STRINGTABLE +STRINGTABLE BEGIN - ID_DIR_COPY_FILE_TO_RIGHT + ID_DIR_COPY_FILE_TO_RIGHT "¼±ÅÃÇϽŠÆÄÀÏÁß ¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù." ID_VIEW_LANGUAGE "¾ð¾î¸¦ ¼±ÅÃÇÕ´Ï´Ù.\n¾ð¾î" ID_HELP_CONTENTS "WinMerge À¯Àú °¡À̵带 º¾´Ï´Ù.\nµµ¿ò¸»" @@ -865,12 +867,12 @@ BEGIN ID_DIR_OPEN_RIGHT "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SAVE_AS_TITLE "´Ù¸¥ À̸§À¸·Î ÀúÀå" - IDS_SELECT_FILES_OR_FOLDERS + IDS_SELECT_FILES_OR_FOLDERS "ÆÄÀÏ ¶Ç´Â µð·ºÅ丮¸¦ ¾çÂÊ ¸ðµÎ ¼±ÅÃÇØ¾ß ÇÕ´Ï´Ù." - IDS_BACKUP_FAILED_PROMPT + IDS_BACKUP_FAILED_PROMPT "¿øº» ÆÄÀÏÀ» ¹é¾÷ÇÒ ¼ö ¾ø½À´Ï´Ù.\n°è¼ÓÇϽðڽÀ´Ï±î?" IDS_OPTIONS_TITLE "¿É¼Ç" IDS_OPEN_TITLE "¿­±â" @@ -887,7 +889,7 @@ BEGIN IDS_NOPROJECT "°è¼ÓÇϽ÷Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇϼžßÇÕ´Ï´Ù (¿¹: $/MyProject)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_AFRIKAANS "Afrikaans" IDS_ALBANIAN "Albanian" @@ -904,7 +906,7 @@ BEGIN IDS_ARABIC_JORDAN "Arabic (Jordan)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ARABIC_LEBANON "Arabic (Lebanon)" IDS_ARABIC_KUWAIT "Arabic (Kuwait)" @@ -924,7 +926,7 @@ BEGIN IDS_CHINESE_SINGAPORE "Chinese (Singapore)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CHINESE_MACAU "Chinese (Macau SAR)" IDS_CROATIAN "Croatian" @@ -944,7 +946,7 @@ BEGIN IDS_ENGLISH_BELIZE "English (Belize)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_ENGLISH_TRINIDAD "English (Trinidad)" IDS_ENGLISH_ZIMBABWE "English (Zimbabwe)" @@ -964,7 +966,7 @@ BEGIN IDS_GERMAN_SWISS "Deutsch (Schweiz)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GERMAN_AUSTRIAN "Deutsch (?terreich)" IDS_GERMAN_LUXEMBOURG "Deutsch (Luxemburg)" @@ -984,7 +986,7 @@ BEGIN IDS_KOREAN_JOHAB "Korean (Johab)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_LATVIAN "Latvian" IDS_LITHUANIAN "Lithuanian" @@ -1004,7 +1006,7 @@ BEGIN IDS_SINDHI "Sindhi" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SLOVAK "Slovak" IDS_SLOVENIAN "Slovensko" @@ -1024,7 +1026,7 @@ BEGIN IDS_SPANISH_URUGUAY "Espa?l (Uruguay)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SPANISH_PARAGUAY "Espa?l (Paraguay)" IDS_SPANISH_BOLIVIA "Espa?l (Bolivia)" @@ -1044,14 +1046,14 @@ BEGIN IDS_URDU_INDIA "Urdu (India)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UZBEK_LATIN "Uzbek (Latin)" IDS_UZBEK_CYRILLIC "Uzbek (Cyrillic)" IDS_VIETNAMESE "Vietnamese" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILENAME_HEADER "ÆÄÀÏ À̸§" IDS_DIR_HEADER "µð·ºÅ丮" @@ -1063,7 +1065,7 @@ BEGIN IDS_CC_CMD "cleartool.exe °æ·Î(&P):" IDS_VSS_CMD "SS.EXE °æ·Î(&P):" IDS_VSS_RUN_ERROR "¹öÀü°ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "¼öÁ¤µÇ¾ú½À´Ï´Ù. ¾î¶² ¼³Á¤Àº ÆÄÀϺñ±³¸¦ ´Ù½ÃÇÒ ¶§±îÁö Àû¿ëµÇÁö ¾ÊÀ» ¼ö ÀÖ½À´Ï´Ù." IDS_LTIME_HEADER "¿ÞÂÊ ³¯Â¥" IDS_RTIME_HEADER "¿À¸¥ÂÊ ³¯Â¥" @@ -1072,7 +1074,7 @@ BEGIN IDS_DEL_LEFT_FMT "¼±Åà ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦(%1 Áß %2)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_DEL_RIGHT_FMT "¼±Åà ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦(%1 Áß %2)" IDS_DELETE_FILE_FAILED "%1 ÆÄÀÏ »èÁ¦ ½ÇÆÐ: %2" @@ -1091,7 +1093,7 @@ BEGIN IDS_BIN_FILES_SAME "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" END -STRINGTABLE +STRINGTABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..." ID_OPTIONS_SHOWBINARIES "¹ÙÀ̳ʸ® ÆÄÀÏÀ» º¾´Ï´Ù." @@ -1099,7 +1101,7 @@ BEGIN ID_REFRESH "»õ·Î °íħ\n»õ·Î °íħ (F5)" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FILESAVE_FAILED "ÆÄÀÏ ÀúÀå ½ÇÆÐ : %1 . ´Ù¸¥ À̸§À¸·Î ÀúÀåÇϽðڽÀ´Ï±î?" IDS_ERROR_FILE_NOT_FOUND "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" @@ -1112,7 +1114,7 @@ BEGIN IDS_STATUS_COPYALL2R "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»çÁß" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NUM_REPLACED "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." IDS_EDIT_TEXT_NOT_FOUND "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : ""%s""" @@ -1137,18 +1139,18 @@ LANGUAGE LANG_KOREAN, SUBLANG_KOREAN // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 6fd8e32e5..2f2f4bcdd 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_SLOVAK, 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" @@ -73,17 +73,17 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN MENUITEM "Kopírova na druhú stranu", ID_POPUP_COPYTOOTHERSIDE MENUITEM "Kopírova z druhej strany", ID_POPUP_COPYFROMOTHERSIDE MENUITEM SEPARATOR - MENUITEM "Kopírova všetky rozdiely na druhú stranu...", + MENUITEM "Kopírova všetky rozdiely na druhú stranu...", ID_POPUP_COPYALLDIFFSTOOTHERSIDE - MENUITEM "Kopírova všetky rozdiely z druhej strany...", + MENUITEM "Kopírova všetky rozdiely z druhej strany...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE MENUITEM SEPARATOR @@ -93,7 +93,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Súbor" BEGIN @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Následujúci rozdiel\tTAlt+Down", ID_NEXTDIFF - MENUITEM "&Predchádzajúci rozdiel\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "Pr&vý rozdiel\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Aktuány rozdiel\tAlt+Enter", ID_CURDIFF - MENUITEM "Posledný &rozdiel\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Kopírova vpravo\t<-", ID_L2R - MENUITEM "Kopírova v¾avo\t->", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Kopírova všetko vpravo", ID_ALL_RIGHT - MENUITEM "Kopírova všetko v¾avo", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "&H¾adaj...\tCtrl+F", ID_EDIT_FIND MENUITEM "Nahraï...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END + POPUP "M&erge" + BEGIN + MENUITEM "&Následujúci rozdiel\tTAlt+Down", ID_NEXTDIFF + MENUITEM "&Predchádzajúci rozdiel\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "Pr&vý rozdiel\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Aktuány rozdiel\tAlt+Enter", ID_CURDIFF + MENUITEM "Posledný &rozdiel\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Kopírova vpravo\t<-", ID_L2R + MENUITEM "Kopírova v¾avo\t->", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Kopírova všetko vpravo", ID_ALL_RIGHT + MENUITEM "Kopírova všetko v¾avo", ID_ALL_LEFT + END POPUP "&Okno" BEGIN MENUITEM "Zavrie", ID_FILE_CLOSE @@ -169,7 +171,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -192,7 +194,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 @@ -257,17 +259,17 @@ CAPTION "V FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&¼avý:",IDC_STATIC,16,24,37,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 "&Prechádza...",IDC_LEFT_BUTTON,241,22,59,12 LTEXT "P&ravý:",IDC_STATIC,16,40,37,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 "Pr&echádza...",IDC_RIGHT_BUTTON,241,38,59,12 LTEXT "Pr&ípony:",IDC_STATIC,16,56,37,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 "V&norené adresáre",IDC_RECURS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,35,77,190,10 @@ -288,7 +290,7 @@ BEGIN PUSHBUTTON "Storno",IDCANCEL,173,121,50,14 PUSHBUTTON "Uloži ako...",IDSAVEAS,103,121,50,14 LTEXT "Projekt:",IDC_STATIC,9,61,25,8 - COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN | + COMBOBOX IDC_PROJECT_COMBO,36,58,215,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Login:",IDC_STATIC,9,80,20,8 EDITTEXT IDC_USER,36,78,58,14,ES_AUTOHSCROLL @@ -305,7 +307,7 @@ BEGIN LTEXT "&Cesta ku cleartool.exe:",IDC_VSS_L1,16,42,73,8 EDITTEXT IDC_PATH_EDIT,92,40,109,12,ES_AUTOHSCROLL PUSHBUTTON "&Prechádza",IDC_BROWSE_BUTTON,206,40,42,12 - COMBOBOX IDC_VER_SYS,92,20,150,41,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_VER_SYS,92,20,150,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Systém &verzií:",IDC_STATIC,16,22,60,10 END @@ -355,7 +357,7 @@ FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "OK",IDOK,154,16,52,14 PUSHBUTTON "Storno",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 "Dostupné jazyky:",IDC_STATIC,7,7,66,8 END @@ -365,7 +367,7 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nájdi" 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 "Iba celé &slová",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,26,100,12 @@ -388,9 +390,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nahraï" 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 "Iba celé slová",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,46,91,12 @@ -419,7 +421,7 @@ BEGIN DEFPUSHBUTTON "CheckOut",IDOK,35,90,50,14 PUSHBUTTON "Cancel",IDCANCEL,194,90,50,14 PUSHBUTTON "Save As...",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 "Comments",IDC_STATIC,18,7,34,10 END @@ -443,10 +445,10 @@ BEGIN 7,221,15 LTEXT "Regulárne výrazy (jeden na riadok):",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 "Súbor pre filter:",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 END @@ -456,26 +458,26 @@ CAPTION "Farby" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Rozdiel:",IDC_STATIC,43,29,26,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 LTEXT "Rozdiel vo výbere:",IDC_STATIC,13,49,60,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 LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 LTEXT "Text",IDC_STATIC,184,15,15,8 END @@ -486,7 +488,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 @@ -557,7 +559,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN IDD_ABOUTBOX, DIALOG BEGIN @@ -696,16 +698,16 @@ IDB_BINARYDIFF BITMAP DISCARDABLE "res\\binarydiff.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 @@ -722,14 +724,14 @@ IDR_MARGIN_CURSOR CURSOR DISCARDABLE "res\\mg_cur.cur" // String Table // -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDR_MAINFRAME "WinMerge" IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document" IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN IDS_VERSION_FMT "Verzia %1 - Slovenský preklad" IDS_ALLFILES "Všetky súbory (*.*)|*.*||" @@ -747,13 +749,13 @@ BEGIN IDS_CANT_COMPARE_FILES "Nemožno porovna súbory" END -STRINGTABLE PRELOAD DISCARDABLE +STRINGTABLE PRELOAD DISCARDABLE BEGIN AFX_IDS_APP_TITLE "WinMerge" AFX_IDS_IDLEMESSAGE "Pripravený" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_INDICATOR_EXT "EXT" ID_INDICATOR_CAPS "CAP" @@ -763,7 +765,7 @@ BEGIN ID_INDICATOR_REC "REC" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "Vytvori nový dokument\nNový dokument" ID_FILE_OPEN "Otvori existujúci dokument\nOtvor" @@ -776,13 +778,13 @@ BEGIN ID_FILE_PRINT_PREVIEW "Náh¾ad\nPreh¾ad pred tlaèou" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_APP_ABOUT "Zobrazi informácie o programe\nO programe" ID_APP_EXIT "Ukonèi program s otázkou na uloženie súborov\nKoniec" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_FILE_MRU_FILE1 "Otvori dokument" ID_FILE_MRU_FILE2 "Otvori dokument" @@ -802,13 +804,13 @@ BEGIN ID_FILE_MRU_FILE16 "Otvori dokument" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_NEXT_PANE "Peepnú na ïalšie okno\nÏalšie okno" ID_PREV_PANE "Prepnú na predchádzajúce okno\nPredchádzajúce okno" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_WINDOW_NEW "Otvori ïalšie okno s aktuálnym dokumentom\nNové okno" ID_WINDOW_ARRANGE "Uspoiada ikony na spodnom okraji okna\nUsporiadaj ikony" @@ -818,7 +820,7 @@ BEGIN ID_WINDOW_SPLIT "Rozdeli aktívne okno\nRozdeli" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_EDIT_CLEAR "Vymaza výber\nZmaza" ID_EDIT_CLEAR_ALL "Zmaza všetko\nZmaza všetko" @@ -833,13 +835,13 @@ BEGIN ID_EDIT_REDO "Obnovi poslednú odvolanú akciu\nRedo" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_VIEW_TOOLBAR "Zobrazi alebo skry panel nástrojov\nPanel nástrojov" ID_VIEW_STATUS_BAR "Zobrazi nebo skry stavový riadok\nStavový riadok" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCSIZE "Zmeni ve¾kos okna" AFX_IDS_SCMOVE "Zmeni pozíciu okna" @@ -850,19 +852,19 @@ BEGIN AFX_IDS_SCCLOSE "Zatvori aktívne okno s možnosou uloženia dokumentov" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_SCRESTORE "Obnovi okná" AFX_IDS_SCTASKLIST "Aktivova zoznam úloh" AFX_IDS_MDICHILD "Aktivova toto okno" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN AFX_IDS_PREVIEW_CLOSE "Zatvori náh¾ad tlaèe\nZruš náh¾ad" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_L2R "Zkopírova vybraný text do súboru vpravo\nKopíruj vpravo (->)" ID_R2L "Skopírova vybraný text do súboru v¾avo\nKopíruj v¾avo (<-)" @@ -874,9 +876,9 @@ BEGIN ID_OPTIONS_BACKUPORIGINALFILE "Uloži záložnú kópiu súboru\nBackup" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN - ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE + ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE "Automaticky prejde na prvý rozdiel\nScroll First" ID_OPTIONS_IGNOREWHITESPACE "Pri porovnaní neberie do úvahy prázdne místo" ID_HIDE_BACKUP_FILES "Skry súbory s príponou BAK" @@ -890,7 +892,7 @@ BEGIN ID_DIR_COPY_FILE_TO_LEFT "Kopírova vybrané súbory do iného adresára" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_COPY_FILE_TO_RIGHT "Kopírova vybrané súbory do iného adresára" ID_VIEW_LANGUAGE "Zvoli jazyk uživate¾ského rozhrania\nJazyk" @@ -902,9 +904,9 @@ BEGIN ID_DIR_DEL_LEFT "Zmaž vybrané položky v¾avo" ID_DIR_DEL_RIGHT "Zmaž vybrané položky vpravo" ID_DIFFSTATUS "placeholder for status count" - ID_OPTIONS_SHOWUNIQUELEFT + ID_OPTIONS_SHOWUNIQUELEFT "Zobraz súbory, ktoré existujú iba na ¾avej strane" - ID_OPTIONS_SHOWUNIQUERIGHT + ID_OPTIONS_SHOWUNIQUERIGHT "Zobraz súbory, ktoré existujú iba na pravej strane" ID_DIR_DEL_BOTH "Zmaž vybrané položky na oboch stranách" ID_DIR_OPEN_LEFT "Otvor ¾avý súbor" @@ -912,7 +914,7 @@ BEGIN ID_DIR_OPEN_RIGHT "Otvor pravý súbor" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_SAVE_AS_TITLE "Uloži jako" IDS_SELECT_FILES_OR_FOLDERS "Musíte zvoli buï súbory alebo len adresáre." @@ -932,7 +934,7 @@ BEGIN IDS_NOPROJECT "Musíte nastavi cestu k projektu SourceSafe (napr.: $/MojProjekt)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILENAME_HEADER "Meno súboru" IDS_DIR_HEADER "Adresár" @@ -944,17 +946,17 @@ BEGIN IDS_CC_CMD "&Cesta ku cleartool.exe :" IDS_VSS_CMD "&Cesta ku SS.EXE :" IDS_VSS_RUN_ERROR "Chyba pri spúšaní príkazu zo Systému Verzií (CVS a pod)." - IDS_DIFF_OPEN_NO_SET_PROPS + IDS_DIFF_OPEN_NO_SET_PROPS "Nastali zmeny v aktuálnom súbore. Niektoré nastavenia sa neuplatnia, pokia¾ porovnanie aktuálneho súboru sa nezaène odznova." IDS_LTIME_HEADER "Dátum v¾avo" IDS_RTIME_HEADER "Dátum vpravo" IDS_EXTENSION_HEADER "Prípona" - IDS_CONFIRM_DELETE_ITEMS + IDS_CONFIRM_DELETE_ITEMS "Chcete naozaj zmaza %1 z %2 vybraných položiek?" IDS_DEL_LEFT_FMT "Zmaž %1 z %2 vybraných položiek z ¾avej strany" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_DEL_RIGHT_FMT "Zmaž %1 z %2 vybraných položiek z pravej strany" IDS_DELETE_FILE_FAILED "Mazanie súboru %1 zlyhalo: %2" @@ -973,7 +975,7 @@ BEGIN IDS_BIN_FILES_SAME "Binárne súbory sú identické" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN ID_DIR_OPEN_RIGHT_WITH "Otvor pravý súbor s..." ID_OPTIONS_SHOWBINARIES "Zobrazuje binárne súbory" @@ -981,7 +983,7 @@ BEGIN ID_REFRESH "Refresh display\nRefresh (F5)" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_FILESAVE_FAILED "Zápis %1 neúspešný. Chceš uloži súbor pod iným menom?" IDS_ERROR_FILE_NOT_FOUND "Súbor nenájdený: %1" @@ -994,7 +996,7 @@ BEGIN IDS_STATUS_COPYALL2R "Kopírujem všetko do pravého" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Nahradených %1 reazcov (strings)." IDS_EDIT_TEXT_NOT_FOUND "Nemôžem nájs reazec ""%s""" diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index a4f9da21c..25f05a6b2 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Diferencia siguiente\tAlt+Down", ID_NEXTDIFF - MENUITEM "&Diferencia anterior\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF - MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF - MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Copiar al lado derecho\tAlt+Right", ID_L2R - MENUITEM "Copiar al lado izquierdo\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Copiar todas al lado derecho", ID_ALL_RIGHT - MENUITEM "Copiar todas al lado izquierdo", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "F&ind...\tCtrl+F", ID_EDIT_FIND MENUITEM "Repla&ce...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Idioma...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Diferencia siguiente\tAlt+Down", ID_NEXTDIFF + MENUITEM "&Diferencia anterior\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF + MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Copiar al lado derecho\tAlt+Right", ID_L2R + MENUITEM "Copiar al lado izquierdo\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Copiar todas al lado derecho", ID_ALL_RIGHT + MENUITEM "Copiar todas al lado izquierdo", ID_ALL_LEFT + END POPUP "&Ventana" BEGIN MENUITEM "Cerrar", ID_FILE_CLOSE @@ -462,17 +464,17 @@ BEGIN WS_EX_CLIENTEDGE LTEXT "Background",IDC_STATIC,86,15,40,8 LTEXT "Deleted",IDC_STATIC,137,15,26,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 LTEXT "Text",IDC_STATIC,184,15,15,8 END diff --git a/Src/Merge.rc b/Src/Merge.rc index c2e994b75..898a1cb6b 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -113,19 +113,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF MENUITEM SEPARATOR - MENUITEM "Ne&xt Difference\tAlt+Down", ID_NEXTDIFF - MENUITEM "Pre&vious Difference\tAlt+Up", ID_PREVDIFF - MENUITEM SEPARATOR - MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF - MENUITEM "Curre&nt Difference\tAlt+Enter", ID_CURDIFF - MENUITEM "Last &Difference\tAlt+End", ID_LASTDIFF - MENUITEM SEPARATOR - MENUITEM "Copy to Ri&ght\tAlt+Right", ID_L2R - MENUITEM "Copy to &Left\tAlt+Left", ID_R2L - MENUITEM SEPARATOR - MENUITEM "Copy &All to Right", ID_ALL_RIGHT - MENUITEM "Copy All to L&eft", ID_ALL_LEFT - MENUITEM SEPARATOR MENUITEM "F&ind...\tCtrl+F", ID_EDIT_FIND MENUITEM "Repla&ce...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR @@ -152,6 +139,21 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Language...", ID_VIEW_LANGUAGE END + POPUP "&Merge" + BEGIN + MENUITEM "&Next Difference\tAlt+Down", ID_NEXTDIFF + MENUITEM "&Previous Difference\tAlt+Up", ID_PREVDIFF + MENUITEM SEPARATOR + MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF + MENUITEM "&Curre&nt Difference\tAlt+Enter", ID_CURDIFF + MENUITEM "&Last Difference\tAlt+End", ID_LASTDIFF + MENUITEM SEPARATOR + MENUITEM "Copy to &Right\tAlt+Right", ID_L2R + MENUITEM "Copy to L&eft\tAlt+Left", ID_R2L + MENUITEM SEPARATOR + MENUITEM "Copy &All to Right", ID_ALL_RIGHT + MENUITEM "Cop&y All to Left", ID_ALL_LEFT + END POPUP "&Window" BEGIN MENUITEM "Close", ID_FILE_CLOSE diff --git a/Src/readme.txt b/Src/readme.txt index cadf4efbb..1b10dae1c 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,6 +1,9 @@ 2003-08-07 Kimmo PATCH: [ 781013 ] 256 Color icon editlib/res: Merge.ico + PATCH: [ 783593 ] Add Merge-menu + WinMerge: Merge.rc + Languages: *.rc 2003-08-07 Perry Fix GetItemFileNames to not pull its data from listview (b/c columns may be reordered). -- 2.11.0