From 6d49edef371a47d9e60c6af01ad73dc7aa907618 Mon Sep 17 00:00:00 2001 From: Alexander Scott-Johns Date: Tue, 20 Apr 2010 14:11:52 +0100 Subject: [PATCH] clock: Remove "License..." and "NO WARRANTY..." items from "Info" menu. --- programs/clock/Cs.rc | 2 -- programs/clock/Da.rc | 2 -- programs/clock/De.rc | 29 ----------------------------- programs/clock/En.rc | 26 -------------------------- programs/clock/Eo.rc | 2 -- programs/clock/Es.rc | 26 -------------------------- programs/clock/Fi.rc | 2 -- programs/clock/Fr.rc | 27 --------------------------- programs/clock/Hu.rc | 2 -- programs/clock/It.rc | 26 -------------------------- programs/clock/Ja.rc | 26 -------------------------- programs/clock/Ko.rc | 26 -------------------------- programs/clock/Lt.rc | 28 ---------------------------- programs/clock/Nl.rc | 27 --------------------------- programs/clock/No.rc | 26 -------------------------- programs/clock/Pl.rc | 27 --------------------------- programs/clock/Pt.rc | 28 ---------------------------- programs/clock/Ro.rc | 26 -------------------------- programs/clock/Ru.rc | 2 -- programs/clock/Si.rc | 26 -------------------------- programs/clock/Sk.rc | 2 -- programs/clock/Sv.rc | 26 -------------------------- programs/clock/Th.rc | 2 -- programs/clock/Tr.rc | 26 -------------------------- programs/clock/Wa.rc | 2 -- programs/clock/Zh.rc | 4 ---- programs/clock/clock_res.h | 9 +-------- programs/clock/main.c | 26 -------------------------- 28 files changed, 1 insertion(+), 482 deletions(-) diff --git a/programs/clock/Cs.rc b/programs/clock/Cs.rc index 8b1ba903453..4f543777966 100644 --- a/programs/clock/Cs.rc +++ b/programs/clock/Cs.rc @@ -43,8 +43,6 @@ MAIN_MENU MENU MENUITEM "Vdy n&a vrchu", IDM_ONTOP } POPUP "&O aplikaci" { - MENUITEM "&Licence...", IDM_LICENSE - MENUITEM "&BEZ ZRUKY...", IDM_NOWARRANTY MENUITEM "O &aplikaci...", IDM_ABOUT } } diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc index e4006319385..860f7232aed 100644 --- a/programs/clock/Da.rc +++ b/programs/clock/Da.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MENUITEM "&Altid verst", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licens...", IDM_LICENSE - MENUITEM "&Ingen Garanti...", IDM_NOWARRANTY MENUITEM "&Om Ur...", IDM_ABOUT } } diff --git a/programs/clock/De.rc b/programs/clock/De.rc index 14bd101e732..59a804d8be1 100644 --- a/programs/clock/De.rc +++ b/programs/clock/De.rc @@ -39,8 +39,6 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL MENUITEM "&Immer im Vordergrund", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Lizenz...", IDM_LICENSE - MENUITEM "&KEINE GARANTIE...", IDM_NOWARRANTY MENUITEM "&Über Uhr...", IDM_ABOUT } } @@ -49,30 +47,3 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL { IDS_CLOCK, "Uhr" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LIZENZ" -IDS_LICENSE, -"Diese Bibliothek ist freie Software; Sie dürfen sie unter den \ -Bedingungen der GNU Lesser General Public License, wie von der \ -Free Software Foundation veröffentlicht, weiterverteilen und/oder \ -modifizieren; entweder gemäß Version 2.1 der Lizenz oder (nach \ -Ihrer Option) jeder späteren Version.\n\ -Diese Bibliothek wird in der Hoffnung weiterverbreitet, daß sie \ -nützlich sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne \ -die implizierte Garantie der MARKTREIFE oder der VERWENDBARKEIT \ -FÜR 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 nützlich \ -sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne die implizierte Garantie \ -der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Mehr Details \ -finden Sie in der GNU Lesser General Public License." -} diff --git a/programs/clock/En.rc b/programs/clock/En.rc index c381b509181..cf66233db20 100644 --- a/programs/clock/En.rc +++ b/programs/clock/En.rc @@ -39,8 +39,6 @@ MAIN_MENU MENU MENUITEM "&Always on Top", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&License...", IDM_LICENSE - MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY MENUITEM "&About Clock...", IDM_ABOUT } } @@ -49,27 +47,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Clock" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -{ -IDS_LICENSE_CAPTION, "LICENSE" -IDS_LICENSE, -"This program 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 program 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 program; 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 program 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/clock/Eo.rc b/programs/clock/Eo.rc index 335ba95195b..0cc7158bfe6 100644 --- a/programs/clock/Eo.rc +++ b/programs/clock/Eo.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU MENUITEM "&iam supre", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licenco", IDM_LICENSE - MENUITEM "&SEN GARANTIO...", IDM_NOWARRANTY MENUITEM "&Pri Horloo", IDM_ABOUT } } diff --git a/programs/clock/Es.rc b/programs/clock/Es.rc index 74b6d960bdb..0183aeba763 100644 --- a/programs/clock/Es.rc +++ b/programs/clock/Es.rc @@ -41,8 +41,6 @@ MAIN_MENU MENU MENUITEM "Siempre &visible", IDM_ONTOP } POPUP "&Info" { - MENUITEM "&Licencia...", IDM_LICENSE - MENUITEM "&SIN GARANTA...", IDM_NOWARRANTY MENUITEM "&Acerca de Reloj...", IDM_ABOUT } } @@ -51,27 +49,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Reloj" } - -STRINGTABLE DISCARDABLE -{ -IDS_LICENSE_CAPTION, "LICENCIA" -IDS_LICENSE, -"This program 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 program 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 program; if not, write to the Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" - -IDS_WARRANTY_CAPTION, "SIN GARANTA" -IDS_WARRANTY, -"This program 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/clock/Fi.rc b/programs/clock/Fi.rc index 87d27866f1c..fd222f47137 100644 --- a/programs/clock/Fi.rc +++ b/programs/clock/Fi.rc @@ -37,8 +37,6 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT MENUITEM "&Aina pllimmisen", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Lisenssi...", IDM_LICENSE - MENUITEM "&EI TAKUUTA...", IDM_NOWARRANTY MENUITEM "&Kellosta...", IDM_ABOUT } } diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index c6c24ba4385..19644b504e9 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -43,8 +43,6 @@ MAIN_MENU MENU MENUITEM "&Toujours visible", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licence...", IDM_LICENSE - MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY MENUITEM "À &propos de l'horloge", IDM_ABOUT } } @@ -53,28 +51,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Horloge" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LICENCE" -IDS_LICENSE, -"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou \ -le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ -telle que publiée par la Free Software Foundation ; soit la version 2.1 \ -de la Licence, soit (à votre gré) toute version ultérieure.\n\ -Ce programme est distribué dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE : sans même la garantie implicite de \ -COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ -la Licence Générale Publique Limitée pour plus de détails.\n\ -Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ -GNU avec ce programme ; si ce n'est pas le cas, écrivez à la : \ -Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ -MA 02110-1301, USA." - -IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" -IDS_WARRANTY, -"Ce programme est distribué dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE : sans même la garantie implicite de \ -COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ -la Licence Générale Publique Limitée pour plus de détails." -} diff --git a/programs/clock/Hu.rc b/programs/clock/Hu.rc index bced57c5b13..b6cb24f4ec9 100644 --- a/programs/clock/Hu.rc +++ b/programs/clock/Hu.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT MENUITEM "&Mindig legfell", IDM_ONTOP } POPUP "Inf&ormci" { - MENUITEM "&Licenc...", IDM_LICENSE - MENUITEM "&SEMMI GARANCIA...", IDM_NOWARRANTY MENUITEM "&ra nvjegy...", IDM_ABOUT } } diff --git a/programs/clock/It.rc b/programs/clock/It.rc index ad12b9cbf31..692493da7d3 100644 --- a/programs/clock/It.rc +++ b/programs/clock/It.rc @@ -44,8 +44,6 @@ MAIN_MENU MENU MENUITEM "&Sempre in primo piano", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licenza...", IDM_LICENSE - MENUITEM "&Garanzia...", IDM_NOWARRANTY MENUITEM "&Informazioni sull'orologio...", IDM_ABOUT } } @@ -54,27 +52,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Orologio" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LICENSE" -IDS_LICENSE, -"Questo programma è software libero; puoi redistribuirlo e/o \ -modificarlo sotto i termini della GNU Lesser General Public \ -License come pubblicata dalla Free Software Foundation; sia \ -la versione 2.1 della Licenza, o (a tua scelta) qualunque altra versione più recente.\n\ -Questo programma è distribuito nella speranza che sia utile, \ -ma SENZA ALCUNA GARANZIA; anche senza la garanzia implicita di \ -COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Leggere la GNU \ -Lesser General Public License per maggiori dettagli.\n\ -Dovresti aver ricevuto una copia della GNU Lesser General Public \ -License insieme a questo programma; altrimenti, scrivi alla Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" - -IDS_WARRANTY_CAPTION, "NESSUNA GARANZIA" -IDS_WARRANTY, -"Questo programma è distribuito nella speranza che sia utile, \ -ma SENZA ALCUNA GARANZIA; anche senza la garanzia implicita di \ -COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Leggere la GNU \ -Lesser General Public License per maggiori dettagli." -} diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc index 10c23e0c687..396368c3af6 100644 --- a/programs/clock/Ja.rc +++ b/programs/clock/Ja.rc @@ -42,8 +42,6 @@ MAIN_MENU MENU MENUITEM "常に手前に表示(&A)", IDM_ONTOP } POPUP "情報(&O)" { - MENUITEM "ライセンス(&L)...", IDM_LICENSE - MENUITEM "無保証(&N)...", IDM_NOWARRANTY MENUITEM "時計について(&A)...", IDM_ABOUT } } @@ -52,27 +50,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "時計" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -{ -IDS_LICENSE_CAPTION, "ライセンス" -IDS_LICENSE, -"This program 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 program 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 program; 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 program 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/clock/Ko.rc b/programs/clock/Ko.rc index e3ea83ad779..27d39109a6a 100644 --- a/programs/clock/Ko.rc +++ b/programs/clock/Ko.rc @@ -40,8 +40,6 @@ MAIN_MENU MENU MENUITEM "׻ տ (&A)", IDM_ONTOP } POPUP "(&O)" { - MENUITEM "̼(&L)...", IDM_LICENSE - MENUITEM " (&N)...", IDM_NOWARRANTY MENUITEM "ð (&A)...", IDM_ABOUT } } @@ -50,27 +48,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "ð" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -{ -IDS_LICENSE_CAPTION, "̼" -IDS_LICENSE, -"This program 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 program 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 program; 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 program 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/clock/Lt.rc b/programs/clock/Lt.rc index e516f4acb6b..63e4d1ba497 100644 --- a/programs/clock/Lt.rc +++ b/programs/clock/Lt.rc @@ -41,8 +41,6 @@ MAIN_MENU MENU MENUITEM "&Visada viršuje", IDM_ONTOP } POPUP "&Informacija" { - MENUITEM "&Licencija...", IDM_LICENSE - MENUITEM "JOKIŲ &GARANTIJŲ...", IDM_NOWARRANTY MENUITEM "&Apie laikrodį...", IDM_ABOUT } } @@ -51,29 +49,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Laikrodis" } - -STRINGTABLE DISCARDABLE -{ -IDS_LICENSE_CAPTION, "LICENCIJA" -IDS_LICENSE, -"Ši programa yra laisva programinė įranga; galite ją platinti ir/ar \ -modifikuoti GNU laisvosios bendrosios viešosios licencijos (LGPL) \ -sąlygomis, kurios paskelbtos Laisvosios programinės įrangos fondo \ -(FSF); 2.1-osios arba (Jūsų pasirinkimu) bet kurios vėlesnės \ -licencijos versijos sąlygomis.\n\ -Ši programa yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ \ -GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ -UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ -bendrojoje viešojoje licencijoje.\n\ -Jūs turėjote gauti GNU laisvosios bendrosios viešosios licencijos \ -kopiją kartu su Wine; jei negavote, rašykite adresu \ -Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, \ -Boston, MA 02110-1301, USA." - -IDS_WARRANTY_CAPTION, "JOKIŲ GARANTIJŲ" -IDS_WARRANTY, -"Ši programa yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ \ -GARANTIJŲ; net be numanomų PERKAMUMO ar TINKAMUMO KONKREČIAI \ -UŽDUOČIAI garantijų. Išsamią informaciją rasite GNU laisvojoje \ -bendrojoje viešojoje licencijoje." -} diff --git a/programs/clock/Nl.rc b/programs/clock/Nl.rc index 11c6e2dacac..082373dc282 100644 --- a/programs/clock/Nl.rc +++ b/programs/clock/Nl.rc @@ -38,37 +38,10 @@ MAIN_MENU MENU MENUITEM "&Altijd op de voorgrond", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licentie...", IDM_LICENSE - MENUITEM "&GEEN GARANTIE...", IDM_NOWARRANTY MENUITEM "&Over Klok...", IDM_ABOUT } } -STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LICENTIE" -IDS_LICENSE, -"Dit is vrij beschikbare software; u kunt dit verspreiden en/of \ -aanpassen onder de voorwaarden van de GNU Lesser General Public \ -License zoals gepubliceerd door de Free Software Foundation; zowel \ -versie 2.1 van de Licentie, of een latere versie.\n\ -Deze software wordt verspreid in de hoop dat het bruikbaar is, \ -maar ZONDER ENIGE GARANTIE; zonder zelfs een impliciete garantie van \ -VERKOOPBAARHEID of GESCHIKHEID VOOR PARTICULIERE DOELEINDEN. Zie de GNU \ -Lesser General Public License voor meer details.\n\ -U heeft een kopie van de GNU Lesser General Public \ -License ontvangen samen met dit programma; zoniet, schrijf dan naar de \ -Free Software Foundation, 51 Franklin St, Fifth Floor, \ -Boston, MA 02110-1301 USA" - -IDS_WARRANTY_CAPTION, "GEEN GARANTIE" -IDS_WARRANTY, -"Deze software wordt verspreid in de hoop dat het bruikbaar is, \ -maar ZONDER ENIGE GARANTIE; zonder zelfs een impliciete garantie van \ -VERKOOPBAARHEID of GESCHIKHEID VOOR PARTICULIERE DOELEINDEN. Zie de GNU \ -Lesser General Public License voor meer details." -} - STRINGTABLE DISCARDABLE { IDS_CLOCK, "Klok" diff --git a/programs/clock/No.rc b/programs/clock/No.rc index 9905ffb309c..09e52d21fea 100644 --- a/programs/clock/No.rc +++ b/programs/clock/No.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU MENUITEM "&Alltid verst", IDM_ONTOP } POPUP "Inf&ormasjon" { - MENUITEM "&Lisens...", IDM_LICENSE - MENUITEM "I&NGEN GARANTI...", IDM_NOWARRANTY MENUITEM "&Om Klokke...", IDM_ABOUT } } @@ -48,27 +46,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Klokke" } - -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 det hp at det er nyttig, \ -men UTEN ENHVER GARANTI; ikke engang 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 eksempal 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 det hp at det er nyttig, \ -men UTEN ENHVER GARANTI; ikke engang den uttrykte garantien for \ -HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORML. Se GNU \ -Lesser General Public License for flere detaljer." -} diff --git a/programs/clock/Pl.rc b/programs/clock/Pl.rc index bd44d4afff3..43e7af6d287 100644 --- a/programs/clock/Pl.rc +++ b/programs/clock/Pl.rc @@ -40,8 +40,6 @@ MAIN_MENU MENU MENUITEM "&Zawsze na wierzchu", IDM_ONTOP } POPUP "In&fo" { - MENUITEM "&Licencja...", IDM_LICENSE - MENUITEM "&BEZ GWARANCJI...", IDM_NOWARRANTY MENUITEM "&O zegarze...", IDM_ABOUT } } @@ -50,28 +48,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Zegar" } - - -STRINGTABLE DISCARDABLE -{ -IDS_LICENSE_CAPTION, "LICENCJA" -IDS_LICENSE, -"This program 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 program 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 program; 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 program 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/clock/Pt.rc b/programs/clock/Pt.rc index 1e64342209f..eb665cd6d52 100644 --- a/programs/clock/Pt.rc +++ b/programs/clock/Pt.rc @@ -44,8 +44,6 @@ MAIN_MENU MENU MENUITEM "&Sempre visível", IDM_ONTOP } POPUP "&Informações" { - MENUITEM "&Licença...", IDM_LICENSE - MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Sobre Clock...", IDM_ABOUT } } @@ -68,8 +66,6 @@ MAIN_MENU MENU MENUITEM "&Sempre visível", IDM_ONTOP } POPUP "&Informações" { - MENUITEM "&Licença...", IDM_LICENSE - MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Acerca do Clock...", IDM_ABOUT } } @@ -81,27 +77,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Relógio" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -{ -IDS_LICENSE_CAPTION, "Licença do Wine" -IDS_LICENSE, -"O Wine é software livre; você pode redistribuí-lo e/ou \ -modificá-lo sob os termos da GNU Lesser General Public \ -License tal como publicado pela Free Software Foundation; seja a \ -versão 2.1 da Licença, ou (por sua escolha) outra versão mais recente.\n\n\ -O Wine é distribuído na esperança que seja útil, \ -mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ -MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ -Lesser General Public License para mais detalhes.\n\n\ -Deverá ter recebido uma cópia da GNU Lesser General Public \ -License com o Wine; se não, escreva à Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." - -IDS_WARRANTY_CAPTION, "SEM GARANTIA" -IDS_WARRANTY, -"O Wine é distribuído na esperança que seja útil, \ -mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ -MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ -Lesser General Public License para mais detalhes." -} diff --git a/programs/clock/Ro.rc b/programs/clock/Ro.rc index a7023280c3c..ca8cd9f8aaa 100644 --- a/programs/clock/Ro.rc +++ b/programs/clock/Ro.rc @@ -40,8 +40,6 @@ MAIN_MENU MENU MENUITEM "T&otdeauna deasupra", IDM_ONTOP } POPUP "Inf&ormații" { - MENUITEM "&Licența...", IDM_LICENSE - MENUITEM "&FĂRĂ GARANȚIE...", IDM_NOWARRANTY MENUITEM "&Despre ceas...", IDM_ABOUT } } @@ -50,27 +48,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Ceas" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LICENȚĂ" -IDS_LICENSE, -"This program 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 program 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 program; if not, write to the Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" - -IDS_WARRANTY_CAPTION, "FĂRĂ GARANȚIE" -IDS_WARRANTY, -"This program 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/clock/Ru.rc b/programs/clock/Ru.rc index 71bd67fdf54..cde2ed2d19e 100644 --- a/programs/clock/Ru.rc +++ b/programs/clock/Ru.rc @@ -41,8 +41,6 @@ MAIN_MENU MENU MENUITEM "&Поверх всех", IDM_ONTOP } POPUP "&Сведения" { - MENUITEM "&Лицензия...", IDM_LICENSE - MENUITEM "&БЕЗ ГАРАНТИЙ...", IDM_NOWARRANTY MENUITEM "&О программе...", IDM_ABOUT } } diff --git a/programs/clock/Si.rc b/programs/clock/Si.rc index 0e4c28b23d8..f49f5180525 100644 --- a/programs/clock/Si.rc +++ b/programs/clock/Si.rc @@ -40,8 +40,6 @@ MAIN_MENU MENU MENUITEM "&Vedno na vrhu", IDM_ONTOP } POPUP "Inf&ormacije" { - MENUITEM "&Licenčna pogodba ...", IDM_LICENSE - MENUITEM "&BREZ GARANCIJE ...", IDM_NOWARRANTY MENUITEM "&O Uri ...", IDM_ABOUT } } @@ -50,27 +48,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Ura" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -{ -IDS_LICENSE_CAPTION, "LICENČNA POGODBA" -IDS_LICENSE, -"This program 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 program 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 program; if not, write to the Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" - -IDS_WARRANTY_CAPTION, "BREZ GARANCIJE" -IDS_WARRANTY, -"This program 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/clock/Sk.rc b/programs/clock/Sk.rc index b3ba3121eb0..6ddfc1b6254 100644 --- a/programs/clock/Sk.rc +++ b/programs/clock/Sk.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT MENUITEM "&Vdy na vrchu", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licencia...", IDM_LICENSE - MENUITEM "&BEZ ZRUKY...", IDM_NOWARRANTY MENUITEM "&O hodinch...", IDM_ABOUT } } diff --git a/programs/clock/Sv.rc b/programs/clock/Sv.rc index 33d801489b8..7238878808b 100644 --- a/programs/clock/Sv.rc +++ b/programs/clock/Sv.rc @@ -40,8 +40,6 @@ MAIN_MENU MENU MENUITEM "&Alltid överst", IDM_ONTOP } POPUP "Inf&o" { - MENUITEM "&Licens...", IDM_LICENSE - MENUITEM "&INGEN GARANTI...", IDM_NOWARRANTY MENUITEM "&Om Klocka...", IDM_ABOUT } } @@ -50,27 +48,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Klocka" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -{ -IDS_LICENSE_CAPTION, "LICENS" -IDS_LICENSE, -"Detta program är fri programvara. Du kan distribuera det och/eller modifiera \ -det under villkoren i GNU Lesser General Public License, publicerad \ -av Free Software Foundation, antingen version 2.1 eller (om du så vill) \ -någon senare version. Detta program distribueras i hopp om att det ska \ -vara användbart,men UTAN NÅGON SOM HELST GARANTI, även utan \ -underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT \ -SPECIELLT ÄNDAMÅL. Se GNU Lesser General Public License för ytterligare \ -information.\n\ -Du bör ha fått en kopia av GNU Lesser General Public License tillsammans \ -med detta program. Om inte, skriv till Free Software Foundation, \ -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" - -IDS_WARRANTY_CAPTION, "INGEN GARANTI" -IDS_WARRANTY, -"Detta program distribueras i hopp om att det ska vara användbart, \ -men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti \ -om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. \ -Se GNU Lesser General Public License för ytterligare information." -} diff --git a/programs/clock/Th.rc b/programs/clock/Th.rc index 11144b93bfc..3a7b67bdd0c 100644 --- a/programs/clock/Th.rc +++ b/programs/clock/Th.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU MENUITEM "ٺش", IDM_ONTOP } POPUP "´" { - MENUITEM "͹حҵ...", IDM_LICENSE - MENUITEM " WARRANTY...", IDM_NOWARRANTY MENUITEM "ǡѺԡ...", IDM_ABOUT } } diff --git a/programs/clock/Tr.rc b/programs/clock/Tr.rc index 0c514aa6b40..115fbf32e81 100644 --- a/programs/clock/Tr.rc +++ b/programs/clock/Tr.rc @@ -38,8 +38,6 @@ MAIN_MENU MENU MENUITEM "&Her zaman stte", IDM_ONTOP } POPUP "B&ilgi" { - MENUITEM "&Lisans...", IDM_LICENSE - MENUITEM "&GARANT YOK...", IDM_NOWARRANTY MENUITEM "&Saat Hakknda...", IDM_ABOUT } } @@ -48,27 +46,3 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Saat" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -{ -IDS_LICENSE_CAPTION, "LSANS" -IDS_LICENSE, -"This program 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 program 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 program; 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 program 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/clock/Wa.rc b/programs/clock/Wa.rc index 48b006d901f..06f0acc9993 100644 --- a/programs/clock/Wa.rc +++ b/programs/clock/Wa.rc @@ -43,8 +43,6 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT MENUITEM "Todi &Visibe", IDM_ONTOP } POPUP "&Informcion" { - MENUITEM "&Licinse...", IDM_LICENSE - MENUITEM "&NOLE WARANTEYE...", IDM_NOWARRANTY MENUITEM " &dfait di l' rlodje...", IDM_ABOUT } } diff --git a/programs/clock/Zh.rc b/programs/clock/Zh.rc index 2750e57c13b..c6488601c10 100644 --- a/programs/clock/Zh.rc +++ b/programs/clock/Zh.rc @@ -42,8 +42,6 @@ MAIN_MENU MENU MENUITEM "总是在最前面(&A)", IDM_ONTOP } POPUP "资料信息(&O)" { - MENUITEM "用户许可协议(&L)...", IDM_LICENSE - MENUITEM "责任无关(&N)...", IDM_NOWARRANTY MENUITEM "关于 Wine(&A)...", IDM_ABOUT } } @@ -71,8 +69,6 @@ MAIN_MENU MENU MENUITEM "總是在最上面(&A)", IDM_ONTOP } POPUP "資料資訊(&O)" { - MENUITEM "用戶許可協議(&L)...", IDM_LICENSE - MENUITEM "責任無關(&N)...", IDM_NOWARRANTY MENUITEM "關於 Wine(&A)...", IDM_ABOUT } } diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index 614efc46334..b7abf1c35d3 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -26,15 +26,8 @@ #define IDM_SECONDS 0x105 #define IDM_DATE 0x106 -#define IDM_LICENSE 0x110 -#define IDM_NOWARRANTY 0x111 -#define IDM_ABOUT 0x112 +#define IDM_ABOUT 0x110 #define IDM_ONTOP 0x113 #define IDS_CLOCK 0x10C - -#define IDS_LICENSE_CAPTION 0x120 -#define IDS_LICENSE 0x121 -#define IDS_WARRANTY_CAPTION 0x122 -#define IDS_WARRANTY 0x123 diff --git a/programs/clock/main.c b/programs/clock/main.c index 752c93bf14b..bbbb69121b5 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -36,22 +36,6 @@ CLOCK_GLOBALS Globals; -static VOID WineLicense(HWND Wnd) -{ - WCHAR cap[20], text[1024]; - LoadStringW(Globals.hInstance, IDS_LICENSE, text, sizeof(text)/sizeof(WCHAR)); - LoadStringW(Globals.hInstance, IDS_LICENSE_CAPTION, cap, sizeof(cap)/sizeof(WCHAR)); - MessageBoxW(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); -} - -static VOID WineWarranty(HWND Wnd) -{ - WCHAR cap[20], text[1024]; - LoadStringW(Globals.hInstance, IDS_WARRANTY, text, sizeof(text)/sizeof(WCHAR)); - LoadStringW(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, sizeof(cap)/sizeof(WCHAR)); - MessageBoxW(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); -} - static VOID CLOCK_UpdateMenuCheckmarks(VOID) { HMENU hPropertiesMenu; @@ -267,16 +251,6 @@ static int CLOCK_MenuCommand (WPARAM wParam) CLOCK_UpdateMenuCheckmarks(); CLOCK_UpdateWindowCaption(); break; - } - /* show license */ - case IDM_LICENSE: { - WineLicense(Globals.hMainWnd); - break; - } - /* show warranties */ - case IDM_NOWARRANTY: { - WineWarranty(Globals.hMainWnd); - break; } /* show "about" box */ case IDM_ABOUT: {