BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU

diff --git a/Src/Changes.txt b/Src/Changes.txt
index c6d6c30..936f7ca 100644 (file)
--- 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 e60b4c6..b78acfe 100644 (file)
--- 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 911b51b..65ec8a2 100644 (file)
--- 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 2acb47a..6e3c8b5 100644 (file)
--- 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 5496d14..4944acb 100644 (file)
--- 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 94d764f..99fa475 100644 (file)
--- 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 2d52db3..40ae798 100644 (file)
--- 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 e7130f0..8692a69 100644 (file)
--- 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 d6a87c0..5b9a870 100644 (file)
--- 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 e94fd08..83461c2 100644 (file)
--- 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 9e58b35..a38a5a0 100644 (file)
--- 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 9338ff6..a399d79 100644 (file)
--- 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 c995e46..86ecd4d 100644 (file)
--- 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 81e1e9f..d43d539 100644 (file)
--- 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 ce4f8e9..e3ed657 100644 (file)
--- 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