[debian-edu-commits] debian-edu/ 07/30: Translated using Weblate (Norwegian Bokmål)

[Petter Reinholdtsen]

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

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

commit 471686697d36f52a4607515068eddaa697443ce1
Author: Petter Reinholdtsen <pere-weblate at hungry.com>
Date:   Mon Jan 23 22:15:58 2017 +0000

    Translated using Weblate (Norwegian Bokmål)
    
    Currently translated at 97.6% (1501 of 1537 strings)
---
 documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 7e19e82..0e662ab 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,9 +21,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2017-01-20 12:40+0000\n"
 "PO-Revision-Date: 2017-01-23 09:39+0000\n"
 "Last-Translator: Ole-Erik Yrvin <oeyrvin at gmail.com>\n"
+=======
+"POT-Creation-Date: 2016-12-16 15:09+0100\n"
+"PO-Revision-Date: 2017-01-23 22:15+0000\n"
+"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
+>>>>>>> 2d3b606... Translated using Weblate (Norwegian Bokmål)
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
 "edu-documentation/debian-edu-stretch/nb/>\n"
 "Language: nb\n"
@@ -12561,7 +12567,7 @@ msgstr "Basert på Debian 3.0 Woody, gitt ut 2002-07-19."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "Linux kernel version 2.4.26."
-msgstr "Linux kjerneversjon 2.4.26"
+msgstr "Linux kjerneversjon 2.4.26."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 msgid "XFree86 version 4.1."

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