notepad: Remove the License and NO WARRANTY options from the Help->Information…

notepad: Remove the License and NO WARRANTY options from the Help->Information popup menu as the same information can now be viewed from the About dialog. Remove the Help->Information popup menu and rename the "About Wine" option to "About Notepad".

notepad: Remove the License and NO WARRANTY options from the Help->Information…
90efadc5 · Rob Shearman · Alexandre Julliard · c06f26f2 · 90efadc5 · 90efadc5
Commit 90efadc5 authored Mar 28, 2008 by Rob Shearman Committed by Alexandre Julliard Mar 28, 2008
29 changed files
--- a/programs/notepad/Bg.rc
+++ b/programs/notepad/Bg.rc
@@ -57,11 +57,7 @@ POPUP "&" {
  MENUITEM "&...",        CMD_HELP_SEARCH
  MENUITEM "&  ",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&...",         CMD_LICENSE
-   MENUITEM "& ...",     CMD_NO_WARRANTY
-   MENUITEM "& Wine...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Cs.rc
+++ b/programs/notepad/Cs.rc
@@ -63,11 +63,7 @@ POPUP "&Npovda" {
  MENUITEM "&Najt...",        CMD_HELP_SEARCH
  MENUITEM "&Pomoc k npovd",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licence...",         CMD_LICENSE
-   MENUITEM "&BEZ ZRUKY...",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Da.rc
+++ b/programs/notepad/Da.rc
@@ -56,11 +56,7 @@ POPUP "&Hjlp" {
  MENUITEM "&Sg efter hjlp om...",    CMD_HELP_SEARCH
  MENUITEM "&Brug af Hjlp",    CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&Om Notesblok" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licens...",          CMD_LICENSE
-   MENUITEM "&Ingen Garenti...",     CMD_NO_WARRANTY
-   MENUITEM "&Om WINE...",         CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/De.rc
+++ b/programs/notepad/De.rc
@@ -59,11 +59,7 @@ POPUP "&Hilfe" {
  MENUITEM "&Suchen...",        CMD_HELP_SEARCH
  MENUITEM "&Hilfe benutzen",   CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Lizenz...",          CMD_LICENSE
-   MENUITEM "&KEINE GARANTIE...",  CMD_NO_WARRANTY
-   MENUITEM "&ber Wine...",       CMD_ABOUT_WINE
-  }
 }
 }
@@ -125,30 +121,3 @@ um diese Funktion \nabzuschließen. Beenden Sie eine oder mehrere \
 }
-STRINGTABLE DISCARDABLE
-{
-IDS_LICENSE_CAPTION,            "LIZENZ"
-IDS_LICENSE,
-"Diese Bibliothek ist freie Software; Sie drfen sie unter den \
-Bedingungen der GNU Lesser General Public License, wie von der \
-Free Software Foundation verffentlicht, weiterverteilen und/oder \
-modifizieren; entweder gem Version 2.1 der Lizenz oder (nach \
-Ihrer Option) jeder spteren Version.\n\
-Diese Bibliothek wird in der Hoffnung weiterverbreitet, da sie \
-ntzlich sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne \
-die implizierte Garantie der MARKTREIFE oder der VERWENDBARKEIT \
-FR EINEN BESTIMMTEN ZWECK. Mehr Details finden Sie in der \
-GNU Lesser General Public License.\n\
-Sie sollten eine Kopie der GNU Lesser General Public License zusammen \
-mit dieser Bibliothek erhalten haben; falls nicht, schreiben Sie an \
-die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, \
-Boston, MA 02110, USA."
-IDS_WARRANTY_CAPTION, "KEINE GARANTIE"
-IDS_WARRANTY,
-"Diese Bibliothek wird in der Hoffnung weiterverbreitet, da sie ntzlich \
-sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne die implizierte Garantie \
-der MARKTREIFE oder der VERWENDBARKEIT FR EINEN BESTIMMTEN ZWECK. Mehr Details \
-finden Sie in der GNU Lesser General Public License."
-}
--- a/programs/notepad/En.rc
+++ b/programs/notepad/En.rc
@@ -59,11 +59,7 @@ POPUP "&Help" {
  MENUITEM "&Search...",        CMD_HELP_SEARCH
  MENUITEM "&Help on help",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&License...",         CMD_LICENSE
-   MENUITEM "&NO WARRANTY...",     CMD_NO_WARRANTY
-   MENUITEM "&About Wine...",      CMD_ABOUT_WINE
-  }
 }
 }
