[ros-diffs] [npwoods] 18151: Christoph_vW: Updated notepad rc files to match Windows notepad's menu layout (bug #839)

Christoph_vW:  Updated notepad rc files to match Windows notepad's menu
layout  (bug #839)
Modified: trunk/reactos/subsys/system/notepad/Cs.rc
Modified: trunk/reactos/subsys/system/notepad/Da.rc
Modified: trunk/reactos/subsys/system/notepad/De.rc
Modified: trunk/reactos/subsys/system/notepad/En.rc
Modified: trunk/reactos/subsys/system/notepad/Es.rc
Modified: trunk/reactos/subsys/system/notepad/Fi.rc
Modified: trunk/reactos/subsys/system/notepad/Fr.rc
Modified: trunk/reactos/subsys/system/notepad/Hu.rc
Modified: trunk/reactos/subsys/system/notepad/It.rc
Modified: trunk/reactos/subsys/system/notepad/Ja.rc
Modified: trunk/reactos/subsys/system/notepad/Nl.rc
Modified: trunk/reactos/subsys/system/notepad/Pl.rc
Modified: trunk/reactos/subsys/system/notepad/Pt.rc
Modified: trunk/reactos/subsys/system/notepad/Ru.rc
Modified: trunk/reactos/subsys/system/notepad/Si.rc
Modified: trunk/reactos/subsys/system/notepad/Sv.rc
Modified: trunk/reactos/subsys/system/notepad/Th.rc
Modified: trunk/reactos/subsys/system/notepad/Wa.rc
Modified: trunk/reactos/subsys/system/notepad/Zh.rc
Modified: trunk/reactos/subsys/system/notepad/notepad_res.h
  _____  

Modified: trunk/reactos/subsys/system/notepad/Cs.rc
--- trunk/reactos/subsys/system/notepad/Cs.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Cs.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -45,26 +45,21 @@

   MENUITEM "&Vlo¥it\tCtrl+V",    CMD_PASTE
   MENUITEM "&Smazat\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Hledej\tCtrl+F",   CMD_SEARCH
+  MENUITEM "&Najdi dal?Ý\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Vybrat v?&e\tCtrl+A",       CMD_SELECT_ALL
   MENUITEM "?&as/Datum\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "Zalo&mit dlouhÚ °ßdky",  CMD_WRAP
   MENUITEM "&PÝsmo...",          CMD_FONT
  }
