From c640125465242e027c5e4684fb5f5708b588af03 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 13 Jul 2006 07:05:04 +0000 Subject: [PATCH] BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU --- Src/Changes.txt | 3 +++ Src/Languages/Brazilian/MergeBrazilian.rc | 2 +- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 2 +- Src/Languages/ChineseTraditional/MergeChineseTraditional.rc | 2 +- Src/Languages/Danish/MergeDanish.rc | 2 +- Src/Languages/Dutch/MergeDutch.rc | 2 +- Src/Languages/French/MergeFrench.rc | 2 +- Src/Languages/German/MergeGerman.rc | 2 +- Src/Languages/Hungarian/MergeHungarian.rc | 2 +- Src/Languages/Italian/MergeItalian.rc | 2 +- Src/Languages/Korean/MergeKorean.rc | 2 +- Src/Languages/Norwegian/MergeNorwegian.rc | 2 +- Src/Languages/Slovak/MergeSlovak.rc | 2 +- Src/Languages/Turkish/MergeTurkish.rc | 2 +- Src/Merge.rc | 2 +- 15 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index c6d6c3024..936f7ca4a 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -7,6 +7,9 @@ Add new items to top. Src/Common: RegExp.cpp PATCH: [ 1521392 ] Fix reading last line in linefilter file Src: FileFilterMgr.cpp + BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU + Src: Merge.rc + Src/Languages/*: Merge*.rc 2006-07-12 Kimmo PATCH: [ 1517057 ] Option to Ignore Multiline Comments diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index e60b4c629..b78acfeb9 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Sair", ID_APP_EXIT END diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 911b51bc0..65ec8a2e1 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -221,7 +221,7 @@ BEGIN MENUITEM "×ó²àÖ»¶Á(&E)", ID_FILE_LEFT_READONLY MENUITEM "ÓÒ²àÖ»¶Á(&G)", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "Í˳ö(&X)", ID_APP_EXIT END diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 2acb47a97..6e3c8b580 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File Enc&oding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "µ²§ô(&X)", ID_APP_EXIT END diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 5496d145e..4944acbb4 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "V&enstre skrivebeskyttet", ID_FILE_LEFT_READONLY MENUITEM "&Højre skrivebeskyttet", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Afslut", ID_APP_EXIT END diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 94d764f1d..99fa4753c 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Afsluiten", ID_APP_EXIT END diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 2d52db3f7..40ae7984f 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -217,7 +217,7 @@ BEGIN MENUITEM "Côté gauc&he lecture seulement", ID_FILE_LEFT_READONLY MENUITEM "Côté droi&t lecture seulement", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File Enc&oding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Quitter", ID_APP_EXIT END diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index e7130f00c..8692a6990 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&inks schreibgeschützt", ID_FILE_LEFT_READONLY MENUITEM "R&echts schreibgeschützt", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Beenden", ID_APP_EXIT END diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index d6a87c0fb..5b9a8705e 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "Bal oldal csak &olvasható", ID_FILE_LEFT_READONLY MENUITEM "Jobb oldal csak o&lvasható", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Kilépés", ID_APP_EXIT END diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index e94fd08a6..83461c267 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "Fil&e di sinistra di Sola lettura", ID_FILE_LEFT_READONLY MENUITEM "F&ile di destra di Sola lettura", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Esci", ID_APP_EXIT END diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 9e58b359c..a38a5a019 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "¿ÞÂÊÀ» ÀбâÀü¿ëÀ¸·Î(E&)", ID_FILE_LEFT_READONLY MENUITEM "¿À¸¥ÂÊÀ» ÀбâÀü¿ëÀ¸·Î(&G)", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "³¡³»±â(&X)", ID_APP_EXIT END diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 9338ff68d..a399d791c 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "V&entsre skrivebeskyttet", ID_FILE_LEFT_READONLY MENUITEM "H&øyre skrivebeskyttet", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "L&ukk", ID_APP_EXIT END diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index c995e46f0..86ecd4d61 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Koniec", ID_APP_EXIT END diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index 81e1e9f92..d43d5394d 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "Salt Okunur S&ol", ID_FILE_LEFT_READONLY MENUITEM "Salt Okunu&r Sað", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "Çýký&þ", ID_APP_EXIT END diff --git a/Src/Merge.rc b/Src/Merge.rc index ce4f8e9c3..e3ed657c4 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -219,7 +219,7 @@ BEGIN MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File &Encoding", ID_FILE_ENCODING + MENUITEM "File En&coding", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "E&xit", ID_APP_EXIT END -- 2.11.0