@@ -123,27 +119,3 @@ task. \nClose one or more applications to increase the amount of \nfree \
 memory."
 }
-STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-{
-IDS_LICENSE_CAPTION,            "LICENSE"
-IDS_LICENSE,
-"This library is free software; you can redistribute it and/or \
-modify it under the terms of the GNU Lesser General Public \
-License as published by the Free Software Foundation; either \
-version 2.1 of the License, or (at your option) any later version.\n\
-This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details.\n\
-You should have received a copy of the GNU Lesser General Public \
-License along with this library; if not, write to the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "NO WARRANTY"
-IDS_WARRANTY,
-"This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details."
-}
--- a/programs/notepad/Eo.rc
+++ b/programs/notepad/Eo.rc
@@ -57,11 +57,7 @@ POPUP "&Helpo" {
  MENUITEM "Seru...",        CMD_HELP_SEARCH
  MENUITEM "Pri Helpanto",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Pri..." {
+  MENUITEM "Pri Notepad...",  CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licenco",         CMD_LICENSE
-   MENUITEM "&Garantio",     CMD_NO_WARRANTY
-   MENUITEM "Pri Notepad",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Es.rc
+++ b/programs/notepad/Es.rc
@@ -61,11 +61,7 @@ POPUP "A&yuda" {
  MENUITEM "&Buscar...",            CMD_HELP_SEARCH
  MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&Informacin" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licencia...",            CMD_LICENSE
-   MENUITEM "SIN &GARANTA...",        CMD_NO_WARRANTY
-   MENUITEM "&Acerca de Wine...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Fi.rc
+++ b/programs/notepad/Fi.rc
@@ -56,11 +56,7 @@ POPUP "&Apua" {
  MENUITEM "&Etsi...",		CMD_HELP_SEARCH
  MENUITEM "Apua &Opastuksesta",	CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Lisenssi...",	CMD_LICENSE
-   MENUITEM "&EI TAKUUTA...",	CMD_NO_WARRANTY
-   MENUITEM "&Tietoja Wine:ista...",	CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Fr.rc
+++ b/programs/notepad/Fr.rc
@@ -59,11 +59,7 @@ POPUP "Aid&e" {
  MENUITEM "&Rechercher...",    CMD_HELP_SEARCH
  MENUITEM "&Utiliser l'aide",  CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licence...",         CMD_LICENSE
-   MENUITEM "&AUCUNE GARANTIE...", CMD_NO_WARRANTY
-   MENUITEM " &propos de Wine...",        CMD_ABOUT_WINE
-  }
 }
 }
@@ -123,30 +119,3 @@ tâche. \nFermez une ou plusieurs applications pour libérer\n\
 de la mmoire."
 }
-STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-{
-IDS_LICENSE_CAPTION,            "LICENCE"
-IDS_LICENSE,
-"Cette bibliothque est libre, vous pouvez la redistribuer et/ou \
-la modifier selon les termes de la Licence Publique Gnrale GNU \
-Limite publie par la Free Software Foundation (version 2.1 ou \
-bien toute autre version ultrieure choisie par vous).\n\
-Cette bibliothque est distribue car potentiellement utile, \
-mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \
-les garanties de commercialisation ou d'adaptation dans un but \
-spcifique. Reportez-vous  la Licence Publique Gnrale GNU \
-Limite pour plus de dtails.\n\
-Vous devez avoir reu une copie de la Licence Publique Gnrale \
-GNU Limite en mme temps que cette bibliothque; si ce n'est pas \
-le cas, crivez  la Free Software Foundation, Inc., 51 Franklin St, \
-Fifth Floor, Boston, MA 02111-1301, tats-Unis."
-IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE"
-IDS_WARRANTY,
-"Cette bibliothque est distribue car potentiellement utile, \
-mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \
-les garanties de commercialisation ou d'adaptation dans un but \
-spcifique. Reportez-vous  la Licence Publique Gnrale GNU \
-Limite pour plus de dtails."
-}
--- a/programs/notepad/Hu.rc
+++ b/programs/notepad/Hu.rc
@@ -57,11 +57,7 @@ POPUP "&Sg" {
  MENUITEM "&Keress...",        CMD_HELP_SEARCH
  MENUITEM "&Hasznlat",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&ormci" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licenc...",         CMD_LICENSE
-   MENUITEM "&SEMMI GARANCIA...",     CMD_NO_WARRANTY
-   MENUITEM "&Wine nvjegy...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/It.rc
+++ b/programs/notepad/It.rc
@@ -62,11 +62,7 @@ POPUP "&Aiuto" {
  MENUITEM "&Trova...",        CMD_HELP_SEARCH
  MENUITEM "&Aiuto sulla Guida",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&Informazioni sul Blocco Note...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licenza...",         CMD_LICENSE
-   MENUITEM "&Garanzia...",     CMD_NO_WARRANTY
-   MENUITEM "&Informazioni sul Blocco Note...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Ja.rc
+++ b/programs/notepad/Ja.rc
@@ -59,11 +59,7 @@ POPUP "ヘルプ(&H)" {
  MENUITEM "検索(&S)...",        CMD_HELP_SEARCH
  MENUITEM "ヘルプの使い方(&H)",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "情報(&o)" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "ライセンス(&L)...",         CMD_LICENSE
-   MENUITEM "未保証(&N)...",     CMD_NO_WARRANTY
-   MENUITEM "Wineについて(&A)...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Ko.rc
+++ b/programs/notepad/Ko.rc
@@ -60,11 +60,7 @@ POPUP "도움말(&H)" {
  MENUITEM "찾기(&S)...",               CMD_HELP_SEARCH
  MENUITEM "도움말 사용법(&H)",         CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "정보(&O)" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "라이센스(&L)...",          CMD_LICENSE
-   MENUITEM "무보증(&N)...",            CMD_NO_WARRANTY
-   MENUITEM "Wine 정보(&A)...",         CMD_ABOUT_WINE
-  }
 }
 }
@@ -123,27 +119,3 @@ STRING_OUT_OF_MEMORY,                           "이 작업을 완료하는 데 필요한 메
 \n사용 가능한 메모리의 양을 확보하기 위해 하나 이상의 응용 프로그램을 닫아 주십시오.\n"
 }
-STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-{
-IDS_LICENSE_CAPTION,            "라이센스"
-IDS_LICENSE,
-"This library is free software; you can redistribute it and/or \
-modify it under the terms of the GNU Lesser General Public \
-License as published by the Free Software Foundation; either \
-version 2.1 of the License, or (at your option) any later version.\n\
-This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details.\n\
-You should have received a copy of the GNU Lesser General Public \
-License along with this library; if not, write to the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "무보증"
-IDS_WARRANTY,
-"This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details."
-}
--- a/programs/notepad/Nl.rc
+++ b/programs/notepad/Nl.rc
@@ -57,11 +57,7 @@ POPUP "&Help" {
  MENUITEM "&Zoeken...",         CMD_HELP_SEARCH
  MENUITEM "&Hulp bij Help",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licentie...",         CMD_LICENSE
-   MENUITEM "&GEEN GARANTIE...",    CMD_NO_WARRANTY
-   MENUITEM "&Over Wine...",        CMD_ABOUT_WINE
-  }
 }
 }
@@ -118,26 +114,4 @@ Wilt u de wijzigingen opslaan?"
 STRING_NOTFOUND,                                "'%s' kan niet worden gevonden."
 STRING_OUT_OF_MEMORY,                           "Onvoldoende geheugen. \
 \nSluit een of meer applicaties om de hoeveelheid \nbeschikbaar geheugen te vergroten."
-IDS_LICENSE_CAPTION,            "LICENTIE"
-/* Only translated the title, there is no official translation of the LGPL */
-IDS_LICENSE,
-"This library is free software; you can redistribute it and/or \
-modify it under the terms of the GNU Lesser General Public \
-License as published by the Free Software Foundation; either \
-version 2.1 of the License, or (at your option) any later version.\n\
-This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details.\n\
-You should have received a copy of the GNU Lesser General Public \
-License along with this library; if not, write to the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "GEEN GARANTIE"
-IDS_WARRANTY,
-"This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details."
 }
