diff options
author | Guillem Jover <guillem@debian.org> | 2010-03-11 08:22:32 +0100 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2010-03-12 00:34:02 +0100 |
commit | eb4155377e4e41a4d420712dfc91c57578d5170f (patch) | |
tree | 0531017331f9c7d7c4bdb5c5f7751b9dcf404ea5 | |
parent | 744f0bd2396bb345e4c975134dac50c1bd8c969c (diff) | |
download | dpkg-eb4155377e4e41a4d420712dfc91c57578d5170f.tar.gz |
Use License instead of Licence in strings
This removes almost duplicate strings for translation.
35 files changed, 39 insertions, 39 deletions
diff --git a/debian/copyright b/debian/copyright index 46bcce493..fe99a6079 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,7 +43,7 @@ Includes code from ‘getopt’ and ‘gettext’: Copyright © 1984-2002 Free Software Foundation, Inc. -Licence: +License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/dselect/po/cs.po b/dselect/po/cs.po index 0d6488e73..55ec81846 100644 --- a/dselect/po/cs.po +++ b/dselect/po/cs.po @@ -826,7 +826,7 @@ msgid "" "later for copying conditions. There is NO warranty.\n" msgstr "" "Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n" -"v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n" +"v Obecné veřejné licenci GNU (GNU General Public License) verze 2 nebo\n" "pozdější. Toto programové vybavení je absolutně bez záruky.\n" "Více informací získáte použitím %s --licence.\n" diff --git a/dselect/po/el.po b/dselect/po/el.po index 2c0adc4f8..96ab2f2ea 100644 --- a/dselect/po/el.po +++ b/dselect/po/el.po @@ -864,7 +864,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence έκδοσης " +"Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public License έκδοσης " "2 ή\n" "μεταγενέστερης για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n" "Δείτε dpkg-deb --licence για λεπτομέρειες.\n" diff --git a/dselect/po/hu.po b/dselect/po/hu.po index 9d38bbd55..95a2b7136 100644 --- a/dselect/po/hu.po +++ b/dselect/po/hu.po @@ -680,7 +680,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Ez egy Szabad Szoftver; l. a GNU General Public Licence 2-es vagy nagyobb\n" +"Ez egy Szabad Szoftver; l. a GNU General Public License 2-es vagy nagyobb\n" "változatát a másolási feltételekért. NINCS garancia.\n" "L. a %s --licence opciót a szerzői jogi és licenc részletekért.\n" diff --git a/dselect/po/id.po b/dselect/po/id.po index 919b35bea..2470f5304 100644 --- a/dselect/po/id.po +++ b/dselect/po/id.po @@ -885,7 +885,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2 " +"Ini adalah perangkat lunak bebas; lihat GNU General Public License versi 2 " "atau \n" "selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n" "Lihat %s --license keterangan hak cipta dan rincian lisensi.\n" diff --git a/dselect/po/it.po b/dselect/po/it.po index e24fbfa8c..acbfe4dd4 100644 --- a/dselect/po/it.po +++ b/dselect/po/it.po @@ -902,7 +902,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Questo è software libero; si veda la GNU General Public Licence versione 2\n" +"Questo è software libero; si veda la GNU General Public License versione 2\n" "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n" "Si veda %s --license per il copyright e i dettagli della licenza.\n" diff --git a/dselect/po/nb.po b/dselect/po/nb.po index 535aa2e13..aeaea5460 100644 --- a/dselect/po/nb.po +++ b/dselect/po/nb.po @@ -830,7 +830,7 @@ msgid "" "later for copying conditions. There is NO warranty.\n" msgstr "" "Dette er fri programvare. Du finner kopieringsvilkårene i\n" -"GNU General Public Licence versjon 2 eller nyere. Det finnes INGEN garanti.\n" +"GNU General Public License versjon 2 eller nyere. Det finnes INGEN garanti.\n" "Se «%s --licence» for opphavsrett og lisensdetaljer.\n" #: dselect/main.cc:173 dselect/main.cc:221 diff --git a/dselect/po/nl.po b/dselect/po/nl.po index 7a32e843e..10bd5b9cb 100644 --- a/dselect/po/nl.po +++ b/dselect/po/nl.po @@ -847,7 +847,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Dit is vrije programmatuur; zie de GNU General Public Licence versie 2\n" +"Dit is vrije programmatuur; zie de GNU General Public License versie 2\n" "of later voor kopiëervoorwaarden. Er is GEEN garantie.\n" "Zie %s --license voor auteursrechten en licentiedetails.\n" diff --git a/dselect/po/nn.po b/dselect/po/nn.po index 61e6d7833..7905fa248 100644 --- a/dselect/po/nn.po +++ b/dselect/po/nn.po @@ -833,7 +833,7 @@ msgid "" "later for copying conditions. There is NO warranty.\n" msgstr "" "Dette er fri programvare. Du finn kopieringsvilkåra i\n" -"GNU General Public Licence versjon 2 eller nyare. Det finst INGEN garanti.\n" +"GNU General Public License versjon 2 eller nyare. Det finst INGEN garanti.\n" "Sjå «dpkg-deb --licence» for detaljar.\n" #: dselect/main.cc:173 dselect/main.cc:221 diff --git a/dselect/po/pt.po b/dselect/po/pt.po index 90756dad7..aa1cc63e1 100644 --- a/dselect/po/pt.po +++ b/dselect/po/pt.po @@ -837,7 +837,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Isto é software livre; veja a GNU General Public Licence versão 2 ou\n" +"Isto é software livre; veja a GNU General Public License versão 2 ou\n" "posterior para condições de cópia. Não existe NENHUMA garantia.\n" "Veja %s --license para detalhes de copyright e licença.\n" diff --git a/dselect/po/ro.po b/dselect/po/ro.po index 8c049062e..896b9eb78 100644 --- a/dselect/po/ro.po +++ b/dselect/po/ro.po @@ -873,7 +873,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Acesta este soft liber; vezi GNU General Public Licence versiunea 2 sau\n" +"Acesta este soft liber; vezi GNU General Public License versiunea 2 sau\n" "ulterioară pentru condițiile de copiere. NU există NICI o garanție.\n" "Vezi %s --licence pentru detalii de licențiere și condiții de copiere.\n" diff --git a/dselect/po/sk.po b/dselect/po/sk.po index 0a7e12ab4..697b70cb7 100644 --- a/dselect/po/sk.po +++ b/dselect/po/sk.po @@ -854,7 +854,7 @@ msgid "" "later for copying conditions. There is NO warranty.\n" msgstr "" "Toto je slobodný softvér; podrobnosti o pravidlách kopírovania\n" -"nájdete v GNU General Public Licence verzii 2 alebo neskoršej.\n" +"nájdete v GNU General Public License verzii 2 alebo neskoršej.\n" "Neposkytuje sa ŽIADNA záruka. Pomocou %s --licence získate\n" "podrobnosti o autorských právach a licencii.\n" diff --git a/dselect/po/tl.po b/dselect/po/tl.po index 517f2e5b3..301d94902 100644 --- a/dselect/po/tl.po +++ b/dselect/po/tl.po @@ -880,7 +880,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"Ito ay malayang software; basahin ang GNU General Public Licence bersyon 2 " +"Ito ay malayang software; basahin ang GNU General Public License bersyon 2 " "o\n" "mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n" "Basahin ang dpkg-deb --licence para sa detalye.\n" diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po index 1904baeb4..7985e6461 100644 --- a/dselect/po/zh_TW.po +++ b/dselect/po/zh_TW.po @@ -811,7 +811,7 @@ msgid "" "This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" -"這是自由軟體﹔要獲知復制該軟體的前提和條件,請參閱 GNU Public Licence \n" +"這是自由軟體﹔要獲知復制該軟體的前提和條件,請參閱 GNU Public License \n" "第二或更新的版本。該軟體【不】提供任何擔保。\n" "請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n" diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl index 4d6f3f07b..128e61cb6 100755 --- a/scripts/changelog/debian.pl +++ b/scripts/changelog/debian.pl @@ -37,7 +37,7 @@ sub version { Copyright (C) 1996 Ian Jackson. Copyright (C) 2005,2007 Frank Lichtenheld."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index 6e9079e72..09d413c7c 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -39,7 +39,7 @@ Copyright (C) 1999-2001 Marcus Brinkmann <brinkmd\@debian.org>. Copyright (C) 2004-2005 Scott James Remnant <scott\@netsplit.com>."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index e2f0c75d4..35cdc7f47 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -41,7 +41,7 @@ Copyright (C) 2000 Wichert Akkerman Copyright (C) 2007 Frank Lichtenheld"); print _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-distaddfile.pl b/scripts/dpkg-distaddfile.pl index 2da0f13c6..920b03593 100755 --- a/scripts/dpkg-distaddfile.pl +++ b/scripts/dpkg-distaddfile.pl @@ -36,7 +36,7 @@ sub version { Copyright (C) 1996 Ian Jackson."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl index e7872c4a3..949a215b2 100755 --- a/scripts/dpkg-divert.pl +++ b/scripts/dpkg-divert.pl @@ -35,8 +35,8 @@ sub version { Copyright (C) 1995 Ian Jackson. Copyright (C) 2000,2001 Wichert Akkerman."); - printf _g(" -This is free software; see the GNU General Public Licence version 2 or + printf "\n" . _g( +"This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index 4cfa864c9..ea23ab1d0 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -99,7 +99,7 @@ Copyright (C) 1996 Ian Jackson. Copyright (C) 2000,2001 Wichert Akkerman."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 7d61bd047..9105a4cad 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -60,7 +60,7 @@ Copyright (C) 1996 Ian Jackson. Copyright (C) 2000,2002 Wichert Akkerman."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl index e56747d7c..54da63599 100755 --- a/scripts/dpkg-gensymbols.pl +++ b/scripts/dpkg-gensymbols.pl @@ -53,7 +53,7 @@ Copyright (C) 2007 Raphael Hertzog. "); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl index 38137642e..2bf965ea6 100755 --- a/scripts/dpkg-parsechangelog.pl +++ b/scripts/dpkg-parsechangelog.pl @@ -35,7 +35,7 @@ Copyright (C) 1996 Ian Jackson. Copyright (C) 2001 Wichert Akkerman"); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 084fb48f8..554cae6c2 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -525,7 +525,7 @@ Copyright (C) 2007 Raphael Hertzog. "); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 307ce2c46..c2e37c9b8 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -400,7 +400,7 @@ Copyright (C) 1997 Klee Dienes Copyright (C) 2008 Raphael Hertzog"); print _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl index 19cf361a5..f59f4c633 100755 --- a/scripts/dpkg-vendor.pl +++ b/scripts/dpkg-vendor.pl @@ -34,7 +34,7 @@ sub version { Copyright (C) 2009 Raphael Hertzog <hertzog\@debian.org>."); printf _g(" -This is free software; see the GNU General Public Licence version 2 or +This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/scripts/po/ca.po b/scripts/po/ca.po index 2cac6d609..3cd3329fd 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -44,7 +44,7 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" diff --git a/scripts/po/de.po b/scripts/po/de.po index a06372b78..4cd7afb54 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -43,11 +43,11 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" -"Dies ist freie Software; lesen Sie die GNU General Public Licence Version 2\n" +"Dies ist freie Software; lesen Sie die GNU General Public License Version 2\n" "oder neuer fr die Kopierbedingungen. Es gibt KEINE Haftung.\n" #: scripts/dpkg-architecture.pl:49 diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot index 524b68948..a8674975c 100644 --- a/scripts/po/dpkg-dev.pot +++ b/scripts/po/dpkg-dev.pot @@ -42,7 +42,7 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 23842f38b..59f216c01 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -47,12 +47,12 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" "Ce logiciel est un logiciel libre. Voyez la licence « GNU General Public " -"Licence »\n" +"License »\n" "dans la version 2 ou une version supérieure pour les conditions de copie. Il " "n'y a PAS de garantie.\n" diff --git a/scripts/po/pl.po b/scripts/po/pl.po index 66b4f71a4..5bdd44930 100644 --- a/scripts/po/pl.po +++ b/scripts/po/pl.po @@ -46,7 +46,7 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" diff --git a/scripts/po/ru.po b/scripts/po/ru.po index dfcfa0c6e..883c684c0 100644 --- a/scripts/po/ru.po +++ b/scripts/po/ru.po @@ -46,7 +46,7 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" diff --git a/scripts/po/sv.po b/scripts/po/sv.po index 61d2c0424..229d89212 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.po @@ -44,7 +44,7 @@ msgstr "" #: scripts/dpkg-source.pl:402 scripts/changelog/debian.pl:39 msgid "" "\n" -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n" msgstr "" "\n" diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl index d511fb644..cdaac92f6 100755 --- a/scripts/update-alternatives.pl +++ b/scripts/update-alternatives.pl @@ -443,8 +443,8 @@ Copyright (C) 1995 Ian Jackson. Copyright (C) 2000-2002 Wichert Akkerman. Copyright (C) 2009 Raphael Hertzog."); - printf _g(" -This is free software; see the GNU General Public Licence version 2 or + printf "\n" . _g( +"This is free software; see the GNU General Public License version 2 or later for copying conditions. There is NO warranty. "); } diff --git a/src/statcmd.c b/src/statcmd.c index cd666049c..6f24c18e3 100644 --- a/src/statcmd.c +++ b/src/statcmd.c @@ -59,7 +59,7 @@ printversion(const struct cmdinfo *cip, const char *value) "Copyright (C) 2006-2009 Guillem Jover.\n")); printf(_( -"This is free software; see the GNU General Public Licence version 2 or\n" +"This is free software; see the GNU General Public License version 2 or\n" "later for copying conditions. There is NO warranty.\n")); m_output(stdout, _("<standard output>")); |