-POPUP "&HledßnÝ" {
-  MENUITEM "&Hledej\tCtrl+F",   CMD_SEARCH
-  MENUITEM "&Najdi dal?Ý\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&Nßpovýda" {
   MENUITEM "&Obsah",         CMD_HELP_CONTENTS
   MENUITEM "&NajÝt...",        CMD_HELP_SEARCH
   MENUITEM "&Pomoc k nßpovýdý",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Licence",         CMD_LICENSE
-   MENUITEM "&BEZ Z?RUKY",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine",      CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Da.rc
--- trunk/reactos/subsys/system/notepad/Da.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Da.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -28,8 +28,8 @@

   MENUITEM "?&bn\tEnter",       CMD_OPEN
   MENUITEM "&Gem",              CMD_SAVE
   MENUITEM "Gem so&m...",       CMD_SAVE_AS
-  MENUITEM "&Udskriv",          CMD_PRINT
   MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP
+  MENUITEM "&Udskriv",          CMD_PRINT
   MENUITEM "&Indstil printer...",       CMD_PRINTER_SETUP
   MENUITEM SEPARATOR
   MENUITEM "&Afslut",           CMD_EXIT
@@ -56,11 +56,7 @@
   MENUITEM "&S°g efter hjµlp om...",    CMD_HELP_SEARCH
   MENUITEM "&Brug af Hjµlp",    CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "&Om Notesblok..." {
-   MENUITEM "&Licens",          CMD_LICENSE
-   MENUITEM "&Ingen Garanti",   CMD_NO_WARRANTY
-   MENUITEM "&Om WINE",         CMD_ABOUT_WINE
-  }
+  MENUITEM "&Om Notesblok",         CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/De.rc
--- trunk/reactos/subsys/system/notepad/De.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/De.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -30,8 +30,8 @@

   MENUITEM "&Speichern",        CMD_SAVE
   MENUITEM "Speichern &unter...",       CMD_SAVE_AS
   MENUITEM SEPARATOR
+  MENUITEM "Seite ein&richten...",      CMD_PAGE_SETUP
   MENUITEM "&Drucken",          CMD_PRINT
-  MENUITEM "Seite ein&richten...",      CMD_PAGE_SETUP
   MENUITEM "Drucker&einrichtung...",    CMD_PRINTER_SETUP
   MENUITEM SEPARATOR
   MENUITEM "&Beenden",          CMD_EXIT
@@ -44,26 +44,27 @@
   MENUITEM "&Einf³gen\tStrg+V",         CMD_PASTE
   MENUITEM "&L÷schen\tEntf",    CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "Suchen...", CMD_SEARCH
+  MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT
+  MENUITEM "&Ersetzen\tCtrl+H",   CMD_REPLACE
+  MENUITEM "Gehe zu...\tCtrl+G",  CMD_GOTO
+  MENUITEM SEPARATOR
   MENUITEM "Alles &markieren",  CMD_SELECT_ALL
   MENUITEM "&Uhrzeit/Datum\tF5",        CMD_TIME_DATE
-  MENUITEM SEPARATOR
+ }
+POPUP "F&ormat" {
   MENUITEM "&Zeilenumbruch",    CMD_WRAP
-  MENUITEM "&Schriftarten...",	CMD_FONT
- }
-POPUP "&Suchen" {
-  MENUITEM "Suchen...", CMD_SEARCH
-  MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT
- }
+  MENUITEM "&Schriftart...",	CMD_FONT
+}
+POPUP "&Anicht" {
+  MENUITEM "Status&leiste",    CMD_STATUSBAR
+}
 POPUP "&Hilfe" {
   MENUITEM "&Inhalt",           CMD_HELP_CONTENTS
   MENUITEM "&Suchen...",        CMD_HELP_SEARCH
   MENUITEM "&Hilfe benutzen",   CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Lizenz",          CMD_LICENSE
-   MENUITEM "&KEINE GARANTIE",  CMD_NO_WARRANTY
-   MENUITEM "&?ber Wine",       CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o",       CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/En.rc
--- trunk/reactos/subsys/system/notepad/En.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/En.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -30,8 +30,8 @@

   MENUITEM "&Save\tCtrl+S",     CMD_SAVE
   MENUITEM "Save &as...",       CMD_SAVE_AS
   MENUITEM SEPARATOR
+  MENUITEM "Page Se&tup...",    CMD_PAGE_SETUP
   MENUITEM "&Print",            CMD_PRINT
-  MENUITEM "Page Se&tup...",    CMD_PAGE_SETUP
   MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP
   MENUITEM SEPARATOR
   MENUITEM "E&xit",             CMD_EXIT
@@ -44,28 +44,29 @@
   MENUITEM "&Paste\tCtrl+V",    CMD_PASTE
   MENUITEM "&Delete\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
-  MENUITEM "Select &all\tCtrl+A",       CMD_SELECT_ALL
-  MENUITEM "&Time/Date\tF5",    CMD_TIME_DATE
-  MENUITEM SEPARATOR
-  MENUITEM "&Wrap long lines",  CMD_WRAP
-  MENUITEM "&Font...",          CMD_FONT
- }
-POPUP "&Search" {
   MENUITEM "&Find...\tCtrl+F",  CMD_SEARCH
   MENUITEM "Find &next\tF3",    CMD_SEARCH_NEXT
   MENUITEM "Replace\tCtrl+H",   CMD_REPLACE
   MENUITEM "Go To...\tCtrl+G",  CMD_GOTO
+  MENUITEM SEPARATOR
+  MENUITEM "Select &all\tCtrl+A",       CMD_SELECT_ALL
+  MENUITEM "&Time/Date\tF5",    CMD_TIME_DATE
  }
+POPUP "F&ormat" {
+  MENUITEM "&Wrap long lines",  CMD_WRAP
+  MENUITEM "&Font...",          CMD_FONT
+}
+POPUP "&View" {
+  MENUITEM "Status&bar",    CMD_STATUSBAR
+}
 POPUP "&Help" {
   MENUITEM "&Contents",         CMD_HELP_CONTENTS
   MENUITEM "&Search...",        CMD_HELP_SEARCH
   MENUITEM "&Help on help",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&License",         CMD_LICENSE
-   MENUITEM "&NO WARRANTY",     CMD_NO_WARRANTY
-   MENUITEM "&About Wine",      CMD_ABOUT_WINE
-  }
+  MENUITEM "&License",         CMD_LICENSE
+  MENUITEM "&NO WARRANTY",     CMD_NO_WARRANTY
+  MENUITEM "Inf&o",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Es.rc
--- trunk/reactos/subsys/system/notepad/Es.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Es.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -46,6 +46,9 @@

   MENUITEM "&Pegar\tCtrl+V",            CMD_PASTE
   MENUITEM "&Borrar\tDel",              CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Buscar\tCtrl+F",       CMD_SEARCH
