[debian-edu-commits] debian-edu/ 01/01: update README.common-translations.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-doc.

commit 4cbe3dfdb702f11b4fabe134f75a155114de725f
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Apr 30 17:33:50 2014 +0200

    update README.common-translations.
    
    scripts/get_copyright: reflect added Dutch franslation and wiki content change.
---
 debian/changelog                                             |  5 ++++-
 documentation/common/README.common-translations              |  8 ++++----
 .../README.debian-edu-wheezy-manual-translations             | 12 ++++++------
 documentation/scripts/get_copyright                          |  3 ++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9b5c23..41b40e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,15 @@ debian-edu-doc (1.5~XXX) UNRELEASED; urgency=medium
   * Update manuals and images from the wiki
   * Update German manual translations
   * README.common-translations: add hint to compress PO files that get
-    attached to bug reports.
+    attached to bug reports; replace http with https in URLs.
   * README: mention the Dutch translation among the complete ones.
   * Add a new debian-edu-doc-nl package for the Dutch translation.
   * control:
     - add texlive-lang-dutch to Build-Depends-Indep.
     - bump Standards-Version to 3.9.5.
+  * scripts/get_copyright: 
+    - add entry for Dutch.
+    - make translation string condition fit the wiki content.
 
   [ Frans Spiesschaert ]
   * Initial Dutch translation of the Debian Edu wheezy manual
diff --git a/documentation/common/README.common-translations b/documentation/common/README.common-translations
index 7a7d4c4..c8ae99d 100644
--- a/documentation/common/README.common-translations
+++ b/documentation/common/README.common-translations
@@ -90,14 +90,14 @@ $CC is your language. They will be picked up automatically.
 
 If you spot errors in the English version or see how it could be improved, 
 please do contribute to the English version too. Just edit the wiki at 
-##URL## - an user account 
+##URL## - a user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
 If you cannot commit your work to the VCS directly, please file a bug against
-the debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc. Compress
+the debian-edu-doc package, see https://bugs.debian.org/debian-edu-doc. Compress
 the PO file using gzip and attach the file to the bugreport. Instructions how
-to submit bugs are available at http://bugs.debian.org
+to submit bugs are available at https://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2013-04-26
+-- Holger Levsen, holger at debian.org, last updated: 2013-04-30
diff --git a/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations b/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
index e7b878f..4e4aa7f 100644
--- a/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
+++ b/documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations
@@ -90,14 +90,14 @@ $CC is your language. They will be picked up automatically.
 
 If you spot errors in the English version or see how it could be improved, 
 please do contribute to the English version too. Just edit the wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - an user account 
+https://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - a user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
-If you cannot commit your work to the VCS directly, please file a bug against the
-debian-edu-doc package, see http://bugs.debian.org/debian-edu-doc and attach 
-the PO file to the bugreport. Instructions how to submit bugs are available
-at http://bugs.debian.org
+If you cannot commit your work to the VCS directly, please file a bug against
+the debian-edu-doc package, see https://bugs.debian.org/debian-edu-doc. Compress
+the PO file using gzip and attach the file to the bugreport. Instructions how
+to submit bugs are available at https://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2013-02-08
+-- Holger Levsen, holger at debian.org, last updated: 2013-04-30
diff --git a/documentation/scripts/get_copyright b/documentation/scripts/get_copyright
index d12b3ab..1424fa8 100755
--- a/documentation/scripts/get_copyright
+++ b/documentation/scripts/get_copyright
@@ -27,6 +27,7 @@ my %langs = (
 	'French'	=> 'fr',
 	'Italian'	=> 'it',
 	'Bokmål'	=> 'nb',
+	'Dutch'		=> 'nl',
 	'Traditional Chinese'	=> 'zh'
 );
 
@@ -74,7 +75,7 @@ while(<FILE>){
 		$buffer .= "License: GPL-2+\n\n";
 	    }
 	}
-	elsif ($_ =~ m/The (.*?) translation is copyrighted by (.*?) and is released under the GPL2 or any later version\./){
+	elsif ($_ =~ m/The (.*?) translation is copyrighted by (.*?) and is released under the GPL v2 or any later version\./){
 	    if ($type eq 'dbk') {
 		$buffer .= "<!-- START $langs{$1} -->\n";
 		$buffer .= copyright($2);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git