--- a/programs/notepad/No.rc
+++ b/programs/notepad/No.rc
@@ -57,11 +57,7 @@ POPUP "&Hjelp" {
  MENUITEM "&Sk . . .",        CMD_HELP_SEARCH
  MENUITEM "&Hjelp om hjelp",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&ormasjon" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Lisens . . .",         CMD_LICENSE
-   MENUITEM "I&NGEN GARANTI . . .",     CMD_NO_WARRANTY
-   MENUITEM "&Om Wine . . .",      CMD_ABOUT_WINE
-  }
 }
 }
@@ -121,27 +117,3 @@ operasjonen. \nLukk et eller flere programmer for å frigjøre \nmer \
 minne."
 }
-STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-{
-IDS_LICENSE_CAPTION,            "LISENS"
-IDS_LICENSE,
-"Dette biblioteket er fri programvare; du kan redistribuere det og/eller \
-endre det under vilkrene i GNU Lesser General Public \
-License, utgitt av the Free Software Foundation; enten \
-versjon 2.1 av Lisensen, eller (hvis du nsker det) en nyere versjon.\n\
-Dette biblioteket distribueres i hp om at det er nyttig, \
-men UTEN ENHVER GARANTI; uten gangen den uttrykte garantien for \
-HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORML. Se GNU \
-Lesser General Public License for flere detaljer.\n\
-Du skal ha mottatt et eksemplar av GNU Lesser General Public \
-License sammen med dette biblioteket; hvis ikke, skriv til: the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "INGEN GARANTI"
-IDS_WARRANTY,
-"Dette biblioteket distribueres i hp om at det er nyttig, \
-men UTEN ENHVER GARANTI; uten engang en uttrykte garantien for \
-HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORML. Se GNU \
-Lesser General Public License for flere detaljer."
-}
--- a/programs/notepad/Pl.rc
+++ b/programs/notepad/Pl.rc
@@ -60,11 +60,7 @@ POPUP "Pomo&c" {
  MENUITEM "&Szukaj...",        CMD_HELP_SEARCH
  MENUITEM "&Pomoc",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "In&fo" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licencja...",         CMD_LICENSE
-   MENUITEM "&BEZ GWARANCJI...",    CMD_NO_WARRANTY
-   MENUITEM "&O Wine...",           CMD_ABOUT_WINE
-  }
 }
 }
@@ -123,28 +119,3 @@ STRING_OUT_OF_MEMORY,                   "Za mao pamici do wykonania tego zadan
 Zamknij jedn lub wicej aplikacji aby zwikszy ilo wolnej pamici."
 }
-STRINGTABLE DISCARDABLE
-{
-IDS_LICENSE_CAPTION,            "LICENCJA"
-IDS_LICENSE,
-"This library is free software; you can redistribute it and/or \
-modify it under the terms of the GNU Lesser General Public \
-License as published by the Free Software Foundation; either \
-version 2.1 of the License, or (at your option) any later version.\n\
-This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details.\n\
-You should have received a copy of the GNU Lesser General Public \
-License along with this library; if not, write to the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "BEZ GWARANCJI"
-IDS_WARRANTY,
-"This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details."
-}
--- a/programs/notepad/Pt.rc
+++ b/programs/notepad/Pt.rc
@@ -61,11 +61,7 @@ POPUP "&Ajuda" {
  MENUITEM "&Procurar...",	CMD_HELP_SEARCH
  MENUITEM "&Ajuda na ajuda",	CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&Informaes" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licena...",	CMD_LICENSE
-   MENUITEM "&SEM GARANTIA...",	CMD_NO_WARRANTY
-   MENUITEM "&Sobre o Wine...",	CMD_ABOUT_WINE
-  }
 }
 }