+  MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL
   MENUITEM "&Hora y fecha\tF5",         CMD_TIME_DATE
   MENUITEM SEPARATOR
@@ -53,19 +56,13 @@
   MENUITEM "Tipo de &letra...",         CMD_FONT
  }
 POPUP "&Buscar" {
-  MENUITEM "&Buscar\tCtrl+F",       CMD_SEARCH
-  MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT
  }
 POPUP "A&yuda" {
   MENUITEM "?&ndice",               CMD_HELP_CONTENTS
   MENUITEM "&Buscar...",            CMD_HELP_SEARCH
   MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "&Informaci¾n..." {
-   MENUITEM "&Licencia",            CMD_LICENSE
-   MENUITEM "SIN &GARANT?A",        CMD_NO_WARRANTY
-   MENUITEM "&Acerca de Wine",      CMD_ABOUT_WINE
-  }
+  MENUITEM "&Informaci¾n...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Fi.rc
--- trunk/reactos/subsys/system/notepad/Fi.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Fi.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -42,25 +42,20 @@

   MENUITEM "L&iitõ\tCtrl+V",	CMD_PASTE
   MENUITEM "P&oista\tDel",	CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "Etsi...",		CMD_SEARCH
+  MENUITEM "Etsi &seuraava\tF3",	CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "&Valitse kaikki",	CMD_SELECT_ALL
   MENUITEM "&Aika/Põivõmõõrõ\tF5",	CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "Ka&tkaise pitkõ rivi",	CMD_WRAP
  }
-POPUP "&Etsi" {
-  MENUITEM "Etsi...",		CMD_SEARCH
-  MENUITEM "Etsi &seuraava\tF3",	CMD_SEARCH_NEXT
- }
 POPUP "&Apua" {
   MENUITEM "&Sisõlt÷",		CMD_HELP_CONTENTS
   MENUITEM "&Etsi...",		CMD_HELP_SEARCH
   MENUITEM "Apua &Opastuksesta",	CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Lisenssi",	CMD_LICENSE
-   MENUITEM "&EI TAKUUTA",	CMD_NO_WARRANTY
-   MENUITEM "&Tietoja Wine:ista",	CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o...",	CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Fr.rc
--- trunk/reactos/subsys/system/notepad/Fr.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Fr.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -44,26 +44,21 @@

   MENUITEM "C&oller\tCtrl+V",   CMD_PASTE
   MENUITEM "&Effacer\tDel",     CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH
+  MENUITEM "&Suivant\tF3",      CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL
   MENUITEM "&Heure/Date\tF5",   CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&Retour Ó la ligne", CMD_WRAP
   MENUITEM "&Police...",        CMD_FONT
  }
-POPUP "&Rechercher" {
-  MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH
-  MENUITEM "&Suivant\tF3",      CMD_SEARCH_NEXT
- }
 POPUP "&Aide" {
   MENUITEM "&Sommaire",         CMD_HELP_CONTENTS
   MENUITEM "&Rechercher...",    CMD_HELP_SEARCH
   MENUITEM "&Utiliser l'aide",  CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Licence",         CMD_LICENSE
-   MENUITEM "&AUCUNE GARANTIE", CMD_NO_WARRANTY
-   MENUITEM "&A propos de Wine",        CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o...",        CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Hu.rc
--- trunk/reactos/subsys/system/notepad/Hu.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Hu.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -43,25 +43,20 @@

   MENUITEM "&BeillesztÚs\tCtrl+V",    CMD_PASTE
   MENUITEM "T÷r&lÚs\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&KeresÚs...",           CMD_SEARCH
+  MENUITEM "K÷ve&tkez§ keresÚse\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "&Az ÷sszes kijel÷lÚse",       CMD_SELECT_ALL
   MENUITEM "&Id§/dßtum\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&Hossz· sorok t÷rdelÚse",  CMD_WRAP
  }
