[debian-edu-commits] debian-edu/ 02/02: Merge branch 'master' of ssh://git.debian.org/git/debian-edu/debian-edu-doc

[Frans Spiesschaert]

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

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

commit 03d27a00cd22c0cd21dbdb365206f2624c8aec79
Merge: eedb92a d729f9f
Author: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
Date:   Sat Feb 14 22:10:30 2015 +0100

    Merge branch 'master' of ssh://git.debian.org/git/debian-edu/debian-edu-doc
    
    Conflicts:
    	documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po

 debian/copyright                                   |  5 ++-
 .../debian-edu-jessie-manual.da.po                 | 21 +++++++----
 .../debian-edu-jessie-manual.de.po                 | 44 ++++++++++++++--------
 .../debian-edu-jessie-manual.es.po                 | 21 +++++++----
 .../debian-edu-jessie-manual.fr.po                 | 40 ++++++++++++++++----
 .../debian-edu-jessie-manual.it.po                 | 34 +++++++++++++----
 .../debian-edu-jessie-manual.nb.po                 | 40 ++++++++++++++++----
 .../debian-edu-jessie-manual.nl.po                 | 43 ++++++++++++++++++---
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 21 +++++++----
 .../debian-edu-jessie/debian-edu-jessie-manual.xml |  8 ++--
 10 files changed, 208 insertions(+), 69 deletions(-)

diff --cc documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index 4c2b2d2,3622a48..4ec5b9a
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@@ -5,8 -5,8 +5,13 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: \n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2015-02-12 13:11+0000\n"
 +"PO-Revision-Date: 2015-02-14 21:30+0100\n"
++=======
+ "POT-Creation-Date: 2015-02-14 14:47+0000\n"
+ "PO-Revision-Date: 2015-01-26 18:20+0100\n"
++>>>>>>> d729f9ff23055415aef24e6712f67728dc0a05b1
  "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
  "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
  "Language: nl\n"
@@@ -10290,19 -10293,20 +10321,19 @@@ msgid "
  "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
  "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
  "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid Yrvin "
- "(2014) Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire "
- "Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff (2014) "
- "and is released under the GPL v2 or any later version."
+ "(2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
+ "FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and Ragnar Wisløff "
+ "(2014) and is released under the GPL v2 or any later version."
  msgstr ""
  "De auteursrechten van de vertaling naar het Bokmål berusten bij Petter "
 -"Reinholdtsen (2007, 2012, 2014), Håvard Korsvoll (2007-2009), Tore Skogly "
 -"(2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin "
 -"(2014), Ingrid Yrvin (2014), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
 -"(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) en Ragnar "
 -"Wisløff (2014). De vertaling is vrijgegeven onder de licentie GPL v2 of "
 -"enige latere versie."
 +"Reinholdtsen (2007, 2012, 2014, 2015), Håvard Korsvoll (2007-2009), Tore "
 +"Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-Erik "
 +"Yrvin (2014), Ingrid Yrvin (2014), Hans Arthur Kielland Aanesen (2014), Knut "
 +"Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) en "
 +"Ragnar Wisløff (2014). De vertaling is vrijgegeven onder de licentie GPL v2 "
 +"of enige latere versie."
  
  #. type: Content of: <article><section><para>
 -#, fuzzy
  #| msgid ""
  #| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
  #| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "

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