@@ -108,11 +104,7 @@ POPUP "&Ajuda" {
  MENUITEM "&Procurar...",	CMD_HELP_SEARCH
  MENUITEM "&Ajuda na ajuda",	CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&Informaes..." {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licena",		CMD_LICENSE
-   MENUITEM "&SEM GARANTIA",	CMD_NO_WARRANTY
-   MENUITEM "&Acerca do Wine",	CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Ru.rc
+++ b/programs/notepad/Ru.rc
@@ -57,11 +57,7 @@ POPUP "&" {
  MENUITEM "&...",        CMD_HELP_SEARCH
  MENUITEM "& ",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&...",         CMD_LICENSE
-   MENUITEM "& ...",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Si.rc
+++ b/programs/notepad/Si.rc
@@ -56,11 +56,7 @@ POPUP "&Pomo" {
  MENUITEM "&Najdi ...",        CMD_HELP_SEARCH
  MENUITEM "&O pomoi",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&ormacije" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licenna pogodba ...",         CMD_LICENSE
-   MENUITEM "&BREZ GARANCIJE ...",     CMD_NO_WARRANTY
-   MENUITEM "&O Wine ...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Sk.rc
+++ b/programs/notepad/Sk.rc
@@ -57,11 +57,7 @@ POPUP "&Help" {
  MENUITEM "&Search...",	CMD_HELP_SEARCH
  MENUITEM "&Help on help",	CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&o" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&License...",	CMD_LICENSE
-   MENUITEM "&NO WARRANTY...",	CMD_NO_WARRANTY
-   MENUITEM "&About Wine...",	CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Sv.rc
+++ b/programs/notepad/Sv.rc
@@ -57,11 +57,7 @@ POPUP "&Hjlp" {
  MENUITEM "&Sk...",           CMD_HELP_SEARCH
  MENUITEM "Anvndning &av hjlp",    CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "Inf&ormation" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licens...",          CMD_LICENSE
-   MENUITEM "&INGEN GARANTI...",   CMD_NO_WARRANTY
-   MENUITEM "&Om Wine...",         CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Th.rc
+++ b/programs/notepad/Th.rc
@@ -57,11 +57,7 @@ MAIN_MENU MENU
  MENUITEM "...",        CMD_HELP_SEARCH
  MENUITEM "ǡѺ",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "´" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "͹حҵ...", CMD_LICENSE
-   MENUITEM " WARRANTY...", CMD_NO_WARRANTY
-   MENUITEM "ǡѺ Wine... ", CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Tr.rc
+++ b/programs/notepad/Tr.rc
@@ -57,11 +57,7 @@ POPUP "&Yardm" {
  MENUITEM "&Ara...",              CMD_HELP_SEARCH
  MENUITEM "&Yardm kullanm",    CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "B&ilgi" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Lisans...",             CMD_LICENSE
-   MENUITEM "&GARANT YOK...",        CMD_NO_WARRANTY
-   MENUITEM "&Wine Hakknda...",      CMD_ABOUT_WINE
-  }
 }
 }
@@ -121,27 +117,3 @@ alan yok. \nBir veya daha fazla uygulamay kapatarak bo bellek miktarn\nartt
 deneyin."
 }
-STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-{
-IDS_LICENSE_CAPTION,            "LSANS"
-IDS_LICENSE,
-"This library is free software; you can redistribute it and/or \
-modify it under the terms of the GNU Lesser General Public \
-License as published by the Free Software Foundation; either \
-version 2.1 of the License, or (at your option) any later version.\n\
-This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details.\n\
-You should have received a copy of the GNU Lesser General Public \
-License along with this library; if not, write to the Free Software \
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
-IDS_WARRANTY_CAPTION, "GARANTSZDR"
-IDS_WARRANTY,
-"This library is distributed in the hope that it will be useful, \
-but WITHOUT ANY WARRANTY; without even the implied warranty of \
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU \
-Lesser General Public License for more details."
-}
--- a/programs/notepad/Wa.rc
+++ b/programs/notepad/Wa.rc
@@ -59,11 +59,7 @@ POPUP "&Aide" {
  MENUITEM "C&wer...",         CMD_HELP_SEARCH
  MENUITEM "&Aide so l' Aide",  CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "&Informcion" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "&Licinse...",         CMD_LICENSE
-   MENUITEM "&NOLE WARANTEYE...",  CMD_NO_WARRANTY
-   MENUITEM " &dfait di Wine...", CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/Zh.rc
+++ b/programs/notepad/Zh.rc
@@ -54,11 +54,7 @@ POPUP "帮助（&H）" {
  MENUITEM "搜索（&S）...",        CMD_HELP_SEARCH
  MENUITEM "如何使用帮助（&H）",     CMD_HELP_ON_HELP
  MENUITEM SEPARATOR
-  POPUP "资料信息（&O）" {
+  MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD
-   MENUITEM "用户许可协议（&L）...",         CMD_LICENSE
-   MENUITEM "责任无关（&N）...",     CMD_NO_WARRANTY
-   MENUITEM "关于 Wine（&A）...",      CMD_ABOUT_WINE
-  }
 }
 }

--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -765,23 +765,7 @@ VOID DIALOG_HelpHelp(VOID)
    WinHelp(Globals.hMainWnd, helpfileW, HELP_HELPONHELP, 0);
 }
-VOID DIALOG_HelpLicense(VOID)
+VOID DIALOG_HelpAboutNotepad(VOID)
-{
-    TCHAR cap[20], text[1024];
-    LoadString(Globals.hInstance, IDS_LICENSE, text, 1024);
-    LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20);
-    MessageBox(Globals.hMainWnd, text, cap, MB_ICONINFORMATION | MB_OK);
-}
-VOID DIALOG_HelpNoWarranty(VOID)
-{
-    TCHAR cap[20], text[1024];
-    LoadString(Globals.hInstance, IDS_WARRANTY, text, 1024);
-    LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20);
-    MessageBox(Globals.hMainWnd, text, cap, MB_ICONEXCLAMATION | MB_OK);
-}
-VOID DIALOG_HelpAboutWine(VOID)
 {
    static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 };
    WCHAR szNotepad[MAX_STRING_LEN];