-POPUP "&KeresÚs" {
-  MENUITEM "&KeresÚs...",           CMD_SEARCH
-  MENUITEM "K÷ve&tkez§ keresÚse\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&S·g¾" {
   MENUITEM "&TÚmak÷r÷k",         CMD_HELP_CONTENTS
   MENUITEM "&KeresÚs...",        CMD_HELP_SEARCH
   MENUITEM "&Hasznßlat",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&ormßci¾..." {
-   MENUITEM "&Licenc",         CMD_LICENSE
-   MENUITEM "&SEMMI GARANCIA",     CMD_NO_WARRANTY
-   MENUITEM "&Wine nÚvjegy",      CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&ormßci¾...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/It.rc
--- trunk/reactos/subsys/system/notepad/It.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/It.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -46,26 +46,21 @@

   MENUITEM "&Incolla\tCtrl+V",    CMD_PASTE
   MENUITEM "&Elimina\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Trova\tCtrl+F",   CMD_SEARCH
+  MENUITEM "&Trova successivo\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Seleziona &tutto\tCtrl+A",       CMD_SELECT_ALL
   MENUITEM "&Ora/Data\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&A campo automatico",  CMD_WRAP
   MENUITEM "&Imposta carattere...",          CMD_FONT
  }
-POPUP "&Trova" {
-  MENUITEM "&Trova\tCtrl+F",   CMD_SEARCH
-  MENUITEM "&Trova successivo\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&Aiuto" {
   MENUITEM "&Contenuti",         CMD_HELP_CONTENTS
   MENUITEM "&Trova...",        CMD_HELP_SEARCH
   MENUITEM "&Aiuto sulla Guida",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Licenza",         CMD_LICENSE
-   MENUITEM "&Garanzia",     CMD_NO_WARRANTY
-   MENUITEM "&Informazioni sul Blocco Note",      CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Ja.rc
--- trunk/reactos/subsys/system/notepad/Ja.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Ja.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -44,26 +44,21 @@

   MENUITEM "âyü[âXâg(&P)\tCtrl+V",    CMD_PASTE
   MENUITEM "ìÝÅ£(&D)\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "îfì§(&S)\tCtrl+F",   CMD_SEARCH
+  MENUITEM "Äfé?î¾òÔé­îfì§(&S)\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "æSé?æIæ­(&a)\tCtrl+A",       CMD_SELECT_ALL
   MENUITEM "ô·òtéãÄ×ìÅ(&T)\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "ÆÀéóìsé­É?éÞòÈéÀ(&W)",  CMD_WRAP
   MENUITEM "âtâHâôâg(&F)...",          CMD_FONT
  }
-POPUP "îfì§(&S)" {
-  MENUITEM "îfì§(&S)\tCtrl+F",   CMD_SEARCH
-  MENUITEM "Äfé?î¾òÔé­îfì§(&S)\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "âwâïâv(&H)" {
   MENUITEM "û?Äf(&C)",         CMD_HELP_CONTENTS
   MENUITEM "îfì§(&S)...",        CMD_HELP_SEARCH
   MENUITEM "âwâïâvé?Ägéóò¹(&H)",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "ůò±(&o)..." {
-   MENUITEM "âëâCâZâôâX(&L)",         CMD_LICENSE
-   MENUITEM "ûóò?ÅÏ(&N)",     CMD_NO_WARRANTY
-   MENUITEM "Wineé?é?éóé?(&A)",      CMD_ABOUT_WINE
-  }
+  MENUITEM "ůò±(&o)...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Nl.rc
--- trunk/reactos/subsys/system/notepad/Nl.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Nl.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -1,4 +1,4 @@

-/*
+´??/*
  *  Notepad (Dutch resources)
  *
  *  Copyright 2003 Hans Leidekker
@@ -42,26 +42,21 @@
   MENUITEM "&Plakken\tCtrl+V",           CMD_PASTE
   MENUITEM "&Verwijderen\tDel",          CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Zoeken\tCtrl+Z",       CMD_SEARCH
+  MENUITEM "&Volgende zoeken\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "&Alles selecteren\tCtrl+A",  CMD_SELECT_ALL
   MENUITEM "Tijd/&datum\tF5",            CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "A&utomatische terugloop",    CMD_WRAP
   MENUITEM "&Lettertype instellen...",   CMD_FONT
  }
-POPUP "&Zoeken" {
-  MENUITEM "&Zoeken\tCtrl+Z",       CMD_SEARCH
-  MENUITEM "&Volgende zoeken\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&Help" {
   MENUITEM "&Help-onderwerpen",  CMD_HELP_CONTENTS
   MENUITEM "&Zoeken...",         CMD_HELP_SEARCH
   MENUITEM "&Hulp bij Help",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&o..." {
-   MENUITEM "&Licentie",         CMD_LICENSE
-   MENUITEM "&GEEN GARANTIE",    CMD_NO_WARRANTY
-   MENUITEM "&Over Wine",        CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&o...",        CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Pl.rc
--- trunk/reactos/subsys/system/notepad/Pl.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Pl.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -45,26 +45,21 @@

   MENUITEM "Wkl&ej\tCtrl+V",    CMD_PASTE
   MENUITEM "&Usu±\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Znajdf\tCtrl+F",   CMD_SEARCH
+  MENUITEM "Z&najdf nastÛpny\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Zaznacz w&szystko\tCtrl+A",       CMD_SELECT_ALL
   MENUITEM "Godzina/&Data\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&Zawijanie wierszy",  CMD_WRAP
   MENUITEM "Czci&onka...",          CMD_FONT
  }
-POPUP "&Znajdf" {
-  MENUITEM "&Znajdf\tCtrl+F",   CMD_SEARCH
-  MENUITEM "Z&najdf nastÛpny\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "Pomo&c" {
   MENUITEM "&Tematy pomocy",         CMD_HELP_CONTENTS
   MENUITEM "&Szukaj...",        CMD_HELP_SEARCH
   MENUITEM "&Pomoc",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "In&fo..." {
-   MENUITEM "&Licencja",         CMD_LICENSE
-   MENUITEM "&BEZ GWARANCJI",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine...",      CMD_ABOUT_WINE
-  }
+  MENUITEM "In&fo...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Pt.rc
--- trunk/reactos/subsys/system/notepad/Pt.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Pt.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -45,26 +45,21 @@

   MENUITEM "C&olar\tCtrl+V",	CMD_PASTE
   MENUITEM "E&xcluir\tDel",	CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Localizar...",	CMD_SEARCH
+  MENUITEM "Localizar &pr¾xima\tF3",	CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Selecionar &tudo",	CMD_SELECT_ALL
   MENUITEM "&Data/Hora\tF5",	CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&Quebrar automßtica de linha",	CMD_WRAP
   MENUITEM "&Fonte...",          CMD_FONT
  }
-POPUP "&Pesquisa" {
-  MENUITEM "&Localizar...",	CMD_SEARCH
-  MENUITEM "Localizar &pr¾xima\tF3",	CMD_SEARCH_NEXT
- }
 POPUP "&Ajuda" {
   MENUITEM "&Conte·do",		CMD_HELP_CONTENTS
   MENUITEM "&Procurar...",	CMD_HELP_SEARCH
   MENUITEM "&Ajuda na ajuda",	CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "&Informaþ§es..." {
-   MENUITEM "&Licenþa",		CMD_LICENSE
-   MENUITEM "&SEM GARANTIA",	CMD_NO_WARRANTY
-   MENUITEM "&Sobre o Wine",	CMD_ABOUT_WINE
-  }
+  MENUITEM "&Informaþ§es...",	CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Ru.rc
--- trunk/reactos/subsys/system/notepad/Ru.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Ru.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -40,25 +40,20 @@

   MENUITEM "?±?&ÓÔÞ?³\tCtrl+V",    CMD_PASTE
   MENUITEM "&ËõÓÙÞ?³\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&?ÓÚ?Þ",           CMD_SEARCH
+  MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "?¹õÕÙÞ?³ Ô&±Õ",       CMD_SELECT_ALL
   MENUITEM "?­Õý&  Þ õÓ?Ó\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&¤Õ­Õݯ± ´¯ ±Ù¯ÔÓý",  CMD_WRAP
  }
-POPUP "¤&¯Þ±Û" {
-  MENUITEM "&?ÓÚ?Þ",           CMD_SEARCH
-  MENUITEM "?ÓÚ?Þ &õÓÙÕÕ\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&д­ÓÔÛÓ" {
   MENUITEM "&ЯõÕ­µÓÝÞÕ",         CMD_HELP_CONTENTS
   MENUITEM "&¤¯Þ±Û...",        CMD_HELP_SEARCH
   MENUITEM "&?±´¯Ù³þ¯ÔÓÝÞÕ ±´­ÓÔÛÞ",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "&ÐÔÕõÕÝÞ ..." {
-   MENUITEM "&?Þ÷ÕÝþÞ ",         CMD_LICENSE
-   MENUITEM "&??Ã ??ð??Ê??",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine",      CMD_ABOUT_WINE
-  }
+  MENUITEM "&ÐÔÕõÕÝÞ ...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Si.rc
--- trunk/reactos/subsys/system/notepad/Si.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Si.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -42,25 +42,20 @@

   MENUITEM "&Prilepi\tCtrl+V",    CMD_PASTE
   MENUITEM "Izbri&Üi\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "&Najdi ...",           CMD_SEARCH
+  MENUITEM "Na&daljuj iskanje\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Izberi &vse",       CMD_SELECT_ALL
   MENUITEM "?as/&Datum\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "Pr&elom vrstice",  CMD_WRAP
  }
-POPUP "&Iskanje" {
-  MENUITEM "&Najdi ...",           CMD_SEARCH
-  MENUITEM "Na&daljuj iskanje\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "&PomoÞ" {
   MENUITEM "&Teme pomoÞi",         CMD_HELP_CONTENTS
   MENUITEM "&Najdi ...",        CMD_HELP_SEARCH
   MENUITEM "&O pomoÞi",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&ormacije ..." {
-   MENUITEM "&LicenÞna pogodba",         CMD_LICENSE
-   MENUITEM "&BREZ GARANCIJE",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine",      CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&ormacije ...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Sv.rc
--- trunk/reactos/subsys/system/notepad/Sv.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Sv.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -44,25 +44,20 @@

   MENUITEM "K&listra in\tCtrl+V",       CMD_PASTE
   MENUITEM "&Ta bort\tDel",     CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "S÷k...",            CMD_SEARCH
+  MENUITEM "&S÷k nõsta\tF3",    CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Markera &allt",     CMD_SELECT_ALL
   MENUITEM "&Tid/datum\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "&Automatiskt radbyte",      CMD_WRAP
  }
-POPUP "&S÷k" {
-  MENUITEM "S÷k...",            CMD_SEARCH
-  MENUITEM "&S÷k nõsta\tF3",    CMD_SEARCH_NEXT
- }
 POPUP "&Hjõlp" {
   MENUITEM "&InnehÕll",         CMD_HELP_CONTENTS
   MENUITEM "&S÷k...",           CMD_HELP_SEARCH
   MENUITEM "Anvisningar f÷r hjõlpen",    CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Inf&ormation..." {
-   MENUITEM "&Licens",          CMD_LICENSE
-   MENUITEM "&INGEN GARANTI",   CMD_NO_WARRANTY
-   MENUITEM "&Om Wine",         CMD_ABOUT_WINE
-  }
+  MENUITEM "Inf&ormation...",         CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Th.rc
--- trunk/reactos/subsys/system/notepad/Th.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Th.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -42,26 +42,21 @@

   MENUITEM "Ãʺ\tCtrl+V",    CMD_PASTE
   MENUITEM "??\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "ñÚ??Ê\tCtrl+F",   CMD_SEARCH
+  MENUITEM "ñÚ??ÊÁÞ?õ?\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "Ó?Î?íÀÐÚº???\tCtrl+A",       CMD_SELECT_ALL
   MENUITEM "ÃÐ?ÀiÞ/\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "?Þ????ÀÐ??ÊÃ",  CMD_WRAP
   MENUITEM "???ß???ÐÃ?Ðí??...",          CMD_FONT
  }
- POPUP "ñÐ??Ê" {
-  MENUITEM "ñÚ??Ê\tCtrl+F",   CMD_SEARCH
-  MENUITEM "ñÚ??ÊÁÞ?õ?\tF3",  CMD_SEARCH_NEXT
- }
  POPUP "¬ÞÃ?Ó??i?" {
   MENUITEM "Ó?ÎÚ??Ê",         CMD_HELP_CONTENTS
   MENUITEM "ñÚ??Ê...",        CMD_HELP_SEARCH
   MENUITEM "ÓíiÞ?ÃíÐ?¬ÞÃ?Ó??i?",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "?Ê??ðÓ?i??..." {
-   MENUITEM "Ò???Ï¡ÊÁ", CMD_LICENSE
-   MENUITEM "õ?Þ?i WARRANTY", CMD_NO_WARRANTY
-   MENUITEM "ÓíiÞ?ÃíÐ? Wine... ", CMD_ABOUT_WINE
-  }
+  MENUITEM "?Ê??ðÓ?i??...", CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Wa.rc
--- trunk/reactos/subsys/system/notepad/Wa.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Wa.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -45,25 +45,20 @@

   MENUITEM "C&laper\tCtrl+V",   CMD_PASTE
   MENUITEM "&Rafacer\tDel",     CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "Cwer¯...",          CMD_SEARCH
+  MENUITEM "&Sh¹vant\tF3",      CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "&Tchwezi totafwait",        CMD_SELECT_ALL
   MENUITEM "&Eure/Date\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "C¶per les ro&yes",  CMD_WRAP
  }
-POPUP "C&wer¯" {
-  MENUITEM "Cwer¯...",          CMD_SEARCH
-  MENUITEM "&Sh¹vant\tF3",      CMD_SEARCH_NEXT
- }
 POPUP "&Aide" {
   MENUITEM "?&dvins",           CMD_HELP_CONTENTS
   MENUITEM "C&wer¯...",         CMD_HELP_SEARCH
   MENUITEM "&Aide so l' Aide",  CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "&InformÕcion..." {
-   MENUITEM "&Licinse",         CMD_LICENSE
-   MENUITEM "&NOLE WARANTEYE",  CMD_NO_WARRANTY
-   MENUITEM "? &dfait di Wine", CMD_ABOUT_WINE
-  }
+  MENUITEM "&InformÕcion...", CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/Zh.rc
--- trunk/reactos/subsys/system/notepad/Zh.rc	2005-09-29 03:33:28 UTC
(rev 18150)
+++ trunk/reactos/subsys/system/notepad/Zh.rc	2005-09-29 03:39:38 UTC
(rev 18151)
@@ -39,25 +39,20 @@

   MENUITEM "i??¨ú¿&Pú®\tCtrl+V",    CMD_PASTE
   MENUITEM "?¥?²ú¿&Dú®\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
+  MENUITEM "?Ð?¸ú¿&Sú®",           CMD_SEARCH
+  MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3",  CMD_SEARCH_NEXT
+  MENUITEM SEPARATOR
   MENUITEM "?½Ðíú¿&Aú®",       CMD_SELECT_ALL
   MENUITEM "?Õ?Ù?iã?íó???õú¿&Tú®\tF5",    CMD_TIME_DATE
   MENUITEM SEPARATOR
   MENUITEM "ÎÈ»??ððú¿&Wú®",  CMD_WRAP
  }
-POPUP "?Ð?¸ú¿&Sú®" {
-  MENUITEM "?Ð?¸ú¿&Sú®",           CMD_SEARCH
-  MENUITEM "?Ð?¸¤?Ê?©÷ú¿&Sú®\tF3",  CMD_SEARCH_NEXT
- }
 POPUP "?´Í·ú¿&Hú®" {
   MENUITEM "???¦ú¿&Cú®",         CMD_HELP_CONTENTS
   MENUITEM "?Ð?¸ú¿&Sú®...",        CMD_HELP_SEARCH
   MENUITEM "?þ????Ë??´Í·ú¿&Hú®",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-  POPUP "Î??¤ð?¤óú¿&Oú®..." {
-   MENUITEM "Ë??ºðÝ??ð¡ÊÚú¿&Lú®",         CMD_LICENSE
-   MENUITEM "È­???Ì?Ïú¿&Nú®",     CMD_NO_WARRANTY
-   MENUITEM "?ÏË? Wineú¿&Aú®",      CMD_ABOUT_WINE
-  }
+  MENUITEM "Î??¤ð?¤óú¿&Oú®...",      CMD_ABOUT_WINE
  }
 }
 
  _____  

Modified: trunk/reactos/subsys/system/notepad/notepad_res.h
--- trunk/reactos/subsys/system/notepad/notepad_res.h	2005-09-29
03:33:28 UTC (rev 18150)
+++ trunk/reactos/subsys/system/notepad/notepad_res.h	2005-09-29
03:39:38 UTC (rev 18151)
@@ -54,6 +54,8 @@

 #define CMD_WRAP                0x119
 #define CMD_FONT                0x140
 
+#define CMD_STATUSBAR		0x150
+
 #define CMD_HELP_CONTENTS       0x130
 #define CMD_HELP_SEARCH         0x131
 #define CMD_HELP_ON_HELP        0x132