Synchronize changes made in GIT hash b5bc69b8.

9 files changed, 33 insertions, 33 deletions

diff --git a/tde-i18n-sv/docs/tdebase/userguide/Makefile.in b/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
index d5327214016..7a4837a218b 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png installation.docbook history.docbook kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png about-desktop.docbook a-window.png pdf-files.docbook intro.docbook kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook getting-started.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook notices-trademarks.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png more-help.docbook splash-screen.png shortcuts.docbook switching-sessions.docbook staff.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png installation.docbook history.docbook tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png about-desktop.docbook a-window.png pdf-files.docbook intro.docbook tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook getting-started.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook notices-trademarks.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png more-help.docbook splash-screen.png shortcuts.docbook switching-sessions.docbook staff.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	@for base in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	for base in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	for file in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-sv/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-sv/docs/tdebase/userguide/base-tde-applications.docbook
index a9ea302bea8..8bb602f2951 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Kontor</title>
 
 <para
->Detta omfattar alla program i &koffice;-sviten. Se <xref linkend="kde-office-components"/> för en översikt av komponenterna.</para>
+>Detta omfattar alla program i &koffice;-sviten. Se <xref linkend="tde-office-components"/> för en översikt av komponenterna.</para>
 
 </sect1>
 
diff --git a/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
index 2e1b859bf48..dea2c5ffd10 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Skrev om <xref linkend="kde-edutainment"/>.</para
+>Skrev om <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/index.docbook b/tde-i18n-sv/docs/tdebase/userguide/index.docbook
index 4ce25ee12ba..ba0181260b9 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -540,14 +540,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >&kde;-komponenter</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia med &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, skrivbordet för flera användare</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Använda nätverk med &kde;</title
@@ -556,7 +556,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafik, utskrift och teckensnitt</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -569,9 +569,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-as-root.docbook
index 030d9fdd2be..030d9fdd2be 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-as-root.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-edutainment.docbook
index 00d2a0597dd..f1be730504a 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-for-admins.docbook
index 3ccc32bbad6..af70e2a3b99 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >&kde;:s interna funktioner</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Översikt</title>
 <para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-office.docbook
index dbc784ea583..0e7d7da864c 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Kontor</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introduktion till Koffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Översikt</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funktioner</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Filformatet OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Översikt över &koffice; komponenter</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Ytterligare information</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Programhandböcker</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Internetresurser</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Utveckling av insticksprogram</title>
 <para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-sv/docs/tdebase/userguide/your-tde-account.docbook
index 1f21f221c87..1f21f221c87 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/your-kde-account.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/your-tde-account.docbook