[debian-edu-commits] debian-edu/ 01/01: (de) Updated Jessie manual translation.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Tue Jun 14 12:27:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch jessie
in repository debian-edu-doc.
commit 9d6e61e00c0b54bf47742bfaa99f4cfabeb4794e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Tue Jun 14 14:20:51 2016 +0200
(de) Updated Jessie manual translation.
(cherry picked from commit 54722ac03ea83d99ee7d3e2d8354244c0b923840)
Conflicts:
documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
---
.../debian-edu-jessie-manual.de.po | 76 +++++-----------------
1 file changed, 16 insertions(+), 60 deletions(-)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index f4d9c4e..6167456 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,8 +16,13 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
"POT-Creation-Date: 2016-06-14 13:18+0200\n"
"PO-Revision-Date: 2016-05-23 13:50+0200\n"
+=======
+"POT-Creation-Date: 2016-06-14 13:12+0200\n"
+"PO-Revision-Date: 2016-06-14 14:06+0100\n"
+>>>>>>> 54722ac... (de) Updated Jessie manual translation.
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
"Language: de\n"
@@ -26,7 +31,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Attribute 'lang' of: <article>
msgid "en"
@@ -1475,12 +1480,6 @@ msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "USB-Stick / Blu-ray Disc ISO-Image für i386 und amd64"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Please note that internet access "
-#| "during installation is needed. Like the others it can be downloaded over "
-#| "FTP, HTTP or rsync via:"
msgid ""
"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
@@ -1488,7 +1487,7 @@ msgid ""
"FTP, HTTP or rsync via:"
msgstr ""
"Das für i386- und amd64-Prozessorarchitektur geeignete Multi-Arch-ISO-Image "
-"ist 5,2 GiB groß. Bitte beachten Sie, das während der Installation eine "
+"ist etwa 5 GiB groß. Bitte beachten Sie, das während der Installation eine "
"Internetverbindung erforderlich ist. Es kann folgendermaßen mittels FTP, "
"HTTP oder rsync heruntergeladen werden:"
@@ -1521,18 +1520,13 @@ msgid "Sources"
msgstr "Quellen"
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Sources are available from the Debian archive, see <ulink url=\"http://"
-#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
-#| "options."
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://"
"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
"Quellen können aus dem Debian-Archiv bezogen werden; für einige Download-"
-"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.4.0/source/"
+"Optionen siehe <ulink url=\"http://cdimage.debian.org/debian-cd/8.5.0/source/"
"iso-dvd/\"/>."
#. type: Content of: <article><section><section><title>
@@ -10307,15 +10301,6 @@ msgstr ""
"lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| 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, 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."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
@@ -10327,21 +10312,12 @@ msgstr ""
"Das Copyright der norwegischen Bokmål-Übersetzung liegt bei 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, 2015), Hans Arthur Kielland Aanesen "
+"Yrvin (2014), Ingrid Yrvin (2014, 2015, 2016), Hans Arthur Kielland Aanesen "
"(2014), Knut Yrvin (2014), FourFire Le'bard (2014), Stefan Mitchell-"
"Lauridsen (2014) und Ragnar Wisløff (2014). Sie ist unter der GPL v2 oder "
"einer späteren Version lizenziert."
#. 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 "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
-#| "v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -10356,33 +10332,21 @@ msgstr ""
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008), Kai Hatje (2008), Kurt Gramlich (2009), Franziska Teichert "
"(2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) und Wolfgang "
-"Schweer (2012, 2013, 2014, 2015). Sie ist unter der GPL v2 oder einer "
+"Schweer (2012, 2013, 2014, 2015, 2016). Sie ist unter der GPL v2 oder einer "
"späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
-#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
"2014) and is released under the GPL v2 or any later version."
msgstr ""
"Die italienische Übersetzung wurde erstellt und ist Copyright von Claudio "
-"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015) und "
+"Carboncini (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) und "
"Beatrice Torracca (2013, 2014). Sie ist unter der GPL v2 oder einer späteren "
"Version lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The French translation is copyrighted by Christophe Masson (2008), "
-#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
-#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
-#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
-#| "or any later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
@@ -10391,34 +10355,26 @@ msgid ""
"version."
msgstr ""
"Die französische Übersetzung wurde von Christophe Masson (2008), Olivier "
-"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-Paul "
+"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
"Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) und dem "
"französischen l10n-Team (2009, 2010, 2012) verfasst und ist unter der GPL v2 "
"oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
-#| "2015) and is released under the GPL v2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Die dänische Übersetzung wurde verfasst von Joe Hansen (2012, 2013, 2014, "
-"2015) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2015, 2016) und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
"2016) and is released under the GPL v2 or any later version."
msgstr ""
"Die niederländische Übersetzung wurde verfasst von Frans Spiesschaert (2014, "
-"2015) und ist unter der GPL v2 oder einer späteren Version lizenziert."
+"2015, 2016) und ist unter der GPL v2 oder einer späteren Version lizenziert."
#. type: Content of: <article><section><title>
msgid "Translations of this document"
@@ -10570,8 +10526,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list