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

[Hans Arthur Kielland Aanesen]

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

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

commit 519fb1f86231a228d41052e781917ae8b21bc923
Merge: c06c070 2d2c7e9
Author: hans-debian <hans at eprforum.no>
Date:   Sun Mar 30 18:42:10 2014 +0200

    Conflict resolved
    Merge branch 'master' of git+ssh://git.debian.org/git/debian-edu/debian-edu-doc
    
    Conflicts:
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po

 .../debian-edu-wheezy-manual.nb.po                 | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --cc documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 0450de2,4eaa09c..24d13da
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@@ -5,14 -5,14 +5,15 @@@
  # Ole-Anders Andreassen <olea at skolelinux.no>, 2010.
  # Jan Roar Roed <janroed at gmail.com>, 2010.
  # Petter Reinholdtsen <pere at hungry.com>, 2012.
 +# Hans Arthur Kielland Aanesen <hans at eprforum.no>, 2014.
+ # Ingrid Yrvin <iyrvin at hagan.no>, 2014.
  msgid ""
  msgstr ""
  "Project-Id-Version: release-manual.nb\n"
  "POT-Creation-Date: 2013-10-27 12:10-0400\n"
 -"PO-Revision-Date: 2014-03-30 18:06+0200\n"
 -"Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 +"PO-Revision-Date: 2014-03-30 18:25+0200\n"
 +"Last-Translator: Hans Arthur Kielland Aanesen <hans at eprforum.no>\n"
- "Language-Team: Norwegian Bokmål <kde-i18n-doc at kde.org>\n"
+ "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
  "Language: nb\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"

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