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

[Ole-Erik Yrvin]

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

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

commit ec01bec4e29502c5c49de6983bc00e1f4c2815c6
Merge: b84d3f5 c166642
Author: Ole-Erik Yrvin <oeyrvin at hagan.no>
Date:   Sun May 11 18:01:51 2014 +0200

    Fikset konflikt
    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                 | 483 ++++++++++++++++++---
 1 file changed, 413 insertions(+), 70 deletions(-)

diff --cc documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index ee0058e,50fff4a..afe2d23
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@@ -8315,9 -8159,10 +8315,11 @@@ msgstr "START -> Kjør kommando
  #. type: Content of: <article><section><section><orderedlist><listitem><para>
  #, fuzzy
  msgid "enter \\\\TJENER and press return"
 -msgstr "skriv inn \\\\TJENER og  trykk på tilbaketasten (Return-tasten)"
 +msgstr "skriv \\\\TJENER og trykk retur"
 +
+ 
  #. type: Content of: <article><section><section><orderedlist><listitem><para>
+ #, fuzzy
  msgid ""
  "-> a Windows Explorer window should open and show the netlogon share on \\"
  "\\TJENER, and maybe printers you already have configured for printing under "

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