From f157994aa7b0ddc71ecb1e1595ccce690db8ea15 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 5 Jun 2005 16:45:12 +0000 Subject: [PATCH] PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu --- Src/Languages/Brazilian/MergeBrazilian.rc | 4 ++++ Src/Languages/Brazilian/resource.h | 3 ++- Src/Languages/Bulgarian/MergeBulgarian.rc | 4 ++++ Src/Languages/Bulgarian/resource.h | 3 ++- Src/Languages/Catalan/MergeCatalan.rc | 4 ++++ Src/Languages/Catalan/resource.h | 3 ++- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 4 ++++ Src/Languages/ChineseSimplified/resource.h | 3 ++- Src/Languages/ChineseTraditional/MergeChineseTraditional.rc | 4 ++++ Src/Languages/ChineseTraditional/resource.h | 3 ++- Src/Languages/Czech/MergeCzech.rc | 4 ++++ Src/Languages/Czech/resource.h | 3 ++- Src/Languages/Danish/MergeDanish.rc | 4 ++++ Src/Languages/Danish/resource.h | 3 ++- Src/Languages/Dutch/MergeDutch.rc | 4 ++++ Src/Languages/Dutch/resource.h | 3 ++- Src/Languages/French/MergeFrench.rc | 4 ++++ Src/Languages/French/resource.h | 3 ++- Src/Languages/German/MergeGerman.rc | 4 ++++ Src/Languages/German/resource.h | 3 ++- Src/Languages/Hungarian/MergeHungarian.rc | 4 ++++ Src/Languages/Hungarian/resource.h | 3 ++- Src/Languages/Italian/MergeItalian.rc | 2 ++ Src/Languages/Italian/resource.h | 3 ++- Src/Languages/Japanese/MergeJapanese.rc | 4 ++++ Src/Languages/Japanese/resource.h | 3 ++- Src/Languages/Korean/MergeKorean.rc | 4 ++++ Src/Languages/Korean/resource.h | 3 ++- Src/Languages/Norwegian/MergeNorwegian.rc | 4 ++++ Src/Languages/Norwegian/resource.h | 3 ++- Src/Languages/Polish/MergePolish.rc | 4 ++++ Src/Languages/Polish/resource.h | 3 ++- Src/Languages/Russian/MergeRussian.rc | 4 ++++ Src/Languages/Russian/resource.h | 3 ++- Src/Languages/Slovak/MergeSlovak.rc | 4 ++++ Src/Languages/Slovak/resource.h | 3 ++- Src/Languages/Spanish/MergeSpanish.rc | 4 ++++ Src/Languages/Spanish/resource.h | 3 ++- Src/Languages/Swedish/MergeSwedish.rc | 4 ++++ Src/Languages/Swedish/resource.h | 3 ++- Src/Languages/Turkish/MergeTurkish.rc | 4 ++++ Src/Languages/Turkish/resource.h | 3 ++- Src/readme.txt | 5 +++++ 43 files changed, 129 insertions(+), 21 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index b5d04a859..ddce244a7 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Copiar tudo para a Direita", ID_ALL_RIGHT MENUITEM "Copiar tudo para a Esquerda", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -528,6 +530,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1946,6 +1949,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 03b988287..9392d1c7c 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Êîïèðàé &âñè÷êî â äÿñíî", ID_ALL_RIGHT MENUITEM "Êîïèðà&É âñè÷êî â ëÿâî", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Èíñòðóìåíòè" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1845,6 +1848,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Bulgarian/resource.h +++ b/Src/Languages/Bulgarian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index e946b8b91..085aec64a 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Copia-ho &tot a la dreta", ID_ALL_RIGHT MENUITEM "Copia-ho t&ot a l'esquerra", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Eines" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1846,6 +1849,7 @@ BEGIN IDS_MOVE_RIGHT_TO "De dreta a... (%1)" IDS_MOVE_LEFT_TO2 "D'esquerra a... (%1 de %2)" IDS_MOVE_RIGHT_TO2 "De dreta a... (%1 de %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Catalan/resource.h +++ b/Src/Languages/Catalan/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 9f35548fc..7b7e88e12 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -212,6 +212,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "È«²¿¸´ÖƵ½ÓÒ±ß(&A)", ID_ALL_RIGHT MENUITEM "È«²¿¸´ÖƵ½×ó±ß(&E)", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -528,6 +530,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1816,6 +1819,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 5774797dc..c0d6f1f06 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "¥þ³¡½Æ»s¨ì¥kÃä(&A)", ID_ALL_RIGHT MENUITEM "¥þ³¡½Æ»s¨ì¥ªÃä(&E)", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -528,6 +530,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1928,6 +1931,7 @@ BEGIN IDS_MOVE_RIGHT_TO "¥kÃä¨ì... (%1)" IDS_MOVE_LEFT_TO2 "¥ªÃä¨ì... (%1 ¦@ %2)" IDS_MOVE_RIGHT_TO2 "¥kÃä¨ì... (%1 ¦@ %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 0ea463d6d..7801b3f48 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopírovat vše vpravo", ID_ALL_RIGHT MENUITEM "Kopírovat vše vlevo", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1943,6 +1946,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index def659497..29ea52297 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopier alt &til højre", ID_ALL_RIGHT MENUITEM "Kopier alt til venst&re", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "Værk&tøjer" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1828,6 +1831,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Højre til... (%1)" IDS_MOVE_LEFT_TO2 "Venstre til... (%1 af %2)" IDS_MOVE_RIGHT_TO2 "Højre til... (%1 af %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index cfc61b355..fac2ebf77 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -214,6 +214,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopieer alles naar rechts", ID_ALL_RIGHT MENUITEM "Kopieer alles naar links", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -530,6 +532,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1946,6 +1949,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Rechts naar... (%1)" IDS_MOVE_LEFT_TO2 "Links naar... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Rechts naar... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index b830d2f8b..683f308ca 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Tout cop&ier vers la droite", ID_ALL_RIGHT MENUITEM "Tout copi&er vers la gauche", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Outils" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1831,6 +1834,7 @@ BEGIN IDS_MOVE_RIGHT_TO "De droite vers... (%1)" IDS_MOVE_LEFT_TO2 "De gauche vers... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "De droite vers... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 5998f1074..786cfc545 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -217,6 +217,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Alles nach rechts kopieren", ID_ALL_RIGHT MENUITEM "Alles nach links kopieren", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -533,6 +535,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1946,6 +1949,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Rechts nach... (%1)" IDS_MOVE_LEFT_TO2 "Links nach... (%1 von %2)" IDS_MOVE_RIGHT_TO2 "Rechts nach... (%1 von %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index b080dbb0f..bd917728b 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "M&inden Jobbra másolása", ID_ALL_RIGHT MENUITEM "Mi&nden Balra másolása", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Eszközök" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1829,6 +1832,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Jobbról... (%1)" IDS_MOVE_LEFT_TO2 "Balról... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Jobbról... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Hungarian/resource.h +++ b/Src/Languages/Hungarian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index d3e1234d4..c8ecbc6df 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -529,6 +529,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1944,6 +1945,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Destra in... (%1)" IDS_MOVE_LEFT_TO2 "Sinistra in... (%1 su %2)" IDS_MOVE_RIGHT_TO2 "Destra in... (%1 su %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 87ff9f766..aed7b0aca 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "‘S‚Ä‚ð‰E‚ɃRƒs[(&A)", ID_ALL_RIGHT MENUITEM "‘S‚Ä‚ð¶‚ÉƒRƒs[(&Y)", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "ƒc[ƒ‹(&T)" BEGIN @@ -530,6 +532,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1833,6 +1836,7 @@ BEGIN IDS_MOVE_RIGHT_TO "‰E‚©‚çŽQÆæ‚Ö... (%1)" IDS_MOVE_LEFT_TO2 "¶‚©‚çŽQÆæ‚Ö... (%1 / %2)" IDS_MOVE_RIGHT_TO2 "‰E‚©‚çŽQÆæ‚Ö... (%1 / %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Japanese/resource.h +++ b/Src/Languages/Japanese/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 67c89565f..f78687fa7 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)", ID_ALL_RIGHT MENUITEM "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "µµ±¸(&T)" BEGIN @@ -531,6 +533,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1827,6 +1830,7 @@ BEGIN IDS_MOVE_RIGHT_TO "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1)" IDS_MOVE_LEFT_TO2 "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)" IDS_MOVE_RIGHT_TO2 "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿ (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 4d97a3f82..73f8d2c8d 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopier alt &til høyre", ID_ALL_RIGHT MENUITEM "Kopier alt til ve&nstre", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Verktøy" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1940,6 +1943,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Høyre til... (%1)" IDS_MOVE_LEFT_TO2 "Venstre til... (%1 av %2)" IDS_MOVE_RIGHT_TO2 "Høyre til... (%1 av %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index fe37d9f7e..b763e359d 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopiuj wszystko na praw¹", ID_ALL_RIGHT MENUITEM "Kopiuj wszystko na lew¹", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Narzêdzia" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1943,6 +1946,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Prawa na... (%1)" IDS_MOVE_LEFT_TO2 "Lewa na... (%1 z %2)" IDS_MOVE_RIGHT_TO2 "Prawa na... (%1 z %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Polish/resource.h +++ b/Src/Languages/Polish/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index 5ecd49531..f2a3bf62b 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -216,6 +216,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Ñê&îïèðîâàòü âñå íà ïðàâóþ ïàíåëü", ID_ALL_RIGHT MENUITEM "Ñêîï&èðîâàòü âñå íà ëåâóþ ïàíåëü", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Èíñòðóìåíòû" BEGIN @@ -538,6 +540,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1844,6 +1847,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Ñïðàâà â... (%1)" IDS_MOVE_LEFT_TO2 "Ñëåâà â... (%1 èç %2)" IDS_MOVE_RIGHT_TO2 "Ñïðàâà â... (%1 èç %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Russian/resource.h +++ b/Src/Languages/Russian/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index aa1051be3..327c22ec5 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopírova všetko vpravo", ID_ALL_RIGHT MENUITEM "Kopírova všetko v¾avo", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1943,6 +1946,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 2ea9c6699..db4010c34 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -213,6 +213,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Copiar todas al lado de&recho", ID_ALL_RIGHT MENUITEM "Copiar todas al lado iz&quierdo", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Herramientas" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1943,6 +1946,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Lado derecho a... (%1)" IDS_MOVE_LEFT_TO2 "Lado izquierdo a... (%1 de %2)" IDS_MOVE_RIGHT_TO2 "Lado derecho a... (%1 de %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 9fdb024d5..df06e8cad 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -212,6 +212,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Kopiera allt &till höger", ID_ALL_RIGHT MENUITEM "Kopiera allt t&ill vänster", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "Verkt&yg" BEGIN @@ -528,6 +530,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1942,6 +1945,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Höger till... (%1)" IDS_MOVE_LEFT_TO2 "Vänster till... (%1 av %2)" IDS_MOVE_RIGHT_TO2 "Höger till... (%1 av %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Swedish/resource.h +++ b/Src/Languages/Swedish/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index 46b74cf83..d45107786 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -212,6 +212,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Tümünü Saða Kopyala", ID_ALL_RIGHT MENUITEM "T&ümünü Sola Kopyala", ID_ALL_LEFT + MENUITEM SEPARATOR + MENUITEM "&Delete\tDel", ID_MERGE_DELETE END POPUP "&Araçlar" BEGIN @@ -529,6 +531,7 @@ BEGIN VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT + VK_DELETE, ID_MERGE_DELETE, VIRTKEY, NOINVERT END @@ -1832,6 +1835,7 @@ BEGIN IDS_MOVE_RIGHT_TO "Right to... (%1)" IDS_MOVE_LEFT_TO2 "Left to... (%1 of %2)" IDS_MOVE_RIGHT_TO2 "Right to... (%1 of %2)" + ID_MERGE_DELETE "Delete selected items from both directories" END // DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION diff --git a/Src/Languages/Turkish/resource.h b/Src/Languages/Turkish/resource.h index 43645d962..dff3d5960 100644 --- a/Src/Languages/Turkish/resource.h +++ b/Src/Languages/Turkish/resource.h @@ -827,6 +827,7 @@ #define ID_LOCBAR_GOTOLINE_FMT 33093 #define ID_HELP_MERGE7ZMISMATCH 33094 #define ID_FILE_OPENPROJECT 33095 +#define ID_MERGE_DELETE 33096 // Next default values for new objects // @@ -834,7 +835,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 224 -#define _APS_NEXT_COMMAND_VALUE 33096 +#define _APS_NEXT_COMMAND_VALUE 33097 #define _APS_NEXT_CONTROL_VALUE 1169 #define _APS_NEXT_SYMED_VALUE 111 #endif diff --git a/Src/readme.txt b/Src/readme.txt index b794ba195..0c1e6035f 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,8 @@ +2005-06-04 Kimmo + PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu + Trying again applying languages.. + Src/Languages: *.rc resource.h + 2005-06-05 Jochen Support 7-Zip 4.20 Merge7z new files: Merge7z420.dsp -- 2.11.0