[SCM] live-manual branch, debian, updated. debian/2.0_a5-1-22-g096e907
Daniel Baumann
daniel at debian.org
Fri Sep 17 21:51:57 UTC 2010
The following commit has been merged in the debian branch:
commit 30f57268ba82463e46f9627a687c6c0603918677
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Sep 17 23:30:07 2010 +0200
Removing undistributable Debian logo (Closes: #597237).
diff --git a/manual/Makefile b/manual/Makefile
index ff0d6cf..2ee8ab3 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -15,8 +15,6 @@ po4a.cfg:
echo "[type: text] $${FILE} \$$lang:\$$lang/$$(basename $${FILE})" >> po4a.cfg; \
done
- echo "[type: xhtml] en/index.html.in \$$lang:\$$lang/index.html.in" >> po4a.cfg
-
update:
@./bin/update-version.sh
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
deleted file mode 100644
index 5e4bb34..0000000
--- a/manual/de/index.html.in
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
- <title>Debian Live Projekt</title>
- <link type="text/css" rel="stylesheet" href="stylesheet.css" />
-</head>
-
-<body>
-
-<h1 id="title"><a href="/">Debian Live Projekt</a></h1>
-<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
-
-<div id="body">
-
-<h2>Live Handbuch</h2>
-
-<dl>
-
-<dd>
- <p>
- <i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>
- </p>
-
- <p>
- Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste
-unter <a
-href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-(englischspraching) gemeldet werden. Informationen wie man <a
-href="html/meta.html#contributing">zum Handbuch beitragen</a> kann, können
-im Handbuch gefunden werden.
- </p>
-</dd>
-
-<dt><h3>Verfügbare Formate</h3></dt>
-
-<dd>
- <ul>
- <li>› <a href="epub/live-manual.epub">EPUB</a></li>
- <li>› <b><a href="html/">HTML</a></b></li>
- <li>› <a href="html-single/live-manual.html">HTML (einzelne Seite)</a></li>
- <li>› <a href="odf/live-manual.odt">ODF</a></li>
- <li>› PDF: <a href="pdf/live-manual.portrait-a4.pdf">portrait-a4</a> <a
-href="pdf/live-manual.landscape-a4.pdf">landscape-a4</a> <a
-href="pdf/live-manual.portrait-letter.pdf">portrait-letter</a> <a
-href="pdf/live-manual.landscape-letter.pdf">landscape-letter</a></li>
- <li>› <a href="txt/live-manual.txt">Text</a></li>
- </ul>
-
- <p>
- Letzte Änderung: @DATE_CHANGE@<br />
- Letzte Aktualisierung: @DATE_BUILD@
- </p>
-</dd>
-
-<dt><h3>Quellen</h3></dt>
-
-<dd>
- <p>
- Die Quellen dieses Handbuches sind in einem <a
-href="http://git.or.cz/">Git</a> Repository auf live.debian.net verfügbar.
- </p>
-
- <ul>
- <li>Browse: <a
-href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
- <li>Git: <a
-href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
- </ul>
-</dd>
-
-</dl>
-</div>
-
-<div class="footer">
-
-<p>
- <a href="http://live.debian.net/">Debian Live</a> <<a
-href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>>
-- <a href="http://live.debian.net/legal.html">Rechtliche Hinweise</a>
-</p>
-
-</div>
-
-</body>
-</html>
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
deleted file mode 100644
index 091b074..0000000
--- a/manual/en/index.html.in
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
- <title>Debian Live Project</title>
- <link type="text/css" rel="stylesheet" href="stylesheet.css" />
-</head>
-
-<body>
-
-<h1 id="title"><a href="/">Debian Live Project</a></h1>
-<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
-
-<div id="body">
-
-<h2>Live Manual</h2>
-
-<dl>
-
-<dd>
- <p>
- <i>This manual is under heavy construction.</i>
- </p>
-
- <p>
- Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/meta.html#contributing">how to contribute</a> to the manual.
- </p>
-</dd>
-
-<dt><h3>Available Formats</h3></dt>
-
-<dd>
- <ul>
- <li>› <a href="epub/live-manual.epub">EPUB</a></li>
- <li>› <b><a href="html/">HTML</a></b></li>
- <li>› <a href="html-single/live-manual.html">HTML (single page)</a></li>
- <li>› <a href="odf/live-manual.odt">ODF</a></li>
- <li>› PDF: <a href="pdf/live-manual.portrait-a4.pdf">portrait-a4</a> <a href="pdf/live-manual.landscape-a4.pdf">landscape-a4</a> <a href="pdf/live-manual.portrait-letter.pdf">portrait-letter</a> <a href="pdf/live-manual.landscape-letter.pdf">landscape-letter</a></li>
- <li>› <a href="txt/live-manual.txt">Plain text</a></li>
- </ul>
-
- <p>
- Last changed: @DATE_CHANGE@<br />
- Last built: @DATE_BUILD@
- </p>
-</dd>
-
-<dt><h3>Source</h3></dt>
-
-<dd>
- <p>
- The sources for this manual is available in a <a href="http://git.or.cz/">git</a> repository at live.debian.net.
- </p>
-
- <ul>
- <li>Browse: <a href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
- <li>Git: <a href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
- </ul>
-</dd>
-
-</dl>
-</div>
-
-<div class="footer">
-
-<p>
- <a href="http://live.debian.net/">Debian Live</a> <<a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>> - <a href="http://live.debian.net/legal.html">Legal Notice</a>
-</p>
-
-</div>
-
-</body>
-</html>
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
deleted file mode 100644
index a6160d5..0000000
--- a/manual/po/de/index.html.in.po
+++ /dev/null
@@ -1,152 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2006-2010 Debian Live Project <debian-live at lists.debian.org>
-# This file is distributed under the same license as the live-manual package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-09-09 09:38+0300\n"
-"PO-Revision-Date: 2010-06-06 15:21+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <html><head><title>
-#: en/index.html.in:8
-msgid "Debian Live Project"
-msgstr "Debian Live Projekt"
-
-#. type: Content of: <html><body><h1>
-#: en/index.html.in:14
-msgid "<a href=\"/\">Debian Live Project</a>"
-msgstr "<a href=\"/\">Debian Live Projekt</a>"
-
-#. type: Content of: <html><body><h2>
-#: en/index.html.in:15
-msgid "<a href=\"/\">Live Debian systems!</a>"
-msgstr "<a href=\"/\">Live Debian systems!</a>"
-
-#. type: Content of: <html><body><div><h2>
-#: en/index.html.in:19
-msgid "Live Manual"
-msgstr "Live Handbuch"
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:25
-msgid "<i>This manual is under heavy construction.</i>"
-msgstr ""
-"<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:29
-msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
-"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
-msgstr ""
-"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
-"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
-"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/meta.html#contributing\">zum Handbuch beitragen</a> kann, können "
-"im Handbuch gefunden werden."
-
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:33
-msgid "Available Formats"
-msgstr "Verfügbare Formate"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:37
-msgid "› <a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr "› <a href=\"epub/live-manual.epub\">EPUB</a>"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:38
-msgid "› <b><a href=\"html/\">HTML</a></b>"
-msgstr "› <b><a href=\"html/\">HTML</a></b>"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:39
-msgid ""
-"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
-msgstr ""
-"› <a href=\"html-single/live-manual.html\">HTML (einzelne Seite)</a>"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:40
-msgid "› <a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr "› <a href=\"odf/live-manual.odt\">ODF</a>"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:41
-msgid ""
-"› PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">portrait-a4</a> <a "
-"href=\"pdf/live-manual.landscape-a4.pdf\">landscape-a4</a> <a href=\"pdf/"
-"live-manual.portrait-letter.pdf\">portrait-letter</a> <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">landscape-letter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:42
-msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "› <a href=\"txt/live-manual.txt\">Text</a>"
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:46
-msgid "Last changed: @DATE_CHANGE@"
-msgstr "Letzte Änderung: @DATE_CHANGE@"
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:47
-msgid "Last built: @DATE_BUILD@"
-msgstr "Letzte Aktualisierung: @DATE_BUILD@"
-
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:51
-msgid "Source"
-msgstr "Quellen"
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:55
-msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
-msgstr ""
-"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
-"\">Git</a> Repository auf live.debian.net verfügbar."
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:59
-msgid ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
-"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
-"a>"
-msgstr ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
-"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
-"a>"
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:60
-msgid ""
-"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
-"live.debian.net/git/live-manual.git</tt></small></a>"
-msgstr ""
-"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
-"live.debian.net/git/live-manual.git</tt></small></a>"
-
-#. type: Content of: <html><body><div><p>
-#: en/index.html.in:70
-msgid ""
-"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
-"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
-"href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
-msgstr ""
-"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
-"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
-"href=\"http://live.debian.net/legal.html\">Rechtliche Hinweise</a>"
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index e7b5f18..6fac8c6 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -25,4 +25,3 @@
[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
[type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
[type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
-[type: xhtml] en/index.html.in $lang:$lang/index.html.in
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
deleted file mode 100644
index 7502c4d..0000000
--- a/manual/pot/index.html.in.pot
+++ /dev/null
@@ -1,136 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-09 09:38+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Content of: <html><head><title>
-#: en/index.html.in:8
-msgid "Debian Live Project"
-msgstr ""
-
-#. type: Content of: <html><body><h1>
-#: en/index.html.in:14
-msgid "<a href=\"/\">Debian Live Project</a>"
-msgstr ""
-
-#. type: Content of: <html><body><h2>
-#: en/index.html.in:15
-msgid "<a href=\"/\">Live Debian systems!</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><h2>
-#: en/index.html.in:19
-msgid "Live Manual"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:25
-msgid "<i>This manual is under heavy construction.</i>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:29
-msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
-"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:33
-msgid "Available Formats"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:37
-msgid "› <a href=\"epub/live-manual.epub\">EPUB</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:38
-msgid "› <b><a href=\"html/\">HTML</a></b>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:39
-msgid ""
-"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:40
-msgid "› <a href=\"odf/live-manual.odt\">ODF</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:41
-msgid ""
-"› PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">portrait-a4</a> <a "
-"href=\"pdf/live-manual.landscape-a4.pdf\">landscape-a4</a> <a href=\"pdf/"
-"live-manual.portrait-letter.pdf\">portrait-letter</a> <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">landscape-letter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:42
-msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:46
-msgid "Last changed: @DATE_CHANGE@"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:47
-msgid "Last built: @DATE_BUILD@"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:51
-msgid "Source"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:55
-msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:59
-msgid ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
-"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
-"a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:60
-msgid ""
-"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
-"live.debian.net/git/live-manual.git</tt></small></a>"
-msgstr ""
-
-#. type: Content of: <html><body><div><p>
-#: en/index.html.in:70
-msgid ""
-"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
-"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
-"href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
-msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list