Branch: master

ac0e4935 2014-08-05 05:16:45 Michele Calgaro
Added basic TDEPasswd 'We apologize' handbook. This relates to bug 1928.
A doc/tdepasswd/CMakeLists.txt
A doc/tdepasswd/Makefile.am
A doc/tdepasswd/index.docbook
diff --git a/doc/tdepasswd/CMakeLists.txt b/doc/tdepasswd/CMakeLists.txt
new file mode 100644
index 0000000..8d0a4d0
--- /dev/null
+++ b/doc/tdepasswd/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION tdepasswd )
diff --git a/doc/tdepasswd/Makefile.am b/doc/tdepasswd/Makefile.am
new file mode 100644
index 0000000..4169155
--- /dev/null
+++ b/doc/tdepasswd/Makefile.am
@@ -0,0 +1,3 @@
+KDE_LANG = en
+KDE_DOCS = AUTO
+
diff --git a/doc/tdepasswd/index.docbook b/doc/tdepasswd/index.docbook
new file mode 100644
index 0000000..1a514b5
--- /dev/null
+++ b/doc/tdepasswd/index.docbook
@@ -0,0 +1,66 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY tdepasswd "<application>TDE Passwd</application>">
+  <!ENTITY kappname "&tdepasswd;">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>The &kappname; Handbook</title>
+
+<articleinfo>
+<title>The &kappname; Handbook</title>
+
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<abstract>
+<para>
+&kappname; is a system utility which can be used to modify user passwords.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>network</keyword>
+<keyword>manager</keyword>
+<keyword>connection</keyword>
+<keyword>connections</keyword>
+<keyword>wired</keyword>
+<keyword>wireless</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for &kappname;.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
36d73438 2014-08-05 05:20:32 Michele Calgaro
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
M kicker/menuext/prefmenu/prefmenu.desktop
diff --git a/kicker/menuext/prefmenu/prefmenu.desktop b/kicker/menuext/prefmenu/prefmenu.desktop
index 2472dc5..88b0438 100644
--- a/kicker/menuext/prefmenu/prefmenu.desktop
+++ b/kicker/menuext/prefmenu/prefmenu.desktop
@@ -13,7 +13,7 @@
 Name[csb]=Centr��m k��ntrol��
 Name[cy]=Canolfan Rheoli
 Name[da]=Kontrolcenter
-Name[de]=Kontrollzentrum
+Name[de]=Trinity-Kontrollzentrum
 Name[el]=������������ ��������������
 Name[en_GB]=Control Centre
 Name[eo]=Stircentro