[PATCH STABLE] update copyright year to 2011
Pascal Quantin
pascal.quantin at gmail.com
Sun Jan 2 11:48:17 CST 2011
# HG changeset patch
# User Pascal Quantin <pascal.quantin at gmail.com>
# Date 1293989461 -3600
# Branch stable
# Node ID e27b064cef609d63526727624275006c09a21095
# Parent e5c2338d76b5ab9f0925c6982b9ebb5fcecdb302
update copyright year to 2011
diff --git a/contrib/setup3k.py b/contrib/setup3k.py
--- a/contrib/setup3k.py
+++ b/contrib/setup3k.py
@@ -343,7 +343,7 @@
if py2exeloaded:
extra['console'] = [
{'script':'hg',
- 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others',
+ 'copyright':'Copyright (C) 2005-2011 Matt Mackall and others',
'product_version':version}]
if os.name == 'nt':
diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -140,7 +140,7 @@
</p>
<p>
- Mercurial is Copyright 2005-2010 Matt Mackall and others. See
+ Mercurial is Copyright 2005-2011 Matt Mackall and others. See
the <tt>Contributors.txt</tt> file for a list of contributors.
</p>
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -21,7 +21,7 @@
#endif
[Setup]
-AppCopyright=Copyright 2005-2010 Matt Mackall and others
+AppCopyright=Copyright 2005-2011 Matt Mackall and others
AppName=Mercurial
#if ARCH == "x64"
AppVerName=Mercurial {#VERSION} (64-bit)
@@ -44,7 +44,7 @@
DefaultDirName={pf}\Mercurial
SourceDir=..\..
VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
-VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others
+VersionInfoCopyright=Copyright 2005-2011 Matt Mackall and others
VersionInfoCompany=Matt Mackall and others
InternalCompressLevel=max
SolidCompression=true
diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf
index 3418a971bda38b613fc6ffc74c9652fc026dad40..0b217d2fd5cd7abbe11102438edd4b44cee8c96a
GIT binary patch
literal 1755
zc$|$@-*4MC5Z-fv{tt(~tQ}lOQsRfsPi_%6#u6v69TW!mLQ9l&3q>j<Wy3K1zweHc
z7Y_rv0RdxK$NPTVNBSsSC{rPg$GGIpHqAzvC{$S{ylQE-X_DO>MQKe48%-Y)Q5w{u
z%q!`<3JI*RRvzYR4+~pMGd`W(zdMTDYU^kRjD=H0BDPK`lZcIORW=%pW6f`3tBi6o
zSO*Wj4648Yqv1_D%;;~Fd>Nm_4%PkzO>raIJQa;}h0r)kGvVUub#{}`TDLl+;`L9_
zQNF&8M17XPgK~N6P-+mr$}f;5$>?*Iq$xbe5NOF?q}Cu!0X9_1dB%AE?rrVx(ukJ|
zFR8)5P%l8xLrGG>+cNB>Q)4*T7IJBTY(O6zZrY%Lgc9Tx39oH|<$=FwO`#kR2?)y7
z9&8yOzR#cGd-O at eQ@hca!#(E8cm>i!!{7Ky6|gzP at +qS)dvusu>M8?TGX{k$5OySz
zo*_E}^xXzPY(C1sgdNz1H+>?O2hcLS?HhL1tY~B7?AA$Q%1CeG3P2MZSGFN76}6<N
z1MHEE-Y96jDqB4Os)Zl3)!pOs3MTV4{Fp2jllf{rrpi!RdaHJ->x6Zqks6aGCrvmo
z^@rQVw>zqze4X9TR%>QIovr4#%Oy-77chaR$znD8_Iy8Cz|-^M>2Z16bDtS7Ha2I|
zwep^Z^V*{8T$Bxg<#MAHDc^Hn$>}X1SXQ=o7|?7xIc!gEn}fq`6-cnA5k at 2VMGO=W
zBoW?M7HWAokGmiKKQa+6EFG{>8Y2mU<qVZnU&vZ+6}?51>$YGT4AdPXveY*!NB%(X
zu^@ev8QPXxn(u2%&m7Ud2~7<>cVMUcD9~uQ9*x|fMxssF{M{ur`1l6SBQ!P;(;7qP
zkhVTXmr^GoQl|eK#nn!6!ec&UPUnSU#TC4R==jzLiKd$Y3$}b1&=t`^qzbkbN{PCq
zy!DL#W<}5xx7d^8b2)&%<kO%F6qbaQSN*iO>*b&-I#e6Ft3Vbz^u*>2L at cp)#r7R~
zC;M0}mHMv(TgC&=r$v!gecrhywVo2M3xeM%GAdWNBWxMN^?z;xZDS-!IC<vJn#U}b
z1~iDNjZym99Wj8J$%g|NrBou#i>A0Q0~J$)DVEfHs;#Aff3-ev`NIT~EKQTo>2;D0
z;CVUe710j`DqZj$Uuueq568Rp)9vDZHva=YR3S9KUtQJbTXX1 at RtEE7ZtD-H(~<W$
auftKaTI6L4KihCRoz9nihfTjNzx)N5lxK+m
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -94,7 +94,7 @@
Copying
-------
-Copyright (C) 2005-2010 Matt Mackall.
+Copyright (C) 2005-2011 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
diff --git a/doc/hgignore.5.txt b/doc/hgignore.5.txt
--- a/doc/hgignore.5.txt
+++ b/doc/hgignore.5.txt
@@ -104,7 +104,7 @@
Copying
-------
This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005-2010 Matt Mackall.
+Mercurial is copyright 2005-2011 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -1092,7 +1092,7 @@
Copying
-------
This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2010 Matt Mackall.
+Mercurial is copyright 2005-2011 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
diff --git a/i18n/da.po b/i18n/da.po
--- a/i18n/da.po
+++ b/i18n/da.po
@@ -9006,11 +9006,11 @@
msgstr "(se http://mercurial.selenic.com for mere information)"
msgid ""
-"Copyright (C) 2005-2010 Matt Mackall and others\n"
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Copyright (C) 2005-2010 Matt Mackall og andre\n"
+"Copyright (C) 2005-2011 Matt Mackall og andre\n"
"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n"
"gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n"
"NOGET BESTEMT FORMÅL.\n"
diff --git a/i18n/de.po b/i18n/de.po
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -11305,12 +11305,12 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> und andere\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> und andere\n"
"Dies ist freie Software; siehe Quellen für Kopierbestimmungen. Es besteht\n"
"KEINE Gewährleistung für das Programm, nicht einmal der Marktreife oder der\n"
"Verwendbarkeit für einen bestimmten Zweck.\n"
diff --git a/i18n/el.po b/i18n/el.po
--- a/i18n/el.po
+++ b/i18n/el.po
@@ -12742,7 +12742,7 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
diff --git a/i18n/fr.po b/i18n/fr.po
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -9439,7 +9439,7 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
diff --git a/i18n/it.po b/i18n/it.po
--- a/i18n/it.po
+++ b/i18n/it.po
@@ -8724,12 +8724,12 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> e altri\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> e altri\n"
"Questo è software libero; vedere i sorgenti per le condizioni di copia.\n"
"Non c'è alcuna garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n"
"SCOPO PARTICOLARE.\n"
diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -9464,11 +9464,11 @@
msgstr "(詳細は http://mercurial.selenic.com を参照のこと)"
msgid ""
-"Copyright (C) 2005-2010 Matt Mackall and others\n"
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Copyright (C) 2005-2010 Matt Mackall 他\n"
+"Copyright (C) 2005-2011 Matt Mackall 他\n"
"本製品はフリーソフトウェアです。\n"
"頒布条件に関しては同梱されるライセンス条項をお読みください。\n"
"市場適合性や特定用途への可否を含め、 本製品は無保証です。\n"
diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
@@ -10350,11 +10350,11 @@
msgstr "(veja http://mercurial.selenic.com para mais informações)"
msgid ""
-"Copyright (C) 2005-2010 Matt Mackall and others\n"
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Copyright (C) 2005-2010 Matt Mackall e outros\n"
+"Copyright (C) 2005-2011 Matt Mackall e outros\n"
"Este software é livre; veja os fontes para condições de cópia. Não\n"
"há garantias, nem mesmo de adequação para qualquer propósito em\n"
"particular.\n"
diff --git a/i18n/ro.po b/i18n/ro.po
--- a/i18n/ro.po
+++ b/i18n/ro.po
@@ -8381,12 +8381,12 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> și alții\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> și alții\n"
"Acesta este software liber; vezi sursa pentru condițiile de copiere.\n"
"Nu există NICIO garanție; nici măcar pentru COMERCIALIZARE sau\n"
"COMPATIBILITATE ÎN ANUMITE SCOPURI.\n"
diff --git a/i18n/sv.po b/i18n/sv.po
--- a/i18n/sv.po
+++ b/i18n/sv.po
@@ -8869,11 +8869,11 @@
msgstr "(se http://mercurial.selenic.com för mer information)"
msgid ""
-"Copyright (C) 2005-2010 Matt Mackall and others\n"
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Copyright (C) 2005-2010 Matt Mackall och andra\n"
+"Copyright (C) 2005-2011 Matt Mackall och andra\n"
"Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
"garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po
--- a/i18n/zh_CN.po
+++ b/i18n/zh_CN.po
@@ -7511,12 +7511,12 @@
msgid ""
"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm at selenic.com> and others\n"
+"Copyright (C) 2005-2011 Matt Mackall <mpm at selenic.com> and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
"\n"
-"版权所有 (C) 2005-2010 Matt Mackall <mpm at selenic.com> 和其他人。\n"
+"版权所有 (C) 2005-2011 Matt Mackall <mpm at selenic.com> 和其他人。\n"
"这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n"
"特定目的的隐含的担保。\n"
diff --git a/i18n/zh_TW.po b/i18n/zh_TW.po
--- a/i18n/zh_TW.po
+++ b/i18n/zh_TW.po
@@ -8192,7 +8192,7 @@
msgstr "\tSee 'hg help urls' for more information."
msgid ""
-"Copyright (C) 2005-2010 Matt Mackall and others\n"
+"Copyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3901,7 +3901,7 @@
% util.version())
ui.status(_(
"(see http://mercurial.selenic.com for more information)\n"
- "\nCopyright (C) 2005-2010 Matt Mackall and others\n"
+ "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. "
"There is NO\nwarranty; "
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -361,7 +361,7 @@
if py2exeloaded:
extra['console'] = [
{'script':'hg',
- 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others',
+ 'copyright':'Copyright (C) 2005-2011 Matt Mackall and others',
'product_version':version}]
if os.name == 'nt':
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -196,7 +196,7 @@
Mercurial Distributed SCM (version *) (glob)
(see http://mercurial.selenic.com for more information)
- Copyright (C) 2005-2010 Matt Mackall and others
+ Copyright (C) 2005-2011 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -349,7 +349,7 @@
Mercurial Distributed SCM (version *) (glob)
(see http://mercurial.selenic.com for more information)
- Copyright (C) 2005-2010 Matt Mackall and others
+ Copyright (C) 2005-2011 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
More information about the Mercurial-devel
mailing list