From 90efadc5408f5f5304792b98f7770f9fa8c89a4e Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Fri, 28 Mar 2008 17:53:31 +0000 Subject: [PATCH] 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". --- programs/notepad/Bg.rc | 6 +----- programs/notepad/Cs.rc | 6 +----- programs/notepad/Da.rc | 6 +----- programs/notepad/De.rc | 33 +-------------------------------- programs/notepad/En.rc | 30 +----------------------------- programs/notepad/Eo.rc | 6 +----- programs/notepad/Es.rc | 6 +----- programs/notepad/Fi.rc | 6 +----- programs/notepad/Fr.rc | 33 +-------------------------------- programs/notepad/Hu.rc | 6 +----- programs/notepad/It.rc | 6 +----- programs/notepad/Ja.rc | 6 +----- programs/notepad/Ko.rc | 30 +----------------------------- programs/notepad/Nl.rc | 28 +--------------------------- programs/notepad/No.rc | 30 +----------------------------- programs/notepad/Pl.rc | 31 +------------------------------ programs/notepad/Pt.rc | 12 ++---------- programs/notepad/Ru.rc | 6 +----- programs/notepad/Si.rc | 6 +----- programs/notepad/Sk.rc | 6 +----- programs/notepad/Sv.rc | 6 +----- programs/notepad/Th.rc | 6 +----- programs/notepad/Tr.rc | 30 +----------------------------- programs/notepad/Wa.rc | 6 +----- programs/notepad/Zh.rc | 6 +----- programs/notepad/dialog.c | 18 +----------------- programs/notepad/dialog.h | 4 +--- programs/notepad/main.c | 4 +--- programs/notepad/notepad_res.h | 9 +-------- 29 files changed, 30 insertions(+), 358 deletions(-) diff --git a/programs/notepad/Bg.rc b/programs/notepad/Bg.rc index efc6a433ae1..e5d39c57353 100644 --- 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 "&...", CMD_LICENSE - MENUITEM "& ...", CMD_NO_WARRANTY - MENUITEM "& Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Cs.rc b/programs/notepad/Cs.rc index 0ffff14b7a4..762d09d9e5f 100644 --- a/programs/notepad/Cs.rc +++ b/programs/notepad/Cs.rc @@ -63,11 +63,7 @@ POPUP "&N MENUITEM "&Najt...", CMD_HELP_SEARCH MENUITEM "&Pomoc k npovd", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&o" { - MENUITEM "&Licence...", CMD_LICENSE - MENUITEM "&BEZ ZRUKY...", CMD_NO_WARRANTY - MENUITEM "&O Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index ab5a6e7b3d0..6ea7c2c12a7 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -56,11 +56,7 @@ POPUP "&Hj MENUITEM "&Sg efter hjlp om...", CMD_HELP_SEARCH MENUITEM "&Brug af Hjlp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Om Notesblok" { - MENUITEM "&Licens...", CMD_LICENSE - MENUITEM "&Ingen Garenti...", CMD_NO_WARRANTY - MENUITEM "&Om WINE...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index de0f1bb2329..569a805dfa5 100644 --- 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 "&Lizenz...", CMD_LICENSE - MENUITEM "&KEINE GARANTIE...", CMD_NO_WARRANTY - MENUITEM "&ber Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -125,30 +121,3 @@ um diese Funktion \nabzuschlie } - -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." -} diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 0697f5f8567..917c3c885e4 100644 --- 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 "&License...", CMD_LICENSE - MENUITEM "&NO WARRANTY...", CMD_NO_WARRANTY - MENUITEM "&About Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -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." -} diff --git a/programs/notepad/Eo.rc b/programs/notepad/Eo.rc index 5019031cabe..76391392609 100644 --- 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 "&Licenco", CMD_LICENSE - MENUITEM "&Garantio", CMD_NO_WARRANTY - MENUITEM "Pri Notepad", CMD_ABOUT_WINE - } + MENUITEM "Pri Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index 64d585bb1c5..8f52f2d9402 100644 --- 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 "&Licencia...", CMD_LICENSE - MENUITEM "SIN &GARANTA...", CMD_NO_WARRANTY - MENUITEM "&Acerca de Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index 386f6291592..eebf8c27c25 100644 --- 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 "&Lisenssi...", CMD_LICENSE - MENUITEM "&EI TAKUUTA...", CMD_NO_WARRANTY - MENUITEM "&Tietoja Wine:ista...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index ccde680eb27..f2b48c1763b 100644 --- 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 "&Licence...", CMD_LICENSE - MENUITEM "&AUCUNE GARANTIE...", CMD_NO_WARRANTY - MENUITEM " &propos de Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -123,30 +119,3 @@ t 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." -} diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc index 014b37038b1..a5f411aad5b 100644 --- a/programs/notepad/Hu.rc +++ b/programs/notepad/Hu.rc @@ -57,11 +57,7 @@ POPUP "&S MENUITEM "&Keress...", CMD_HELP_SEARCH MENUITEM "&Hasznlat", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "Inf&ormci" { - MENUITEM "&Licenc...", CMD_LICENSE - MENUITEM "&SEMMI GARANCIA...", CMD_NO_WARRANTY - MENUITEM "&Wine nvjegy...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index 041d3ae28ba..3ebb7030c37 100644 --- 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 "&Licenza...", CMD_LICENSE - MENUITEM "&Garanzia...", CMD_NO_WARRANTY - MENUITEM "&Informazioni sul Blocco Note...", CMD_ABOUT_WINE - } + MENUITEM "&Informazioni sul Blocco Note...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 35a73d4bb60..84cd5b20938 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -59,11 +59,7 @@ POPUP " MENUITEM "(&S)...", CMD_HELP_SEARCH MENUITEM "wv̎g(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "(&o)" { - MENUITEM "CZX(&L)...", CMD_LICENSE - MENUITEM "ۏ(&N)...", CMD_NO_WARRANTY - MENUITEM "Wineɂ‚(&A)...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 93fececaa9a..1865b85c1b7 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -60,11 +60,7 @@ POPUP " 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 "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -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." -} diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index f047d791929..1a427fd652c 100644 --- 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 "&Licentie...", CMD_LICENSE - MENUITEM "&GEEN GARANTIE...", CMD_NO_WARRANTY - MENUITEM "&Over Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -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." } diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index 4a6b7ae11c7..2d2e31ec093 100644 --- 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 "&Lisens . . .", CMD_LICENSE - MENUITEM "I&NGEN GARANTI . . .", CMD_NO_WARRANTY - MENUITEM "&Om Wine . . .", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -121,27 +117,3 @@ operasjonen. \nLukk et eller flere programmer for 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." -} diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc index 0e5df7e26e4..18078d72220 100644 --- 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 "&Licencja...", CMD_LICENSE - MENUITEM "&BEZ GWARANCJI...", CMD_NO_WARRANTY - MENUITEM "&O Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -123,28 +119,3 @@ STRING_OUT_OF_MEMORY, "Za ma 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." -} diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 072043517bf..f3f34c8fb20 100644 --- 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 "&Licena...", CMD_LICENSE - MENUITEM "&SEM GARANTIA...", CMD_NO_WARRANTY - MENUITEM "&Sobre o Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -108,11 +104,7 @@ POPUP "&Ajuda" { MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "&Informaes..." { - MENUITEM "&Licena", CMD_LICENSE - MENUITEM "&SEM GARANTIA", CMD_NO_WARRANTY - MENUITEM "&Acerca do Wine", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index f34eec009bc..44152a90534 100644 --- 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 "&...", CMD_LICENSE - MENUITEM "& ...", CMD_NO_WARRANTY - MENUITEM "&O Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 25bd62df4a3..d5bda70f748 100644 --- 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 "&Licenna pogodba ...", CMD_LICENSE - MENUITEM "&BREZ GARANCIJE ...", CMD_NO_WARRANTY - MENUITEM "&O Wine ...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Sk.rc b/programs/notepad/Sk.rc index 1f6858b4342..70a2a74e54a 100644 --- 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 "&License...", CMD_LICENSE - MENUITEM "&NO WARRANTY...", CMD_NO_WARRANTY - MENUITEM "&About Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index d69b466ebb7..d5fe1b49fee 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -57,11 +57,7 @@ POPUP "&Hj MENUITEM "&Sk...", CMD_HELP_SEARCH MENUITEM "Anvndning &av hjlp", 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 "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Th.rc b/programs/notepad/Th.rc index 790f33b6579..a89236169f6 100644 --- 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 "͹حҵ...", CMD_LICENSE - MENUITEM " WARRANTY...", CMD_NO_WARRANTY - MENUITEM "ǡѺ Wine... ", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Tr.rc b/programs/notepad/Tr.rc index 4e64cf65a7a..d61c9a24cb8 100644 --- a/programs/notepad/Tr.rc +++ b/programs/notepad/Tr.rc @@ -57,11 +57,7 @@ POPUP "&Yard MENUITEM "&Ara...", CMD_HELP_SEARCH MENUITEM "&Yardm kullanm", CMD_HELP_ON_HELP MENUITEM SEPARATOR - POPUP "B&ilgi" { - MENUITEM "&Lisans...", CMD_LICENSE - MENUITEM "&GARANT YOK...", CMD_NO_WARRANTY - MENUITEM "&Wine Hakknda...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -121,27 +117,3 @@ alan 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." -} diff --git a/programs/notepad/Wa.rc b/programs/notepad/Wa.rc index 8c398f758c7..b65f6e8b671 100644 --- 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 "&Licinse...", CMD_LICENSE - MENUITEM "&NOLE WARANTEYE...", CMD_NO_WARRANTY - MENUITEM " &dfait di Wine...", CMD_ABOUT_WINE - } + MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 3629f3f34e6..090ac0cca5d 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -54,11 +54,7 @@ POPUP " 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 "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD } } diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 2e750769aeb..d5de817eb4d 100644 --- 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) -{ - 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) +VOID DIALOG_HelpAboutNotepad(VOID) { static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; WCHAR szNotepad[MAX_STRING_LEN]; diff --git a/programs/notepad/dialog.h b/programs/notepad/dialog.h index ffadf00a710..b141de7aff7 100644 --- 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_HelpNoWarranty(VOID); -VOID DIALOG_HelpAboutWine(VOID); +VOID DIALOG_HelpAboutNotepad(VOID); VOID DIALOG_TimeDate(VOID); int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCWSTR szString, DWORD dwFlags); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 18500df06f9..aec0a22be6f 100644 --- 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_NO_WARRANTY: DIALOG_HelpNoWarranty(); break; - case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; + case CMD_HELP_ABOUT_NOTEPAD: DIALOG_HelpAboutNotepad(); break; default: break; diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index d95239afbd0..9228a5ef43d 100644 --- 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_NO_WARRANTY 0x136 -#define CMD_ABOUT_WINE 0x137 +#define CMD_HELP_ABOUT_NOTEPAD 0x134 /* 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