summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2009-09-04 07:36:26 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2009-09-04 07:36:26 +0000
commit8f4ac0bf097ccad9588e9fa4c035ae781f395a52 (patch)
tree511e28a2819e7749410a8f81feb35c7a6ab666f7
parent6e8af28a99925cb436ae068f059f726453034bea (diff)
downloadneon-8f4ac0bf097ccad9588e9fa4c035ae781f395a52.tar.gz
Merge r1722 from trunk:
* Makefile.in, README: Collect copyright notices from po/*. * po/: Update copyright notices. git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.29.x@1723 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--Makefile.in4
-rw-r--r--README6
-rw-r--r--po/de.po2
-rw-r--r--po/fr.po3
-rw-r--r--po/ja.po2
-rw-r--r--po/ru.po2
6 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 0042435..c01f695 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,8 +206,8 @@ compile-gmo:
update-copyright: Makefile
sed -n '/^Copyright/q;p' < README > README.orig
- (cat README.orig; grep -h Copyright src/*.[ch] \
- | sed -r 's/\(C\) [12].+[0-9],? /(C) /;s/^ *//;s/ *$$//;/Orton/d' | sort -u) > README
+ (cat README.orig; grep -h Copyright src/*.[ch] po/*.po macros/*.m4 \
+ | sed -r 's/\(C\) [12].+[0-9],? /(C) /;s/^\#//;s/^dnl//;s/[ ]*//;s/ *$$//;/Orton/d' | sort -u) > README
doc-status:
@echo -n "Missing docs for:"
diff --git a/README b/README
index 7690db0..24bae4a 100644
--- a/README
+++ b/README
@@ -41,11 +41,17 @@ restrictive license, see each file for details.
neon is Copyright (C) 1999-2008 Joe Orton <joe@manyfish.co.uk>
Portions are:
Copyright (C) Aleix Conchillo Flaque <aleix@member.fsf.org>
+Copyright (C) Arfrever Frehtes Taifersar Arahesis
Copyright (C) Arun Garg <arung@pspl.co.in>
Copyright (C) Daniel Stenberg <daniel@haxx.se>
Copyright (C) Free Software Foundation, Inc.
Copyright (C) Henrik Holst <henrik.holst2@gmail.com>
Copyright (C) Jiang Lei <tristone@deluxe.ocn.ne.jp>
Copyright (C) Kai Sommerfeld <kso@openoffice.org>
+Copyright (C) Karl Ove Hufthammer.
+Copyright (C) Michael Sobolev
+Copyright (C) Nobuyuki Tsuchimura <tutimura@nn.iij4u.or.jp>
+Copyright (C) Sylvain Glaize <mokona@puupuu.org>
+Copyright (C) Thomas Schultz <tststs@gmx.de>
Copyright (C) Vladimir Berezniker @ http://public.xdi.org/=vmpn
Copyright (C) Yves Martin <ymartin59@free.fr>
diff --git a/po/de.po b/po/de.po
index d84ec21..37db59a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,5 @@
# The German translation for sitecopy.
-# Thomas Schultz <tststs@gmx.de>, 2000.
+# Copyright (C) 2000, Thomas Schultz <tststs@gmx.de>
#
msgid ""
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index dc515bf..b63cbdd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright (C) 2000 Sylvain Glaize <mokona@puupuu.org>
#
#, fuzzy
msgid ""
diff --git a/po/ja.po b/po/ja.po
index 7ac0a1c..e58de60 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
# The Japanese translation for sitecopy
-# Nobuyuki Tsuchimura <tutimura@nn.iij4u.or.jp>, 2000.
+# Copyright (C) 2000 Nobuyuki Tsuchimura <tutimura@nn.iij4u.or.jp>
#
#, fuzzy
msgid ""
diff --git a/po/ru.po b/po/ru.po
index 2b2d40e..1756c07 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) Michael Sobolev, 1999
+# Copyright (C) 1999 Michael Sobolev
#
#, fuzzy
msgid ""