--- a/programs/notepad/dialog.h
+++ b/programs/notepad/dialog.h
@@ -44,9 +44,7 @@ VOID DIALOG_SelectFont(VOID);
 VOID DIALOG_HelpContents(VOID);
 VOID DIALOG_HelpSearch(VOID);
 VOID DIALOG_HelpHelp(VOID);
-VOID DIALOG_HelpLicense(VOID);
+VOID DIALOG_HelpAboutNotepad(VOID);
-VOID DIALOG_HelpNoWarranty(VOID);
-VOID DIALOG_HelpAboutWine(VOID);
 VOID DIALOG_TimeDate(VOID);
 int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFlags);

--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -297,9 +297,7 @@ static int NOTEPAD_MenuCommand(WPARAM wParam)
    case CMD_HELP_CONTENTS:    DIALOG_HelpContents(); break;
    case CMD_HELP_SEARCH:      DIALOG_HelpSearch(); break;
    case CMD_HELP_ON_HELP:     DIALOG_HelpHelp(); break;
-    case CMD_LICENSE:          DIALOG_HelpLicense(); break;
+    case CMD_HELP_ABOUT_NOTEPAD: DIALOG_HelpAboutNotepad(); break;
-    case CMD_NO_WARRANTY:      DIALOG_HelpNoWarranty(); break;
-    case CMD_ABOUT_WINE:       DIALOG_HelpAboutWine(); break;
    default:
 	break;

--- a/programs/notepad/notepad_res.h
+++ b/programs/notepad/notepad_res.h
@@ -52,9 +52,7 @@
 #define CMD_HELP_CONTENTS       0x130
 #define CMD_HELP_SEARCH         0x131
 #define CMD_HELP_ON_HELP        0x132
-#define CMD_LICENSE             0x135
+#define CMD_HELP_ABOUT_NOTEPAD  0x134
-#define CMD_NO_WARRANTY         0x136
-#define CMD_ABOUT_WINE          0x137
 /* Control IDs */
 #define IDC_PAGESETUP_HEADERVALUE 0x141
@@ -82,8 +80,3 @@
 #define STRING_NOTFOUND 0x17B
 #define STRING_OUT_OF_MEMORY 0x17C
-#define IDS_LICENSE_CAPTION       0x180
-#define IDS_LICENSE               0x181
-#define IDS_WARRANTY_CAPTION      0x182
-#define IDS_WARRANTY              0x183